KON-612 Change DB-View and SonarWork
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/service/AuthNAuthService.java b/src/main/java/org/eclipse/openk/contactbasedata/service/AuthNAuthService.java
index 746a8ee..d5c6009 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/service/AuthNAuthService.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/service/AuthNAuthService.java
@@ -1,34 +1,24 @@
package org.eclipse.openk.contactbasedata.service;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectReader;
-import feign.Response;
+
import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang.StringUtils;
import org.eclipse.openk.contactbasedata.api.AuthNAuthApi;
-import org.eclipse.openk.contactbasedata.exceptions.NotFoundException;
-import org.eclipse.openk.contactbasedata.model.*;
-import org.eclipse.openk.contactbasedata.repository.CommunicationRepository;
-import org.eclipse.openk.contactbasedata.repository.CommunicationTypeRepository;
+import org.eclipse.openk.contactbasedata.model.JwtToken;
+import org.eclipse.openk.contactbasedata.model.KeyCloakUser;
+import org.eclipse.openk.contactbasedata.model.LoginCredentials;
+import org.eclipse.openk.contactbasedata.model.TblInternalPerson;
import org.eclipse.openk.contactbasedata.repository.InternalPersonRepository;
-import org.eclipse.openk.contactbasedata.service.util.LdapUserAttributesMapper;
-import org.eclipse.openk.contactbasedata.viewmodel.LdapUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.ResponseEntity;
-import org.springframework.ldap.core.LdapTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.RestTemplate;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
-import static org.springframework.ldap.query.LdapQueryBuilder.query;
-
@Log4j2
@Service
public class AuthNAuthService {
@@ -80,7 +70,7 @@
for (TblInternalPerson tblInternalPerson : internalPersonList) {
KeyCloakUser keyCloakUserToSync = userRefToKeycloakMap.get(tblInternalPerson.getUserRef());
- boolean attributesChanged = mapKeycloakUserToInternaPerson(tblInternalPerson, keyCloakUserToSync);
+ boolean attributesChanged = mapKeycloakUserToInternalPerson(tblInternalPerson, keyCloakUserToSync);
if (attributesChanged) {
internalPersonListSynchronized.add(tblInternalPerson);
@@ -89,7 +79,7 @@
return internalPersonListSynchronized;
}
- private boolean mapKeycloakUserToInternaPerson(TblInternalPerson tblInternalPerson, KeyCloakUser keyCloakUserToSync) {
+ private boolean mapKeycloakUserToInternalPerson(TblInternalPerson tblInternalPerson, KeyCloakUser keyCloakUserToSync) {
boolean attributesChanged = false;
if (keyCloakUserToSync == null) {
tblInternalPerson.setUserRef(null);
diff --git a/src/test/java/org/eclipse/openk/contactbasedata/config/TestConfiguration.java b/src/test/java/org/eclipse/openk/contactbasedata/config/TestConfiguration.java
index 0fb8a1d..de5b02c 100644
--- a/src/test/java/org/eclipse/openk/contactbasedata/config/TestConfiguration.java
+++ b/src/test/java/org/eclipse/openk/contactbasedata/config/TestConfiguration.java
@@ -15,6 +15,7 @@
package org.eclipse.openk.contactbasedata.config;
import org.eclipse.openk.contactbasedata.ContactBaseDataApplication;
+import org.eclipse.openk.contactbasedata.api.AuthNAuthApi;
import org.eclipse.openk.contactbasedata.mapper.*;
import org.eclipse.openk.contactbasedata.service.*;
import org.eclipse.openk.contactbasedata.service.util.LdapUserAttributesMapper;
@@ -78,6 +79,9 @@
LdapUserAttributesMapper ldapUserAttributesMapper() { return new LdapUserAttributesMapper(); };
@MockBean
+ private AuthNAuthApi authNAuthApi;
+
+ @MockBean
private LdapTemplate ldapTemplate;
@Bean
diff --git a/src/test/java/org/eclipse/openk/contactbasedata/service/AuthNAuthServiceTest.java b/src/test/java/org/eclipse/openk/contactbasedata/service/AuthNAuthServiceTest.java
index 2e79876..7eef0e3 100644
--- a/src/test/java/org/eclipse/openk/contactbasedata/service/AuthNAuthServiceTest.java
+++ b/src/test/java/org/eclipse/openk/contactbasedata/service/AuthNAuthServiceTest.java
@@ -46,6 +46,9 @@
@Autowired
private AuthNAuthService authNAuthService ;
+ @Autowired
+ private AuthNAuthApi authNAuthApi;
+
@MockBean
private InternalPersonService internalPersonService;
@@ -55,10 +58,6 @@
@MockBean
private CommunicationTypeRepository communicationTypeRepository;
- @MockBean
- private AuthNAuthApi authNAuthApi;
-
-
@Test
public void shouldSynchronizeAuthnAuthRunThrou1() {
