diff options
Diffstat (limited to 'common/src/main/java/org/onap/so/client/policy')
24 files changed, 667 insertions, 743 deletions
diff --git a/common/src/main/java/org/onap/so/client/policy/CommonObjectMapperProvider.java b/common/src/main/java/org/onap/so/client/policy/CommonObjectMapperProvider.java index f2f6f0362f..c55370f7dc 100644 --- a/common/src/main/java/org/onap/so/client/policy/CommonObjectMapperProvider.java +++ b/common/src/main/java/org/onap/so/client/policy/CommonObjectMapperProvider.java @@ -28,19 +28,19 @@ import com.fasterxml.jackson.databind.SerializationFeature; public class CommonObjectMapperProvider { - protected ObjectMapper mapper; + protected ObjectMapper mapper; - public CommonObjectMapperProvider() { - - mapper = new ObjectMapper(); - mapper.setSerializationInclusion(Include.NON_NULL); + public CommonObjectMapperProvider() { + + mapper = new ObjectMapper(); + mapper.setSerializationInclusion(Include.NON_NULL); mapper.enable(MapperFeature.USE_ANNOTATIONS); - mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false); - mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - } + mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false); + mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + } - public ObjectMapper getMapper() { - return mapper; - } -}
\ No newline at end of file + public ObjectMapper getMapper() { + return mapper; + } +} diff --git a/common/src/main/java/org/onap/so/client/policy/DecisionAttributes.java b/common/src/main/java/org/onap/so/client/policy/DecisionAttributes.java index 951372db42..cf41dea7a2 100644 --- a/common/src/main/java/org/onap/so/client/policy/DecisionAttributes.java +++ b/common/src/main/java/org/onap/so/client/policy/DecisionAttributes.java @@ -27,67 +27,67 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ "ServiceType", "VNFType", "BB_ID", "WorkStep", "ErrorCode" }) +@JsonPropertyOrder({"ServiceType", "VNFType", "BB_ID", "WorkStep", "ErrorCode"}) public class DecisionAttributes { - @JsonProperty("ServiceType") - private String serviceType; - @JsonProperty("VNFType") - private String vNFType; - @JsonProperty("BB_ID") - private String bbID; - @JsonProperty("WorkStep") - private String workStep; - @JsonProperty("ErrorCode") - private String errorCode; - - @JsonProperty("ServiceType") - public String getServiceType() { - return serviceType; - } - - @JsonProperty("ServiceType") - public void setServiceType(String serviceType) { - this.serviceType = serviceType; - } - - @JsonProperty("VNFType") - public String getVNFType() { - return vNFType; - } - - @JsonProperty("VNFType") - public void setVNFType(String vNFType) { - this.vNFType = vNFType; - } - - @JsonProperty("BB_ID") - public String getBBID() { - return bbID; - } - - @JsonProperty("BB_ID") - public void setBBID(String bBID) { - this.bbID = bBID; - } - - @JsonProperty("WorkStep") - public String getWorkStep() { - return workStep; - } - - @JsonProperty("WorkStep") - public void setWorkStep(String workStep) { - this.workStep = workStep; - } - - @JsonProperty("ErrorCode") - public String getErrorCode() { - return errorCode; - } - - @JsonProperty("ErrorCode") - public void setErrorCode(String errorCode) { - this.errorCode = errorCode; - } + @JsonProperty("ServiceType") + private String serviceType; + @JsonProperty("VNFType") + private String vNFType; + @JsonProperty("BB_ID") + private String bbID; + @JsonProperty("WorkStep") + private String workStep; + @JsonProperty("ErrorCode") + private String errorCode; + + @JsonProperty("ServiceType") + public String getServiceType() { + return serviceType; + } + + @JsonProperty("ServiceType") + public void setServiceType(String serviceType) { + this.serviceType = serviceType; + } + + @JsonProperty("VNFType") + public String getVNFType() { + return vNFType; + } + + @JsonProperty("VNFType") + public void setVNFType(String vNFType) { + this.vNFType = vNFType; + } + + @JsonProperty("BB_ID") + public String getBBID() { + return bbID; + } + + @JsonProperty("BB_ID") + public void setBBID(String bBID) { + this.bbID = bBID; + } + + @JsonProperty("WorkStep") + public String getWorkStep() { + return workStep; + } + + @JsonProperty("WorkStep") + public void setWorkStep(String workStep) { + this.workStep = workStep; + } + + @JsonProperty("ErrorCode") + public String getErrorCode() { + return errorCode; + } + + @JsonProperty("ErrorCode") + public void setErrorCode(String errorCode) { + this.errorCode = errorCode; + } } diff --git a/common/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java b/common/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java index 23b984a3d0..34b121366b 100644 --- a/common/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java +++ b/common/src/main/java/org/onap/so/client/policy/JettisonStyleMapperProvider.java @@ -21,7 +21,6 @@ package org.onap.so.client.policy; import org.springframework.stereotype.Component; - import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; @@ -30,16 +29,16 @@ import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; @Component public class JettisonStyleMapperProvider extends CommonObjectMapperProvider { - - public JettisonStyleMapperProvider() { - - mapper = new ObjectMapper(); - JaxbAnnotationModule jaxbModule = new JaxbAnnotationModule(); - mapper.setSerializationInclusion(Include.NON_NULL); - mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); - mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - mapper.registerModule(jaxbModule); - } + + public JettisonStyleMapperProvider() { + + mapper = new ObjectMapper(); + JaxbAnnotationModule jaxbModule = new JaxbAnnotationModule(); + mapper.setSerializationInclusion(Include.NON_NULL); + mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); + mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, true); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + mapper.registerModule(jaxbModule); + } } diff --git a/common/src/main/java/org/onap/so/client/policy/PolicyClient.java b/common/src/main/java/org/onap/so/client/policy/PolicyClient.java index 6743bc2c34..d1349260c5 100644 --- a/common/src/main/java/org/onap/so/client/policy/PolicyClient.java +++ b/common/src/main/java/org/onap/so/client/policy/PolicyClient.java @@ -26,10 +26,10 @@ import org.onap.so.client.policy.entities.PolicyDecision; public interface PolicyClient { - public PolicyDecision getDecision(String serviceType, String vnfType, String bbID, String workStep, - String errorCode); - - public DictionaryData getAllowedTreatments(String bbID, String workStep); - - public Config getConfigWithPolicyName(String policyName); + public PolicyDecision getDecision(String serviceType, String vnfType, String bbID, String workStep, + String errorCode); + + public DictionaryData getAllowedTreatments(String bbID, String workStep); + + public Config getConfigWithPolicyName(String policyName); } diff --git a/common/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java b/common/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java index 71a3227c56..72c5a7dd5b 100644 --- a/common/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java +++ b/common/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java @@ -22,7 +22,6 @@ package org.onap.so.client.policy; import java.io.IOException; import java.util.List; - import org.onap.so.client.RestClient; import org.onap.so.client.RestPropertiesLoader; import org.onap.so.client.defaultproperties.PolicyRestPropertiesImpl; @@ -41,7 +40,6 @@ import org.onap.so.client.policy.entities.PolicyServiceType; import org.onap.so.client.policy.entities.Workstep; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonMappingException; @@ -51,88 +49,89 @@ import com.fasterxml.jackson.databind.SerializationFeature; public class PolicyClientImpl implements PolicyClient { - private static Logger logger = LoggerFactory.getLogger(PolicyClientImpl.class); - private PolicyRestProperties props; - private ObjectMapper mapper = new ObjectMapper(); - - public PolicyClientImpl() { - props = RestPropertiesLoader.getInstance().getNewImpl(PolicyRestProperties.class); - if (props == null) { - logger.error("No RestProperty.PolicyRestProperties implementation found on classpath"); - props = new PolicyRestPropertiesImpl(); - } - } - public PolicyDecision getDecision(String serviceType, String vnfType, String bbID, String workStep, - String errorCode) { - DecisionAttributes decisionAttributes = new DecisionAttributes(); - decisionAttributes.setServiceType(serviceType); - decisionAttributes.setvNFType(vnfType); - decisionAttributes.setBbID(bbID); - decisionAttributes.setWorkStep(workStep); - decisionAttributes.setErrorCode(errorCode); + private static Logger logger = LoggerFactory.getLogger(PolicyClientImpl.class); + private PolicyRestProperties props; + private ObjectMapper mapper = new ObjectMapper(); + + public PolicyClientImpl() { + props = RestPropertiesLoader.getInstance().getNewImpl(PolicyRestProperties.class); + if (props == null) { + logger.error("No RestProperty.PolicyRestProperties implementation found on classpath"); + props = new PolicyRestPropertiesImpl(); + } + } + + public PolicyDecision getDecision(String serviceType, String vnfType, String bbID, String workStep, + String errorCode) { + DecisionAttributes decisionAttributes = new DecisionAttributes(); + decisionAttributes.setServiceType(serviceType); + decisionAttributes.setvNFType(vnfType); + decisionAttributes.setBbID(bbID); + decisionAttributes.setWorkStep(workStep); + decisionAttributes.setErrorCode(errorCode); + + return this.getDecision(decisionAttributes); + } + + protected PolicyDecision getDecision(DecisionAttributes decisionAttributes) { + PolicyRestClient client = this.getPolicyRestClient(PolicyServiceType.GET_DECISION); + PolicyDecisionRequest decisionRequest = new PolicyDecisionRequest(); + decisionRequest.setDecisionAttributes(decisionAttributes); + decisionRequest.setEcompcomponentName(RestClient.ECOMP_COMPONENT_NAME); + + return client.post(decisionRequest, PolicyDecision.class); + } + + public DictionaryData getAllowedTreatments(String bbID, String workStep) { + PolicyRestClient client = this.getPolicyRestClient(PolicyServiceType.GET_DICTIONARY_ITEMS); + DictionaryItemsRequest dictionaryItemsRequest = new DictionaryItemsRequest(); + dictionaryItemsRequest.setDictionaryType("Decision"); + dictionaryItemsRequest.setDictionary("RainyDayTreatments"); + final AllowedTreatments response = client.post(dictionaryItemsRequest, AllowedTreatments.class); + final DictionaryJson dictionaryJson = response.getDictionaryJson(); + final List<DictionaryData> dictionaryDataList = dictionaryJson.getDictionaryDatas(); + for (DictionaryData dictData : dictionaryDataList) { + Bbid bBid = dictData.getBbid(); + Workstep workstep = dictData.getWorkstep(); + String bBidString = bBid.getString(); + String workstepString = workstep.getString(); + if (bbID.equals(bBidString) && workStep.equals(workstepString)) { + return dictData; + } + } + logger.error("There is no AllowedTreatments with that specified parameter set"); + return null; + } + + @Override + public Config getConfigWithPolicyName(String policyName) { + PolicyRestClient client = this.getPolicyRestClient(PolicyServiceType.GET_CONFIG); + ConfigRequestParameters configReqParameters = new ConfigRequestParameters(); + configReqParameters.setPolicyName(policyName); + PolicyConfig[] policyConfigList = client.post(configReqParameters, PolicyConfig[].class); + PolicyConfig policyConfig = null; + if (policyConfigList.length > 1) { + logger.debug("Too many configs for policyName: " + policyName); + return null; + } + try { + policyConfig = policyConfigList[0]; + return this.getConfigFromStringJson(policyConfig.getConfig()); + } catch (IOException e) { + logger.error(e.getMessage()); + return null; + } + } - return this.getDecision(decisionAttributes); - } + protected Config getConfigFromStringJson(String configJson) + throws JsonParseException, JsonMappingException, IOException { + String unescapedJson = configJson.replaceAll("\\\\", ""); + mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false); + mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false); + return mapper.readValue(unescapedJson, Config.class); + } - protected PolicyDecision getDecision(DecisionAttributes decisionAttributes) { - PolicyRestClient client = this.getPolicyRestClient(PolicyServiceType.GET_DECISION); - PolicyDecisionRequest decisionRequest = new PolicyDecisionRequest(); - decisionRequest.setDecisionAttributes(decisionAttributes); - decisionRequest.setEcompcomponentName(RestClient.ECOMP_COMPONENT_NAME); - - return client.post(decisionRequest, PolicyDecision.class); - } - - public DictionaryData getAllowedTreatments(String bbID, String workStep) - { - PolicyRestClient client = this.getPolicyRestClient(PolicyServiceType.GET_DICTIONARY_ITEMS); - DictionaryItemsRequest dictionaryItemsRequest = new DictionaryItemsRequest(); - dictionaryItemsRequest.setDictionaryType("Decision"); - dictionaryItemsRequest.setDictionary("RainyDayTreatments"); - final AllowedTreatments response = client.post(dictionaryItemsRequest, AllowedTreatments.class); - final DictionaryJson dictionaryJson = response.getDictionaryJson(); - final List<DictionaryData> dictionaryDataList = dictionaryJson.getDictionaryDatas(); - for(DictionaryData dictData : dictionaryDataList){ - Bbid bBid = dictData.getBbid(); - Workstep workstep = dictData.getWorkstep(); - String bBidString = bBid.getString(); - String workstepString = workstep.getString(); - if(bbID.equals(bBidString) && workStep.equals(workstepString)){ - return dictData; - } - } - logger.error("There is no AllowedTreatments with that specified parameter set"); - return null; - } - - @Override - public Config getConfigWithPolicyName(String policyName) { - PolicyRestClient client = this.getPolicyRestClient(PolicyServiceType.GET_CONFIG); - ConfigRequestParameters configReqParameters = new ConfigRequestParameters(); - configReqParameters.setPolicyName(policyName); - PolicyConfig[] policyConfigList = client.post(configReqParameters, PolicyConfig[].class); - PolicyConfig policyConfig = null; - if(policyConfigList.length > 1) { - logger.debug("Too many configs for policyName: " + policyName); - return null; - } - try { - policyConfig = policyConfigList[0]; - return this.getConfigFromStringJson(policyConfig.getConfig()); - } catch (IOException e) { - logger.error(e.getMessage()); - return null; - } - } - - protected Config getConfigFromStringJson(String configJson) throws JsonParseException, JsonMappingException, IOException { - String unescapedJson = configJson.replaceAll("\\\\", ""); - mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false); - mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false); - return mapper.readValue(unescapedJson, Config.class); - } - - protected PolicyRestClient getPolicyRestClient(PolicyServiceType policyServiceType) { - return new PolicyRestClient(this.props, policyServiceType); - } + protected PolicyRestClient getPolicyRestClient(PolicyServiceType policyServiceType) { + return new PolicyRestClient(this.props, policyServiceType); + } } diff --git a/common/src/main/java/org/onap/so/client/policy/PolicyRestClient.java b/common/src/main/java/org/onap/so/client/policy/PolicyRestClient.java index 9427fa7eb9..95bc4282ae 100644 --- a/common/src/main/java/org/onap/so/client/policy/PolicyRestClient.java +++ b/common/src/main/java/org/onap/so/client/policy/PolicyRestClient.java @@ -23,32 +23,30 @@ package org.onap.so.client.policy; import java.util.Map; import java.util.Optional; - import javax.ws.rs.core.UriBuilder; - import org.onap.so.client.RestClient; import org.onap.so.client.policy.entities.PolicyServiceType; import org.onap.so.utils.TargetEntity; public class PolicyRestClient extends RestClient { - private final PolicyRestProperties properties; + private final PolicyRestProperties properties; - public PolicyRestClient(PolicyRestProperties props, PolicyServiceType serviceType) { - super(props, Optional.of(UriBuilder.fromPath(serviceType.toString()).build())); - this.properties = props; - } + public PolicyRestClient(PolicyRestProperties props, PolicyServiceType serviceType) { + super(props, Optional.of(UriBuilder.fromPath(serviceType.toString()).build())); + this.properties = props; + } @Override - public TargetEntity getTargetEntity(){ + public TargetEntity getTargetEntity() { return TargetEntity.POLICY; } - @Override - protected void initializeHeaderMap(Map<String, String> headerMap) { - headerMap.put("ClientAuth", properties.getClientAuth()); - headerMap.put("Authorization", properties.getAuth()); - headerMap.put("Environment", properties.getEnvironment()); - } + @Override + protected void initializeHeaderMap(Map<String, String> headerMap) { + headerMap.put("ClientAuth", properties.getClientAuth()); + headerMap.put("Authorization", properties.getAuth()); + headerMap.put("Environment", properties.getEnvironment()); + } -}
\ No newline at end of file +} diff --git a/common/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java b/common/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java index 1de6e8cd97..2b6947104c 100644 --- a/common/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java +++ b/common/src/main/java/org/onap/so/client/policy/PolicyRestProperties.java @@ -23,9 +23,11 @@ package org.onap.so.client.policy; import org.onap.so.client.RestProperties; public interface PolicyRestProperties extends RestProperties { - - public String getClientAuth(); - public String getAuth(); - public String getEnvironment(); + + public String getClientAuth(); + + public String getAuth(); + + public String getEnvironment(); } diff --git a/common/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java b/common/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java index e82eca56b8..6c03b60ffb 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/AllowedTreatments.java @@ -25,81 +25,76 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ -"dictionaryJson", -"dictionaryData", -"responseCode", -"responseMessage" -}) -public class AllowedTreatments{ - -@JsonProperty("dictionaryJson") -private DictionaryJson dictionaryJson; -@JsonProperty("dictionaryData") -private Object dictionaryData; -@JsonProperty("responseCode") -private Integer responseCode; -@JsonProperty("responseMessage") -private String responseMessage; - -@JsonProperty("dictionaryJson") -public DictionaryJson getDictionaryJson() { -return dictionaryJson; - } - -@JsonProperty("dictionaryJson") -public void setDictionaryJson(DictionaryJson dictionaryJson) { -this.dictionaryJson = dictionaryJson; - } - -public AllowedTreatments withDictionaryJson(DictionaryJson dictionaryJson) { -this.dictionaryJson = dictionaryJson; -return this; - } - -@JsonProperty("dictionaryData") -public Object getDictionaryData() { -return dictionaryData; - } - -@JsonProperty("dictionaryData") -public void setDictionaryData(Object dictionaryData) { -this.dictionaryData = dictionaryData; - } - -public AllowedTreatments withDictionaryData(Object dictionaryData) { -this.dictionaryData = dictionaryData; -return this; - } - -@JsonProperty("responseCode") -public Integer getResponseCode() { -return responseCode; - } - -@JsonProperty("responseCode") -public void setResponseCode(Integer responseCode) { -this.responseCode = responseCode; - } - -public AllowedTreatments withResponseCode(Integer responseCode) { -this.responseCode = responseCode; -return this; - } - -@JsonProperty("responseMessage") -public String getResponseMessage() { -return responseMessage; - } - -@JsonProperty("responseMessage") -public void setResponseMessage(String responseMessage) { -this.responseMessage = responseMessage; - } - -public AllowedTreatments withResponseMessage(String responseMessage) { -this.responseMessage = responseMessage; -return this; - } +@JsonPropertyOrder({"dictionaryJson", "dictionaryData", "responseCode", "responseMessage"}) +public class AllowedTreatments { + + @JsonProperty("dictionaryJson") + private DictionaryJson dictionaryJson; + @JsonProperty("dictionaryData") + private Object dictionaryData; + @JsonProperty("responseCode") + private Integer responseCode; + @JsonProperty("responseMessage") + private String responseMessage; + + @JsonProperty("dictionaryJson") + public DictionaryJson getDictionaryJson() { + return dictionaryJson; + } + + @JsonProperty("dictionaryJson") + public void setDictionaryJson(DictionaryJson dictionaryJson) { + this.dictionaryJson = dictionaryJson; + } + + public AllowedTreatments withDictionaryJson(DictionaryJson dictionaryJson) { + this.dictionaryJson = dictionaryJson; + return this; + } + + @JsonProperty("dictionaryData") + public Object getDictionaryData() { + return dictionaryData; + } + + @JsonProperty("dictionaryData") + public void setDictionaryData(Object dictionaryData) { + this.dictionaryData = dictionaryData; + } + + public AllowedTreatments withDictionaryData(Object dictionaryData) { + this.dictionaryData = dictionaryData; + return this; + } + + @JsonProperty("responseCode") + public Integer getResponseCode() { + return responseCode; + } + + @JsonProperty("responseCode") + public void setResponseCode(Integer responseCode) { + this.responseCode = responseCode; + } + + public AllowedTreatments withResponseCode(Integer responseCode) { + this.responseCode = responseCode; + return this; + } + + @JsonProperty("responseMessage") + public String getResponseMessage() { + return responseMessage; + } + + @JsonProperty("responseMessage") + public void setResponseMessage(String responseMessage) { + this.responseMessage = responseMessage; + } + + public AllowedTreatments withResponseMessage(String responseMessage) { + this.responseMessage = responseMessage; + return this; + } } diff --git a/common/src/main/java/org/onap/so/client/policy/entities/Bbid.java b/common/src/main/java/org/onap/so/client/policy/entities/Bbid.java index 34faa7df09..90ebd603bc 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/Bbid.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/Bbid.java @@ -25,63 +25,59 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ -"valueType", -"string", -"chars" -}) +@JsonPropertyOrder({"valueType", "string", "chars"}) public class Bbid { -@JsonProperty("valueType") -private String valueType; -@JsonProperty("string") -private String string; -@JsonProperty("chars") -private String chars; + @JsonProperty("valueType") + private String valueType; + @JsonProperty("string") + private String string; + @JsonProperty("chars") + private String chars; -@JsonProperty("valueType") -public String getValueType() { -return valueType; - } + @JsonProperty("valueType") + public String getValueType() { + return valueType; + } -@JsonProperty("valueType") -public void setValueType(String valueType) { -this.valueType = valueType; - } + @JsonProperty("valueType") + public void setValueType(String valueType) { + this.valueType = valueType; + } -public Bbid withValueType(String valueType) { -this.valueType = valueType; -return this; - } + public Bbid withValueType(String valueType) { + this.valueType = valueType; + return this; + } -@JsonProperty("string") -public String getString() { -return string; - } + @JsonProperty("string") + public String getString() { + return string; + } -@JsonProperty("string") -public void setString(String string) { -this.string = string; - } + @JsonProperty("string") + public void setString(String string) { + this.string = string; + } -public Bbid withString(String string) { -this.string = string; -return this; - } + public Bbid withString(String string) { + this.string = string; + return this; + } -@JsonProperty("chars") -public String getChars() { -return chars; - } + @JsonProperty("chars") + public String getChars() { + return chars; + } -@JsonProperty("chars") -public void setChars(String chars) { -this.chars = chars; - } + @JsonProperty("chars") + public void setChars(String chars) { + this.chars = chars; + } -public Bbid withChars(String chars) { -this.chars = chars; -return this; - } + public Bbid withChars(String chars) { + this.chars = chars; + return this; + } } diff --git a/common/src/main/java/org/onap/so/client/policy/entities/Config.java b/common/src/main/java/org/onap/so/client/policy/entities/Config.java index 6c9c0759d6..440c31916f 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/Config.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/Config.java @@ -26,22 +26,8 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonRootName; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "configName", - "riskLevel", - "policyName", - "policyScope", - "guard", - "description", - "priority", - "uuid", - "version", - "content", - "riskType", - "service", - "location", - "templateVersion" -}) +@JsonPropertyOrder({"configName", "riskLevel", "policyName", "policyScope", "guard", "description", "priority", "uuid", + "version", "content", "riskType", "service", "location", "templateVersion"}) @JsonRootName(value = "config") public class Config { diff --git a/common/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java b/common/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java index 8cd5b93a36..177a1c0ca3 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/ConfigRequestParameters.java @@ -22,21 +22,12 @@ package org.onap.so.client.policy.entities; import java.util.HashMap; import java.util.Map; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "configAttributes", - "configName", - "ecompName", - "onapName", - "policyName", - "requestID", - "unique" -}) +@JsonPropertyOrder({"configAttributes", "configName", "ecompName", "onapName", "policyName", "requestID", "unique"}) public class ConfigRequestParameters { @JsonProperty("configAttributes") diff --git a/common/src/main/java/org/onap/so/client/policy/entities/Content.java b/common/src/main/java/org/onap/so/client/policy/entities/Content.java index a473f6c566..009774dbe6 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/Content.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/Content.java @@ -26,9 +26,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "fabric-config-models" -}) +@JsonPropertyOrder({"fabric-config-models"}) public class Content { @JsonProperty("fabric-config-models") diff --git a/common/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java b/common/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java index 07db7d8568..08489f4a08 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/DecisionAttributes.java @@ -27,68 +27,68 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ "ServiceType", "VNFType", "BB_ID", "WorkStep", "ErrorCode" }) +@JsonPropertyOrder({"ServiceType", "VNFType", "BB_ID", "WorkStep", "ErrorCode"}) public class DecisionAttributes { - @JsonProperty("ServiceType") - private String serviceType; - @JsonProperty("VNFType") - private String vNFType; - @JsonProperty("BB_ID") - private String bbID; - @JsonProperty("WorkStep") - private String workStep; - @JsonProperty("ErrorCode") - private String errorCode; - - @JsonProperty("ServiceType") - public String getServiceType() { - return serviceType; - } - - @JsonProperty("ServiceType") - public void setServiceType(String serviceType) { - this.serviceType = serviceType; - } - - @JsonProperty("WorkStep") - public String getWorkStep() { - return workStep; - } - - @JsonProperty("WorkStep") - public void setWorkStep(String workStep) { - this.workStep = workStep; - } - - @JsonProperty("ErrorCode") - public String getErrorCode() { - return errorCode; - } - - @JsonProperty("ErrorCode") - public void setErrorCode(String errorCode) { - this.errorCode = errorCode; - } - - @JsonProperty("VNFType") - public String getvNFType() { - return vNFType; - } - - @JsonProperty("VNFType") - public void setvNFType(String vNFType) { - this.vNFType = vNFType; - } - - @JsonProperty("BB_ID") - public String getBbID() { - return bbID; - } - - @JsonProperty("BB_ID") - public void setBbID(String bbID) { - this.bbID = bbID; - } - + @JsonProperty("ServiceType") + private String serviceType; + @JsonProperty("VNFType") + private String vNFType; + @JsonProperty("BB_ID") + private String bbID; + @JsonProperty("WorkStep") + private String workStep; + @JsonProperty("ErrorCode") + private String errorCode; + + @JsonProperty("ServiceType") + public String getServiceType() { + return serviceType; + } + + @JsonProperty("ServiceType") + public void setServiceType(String serviceType) { + this.serviceType = serviceType; + } + + @JsonProperty("WorkStep") + public String getWorkStep() { + return workStep; + } + + @JsonProperty("WorkStep") + public void setWorkStep(String workStep) { + this.workStep = workStep; + } + + @JsonProperty("ErrorCode") + public String getErrorCode() { + return errorCode; + } + + @JsonProperty("ErrorCode") + public void setErrorCode(String errorCode) { + this.errorCode = errorCode; + } + + @JsonProperty("VNFType") + public String getvNFType() { + return vNFType; + } + + @JsonProperty("VNFType") + public void setvNFType(String vNFType) { + this.vNFType = vNFType; + } + + @JsonProperty("BB_ID") + public String getBbID() { + return bbID; + } + + @JsonProperty("BB_ID") + public void setBbID(String bbID) { + this.bbID = bbID; + } + } diff --git a/common/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java b/common/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java index 8207999a80..d509d78df7 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/DictionaryData.java @@ -25,81 +25,76 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ -"id", -"bbid", -"workstep", -"treatments" -}) +@JsonPropertyOrder({"id", "bbid", "workstep", "treatments"}) public class DictionaryData { -@JsonProperty("id") -private Id id; -@JsonProperty("bbid") -private Bbid bbid; -@JsonProperty("workstep") -private Workstep workstep; -@JsonProperty("treatments") -private Treatments treatments; - -@JsonProperty("id") -public Id getId() { -return id; - } - -@JsonProperty("id") -public void setId(Id id) { -this.id = id; - } - -public DictionaryData withId(Id id) { -this.id = id; -return this; - } - -@JsonProperty("bbid") -public Bbid getBbid() { -return bbid; - } - -@JsonProperty("bbid") -public void setBbid(Bbid bbid) { -this.bbid = bbid; - } - -public DictionaryData withBbid(Bbid bbid) { -this.bbid = bbid; -return this; - } - -@JsonProperty("workstep") -public Workstep getWorkstep() { -return workstep; - } - -@JsonProperty("workstep") -public void setWorkstep(Workstep workstep) { -this.workstep = workstep; - } - -public DictionaryData withWorkstep(Workstep workstep) { -this.workstep = workstep; -return this; - } - -@JsonProperty("treatments") -public Treatments getTreatments() { -return treatments; - } - -@JsonProperty("treatments") -public void setTreatments(Treatments treatments) { -this.treatments = treatments; - } - -public DictionaryData withTreatments(Treatments treatments) { -this.treatments = treatments; -return this; - } + @JsonProperty("id") + private Id id; + @JsonProperty("bbid") + private Bbid bbid; + @JsonProperty("workstep") + private Workstep workstep; + @JsonProperty("treatments") + private Treatments treatments; + + @JsonProperty("id") + public Id getId() { + return id; + } + + @JsonProperty("id") + public void setId(Id id) { + this.id = id; + } + + public DictionaryData withId(Id id) { + this.id = id; + return this; + } + + @JsonProperty("bbid") + public Bbid getBbid() { + return bbid; + } + + @JsonProperty("bbid") + public void setBbid(Bbid bbid) { + this.bbid = bbid; + } + + public DictionaryData withBbid(Bbid bbid) { + this.bbid = bbid; + return this; + } + + @JsonProperty("workstep") + public Workstep getWorkstep() { + return workstep; + } + + @JsonProperty("workstep") + public void setWorkstep(Workstep workstep) { + this.workstep = workstep; + } + + public DictionaryData withWorkstep(Workstep workstep) { + this.workstep = workstep; + return this; + } + + @JsonProperty("treatments") + public Treatments getTreatments() { + return treatments; + } + + @JsonProperty("treatments") + public void setTreatments(Treatments treatments) { + this.treatments = treatments; + } + + public DictionaryData withTreatments(Treatments treatments) { + this.treatments = treatments; + return this; + } } diff --git a/common/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java b/common/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java index 8b063e83c7..9fa2e4d0b9 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/DictionaryItemsRequest.java @@ -25,31 +25,31 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ "dictionaryType", "dictionary" }) +@JsonPropertyOrder({"dictionaryType", "dictionary"}) public class DictionaryItemsRequest { - @JsonProperty("dictionary") - private String dictionary; - @JsonProperty("dictionaryType") - private String dictionaryType; - - @JsonProperty("dictionary") - public String getDictionary() { - return dictionary; - } - - @JsonProperty("dictionary") - public void setDictionary(String dictionary) { - this.dictionary = dictionary; - } - - @JsonProperty("dictionaryType") - public String getDictionaryType() { - return dictionaryType; - } - - @JsonProperty("dictionaryType") - public void setDictionaryType(String dictionaryType) { - this.dictionaryType = dictionaryType; - } + @JsonProperty("dictionary") + private String dictionary; + @JsonProperty("dictionaryType") + private String dictionaryType; + + @JsonProperty("dictionary") + public String getDictionary() { + return dictionary; + } + + @JsonProperty("dictionary") + public void setDictionary(String dictionary) { + this.dictionary = dictionary; + } + + @JsonProperty("dictionaryType") + public String getDictionaryType() { + return dictionaryType; + } + + @JsonProperty("dictionaryType") + public void setDictionaryType(String dictionaryType) { + this.dictionaryType = dictionaryType; + } } diff --git a/common/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java b/common/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java index 097c9a5cb9..5b99fe1a05 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/DictionaryJson.java @@ -22,33 +22,30 @@ package org.onap.so.client.policy.entities; import java.util.ArrayList; import java.util.List; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ -"DictionaryDatas" -}) +@JsonPropertyOrder({"DictionaryDatas"}) public class DictionaryJson { -@JsonProperty("DictionaryDatas") -private List<DictionaryData> dictionaryDatas = new ArrayList<DictionaryData>(); + @JsonProperty("DictionaryDatas") + private List<DictionaryData> dictionaryDatas = new ArrayList<DictionaryData>(); -@JsonProperty("DictionaryDatas") -public List<DictionaryData> getDictionaryDatas() { -return dictionaryDatas; - } + @JsonProperty("DictionaryDatas") + public List<DictionaryData> getDictionaryDatas() { + return dictionaryDatas; + } -@JsonProperty("DictionaryDatas") -public void setDictionaryDatas(List<DictionaryData> dictionaryDatas) { -this.dictionaryDatas = dictionaryDatas; - } + @JsonProperty("DictionaryDatas") + public void setDictionaryDatas(List<DictionaryData> dictionaryDatas) { + this.dictionaryDatas = dictionaryDatas; + } -public DictionaryJson withDictionaryDatas(List<DictionaryData> dictionaryDatas) { -this.dictionaryDatas = dictionaryDatas; -return this; - } + public DictionaryJson withDictionaryDatas(List<DictionaryData> dictionaryDatas) { + this.dictionaryDatas = dictionaryDatas; + return this; + } } diff --git a/common/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java b/common/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java index d1a924cb7d..684311f997 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/FabricConfigModel.java @@ -25,10 +25,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "vnfProfile", - "lagProfile" -}) +@JsonPropertyOrder({"vnfProfile", "lagProfile"}) public class FabricConfigModel { @JsonProperty("vnfProfile") diff --git a/common/src/main/java/org/onap/so/client/policy/entities/Id.java b/common/src/main/java/org/onap/so/client/policy/entities/Id.java index af164d6866..0b957711fe 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/Id.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/Id.java @@ -25,45 +25,42 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ -"integral", -"valueType" -}) +@JsonPropertyOrder({"integral", "valueType"}) public class Id { -@JsonProperty("integral") -private Boolean integral; -@JsonProperty("valueType") -private String valueType; + @JsonProperty("integral") + private Boolean integral; + @JsonProperty("valueType") + private String valueType; -@JsonProperty("integral") -public Boolean getIntegral() { -return integral; - } + @JsonProperty("integral") + public Boolean getIntegral() { + return integral; + } -@JsonProperty("integral") -public void setIntegral(Boolean integral) { -this.integral = integral; - } + @JsonProperty("integral") + public void setIntegral(Boolean integral) { + this.integral = integral; + } -public Id withIntegral(Boolean integral) { -this.integral = integral; -return this; - } + public Id withIntegral(Boolean integral) { + this.integral = integral; + return this; + } -@JsonProperty("valueType") -public String getValueType() { -return valueType; - } + @JsonProperty("valueType") + public String getValueType() { + return valueType; + } -@JsonProperty("valueType") -public void setValueType(String valueType) { -this.valueType = valueType; - } + @JsonProperty("valueType") + public void setValueType(String valueType) { + this.valueType = valueType; + } -public Id withValueType(String valueType) { -this.valueType = valueType; -return this; - } + public Id withValueType(String valueType) { + this.valueType = valueType; + return this; + } } diff --git a/common/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java b/common/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java index 807829e323..716462f534 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/PolicyConfig.java @@ -22,24 +22,13 @@ package org.onap.so.client.policy.entities; import java.util.HashMap; import java.util.Map; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "policyConfigMessage", - "policyConfigStatus", - "type", - "config", - "policyName", - "policyType", - "policyVersion", - "matchingConditions", - "responseAttributes", - "property" -}) +@JsonPropertyOrder({"policyConfigMessage", "policyConfigStatus", "type", "config", "policyName", "policyType", + "policyVersion", "matchingConditions", "responseAttributes", "property"}) public class PolicyConfig { @JsonProperty("policyConfigMessage") diff --git a/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java b/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java index 57c93927cb..f907b041fa 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecision.java @@ -27,31 +27,31 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ "decision", "details" }) +@JsonPropertyOrder({"decision", "details"}) public class PolicyDecision { - @JsonProperty("decision") - private String decision; - @JsonProperty("details") - private String details; - - @JsonProperty("decision") - public String getDecision() { - return decision; - } - - @JsonProperty("decision") - public void setDecision(String decision) { - this.decision = decision; - } - - @JsonProperty("details") - public String getDetails() { - return details; - } - - @JsonProperty("details") - public void setDetails(String details) { - this.details = details; - } + @JsonProperty("decision") + private String decision; + @JsonProperty("details") + private String details; + + @JsonProperty("decision") + public String getDecision() { + return decision; + } + + @JsonProperty("decision") + public void setDecision(String decision) { + this.decision = decision; + } + + @JsonProperty("details") + public String getDetails() { + return details; + } + + @JsonProperty("details") + public void setDetails(String details) { + this.details = details; + } } diff --git a/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java b/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java index b402e85e32..be58b567bc 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/PolicyDecisionRequest.java @@ -26,32 +26,32 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ "decisionAttributes", "ecompcomponentName" }) +@JsonPropertyOrder({"decisionAttributes", "ecompcomponentName"}) public class PolicyDecisionRequest { - @JsonProperty("decisionAttributes") - private DecisionAttributes decisionAttributes; - @JsonProperty("ecompcomponentName") - private String ecompcomponentName; - - @JsonProperty("decisionAttributes") - public DecisionAttributes getDecisionAttributes() { - return decisionAttributes; - } - - @JsonProperty("decisionAttributes") - public void setDecisionAttributes(DecisionAttributes decisionAttributes) { - this.decisionAttributes = decisionAttributes; - } - - @JsonProperty("ecompcomponentName") - public String getEcompcomponentName() { - return ecompcomponentName; - } - - @JsonProperty("ecompcomponentName") - public void setEcompcomponentName(String ecompcomponentName) { - this.ecompcomponentName = ecompcomponentName; - } + @JsonProperty("decisionAttributes") + private DecisionAttributes decisionAttributes; + @JsonProperty("ecompcomponentName") + private String ecompcomponentName; + + @JsonProperty("decisionAttributes") + public DecisionAttributes getDecisionAttributes() { + return decisionAttributes; + } + + @JsonProperty("decisionAttributes") + public void setDecisionAttributes(DecisionAttributes decisionAttributes) { + this.decisionAttributes = decisionAttributes; + } + + @JsonProperty("ecompcomponentName") + public String getEcompcomponentName() { + return ecompcomponentName; + } + + @JsonProperty("ecompcomponentName") + public void setEcompcomponentName(String ecompcomponentName) { + this.ecompcomponentName = ecompcomponentName; + } } diff --git a/common/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java b/common/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java index 83dc6b7862..b00d22dbad 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java @@ -21,28 +21,21 @@ package org.onap.so.client.policy.entities; public enum PolicyServiceType { - GET_CONFIG("getConfig"), - SEND_EVENT("sendEvent"), - PUSH_POLICY("pushPolicy"), - CREATE_POLICY("createPolicy"), - UPDATE_POLICY("updatePolicy"), - GET_DECISION("getDecision"), - GET_METRICS("getMetrics"), - DELETE_POLICY("deletePolicy"), - LIST_CONFIG("listConfig"), - CREATE_DICTIONARY_ITEM("createDictionaryItem"), - UPDATE_DICTIONARY_ITEM("updateDictionaryItem"), - GET_DICTIONARY_ITEMS("getDictionaryItems"); - - private final String name; - - PolicyServiceType(String name) { - this.name = name; - } - - @Override - public String toString() { - return name; - } - + GET_CONFIG("getConfig"), SEND_EVENT("sendEvent"), PUSH_POLICY("pushPolicy"), CREATE_POLICY( + "createPolicy"), UPDATE_POLICY("updatePolicy"), GET_DECISION("getDecision"), GET_METRICS( + "getMetrics"), DELETE_POLICY("deletePolicy"), LIST_CONFIG("listConfig"), CREATE_DICTIONARY_ITEM( + "createDictionaryItem"), UPDATE_DICTIONARY_ITEM( + "updateDictionaryItem"), GET_DICTIONARY_ITEMS("getDictionaryItems"); + + private final String name; + + PolicyServiceType(String name) { + this.name = name; + } + + @Override + public String toString() { + return name; + } + } diff --git a/common/src/main/java/org/onap/so/client/policy/entities/Treatments.java b/common/src/main/java/org/onap/so/client/policy/entities/Treatments.java index 433d32756c..fd8a3c5e2a 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/Treatments.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/Treatments.java @@ -25,63 +25,59 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ -"valueType", -"string", -"chars" -}) +@JsonPropertyOrder({"valueType", "string", "chars"}) public class Treatments { -@JsonProperty("valueType") -private String valueType; -@JsonProperty("string") -private String string; -@JsonProperty("chars") -private String chars; + @JsonProperty("valueType") + private String valueType; + @JsonProperty("string") + private String string; + @JsonProperty("chars") + private String chars; -@JsonProperty("valueType") -public String getValueType() { -return valueType; - } + @JsonProperty("valueType") + public String getValueType() { + return valueType; + } -@JsonProperty("valueType") -public void setValueType(String valueType) { -this.valueType = valueType; - } + @JsonProperty("valueType") + public void setValueType(String valueType) { + this.valueType = valueType; + } -public Treatments withValueType(String valueType) { -this.valueType = valueType; -return this; - } + public Treatments withValueType(String valueType) { + this.valueType = valueType; + return this; + } -@JsonProperty("string") -public String getString() { -return string; - } + @JsonProperty("string") + public String getString() { + return string; + } -@JsonProperty("string") -public void setString(String string) { -this.string = string; - } + @JsonProperty("string") + public void setString(String string) { + this.string = string; + } -public Treatments withString(String string) { -this.string = string; -return this; - } + public Treatments withString(String string) { + this.string = string; + return this; + } -@JsonProperty("chars") -public String getChars() { -return chars; - } + @JsonProperty("chars") + public String getChars() { + return chars; + } -@JsonProperty("chars") -public void setChars(String chars) { -this.chars = chars; - } + @JsonProperty("chars") + public void setChars(String chars) { + this.chars = chars; + } -public Treatments withChars(String chars) { -this.chars = chars; -return this; - } + public Treatments withChars(String chars) { + this.chars = chars; + return this; + } } diff --git a/common/src/main/java/org/onap/so/client/policy/entities/Workstep.java b/common/src/main/java/org/onap/so/client/policy/entities/Workstep.java index 4fbd6e2f8a..1bf3ce001d 100644 --- a/common/src/main/java/org/onap/so/client/policy/entities/Workstep.java +++ b/common/src/main/java/org/onap/so/client/policy/entities/Workstep.java @@ -25,63 +25,59 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ -"valueType", -"string", -"chars" -}) +@JsonPropertyOrder({"valueType", "string", "chars"}) public class Workstep { -@JsonProperty("valueType") -private String valueType; -@JsonProperty("string") -private String string; -@JsonProperty("chars") -private String chars; + @JsonProperty("valueType") + private String valueType; + @JsonProperty("string") + private String string; + @JsonProperty("chars") + private String chars; -@JsonProperty("valueType") -public String getValueType() { -return valueType; - } + @JsonProperty("valueType") + public String getValueType() { + return valueType; + } -@JsonProperty("valueType") -public void setValueType(String valueType) { -this.valueType = valueType; - } + @JsonProperty("valueType") + public void setValueType(String valueType) { + this.valueType = valueType; + } -public Workstep withValueType(String valueType) { -this.valueType = valueType; -return this; - } + public Workstep withValueType(String valueType) { + this.valueType = valueType; + return this; + } -@JsonProperty("string") -public String getString() { -return string; - } + @JsonProperty("string") + public String getString() { + return string; + } -@JsonProperty("string") -public void setString(String string) { -this.string = string; - } + @JsonProperty("string") + public void setString(String string) { + this.string = string; + } -public Workstep withString(String string) { -this.string = string; -return this; - } + public Workstep withString(String string) { + this.string = string; + return this; + } -@JsonProperty("chars") -public String getChars() { -return chars; - } + @JsonProperty("chars") + public String getChars() { + return chars; + } -@JsonProperty("chars") -public void setChars(String chars) { -this.chars = chars; - } + @JsonProperty("chars") + public void setChars(String chars) { + this.chars = chars; + } -public Workstep withChars(String chars) { -this.chars = chars; -return this; - } + public Workstep withChars(String chars) { + this.chars = chars; + return this; + } } |