Skip to content

Commit 02a2328

Browse files
committed
apply spotless format
1 parent 31fe2a7 commit 02a2328

18 files changed

Lines changed: 1143 additions & 1325 deletions

build.gradle

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ plugins {
33
id "com.palantir.git-version" version "0.13.0"
44
id "java"
55
id "jacoco"
6+
id "com.diffplug.spotless" version "6.11.0"
67
}
78
import com.github.jrubygradle.JRubyExec
89
repositories {
@@ -22,8 +23,8 @@ version = {
2223
}()
2324

2425
compileJava.options.encoding = 'UTF-8' // source encoding
25-
sourceCompatibility = 1.7
26-
targetCompatibility = 1.7
26+
sourceCompatibility = 1.8
27+
targetCompatibility = 1.8
2728

2829
sourceSets {
2930
main {
@@ -67,9 +68,11 @@ task gemPush(type: JRubyExec, dependsOn: ["gem"]) {
6768
script "pkg/${project.name}-${project.version}.gem"
6869
}
6970

70-
task "package"(dependsOn: ["gemspec", "classpath"]) << {
71-
println "> Build succeeded."
72-
println "> You can run embulk with '-L ${file(".").absolutePath}' argument."
71+
task "package"(dependsOn: ["gemspec", "classpath"]) {
72+
doLast {
73+
println "> Build succeeded."
74+
println "> You can run embulk with '-L ${file(".").absolutePath}' argument."
75+
}
7376
}
7477

7578
task gemspec {
@@ -98,3 +101,13 @@ end
98101
}
99102
}
100103
clean { delete "${project.name}.gemspec" }
104+
105+
spotless {
106+
java {
107+
target 'src/**/*.java'
108+
googleJavaFormat()
109+
removeUnusedImports()
110+
trimTrailingWhitespace()
111+
endWithNewline()
112+
}
113+
}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Tue Aug 11 00:26:20 PDT 2015
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip

src/main/java/org/embulk/parser/jsonl/ColumnCaster.java

Lines changed: 53 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -10,88 +10,66 @@
1010
import org.embulk.spi.time.TimestampParser;
1111
import org.msgpack.value.Value;
1212

13-
class ColumnCaster
14-
{
15-
ColumnCaster() {}
13+
class ColumnCaster {
14+
ColumnCaster() {}
1615

17-
public static boolean asBoolean(Value value) throws DataException
18-
{
19-
if (value.isBooleanValue()) {
20-
return value.asBooleanValue().getBoolean();
21-
}
22-
else if (value.isIntegerValue()) {
23-
return LongCast.asBoolean(value.asIntegerValue().asLong());
24-
}
25-
else if (value.isFloatValue()) {
26-
return DoubleCast.asBoolean(value.asFloatValue().toDouble());
27-
}
28-
else if (value.isStringValue()) {
29-
return StringCast.asBoolean(value.asStringValue().asString());
30-
}
31-
else {
32-
return JsonCast.asBoolean(value);
33-
}
16+
public static boolean asBoolean(Value value) throws DataException {
17+
if (value.isBooleanValue()) {
18+
return value.asBooleanValue().getBoolean();
19+
} else if (value.isIntegerValue()) {
20+
return LongCast.asBoolean(value.asIntegerValue().asLong());
21+
} else if (value.isFloatValue()) {
22+
return DoubleCast.asBoolean(value.asFloatValue().toDouble());
23+
} else if (value.isStringValue()) {
24+
return StringCast.asBoolean(value.asStringValue().asString());
25+
} else {
26+
return JsonCast.asBoolean(value);
3427
}
28+
}
3529

36-
public static long asLong(Value value) throws DataException
37-
{
38-
if (value.isBooleanValue()) {
39-
return BooleanCast.asLong(value.asBooleanValue().getBoolean());
40-
}
41-
else if (value.isIntegerValue()) {
42-
return value.asIntegerValue().asLong();
43-
}
44-
else if (value.isFloatValue()) {
45-
return DoubleCast.asLong(value.asFloatValue().toDouble());
46-
}
47-
else if (value.isStringValue()) {
48-
return StringCast.asLong(value.asStringValue().asString());
49-
}
50-
else {
51-
return JsonCast.asLong(value);
52-
}
30+
public static long asLong(Value value) throws DataException {
31+
if (value.isBooleanValue()) {
32+
return BooleanCast.asLong(value.asBooleanValue().getBoolean());
33+
} else if (value.isIntegerValue()) {
34+
return value.asIntegerValue().asLong();
35+
} else if (value.isFloatValue()) {
36+
return DoubleCast.asLong(value.asFloatValue().toDouble());
37+
} else if (value.isStringValue()) {
38+
return StringCast.asLong(value.asStringValue().asString());
39+
} else {
40+
return JsonCast.asLong(value);
5341
}
42+
}
5443

55-
public static double asDouble(Value value) throws DataException
56-
{
57-
if (value.isBooleanValue()) {
58-
return BooleanCast.asDouble(value.asBooleanValue().getBoolean());
59-
}
60-
else if (value.isIntegerValue()) {
61-
return LongCast.asDouble(value.asIntegerValue().asLong());
62-
}
63-
else if (value.isFloatValue()) {
64-
return value.asFloatValue().toDouble();
65-
}
66-
else if (value.isStringValue()) {
67-
return StringCast.asDouble(value.asStringValue().asString());
68-
}
69-
else {
70-
return JsonCast.asDouble(value);
71-
}
44+
public static double asDouble(Value value) throws DataException {
45+
if (value.isBooleanValue()) {
46+
return BooleanCast.asDouble(value.asBooleanValue().getBoolean());
47+
} else if (value.isIntegerValue()) {
48+
return LongCast.asDouble(value.asIntegerValue().asLong());
49+
} else if (value.isFloatValue()) {
50+
return value.asFloatValue().toDouble();
51+
} else if (value.isStringValue()) {
52+
return StringCast.asDouble(value.asStringValue().asString());
53+
} else {
54+
return JsonCast.asDouble(value);
7255
}
56+
}
7357

74-
public static String asString(Value value) throws DataException
75-
{
76-
return value.toString();
77-
}
58+
public static String asString(Value value) throws DataException {
59+
return value.toString();
60+
}
7861

79-
public static Timestamp asTimestamp(Value value, TimestampParser parser) throws DataException
80-
{
81-
if (value.isBooleanValue()) {
82-
return BooleanCast.asTimestamp(value.asBooleanValue().getBoolean());
83-
}
84-
else if (value.isIntegerValue()) {
85-
return LongCast.asTimestamp(value.asIntegerValue().asLong());
86-
}
87-
else if (value.isFloatValue()) {
88-
return DoubleCast.asTimestamp(value.asFloatValue().toDouble());
89-
}
90-
else if (value.isStringValue()) {
91-
return StringCast.asTimestamp(value.asStringValue().asString(), parser);
92-
}
93-
else {
94-
return JsonCast.asTimestamp(value);
95-
}
62+
public static Timestamp asTimestamp(Value value, TimestampParser parser) throws DataException {
63+
if (value.isBooleanValue()) {
64+
return BooleanCast.asTimestamp(value.asBooleanValue().getBoolean());
65+
} else if (value.isIntegerValue()) {
66+
return LongCast.asTimestamp(value.asIntegerValue().asLong());
67+
} else if (value.isFloatValue()) {
68+
return DoubleCast.asTimestamp(value.asFloatValue().toDouble());
69+
} else if (value.isStringValue()) {
70+
return StringCast.asTimestamp(value.asStringValue().asString(), parser);
71+
} else {
72+
return JsonCast.asTimestamp(value);
9673
}
74+
}
9775
}

0 commit comments

Comments
 (0)