Skip to content

Commit 5845c34

Browse files
cardilcardil
committed
Fixes for Sonar issues
1 parent 98fe740 commit 5845c34

File tree

3 files changed

+35
-34
lines changed

3 files changed

+35
-34
lines changed

‎pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
<netbeans.hint.license>apache20</netbeans.hint.license>
2424
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2525
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
26-
<maven.compiler.source>1.6</maven.compiler.source>
27-
<maven.compiler.target>1.6</maven.compiler.target>
26+
<java.source.version>6</java.source.version>
27+
<maven.compiler.source>1.${java.source.version}</maven.compiler.source>
28+
<maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
2829
<coveralls.skip>${skipTests}</coveralls.skip>
2930
</properties>
3031

@@ -41,6 +42,7 @@
4142
<developerConnection>scm:git:[email protected]:wavesoftware/java-eid-exceptions.git</developerConnection>
4243
<url>https://github.com/wavesoftware/java-eid-exceptions</url>
4344
</scm>
45+
4446
<ciManagement>
4547
<system>travis-ci</system>
4648
<url>https://travis-ci.org/wavesoftware/java-eid-exceptions</url>
@@ -87,8 +89,7 @@
8789
<plugin>
8890
<groupId>org.jacoco</groupId>
8991
<artifactId>jacoco-maven-plugin</artifactId>
90-
<!-- Version pin because 0.7.5 fails on SONAR -->
91-
<version>0.7.4.201502262128</version>
92+
<version>0.7.5.201505241946</version>
9293
<executions>
9394
<execution>
9495
<id>jacoco-initialize</id>

‎src/main/java/pl/wavesoftware/eid/exceptions/Eid.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public String generateUniqId() {
259259
return Integer.toString(abs(calc), BASE36);
260260
}
261261

