Skip to content

Commit 090cc5c

Browse files
committed
Format all java files using google-formatter
1 parent fea0471 commit 090cc5c

File tree

31 files changed

+160
-123
lines changed

31 files changed

+160
-123
lines changed
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package test;
2-
import java.math.BigDecimal;
32

43
import com.mysema.query.annotations.QueryEntity;
5-
4+
import java.math.BigDecimal;
65

76
@QueryEntity
87
public class Test {
98

10-
private String property;
9+
private String property;
1110

12-
private int intProperty;
11+
private int intProperty;
1312

14-
private BigDecimal bigDecimal;
13+
private BigDecimal bigDecimal;
1514
}

querydsl-apt/src/test/apt/com/querydsl/BooleanExtensions.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66

77
public class BooleanExtensions {
88

9-
@QueryDelegate(Boolean.class)
10-
public static Predicate isFalse(BooleanPath path) {
11-
return path.isNotNull().or(path.eq(false));
12-
}
13-
14-
@QueryDelegate(Boolean.class)
15-
public static Predicate isTrue(BooleanPath path) {
16-
return path.eq(true);
17-
}
9+
@QueryDelegate(Boolean.class)
10+
public static Predicate isFalse(BooleanPath path) {
11+
return path.isNotNull().or(path.eq(false));
12+
}
1813

14+
@QueryDelegate(Boolean.class)
15+
public static Predicate isTrue(BooleanPath path) {
16+
return path.eq(true);
17+
}
1918
}

querydsl-apt/src/test/apt/com/querydsl/BooleanExtensions2.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66

77
public class BooleanExtensions2 {
88

9-
@QueryDelegate(boolean.class)
10-
public static Predicate isFalse(BooleanPath path) {
11-
return path.isNotNull().or(path.eq(false));
12-
}
13-
14-
@QueryDelegate(boolean.class)
15-
public static Predicate isTrue(BooleanPath path) {
16-
return path.eq(true);
17-
}
9+
@QueryDelegate(boolean.class)
10+
public static Predicate isFalse(BooleanPath path) {
11+
return path.isNotNull().or(path.eq(false));
12+
}
1813

14+
@QueryDelegate(boolean.class)
15+
public static Predicate isTrue(BooleanPath path) {
16+
return path.eq(true);
17+
}
1918
}

querydsl-apt/src/test/apt/com/querydsl/ExampleEntity.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
@QueryEntity
66
public class ExampleEntity {
77

8-
private boolean booleanProp;
9-
10-
private Boolean booleanProp2;
11-
12-
8+
private boolean booleanProp;
139

10+
private Boolean booleanProp2;
1411
}

querydsl-apt/src/test/apt/com/querydsl/ExampleEntity2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55

66
@QueryEntity
77
public class ExampleEntity2 extends AbstractEntity<ExampleEntity2> {
8-
// id inherited
8+
// id inherited
99
}

querydsl-apt/src/test/apt/com/querydsl/InnerExtensions.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
public class InnerExtensions {
77

8-
public static class ExampleEntity2Extensions {
8+
public static class ExampleEntity2Extensions {
99

10-
@QueryDelegate(ExampleEntity2.class)
11-
public static BooleanExpression isZero(QExampleEntity2 left) {
12-
return left.id.eq(0);
13-
}
10+
@QueryDelegate(ExampleEntity2.class)
11+
public static BooleanExpression isZero(QExampleEntity2 left) {
12+
return left.id.eq(0);
1413
}
14+
}
1515
}

querydsl-apt/src/test/apt/com/querydsl/IntegerExtensions.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66

77
public class IntegerExtensions {
88

9-
@QueryDelegate(Integer.class)
10-
public static NumberExpression<Integer> difference(NumberPath<Integer> left, NumberExpression<Integer> right) {
11-
return right.subtract(left);
12-
}
9+
@QueryDelegate(Integer.class)
10+
public static NumberExpression<Integer> difference(
11+
NumberPath<Integer> left, NumberExpression<Integer> right) {
12+
return right.subtract(left);
13+
}
1314
}
Lines changed: 34 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,60 @@
11
package com.querydsl.eclipse;
22

3-
import java.math.BigDecimal;
4-
53
import com.querydsl.core.annotations.QueryEntity;
4+
import java.math.BigDecimal;
65

76
@QueryEntity
87
public class SimpleEntity {
98

10-
CustomComparable comparableProp;
11-
12-
CustomNumber customNumber;
9+
CustomComparable comparableProp;
1310

14-
int intProp;
11+
CustomNumber customNumber;
1512

16-
Integer integerProp;
13+
int intProp;
1714

18-
BigDecimal bigDecimalProp;
15+
Integer integerProp;
1916

20-
String stringProp;
17+
BigDecimal bigDecimalProp;
2118

22-
SimpleEntity entityProp;
19+
String stringProp;
2320

21+
SimpleEntity entityProp;
2422
}
2523

2624
class CustomComparable implements Comparable<CustomComparable> {
2725

28-
@Override
29-
public int compareTo(CustomComparable o) {
30-
return 0;
31-
}
32-
26+
@Override
27+
public int compareTo(CustomComparable o) {
28+
return 0;
29+
}
3330
}
3431

3532
class CustomNumber extends Number implements Comparable<CustomNumber> {
3633

37-
private static final long serialVersionUID = 8683978836725543780L;
38-
39-
@Override
40-
public double doubleValue() {
41-
return 0;
42-
}
34+
private static final long serialVersionUID = 8683978836725543780L;
4335

44-
@Override
45-
public float floatValue() {
46-
return 0;
47-
}
36+
@Override
37+
public double doubleValue() {
38+
return 0;
39+
}
4840

49-
@Override
50-
public int intValue() {
51-
return 0;
52-
}
41+
@Override
42+
public float floatValue() {
43+
return 0;
44+
}
5345

54-
@Override
55-
public long longValue() {
56-
return 0;
57-
}
46+
@Override
47+
public int intValue() {
48+
return 0;
49+
}
5850

59-
@Override
60-
public int compareTo(CustomNumber o) {
61-
return 0;
62-
}
51+
@Override
52+
public long longValue() {
53+
return 0;
54+
}
6355

64-
65-
}
56+
@Override
57+
public int compareTo(CustomNumber o) {
58+
return 0;
59+
}
60+
}

querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/AnnotationTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ public class AnnotationTest {
2424
public void ClassAnnotation() throws IOException {
2525
writer.annotation(getClass().getAnnotation(Annotation.class));
2626
String option1 =
27-
"@com.querydsl.codegen.utils.Annotation(clazz=com.querydsl.codegen.utils.AnnotationTest.class, prop2=false)";
27+
"@com.querydsl.codegen.utils.Annotation(clazz=com.querydsl.codegen.utils.AnnotationTest.class,"
28+
+ " prop2=false)";
2829
String option2 =
29-
"@com.querydsl.codegen.utils.Annotation(prop2=false, clazz=com.querydsl.codegen.utils.AnnotationTest.class)";
30+
"@com.querydsl.codegen.utils.Annotation(prop2=false,"
31+
+ " clazz=com.querydsl.codegen.utils.AnnotationTest.class)";
3032
String serialized = w.toString().trim();
3133
assertThat(serialized.equals(option1) || serialized.equals(option2)).isTrue();
3234
}

querydsl-codegen-utils/src/test/java/com/querydsl/codegen/utils/ComplexEvaluationTest.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,11 @@ public void ComplexClassLoading() {
5959
StringBuilder source = new StringBuilder();
6060
source.append("java.util.List<Object[]> rv = new java.util.ArrayList<Object[]>();\n");
6161
source.append(
62-
"for (com.querydsl.codegen.utils.support.Cat cat : (java.util.List<com.querydsl.codegen.utils.support.Cat>)cat_){\n");
62+
"for (com.querydsl.codegen.utils.support.Cat cat :"
63+
+ " (java.util.List<com.querydsl.codegen.utils.support.Cat>)cat_){\n");
6364
source.append(
64-
"for (com.querydsl.codegen.utils.support.Cat otherCat : (java.util.List<com.querydsl.codegen.utils.support.Cat>)otherCat_){\n");
65+
"for (com.querydsl.codegen.utils.support.Cat otherCat :"
66+
+ " (java.util.List<com.querydsl.codegen.utils.support.Cat>)otherCat_){\n");
6567
source.append("rv.add(new Object[]{cat,otherCat});\n");
6668
source.append("}\n");
6769
source.append("}\n");
@@ -106,7 +108,8 @@ public void ComplexClassLoadingFailure() {
106108
ClassType resultType = new ClassType(TypeCategory.LIST, List.class, Types.STRING);
107109
StringBuilder source = new StringBuilder();
108110
source.append(
109-
"java.util.List<String> rv = (java.util.List<String>) new java.util.ArrayList<Franklin>();\n");
111+
"java.util.List<String> rv = (java.util.List<String>) new"
112+
+ " java.util.ArrayList<Franklin>();\n");
110113
source.append("for (String a : a_){\n");
111114
source.append(" for (String b : b_){\n");
112115
source.append(" if (a.equals(b)){\n");
@@ -177,7 +180,8 @@ public void ComplexEmbeddedClass() {
177180
source.append(" }\n");
178181
source.append("}\n");
179182
source.append(
180-
"return rv;} private static class TestEmbedded { public TestEmbedded() {} public boolean DO_RETURN() { return true; } ");
183+
"return rv;} private static class TestEmbedded { public TestEmbedded() {} public boolean"
184+
+ " DO_RETURN() { return true; } ");
181185

182186
@SuppressWarnings("rawtypes") // cannot specify further than List.class
183187
Evaluator<List> evaluator =
@@ -207,9 +211,11 @@ public void ComplexDifferentConstants() {
207211
String source =
208212
new StringBuilder()
209213
.append(
210-
"java.util.List<com.querydsl.codegen.utils.support.Cat> rv = new java.util.ArrayList<com.querydsl.codegen.utils.support.Cat>();\n")
214+
"java.util.List<com.querydsl.codegen.utils.support.Cat> rv = new"
215+
+ " java.util.ArrayList<com.querydsl.codegen.utils.support.Cat>();\n")
211216
.append(
212-
"for (com.querydsl.codegen.utils.support.Cat cat : (java.util.List<com.querydsl.codegen.utils.support.Cat>)cat_){\n")
217+
"for (com.querydsl.codegen.utils.support.Cat cat :"
218+
+ " (java.util.List<com.querydsl.codegen.utils.support.Cat>)cat_){\n")
213219
.append("if (cat.equals(a1)) {\n")
214220
.append("rv.add(cat);\n")
215221
.append("}\n")

0 commit comments

Comments
 (0)