[SDC] OnBoard with enabled tests and features

Change-Id: I4c1bbf6e1c854cf97a3561c736f83da44b58b7c0
Signed-off-by: az2497 <avi.ziv@amdocs.com>

[SDC] OnBoard with enabled tests and features.

Change-Id: Icd52f039aee4dd393a1404d530bb9fdd0b20e604
Signed-off-by: az2497 <avi.ziv@amdocs.com>

2 files changed, 44 insertions, 57 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/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 9678f927b0..1152cc1eb3 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
@@ -12,10 +12,10 @@ public class MapLimitEntityToLimitDto extends MappingBase<LimitEntity, LimitEnti
     target.setId(source.getId());
     target.setName(source.getName());
     target.setDescription(source.getDescription());
-    target.setMetric(source.getMetric() != null ? source.getMetric().name() : null);
+    target.setMetric(source.getMetric());
     target.setAggregationFunction(source.getAggregationFunction() != null ? source
         .getAggregationFunction().name() : null);
-    target.setTime(source.getTime() != null ? source.getTime().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 7f48ece1cf..d123924ec3 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
@@ -3,73 +3,60 @@ package org.openecomp.sdcrests.vendorlicense.rest.mapping;
 import org.openecomp.sdc.common.errors.CoreException;
 import org.openecomp.sdc.common.errors.ErrorCode;
 import org.openecomp.sdc.datatypes.error.ErrorLevel;
+import org.openecomp.sdc.logging.api.Logger;
+import org.openecomp.sdc.logging.api.LoggerFactory;
 import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage;
 import org.openecomp.sdc.logging.types.LoggerConstants;
 import org.openecomp.sdc.logging.types.LoggerServiceName;
-import org.openecomp.sdc.logging.types.LoggerTragetServiceName;
 import org.openecomp.sdc.vendorlicense.dao.types.AggregationFunction;
-import org.openecomp.sdc.vendorlicense.dao.types.EntitlementMetric;
-import org.openecomp.sdc.vendorlicense.dao.types.EntitlementTime;
 import org.openecomp.sdc.vendorlicense.dao.types.LimitEntity;
+import org.openecomp.sdc.vendorlicense.dao.types.LimitType;
 import org.openecomp.sdc.vendorlicense.errors.LimitErrorBuilder;
 import org.openecomp.sdc.vendorlicense.errors.VendorLicenseErrorCodes;
-import org.openecomp.sdc.vendorsoftwareproduct.errors.ImageErrorBuilder;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorlicense.types.LimitRequestDto;
-import org.openecomp.sdc.vendorlicense.dao.types.LimitType;
 
 
 public class MapLimitRequestDtoToLimitEntity extends MappingBase<LimitRequestDto, LimitEntity> {
-  @Override
-  public void doMapping(LimitRequestDto source, LimitEntity target) {
-    target.setName(source.getName());
-    target.setDescription(source.getDescription());
-    try {
-      LimitType type = LimitType.valueOf(source.getType());
-      target.setType(type);
-    }
-    catch (IllegalArgumentException exception) {
-      throwInvalidValueError("type", VendorLicenseErrorCodes.LIMIT_INVALID_TYPE);
-    }
-
-    try {
-      EntitlementMetric metric = EntitlementMetric.valueOf(source.getMetric());
-      target.setMetric(metric);
-    }
-    catch (IllegalArgumentException exception) {
-      throwInvalidValueError("metric", VendorLicenseErrorCodes.LIMIT_INVALID_METRIC);
-    }
 
-    try {
-      AggregationFunction function = source.getAggregationFunction() != null ?
-              AggregationFunction.valueOf(source.getAggregationFunction()) : null;
-      target.setAggregationFunction(function);
+    private static final Logger logger =
+            LoggerFactory.getLogger(MapLimitRequestDtoToLimitEntity.class);
+
+    @Override
+    public void doMapping(LimitRequestDto source, LimitEntity target) {
+        target.setName(source.getName());
+        target.setDescription(source.getDescription());
+        try {
+            LimitType type = LimitType.valueOf(source.getType());
+            target.setType(type);
+        } catch (IllegalArgumentException exception) {
+            logger.error(exception.getMessage(), exception);
+            throwInvalidValueError("type", VendorLicenseErrorCodes.LIMIT_INVALID_TYPE);
+        }
+
+        try {
+            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);
+        }
+
+        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);
+        MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_DB,
+                LoggerServiceName.Create_LIMIT.toString(), ErrorLevel.ERROR.name(),
+                errorCode.id(), errorCode.message());
+        throw new CoreException(errorCode);
     }
-    catch (IllegalArgumentException exception) {
-      throwInvalidValueError("aggregationFunction",
-          VendorLicenseErrorCodes.LIMIT_INVALID_AGGREGATIONFUNCTION);
-    }
-
-    try {
-      EntitlementTime time = source.getTime() != null ?
-              EntitlementTime.valueOf(source.getTime()) : null;
-      target.setTime(time);
-    }
-    catch (IllegalArgumentException exception) {
-      throwInvalidValueError("time", VendorLicenseErrorCodes.LIMIT_INVALID_TIME);
-    }
-
-    target.setValue(source.getValue());
-    target.setUnit(source.getUnit());
-
-  }
-
-  private void throwInvalidValueError(String attribute, String vendorLicenseErrorCode) {
-    ErrorCode errorCode = LimitErrorBuilder.getInvalidValueErrorBuilder(attribute,
-        vendorLicenseErrorCode);
-    MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_DB,
-        LoggerServiceName.Create_LIMIT.toString(), ErrorLevel.ERROR.name(),
-        errorCode.id(), errorCode.message() );
-    throw new CoreException(errorCode);
-  }
 }