Skip to content

Commit 0dede69

Browse files
committed
sonarqube fixes
1 parent ce29daa commit 0dede69

18 files changed

+34
-33
lines changed

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/base64/AbstractBase64UrlEncoder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
public abstract class AbstractBase64UrlEncoder {
1010

11-
abstract protected void pad(BitStringBuilder bitString);
11+
protected abstract void pad(BitStringBuilder bitString);
1212

1313
private static final int BASE64_BITS = 6;
1414
/**

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/bitstring/BitStringBuilder.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public BitStringBuilder append(boolean value) {
2727
}
2828

2929
public BitStringBuilder append(BitString other) {
30-
int length = other.length();
31-
for (int i = 0; i < length; i++) {
30+
int otherLength = other.length();
31+
for (int i = 0; i < otherLength; i++) {
3232
append(other.getValue(i));
3333
}
3434
return this;
@@ -38,10 +38,10 @@ public int length() {
3838
return length;
3939
}
4040

41-
public BitStringBuilder append(BitStringBuilder rangeBitString) {
42-
int length = rangeBitString.length();
43-
for (int i = 0; i < length; i++) {
44-
append(rangeBitString.bitSet.get(i));
41+
public BitStringBuilder append(BitStringBuilder other) {
42+
int otherLength = other.length();
43+
for (int i = 0; i < otherLength; i++) {
44+
append(other.bitSet.get(i));
4545
}
4646
return this;
4747
}

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/AbstractEncodableBitStringDataType.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void setValue(Object value) {
4141
} else {
4242
if (v instanceof Collection) {
4343
throw new ValidationException("Invalid value '"
44-
+ ((Collection<?>) v).stream().map(i -> i.toString()).collect(Collectors.joining(",")) + "'");
44+
+ ((Collection<?>) v).stream().map(Object::toString).collect(Collectors.joining(",")) + "'");
4545
} else {
4646
throw new ValidationException("Invalid value '" + v + "'");
4747
}
@@ -53,10 +53,6 @@ public boolean getHardFailIfMissing() {
5353
return this.hardFailIfMissing;
5454
}
5555

56-
public abstract void encode(BitStringBuilder builder);
57-
58-
public abstract void decode(BitString bitString);
59-
6056
public abstract BitString substring(BitString bitString, int fromIndex) throws SubstringException;
6157

6258
public boolean isDirty() {

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/BaseIntegerSet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public final boolean add(Integer value) {
1818
if (value == null) {
1919
return false;
2020
}
21-
return addInt((Integer) value);
21+
return addInt(value);
2222
}
2323

2424
@Override

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/BooleanEncoder.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66
import com.iab.gpp.encoder.error.EncodingException;
77

88
public class BooleanEncoder {
9+
private BooleanEncoder() {}
910
public static void encode(BitStringBuilder builder, Boolean value) {
10-
if (value == true) {
11-
builder.append(true);
12-
} else if (value == false) {
13-
builder.append(false);
14-
} else {
11+
if (value == null) {
1512
throw new EncodingException("Unencodable Boolean '" + value + "'");
1613
}
14+
builder.append(value);
1715
}
1816

1917
public static boolean decode(BitString bitString) {

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/DatetimeEncoder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
public class DatetimeEncoder {
1212

13+
private DatetimeEncoder() {}
1314
public static final ZoneId UTC = ZoneId.of("UTC");
1415

1516
public static void encode(BitStringBuilder builder, ZonedDateTime value) {

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/FibonacciIntegerEncoder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.iab.gpp.encoder.error.EncodingException;
77

88
public class FibonacciIntegerEncoder {
9+
private FibonacciIntegerEncoder() {}
910

1011
// this is the length of the longest fibonacci encoded string of all 1's
1112
// which does not overflow a 32-bit integer

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/FibonacciIntegerRangeEncoder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.iab.gpp.encoder.error.DecodingException;
77

88
public class FibonacciIntegerRangeEncoder {
9+
private FibonacciIntegerRangeEncoder() {}
910

1011
public static int encode(BitStringBuilder builder, Collection<Integer> value) {
1112
BitStringBuilder rangeBuilder = new BitStringBuilder();
@@ -60,7 +61,7 @@ public static IntegerSet decode(BitString bitString) throws DecodingException {
6061
boolean group = BooleanEncoder.decode(bitString, startIndex, 1);
6162
startIndex++;
6263

63-
if (group == true) {
64+
if (group) {
6465
int index = FibonacciIntegerEncoder.indexOfEndTag(bitString, startIndex);
6566
int start = FibonacciIntegerEncoder.decode(bitString, startIndex, index + 2 - startIndex) + offset;
6667
offset = start;

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/FixedBitfieldEncoder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.iab.gpp.encoder.bitstring.BitStringBuilder;
55

66
public class FixedBitfieldEncoder {
7+
private FixedBitfieldEncoder() {}
78

89
public static void encode(BitStringBuilder builder, IntegerSet value, int bitStringLength) {
910
for (int i = 0; i < bitStringLength; i++) {

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/FixedIntegerEncoder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.iab.gpp.encoder.error.EncodingException;
77

88
public class FixedIntegerEncoder {
9+
private FixedIntegerEncoder() {}
910

1011
public static void encode(BitStringBuilder builder, int value, int bitStringLength) {
1112
int mask = 1 << bitStringLength;

0 commit comments

Comments
 (0)