summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-02-06 17:46:51 +0100
committerDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-02-06 17:46:51 +0100
commitb7d54e6134baafeba6b6b3c8aea97cdca25cd761 (patch)
tree7b655810e0a570cffe174c913cd014d8870eed89 /src/main
parenteed0dbe9d65cf5c1bbdeb7728008facb09e9902b (diff)
Merge UserService into one.
Merge userService and UserServceImpl into one single class. Issue-ID: CLAMP-74 Change-Id: I3c8b710808bbd85730aec8b3e96c98173740150e Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/onap/clamp/clds/service/UserService.java17
-rw-r--r--src/main/java/org/onap/clamp/clds/service/UserServiceImpl.java46
2 files changed, 10 insertions, 53 deletions
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 6f3e480ad..507db7b4f 100644
--- a/src/main/java/org/onap/clamp/clds/service/UserService.java
+++ b/src/main/java/org/onap/clamp/clds/service/UserService.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP CLAMP
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,16 +29,18 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-import io.swagger.annotations.Api;
+import org.springframework.stereotype.Component;
/**
* User service used for authorization verification at the login page. Do not
* remove this class.
*/
-@Api(value = "/user")
+@Component
@Path("/user")
-@Produces({ MediaType.TEXT_PLAIN })
-public interface UserService {
+@Produces({
+ MediaType.TEXT_PLAIN
+})
+public class UserService {
/**
* REST service that returns the username.
@@ -49,6 +51,7 @@ public interface UserService {
@GET
@Path("/{userName}")
@Produces(MediaType.TEXT_PLAIN)
- String getUser(@PathParam("userName") String userName);
-
+ public String getUser(@PathParam("userName") String userName) {
+ return userName;
+ }
} \ No newline at end of file
diff --git a/src/main/java/org/onap/clamp/clds/service/UserServiceImpl.java b/src/main/java/org/onap/clamp/clds/service/UserServiceImpl.java
deleted file mode 100644
index 7d0fda0a1..000000000
--- a/src/main/java/org/onap/clamp/clds/service/UserServiceImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 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.
- * 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
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- */
-
-package org.onap.clamp.clds.service;
-
-import com.att.ajsc.common.AjscService;
-
-/**
- * User service used for authorization verification at the login page. Do not
- * remove this class.
- */
-@AjscService
-public class UserServiceImpl implements UserService {
-
- /**
- * REST service that returns the username.
- *
- * @param userName
- * @return the user name
- */
- @Override
- public String getUser(String userName) {
- return userName;
- }
-
-} \ No newline at end of file