move and rename

yuzawa-san · yuzawa-san · commit eef98d340b91 · 2025-04-01T16:17:03.000-04:00
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/bitstring/BitString.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/bitstring/BitString.java
@@ -1,7 +1,7 @@
 package com.iab.gpp.encoder.bitstring;
 
 import java.util.BitSet;
-import com.iab.gpp.encoder.datatype.encoder.BitStringSet;
+import com.iab.gpp.encoder.datatype.encoder.IntegerBitSet;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
 import com.iab.gpp.encoder.error.DecodingException;
 
@@ -46,7 +46,7 @@ public static final BitString of(String str) {
   }
   
   public IntegerSet toIntegerSet() {
-    return new BitStringSet(bitSet, from, to);
+    return new IntegerBitSet(bitSet, from, to);
   }
 
   @Override
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFibonacciIntegerRange.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFibonacciIntegerRange.java
@@ -3,7 +3,7 @@
 import java.util.Collection;
 import com.iab.gpp.encoder.bitstring.BitString;
 import com.iab.gpp.encoder.bitstring.BitStringBuilder;
-import com.iab.gpp.encoder.datatype.encoder.BitStringSet;
+import com.iab.gpp.encoder.datatype.encoder.IntegerBitSet;
 import com.iab.gpp.encoder.datatype.encoder.FibonacciIntegerEncoder;
 import com.iab.gpp.encoder.datatype.encoder.FibonacciIntegerRangeEncoder;
 import com.iab.gpp.encoder.datatype.encoder.FixedIntegerEncoder;
