Update docker-compose for Macroflow with HEAT and small refactoring

[integration/csit.git] / plans / so / integration-etsi-testing / so-simulators / multicloud-simulator / src / main / java / org / onap / so / multicloudsimulator / beans / Resource.java

diff --git a/plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/Resource.java b/plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/Resource.java
index 368ab6d..666cbe0 100644 (file)
--- a/plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/Resource.java
+++ b/plans/so/integration-etsi-testing/so-simulators/multicloud-simulator/src/main/java/org/onap/so/multicloudsimulator/beans/Resource.java
@@ -1,15 +1,13 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright 2021 Huawei Technologies Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +15,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.so.multicloudsimulator.beans;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -25,11 +22,12 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({"resource-type", "resource-link"})
+@JsonPropertyOrder({ "resource-type", "resource-link" })
 public class Resource {
 
     @JsonProperty("resource-type")
     private String resourceType;
+
     @JsonProperty("resource-link")
     private String resourceLink;
 
@@ -38,20 +36,16 @@ public class Resource {
         return resourceType;
     }
 
-    @JsonProperty("resource-type")
-    public void setResourceType(String resourceType) {
+    public void setResourceType(final String resourceType) {
         this.resourceType = resourceType;
     }
 
-    @JsonProperty("resource-link")
     public String getResourceLink() {
         return resourceLink;
     }
 
-    //@JsonProperty("resource-link")
-    public void setResourceLink(String resourceLink) {
+    public void setResourceLink(final String resourceLink) {
         this.resourceLink = resourceLink;
     }
 
 }
-