Merge branch 'DEVELOP_BE'
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 d065931..0830a09 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
@@ -140,7 +140,7 @@
// decode
byte[] decoded = Base64Url.decode(jwtPayload);
jwtPayload = new String(decoded, StandardCharsets.UTF_8);
- logger.info(jwtPayload);
+ logger.debug(jwtPayload);
return getJwtPayloadFromJson(jwtPayload);
}
@@ -169,7 +169,7 @@
con.setRequestProperty("Authorization", "Bearer " + token);
}
InputStream is = con.getInputStream();
- try (BufferedReader rd = new BufferedReader(new InputStreamReader(is, "UTF-8"))) {
+ try (BufferedReader rd = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
String line;
while ((line = rd.readLine()) != null) {
response.append(line);
diff --git a/src/main/java/org/eclipse/openk/portal/common/InitUserCacheJob.java b/src/main/java/org/eclipse/openk/portal/common/InitUserCacheJob.java
index a735bda..0d9be8f 100644
--- a/src/main/java/org/eclipse/openk/portal/common/InitUserCacheJob.java
+++ b/src/main/java/org/eclipse/openk/portal/common/InitUserCacheJob.java
@@ -26,7 +26,7 @@
@Override
public void init() throws ServletException {
- LOGGER.info("InitUserCacheJob called");
+ LOGGER.debug("InitUserCacheJob called");
TimerTask timerTask = new UserCacheTimerTask();
Timer timer = new Timer();
timer.scheduleAtFixedRate(timerTask, 500, BackendConfig.getInstance().getReloadUsersInSec()*1000L);
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 495bd77..0ad7143 100644
--- a/src/main/java/org/eclipse/openk/portal/controller/BackendController.java
+++ b/src/main/java/org/eclipse/openk/portal/controller/BackendController.java
@@ -54,7 +54,7 @@
public JwtToken authenticate(String credentials) throws PortalException {
- LOGGER.info("authenticate() is called");
+ LOGGER.debug("authenticate() is called");
// valuator will throw an exception if not valid
inputDataValuator.checkCredentials(credentials);
@@ -73,23 +73,23 @@
throw new PortalUnauthorized("Unknown User/Password");
}
- LOGGER.info("authenticate() succeeded.");
+ LOGGER.debug("authenticate() succeeded.");
return token;
}
public VersionInfo getVersionInfo() {
- LOGGER.info("getVersionInfo() is called");
+ LOGGER.debug("getVersionInfo() is called");
String version = getClass().getPackage().getImplementationVersion();
VersionInfo vi = new VersionInfo();
vi.setBackendVersion(version);
- LOGGER.info("getVersionInfo() is finished");
+ LOGGER.debug("getVersionInfo() is finished");
return vi;
}
public List<UserModule> getUserModuleList() {
- LOGGER.info("getUserModuleList() is called");
+ LOGGER.debug("getUserModuleList() is called");
List<UserModule> umList = new ArrayList<>();
for (int i=0; i<UserModule.getInstance().length; i++)
@@ -106,7 +106,7 @@
umList.add(um);
}
- LOGGER.info("getUserModuleList() is finished");
+ LOGGER.debug("getUserModuleList() is finished");
return umList;
}
diff --git a/src/main/java/org/eclipse/openk/portal/controller/BaseWebService.java b/src/main/java/org/eclipse/openk/portal/controller/BaseWebService.java
index 4121d6d..fc04dc4 100644
--- a/src/main/java/org/eclipse/openk/portal/controller/BaseWebService.java
+++ b/src/main/java/org/eclipse/openk/portal/controller/BaseWebService.java
@@ -65,7 +65,7 @@
return invokable.invoke();
} catch (PortalException bee) {
- logger.info("Caught BackendException: " + bee.getClass().getSimpleName());
+ logger.debug("Caught BackendException: " + bee.getClass().getSimpleName());
return Response.status(bee.getHttpStatus()).entity(PortalExceptionMapper.toJson(bee))
.build();
diff --git a/src/main/java/org/eclipse/openk/portal/controller/TokenManager.java b/src/main/java/org/eclipse/openk/portal/controller/TokenManager.java
index 17d33d2..f38e01c 100644
--- a/src/main/java/org/eclipse/openk/portal/controller/TokenManager.java
+++ b/src/main/java/org/eclipse/openk/portal/controller/TokenManager.java
@@ -125,10 +125,10 @@
if (sitem != null) {
JwtPayload payLoad = JwtHelper.getPayLoad(sitem.getJwtToken());
String user = (payLoad != null ? payLoad.getPreferredUsername() : null);
- LOGGER.info("Session expired for User " + user);
+ LOGGER.debug("Session expired for User " + user);
}
registry.remove(token); // we're done
- LOGGER.info("Invalid Token: " + token);
+ LOGGER.debug("Invalid Token: " + token);
throw new PortalUnauthorized("Invalid Token");
}