@@ -15,7 +15,7 @@ public class EncodableFibonacciIntegerRange extends AbstractEncodableBitStringDa
 
   public EncodableFibonacciIntegerRange() {
     super(true);
-    this.value = new BitStringSet();
+    this.value = new IntegerBitSet();
   }
 
   public void encode(BitStringBuilder builder) {
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFixedBitfield.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFixedBitfield.java
@@ -3,7 +3,7 @@
 import java.util.Collection;
 import com.iab.gpp.encoder.bitstring.BitString;
 import com.iab.gpp.encoder.bitstring.BitStringBuilder;
-import com.iab.gpp.encoder.datatype.encoder.BitStringSet;
+import com.iab.gpp.encoder.datatype.encoder.IntegerBitSet;
 import com.iab.gpp.encoder.datatype.encoder.FixedBitfieldEncoder;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
 import com.iab.gpp.encoder.error.DecodingException;
@@ -16,7 +16,7 @@ public class EncodableFixedBitfield extends AbstractEncodableBitStringDataType<I
   public EncodableFixedBitfield(int numElements) {
     super(true);
     this.numElements = numElements;
-    this.value = BitStringSet.withLimit(numElements);
+    this.value = IntegerBitSet.withLimit(numElements);
   }
 
   public void encode(BitStringBuilder builder) {
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFixedIntegerRange.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFixedIntegerRange.java
@@ -3,7 +3,7 @@
 import java.util.Collection;
 import com.iab.gpp.encoder.bitstring.BitString;
 import com.iab.gpp.encoder.bitstring.BitStringBuilder;
-import com.iab.gpp.encoder.datatype.encoder.BitStringSet;
+import com.iab.gpp.encoder.datatype.encoder.IntegerBitSet;
 import com.iab.gpp.encoder.datatype.encoder.FixedIntegerEncoder;
 import com.iab.gpp.encoder.datatype.encoder.FixedIntegerRangeEncoder;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
@@ -14,7 +14,7 @@ public class EncodableFixedIntegerRange extends AbstractEncodableBitStringDataTy
 
   protected EncodableFixedIntegerRange() {
     super(true);
-    this.value = new BitStringSet();
+    this.value = new IntegerBitSet();
   }
 
   public void encode(BitStringBuilder builder) {
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFlexibleBitfield.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFlexibleBitfield.java
@@ -5,7 +5,7 @@
 
 import com.iab.gpp.encoder.bitstring.BitString;
 import com.iab.gpp.encoder.bitstring.BitStringBuilder;
-import com.iab.gpp.encoder.datatype.encoder.BitStringSet;
+import com.iab.gpp.encoder.datatype.encoder.IntegerBitSet;
 import com.iab.gpp.encoder.datatype.encoder.FixedBitfieldEncoder;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
 import com.iab.gpp.encoder.error.DecodingException;
@@ -18,7 +18,7 @@ public class EncodableFlexibleBitfield extends AbstractEncodableBitStringDataTyp
   public EncodableFlexibleBitfield(IntSupplier getLengthSupplier) {
     super(true);
     this.getLengthSupplier = getLengthSupplier;
-    this.value = new BitStringSet();
+    this.value = new IntegerBitSet();
   }
 
   public void encode(BitStringBuilder builder) {
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableOptimizedFixedRange.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableOptimizedFixedRange.java
@@ -3,7 +3,7 @@
 import java.util.Collection;
 import com.iab.gpp.encoder.bitstring.BitString;
 import com.iab.gpp.encoder.bitstring.BitStringBuilder;
-import com.iab.gpp.encoder.datatype.encoder.BitStringSet;
+import com.iab.gpp.encoder.datatype.encoder.IntegerBitSet;
 import com.iab.gpp.encoder.datatype.encoder.FixedIntegerEncoder;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
 import com.iab.gpp.encoder.datatype.encoder.OptimizedFixedRangeEncoder;
@@ -15,7 +15,7 @@ public class EncodableOptimizedFixedRange extends AbstractEncodableBitStringData
 
   public EncodableOptimizedFixedRange() {
     super(true);
-    this.value = new BitStringSet();
+    this.value = new IntegerBitSet();
   }
 
   public void encode(BitStringBuilder builder) {
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/ManagedIntegerSet.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/ManagedIntegerSet.java
@@ -1,6 +1,8 @@
 package com.iab.gpp.encoder.datatype;
 
 import java.util.PrimitiveIterator;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 import com.iab.gpp.encoder.datatype.encoder.BaseIntegerSet;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
 
@@ -35,6 +37,16 @@ public PrimitiveIterator.OfInt iterator() {
     return delegate.iterator();
   }
   
+  @Override
+  public Stream<Integer> stream(){
+    return delegate.stream();
+  }
+  
+  @Override
+  public IntStream intStream() {
+    return delegate.intStream();
+  }
+  
   @Override
   public boolean containsInt(int value) {
     return delegate.containsInt(value);
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/RangeEntry.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/RangeEntry.java
@@ -2,7 +2,7 @@
 
 import java.util.Collection;
 import java.util.Set;
-import com.iab.gpp.encoder.datatype.encoder.BitStringSet;
+import com.iab.gpp.encoder.datatype.encoder.IntegerBitSet;
 
 public class RangeEntry {
 
@@ -14,7 +14,7 @@ public RangeEntry(int key, int type, Set<Integer> ids) {
     super();
     this.key = key;
     this.type = type;
-    this.ids = new BitStringSet();
+    this.ids = new IntegerBitSet();
     this.ids.addAll(ids);
   }
 
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/BaseIntegerSet.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/BaseIntegerSet.java
@@ -3,9 +3,12 @@
 import java.util.AbstractSet;
 import java.util.Collection;
 import java.util.PrimitiveIterator;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.IntStream;
+import java.util.stream.StreamSupport;
 
 public abstract class BaseIntegerSet extends AbstractSet<Integer> implements IntegerSet {
-  public abstract boolean containsInt(int value);
   
   @Override
   public final boolean contains(Object value) {
@@ -23,8 +26,6 @@ public final boolean add(Integer value) {
     return addInt((Integer) value);
   }
   
-  public abstract boolean addInt(int value);
-  
   @Override
   public final boolean remove(Object value) {
     if (value instanceof Integer) {
@@ -57,8 +58,4 @@ public boolean retainAll(Collection<?> c) {
     return modified;
   }
 
-  public abstract boolean removeInt(int value);
-  
-  @Override
-  public abstract PrimitiveIterator.OfInt iterator();
 }
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/FibonacciIntegerRangeEncoder.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/FibonacciIntegerRangeEncoder.java
@@ -52,7 +52,7 @@ public static IntegerSet decode(BitString bitString) throws DecodingException {
     }
 
     int count = FixedIntegerEncoder.decode(bitString, 0, 12);
-    BitStringSet value = new BitStringSet();
+    IntegerBitSet value = new IntegerBitSet();
 
     int offset = 0;
     int startIndex = 12;
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/FixedIntegerRangeEncoder.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/FixedIntegerRangeEncoder.java
@@ -48,7 +48,7 @@ public static IntegerSet decode(BitString bitString) throws DecodingException {
     }
 
     int count = FixedIntegerEncoder.decode(bitString, 0, 12);
-    BitStringSet value = new BitStringSet();
+    IntegerBitSet value = new IntegerBitSet();
     int startIndex = 12;
     for (int i = 0; i < count; i++) {
       boolean group = BooleanEncoder.decode(bitString, startIndex, 1);
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/IntegerBitSet.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/IntegerBitSet.java
@@ -2,35 +2,39 @@
 
 import java.util.BitSet;
 import java.util.NoSuchElementException;
+import java.util.Spliterator;
+import java.util.Spliterators;
 import java.util.PrimitiveIterator.OfInt;
+import java.util.stream.IntStream;
+import java.util.stream.StreamSupport;
 
-public final class BitStringSet extends BaseIntegerSet {
+public final class IntegerBitSet extends BaseIntegerSet {
   static final int MAX_COLLECTION_SIZE = 16384;
 
   protected final BitSet bitSet;
   protected final int from;
   protected final int to;
 
-  public BitStringSet(BitSet bitSet, int from, int to) {
+  public IntegerBitSet(BitSet bitSet, int from, int to) {
     this.bitSet = bitSet;
     this.from = from;
     this.to = to;
   }
   
-  public static final BitStringSet withLimit(int limit) {
-    return new BitStringSet(new BitSet(0), 0, limit);
+  public static final IntegerBitSet withLimit(int limit) {
+    return new IntegerBitSet(new BitSet(0), 0, limit);
   }
   
-  public BitStringSet(int size) {
+  public IntegerBitSet(int size) {
     this(new BitSet(size), 0, MAX_COLLECTION_SIZE);
   }
   
-  public BitStringSet() {
+  public IntegerBitSet() {
     this(0);
   }
 
-  public static final BitStringSet of(int... values) {
-    BitStringSet out = new BitStringSet();
+  public static final IntegerBitSet of(int... values) {
+    IntegerBitSet out = new IntegerBitSet();
     for (int value : values) {
       out.addInt(value);
     }
@@ -91,6 +95,18 @@ public int nextInt() {
     };
   }
 
+  @Override
+  public Spliterator.OfInt spliterator(){
+    return Spliterators.spliteratorUnknownSize(
+        iterator(),
+        Spliterator.ORDERED | Spliterator.DISTINCT | Spliterator.IMMUTABLE | Spliterator.NONNULL);
+  }
+
+  @Override
+  public IntStream intStream() {
+    return StreamSupport.intStream(spliterator(), false);
+  }
+  
   public void addRange(int start, int end) {
     int realStart = from + start;
     int realEnd = from + end;
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/IntegerSet.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/IntegerSet.java
@@ -1,15 +1,30 @@
 package com.iab.gpp.encoder.datatype.encoder;
 
+import java.util.Collection;
 import java.util.PrimitiveIterator;
 import java.util.Set;
+import java.util.Spliterator;
+import java.util.stream.IntStream;
 
 public interface IntegerSet extends Set<Integer> {
   boolean containsInt(int value);
+  
+  default boolean containsAny(Collection<?> c) {
+    for (Object e : c) {
+      if (!contains(e)) {
+          return false;
+      }
+    }
+    String.join(null, null)
+    return true;
+  }
 
   boolean addInt(int value);
 
   boolean removeInt(int value);
   
+  IntStream intStream();
+  
   @Override
   PrimitiveIterator.OfInt iterator();
 }
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/OptimizedFibonacciRangeEncoder.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/OptimizedFibonacciRangeEncoder.java
@@ -41,7 +41,7 @@ public static IntegerSet decode(BitString bitString) throws DecodingException {
     } else {
       BitString bits = bitString.substring(17);
       int length = bits.length();
-      BitStringSet value = new BitStringSet(length + 1);
+      IntegerBitSet value = new IntegerBitSet(length + 1);
       for (int i = 0; i < length; i++) {
         if (bits.getValue(i)) {
           value.addInt(i + 1);
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/OptimizedFixedRangeEncoder.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/OptimizedFixedRangeEncoder.java
@@ -41,7 +41,7 @@ public static IntegerSet decode(BitString bitString) throws DecodingException {
     } else {
       BitString bits = bitString.substring(17);
       int length = bits.length();
-      BitStringSet value = new BitStringSet(length + 1);
+      IntegerBitSet value = new IntegerBitSet(length + 1);
       for (int i = 0; i < length; i++) {
         if (bits.getValue(i)) {
           value.addInt(i + 1);
diff --git a/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/GppModelTest.java b/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/GppModelTest.java
@@ -7,7 +7,7 @@
 import java.util.Set;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import com.iab.gpp.encoder.datatype.encoder.BitStringSet;
+import com.iab.gpp.encoder.datatype.encoder.IntegerBitSet;
 import com.iab.gpp.encoder.error.DecodingException;
 import com.iab.gpp.encoder.field.TcfCaV1Field;
 import com.iab.gpp.encoder.field.TcfEuV2Field;
@@ -362,9 +362,9 @@ public void testEncodeUspV1AndTcfEuV2AndTcfCaV1() {
         Arrays.asList(3, 4, 5, 9, 10, 11, 15, 16, 17, 21, 22, 23));
     gppModel.setFieldValue(TcfCaV1.NAME, TcfCaV1Field.NUM_CUSTOM_PURPOSES, 3);
     gppModel.setFieldValue(TcfCaV1.NAME, TcfCaV1Field.CUSTOM_PURPOSES_EXPRESS_CONSENT,
-        BitStringSet.of(1));
+        IntegerBitSet.of(1));
     gppModel.setFieldValue(TcfCaV1.NAME, TcfCaV1Field.CUSTOM_PURPOSES_IMPLIED_CONSENT,
-        BitStringSet.of(0,2));
+        IntegerBitSet.of(0,2));
 
     gppModel.setFieldValue(TcfCaV1.NAME, TcfCaV1Field.CREATED, utcDateTime);
     gppModel.setFieldValue(TcfCaV1.NAME, TcfCaV1Field.LAST_UPDATED, utcDateTime);
@@ -613,6 +613,7 @@ public void testDecodeUspv1AndTcfEuV2AndTcfCaV1() {
     Assertions.assertEquals(2, tcfCaV1Section.getCmpVersion());
     Assertions.assertEquals(413, tcfCaV1Section.getVendorListVersion());
     Assertions.assertEquals(true, tcfCaV1Section.getUseNonStandardStacks());
+    Assertions.assertTrue(tcfCaV1Section.getSpecialFeatureExpressConsent().intStream().anyMatch(x -> x== 7));
     Assertions.assertEquals(Set.of(6, 7, 8, 9, 10, 11),
         tcfCaV1Section.getSpecialFeatureExpressConsent());
     Assertions
diff --git a/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/datatype/encoder/FibonacciIntegerRangeEncoderTest.java b/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/datatype/encoder/FibonacciIntegerRangeEncoderTest.java
@@ -43,7 +43,7 @@ public void testEncode4() {
   @Test
   public void testEncode5() {
     BitStringBuilder builder = new BitStringBuilder();
-    IntegerSet set = new BitStringSet();
+    IntegerSet set = new IntegerBitSet();
     set.addAll(Arrays.asList(6, 7, 2, 5));
     FibonacciIntegerRangeEncoder.encode(builder, set);
     Assertions.assertEquals("000000000010001110011011", builder.build().toString());
diff --git a/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/datatype/encoder/FixedBitfieldEncoderTest.java b/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/datatype/encoder/FixedBitfieldEncoderTest.java
diff --git a/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/datatype/encoder/FixedIntegerRangeEncoderTest.java b/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/datatype/encoder/FixedIntegerRangeEncoderTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package com.iab.gpp.encoder.bitstring;`
`2`	`2`
`3`	`3`	`import java.util.BitSet;`
`4`		`-import com.iab.gpp.encoder.datatype.encoder.BitStringSet;`
	`4`	`+import com.iab.gpp.encoder.datatype.encoder.IntegerBitSet;`
`5`	`5`	`import com.iab.gpp.encoder.datatype.encoder.IntegerSet;`
`6`	`6`	`import com.iab.gpp.encoder.error.DecodingException;`
`7`	`7`
`@@ -46,7 +46,7 @@ public static final BitString of(String str) {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public IntegerSet toIntegerSet() {`
`49`		`- return new BitStringSet(bitSet, from, to);`
	`49`	`+ return new IntegerBitSet(bitSet, from, to);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public static IntegerSet decode(BitString bitString) throws DecodingException {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`int count = FixedIntegerEncoder.decode(bitString, 0, 12);`
`55`		`- BitStringSet value = new BitStringSet();`
	`55`	`+ IntegerBitSet value = new IntegerBitSet();`
`56`	`56`
`57`	`57`	`int offset = 0;`
`58`	`58`	`int startIndex = 12;`