Skip to content

Commit 4d37f6c

Browse files
javadevjavadev
committed
Fix checkstyle/pmd warnings.
1 parent 27224c0 commit 4d37f6c

File tree

5 files changed

+93
-148
lines changed

5 files changed

+93
-148
lines changed

‎lodash-plugin/src/main/java/com/github/underscore/lodash/$.java‎

Lines changed: 37 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public Chain(final List<T> list) {
7878
super(list);
7979
}
8080

81-
public Chain<List<List<T>>> chunk(final Integer size) {
81+
public Chain<List<List<T>>> chunk(final int size) {
8282
return new Chain<List<List<T>>>($.chunk(value(), size));
8383
}
8484

@@ -311,7 +311,7 @@ public Chain chain() {
311311
return new $.Chain<T>(newArrayList(value()));
312312
}
313313

314-
public static <T> List<List<T>> chunk(final Iterable<T> iterable, final Integer size) {
314+
public static <T> List<List<T>> chunk(final Iterable<T> iterable, final int size) {
315315
int index = 0;
316316
int length = size(iterable);
317317
final List<List<T>> result = new ArrayList<List<T>>(length / size);
@@ -322,7 +322,7 @@ public static <T> List<List<T>> chunk(final Iterable<T> iterable, final Integer
322322
return result;
323323
}
324324

325-
public List<List<T>> chunk(final Integer size) {
325+
public List<List<T>> chunk(final int size) {
326326
return chunk(getIterable(), size);
327327
}
328328

@@ -1139,100 +1139,51 @@ public static class JsonValue {
11391139
public static void writeJson(Object value, StringBuilder builder) {
11401140
if (value == null) {
11411141
builder.append(NULL);
1142-
return;
1143-
}
1144-
1145-
if (value instanceof String) {
1142+
} else if (value instanceof String) {
11461143
builder.append('\"');
11471144
builder.append(escape((String) value));
11481145
builder.append('\"');
1149-
return;
1150-
}
1151-
1152-
if (value instanceof Double) {
1146+
} else if (value instanceof Double) {
11531147
if (((Double) value).isInfinite() || ((Double) value).isNaN()) {
11541148
builder.append(NULL);
11551149
} else {
11561150
builder.append(value.toString());
11571151
}
1158-
return;
1159-
}
1160-
1161-
if (value instanceof Float) {
1152+
} else if (value instanceof Float) {
11621153
if (((Float) value).isInfinite() || ((Float) value).isNaN()) {
11631154
builder.append(NULL);
11641155
} else {
11651156
builder.append(value.toString());
11661157
}
1167-
return;
1168-
}
1169-
1170-
if (value instanceof Number) {
1158+
} else if (value instanceof Number) {
11711159
builder.append(value.toString());
1172-
return;
1173-
}
1174-
1175-
if (value instanceof Boolean) {
1160+
} else if (value instanceof Boolean) {
11761161
builder.append(value.toString());
1177-
return;
1178-
}
1179-
1180-
if (value instanceof Map) {
1162+
} else if (value instanceof Map) {
11811163
JsonObject.writeJson((Map) value, builder);
1182-
return;
1183-
}
1184-
1185-
if (value instanceof Collection) {
1164+
} else if (value instanceof Collection) {
11861165
JsonArray.writeJson((Collection) value, builder);
1187-
return;
1188-
}
1189-
1190-
if (value instanceof byte[]) {
1166+
} else if (value instanceof byte[]) {
11911167
JsonArray.writeJson((byte[]) value, builder);
1192-
return;
1193-
}
1194-
1195-
if (value instanceof short[]) {
1168+
} else if (value instanceof short[]) {
11961169
JsonArray.writeJson((short[]) value, builder);
1197-
return;
1198-
}
1199-
1200-
if (value instanceof int[]) {
1170+
} else if (value instanceof int[]) {
12011171
JsonArray.writeJson((int[]) value, builder);
1202-
return;
1203-
}
1204-
1205-
if (value instanceof long[]) {
1172+
} else if (value instanceof long[]) {
12061173
JsonArray.writeJson((long[]) value, builder);
1207-
return;
1208-
}
1209-
1210-
if (value instanceof float[]) {
1174+
} else if (value instanceof float[]) {
12111175
JsonArray.writeJson((float[]) value, builder);
1212-
return;
1213-
}
1214-
1215-
if (value instanceof double[]) {
1176+
} else if (value instanceof double[]) {
12161177
JsonArray.writeJson((double[]) value, builder);
1217-
return;
1218-
}
1219-
1220-
if (value instanceof boolean[]) {
1178+
} else if (value instanceof boolean[]) {
12211179
JsonArray.writeJson((boolean[]) value, builder);
1222-
return;
1223-
}
1224-
1225-
if (value instanceof char[]) {
1180+
} else if (value instanceof char[]) {
12261181
JsonArray.writeJson((char[]) value, builder);
1227-
return;
1228-
}
1229-
1230-
if (value instanceof Object[]) {
1182+
} else if (value instanceof Object[]) {
12311183
JsonArray.writeJson((Object[]) value, builder);
1232-
return;
1184+
} else {
1185+
builder.append(value.toString());
12331186
}
1234-
1235-
builder.append(value.toString());
12361187
}
12371188

12381189
public static String escape(String s) {
@@ -1309,16 +1260,28 @@ public static String toJson(Map map) {
13091260
}
13101261

13111262
public static class ParseException extends RuntimeException {
1312-
public final int offset;
1313-
public final int line;
1314-
public final int column;
1263+
private final int offset;
1264+
private final int line;
1265+
private final int column;
13151266

13161267
public ParseException(String message, int offset, int line, int column) {
13171268
super(message + " at " + line + ":" + column);
13181269
this.offset = offset;
13191270
this.line = line;
13201271
this.column = column;
13211272
}
1273+
1274+
public int getOffset() {
1275+
return offset;
1276+
}
1277+
1278+
public int getLine() {
1279+
return line;
1280+
}
1281+
1282+
public int getColumn() {
1283+
return column;
1284+
}
13221285
}
13231286

13241287
public static class JsonParser {
@@ -1653,7 +1616,7 @@ private boolean isDigit() {
16531616
}
16541617

16551618
private boolean isHexDigit() {
1656-
return current >= '0' && current <= '9' || current >= 'a' && current <= 'f' || current >= 'A'
1619+
return isDigit() || current >= 'a' && current <= 'f' || current >= 'A'
16571620
&& current <= 'F';
16581621
}
16591622

‎lodash-plugin/src/test/java/com/github/underscore/lodash/MathTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ public void median() {
134134
assertEquals("0.0", result.toString());
135135
final Double resultObj = new $(asList((int) 0, (int) 0, (int) 0, (int) 0, (int) 5)).median();
136136
assertEquals("0.0", resultObj.toString());
137-
final Double resultChain = (Double) $.chain(asList((int) 0, (int) 0, (int) 0, (int) 0, (int) 5)).median().item();
137+
final Double resultChain = (Double) $.chain(asList((int) 0, (int) 0, (int) 0, (int) 0, (int) 5))
138+
.median().item();
138139
assertEquals("0.0", resultChain.toString());
139140
final Double result2 = $.median(asList((int) 0, (int) 0, (int) 1, (int) 2, (int) 5));
140141
assertEquals("1.0", result2.toString());

‎lodash-plugin/src/test/java/com/github/underscore/lodash/StringTest.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import static org.junit.Assert.assertEquals;
2929
import static org.junit.Assert.assertFalse;
3030
import static org.junit.Assert.assertTrue;
31+
import static org.junit.Assert.fail;
3132

3233
/**
3334
* Underscore library unit test.
@@ -732,7 +733,15 @@ public void testDecodeUnicode() {
732733

733734
@Test(expected = $.ParseException.class)
734735
public void testDecodeUnicodeErr1() {
735-
$.fromJson("[\"abc\\u0$00\"]");
736+
try {
737+
$.fromJson("[\"abc\\u0$00\"]");
738+
fail("Expected ParseException");
739+
} catch ($.ParseException ex) {
740+
ex.getOffset();
741+
ex.getLine();
742+
ex.getColumn();
743+
throw ex;
744+
}
736745
}
737746

738747
@Test(expected = $.ParseException.class)

‎string-plugin/src/main/java/com/github/underscore/string/$.java‎

Lines changed: 34 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -721,100 +721,51 @@ public static class JsonValue {
721721
public static void writeJson(Object value, StringBuilder builder) {
722722
if (value == null) {
723723
builder.append(NULL);
724-
return;
725-
}
726-
727-
if (value instanceof String) {
724+
} else if (value instanceof String) {
728725
builder.append('\"');
729726
builder.append(escape((String) value));
730727
builder.append('\"');
731-
return;
732-
}
733-
734-
if (value instanceof Double) {
728+
} else if (value instanceof Double) {
735729
if (((Double) value).isInfinite() || ((Double) value).isNaN()) {
736730
builder.append(NULL);
737731
} else {
738732
builder.append(value.toString());
739733
}
740-
return;
741-
}
742-
743-
if (value instanceof Float) {
734+
} else if (value instanceof Float) {
744735
if (((Float) value).isInfinite() || ((Float) value).isNaN()) {
745736
builder.append(NULL);
746737
} else {
747738
builder.append(value.toString());
748739
}
749-
return;
750-
}
751-
752-
if (value instanceof Number) {
740+
} else if (value instanceof Number) {
753741
builder.append(value.toString());
754-
return;
755-
}
756-
757-
if (value instanceof Boolean) {
742+
} else if (value instanceof Boolean) {
758743
builder.append(value.toString());
759-
return;
760-
}
761-
762-
if (value instanceof Map) {
744+
} else if (value instanceof Map) {
763745
JsonObject.writeJson((Map) value, builder);
764-
return;
765-
}
766-
767-
if (value instanceof Collection) {
746+
} else if (value instanceof Collection) {
768747
JsonArray.writeJson((Collection) value, builder);
769-
return;
770-
}
771-
772-
if (value instanceof byte[]) {
748+
} else if (value instanceof byte[]) {
773749
JsonArray.writeJson((byte[]) value, builder);
774-
return;
775-
}
776-
777-
if (value instanceof short[]) {
750+
} else if (value instanceof short[]) {
778751
JsonArray.writeJson((short[]) value, builder);
779-
return;
780-
}
781-
782-
if (value instanceof int[]) {
752+
} else if (value instanceof int[]) {
783753
JsonArray.writeJson((int[]) value, builder);
784-
return;
785-
}
786-
787-
if (value instanceof long[]) {
754+
} else if (value instanceof long[]) {
788755
JsonArray.writeJson((long[]) value, builder);
789-
return;
790-
}
791-
792-
if (value instanceof float[]) {
756+
} else if (value instanceof float[]) {
793757
JsonArray.writeJson((float[]) value, builder);
794-
return;
795-
}
796-
797-
if (value instanceof double[]) {
758+
} else if (value instanceof double[]) {
798759
JsonArray.writeJson((double[]) value, builder);
799-
return;
800-
}
801-
802-
if (value instanceof boolean[]) {
760+
} else if (value instanceof boolean[]) {
803761
JsonArray.writeJson((boolean[]) value, builder);
804-
return;
805-
}
806-
807-
if (value instanceof char[]) {
762+
} else if (value instanceof char[]) {
808763
JsonArray.writeJson((char[]) value, builder);
809-
return;
810-
}
811-
812-
if (value instanceof Object[]) {
764+
} else if (value instanceof Object[]) {
813765
JsonArray.writeJson((Object[]) value, builder);
814-
return;
766+
} else {
767+
builder.append(value.toString());
815768
}
816-
817-
builder.append(value.toString());
818769
}
819770

820771
public static String escape(String s) {
@@ -891,16 +842,28 @@ public static String toJson(Map map) {
891842
}
892843

893844
public static class ParseException extends RuntimeException {
894-
public final int offset;
895-
public final int line;
896-
public final int column;
845+
private final int offset;
846+
private final int line;
847+
private final int column;
897848

898849
public ParseException(String message, int offset, int line, int column) {
899850
super(message + " at " + line + ":" + column);
900851
this.offset = offset;
901852
this.line = line;
902853
this.column = column;
903854
}
855+
856+
public int getOffset() {
857+
return offset;
858+
}
859+
860+
public int getLine() {
861+
return line;
862+
}
863+
864+
public int getColumn() {
865+
return column;
866+
}
904867
}
905868

906869
public static class JsonParser {
@@ -1235,7 +1198,7 @@ private boolean isDigit() {
12351198
}
12361199

12371200
private boolean isHexDigit() {
1238-
return current >= '0' && current <= '9' || current >= 'a' && current <= 'f' || current >= 'A'
1201+
return isDigit() || current >= 'a' && current <= 'f' || current >= 'A'
12391202
&& current <= 'F';
12401203
}
12411204

0 commit comments

Comments
 (0)