Google Git
Sign in
eclipse/openk-coremodules/org.eclipse.openk-coremodules.authandauth/98678d832f368c81a899b76f801f268f2cfd07cd^!/.
commit
98678d832f368c81a899b76f801f268f2cfd07cd
[log]
author
Frank Dietrich <frank.dietrich@pta.eu>
Thu Mar 29 08:15:10 2018 +0200
committer
Frank Dietrich <frank.dietrich@pta.eu>
Thu Mar 29 08:15:10 2018 +0200
tree
f57e416a8cd2fbf63618bc98ba8a2cf45b1fe8c2
parent
80199ded93118d96097a75fe5acf3e57a83de8e3 [diff]
Sonarwork

diff --git a/src/main/java/org/eclipse/openk/portal/auth2/model/KeyCloakUser.java b/src/main/java/org/eclipse/openk/portal/auth2/model/KeyCloakUser.java
index 4b4d853..d33c9b2 100644
--- a/src/main/java/org/eclipse/openk/portal/auth2/model/KeyCloakUser.java
+++ b/src/main/java/org/eclipse/openk/portal/auth2/model/KeyCloakUser.java

@@ -39,13 +39,8 @@
     public String getUsername() { return username; }
     public void setUsername(String username) { this.username = username; }
 
-    public boolean getEnabled() { return enabled; }
-    public void setEnabled(boolean enabled) { this.enabled = enabled; }
-
-    public boolean getTotp() { return totp; }
     public void setTotp(boolean totp) { this.totp = totp; }
 
-    public boolean getEmailVerified() { return emailVerified; }
     public void setEmailVerified(boolean emailVerified) { this.emailVerified = emailVerified; }
 
     public String getFirstName() { return firstName; }

diff --git a/src/main/java/org/eclipse/openk/portal/auth2/util/JwtHelper.java b/src/main/java/org/eclipse/openk/portal/auth2/util/JwtHelper.java
index f3a550a..404045d 100644
--- a/src/main/java/org/eclipse/openk/portal/auth2/util/JwtHelper.java
+++ b/src/main/java/org/eclipse/openk/portal/auth2/util/JwtHelper.java

@@ -28,7 +28,6 @@
 import java.lang.reflect.Type;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.util.Base64;
 import java.util.List;
 import org.apache.log4j.Logger;
 import org.eclipse.openk.portal.common.BackendConfig;
