remove serialization, add some more convenience to URL

build.gradle

@@ -52,7 +52,7 @@ subprojects {
 
     [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
     tasks.withType(JavaCompile) {
-        options.compilerArgs << "-Xlint:all" << "-profile" << "compact1"
+        options.compilerArgs << "-Xlint:all,-serial" << "-profile" << "compact1"
     }
 
     jar {

gradle.properties

@@ -1,8 +1,8 @@
 group = org.xbib
 name = net
-version = 1.0.4
+version = 1.1.0
 
 junit.version = 4.12
 asciidoclet.version = 1.5.4
-wagon.version = 2.12
+wagon.version = 3.0.0
-jackson.version = 2.8.4
+jackson.version = 2.8.10

gradle/publish.gradle

@@ -1,5 +1,6 @@
 
 task xbibUpload(type: Upload) {
+    group = 'publish'
     configuration = configurations.archives
     uploadDescriptor = true
     repositories {
@@ -15,6 +16,7 @@ task xbibUpload(type: Upload) {
 }
 
 task sonatypeUpload(type: Upload, dependsOn: build) {
+    group = 'publish'
     configuration = configurations.archives
     uploadDescriptor = true
     repositories {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Tue Feb 27 11:11:33 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-rc-1-all.zip

net-url/src/main/java/org/xbib/net/QueryParameters.java

@@ -5,11 +5,10 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
+ * Query parameters.
  */
 public class QueryParameters extends ArrayList<QueryParameters.Pair<String, String>> {
 
-    private static final long serialVersionUID = 1195469379836789386L;
-
     private final int max;
 
     public QueryParameters() {

net-url/src/main/java/org/xbib/net/URL.java

@@ -3,7 +3,6 @@ package org.xbib.net;
 import org.xbib.net.scheme.Scheme;
 import org.xbib.net.scheme.SchemeRegistry;
 
-import java.io.Serializable;
 import java.net.IDN;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
@@ -43,12 +42,10 @@ import java.util.logging.Logger;
  * --
  *
  */
-public class URL implements Comparable<URL>, Serializable {
+public class URL implements Comparable<URL> {
 
     private static final Logger logger = Logger.getLogger(URL.class.getName());
 
-    private static final long serialVersionUID = 7936984038051707342L;
-
     private static final char SEPARATOR_CHAR = '/';
 
     private static final char QUESTION_CHAR = '?';
@@ -102,7 +99,7 @@ public class URL implements Comparable<URL>, Serializable {
     /**
      * A special, scheme-less URL denoting the fact that this URL should be considered as invalid.
      */
-    public static final URL INVALID = URL.builder().build();
+    private static final URL INVALID = URL.builder().build();
 
     public static Builder file() {
         return new Builder().scheme(Scheme.FILE);
@@ -236,33 +233,45 @@ public class URL implements Comparable<URL>, Serializable {
         return new Resolver(URL.create(base));
     }
 
-    public static URL from(String input) {
+    public static URL getInvalid() {
-        try {
+        return INVALID;
-            return parser().parse(input, true);
-        } catch (URLSyntaxException e) {
-            throw new IllegalArgumentException(e);
     }
+
+    public static URL from(String input) {
+        return from(input, true);
     }
 
     public static URL create(String input) {
+        return from(input, false);
+    }
+
+    public static URL from(String input, boolean resolve) {
         try {
-            return parser().parse(input, false);
+            return parser().parse(input, resolve);
         } catch (URLSyntaxException e) {
             throw new IllegalArgumentException(e);
         }
     }
 
     public URL resolve(String spec) {
+        return from(this, spec);
+    }
+
+    public static URL from(URL base, String spec) {
         try {
-            return new Resolver(this).resolve(spec);
+            return new Resolver(base).resolve(spec);
         } catch (URLSyntaxException e) {
             throw new IllegalArgumentException(e);
         }
     }
 
     public URL resolve(URL spec) {
+        return from(this, spec);
+    }
+
+    public static URL from(URL base, URL spec) {
         try {
-            return new Resolver(this).resolve(spec);
+            return new Resolver(base).resolve(spec);
         } catch (URLSyntaxException e) {
             throw new IllegalArgumentException(e);
         }
@@ -1252,9 +1261,7 @@ public class URL implements Comparable<URL>, Serializable {
         }
     }
 
-    private static class URLWithFragmentComparator implements Comparator<URL>, Serializable {
+    private static class URLWithFragmentComparator implements Comparator<URL> {
-
-        private static final long serialVersionUID = -5048272347975931901L;
 
         @Override
         public int compare(URL o1, URL o2) {
@@ -1262,9 +1269,7 @@ public class URL implements Comparable<URL>, Serializable {
         }
     }
 
-    private static class URLWithoutFragmentComparator implements Comparator<URL>, Serializable {
+    private static class URLWithoutFragmentComparator implements Comparator<URL> {
-
-        private static final long serialVersionUID = 818948352939772199L;
 
         @Override
         public int compare(URL o1, URL o2) {

net-url/src/main/java/org/xbib/net/URLSyntaxException.java

@@ -1,12 +1,10 @@
 package org.xbib.net;
 
 /**
- *
+ * URL syntax exception.
  */
 public class URLSyntaxException extends Exception {
 
-    private static final long serialVersionUID = 1813084470937980392L;
-
     URLSyntaxException(String message) {
         super(message);
     }

net-url/src/main/java/org/xbib/net/path/PathDecoder.java

@@ -13,7 +13,7 @@ import java.nio.charset.UnmappableCharacterException;
  */
 public class PathDecoder {
 
-    private static final Integer MAX_PARAM_COUNT = 1000;
+    private static final Integer MAX_PARAM_COUNT = 1024;
 
     private PercentDecoder decoder;
 

net-url/src/main/java/org/xbib/net/path/PathMatcher.java

@@ -11,7 +11,7 @@ import java.util.Map;
 import java.util.StringTokenizer;
 
 /**
- *
+ * Path matcher.
  */
 public class PathMatcher {
 
@@ -312,8 +312,6 @@ public class PathMatcher {
      */
     private static class LRUCache<K, V> extends LinkedHashMap<K, V> {
 
-        private static final long serialVersionUID = -2795566703268944901L;
-
         private final int cacheSize;
 
         LRUCache(int cacheSize) {

net-url/src/main/java/org/xbib/net/path/PathNormalizer.java

@@ -5,6 +5,7 @@ import java.util.LinkedList;
 import java.util.StringTokenizer;
 
 /**
+ *  Path normalizer.
  */
 public class PathNormalizer {
 
@@ -13,100 +14,6 @@ public class PathNormalizer {
     private PathNormalizer() {
     }
 
-    /*public static String normalizePath(String path) {
-        return normalizePath(path, false);
-    }
-
-    public static String normalizePath(String path, boolean keepSeparator) {
-        if (path == null || path.equals("") || path.equals("/")) {
-            return "/";
-        }
-        path = path.replaceAll("/+", "/");
-        int size = path.length();
-        if (size == 0) {
-            return path;
-        }
-        int prefix = getPrefixLength(path);
-        if (prefix < 0) {
-            return "";
-        }
-        char[] ch = new char[size + 2];
-        path.getChars(0, path.length(), ch, 0);
-        boolean firstIsDirectory = true;
-        if (ch[0] != separator) {
-            firstIsDirectory = false;
-        }
-        boolean lastIsDirectory = true;
-        if (ch[size - 1] != separator) {
-            lastIsDirectory = false;
-        }
-        for (int i = prefix + 1; i < size; i++) {
-            if (ch[i] == separator && ch[i - 1] == separator) {
-                System.arraycopy(ch, i, ch, i - 1, size - i);
-                size--;
-                i--;
-            }
-        }
-        for (int i = prefix + 1; i < size; i++) {
-            if (ch[i] == separator && ch[i - 1] == '.'
-                    && (i == prefix + 1 || ch[i - 2] == separator)) {
-                if (i == size - 1) {
-                    lastIsDirectory = true;
-                }
-                System.arraycopy(ch, i + 1, ch, i - 1, size - i);
-                size -=2;
-                i--;
-            }
-        }
-        int i =  prefix + 2;
-        while (i < size) {
-            if (ch[i] == separator && ch[i - 1] == '.' && ch[i - 2] == '.'
-                    && (i == prefix + 2 || ch[i - 3] == separator)) {
-                if (i == prefix + 2) {
-                    return "";
-                }
-                if (i == size - 1) {
-                    lastIsDirectory = true;
-                }
-                int j;
-                boolean b = false;
-                for (j = i - 4 ; j >= prefix; j--) {
-                    if (ch[j] == separator) {
-                        System.arraycopy(ch, i + 1, ch, j + 1, size - i);
-                        size -= (i - j);
-                        i = j + 1;
-                        b = true;
-                        break;
-                    }
-                }
-                if (b) {
-                    continue;
-                }
-                System.arraycopy(ch, i + 1, ch, prefix, size - i);
-                size -= (i + 1 - prefix);
-                i = prefix + 1;
-            }
-            i++;
-        }
-        if (size <= 0) {
-            return "";
-        }
-        String s = new String(ch, 0, size);
-        if (size <= prefix) {
-            return s;
-        }
-        if (!keepSeparator) {
-            if (firstIsDirectory && lastIsDirectory) {
-                return s.substring(1, s.length() - 1);
-            } else if (firstIsDirectory) {
-                return s.substring(1);
-            } else if (lastIsDirectory) {
-                return s.substring(0, s.length() - 1);
-            }
-        }
-        return s;
-    }*/
-
     public static String normalize(String path) {
         if (path == null || "".equals(path) || "/".equals(path)) {
             return "/";
@@ -147,48 +54,4 @@ public class PathNormalizer {
         }
         return sb.toString();
     }
-
-    private static int getPrefixLength(String filename) {
-        if (filename == null) {
-            return -1;
-        }
-        int len = filename.length();
-        if (len == 0) {
-            return 0;
-        }
-        char ch0 = filename.charAt(0);
-        if (ch0 == ':') {
-            return -1;
-        }
-        if (len == 1) {
-            if (ch0 == '~') {
-                return 2;
-            }
-            return ch0 == separator ? 1 : 0;
-        } else {
-            if (ch0 == '~') {
-                int pos = filename.indexOf(separator, 1);
-                return pos == -1 ? len + 1 : pos + 1;
-            }
-            char ch1 = filename.charAt(1);
-            if (ch1 == ':') {
-                ch0 = Character.toUpperCase(ch0);
-                if (ch0 >= ('A') && ch0 <= ('Z')) {
-                    if (len == 2 || filename.charAt(2) != separator) {
-                        return 2;
-                    }
-                    return 3;
-                }
-                return -1;
-            } else if (ch0 == separator && ch1 == separator) {
-                int pos = filename.indexOf(separator, 2);
-                if (pos == -1  || pos == 2) {
-                    return -1;
-                }
-                return pos + 1;
-            } else {
-                return ch0 == separator ? 1 : 0;
-            }
-        }
-    }
 }

net-url/src/main/java/org/xbib/net/path/PathPatternComparator.java

@@ -1,13 +1,11 @@
 package org.xbib.net.path;
 
-import java.io.Serializable;
 import java.util.Comparator;
 
 /**
+ * Path pattern comparator.
  */
-public class PathPatternComparator implements Comparator<String>, Serializable {
+public class PathPatternComparator implements Comparator<String> {
-
-    private static final long serialVersionUID = -5286803094119345841L;
 
     private final String path;
 

net-url/src/main/java/org/xbib/net/path/PathPatternInfo.java

@@ -3,6 +3,7 @@ package org.xbib.net.path;
 import java.util.regex.Pattern;
 
 /**
+ * Path pattern info.
  */
 class PathPatternInfo {
 

net-url/src/main/java/org/xbib/net/path/PathSeparatorPatternCache.java

@@ -1,6 +1,7 @@
 package org.xbib.net.path;
 
 /**
+ * Path separator pattern cache.
  */
 class PathSeparatorPatternCache {
 

net-url/src/main/java/org/xbib/net/path/PathStringMatcher.java

@@ -8,6 +8,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
+ * Path string matcher.
  */
 class PathStringMatcher {
 

net-url/src/main/java/org/xbib/net/scheme/DefaultScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- *
+ * Default scheme.
  */
 public class DefaultScheme extends AbstractScheme {
 

net-url/src/main/java/org/xbib/net/scheme/FileScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- *
+ * File scheme.
  */
 class FileScheme extends HttpScheme {
 

net-url/src/main/java/org/xbib/net/scheme/FtpScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- *
+ * FTP scheme.
  */
 class FtpScheme extends HttpScheme {
 

net-url/src/main/java/org/xbib/net/scheme/GitScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- *
+ * Git scheme.
  */
 class GitScheme extends HttpScheme {
 

net-url/src/main/java/org/xbib/net/scheme/GitSecureHttpScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- *
+ * Git secure scheme.
  */
 class GitSecureHttpScheme extends HttpScheme {
 

net-url/src/main/java/org/xbib/net/scheme/GopherScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- *
+ * Gopher scheme.
  */
 class GopherScheme extends AbstractScheme {
 

net-url/src/main/java/org/xbib/net/scheme/HttpScheme.java

@@ -4,7 +4,7 @@ import org.xbib.net.URL;
 import org.xbib.net.path.PathNormalizer;
 
 /**
- *
+ * HTTP scheme.
  */
 class HttpScheme extends AbstractScheme {
 

net-url/src/main/java/org/xbib/net/scheme/RedisScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- *
+ * Redis scheme.
  */
 class RedisScheme extends AbstractScheme {
 

net-url/src/main/java/org/xbib/net/scheme/RsyncScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- *
+ * Rsync scheme.
  */
 class RsyncScheme extends SshScheme {
 

net-url/src/main/java/org/xbib/net/scheme/RtmpScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- *
+ * Rtmp scheme.
  */
 class RtmpScheme extends AbstractScheme {
 

net-url/src/main/java/org/xbib/net/scheme/SecureHttpScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- *
+ * Secure HTTP scheme.
  */
 class SecureHttpScheme extends HttpScheme {
 

net-url/src/main/java/org/xbib/net/scheme/SecureImapScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- * The IMAP scheme.
+ * The secure IMAP scheme.
  * @see <a href="https://tools.ietf.org/html/rfc5092">IMAP scheme RFC</a>
  */
 class SecureImapScheme extends ImapScheme {

net-url/src/main/java/org/xbib/net/scheme/SecureLdapScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- * The LDAPS scheme.
+ * The secure LDAP scheme.
  *
  * @see <a href="https://tools.ietf.org/html/rfc4516">LDAP RFC</a>
  */

net-url/src/main/java/org/xbib/net/scheme/SecureNewsScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- * The snews scheme.
+ * The secure news scheme.
  *
  * @see <a href="https://tools.ietf.org/html/rfc5538">news RFC</a>
  */

net-url/src/main/java/org/xbib/net/scheme/SecurePop3Scheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- * The POP3S scheme.
+ * The secure POP3 scheme.
  *
  * @see <a href="https://tools.ietf.org/html/rfc2595">POP3 RFC</a>
  */

net-url/src/main/java/org/xbib/net/scheme/SecureSmtpScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- * The SMTPS scheme.
+ * The secure SMTP scheme.
  *
  * @see <a href="https://tools.ietf.org/html/rfc4409">SMTP RFC</a>
  */

net-url/src/main/java/org/xbib/net/scheme/SecureWebSocketScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- *
+ * Secure web socket scheme.
  */
 class SecureWebSocketScheme extends WebSocketScheme {
 

net-url/src/main/java/org/xbib/net/scheme/SftpScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- *
+ * Secure FTP scheme.
  */
 class SftpScheme extends SshScheme {
 

net-url/src/main/java/org/xbib/net/scheme/SshScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- *
+ * Secure shell scheme.
  */
 class SshScheme extends HttpScheme {
 

net-url/src/main/java/org/xbib/net/scheme/WebSocketScheme.java

@@ -1,7 +1,7 @@
 package org.xbib.net.scheme;
 
 /**
- *
+ * Web socket scheme.
  */
 class WebSocketScheme extends HttpScheme {
 

net-url/src/main/java/org/xbib/net/template/URITemplate.java

@@ -8,7 +8,7 @@ import org.xbib.net.template.vars.Variables;
 import java.util.List;
 
 /**
- *
+ * URI templates.
  */
 public class URITemplate {
 

net-url/src/main/java/org/xbib/net/template/expression/ExpressionType.java

@@ -1,6 +1,7 @@
 package org.xbib.net.template.expression;
 
 /**
+ * Expression types.
  */
 public enum ExpressionType {
     /*

net-url/src/main/java/org/xbib/net/template/expression/TemplateExpression.java

@@ -9,6 +9,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
+ * Template expression.
  */
 public class TemplateExpression implements URITemplateExpression {
 

net-url/src/main/java/org/xbib/net/template/expression/TemplateLiteral.java

@@ -3,6 +3,7 @@ package org.xbib.net.template.expression;
 import org.xbib.net.template.vars.Variables;
 
 /**
+ * Template literal.
  */
 public
 class TemplateLiteral implements URITemplateExpression {

net-url/src/main/java/org/xbib/net/template/expression/URITemplateExpression.java

@@ -3,6 +3,7 @@ package org.xbib.net.template.expression;
 import org.xbib.net.template.vars.Variables;
 
 /**
+ * Template expression interface.
  */
 public interface URITemplateExpression {
 

net-url/src/main/java/org/xbib/net/template/parse/ExpressionParser.java

@@ -13,6 +13,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
+ * Expression parser.
  */
 public class ExpressionParser implements TemplateParser {
 

net-url/src/main/java/org/xbib/net/template/parse/LiteralParser.java

@@ -7,6 +7,7 @@ import org.xbib.net.template.expression.URITemplateExpression;
 import java.nio.CharBuffer;
 
 /**
+ * Literal parser.
  */
 public
 class LiteralParser implements TemplateParser {

net-url/src/main/java/org/xbib/net/template/parse/TemplateParser.java

@@ -5,7 +5,7 @@ import org.xbib.net.template.expression.URITemplateExpression;
 import java.nio.CharBuffer;
 
 /**
- *
+ * Template parser interface.
  */
 public interface TemplateParser {
     URITemplateExpression parse(CharBuffer buffer);

net-url/src/main/java/org/xbib/net/template/parse/URITemplateParser.java

@@ -8,6 +8,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
+ * URI template parser.
  */
 public class URITemplateParser {
 

net-url/src/main/java/org/xbib/net/template/parse/VariableSpecParser.java

@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
+ * Variable spec parser.
  */
 public class VariableSpecParser {
 

net-url/src/main/java/org/xbib/net/template/render/ListRenderer.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- *
+ * Liste renderer.
  */
 public class ListRenderer extends MultiValueRenderer {
 

net-url/src/main/java/org/xbib/net/template/render/MapRenderer.java

@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- *
+ * Map renderer.
  */
 public  class MapRenderer extends MultiValueRenderer {
 

net-url/src/main/java/org/xbib/net/template/render/MultiValueRenderer.java

@@ -7,7 +7,7 @@ import org.xbib.net.template.vars.values.VariableValue;
 import java.util.List;
 
 /**
- *
+ * Multi value renderer.
  */
 abstract class MultiValueRenderer extends ValueRenderer {
 

net-url/src/main/java/org/xbib/net/template/render/NullRenderer.java

@@ -7,7 +7,7 @@ import org.xbib.net.template.vars.values.VariableValue;
 import java.util.List;
 
 /**
- *
+ * Null renderer.
  */
 public class NullRenderer extends ValueRenderer {
 

net-url/src/main/java/org/xbib/net/template/render/StringRenderer.java

@@ -8,7 +8,7 @@ import java.util.Collections;
 import java.util.List;
 
 /**
- *
+ * String renderer.
  */
 public class StringRenderer extends ValueRenderer {
 

net-url/src/main/java/org/xbib/net/template/render/ValueRenderer.java

@@ -78,4 +78,3 @@ public abstract class ValueRenderer {
         }
     }
 }
-

net-url/src/main/java/org/xbib/net/template/vars/Variables.java

@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
+ * Variables.
  */
 public class Variables {
 

net-url/src/main/java/org/xbib/net/template/vars/specs/ExplodedVariable.java

@@ -1,7 +1,7 @@
 package org.xbib.net.template.vars.specs;
 
 /**
- *
+ * Exploded variable.
  */
 public class ExplodedVariable extends VariableSpec {
 

net-url/src/main/java/org/xbib/net/template/vars/values/ListValue.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- *
+ * List value.
  */
 public class ListValue extends VariableValue {
 

net-url/src/main/java/org/xbib/net/template/vars/values/MapValue.java

@@ -4,7 +4,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
- *
+ * Map value.
  */
 public class MapValue extends VariableValue {
 

net-url/src/main/java/org/xbib/net/template/vars/values/NullValue.java

@@ -1,6 +1,7 @@
 package org.xbib.net.template.vars.values;
 
 /**
+ * Null value.
  */
 public class NullValue extends VariableValue {
 

net-url/src/main/java/org/xbib/net/template/vars/values/ScalarValue.java

@@ -1,7 +1,7 @@
 package org.xbib.net.template.vars.values;
 
 /**
- *
+ * Scalar value.
  */
 public class ScalarValue extends VariableValue {
 

net-url/src/main/java/org/xbib/net/template/vars/values/ValueType.java

@@ -8,6 +8,7 @@ import org.xbib.net.template.render.StringRenderer;
 import org.xbib.net.template.render.ValueRenderer;
 
 /**
+ * Value types.
  */
 public enum ValueType {
 

net-url/src/main/java/org/xbib/net/template/vars/values/VariableValue.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
+ * Variable value.
  */
 public abstract class VariableValue {
 

net-url/src/test/java/org/xbib/net/IRITest.java

@@ -29,7 +29,7 @@ public class IRITest {
     @Test
     public void testIpv6Invalid() {
         URL iri = URL.from("http://[2001:0db8:85a3:08d3:1319:8a2e:0370:734o]");
-        assertEquals(URL.INVALID, iri);
+        assertEquals(URL.getInvalid(), iri);
     }
 
     @Test

net-url/src/test/java/org/xbib/net/URLParserTest.java

@@ -6,7 +6,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -15,17 +14,17 @@ public class URLParserTest {
 
     @Test
     public void testNull() {
-        assertEquals(URL.INVALID, URL.from(null));
+        assertEquals(URL.getInvalid(), URL.from(null));
     }
 
     @Test
     public void testEmpty() {
-        assertEquals(URL.INVALID, URL.from(""));
+        assertEquals(URL.getInvalid(), URL.from(""));
     }
 
     @Test
     public void testNewline() {
-        assertEquals(URL.INVALID, URL.from("\n"));
+        assertEquals(URL.getInvalid(), URL.from("\n"));
     }
 
     @Test(expected = IllegalArgumentException.class)

net-url/src/test/java/org/xbib/net/URLResolverTest.java

@@ -94,9 +94,11 @@ public class URLResolverTest {
         // scheme
         resolve("http://a/b/c/d;p?q", "http:g", "http:g");
         resolve("http://a/b/c/d;p?q", "http:", "http:");
+        // absolute
+        resolve("http://a/b/c/d;p?q", "http://e/f/g/h", "http://e/f/g/h");
     }
 
-    private void resolve(String inputBase, String relative, String expected) throws URLSyntaxException {
+    private void resolve(String inputBase, String spec, String expected) throws URLSyntaxException {
-        assertEquals(expected, URL.base(inputBase).resolve(relative).toExternalForm());
+        assertEquals(expected, URL.base(inputBase).resolve(spec).toExternalForm());
     }
 }