From 9849908bc526807c8c11f6609dbc5cef6ab2a872 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 18 Feb 2019 08:46:09 -0500 Subject: Removed null custom coders Some code still referenced the customJacksonCoder() method, which has been removed from drools-pdp. However, all the code did was set the jackson & gson coders to null, which is unnecessary, as that is the default value for both. Thus the code was removed altogether so-as not to cause issues in the future. Updated license dates. Change-Id: Ie6f6bc8360890485ca50a751477650af7387b397 Issue-ID: POLICY-1429 Signed-off-by: Jim Hahn --- .../onap/policy/template/demo/clc/ControlLoopCoordinationTest.java | 6 +----- .../onap/policy/template/demo/clc/ControlLoopEventCleanupTest.java | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'controlloop/templates/template.demo.clc/src') diff --git a/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/ControlLoopCoordinationTest.java b/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/ControlLoopCoordinationTest.java index d4af9ea4d..4d8fca83b 100644 --- a/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/ControlLoopCoordinationTest.java +++ b/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/ControlLoopCoordinationTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * demo * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018-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. @@ -111,8 +111,6 @@ public class ControlLoopCoordinationTest implements TopicListener { .topic("POLICY-CL-MGT") .eventClass("org.onap.policy.controlloop.VirtualControlLoopNotification") .protocolFilter(new JsonProtocolFilter()) - .customGsonCoder(null) - .customJacksonCoder(null) .modelClassLoaderHash(1111)); EventProtocolCoder.manager.addEncoder(EventProtocolParams.builder() .groupId("junit.groupId") @@ -120,8 +118,6 @@ public class ControlLoopCoordinationTest implements TopicListener { .topic("APPC-LCM-READ") .eventClass("org.onap.policy.appclcm.LcmRequestWrapper") .protocolFilter(new JsonProtocolFilter()) - .customGsonCoder(null) - .customJacksonCoder(null) .modelClassLoaderHash(1111)); try { SupportUtil.buildAaiSim(); diff --git a/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/ControlLoopEventCleanupTest.java b/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/ControlLoopEventCleanupTest.java index e034990fe..605732c31 100644 --- a/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/ControlLoopEventCleanupTest.java +++ b/controlloop/templates/template.demo.clc/src/test/java/org/onap/policy/template/demo/clc/ControlLoopEventCleanupTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * demo * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018-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. @@ -130,8 +130,6 @@ public class ControlLoopEventCleanupTest { .topic("POLICY-CL-MGT") .eventClass("org.onap.policy.controlloop.VirtualControlLoopNotification") .protocolFilter(new JsonProtocolFilter()) - .customGsonCoder(null) - .customJacksonCoder(null) .modelClassLoaderHash(1111)); EventProtocolCoder.manager.addEncoder(EventProtocolParams.builder() .groupId("junit.groupId") @@ -139,8 +137,6 @@ public class ControlLoopEventCleanupTest { .topic("APPC-CL") .eventClass("org.onap.policy.appc.Request") .protocolFilter(new JsonProtocolFilter()) - .customGsonCoder(null) - .customJacksonCoder(null) .modelClassLoaderHash(1111)); try { -- cgit 1.2.3-korg