SonarLint fixes.

it-at-m · Sep 19, 2024 · 083ca92 · 083ca92
1 parent dcc6277
commit 083ca92
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/src/main/java/de/muenchen/zammad/ldap/service/ZammadService.java b/src/main/java/de/muenchen/zammad/ldap/service/ZammadService.java
@@ -22,7 +22,9 @@
 @Slf4j
 public class ZammadService {
 
-	private final RestTemplate restTemplate = new RestTemplate();
+	private static final String AUTHORIZATION = "Authorization";
+
+    private final RestTemplate restTemplate = new RestTemplate();
 
 	private final ZammadProperties zammadProperties;
 
@@ -32,7 +34,7 @@ public ZammadService(ZammadProperties zammadProperties) {
 
 	public List<ZammadGroupDTO> getZammadGroups() {
 		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-		headers.add("Authorization", zammadProperties.getToken());
+		headers.add(AUTHORIZATION, zammadProperties.getToken());
 
 		boolean found = true;
 		int i = 0;
@@ -55,7 +57,7 @@ public List<ZammadGroupDTO> getZammadGroups() {
 
 	public ZammadGroupDTO updateZammadGroup(ZammadGroupDTO zammadGroupDTO) {
 		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-		headers.add("Authorization", zammadProperties.getToken());
+		headers.add(AUTHORIZATION, zammadProperties.getToken());
 
 		HttpEntity<ZammadGroupDTO> requestEntity = new HttpEntity<>(zammadGroupDTO, headers);
 
@@ -69,7 +71,7 @@ public ZammadGroupDTO updateZammadGroup(ZammadGroupDTO zammadGroupDTO) {
 
 	public String deleteZammadGroup(String id) {
 		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-		headers.add("Authorization", zammadProperties.getToken());
+		headers.add(AUTHORIZATION, zammadProperties.getToken());
 
 		HttpEntity<ZammadGroupDTO> requestEntity = new HttpEntity<>(headers);
 
@@ -81,7 +83,7 @@ public String deleteZammadGroup(String id) {
 
 	public ZammadGroupDTO createZammadGroup(ZammadGroupDTO zammadGroupDTO) {
 		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-		headers.add("Authorization", zammadProperties.getToken());
+		headers.add(AUTHORIZATION, zammadProperties.getToken());
 
 		HttpEntity<ZammadGroupDTO> requestEntity = new HttpEntity<>(zammadGroupDTO, headers);
 
@@ -99,7 +101,7 @@ public ZammadGroupDTO createZammadGroup(ZammadGroupDTO zammadGroupDTO) {
 
 	public List<ZammadUserDTO> getZammadUsers() {
 		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-		headers.add("Authorization", zammadProperties.getToken());
+		headers.add(AUTHORIZATION, zammadProperties.getToken());
 
 		boolean found = true;
 		int i = 0;
@@ -121,7 +123,7 @@ public List<ZammadUserDTO> getZammadUsers() {
 
 	public ZammadUserDTO updateZammadUser(ZammadUserDTO zammadUserDTO) {
 		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-		headers.add("Authorization", zammadProperties.getToken());
+		headers.add(AUTHORIZATION, zammadProperties.getToken());
 
 		HttpEntity<ZammadUserDTO> requestEntity = new HttpEntity<>(zammadUserDTO, headers);
 
@@ -135,7 +137,7 @@ public ZammadUserDTO updateZammadUser(ZammadUserDTO zammadUserDTO) {
 
 	public ZammadUserDTO createZammadUser(ZammadUserDTO zammadUserDTO) {
 		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-		headers.add("Authorization", zammadProperties.getToken());
+		headers.add(AUTHORIZATION, zammadProperties.getToken());
 
 		HttpEntity<ZammadUserDTO> requestEntity = new HttpEntity<>(zammadUserDTO, headers);
 
@@ -147,7 +149,7 @@ public ZammadUserDTO createZammadUser(ZammadUserDTO zammadUserDTO) {
 
 	public String deleteZammadUser(String id) {
 		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-		headers.add("Authorization", zammadProperties.getToken());
+		headers.add(AUTHORIZATION, zammadProperties.getToken());
 
 		HttpEntity<ZammadUserDTO> requestEntity = new HttpEntity<>(headers);
 
@@ -159,7 +161,7 @@ public String deleteZammadUser(String id) {
 
 	public ZammadRoleDTO getZammadRole(int id) {
 		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-		headers.add("Authorization", zammadProperties.getToken());
+		headers.add(AUTHORIZATION, zammadProperties.getToken());
 
 		HttpEntity<ZammadRoleDTO> requestEntity = new HttpEntity<>(headers);
 
@@ -171,7 +173,7 @@ public ZammadRoleDTO getZammadRole(int id) {
 
 	public List<ZammadRoleDTO> getZammadRoles() {
 		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-		headers.add("Authorization", zammadProperties.getToken());
+		headers.add(AUTHORIZATION, zammadProperties.getToken());
 
 		HttpEntity<ZammadRoleDTO> requestEntity = new HttpEntity<>(headers);
 
@@ -183,7 +185,7 @@ public List<ZammadRoleDTO> getZammadRoles() {
 
 	public ZammadRoleDTO updateZammadRole(ZammadRoleDTO zammadRoleDTO) {
 		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-		headers.add("Authorization", zammadProperties.getToken());
+		headers.add(AUTHORIZATION, zammadProperties.getToken());
 
 		HttpEntity<ZammadRoleDTO> requestEntity = new HttpEntity<>(zammadRoleDTO, headers);
 

diff --git a/src/main/java/de/muenchen/zammad/ldap/service/config/LdapSearch.java b/src/main/java/de/muenchen/zammad/ldap/service/config/LdapSearch.java
@@ -16,7 +16,6 @@
 @Setter
 public class LdapSearch {
 
-    //	Integer dateTimeMinusDay;
     private Map<String, OrganizationalUnit> organizationalUnits;
 
     public List<String> listDistinguishedNames() {

diff --git a/src/test/java/de/muenchen/zammad/ldap/tree/LdapServiceIntegrationTest.java b/src/test/java/de/muenchen/zammad/ldap/tree/LdapServiceIntegrationTest.java
@@ -74,8 +74,6 @@ private LdapContextSource contextSource(final int port) {
         ldapContextSource.setUrl("ldap://localhost:" + port);
         ldapContextSource.setUserDn("cn=admin,dc=example,dc=org");
         ldapContextSource.setPassword("admin");
-        //        ldapContextSource.setAnonymousReadOnly(true);
-        // we need to call this manually if no Spring context present
         ldapContextSource.afterPropertiesSet();
         return ldapContextSource;
     }