Skip to content

Commit 2245444

Browse files
david-waltermiredavid-waltermire
committed
normalized line endings
1 parent 342eddd commit 2245444

File tree

12 files changed

+160
-106
lines changed

12 files changed

+160
-106
lines changed

‎.gitattributes

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# To list all file extensions:
2+
# git ls-files | awk -F . {'print $NF'}|sort -u
3+
#
4+
# Set the default behavior, in case people don't have core.autocrlf set.
5+
* text=auto
6+
7+
# files that are binary
8+
*.png
9+
*.jpg

‎cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/CLIProcessor.java

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ private ExitStatus parseCommand(String... args) {
196196
return status;
197197
}
198198

199-
protected List<ICommand> getTopLevelCommands() {
199+
protected final List<ICommand> getTopLevelCommands() {
200200
List<ICommand> retval = Collections.unmodifiableList(commands);
201201
assert retval != null;
202202
return retval;
@@ -221,7 +221,7 @@ public static void handleQuiet() {
221221

222222
protected void showVersion() {
223223
@SuppressWarnings("resource") PrintStream out = AnsiConsole.out(); // NOPMD - not owner
224-
getVersionInfos().stream().forEach((info) -> {
224+
getVersionInfos().stream().forEach(info -> {
225225
out.println(ansi()
226226
.bold().a(info.getName()).boldOff()
227227
.a(" ")
@@ -265,35 +265,31 @@ public CallingContext(@NonNull List<String> args) {
265265

266266
boolean endArgs = false;
267267
for (String arg : args) {
268-
if (endArgs) {
268+
if (endArgs || arg.startsWith("-")) {
269269
extraArgs.add(arg);
270+
} else if ("--".equals(arg)) {
271+
endArgs = true;
270272
} else {
271-
if (arg.startsWith("-")) {
273+
ICommand command;
274+
if (calledCommands.isEmpty()) {
275+
command = topLevelCommandMap.get(arg);
276+
} else {
277+
command = calledCommands.getLast();
278+
command = command.getSubCommandByName(arg);
279+
}
280+
281+
if (command == null) {
272282
extraArgs.add(arg);
273-
} else if ("--".equals(arg)) {
274283
endArgs = true;
275284
} else {
276-
ICommand command;
277-
if (calledCommands.isEmpty()) {
278-
command = topLevelCommandMap.get(arg);
279-
} else {
280-
command = calledCommands.getLast();
281-
command = command.getSubCommandByName(arg);
282-
}
283-
284-
if (command == null) {
285-
extraArgs.add(arg);
286-
endArgs = true;
287-
} else {
288-
calledCommands.add(command);
289-
}
285+
calledCommands.add(command);
290286
}
291287
}
292288
}
293289

294290
if (LOGGER.isDebugEnabled()) {
295291
String commandChain = calledCommands.stream()
296-
.map(command -> command.getName())
292+
.map(ICommand::getName)
297293
.collect(Collectors.joining(" -> "));
298294
LOGGER.debug("Processing command chain: {}", commandChain);
299295
}
@@ -548,7 +544,7 @@ protected String buildHelpCliSyntax() {
548544

549545
// output required options
550546
getOptionsList().stream()
551-
.filter(option -> option.isRequired())
547+
.filter(Option::isRequired)
552548
.forEach(option -> {
553549
builder
554550
.append(' ')

‎cli-processor/src/main/java/gov/nist/secauto/metaschema/cli/processor/command/AbstractParentCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected AbstractParentCommand(boolean subCommandRequired) {
5151
this.subCommandRequired = subCommandRequired;
5252
}
5353

54-
protected void addCommandHandler(ICommand handler) {
54+
protected final void addCommandHandler(ICommand handler) {
5555
String commandName = handler.getName();
5656
this.commandToSubcommandHandlerMap.put(commandName, handler);
5757
}
@@ -87,7 +87,7 @@ protected ExitStatus executeCommand(
8787
status = ExitCode.INVALID_COMMAND
8888
.exitMessage("Please use one of the following sub-commands: " +
8989
getSubCommands().stream()
90-
.map(command -> command.getName())
90+
.map(ICommand::getName)
9191
.collect(Collectors.joining(", ")));
9292
} else {
9393
status = ExitCode.OK.exit();

‎databind/src/main/resources/META-INF/services/javax.xml.bind.JAXBContext

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
org.eclipse.persistence.jaxb.JAXBContextFactory
1+
org.eclipse.persistence.jaxb.JAXBContextFactory

‎databind/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension-removed

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎metaschema-cli/src/main/java/gov/nist/secauto/metaschema/cli/commands/ValidateContentUsingModuleCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public ICommandExecutor newExecutor(CallingContext callingContext, CommandLine c
115115
return new OscalCommandExecutor(callingContext, commandLine);
116116
}
117117

118-
private class OscalCommandExecutor
118+
private final class OscalCommandExecutor
119119
extends AbstractValidationCommandExecutor {
120120

121121
private Path tempDir;

‎metaschema-documentation-generator/xml-outline.html

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
1-
<div xmlns="http://www.w3.org/1999/xhtml" class="xml-outline">
2-
<div class="model-container">
3-
<details class="OM-entry" open="open">
4-
<summary>
5-
<span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
6-
</summary>
7-
</details>
8-
</div>
9-
<div class="model-container">
10-
<details class="OM-entry" open="open">
11-
<summary>
12-
<span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
13-
</summary>
14-
</details>
15-
</div>
16-
<div class="model-container">
17-
<details class="OM-entry" open="open">
18-
<summary>
19-
<span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
20-
</summary>
21-
</details>
22-
</div>
23-
<div class="model-container">
24-
<details class="OM-entry" open="open">
25-
<summary>
26-
<span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
27-
</summary>
28-
</details>
29-
</div>
30-
<div class="model-container">
31-
<details class="OM-entry" open="open">
32-
<summary>
33-
<span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
34-
</summary>
35-
</details>
36-
</div>
37-
<div class="model-container">
38-
<details class="OM-entry" open="open">
39-
<summary>
40-
<span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
41-
</summary>
42-
</details>
43-
</div>
44-
<div class="model-container">
45-
<details class="OM-entry" open="open">
46-
<summary>
47-
<span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
48-
</summary>
49-
</details>
50-
</div>
1+
<div xmlns="http://www.w3.org/1999/xhtml" class="xml-outline">
2+
<div class="model-container">
3+
<details class="OM-entry" open="open">
4+
<summary>
5+
<span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
6+
</summary>
7+
</details>
8+
</div>
9+
<div class="model-container">
10+
<details class="OM-entry" open="open">
11+
<summary>
12+
<span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
13+
</summary>
14+
</details>
15+
</div>
16+
<div class="model-container">
17+
<details class="OM-entry" open="open">
18+
<summary>
19+
<span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
20+
</summary>
21+
</details>
22+
</div>
23+
<div class="model-container">
24+
<details class="OM-entry" open="open">
25+
<summary>
26+
<span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
27+
</summary>
28+
</details>
29+
</div>
30+
<div class="model-container">
31+
<details class="OM-entry" open="open">
32+
<summary>
33+
<span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
34+
</summary>
35+
</details>
36+
</div>
37+
<div class="model-container">
38+
<details class="OM-entry" open="open">
39+
<summary>
40+
<span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
41+
</summary>
42+
</details>
43+
</div>
44+
<div class="model-container">
45+
<details class="OM-entry" open="open">
46+
<summary>
47+
<span class="sq"><span class="nobr">&lt;<a class="OM-name" href="../xml-reference/#/assessment-plan">assessment-plan</a></span> <span class="nobr" id="/assessment-plan/@uuid"><a class="OM-name" href="../xml-reference/#/assessment-plan/@uuid">uuid</a>="<span class="OM-datatype"><a href="/reference/datatypes/#uuid">uuid</a></span>"</span>&gt;<span class="show-closed"> … <span class="nobr">&lt;/assessment-plan&gt;</span></span></span><span class="sq cardinality"> <span class="OM-cardinality">[1]</span></span>
48+
</summary>
49+
</details>
50+
</div>
5151
</div>

‎metaschema-maven-plugin/src/it/generate-sources/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
File genSources = new File(basedir, 'target/generated-sources/metaschema/');
1+
File genSources = new File(basedir, 'target/generated-sources/metaschema/');
22
assert genSources.exists(), "Didn't find generated sources [" + genSources.getAbsolutePath() + "]";

‎metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/AbstractMetaschemaMojo.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,14 @@ protected final String getEncoding() {
227227
if (this.encoding != null) {
228228
// first try to use the provided encoding
229229
encoding = this.encoding;
230-
getLog().debug(String.format("Using configured encoding [%s].", encoding));
230+
if (getLog().isDebugEnabled()) {
231+
getLog().debug(String.format("Using configured encoding [%s].", encoding));
232+
}
231233
} else {
232234
encoding = System.getProperty(SYSTEM_FILE_ENCODING_PROPERTY);
233-
getLog().warn(String.format("Using system encoding [%s]. This build is platform dependent!", encoding));
235+
if (getLog().isWarnEnabled()) {
236+
getLog().warn(String.format("Using system encoding [%s]. This build is platform dependent!", encoding));
237+
}
234238
}
235239
return encoding;
236240
}
@@ -304,7 +308,9 @@ protected boolean isGenerationRequired() {
304308
final File staleFile = getStaleFile();
305309
boolean generate = !staleFile.exists();
306310
if (generate) {
307-
getLog().info(String.format("Stale file '%s' doesn't exist! Generating source files.", staleFile.getPath()));
311+
if (getLog().isInfoEnabled()) {
312+
getLog().info(String.format("Stale file '%s' doesn't exist! Generating source files.", staleFile.getPath()));
313+
}
308314
generate = true;
309315
} else {
310316
generate = false;
@@ -315,13 +321,17 @@ protected boolean isGenerationRequired() {
315321
URI metaschemaDirRelative = getMavenProject().getBasedir().toURI().relativize(metaschemaDir.toURI());
316322

317323
if (buildContext.isIncremental() && buildContext.hasDelta(metaschemaDirRelative.toString())) {
318-
getLog().info("metaschemaDirRelative: " + metaschemaDirRelative.toString());
324+
if (getLog().isInfoEnabled()) {
325+
getLog().info("metaschemaDirRelative: " + metaschemaDirRelative.toString());
326+
}
319327
generate = true;
320328
}
321329

322330
if (!generate) {
323331
for (File sourceFile : getModuleSources().collect(Collectors.toList())) {
324-
getLog().info("Source file: " + sourceFile.getPath());
332+
if (getLog().isInfoEnabled()) {
333+
getLog().info("Source file: " + sourceFile.getPath());
334+
}
325335
if (sourceFile.lastModified() > staleLastModified) {
326336
generate = true;
327337
}

‎metaschema-maven-plugin/src/main/java/gov/nist/secauto/metaschema/maven/plugin/GenerateSchemaMojo.java

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,12 @@ protected void generate(@NonNull Set<IModule> modules) throws MojoExecutionExcep
193193

194194
Path outputDirectory = ObjectUtils.notNull(getOutputDirectory().toPath());
195195
for (IModule module : modules) {
196-
getLog().info(String.format("Processing metaschema: %s", module.getLocation()));
196+
if (getLog().isInfoEnabled()) {
197+
getLog().info(String.format("Processing metaschema: %s", module.getLocation()));
198+
}
197199
if (module.getExportedRootAssemblyDefinitions().isEmpty()) {
198200
continue;
199201
}
200-
201202
generateSchemas(module, schemaGenerationConfig, outputDirectory, schemaFormats);
202203
}
203204
}
@@ -252,23 +253,31 @@ public void execute() throws MojoExecutionException {
252253
try {
253254
staleFile = staleFile.getCanonicalFile();
254255
} catch (IOException ex) {
255-
getLog().warn("Unable to resolve canonical path to stale file. Treating it as not existing.", ex);
256+
if (getLog().isWarnEnabled()) {
257+
getLog().warn("Unable to resolve canonical path to stale file. Treating it as not existing.", ex);
258+
}
256259
}
257260

258261
boolean generate;
259262
if (shouldExecutionBeSkipped()) {
260-
getLog().debug(String.format("Schema generation is configured to be skipped. Skipping."));
263+
if (getLog().isDebugEnabled()) {
264+
getLog().debug(String.format("Schema generation is configured to be skipped. Skipping."));
265+
}
261266
generate = false;
262267
} else if (staleFile.exists()) {
263268
generate = isGenerationRequired();
264269
} else {
265-
getLog().info(String.format("Stale file '%s' doesn't exist! Generating source files.", staleFile.getPath()));
270+
if (getLog().isInfoEnabled()) {
271+
getLog().info(String.format("Stale file '%s' doesn't exist! Generating source files.", staleFile.getPath()));
272+
}
266273
generate = true;
267274
}
268275

269276
if (generate) {
270277
File outputDir = getOutputDirectory();
271-
getLog().debug(String.format("Using outputDirectory: %s", outputDir.getPath()));
278+
if (getLog().isDebugEnabled()) {
279+
getLog().debug(String.format("Using outputDirectory: %s", outputDir.getPath()));
280+
}
272281

273282
if (!outputDir.exists() && !outputDir.mkdirs()) {
274283
throw new MojoExecutionException("Unable to create output directory: " + outputDir);
@@ -289,7 +298,9 @@ public void execute() throws MojoExecutionException {
289298
loader.allowEntityResolution();
290299
final Set<IModule> modules = new HashSet<>();
291300
for (File source : getModuleSources().collect(Collectors.toList())) {
292-
getLog().info("Using metaschema source: " + source.getPath());
301+
if (getLog().isInfoEnabled()) {
302+
getLog().info("Using metaschema source: " + source.getPath());
303+
}
293304
IModule module;
294305
try {
295306
module = loader.load(source);
@@ -309,7 +320,9 @@ public void execute() throws MojoExecutionException {
309320
= Files.newOutputStream(staleFile.toPath(), StandardOpenOption.CREATE, StandardOpenOption.WRITE,
310321
StandardOpenOption.TRUNCATE_EXISTING)) {
311322
os.close();
312-
getLog().info("Created stale file: " + staleFile);
323+
if (getLog().isInfoEnabled()) {
324+
getLog().info("Created stale file: " + staleFile);
325+
}
313326
} catch (IOException ex) {
314327
throw new MojoExecutionException("Failed to write stale file: " + staleFile.getPath(), ex);
315328
}

0 commit comments

Comments
 (0)