@@ -54,7 +53,9 @@
   public static boolean serviceAvailable() throws PortalInternalServerError {
     String jsonRet = sendGet(BackendConfig.getInstance().getAuthServerUrl() + "auth/realms/" +
                     BackendConfig.getInstance().getKeycloakRealm(), "", null);
-    return jsonRet.contains("realm") && jsonRet.contains(BackendConfig.getInstance().getKeycloakRealm());
+
+    return jsonRet != null ? jsonRet.contains("realm") && jsonRet.contains(BackendConfig.getInstance().getKeycloakRealm())
+                           : false;
   }
 
   public static List<KeyCloakUser> getUsers(JwtToken jwtToken, int maxUsers) throws PortalInternalServerError {

diff --git a/src/main/java/org/eclipse/openk/portal/controller/BackendController.java b/src/main/java/org/eclipse/openk/portal/controller/BackendController.java
index e46a4c5..caf8388 100644
--- a/src/main/java/org/eclipse/openk/portal/controller/BackendController.java
+++ b/src/main/java/org/eclipse/openk/portal/controller/BackendController.java

@@ -16,10 +16,8 @@
 import org.eclipse.openk.portal.auth2.model.JwtToken;
 import org.eclipse.openk.portal.auth2.model.KeyCloakUser;
 import org.eclipse.openk.portal.auth2.util.JwtHelper;
-import org.eclipse.openk.portal.common.BackendConfig;
 import org.eclipse.openk.portal.common.JsonGeneratorBase;
 import org.eclipse.openk.portal.exceptions.PortalException;
-import org.eclipse.openk.portal.exceptions.PortalInternalServerError;
 import org.eclipse.openk.portal.exceptions.PortalUnauthorized;
 import org.eclipse.openk.portal.viewmodel.LoginCredentials;
 import org.eclipse.openk.portal.viewmodel.UserCache;

diff --git a/src/main/java/org/eclipse/openk/portal/controller/ControllerImplementations.java b/src/main/java/org/eclipse/openk/portal/controller/ControllerImplementations.java
index c343d29..8d3fb8e 100644
--- a/src/main/java/org/eclipse/openk/portal/controller/ControllerImplementations.java
+++ b/src/main/java/org/eclipse/openk/portal/controller/ControllerImplementations.java

@@ -29,8 +29,6 @@
 
     public static class GetUsers extends BackendInvokable {
 
-        public GetUsers() {}
-
         @Override
         public Response invoke() throws PortalException {
             List<KeyCloakUser> keyCloakUserList = UserCache.getInstance().getKeyCloakUsers();

diff --git a/src/main/java/org/eclipse/openk/portal/health/base/HealthCheck.java b/src/main/java/org/eclipse/openk/portal/health/base/HealthCheck.java
index 08fc817..f6bc66c 100644
--- a/src/main/java/org/eclipse/openk/portal/health/base/HealthCheck.java
+++ b/src/main/java/org/eclipse/openk/portal/health/base/HealthCheck.java

@@ -13,5 +13,5 @@
 
 public abstract class HealthCheck {
 
-    protected abstract Result check() throws Exception;
+    protected abstract Result check() throws Exception; // NOSONAR
 }

diff --git a/src/main/java/org/eclipse/openk/portal/health/base/HealthChecker.java b/src/main/java/org/eclipse/openk/portal/health/base/HealthChecker.java
index 33d04f5..34ebd90 100644
--- a/src/main/java/org/eclipse/openk/portal/health/base/HealthChecker.java
+++ b/src/main/java/org/eclipse/openk/portal/health/base/HealthChecker.java

@@ -35,7 +35,7 @@
             try {
                 hcList.add(new NamedHealthCheckResult(namingMap.get(hc), hc.check()));
 
-            } catch (Throwable t) {
+            } catch (Throwable t) { // NOSONAR  we definately want to catch everything here!!!
                 logger.error("Error during healthcheck", t);
                 hcList.add(new NamedHealthCheckResult(namingMap.get(hc),
                         Result.unhealthy("Exception during test: "+t+" -> See Log!")));

diff --git a/src/main/java/org/eclipse/openk/portal/health/base/NamedHealthCheckResult.java b/src/main/java/org/eclipse/openk/portal/health/base/NamedHealthCheckResult.java
index 9ee581e..9726cb9 100644
--- a/src/main/java/org/eclipse/openk/portal/health/base/NamedHealthCheckResult.java
+++ b/src/main/java/org/eclipse/openk/portal/health/base/NamedHealthCheckResult.java

@@ -25,7 +25,7 @@
     }
 
     public String toJson() {
-        StringBuffer buffer = new StringBuffer();
+        StringBuffer buffer = new StringBuffer(); // NOSONAR - _fd we don't a new dependency because of this
         buffer.append("\""+name+"\":");
         buffer.append(new GsonBuilder().disableHtmlEscaping().create().toJson(result));
         return buffer.toString();

diff --git a/src/main/java/org/eclipse/openk/portal/health/impl/KeyCloakPresentHealthCheck.java b/src/main/java/org/eclipse/openk/portal/health/impl/KeyCloakPresentHealthCheck.java
index 1295f46..80a7b52 100644
--- a/src/main/java/org/eclipse/openk/portal/health/impl/KeyCloakPresentHealthCheck.java
+++ b/src/main/java/org/eclipse/openk/portal/health/impl/KeyCloakPresentHealthCheck.java

@@ -18,7 +18,6 @@
 import org.eclipse.openk.portal.health.base.Result;
 
 public class KeyCloakPresentHealthCheck extends HealthCheck {
-    public KeyCloakPresentHealthCheck() {}
 
     protected boolean checkit() throws PortalInternalServerError {
         return JwtHelper.serviceAvailable();

diff --git a/src/test/java/org/eclipse/openk/portal/common/BackendConfigTest.java b/src/test/java/org/eclipse/openk/portal/common/BackendConfigTest.java
index 6b53881..4efadc9 100644
--- a/src/test/java/org/eclipse/openk/portal/common/BackendConfigTest.java
+++ b/src/test/java/org/eclipse/openk/portal/common/BackendConfigTest.java

@@ -20,15 +20,15 @@
     @Test
     public void testConfig() {
         BackendConfig bc = BackendConfig.getInstance();
-        assertEquals( (int)bc.getInternalSessionLengthMillis(), 3600000 );
-        assertEquals( (int)bc.getReloadUsersInSec(), 300 );
-        assertEquals( bc.getAuthServerUrl(), "http://entjava002:8080/");
-        assertEquals( bc.getKeycloakRealm(), "elogbook");
-        assertEquals( bc.getKeycloakClient(),"elogbook-backend");
-        assertEquals( bc.getKeycloakAdmin(), "admin");
-        assertEquals( bc.getKeycloakPW(), "nimda");
-        assertEquals( BackendConfig.getConfigFileName(), "backendConfigDevLocal.json");
+        assertEquals( 3600000, (int)bc.getInternalSessionLengthMillis() );
+        assertEquals( 300 , (int)bc.getReloadUsersInSec());
+        assertEquals( "http://entjava002:8080/", bc.getAuthServerUrl() );
+        assertEquals( "elogbook", bc.getKeycloakRealm());
+        assertEquals( "elogbook-backend", bc.getKeycloakClient());
+        assertEquals( "admin", bc.getKeycloakAdmin() );
+        assertEquals( "nimda", bc.getKeycloakPW() );
+        assertEquals( "backendConfigDevLocal.json", BackendConfig.getConfigFileName() );
         BackendConfig.setConfigFileName("backendConfigProduction.json");
-        assertEquals( BackendConfig.getConfigFileName(), "backendConfigProduction.json");
+        assertEquals( "backendConfigProduction.json", BackendConfig.getConfigFileName() );
     }
 }

diff --git a/src/test/java/org/eclipse/openk/portal/common/util/ResourceLoaderBaseTest.java b/src/test/java/org/eclipse/openk/portal/common/util/ResourceLoaderBaseTest.java
index f53ff8c..9d888ef 100644
--- a/src/test/java/org/eclipse/openk/portal/common/util/ResourceLoaderBaseTest.java
+++ b/src/test/java/org/eclipse/openk/portal/common/util/ResourceLoaderBaseTest.java

@@ -21,6 +21,6 @@
     public void testloadStringFromResourceError() {
         ResourceLoaderBase rlb = new ResourceLoaderBase();
         String str = rlb.loadStringFromResource("UNKNOWN_FILE");
-        assertEquals(str, "");
+        assertEquals("", str);
     }
 }

diff --git a/src/test/java/org/eclipse/openk/portal/controller/BaseWebServiceTest.java b/src/test/java/org/eclipse/openk/portal/controller/BaseWebServiceTest.java
index 8f0cea6..10a17dc 100644
--- a/src/test/java/org/eclipse/openk/portal/controller/BaseWebServiceTest.java
+++ b/src/test/java/org/eclipse/openk/portal/controller/BaseWebServiceTest.java

@@ -83,7 +83,7 @@
 
 		ti.exceptionToThrow = new PortalBadRequest();
 		Response ret = tws.invoke("ssess", false, ti);
-		Assert.assertEquals(ret.getStatus(), Globals.HTTPSTATUS_BAD_REQUEST);
+		Assert.assertEquals(Globals.HTTPSTATUS_BAD_REQUEST, ret.getStatus());
 	}
 
 	@Test
@@ -93,7 +93,7 @@
 
 		ti.throwRuntime = true;
 		Response ret = tws.invoke("ssess",  false, ti);
-		assertEquals(ret.getStatus(), Globals.HTTPSTATUS_INTERNAL_SERVER_ERROR);
+		assertEquals(Globals.HTTPSTATUS_INTERNAL_SERVER_ERROR, ret.getStatus());
 	}
 
 	@Test
@@ -102,7 +102,7 @@
 		TestInvokable ti = new TestInvokable();
 		tws.throwUnauthException = true;
 		Response ret = tws.invoke("ssess",  false, ti);
-		assertEquals(ret.getStatus(), Globals.HTTPSTATUS_UNAUTHORIZED);
+		assertEquals(Globals.HTTPSTATUS_UNAUTHORIZED, ret.getStatus());
 	}
 
 	@Test
@@ -252,8 +252,8 @@
 
 		Response ret = tws.invoke("ssess",  false, ti);
 		assertTrue(ti.isInvoked);
-		assertEquals(tws.sessionId, "ssess");
-		assertEquals(ret.getStatus(), 666);
+		assertEquals("ssess", tws.sessionId);
+		assertEquals(666, ret.getStatus() );
 
 	}
 

