From b7d54e6134baafeba6b6b3c8aea97cdca25cd761 Mon Sep 17 00:00:00 2001
From: "Determe, Sebastien (sd378r)" <sd378r@intl.att.com>
Date: Tue, 6 Feb 2018 17:46:51 +0100
Subject: 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>
---
 .../org/onap/clamp/clds/service/UserService.java   | 17 ++++----
 .../onap/clamp/clds/service/UserServiceImpl.java   | 46 ----------------------
 2 files changed, 10 insertions(+), 53 deletions(-)
 delete mode 100644 src/main/java/org/onap/clamp/clds/service/UserServiceImpl.java

(limited to 'src/main/java')

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
-- 
cgit 1.2.3-korg