From f1f32cbedf000b416d5a9d81fcf0af0e51a7923f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Sun, 31 Dec 2017 00:11:10 +0100 Subject: [PATCH] created a net-url subpackage --- .gitignore | 20 +- README.adoc | 29 +- build.gradle | 179 +++++----- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 54712 -> 54329 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- net-url/config/checkstyle/checkstyle.xml | 323 ++++++++++++++++++ .../src}/docs/asciidoc/css/foundation.css | 0 {src => net-url/src}/docs/asciidoc/index.adoc | 0 .../src}/docs/asciidoclet/overview.adoc | 0 .../java/org/xbib/net/PercentDecoder.java | 0 .../java/org/xbib/net/PercentEncoder.java | 0 .../java/org/xbib/net/PercentEncoders.java | 0 .../java/org/xbib/net/ProtocolVersion.java | 0 .../java/org/xbib/net/QueryParameters.java | 0 .../src}/main/java/org/xbib/net/URL.java | 0 .../java/org/xbib/net/URLSyntaxException.java | 0 .../org/xbib/net/matcher/CharMatcher.java | 0 .../org/xbib/net/matcher/package-info.java | 0 .../main/java/org/xbib/net/package-info.java | 0 .../java/org/xbib/net/path/PathDecoder.java | 0 .../java/org/xbib/net/path/PathMatcher.java | 1 + .../org/xbib/net/path/PathNormalizer.java | 0 .../xbib/net/path/PathPatternComparator.java | 0 .../org/xbib/net/path/PathPatternInfo.java | 0 .../net/path/PathSeparatorPatternCache.java | 0 .../org/xbib/net/path/PathStringMatcher.java | 0 .../java/org/xbib/net/path/package-info.java | 0 .../org/xbib/net/scheme/AbstractScheme.java | 0 .../org/xbib/net/scheme/DefaultScheme.java | 0 .../java/org/xbib/net/scheme/DnsScheme.java | 0 .../java/org/xbib/net/scheme/FileScheme.java | 0 .../java/org/xbib/net/scheme/FtpScheme.java | 0 .../java/org/xbib/net/scheme/GitScheme.java | 0 .../xbib/net/scheme/GitSecureHttpScheme.java | 0 .../org/xbib/net/scheme/GopherScheme.java | 0 .../java/org/xbib/net/scheme/HttpScheme.java | 4 +- .../java/org/xbib/net/scheme/ImapScheme.java | 0 .../java/org/xbib/net/scheme/IrcScheme.java | 0 .../java/org/xbib/net/scheme/LdapScheme.java | 0 .../org/xbib/net/scheme/MailtoScheme.java | 0 .../java/org/xbib/net/scheme/NewsScheme.java | 0 .../java/org/xbib/net/scheme/NntpScheme.java | 0 .../java/org/xbib/net/scheme/Pop3Scheme.java | 0 .../java/org/xbib/net/scheme/RedisScheme.java | 0 .../java/org/xbib/net/scheme/RsyncScheme.java | 0 .../java/org/xbib/net/scheme/RtmpScheme.java | 0 .../java/org/xbib/net/scheme/RtspScheme.java | 0 .../main/java/org/xbib/net/scheme/Scheme.java | 0 .../org/xbib/net/scheme/SchemeRegistry.java | 0 .../org/xbib/net/scheme/SecureHttpScheme.java | 0 .../org/xbib/net/scheme/SecureImapScheme.java | 0 .../org/xbib/net/scheme/SecureLdapScheme.java | 0 .../org/xbib/net/scheme/SecureNewsScheme.java | 0 .../org/xbib/net/scheme/SecurePop3Scheme.java | 0 .../org/xbib/net/scheme/SecureSmtpScheme.java | 0 .../net/scheme/SecureWebSocketScheme.java | 0 .../java/org/xbib/net/scheme/SftpScheme.java | 0 .../java/org/xbib/net/scheme/SmtpScheme.java | 0 .../java/org/xbib/net/scheme/SshScheme.java | 0 .../org/xbib/net/scheme/TelnetScheme.java | 0 .../java/org/xbib/net/scheme/TftpScheme.java | 0 .../java/org/xbib/net/scheme/UrnScheme.java | 0 .../org/xbib/net/scheme/WebSocketScheme.java | 0 .../org/xbib/net/scheme/package-info.java | 0 .../org/xbib/net/template/URITemplate.java | 0 .../template/expression/ExpressionType.java | 0 .../expression/TemplateExpression.java | 0 .../template/expression/TemplateLiteral.java | 0 .../expression/URITemplateExpression.java | 0 .../net/template/expression/package-info.java | 0 .../org/xbib/net/template/package-info.java | 0 .../net/template/parse/ExpressionParser.java | 0 .../net/template/parse/LiteralParser.java | 0 .../net/template/parse/TemplateParser.java | 0 .../net/template/parse/URITemplateParser.java | 0 .../template/parse/VariableSpecParser.java | 0 .../xbib/net/template/parse/package-info.java | 0 .../net/template/render/ListRenderer.java | 0 .../xbib/net/template/render/MapRenderer.java | 0 .../template/render/MultiValueRenderer.java | 0 .../net/template/render/NullRenderer.java | 0 .../net/template/render/StringRenderer.java | 0 .../net/template/render/ValueRenderer.java | 0 .../net/template/render/package-info.java | 0 .../org/xbib/net/template/vars/Variables.java | 0 .../xbib/net/template/vars/package-info.java | 0 .../template/vars/specs/ExplodedVariable.java | 0 .../template/vars/specs/PrefixVariable.java | 0 .../template/vars/specs/SimpleVariable.java | 0 .../net/template/vars/specs/VariableSpec.java | 0 .../template/vars/specs/VariableSpecType.java | 0 .../net/template/vars/specs/package-info.java | 0 .../net/template/vars/values/ListValue.java | 0 .../net/template/vars/values/MapValue.java | 0 .../net/template/vars/values/NullValue.java | 0 .../net/template/vars/values/ScalarValue.java | 0 .../net/template/vars/values/ValueType.java | 0 .../template/vars/values/VariableValue.java | 0 .../template/vars/values/package-info.java | 0 .../src}/test/java/org/xbib/net/IRITest.java | 0 .../java/org/xbib/net/PercentDecoderTest.java | 0 .../java/org/xbib/net/PercentEncoderTest.java | 0 .../java/org/xbib/net/URIComponentTest.java | 0 .../java/org/xbib/net/URLBuilderTest.java | 0 .../test/java/org/xbib/net/URLParserTest.java | 0 .../java/org/xbib/net/URLResolverTest.java | 10 + .../src}/test/java/org/xbib/net/URLTest.java | 0 .../test/java/org/xbib/net/package-info.java | 0 .../org/xbib/net/path/PathDecoderTest.java | 0 .../org/xbib/net/path/PathMatcherTest.java | 0 .../org/xbib/net/path/PathNormalizerTest.java | 0 .../java/org/xbib/net/path/package-info.java | 0 .../xbib/net/template/URITemplateTest.java | 0 .../org/xbib/net/template/package-info.java | 0 .../src}/test/resources/extended-tests.json | 0 .../src}/test/resources/lists.json | 0 .../src}/test/resources/multipleLists.json | 0 .../src}/test/resources/multipleStrings.json | 0 .../src}/test/resources/negative-tests.json | 0 .../src}/test/resources/rfcExamples.json | 0 .../resources/spec-examples-by-section.json | 0 .../src}/test/resources/spec-examples.json | 0 .../src}/test/resources/strings.json | 0 .../src}/test/resources/urltestdata.json | 0 settings.gradle | 3 + 126 files changed, 471 insertions(+), 103 deletions(-) create mode 100644 net-url/config/checkstyle/checkstyle.xml rename {src => net-url/src}/docs/asciidoc/css/foundation.css (100%) rename {src => net-url/src}/docs/asciidoc/index.adoc (100%) rename {src => net-url/src}/docs/asciidoclet/overview.adoc (100%) rename {src => net-url/src}/main/java/org/xbib/net/PercentDecoder.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/PercentEncoder.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/PercentEncoders.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/ProtocolVersion.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/QueryParameters.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/URL.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/URLSyntaxException.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/matcher/CharMatcher.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/matcher/package-info.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/package-info.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/path/PathDecoder.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/path/PathMatcher.java (99%) rename {src => net-url/src}/main/java/org/xbib/net/path/PathNormalizer.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/path/PathPatternComparator.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/path/PathPatternInfo.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/path/PathSeparatorPatternCache.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/path/PathStringMatcher.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/path/package-info.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/AbstractScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/DefaultScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/DnsScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/FileScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/FtpScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/GitScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/GitSecureHttpScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/GopherScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/HttpScheme.java (76%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/ImapScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/IrcScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/LdapScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/MailtoScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/NewsScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/NntpScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/Pop3Scheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/RedisScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/RsyncScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/RtmpScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/RtspScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/Scheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/SchemeRegistry.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/SecureHttpScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/SecureImapScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/SecureLdapScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/SecureNewsScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/SecurePop3Scheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/SecureSmtpScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/SecureWebSocketScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/SftpScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/SmtpScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/SshScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/TelnetScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/TftpScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/UrnScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/WebSocketScheme.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/scheme/package-info.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/URITemplate.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/expression/ExpressionType.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/expression/TemplateExpression.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/expression/TemplateLiteral.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/expression/URITemplateExpression.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/expression/package-info.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/package-info.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/parse/ExpressionParser.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/parse/LiteralParser.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/parse/TemplateParser.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/parse/URITemplateParser.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/parse/VariableSpecParser.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/parse/package-info.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/render/ListRenderer.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/render/MapRenderer.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/render/MultiValueRenderer.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/render/NullRenderer.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/render/StringRenderer.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/render/ValueRenderer.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/render/package-info.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/Variables.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/package-info.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/specs/ExplodedVariable.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/specs/PrefixVariable.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/specs/SimpleVariable.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/specs/VariableSpec.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/specs/VariableSpecType.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/specs/package-info.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/values/ListValue.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/values/MapValue.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/values/NullValue.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/values/ScalarValue.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/values/ValueType.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/values/VariableValue.java (100%) rename {src => net-url/src}/main/java/org/xbib/net/template/vars/values/package-info.java (100%) rename {src => net-url/src}/test/java/org/xbib/net/IRITest.java (100%) rename {src => net-url/src}/test/java/org/xbib/net/PercentDecoderTest.java (100%) rename {src => net-url/src}/test/java/org/xbib/net/PercentEncoderTest.java (100%) rename {src => net-url/src}/test/java/org/xbib/net/URIComponentTest.java (100%) rename {src => net-url/src}/test/java/org/xbib/net/URLBuilderTest.java (100%) rename {src => net-url/src}/test/java/org/xbib/net/URLParserTest.java (100%) rename {src => net-url/src}/test/java/org/xbib/net/URLResolverTest.java (91%) rename {src => net-url/src}/test/java/org/xbib/net/URLTest.java (100%) rename {src => net-url/src}/test/java/org/xbib/net/package-info.java (100%) rename {src => net-url/src}/test/java/org/xbib/net/path/PathDecoderTest.java (100%) rename {src => net-url/src}/test/java/org/xbib/net/path/PathMatcherTest.java (100%) rename {src => net-url/src}/test/java/org/xbib/net/path/PathNormalizerTest.java (100%) rename {src => net-url/src}/test/java/org/xbib/net/path/package-info.java (100%) rename {src => net-url/src}/test/java/org/xbib/net/template/URITemplateTest.java (100%) rename {src => net-url/src}/test/java/org/xbib/net/template/package-info.java (100%) rename {src => net-url/src}/test/resources/extended-tests.json (100%) rename {src => net-url/src}/test/resources/lists.json (100%) rename {src => net-url/src}/test/resources/multipleLists.json (100%) rename {src => net-url/src}/test/resources/multipleStrings.json (100%) rename {src => net-url/src}/test/resources/negative-tests.json (100%) rename {src => net-url/src}/test/resources/rfcExamples.json (100%) rename {src => net-url/src}/test/resources/spec-examples-by-section.json (100%) rename {src => net-url/src}/test/resources/spec-examples.json (100%) rename {src => net-url/src}/test/resources/strings.json (100%) rename {src => net-url/src}/test/resources/urltestdata.json (100%) create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index 9543d32..d5b5511 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,14 @@ -/data -/work -/logs -/.idea -/target -.DS_Store -*.iml /.settings /.classpath /.project /.gradle -/build -/plugins -/sessions +**/data +**/work +**/logs +**/.idea +**/target +**/out +**/build +.DS_Store +*.iml *~ -*.MARC diff --git a/README.adoc b/README.adoc index 860b70b..1ae72ec 100644 --- a/README.adoc +++ b/README.adoc @@ -1,11 +1,32 @@ # Network classes for Java -image:https://api.travis-ci.org/xbib/net.svg[title="Build status", link="https://travis-ci.org/xbib/net/"] -image:https://img.shields.io/sonar/http/nemo.sonarqube.com/org.xbib%3Anet/coverage.svg?style=flat-square[title="Coverage", link="https://sonarqube.com/dashboard/index?id=org.xbib%3Anet"] -image:https://maven-badges.herokuapp.com/maven-central/org.xbib/net/badge.svg[title="Maven Central", link="http://search.maven.org/#search%7Cga%7C1%7Cxbib%20net"] +## Net-url: Uniform Resource Locator implementation + +image:https://api.travis-ci.org/xbib/net-url.svg[title="Build status", link="https://travis-ci.org/xbib/net-url/"] +image:https://img.shields.io/sonar/http/nemo.sonarqube.com/org.xbib%3Anet/coverage.svg?style=flat-square[title="Coverage", link="https://sonarqube.com/dashboard/index?id=org.xbib%3Anet-url"] +image:https://maven-badges.herokuapp.com/maven-central/org.xbib/net-url/badge.svg[title="Maven Central", link="http://search.maven.org/#search%7Cga%7C1%7Cxbib%20net-url"] image:https://img.shields.io/badge/License-Apache%202.0-blue.svg[title="Apache License 2.0", link="https://opensource.org/licenses/Apache-2.0"] image:https://img.shields.io/twitter/url/https/twitter.com/xbib.svg?style=social&label=Follow%20%40xbib[title="Twitter", link="https://twitter.com/xbib"] -image:https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif[title="PayPal", link="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=GVHFQYZ9WZ8HG"] +# License +Copyright (C) 2018 Jörg Prante + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +you may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +# Donations + +Donations are welcome as a small thanks if you find this software useful. + +image:https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif[title="PayPal", link="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=GVHFQYZ9WZ8HG"] diff --git a/build.gradle b/build.gradle index a42a402..b6d086b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { - id "org.sonarqube" version "2.5" + id "org.sonarqube" version "2.6.1" id "org.xbib.gradle.plugin.asciidoctor" version "1.5.4.1.0" - id "io.codearte.nexus-staging" version "0.7.0" + id "io.codearte.nexus-staging" version "0.11.0" } printf "Host: %s\nOS: %s %s %s\nJVM: %s %s %s %s\nGroovy: %s\nGradle: %s\n" + @@ -18,97 +18,110 @@ printf "Host: %s\nOS: %s %s %s\nJVM: %s %s %s %s\nGroovy: %s\nGradle: %s\n" + GroovySystem.getVersion(), gradle.gradleVersion - -apply plugin: 'java' -apply plugin: 'maven' -apply plugin: 'signing' -apply plugin: 'findbugs' -apply plugin: 'pmd' -apply plugin: 'checkstyle' -apply plugin: "jacoco" apply plugin: "io.codearte.nexus-staging" -apply plugin: 'org.xbib.gradle.plugin.asciidoctor' -repositories { - mavenCentral() -} +subprojects { -configurations { - asciidoclet - wagon -} + apply plugin: 'java' + apply plugin: 'maven' + apply plugin: 'signing' + apply plugin: 'findbugs' + apply plugin: 'pmd' + apply plugin: 'checkstyle' + apply plugin: "jacoco" + apply plugin: 'org.xbib.gradle.plugin.asciidoctor' -dependencies { - testCompile "junit:junit:${project.property('junit.version')}" - wagon "org.apache.maven.wagon:wagon-ssh-external:2.12" - testCompile "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}" - asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}" - wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon.version')}" - -} - -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 - -[compileJava, compileTestJava]*.options*.encoding = 'UTF-8' -tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:all" << "-profile" << "compact1" -} - -jar { - manifest { - attributes('Implementation-Version': project.version) + repositories { + mavenCentral() } -} -test { - testLogging { - showStandardStreams = false - exceptionFormat = 'full' + configurations { + asciidoclet + wagon } - systemProperty 'java.net.preferIPv4Stack','false' - systemProperty 'java.net.preferIPv6Addresses', 'true' -} -asciidoctor { - backends 'html5' - separateOutputDirs = false - attributes 'source-highlighter': 'coderay', - toc : '', - idprefix : '', - idseparator : '-', - stylesheet: "${projectDir}/src/docs/asciidoc/css/foundation.css" -} - -javadoc { - options.docletpath = configurations.asciidoclet.files.asType(List) - options.doclet = 'org.asciidoctor.Asciidoclet' - options.overview = "src/docs/asciidoclet/overview.adoc" - options.addStringOption "-base-dir", "${projectDir}" - options.addStringOption "-attribute", - "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}" - configure(options) { - noTimestamp = true + dependencies { + testCompile "junit:junit:${project.property('junit.version')}" + testCompile "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}" + asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}" + wagon "org.apache.maven.wagon:wagon-ssh:${project.property('wagon.version')}" } -} -task sourcesJar(type: Jar, dependsOn: classes) { - classifier 'sources' - from sourceSets.main.allSource -} -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier 'javadoc' -} -artifacts { - archives sourcesJar, javadocJar -} -if (project.hasProperty('signing.keyId')) { - signing { - sign configurations.archives + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + + [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' + tasks.withType(JavaCompile) { + options.compilerArgs << "-Xlint:all" << "-profile" << "compact1" } + + jar { + manifest { + attributes('Implementation-Version': project.version) + } + } + + clean { + delete 'out' + } + + test { + testLogging { + showStandardStreams = false + exceptionFormat = 'full' + } + systemProperty 'java.net.preferIPv4Stack', 'false' + systemProperty 'java.net.preferIPv6Addresses', 'true' + } + + asciidoctor { + attributes 'source-highlighter': 'coderay', + toc: 'left', + doctype: 'book', + icons: 'font', + encoding: 'utf-8', + sectlink: true, + sectanchors: true, + linkattrs: true, + imagesdir: 'img' + } + + javadoc { + options.docletpath = configurations.asciidoclet.files.asType(List) + options.doclet = 'org.asciidoctor.Asciidoclet' + options.overview = "src/docs/asciidoclet/overview.adoc" + options.addStringOption "-base-dir", "${projectDir}" + options.addStringOption "-attribute", + "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}" + configure(options) { + noTimestamp = true + } + } + + task sourcesJar(type: Jar, dependsOn: classes) { + classifier 'sources' + from sourceSets.main.allSource + } + + task javadocJar(type: Jar, dependsOn: javadoc) { + classifier 'javadoc' + } + + artifacts { + archives sourcesJar, javadocJar + } + + if (project.hasProperty('signing.keyId')) { + signing { + sign configurations.archives + } + } + + apply from: "${rootProject.projectDir}/gradle/ext.gradle" + apply from: "${rootProject.projectDir}/gradle/publish.gradle" + apply from: "${rootProject.projectDir}/gradle/sonarqube.gradle" } -apply from: "${rootProject.projectDir}/gradle/ext.gradle" -apply from: "${rootProject.projectDir}/gradle/publish.gradle" -apply from: "${rootProject.projectDir}/gradle/sonarqube.gradle" - +nexusStaging { + packageGroup = "org.xbib" +} diff --git a/gradle.properties b/gradle.properties index 77300fa..c3c29cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ group = org.xbib name = net -version = 1.0.3 +version = 1.0.4 junit.version = 4.12 asciidoclet.version = 1.5.4 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c8f75464242443e480454f1eb7a4b14dec7a9a59..01b8bf6b1f99cad9213fc495b33ad5bbab8efd20 100644 GIT binary patch delta 16106 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 B6vO}k delta 16595 zcmZ8}b9iLU({^mzwr$(l*xA_0#!e=-CmY+gZQC2$*kHp=^6j%Pe&6%XKU3Z3J~efn z>ps=pg=sGXZ>t1P;D%kJjCKP1PKC? zjtHF1Cjq{FLk74kYNC83<4o2|q9F|J5s?I#qHkh>B^P~xX%&$PD3TS=ldRW}R!`K| zIbL|{euwXRs6Hx2Zc-a4nsR*|61RM%eidK$m)11<(I8&}jGW0?&e{6r(JOdI4ETJ- z4@kYWC*WtHH06uqQgAck-#+a_un2u9@tmS`1iy#f90D-jddiP%z;1@onTkpY#m$_T z2PJTjc9RzscruLSjXFxx?8Nq?R8TstU?9s&$&UD-nN=R1rs$;1ar#SlS02;FIUJU7 zSZa%nCL3~Sl$zM0J+AZ;mOCIWGaQ!?=y696QhSN1T$z~5vS*(`QxdJC)ZuY1Ij2)) z;<=IIIsw>J<|e%KJo;s1!nV|O=HyyZv_i+LY%-VRA}%a?8bq?!WVm5Etn|JwR9!R3 z@od7ZH$=A=RAV79rgA@QmNhpOWrR9yEm3WaIiSs>ZY^a4(NxbsVpydcmm$URiP92L zaGT*WXmFL4)KjoHe000e`>MNarpj8F9&^}iya3kCXYc-?`d@0)MjLQB_ZiMF2Xe4Y zt7`M(<;9f!99#Op=NRI#2&Za(XfBZ&E@h2tfZ59+htM?Ds;rXPnW!-4KDLn?(-4x) z^y!{E3%DvJ*eXiDE!wiFf$^j}Q{M~YQ(TuU`(BjeH#a*E8(HXyeVbKxEzE<3a$WGq zZUhvb)zxz5E1<1d57u2n*0+>G^APF1YiYsAFyrd>QS|T`>xvFoaJT*(qFwr0Hof+x zZO}HO!K@>YAxK$z@pCX$eu%cx9>^$LT#V(26LKD_rfv%w$1|)yIyp&F0 za5vmzgtU|u9o+SPPRtt|k�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 X=YJm8zl=E@1i~)SL5UCjGyDGl*!U~P diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d1ec295..933b647 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu Jul 13 21:48:43 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip diff --git a/net-url/config/checkstyle/checkstyle.xml b/net-url/config/checkstyle/checkstyle.xml new file mode 100644 index 0000000..3dc3e16 --- /dev/null +++ b/net-url/config/checkstyle/checkstyle.xml @@ -0,0 +1,323 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/docs/asciidoc/css/foundation.css b/net-url/src/docs/asciidoc/css/foundation.css similarity index 100% rename from src/docs/asciidoc/css/foundation.css rename to net-url/src/docs/asciidoc/css/foundation.css diff --git a/src/docs/asciidoc/index.adoc b/net-url/src/docs/asciidoc/index.adoc similarity index 100% rename from src/docs/asciidoc/index.adoc rename to net-url/src/docs/asciidoc/index.adoc diff --git a/src/docs/asciidoclet/overview.adoc b/net-url/src/docs/asciidoclet/overview.adoc similarity index 100% rename from src/docs/asciidoclet/overview.adoc rename to net-url/src/docs/asciidoclet/overview.adoc diff --git a/src/main/java/org/xbib/net/PercentDecoder.java b/net-url/src/main/java/org/xbib/net/PercentDecoder.java similarity index 100% rename from src/main/java/org/xbib/net/PercentDecoder.java rename to net-url/src/main/java/org/xbib/net/PercentDecoder.java diff --git a/src/main/java/org/xbib/net/PercentEncoder.java b/net-url/src/main/java/org/xbib/net/PercentEncoder.java similarity index 100% rename from src/main/java/org/xbib/net/PercentEncoder.java rename to net-url/src/main/java/org/xbib/net/PercentEncoder.java diff --git a/src/main/java/org/xbib/net/PercentEncoders.java b/net-url/src/main/java/org/xbib/net/PercentEncoders.java similarity index 100% rename from src/main/java/org/xbib/net/PercentEncoders.java rename to net-url/src/main/java/org/xbib/net/PercentEncoders.java diff --git a/src/main/java/org/xbib/net/ProtocolVersion.java b/net-url/src/main/java/org/xbib/net/ProtocolVersion.java similarity index 100% rename from src/main/java/org/xbib/net/ProtocolVersion.java rename to net-url/src/main/java/org/xbib/net/ProtocolVersion.java diff --git a/src/main/java/org/xbib/net/QueryParameters.java b/net-url/src/main/java/org/xbib/net/QueryParameters.java similarity index 100% rename from src/main/java/org/xbib/net/QueryParameters.java rename to net-url/src/main/java/org/xbib/net/QueryParameters.java diff --git a/src/main/java/org/xbib/net/URL.java b/net-url/src/main/java/org/xbib/net/URL.java similarity index 100% rename from src/main/java/org/xbib/net/URL.java rename to net-url/src/main/java/org/xbib/net/URL.java diff --git a/src/main/java/org/xbib/net/URLSyntaxException.java b/net-url/src/main/java/org/xbib/net/URLSyntaxException.java similarity index 100% rename from src/main/java/org/xbib/net/URLSyntaxException.java rename to net-url/src/main/java/org/xbib/net/URLSyntaxException.java diff --git a/src/main/java/org/xbib/net/matcher/CharMatcher.java b/net-url/src/main/java/org/xbib/net/matcher/CharMatcher.java similarity index 100% rename from src/main/java/org/xbib/net/matcher/CharMatcher.java rename to net-url/src/main/java/org/xbib/net/matcher/CharMatcher.java diff --git a/src/main/java/org/xbib/net/matcher/package-info.java b/net-url/src/main/java/org/xbib/net/matcher/package-info.java similarity index 100% rename from src/main/java/org/xbib/net/matcher/package-info.java rename to net-url/src/main/java/org/xbib/net/matcher/package-info.java diff --git a/src/main/java/org/xbib/net/package-info.java b/net-url/src/main/java/org/xbib/net/package-info.java similarity index 100% rename from src/main/java/org/xbib/net/package-info.java rename to net-url/src/main/java/org/xbib/net/package-info.java diff --git a/src/main/java/org/xbib/net/path/PathDecoder.java b/net-url/src/main/java/org/xbib/net/path/PathDecoder.java similarity index 100% rename from src/main/java/org/xbib/net/path/PathDecoder.java rename to net-url/src/main/java/org/xbib/net/path/PathDecoder.java diff --git a/src/main/java/org/xbib/net/path/PathMatcher.java b/net-url/src/main/java/org/xbib/net/path/PathMatcher.java similarity index 99% rename from src/main/java/org/xbib/net/path/PathMatcher.java rename to net-url/src/main/java/org/xbib/net/path/PathMatcher.java index c45c1f9..c1dae20 100644 --- a/src/main/java/org/xbib/net/path/PathMatcher.java +++ b/net-url/src/main/java/org/xbib/net/path/PathMatcher.java @@ -11,6 +11,7 @@ import java.util.Map; import java.util.StringTokenizer; /** + * */ public class PathMatcher { diff --git a/src/main/java/org/xbib/net/path/PathNormalizer.java b/net-url/src/main/java/org/xbib/net/path/PathNormalizer.java similarity index 100% rename from src/main/java/org/xbib/net/path/PathNormalizer.java rename to net-url/src/main/java/org/xbib/net/path/PathNormalizer.java diff --git a/src/main/java/org/xbib/net/path/PathPatternComparator.java b/net-url/src/main/java/org/xbib/net/path/PathPatternComparator.java similarity index 100% rename from src/main/java/org/xbib/net/path/PathPatternComparator.java rename to net-url/src/main/java/org/xbib/net/path/PathPatternComparator.java diff --git a/src/main/java/org/xbib/net/path/PathPatternInfo.java b/net-url/src/main/java/org/xbib/net/path/PathPatternInfo.java similarity index 100% rename from src/main/java/org/xbib/net/path/PathPatternInfo.java rename to net-url/src/main/java/org/xbib/net/path/PathPatternInfo.java diff --git a/src/main/java/org/xbib/net/path/PathSeparatorPatternCache.java b/net-url/src/main/java/org/xbib/net/path/PathSeparatorPatternCache.java similarity index 100% rename from src/main/java/org/xbib/net/path/PathSeparatorPatternCache.java rename to net-url/src/main/java/org/xbib/net/path/PathSeparatorPatternCache.java diff --git a/src/main/java/org/xbib/net/path/PathStringMatcher.java b/net-url/src/main/java/org/xbib/net/path/PathStringMatcher.java similarity index 100% rename from src/main/java/org/xbib/net/path/PathStringMatcher.java rename to net-url/src/main/java/org/xbib/net/path/PathStringMatcher.java diff --git a/src/main/java/org/xbib/net/path/package-info.java b/net-url/src/main/java/org/xbib/net/path/package-info.java similarity index 100% rename from src/main/java/org/xbib/net/path/package-info.java rename to net-url/src/main/java/org/xbib/net/path/package-info.java diff --git a/src/main/java/org/xbib/net/scheme/AbstractScheme.java b/net-url/src/main/java/org/xbib/net/scheme/AbstractScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/AbstractScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/AbstractScheme.java diff --git a/src/main/java/org/xbib/net/scheme/DefaultScheme.java b/net-url/src/main/java/org/xbib/net/scheme/DefaultScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/DefaultScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/DefaultScheme.java diff --git a/src/main/java/org/xbib/net/scheme/DnsScheme.java b/net-url/src/main/java/org/xbib/net/scheme/DnsScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/DnsScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/DnsScheme.java diff --git a/src/main/java/org/xbib/net/scheme/FileScheme.java b/net-url/src/main/java/org/xbib/net/scheme/FileScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/FileScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/FileScheme.java diff --git a/src/main/java/org/xbib/net/scheme/FtpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/FtpScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/FtpScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/FtpScheme.java diff --git a/src/main/java/org/xbib/net/scheme/GitScheme.java b/net-url/src/main/java/org/xbib/net/scheme/GitScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/GitScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/GitScheme.java diff --git a/src/main/java/org/xbib/net/scheme/GitSecureHttpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/GitSecureHttpScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/GitSecureHttpScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/GitSecureHttpScheme.java diff --git a/src/main/java/org/xbib/net/scheme/GopherScheme.java b/net-url/src/main/java/org/xbib/net/scheme/GopherScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/GopherScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/GopherScheme.java diff --git a/src/main/java/org/xbib/net/scheme/HttpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/HttpScheme.java similarity index 76% rename from src/main/java/org/xbib/net/scheme/HttpScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/HttpScheme.java index 60266c5..5a70002 100644 --- a/src/main/java/org/xbib/net/scheme/HttpScheme.java +++ b/net-url/src/main/java/org/xbib/net/scheme/HttpScheme.java @@ -28,8 +28,8 @@ class HttpScheme extends AbstractScheme { .host(host, url.getProtocolVersion()) .port(url.getPort()) .path(PathNormalizer.normalize(url.getPath())) - .query(url.getQuery()/*PercentEncoders.getQueryEncoder().encode(url.getDecodedQuery())*/) - .fragment(url.getFragment()/*PercentEncoders.getFragmentEncoder().encode(url.getDecodedFragment())*/) + .query(url.getQuery()) + .fragment(url.getFragment()) .build(); } } diff --git a/src/main/java/org/xbib/net/scheme/ImapScheme.java b/net-url/src/main/java/org/xbib/net/scheme/ImapScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/ImapScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/ImapScheme.java diff --git a/src/main/java/org/xbib/net/scheme/IrcScheme.java b/net-url/src/main/java/org/xbib/net/scheme/IrcScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/IrcScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/IrcScheme.java diff --git a/src/main/java/org/xbib/net/scheme/LdapScheme.java b/net-url/src/main/java/org/xbib/net/scheme/LdapScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/LdapScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/LdapScheme.java diff --git a/src/main/java/org/xbib/net/scheme/MailtoScheme.java b/net-url/src/main/java/org/xbib/net/scheme/MailtoScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/MailtoScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/MailtoScheme.java diff --git a/src/main/java/org/xbib/net/scheme/NewsScheme.java b/net-url/src/main/java/org/xbib/net/scheme/NewsScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/NewsScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/NewsScheme.java diff --git a/src/main/java/org/xbib/net/scheme/NntpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/NntpScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/NntpScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/NntpScheme.java diff --git a/src/main/java/org/xbib/net/scheme/Pop3Scheme.java b/net-url/src/main/java/org/xbib/net/scheme/Pop3Scheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/Pop3Scheme.java rename to net-url/src/main/java/org/xbib/net/scheme/Pop3Scheme.java diff --git a/src/main/java/org/xbib/net/scheme/RedisScheme.java b/net-url/src/main/java/org/xbib/net/scheme/RedisScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/RedisScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/RedisScheme.java diff --git a/src/main/java/org/xbib/net/scheme/RsyncScheme.java b/net-url/src/main/java/org/xbib/net/scheme/RsyncScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/RsyncScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/RsyncScheme.java diff --git a/src/main/java/org/xbib/net/scheme/RtmpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/RtmpScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/RtmpScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/RtmpScheme.java diff --git a/src/main/java/org/xbib/net/scheme/RtspScheme.java b/net-url/src/main/java/org/xbib/net/scheme/RtspScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/RtspScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/RtspScheme.java diff --git a/src/main/java/org/xbib/net/scheme/Scheme.java b/net-url/src/main/java/org/xbib/net/scheme/Scheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/Scheme.java rename to net-url/src/main/java/org/xbib/net/scheme/Scheme.java diff --git a/src/main/java/org/xbib/net/scheme/SchemeRegistry.java b/net-url/src/main/java/org/xbib/net/scheme/SchemeRegistry.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/SchemeRegistry.java rename to net-url/src/main/java/org/xbib/net/scheme/SchemeRegistry.java diff --git a/src/main/java/org/xbib/net/scheme/SecureHttpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SecureHttpScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/SecureHttpScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/SecureHttpScheme.java diff --git a/src/main/java/org/xbib/net/scheme/SecureImapScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SecureImapScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/SecureImapScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/SecureImapScheme.java diff --git a/src/main/java/org/xbib/net/scheme/SecureLdapScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SecureLdapScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/SecureLdapScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/SecureLdapScheme.java diff --git a/src/main/java/org/xbib/net/scheme/SecureNewsScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SecureNewsScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/SecureNewsScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/SecureNewsScheme.java diff --git a/src/main/java/org/xbib/net/scheme/SecurePop3Scheme.java b/net-url/src/main/java/org/xbib/net/scheme/SecurePop3Scheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/SecurePop3Scheme.java rename to net-url/src/main/java/org/xbib/net/scheme/SecurePop3Scheme.java diff --git a/src/main/java/org/xbib/net/scheme/SecureSmtpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SecureSmtpScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/SecureSmtpScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/SecureSmtpScheme.java diff --git a/src/main/java/org/xbib/net/scheme/SecureWebSocketScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SecureWebSocketScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/SecureWebSocketScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/SecureWebSocketScheme.java diff --git a/src/main/java/org/xbib/net/scheme/SftpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SftpScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/SftpScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/SftpScheme.java diff --git a/src/main/java/org/xbib/net/scheme/SmtpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SmtpScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/SmtpScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/SmtpScheme.java diff --git a/src/main/java/org/xbib/net/scheme/SshScheme.java b/net-url/src/main/java/org/xbib/net/scheme/SshScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/SshScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/SshScheme.java diff --git a/src/main/java/org/xbib/net/scheme/TelnetScheme.java b/net-url/src/main/java/org/xbib/net/scheme/TelnetScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/TelnetScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/TelnetScheme.java diff --git a/src/main/java/org/xbib/net/scheme/TftpScheme.java b/net-url/src/main/java/org/xbib/net/scheme/TftpScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/TftpScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/TftpScheme.java diff --git a/src/main/java/org/xbib/net/scheme/UrnScheme.java b/net-url/src/main/java/org/xbib/net/scheme/UrnScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/UrnScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/UrnScheme.java diff --git a/src/main/java/org/xbib/net/scheme/WebSocketScheme.java b/net-url/src/main/java/org/xbib/net/scheme/WebSocketScheme.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/WebSocketScheme.java rename to net-url/src/main/java/org/xbib/net/scheme/WebSocketScheme.java diff --git a/src/main/java/org/xbib/net/scheme/package-info.java b/net-url/src/main/java/org/xbib/net/scheme/package-info.java similarity index 100% rename from src/main/java/org/xbib/net/scheme/package-info.java rename to net-url/src/main/java/org/xbib/net/scheme/package-info.java diff --git a/src/main/java/org/xbib/net/template/URITemplate.java b/net-url/src/main/java/org/xbib/net/template/URITemplate.java similarity index 100% rename from src/main/java/org/xbib/net/template/URITemplate.java rename to net-url/src/main/java/org/xbib/net/template/URITemplate.java diff --git a/src/main/java/org/xbib/net/template/expression/ExpressionType.java b/net-url/src/main/java/org/xbib/net/template/expression/ExpressionType.java similarity index 100% rename from src/main/java/org/xbib/net/template/expression/ExpressionType.java rename to net-url/src/main/java/org/xbib/net/template/expression/ExpressionType.java diff --git a/src/main/java/org/xbib/net/template/expression/TemplateExpression.java b/net-url/src/main/java/org/xbib/net/template/expression/TemplateExpression.java similarity index 100% rename from src/main/java/org/xbib/net/template/expression/TemplateExpression.java rename to net-url/src/main/java/org/xbib/net/template/expression/TemplateExpression.java diff --git a/src/main/java/org/xbib/net/template/expression/TemplateLiteral.java b/net-url/src/main/java/org/xbib/net/template/expression/TemplateLiteral.java similarity index 100% rename from src/main/java/org/xbib/net/template/expression/TemplateLiteral.java rename to net-url/src/main/java/org/xbib/net/template/expression/TemplateLiteral.java diff --git a/src/main/java/org/xbib/net/template/expression/URITemplateExpression.java b/net-url/src/main/java/org/xbib/net/template/expression/URITemplateExpression.java similarity index 100% rename from src/main/java/org/xbib/net/template/expression/URITemplateExpression.java rename to net-url/src/main/java/org/xbib/net/template/expression/URITemplateExpression.java diff --git a/src/main/java/org/xbib/net/template/expression/package-info.java b/net-url/src/main/java/org/xbib/net/template/expression/package-info.java similarity index 100% rename from src/main/java/org/xbib/net/template/expression/package-info.java rename to net-url/src/main/java/org/xbib/net/template/expression/package-info.java diff --git a/src/main/java/org/xbib/net/template/package-info.java b/net-url/src/main/java/org/xbib/net/template/package-info.java similarity index 100% rename from src/main/java/org/xbib/net/template/package-info.java rename to net-url/src/main/java/org/xbib/net/template/package-info.java diff --git a/src/main/java/org/xbib/net/template/parse/ExpressionParser.java b/net-url/src/main/java/org/xbib/net/template/parse/ExpressionParser.java similarity index 100% rename from src/main/java/org/xbib/net/template/parse/ExpressionParser.java rename to net-url/src/main/java/org/xbib/net/template/parse/ExpressionParser.java diff --git a/src/main/java/org/xbib/net/template/parse/LiteralParser.java b/net-url/src/main/java/org/xbib/net/template/parse/LiteralParser.java similarity index 100% rename from src/main/java/org/xbib/net/template/parse/LiteralParser.java rename to net-url/src/main/java/org/xbib/net/template/parse/LiteralParser.java diff --git a/src/main/java/org/xbib/net/template/parse/TemplateParser.java b/net-url/src/main/java/org/xbib/net/template/parse/TemplateParser.java similarity index 100% rename from src/main/java/org/xbib/net/template/parse/TemplateParser.java rename to net-url/src/main/java/org/xbib/net/template/parse/TemplateParser.java diff --git a/src/main/java/org/xbib/net/template/parse/URITemplateParser.java b/net-url/src/main/java/org/xbib/net/template/parse/URITemplateParser.java similarity index 100% rename from src/main/java/org/xbib/net/template/parse/URITemplateParser.java rename to net-url/src/main/java/org/xbib/net/template/parse/URITemplateParser.java diff --git a/src/main/java/org/xbib/net/template/parse/VariableSpecParser.java b/net-url/src/main/java/org/xbib/net/template/parse/VariableSpecParser.java similarity index 100% rename from src/main/java/org/xbib/net/template/parse/VariableSpecParser.java rename to net-url/src/main/java/org/xbib/net/template/parse/VariableSpecParser.java diff --git a/src/main/java/org/xbib/net/template/parse/package-info.java b/net-url/src/main/java/org/xbib/net/template/parse/package-info.java similarity index 100% rename from src/main/java/org/xbib/net/template/parse/package-info.java rename to net-url/src/main/java/org/xbib/net/template/parse/package-info.java diff --git a/src/main/java/org/xbib/net/template/render/ListRenderer.java b/net-url/src/main/java/org/xbib/net/template/render/ListRenderer.java similarity index 100% rename from src/main/java/org/xbib/net/template/render/ListRenderer.java rename to net-url/src/main/java/org/xbib/net/template/render/ListRenderer.java diff --git a/src/main/java/org/xbib/net/template/render/MapRenderer.java b/net-url/src/main/java/org/xbib/net/template/render/MapRenderer.java similarity index 100% rename from src/main/java/org/xbib/net/template/render/MapRenderer.java rename to net-url/src/main/java/org/xbib/net/template/render/MapRenderer.java diff --git a/src/main/java/org/xbib/net/template/render/MultiValueRenderer.java b/net-url/src/main/java/org/xbib/net/template/render/MultiValueRenderer.java similarity index 100% rename from src/main/java/org/xbib/net/template/render/MultiValueRenderer.java rename to net-url/src/main/java/org/xbib/net/template/render/MultiValueRenderer.java diff --git a/src/main/java/org/xbib/net/template/render/NullRenderer.java b/net-url/src/main/java/org/xbib/net/template/render/NullRenderer.java similarity index 100% rename from src/main/java/org/xbib/net/template/render/NullRenderer.java rename to net-url/src/main/java/org/xbib/net/template/render/NullRenderer.java diff --git a/src/main/java/org/xbib/net/template/render/StringRenderer.java b/net-url/src/main/java/org/xbib/net/template/render/StringRenderer.java similarity index 100% rename from src/main/java/org/xbib/net/template/render/StringRenderer.java rename to net-url/src/main/java/org/xbib/net/template/render/StringRenderer.java diff --git a/src/main/java/org/xbib/net/template/render/ValueRenderer.java b/net-url/src/main/java/org/xbib/net/template/render/ValueRenderer.java similarity index 100% rename from src/main/java/org/xbib/net/template/render/ValueRenderer.java rename to net-url/src/main/java/org/xbib/net/template/render/ValueRenderer.java diff --git a/src/main/java/org/xbib/net/template/render/package-info.java b/net-url/src/main/java/org/xbib/net/template/render/package-info.java similarity index 100% rename from src/main/java/org/xbib/net/template/render/package-info.java rename to net-url/src/main/java/org/xbib/net/template/render/package-info.java diff --git a/src/main/java/org/xbib/net/template/vars/Variables.java b/net-url/src/main/java/org/xbib/net/template/vars/Variables.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/Variables.java rename to net-url/src/main/java/org/xbib/net/template/vars/Variables.java diff --git a/src/main/java/org/xbib/net/template/vars/package-info.java b/net-url/src/main/java/org/xbib/net/template/vars/package-info.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/package-info.java rename to net-url/src/main/java/org/xbib/net/template/vars/package-info.java diff --git a/src/main/java/org/xbib/net/template/vars/specs/ExplodedVariable.java b/net-url/src/main/java/org/xbib/net/template/vars/specs/ExplodedVariable.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/specs/ExplodedVariable.java rename to net-url/src/main/java/org/xbib/net/template/vars/specs/ExplodedVariable.java diff --git a/src/main/java/org/xbib/net/template/vars/specs/PrefixVariable.java b/net-url/src/main/java/org/xbib/net/template/vars/specs/PrefixVariable.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/specs/PrefixVariable.java rename to net-url/src/main/java/org/xbib/net/template/vars/specs/PrefixVariable.java diff --git a/src/main/java/org/xbib/net/template/vars/specs/SimpleVariable.java b/net-url/src/main/java/org/xbib/net/template/vars/specs/SimpleVariable.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/specs/SimpleVariable.java rename to net-url/src/main/java/org/xbib/net/template/vars/specs/SimpleVariable.java diff --git a/src/main/java/org/xbib/net/template/vars/specs/VariableSpec.java b/net-url/src/main/java/org/xbib/net/template/vars/specs/VariableSpec.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/specs/VariableSpec.java rename to net-url/src/main/java/org/xbib/net/template/vars/specs/VariableSpec.java diff --git a/src/main/java/org/xbib/net/template/vars/specs/VariableSpecType.java b/net-url/src/main/java/org/xbib/net/template/vars/specs/VariableSpecType.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/specs/VariableSpecType.java rename to net-url/src/main/java/org/xbib/net/template/vars/specs/VariableSpecType.java diff --git a/src/main/java/org/xbib/net/template/vars/specs/package-info.java b/net-url/src/main/java/org/xbib/net/template/vars/specs/package-info.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/specs/package-info.java rename to net-url/src/main/java/org/xbib/net/template/vars/specs/package-info.java diff --git a/src/main/java/org/xbib/net/template/vars/values/ListValue.java b/net-url/src/main/java/org/xbib/net/template/vars/values/ListValue.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/values/ListValue.java rename to net-url/src/main/java/org/xbib/net/template/vars/values/ListValue.java diff --git a/src/main/java/org/xbib/net/template/vars/values/MapValue.java b/net-url/src/main/java/org/xbib/net/template/vars/values/MapValue.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/values/MapValue.java rename to net-url/src/main/java/org/xbib/net/template/vars/values/MapValue.java diff --git a/src/main/java/org/xbib/net/template/vars/values/NullValue.java b/net-url/src/main/java/org/xbib/net/template/vars/values/NullValue.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/values/NullValue.java rename to net-url/src/main/java/org/xbib/net/template/vars/values/NullValue.java diff --git a/src/main/java/org/xbib/net/template/vars/values/ScalarValue.java b/net-url/src/main/java/org/xbib/net/template/vars/values/ScalarValue.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/values/ScalarValue.java rename to net-url/src/main/java/org/xbib/net/template/vars/values/ScalarValue.java diff --git a/src/main/java/org/xbib/net/template/vars/values/ValueType.java b/net-url/src/main/java/org/xbib/net/template/vars/values/ValueType.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/values/ValueType.java rename to net-url/src/main/java/org/xbib/net/template/vars/values/ValueType.java diff --git a/src/main/java/org/xbib/net/template/vars/values/VariableValue.java b/net-url/src/main/java/org/xbib/net/template/vars/values/VariableValue.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/values/VariableValue.java rename to net-url/src/main/java/org/xbib/net/template/vars/values/VariableValue.java diff --git a/src/main/java/org/xbib/net/template/vars/values/package-info.java b/net-url/src/main/java/org/xbib/net/template/vars/values/package-info.java similarity index 100% rename from src/main/java/org/xbib/net/template/vars/values/package-info.java rename to net-url/src/main/java/org/xbib/net/template/vars/values/package-info.java diff --git a/src/test/java/org/xbib/net/IRITest.java b/net-url/src/test/java/org/xbib/net/IRITest.java similarity index 100% rename from src/test/java/org/xbib/net/IRITest.java rename to net-url/src/test/java/org/xbib/net/IRITest.java diff --git a/src/test/java/org/xbib/net/PercentDecoderTest.java b/net-url/src/test/java/org/xbib/net/PercentDecoderTest.java similarity index 100% rename from src/test/java/org/xbib/net/PercentDecoderTest.java rename to net-url/src/test/java/org/xbib/net/PercentDecoderTest.java diff --git a/src/test/java/org/xbib/net/PercentEncoderTest.java b/net-url/src/test/java/org/xbib/net/PercentEncoderTest.java similarity index 100% rename from src/test/java/org/xbib/net/PercentEncoderTest.java rename to net-url/src/test/java/org/xbib/net/PercentEncoderTest.java diff --git a/src/test/java/org/xbib/net/URIComponentTest.java b/net-url/src/test/java/org/xbib/net/URIComponentTest.java similarity index 100% rename from src/test/java/org/xbib/net/URIComponentTest.java rename to net-url/src/test/java/org/xbib/net/URIComponentTest.java diff --git a/src/test/java/org/xbib/net/URLBuilderTest.java b/net-url/src/test/java/org/xbib/net/URLBuilderTest.java similarity index 100% rename from src/test/java/org/xbib/net/URLBuilderTest.java rename to net-url/src/test/java/org/xbib/net/URLBuilderTest.java diff --git a/src/test/java/org/xbib/net/URLParserTest.java b/net-url/src/test/java/org/xbib/net/URLParserTest.java similarity index 100% rename from src/test/java/org/xbib/net/URLParserTest.java rename to net-url/src/test/java/org/xbib/net/URLParserTest.java diff --git a/src/test/java/org/xbib/net/URLResolverTest.java b/net-url/src/test/java/org/xbib/net/URLResolverTest.java similarity index 91% rename from src/test/java/org/xbib/net/URLResolverTest.java rename to net-url/src/test/java/org/xbib/net/URLResolverTest.java index 929cf56..9c33b8b 100644 --- a/src/test/java/org/xbib/net/URLResolverTest.java +++ b/net-url/src/test/java/org/xbib/net/URLResolverTest.java @@ -34,6 +34,16 @@ public class URLResolverTest { assertEquals("http://example.org/foo/foobar", base.resolve("foobar").toString()); } + @Test + public void testMultiResolve() throws Exception { + URL base = URL.create("http://example:8080"); + String pathSpec = "foobar/"; + String index = "index.html"; + String queryString = "a=b"; + URL url = base.resolve(pathSpec).resolve(index).newBuilder().query(queryString).build().normalize(); + assertEquals("http://example:8080/foobar/index.html?a=b", url.toString()); + } + @Test public void testFielding() throws Exception { // http://www.ics.uci.edu/~fielding/url/test1.html diff --git a/src/test/java/org/xbib/net/URLTest.java b/net-url/src/test/java/org/xbib/net/URLTest.java similarity index 100% rename from src/test/java/org/xbib/net/URLTest.java rename to net-url/src/test/java/org/xbib/net/URLTest.java diff --git a/src/test/java/org/xbib/net/package-info.java b/net-url/src/test/java/org/xbib/net/package-info.java similarity index 100% rename from src/test/java/org/xbib/net/package-info.java rename to net-url/src/test/java/org/xbib/net/package-info.java diff --git a/src/test/java/org/xbib/net/path/PathDecoderTest.java b/net-url/src/test/java/org/xbib/net/path/PathDecoderTest.java similarity index 100% rename from src/test/java/org/xbib/net/path/PathDecoderTest.java rename to net-url/src/test/java/org/xbib/net/path/PathDecoderTest.java diff --git a/src/test/java/org/xbib/net/path/PathMatcherTest.java b/net-url/src/test/java/org/xbib/net/path/PathMatcherTest.java similarity index 100% rename from src/test/java/org/xbib/net/path/PathMatcherTest.java rename to net-url/src/test/java/org/xbib/net/path/PathMatcherTest.java diff --git a/src/test/java/org/xbib/net/path/PathNormalizerTest.java b/net-url/src/test/java/org/xbib/net/path/PathNormalizerTest.java similarity index 100% rename from src/test/java/org/xbib/net/path/PathNormalizerTest.java rename to net-url/src/test/java/org/xbib/net/path/PathNormalizerTest.java diff --git a/src/test/java/org/xbib/net/path/package-info.java b/net-url/src/test/java/org/xbib/net/path/package-info.java similarity index 100% rename from src/test/java/org/xbib/net/path/package-info.java rename to net-url/src/test/java/org/xbib/net/path/package-info.java diff --git a/src/test/java/org/xbib/net/template/URITemplateTest.java b/net-url/src/test/java/org/xbib/net/template/URITemplateTest.java similarity index 100% rename from src/test/java/org/xbib/net/template/URITemplateTest.java rename to net-url/src/test/java/org/xbib/net/template/URITemplateTest.java diff --git a/src/test/java/org/xbib/net/template/package-info.java b/net-url/src/test/java/org/xbib/net/template/package-info.java similarity index 100% rename from src/test/java/org/xbib/net/template/package-info.java rename to net-url/src/test/java/org/xbib/net/template/package-info.java diff --git a/src/test/resources/extended-tests.json b/net-url/src/test/resources/extended-tests.json similarity index 100% rename from src/test/resources/extended-tests.json rename to net-url/src/test/resources/extended-tests.json diff --git a/src/test/resources/lists.json b/net-url/src/test/resources/lists.json similarity index 100% rename from src/test/resources/lists.json rename to net-url/src/test/resources/lists.json diff --git a/src/test/resources/multipleLists.json b/net-url/src/test/resources/multipleLists.json similarity index 100% rename from src/test/resources/multipleLists.json rename to net-url/src/test/resources/multipleLists.json diff --git a/src/test/resources/multipleStrings.json b/net-url/src/test/resources/multipleStrings.json similarity index 100% rename from src/test/resources/multipleStrings.json rename to net-url/src/test/resources/multipleStrings.json diff --git a/src/test/resources/negative-tests.json b/net-url/src/test/resources/negative-tests.json similarity index 100% rename from src/test/resources/negative-tests.json rename to net-url/src/test/resources/negative-tests.json diff --git a/src/test/resources/rfcExamples.json b/net-url/src/test/resources/rfcExamples.json similarity index 100% rename from src/test/resources/rfcExamples.json rename to net-url/src/test/resources/rfcExamples.json diff --git a/src/test/resources/spec-examples-by-section.json b/net-url/src/test/resources/spec-examples-by-section.json similarity index 100% rename from src/test/resources/spec-examples-by-section.json rename to net-url/src/test/resources/spec-examples-by-section.json diff --git a/src/test/resources/spec-examples.json b/net-url/src/test/resources/spec-examples.json similarity index 100% rename from src/test/resources/spec-examples.json rename to net-url/src/test/resources/spec-examples.json diff --git a/src/test/resources/strings.json b/net-url/src/test/resources/strings.json similarity index 100% rename from src/test/resources/strings.json rename to net-url/src/test/resources/strings.json diff --git a/src/test/resources/urltestdata.json b/net-url/src/test/resources/urltestdata.json similarity index 100% rename from src/test/resources/urltestdata.json rename to net-url/src/test/resources/urltestdata.json diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..a32c64d --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = name + +include 'net-url'