diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/AssemblyConstraints.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/AssemblyConstraints.java index 43dfa19b1..3675ae56d 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/AssemblyConstraints.java +++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/AssemblyConstraints.java @@ -26,7 +26,6 @@ package gov.nist.secauto.metaschema.databind.model.binding.metaschema; -import gov.nist.secauto.metaschema.core.model.IBoundObject; import gov.nist.secauto.metaschema.core.model.IMetaschemaData; import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; import gov.nist.secauto.metaschema.core.util.ObjectUtils; @@ -52,7 +51,7 @@ @MetaschemaAssembly( name = "assembly-constraints", moduleClass = MetaschemaModelModule.class) -public final class AssemblyConstraints implements IBoundObject, IModelConstraintsBase { +public final class AssemblyConstraints implements IModelConstraintsBase { private final IMetaschemaData __metaschemaData; @BoundAssembly( diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FieldConstraints.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FieldConstraints.java index f36f2a29e..bb0aa6764 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FieldConstraints.java +++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FieldConstraints.java @@ -26,7 +26,6 @@ package gov.nist.secauto.metaschema.databind.model.binding.metaschema; -import gov.nist.secauto.metaschema.core.model.IBoundObject; import gov.nist.secauto.metaschema.core.model.IMetaschemaData; import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; import gov.nist.secauto.metaschema.core.util.ObjectUtils; @@ -51,7 +50,7 @@ @MetaschemaAssembly( name = "field-constraints", moduleClass = MetaschemaModelModule.class) -public final class FieldConstraints implements IBoundObject, IValueTargetedConstraintsBase { +public final class FieldConstraints implements IValueTargetedConstraintsBase { private final IMetaschemaData __metaschemaData; @BoundAssembly( diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagConstraints.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagConstraints.java index 89fe9fc83..01a067c43 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagConstraints.java +++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/FlagConstraints.java @@ -26,7 +26,6 @@ package gov.nist.secauto.metaschema.databind.model.binding.metaschema; -import gov.nist.secauto.metaschema.core.model.IBoundObject; import gov.nist.secauto.metaschema.core.model.IMetaschemaData; import gov.nist.secauto.metaschema.core.model.JsonGroupAsBehavior; import gov.nist.secauto.metaschema.core.util.ObjectUtils; @@ -52,7 +51,7 @@ @MetaschemaAssembly( name = "flag-constraints", moduleClass = MetaschemaModelModule.class) -public final class FlagConstraints implements IBoundObject, IValueConstraintsBase { +public final class FlagConstraints implements IValueConstraintsBase { private final IMetaschemaData __metaschemaData; @BoundAssembly( diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaModuleConstraints.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaModuleConstraints.java index 75881f8e8..f54173f72 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaModuleConstraints.java +++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/binding/metaschema/MetaschemaModuleConstraints.java @@ -338,7 +338,7 @@ public String toString() { @MetaschemaAssembly( name = "assembly", moduleClass = MetaschemaModelModule.class) - public static final class Assembly implements IBoundObject, IModelConstraintsBase { + public static final class Assembly implements IModelConstraintsBase { private final IMetaschemaData __metaschemaData; @BoundFlag( @@ -414,7 +414,7 @@ public String toString() { @MetaschemaAssembly( name = "field", moduleClass = MetaschemaModelModule.class) - public static final class Field implements IBoundObject, IValueConstraintsBase { + public static final class Field implements IValueConstraintsBase { private final IMetaschemaData __metaschemaData; @BoundFlag( diff --git a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java index 9924c4882..d84a7406b 100644 --- a/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java +++ b/databind/src/main/java/gov/nist/secauto/metaschema/databind/model/impl/AbstractBoundDefinitionModelComplex.java @@ -139,7 +139,7 @@ public Method getAfterDeserializeMethod() { @Override public IBoundObject deepCopyItem(IBoundObject item, IBoundObject parentInstance) throws BindingException { - IBoundObject instance = newInstance(() -> item.getMetaschemaData()); + IBoundObject instance = newInstance(item::getMetaschemaData); callBeforeDeserialize(instance, parentInstance);