Divide the MSB source codes into two repos

[msb/apigateway.git] / apiroute / apiroute-service / src / main / java / org / onap / msb / apiroute / resources / CustomRouteResource.java

diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/CustomRouteResource.java b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/resources/CustomRouteResource.java
similarity index 66%
rename from msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/CustomRouteResource.java
rename to apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/resources/CustomRouteResource.java
index 01a4291..92b3408 100644 (file)
--- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/resources/CustomRouteResource.java
+++ b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/resources/CustomRouteResource.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 ZTE Corporation.
+ * Copyright 2016 ZTE, Inc. and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.msb.resources;
+package org.onap.msb.apiroute.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -22,8 +22,10 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 
 import java.net.URI;
+import java.util.List;
 
 import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
@@ -36,8 +38,8 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.http.HttpStatus;
-import org.openo.msb.api.CustomRouteInfo;
-import org.openo.msb.wrapper.CustomRouteServiceWrapper;
+import org.onap.msb.apiroute.api.CustomRouteInfo;
+import org.onap.msb.apiroute.wrapper.CustomRouteServiceWrapper;
 
 import com.codahale.metrics.annotation.Timed;
 
@@ -55,25 +57,24 @@ public class CustomRouteResource {
     @ApiResponses(value = {@ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = "get CustomRouteInfo List  fail", response = String.class)})
        @Produces(MediaType.APPLICATION_JSON)
        @Timed
-       public CustomRouteInfo[] getCustomRoutes() {
-               return CustomRouteServiceWrapper.getInstance().getAllCustomRouteInstances();
+       public List<CustomRouteInfo> getCustomRoutes(@ApiParam(value = "Route Way", required = false) @QueryParam("routeWay") @DefaultValue("ip")String routeWay) {
+               return CustomRouteServiceWrapper.getInstance().getAllCustomRouteInstances(routeWay);
        }
        
        @POST
        @Path("/instance")
        @ApiOperation(value = "add one CustomRoute ", code = HttpStatus.SC_CREATED,response = CustomRouteInfo.class)
        @ApiResponses(value = {
-                              @ApiResponse(code = HttpStatus.SC_UNSUPPORTED_MEDIA_TYPE, message = "Unprocessable CustomRouteInfo Entity ", response = String.class),
+                              @ApiResponse(code = HttpStatus.SC_UNPROCESSABLE_ENTITY, message = "Unprocessable CustomRouteInfo Entity ", response = String.class),
                               @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = "add CustomRouteInfo fail", response = String.class),
                               @ApiResponse(code = HttpStatus.SC_BAD_REQUEST, message = "Unprocessable CustomRouteInfo JSON REQUEST", response = String.class)})
        @Produces(MediaType.APPLICATION_JSON)
        @Timed
        public Response addCustomRoute(
-                       @ApiParam(value = "CustomRoute Instance Info", required = true) CustomRouteInfo customRouteInfo) {
-           CustomRouteInfo new_customRouteInfo = CustomRouteServiceWrapper.getInstance().saveCustomRouteInstance(customRouteInfo,"");
-           URI returnURI =
-                uriInfo.getAbsolutePathBuilder()
-                        .path("/instance?serviceName=" + new_customRouteInfo.getServiceName()).build();
+                       @ApiParam(value = "CustomRoute Instance Info", required = true) CustomRouteInfo customRouteInfo,
+                       @ApiParam(value = "Route Way", required = false) @QueryParam("routeWay") @DefaultValue("ip")String routeWay) {
+           CustomRouteInfo new_customRouteInfo = CustomRouteServiceWrapper.getInstance().saveCustomRouteInstance4Rest(customRouteInfo,routeWay);
+           URI returnURI =uriInfo.getAbsolutePathBuilder().path("/instance?serviceName=" + new_customRouteInfo.getServiceName()).build();
         return Response.created(returnURI).entity(new_customRouteInfo).build();
 
        }
@@ -83,15 +84,18 @@ public class CustomRouteResource {
        @ApiOperation(value = "get one CustomRoute ",code = HttpStatus.SC_OK,  response = CustomRouteInfo.class)
        @ApiResponses(value = {
                                @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = "CustomRoute not found", response = String.class),
-                               @ApiResponse(code = HttpStatus.SC_UNSUPPORTED_MEDIA_TYPE, message = "Unprocessable CustomRoute Entity ", response = String.class),
+                               @ApiResponse(code = HttpStatus.SC_UNPROCESSABLE_ENTITY, message = "Unprocessable CustomRoute Entity ", response = String.class),
                                @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = "get CustomRoute fail", response = String.class)})
        @Produces(MediaType.APPLICATION_JSON)
        @Timed
        public CustomRouteInfo getCustomRoute(
-                       @ApiParam(value = "CustomRoute serviceName", required = false) @QueryParam("serviceName") String serviceName) {
+                       @ApiParam(value = "CustomRoute serviceName", required = false) @QueryParam("serviceName") String serviceName,
+                       @ApiParam(value = "CustomRoute host", required = false) @QueryParam("host") String host,
+                       @ApiParam(value = "CustomRoute Publish port", required = false) @QueryParam("publish_port") @DefaultValue("")String publish_port,
+                       @ApiParam(value = "Route Way", required = false) @QueryParam("routeWay") @DefaultValue("ip")String routeWay) {
            
         
-               return CustomRouteServiceWrapper.getInstance().getCustomRouteInstance(serviceName);
+               return CustomRouteServiceWrapper.getInstance().getCustomRouteInstance(serviceName,host,publish_port,routeWay);
 
        }
        
