add public API to PathMatcher

This commit is contained in:
Jörg Prante 2017-07-24 21:33:52 +02:00
parent 87aa1c7ca1
commit 286ab07793
4 changed files with 18 additions and 18 deletions

View file

@ -1,6 +1,6 @@
group = org.xbib
name = net
version = 1.0.0
version = 1.0.1
junit.version = 4.12
asciidoclet.version = 1.5.4

View file

@ -1,8 +1,8 @@
ext {
user = 'xbib'
projectName = 'content'
projectDescription = 'Content processing library for Java'
scmUrl = 'https://github.com/xbib/content'
scmConnection = 'scm:git:git://github.com/xbib/content.git'
scmDeveloperConnection = 'scm:git:git://github.com/xbib/content.git'
projectName = 'net'
projectDescription = 'Network classes for Java'
scmUrl = 'https://github.com/xbib/net'
scmConnection = 'scm:git:git://github.com/xbib/net.git'
scmDeveloperConnection = 'scm:git:git://github.com/xbib/net.git'
}

View file

@ -1,13 +1,13 @@
task xbibUpload(type: Upload, dependsOn: build) {
task xbibUpload(type: Upload) {
configuration = configurations.archives
uploadDescriptor = true
repositories {
if (project.hasProperty('xbibUsername')) {
if (project.hasProperty("xbibUsername")) {
mavenDeployer {
configuration = configurations.wagon
repository(url: uri('scpexe://xbib.org/repository')) {
authentication(userName: xbibUsername, privateKey: xbibPrivateKey)
repository(url: 'sftp://xbib.org/repository') {
authentication(userName: xbibUsername, privateKey: xbibPrivateKey)
}
}
}
@ -34,7 +34,7 @@ task sonatypeUpload(type: Upload, dependsOn: build) {
name project.name
description projectDescription
packaging 'jar'
inceptionYear '2016'
inceptionYear '2017'
url scmUrl
organization {
name 'xbib'
@ -45,7 +45,7 @@ task sonatypeUpload(type: Upload, dependsOn: build) {
id user
name 'Jörg Prante'
email 'joergprante@gmail.com'
url 'https://github.com/jprante'
url 'https://github.com/xbib'
}
}
scm {

View file

@ -60,23 +60,23 @@ public class PathMatcher {
return queryParameters;
}
void setCachePatterns(boolean cachePatterns) {
public void setCachePatterns(boolean cachePatterns) {
this.cachePatterns = cachePatterns;
}
Map<String, PathStringMatcher> stringMatcherCache() {
public Map<String, PathStringMatcher> stringMatcherCache() {
return stringMatcherCache;
}
boolean match(String pattern, String path) {
public boolean match(String pattern, String path) {
return doMatch(pattern, path, true, null);
}
boolean matchStart(String pattern, String path) {
public boolean matchStart(String pattern, String path) {
return doMatch(pattern, path, false, null);
}
String extractPathWithinPattern(String pattern, String path) {
public String extractPathWithinPattern(String pattern, String path) {
List<String> patternParts = tokenize(pattern, this.pathSeparator, this.trimTokens, true);
List<String> pathParts = tokenize(path, this.pathSeparator, this.trimTokens, true);
StringBuilder sb = new StringBuilder();
@ -97,7 +97,7 @@ public class PathMatcher {
return sb.toString();
}
String combine(String pattern1, String pattern2) {
public String combine(String pattern1, String pattern2) {
if (!hasText(pattern1) && !hasText(pattern2)) {
return "";
}