From 4b9341b810a8d676373677e86da736bf9144308c Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 15 Feb 2019 17:33:49 -0500 Subject: Change properties to use gson Modified property files to use gson instead of jackson for REST calls, for both clients and servers. Change-Id: Ib836886df33cd585b4c2d227e9cc496cc165fc2c Issue-ID: POLICY-1431 Signed-off-by: Jim Hahn --- .../src/main/feature/config/feature-healthcheck.properties | 5 ++++- .../src/main/feature/config/feature-state-management.properties | 1 + policy-management/src/main/server/config/policy-engine.properties | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties index eaecaa67..4d988a23 100644 --- a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties +++ b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # feature-healthcheck # ================================================================================ -# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2019 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. @@ -28,6 +28,7 @@ http.server.services.HEALTHCHECK.userName=${{HEALTHCHECK_USER}} http.server.services.HEALTHCHECK.password=${{HEALTHCHECK_PASSWORD}} http.server.services.HEALTHCHECK.https=true http.server.services.HEALTHCHECK.aaf=${{AAF}} +http.server.services.HEALTHCHECK.serialization.provider=org.onap.policy.common.gson.JacksonHandler http.client.services=PAP,PDP @@ -38,6 +39,7 @@ http.client.services.PAP.https=true http.client.services.PAP.userName=${{PAP_USERNAME}} http.client.services.PAP.password=${{PAP_PASSWORD}} http.client.services.PAP.managed=true +http.client.services.PAP.serialization.provider=org.onap.policy.common.gson.JacksonHandler http.client.services.PDP.host=${{PDP_HOST}} http.client.services.PDP.port=8081 @@ -46,3 +48,4 @@ http.client.services.PDP.https=true http.client.services.PDP.userName=${{PDP_USERNAME}} http.client.services.PDP.password=${{PDP_PASSWORD}} http.client.services.PDP.managed=false +http.client.services.PDP.serialization.provider=org.onap.policy.common.gson.JacksonHandler diff --git a/feature-state-management/src/main/feature/config/feature-state-management.properties b/feature-state-management/src/main/feature/config/feature-state-management.properties index d43675e8..50d7edae 100644 --- a/feature-state-management/src/main/feature/config/feature-state-management.properties +++ b/feature-state-management/src/main/feature/config/feature-state-management.properties @@ -28,6 +28,7 @@ javax.persistence.jdbc.password=${{SQL_PASSWORD}} # Test interface host and port defaults may be overwritten here http.server.services.TEST.host=0.0.0.0 http.server.services.TEST.port=9981 +http.server.services.TEST.serialization.provider=org.onap.policy.common.gson.JacksonHandler #These properties will default to the following if no other values are provided: # http.server.services.TEST.restClasses=org.onap.policy.drools.statemanagement.IntegrityMonitorRestManager # http.server.services.TEST.managed=false diff --git a/policy-management/src/main/server/config/policy-engine.properties b/policy-management/src/main/server/config/policy-engine.properties index c2e8aa10..58389151 100644 --- a/policy-management/src/main/server/config/policy-engine.properties +++ b/policy-management/src/main/server/config/policy-engine.properties @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # policy-management # ================================================================================ -# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2019 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. @@ -50,6 +50,7 @@ http.server.services.SECURED-CONFIG.managed=false http.server.services.SECURED-CONFIG.swagger=true http.server.services.SECURED-CONFIG.https=true http.server.services.SECURED-CONFIG.aaf=${{AAF}} +http.server.services.SECURED-CONFIG.serialization.provider=org.onap.policy.common.gson.JacksonHandler aaf.namespace=${{AAF_NAMESPACE}} aaf.root.permission=${{AAF_NAMESPACE}}.pdpd -- cgit 1.2.3-korg