From 85f2f540dc775a816a643df311ef96c12e3d9016 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 20 Feb 2024 08:27:33 +0100
Subject: [PATCH] Revert "Add parameter for performing user sync on start up."
This reverts commit 34bf63d7be7e95d234b9ab72e51907920845f68a.
---
.../de/ozgcloud/user/sync/SyncScheduler.java | 15 +---------
.../src/main/resources/application.yaml | 3 +-
.../ozgcloud/user/sync/SyncSchedulerTest.java | 28 -------------------
3 files changed, 2 insertions(+), 44 deletions(-)
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncScheduler.java b/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncScheduler.java
index 251bf289..0fe18bc2 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncScheduler.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/sync/SyncScheduler.java
@@ -25,14 +25,10 @@ package de.ozgcloud.user.sync;
import static io.quarkus.scheduler.Scheduled.ConcurrentExecution.*;
+import de.ozgcloud.user.common.lock.LockService;
import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.event.Observes;
import jakarta.inject.Inject;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
-import de.ozgcloud.user.common.lock.LockService;
-import io.quarkus.runtime.StartupEvent;
import io.quarkus.scheduler.Scheduled;
import lombok.extern.log4j.Log4j2;
@@ -45,15 +41,6 @@ public class SyncScheduler {
@Inject
LockService syncLockService;
- @ConfigProperty(name = "ozgcloud.usersync.onstart")
- boolean syncUsers;
-
- void onStart(@Observes StartupEvent event) {
- if (syncUsers) {
- start();
- }
- }
-
@Scheduled(every = "{ozgcloud.usersync.period}", concurrentExecution = SKIP)
public void start() {
if (syncLockService.isNotLocked()) {
diff --git a/user-manager-server/src/main/resources/application.yaml b/user-manager-server/src/main/resources/application.yaml
index 66db5ca6..2b4d4d46 100644
--- a/user-manager-server/src/main/resources/application.yaml
+++ b/user-manager-server/src/main/resources/application.yaml
@@ -46,5 +46,4 @@ ozgcloud:
realm: by-kiel-dev
client: alfa
usersync:
- period: "6h"
- onstart: false
\ No newline at end of file
+ period: "6h"
\ No newline at end of file
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerTest.java
index 20accec4..9d20a7e2 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerTest.java
@@ -38,7 +38,6 @@ import org.mockito.Spy;
import de.ozgcloud.user.common.lock.Lock;
import de.ozgcloud.user.common.lock.LockService;
-import io.quarkus.runtime.StartupEvent;
class SyncSchedulerTest {
@@ -125,31 +124,4 @@ class SyncSchedulerTest {
verify(syncLockService).unlock();
}
}
-
- @Nested
- class OnStartTest {
-
- @Test
- void shouldSyncUsers() {
- doNothing().when(scheduler).start();
- scheduler.syncUsers = true;
-
- callScheduler();
-
- verify(scheduler).start();
- }
-
- @Test
- void shouldNOTSyncUsers() {
- scheduler.syncUsers = false;
-
- callScheduler();
-
- verify(scheduler, never()).start();
- }
-
- private void callScheduler() {
- scheduler.onStart(new StartupEvent());
- }
- }
}
\ No newline at end of file
--
GitLab