bail and use logger

Author: yuzawa-san

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

@@ -3,11 +3,13 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import com.iab.gpp.encoder.error.DecodingException;
 
 public class FibonacciIntegerRangeEncoder {
 
+  private static final Logger LOGGER = Logger.getLogger(FibonacciIntegerRangeEncoder.class.getName());
   // NOTE: This is a value roughly the 2x the size of this list
   // https://tools.iabtechlab.com/transparencycenter/explorer/business/gpp
   static final int MAX_SIZE = 8192;
@@ -74,7 +76,8 @@ public static List<Integer> decode(String bitString) throws DecodingException {
         startIndex = index + 2;
 
         if (value.size() + (end - start) > MAX_SIZE) {
-          throw new DecodingException("FibonacciIntegerRange has too many values");
+          LOGGER.warning("FibonacciIntegerRange has too many values");
+          break;
         }
         for (int j = start; j <= end; j++) {
           value.add(j);
@@ -84,7 +87,8 @@ public static List<Integer> decode(String bitString) throws DecodingException {
         int val = FibonacciIntegerEncoder.decode(bitString.substring(startIndex, index + 2)) + offset;
         offset = val;
         if (value.size() == MAX_SIZE) {
-          throw new DecodingException("FibonacciIntegerRange has too many values");
+          LOGGER.warning("FibonacciIntegerRange has too many values");
+          break;
         }
         value.add(val);
         startIndex = index + 2;

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

@@ -3,11 +3,13 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import com.iab.gpp.encoder.error.DecodingException;
 
 public class FixedIntegerRangeEncoder {
 
+  private static final Logger LOGGER = Logger.getLogger(FixedIntegerRangeEncoder.class.getName());
   // NOTE: This is a value roughly the 2x the size of this list
   // https://tools.iabtechlab.com/transparencycenter/explorer/business/gpp
   private static final int MAX_SIZE = 8192;
@@ -65,15 +67,17 @@ public static List<Integer> decode(String bitString) throws DecodingException {
           throw new DecodingException("FixedIntegerRange has invalid range");
         }
         if (value.size() + (end - start) > MAX_SIZE) {
-          throw new DecodingException("FixedIntegerRange has too many values");
+          LOGGER.warning("FixedIntegerRange has too many values");
+          break;
         }
         for (int j = start; j <= end; j++) {
           value.add(j);
         }
       } else {
         int val = FixedIntegerEncoder.decode(bitString.substring(startIndex, startIndex + 16));
         if (value.size() == MAX_SIZE) {
-          throw new DecodingException("FixedIntegerRange has too many values");
+          LOGGER.warning("FixedIntegerRange has too many values");
+          break;
         }
         value.add(val);
         startIndex += 16;

iabgpp-encoder/src/test/java/com/iab/gpp/encoder/datatype/encoder/FibonacciIntegerRangeEncoderTest.java

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import com.iab.gpp.encoder.error.DecodingException;
@@ -101,7 +102,6 @@ public void testDecode8() {
   @Test
   public void testGiantRange() {
     String max = FibonacciIntegerEncoder.encode(FibonacciIntegerRangeEncoder.MAX_SIZE + 1);
-    assertThrows(DecodingException.class, ()->
-      FibonacciIntegerRangeEncoder.decode("000000000001111" + max));
+    Assertions.assertEquals(List.of(), FibonacciIntegerRangeEncoder.decode("000000000001111" + max));
   }
 }

iabgpp-encoder/src/test/java/com/iab/gpp/encoder/datatype/encoder/FixedIntegerRangeEncoderTest.java

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import com.iab.gpp.encoder.error.DecodingException;
@@ -131,7 +132,6 @@ public void testDecode10() {
   @Test
   public void testGiantRange() {
     String max = FibonacciIntegerEncoder.encode(FibonacciIntegerRangeEncoder.MAX_SIZE + 1);
-    assertThrows(DecodingException.class, ()->
-      FixedIntegerRangeEncoder.decode("00000000000110000000000000001" + max));
+    Assertions.assertEquals(List.of(), FixedIntegerRangeEncoder.decode("00000000000110000000000000001" + max));
   }
 }