Merge pull request #62 from bitmarck-service/master

Minor improvements
This commit is contained in:
apenski 2021-01-04 16:18:41 +01:00 committed by GitHub
commit cecb5a78b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 41 additions and 10 deletions

30
pom.xml
View file

@ -544,6 +544,19 @@
<lineEnding>LF</lineEnding> <lineEnding>LF</lineEnding>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
@ -585,6 +598,23 @@
<connection>https://github.com/itplr-kosit/validationtool.git</connection> <connection>https://github.com/itplr-kosit/validationtool.git</connection>
<developerConnection>scm:git:https://projekte.kosit.org/kosit/validator.git</developerConnection> <developerConnection>scm:git:https://projekte.kosit.org/kosit/validator.git</developerConnection>
<tag>v1.1.0</tag> <tag>v1.1.0</tag>
<url>https://github.com/itplr-kosit/validator</url>
</scm> </scm>
<url>https://github.com/itplr-kosit/validator</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<distributionManagement>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
</distributionManagement>
</project> </project>

View file

@ -133,7 +133,7 @@ public class InputFactory {
try { try {
return read(uri.toURL(), digestAlgorithm); return read(uri.toURL(), digestAlgorithm);
} catch (final MalformedURLException e) { } catch (final MalformedURLException e) {
throw new IllegalArgumentException(String.format("Can not read from uri %s Not a valid uri supplied", uri)); throw new IllegalArgumentException(String.format("URL invalid or protocol not supported: %s", uri), e);
} }
} }
@ -149,7 +149,7 @@ public class InputFactory {
} }
/** /**
* Liest einen Prüfling von der übergebenen URL. Es wird ein definierter Algorithmis zur Ermittlung der Prüfsumme * Liest einen Prüfling von der übergebenen URL. Es wird ein definierter Algorithmus zur Ermittlung der Prüfsumme
* genutzt. * genutzt.
* *
* @param url URL des Prüflings * @param url URL des Prüflings

View file

@ -67,7 +67,7 @@ public class CommandLineApplication {
private static void sayGoodby(final ReturnValue resultStatus) { private static void sayGoodby(final ReturnValue resultStatus) {
Printer.writeOut("\n##############################"); Printer.writeOut("\n##############################");
if (resultStatus.equals(ReturnValue.SUCCESS)) { if (resultStatus.equals(ReturnValue.SUCCESS)) {
Printer.writeOut("# " + new Line(Code.GREEN).add("Validation succesful!").render(false, false) + " #"); Printer.writeOut("# " + new Line(Code.GREEN).add("Validation successful!").render(false, false) + " #");
} else { } else {
Printer.writeOut("# " + new Line(Code.RED).add("Validation failed!").render(false, false) + " #"); Printer.writeOut("# " + new Line(Code.RED).add("Validation failed!").render(false, false) + " #");
} }

View file

@ -38,8 +38,8 @@ import de.kosit.validationtool.impl.DefaultCheck;
import de.kosit.validationtool.impl.tasks.CheckAction; import de.kosit.validationtool.impl.tasks.CheckAction;
/** /**
* Simple Erweiterung der Klasse {@link DefaultCheck} um das Ergebnis der Assertion-Prüfung auszwerten und auszugeben. * Simple Erweiterung der Klasse {@link DefaultCheck} um das Ergebnis der Assertion-Prüfung auszuwerten und auszugeben.
* Diese Klasse stellt keine fachlicher Erweiterung des eigentlichen Prüfvorganges dar! * Diese Klasse stellt keine fachliche Erweiterung des eigentlichen Prüfvorganges dar!
* *
* @author Andreas Penski * @author Andreas Penski
*/ */

View file

@ -55,7 +55,7 @@ import net.sf.saxon.s9api.XdmNode;
import net.sf.saxon.s9api.XdmNodeKind; import net.sf.saxon.s9api.XdmNodeKind;
/** /**
* Configuration class that loads neccessary {@link Check} configuration from an existing scenario.xml specification. * Configuration class that loads necessary {@link Check} configuration from an existing scenario.xml specification.
* This is the recommended option when an official configuration exists as is the case with 'xrechnung'. * This is the recommended option when an official configuration exists as is the case with 'xrechnung'.
* *
* @author Andreas Penski * @author Andreas Penski

View file

@ -147,7 +147,7 @@ public class ConversionService {
} }
/** /**
* Unmarshalls a specifc xml model into a defined java object. * Unmarshalls a specific XML model into a defined Java object.
* *
* @param xml the xml * @param xml the xml
* @param type the expected type created * @param type the expected type created

View file

@ -17,6 +17,7 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.Locale;
/** /**
* Wrapper for {@link System Systems} printing capability. * Wrapper for {@link System Systems} printing capability.
@ -37,7 +38,7 @@ public class Printer {
* @param params the params. * @param params the params.
*/ */
public static void writeOut(final String message, final Object... params) { public static void writeOut(final String message, final Object... params) {
System.out.println(MessageFormat.format(message, params)); System.out.println(new MessageFormat(message, Locale.ENGLISH).format(params));
} }
/** /**
@ -47,6 +48,6 @@ public class Printer {
* @param params the params. * @param params the params.
*/ */
public static void writeErr(final String message, final Object... params) { public static void writeErr(final String message, final Object... params) {
System.err.println(MessageFormat.format(message, params)); System.err.println(new MessageFormat(message, Locale.ENGLISH).format(params));
} }
} }

View file

@ -33,7 +33,7 @@ import de.kosit.validationtool.impl.xml.StrictRelativeResolvingStrategy;
public enum ResolvingMode { public enum ResolvingMode {
/** /**
* Resolving using only the configured content repository. No furthing resolving allowed. This * Resolving using only the configured content repository.
*/ */
STRICT_RELATIVE(new StrictRelativeResolvingStrategy()) { STRICT_RELATIVE(new StrictRelativeResolvingStrategy()) {