clean up rebase

Author: yuzawa-san

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/GppModel.java

@@ -359,6 +359,7 @@ protected String encodeModel(Map<String, EncodableSection> sections) {
   protected Map<String, EncodableSection> decodeModel(String str) {
     if (str == null || str.isEmpty() || str.startsWith("DB")) {
       Map<String, EncodableSection> sections = new HashMap<>();
+
       if(str != null && !str.isEmpty()) {
         List<CharSequence> encodedSections = SlicedCharSequence.split(str, '~');
         HeaderV1 header = new HeaderV1(encodedSections.get(0));

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

@@ -55,7 +55,6 @@ public static int decode(BitString bitString) throws DecodingException {
   }
 
   public static int decode(BitString bitString, int fromIndex, int length) throws DecodingException {
-    // must end with "11"
     int limit = length - 1;
     int end = fromIndex + length;
     // must not overflow and must end with "11"

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

@@ -71,6 +71,7 @@ public static IntegerSet decode(BitString bitString) throws DecodingException {
         int end = FibonacciIntegerEncoder.decode(bitString, startIndex, index + 2 - startIndex) + offset;
         offset = end;
         startIndex = index + 2;
+
         value.addRange(start, end + 1);
       } else {
         int index = FibonacciIntegerEncoder.indexOfEndTag(bitString, startIndex);

iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/UsNatCoreSegment.java

@@ -83,13 +83,13 @@ protected void decodeSegment(CharSequence encodedString, EncodableBitStringField
       // length of 12 to 16 and known child sensitive data consents changed from a length of 2 to 3 in the
       // DE, IA, NE, NH, NJ, TN release
       if (bitString.length() == 66) {
-        BitStringBuilder b = new BitStringBuilder();
-        b.append(bitString.substring(0, 48));
-        b.append(BitString.empty(8));
-        b.append(bitString.substring(48, 52));
-        b.append(BitString.empty(2));
-        b.append(bitString.substring(52, 62));
-        bitString = b.build();
+        BitStringBuilder builder = new BitStringBuilder();
+        builder.append(bitString.substring(0, 48));
+        builder.append(BitString.of("00000000"));
+        builder.append(bitString.substring(48, 52));
+        builder.append(BitString.of("00"));
+        builder.append(bitString.substring(52, 62));
+        bitString = builder.build();
       }
 
       bitStringEncoder.decode(bitString, fields);

iabgpp-encoder/src/test/java/com/iab/gpp/encoder/GppModelTest.java

@@ -72,6 +72,20 @@ public void testEncodeDefault() {
 
   }
 
+  @Test
+  public void testDecodingException() {
+    Assertions.assertThrows(DecodingException.class, () -> {
+      new GppModel("invalid gpp string").getHeader();
+    });
+  }
+  
+  @Test()
+  public void testDecodeGarbage() {
+    Assertions.assertThrows(DecodingException.class, () -> {
+      new GppModel("z").getUsCtSection();
+    });
+  }
+
   @Test
   public void testEncodeDefaultAll() {
     GppModel gppModel = new GppModel();
@@ -121,6 +135,7 @@ public void testEncodeDefaultAll() {
     gppModel.setFieldValue(UsTn.NAME, UsTxField.VERSION, UsTx.VERSION);
 
 
+
     Assertions.assertEquals(true, gppModel.hasSection(TcfEuV2.NAME));
     Assertions.assertEquals(true, gppModel.hasSection(TcfCaV1.NAME));
     Assertions.assertEquals(true, gppModel.hasSection(UspV1.NAME));