From 968150f850733a3feec12728359fe3e809beb6c0 Mon Sep 17 00:00:00 2001 From: David Waltermire Date: Mon, 10 Jul 2023 14:58:29 -0400 Subject: [PATCH] Updated oss-maven dependency to released version. Fixed a compile error in YamlOperations.java. Updated Java code examples for using the binding implementation. Applied code formatting. --- .../metaschema/cli/processor/CLIProcessor.java | 15 ++++++--------- .../cli/processor/command/Command.java | 2 +- .../cli/commands/GenerateSchemaCommand.java | 2 +- .../cli/util/LoggingValidationHandler.java | 8 +++----- .../binding/io/yaml/YamlOperations.java | 8 +++++--- .../binding/io/yaml/impl/package-info.java | 2 +- .../binding/model/AbstractBoundMetaschema.java | 6 +++--- .../binding/model/RootAssemblyDefinition.java | 3 +-- .../src/site/markdown/index.md.vm | 7 ++++--- .../secauto/metaschema/binding/Examples.java | 17 +++++++++++++---- .../codegen/DefaultTypeResolver.java | 3 +-- .../codegen/test/TestBasicMetaschema.java | 12 ++++-------- .../markup/flexmark/InsertAnchorExtension.java | 3 +-- .../model/common/metapath/ExpressionUtils.java | 4 ++-- .../model/common/metapath/ISequence.java | 16 ++++++++-------- .../item/AbstractAssemblyInstanceNodeItem.java | 6 ++---- .../item/AbstractFieldInstanceNodeItem.java | 6 ++---- .../item/AbstractModelNodeContext.java | 6 ++---- .../datatype/markup/MarkupStringTest.java | 5 +---- .../model/common/metapath/AndTest.java | 2 +- .../common/metapath/ExpressionTestBase.java | 2 +- .../model/common/metapath/OrTest.java | 3 +-- .../model/common/metapath/PredicateTest.java | 18 ++++++------------ .../schemagen/AbstractSchemaGenerator.java | 11 ++++------- .../metaschema/schemagen/MetaschemaIndex.java | 2 +- .../model/testing/AbstractTestSuite.java | 6 +++--- pom.xml | 6 +++--- 27 files changed, 81 insertions(+), 100 deletions(-) diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java index 749bb1275..dc4706ff5 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java +++ b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java @@ -204,9 +204,8 @@ private static void handleNoColor() { } public static void handleQuiet() { - @SuppressWarnings("resource") - LoggerContext ctx = (LoggerContext) LogManager.getContext(false); // NOPMD not - // closable here + @SuppressWarnings("resource") LoggerContext ctx = (LoggerContext) LogManager.getContext(false); // NOPMD not + // closable here Configuration config = ctx.getConfiguration(); LoggerConfig loggerConfig = config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME); Level oldLevel = loggerConfig.getLevel(); @@ -217,8 +216,7 @@ public static void handleQuiet() { } protected void showVersion() { - @SuppressWarnings("resource") - PrintStream out = AnsiConsole.out(); // NOPMD - not owner + @SuppressWarnings("resource") PrintStream out = AnsiConsole.out(); // NOPMD - not owner getVersionInfos().stream().forEach((info) -> { out.println(ansi() .bold().a(info.getName()).boldOff() @@ -568,10 +566,9 @@ public void showHelp() { AnsiPrintStream out = AnsiConsole.out(); int terminalWidth = Math.max(out.getTerminalWidth(), 40); - @SuppressWarnings("resource") - PrintWriter writer = new PrintWriter(out, true, StandardCharsets.UTF_8); // NOPMD - - // not - // owned + @SuppressWarnings("resource") PrintWriter writer = new PrintWriter(out, true, StandardCharsets.UTF_8); // NOPMD - + // not + // owned formatter.printHelp( writer, terminalWidth, diff --git a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/Command.java b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/Command.java index 925d669e2..37950db96 100644 --- a/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/Command.java +++ b/cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/Command.java @@ -78,7 +78,7 @@ default void validateOptions( boolean isSubCommandRequired(); - @SuppressWarnings("unused") + @SuppressWarnings("unused") default Command getSubCommandByName(@NonNull String name) { // no sub commands by default return null; diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java index 45eab7d2c..7bb27321d 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java +++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/GenerateSchemaCommand.java @@ -205,7 +205,7 @@ public ExitStatus executeCommand(CallingContext callingContext, CommandLine cmdL try { IMetaschema metaschema = new MetaschemaLoader().load(input); if (destination == null) { - @SuppressWarnings({"resource", "PMD.CloseResource"}) // not owned + @SuppressWarnings({ "resource", "PMD.CloseResource" }) // not owned OutputStream os = ObjectUtils.notNull(System.out); ISchemaGenerator.generateSchema(metaschema, os, asFormat, configuration); } else { diff --git a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandler.java b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandler.java index e4cd9f423..57a88f498 100644 --- a/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandler.java +++ b/metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/util/LoggingValidationHandler.java @@ -48,7 +48,7 @@ public final class LoggingValidationHandler { private static final Logger LOGGER = LogManager.getLogger(LoggingValidationHandler.class); - + private static final LoggingValidationHandler NO_LOG_EXCPTION_INSTANCE = new LoggingValidationHandler(false); private static final LoggingValidationHandler LOG_EXCPTION_INSTANCE = new LoggingValidationHandler(true); @@ -61,17 +61,15 @@ public static LoggingValidationHandler instance() { public static LoggingValidationHandler instance(boolean logExceptions) { return logExceptions ? LOG_EXCPTION_INSTANCE : NO_LOG_EXCPTION_INSTANCE; } - + protected LoggingValidationHandler(boolean logExceptions) { this.logExceptions = logExceptions; } - public boolean isLogExceptions() { return logExceptions; } - public boolean handleValidationResults(IValidationResult result) { handleValidationFindings(result.getFindings()); return result.isPassing(); @@ -145,7 +143,7 @@ private LogBuilder getLogger(@NonNull IValidationFinding finding) { } assert retval != null; - + if (finding.getCause() != null && isLogExceptions()) { retval.withThrowable(finding.getCause()); } diff --git a/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/io/yaml/YamlOperations.java b/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/io/yaml/YamlOperations.java index 83264d65b..8bb7017c2 100644 --- a/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/io/yaml/YamlOperations.java +++ b/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/io/yaml/YamlOperations.java @@ -29,6 +29,7 @@ import org.json.JSONException; import org.json.JSONObject; import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.nodes.Tag; @@ -48,9 +49,10 @@ public final class YamlOperations { private static final Yaml YAML_PARSER; static { - Constructor constructor = new Constructor(); - Representer representer = new Representer(); - YAML_PARSER = new Yaml(constructor, representer, new DumperOptions(), new Resolver() { + Constructor constructor = new Constructor(new LoaderOptions()); + DumperOptions dumperOptions = new DumperOptions(); + Representer representer = new Representer(dumperOptions); + YAML_PARSER = new Yaml(constructor, representer, dumperOptions, new Resolver() { @Override protected void addImplicitResolvers() { addImplicitResolver(Tag.BOOL, BOOL, "yYnNtTfFoO"); diff --git a/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/io/yaml/impl/package-info.java b/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/io/yaml/impl/package-info.java index d5b17bfea..be89143b1 100644 --- a/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/io/yaml/impl/package-info.java +++ b/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/io/yaml/impl/package-info.java @@ -24,4 +24,4 @@ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER. */ -package gov.nist.secauto.metaschema.binding.io.yaml.impl; \ No newline at end of file +package gov.nist.secauto.metaschema.binding.io.yaml.impl; diff --git a/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/model/AbstractBoundMetaschema.java b/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/model/AbstractBoundMetaschema.java index 18aa2e96e..b44ed5814 100644 --- a/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/model/AbstractBoundMetaschema.java +++ b/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/model/AbstractBoundMetaschema.java @@ -63,7 +63,7 @@ public abstract class AbstractBoundMetaschema *

* Will also load any imported Metaschemas. * - * + * * @param clazz * the Metaschema class * @param bindingContext @@ -118,7 +118,7 @@ private static IMetaschema createInstance( /** * Construct a new Metaschema instance. - * + * * @param importedMetaschema * Metaschema imports associated with the metaschema * @param bindingContext @@ -133,7 +133,7 @@ protected AbstractBoundMetaschema( /** * Get the Metaschema binding context. - * + * * @return the context */ @NonNull diff --git a/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/model/RootAssemblyDefinition.java b/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/model/RootAssemblyDefinition.java index af9d2a12b..f47c186a0 100644 --- a/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/model/RootAssemblyDefinition.java +++ b/metaschema-java-binding/src/main/java/gov/nist/secauto/metaschema/binding/model/RootAssemblyDefinition.java @@ -291,8 +291,7 @@ public void writeRoot(Object instance, IXmlWritingContext context) throws XMLStr @Override public void writeRoot(Object instance, IJsonWritingContext context) throws IOException { - @SuppressWarnings("resource") - JsonGenerator writer = context.getWriter(); // NOPMD - intentional + @SuppressWarnings("resource") JsonGenerator writer = context.getWriter(); // NOPMD - intentional // first read the initial START_OBJECT writer.writeStartObject(); diff --git a/metaschema-java-binding/src/site/markdown/index.md.vm b/metaschema-java-binding/src/site/markdown/index.md.vm index e352e28cf..60ba2ef6f 100644 --- a/metaschema-java-binding/src/site/markdown/index.md.vm +++ b/metaschema-java-binding/src/site/markdown/index.md.vm @@ -18,14 +18,15 @@ The following code illustrates how to load data into a bound object using this [ ```java // get the binding context instance, which manages Metaschema-to-object binding information -BindingContext bindingContext = BindingContext.newInstance(); +IBindingContext bindingContext = IBindingContext.instance(); // create a loader which is used to parse the content IBoundLoader loader = bindingContext.newBoundLoader(); // specify the bound class to load data into and the file to load it from // the loader figures out the format to load from (i.e. JSON) -BoundClass object = loader.load(BoundClass.class, new File("src/test/resources/test-content/bound-class-simple.json")); +BoundClass object + = loader.load(BoundClass.class, new File("src/test/resources/test-content/bound-class-simple.json")); System.out.println(object.getId()); ``` @@ -40,7 +41,7 @@ Next you can save the data in a specific format. In the following example, we sa ```java // create a serializer to write the object -Serializer serializer = bindingContext.newSerializer(Format.XML, BoundClass.class); +ISerializer serializer = bindingContext.newSerializer(Format.XML, BoundClass.class); serializer.serialize(object, new File("target/bound-class-simple.xml")); ``` diff --git a/metaschema-java-binding/src/test/java/gov/nist/secauto/metaschema/binding/Examples.java b/metaschema-java-binding/src/test/java/gov/nist/secauto/metaschema/binding/Examples.java index ba81d0e25..9ddbb7035 100644 --- a/metaschema-java-binding/src/test/java/gov/nist/secauto/metaschema/binding/Examples.java +++ b/metaschema-java-binding/src/test/java/gov/nist/secauto/metaschema/binding/Examples.java @@ -26,13 +26,23 @@ package gov.nist.secauto.metaschema.binding; +//import gov.nist.secauto.metaschema.binding.io.Format; +//import gov.nist.secauto.metaschema.binding.io.IBoundLoader; +//import gov.nist.secauto.metaschema.binding.io.ISerializer; +// +//import org.junit.jupiter.api.Test; +// +//import java.io.File; +//import java.io.FileNotFoundException; +//import java.io.IOException; + class Examples { // NOPMD // @SuppressWarnings("PMD") // @Test // void testLoadJson() throws FileNotFoundException, IOException { // // get the binding context instance, which manages Metaschema-to-object binding information - // IBindingContext bindingContext = IBindingContext.newInstance(); + // IBindingContext bindingContext = IBindingContext.instance(); // // // create a loader which is used to parse the content // IBoundLoader loader = bindingContext.newBoundLoader(); @@ -48,7 +58,7 @@ class Examples { // NOPMD // @Test // void test() throws FileNotFoundException, IOException { // // get the binding context instance, which manages Metaschema-to-object binding information - // IBindingContext bindingContext = IBindingContext.newInstance(); + // IBindingContext bindingContext = IBindingContext.instance(); // // // create a loader which is used to parse the content // IBoundLoader loader = bindingContext.newBoundLoader(); @@ -60,8 +70,7 @@ class Examples { // NOPMD // File("src/test/resources/test-content/bound-class-simple.json")); // // // create a serializer to write the object - // ISerializer<@NonNull BoundClass> serializer = bindingContext.newSerializer(Format.XML, - // BoundClass.class); + // ISerializer serializer = bindingContext.newSerializer(Format.XML, Object.class); // serializer.serialize(object, new File("target/bound-class-simple.xml")); // } diff --git a/metaschema-java-codegen/src/main/java/gov/nist/secauto/metaschema/codegen/DefaultTypeResolver.java b/metaschema-java-codegen/src/main/java/gov/nist/secauto/metaschema/codegen/DefaultTypeResolver.java index cd8fd6f0a..ea61f95fa 100644 --- a/metaschema-java-codegen/src/main/java/gov/nist/secauto/metaschema/codegen/DefaultTypeResolver.java +++ b/metaschema-java-codegen/src/main/java/gov/nist/secauto/metaschema/codegen/DefaultTypeResolver.java @@ -154,8 +154,7 @@ protected boolean addClassName(@NonNull String packageOrTypeName, @NonNull Strin } private String generateClassName(@NonNull String packageOrTypeName, @NonNull IFlagContainer definition) { - @NonNull - String className = getBindingConfiguration().getClassName(definition); + @NonNull String className = getBindingConfiguration().getClassName(definition); Set classNames = getClassNamesFor(packageOrTypeName); synchronized (classNames) { diff --git a/metaschema-java-codegen/src/test/java/gov/nist/secauto/metaschema/codegen/test/TestBasicMetaschema.java b/metaschema-java-codegen/src/test/java/gov/nist/secauto/metaschema/codegen/test/TestBasicMetaschema.java index 3ea67f4fa..87685a4ae 100644 --- a/metaschema-java-codegen/src/test/java/gov/nist/secauto/metaschema/codegen/test/TestBasicMetaschema.java +++ b/metaschema-java-codegen/src/test/java/gov/nist/secauto/metaschema/codegen/test/TestBasicMetaschema.java @@ -105,8 +105,7 @@ private static Object read(@NonNull Format format, @NonNull Path file, @NonNull private static void write(@NonNull Format format, @NonNull Path file, CLASS rootObject) throws IOException { IBindingContext context = IBindingContext.instance(); - @SuppressWarnings("unchecked") - Class clazz = (Class) rootObject.getClass(); + @SuppressWarnings("unchecked") Class clazz = (Class) rootObject.getClass(); try (Writer writer = Files.newBufferedWriter(file, StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING)) { @@ -215,8 +214,7 @@ void testFieldsWithFlagMetaschema() Assertions.assertEquals("complex-field1", reflectMethod(field1, "getId")); Assertions.assertEquals("test-string", reflectMethod(field1, "getValue")); - @SuppressWarnings("unchecked") - List field2s + @SuppressWarnings("unchecked") List field2s = (List) ReflectionUtils.invokeMethod(obj.getClass().getMethod("getComplexFields2"), obj); Assertions.assertNotNull(field2s); @@ -225,8 +223,7 @@ void testFieldsWithFlagMetaschema() Assertions.assertEquals("complex-field2-1", reflectMethod(field2, "getId")); Assertions.assertEquals("test-string2", reflectMethod(field2, "getValue")); - @SuppressWarnings("unchecked") - List field3s + @SuppressWarnings("unchecked") List field3s = (List) ReflectionUtils.invokeMethod(obj.getClass().getMethod("getComplexFields3"), obj); Assertions.assertEquals(2, field3s.size()); @@ -242,8 +239,7 @@ void testFieldsWithFlagMetaschema() }); Assertions.assertAll("ComplexFields4", () -> { - @SuppressWarnings("unchecked") - Map collection + @SuppressWarnings("unchecked") Map collection = (Map) ReflectionUtils.invokeMethod(obj.getClass().getMethod("getComplexFields4"), obj); Assertions.assertNotNull(collection); diff --git a/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/datatype/markup/flexmark/InsertAnchorExtension.java b/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/datatype/markup/flexmark/InsertAnchorExtension.java index c9c3f5424..6f5cb1c6b 100644 --- a/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/datatype/markup/flexmark/InsertAnchorExtension.java +++ b/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/datatype/markup/flexmark/InsertAnchorExtension.java @@ -332,8 +332,7 @@ public void setIdReference(@NonNull BasedSequence value) { @Override @NonNull public BasedSequence[] getSegments() { - @NonNull - BasedSequence[] retval = { getType(), getIdReference() }; + @NonNull BasedSequence[] retval = { getType(), getIdReference() }; return retval; } diff --git a/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/ExpressionUtils.java b/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/ExpressionUtils.java index d28f437d2..275deead6 100644 --- a/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/ExpressionUtils.java +++ b/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/ExpressionUtils.java @@ -85,8 +85,8 @@ private static Class findCommonBase( baseType, first, ObjectUtils.notNull(expressionClasses.subList(1, expressionClasses.size()))); - @SuppressWarnings("unchecked") - Class newBase = (Class) leastCommon; + @SuppressWarnings("unchecked") Class newBase + = (Class) leastCommon; if (newBase != null) { retval = newBase; } else { diff --git a/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/ISequence.java b/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/ISequence.java index a35142594..a81563618 100644 --- a/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/ISequence.java +++ b/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/ISequence.java @@ -56,7 +56,7 @@ static ISequence empty() { * Construct a new sequence containing the provided {@code item}. *

* If the item is {@code null} and empty sequence will be created. - * + * * @param * the type of items contained in the sequence. * @param item @@ -77,7 +77,7 @@ public static ISequence of( // NOPMD - inte /** * Construct a new sequence containing the provided {@code items}. - * + * * @param * the type of items contained in the sequence. * @param items @@ -98,7 +98,7 @@ public static ISequence of( // NOPMD - inte /** * Construct a new sequence containing the provided {@code items}. - * + * * @param * the type of items contained in the sequence. * @param items @@ -113,7 +113,7 @@ public static ISequence of( // NOPMD - inte /** * Get the items in this sequence as a {@link List}. - * + * * @return a list containing all the items of the sequence */ @NonNull @@ -121,7 +121,7 @@ public static ISequence of( // NOPMD - inte /** * Get the items in this sequence as a {@link Stream}. - * + * * @return a stream containing all the items of the sequence */ // TODO: rename to "stream" @@ -130,21 +130,21 @@ public static ISequence of( // NOPMD - inte /** * Determine if this sequence is empty. - * + * * @return {@code true} if the sequence contains no items, or {@code false} otherwise */ boolean isEmpty(); /** * Get the count of items in this sequence. - * + * * @return the count of items */ int size(); /** * Iterate over each item in the sequence using the provided {@code action}. - * + * * @param action * code to execute for each item */ diff --git a/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/item/AbstractAssemblyInstanceNodeItem.java b/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/item/AbstractAssemblyInstanceNodeItem.java index 6ec4163bb..c66ee78fd 100644 --- a/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/item/AbstractAssemblyInstanceNodeItem.java +++ b/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/item/AbstractAssemblyInstanceNodeItem.java @@ -31,10 +31,8 @@ import edu.umd.cs.findbugs.annotations.NonNull; -public abstract class AbstractAssemblyInstanceNodeItem< - F extends IFlagNodeItem, - M extends IModelNodeItem, - P extends INodeItem, L extends AbstractModelNodeContext.Model> +public abstract class AbstractAssemblyInstanceNodeItem> extends AbstractModelNodeContext implements IAssemblyNodeItem { diff --git a/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/item/AbstractFieldInstanceNodeItem.java b/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/item/AbstractFieldInstanceNodeItem.java index a0c41ad7e..5c1f37d11 100644 --- a/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/item/AbstractFieldInstanceNodeItem.java +++ b/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/item/AbstractFieldInstanceNodeItem.java @@ -39,10 +39,8 @@ * @param

* the parent node item type */ -abstract class AbstractFieldInstanceNodeItem< - F extends IFlagNodeItem, - P extends IAssemblyNodeItem, - L extends AbstractNodeContext.Flags> +abstract class AbstractFieldInstanceNodeItem> extends AbstractNodeContext implements IFieldNodeItem { @NonNull diff --git a/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/item/AbstractModelNodeContext.java b/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/item/AbstractModelNodeContext.java index 13603a26e..d6b39c584 100644 --- a/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/item/AbstractModelNodeContext.java +++ b/metaschema-model-common/src/main/java/gov/nist/secauto/metaschema/model/common/metapath/item/AbstractModelNodeContext.java @@ -34,10 +34,8 @@ import edu.umd.cs.findbugs.annotations.NonNull; -public abstract class AbstractModelNodeContext< - F extends IFlagNodeItem, - M extends IModelNodeItem, - L extends AbstractModelNodeContext.Model> +public abstract class AbstractModelNodeContext> extends AbstractNodeContext { /** diff --git a/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/datatype/markup/MarkupStringTest.java b/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/datatype/markup/MarkupStringTest.java index fecc4ea94..2cf43feb1 100644 --- a/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/datatype/markup/MarkupStringTest.java +++ b/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/datatype/markup/MarkupStringTest.java @@ -26,8 +26,6 @@ package gov.nist.secauto.metaschema.model.common.datatype.markup; - - import com.ctc.wstx.api.WstxOutputProperties; import com.ctc.wstx.stax.WstxOutputFactory; import com.vladsch.flexmark.ast.Emphasis; @@ -151,8 +149,7 @@ void markupLineFromMarkdownTest() { } // InsertAnchorNode[0, 0] name:[39, 45, "insert"] { - @SuppressWarnings("unused") - InsertAnchorNode insert = (InsertAnchorNode) paragraphChildren.get(5); + @SuppressWarnings("unused") InsertAnchorNode insert = (InsertAnchorNode) paragraphChildren.get(5); } // Text[48, 49] chars:[48, 49, "."] { diff --git a/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/AndTest.java b/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/AndTest.java index d57984780..da4f87f84 100644 --- a/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/AndTest.java +++ b/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/AndTest.java @@ -54,7 +54,7 @@ private static Stream testAnd() { // NOPMD - false positive @MethodSource void testAnd(IBooleanItem bool1, IBooleanItem bool2, IBooleanItem expectedResult) { DynamicContext dynamicContext = newDynamicContext(); - + Mockery context = getContext(); INodeContext nodeContext = context.mock(INodeContext.class); diff --git a/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/ExpressionTestBase.java b/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/ExpressionTestBase.java index 23e0b3f91..5105a100e 100644 --- a/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/ExpressionTestBase.java +++ b/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/ExpressionTestBase.java @@ -46,7 +46,7 @@ public class ExpressionTestBase { protected Mockery getContext() { return context; } - + /** * Construct a new dynamic context for testing. * diff --git a/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/OrTest.java b/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/OrTest.java index 4d3d93d96..fd63cdbdd 100644 --- a/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/OrTest.java +++ b/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/OrTest.java @@ -58,8 +58,7 @@ void testOr(IBooleanItem bool1, IBooleanItem bool2, IBooleanItem expectedResult) Mockery context = getContext(); @SuppressWarnings("null") - @NonNull - INodeContext nodeContext = context.mock(INodeContext.class); + @NonNull INodeContext nodeContext = context.mock(INodeContext.class); IExpression exp1 = context.mock(IExpression.class, "exp1"); IExpression exp2 = context.mock(IExpression.class, "exp2"); diff --git a/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/PredicateTest.java b/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/PredicateTest.java index ab9eea465..2652bd13f 100644 --- a/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/PredicateTest.java +++ b/metaschema-model-common/src/test/java/gov/nist/secauto/metaschema/model/common/metapath/PredicateTest.java @@ -52,15 +52,12 @@ void testPredicateWithValues() { Mockery context = getContext(); @SuppressWarnings("null") - @NonNull - IExpression stepExpr = context.mock(IExpression.class); + @NonNull IExpression stepExpr = context.mock(IExpression.class); ISequence stepResult = context.mock(ISequence.class, "stepResult"); @SuppressWarnings("null") - @NonNull - IRequiredValueAssemblyNodeItem item = context.mock(IRequiredValueAssemblyNodeItem.class); + @NonNull IRequiredValueAssemblyNodeItem item = context.mock(IRequiredValueAssemblyNodeItem.class); @SuppressWarnings({ "unchecked", "null" }) - @NonNull - List predicates = context.mock(List.class, "predicates"); + @NonNull List predicates = context.mock(List.class, "predicates"); context.checking(new Expectations() { { // NOPMD - intentional @@ -96,15 +93,12 @@ void testPredicateWithoutValues() { Mockery context = getContext(); @SuppressWarnings("null") - @NonNull - IExpression stepExpr = context.mock(IExpression.class); + @NonNull IExpression stepExpr = context.mock(IExpression.class); ISequence stepResult = context.mock(ISequence.class, "stepResult"); @SuppressWarnings("null") - @NonNull - IAssemblyNodeItem item = context.mock(IAssemblyNodeItem.class); + @NonNull IAssemblyNodeItem item = context.mock(IAssemblyNodeItem.class); @SuppressWarnings({ "unchecked", "null" }) - @NonNull - List predicates = context.mock(List.class, "predicates"); + @NonNull List predicates = context.mock(List.class, "predicates"); context.checking(new Expectations() { { // NOPMD - intentional diff --git a/metaschema-schema-generator/src/main/java/gov/nist/secauto/metaschema/schemagen/AbstractSchemaGenerator.java b/metaschema-schema-generator/src/main/java/gov/nist/secauto/metaschema/schemagen/AbstractSchemaGenerator.java index b34b7fa9d..3f9b26bb3 100644 --- a/metaschema-schema-generator/src/main/java/gov/nist/secauto/metaschema/schemagen/AbstractSchemaGenerator.java +++ b/metaschema-schema-generator/src/main/java/gov/nist/secauto/metaschema/schemagen/AbstractSchemaGenerator.java @@ -45,7 +45,7 @@ /** * Thsi abstract class provides a common implementation shared by all schema generators. - * + * * @param * the writer type * @param @@ -53,10 +53,8 @@ * @param * the {@link IGenerationState} type */ -public abstract class AbstractSchemaGenerator< - T extends AutoCloseable, - D extends IDatatypeManager, - S extends AbstractGenerationState> +public abstract class AbstractSchemaGenerator> implements ISchemaGenerator { /** @@ -106,8 +104,7 @@ public void generateFromMetaschema( // IInlineStrategy inlineStrategy = IInlineStrategy.newInlineStrategy(configuration); try { // avoid automatically closing streams not owned by the generator - @SuppressWarnings("PMD.CloseResource") - T schemaWriter = newWriter(out); + @SuppressWarnings("PMD.CloseResource") T schemaWriter = newWriter(out); S generationState = newGenerationState(metaschema, schemaWriter, configuration); generateSchema(generationState); generationState.flushWriter(); diff --git a/metaschema-schema-generator/src/main/java/gov/nist/secauto/metaschema/schemagen/MetaschemaIndex.java b/metaschema-schema-generator/src/main/java/gov/nist/secauto/metaschema/schemagen/MetaschemaIndex.java index 540b3dbab..42f37417d 100644 --- a/metaschema-schema-generator/src/main/java/gov/nist/secauto/metaschema/schemagen/MetaschemaIndex.java +++ b/metaschema-schema-generator/src/main/java/gov/nist/secauto/metaschema/schemagen/MetaschemaIndex.java @@ -125,7 +125,7 @@ protected void visit(IFlagDefinition def, MetaschemaIndex data) { /** * Updates the index entry for the definition associated with the reference. - * + * * @param instance * the instance to process * @return {@code true} if this is the first time handling the definition this instance references, 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 41a872664..678999b69 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 @@ -288,7 +288,8 @@ private DynamicContainer generateScenario(@NonNull TestScenario scenario, @NonNu IMetaschema metaschema = loadMetaschemaFuture.get(); DynamicBindingContext context; try { - context = produceDynamicBindingContext(ObjectUtils.notNull(metaschema), ObjectUtils.notNull(scenarioGenerationPath)); + context = produceDynamicBindingContext(ObjectUtils.notNull(metaschema), + ObjectUtils.notNull(scenarioGenerationPath)); } catch (Exception ex) { // NOPMD - intentional throw new JUnitException("Unable to generate classes for metaschema: " + metaschemaUri, ex); } @@ -358,8 +359,7 @@ protected Path convertContent(URI contentUri, @NonNull Path generationPath, @Non throw new JUnitException("Unable to create schema temp file", ex); } - @SuppressWarnings("rawtypes") - ISerializer serializer + @SuppressWarnings("rawtypes") ISerializer serializer = context.newSerializer(getRequiredContentFormat(), object.getClass()); serializer.serialize(object, convertedContetPath, getWriteOpenOptions()); diff --git a/pom.xml b/pom.xml index 3e807e4cd..d310827ff 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ gov.nist.secauto oss-parent - 24-SNAPSHOT + 24 gov.nist.secauto.metaschema metaschema-framework @@ -127,8 +127,8 @@ 0.64.8 2.3.32 0.3.3 - 2.13.3 - 2.13.4 + 2.15.2 + 2.15.2 2.4.0 4.0.0 2.3.1