diff --git a/src/test/java/org/eclipse/openk/portal/controller/ResponseBuilderWrapperTest.java b/src/test/java/org/eclipse/openk/portal/controller/ResponseBuilderWrapperTest.java
index 03906d6..a64e04e 100644
--- a/src/test/java/org/eclipse/openk/portal/controller/ResponseBuilderWrapperTest.java
+++ b/src/test/java/org/eclipse/openk/portal/controller/ResponseBuilderWrapperTest.java

@@ -27,16 +27,16 @@
         String json = "{ 'ret' : 'OK' }";
         Response.ResponseBuilder rb = ResponseBuilderWrapper.INSTANCE.getResponseBuilder( json );
         Response resp = rb.build();
-        assertEquals(resp.getStatus(), Globals.HTTPSTATUS_OK );
+        assertEquals(Globals.HTTPSTATUS_OK, resp.getStatus());
     }
 
     @Test
     public void testBuildOkResponse() throws PortalException {
         String json = "{ 'test' : 'Value' }";
         Response resp = ResponseBuilderWrapper.INSTANCE.buildOKResponse( json );
-        assertEquals( resp.getStatus(), Globals.HTTPSTATUS_OK );
+        assertEquals( Globals.HTTPSTATUS_OK, resp.getStatus());
 
         resp = ResponseBuilderWrapper.INSTANCE.buildOKResponse(json, "ssess");
-        assertEquals( resp.getStatus(), Globals.HTTPSTATUS_OK);
+        assertEquals( Globals.HTTPSTATUS_OK, resp.getStatus());
     }
 }

