clean up rebase

Author: yuzawa-san

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

@@ -97,6 +97,24 @@ private EncodableSection getOrCreateSection(String sectionName) {
         case UsTx.NAME:
           section = new UsTx();
           break;
+        case UsDe.NAME:
+          section = new UsDe();
+          break;
+        case UsIa.NAME:
+          section = new UsIa();
+          break;
+        case UsNe.NAME:
+          section = new UsNe();
+          break;
+        case UsNh.NAME:
+          section = new UsNh();
+          break;
+        case UsNj.NAME:
+          section = new UsNj();
+          break;
+        case UsTn.NAME:
+          section = new UsTn();
+          break;
       }
       if (section != null) {
         this.sections.put(sectionName, section);
@@ -111,7 +129,6 @@ public void setFieldValue(String sectionName, String fieldName, Object value) {
       this.dirty = false;
       this.decoded = true;
     }
-
     EncodableSection section = getOrCreateSection(sectionName);
     if (section != null) {
       section.setFieldValue(fieldName, value);
@@ -131,7 +148,6 @@ public Object getFieldValue(String sectionName, String fieldName) {
       this.dirty = false;
       this.decoded = true;
     }
-
     EncodableSection field = this.sections.get(sectionName);
     if (field != null) {
       return field.getFieldValue(fieldName);
@@ -150,7 +166,6 @@ public boolean hasField(String sectionName, String fieldName) {
       this.dirty = false;
       this.decoded = true;
     }
-
     EncodableSection field = this.sections.get(sectionName);
     if (field != null) {
       return field.hasField(fieldName);
@@ -199,7 +214,6 @@ public EncodableSection getSection(String sectionName) {
       this.dirty = false;
       this.decoded = true;
     }
-
     return this.sections.get(sectionName);
   }
 
@@ -213,7 +227,6 @@ public void deleteSection(String sectionName) {
       this.dirty = false;
       this.decoded = true;
     }
-
     if (this.sections.remove(sectionName) != null) {
       this.dirty = true;
     }
@@ -308,7 +321,6 @@ public List<Integer> getSectionIds() {
       this.dirty = false;
       this.decoded = true;
     }
-
     int length = Sections.SECTION_ORDER.size();
     List<Integer> sectionIds = new ArrayList<>(length);
     for (int i = 0; i < length; i++) {
@@ -396,6 +408,24 @@ protected Map<String, EncodableSection> decodeModel(String str) {
             case UsTx.ID:
               sections.put(UsTx.NAME, new UsTx(section));
               break;
+            case UsDe.ID:
+              sections.put(UsDe.NAME, new UsDe(section));
+              break;
+            case UsIa.ID:
+              sections.put(UsIa.NAME, new UsIa(section));
+              break;
+            case UsNe.ID:
+              sections.put(UsNe.NAME, new UsNe(section));
+              break;
+            case UsNh.ID:
+              sections.put(UsNh.NAME, new UsNh(section));
+              break;
+            case UsNj.ID:
+              sections.put(UsNj.NAME, new UsNj(section));
+              break;
+            case UsTn.ID:
+              sections.put(UsTn.NAME, new UsTn(section));
+              break;
           }
         }
       }
@@ -428,7 +458,6 @@ public String encodeSection(String sectionName) {
       this.dirty = false;
       this.decoded = true;
     }
-
     EncodableSection section = this.sections.get(sectionName);
     if (section != null) {
       return section.encode();
@@ -449,7 +478,6 @@ public void decodeSection(String sectionName, String encodedString) {
     }
 
     EncodableSection section = getOrCreateSection(sectionName);
-
     if (section != null) {
       section.decode(encodedString);
       this.dirty = true;

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

@@ -4,6 +4,7 @@
 import com.iab.gpp.encoder.base64.AbstractBase64UrlEncoder;
 import com.iab.gpp.encoder.base64.CompressedBase64UrlEncoder;
 import com.iab.gpp.encoder.bitstring.BitString;
+import com.iab.gpp.encoder.bitstring.BitStringBuilder;
 import com.iab.gpp.encoder.bitstring.BitStringEncoder;
 import com.iab.gpp.encoder.datatype.EncodableFixedInteger;
 import com.iab.gpp.encoder.datatype.EncodableFixedIntegerList;
@@ -82,8 +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) {
-        bitString =
-            bitString.substring(0, 48) + "00000000" + bitString.substring(48, 52) + "00" + bitString.substring(52, 62);
+        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();
       }
 
       bitStringEncoder.decode(bitString, fields);

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

@@ -115,10 +115,4 @@ public void testDecode8() {
 
     }
   }
-
-  @Test
-  public void testGiantRange() {
-    String max = FibonacciIntegerEncoder.encode(FibonacciIntegerRangeEncoder.MAX_SIZE + 1);
-    Assertions.assertEquals(List.of(), FibonacciIntegerRangeEncoder.decode("000000000001111" + max));
-  }
 }

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

@@ -151,10 +151,4 @@ public void testDecode10() {
 
     }
   }
-
-  @Test
-  public void testGiantRange() {
-    String max = FibonacciIntegerEncoder.encode(FibonacciIntegerRangeEncoder.MAX_SIZE + 1);
-    Assertions.assertEquals(List.of(), FixedIntegerRangeEncoder.decode("00000000000110000000000000001" + max));
-  }
 }