Reformat openecomp-be

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

18 files changed, 211 insertions, 246 deletions

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/LimitCreationDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/LimitCreationDto.java
index 35833e9621..05d2d1ac77 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/LimitCreationDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/LimitCreationDto.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,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 public class LimitCreationDto {
-  private String limitId;
 
-  public String getLimitId() {
-    return limitId;
-  }
+    private String limitId;
+
+    public String getLimitId() {
+        return limitId;
+    }
 
-  public void setLimitId(String limitId) {
-    this.limitId = limitId;
-  }
+    public void setLimitId(String limitId) {
+        this.limitId = limitId;
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherDtoToChoiceOrOther.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherDtoToChoiceOrOther.java
index 28eeb29018..f4b6119056 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherDtoToChoiceOrOther.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherDtoToChoiceOrOther.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,20 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.ChoiceOrOtherDto;
 
-public class MapChoiceOrOtherDtoToChoiceOrOther
-    extends MappingBase<ChoiceOrOtherDto, ChoiceOrOther> {
+public class MapChoiceOrOtherDtoToChoiceOrOther extends MappingBase<ChoiceOrOtherDto, ChoiceOrOther> {
 
-  @Override
-  public void doMapping(ChoiceOrOtherDto source, ChoiceOrOther target) {
-    target.setChoice(source.getChoice());
-    target.setOther(source.getOther());
-    target.setResult(null);
-  }
+    @Override
+    public void doMapping(ChoiceOrOtherDto source, ChoiceOrOther target) {
+        target.setChoice(source.getChoice());
+        target.setOther(source.getOther());
+        target.setResult(null);
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherToChoiceOrOtherDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherToChoiceOrOtherDto.java
index 2d686110d5..aad72491ac 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherToChoiceOrOtherDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapChoiceOrOtherToChoiceOrOtherDto.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,19 +17,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.ChoiceOrOtherDto;
 
-public class MapChoiceOrOtherToChoiceOrOtherDto
-    extends MappingBase<ChoiceOrOther, ChoiceOrOtherDto> {
+public class MapChoiceOrOtherToChoiceOrOtherDto extends MappingBase<ChoiceOrOther, ChoiceOrOtherDto> {
 
-  @Override
-  public void doMapping(ChoiceOrOther source, ChoiceOrOtherDto target) {
-    target.setChoice(source.getChoice());
-    target.setOther(source.getOther());
-  }
+    @Override
+    public void doMapping(ChoiceOrOther source, ChoiceOrOtherDto target) {
+        target.setChoice(source.getChoice());
+        target.setOther(source.getOther());
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDto.java
index 2510bd0634..6dc6e6af92 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolEntityToEntitlementPoolEntityDto.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,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity;
@@ -25,26 +24,23 @@ import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.EntitlementPoolEntityDto;
 import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto;
 
-public class MapEntitlementPoolEntityToEntitlementPoolEntityDto
-    extends MappingBase<EntitlementPoolEntity, EntitlementPoolEntityDto> {
-  @Override
-  public void doMapping(EntitlementPoolEntity source, EntitlementPoolEntityDto target) {
-    target.setId(source.getId());
-    target.setName(source.getName());
-    target.setDescription(source.getDescription());
-    target.setType(source.getType());
-    target.setThresholdValue(source.getThresholdValue());
-    target.setThresholdUnits(source.getThresholdUnit());
-    target.setIncrements(source.getIncrements());
-
-    target.setOperationalScope(new MapMultiChoiceOrOtherToMultiChoiceOrOtherDto()
-        .applyMapping(source.getOperationalScope(), MultiChoiceOrOtherDto.class));
-
-    target.setReferencingFeatureGroups(source.getReferencingFeatureGroups());
+public class MapEntitlementPoolEntityToEntitlementPoolEntityDto extends MappingBase<EntitlementPoolEntity, EntitlementPoolEntityDto> {
 
-    target.setStartDate(source.getStartDate());
-    target.setExpiryDate(source.getExpiryDate());
-    target.setVersionUUID(source.getVersionUuId());
-    target.setManufacturerReferenceNumber(source.getManufacturerReferenceNumber());
-  }
+    @Override
+    public void doMapping(EntitlementPoolEntity source, EntitlementPoolEntityDto target) {
+        target.setId(source.getId());
+        target.setName(source.getName());
+        target.setDescription(source.getDescription());
+        target.setType(source.getType());
+        target.setThresholdValue(source.getThresholdValue());
+        target.setThresholdUnits(source.getThresholdUnit());
+        target.setIncrements(source.getIncrements());
+        target.setOperationalScope(
+            new MapMultiChoiceOrOtherToMultiChoiceOrOtherDto().applyMapping(source.getOperationalScope(), MultiChoiceOrOtherDto.class));
+        target.setReferencingFeatureGroups(source.getReferencingFeatureGroups());
+        target.setStartDate(source.getStartDate());
+        target.setExpiryDate(source.getExpiryDate());
+        target.setVersionUUID(source.getVersionUuId());
+        target.setManufacturerReferenceNumber(source.getManufacturerReferenceNumber());
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolRequestDtoToEntitlementPoolEntity.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolRequestDtoToEntitlementPoolEntity.java
index 5c45ed652a..1058a869aa 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolRequestDtoToEntitlementPoolEntity.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapEntitlementPoolRequestDtoToEntitlementPoolEntity.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,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity;
@@ -25,21 +24,20 @@ import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.EntitlementPoolRequestDto;
 
-public class MapEntitlementPoolRequestDtoToEntitlementPoolEntity
-    extends MappingBase<EntitlementPoolRequestDto, EntitlementPoolEntity> {
-  @Override
-  public void doMapping(EntitlementPoolRequestDto source, EntitlementPoolEntity target) {
-    target.setName(source.getName());
-    target.setManufacturerReferenceNumber(source.getManufacturerReferenceNumber());
-    target.setDescription(source.getDescription());
-    target.setType(source.getType());
-    target.setThresholdValue(source.getThresholdValue());
-    target.setThresholdUnit(source.getThresholdUnits());
-    target.setIncrements(source.getIncrements());
-    target.setOperationalScope(new MapMultiChoiceOrOtherDtoToMultiChoiceOrOther()
-        .applyMapping(source.getOperationalScope(), MultiChoiceOrOther.class));
+public class MapEntitlementPoolRequestDtoToEntitlementPoolEntity extends MappingBase<EntitlementPoolRequestDto, EntitlementPoolEntity> {
 
-    target.setStartDate(source.getStartDate());
-    target.setExpiryDate(source.getExpiryDate());
-  }
+    @Override
+    public void doMapping(EntitlementPoolRequestDto source, EntitlementPoolEntity target) {
+        target.setName(source.getName());
+        target.setManufacturerReferenceNumber(source.getManufacturerReferenceNumber());
+        target.setDescription(source.getDescription());
+        target.setType(source.getType());
+        target.setThresholdValue(source.getThresholdValue());
+        target.setThresholdUnit(source.getThresholdUnits());
+        target.setIncrements(source.getIncrements());
+        target.setOperationalScope(
+            new MapMultiChoiceOrOtherDtoToMultiChoiceOrOther().applyMapping(source.getOperationalScope(), MultiChoiceOrOther.class));
+        target.setStartDate(source.getStartDate());
+        target.setExpiryDate(source.getExpiryDate());
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupDescriptorDtoToFeatureGroupEntity.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupDescriptorDtoToFeatureGroupEntity.java
index 5dbf087e45..e362c92196 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupDescriptorDtoToFeatureGroupEntity.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupDescriptorDtoToFeatureGroupEntity.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,19 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupEntity;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.FeatureGroupDescriptorDto;
 
-public class MapFeatureGroupDescriptorDtoToFeatureGroupEntity
-    extends MappingBase<FeatureGroupDescriptorDto, FeatureGroupEntity> {
-  @Override
-  public void doMapping(FeatureGroupDescriptorDto source, FeatureGroupEntity target) {
-    target.setName(source.getName());
-    target.setDescription(source.getDescription());
-    target.setPartNumber(source.getPartNumber());
-  }
-}
\ No newline at end of file
+public class MapFeatureGroupDescriptorDtoToFeatureGroupEntity extends MappingBase<FeatureGroupDescriptorDto, FeatureGroupEntity> {
+
+    @Override
+    public void doMapping(FeatureGroupDescriptorDto source, FeatureGroupEntity target) {
+        target.setName(source.getName());
+        target.setDescription(source.getDescription());
+        target.setPartNumber(source.getPartNumber());
+    }
+}
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupEntityToFeatureGroupDescriptorDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupEntityToFeatureGroupDescriptorDto.java
index 70f5666bcb..ee8626abaa 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupEntityToFeatureGroupDescriptorDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapFeatureGroupEntityToFeatureGroupDescriptorDto.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,19 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupEntity;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.FeatureGroupDescriptorDto;
 
-public class MapFeatureGroupEntityToFeatureGroupDescriptorDto
-    extends MappingBase<FeatureGroupEntity, FeatureGroupDescriptorDto> {
-  @Override
-  public void doMapping(FeatureGroupEntity source, FeatureGroupDescriptorDto target) {
-    target.setName(source.getName());
-    target.setDescription(source.getDescription());
-    target.setPartNumber(source.getPartNumber());
-  }
+public class MapFeatureGroupEntityToFeatureGroupDescriptorDto extends MappingBase<FeatureGroupEntity, FeatureGroupDescriptorDto> {
+
+    @Override
+    public void doMapping(FeatureGroupEntity source, FeatureGroupDescriptorDto target) {
+        target.setName(source.getName());
+        target.setDescription(source.getDescription());
+        target.setPartNumber(source.getPartNumber());
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity.java
index f5ea8414d5..98d703299b 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity.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,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.ChoiceOrOther;
@@ -25,14 +24,13 @@ import org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementEntity;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.LicenseAgreementDescriptorDto;
 
-public class MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity
-    extends MappingBase<LicenseAgreementDescriptorDto, LicenseAgreementEntity> {
-  @Override
-  public void doMapping(LicenseAgreementDescriptorDto source, LicenseAgreementEntity target) {
-    target.setName(source.getName());
-    target.setDescription(source.getDescription());
-    target.setLicenseTerm(new MapChoiceOrOtherDtoToChoiceOrOther()
-        .applyMapping(source.getLicenseTerm(), ChoiceOrOther.class));
-    target.setRequirementsAndConstrains(source.getRequirementsAndConstrains());
-  }
+public class MapLicenseAgreementDescriptorDtoToLicenseAgreementEntity extends MappingBase<LicenseAgreementDescriptorDto, LicenseAgreementEntity> {
+
+    @Override
+    public void doMapping(LicenseAgreementDescriptorDto source, LicenseAgreementEntity target) {
+        target.setName(source.getName());
+        target.setDescription(source.getDescription());
+        target.setLicenseTerm(new MapChoiceOrOtherDtoToChoiceOrOther().applyMapping(source.getLicenseTerm(), ChoiceOrOther.class));
+        target.setRequirementsAndConstrains(source.getRequirementsAndConstrains());
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementEntityToLicenseAgreementDescriptorDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementEntityToLicenseAgreementDescriptorDto.java
index 2fd4f669cf..46de11f021 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementEntityToLicenseAgreementDescriptorDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseAgreementEntityToLicenseAgreementDescriptorDto.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,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementEntity;
@@ -25,14 +24,13 @@ import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.ChoiceOrOtherDto;
 import org.openecomp.sdcrests.vendorlicense.types.LicenseAgreementDescriptorDto;
 
-public class MapLicenseAgreementEntityToLicenseAgreementDescriptorDto
-    extends MappingBase<LicenseAgreementEntity, LicenseAgreementDescriptorDto> {
-  @Override
-  public void doMapping(LicenseAgreementEntity source, LicenseAgreementDescriptorDto target) {
-    target.setName(source.getName());
-    target.setDescription(source.getDescription());
-    target.setLicenseTerm(new MapChoiceOrOtherToChoiceOrOtherDto()
-        .applyMapping(source.getLicenseTerm(), ChoiceOrOtherDto.class));
-    target.setRequirementsAndConstrains(source.getRequirementsAndConstrains());
-  }
+public class MapLicenseAgreementEntityToLicenseAgreementDescriptorDto extends MappingBase<LicenseAgreementEntity, LicenseAgreementDescriptorDto> {
+
+    @Override
+    public void doMapping(LicenseAgreementEntity source, LicenseAgreementDescriptorDto target) {
+        target.setName(source.getName());
+        target.setDescription(source.getDescription());
+        target.setLicenseTerm(new MapChoiceOrOtherToChoiceOrOtherDto().applyMapping(source.getLicenseTerm(), ChoiceOrOtherDto.class));
+        target.setRequirementsAndConstrains(source.getRequirementsAndConstrains());
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto.java
index c543cf402e..3690a7c5d3 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto.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,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyGroupEntity;
@@ -25,23 +24,23 @@ import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.LicenseKeyGroupEntityDto;
 import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto;
 
-public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto
-    extends MappingBase<LicenseKeyGroupEntity, LicenseKeyGroupEntityDto> {
-  @Override
-  public void doMapping(LicenseKeyGroupEntity source, LicenseKeyGroupEntityDto target) {
-    target.setId(source.getId());
-    target.setName(source.getName());
-    target.setDescription(source.getDescription());
-    target.setType(source.getType());
-    target.setOperationalScope(new MapMultiChoiceOrOtherToMultiChoiceOrOtherDto()
-        .applyMapping(source.getOperationalScope(), MultiChoiceOrOtherDto.class));
-    target.setReferencingFeatureGroups(source.getReferencingFeatureGroups());
-    target.setStartDate(source.getStartDate());
-    target.setExpiryDate(source.getExpiryDate());
-    target.setThresholdUnits(source.getThresholdUnits());
-    target.setThresholdValue(source.getThresholdValue());
-    target.setIncrements(source.getIncrements());
-    target.setVersionUUID(source.getVersionUuId());
-    target.setManufacturerReferenceNumber(source.getManufacturerReferenceNumber());
-  }
+public class MapLicenseKeyGroupEntityToLicenseKeyGroupEntityDto extends MappingBase<LicenseKeyGroupEntity, LicenseKeyGroupEntityDto> {
+
+    @Override
+    public void doMapping(LicenseKeyGroupEntity source, LicenseKeyGroupEntityDto target) {
+        target.setId(source.getId());
+        target.setName(source.getName());
+        target.setDescription(source.getDescription());
+        target.setType(source.getType());
+        target.setOperationalScope(
+            new MapMultiChoiceOrOtherToMultiChoiceOrOtherDto().applyMapping(source.getOperationalScope(), MultiChoiceOrOtherDto.class));
+        target.setReferencingFeatureGroups(source.getReferencingFeatureGroups());
+        target.setStartDate(source.getStartDate());
+        target.setExpiryDate(source.getExpiryDate());
+        target.setThresholdUnits(source.getThresholdUnits());
+        target.setThresholdValue(source.getThresholdValue());
+        target.setIncrements(source.getIncrements());
+        target.setVersionUUID(source.getVersionUuId());
+        target.setManufacturerReferenceNumber(source.getManufacturerReferenceNumber());
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity.java
index 87eea4ba1e..ed0e79d0a5 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity.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,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyGroupEntity;
@@ -25,20 +24,20 @@ import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.LicenseKeyGroupRequestDto;
 
-public class MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity
-    extends MappingBase<LicenseKeyGroupRequestDto, LicenseKeyGroupEntity> {
-  @Override
-  public void doMapping(LicenseKeyGroupRequestDto source, LicenseKeyGroupEntity target) {
-    target.setName(source.getName());
-    target.setManufacturerReferenceNumber(source.getManufacturerReferenceNumber());
-    target.setDescription(source.getDescription());
-    target.setType(source.getType());
-    target.setOperationalScope(new MapMultiChoiceOrOtherDtoToMultiChoiceOrOther()
-        .applyMapping(source.getOperationalScope(), MultiChoiceOrOther.class));
-    target.setStartDate(source.getStartDate());
-    target.setExpiryDate(source.getExpiryDate());
-    target.setThresholdUnits(source.getThresholdUnits());
-    target.setThresholdValue(source.getThresholdValue());
-    target.setIncrements(source.getIncrements());
-  }
+public class MapLicenseKeyGroupRequestDtoToLicenseKeyGroupEntity extends MappingBase<LicenseKeyGroupRequestDto, LicenseKeyGroupEntity> {
+
+    @Override
+    public void doMapping(LicenseKeyGroupRequestDto source, LicenseKeyGroupEntity target) {
+        target.setName(source.getName());
+        target.setManufacturerReferenceNumber(source.getManufacturerReferenceNumber());
+        target.setDescription(source.getDescription());
+        target.setType(source.getType());
+        target.setOperationalScope(
+            new MapMultiChoiceOrOtherDtoToMultiChoiceOrOther().applyMapping(source.getOperationalScope(), MultiChoiceOrOther.class));
+        target.setStartDate(source.getStartDate());
+        target.setExpiryDate(source.getExpiryDate());
+        target.setThresholdUnits(source.getThresholdUnits());
+        target.setThresholdValue(source.getThresholdValue());
+        target.setIncrements(source.getIncrements());
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitCreationDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitCreationDto.java
index ef4ae1ccdc..eb1a8a2def 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitCreationDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitCreationDto.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,16 +17,15 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.LimitEntity;
 import org.openecomp.sdcrests.mapping.MappingBase;
 
-public class MapLimitEntityToLimitCreationDto extends
-    MappingBase<LimitEntity, LimitCreationDto> {
-  @Override
-  public void doMapping(LimitEntity source, LimitCreationDto target) {
-    target.setLimitId(source.getId());
-  }
+public class MapLimitEntityToLimitCreationDto extends MappingBase<LimitEntity, LimitCreationDto> {
+
+    @Override
+    public void doMapping(LimitEntity source, LimitCreationDto target) {
+        target.setLimitId(source.getId());
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitDto.java
index b17a0e08d4..030fcc1c91 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitEntityToLimitDto.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,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.LimitEntity;
@@ -26,17 +25,16 @@ import org.openecomp.sdcrests.vendorlicense.types.LimitEntityDto;
 
 public class MapLimitEntityToLimitDto extends MappingBase<LimitEntity, LimitEntityDto> {
 
-  @Override
-  public void doMapping(LimitEntity source, LimitEntityDto target) {
-    target.setId(source.getId());
-    target.setName(source.getName());
-    target.setDescription(source.getDescription());
-    target.setMetric(source.getMetric());
-    target.setAggregationFunction(source.getAggregationFunction() != null ? source
-        .getAggregationFunction().name() : null);
-    target.setTime(source.getTime());
-    target.setType(source.getType() != null ? source.getType().name() : null);
-    target.setUnit(source.getUnit());
-    target.setValue(source.getValue());
-  }
+    @Override
+    public void doMapping(LimitEntity source, LimitEntityDto target) {
+        target.setId(source.getId());
+        target.setName(source.getName());
+        target.setDescription(source.getDescription());
+        target.setMetric(source.getMetric());
+        target.setAggregationFunction(source.getAggregationFunction() != null ? source.getAggregationFunction().name() : null);
+        target.setTime(source.getTime());
+        target.setType(source.getType() != null ? source.getType().name() : null);
+        target.setUnit(source.getUnit());
+        target.setValue(source.getValue());
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitRequestDtoToLimitEntity.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitRequestDtoToLimitEntity.java
index 99f45bfc18..2de29c6e0c 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitRequestDtoToLimitEntity.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapLimitRequestDtoToLimitEntity.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,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.common.errors.CoreException;
@@ -32,11 +31,9 @@ import org.openecomp.sdc.vendorlicense.errors.VendorLicenseErrorCodes;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.LimitRequestDto;
 
-
 public class MapLimitRequestDtoToLimitEntity extends MappingBase<LimitRequestDto, LimitEntity> {
 
-    private static final Logger logger =
-            LoggerFactory.getLogger(MapLimitRequestDtoToLimitEntity.class);
+    private static final Logger logger = LoggerFactory.getLogger(MapLimitRequestDtoToLimitEntity.class);
 
     @Override
     public void doMapping(LimitRequestDto source, LimitEntity target) {
@@ -49,27 +46,22 @@ public class MapLimitRequestDtoToLimitEntity extends MappingBase<LimitRequestDto
             logger.error(exception.getMessage(), exception);
             throwInvalidValueError("type", VendorLicenseErrorCodes.LIMIT_INVALID_TYPE);
         }
-
         try {
-            AggregationFunction function = source.getAggregationFunction() != null ?
-                    AggregationFunction.valueOf(source.getAggregationFunction()) : null;
+            AggregationFunction function =
+                source.getAggregationFunction() != null ? AggregationFunction.valueOf(source.getAggregationFunction()) : null;
             target.setAggregationFunction(function);
         } catch (IllegalArgumentException exception) {
             logger.error(exception.getMessage(), exception);
-            throwInvalidValueError("aggregationFunction",
-                    VendorLicenseErrorCodes.LIMIT_INVALID_AGGREGATIONFUNCTION);
+            throwInvalidValueError("aggregationFunction", VendorLicenseErrorCodes.LIMIT_INVALID_AGGREGATIONFUNCTION);
         }
-
         target.setTime(source.getTime());
         target.setMetric(source.getMetric());
         target.setValue(source.getValue());
         target.setUnit(source.getUnit());
-
     }
 
     private void throwInvalidValueError(String attribute, String vendorLicenseErrorCode) {
-        ErrorCode errorCode = LimitErrorBuilder.getInvalidValueErrorBuilder(attribute,
-                vendorLicenseErrorCode);
+        ErrorCode errorCode = LimitErrorBuilder.getInvalidValueErrorBuilder(attribute, vendorLicenseErrorCode);
         throw new CoreException(errorCode);
     }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherDtoToMultiChoiceOrOther.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherDtoToMultiChoiceOrOther.java
index 320bf67bdf..ad0aab26d1 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherDtoToMultiChoiceOrOther.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherDtoToMultiChoiceOrOther.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,20 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto;
 
-public class MapMultiChoiceOrOtherDtoToMultiChoiceOrOther
-    extends MappingBase<MultiChoiceOrOtherDto, MultiChoiceOrOther> {
+public class MapMultiChoiceOrOtherDtoToMultiChoiceOrOther extends MappingBase<MultiChoiceOrOtherDto, MultiChoiceOrOther> {
 
-  @Override
-  public void doMapping(MultiChoiceOrOtherDto source, MultiChoiceOrOther target) {
-    target.setChoices(source.getChoices());
-    target.setOther(source.getOther());
-    target.setResults(null);
-  }
+    @Override
+    public void doMapping(MultiChoiceOrOtherDto source, MultiChoiceOrOther target) {
+        target.setChoices(source.getChoices());
+        target.setOther(source.getOther());
+        target.setResults(null);
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherToMultiChoiceOrOtherDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherToMultiChoiceOrOtherDto.java
index 9649053fb4..93a2007897 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherToMultiChoiceOrOtherDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapMultiChoiceOrOtherToMultiChoiceOrOtherDto.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,19 +17,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.MultiChoiceOrOtherDto;
 
-public class MapMultiChoiceOrOtherToMultiChoiceOrOtherDto
-    extends MappingBase<MultiChoiceOrOther, MultiChoiceOrOtherDto> {
+public class MapMultiChoiceOrOtherToMultiChoiceOrOtherDto extends MappingBase<MultiChoiceOrOther, MultiChoiceOrOtherDto> {
 
-  @Override
-  public void doMapping(MultiChoiceOrOther source, MultiChoiceOrOtherDto target) {
-    target.setChoices(source.getChoices());
-    target.setOther(source.getOther());
-  }
+    @Override
+    public void doMapping(MultiChoiceOrOther source, MultiChoiceOrOtherDto target) {
+        target.setChoices(source.getChoices());
+        target.setOther(source.getOther());
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelEntityToDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelEntityToDto.java
index 7bdde1d592..5b0bfb7d73 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelEntityToDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelEntityToDto.java
@@ -17,20 +17,19 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.VendorLicenseModelEntity;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.VendorLicenseModelEntityDto;
 
-public class MapVendorLicenseModelEntityToDto
-    extends MappingBase<VendorLicenseModelEntity, VendorLicenseModelEntityDto> {
-  @Override
-  public void doMapping(VendorLicenseModelEntity source, VendorLicenseModelEntityDto target) {
-    target.setId(source.getId());
-    target.setVendorName(source.getVendorName());
-    target.setDescription(source.getDescription());
-    target.setIconRef(source.getIconRef());
-  }
+public class MapVendorLicenseModelEntityToDto extends MappingBase<VendorLicenseModelEntity, VendorLicenseModelEntityDto> {
+
+    @Override
+    public void doMapping(VendorLicenseModelEntity source, VendorLicenseModelEntityDto target) {
+        target.setId(source.getId());
+        target.setVendorName(source.getVendorName());
+        target.setDescription(source.getDescription());
+        target.setIconRef(source.getIconRef());
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelRequestDtoToVendorLicenseModelEntity.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelRequestDtoToVendorLicenseModelEntity.java
index 593a4a37b0..2cbc81980a 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelRequestDtoToVendorLicenseModelEntity.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/mapping/MapVendorLicenseModelRequestDtoToVendorLicenseModelEntity.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,19 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 
 import org.openecomp.sdc.vendorlicense.dao.types.VendorLicenseModelEntity;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.VendorLicenseModelRequestDto;
 
-public class MapVendorLicenseModelRequestDtoToVendorLicenseModelEntity
-    extends MappingBase<VendorLicenseModelRequestDto, VendorLicenseModelEntity> {
-  @Override
-  public void doMapping(VendorLicenseModelRequestDto source, VendorLicenseModelEntity target) {
-    target.setVendorName(source.getVendorName());
-    target.setDescription(source.getDescription());
-    target.setIconRef(source.getIconRef());
-  }
+public class MapVendorLicenseModelRequestDtoToVendorLicenseModelEntity extends MappingBase<VendorLicenseModelRequestDto, VendorLicenseModelEntity> {
+
+    @Override
+    public void doMapping(VendorLicenseModelRequestDto source, VendorLicenseModelEntity target) {
+        target.setVendorName(source.getVendorName());
+        target.setDescription(source.getDescription());
+        target.setIconRef(source.getIconRef());
+    }
 }