Skip to content

Commit 7383b89

Browse files
committed
minor fix
1 parent ff2827e commit 7383b89

3 files changed

Lines changed: 206 additions & 9 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/target/
22
.settings
33
.idea
4+
*.iml

git-demo.iml

Lines changed: 200 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,203 @@
4545
<orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:3.1" level="project" />
4646
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
4747
</component>
48-
</module>
48+
<component name="org.twodividedbyzero.idea.findbugs">
49+
<option name="_basePreferences">
50+
<map>
51+
<entry key="property.analysisEffortLevel" value="default" />
52+
<entry key="property.analyzeAfterCompile" value="false" />
53+
<entry key="property.annotationGutterIconEnabled" value="true" />
54+
<entry key="property.annotationSuppressWarningsClass" value="edu.umd.cs.findbugs.annotations.SuppressFBWarnings" />
55+
<entry key="property.annotationTextRangeMarkupEnabled" value="true" />
56+
<entry key="property.exportAsHtml" value="true" />
57+
<entry key="property.exportAsXml" value="true" />
58+
<entry key="property.exportBaseDir" value="" />
59+
<entry key="property.exportCreateArchiveDir" value="false" />
60+
<entry key="property.exportOpenBrowser" value="true" />
61+
<entry key="property.minPriorityToReport" value="Medium" />
62+
<entry key="property.runAnalysisInBackground" value="false" />
63+
<entry key="property.showHiddenDetectors" value="false" />
64+
<entry key="property.toolWindowToFront" value="true" />
65+
</map>
66+
</option>
67+
<option name="_detectors">
68+
<map>
69+
<entry key="AppendingToAnObjectOutputStream" value="true" />
70+
<entry key="AtomicityProblem" value="true" />
71+
<entry key="BadAppletConstructor" value="false" />
72+
<entry key="BadResultSetAccess" value="true" />
73+
<entry key="BadSyntaxForRegularExpression" value="true" />
74+
<entry key="BadUseOfReturnValue" value="true" />
75+
<entry key="BadlyOverriddenAdapter" value="true" />
76+
<entry key="BooleanReturnNull" value="true" />
77+
<entry key="BuildInterproceduralCallGraph" value="false" />
78+
<entry key="BuildObligationPolicyDatabase" value="true" />
79+
<entry key="BuildStringPassthruGraph" value="true" />
80+
<entry key="CallToUnsupportedMethod" value="false" />
81+
<entry key="CalledMethods" value="true" />
82+
<entry key="CheckCalls" value="false" />
83+
<entry key="CheckExpectedWarnings" value="false" />
84+
<entry key="CheckImmutableAnnotation" value="true" />
85+
<entry key="CheckRelaxingNullnessAnnotation" value="true" />
86+
<entry key="CheckTypeQualifiers" value="true" />
87+
<entry key="CloneIdiom" value="true" />
88+
<entry key="ComparatorIdiom" value="true" />
89+
<entry key="ConfusedInheritance" value="true" />
90+
<entry key="ConfusionBetweenInheritedAndOuterMethod" value="true" />
91+
<entry key="CrossSiteScripting" value="true" />
92+
<entry key="DefaultEncodingDetector" value="true" />
93+
<entry key="DoInsideDoPrivileged" value="true" />
94+
<entry key="DontCatchIllegalMonitorStateException" value="true" />
95+
<entry key="DontIgnoreResultOfPutIfAbsent" value="true" />
96+
<entry key="DontUseEnum" value="true" />
97+
<entry key="DroppedException" value="true" />
98+
<entry key="DumbMethodInvocations" value="true" />
99+
<entry key="DumbMethods" value="true" />
100+
<entry key="DuplicateBranches" value="true" />
101+
<entry key="EmptyZipFileEntry" value="false" />
102+
<entry key="EqualsOperandShouldHaveClassCompatibleWithThis" value="true" />
103+
<entry key="ExplicitSerialization" value="true" />
104+
<entry key="FieldItemSummary" value="true" />
105+
<entry key="FinalizerNullsFields" value="true" />
106+
<entry key="FindBadCast2" value="true" />
107+
<entry key="FindBadForLoop" value="true" />
108+
<entry key="FindBugsSummaryStats" value="true" />
109+
<entry key="FindCircularDependencies" value="false" />
110+
<entry key="FindDeadLocalStores" value="true" />
111+
<entry key="FindDoubleCheck" value="true" />
112+
<entry key="FindEmptySynchronizedBlock" value="true" />
113+
<entry key="FindFieldSelfAssignment" value="true" />
114+
<entry key="FindFinalizeInvocations" value="true" />
115+
<entry key="FindFloatEquality" value="true" />
116+
<entry key="FindFloatMath" value="false" />
117+
<entry key="FindHEmismatch" value="true" />
118+
<entry key="FindInconsistentSync2" value="true" />
119+
<entry key="FindJSR166LockMonitorenter" value="true" />
120+
<entry key="FindLocalSelfAssignment2" value="true" />
121+
<entry key="FindMaskedFields" value="true" />
122+
<entry key="FindMismatchedWaitOrNotify" value="true" />
123+
<entry key="FindNakedNotify" value="true" />
124+
<entry key="FindNoSideEffectMethods" value="true" />
125+
<entry key="FindNonSerializableStoreIntoSession" value="false" />
126+
<entry key="FindNonSerializableValuePassedToWriteObject" value="false" />
127+
<entry key="FindNonShortCircuit" value="true" />
128+
<entry key="FindNullDeref" value="true" />
129+
<entry key="FindNullDerefsInvolvingNonShortCircuitEvaluation" value="true" />
130+
<entry key="FindOpenStream" value="true" />
131+
<entry key="FindPuzzlers" value="true" />
132+
<entry key="FindRefComparison" value="true" />
133+
<entry key="FindReturnRef" value="true" />
134+
<entry key="FindRoughConstants" value="true" />
135+
<entry key="FindRunInvocations" value="true" />
136+
<entry key="FindSelfComparison" value="true" />
137+
<entry key="FindSelfComparison2" value="true" />
138+
<entry key="FindSleepWithLockHeld" value="true" />
139+
<entry key="FindSpinLoop" value="true" />
140+
<entry key="FindSqlInjection" value="true" />
141+
<entry key="FindTwoLockWait" value="true" />
142+
<entry key="FindUncalledPrivateMethods" value="true" />
143+
<entry key="FindUnconditionalWait" value="true" />
144+
<entry key="FindUninitializedGet" value="true" />
145+
<entry key="FindUnrelatedTypesInGenericContainer" value="true" />
146+
<entry key="FindUnreleasedLock" value="true" />
147+
<entry key="FindUnsatisfiedObligation" value="true" />
148+
<entry key="FindUnsyncGet" value="true" />
149+
<entry key="FindUseOfNonSerializableValue" value="true" />
150+
<entry key="FindUselessControlFlow" value="true" />
151+
<entry key="FormatStringChecker" value="true" />
152+
<entry key="FunctionsThatMightBeMistakenForProcedures" value="true" />
153+
<entry key="HugeSharedStringConstants" value="true" />
154+
<entry key="IDivResultCastToDouble" value="true" />
155+
<entry key="IncompatMask" value="true" />
156+
<entry key="InconsistentAnnotations" value="true" />
157+
<entry key="InefficientIndexOf" value="true" />
158+
<entry key="InefficientInitializationInsideLoop" value="true" />
159+
<entry key="InefficientMemberAccess" value="false" />
160+
<entry key="InefficientToArray" value="true" />
161+
<entry key="InfiniteLoop" value="true" />
162+
<entry key="InfiniteRecursiveLoop" value="true" />
163+
<entry key="InheritanceUnsafeGetResource" value="true" />
164+
<entry key="InitializationChain" value="true" />
165+
<entry key="InitializeNonnullFieldsInConstructor" value="true" />
166+
<entry key="InstantiateStaticClass" value="true" />
167+
<entry key="IntCast2LongAsInstant" value="true" />
168+
<entry key="InvalidJUnitTest" value="true" />
169+
<entry key="IteratorIdioms" value="true" />
170+
<entry key="LazyInit" value="true" />
171+
<entry key="LoadOfKnownNullValue" value="true" />
172+
<entry key="LostLoggerDueToWeakReference" value="true" />
173+
<entry key="MethodReturnCheck" value="true" />
174+
<entry key="Methods" value="true" />
175+
<entry key="MultithreadedInstanceAccess" value="true" />
176+
<entry key="MutableLock" value="true" />
177+
<entry key="MutableStaticFields" value="true" />
178+
<entry key="Naming" value="true" />
179+
<entry key="Noise" value="false" />
180+
<entry key="NoiseNullDeref" value="false" />
181+
<entry key="NoteAnnotationRetention" value="true" />
182+
<entry key="NoteCheckReturnValueAnnotations" value="true" />
183+
<entry key="NoteDirectlyRelevantTypeQualifiers" value="true" />
184+
<entry key="NoteJCIPAnnotation" value="true" />
185+
<entry key="NoteNonNullAnnotations" value="false" />
186+
<entry key="NoteNonnullReturnValues" value="false" />
187+
<entry key="NoteSuppressedWarnings" value="true" />
188+
<entry key="NoteUnconditionalParamDerefs" value="true" />
189+
<entry key="NumberConstructor" value="true" />
190+
<entry key="OptionalReturnNull" value="true" />
191+
<entry key="OverridingEqualsNotSymmetrical" value="true" />
192+
<entry key="PreferZeroLengthArrays" value="true" />
193+
<entry key="PublicSemaphores" value="false" />
194+
<entry key="QuestionableBooleanAssignment" value="true" />
195+
<entry key="ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass" value="true" />
196+
<entry key="ReadReturnShouldBeChecked" value="true" />
197+
<entry key="RedundantInterfaces" value="true" />
198+
<entry key="ReflectiveClasses" value="true" />
199+
<entry key="RepeatedConditionals" value="true" />
200+
<entry key="ResolveAllReferences" value="false" />
201+
<entry key="RuntimeExceptionCapture" value="true" />
202+
<entry key="SerializableIdiom" value="true" />
203+
<entry key="StartInConstructor" value="true" />
204+
<entry key="StaticCalendarDetector" value="true" />
205+
<entry key="StringConcatenation" value="true" />
206+
<entry key="SuperfluousInstanceOf" value="true" />
207+
<entry key="SuspiciousThreadInterrupted" value="true" />
208+
<entry key="SwitchFallthrough" value="true" />
209+
<entry key="SynchronizationOnSharedBuiltinConstant" value="true" />
210+
<entry key="SynchronizeAndNullCheckField" value="true" />
211+
<entry key="SynchronizeOnClassLiteralNotGetClass" value="true" />
212+
<entry key="SynchronizingOnContentsOfFieldToProtectField" value="true" />
213+
<entry key="TestASM" value="false" />
214+
<entry key="TestDataflowAnalysis" value="false" />
215+
<entry key="TestingGround" value="false" />
216+
<entry key="TestingGround2" value="false" />
217+
<entry key="TrainFieldStoreTypes" value="true" />
218+
<entry key="TrainLongInstantfParams" value="true" />
219+
<entry key="TrainNonNullAnnotations" value="true" />
220+
<entry key="TrainUnconditionalDerefParams" value="true" />
221+
<entry key="URLProblems" value="true" />
222+
<entry key="UncallableMethodOfAnonymousClass" value="true" />
223+
<entry key="UnnecessaryMath" value="true" />
224+
<entry key="UnreadFields" value="true" />
225+
<entry key="UselessSubclassMethod" value="false" />
226+
<entry key="VarArgsProblems" value="true" />
227+
<entry key="VolatileUsage" value="true" />
228+
<entry key="WaitInLoop" value="true" />
229+
<entry key="WrongMapIterator" value="true" />
230+
<entry key="XMLFactoryBypass" value="true" />
231+
</map>
232+
</option>
233+
<option name="_reportCategories">
234+
<map>
235+
<entry key="BAD_PRACTICE" value="true" />
236+
<entry key="CORRECTNESS" value="true" />
237+
<entry key="EXPERIMENTAL" value="true" />
238+
<entry key="I18N" value="true" />
239+
<entry key="MALICIOUS_CODE" value="true" />
240+
<entry key="MT_CORRECTNESS" value="true" />
241+
<entry key="PERFORMANCE" value="true" />
242+
<entry key="SECURITY" value="true" />
243+
<entry key="STYLE" value="true" />
244+
</map>
245+
</option>
246+
</component>
247+
</module>

