From 28a19b966e6fa8570e1b2c9d5d1cc873a6cd4f92 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 20 Jul 2020 16:33:10 -0400 Subject: Remove jackson from policy-common Issue-ID: POLICY-1528 Change-Id: Ic4b9314a770e53cefb93776bfede35591363690e Signed-off-by: Jim Hahn --- .../policy/common/endpoints/event/comm/TopicEndpointProxy.java | 8 -------- .../common/endpoints/event/comm/bus/internal/BusPublisher.java | 4 +--- .../common/endpoints/http/client/internal/JerseyClient.java | 2 -- .../common/endpoints/http/server/internal/JettyServletServer.java | 2 -- 4 files changed, 1 insertion(+), 15 deletions(-) (limited to 'policy-endpoints/src/main/java/org/onap/policy/common') diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxy.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxy.java index 6f3094ff..b86532fc 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxy.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxy.java @@ -20,7 +20,6 @@ package org.onap.policy.common.endpoints.event.comm; -import com.fasterxml.jackson.annotation.JsonIgnore; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -313,42 +312,36 @@ class TopicEndpointProxy implements TopicEndpoint { return sinks; } - @JsonIgnore @GsonJsonIgnore @Override public List getUebTopicSources() { return UebTopicFactories.getSourceFactory().inventory(); } - @JsonIgnore @GsonJsonIgnore @Override public List getDmaapTopicSources() { return DmaapTopicFactories.getSourceFactory().inventory(); } - @JsonIgnore @GsonJsonIgnore @Override public List getNoopTopicSources() { return NoopTopicFactories.getSourceFactory().inventory(); } - @JsonIgnore @GsonJsonIgnore @Override public List getUebTopicSinks() { return UebTopicFactories.getSinkFactory().inventory(); } - @JsonIgnore @GsonJsonIgnore @Override public List getDmaapTopicSinks() { return DmaapTopicFactories.getSinkFactory().inventory(); } - @JsonIgnore @GsonJsonIgnore @Override public List getNoopTopicSinks() { @@ -416,7 +409,6 @@ class TopicEndpointProxy implements TopicEndpoint { * * @return list of managed endpoints */ - @JsonIgnore @GsonJsonIgnore protected List getEndpoints() { final List endpoints = new ArrayList<>(); diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisher.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisher.java index c2b590a0..09d52946 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisher.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusPublisher.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * policy-endpoints * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,7 +25,6 @@ import com.att.nsa.apiClient.http.HttpClient.ConnectionType; import com.att.nsa.cambria.client.CambriaBatchingPublisher; import com.att.nsa.cambria.client.CambriaClientBuilders; import com.att.nsa.cambria.client.CambriaClientBuilders.PublisherBuilder; -import com.fasterxml.jackson.annotation.JsonIgnore; import java.net.MalformedURLException; import java.security.GeneralSecurityException; import java.util.ArrayList; @@ -69,7 +68,6 @@ public interface BusPublisher { /** * The actual Cambria publisher. */ - @JsonIgnore @GsonJsonIgnore protected CambriaBatchingPublisher publisher; diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/client/internal/JerseyClient.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/client/internal/JerseyClient.java index ab19b7ef..f4f0705c 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/client/internal/JerseyClient.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/client/internal/JerseyClient.java @@ -22,7 +22,6 @@ package org.onap.policy.common.endpoints.http.client.internal; -import com.fasterxml.jackson.annotation.JsonIgnore; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; @@ -298,7 +297,6 @@ public class JerseyClient implements HttpClient { return userName; } - @JsonIgnore @GsonJsonIgnore @Override public String getPassword() { diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java index 6825f07c..699d5d43 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java @@ -21,7 +21,6 @@ package org.onap.policy.common.endpoints.http.server.internal; -import com.fasterxml.jackson.annotation.JsonIgnore; import java.util.EnumSet; import javax.servlet.DispatcherType; import org.eclipse.jetty.security.ConstraintMapping; @@ -492,7 +491,6 @@ public abstract class JettyServletServer implements HttpServletServer, Runnable * * @return the password */ - @JsonIgnore @GsonJsonIgnore public String getPassword() { return password; -- cgit 1.2.3-korg