V2.0.0 Documentation updated (KSM-Modul-Konfig) in doku.
diff --git a/src/main/java/org/eclipse/openk/elogbook/common/mapper/ResponsibilityMapper.java b/src/main/java/org/eclipse/openk/elogbook/common/mapper/ResponsibilityMapper.java
index 8ebfb2a..af40cb8 100644
--- a/src/main/java/org/eclipse/openk/elogbook/common/mapper/ResponsibilityMapper.java
+++ b/src/main/java/org/eclipse/openk/elogbook/common/mapper/ResponsibilityMapper.java
@@ -11,11 +11,6 @@
*/
package org.eclipse.openk.elogbook.common.mapper;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
import org.apache.log4j.Logger;
import org.eclipse.openk.elogbook.common.Globals;
import org.eclipse.openk.elogbook.exceptions.BtbGone;
@@ -23,14 +18,17 @@
import org.eclipse.openk.elogbook.viewmodel.Responsibility;
import org.eclipse.openk.elogbook.viewmodel.TerritoryResponsibility;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
public class ResponsibilityMapper {
private static final Logger LOGGER = Logger.getLogger(ResponsibilityMapper.class.getName());
public enum PROCESS_MODE {PLAN, CONFIRM, FETCH}
- public ResponsibilityMapper() { }
-
-
public Responsibility mapToVModelForContainer(TblResponsibility tblResponsibility) {
Responsibility responsibility = new Responsibility();
diff --git a/src/main/java/org/eclipse/openk/elogbook/controller/BackendControllerNotificationFile.java b/src/main/java/org/eclipse/openk/elogbook/controller/BackendControllerNotificationFile.java
index 00f2a35..daab585 100644
--- a/src/main/java/org/eclipse/openk/elogbook/controller/BackendControllerNotificationFile.java
+++ b/src/main/java/org/eclipse/openk/elogbook/controller/BackendControllerNotificationFile.java
@@ -11,9 +11,14 @@
*/
package org.eclipse.openk.elogbook.controller;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.log4j.Logger;
+import org.eclipse.openk.elogbook.common.BackendConfig;
+import org.eclipse.openk.elogbook.exceptions.BtbInternalServerError;
+import org.eclipse.openk.elogbook.viewmodel.NotificationFile;
+
import java.io.File;
import java.io.IOException;
-import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -23,11 +28,6 @@
import java.nio.file.attribute.UserPrincipal;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.log4j.Logger;
-import org.eclipse.openk.elogbook.common.BackendConfig;
-import org.eclipse.openk.elogbook.exceptions.BtbInternalServerError;
-import org.eclipse.openk.elogbook.viewmodel.NotificationFile;
public class BackendControllerNotificationFile {
@@ -113,7 +113,7 @@
throws IOException {
if (listOfFiles != null) {
- //TODO 17.01.2019 "Leitsystem" is beeing updated and we are waiting for more information to continue here and adjust the import process
+ // 17.01.2019 "Leitsystem" is beeing updated and we are waiting for more information to continue here and adjust the import process
// see also BackendControllerNotificationFile_ImportFilenameAdjusted (reiss)
for (File file : listOfFiles) {
diff --git a/src/main/java/org/eclipse/openk/elogbook/controller/BackendControllerUser.java b/src/main/java/org/eclipse/openk/elogbook/controller/BackendControllerUser.java
index 8686316..8820ce3 100644
--- a/src/main/java/org/eclipse/openk/elogbook/controller/BackendControllerUser.java
+++ b/src/main/java/org/eclipse/openk/elogbook/controller/BackendControllerUser.java
@@ -94,7 +94,6 @@
public void sentTestMail() throws BtbException {
LOGGER.debug("sentTestMail() is called");
- //EmailService.getInstance().senTestMail();
EmailService.getInstance().sendPresenceCheckReminderMail();
LOGGER.debug("sentTestMail() is finished");
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/controller/ControllerImplementations.java b/src/main/java/org/eclipse/openk/elogbook/controller/ControllerImplementations.java
index 32c9882..5070e94 100644
--- a/src/main/java/org/eclipse/openk/elogbook/controller/ControllerImplementations.java
+++ b/src/main/java/org/eclipse/openk/elogbook/controller/ControllerImplementations.java
@@ -573,7 +573,6 @@
@Override
public Response invoke() throws BtbException {
-// List<String> userSuggestionsList = backendControllerUser.getAssignedUserSuggestions();
List<String> userSuggestionsList = backendControllerUser.getUserSuggestionsFromContactdatabase(this.token);
return ResponseBuilderWrapper.INSTANCE
.buildOKResponse(JsonGeneratorBase.getGson().toJson(userSuggestionsList));
diff --git a/src/main/java/org/eclipse/openk/elogbook/controller/ResponseBuilderWrapper.java b/src/main/java/org/eclipse/openk/elogbook/controller/ResponseBuilderWrapper.java
index 1745e1e..46e5143 100644
--- a/src/main/java/org/eclipse/openk/elogbook/controller/ResponseBuilderWrapper.java
+++ b/src/main/java/org/eclipse/openk/elogbook/controller/ResponseBuilderWrapper.java
@@ -17,7 +17,7 @@
import org.eclipse.openk.elogbook.exceptions.BtbInternalServerError;
import javax.ws.rs.core.Response;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
public enum ResponseBuilderWrapper {
INSTANCE;
@@ -42,11 +42,7 @@
}
private byte[] jsonStringToBytes( String jsonString ) throws BtbInternalServerError {
- try {
- return jsonString.getBytes("UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new BtbInternalServerError("Unexpected Error", e);
- }
+ return jsonString.getBytes(StandardCharsets.UTF_8);
}
public Response buildOKResponse(String jsonString) throws BtbException {
diff --git a/src/main/java/org/eclipse/openk/elogbook/controller/TokenManager.java b/src/main/java/org/eclipse/openk/elogbook/controller/TokenManager.java
index c62a51c..63f8fa7 100644
--- a/src/main/java/org/eclipse/openk/elogbook/controller/TokenManager.java
+++ b/src/main/java/org/eclipse/openk/elogbook/controller/TokenManager.java
@@ -50,11 +50,11 @@
if (jwtPayload != null && secureType == SecureType.NORMAL && !(jwtPayload.getRealmAccess()
.isInRole(Globals.KEYCLOAK_ROLE_NORMALUSER) || jwtPayload.getRealmAccess()
.isInRole(Globals.KEYCLOAK_ROLE_SUPERUSER))){
- LOGGER.warn("Security level not sufficent ");
+ LOGGER.warn("Security level not sufficent.");
throw new BtbForbidden("insufficent rights");
} else if (jwtPayload != null && secureType == BaseWebService.SecureType.HIGH &&
!jwtPayload.getRealmAccess().isInRole(Globals.KEYCLOAK_ROLE_SUPERUSER)){
- LOGGER.warn("Security level not sufficent ");
+ LOGGER.warn("Security level not sufficent!");
throw new BtbForbidden("insufficent rights");
}
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/email/Email.java b/src/main/java/org/eclipse/openk/elogbook/email/Email.java
index 68dd459..e8a145b 100644
--- a/src/main/java/org/eclipse/openk/elogbook/email/Email.java
+++ b/src/main/java/org/eclipse/openk/elogbook/email/Email.java
@@ -25,7 +25,6 @@
import jakarta.mail.internet.MimeMultipart;
import org.apache.log4j.Logger;
-import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
