From 3d5216c34ba7f6b65a89161a6d1d7dfb332d5c96 Mon Sep 17 00:00:00 2001 From: David Waltermire Date: Fri, 1 Nov 2024 10:56:26 -0400 Subject: [PATCH] Fixed PMD warnings and added Javadocs. Refactored XML data type parsing implementation classes. --- .../maven/plugin/GenerateSchemaMojo.java | 1 + .../maven/plugin/GenerateSourcesMojo.java | 1 + .../model/testing/AbstractTestSuite.java | 6 ++- .../schemagen/datatype/IDatatypeContent.java | 23 ----------- .../impl/AssemblyDefinitionJsonSchema.java | 2 +- .../json/impl/FieldDefinitionJsonSchema.java | 7 ++-- .../{datatype => }/XmlDatatypeManager.java | 12 +++++- .../schemagen/xml/XmlSchemaGenerator.java | 3 +- .../schemagen/xml/datatype/package-info.java | 11 ----- .../impl}/AbstractDatatypeContent.java | 2 +- .../AbstractXmlDatatypeProvider.java | 5 +-- .../AbstractXmlMarkupDatatypeProvider.java | 3 +- .../impl}/CompositeDatatypeProvider.java | 2 +- .../schemagen/xml/impl/IDatatypeContent.java | 41 +++++++++++++++++++ .../impl}/IDatatypeProvider.java | 2 +- .../JDom2DatatypeContent.java | 3 +- .../JDom2XmlSchemaLoader.java | 2 +- .../XmlCoreDatatypeProvider.java | 3 +- .../xml/impl/XmlGenerationState.java | 18 ++++---- .../XmlMarkupLineDatatypeProvider.java | 2 +- .../XmlMarkupMultilineDatatypeProvider.java | 2 +- .../XmlProseBaseDatatypeProvider.java | 3 +- .../XmlProseCompositDatatypeProvider.java | 6 +-- .../schematype/AbstractXmlComplexType.java | 2 +- .../schematype/AbstractXmlSimpleType.java | 2 +- .../schematype/AbstractXmlType.java | 2 +- .../schematype/IXmlComplexType.java | 2 +- .../{ => impl}/schematype/IXmlSimpleType.java | 2 +- .../xml/{ => impl}/schematype/IXmlType.java | 2 +- .../XmlComplexTypeAssemblyDefinition.java | 2 +- .../XmlComplexTypeFieldDefinition.java | 2 +- .../XmlSimpleTypeDataTypeReference.java | 2 +- .../XmlSimpleTypeDataTypeRestriction.java | 2 +- .../schematype/XmlSimpleTypeUnion.java | 2 +- .../{ => impl}/schematype/package-info.java | 2 +- 35 files changed, 95 insertions(+), 89 deletions(-) delete mode 100644 schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/IDatatypeContent.java rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{datatype => }/XmlDatatypeManager.java (75%) delete mode 100644 schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/package-info.java rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/{datatype => xml/impl}/AbstractDatatypeContent.java (94%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{datatype => impl}/AbstractXmlDatatypeProvider.java (92%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{datatype => impl}/AbstractXmlMarkupDatatypeProvider.java (92%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/{datatype => xml/impl}/CompositeDatatypeProvider.java (96%) create mode 100644 schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IDatatypeContent.java rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/{datatype => xml/impl}/IDatatypeProvider.java (89%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{datatype => impl}/JDom2DatatypeContent.java (89%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{datatype => impl}/JDom2XmlSchemaLoader.java (97%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{datatype => impl}/XmlCoreDatatypeProvider.java (94%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{datatype => impl}/XmlMarkupLineDatatypeProvider.java (89%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{datatype => impl}/XmlMarkupMultilineDatatypeProvider.java (89%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{datatype => impl}/XmlProseBaseDatatypeProvider.java (89%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{datatype => impl}/XmlProseCompositDatatypeProvider.java (81%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{ => impl}/schematype/AbstractXmlComplexType.java (97%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{ => impl}/schematype/AbstractXmlSimpleType.java (94%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{ => impl}/schematype/AbstractXmlType.java (86%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{ => impl}/schematype/IXmlComplexType.java (91%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{ => impl}/schematype/IXmlSimpleType.java (89%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{ => impl}/schematype/IXmlType.java (97%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{ => impl}/schematype/XmlComplexTypeAssemblyDefinition.java (99%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{ => impl}/schematype/XmlComplexTypeFieldDefinition.java (96%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{ => impl}/schematype/XmlSimpleTypeDataTypeReference.java (95%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{ => impl}/schematype/XmlSimpleTypeDataTypeRestriction.java (98%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{ => impl}/schematype/XmlSimpleTypeUnion.java (97%) rename schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/{ => impl}/schematype/package-info.java (74%) diff --git a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSchemaMojo.java b/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSchemaMojo.java index 1902875b3..57eaa879b 100644 --- a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSchemaMojo.java +++ b/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSchemaMojo.java @@ -266,6 +266,7 @@ public void execute() throws MojoExecutionException { // } } + @SuppressWarnings("PMD.AvoidCatchingGenericException") private void performGeneration() throws MojoExecutionException { File outputDir = getOutputDirectory(); if (getLog().isDebugEnabled()) { diff --git a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSourcesMojo.java b/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSourcesMojo.java index 6b0843c77..eba856b80 100644 --- a/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSourcesMojo.java +++ b/metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSourcesMojo.java @@ -146,6 +146,7 @@ public void execute() throws MojoExecutionException { } } + @SuppressWarnings("PMD.AvoidCatchingGenericException") private void performGeneration() throws MojoExecutionException { File outputDir = getOutputDirectory(); if (getLog().isDebugEnabled()) { diff --git a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/AbstractTestSuite.java b/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/AbstractTestSuite.java index a2557a51b..e1c0e2a3f 100644 --- a/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/AbstractTestSuite.java +++ b/metaschema-testing/src/main/java/gov/nist/secauto/metaschema/model/testing/AbstractTestSuite.java @@ -264,6 +264,7 @@ protected OpenOption[] getWriteOpenOptions() { return OPEN_OPTIONS_TRUNCATE; } + @SuppressWarnings("PMD.AvoidCatchingGenericException") private DynamicContainer generateScenario( @NonNull TestScenario scenario, @NonNull URI collectionUri, @@ -346,7 +347,7 @@ private DynamicContainer generateScenario( try { schemaPath = ObjectUtils.requireNonNull(lazySchema.get()); } catch (Exception ex) { - throw new JUnitException( // NOPMD - cause is relevant, exception is not + throw new JUnitException( "failed to generate schema", ex); } validateWithSchema(ObjectUtils.requireNonNull(supplier.get()), schemaPath); @@ -416,13 +417,14 @@ protected Path convertContent( LOGGER.atInfo().log("Converting content '{}' to {} as '{}'", resource, toFormat, convertedContetPath); } - @SuppressWarnings("rawtypes") ISerializer serializer + ISerializer serializer = context.newSerializer(toFormat, ObjectUtils.asType(object.getClass())); serializer.serialize(ObjectUtils.asType(object), convertedContetPath, getWriteOpenOptions()); return convertedContetPath; } + @SuppressWarnings("PMD.AvoidCatchingGenericException") private DynamicTest generateValidationCase( @NonNull ContentCaseType contentCase, @NonNull IBindingContext bindingContext, diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/IDatatypeContent.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/IDatatypeContent.java deleted file mode 100644 index 91b68ddf9..000000000 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/IDatatypeContent.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -package gov.nist.secauto.metaschema.schemagen.datatype; - -import java.util.List; - -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; - -import edu.umd.cs.findbugs.annotations.NonNull; - -public interface IDatatypeContent { - @NonNull - String getTypeName(); - - @NonNull - List getDependencies(); - - void write(@NonNull XMLStreamWriter writer) throws XMLStreamException; -} diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AssemblyDefinitionJsonSchema.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AssemblyDefinitionJsonSchema.java index d357bffc4..0ff6169a1 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AssemblyDefinitionJsonSchema.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/AssemblyDefinitionJsonSchema.java @@ -78,7 +78,7 @@ private static Stream explodeChoice(@NonN @NonNull protected List> getGroupableModelInstances() { - return groupableModelInstances.get(); + return ObjectUtils.notNull(groupableModelInstances.get()); } @Override diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/FieldDefinitionJsonSchema.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/FieldDefinitionJsonSchema.java index 1a033b174..46a974834 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/FieldDefinitionJsonSchema.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/json/impl/FieldDefinitionJsonSchema.java @@ -72,11 +72,10 @@ protected void generateBody( } // generate flag properties - for (IFlagInstance flag : flags) { + flags.forEach(flag -> { assert flag != null; - new FlagInstanceJsonProperty(flag) - .generateProperty(properties, state); // NOPMD unavoidable instantiation - } + new FlagInstanceJsonProperty(flag).generateProperty(properties, state); + }); // generate value property if (jsonValueKeyFlag == null) { diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlDatatypeManager.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/XmlDatatypeManager.java similarity index 75% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlDatatypeManager.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/XmlDatatypeManager.java index bbc9b0be2..319bd00b7 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlDatatypeManager.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/XmlDatatypeManager.java @@ -3,11 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.datatype; +package gov.nist.secauto.metaschema.schemagen.xml; import gov.nist.secauto.metaschema.core.util.ObjectUtils; import gov.nist.secauto.metaschema.schemagen.datatype.AbstractDatatypeManager; -import gov.nist.secauto.metaschema.schemagen.datatype.IDatatypeProvider; +import gov.nist.secauto.metaschema.schemagen.xml.impl.IDatatypeProvider; +import gov.nist.secauto.metaschema.schemagen.xml.impl.XmlCoreDatatypeProvider; +import gov.nist.secauto.metaschema.schemagen.xml.impl.XmlMarkupLineDatatypeProvider; +import gov.nist.secauto.metaschema.schemagen.xml.impl.XmlMarkupMultilineDatatypeProvider; +import gov.nist.secauto.metaschema.schemagen.xml.impl.XmlProseCompositDatatypeProvider; import org.codehaus.stax2.XMLStreamWriter2; @@ -21,6 +25,10 @@ import edu.umd.cs.findbugs.annotations.NonNull; import nl.talsmasoftware.lazy4j.Lazy; +/** + * Support for managing Module data type implementations aligned with the XML + * schema format for use in schema generation. + */ public class XmlDatatypeManager extends AbstractDatatypeManager { public static final String NS_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema"; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/XmlSchemaGenerator.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/XmlSchemaGenerator.java index c87dd4ccb..67dce18ad 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/XmlSchemaGenerator.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/XmlSchemaGenerator.java @@ -16,9 +16,8 @@ import gov.nist.secauto.metaschema.schemagen.AbstractSchemaGenerator; import gov.nist.secauto.metaschema.schemagen.SchemaGenerationException; import gov.nist.secauto.metaschema.schemagen.SchemaGenerationFeature; -import gov.nist.secauto.metaschema.schemagen.xml.datatype.XmlDatatypeManager; import gov.nist.secauto.metaschema.schemagen.xml.impl.XmlGenerationState; -import gov.nist.secauto.metaschema.schemagen.xml.schematype.IXmlType; +import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.IXmlType; import org.codehaus.stax2.XMLOutputFactory2; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/package-info.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/package-info.java deleted file mode 100644 index 402dccc97..000000000 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -/* - * SPDX-FileCopyrightText: none - * SPDX-License-Identifier: CC0-1.0 - */ - -/** - * Support for managing Module data type implementations aligned with the XML - * schema format for use in schema generation. - */ - -package gov.nist.secauto.metaschema.schemagen.xml.datatype; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/AbstractDatatypeContent.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractDatatypeContent.java similarity index 94% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/AbstractDatatypeContent.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractDatatypeContent.java index 6b3f7692d..f3ec0d79c 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/AbstractDatatypeContent.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractDatatypeContent.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.datatype; +package gov.nist.secauto.metaschema.schemagen.xml.impl; import gov.nist.secauto.metaschema.core.util.CollectionUtil; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/AbstractXmlDatatypeProvider.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlDatatypeProvider.java similarity index 92% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/AbstractXmlDatatypeProvider.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlDatatypeProvider.java index d95c1e908..9a0b5681c 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/AbstractXmlDatatypeProvider.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlDatatypeProvider.java @@ -3,10 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.datatype; - -import gov.nist.secauto.metaschema.schemagen.datatype.IDatatypeContent; -import gov.nist.secauto.metaschema.schemagen.datatype.IDatatypeProvider; +package gov.nist.secauto.metaschema.schemagen.xml.impl; import org.codehaus.stax2.XMLStreamWriter2; import org.eclipse.jdt.annotation.Owning; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/AbstractXmlMarkupDatatypeProvider.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java similarity index 92% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/AbstractXmlMarkupDatatypeProvider.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java index eb847965d..f0eb5eb27 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/AbstractXmlMarkupDatatypeProvider.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/AbstractXmlMarkupDatatypeProvider.java @@ -3,12 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.datatype; +package gov.nist.secauto.metaschema.schemagen.xml.impl; import gov.nist.secauto.metaschema.core.model.IModule; import gov.nist.secauto.metaschema.core.util.CollectionUtil; import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.datatype.IDatatypeContent; import org.eclipse.jdt.annotation.Owning; import org.jdom2.Element; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/CompositeDatatypeProvider.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/CompositeDatatypeProvider.java similarity index 96% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/CompositeDatatypeProvider.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/CompositeDatatypeProvider.java index 5f84881ac..271ef895d 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/CompositeDatatypeProvider.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/CompositeDatatypeProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.datatype; +package gov.nist.secauto.metaschema.schemagen.xml.impl; import gov.nist.secauto.metaschema.core.util.CollectionUtil; import gov.nist.secauto.metaschema.core.util.ObjectUtils; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IDatatypeContent.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IDatatypeContent.java new file mode 100644 index 000000000..f75ab7096 --- /dev/null +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IDatatypeContent.java @@ -0,0 +1,41 @@ +/* + * SPDX-FileCopyrightText: none + * SPDX-License-Identifier: CC0-1.0 + */ + +package gov.nist.secauto.metaschema.schemagen.xml.impl; + +import java.util.List; + +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + +import edu.umd.cs.findbugs.annotations.NonNull; + +public interface IDatatypeContent { + /** + * Get the name of the data type. + * + * @return the name + */ + @NonNull + String getTypeName(); + + /** + * Get the data type names this type depends on. + * + * @return the names + */ + @NonNull + List getDependencies(); + + /** + * Write the data type to the XML stream. + * + * @param writer + * the XML stream + * @throws XMLStreamException + * if an error occurred while writing to the XML stream + */ + void write(@NonNull XMLStreamWriter writer) throws XMLStreamException; +} diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/IDatatypeProvider.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IDatatypeProvider.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/IDatatypeProvider.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IDatatypeProvider.java index d2749bfee..76fc7a723 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/datatype/IDatatypeProvider.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/IDatatypeProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.datatype; +package gov.nist.secauto.metaschema.schemagen.xml.impl; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/JDom2DatatypeContent.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/JDom2DatatypeContent.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/JDom2DatatypeContent.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/JDom2DatatypeContent.java index c55c0c330..008e9f151 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/JDom2DatatypeContent.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/JDom2DatatypeContent.java @@ -3,10 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.datatype; +package gov.nist.secauto.metaschema.schemagen.xml.impl; import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.schemagen.datatype.AbstractDatatypeContent; import org.jdom2.Element; import org.jdom2.output.Format; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/JDom2XmlSchemaLoader.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/JDom2XmlSchemaLoader.java similarity index 97% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/JDom2XmlSchemaLoader.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/JDom2XmlSchemaLoader.java index d4ff1f13f..98a0b5bb4 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/JDom2XmlSchemaLoader.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/JDom2XmlSchemaLoader.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.datatype; +package gov.nist.secauto.metaschema.schemagen.xml.impl; import org.jdom2.Document; import org.jdom2.Element; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlCoreDatatypeProvider.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java similarity index 94% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlCoreDatatypeProvider.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java index 05755130b..b09b9f5fc 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlCoreDatatypeProvider.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlCoreDatatypeProvider.java @@ -3,12 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.datatype; +package gov.nist.secauto.metaschema.schemagen.xml.impl; import gov.nist.secauto.metaschema.core.model.IModule; import gov.nist.secauto.metaschema.core.util.CollectionUtil; import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.schemagen.datatype.IDatatypeContent; import org.jdom2.Attribute; import org.jdom2.Element; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlGenerationState.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlGenerationState.java index 14202214f..281997443 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlGenerationState.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlGenerationState.java @@ -20,15 +20,15 @@ import gov.nist.secauto.metaschema.schemagen.AbstractGenerationState; import gov.nist.secauto.metaschema.schemagen.SchemaGenerationException; import gov.nist.secauto.metaschema.schemagen.SchemaGenerationFeature; -import gov.nist.secauto.metaschema.schemagen.xml.datatype.XmlDatatypeManager; -import gov.nist.secauto.metaschema.schemagen.xml.schematype.IXmlComplexType; -import gov.nist.secauto.metaschema.schemagen.xml.schematype.IXmlSimpleType; -import gov.nist.secauto.metaschema.schemagen.xml.schematype.IXmlType; -import gov.nist.secauto.metaschema.schemagen.xml.schematype.XmlComplexTypeAssemblyDefinition; -import gov.nist.secauto.metaschema.schemagen.xml.schematype.XmlComplexTypeFieldDefinition; -import gov.nist.secauto.metaschema.schemagen.xml.schematype.XmlSimpleTypeDataTypeReference; -import gov.nist.secauto.metaschema.schemagen.xml.schematype.XmlSimpleTypeDataTypeRestriction; -import gov.nist.secauto.metaschema.schemagen.xml.schematype.XmlSimpleTypeUnion; +import gov.nist.secauto.metaschema.schemagen.xml.XmlDatatypeManager; +import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.IXmlComplexType; +import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.IXmlSimpleType; +import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.IXmlType; +import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.XmlComplexTypeAssemblyDefinition; +import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.XmlComplexTypeFieldDefinition; +import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.XmlSimpleTypeDataTypeReference; +import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.XmlSimpleTypeDataTypeRestriction; +import gov.nist.secauto.metaschema.schemagen.xml.impl.schematype.XmlSimpleTypeUnion; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlMarkupLineDatatypeProvider.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlMarkupLineDatatypeProvider.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlMarkupLineDatatypeProvider.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlMarkupLineDatatypeProvider.java index e69cc59ee..0c8ca2861 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlMarkupLineDatatypeProvider.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlMarkupLineDatatypeProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.datatype; +package gov.nist.secauto.metaschema.schemagen.xml.impl; public class XmlMarkupLineDatatypeProvider extends AbstractXmlMarkupDatatypeProvider { diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlMarkupMultilineDatatypeProvider.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlMarkupMultilineDatatypeProvider.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlMarkupMultilineDatatypeProvider.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlMarkupMultilineDatatypeProvider.java index 8b8a16f85..4502d36fa 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlMarkupMultilineDatatypeProvider.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlMarkupMultilineDatatypeProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.datatype; +package gov.nist.secauto.metaschema.schemagen.xml.impl; public class XmlMarkupMultilineDatatypeProvider extends AbstractXmlMarkupDatatypeProvider { diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlProseBaseDatatypeProvider.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlProseBaseDatatypeProvider.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java index cfbc7f710..14cd3427e 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlProseBaseDatatypeProvider.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlProseBaseDatatypeProvider.java @@ -3,11 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.datatype; +package gov.nist.secauto.metaschema.schemagen.xml.impl; import gov.nist.secauto.metaschema.core.model.IModule; import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.schemagen.datatype.IDatatypeContent; import org.jdom2.Element; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlProseCompositDatatypeProvider.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlProseCompositDatatypeProvider.java similarity index 81% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlProseCompositDatatypeProvider.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlProseCompositDatatypeProvider.java index e11787667..394b68b4c 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/datatype/XmlProseCompositDatatypeProvider.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/XmlProseCompositDatatypeProvider.java @@ -3,11 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.datatype; - -import gov.nist.secauto.metaschema.schemagen.datatype.CompositeDatatypeProvider; -import gov.nist.secauto.metaschema.schemagen.datatype.IDatatypeContent; -import gov.nist.secauto.metaschema.schemagen.datatype.IDatatypeProvider; +package gov.nist.secauto.metaschema.schemagen.xml.impl; import org.codehaus.stax2.XMLStreamWriter2; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/AbstractXmlComplexType.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlComplexType.java similarity index 97% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/AbstractXmlComplexType.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlComplexType.java index ea684d300..f543cb255 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/AbstractXmlComplexType.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlComplexType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.schematype; +package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; import gov.nist.secauto.metaschema.core.model.IFlagInstance; import gov.nist.secauto.metaschema.core.model.IModelDefinition; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/AbstractXmlSimpleType.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlSimpleType.java similarity index 94% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/AbstractXmlSimpleType.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlSimpleType.java index c2346861f..108326d79 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/AbstractXmlSimpleType.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlSimpleType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.schematype; +package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; import gov.nist.secauto.metaschema.core.model.IValuedDefinition; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/AbstractXmlType.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlType.java similarity index 86% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/AbstractXmlType.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlType.java index 8e78c0172..a73ac16e5 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/AbstractXmlType.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/AbstractXmlType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.schematype; +package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; import javax.xml.namespace.QName; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/IXmlComplexType.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlComplexType.java similarity index 91% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/IXmlComplexType.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlComplexType.java index 3c4c4ebb0..49cd8350a 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/IXmlComplexType.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlComplexType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.schematype; +package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; import gov.nist.secauto.metaschema.core.model.IDefinition; import gov.nist.secauto.metaschema.schemagen.ModuleIndex.DefinitionEntry; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/IXmlSimpleType.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlSimpleType.java similarity index 89% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/IXmlSimpleType.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlSimpleType.java index e1ee56fea..5380ce311 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/IXmlSimpleType.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlSimpleType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.schematype; +package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; import gov.nist.secauto.metaschema.schemagen.xml.impl.XmlGenerationState; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/IXmlType.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlType.java similarity index 97% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/IXmlType.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlType.java index 45d931288..275995b07 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/IXmlType.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/IXmlType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.schematype; +package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; import gov.nist.secauto.metaschema.core.util.ObjectUtils; import gov.nist.secauto.metaschema.schemagen.SchemaGenerationException; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlComplexTypeAssemblyDefinition.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeAssemblyDefinition.java similarity index 99% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlComplexTypeAssemblyDefinition.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeAssemblyDefinition.java index b05c81b20..07aec466b 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlComplexTypeAssemblyDefinition.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeAssemblyDefinition.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.schematype; +package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; import gov.nist.secauto.metaschema.core.datatype.markup.MarkupDataTypeProvider; import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlComplexTypeFieldDefinition.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeFieldDefinition.java similarity index 96% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlComplexTypeFieldDefinition.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeFieldDefinition.java index d504644ea..af6135911 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlComplexTypeFieldDefinition.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlComplexTypeFieldDefinition.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.schematype; +package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; import gov.nist.secauto.metaschema.core.model.IFieldDefinition; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlSimpleTypeDataTypeReference.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeReference.java similarity index 95% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlSimpleTypeDataTypeReference.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeReference.java index 0369002a7..e03590de9 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlSimpleTypeDataTypeReference.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeReference.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.schematype; +package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; import gov.nist.secauto.metaschema.core.datatype.IDataTypeAdapter; import gov.nist.secauto.metaschema.schemagen.xml.impl.XmlGenerationState; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlSimpleTypeDataTypeRestriction.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeRestriction.java similarity index 98% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlSimpleTypeDataTypeRestriction.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeRestriction.java index 10b5de4f2..457d50305 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlSimpleTypeDataTypeRestriction.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeDataTypeRestriction.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.schematype; +package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine; import gov.nist.secauto.metaschema.core.model.IValuedDefinition; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlSimpleTypeUnion.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeUnion.java similarity index 97% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlSimpleTypeUnion.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeUnion.java index 71256a7af..34ad7f5ef 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/XmlSimpleTypeUnion.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/XmlSimpleTypeUnion.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.metaschema.schemagen.xml.schematype; +package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype; import gov.nist.secauto.metaschema.core.model.IValuedDefinition; import gov.nist.secauto.metaschema.core.util.CollectionUtil; diff --git a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/package-info.java b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/package-info.java similarity index 74% rename from schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/package-info.java rename to schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/package-info.java index 5b776c06d..7ca818916 100644 --- a/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/schematype/package-info.java +++ b/schemagen/src/main/java/gov/nist/secauto/metaschema/schemagen/xml/impl/schematype/package-info.java @@ -8,4 +8,4 @@ * flags, fields, assemblies). */ -package gov.nist.secauto.metaschema.schemagen.xml.schematype; +package gov.nist.secauto.metaschema.schemagen.xml.impl.schematype;