Removed use of auto service. Reformatted code.

core/pom.xml

@@ -27,12 +27,6 @@
 	</scm>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.auto.service</groupId>
-            <artifactId>auto-service-annotations</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
@@ -151,6 +145,9 @@
 
     <build>
         <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
             <resource>
                 <directory>${project.build.directory}/generated-resources/xmlbeans</directory>
             </resource>

core/src/main/java/gov/nist/secauto/metaschema/core/datatype/adapter/MetaschemaDataTypeProvider.java

@@ -5,10 +5,7 @@
 
 package gov.nist.secauto.metaschema.core.datatype.adapter;
 
-import com.google.auto.service.AutoService;
-
 import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeProvider;
-import gov.nist.secauto.metaschema.core.datatype.IDataTypeProvider;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
@@ -17,7 +14,6 @@
  * data types.
  */
 @SuppressWarnings("PMD.CouplingBetweenObjects")
-@AutoService(IDataTypeProvider.class)
 public final class MetaschemaDataTypeProvider // NOPMD - Used for service initialization
     extends AbstractDataTypeProvider {
   @NonNull

core/src/main/java/gov/nist/secauto/metaschema/core/datatype/markup/MarkupDataTypeProvider.java

@@ -5,18 +5,14 @@
 
 package gov.nist.secauto.metaschema.core.datatype.markup;
 
-import com.google.auto.service.AutoService;
-
 import gov.nist.secauto.metaschema.core.datatype.AbstractDataTypeProvider;
-import gov.nist.secauto.metaschema.core.datatype.IDataTypeProvider;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
  * Provides for runtime discovery of built-in implementations of the markup
  * Metaschema data types.
  */
-@AutoService(IDataTypeProvider.class)
 public final class MarkupDataTypeProvider
     extends AbstractDataTypeProvider {
   @NonNull

core/src/main/java/gov/nist/secauto/metaschema/core/metapath/function/library/DefaultFunctionLibrary.java

@@ -5,11 +5,8 @@
 
 package gov.nist.secauto.metaschema.core.metapath.function.library;
 
-import com.google.auto.service.AutoService;
-
 import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
 import gov.nist.secauto.metaschema.core.metapath.function.FunctionLibrary;
-import gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateItem;
 import gov.nist.secauto.metaschema.core.metapath.item.atomic.IDateTimeItem;
@@ -31,7 +28,6 @@
  */
 @SuppressWarnings({ "removal" })
 @SuppressFBWarnings("UWF_UNWRITTEN_FIELD")
-@AutoService(IFunctionLibrary.class)
 public class DefaultFunctionLibrary
     extends FunctionLibrary {
 

core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/XmlConstraintLoader.java

@@ -9,6 +9,7 @@
 import gov.nist.secauto.metaschema.core.metapath.StaticContext;
 import gov.nist.secauto.metaschema.core.model.AbstractLoader;
 import gov.nist.secauto.metaschema.core.model.IConstraintLoader;
+import gov.nist.secauto.metaschema.core.model.ISource;
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.model.constraint.AssemblyConstraintSet;
 import gov.nist.secauto.metaschema.core.model.constraint.AssemblyTargetedConstraints;

core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/ConstraintXmlSupport.java

@@ -11,6 +11,7 @@
 import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
 import gov.nist.secauto.metaschema.core.metapath.MetapathException;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
+import gov.nist.secauto.metaschema.core.model.ISource;
 import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValue;
 import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint;
 import gov.nist.secauto.metaschema.core.model.constraint.ICardinalityConstraint;
@@ -374,6 +375,7 @@ private ConstraintXmlSupport() {
     // disable construction
   }
 
+  @SuppressWarnings("unused")
   private static final class XmlbeanGeneratingVisitor
       implements IConstraintVisitor<DefineAssemblyConstraintsType, Void> {
 

core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGlobalFieldDefinition.java

@@ -14,7 +14,6 @@
 import gov.nist.secauto.metaschema.core.model.IContainerFlagSupport;
 import gov.nist.secauto.metaschema.core.model.IFieldInstance;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
-import gov.nist.secauto.metaschema.core.model.ModuleScopeEnum;
 import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained;
 import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.GlobalFieldDefinitionType;

core/src/main/java/gov/nist/secauto/metaschema/core/model/xml/impl/XmlGlobalFlagDefinition.java

@@ -12,7 +12,6 @@
 import gov.nist.secauto.metaschema.core.model.AbstractGlobalFlagDefinition;
 import gov.nist.secauto.metaschema.core.model.IAttributable;
 import gov.nist.secauto.metaschema.core.model.IFlagInstance;
-import gov.nist.secauto.metaschema.core.model.constraint.ISource;
 import gov.nist.secauto.metaschema.core.model.constraint.IValueConstrained;
 import gov.nist.secauto.metaschema.core.model.constraint.ValueConstraintSet;
 import gov.nist.secauto.metaschema.core.model.xml.xmlbeans.GlobalFlagDefinitionType;

core/src/main/java/module-info.java

@@ -25,7 +25,6 @@
 
   requires static org.eclipse.jdt.annotation;
   requires static biz.aQute.bnd.util;
-  requires static com.google.auto.service;
   requires static com.github.spotbugs.annotations;
 
   requires com.ctc.wstx;

core/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.datatype.IDataTypeProvider

@@ -0,0 +1,2 @@
+gov.nist.secauto.metaschema.core.datatype.adapter.MetaschemaDataTypeProvider
+gov.nist.secauto.metaschema.core.datatype.markup.MarkupDataTypeProvider

core/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary

@@ -0,0 +1 @@
+gov.nist.secauto.metaschema.core.metapath.function.library.DefaultFunctionLibrary

databind/pom.xml

@@ -33,12 +33,6 @@
 			<artifactId>metaschema-core</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>com.google.auto.service</groupId>
-			<artifactId>auto-service-annotations</artifactId>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>

databind/src/main/java/gov/nist/secauto/metaschema/databind/AbstractModuleLoaderStrategy.java

@@ -72,12 +72,10 @@ public IBoundModule registerModule(
         assert key != null;
 
         IBoundModule boundModule;
-        Class<? extends IBoundModule> moduleClass;
         if (key instanceof IBoundModule) {
           boundModule = (IBoundModule) key;
-          moduleClass = boundModule.getClass();
         } else {
-          moduleClass = handleUnboundModule(key);
+          Class<? extends IBoundModule> moduleClass = handleUnboundModule(key);
           boundModule = lookupInstance(moduleClass, bindingContext);
         }
 

databind/src/main/java/gov/nist/secauto/metaschema/databind/metapath/function/DatabindFunctionLibrary.java

@@ -5,12 +5,8 @@
 
 package gov.nist.secauto.metaschema.databind.metapath.function;
 
-import com.google.auto.service.AutoService;
-
 import gov.nist.secauto.metaschema.core.metapath.function.FunctionLibrary;
-import gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary;
 
-@AutoService(IFunctionLibrary.class)
 public class DatabindFunctionLibrary
     extends FunctionLibrary {
 

databind/src/main/java/module-info.java

@@ -19,7 +19,6 @@
   requires com.ctc.wstx;
   requires com.fasterxml.jackson.dataformat.yaml;
   requires com.fasterxml.jackson.dataformat.xml;
-  requires transitive com.google.auto.service;
   requires transitive com.squareup.javapoet;
   requires nl.talsmasoftware.lazy4j;
   requires transitive org.apache.commons.lang3;

databind/src/main/resources/META-INF/services/gov.nist.secauto.metaschema.core.metapath.function.IFunctionLibrary

@@ -0,0 +1 @@
+gov.nist.secauto.metaschema.databind.metapath.function.DatabindFunctionLibrary

databind/src/test/java/gov/nist/secauto/metaschema/databind/io/DefaultBoundLoaderTest.java

@@ -13,7 +13,6 @@
 import gov.nist.secauto.metaschema.core.model.MetaschemaException;
 import gov.nist.secauto.metaschema.core.util.ObjectUtils;
 import gov.nist.secauto.metaschema.databind.IBindingContext;
-import gov.nist.secauto.metaschema.databind.model.metaschema.IBindingMetaschemaModule;
 
 import org.junit.jupiter.api.Test;
 
@@ -30,7 +29,7 @@ void testIssue187() throws IOException, MetaschemaException {
         .compilePath(ObjectUtils.notNull(Files.createTempDirectory(Paths.get("target"), "modules-")))
         .build();
 
-    IBindingMetaschemaModule module = bindingContext.loadMetaschema(ObjectUtils.notNull(
+    bindingContext.loadMetaschema(ObjectUtils.notNull(
         Paths.get("src/test/resources/content/issue187-metaschema.xml")));
 
     IBoundLoader loader = new DefaultBoundLoader(bindingContext);