diff options
Diffstat (limited to 'models-interactions')
12 files changed, 16 insertions, 16 deletions
diff --git a/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/AppcOperation.java b/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/AppcOperation.java index 14ab355bf..9af24185c 100644 --- a/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/AppcOperation.java +++ b/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/AppcOperation.java @@ -183,7 +183,7 @@ public abstract class AppcOperation extends BidirectionalTopicOperation<Request, } @Override - protected Coder makeCoder() { + protected Coder getCoder() { return coder; } } diff --git a/models-interactions/model-actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmOperation.java b/models-interactions/model-actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmOperation.java index 3e5ed2c27..0be723c7c 100644 --- a/models-interactions/model-actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmOperation.java +++ b/models-interactions/model-actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmOperation.java @@ -136,7 +136,7 @@ public class AppcLcmOperation extends BidirectionalTopicOperation<AppcLcmDmaapWr */ private void convertPayload(Map<String, Object> source, AppcLcmInput request) { try { - String encodedPayloadString = makeCoder().encode(source); + String encodedPayloadString = getCoder().encode(source); request.setPayload(encodedPayloadString); } catch (CoderException e) { throw new IllegalArgumentException("Cannot convert payload", e); diff --git a/models-interactions/model-actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmOperationTest.java b/models-interactions/model-actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmOperationTest.java index c5ec58acd..fcfb6b868 100644 --- a/models-interactions/model-actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmOperationTest.java +++ b/models-interactions/model-actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmOperationTest.java @@ -203,7 +203,7 @@ public class AppcLcmOperationTest extends BasicBidirectionalTopicOperation { // coder exception oper = new AppcLcmOperation(params, config) { @Override - protected Coder makeCoder() { + protected Coder getCoder() { return new StandardCoder() { @Override public String encode(Object object) throws CoderException { diff --git a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java index 7f8a5c5c4..a8900f76b 100644 --- a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java +++ b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java @@ -489,7 +489,7 @@ public abstract class SoOperation extends HttpOperation<SoResponse> { } @Override - protected Coder makeCoder() { + protected Coder getCoder() { return coder; } diff --git a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleDelete.java b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleDelete.java index 04f0287b7..9dbdc58d8 100644 --- a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleDelete.java +++ b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleDelete.java @@ -165,7 +165,7 @@ public class VfModuleDelete extends SoOperation { // propagate "cancel" to the future controller.add(future); - future.thenApply(response -> new RestManagerResponse(response.statusCode(), response.body(), makeCoder())) + future.thenApply(response -> new RestManagerResponse(response.statusCode(), response.body(), getCoder())) .whenComplete((resp, thrown) -> { if (thrown != null) { callback.failed(thrown); diff --git a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java index 9e72c8aaf..b794eab4e 100644 --- a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java +++ b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java @@ -431,8 +431,8 @@ public class SoOperationTest extends BasicSoOperation { } @Test - public void testMakeCoder() throws CoderException { - Coder opcoder = oper.makeCoder(); + public void testGetCoder() throws CoderException { + Coder opcoder = oper.getCoder(); // ensure we can decode an SO timestamp String json = "{'request':{'finishTime':'Fri, 15 May 2020 12:14:21 GMT'}}"; diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperation.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperation.java index 2a460667a..13231e6ad 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperation.java +++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperation.java @@ -201,7 +201,7 @@ public abstract class BidirectionalTopicOperation<Q, S> extends OperationPartial } else { try { - response = makeCoder().decode(rawResponse, responseClass); + response = getCoder().decode(rawResponse, responseClass); } catch (CoderException e) { logger.warn("{}.{} cannot decode response for {}", params.getActor(), params.getOperation(), params.getRequestId()); diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperation.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperation.java index 766468c07..fb6d38292 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperation.java +++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperation.java @@ -186,7 +186,7 @@ public abstract class HttpOperation<T> extends OperationPartial { response = responseClass.cast(strResponse); } else { try { - response = makeCoder().decode(strResponse, responseClass); + response = getCoder().decode(strResponse, responseClass); } catch (CoderException e) { logger.warn("{}.{} cannot decode response for {}", params.getActor(), params.getOperation(), params.getRequestId(), e); diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartial.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartial.java index 1df318799..b28021607 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartial.java +++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartial.java @@ -1029,7 +1029,7 @@ public abstract class OperationPartial implements Operation { return message.toString(); } else { try { - return makeCoder().encode(message, true); + return getCoder().encode(message, true); } catch (CoderException e) { throw new IllegalArgumentException("cannot encode message", e); } @@ -1071,7 +1071,7 @@ public abstract class OperationPartial implements Operation { // these may be overridden by junit tests - protected Coder makeCoder() { + protected Coder getCoder() { return coder; } } diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperationTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperationTest.java index 84a4d5d29..b62eae8a6 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperationTest.java +++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/BidirectionalTopicOperationTest.java @@ -323,8 +323,8 @@ public class BidirectionalTopicOperationTest { } @Test - public void testMakeCoder() { - assertNotNull(oper.makeCoder()); + public void testGetCoder() { + assertNotNull(oper.getCoder()); } /** @@ -333,7 +333,7 @@ public class BidirectionalTopicOperationTest { private void setOperCoderException() { oper = new MyOperation() { @Override - protected Coder makeCoder() { + protected Coder getCoder() { return new StandardCoder() { @Override public String encode(Object object, boolean pretty) throws CoderException { diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java index 291811a6e..1b3485d5d 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java +++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java @@ -415,7 +415,7 @@ public class HttpOperationTest { @Test public void testMakeDecoder() { - assertNotNull(oper.makeCoder()); + assertNotNull(oper.getCoder()); } /** diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java index f5fd9fb75..6d8c60bb6 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java +++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/OperationPartialTest.java @@ -1259,7 +1259,7 @@ public class OperationPartialTest { private void setOperCoderException() { oper = new MyOper() { @Override - protected Coder makeCoder() { + protected Coder getCoder() { return new StandardCoder() { @Override public String encode(Object object, boolean pretty) throws CoderException { |