src/main/java/com/google/gcloud/RetryHelper.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
package com.google.gcloud;
22

3-
import static com.google.common.base.Preconditions.checkNotNull;
4-
import static java.lang.Math.max;
5-
import static java.lang.Math.min;
6-
import static java.lang.Math.pow;
7-
import static java.lang.Math.random;
8-
import static java.util.concurrent.TimeUnit.MILLISECONDS;
9-
103
import com.google.common.annotations.VisibleForTesting;
114
import com.google.common.base.MoreObjects;
125
import com.google.common.base.MoreObjects.ToStringHelper;
@@ -17,6 +10,10 @@
1710
import java.util.concurrent.Callable;
1811
import java.util.logging.Logger;
1912

13+
import static com.google.common.base.Preconditions.checkNotNull;
14+
import static java.lang.Math.*;
15+
import static java.util.concurrent.TimeUnit.MILLISECONDS;
16+
2017
/**
2118
* Utility class for retrying operations.
2219
* For more details about the parameters, see {@link RetryParams}.
@@ -148,7 +145,7 @@ static Context getContext() {
148145
public String toString() {
149146
ToStringHelper toStringHelper = MoreObjects.toStringHelper(this);
150147
toStringHelper.add("stopwatch", stopwatch);
151-
toStringHelper.add("attempNumber", attemptNumber);
148+
toStringHelper.add("attemptNumber", attemptNumber);
152149
toStringHelper.add("callable", callable);
153150
return toStringHelper.toString();
154151
}

0 commit comments

Comments
 (0)