Skip to content

Commit 938b04d

Browse files
aozarovaozarov
committed
Make maven happy
1 parent ede6867 commit 938b04d

5 files changed

Lines changed: 16 additions & 13 deletions

File tree

‎.checkstyle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
4-
<fileset name="all" enabled="true" check-config-name="Copy of Google Checks" local="false">
4+
<fileset name="all" enabled="true" check-config-name="Google Checks" local="false">
55
<file-match-pattern match-pattern="." include-pattern="true"/>
66
</fileset>
77
</fileset-config>

‎.project‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,22 @@
3131
</arguments>
3232
</buildCommand>
3333
<buildCommand>
34-
<name>org.eclipse.m2e.core.maven2Builder</name>
34+
<name>org.eclipse.wst.validation.validationbuilder</name>
3535
<arguments>
3636
</arguments>
3737
</buildCommand>
3838
<buildCommand>
39-
<name>org.eclipse.wst.validation.validationbuilder</name>
39+
<name>ntut.csie.rleht.builder.RLBuilder</name>
4040
<arguments>
4141
</arguments>
4242
</buildCommand>
4343
<buildCommand>
44-
<name>ntut.csie.rleht.builder.RLBuilder</name>
44+
<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
4545
<arguments>
4646
</arguments>
4747
</buildCommand>
4848
<buildCommand>
49-
<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
49+
<name>org.eclipse.m2e.core.maven2Builder</name>
5050
<arguments>
5151
</arguments>
5252
</buildCommand>

‎.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN
88
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
99
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
1010
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
11+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
1112
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
1213
org.eclipse.jdt.core.compiler.compliance=1.7
1314
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
15+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1416
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
1517
org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
1618
org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -19,6 +21,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
1921
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
2022
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
2123
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
24+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
2225
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
2326
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
2427
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
</plugin>
109109
<plugin>
110110
<artifactId>maven-compiler-plugin</artifactId>
111-
<version>3.1</version>
111+
<version>3.2</version>
112112
<configuration>
113113
<source>1.7</source>
114114
<target>1.7</target>

‎src/main/java/com/google/gcloud/ExceptionHandler.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.google.common.collect.ImmutableList;
99
import com.google.common.collect.ImmutableSet;
1010
import com.google.common.collect.Sets;
11-
import com.google.gcloud.ExceptionHandler.Interceptor.RetryResult;
1211

1312
import java.io.Serializable;
1413
import java.lang.reflect.Method;
@@ -140,10 +139,10 @@ static final class RetryInfo implements Serializable {
140139

141140
private static final long serialVersionUID = -4264634837841455974L;
142141
private final Class<? extends Exception> exception;
143-
private final RetryResult retry;
142+
private final Interceptor.RetryResult retry;
144143
private final Set<RetryInfo> children = Sets.newHashSet();
145144

146-
RetryInfo(Class<? extends Exception> exception, RetryResult retry) {
145+
RetryInfo(Class<? extends Exception> exception, Interceptor.RetryResult retry) {
147146
this.exception = checkNotNull(exception);
148147
this.retry = retry;
149148
}
@@ -174,10 +173,10 @@ private ExceptionHandler(Builder builder) {
174173
Sets.intersection(retriableExceptions, nonRetriableExceptions).isEmpty(),
175174
"Same exception was found in both retriable and non-retriable sets");
176175
for (Class<? extends Exception> exception : retriableExceptions) {
177-
addToRetryInfos(retryInfos, new RetryInfo(exception, RetryResult.RETRY));
176+
addToRetryInfos(retryInfos, new RetryInfo(exception, Interceptor.RetryResult.RETRY));
178177
}
179178
for (Class<? extends Exception> exception : nonRetriableExceptions) {
180-
addToRetryInfos(retryInfos, new RetryInfo(exception, RetryResult.ABORT));
179+
addToRetryInfos(retryInfos, new RetryInfo(exception, Interceptor.RetryResult.ABORT));
181180
}
182181
}
183182

@@ -242,13 +241,14 @@ public Set<Class<? extends Exception>> getNonRetriableExceptions() {
242241

243242
boolean shouldRetry(Exception ex) {
244243
for (Interceptor interceptor : interceptors) {
245-
RetryResult retryResult = interceptor.shouldRetry(ex);
244+
Interceptor.RetryResult retryResult = interceptor.shouldRetry(ex);
246245
if (retryResult != null) {
247246
return retryResult.booleanValue();
248247
}
249248
}
250249
RetryInfo retryInfo = findMostSpecificRetryInfo(retryInfos, ex.getClass());
251-
RetryResult retryResult = retryInfo == null ? RetryResult.ABORT : retryInfo.retry;
250+
Interceptor.RetryResult retryResult =
251+
retryInfo == null ? Interceptor.RetryResult.ABORT : retryInfo.retry;
252252
for (Interceptor interceptor : interceptors) {
253253
retryResult = firstNonNull(interceptor.shouldRetry(ex, retryResult), retryResult);
254254
}

0 commit comments

Comments
 (0)