Fix checkstyle of GoLangFileMatch

tejksat · tejksat · commit da6b013dbc16 · 2016-08-02T15:37:58.000+03:00
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -154,8 +154,7 @@ private static String appendChunkPattern(StringBuilder patternStringBuilder, Str
                 case '[':
                     if (!isEsc) {
                         if (inRange) {
-                            //"[ is not expected, ] had not reached"
-                            throw new GoLangFileMatchException();
+                            throw new GoLangFileMatchException("[ not expected, closing bracket ] not yet reached");
                         }
                         rangeFrom = i;
                         rangeParseState = RangeParseState.CHAR_EXPECTED;
@@ -172,12 +171,10 @@ private static String appendChunkPattern(StringBuilder patternStringBuilder, Str
                 case ']':
                     if (!isEsc) {
                         if (!inRange) {
-                            //"] is not expected, [ was not met"
-                            throw new GoLangFileMatchException();
+                            throw new GoLangFileMatchException("] is not expected, [ was not met");
                         }
                         if (rangeParseState == RangeParseState.CHAR_EXPECTED_AFTER_DASH) {
-                            // character range not finished
-                            throw new GoLangFileMatchException();
+                            throw new GoLangFileMatchException("Character range not finished");
                         }
                         patternStringBuilder.append(pattern.substring(rangeFrom, i + 1));
                         inRange = false;
@@ -220,8 +217,7 @@ private static String appendChunkPattern(StringBuilder patternStringBuilder, Str
                     } else {
                         if (!isEsc) {
                             if (rangeParseState != RangeParseState.CHAR_OR_DASH_EXPECTED) {
-                                // - not expected
-                                throw new GoLangFileMatchException();
+                                throw new GoLangFileMatchException("- character not expected");
                             }
                             rangeParseState = RangeParseState.CHAR_EXPECTED_AFTER_DASH;
                         } else {
@@ -240,12 +236,10 @@ private static String appendChunkPattern(StringBuilder patternStringBuilder, Str
             }
         }
         if (isEsc) {
-            // "Escaped character missing"
-            throw new GoLangFileMatchException();
+            throw new GoLangFileMatchException("Escaped character missing");
         }
         if (inRange) {
-            // "Character range not finished"
-            throw new GoLangFileMatchException();
+            throw new GoLangFileMatchException("Character range not finished");
         }
         return "";
     }
diff --git a/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java b/src/main/java/com/github/dockerjava/core/exception/GoLangFileMatchException.java
@@ -7,4 +7,7 @@ public class GoLangFileMatchException extends IllegalArgumentException {
 
     private static final long serialVersionUID = -1204971075600864898L;
 
+    public GoLangFileMatchException(String s) {
+        super(s);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,7 @@ private static String appendChunkPattern(StringBuilder patternStringBuilder, Str`
`154`	`154`	`case '[':`
`155`	`155`	`if (!isEsc) {`
`156`	`156`	`if (inRange) {`
`157`		`- //"[ is not expected, ] had not reached"`
`158`		`- throw new GoLangFileMatchException();`
	`157`	`+ throw new GoLangFileMatchException("[ not expected, closing bracket ] not yet reached");`
`159`	`158`	`}`
`160`	`159`	`rangeFrom = i;`
`161`	`160`	`rangeParseState = RangeParseState.CHAR_EXPECTED;`
`@@ -172,12 +171,10 @@ private static String appendChunkPattern(StringBuilder patternStringBuilder, Str`
`172`	`171`	`case ']':`
`173`	`172`	`if (!isEsc) {`
`174`	`173`	`if (!inRange) {`
`175`		`- //"] is not expected, [ was not met"`
`176`		`- throw new GoLangFileMatchException();`
	`174`	`+ throw new GoLangFileMatchException("] is not expected, [ was not met");`
`177`	`175`	`}`
`178`	`176`	`if (rangeParseState == RangeParseState.CHAR_EXPECTED_AFTER_DASH) {`
`179`		`- // character range not finished`
`180`		`- throw new GoLangFileMatchException();`
	`177`	`+ throw new GoLangFileMatchException("Character range not finished");`
`181`	`178`	`}`
`182`	`179`	`patternStringBuilder.append(pattern.substring(rangeFrom, i + 1));`
`183`	`180`	`inRange = false;`
`@@ -220,8 +217,7 @@ private static String appendChunkPattern(StringBuilder patternStringBuilder, Str`
`220`	`217`	`} else {`
`221`	`218`	`if (!isEsc) {`
`222`	`219`	`if (rangeParseState != RangeParseState.CHAR_OR_DASH_EXPECTED) {`
`223`		`- // - not expected`
`224`		`- throw new GoLangFileMatchException();`
	`220`	`+ throw new GoLangFileMatchException("- character not expected");`
`225`	`221`	`}`
`226`	`222`	`rangeParseState = RangeParseState.CHAR_EXPECTED_AFTER_DASH;`
`227`	`223`	`} else {`
`@@ -240,12 +236,10 @@ private static String appendChunkPattern(StringBuilder patternStringBuilder, Str`
`240`	`236`	`}`
`241`	`237`	`}`
`242`	`238`	`if (isEsc) {`
`243`		`- // "Escaped character missing"`
`244`		`- throw new GoLangFileMatchException();`
	`239`	`+ throw new GoLangFileMatchException("Escaped character missing");`
`245`	`240`	`}`
`246`	`241`	`if (inRange) {`
`247`		`- // "Character range not finished"`
`248`		`- throw new GoLangFileMatchException();`
	`242`	`+ throw new GoLangFileMatchException("Character range not finished");`
`249`	`243`	`}`
`250`	`244`	`return "";`
`251`	`245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,7 @@ public class GoLangFileMatchException extends IllegalArgumentException {`
`7`	`7`
`8`	`8`	`private static final long serialVersionUID = -1204971075600864898L;`
`9`	`9`
	`10`	`+ public GoLangFileMatchException(String s) {`
	`11`	`+ super(s);`
	`12`	`+ }`
`10`	`13`	`}`