diff --git a/src/test/java/org/eclipse/openk/portal/controller/TokenManagerTest.java b/src/test/java/org/eclipse/openk/portal/controller/TokenManagerTest.java
index 00bff61..1c31de2 100644
--- a/src/test/java/org/eclipse/openk/portal/controller/TokenManagerTest.java
+++ b/src/test/java/org/eclipse/openk/portal/controller/TokenManagerTest.java

@@ -54,7 +54,7 @@
 
         HashMap<String, TokenManager.SessionItem> regMap = Whitebox.getInternalState(sessione, "registry");
 
-        assertEquals(regMap.size(), 3);
+        assertEquals(3, regMap.size());
         assertTrue(regMap.containsKey("HUGO1"));
         assertTrue(regMap.containsKey(specialToken.getAccessToken()));
         assertTrue(regMap.containsKey("HUGO3"));
@@ -77,14 +77,14 @@
         assertEquals( sit1.getSessionCreationTime()+200, sit1.getSessionLastAccessTime());
         sit1.setUser(null);
         assertNull(sit1.getUser());
-        assertEquals(sit1.getSessionId(), "HUGO1");
+        assertEquals("HUGO1", sit1.getSessionId() );
         sit1.setCookieToken("CaptainCookie");
-        assertEquals(sit1.getCookieToken(), "CaptainCookie");
+        assertEquals("CaptainCookie", sit1.getCookieToken());
 
         TokenManager.getInstance().logout("HUGO1");
