1 files changed, 28 insertions, 3 deletions
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 2c88694c..2ea4ff24 100644
--- a/portal-BE/src/main/java/org/onap/portal/controller/LanguageController.java
+++ b/portal-BE/src/main/java/org/onap/portal/controller/LanguageController.java
@@ -40,15 +40,23 @@
 
 package org.onap.portal.controller;
 
+import java.security.Principal;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.onap.portal.aop.service.FnLanguageServiceAOP;
 import org.onap.portal.domain.db.fn.FnLanguage;
 import org.onap.portal.domain.db.fn.FnUser;
+import org.onap.portal.domain.dto.PortalRestResponse;
+import org.onap.portal.domain.dto.PortalRestStatusEnum;
 import org.onap.portal.service.fn.FnLanguageService;
 import org.onap.portal.service.fn.FnUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -57,6 +65,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/auxapi")
 public class LanguageController {
+       private static final Logger LOGGER = LoggerFactory.getLogger(LanguageController.class);
 
        private final FnLanguageService languageService;
        private final FnUserService fnUserService;
@@ -68,12 +77,12 @@ public class LanguageController {
               this.fnUserService = fnUserService;
        }
 
-       @RequestMapping(value = "/language",method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
+       @GetMapping(value = "/language", produces = "application/json;charset=UTF-8")
        public List<FnLanguage> getLanguageList() {
               return languageService.getLanguages();
        }
 
-       @RequestMapping(value = "/languageSetting/user/{loginId}",method = RequestMethod.POST)
+       @PostMapping(value = "/languageSetting/user/{loginId}")
        public void setUpUserLanguage(@RequestBody FnLanguage fnLanguage,
                @PathVariable("loginId") Long loginId) {
               if (fnUserService.getUser(loginId).isPresent()){
@@ -83,7 +92,7 @@ public class LanguageController {
               }
        }
 
-       @RequestMapping(value = "/languageSetting/user/{loginId}",method = RequestMethod.GET)
+       @GetMapping(value = "/languageSetting/user/{loginId}")
        public FnLanguage getUserLanguage(HttpServletRequest request, HttpServletResponse response,
                @PathVariable("loginId") Long loginId) {
               if (fnUserService.getUser(loginId).isPresent()){
@@ -93,4 +102,20 @@ public class LanguageController {
               return new FnLanguage();
        }
 
+       @PostMapping(value = "/language")
+       public PortalRestResponse<String> saveLanguage(final Principal principal, final FnLanguage fnLanguage){
+              PortalRestResponse<String> response = new PortalRestResponse<>();
+              try {
+                     response.setMessage("SUCCESS");
+                     response.setResponse(languageService.save(principal, fnLanguage).toString());
+                     response.setStatus(PortalRestStatusEnum.OK);
+              } catch (Exception e){
+                     response.setMessage("FAILURE");
+                     response.setResponse(e.getMessage());
+                     response.setStatus(PortalRestStatusEnum.ERROR);
+                     return response;
+              }
+              return response;
+       }
+
 }