debian/changelog

+wildfly-client-config (1.0.1-1) unstable; urgency=medium
+
+  * New upstream version 1.0.1.
+  * Switch to compat level 11.
+  * Declare compliance with Debian Policy 4.2.1.
+
+ -- Markus Koschany <apo@debian.org>  Tue, 28 Aug 2018 23:21:28 +0200
+
 wildfly-client-config (1.0.0-1) unstable; urgency=medium
 
   * Initial release (Closes: #872733)

debian/compat

-10
+11

debian/control

@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.or
 Uploaders:
  Markus Koschany <apo@debian.org>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  default-jdk,
  junit4,
  libjboss-logging-java,
@@ -14,7 +14,7 @@ Build-Depends:
  libmaven-bundle-plugin-java,
  libwildfly-common-java,
  maven-debian-helper (>= 2.1)
-Standards-Version: 4.0.1
+Standards-Version: 4.2.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/wildfly-client-config.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-java/wildfly-client-config.git
 Homepage: http://wildfly.org/

debian/copyright

@@ -3,11 +3,11 @@ Upstream-Name: wildfly-client-config
 Source: https://github.com/wildfly/wildfly-client-config
 
 Files: *
-Copyright: 2014-2017, Red Hat, Inc.
+Copyright: 2014-2018, Red Hat, Inc.
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2017, Markus Koschany <apo@debian.org>
+Copyright: 2017-2018, Markus Koschany <apo@debian.org>
 License: Apache-2.0
 
 License: Apache-2.0

debian/rules

@@ -2,6 +2,3 @@
 
 %:
 	dh $@
-
-get-orig-source:
-	uscan --download-current-version --force-download

debian/watch

 version=4
-opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/wildfly-client-config-$1\.tar\.gz/ \
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/wildfly-client-config-$1\.tar\.gz/,\
+uversionmangle=s/_/./g;s/\.Final// \
   https://github.com/wildfly/wildfly-client-config/tags .*/v?(\d\S+)\.tar\.gz

pom.xml

@@ -37,7 +37,7 @@
 
     <groupId>org.wildfly.client</groupId>
     <artifactId>wildfly-client-config</artifactId>
-    <version>1.0.0.Final</version>
+    <version>1.0.1.Final</version>
 
     <name>WildFly Client Configuration</name>
     <description>Library for supporting WildFly common client configuration</description>

src/main/java/org/wildfly/client/config/ClientConfiguration.java

@@ -19,7 +19,7 @@
 package org.wildfly.client.config;
 
 import static java.lang.Boolean.FALSE;
-import static javax.xml.stream.XMLStreamConstants.*;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
 import static org.wildfly.client.config.ConfigurationXMLStreamReader.eventToString;
 import static org.wildfly.client.config._private.ConfigMessages.msg;
 
@@ -39,6 +39,7 @@ import java.util.Set;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 
+import org.wildfly.common.Assert;
 import org.wildfly.common.function.ExceptionSupplier;
 
 /**
@@ -183,6 +184,8 @@ public class ClientConfiguration {
      * @return the client configuration instance
      */
     public static ClientConfiguration getInstance(URI configurationUri) {
+        Assert.checkNotNullParam("configurationUri", configurationUri);
+
         return new ClientConfiguration(createXmlInputFactory(), configurationUri);
     }
 
@@ -193,6 +196,8 @@ public class ClientConfiguration {
      * @return the client configuration instance
      */
     public static ClientConfiguration getInstance(URI configurationUri, ExceptionSupplier<InputStream, IOException> streamSupplier) {
+        Assert.checkNotNullParam("configurationUri", configurationUri);
+
         return new ClientConfiguration(createXmlInputFactory(), configurationUri, streamSupplier);
     }
 
@@ -251,7 +256,9 @@ public class ClientConfiguration {
             if (resource == null) {
                 return null;
             }
-        } try {
+        }
+
+        try {
             return new ClientConfiguration(XMLInputFactory.newFactory(), resource.toURI(), resource::openStream);
         } catch (URISyntaxException e) {
             return null;
@@ -259,6 +266,10 @@ public class ClientConfiguration {
     }
 
     static URI propertyUrlToUri(String wildFlyConfig) {
+        if (File.separator.equals("\\") && wildFlyConfig.contains("\\")) { // we are on the windows and path is for windows
+            File f = new File(wildFlyConfig);
+            return f.toPath().toUri();
+        } else {
             try {
                 URI uri = new URI(wildFlyConfig);
                 if (!uri.isAbsolute()) { // URI does not include schema
@@ -275,6 +286,7 @@ public class ClientConfiguration {
                 return null;
             }
         }
+    }
 
     private static ClassLoader getContextClassLoader() {
         return Thread.currentThread().getContextClassLoader();

src/main/java/org/wildfly/client/config/_private/ConfigMessages.java

@@ -89,10 +89,10 @@ public interface ConfigMessages {
     @Message(id = 15, value = "Unexpected attribute \"%s\" encountered")
     ConfigXMLParseException unexpectedAttribute(QName name, @Param(Location.class) XMLLocation location);
 
-    @Message(id = 16, value = "Missing required element \"%s\" from namespace \"%s\"")
+    @Message(id = 16, value = "Missing required element \"%2$s\" from namespace \"%s\"")
     ConfigXMLParseException missingRequiredElement(String namespaceUri, String localName, @Param(Location.class) XMLLocation location);
 
-    @Message(id = 17, value = "Missing required attribute \"%s\" from namespace \"%s\"")
+    @Message(id = 17, value = "Missing required attribute \"%2$s\" from namespace \"%s\"")
     ConfigXMLParseException missingRequiredAttribute(String namespaceUri, String localName, @Param(Location.class) XMLLocation location);
 
     @Message(id = 18, value = "Failed to parse integer value of attribute \"%s\"")

src/test/java/org/wildfly/client/config/TestSimpleConfiguration.java

@@ -18,9 +18,18 @@
 
 package org.wildfly.client.config;
 
-import static org.junit.Assert.*;
-import static javax.xml.stream.XMLStreamConstants.*;
+import static javax.xml.stream.XMLStreamConstants.CHARACTERS;
+import static javax.xml.stream.XMLStreamConstants.COMMENT;
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+import static javax.xml.stream.XMLStreamConstants.SPACE;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import java.io.File;
 import java.net.URL;
 import java.util.Collections;
 import java.util.regex.Pattern;
@@ -315,6 +324,13 @@ public final class TestSimpleConfiguration {
                 Pattern.matches("file:///absolute", ClientConfiguration.propertyUrlToUri("/absolute").toString()) ||
                         Pattern.matches("file:///[A-Za-z]:/absolute", ClientConfiguration.propertyUrlToUri("/absolute").toString())
         );
+
+        if (File.separator.equals("\\")) {
+            // we are on the windows and we want to check windows specific behavior
+            assertTrue(Pattern.matches("file:///.*/relative", ClientConfiguration.propertyUrlToUri("..\\relative").toString()));
+            assertTrue(Pattern.matches("file:///C:/absolute.xml",
+                    ClientConfiguration.propertyUrlToUri("C:\\absolute.xml").toString()));
             assertEquals("file:///C:/absolute.xml", ClientConfiguration.propertyUrlToUri("file:///C:/absolute.xml").toString());
         }
     }
+}
\ No newline at end of file