262-
private Random getUnsecuredFastRandom() {
262+
private static Random getUnsecuredFastRandom() {
263263
return new Random(System.currentTimeMillis());
264264
}
265265

‎src/main/java/pl/wavesoftware/eid/utils/EidPreconditions.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ protected EidPreconditions() {
121121
* @throws EidIllegalArgumentException if {@code expression} is false
122122
* @throws EidNullPointerException if {@code expression} is null
123123
*/
124-
public static void checkArgument(final @Nullable Boolean expression, final @Nonnull String eid) {
124+
public static void checkArgument(@Nullable final Boolean expression, @Nonnull final String eid) {
125125
String checkedEid = checkNotNull(eid);
126126
checkArgument(expression, new Eid(checkedEid));
127127
}
@@ -137,8 +137,8 @@ public static void checkArgument(final @Nullable Boolean expression, final @Nonn
137137
* @throws EidIllegalArgumentException if {@code expression} is false
138138
* @throws EidNullPointerException if {@code expression} or {@code eid} are null
139139
*/
140-
public static void checkArgument(final @Nullable Boolean expression, final @Nonnull String eid,
141-
final @Nonnull String messageFormat, final Object... parameters) {
140+
public static void checkArgument(@Nullable final Boolean expression, @Nonnull final String eid,
141+
@Nonnull final String messageFormat, final Object... parameters) {
142142
String checkedEid = checkNotNull(eid);
143143
checkArgument(expression, new Eid(checkedEid), messageFormat, parameters);
144144
}
@@ -152,7 +152,7 @@ public static void checkArgument(final @Nullable Boolean expression, final @Nonn
152152
* @throws EidIllegalArgumentException if {@code expression} is false
153153
* @throws EidNullPointerException if {@code expression} is null
154154
*/
155-
public static void checkArgument(final @Nullable Boolean expression, final @Nonnull Eid eid) {
155+
public static void checkArgument(@Nullable final Boolean expression, @Nonnull final Eid eid) {
156156
Eid checkedEid = checkNotNull(eid);
157157
if (!checkNotNull(expression, checkedEid)) {
158158
throw new EidIllegalArgumentException(checkedEid);
@@ -170,8 +170,8 @@ public static void checkArgument(final @Nullable Boolean expression, final @Nonn
170170
* @throws EidIllegalArgumentException if {@code expression} is false
171171
* @throws EidNullPointerException if {@code expression} is null
172172
*/
173-
public static void checkArgument(final @Nullable Boolean expression, final @Nonnull Eid eid,
174-
final @Nonnull String messageFormat, final Object... parameters) {
173+
public static void checkArgument(@Nullable final Boolean expression, @Nonnull final Eid eid,
174+
@Nonnull final String messageFormat, final Object... parameters) {
175175
Eid checkedEid = checkNotNull(eid);
176176
if (!checkNotNull(expression, checkedEid)) {
177177
throw new EidIllegalArgumentException(checkedEid, messageFormat, parameters);
@@ -188,7 +188,7 @@ public static void checkArgument(final @Nullable Boolean expression, final @Nonn
188188
* @throws EidIllegalStateException if {@code expression} is false
189189
* @throws EidNullPointerException if {@code expression} is null
190190
*/
191-
public static void checkState(final @Nullable Boolean expression, final @Nonnull String eid) {
191+
public static void checkState(@Nullable final Boolean expression, @Nonnull final String eid) {
192192
String checkedEid = checkNotNull(eid);
193193
checkState(expression, new Eid(checkedEid));
194194
}
@@ -205,8 +205,8 @@ public static void checkState(final @Nullable Boolean expression, final @Nonnull
205205
* @throws EidIllegalStateException if {@code expression} is false
206206
* @throws EidNullPointerException if {@code expression} is null
207207
*/
208-
public static void checkState(final @Nullable Boolean expression, final @Nonnull String eid,
209-
final @Nonnull String messageFormat, final Object... parameters) {
208+
public static void checkState(@Nullable final Boolean expression, @Nonnull final String eid,
209+
@Nonnull final String messageFormat, final Object... parameters) {
210210
String checkedEid = checkNotNull(eid);
211211
checkState(expression, new Eid(checkedEid), messageFormat, parameters);
212212
}
@@ -220,7 +220,7 @@ public static void checkState(final @Nullable Boolean expression, final @Nonnull
220220
* {@link String#valueOf(Object)}
221221
* @throws EidIllegalStateException if {@code expression} is false
222222
*/
223-
public static void checkState(final @Nullable Boolean expression, final @Nonnull Eid eid) {
223+
public static void checkState(@Nullable final Boolean expression, @Nonnull final Eid eid) {
224224
Eid checkedEid = checkNotNull(eid);
225225
if (!checkNotNull(expression, checkedEid)) {
226226
throw new EidIllegalStateException(checkedEid);
@@ -238,8 +238,8 @@ public static void checkState(final @Nullable Boolean expression, final @Nonnull
238238
* @param parameters parameters fo message format in for of {@link String#format(String, Object...)}
239239
* @throws EidIllegalStateException if {@code expression} is false
240240
*/
241-
public static void checkState(final @Nullable Boolean expression, final @Nonnull Eid eid,
242-
final @Nonnull String messageFormat, final Object... parameters) {
241+
public static void checkState(@Nullable final Boolean expression, @Nonnull final Eid eid,
242+
@Nonnull final String messageFormat, final Object... parameters) {
243243
Eid checkedEid = checkNotNull(eid);
244244
if (!checkNotNull(expression, checkedEid)) {
245245
throw new EidIllegalStateException(checkedEid, messageFormat, parameters);
@@ -257,7 +257,7 @@ public static void checkState(final @Nullable Boolean expression, final @Nonnull
257257
* @throws EidNullPointerException if {@code reference} is null
258258
*/
259259
@Nonnull
260-
public static <T> T checkNotNull(final @Nullable T reference, final @Nonnull String eid) {
260+
public static <T> T checkNotNull(@Nullable final T reference, @Nonnull final String eid) {
261261
String checkedEid = checkNotNull(eid);
262262
return checkNotNull(reference, new Eid(checkedEid));
263263
}
@@ -275,8 +275,8 @@ public static <T> T checkNotNull(final @Nullable T reference, final @Nonnull Str
275275
* @throws EidNullPointerException if {@code reference} is null
276276
*/
277277
@Nonnull
278-
public static <T> T checkNotNull(final @Nullable T reference, final @Nonnull String eid,
279-
final @Nonnull String messageFormat, final Object... parameters) {
278+
public static <T> T checkNotNull(@Nullable final T reference, @Nonnull final String eid,
279+
@Nonnull final String messageFormat, final Object... parameters) {
280280
String checkedEid = checkNotNull(eid);
281281
return checkNotNull(reference, new Eid(checkedEid), messageFormat, parameters);
282282
}
@@ -292,7 +292,7 @@ public static <T> T checkNotNull(final @Nullable T reference, final @Nonnull Str
292292
* @throws EidNullPointerException if {@code reference} is null
293293
*/
294294
@Nonnull
295-
public static <T> T checkNotNull(final @Nullable T reference, final @Nonnull Eid eid) {
295+
public static <T> T checkNotNull(@Nullable final T reference, @Nonnull final Eid eid) {
296296
Eid checkedEid = checkNotNull(eid);
297297
if (reference == null) {
298298
throw new EidNullPointerException(checkedEid);
@@ -313,8 +313,8 @@ public static <T> T checkNotNull(final @Nullable T reference, final @Nonnull Eid
313313
* @throws EidNullPointerException if {@code reference} is null
314314
*/
315315
@Nonnull
316-
public static <T> T checkNotNull(final @Nullable T reference, final @Nonnull Eid eid,
317-
final @Nonnull String messageFormat, final Object... parameters) {
316+
public static <T> T checkNotNull(@Nullable final T reference, @Nonnull final Eid eid,
317+
@Nonnull final String messageFormat, final Object... parameters) {
318318
Eid checkedEid = checkNotNull(eid);
319319
if (reference == null) {
320320
throw new EidNullPointerException(checkedEid, messageFormat, parameters);
@@ -333,7 +333,7 @@ public static <T> T checkNotNull(final @Nullable T reference, final @Nonnull Eid
333333
* @throws EidIndexOutOfBoundsException if {@code index} is negative or is not less than {@code size}
334334
* @throws EidIllegalArgumentException if {@code size} is negative
335335
*/
336-
public static int checkElementIndex(int index, int size, final @Nonnull String eid) {
336+
public static int checkElementIndex(int index, int size, @Nonnull final String eid) {
337337
String checkedEid = checkNotNull(eid);
338338
return checkElementIndex(index, size, new Eid(checkedEid));
339339
}
@@ -351,8 +351,8 @@ public static int checkElementIndex(int index, int size, final @Nonnull String e
351351
* @throws EidIndexOutOfBoundsException if {@code index} is negative or is not less than {@code size}
352352
* @throws EidIllegalArgumentException if {@code size} is negative
353353
*/
354-
public static int checkElementIndex(int index, int size, final @Nonnull String eid,
355-
final @Nonnull String messageFormat, final Object... parameters) {
354+
public static int checkElementIndex(int index, int size, @Nonnull final String eid,
355+
@Nonnull final String messageFormat, final Object... parameters) {
356356
String checkedEid = checkNotNull(eid);
357357
return checkElementIndex(index, size, new Eid(checkedEid), messageFormat, parameters);
358358
}
@@ -368,7 +368,7 @@ public static int checkElementIndex(int index, int size, final @Nonnull String e
368368
* @throws EidIndexOutOfBoundsException if {@code index} is negative or is not less than {@code size}
369369
* @throws EidIllegalArgumentException if {@code size} is negative
370370
*/
371-
public static int checkElementIndex(int index, int size, final @Nonnull Eid eid) {
371+
public static int checkElementIndex(int index, int size, @Nonnull final Eid eid) {
372372
Eid checkedEid = checkNotNull(eid);
373373
if (isSizeIllegal(size)) {
374374
throw new EidIllegalArgumentException(checkedEid);
@@ -392,7 +392,7 @@ public static int checkElementIndex(int index, int size, final @Nonnull Eid eid)
392392
* @throws EidIndexOutOfBoundsException if {@code index} is negative or is not less than {@code size}
393393
* @throws EidIllegalArgumentException if {@code size} is negative
394394
*/
395-
public static int checkElementIndex(int index, int size, final @Nonnull Eid eid, final @Nonnull String messageFormat,
395+
public static int checkElementIndex(int index, int size, @Nonnull final Eid eid, @Nonnull final String messageFormat,
396396
final Object... parameters) {
397397
Eid checkedEid = checkNotNull(eid);
398398
if (isSizeIllegal(size)) {
@@ -417,7 +417,7 @@ private static boolean isSizeIllegal(int size) {
417417
*/
418418
@Nullable
419419
@Deprecated
420-
public static <R> R tryToExecute(final @Nonnull RiskyCode<R> code, final @Nonnull String eid) {
420+
public static <R> R tryToExecute(@Nonnull final RiskyCode<R> code, @Nonnull final String eid) {
421421
return tryToExecute(new UnsafeSupplier<R>() {
422422
@Override
423423
public R get() throws Exception {
@@ -431,7 +431,7 @@ public R get() throws Exception {
431431
*/
432432
@Deprecated
433433
@Nullable
434-
public static <R> R tryToExecute(final @Nonnull RiskyCode<R> code, final @Nonnull Eid eid) {
434+
public static <R> R tryToExecute(@Nonnull final RiskyCode<R> code, @Nonnull final Eid eid) {
435435
return tryToExecute(new UnsafeSupplier<R>() {
436436
@Override
437437
public R get() throws Exception {
@@ -451,7 +451,7 @@ public R get() throws Exception {
451451
* @see EidPreconditions#tryToExecute(UnsafeSupplier, Eid)
452452
*/
453453
@Nullable
454-
public static <R> R tryToExecute(final @Nonnull UnsafeSupplier<R> supplier, final @Nonnull String eid) {
454+
public static <R> R tryToExecute(@Nonnull final UnsafeSupplier<R> supplier, @Nonnull final String eid) {
455455
String checkedEid = checkNotNull(eid);
456456
return tryToExecute(supplier, new Eid(checkedEid));
457457
}
@@ -464,7 +464,7 @@ public static <R> R tryToExecute(final @Nonnull UnsafeSupplier<R> supplier, fina
464464
* @throws EidRuntimeException if code block thrown any exception, which in that case is wrapped in EidRuntimeException
465465
* @see EidPreconditions#tryToExecute(UnsafeProcedure, Eid)
466466
*/
467-
public static void tryToExecute(final @Nonnull UnsafeProcedure procedure, final @Nonnull String eid) {
467+
public static void tryToExecute(@Nonnull final UnsafeProcedure procedure, @Nonnull final String eid) {
468468
String checkedEid = checkNotNull(eid);
469469
tryToExecute(procedure, new Eid(checkedEid));
470470
}
@@ -492,7 +492,7 @@ public static void tryToExecute(final @Nonnull UnsafeProcedure procedure, final
492492
* @throws EidRuntimeException if code block thrown any exception, which in that case is wrapped in EidRuntimeException
493493
*/
494494
@Nullable
495-
public static <R> R tryToExecute(final @Nonnull UnsafeSupplier<R> supplier, final @Nonnull Eid eid) {
495+
public static <R> R tryToExecute(@Nonnull final UnsafeSupplier<R> supplier, @Nonnull final Eid eid) {
496496
Eid checkedEid = checkNotNull(eid);
497497
try {
498498
return supplier.get();
@@ -520,7 +520,7 @@ public static <R> R tryToExecute(final @Nonnull UnsafeSupplier<R> supplier, fina
520520
* @param eid unique developer identifier from date for ex.: "20150716:123200"
521521
* @throws EidRuntimeException if code block thrown any exception, which in that case is wrapped in EidRuntimeException
522522
*/
523-
public static void tryToExecute(final @Nonnull UnsafeProcedure procedure, final @Nonnull Eid eid) {
523+
public static void tryToExecute(@Nonnull final UnsafeProcedure procedure, @Nonnull final Eid eid) {
524524
Eid checkedEid = checkNotNull(eid);
525525
try {
526526
procedure.execute();

0 commit comments

Comments
 (0)