aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2023-02-14 10:49:22 +0000
committerGerrit Code Review <gerrit@onap.org>2023-02-14 10:49:22 +0000
commit019bfddd9eaf08cc840b421aaafc403628ba674a (patch)
tree815ab0a0281c71057f2dbf929c6621a3f66318a9
parentd33d06e04fbae06704f36b43b2f746421cd208d2 (diff)
parent80311ac0dedb0868d3837029c6e4b5fcb984efb2 (diff)
Merge "Remove annotations in models"
-rw-r--r--models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java7
-rw-r--r--models-pap/src/main/java/org/onap/policy/models/pap/concepts/PapPolicyIdentifier.java3
-rw-r--r--models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/BaseRestControllerV1.java21
-rw-r--r--models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaConstraint.java7
-rw-r--r--models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaEntity.java2
-rw-r--r--models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaParameter.java2
-rw-r--r--models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaProperty.java5
-rw-r--r--models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaSchemaDefinition.java2
-rw-r--r--models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplate.java8
-rw-r--r--models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplates.java2
-rw-r--r--models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaTopologyTemplate.java2
-rw-r--r--models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaWithTypeAndObjectProperties.java2
12 files changed, 3 insertions, 60 deletions
diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java
index 948529fab..957541993 100644
--- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java
+++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/SoSimulatorJaxRs.java
@@ -23,7 +23,6 @@
package org.onap.policy.simulators;
-import io.swagger.annotations.ApiParam;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -78,7 +77,7 @@ public class SoSimulatorJaxRs {
@Produces("application/json")
public String soPostQuery(@PathParam("serviceInstanceId") final String serviceInstanceId,
@PathParam("vnfInstanceId") final String vnfInstanceId,
- @ApiParam(required = true) SoRequest request) {
+ SoRequest request) {
List<Map<String, String>> userParam = null;
userParam = request.getRequestDetails().getRequestParameters().getUserParams();
@@ -131,7 +130,7 @@ public class SoSimulatorJaxRs {
@Path("/3gppservices/v7/modify")
@Consumes(MediaType.APPLICATION_JSON)
@Produces("application/json")
- public String soPost3gpp(@ApiParam(required = true) SoRequest3gpp request) {
+ public String soPost3gpp(SoRequest3gpp request) {
return ResourceUtils.getResourceAsString("org/onap/policy/simulators/so/so.3gpp.success.json");
}
@@ -139,7 +138,7 @@ public class SoSimulatorJaxRs {
@Path("/infra/serviceIntent/v1/modify")
@Consumes(MediaType.APPLICATION_JSON)
@Produces("application/json")
- public String soPostModifyCll(@ApiParam(required = true) SoRequest3gpp request) {
+ public String soPostModifyCll(SoRequest3gpp request) {
return ResourceUtils.getResourceAsString("org/onap/policy/simulators/so/so.cll.success.json");
}
diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PapPolicyIdentifier.java b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PapPolicyIdentifier.java
index 7bd78a222..ef4624700 100644
--- a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PapPolicyIdentifier.java
+++ b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PapPolicyIdentifier.java
@@ -21,7 +21,6 @@
package org.onap.policy.models.pap.concepts;
import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModelProperty;
import lombok.NonNull;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifierOptVersion;
@@ -34,11 +33,9 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifierO
*/
public class PapPolicyIdentifier {
@NonNull
- @ApiModelProperty(name = "policy-id")
@SerializedName("policy-id")
private String name;
- @ApiModelProperty(name = "policy-version")
@SerializedName("policy-version")
private String version;
diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/BaseRestControllerV1.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/BaseRestControllerV1.java
index ed8909b80..472a898c9 100644
--- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/BaseRestControllerV1.java
+++ b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/BaseRestControllerV1.java
@@ -20,38 +20,17 @@
package org.onap.policy.models.sim.dmaap.rest;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.BasicAuthDefinition;
-import io.swagger.annotations.Info;
-import io.swagger.annotations.SecurityDefinition;
-import io.swagger.annotations.SwaggerDefinition;
-import io.swagger.annotations.Tag;
import java.net.HttpURLConnection;
import java.util.UUID;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response.ResponseBuilder;
/**
* Version v1 common superclass to provide DMaaP endpoints for the DMaaP simulator component.
*/
-// @formatter:off
-@Api(value = "DMaaP Simulator API")
@Produces("application/json")
@Consumes({"application/cambria", "application/json"})
-@SwaggerDefinition(
- info = @Info(description =
- "Simulator for DMaaP, follows API as described at "
- + "\"https://onap.readthedocs.io/en/amsterdam/submodules/dmaap/messagerouter/messageservice.git/"
- + "docs/message-router/message-router.html", version = "v1.0",
- title = "Policy Administration"),
- consumes = {MediaType.APPLICATION_JSON},
- produces = {MediaType.APPLICATION_JSON},
- schemes = {SwaggerDefinition.Scheme.HTTP, SwaggerDefinition.Scheme.HTTPS},
- tags = {@Tag(name = "dmaap-simulator", description = "DMaaP simulation")},
- securityDefinition = @SecurityDefinition(basicAuthDefinitions = {@BasicAuthDefinition(key = "basicAuth")}))
-// @formatter:on
public class BaseRestControllerV1 {
public static final String EXTENSION_NAME = "interface info";
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaConstraint.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaConstraint.java
index acfda4902..f00c243c3 100644
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaConstraint.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaConstraint.java
@@ -24,7 +24,6 @@
package org.onap.policy.models.tosca.authorative.concepts;
import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.Data;
@@ -35,29 +34,23 @@ import lombok.Data;
*/
@Data
public class ToscaConstraint {
- @ApiModelProperty(name = "valid_values")
@SerializedName("valid_values")
private List<String> validValues;
private String equal;
- @ApiModelProperty(name = "greater_than")
@SerializedName("greater_than")
private String greaterThan;
- @ApiModelProperty(name = "greater_or_equal")
@SerializedName("greater_or_equal")
private String greaterOrEqual;
- @ApiModelProperty(name = "less_than")
@SerializedName("less_than")
private String lessThan;
- @ApiModelProperty(name = "less_or_equal")
@SerializedName("less_or_equal")
private String lessOrEqual;
- @ApiModelProperty(name = "in_range")
@SerializedName("in_range")
private List<String> rangeValues;
}
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaEntity.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaEntity.java
index c339f721e..24c74cbaa 100644
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaEntity.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaEntity.java
@@ -23,7 +23,6 @@
package org.onap.policy.models.tosca.authorative.concepts;
import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModelProperty;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -47,7 +46,6 @@ public class ToscaEntity implements PfNameVersion {
private String name = PfKey.NULL_KEY_NAME;
private String version = PfKey.NULL_KEY_VERSION;
- @ApiModelProperty(name = "derived_from")
@SerializedName("derived_from")
private String derivedFrom;
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaParameter.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaParameter.java
index 290bdacfe..86557ebc2 100644
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaParameter.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaParameter.java
@@ -23,7 +23,6 @@
package org.onap.policy.models.tosca.authorative.concepts;
import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -33,7 +32,6 @@ public class ToscaParameter {
private String name;
private String type;
- @ApiModelProperty(name = "type_version")
@SerializedName("type_version")
private String typeVersion;
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaProperty.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaProperty.java
index 0bd0d44e8..977d32738 100644
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaProperty.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaProperty.java
@@ -24,7 +24,6 @@
package org.onap.policy.models.tosca.authorative.concepts;
import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import java.util.Map;
import lombok.Data;
@@ -43,13 +42,11 @@ public class ToscaProperty {
private String name;
private String type;
- @ApiModelProperty(name = "type_version")
@SerializedName("type_version")
private String typeVersion;
private String description;
- @ApiModelProperty(name = "default")
@SerializedName("default")
private Object defaultValue;
@@ -57,11 +54,9 @@ public class ToscaProperty {
private Status status;
private List<ToscaConstraint> constraints;
- @ApiModelProperty(name = "key_schema")
@SerializedName("key_schema")
private ToscaSchemaDefinition keySchema;
- @ApiModelProperty(name = "entry_schema")
@SerializedName("entry_schema")
private ToscaSchemaDefinition entrySchema;
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaSchemaDefinition.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaSchemaDefinition.java
index 758711c98..d89af6ab7 100644
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaSchemaDefinition.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaSchemaDefinition.java
@@ -24,7 +24,6 @@
package org.onap.policy.models.tosca.authorative.concepts;
import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.Data;
@@ -38,7 +37,6 @@ public class ToscaSchemaDefinition {
private String name;
private String type;
- @ApiModelProperty(name = "type_version")
@SerializedName("type_version")
private String typeVersion;
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplate.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplate.java
index 36434bd91..1914280ff 100644
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplate.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplate.java
@@ -24,7 +24,6 @@
package org.onap.policy.models.tosca.authorative.concepts;
import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModelProperty;
import java.util.LinkedHashMap;
import java.util.Map;
import lombok.Data;
@@ -41,31 +40,24 @@ import lombok.NonNull;
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
public class ToscaServiceTemplate extends ToscaEntity {
- @ApiModelProperty(name = "tosca_definitions_version")
@SerializedName("tosca_definitions_version")
private String toscaDefinitionsVersion;
- @ApiModelProperty(name = "data_types")
@SerializedName("data_types")
private Map<String, ToscaDataType> dataTypes;
- @ApiModelProperty(name = "capability_types")
@SerializedName("capability_types")
private Map<String, ToscaCapabilityType> capabilityTypes;
- @ApiModelProperty(name = "node_types")
@SerializedName("node_types")
private Map<String, ToscaNodeType> nodeTypes;
- @ApiModelProperty(name = "relationship_types")
@SerializedName("relationship_types")
private Map<String, ToscaRelationshipType> relationshipTypes;
- @ApiModelProperty(name = "policy_types")
@SerializedName("policy_types")
private Map<String, ToscaPolicyType> policyTypes;
- @ApiModelProperty(name = "topology_template")
@SerializedName("topology_template")
private ToscaTopologyTemplate toscaTopologyTemplate;
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplates.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplates.java
index 912cfd580..4c145ccc4 100644
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplates.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaServiceTemplates.java
@@ -23,7 +23,6 @@
package org.onap.policy.models.tosca.authorative.concepts;
import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -34,7 +33,6 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode
public class ToscaServiceTemplates {
- @ApiModelProperty(name = "service_templates")
@SerializedName("service_templates")
private List<ToscaServiceTemplate> serviceTemplates;
}
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaTopologyTemplate.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaTopologyTemplate.java
index eca1bea16..45b4b2076 100644
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaTopologyTemplate.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaTopologyTemplate.java
@@ -24,7 +24,6 @@
package org.onap.policy.models.tosca.authorative.concepts;
import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -45,7 +44,6 @@ public class ToscaTopologyTemplate {
private Map<String, ToscaParameter> inputs;
- @ApiModelProperty(name = "node_templates")
@SerializedName("node_templates")
private Map<String, ToscaNodeTemplate> nodeTemplates;
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaWithTypeAndObjectProperties.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaWithTypeAndObjectProperties.java
index 0bcb1cf54..ff862cb77 100644
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaWithTypeAndObjectProperties.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/authorative/concepts/ToscaWithTypeAndObjectProperties.java
@@ -22,7 +22,6 @@
package org.onap.policy.models.tosca.authorative.concepts;
import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModelProperty;
import java.util.LinkedHashMap;
import java.util.Map;
import lombok.Data;
@@ -42,7 +41,6 @@ import lombok.ToString;
public class ToscaWithTypeAndObjectProperties extends ToscaEntity {
private String type;
- @ApiModelProperty(name = "type_version")
@SerializedName("type_version")
private String typeVersion;