@@ -99,16 +103,18 @@ public class CustomRouteResource {
        @Path("/instance")
        @ApiOperation(value = "update one CustomRoute by serviceName",  code = HttpStatus.SC_CREATED,response = CustomRouteInfo.class)
        @ApiResponses(value = {
-                              @ApiResponse(code = HttpStatus.SC_UNSUPPORTED_MEDIA_TYPE, message = "Unprocessable CustomRoute Entity ", response = String.class),
+                              @ApiResponse(code = HttpStatus.SC_UNPROCESSABLE_ENTITY, message = "Unprocessable CustomRoute Entity ", response = String.class),
                               @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = "update CustomRoute fail", response = String.class),
                               @ApiResponse(code = HttpStatus.SC_BAD_REQUEST, message = "Unprocessable CustomRoute JSON REQUEST", response = String.class)})
        @Produces(MediaType.APPLICATION_JSON)
        @Timed
        public Response updateCustomRoute(
                        @ApiParam(value = "CustomRoute serviceName", required = true) @QueryParam("serviceName") String serviceName,
-                       @ApiParam(value = "CustomRoute Instance Info", required = true) CustomRouteInfo customRoute) {
+                       @ApiParam(value = "CustomRoute Instance Info", required = true) CustomRouteInfo customRoute,
+                       @ApiParam(value = "Route Way", required = false) @QueryParam("routeWay") @DefaultValue("ip")String routeWay
+                       ) {
 
-           CustomRouteInfo new_customRouteInfo= CustomRouteServiceWrapper.getInstance().updateCustomRouteInstance(serviceName,customRoute,"");
+           CustomRouteInfo new_customRouteInfo= CustomRouteServiceWrapper.getInstance().saveCustomRouteInstance4Rest(customRoute,routeWay);
 
         return Response.created(uriInfo.getAbsolutePathBuilder().build()).entity(new_customRouteInfo).build();
 
@@ -124,9 +130,12 @@ public class CustomRouteResource {
        @Produces(MediaType.APPLICATION_JSON)
        @Timed
        public void deleteCustomRoute(
-                       @ApiParam(value = "CustomRoute serviceName", required = true) @QueryParam("serviceName") String serviceName) {
+                       @ApiParam(value = "CustomRoute serviceName", required = true) @QueryParam("serviceName") String serviceName,
+                       @ApiParam(value = "CustomRoute host", required = false) @QueryParam("host") String host,
+                       @ApiParam(value = "CustomRoute Publish port", required = false) @QueryParam("publish_port") @DefaultValue("")String publish_port,
+                       @ApiParam(value = "Route Way", required = false) @QueryParam("routeWay") @DefaultValue("ip")String routeWay) {
 
-                CustomRouteServiceWrapper.getInstance().deleteCustomRoute(serviceName,"*","");
+                CustomRouteServiceWrapper.getInstance().deleteCustomRoute(serviceName,host,publish_port,routeWay);
 
        }
        
@@ -134,16 +143,19 @@ public class CustomRouteResource {
        @Path("/status")
        @ApiOperation(value = "update one CustomRoute  status by serviceName ",code = HttpStatus.SC_CREATED, response = CustomRouteInfo.class)
     @ApiResponses(value = {
-                               @ApiResponse(code = HttpStatus.SC_UNSUPPORTED_MEDIA_TYPE, message = "Unprocessable customRoute Entity ", response = String.class),
+                               @ApiResponse(code = HttpStatus.SC_UNPROCESSABLE_ENTITY, message = "Unprocessable customRoute Entity ", response = String.class),
                                @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = "customRoute not found", response = String.class),
                                @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = "update status fail", response = String.class)})
        @Produces(MediaType.APPLICATION_JSON)
        @Timed
        public Response updateCustomRouteStatus(
                        @ApiParam(value = "CustomRoute serviceName", required = true) @QueryParam("serviceName") String serviceName,
-                       @ApiParam(value = "CustomRoute status,1：abled  0：disabled", required = true)  @QueryParam("status") String status) {
+                       @ApiParam(value = "CustomRoute host", required = false) @QueryParam("host") String host,
+                       @ApiParam(value = "CustomRoute status,1：abled  0：disabled", required = true)  @QueryParam("status") String status,
+                       @ApiParam(value = "CustomRoute Publish port", required = false) @QueryParam("publish_port") @DefaultValue("")String publish_port,
+                       @ApiParam(value = "Route Way", required = false) @QueryParam("routeWay") @DefaultValue("ip")String routeWay) {
 
-           CustomRouteInfo new_customRouteInfo = CustomRouteServiceWrapper.getInstance().updateCustomRouteStatus(serviceName,status);
+           CustomRouteInfo new_customRouteInfo = CustomRouteServiceWrapper.getInstance().updateCustomRouteStatus(serviceName,host,publish_port,status,routeWay);
         return Response.created(uriInfo.getAbsolutePathBuilder().build()).entity(new_customRouteInfo).build();