Merge "NonCentralizedAppException-junits"

[portal.git] / portal-BE / src / main / java / org / onap / portal / controller / LanguageController.java

diff --git a/portal-BE/src/main/java/org/onap/portal/controller/LanguageController.java b/portal-BE/src/main/java/org/onap/portal/controller/LanguageController.java
index 90ea068..28c21d3 100644 (file)
--- a/portal-BE/src/main/java/org/onap/portal/controller/LanguageController.java
+++ b/portal-BE/src/main/java/org/onap/portal/controller/LanguageController.java
@@ -50,8 +50,8 @@ import org.onap.portal.domain.dto.PortalRestStatusEnum;
 import org.onap.portal.domain.dto.fn.FnLanguageDto;
 import org.onap.portal.domain.mapper.FnLanguageMapper;
 import org.onap.portal.domain.mapper.FnUserMapper;
-import org.onap.portal.service.fn.FnLanguageService;
-import org.onap.portal.service.fn.FnUserService;
+import org.onap.portal.service.language.FnLanguageService;
+import org.onap.portal.service.user.FnUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -101,7 +101,7 @@ public class LanguageController {
                             @SuppressWarnings("OptionalGetWithoutIsPresent")
                             FnUser user = fnUserService.getUser(userId).get();
                             user.setLanguageId(fnLanguage);
-                            fnUserService.saveFnUser(principal, user);
+                            fnUserService.saveFnUser(user);
                             //response.setResponse(fnUserMapper.fnUserToFnUserDto(user).toString());
                             response.setMessage("SUCCESS");
                             response.setStatus(PortalRestStatusEnum.OK);
@@ -111,6 +111,7 @@ public class LanguageController {
                             response.setStatus(PortalRestStatusEnum.ERROR);
                      }
               } catch (Exception e) {
+                     LOGGER.error("Exception in setUpUserLanguage", e);
                      response.setMessage("FAILURE");
                      response.setResponse(e.toString());
                      response.setStatus(PortalRestStatusEnum.ERROR);
@@ -133,9 +134,10 @@ public class LanguageController {
               PortalRestResponse<String> response = new PortalRestResponse<>();
               try {
                      response.setMessage("SUCCESS");
-                     response.setResponse(languageService.save(principal, fnLanguage).toString());
+                     response.setResponse(languageService.save(fnLanguage).toString());
                      response.setStatus(PortalRestStatusEnum.OK);
               } catch (Exception e) {
+                     LOGGER.error("Exception in saveLanguage", e);
                      response.setMessage("FAILURE");
                      response.setResponse(e.getMessage());
                      response.setStatus(PortalRestStatusEnum.ERROR);