X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fservice%2FUserService.java;h=cfe50c95f3b06cd95d4cb577d3fbf3f73b738a0b;hb=054f1d1e13b4a7f0dc3a84d4c282019a3c528043;hp=996116090c61856d08424ae7a0479fdae837857d;hpb=b0ff445fb7b53db882997ec0fd0e843b5c92a413;p=clamp.git

diff --git a/src/main/java/org/onap/clamp/clds/service/UserService.java b/src/main/java/org/onap/clamp/clds/service/UserService.java
index 99611609..cfe50c95 100644
--- a/src/main/java/org/onap/clamp/clds/service/UserService.java
+++ b/src/main/java/org/onap/clamp/clds/service/UserService.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
@@ -22,28 +22,20 @@
 
 package org.onap.clamp.clds.service;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.SecurityContext;
 
-import org.springframework.stereotype.Component;
+
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Controller;
 
 /**
  * User service used for authorization verification at the login page. Do not
  * remove this class.
  */
-@Component
-@Path("/user")
-@Produces({
-        MediaType.TEXT_PLAIN
-})
+@Controller
 public class UserService {
-    @Context
-    private SecurityContext           securityContext;
+
+    private SecurityContext           securityContext= SecurityContextHolder.getContext();
 
     /**
      * REST service that returns the username.
@@ -51,12 +43,7 @@ public class UserService {
      * @param userName
      * @return the user name
      */
-    @GET
-    @Path("/getUser")
-    @Produces(MediaType.TEXT_PLAIN)
     public String getUser() {
-        UserNameHandler    userNameHandler = new DefaultUserNameHandler();
-        String userName = userNameHandler.retrieveUserName(securityContext);
-        return userName;
+        return new DefaultUserNameHandler().retrieveUserName(securityContext);
     }
 }
\ No newline at end of file