Reformat openecomp-be

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3449
Change-Id: I13e02322f8e00820cc5a1d85752caaeda9bf10d1

24 files changed, 800 insertions, 886 deletions

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/ChoiceOrOtherDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/ChoiceOrOtherDto.java
index ba8f57f79f..fc3a41903b 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/ChoiceOrOtherDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/ChoiceOrOtherDto.java
@@ -7,9 +7,9 @@
  * 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,59 +17,53 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
+import javax.validation.constraints.NotNull;
 import org.hibernate.validator.group.GroupSequenceProvider;
 import org.openecomp.sdcrests.vendorlicense.types.validation.ChoiceOrOtherSequenceProvider;
 import org.openecomp.sdcrests.vendorlicense.types.validation.OtherChoiceValidation;
 
-import javax.validation.constraints.NotNull;
-
 @GroupSequenceProvider(value = ChoiceOrOtherSequenceProvider.class)
 public class ChoiceOrOtherDto<E extends Enum<E>> {
-  @NotNull
-  private E choice;
-  @NotNull(message = "may not be null when choice is set to 'Other'.",
-      groups = OtherChoiceValidation.class)
-  private String other;
-
-  public E getChoice() {
-    return choice;
-  }
-
-  public void setChoice(E choice) {
-    this.choice = choice;
-  }
 
-  public String getOther() {
-    return other;
-  }
+    @NotNull
+    private E choice;
+    @NotNull(message = "may not be null when choice is set to 'Other'.", groups = OtherChoiceValidation.class)
+    private String other;
 
-  public void setOther(String other) {
-    this.other = other;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (this == obj) {
-      return true;
+    public E getChoice() {
+        return choice;
     }
-    if (obj == null || getClass() != obj.getClass()) {
-      return false;
+
+    public void setChoice(E choice) {
+        this.choice = choice;
     }
 
-    ChoiceOrOtherDto<?> that = (ChoiceOrOtherDto<?>) obj;
+    public String getOther() {
+        return other;
+    }
 
-    return choice != null ? choice.equals(that.choice)
-        : that.choice == null && (other != null ? other.equals(that.other) : that.other == null);
+    public void setOther(String other) {
+        this.other = other;
+    }
 
-  }
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        ChoiceOrOtherDto<?> that = (ChoiceOrOtherDto<?>) obj;
+        return choice != null ? choice.equals(that.choice) : that.choice == null && (other != null ? other.equals(that.other) : that.other == null);
+    }
 
-  @Override
-  public int hashCode() {
-    int result = choice != null ? choice.hashCode() : 0;
-    result = 31 * result + (other != null ? other.hashCode() : 0);
-    return result;
-  }
+    @Override
+    public int hashCode() {
+        int result = choice != null ? choice.hashCode() : 0;
+        result = 31 * result + (other != null ? other.hashCode() : 0);
+        return result;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolEntityDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolEntityDto.java
index 88d08d6aa1..835d6fcbfe 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolEntityDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolEntityDto.java
@@ -7,9 +7,9 @@
  * 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,41 +17,39 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.Set;
 
 @Schema(description = "EntitlementPoolEntity")
 public class EntitlementPoolEntityDto extends EntitlementPoolRequestDto {
-  private String id;
-  private Set<String> referencingFeatureGroups;
-  private String versionUUID;
 
-  public String getId() {
-    return id;
-  }
+    private String id;
+    private Set<String> referencingFeatureGroups;
+    private String versionUUID;
+
+    public String getId() {
+        return id;
+    }
 
-  public void setId(String id) {
-    this.id = id;
-  }
+    public void setId(String id) {
+        this.id = id;
+    }
 
-  public Set<String> getReferencingFeatureGroups() {
-    return referencingFeatureGroups;
-  }
+    public Set<String> getReferencingFeatureGroups() {
+        return referencingFeatureGroups;
+    }
 
-  public void setReferencingFeatureGroups(Set<String> referencingFeatureGroups) {
-    this.referencingFeatureGroups = referencingFeatureGroups;
-  }
+    public void setReferencingFeatureGroups(Set<String> referencingFeatureGroups) {
+        this.referencingFeatureGroups = referencingFeatureGroups;
+    }
 
-  public String getversionUUID() {
-    return versionUUID;
-  }
+    public String getversionUUID() {
+        return versionUUID;
+    }
 
-  public void setVersionUUID(String versionUUID) {
-    this.versionUUID = versionUUID;
-  }
+    public void setVersionUUID(String versionUUID) {
+        this.versionUUID = versionUUID;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java
index 642156fa30..35e6f31e28 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/EntitlementPoolRequestDto.java
@@ -7,9 +7,9 @@
  * 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,17 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.hibernate.validator.constraints.NotBlank;
 import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolType;
 import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope;
 import org.openecomp.sdc.vendorlicense.dao.types.ThresholdUnit;
-
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -36,109 +33,102 @@ import javax.validation.constraints.Size;
 @JsonIgnoreProperties({"time", "aggregationFunction", "entitlementMetric"})
 public class EntitlementPoolRequestDto {
 
-  @NotNull
-  @Size(max = 120)
-  private String name;
-
-  @NotBlank(message = "is mandatory and should not be empty")
-  @Size(max = 100)
-  private String manufacturerReferenceNumber;
-
-  @Size(max = 1000)
-  private String description;
-
-  @NotNull
-  private EntitlementPoolType type;
-
-  private Integer thresholdValue;
-
-  private ThresholdUnit thresholdUnits;
-  @Size(max = 120)
-  private String increments;
-
-  @Valid
-  private MultiChoiceOrOtherDto<OperationalScope> operationalScope;
-
-  private String startDate;
-  private String expiryDate;
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getManufacturerReferenceNumber() {
-    return manufacturerReferenceNumber;
-  }
-
-  public void setManufacturerReferenceNumber(String manufacturerReferenceNumber) {
-    this.manufacturerReferenceNumber = manufacturerReferenceNumber;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public EntitlementPoolType getType() {
-    return type;
-  }
-
-  public void setType(EntitlementPoolType type) {
-    this.type = type;
-  }
-
-  public Integer getThresholdValue() {
-    return thresholdValue;
-  }
-
-  public void setThresholdValue(Integer thresholdValue) {
-    this.thresholdValue = thresholdValue;
-  }
-
-  public ThresholdUnit getThresholdUnits() {
-    return thresholdUnits;
-  }
-
-  public void setThresholdUnits(ThresholdUnit thresholdUnits) {
-    this.thresholdUnits = thresholdUnits;
-  }
-
-  public String getIncrements() {
-    return increments;
-  }
-
-  public void setIncrements(String increments) {
-    this.increments = increments;
-  }
-
-  public MultiChoiceOrOtherDto<OperationalScope> getOperationalScope() {
-    return operationalScope;
-  }
-
-  public void setOperationalScope(MultiChoiceOrOtherDto<OperationalScope> operationalScope) {
-    this.operationalScope = operationalScope;
-  }
-
-  public String getStartDate() {
-    return startDate;
-  }
-
-  public void setStartDate(String startDate) {
-    this.startDate = startDate;
-  }
-
-  public String getExpiryDate() {
-    return expiryDate;
-  }
-
-  public void setExpiryDate(String expiryDate) {
-    this.expiryDate = expiryDate;
-  }
+    @NotNull
+    @Size(max = 120)
+    private String name;
+    @NotBlank(message = "is mandatory and should not be empty")
+    @Size(max = 100)
+    private String manufacturerReferenceNumber;
+    @Size(max = 1000)
+    private String description;
+    @NotNull
+    private EntitlementPoolType type;
+    private Integer thresholdValue;
+    private ThresholdUnit thresholdUnits;
+    @Size(max = 120)
+    private String increments;
+    @Valid
+    private MultiChoiceOrOtherDto<OperationalScope> operationalScope;
+    private String startDate;
+    private String expiryDate;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getManufacturerReferenceNumber() {
+        return manufacturerReferenceNumber;
+    }
+
+    public void setManufacturerReferenceNumber(String manufacturerReferenceNumber) {
+        this.manufacturerReferenceNumber = manufacturerReferenceNumber;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public EntitlementPoolType getType() {
+        return type;
+    }
+
+    public void setType(EntitlementPoolType type) {
+        this.type = type;
+    }
+
+    public Integer getThresholdValue() {
+        return thresholdValue;
+    }
+
+    public void setThresholdValue(Integer thresholdValue) {
+        this.thresholdValue = thresholdValue;
+    }
+
+    public ThresholdUnit getThresholdUnits() {
+        return thresholdUnits;
+    }
+
+    public void setThresholdUnits(ThresholdUnit thresholdUnits) {
+        this.thresholdUnits = thresholdUnits;
+    }
+
+    public String getIncrements() {
+        return increments;
+    }
+
+    public void setIncrements(String increments) {
+        this.increments = increments;
+    }
+
+    public MultiChoiceOrOtherDto<OperationalScope> getOperationalScope() {
+        return operationalScope;
+    }
+
+    public void setOperationalScope(MultiChoiceOrOtherDto<OperationalScope> operationalScope) {
+        this.operationalScope = operationalScope;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getExpiryDate() {
+        return expiryDate;
+    }
+
+    public void setExpiryDate(String expiryDate) {
+        this.expiryDate = expiryDate;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupDescriptorDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupDescriptorDto.java
index 919fdb21c2..03bf2de328 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupDescriptorDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupDescriptorDto.java
@@ -7,9 +7,9 @@
  * 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,45 +17,42 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 public class FeatureGroupDescriptorDto {
-  @NotNull
-  @Size(max = 120)
-  private String name;
-
-  @Size(max = 1000)
-  private String description;
-  @NotNull
-  private String partNumber;
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public String getPartNumber() {
-    return partNumber;
-  }
-
-  public void setPartNumber(String partNumber) {
-    this.partNumber = partNumber;
-  }
 
+    @NotNull
+    @Size(max = 120)
+    private String name;
+    @Size(max = 1000)
+    private String description;
+    @NotNull
+    private String partNumber;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getPartNumber() {
+        return partNumber;
+    }
+
+    public void setPartNumber(String partNumber) {
+        this.partNumber = partNumber;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupEntityDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupEntityDto.java
index eac6ed38fe..679dfbbeca 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupEntityDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupEntityDto.java
@@ -7,9 +7,9 @@
  * 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,52 +17,50 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
-import javax.validation.constraints.Size;
 import java.util.Set;
+import javax.validation.constraints.Size;
 
 @Schema(description = "FeatureGroupEntity")
 public class FeatureGroupEntityDto extends FeatureGroupDescriptorDto {
-  private String id;
-  private Set<String> licenseKeyGroupsIds;
-  @Size(min = 1)
-  private Set<String> entitlementPoolsIds;
-  private Set<String> referencingLicenseAgreements;
 
-  public String getId() {
-    return id;
-  }
+    private String id;
+    private Set<String> licenseKeyGroupsIds;
+    @Size(min = 1)
+    private Set<String> entitlementPoolsIds;
+    private Set<String> referencingLicenseAgreements;
+
+    public String getId() {
+        return id;
+    }
 
-  public void setId(String id) {
-    this.id = id;
-  }
+    public void setId(String id) {
+        this.id = id;
+    }
 
-  public Set<String> getLicenseKeyGroupsIds() {
-    return licenseKeyGroupsIds;
-  }
+    public Set<String> getLicenseKeyGroupsIds() {
+        return licenseKeyGroupsIds;
+    }
 
-  public void setLicenseKeyGroupsIds(Set<String> licenseKeyGroupsIds) {
-    this.licenseKeyGroupsIds = licenseKeyGroupsIds;
-  }
+    public void setLicenseKeyGroupsIds(Set<String> licenseKeyGroupsIds) {
+        this.licenseKeyGroupsIds = licenseKeyGroupsIds;
+    }
 
-  public Set<String> getEntitlementPoolsIds() {
-    return entitlementPoolsIds;
-  }
+    public Set<String> getEntitlementPoolsIds() {
+        return entitlementPoolsIds;
+    }
 
-  public void setEntitlementPoolsIds(Set<String> entitlementPoolsIds) {
-    this.entitlementPoolsIds = entitlementPoolsIds;
-  }
+    public void setEntitlementPoolsIds(Set<String> entitlementPoolsIds) {
+        this.entitlementPoolsIds = entitlementPoolsIds;
+    }
 
-  public Set<String> getReferencingLicenseAgreements() {
-    return referencingLicenseAgreements;
-  }
+    public Set<String> getReferencingLicenseAgreements() {
+        return referencingLicenseAgreements;
+    }
 
-  public void setReferencingLicenseAgreements(Set<String> referencingLicenseAgreements) {
-    this.referencingLicenseAgreements = referencingLicenseAgreements;
-  }
+    public void setReferencingLicenseAgreements(Set<String> referencingLicenseAgreements) {
+        this.referencingLicenseAgreements = referencingLicenseAgreements;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupModelDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupModelDto.java
index 44404c3b1f..485e362288 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupModelDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupModelDto.java
@@ -7,9 +7,9 @@
  * 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,52 +17,49 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.Collection;
 import java.util.Set;
 
 @Schema(description = "FeatureGroupModel")
 public class FeatureGroupModelDto extends FeatureGroupDescriptorDto {
-  private String id;
-  private Set<String> referencingLicenseAgreements;
-  private Collection<LicenseKeyGroupEntityDto> licenseKeyGroups;
-  private Collection<EntitlementPoolEntityDto> entitlementPools;
 
-  public String getId() {
-    return id;
-  }
+    private String id;
+    private Set<String> referencingLicenseAgreements;
+    private Collection<LicenseKeyGroupEntityDto> licenseKeyGroups;
+    private Collection<EntitlementPoolEntityDto> entitlementPools;
+
+    public String getId() {
+        return id;
+    }
 
-  public void setId(String id) {
-    this.id = id;
-  }
+    public void setId(String id) {
+        this.id = id;
+    }
 
-  public Set<String> getReferencingLicenseAgreements() {
-    return referencingLicenseAgreements;
-  }
+    public Set<String> getReferencingLicenseAgreements() {
+        return referencingLicenseAgreements;
+    }
 
-  public void setReferencingLicenseAgreements(Set<String> referencingLicenseAgreements) {
-    this.referencingLicenseAgreements = referencingLicenseAgreements;
-  }
+    public void setReferencingLicenseAgreements(Set<String> referencingLicenseAgreements) {
+        this.referencingLicenseAgreements = referencingLicenseAgreements;
+    }
 
-  public Collection<LicenseKeyGroupEntityDto> getLicenseKeyGroups() {
-    return licenseKeyGroups;
-  }
+    public Collection<LicenseKeyGroupEntityDto> getLicenseKeyGroups() {
+        return licenseKeyGroups;
+    }
 
-  public void setLicenseKeyGroups(Collection<LicenseKeyGroupEntityDto> licenseKeyGroups) {
-    this.licenseKeyGroups = licenseKeyGroups;
-  }
+    public void setLicenseKeyGroups(Collection<LicenseKeyGroupEntityDto> licenseKeyGroups) {
+        this.licenseKeyGroups = licenseKeyGroups;
+    }
 
-  public Collection<EntitlementPoolEntityDto> getEntitlementPools() {
-    return entitlementPools;
-  }
+    public Collection<EntitlementPoolEntityDto> getEntitlementPools() {
+        return entitlementPools;
+    }
 
-  public void setEntitlementPools(Collection<EntitlementPoolEntityDto> entitlementPools) {
-    this.entitlementPools = entitlementPools;
-  }
+    public void setEntitlementPools(Collection<EntitlementPoolEntityDto> entitlementPools) {
+        this.entitlementPools = entitlementPools;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupRequestDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupRequestDto.java
index 3aefaa1d45..27fb954957 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupRequestDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupRequestDto.java
@@ -7,9 +7,9 @@
  * 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,33 +17,30 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.Set;
 
 @Schema(description = "FeatureGroupRequest")
 public class FeatureGroupRequestDto extends FeatureGroupDescriptorDto {
 
-  private Set<String> addedLicenseKeyGroupsIds;
-  private Set<String> addedEntitlementPoolsIds;
+    private Set<String> addedLicenseKeyGroupsIds;
+    private Set<String> addedEntitlementPoolsIds;
 
-  public Set<String> getAddedLicenseKeyGroupsIds() {
-    return addedLicenseKeyGroupsIds;
-  }
+    public Set<String> getAddedLicenseKeyGroupsIds() {
+        return addedLicenseKeyGroupsIds;
+    }
 
-  public void setAddedLicenseKeyGroupsIds(Set<String> addedLicenseKeyGroupsIds) {
-    this.addedLicenseKeyGroupsIds = addedLicenseKeyGroupsIds;
-  }
+    public void setAddedLicenseKeyGroupsIds(Set<String> addedLicenseKeyGroupsIds) {
+        this.addedLicenseKeyGroupsIds = addedLicenseKeyGroupsIds;
+    }
 
-  public Set<String> getAddedEntitlementPoolsIds() {
-    return addedEntitlementPoolsIds;
-  }
+    public Set<String> getAddedEntitlementPoolsIds() {
+        return addedEntitlementPoolsIds;
+    }
 
-  public void setAddedEntitlementPoolsIds(Set<String> addedEntitlementPoolsIds) {
-    this.addedEntitlementPoolsIds = addedEntitlementPoolsIds;
-  }
+    public void setAddedEntitlementPoolsIds(Set<String> addedEntitlementPoolsIds) {
+        this.addedEntitlementPoolsIds = addedEntitlementPoolsIds;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupUpdateRequestDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupUpdateRequestDto.java
index 9e3fab59ee..016735fced 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupUpdateRequestDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/FeatureGroupUpdateRequestDto.java
@@ -7,9 +7,9 @@
  * 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,33 +17,30 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.Set;
 
 @Schema(description = "FeatureGroupUpdateRequest")
 public class FeatureGroupUpdateRequestDto extends FeatureGroupRequestDto {
 
-  private Set<String> removedLicenseKeyGroupsIds;
-  private Set<String> removedEntitlementPoolsIds;
+    private Set<String> removedLicenseKeyGroupsIds;
+    private Set<String> removedEntitlementPoolsIds;
 
-  public Set<String> getRemovedLicenseKeyGroupsIds() {
-    return removedLicenseKeyGroupsIds;
-  }
+    public Set<String> getRemovedLicenseKeyGroupsIds() {
+        return removedLicenseKeyGroupsIds;
+    }
 
-  public void setRemovedLicenseKeyGroupsIds(Set<String> removedLicenseKeyGroupsIds) {
-    this.removedLicenseKeyGroupsIds = removedLicenseKeyGroupsIds;
-  }
+    public void setRemovedLicenseKeyGroupsIds(Set<String> removedLicenseKeyGroupsIds) {
+        this.removedLicenseKeyGroupsIds = removedLicenseKeyGroupsIds;
+    }
 
-  public Set<String> getRemovedEntitlementPoolsIds() {
-    return removedEntitlementPoolsIds;
-  }
+    public Set<String> getRemovedEntitlementPoolsIds() {
+        return removedEntitlementPoolsIds;
+    }
 
-  public void setRemovedEntitlementPoolsIds(Set<String> removedEntitlementPoolsIds) {
-    this.removedEntitlementPoolsIds = removedEntitlementPoolsIds;
-  }
+    public void setRemovedEntitlementPoolsIds(Set<String> removedEntitlementPoolsIds) {
+        this.removedEntitlementPoolsIds = removedEntitlementPoolsIds;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementDescriptorDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementDescriptorDto.java
index 4239488124..cd72d151dc 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementDescriptorDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementDescriptorDto.java
@@ -7,9 +7,9 @@
  * 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,58 +17,55 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-import org.openecomp.sdc.vendorlicense.dao.types.LicenseTerm;
-
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import org.openecomp.sdc.vendorlicense.dao.types.LicenseTerm;
 
 public class LicenseAgreementDescriptorDto {
 
-  @NotNull
-  @Size(max = 120)
-  private String name;
-
-  @Size(max = 1000)
-  private String description;
-  @NotNull
-  @Valid
-  private ChoiceOrOtherDto<LicenseTerm> licenseTerm;
-  @Size(max = 1000)
-  private String requirementsAndConstrains;
+    @NotNull
+    @Size(max = 120)
+    private String name;
+    @Size(max = 1000)
+    private String description;
+    @NotNull
+    @Valid
+    private ChoiceOrOtherDto<LicenseTerm> licenseTerm;
+    @Size(max = 1000)
+    private String requirementsAndConstrains;
 
-  public String getName() {
-    return name;
-  }
+    public String getName() {
+        return name;
+    }
 
-  public void setName(String name) {
-    this.name = name;
-  }
+    public void setName(String name) {
+        this.name = name;
+    }
 
-  public String getDescription() {
-    return description;
-  }
+    public String getDescription() {
+        return description;
+    }
 
-  public void setDescription(String description) {
-    this.description = description;
-  }
+    public void setDescription(String description) {
+        this.description = description;
+    }
 
-  public ChoiceOrOtherDto<LicenseTerm> getLicenseTerm() {
-    return licenseTerm;
-  }
+    public ChoiceOrOtherDto<LicenseTerm> getLicenseTerm() {
+        return licenseTerm;
+    }
 
-  public void setLicenseTerm(ChoiceOrOtherDto<LicenseTerm> licenseTerm) {
-    this.licenseTerm = licenseTerm;
-  }
+    public void setLicenseTerm(ChoiceOrOtherDto<LicenseTerm> licenseTerm) {
+        this.licenseTerm = licenseTerm;
+    }
 
-  public String getRequirementsAndConstrains() {
-    return requirementsAndConstrains;
-  }
+    public String getRequirementsAndConstrains() {
+        return requirementsAndConstrains;
+    }
 
-  public void setRequirementsAndConstrains(String requirementsAndConstrains) {
-    this.requirementsAndConstrains = requirementsAndConstrains;
-  }
+    public void setRequirementsAndConstrains(String requirementsAndConstrains) {
+        this.requirementsAndConstrains = requirementsAndConstrains;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementEntityDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementEntityDto.java
index e3b6207eaa..423edcfe59 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementEntityDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementEntityDto.java
@@ -7,9 +7,9 @@
  * 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,35 +17,32 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
-import javax.validation.constraints.Size;
 import java.util.Set;
+import javax.validation.constraints.Size;
 
 @Schema(description = "LicenseAgreementEntity")
 public class LicenseAgreementEntityDto extends LicenseAgreementDescriptorDto {
-  private String id;
-  @Size(min = 1)
-  private Set<String> featureGroupsIds;
 
-  public String getId() {
-    return id;
-  }
+    private String id;
+    @Size(min = 1)
+    private Set<String> featureGroupsIds;
+
+    public String getId() {
+        return id;
+    }
 
-  public void setId(String id) {
-    this.id = id;
-  }
+    public void setId(String id) {
+        this.id = id;
+    }
 
-  public Set<String> getFeatureGroupsIds() {
-    return featureGroupsIds;
-  }
+    public Set<String> getFeatureGroupsIds() {
+        return featureGroupsIds;
+    }
 
-  public void setFeatureGroupsIds(Set<String> featureGroupsIds) {
-    this.featureGroupsIds = featureGroupsIds;
-  }
+    public void setFeatureGroupsIds(Set<String> featureGroupsIds) {
+        this.featureGroupsIds = featureGroupsIds;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementModelDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementModelDto.java
index 3c97756c3c..8365476e8d 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementModelDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementModelDto.java
@@ -7,9 +7,9 @@
  * 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,33 +17,30 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.Set;
 
 @Schema(description = "LicenseAgreementModel")
 public class LicenseAgreementModelDto extends LicenseAgreementDescriptorDto {
-  private String id;
-  private Set<FeatureGroupEntityDto> featureGroups;
 
-  public String getId() {
-    return id;
-  }
+    private String id;
+    private Set<FeatureGroupEntityDto> featureGroups;
+
+    public String getId() {
+        return id;
+    }
 
-  public void setId(String id) {
-    this.id = id;
-  }
+    public void setId(String id) {
+        this.id = id;
+    }
 
-  public Set<FeatureGroupEntityDto> getFeatureGroups() {
-    return featureGroups;
-  }
+    public Set<FeatureGroupEntityDto> getFeatureGroups() {
+        return featureGroups;
+    }
 
-  public void setFeatureGroups(Set<FeatureGroupEntityDto> featureGroups) {
-    this.featureGroups = featureGroups;
-  }
+    public void setFeatureGroups(Set<FeatureGroupEntityDto> featureGroups) {
+        this.featureGroups = featureGroups;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementRequestDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementRequestDto.java
index 358dcef8e2..ee90e989e2 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementRequestDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementRequestDto.java
@@ -7,9 +7,9 @@
  * 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,24 +17,21 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.Set;
 
 @Schema(description = "LicenseAgreementRequest")
 public class LicenseAgreementRequestDto extends LicenseAgreementDescriptorDto {
 
-  private Set<String> addedFeatureGroupsIds;
+    private Set<String> addedFeatureGroupsIds;
 
-  public Set<String> getAddedFeatureGroupsIds() {
-    return addedFeatureGroupsIds;
-  }
+    public Set<String> getAddedFeatureGroupsIds() {
+        return addedFeatureGroupsIds;
+    }
 
-  public void setAddedFeatureGroupsIds(Set<String> addedFeatureGroupsIds) {
-    this.addedFeatureGroupsIds = addedFeatureGroupsIds;
-  }
+    public void setAddedFeatureGroupsIds(Set<String> addedFeatureGroupsIds) {
+        this.addedFeatureGroupsIds = addedFeatureGroupsIds;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementUpdateRequestDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementUpdateRequestDto.java
index 6baba8acb3..3fbba212dd 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementUpdateRequestDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseAgreementUpdateRequestDto.java
@@ -7,9 +7,9 @@
  * 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,23 +17,21 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.Set;
 
 @Schema(description = "LicenseAgreementUpdateRequest")
 public class LicenseAgreementUpdateRequestDto extends LicenseAgreementRequestDto {
-  private Set<String> removedFeatureGroupsIds;
 
-  public Set<String> getRemovedFeatureGroupsIds() {
-    return removedFeatureGroupsIds;
-  }
+    private Set<String> removedFeatureGroupsIds;
+
+    public Set<String> getRemovedFeatureGroupsIds() {
+        return removedFeatureGroupsIds;
+    }
 
-  public void setRemovedFeatureGroupsIds(Set<String> removedFeatureGroupsIds) {
-    this.removedFeatureGroupsIds = removedFeatureGroupsIds;
-  }
+    public void setRemovedFeatureGroupsIds(Set<String> removedFeatureGroupsIds) {
+        this.removedFeatureGroupsIds = removedFeatureGroupsIds;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupEntityDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupEntityDto.java
index 6186398d29..6ee80bd801 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupEntityDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupEntityDto.java
@@ -7,9 +7,9 @@
  * 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,38 +17,37 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-
 import java.util.Set;
 
 public class LicenseKeyGroupEntityDto extends LicenseKeyGroupRequestDto {
-  private String id;
-  private Set<String> referencingFeatureGroups;
-  private String versionUUID;
 
-  public String getId() {
-    return id;
-  }
+    private String id;
+    private Set<String> referencingFeatureGroups;
+    private String versionUUID;
+
+    public String getId() {
+        return id;
+    }
 
-  public void setId(String id) {
-    this.id = id;
-  }
+    public void setId(String id) {
+        this.id = id;
+    }
 
-  public Set<String> getReferencingFeatureGroups() {
-    return referencingFeatureGroups;
-  }
+    public Set<String> getReferencingFeatureGroups() {
+        return referencingFeatureGroups;
+    }
 
-  public void setReferencingFeatureGroups(Set<String> referencingFeatureGroups) {
-    this.referencingFeatureGroups = referencingFeatureGroups;
-  }
+    public void setReferencingFeatureGroups(Set<String> referencingFeatureGroups) {
+        this.referencingFeatureGroups = referencingFeatureGroups;
+    }
 
-  public String getVersionUUID() {
-    return versionUUID;
-  }
+    public String getVersionUUID() {
+        return versionUUID;
+    }
 
-  public void setVersionUUID(String versionUUID) {
-    this.versionUUID = versionUUID;
-  }
+    public void setVersionUUID(String versionUUID) {
+        this.versionUUID = versionUUID;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupRequestDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupRequestDto.java
index c1e2ef05bf..2eabb0aa4a 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupRequestDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LicenseKeyGroupRequestDto.java
@@ -7,9 +7,9 @@
  * 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,121 +17,112 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyType;
-import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope;
-import org.openecomp.sdc.vendorlicense.dao.types.ThresholdUnit;
-
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyType;
+import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope;
+import org.openecomp.sdc.vendorlicense.dao.types.ThresholdUnit;
 
 public class LicenseKeyGroupRequestDto {
-  @NotNull
-  @Size(max = 120)
-  private String name;
-
-  @Size(max = 100)
-  private String manufacturerReferenceNumber;
-
-  @Size(max = 1000)
-  private String description;
-
-  @NotNull
-  private LicenseKeyType type;
-
-  @Valid
-  private MultiChoiceOrOtherDto<OperationalScope> operationalScope;
-
-  private String startDate;
-  private String expiryDate;
-
-  private Integer thresholdValue;
-
-  private ThresholdUnit thresholdUnits;
-
-  @Size(max = 120)
-  private String increments;
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getManufacturerReferenceNumber() {
-    return manufacturerReferenceNumber;
-  }
-
-  public void setManufacturerReferenceNumber(String manufacturerReferenceNumber) {
-    this.manufacturerReferenceNumber = manufacturerReferenceNumber;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public LicenseKeyType getType() {
-    return type;
-  }
-
-  public void setType(LicenseKeyType type) {
-    this.type = type;
-  }
-
-  public MultiChoiceOrOtherDto<OperationalScope> getOperationalScope() {
-    return operationalScope;
-  }
-
-  public void setOperationalScope(MultiChoiceOrOtherDto<OperationalScope> operationalScope) {
-    this.operationalScope = operationalScope;
-  }
-
-  public String getStartDate() {
-    return startDate;
-  }
-
-  public void setStartDate(String startDate) {
-    this.startDate = startDate;
-  }
-
-  public String getExpiryDate() {
-    return expiryDate;
-  }
-
-  public void setExpiryDate(String expiryDate) {
-    this.expiryDate = expiryDate;
-  }
-
-  public Integer getThresholdValue() {
-    return thresholdValue;
-  }
-
-  public void setThresholdValue(Integer thresholdValue) {
-    this.thresholdValue = thresholdValue;
-  }
-
-  public ThresholdUnit getThresholdUnits() {
-    return thresholdUnits;
-  }
-
-  public void setThresholdUnits(ThresholdUnit thresholdUnits) {
-    this.thresholdUnits = thresholdUnits;
-  }
-
-  public String getIncrements() {
-    return increments;
-  }
 
-  public void setIncrements(String increments) {
-    this.increments = increments;
-  }
+    @NotNull
+    @Size(max = 120)
+    private String name;
+    @Size(max = 100)
+    private String manufacturerReferenceNumber;
+    @Size(max = 1000)
+    private String description;
+    @NotNull
+    private LicenseKeyType type;
+    @Valid
+    private MultiChoiceOrOtherDto<OperationalScope> operationalScope;
+    private String startDate;
+    private String expiryDate;
+    private Integer thresholdValue;
+    private ThresholdUnit thresholdUnits;
+    @Size(max = 120)
+    private String increments;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getManufacturerReferenceNumber() {
+        return manufacturerReferenceNumber;
+    }
+
+    public void setManufacturerReferenceNumber(String manufacturerReferenceNumber) {
+        this.manufacturerReferenceNumber = manufacturerReferenceNumber;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public LicenseKeyType getType() {
+        return type;
+    }
+
+    public void setType(LicenseKeyType type) {
+        this.type = type;
+    }
+
+    public MultiChoiceOrOtherDto<OperationalScope> getOperationalScope() {
+        return operationalScope;
+    }
+
+    public void setOperationalScope(MultiChoiceOrOtherDto<OperationalScope> operationalScope) {
+        this.operationalScope = operationalScope;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getExpiryDate() {
+        return expiryDate;
+    }
+
+    public void setExpiryDate(String expiryDate) {
+        this.expiryDate = expiryDate;
+    }
+
+    public Integer getThresholdValue() {
+        return thresholdValue;
+    }
+
+    public void setThresholdValue(Integer thresholdValue) {
+        this.thresholdValue = thresholdValue;
+    }
+
+    public ThresholdUnit getThresholdUnits() {
+        return thresholdUnits;
+    }
+
+    public void setThresholdUnits(ThresholdUnit thresholdUnits) {
+        this.thresholdUnits = thresholdUnits;
+    }
+
+    public String getIncrements() {
+        return increments;
+    }
+
+    public void setIncrements(String increments) {
+        this.increments = increments;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LimitEntityDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LimitEntityDto.java
index e3e3584b34..a22bb0a64d 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LimitEntityDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LimitEntityDto.java
@@ -7,9 +7,9 @@
  * 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,90 +17,89 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
 public class LimitEntityDto {
 
-  private String id;
-  private String name;
-  private String type;
-  private String description;
-  private String metric;
-  private String value;
-  private String unit;
-  private String aggregationFunction;
-  private String time;
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public String getMetric() {
-    return metric;
-  }
-
-  public void setMetric(String metric) {
-    this.metric = metric;
-  }
-
-  public String getUnit() {
-    return unit;
-  }
-
-  public void setUnit(String unit) {
-    this.unit = unit;
-  }
-
-  public String getAggregationFunction() {
-    return aggregationFunction;
-  }
-
-  public void setAggregationFunction(String aggregationFunction) {
-    this.aggregationFunction = aggregationFunction;
-  }
-
-  public String getTime() {
-    return time;
-  }
-
-  public void setTime(String time) {
-    this.time = time;
-  }
-
-  public String getValue() {
-    return value;
-  }
-
-  public void setValue(String value) {
-    this.value = value;
-  }
+    private String id;
+    private String name;
+    private String type;
+    private String description;
+    private String metric;
+    private String value;
+    private String unit;
+    private String aggregationFunction;
+    private String time;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getMetric() {
+        return metric;
+    }
+
+    public void setMetric(String metric) {
+        this.metric = metric;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getAggregationFunction() {
+        return aggregationFunction;
+    }
+
+    public void setAggregationFunction(String aggregationFunction) {
+        this.aggregationFunction = aggregationFunction;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LimitRequestDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LimitRequestDto.java
index 116be31a40..fff840c402 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LimitRequestDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/LimitRequestDto.java
@@ -7,9 +7,9 @@
  * 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,95 +17,91 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.hibernate.validator.constraints.NotBlank;
-
 import javax.validation.constraints.Size;
+import org.hibernate.validator.constraints.NotBlank;
 
 @Schema(description = "LimitRequest")
 public class LimitRequestDto {
 
-  @NotBlank(message = "is mandatory and should not be empty")
-  @Size(max = 120, message = "length should not exceed 120 characters.")
-  private String name;
-  @NotBlank(message = "is mandatory and should not be empty")
-  private String type;
-  @Size(max = 1000, message = "length should not exceed 1000 characters.")
-  private String description;
-  @NotBlank(message = "is mandatory and should not be empty")
-  private String metric;
-  @NotBlank(message = "is mandatory and should not be empty")
-  private String value;
-  private String unit;
-  private String aggregationFunction;
-  private String time;
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public String getMetric() {
-    return metric;
-  }
-
-  public void setMetric(String metric) {
-    this.metric = metric;
-  }
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public String getAggregationFunction() {
-    return aggregationFunction;
-  }
-
-  public void setAggregationFunction(
-      String aggregationFunction) {
-    this.aggregationFunction = aggregationFunction;
-  }
-
-  public String getTime() {
-    return time;
-  }
-
-  public void setTime(String time) {
-    this.time = time;
-  }
-
-  public String getUnit() {
-    return unit;
-  }
-
-  public void setUnit(String unit) {
-    this.unit = unit;
-  }
-
-  public String getValue() {
-    return value;
-  }
-
-  public void setValue(String value) {
-    this.value = value;
-  }
-
+    @NotBlank(message = "is mandatory and should not be empty")
+    @Size(max = 120, message = "length should not exceed 120 characters.")
+    private String name;
+    @NotBlank(message = "is mandatory and should not be empty")
+    private String type;
+    @Size(max = 1000, message = "length should not exceed 1000 characters.")
+    private String description;
+    @NotBlank(message = "is mandatory and should not be empty")
+    private String metric;
+    @NotBlank(message = "is mandatory and should not be empty")
+    private String value;
+    private String unit;
+    private String aggregationFunction;
+    private String time;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getMetric() {
+        return metric;
+    }
+
+    public void setMetric(String metric) {
+        this.metric = metric;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getAggregationFunction() {
+        return aggregationFunction;
+    }
+
+    public void setAggregationFunction(String aggregationFunction) {
+        this.aggregationFunction = aggregationFunction;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/MultiChoiceOrOtherDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/MultiChoiceOrOtherDto.java
index 1dc8ff2bdd..7a3266da96 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/MultiChoiceOrOtherDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/MultiChoiceOrOtherDto.java
@@ -7,9 +7,9 @@
  * 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,62 +17,57 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
+import java.util.Set;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import org.hibernate.validator.group.GroupSequenceProvider;
 import org.openecomp.sdcrests.vendorlicense.types.validation.MultiChoiceOrOtherSequenceProvider;
 import org.openecomp.sdcrests.vendorlicense.types.validation.OtherChoiceValidation;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.util.Set;
-
 @GroupSequenceProvider(value = MultiChoiceOrOtherSequenceProvider.class)
 public class MultiChoiceOrOtherDto<E extends Enum<E>> {
-  @NotNull
-  @Size(min = 1, message = "must contain at least 1 choice.")
-  private Set<E> choices;
-  @NotNull(message = "may not be null when choices is set to 'Other'.",
-      groups = OtherChoiceValidation.class)
-  private String other;
 
-  public Set<E> getChoices() {
-    return choices;
-  }
+    @NotNull
+    @Size(min = 1, message = "must contain at least 1 choice.")
+    private Set<E> choices;
+    @NotNull(message = "may not be null when choices is set to 'Other'.", groups = OtherChoiceValidation.class)
+    private String other;
 
-  public void setChoices(Set<E> choices) {
-    this.choices = choices;
-  }
-
-  public String getOther() {
-    return other;
-  }
-
-  public void setOther(String other) {
-    this.other = other;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (this == obj) {
-      return true;
+    public Set<E> getChoices() {
+        return choices;
     }
-    if (obj == null || getClass() != obj.getClass()) {
-      return false;
+
+    public void setChoices(Set<E> choices) {
+        this.choices = choices;
     }
 
-    MultiChoiceOrOtherDto<?> that = (MultiChoiceOrOtherDto<?>) obj;
+    public String getOther() {
+        return other;
+    }
 
-    return choices != null ? choices.equals(that.choices)
-        : that.choices == null && (other != null ? other.equals(that.other) : that.other == null);
+    public void setOther(String other) {
+        this.other = other;
+    }
 
-  }
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        MultiChoiceOrOtherDto<?> that = (MultiChoiceOrOtherDto<?>) obj;
+        return choices != null ? choices.equals(that.choices)
+            : that.choices == null && (other != null ? other.equals(that.other) : that.other == null);
+    }
 
-  @Override
-  public int hashCode() {
-    int result = choices != null ? choices.hashCode() : 0;
-    result = 31 * result + (other != null ? other.hashCode() : 0);
-    return result;
-  }
+    @Override
+    public int hashCode() {
+        int result = choices != null ? choices.hashCode() : 0;
+        result = 31 * result + (other != null ? other.hashCode() : 0);
+        return result;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/VendorLicenseModelActionRequestDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/VendorLicenseModelActionRequestDto.java
index 68e0fd8552..53be21f0bc 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/VendorLicenseModelActionRequestDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/VendorLicenseModelActionRequestDto.java
@@ -7,9 +7,9 @@
  * 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,33 +17,30 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
 import org.openecomp.sdcrests.item.types.SubmitRequestDto;
 
 public class VendorLicenseModelActionRequestDto {
 
-  private VendorLicenseModelAction action;
-  private SubmitRequestDto submitRequest;
+    private VendorLicenseModelAction action;
+    private SubmitRequestDto submitRequest;
 
-  public VendorLicenseModelAction getAction() {
-    return action;
-  }
+    public VendorLicenseModelAction getAction() {
+        return action;
+    }
 
-  public void setAction(VendorLicenseModelAction action) {
-    this.action = action;
-  }
+    public void setAction(VendorLicenseModelAction action) {
+        this.action = action;
+    }
 
-  public SubmitRequestDto getSubmitRequest() {
-    return submitRequest;
-  }
+    public SubmitRequestDto getSubmitRequest() {
+        return submitRequest;
+    }
 
-  public void setSubmitRequest(SubmitRequestDto submitRequest) {
-    this.submitRequest = submitRequest;
-  }
+    public void setSubmitRequest(SubmitRequestDto submitRequest) {
+        this.submitRequest = submitRequest;
+    }
 
-  public enum VendorLicenseModelAction {
-    Submit
-  }
+    public enum VendorLicenseModelAction {Submit}
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/VendorLicenseModelEntityDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/VendorLicenseModelEntityDto.java
index 2162006c16..2c647647d8 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/VendorLicenseModelEntityDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/VendorLicenseModelEntityDto.java
@@ -7,9 +7,9 @@
  * 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,21 +17,20 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @Schema(description = "VendorLicenseModelEntity")
 public class VendorLicenseModelEntityDto extends VendorLicenseModelRequestDto {
-  private String id;
 
-  public String getId() {
-    return id;
-  }
+    private String id;
+
+    public String getId() {
+        return id;
+    }
 
-  public void setId(String id) {
-    this.id = id;
-  }
+    public void setId(String id) {
+        this.id = id;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/VendorLicenseModelRequestDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/VendorLicenseModelRequestDto.java
index da2a3e742d..625cc721a9 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/VendorLicenseModelRequestDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/VendorLicenseModelRequestDto.java
@@ -7,9 +7,9 @@
  * 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,48 +17,45 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types;
 
-
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 @Schema(description = "VendorLicenseModelRequest")
 public class VendorLicenseModelRequestDto {
-  @NotNull
-  @Size(max = 25)
-  private String vendorName;
-  @NotNull
-  @Size(max = 1000)
-  private String description;
-  @NotNull
-  private String iconRef;
-
-  public String getVendorName() {
-    return vendorName;
-  }
-
-  public void setVendorName(String vendorName) {
-    this.vendorName = vendorName;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public String getIconRef() {
-    return iconRef;
-  }
 
-  public void setIconRef(String iconRef) {
-    this.iconRef = iconRef;
-  }
+    @NotNull
+    @Size(max = 25)
+    private String vendorName;
+    @NotNull
+    @Size(max = 1000)
+    private String description;
+    @NotNull
+    private String iconRef;
+
+    public String getVendorName() {
+        return vendorName;
+    }
+
+    public void setVendorName(String vendorName) {
+        this.vendorName = vendorName;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getIconRef() {
+        return iconRef;
+    }
+
+    public void setIconRef(String iconRef) {
+        this.iconRef = iconRef;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/validation/ChoiceOrOtherSequenceProvider.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/validation/ChoiceOrOtherSequenceProvider.java
index 8be0ba3231..d2cc51c769 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/validation/ChoiceOrOtherSequenceProvider.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/validation/ChoiceOrOtherSequenceProvider.java
@@ -7,9 +7,9 @@
  * 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,29 +17,23 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types.validation;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.hibernate.validator.spi.group.DefaultGroupSequenceProvider;
 import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther;
 import org.openecomp.sdcrests.vendorlicense.types.ChoiceOrOtherDto;
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class ChoiceOrOtherSequenceProvider
-    implements DefaultGroupSequenceProvider<ChoiceOrOtherDto> {
+public class ChoiceOrOtherSequenceProvider implements DefaultGroupSequenceProvider<ChoiceOrOtherDto> {
 
-  @Override
-  public List<Class<?>> getValidationGroups(ChoiceOrOtherDto choiceOrOther) {
-    List<Class<?>> sequence = new ArrayList<>();
-    sequence.add(ChoiceOrOtherDto.class);
-
-    if (choiceOrOther != null && choiceOrOther.getChoice() != null
-        && ChoiceOrOther.OTHER_ENUM_VALUE.equals(choiceOrOther.getChoice().name())) {
-      sequence.add(OtherChoiceValidation.class);
+    @Override
+    public List<Class<?>> getValidationGroups(ChoiceOrOtherDto choiceOrOther) {
+        List<Class<?>> sequence = new ArrayList<>();
+        sequence.add(ChoiceOrOtherDto.class);
+        if (choiceOrOther != null && choiceOrOther.getChoice() != null && ChoiceOrOther.OTHER_ENUM_VALUE.equals(choiceOrOther.getChoice().name())) {
+            sequence.add(OtherChoiceValidation.class);
+        }
+        return sequence;
     }
-
-    return sequence;
-  }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/validation/MultiChoiceOrOtherSequenceProvider.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/validation/MultiChoiceOrOtherSequenceProvider.java
index 7cc9bbd2a2..446a7c2ec7 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/validation/MultiChoiceOrOtherSequenceProvider.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/validation/MultiChoiceOrOtherSequenceProvider.java
@@ -7,9 +7,9 @@
  * 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,31 +17,24 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types.validation;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.hibernate.validator.spi.group.DefaultGroupSequenceProvider;
 import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther;
 import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto;
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class MultiChoiceOrOtherSequenceProvider
-    implements DefaultGroupSequenceProvider<MultiChoiceOrOtherDto> {
+public class MultiChoiceOrOtherSequenceProvider implements DefaultGroupSequenceProvider<MultiChoiceOrOtherDto> {
 
-  @Override
-  public List<Class<?>> getValidationGroups(MultiChoiceOrOtherDto multiChoiceOrOther) {
-    List<Class<?>> sequence = new ArrayList<>();
-    sequence.add(MultiChoiceOrOtherDto.class);
-
-    if (multiChoiceOrOther != null && multiChoiceOrOther.getChoices() != null
-        && multiChoiceOrOther.getChoices().size() == 1
-        && MultiChoiceOrOther.OTHER_ENUM_VALUE
-        .equals((((Enum) (multiChoiceOrOther.getChoices().iterator().next())).name()))) {
-      sequence.add(OtherChoiceValidation.class);
+    @Override
+    public List<Class<?>> getValidationGroups(MultiChoiceOrOtherDto multiChoiceOrOther) {
+        List<Class<?>> sequence = new ArrayList<>();
+        sequence.add(MultiChoiceOrOtherDto.class);
+        if (multiChoiceOrOther != null && multiChoiceOrOther.getChoices() != null && multiChoiceOrOther.getChoices().size() == 1
+            && MultiChoiceOrOther.OTHER_ENUM_VALUE.equals((((Enum) (multiChoiceOrOther.getChoices().iterator().next())).name()))) {
+            sequence.add(OtherChoiceValidation.class);
+        }
+        return sequence;
     }
-
-    return sequence;
-  }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/validation/OtherChoiceValidation.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/validation/OtherChoiceValidation.java
index ff682dd8b5..7bffee5749 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/validation/OtherChoiceValidation.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-types/src/main/java/org/openecomp/sdcrests/vendorlicense/types/validation/OtherChoiceValidation.java
@@ -7,9 +7,9 @@
  * 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,8 +17,8 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.types.validation;
 
 public interface OtherChoiceValidation {
+
 }