From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 31 Dec 2018 17:21:27 +0200 Subject: Merge from ECOMP's repository Main Features -------------- - Async-Instantiation jobs mechanism major update; still WIP (package `org.onap.vid.job`) - New features in View/Edit: Activate fabric configuration; show related networks; soft delete - Support AAI service-tree traversal (`AAIServiceTree`) - In-memory cache for SDC models and certain A&AI queries (`CacheProviderWithLoadingCache`) - Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA models - Resolve Cloud-Owner values for MSO - Pass X-ONAP headers to MSO Infrastructure -------------- - Remove codehaus' jackson mapper; use soley fasterxml 2.9.7 - Surefire invokes both TestNG and JUnit tests - Support Kotlin source files - AaiController2 which handles errors in a "Spring manner" - Inline generated-sources and remove jsonschema2pojo Quality -------- - Cumulative bug fixes (A&AI API, UI timeouts, and many more) - Many Sonar issues cleaned-up - Some unused classes removed - Minor changes in vid-automation project, allowing some API verification to run Hard Merges ------------ - HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest) - Moved `package org.onap.vid.controllers` to `controller`, without plural -- just to keep semantic sync with ECOMP. Reference commit in ECOMP: 3d1141625 Issue-ID: VID-378 Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788 Signed-off-by: Ittay Stern --- .../src/test/java/org/onap/vid/utils/LoggingUtilsTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'vid-app-common/src/test/java/org/onap/vid/utils/LoggingUtilsTest.java') diff --git a/vid-app-common/src/test/java/org/onap/vid/utils/LoggingUtilsTest.java b/vid-app-common/src/test/java/org/onap/vid/utils/LoggingUtilsTest.java index 7bc3fca1d..ca27a2266 100644 --- a/vid-app-common/src/test/java/org/onap/vid/utils/LoggingUtilsTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/utils/LoggingUtilsTest.java @@ -1,8 +1,8 @@ package org.onap.vid.utils; +import com.fasterxml.jackson.core.JsonLocation; +import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; -import org.codehaus.jackson.JsonLocation; -import org.codehaus.jackson.JsonParseException; import org.onap.vid.exceptions.GenericUncheckedException; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -47,15 +47,15 @@ public class LoggingUtilsTest { " expected a valid value (number, String, array, object, 'true', 'false' or 'null')", new JsonLocation("i'm an error", 25, 1, 1))); String codehausParseDescription = "" + - "org.codehaus.jackson.JsonParseException: Unexpected character ('<' (code 60)):" + + "com.fasterxml.jackson.core.JsonParseException: Unexpected character ('<' (code 60)):" + " expected a valid value (number, String, array, object, 'true', 'false' or 'null')\n" + - " at [Source: i'm an error; line: 1, column: 1]"; + " at [Source: (String)\"i'm an error\"; line: 1, column: 1]"; RuntimeException fasterxmlMappingException = new RuntimeException(new JsonMappingException("Can not deserialize instance of java.lang.String out of START_ARRAY token", new com.fasterxml.jackson.core.JsonLocation("{ example json }", 15, 1, 20))); String fasterxmlMappingDescription = "" + "com.fasterxml.jackson.databind.JsonMappingException: Can not deserialize instance of java.lang.String out of START_ARRAY token\n" + - " at [Source: { example json }; line: 1, column: 20]"; + " at [Source: (String)\"{ example json }\"; line: 1, column: 20]"; return new Object[][]{ {"javax.net.ssl.SSLHandshakeException: java.security.cert.CertificateException: No X509TrustManager implementation available", -- cgit 1.2.3-korg