diff --git a/pom.xml b/pom.xml index 0f82c885b644640c06debf12091b7c9dd2f43a9f..16d255e85ad22b52b7dbc618d60a645fd19350f5 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,7 @@ <?xml version="1.0"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> - + <groupId>de.itvsh.kop.user</groupId> <artifactId>user-manager</artifactId> <version>0.2.0-SNAPSHOT</version> @@ -12,14 +9,14 @@ <properties> <skipITs>true</skipITs> - + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <compiler-plugin.version>3.8.1</compiler-plugin.version> <maven.compiler.release>17</maven.compiler.release> - + <kop-common.version>1.1.4-SNAPSHOT</kop-common.version> - + <jacoco.plugin.version>0.8.8</jacoco.plugin.version> <quarkus.platform.version>2.10.3.Final</quarkus.platform.version> <surefire-plugin.version>3.0.0-M7</surefire-plugin.version> @@ -47,7 +44,7 @@ </dependencies> </dependencyManagement> - <dependencies> + <dependencies> <!-- Quarkus --> <dependency> <groupId>io.quarkus</groupId> @@ -62,25 +59,25 @@ <artifactId>quarkus-config-yaml</artifactId> </dependency> <dependency> - <groupId>io.quarkiverse.loggingjson</groupId> - <artifactId>quarkus-logging-json</artifactId> - <version>${quarkus-logging-json.version}</version> + <groupId>io.quarkiverse.loggingjson</groupId> + <artifactId>quarkus-logging-json</artifactId> + <version>${quarkus-logging-json.version}</version> </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-micrometer-registry-prometheus</artifactId> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-micrometer-registry-prometheus</artifactId> </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-smallrye-health</artifactId> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-smallrye-health</artifactId> </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-keycloak-admin-client</artifactId> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-keycloak-admin-client</artifactId> </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-mongodb-client</artifactId> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-mongodb-client</artifactId> </dependency> <dependency> <groupId>io.quarkus</groupId> @@ -91,33 +88,33 @@ <artifactId>quarkus-resteasy-reactive</artifactId> </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-scheduler</artifactId> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-scheduler</artifactId> </dependency> <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-oidc</artifactId> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-oidc</artifactId> </dependency> - + <!-- Tools --> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-jacoco</artifactId> <scope>test</scope> </dependency> - <dependency> + <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-container-image-jib</artifactId> </dependency> @@ -127,17 +124,27 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-test-keycloak-server</artifactId> - <scope>test</scope> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-test-keycloak-server</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct-processor</artifactId> + <version>1.5.1.Final</version> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.mapstruct</groupId> - <artifactId>mapstruct-processor</artifactId> - <version>1.5.1.Final</version> - <scope>provided</scope> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>2.18.0</version> </dependency> - + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.18.0</version> + </dependency> + <!-- Test --> <dependency> <groupId>io.quarkus</groupId> @@ -155,9 +162,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-panache-mock</artifactId> - <scope>test</scope> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-panache-mock</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>com.github.javafaker</groupId> @@ -165,9 +172,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <scope>test</scope> </dependency> </dependencies> diff --git a/src/main/java/de/itvsh/kop/user/UserRepresentationMapper.java b/src/main/java/de/itvsh/kop/user/UserRepresentationMapper.java index a905543614ce33b07000559c0907c255bb42db33..30063e1f4a1fb236d708187dea9276ae97dc66b1 100644 --- a/src/main/java/de/itvsh/kop/user/UserRepresentationMapper.java +++ b/src/main/java/de/itvsh/kop/user/UserRepresentationMapper.java @@ -10,7 +10,6 @@ import org.mapstruct.ReportingPolicy; @Mapper(componentModel = "cdi", unmappedTargetPolicy = ReportingPolicy.WARN) public interface UserRepresentationMapper { - @Mapping(target = "id", ignore = true) @Mapping(target = "externalId", expression = "java(getExternalId(userRep))") @Mapping(target = "organisationseinheitId", ignore = true) @Mapping(target = "organisationseinheitIds", ignore = true) diff --git a/src/main/java/de/itvsh/kop/user/sync/SyncService.java b/src/main/java/de/itvsh/kop/user/sync/SyncService.java index e0e3bb92646374aa1acd5501106881c1c22cb407..8cba55e4833b4159d356afac50aa8be89e2cba18 100644 --- a/src/main/java/de/itvsh/kop/user/sync/SyncService.java +++ b/src/main/java/de/itvsh/kop/user/sync/SyncService.java @@ -1,7 +1,6 @@ package de.itvsh.kop.user.sync; import java.time.ZonedDateTime; -import java.util.logging.Level; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @@ -11,10 +10,10 @@ import org.apache.commons.collections4.CollectionUtils; import de.itvsh.kop.user.UserService; import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService; import io.quarkus.scheduler.Scheduled; -import lombok.extern.java.Log; +import lombok.extern.log4j.Log4j2; @ApplicationScoped -@Log +@Log4j2 public class SyncService { @Inject UserService userService; @@ -30,7 +29,7 @@ public class SyncService { if (isNotLocked()) { ZonedDateTime syncDateTime = ZonedDateTime.now(); Lock lock = lockUserDatabase(syncDateTime); - LOG.log(Level.INFO, "Started sync at " + syncDateTime); + LOG.info("Started sync at " + syncDateTime); doSync(syncDateTime, lock); } @@ -44,14 +43,13 @@ public class SyncService { userService.save(syncUsers); } catch (Exception e) { - LOG.log(Level.SEVERE, "Error syncing usermanager database", e); + LOG.error("Error syncing usermanager database", e); } finally { unlockUserDatabase(lock); } } Lock lockUserDatabase(ZonedDateTime syncDateTime) { - LOG.log(Level.INFO, "Db locked at " + syncDateTime); var timestamp = syncDateTime.toInstant().toEpochMilli(); Lock lock = Lock.builder().timestamp(timestamp).build(); lockRepository.persist(lock); @@ -61,8 +59,8 @@ public class SyncService { } void unlockUserDatabase(Lock lock) { - LOG.log(Level.INFO, "Db unlocked"); lockRepository.delete(lock); + LOG.info("Db locked released"); } boolean isNotLocked() { diff --git a/src/test/java/de/itvsh/kop/user/UserITCase.java b/src/test/java/de/itvsh/kop/user/UserITCase.java deleted file mode 100644 index 673e9233e951ac9d90569750406773d4a7317bf0..0000000000000000000000000000000000000000 --- a/src/test/java/de/itvsh/kop/user/UserITCase.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.itvsh.kop.user; - -import io.quarkus.test.junit.QuarkusIntegrationTest; - -@QuarkusIntegrationTest -class UserITCase extends UserControllerTest { -} \ No newline at end of file