From 07d552581210c402536f0670331e43267b445de7 Mon Sep 17 00:00:00 2001 From: Taka Cho Date: Wed, 16 Oct 2019 17:04:43 -0400 Subject: replace deprecated addMixInAnnotations addMixInAnnotations(Class, Class) was deprecated use addMixIn instead Issue-ID: APPC-1764 Change-Id: Ic65e1f18a8d427f641a8d36003f29bdbf1b3b58b Signed-off-by: Taka Cho --- .../org/onap/appc/mdsal/impl/MDSALStoreImpl.java | 2 +- .../onap/appc/requesthandler/conv/Converter.java | 24 +++++++++++----------- .../onap/appc/oam/messageadapter/Converter.java | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/impl/MDSALStoreImpl.java b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/impl/MDSALStoreImpl.java index 8f7bfabac..babf59577 100644 --- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/impl/MDSALStoreImpl.java +++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/src/main/java/org/onap/appc/mdsal/impl/MDSALStoreImpl.java @@ -168,7 +168,7 @@ public class MDSALStoreImpl implements MDSALStore { StoreYangInput input = builder.build(); try { ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.addMixInAnnotations(StoreYangInput.class, MixIn.class); + objectMapper.addMixIn(StoreYangInput.class, MixIn.class); String inputJson = objectMapper.writer().withRootName("input").writeValueAsString(input); logger.debug("Input JSON :" + inputJson); return inputJson; diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/conv/Converter.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/conv/Converter.java index 260f8695f..41b71224d 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/conv/Converter.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/conv/Converter.java @@ -413,12 +413,12 @@ public class Converter { Builder builder = Converter.convAsyncResponseToBuilder(vnfOperation, rpcName, asyncResponse); Object message = builder.build(); ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.addMixInAnnotations(message.getClass(), MixInFlagsMessage.class); - objectMapper.addMixInAnnotations(CommonHeader.class, MixInCommonHeader.class); - objectMapper.addMixInAnnotations(Flags.class, MixIn.class); - objectMapper.addMixInAnnotations(Status.class, MixIn.class); - objectMapper.addMixInAnnotations(Payload.class, MixIn.class); - objectMapper.addMixInAnnotations(ZULU.class, MixIn.class); + objectMapper.addMixIn(message.getClass(), MixInFlagsMessage.class); + objectMapper.addMixIn(CommonHeader.class, MixInCommonHeader.class); + objectMapper.addMixIn(Flags.class, MixIn.class); + objectMapper.addMixIn(Status.class, MixIn.class); + objectMapper.addMixIn(Payload.class, MixIn.class); + objectMapper.addMixIn(ZULU.class, MixIn.class); // .configure(SerializationConfig.Feature.SORT_PROPERTIES_ALPHABETICALLY,true) ObjectWriter writer = objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL).configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY,true) @@ -430,12 +430,12 @@ public class Converter { logger.debug("Entered Converter.convAsyncResponseToDmaapOutgoingMessageJsonString()"); DmaapOutgoingMessage dmaapOutgoingMessage = convAsyncResponseToDmaapOutgoingMessage(vnfOperation, rpcName, asyncResponse); ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.addMixInAnnotations(dmaapOutgoingMessage.getBody().getOutput().getClass(), MixInFlagsMessage.class); - objectMapper.addMixInAnnotations(CommonHeader.class, MixInCommonHeader.class); - objectMapper.addMixInAnnotations(Flags.class, MixIn.class); - objectMapper.addMixInAnnotations(Status.class, MixIn.class); - objectMapper.addMixInAnnotations(Payload.class, MixIn.class); - objectMapper.addMixInAnnotations(ZULU.class, MixIn.class); + objectMapper.addMixIn(dmaapOutgoingMessage.getBody().getOutput().getClass(), MixInFlagsMessage.class); + objectMapper.addMixIn(CommonHeader.class, MixInCommonHeader.class); + objectMapper.addMixIn(Flags.class, MixIn.class); + objectMapper.addMixIn(Status.class, MixIn.class); + objectMapper.addMixIn(Payload.class, MixIn.class); + objectMapper.addMixIn(ZULU.class, MixIn.class); // .configure(SerializationConfig.Feature.SORT_PROPERTIES_ALPHABETICALLY,true) ObjectWriter writer = objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL).configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY,true).writer(); diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/messageadapter/Converter.java b/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/messageadapter/Converter.java index 58fba5f23..2818f3935 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/messageadapter/Converter.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/messageadapter/Converter.java @@ -105,10 +105,10 @@ public class Converter { DmaapOutgoingMessage dmaapOutgoingMessage = convAsyncResponseToUebOutgoingMessage(rpcName, commonHeader, status); ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.addMixInAnnotations(dmaapOutgoingMessage.getBody().getOutput().getClass(), + objectMapper.addMixIn(dmaapOutgoingMessage.getBody().getOutput().getClass(), MixInFlagsMessage.class); - objectMapper.addMixInAnnotations(Status.class, MixIn.class); - objectMapper.addMixInAnnotations(CommonHeader.class, MixInCommonHeader.class); + objectMapper.addMixIn(Status.class, MixIn.class); + objectMapper.addMixIn(CommonHeader.class, MixInCommonHeader.class); ObjectWriter writer = objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL).configure (MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true).writer(); return writer.writeValueAsString(dmaapOutgoingMessage); -- cgit 1.2.3-korg