You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2017/03/04 00:59:55 UTC
[30/50] [abbrv] [text] TEXT-65: 174 checkstyle errors
TEXT-65: 174 checkstyle errors
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/1035cd6d
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/1035cd6d
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/1035cd6d
Branch: refs/heads/release
Commit: 1035cd6de87ece49aa2fdd7faa23e004e5748daf
Parents: c7cf533
Author: Rob Tompkins <ch...@apache.org>
Authored: Sat Feb 11 10:46:12 2017 -0500
Committer: Rob Tompkins <ch...@apache.org>
Committed: Sat Feb 11 10:46:12 2017 -0500
----------------------------------------------------------------------
checkstyle-suppressions.xml | 6 ++-
.../java/org/apache/commons/text/StrLookup.java | 1 +
.../org/apache/commons/text/StrMatcher.java | 8 ++--
.../org/apache/commons/text/StrSubstitutor.java | 47 +++++++++++++-------
4 files changed, 39 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/1035cd6d/checkstyle-suppressions.xml
----------------------------------------------------------------------
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index f577e79..d6634e3 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -32,6 +32,8 @@
<suppress checks="MagicNumber" files="JaroWinklerDistance.java" lines="0-99999" />
<suppress checks="NoWhitespaceAfter" files="JaroWinklerDistance.java" lines="0-99999" />
<suppress checks="FileLength" files="StrBuilder.java" lines="0-99999" />
- <suppress checks="MagicNumber" files="StrBuilder.java" lines="0-99999"/>
- <suppress checks="MagicNumber" files="StringEscapeUtils.java" lines="0-99999"/>
+ <suppress checks="MagicNumber" files="StrBuilder.java" lines="0-99999" />
+ <suppress checks="MagicNumber" files="StringEscapeUtils.java" lines="0-99999" />
+ <suppress checks="EmptyBlock" files="StrLookup.java" lines="0-99999" />
+ <suppress checks="MagicNumber" files="StrMatcher.java" lines="0-99999" />
</suppressions>
http://git-wip-us.apache.org/repos/asf/commons-text/blob/1035cd6d/src/main/java/org/apache/commons/text/StrLookup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/StrLookup.java b/src/main/java/org/apache/commons/text/StrLookup.java
index f9bffb5..7c87670 100644
--- a/src/main/java/org/apache/commons/text/StrLookup.java
+++ b/src/main/java/org/apache/commons/text/StrLookup.java
@@ -31,6 +31,7 @@ import java.util.Map;
* For example, it would be possible to implement a lookup that used the
* key as a primary key, and looked up the value on demand from the database
*
+ * @param <V> the type of the values supported by the lookup
* @since 1.0
*/
public abstract class StrLookup<V> {
http://git-wip-us.apache.org/repos/asf/commons-text/blob/1035cd6d/src/main/java/org/apache/commons/text/StrMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/StrMatcher.java b/src/main/java/org/apache/commons/text/StrMatcher.java
index 97d6673..357118c 100644
--- a/src/main/java/org/apache/commons/text/StrMatcher.java
+++ b/src/main/java/org/apache/commons/text/StrMatcher.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -277,7 +277,7 @@ public abstract class StrMatcher {
*
* @param chars the characters to match, must not be null
*/
- CharSetMatcher(final char chars[]) {
+ CharSetMatcher(final char[] chars) {
super();
this.chars = chars.clone();
Arrays.sort(this.chars);
@@ -371,7 +371,7 @@ public abstract class StrMatcher {
}
return len;
}
-
+
@Override
public String toString() {
return super.toString() + ' ' + Arrays.toString(chars);
http://git-wip-us.apache.org/repos/asf/commons-text/blob/1035cd6d/src/main/java/org/apache/commons/text/StrSubstitutor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/StrSubstitutor.java b/src/main/java/org/apache/commons/text/StrSubstitutor.java
index 00d05f7..82a4e22 100644
--- a/src/main/java/org/apache/commons/text/StrSubstitutor.java
+++ b/src/main/java/org/apache/commons/text/StrSubstitutor.java
@@ -152,7 +152,7 @@ public class StrSubstitutor {
*/
private StrMatcher suffixMatcher;
/**
- * Stores the default variable value delimiter
+ * Stores the default variable value delimiter.
*/
private StrMatcher valueDelimiterMatcher;
/**
@@ -195,7 +195,10 @@ public class StrSubstitutor {
* @return the result of the replace operation
* @throws IllegalArgumentException if the prefix or suffix is null
*/
- public static <V> String replace(final Object source, final Map<String, V> valueMap, final String prefix, final String suffix) {
+ public static <V> String replace(final Object source,
+ final Map<String, V> valueMap,
+ final String prefix,
+ final String suffix) {
return new StrSubstitutor(valueMap, prefix, suffix).replace(source);
}
@@ -211,10 +214,10 @@ public class StrSubstitutor {
if (valueProperties == null) {
return source.toString();
}
- final Map<String,String> valueMap = new HashMap<>();
+ final Map<String, String> valueMap = new HashMap<>();
final Enumeration<?> propNames = valueProperties.propertyNames();
while (propNames.hasMoreElements()) {
- final String propName = (String)propNames.nextElement();
+ final String propName = (String) propNames.nextElement();
final String propValue = valueProperties.getProperty(propName);
valueMap.put(propName, propValue);
}
@@ -390,7 +393,7 @@ public class StrSubstitutor {
return null;
}
final StrBuilder buf = new StrBuilder(source);
- if (substitute(buf, 0, source.length()) == false) {
+ if (!substitute(buf, 0, source.length())) {
return source;
}
return buf.toString();
@@ -413,7 +416,7 @@ public class StrSubstitutor {
return null;
}
final StrBuilder buf = new StrBuilder(length).append(source, offset, length);
- if (substitute(buf, 0, length) == false) {
+ if (!substitute(buf, 0, length)) {
return source.substring(offset, offset + length);
}
return buf.toString();
@@ -628,7 +631,7 @@ public class StrSubstitutor {
return false;
}
final StrBuilder buf = new StrBuilder(length).append(source, offset, length);
- if (substitute(buf, 0, length) == false) {
+ if (!substitute(buf, 0, length)) {
return false;
}
source.replace(offset, offset + length, buf.toString());
@@ -669,7 +672,7 @@ public class StrSubstitutor {
return false;
}
final StrBuilder buf = new StrBuilder(length).append(source, offset, length);
- if (substitute(buf, 0, length) == false) {
+ if (!substitute(buf, 0, length)) {
return false;
}
source.replace(offset, offset + length, buf.toString());
@@ -780,9 +783,11 @@ public class StrSubstitutor {
int nestedVarCount = 0;
while (pos < bufEnd) {
if (substitutionInVariablesEnabled
- && (endMatchLen = pfxMatcher.isMatch(chars,
- pos, offset, bufEnd)) != 0) {
+ && pfxMatcher.isMatch(chars,
+ pos, offset, bufEnd) != 0) {
// found a nested variable start
+ endMatchLen = pfxMatcher.isMatch(chars,
+ pos, offset, bufEnd);
nestedVarCount++;
pos += endMatchLen;
continue;
@@ -813,12 +818,17 @@ public class StrSubstitutor {
final char [] varNameExprChars = varNameExpr.toCharArray();
int valueDelimiterMatchLen = 0;
for (int i = 0; i < varNameExprChars.length; i++) {
- // if there's any nested variable when nested variable substitution disabled, then stop resolving name and default value.
+ // if there's any nested variable when nested variable substitution disabled,
+ // then stop resolving name and default value.
if (!substitutionInVariablesEnabled
- && pfxMatcher.isMatch(varNameExprChars, i, i, varNameExprChars.length) != 0) {
+ && pfxMatcher.isMatch(varNameExprChars,
+ i,
+ i,
+ varNameExprChars.length) != 0) {
break;
}
- if ((valueDelimiterMatchLen = valueDelimMatcher.isMatch(varNameExprChars, i)) != 0) {
+ if (valueDelimMatcher.isMatch(varNameExprChars, i) != 0) {
+ valueDelimiterMatchLen = valueDelimMatcher.isMatch(varNameExprChars, i);
varName = varNameExpr.substring(0, i);
varDefaultValue = varNameExpr.substring(i + valueDelimiterMatchLen);
break;
@@ -884,7 +894,7 @@ public class StrSubstitutor {
* @param priorVariables the list of prior variables
*/
private void checkCyclicSubstitution(final String varName, final List<String> priorVariables) {
- if (priorVariables.contains(varName) == false) {
+ if (!priorVariables.contains(varName)) {
return;
}
final StrBuilder buf = new StrBuilder(256);
@@ -912,7 +922,10 @@ public class StrSubstitutor {
* @param endPos the end position of the variable including the suffix, valid
* @return the variable's value or <b>null</b> if the variable is unknown
*/
- protected String resolveVariable(final String variableName, final StrBuilder buf, final int startPos, final int endPos) {
+ protected String resolveVariable(final String variableName,
+ final StrBuilder buf,
+ final int startPos,
+ final int endPos) {
final StrLookup<?> resolver = getVariableResolver();
if (resolver == null) {
return null;
@@ -1189,7 +1202,7 @@ public class StrSubstitutor {
/**
* Returns the flag controlling whether escapes are preserved during
* substitution.
- *
+ *
* @return the preserve escape flag
*/
public boolean isPreserveEscapes() {
@@ -1204,7 +1217,7 @@ public class StrSubstitutor {
* character is removed during substitution (e.g.
* <code>$${this-is-escaped}</code> becomes
* <code>${this-is-escaped}</code>). The default value is <b>false</b>
- *
+ *
* @param preserveEscapes true if escapes are to be preserved
*/
public void setPreserveEscapes(final boolean preserveEscapes) {