-        assertEquals(regMap.size(), 2);
+        assertEquals(2, regMap.size());
         TokenManager.getInstance().logout( "FAKE");
-        assertEquals(regMap.size(), 2);
+        assertEquals(2, regMap.size());
 
 
         // session out of time

diff --git a/src/test/java/org/eclipse/openk/portal/exceptions/PortalExceptionsTest.java b/src/test/java/org/eclipse/openk/portal/exceptions/PortalExceptionsTest.java
index ef2b754..5cdf190 100644
--- a/src/test/java/org/eclipse/openk/portal/exceptions/PortalExceptionsTest.java
+++ b/src/test/java/org/eclipse/openk/portal/exceptions/PortalExceptionsTest.java

@@ -20,11 +20,11 @@
 
     @Test
     public void testConstructors() {
-        assertEquals(new PortalBadRequest().getHttpStatus(), Globals.HTTPSTATUS_BAD_REQUEST);
-        assertEquals(new PortalForbidden().getHttpStatus(), Globals.HTTPSTATUS_FORBIDDEN);
-        assertEquals(new PortalInternalServerError(null, null).getHttpStatus(), Globals.HTTPSTATUS_INTERNAL_SERVER_ERROR);
-        assertEquals(new PortalNotFound().getHttpStatus(), Globals.HTTPSTATUS_NOT_FOUND);
-        assertEquals(new PortalUnauthorized().getHttpStatus(), Globals.HTTPSTATUS_UNAUTHORIZED);
+        assertEquals(Globals.HTTPSTATUS_BAD_REQUEST, new PortalBadRequest().getHttpStatus() );
+        assertEquals(Globals.HTTPSTATUS_FORBIDDEN, new PortalForbidden().getHttpStatus());
+        assertEquals(Globals.HTTPSTATUS_INTERNAL_SERVER_ERROR, new PortalInternalServerError(null, null).getHttpStatus());
+        assertEquals(Globals.HTTPSTATUS_NOT_FOUND, new PortalNotFound().getHttpStatus());
+        assertEquals(Globals.HTTPSTATUS_UNAUTHORIZED, new PortalUnauthorized().getHttpStatus());
     }
 
 

diff --git a/src/test/java/org/eclipse/openk/portal/viewmodel/ErrorReturnTest.java b/src/test/java/org/eclipse/openk/portal/viewmodel/ErrorReturnTest.java
index 09bee1f..b4ba312 100644
--- a/src/test/java/org/eclipse/openk/portal/viewmodel/ErrorReturnTest.java
+++ b/src/test/java/org/eclipse/openk/portal/viewmodel/ErrorReturnTest.java

@@ -28,7 +28,7 @@
 		String json = super.loadStringFromResource("testErrorReturn.json");
 		ErrorReturn errRet = getGson().fromJson(json, ErrorReturn.class);
 		assertFalse(errRet.getErrorText().isEmpty());
-		assertEquals(errRet.getErrorCode(), 999);
+		assertEquals(999, errRet.getErrorCode());
 	}
 
 	@Test

