This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch ISIS-2222 in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4ea2bbb6900e2b94925d550e066f2750a0607aa4 Author: danhaywood <[email protected]> AuthorDate: Sat Aug 15 17:10:34 2020 +0100 ISIS-2222: wip adds facets for ChangesDto and CommandDto --- .../facets/schema/IsisSchemaMetaModelRefiner.java | 9 ++++ .../facets/schema/IsisSchemaValueTypeProvider.java | 12 +++-- .../ChangesDtoValueFacet.java} | 6 +-- ...toValueFacetUsingSemanticsProviderFactory.java} | 10 ++--- .../v2/ChangesDtoValueSemanticsProvider.java} | 49 ++++++++++---------- .../CommandDtoValueFacet.java} | 6 +-- ...toValueFacetUsingSemanticsProviderFactory.java} | 10 ++--- .../v2/CommandDtoValueSemanticsProvider.java} | 52 ++++++++++++---------- .../schema/{ => ixn}/InteractionDtoValueFacet.java | 2 +- ...DtoValueFacetUsingSemanticsProviderFactory.java | 2 +- .../v2}/InteractionDtoValueSemanticsProvider.java | 11 +++-- 11 files changed, 97 insertions(+), 72 deletions(-) diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaMetaModelRefiner.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaMetaModelRefiner.java index dc97220..111187f 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaMetaModelRefiner.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaMetaModelRefiner.java @@ -23,6 +23,9 @@ import javax.inject.Named; import org.springframework.stereotype.Component; import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner; +import org.apache.isis.core.metamodel.facets.schema.chg.v2.ChangesDtoValueFacetUsingSemanticsProviderFactory; +import org.apache.isis.core.metamodel.facets.schema.cmd.v2.CommandDtoValueFacetUsingSemanticsProviderFactory; +import org.apache.isis.core.metamodel.facets.schema.ixn.v2.InteractionDtoValueFacetUsingSemanticsProviderFactory; import org.apache.isis.core.metamodel.progmodel.ProgrammingModel; @Component @@ -33,6 +36,12 @@ public class IsisSchemaMetaModelRefiner implements MetaModelRefiner { programmingModel.addFactory( ProgrammingModel.FacetProcessingOrder.G1_VALUE_TYPES, InteractionDtoValueFacetUsingSemanticsProviderFactory.class); + programmingModel.addFactory( + ProgrammingModel.FacetProcessingOrder.G1_VALUE_TYPES, + ChangesDtoValueFacetUsingSemanticsProviderFactory.class); + programmingModel.addFactory( + ProgrammingModel.FacetProcessingOrder.G1_VALUE_TYPES, + CommandDtoValueFacetUsingSemanticsProviderFactory.class); } } diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaValueTypeProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaValueTypeProvider.java index b5f51bb..01f96a3 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaValueTypeProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/IsisSchemaValueTypeProvider.java @@ -18,8 +18,8 @@ */ package org.apache.isis.core.metamodel.facets.schema; +import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import javax.inject.Named; @@ -27,16 +27,20 @@ import org.springframework.stereotype.Component; import org.apache.isis.core.metamodel.valuetypes.ValueTypeDefinition; import org.apache.isis.core.metamodel.valuetypes.ValueTypeProvider; +import org.apache.isis.schema.chg.v2.ChangesDto; +import org.apache.isis.schema.cmd.v2.CommandDto; import org.apache.isis.schema.common.v2.ValueType; import org.apache.isis.schema.ixn.v2.InteractionDto; -import org.apache.isis.schema.ixn.v2.PropertyEditDto; @Component @Named("isisMetaModel.isisSchema.ValueTypeProvider") public class IsisSchemaValueTypeProvider implements ValueTypeProvider { @Override public Collection<ValueTypeDefinition> definitions() { - return Collections.singletonList( - ValueTypeDefinition.of(InteractionDto.class, ValueType.STRING)); + return Arrays.asList( + ValueTypeDefinition.of(InteractionDto.class, ValueType.STRING) + , ValueTypeDefinition.of(ChangesDto.class, ValueType.STRING) + , ValueTypeDefinition.of(CommandDto.class, ValueType.STRING) + ); } } diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/chg/ChangesDtoValueFacet.java similarity index 85% copy from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacet.java copy to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/chg/ChangesDtoValueFacet.java index 056a421..e2aa514 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacet.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/chg/ChangesDtoValueFacet.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.isis.core.metamodel.facets.schema; +package org.apache.isis.core.metamodel.facets.schema.chg; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.spec.ManagedObject; -public interface InteractionDtoValueFacet extends Facet { +public interface ChangesDtoValueFacet extends Facet { - String interactionDtoValue(ManagedObject object); + String changesDtoValue(ManagedObject object); ManagedObject createValue(ManagedObject object, String xml); } diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/chg/v2/ChangesDtoValueFacetUsingSemanticsProviderFactory.java similarity index 77% copy from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacetUsingSemanticsProviderFactory.java copy to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/chg/v2/ChangesDtoValueFacetUsingSemanticsProviderFactory.java index d7b76bf..6d06b91 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/chg/v2/ChangesDtoValueFacetUsingSemanticsProviderFactory.java @@ -17,25 +17,25 @@ * under the License. */ -package org.apache.isis.core.metamodel.facets.schema; +package org.apache.isis.core.metamodel.facets.schema.chg.v2; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProviderFactory; -import org.apache.isis.schema.ixn.v2.InteractionDto; +import org.apache.isis.schema.chg.v2.ChangesDto; import lombok.val; -public class InteractionDtoValueFacetUsingSemanticsProviderFactory extends ValueFacetUsingSemanticsProviderFactory<InteractionDto> { +public class ChangesDtoValueFacetUsingSemanticsProviderFactory extends ValueFacetUsingSemanticsProviderFactory<ChangesDto> { @Override public void process(final ProcessClassContext processClassContext) { final Class<?> type = processClassContext.getCls(); final FacetHolder holder = processClassContext.getFacetHolder(); - if (!(InteractionDto.class.isAssignableFrom(type))) { + if (!(ChangesDto.class.isAssignableFrom(type))) { return; } - val provider = new InteractionDtoValueSemanticsProvider(holder); + val provider = new ChangesDtoValueSemanticsProvider(holder); addFacets(provider); } } diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/chg/v2/ChangesDtoValueSemanticsProvider.java similarity index 59% copy from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueSemanticsProvider.java copy to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/chg/v2/ChangesDtoValueSemanticsProvider.java index aae5938..0e1dd82 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/chg/v2/ChangesDtoValueSemanticsProvider.java @@ -17,52 +17,55 @@ * under the License. */ -package org.apache.isis.core.metamodel.facets.schema; +package org.apache.isis.core.metamodel.facets.schema.chg.v2; import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; -import org.apache.isis.applib.util.schema.InteractionDtoUtils; +import org.apache.isis.applib.util.schema.ChangesDtoUtils; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract; +import org.apache.isis.core.metamodel.facets.schema.chg.ChangesDtoValueFacet; import org.apache.isis.core.metamodel.spec.ManagedObject; -import org.apache.isis.schema.ixn.v2.InteractionDto; +import org.apache.isis.schema.chg.v2.ChangesDto; -public class InteractionDtoValueSemanticsProvider -extends ValueSemanticsProviderAndFacetAbstract<InteractionDto> -implements InteractionDtoValueFacet { +import lombok.val; + +public class ChangesDtoValueSemanticsProvider +extends ValueSemanticsProviderAndFacetAbstract<ChangesDto> +implements ChangesDtoValueFacet { private static final int TYPICAL_LENGTH = 0; private static Class<? extends Facet> type() { - return InteractionDtoValueFacet.class; + return ChangesDtoValueFacet.class; } - private static final InteractionDto DEFAULT_VALUE = null; + private static final ChangesDto DEFAULT_VALUE = null; /** * Required because implementation of {@link Parser} and * {@link EncoderDecoder}. */ - public InteractionDtoValueSemanticsProvider() { + public ChangesDtoValueSemanticsProvider() { this(null); } - public InteractionDtoValueSemanticsProvider(final FacetHolder holder) { - super(type(), holder, InteractionDto.class, TYPICAL_LENGTH, -1, Immutability.IMMUTABLE, EqualByContent.NOT_HONOURED, DEFAULT_VALUE); + public ChangesDtoValueSemanticsProvider(final FacetHolder holder) { + super(type(), holder, ChangesDto.class, TYPICAL_LENGTH, -1, Immutability.IMMUTABLE, EqualByContent.NOT_HONOURED, DEFAULT_VALUE); } @Override - protected InteractionDto doParse(final Object context, final String str) { + protected ChangesDto doParse(final Object context, final String str) { return doRestore(str); } @Override public String titleString(final Object object) { if (object == null) return "[null]"; - final InteractionDto interactionDto = (InteractionDto) object; - return InteractionDtoUtils.toXml(interactionDto); + final ChangesDto changesDto = (ChangesDto) object; + return ChangesDtoUtils.toXml(changesDto); } @Override @@ -72,30 +75,30 @@ implements InteractionDtoValueFacet { @Override - public String interactionDtoValue(final ManagedObject object) { + public String changesDtoValue(final ManagedObject object) { if (object == null) { return ""; } - final InteractionDto interactionDto = (InteractionDto) object.getPojo(); - return InteractionDtoUtils.toXml(interactionDto); + val changesDto = (ChangesDto) object.getPojo(); + return ChangesDtoUtils.toXml(changesDto); } @Override public ManagedObject createValue(final ManagedObject object, final String xml) { - final InteractionDto interactionDto = InteractionDtoUtils.fromXml(xml); - return getObjectManager().adapt(interactionDto); + val changesDto = ChangesDtoUtils.fromXml(xml); + return getObjectManager().adapt(changesDto); } @Override protected String doEncode(final Object object) { - InteractionDto interactionDto = (InteractionDto) object; - return InteractionDtoUtils.toXml(interactionDto); + val changesDto = (ChangesDto) object; + return ChangesDtoUtils.toXml(changesDto); } @Override - protected InteractionDto doRestore(final String xml) { - return InteractionDtoUtils.fromXml(xml); + protected ChangesDto doRestore(final String xml) { + return ChangesDtoUtils.fromXml(xml); } diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/cmd/CommandDtoValueFacet.java similarity index 85% copy from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacet.java copy to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/cmd/CommandDtoValueFacet.java index 056a421..12f2b85 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacet.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/cmd/CommandDtoValueFacet.java @@ -17,14 +17,14 @@ * under the License. */ -package org.apache.isis.core.metamodel.facets.schema; +package org.apache.isis.core.metamodel.facets.schema.cmd; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.spec.ManagedObject; -public interface InteractionDtoValueFacet extends Facet { +public interface CommandDtoValueFacet extends Facet { - String interactionDtoValue(ManagedObject object); + String commandDtoValue(ManagedObject object); ManagedObject createValue(ManagedObject object, String xml); } diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/cmd/v2/CommandDtoValueFacetUsingSemanticsProviderFactory.java similarity index 77% copy from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacetUsingSemanticsProviderFactory.java copy to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/cmd/v2/CommandDtoValueFacetUsingSemanticsProviderFactory.java index d7b76bf..b0d377a 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/cmd/v2/CommandDtoValueFacetUsingSemanticsProviderFactory.java @@ -17,25 +17,25 @@ * under the License. */ -package org.apache.isis.core.metamodel.facets.schema; +package org.apache.isis.core.metamodel.facets.schema.cmd.v2; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProviderFactory; -import org.apache.isis.schema.ixn.v2.InteractionDto; +import org.apache.isis.schema.cmd.v2.CommandDto; import lombok.val; -public class InteractionDtoValueFacetUsingSemanticsProviderFactory extends ValueFacetUsingSemanticsProviderFactory<InteractionDto> { +public class CommandDtoValueFacetUsingSemanticsProviderFactory extends ValueFacetUsingSemanticsProviderFactory<CommandDto> { @Override public void process(final ProcessClassContext processClassContext) { final Class<?> type = processClassContext.getCls(); final FacetHolder holder = processClassContext.getFacetHolder(); - if (!(InteractionDto.class.isAssignableFrom(type))) { + if (!(CommandDto.class.isAssignableFrom(type))) { return; } - val provider = new InteractionDtoValueSemanticsProvider(holder); + val provider = new CommandDtoValueSemanticsProvider(holder); addFacets(provider); } } diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/cmd/v2/CommandDtoValueSemanticsProvider.java similarity index 58% copy from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueSemanticsProvider.java copy to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/cmd/v2/CommandDtoValueSemanticsProvider.java index aae5938..16f90e6 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/cmd/v2/CommandDtoValueSemanticsProvider.java @@ -17,52 +17,58 @@ * under the License. */ -package org.apache.isis.core.metamodel.facets.schema; +package org.apache.isis.core.metamodel.facets.schema.cmd.v2; import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; -import org.apache.isis.applib.util.schema.InteractionDtoUtils; +import org.apache.isis.applib.util.schema.ChangesDtoUtils; +import org.apache.isis.applib.util.schema.CommandDtoUtils; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract; +import org.apache.isis.core.metamodel.facets.schema.cmd.CommandDtoValueFacet; import org.apache.isis.core.metamodel.spec.ManagedObject; -import org.apache.isis.schema.ixn.v2.InteractionDto; +import org.apache.isis.schema.chg.v2.ChangesDto; +import org.apache.isis.schema.cmd.v2.CommandDto; +import org.apache.isis.schema.cmd.v2.CommandsDto; -public class InteractionDtoValueSemanticsProvider -extends ValueSemanticsProviderAndFacetAbstract<InteractionDto> -implements InteractionDtoValueFacet { +import lombok.val; + +public class CommandDtoValueSemanticsProvider +extends ValueSemanticsProviderAndFacetAbstract<CommandDto> +implements CommandDtoValueFacet { private static final int TYPICAL_LENGTH = 0; private static Class<? extends Facet> type() { - return InteractionDtoValueFacet.class; + return CommandDtoValueFacet.class; } - private static final InteractionDto DEFAULT_VALUE = null; + private static final CommandDto DEFAULT_VALUE = null; /** * Required because implementation of {@link Parser} and * {@link EncoderDecoder}. */ - public InteractionDtoValueSemanticsProvider() { + public CommandDtoValueSemanticsProvider() { this(null); } - public InteractionDtoValueSemanticsProvider(final FacetHolder holder) { - super(type(), holder, InteractionDto.class, TYPICAL_LENGTH, -1, Immutability.IMMUTABLE, EqualByContent.NOT_HONOURED, DEFAULT_VALUE); + public CommandDtoValueSemanticsProvider(final FacetHolder holder) { + super(type(), holder, CommandDto.class, TYPICAL_LENGTH, -1, Immutability.IMMUTABLE, EqualByContent.NOT_HONOURED, DEFAULT_VALUE); } @Override - protected InteractionDto doParse(final Object context, final String str) { + protected CommandDto doParse(final Object context, final String str) { return doRestore(str); } @Override public String titleString(final Object object) { if (object == null) return "[null]"; - final InteractionDto interactionDto = (InteractionDto) object; - return InteractionDtoUtils.toXml(interactionDto); + val commandDto = (CommandDto) object; + return CommandDtoUtils.toXml(commandDto); } @Override @@ -72,30 +78,30 @@ implements InteractionDtoValueFacet { @Override - public String interactionDtoValue(final ManagedObject object) { + public String commandDtoValue(final ManagedObject object) { if (object == null) { return ""; } - final InteractionDto interactionDto = (InteractionDto) object.getPojo(); - return InteractionDtoUtils.toXml(interactionDto); + val commandDto = (CommandDto) object.getPojo(); + return CommandDtoUtils.toXml(commandDto); } @Override public ManagedObject createValue(final ManagedObject object, final String xml) { - final InteractionDto interactionDto = InteractionDtoUtils.fromXml(xml); - return getObjectManager().adapt(interactionDto); + val commandDto = CommandDtoUtils.fromXml(xml); + return getObjectManager().adapt(commandDto); } @Override protected String doEncode(final Object object) { - InteractionDto interactionDto = (InteractionDto) object; - return InteractionDtoUtils.toXml(interactionDto); + val commandDto = (CommandDto) object; + return CommandDtoUtils.toXml(commandDto); } @Override - protected InteractionDto doRestore(final String xml) { - return InteractionDtoUtils.fromXml(xml); + protected CommandDto doRestore(final String xml) { + return CommandDtoUtils.fromXml(xml); } diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/ixn/InteractionDtoValueFacet.java similarity index 95% rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacet.java rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/ixn/InteractionDtoValueFacet.java index 056a421..94145ae 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacet.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/ixn/InteractionDtoValueFacet.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.isis.core.metamodel.facets.schema; +package org.apache.isis.core.metamodel.facets.schema.ixn; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.spec.ManagedObject; diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/ixn/v2/InteractionDtoValueFacetUsingSemanticsProviderFactory.java similarity index 96% rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacetUsingSemanticsProviderFactory.java rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/ixn/v2/InteractionDtoValueFacetUsingSemanticsProviderFactory.java index d7b76bf..8113dc1 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueFacetUsingSemanticsProviderFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/ixn/v2/InteractionDtoValueFacetUsingSemanticsProviderFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.isis.core.metamodel.facets.schema; +package org.apache.isis.core.metamodel.facets.schema.ixn.v2; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueFacetUsingSemanticsProviderFactory; diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/ixn/v2/InteractionDtoValueSemanticsProvider.java similarity index 90% rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueSemanticsProvider.java rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/ixn/v2/InteractionDtoValueSemanticsProvider.java index aae5938..82c3839 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/InteractionDtoValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/schema/ixn/v2/InteractionDtoValueSemanticsProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.isis.core.metamodel.facets.schema; +package org.apache.isis.core.metamodel.facets.schema.ixn.v2; import org.apache.isis.applib.adapters.EncoderDecoder; import org.apache.isis.applib.adapters.Parser; @@ -25,9 +25,12 @@ import org.apache.isis.applib.util.schema.InteractionDtoUtils; import org.apache.isis.core.metamodel.facetapi.Facet; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract; +import org.apache.isis.core.metamodel.facets.schema.ixn.InteractionDtoValueFacet; import org.apache.isis.core.metamodel.spec.ManagedObject; import org.apache.isis.schema.ixn.v2.InteractionDto; +import lombok.val; + public class InteractionDtoValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<InteractionDto> implements InteractionDtoValueFacet { @@ -76,20 +79,20 @@ implements InteractionDtoValueFacet { if (object == null) { return ""; } - final InteractionDto interactionDto = (InteractionDto) object.getPojo(); + val interactionDto = (InteractionDto) object.getPojo(); return InteractionDtoUtils.toXml(interactionDto); } @Override public ManagedObject createValue(final ManagedObject object, final String xml) { - final InteractionDto interactionDto = InteractionDtoUtils.fromXml(xml); + val interactionDto = InteractionDtoUtils.fromXml(xml); return getObjectManager().adapt(interactionDto); } @Override protected String doEncode(final Object object) { - InteractionDto interactionDto = (InteractionDto) object; + val interactionDto = (InteractionDto) object; return InteractionDtoUtils.toXml(interactionDto); }
