xAdd application/component.

Change-Id: Ib60ef8f3e64aa03dfa49b7c542ac7bae1e25175f
Issue-ID: DCAEGEN2-879
Signed-off-by: Shadi Haidar <sh1986@att.com>
Signed-off-by: Haidar, Shadi (sh1986) <sh1986@att.com>

3 files changed, 46 insertions, 6 deletions

diff --git a/src/gen/java/io/swagger/api/DcaeServiceTypesApi.java b/src/gen/java/io/swagger/api/DcaeServiceTypesApi.java
index 72f1f63..5ff9eb3 100644
--- a/src/gen/java/io/swagger/api/DcaeServiceTypesApi.java
+++ b/src/gen/java/io/swagger/api/DcaeServiceTypesApi.java
@@ -45,7 +45,7 @@ public class DcaeServiceTypesApi {
 
     public static Link buildLinkForGet(UriInfo uriInfo, String rel, String typeName, Boolean onlyLatest, Boolean onlyActive,
                                        String vnfType, String serviceId, String serviceLocation, String asdcServiceId,
-                                       String asdcResourceId, Integer offset) {
+                                       String asdcResourceId, Integer offset, String application, String component, String owner) {
         UriBuilder ub = uriInfo.getBaseUriBuilder().path(DcaeServiceTypesApi.class)
                 .path(DcaeServiceTypesApi.class, "dcaeServiceTypesGet");
 
@@ -76,6 +76,15 @@ public class DcaeServiceTypesApi {
         if (offset != null) {
             ub.queryParam("offset", offset);
         }
+        if (application != null) {
+            ub.queryParam("application", application);
+        }
+        if (component != null) {
+            ub.queryParam("component", component);
+        }
+        if (owner != null) {
+            ub.queryParam("owner", owner);
+        }
 
         Link.Builder lb = Link.fromUri(ub.build());
         lb.rel(rel);
@@ -90,7 +99,7 @@ public class DcaeServiceTypesApi {
     @io.swagger.annotations.ApiResponses(value = {
             @io.swagger.annotations.ApiResponse(code = 200, message = "List of `DCAEServiceType` objects", response = InlineResponse200.class)})
     public Response dcaeServiceTypesGet(
-            @ApiParam(value = "Filter by service type name") @QueryParam("typeName") String typeName,
+            @ApiParam(value = "Filter by service type name. Wildcards matches with asterick(s) allowed.") @QueryParam("typeName") String typeName,
             @ApiParam(value = "If set to true, query returns just the latest versions of DCAE service types. If set to false, then all versions are returned. Default is true")
                 @DefaultValue("true") @QueryParam("onlyLatest") Boolean onlyLatest,
             @ApiParam(value = "If set to true, query returns only *active* DCAE service types. If set to false, then all DCAE service types are returned. Default is true")
@@ -106,10 +115,14 @@ public class DcaeServiceTypesApi {
             @ApiParam(value = "Filter by associated asdc design resource id. Setting this to `NONE` will return instances that have asdc resource id set to null")
                 @QueryParam("asdcResourceId") String asdcResourceId,
             @ApiParam(value = "Query resultset offset used for pagination (zero-based)") @QueryParam("offset") Integer offset,
-            @Context SecurityContext securityContext)
+            @Context SecurityContext securityContext,
+            @ApiParam(value = "Filter by associated application.") @QueryParam("application") String application,    
+            @ApiParam(value = "Filter by associated component or sub-application module.") @QueryParam("component") String component,    
+            @ApiParam(value = "Filter by associated owner.") @QueryParam("owner") String owner
+              )
             throws NotFoundException {
         return delegate.dcaeServiceTypesGet(typeName, onlyLatest, onlyActive, vnfType, serviceId, serviceLocation,
-                asdcServiceId, asdcResourceId, offset, uriInfo, securityContext);
+                asdcServiceId, asdcResourceId, offset, uriInfo, securityContext, application, component, owner);
     }
 
     public static Link buildLinkForGet(UriInfo uriInfo, String rel, String typeId) {
diff --git a/src/gen/java/io/swagger/api/DcaeServiceTypesApiService.java b/src/gen/java/io/swagger/api/DcaeServiceTypesApiService.java
index afc7476..ab2bc64 100644
--- a/src/gen/java/io/swagger/api/DcaeServiceTypesApiService.java
+++ b/src/gen/java/io/swagger/api/DcaeServiceTypesApiService.java
@@ -31,7 +31,8 @@ public abstract class DcaeServiceTypesApiService {
       public abstract Response dcaeServiceTypesGet(String typeName, Boolean onlyLatest, Boolean onlyActive,
                                                    String vnfType, String serviceId, String serviceLocation,
                                                    String asdcServiceId, String asdcResourceId,
-                                                   Integer offset, UriInfo uriInfo, SecurityContext securityContext)
+                                                   Integer offset, UriInfo uriInfo, SecurityContext securityContext, 
+                                                   String application, String component, String owner)
       throws NotFoundException;
       public abstract Response dcaeServiceTypesTypeIdGet(String typeId, UriInfo uriInfo, SecurityContext securityContext)
       throws NotFoundException;
diff --git a/src/gen/java/io/swagger/model/DCAEServiceTypeRequest.java b/src/gen/java/io/swagger/model/DCAEServiceTypeRequest.java
index 7cd3577..83b7949 100644
--- a/src/gen/java/io/swagger/model/DCAEServiceTypeRequest.java
+++ b/src/gen/java/io/swagger/model/DCAEServiceTypeRequest.java
@@ -53,6 +53,8 @@ public class DCAEServiceTypeRequest {
     private String asdcServiceId = null;
     private String asdcResourceId = null;
     private String asdcServiceURL = null;
+    private String application = null;
+    private String component = null;
 
 
     /**
@@ -72,6 +74,26 @@ public class DCAEServiceTypeRequest {
     public void setOwner(String owner) {
         this.owner = owner;
     }
+    
+    @ApiModelProperty(required = false, value = "Application associated or that added this DCAE service type.")
+    @JsonProperty("application")
+    public String getApplication() {
+        return application;
+    }
+
+    public void setApplication(String application) {
+        this.application = application;
+    }
+    
+    @ApiModelProperty(required = false, value = "Component or sub-application module associated or that added this DCAE service type.")
+    @JsonProperty("component")
+    public String getComponent() {
+        return component;
+    }
+
+    public void setComponent(String component) {
+        this.component = component;
+    }
 
 
     @ApiModelProperty(required = true, value = "Descriptive name for this DCAE service type")
@@ -192,13 +214,15 @@ public class DCAEServiceTypeRequest {
         }
         DCAEServiceTypeRequest dCAEServiceTypeRequest = (DCAEServiceTypeRequest) o;
         return Objects.equals(owner, dCAEServiceTypeRequest.owner) &&
+                Objects.equals(application, dCAEServiceTypeRequest.application) &&
+                Objects.equals(component, dCAEServiceTypeRequest.component) &&
                 Objects.equals(vnfTypes, dCAEServiceTypeRequest.vnfTypes) &&
                 Objects.equals(blueprintTemplate, dCAEServiceTypeRequest.blueprintTemplate);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(owner, vnfTypes, blueprintTemplate);
+        return Objects.hash(owner, application, component, vnfTypes, blueprintTemplate);
     }
 
     @Override
@@ -207,6 +231,8 @@ public class DCAEServiceTypeRequest {
         sb.append("class DCAEServiceTypeRequest {\n");
 
         sb.append("    owner: ").append(toIndentedString(owner)).append("\n");
+        sb.append("    application: ").append(toIndentedString(application)).append("\n");
+        sb.append("    component: ").append(toIndentedString(component)).append("\n");
         sb.append("    vnfTypes: ").append(toIndentedString(vnfTypes)).append("\n");
         sb.append("    blueprintTemplate: ").append(toIndentedString(blueprintTemplate)).append("\n");
         sb.append("}");