Upgrade spring/camel versions

[clamp.git] / src / main / java / org / onap / clamp / clds / service / DefaultUserNameHandler.java

diff --git a/src/main/java/org/onap/clamp/clds/service/DefaultUserNameHandler.java b/src/main/java/org/onap/clamp/clds/service/DefaultUserNameHandler.java
index 44372b6..543dd4a 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/service/DefaultUserNameHandler.java
+++ b/src/main/java/org/onap/clamp/clds/service/DefaultUserNameHandler.java
@@ -5,40 +5,39 @@
  * Copyright (C) 2017 AT&T Intellectual Property. All rights\r
  *                             reserved.\r
  * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License"); \r
- * you may not use this file except in compliance with the License. \r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
- * \r
+ *\r
  * http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software \r
- * distributed under the License is distributed on an "AS IS" BASIS, \r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. \r
- * See the License for the specific language governing permissions and \r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  * ============LICENSE_END============================================\r
  * ===================================================================\r
- * \r
+ *\r
  */\r
 \r
 package org.onap.clamp.clds.service;\r
 \r
-import java.security.Principal;\r
+import org.springframework.security.core.context.SecurityContext;\r
+import org.springframework.security.core.userdetails.UserDetails;\r
+\r
 \r
-import javax.ws.rs.core.SecurityContext;\r
 \r
 public class DefaultUserNameHandler implements UserNameHandler {\r
 \r
     /*\r
      * (non-Javadoc)\r
-     * \r
+     *\r
      * @see\r
-     * org.onap.clamp.clds.service.PrincipalNameHandler#handleName(javax.ws.rs.\r
-     * core.SecurityContext)\r
+     * org.onap.clamp.clds.service.PrincipalNameHandler#handleName(SecurityContext)\r
      */\r
     @Override\r
     public String retrieveUserName(SecurityContext securityContext) {\r
-        Principal p = securityContext.getUserPrincipal();\r
-        return (p == null ? "Not found" : p.getName());\r
+        return ((UserDetails)securityContext.getAuthentication().getPrincipal()).getUsername();\r
     }\r
 }\r