moved various modules and classes to tools realm, replaced gradle buildscripts by gradle kotlin buildscripts

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
2024-12-17 00:59:45 +01:00
parent eec87f678d
commit 94aeaa8650
60 changed files with 188 additions and 964 deletions

View File

@@ -1,24 +0,0 @@
plugins {
id 'java'
}
group = 'de.srsoftware'
version = '1.0-SNAPSHOT'
repositories {
mavenCentral()
}
dependencies {
testImplementation platform('org.junit:junit-bom:5.10.0')
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation project(path: ':de.srsoftware.oidc.api', configuration: "testBundle")
implementation project(':de.srsoftware.oidc.api')
implementation project(':de.srsoftware.utils')
implementation 'com.sun.mail:jakarta.mail:2.0.1'
implementation 'org.bitbucket.b_c:jose4j:0.9.6'
}
test {
useJUnitPlatform()
}

View File

@@ -0,0 +1,11 @@
description = "SRSoftware OIDC: encrypted datastore module"
dependencies{
implementation("com.sun.mail:jakarta.mail:2.0.1")
implementation("de.srsoftware:tools.optionals:1.0.0")
implementation("de.srsoftware:tools.util:1.0.2")
implementation(project(":de.srsoftware.oidc.api"))
testImplementation(project(":de.srsoftware.oidc.api","testBundle"))
}

View File

@@ -8,10 +8,10 @@ import static java.util.Optional.empty;
import de.srsoftware.oidc.api.UserService;
import de.srsoftware.oidc.api.data.AccessToken;
import de.srsoftware.oidc.api.data.User;
import de.srsoftware.utils.Error;
import de.srsoftware.utils.PasswordHasher;
import de.srsoftware.utils.Payload;
import de.srsoftware.utils.Result;
import de.srsoftware.tools.Error;
import de.srsoftware.tools.PasswordHasher;
import de.srsoftware.tools.Payload;
import de.srsoftware.tools.Result;
import java.util.*;
public class EncryptedUserService extends EncryptedConfig implements UserService {

View File

@@ -1,11 +1,11 @@
/* © SRSoftware 2024 */
import static de.srsoftware.utils.Optionals.nullable;
import static de.srsoftware.utils.Strings.uuid;
package de.srsoftware.oidc.datastore.encrypted; /* © SRSoftware 2024 */
import static de.srsoftware.tools.Optionals.nullable;
import static de.srsoftware.tools.Strings.uuid;
import de.srsoftware.oidc.api.ClientService;
import de.srsoftware.oidc.api.ClientServiceTest;
import de.srsoftware.oidc.api.data.Client;
import de.srsoftware.oidc.datastore.encrypted.EncryptedClientService;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;

View File

@@ -1,8 +1,8 @@
/* © SRSoftware 2024 */
import static de.srsoftware.utils.Strings.uuid;
package de.srsoftware.oidc.datastore.encrypted; /* © SRSoftware 2024 */
import static de.srsoftware.tools.Strings.uuid;
import static org.junit.jupiter.api.Assertions.assertEquals;
import de.srsoftware.oidc.datastore.encrypted.EncryptedConfig;
import org.junit.jupiter.api.Test;
public class EncryptedConfigTest {

View File

@@ -1,9 +1,9 @@
/* © SRSoftware 2024 */
import static de.srsoftware.utils.Strings.uuid;
package de.srsoftware.oidc.datastore.encrypted; /* © SRSoftware 2024 */
import static de.srsoftware.tools.Strings.uuid;
import de.srsoftware.oidc.api.KeyStorage;
import de.srsoftware.oidc.api.KeyStoreTest;
import de.srsoftware.oidc.datastore.encrypted.EncryptedKeyStore;
import java.io.IOException;
import java.sql.SQLException;
import java.util.HashMap;

View File

@@ -1,9 +1,9 @@
/* © SRSoftware 2024 */
import static de.srsoftware.utils.Strings.uuid;
package de.srsoftware.oidc.datastore.encrypted; /* © SRSoftware 2024 */
import static de.srsoftware.tools.Strings.uuid;
import static org.junit.jupiter.api.Assertions.*;
import de.srsoftware.oidc.api.MailConfig;
import de.srsoftware.oidc.datastore.encrypted.EncryptedMailConfig;
import jakarta.mail.Authenticator;
import java.util.Map;
import java.util.Properties;

View File

@@ -1,17 +1,17 @@
/* © SRSoftware 2024 */
package de.srsoftware.oidc.datastore.encrypted; /* © SRSoftware 2024 */
import static de.srsoftware.oidc.api.Constants.*;
import static de.srsoftware.utils.Optionals.nullable;
import static de.srsoftware.utils.Strings.uuid;
import static de.srsoftware.tools.Optionals.nullable;
import static de.srsoftware.tools.Strings.uuid;
import static java.lang.System.Logger.Level.WARNING;
import de.srsoftware.oidc.api.*;
import de.srsoftware.oidc.api.data.AccessToken;
import de.srsoftware.oidc.api.data.User;
import de.srsoftware.oidc.datastore.encrypted.EncryptedUserService;
import de.srsoftware.utils.Error;
import de.srsoftware.utils.PasswordHasher;
import de.srsoftware.utils.Payload;
import de.srsoftware.utils.Result;
import de.srsoftware.tools.Error;
import de.srsoftware.tools.PasswordHasher;
import de.srsoftware.tools.Payload;
import de.srsoftware.tools.Result;
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;