Merge "Fix 3gppservices URI path"

1 files changed, 9 insertions, 9 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java
index 3f05c79dad..b1486c9686 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java
@@ -88,9 +88,9 @@ import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.client.RequestsDbClient;
 
 @Component
-@Path("/onap/so/infra/onap3gppServiceInstances")
-@OpenAPIDefinition(info = @Info(title = "/onap/so/infra/onap3gppServiceInstances",
-        description = "API Requests for 3GPP Service Instances"))
+@Path("/onap/so/infra/3gppservices")
+@OpenAPIDefinition(
+        info = @Info(title = "/onap/so/infra/3gppservices", description = "API Requests for 3GPP Service Instances"))
 public class Onap3gppServiceInstances {
 
     private static final Logger logger = LoggerFactory.getLogger(Onap3gppServiceInstances.class);
@@ -101,7 +101,7 @@ public class Onap3gppServiceInstances {
 
     private static final String SAVE_TO_DB = "save instance to db";
 
-    private static String uriPrefix = "/onap3gppServiceInstances/";
+    private static final String URI_PREFIX = "/3gppservices/";
 
     @Autowired
     private MsoRequest msoRequest;
@@ -140,7 +140,7 @@ public class Onap3gppServiceInstances {
             @Context ContainerRequestContext requestContext) throws ApiException {
         String requestId = requestHandlerUtils.getRequestId(requestContext);
         return processServiceInstanceRequest(request, Action.createInstance, version, requestId, null,
-                requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
+                requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX));
     }
 
     /**
@@ -161,7 +161,7 @@ public class Onap3gppServiceInstances {
         HashMap<String, String> instanceIdMap = new HashMap<>();
         instanceIdMap.put("serviceInstanceId", request.getServiceInstanceID());
         return updateServiceInstances(request, Action.updateInstance, version, requestId, instanceIdMap,
-                requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
+                requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX));
     }
 
     /**
@@ -183,7 +183,7 @@ public class Onap3gppServiceInstances {
         HashMap<String, String> instanceIdMap = new HashMap<>();
         instanceIdMap.put("serviceInstanceId", request.getServiceInstanceID());
         return deleteServiceInstances(request, Action.deleteInstance, version, requestId, instanceIdMap,
-                requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
+                requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX));
     }
 
     /**
@@ -204,7 +204,7 @@ public class Onap3gppServiceInstances {
         HashMap<String, String> instanceIdMap = new HashMap<>();
         instanceIdMap.put("serviceInstanceId", request.getServiceInstanceID());
         return activateOrDeactivateServiceInstances(request, Action.activateInstance, version, requestId, instanceIdMap,
-                requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
+                requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX));
     }
 
     /**
@@ -225,7 +225,7 @@ public class Onap3gppServiceInstances {
         HashMap<String, String> instanceIdMap = new HashMap<>();
         instanceIdMap.put("serviceInstanceId", request.getServiceInstanceID());
         return activateOrDeactivateServiceInstances(request, Action.deactivateInstance, version, requestId,
-                instanceIdMap, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
+                instanceIdMap, requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX));
     }
 
     /**