From 34f89faa64f815d5cf33d0905046eaf392017b39 Mon Sep 17 00:00:00 2001 From: Michael Dürre Date: Wed, 31 Aug 2022 08:46:55 +0200 Subject: add fixes for wt sulfur MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix devmgrs and db access Issue-ID: CCSDK-3749 Signed-off-by: Michael Dürre Change-Id: I41018d2daa55b200a9ba89e784f8adf4200d32c3 Signed-off-by: Michael Dürre --- .../features/sdnr/wt/websocketmanager/WebSocketManagerSocket.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sdnr/wt/websocketmanager/provider/src/main') diff --git a/sdnr/wt/websocketmanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager/WebSocketManagerSocket.java b/sdnr/wt/websocketmanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager/WebSocketManagerSocket.java index 95715be39..0b64d476a 100644 --- a/sdnr/wt/websocketmanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager/WebSocketManagerSocket.java +++ b/sdnr/wt/websocketmanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager/WebSocketManagerSocket.java @@ -32,6 +32,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.regex.Matcher; import java.util.regex.Pattern; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.WebSocketAdapter; import org.onap.ccsdk.features.sdnr.wt.websocketmanager.model.data.DOMNotificationOutput; @@ -120,7 +123,7 @@ public class WebSocketManagerSocket extends WebSocketAdapter { */ private static final HashMap clientList = new HashMap<>(); - private static final YangToolsMapper mapper = new YangToolsMapper(); + private static final ObjectMapper mapper = new YangToolsMapper().disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); private final String myUniqueSessionId; private Session session = null; @@ -133,6 +136,7 @@ public class WebSocketManagerSocket extends WebSocketAdapter { this.myUniqueSessionId = _genSessionId(); this.sendingSyncThread = new Thread(this.sendingRunner); this.messageQueue = new ArrayBlockingQueue<>(QUEUE_SIZE); + } @Override -- cgit 1.2.3-korg