From e5ea438e452307e2b89fb1d27aba1b3bbfcd0729 Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Mon, 30 Jan 2017 13:34:36 +0200 Subject: [PATCH] rename the FilePlanComponentMix file to FilePlanComponentMixIn --- .../{FilePlanComponentMix.java => FilePlanComponentMixIn.java} | 2 +- .../java/org/alfresco/rest/rm/community/util/PojoUtility.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/{FilePlanComponentMix.java => FilePlanComponentMixIn.java} (97%) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/FilePlanComponentMix.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/FilePlanComponentMixIn.java similarity index 97% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/FilePlanComponentMix.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/FilePlanComponentMixIn.java index 580fe13049..71b1e25186 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/FilePlanComponentMix.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/FilePlanComponentMixIn.java @@ -38,7 +38,7 @@ import org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponent * @author Rodica Sutu * @since 2.6 */ -public abstract class FilePlanComponentMix +public abstract class FilePlanComponentMixIn { /** * Annotation used to indicate that a property should be serialized "unwrapped" diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/PojoUtility.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/PojoUtility.java index 5b98b437ae..e865118d79 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/PojoUtility.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/PojoUtility.java @@ -87,7 +87,7 @@ public class PojoUtility //inject the "mix-in" annotations from FilePlanComponentMix to // FilePlanComponent POJO class when converting to json - mapper.addMixIn(FilePlanComponent.class, FilePlanComponentMix.class); + mapper.addMixIn(FilePlanComponent.class, FilePlanComponentMixIn.class); //include only values that differ from default settings to be included mapper.setSerializationInclusion(Include.NON_DEFAULT);