From 4dcc36142e51b389c5df97c227acc08608caa3b0 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 29 May 2020 15:06:49 -0400 Subject: [PATCH] Use default serialization provider The default provider has been changed to gson, so the provider property no longer has to be set. Issue-ID: POLICY-1527 Change-Id: I21f5a3af2bc1d7fc10dc41f58e6e62a04f4bda77 Signed-off-by: Jim Hahn --- .../org/onap/policy/pdp/xacml/application/common/PolicyApiCaller.java | 2 -- .../org/onap/policy/pdpx/main/rest/TestAbbreviateDecisionResults.java | 4 +--- main/src/test/java/org/onap/policy/pdpx/main/rest/TestDecision.java | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/PolicyApiCaller.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/PolicyApiCaller.java index 632bdcb2..44593e1b 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/PolicyApiCaller.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/PolicyApiCaller.java @@ -27,7 +27,6 @@ import org.onap.policy.common.endpoints.http.client.HttpClient; import org.onap.policy.common.endpoints.http.client.HttpClientConfigException; import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance; import org.onap.policy.common.endpoints.parameters.RestServerParameters; -import org.onap.policy.common.gson.GsonMessageBodyHandler; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; import org.slf4j.Logger; @@ -57,7 +56,6 @@ public class PolicyApiCaller { busParams.setManaged(false); busParams.setPassword(params.getPassword()); busParams.setPort(params.getPort()); - busParams.setSerializationProvider(GsonMessageBodyHandler.class.getName()); busParams.setUseHttps(params.isHttps()); busParams.setUserName(params.getUserName()); diff --git a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestAbbreviateDecisionResults.java b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestAbbreviateDecisionResults.java index a4469a35..6d2a6fa9 100644 --- a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestAbbreviateDecisionResults.java +++ b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestAbbreviateDecisionResults.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,6 @@ import org.onap.policy.common.endpoints.http.client.HttpClientConfigException; import org.onap.policy.common.endpoints.http.client.internal.JerseyClient; import org.onap.policy.common.endpoints.parameters.RestServerParameters; import org.onap.policy.common.endpoints.parameters.TopicParameterGroup; -import org.onap.policy.common.gson.GsonMessageBodyHandler; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.common.utils.network.NetworkUtil; @@ -224,7 +223,6 @@ public class TestAbbreviateDecisionResults { throws HttpClientConfigException, KeyManagementException, NoSuchAlgorithmException, ClassNotFoundException { BusTopicParams clientParams = new BusTopicParams(); clientParams.setClientName("testName"); - clientParams.setSerializationProvider(GsonMessageBodyHandler.class.getName()); clientParams.setUseHttps(false); clientParams.setAllowSelfSignedCerts(false); clientParams.setHostname("localhost"); diff --git a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestDecision.java b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestDecision.java index 6f7dec6d..31d09799 100644 --- a/main/src/test/java/org/onap/policy/pdpx/main/rest/TestDecision.java +++ b/main/src/test/java/org/onap/policy/pdpx/main/rest/TestDecision.java @@ -52,7 +52,6 @@ import org.onap.policy.common.endpoints.http.client.HttpClientConfigException; import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance; import org.onap.policy.common.endpoints.parameters.RestServerParameters; import org.onap.policy.common.endpoints.parameters.TopicParameterGroup; -import org.onap.policy.common.gson.GsonMessageBodyHandler; import org.onap.policy.common.utils.network.NetworkUtil; import org.onap.policy.common.utils.resources.ResourceUtils; import org.onap.policy.models.decisions.concepts.DecisionRequest; @@ -244,7 +243,6 @@ public class TestDecision { private static HttpClient getNoAuthHttpClient() throws HttpClientConfigException { return HttpClientFactoryInstance.getClientFactory().build(BusTopicParams.builder() .clientName("testDecisionClient") - .serializationProvider(GsonMessageBodyHandler.class.getName()) .useHttps(false).allowSelfSignedCerts(false).hostname("localhost").port(port) .basePath("policy/pdpx/v1") .userName("healthcheck").password("zb!XztG34").managed(true).build()); -- 2.16.6