clean up

Jenkinsfile

@@ -66,7 +66,7 @@ pipeline {
                     FAILED_STAGE=env.STAGE_NAME
                 }
                 configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
-                    sh 'mvn -s $MAVEN_SETTINGS clean install -DskipTests -Dmaven.wagon.http.retryHandler.count=3'
+                    sh 'mvn -s $MAVEN_SETTINGS clean install -Dmaven.wagon.http.retryHandler.count=3'
                         
                     script {
                       	try {

src/main/java/de/ozgcloud/operator/elstertransfer/user/Constants.java

@@ -12,5 +12,4 @@ public class Constants {
 	public static final String ETR_DEPLOYMENT_NAME = "elster-transfer";
 	public static final String MUK_USER_SECRET_NAME = "muk-user-secret";
 
-    
 }

src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserReconciler.java

@@ -35,7 +35,8 @@ public class OzgCloudElsterTransferUserReconciler implements Reconciler<OzgCloud
 					.withReschedule(ElsterTransferOperatorConfiguration.RECONCILER_RETRY_SECONDS)
 					.build();
 		} catch (Exception e) {
-			LOG.warn("{} could not reconcile in namespace {}: {}.", elsterTransferUser.getMetadata().getName(), elsterTransferUser.getMetadata().getNamespace(), e);
+			LOG.warn("{} could not reconcile in namespace {}: {}.", elsterTransferUser.getMetadata().getName(),
+					elsterTransferUser.getMetadata().getNamespace(), e);
 			return UserUpdateControlBuilder.fromResource(elsterTransferUser)
 					.withStatus(OzgCloudCustomResourceStatus.ERROR)
 					.withMessage(e.getMessage())
@@ -44,7 +45,6 @@ public class OzgCloudElsterTransferUserReconciler implements Reconciler<OzgCloud
 		}
 	}
 
-
 	@Override
 	public DeleteControl cleanup(OzgCloudElsterTransferUser user, Context<OzgCloudElsterTransferUser> context) {
 		LOG.info("{} cleanup...", user.getMetadata().getName());
@@ -56,7 +56,7 @@ public class OzgCloudElsterTransferUserReconciler implements Reconciler<OzgCloud
 		}
 
 		try {
-			service.deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(user);
+			service.delete(user);
 			return DeleteControl.defaultDelete();
 		} catch (Exception e) {
 			LOG.warn(namespace + " could not delete.", e);

src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java

@@ -20,7 +20,6 @@ public class OzgCloudElsterTransferUserRemoteService {
 
 	private final KubernetesClient client;
 
-
 	public ConfigMap getConfigMap(String configmapNamespace, String configMapName) {
 		return client.configMaps().inNamespace(configmapNamespace).withName(configMapName).get();
 	}

src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java

@@ -16,7 +16,6 @@ import com.github.mustachejava.Mustache;
 import com.github.mustachejava.MustacheFactory;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
-import io.micrometer.common.util.StringUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 
@@ -39,7 +38,7 @@ public class OzgCloudElsterTransferUserService {
 		}
 	}
 
-	public void deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(OzgCloudElsterTransferUser user) {
+	public void delete(OzgCloudElsterTransferUser user) {
 		String namespace = user.getMetadata().getNamespace();
 		if (!userExists(namespace, Constants.ETR_NAMESPACE, Constants.ELSTER_TRANSFER_USER_LOGIN_KEY)) {
 			LOG.info("User not exists");

src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferConfigMapUserListFactory.java

 package de.ozgcloud.operator.elstertransfer.user;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserReconcilerTest.java

@@ -66,7 +66,7 @@ class OzgCloudElsterTransferUserReconcilerTest {
 		void shouldCallServiceDelete() {
 			reconciler.cleanup(user, null);
 
-			verify(service).deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(user);
+			verify(service).delete(user);
 		}
 
 		@Test
@@ -79,7 +79,7 @@ class OzgCloudElsterTransferUserReconcilerTest {
 		@Test
 		void shouldRescheduleOnError() {
 			doThrow(RuntimeException.class).when(service)
-					.deleteUserAndRestartDeploymentIfNotKeepUserAndUserExists(user);
+					.delete(user);
 
 			var control = reconciler.cleanup(user, null);
 

src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserSpecTestFactory.java

@@ -23,7 +23,6 @@
  */
 package de.ozgcloud.operator.elstertransfer.user;
 
-
 public class OzgCloudElsterTransferUserSpecTestFactory {
 
 	public static final boolean KEEP_AFTER_DELETE = false;

src/test/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserTestFactory.java

@@ -27,7 +27,6 @@ public class OzgCloudElsterTransferUserTestFactory {
 
 	public static final String METADATA_NAMESPACE = "TestNamespace";
 
-
 	public static OzgCloudElsterTransferUser create() {
 		return createWithSpec(OzgCloudElsterTransferUserSpecTestFactory.create());
 	}