From fe1d9a3def9cd5355682cd22ccfb3a3eb502093c Mon Sep 17 00:00:00 2001 From: Yuli Shlosberg Date: Sun, 12 Nov 2017 11:14:38 +0200 Subject: sanity fix after merge of BE code Change-Id: I9c994bdbee0ccefb47f065c5a4c6b22bf0e5ccb0 Issue-Id: SDC-608 Signed-off-by: Yuli Shlosberg --- .../java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java | 2 +- .../org/openecomp/sdc/ci/tests/utils/rest/ConsumerRestUtils.java | 2 ++ .../org/openecomp/sdc/ci/tests/utils/rest/ResponseParser.java | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java index 67091f3898..9af3b6bc05 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java @@ -116,7 +116,7 @@ public abstract class ComponentBaseTest { config = Utils.getConfig(); myContext=context; ExtentManager.initReporter(getReportFolder(), REPORT_FILE_NAME, context); -// AtomicOperationUtils.createDefaultConsumer(true); + AtomicOperationUtils.createDefaultConsumer(true); openTitanLogic(); performClean(); diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ConsumerRestUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ConsumerRestUtils.java index 71735d5a4a..0e0a974885 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ConsumerRestUtils.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ConsumerRestUtils.java @@ -24,6 +24,7 @@ import static org.testng.AssertJUnit.assertEquals; import java.util.Map; +import org.codehaus.jackson.map.DeserializationConfig; import org.codehaus.jackson.map.ObjectMapper; import org.openecomp.sdc.be.datatypes.elements.ConsumerDataDefinition; import org.openecomp.sdc.be.model.User; @@ -123,6 +124,7 @@ public class ConsumerRestUtils extends BaseRestUtils { String bodyToParse = restResponse.getResponse(); ObjectMapper mapper = new ObjectMapper(); try { + mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); ConsumerDataDefinition component = mapper.readValue(bodyToParse, ConsumerDataDefinition.class); return component; } catch (Exception e) { diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ResponseParser.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ResponseParser.java index 6828a5ef2a..c4b9764c96 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ResponseParser.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/ResponseParser.java @@ -215,6 +215,7 @@ public class ResponseParser { mapper.registerModule(module); ComponentInstanceProperty propertyDefinition = null; try { + mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); propertyDefinition = mapper.readValue(response, ComponentInstanceProperty.class); logger.debug(propertyDefinition.toString()); } catch (IOException e) { @@ -233,7 +234,7 @@ public class ResponseParser { ObjectMapper mapper = new ObjectMapper(); ArtifactDefinition artifactDefinition = null; try { - + mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); artifactDefinition = mapper.readValue(response, ArtifactDefinition.class); logger.debug(artifactDefinition.toString()); } catch (IOException e) { @@ -273,6 +274,7 @@ public class ResponseParser { JsonDeserializer desrializer = new PropertyConstraintJacksonDeserialiser(); addDeserializer(module, PropertyConstraint.class, desrializer); mapper.registerModule(module); + mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); try { object = mapper.readValue(json, clazz); // System.out.println("Class: "+clazz.getSimpleName()+", json: @@ -311,6 +313,8 @@ public class ResponseParser { mapper.registerModule(module); Service service = null; try { +// TODO Andrey L. uncomment line below in case to ignore on unknown properties, not recommended, added by Matvey + mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); service = mapper.readValue(response, Service.class); logger.debug(service.toString()); } catch (IOException e) { @@ -334,6 +338,7 @@ public class ResponseParser { Product product = null; try { + mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); product = mapper.readValue(response, Product.class); logger.debug(product.toString()); } catch (IOException e) { @@ -355,6 +360,7 @@ public class ResponseParser { mapper.registerModule(module); ComponentInstance componentInstance = null; try { + mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); componentInstance = mapper.readValue(response, ComponentInstance.class); logger.debug(componentInstance.toString()); } catch (IOException e) { -- cgit 1.2.3-korg