diff --git a/src/test/java/org/eclipse/openk/portal/viewmodel/GeneralReturnItemTest.java b/src/test/java/org/eclipse/openk/portal/viewmodel/GeneralReturnItemTest.java
index 19516de..217cd7d 100644
--- a/src/test/java/org/eclipse/openk/portal/viewmodel/GeneralReturnItemTest.java
+++ b/src/test/java/org/eclipse/openk/portal/viewmodel/GeneralReturnItemTest.java

@@ -27,7 +27,7 @@
 	public void TestStructureAgainstJson() {
 		String json = super.loadStringFromResource("testGeneralReturnItem.json");
 		GeneralReturnItem gRRet = JsonGeneratorBase.getGson().fromJson(json, GeneralReturnItem.class);
-		assertEquals(gRRet.getRet(), "It works!");
+		assertEquals("It works!", gRRet.getRet());
 	}
 
 	@Test

diff --git a/src/test/java/org/eclipse/openk/portal/viewmodel/LoginCredentialsTest.java b/src/test/java/org/eclipse/openk/portal/viewmodel/LoginCredentialsTest.java
index 46d132a..d6ad438 100644
--- a/src/test/java/org/eclipse/openk/portal/viewmodel/LoginCredentialsTest.java
+++ b/src/test/java/org/eclipse/openk/portal/viewmodel/LoginCredentialsTest.java

@@ -24,8 +24,8 @@
 	public void testStructureAgainstJson() {
 		String json = super.loadStringFromResource("testLoginCredentials.json");
 		LoginCredentials lc = JsonGeneratorBase.getGson().fromJson(json, LoginCredentials.class);
-		assertEquals(lc.getUserName(), "Carlo");
-		assertEquals(lc.getPassword(), "Cottura");
+		assertEquals("Carlo", lc.getUserName() );
+		assertEquals("Cottura", lc.getPassword());
 	}
 
 	@Test

diff --git a/src/test/java/org/eclipse/openk/portal/viewmodel/UserModuleTest.java b/src/test/java/org/eclipse/openk/portal/viewmodel/UserModuleTest.java
index ea6b126..ead9bd4 100644
--- a/src/test/java/org/eclipse/openk/portal/viewmodel/UserModuleTest.java
+++ b/src/test/java/org/eclipse/openk/portal/viewmodel/UserModuleTest.java

@@ -20,17 +20,17 @@
     @Test
     public void testModuleConfigProduction() {
         UserModule[] um = UserModule.getInstance();
-        assertEquals( um[0].getModuleName(), "Betriebstagebuch");
-        assertEquals( um[0].getColor(), "#ffffff");
-        assertEquals( (long)um[0].getCols(), 1);
-        assertEquals( (long)um[0].getRows(), 1);
-        assertEquals( um[0].getLink(), "http://localhost:4200/");
-        assertEquals( um[0].getPictureLink(), "https://www.openkonsequenz.de/medien/cache/main_image/m_logbuch_2443636.jpg");
-        assertEquals( um[0].getRequiredRole(), "elogbook-access");
+        assertEquals( "Betriebstagebuch", um[0].getModuleName() );
+        assertEquals( "#ffffff", um[0].getColor() );
+        assertEquals( 1, (long)um[0].getCols() );
+        assertEquals( 1, (long)um[0].getRows() );
+        assertEquals( "http://localhost:4200/", um[0].getLink() );
+        assertEquals( "https://www.openkonsequenz.de/medien/cache/main_image/m_logbuch_2443636.jpg", um[0].getPictureLink() );
+        assertEquals( "elogbook-access", um[0].getRequiredRole() );
 
-        assertEquals( UserModule.getConfigFileName(), "moduleConfigDevLocal.json");
+        assertEquals( "moduleConfigDevLocal.json", UserModule.getConfigFileName());
         UserModule.setConfigFileName("moduleConfigDevLocal.json");
-        assertEquals( UserModule.getConfigFileName(), "moduleConfigDevLocal.json");
+        assertEquals( "moduleConfigDevLocal.json", UserModule.getConfigFileName() );
     }
 
 }