move and rename

yuzawa-san · yuzawa-san · commit 60a4e2e1fc63 · 2025-04-01T15:39:26.000-04:00
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/GppModel.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/GppModel.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.PrimitiveIterator;
-import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
 import com.iab.gpp.encoder.error.DecodingException;
 import com.iab.gpp.encoder.error.EncodingException;
 import com.iab.gpp.encoder.error.InvalidFieldException;
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
@@ -1,15 +1,13 @@
 package com.iab.gpp.encoder.datatype;
 
 import java.util.Collection;
-import java.util.List;
 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.FibonacciIntegerEncoder;
 import com.iab.gpp.encoder.datatype.encoder.FibonacciIntegerRangeEncoder;
 import com.iab.gpp.encoder.datatype.encoder.FixedIntegerEncoder;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
-import com.iab.gpp.encoder.datatype.encoder.ManagedSet;
 import com.iab.gpp.encoder.error.DecodingException;
 import com.iab.gpp.encoder.error.EncodingException;
 
@@ -62,6 +60,6 @@ public void setValue(Object value) {
 
   @Override
   public IntegerSet getValue() {
-    return new ManagedSet(this, super.getValue());
+    return new ManagedIntegerSet(this, super.getValue());
   }
 }
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
@@ -1,15 +1,11 @@
 package com.iab.gpp.encoder.datatype;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
-
 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.FixedBitfieldEncoder;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
-import com.iab.gpp.encoder.datatype.encoder.ManagedSet;
 import com.iab.gpp.encoder.error.DecodingException;
 import com.iab.gpp.encoder.error.EncodingException;
 
@@ -56,6 +52,6 @@ public void setValue(Object value) {
 
   @Override
   public IntegerSet getValue() {
-    return new ManagedSet(this, super.getValue());
+    return new ManagedIntegerSet(this, super.getValue());
   }
 }
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFixedIntegerList.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableFixedIntegerList.java
@@ -6,7 +6,6 @@
 import com.iab.gpp.encoder.bitstring.BitString;
 import com.iab.gpp.encoder.bitstring.BitStringBuilder;
 import com.iab.gpp.encoder.datatype.encoder.FixedIntegerListEncoder;
-import com.iab.gpp.encoder.datatype.encoder.ManagedList;
 import com.iab.gpp.encoder.error.DecodingException;
 import com.iab.gpp.encoder.error.EncodingException;
 
@@ -67,6 +66,6 @@ public void setValue(Object value) {
 
   @Override
   public List<Integer> getValue() {
-    return new ManagedList<>(this, super.getValue());
+    return new ManagedFixedList<>(this, super.getValue());
   }
 }
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
@@ -1,14 +1,12 @@
 package com.iab.gpp.encoder.datatype;
 
 import java.util.Collection;
-import java.util.List;
 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.FixedIntegerEncoder;
 import com.iab.gpp.encoder.datatype.encoder.FixedIntegerRangeEncoder;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
-import com.iab.gpp.encoder.datatype.encoder.ManagedSet;
 import com.iab.gpp.encoder.error.DecodingException;
 import com.iab.gpp.encoder.error.EncodingException;
 
@@ -61,6 +59,6 @@ public void setValue(Object value) {
   
   @Override
   public IntegerSet getValue() {
-    return new ManagedSet(this, super.getValue());
+    return new ManagedIntegerSet(this, super.getValue());
   }
 }
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
@@ -1,16 +1,13 @@
 package com.iab.gpp.encoder.datatype;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.function.IntSupplier;
 
 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.FixedBitfieldEncoder;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
-import com.iab.gpp.encoder.datatype.encoder.ManagedSet;
 import com.iab.gpp.encoder.error.DecodingException;
 import com.iab.gpp.encoder.error.EncodingException;
 
@@ -57,6 +54,6 @@ public void setValue(Object value) {
 
   @Override
   public IntegerSet getValue() {
-    return new ManagedSet(this, super.getValue());
+    return new ManagedIntegerSet(this, super.getValue());
   }
 }
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableOptimizedFibonacciRange.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/EncodableOptimizedFibonacciRange.java
@@ -6,7 +6,6 @@
 import com.iab.gpp.encoder.bitstring.BitStringBuilder;
 import com.iab.gpp.encoder.datatype.encoder.FixedIntegerEncoder;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
-import com.iab.gpp.encoder.datatype.encoder.ManagedSet;
 import com.iab.gpp.encoder.datatype.encoder.OptimizedFibonacciRangeEncoder;
 import com.iab.gpp.encoder.error.DecodingException;
 import com.iab.gpp.encoder.error.EncodingException;
@@ -68,6 +67,6 @@ public void setValue(Object value) {
 
   @Override
   public IntegerSet getValue() {
-    return new ManagedSet(this, super.getValue());
+    return new ManagedIntegerSet(this, super.getValue());
   }
 }
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
@@ -1,13 +1,11 @@
 package com.iab.gpp.encoder.datatype;
 
 import java.util.Collection;
-import java.util.List;
 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.FixedIntegerEncoder;
 import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
-import com.iab.gpp.encoder.datatype.encoder.ManagedSet;
 import com.iab.gpp.encoder.datatype.encoder.OptimizedFixedRangeEncoder;
 import com.iab.gpp.encoder.error.DecodingException;
 import com.iab.gpp.encoder.error.EncodingException;
@@ -61,6 +59,6 @@ public void setValue(Object value) {
 
   @Override
   public IntegerSet getValue() {
-    return new ManagedSet(this, super.getValue());
+    return new ManagedIntegerSet(this, super.getValue());
   }
 }
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/ManagedFixedList.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/ManagedFixedList.java
@@ -1,15 +1,14 @@
-package com.iab.gpp.encoder.datatype.encoder;
+package com.iab.gpp.encoder.datatype;
 
 import java.util.AbstractList;
 import java.util.List;
-import com.iab.gpp.encoder.datatype.DataType;
 
-public final class ManagedList<T> extends AbstractList<T> {
+final class ManagedFixedList<T> extends AbstractList<T> {
   
   private final DataType<?> parent;
   private final List<T> delegate;
   
-  public ManagedList(DataType<?> parent, List<T> delegate) {
+  ManagedFixedList(DataType<?> parent, List<T> delegate) {
     this.parent = parent;
     this.delegate = delegate;
   }
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,14 +1,15 @@
-package com.iab.gpp.encoder.datatype.encoder;
+package com.iab.gpp.encoder.datatype;
 
 import java.util.PrimitiveIterator;
-import com.iab.gpp.encoder.datatype.DataType;
+import com.iab.gpp.encoder.datatype.encoder.BaseIntegerSet;
+import com.iab.gpp.encoder.datatype.encoder.IntegerSet;
 
-public final class ManagedSet extends IntegerSet {
+final class ManagedIntegerSet extends BaseIntegerSet {
   
   private final DataType<?> parent;
   private final IntegerSet delegate;
   
-  public ManagedSet(DataType<?> parent, IntegerSet delegate) {
+  ManagedIntegerSet(DataType<?> parent, IntegerSet delegate) {
     this.parent = parent;
     this.delegate = delegate;
   }
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
@@ -0,0 +1,64 @@
+package com.iab.gpp.encoder.datatype.encoder;
+
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.PrimitiveIterator;
+
+public abstract class BaseIntegerSet extends AbstractSet<Integer> implements IntegerSet {
+  public abstract boolean containsInt(int value);
+  
+  @Override
+  public final boolean contains(Object value) {
+    if (value instanceof Integer) {
+      return containsInt((Integer) value);
+    }
+    return false; 
+  }
+  
+  @Override
+  public final boolean add(Integer value) {
+    if (value == null) {
+      return false;
+    }
+    return addInt((Integer) value);
+  }
+  
+  public abstract boolean addInt(int value);
+  
+  @Override
+  public final boolean remove(Object value) {
+    if (value instanceof Integer) {
+      return removeInt((Integer) value);
+    }
+    return false;
+  }
+  
+  @Override
+  public boolean removeAll(Collection<?> c) {
+    boolean modified = false;
+    for (Integer i : this) {
+      if (c.contains(i)) {
+        remove(i);
+        modified = true;
+      }
+    }
+    return modified;
+  }
+  
+  @Override
+  public boolean retainAll(Collection<?> c) {
+    boolean modified = false;
+    for (Integer i : this) {
+      if (!c.contains(i)) {
+        remove(i);
+        modified = true;
+      }
+    }
+    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/BitStringSet.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/datatype/encoder/BitStringSet.java
@@ -4,7 +4,7 @@
 import java.util.NoSuchElementException;
 import java.util.PrimitiveIterator.OfInt;
 
-public final class BitStringSet extends IntegerSet {
+public final class BitStringSet extends BaseIntegerSet {
   static final int MAX_COLLECTION_SIZE = 16384;
 
   protected final BitSet bitSet;
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,64 +1,15 @@
 package com.iab.gpp.encoder.datatype.encoder;
 
-import java.util.AbstractSet;
-import java.util.Collection;
 import java.util.PrimitiveIterator;
+import java.util.Set;
 
-public abstract class IntegerSet extends AbstractSet<Integer> {
-  public abstract boolean containsInt(int value);
-  
-  @Override
-  public final boolean contains(Object value) {
-    if (value instanceof Integer) {
-      return containsInt((Integer) value);
-    }
-    return false; 
-  }
-  
-  @Override
-  public final boolean add(Integer value) {
-    if (value == null) {
-      return false;
-    }
-    return addInt((Integer) value);
-  }
-  
-  public abstract boolean addInt(int value);
-  
-  @Override
-  public final boolean remove(Object value) {
-    if (value instanceof Integer) {
-      return removeInt((Integer) value);
-    }
-    return false;
-  }
-  
-  @Override
-  public boolean removeAll(Collection<?> c) {
-    boolean modified = false;
-    for (Integer i : this) {
-      if (c.contains(i)) {
-        remove(i);
-        modified = true;
-      }
-    }
-    return modified;
-  }
-  
-  @Override
-  public boolean retainAll(Collection<?> c) {
-    boolean modified = false;
-    for (Integer i : this) {
-      if (!c.contains(i)) {
-        remove(i);
-        modified = true;
-      }
-    }
-    return modified;
-  }
+public interface IntegerSet extends Set<Integer> {
+  boolean containsInt(int value);
+
+  boolean addInt(int value);
 
-  public abstract boolean removeInt(int value);
+  boolean removeInt(int value);
   
   @Override
-  public abstract PrimitiveIterator.OfInt iterator();
+  PrimitiveIterator.OfInt iterator();
 }
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/HeaderV1CoreSegment.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/HeaderV1CoreSegment.java
@@ -1,6 +1,5 @@
 package com.iab.gpp.encoder.segment;
 
-import java.util.ArrayList;
 import com.iab.gpp.encoder.base64.AbstractBase64UrlEncoder;
 import com.iab.gpp.encoder.base64.CompressedBase64UrlEncoder;
 import com.iab.gpp.encoder.bitstring.BitString;
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfCaV1CoreSegment.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfCaV1CoreSegment.java
@@ -1,7 +1,6 @@
 package com.iab.gpp.encoder.segment;
 
 import java.time.ZonedDateTime;
-import java.util.ArrayList;
 import com.iab.gpp.encoder.base64.AbstractBase64UrlEncoder;
 import com.iab.gpp.encoder.base64.CompressedBase64UrlEncoder;
 import com.iab.gpp.encoder.bitstring.BitString;
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfCaV1DisclosedVendorsSegment.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfCaV1DisclosedVendorsSegment.java
@@ -1,6 +1,5 @@
 package com.iab.gpp.encoder.segment;
 
-import java.util.ArrayList;
 import com.iab.gpp.encoder.base64.AbstractBase64UrlEncoder;
 import com.iab.gpp.encoder.base64.CompressedBase64UrlEncoder;
 import com.iab.gpp.encoder.bitstring.BitString;
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfCaV1PublisherPurposesSegment.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfCaV1PublisherPurposesSegment.java
@@ -1,6 +1,5 @@
 package com.iab.gpp.encoder.segment;
 
-import java.util.ArrayList;
 import java.util.function.IntSupplier;
 import com.iab.gpp.encoder.base64.AbstractBase64UrlEncoder;
 import com.iab.gpp.encoder.base64.CompressedBase64UrlEncoder;
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfEuV2CoreSegment.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfEuV2CoreSegment.java
@@ -1,7 +1,6 @@
 package com.iab.gpp.encoder.segment;
 
 import java.time.ZonedDateTime;
-import java.util.ArrayList;
 import com.iab.gpp.encoder.base64.AbstractBase64UrlEncoder;
 import com.iab.gpp.encoder.base64.TraditionalBase64UrlEncoder;
 import com.iab.gpp.encoder.bitstring.BitString;
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfEuV2PublisherPurposesSegment.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfEuV2PublisherPurposesSegment.java
@@ -1,6 +1,5 @@
 package com.iab.gpp.encoder.segment;
 
-import java.util.ArrayList;
 import java.util.function.IntSupplier;
 import com.iab.gpp.encoder.base64.AbstractBase64UrlEncoder;
 import com.iab.gpp.encoder.base64.TraditionalBase64UrlEncoder;
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfEuV2VendorsAllowedSegment.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfEuV2VendorsAllowedSegment.java
@@ -1,6 +1,5 @@
 package com.iab.gpp.encoder.segment;
 
-import java.util.ArrayList;
 import com.iab.gpp.encoder.base64.AbstractBase64UrlEncoder;
 import com.iab.gpp.encoder.base64.TraditionalBase64UrlEncoder;
 import com.iab.gpp.encoder.bitstring.BitString;
diff --git a/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfEuV2VendorsDisclosedSegment.java b/iabgpp-encoder/src/main/java/com/iab/gpp/encoder/segment/TcfEuV2VendorsDisclosedSegment.java
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
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
diff --git a/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/section/TcfCaV1Test.java b/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/section/TcfCaV1Test.java
diff --git a/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/section/TcfEuV2Test.java b/iabgpp-encoder/src/test/java/com/iab/gpp/encoder/section/TcfEuV2Test.java

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`import com.iab.gpp.encoder.bitstring.BitString;`
`7`	`7`	`import com.iab.gpp.encoder.bitstring.BitStringBuilder;`
`8`	`8`	`import com.iab.gpp.encoder.datatype.encoder.FixedIntegerListEncoder;`
`9`		`-import com.iab.gpp.encoder.datatype.encoder.ManagedList;`
`10`	`9`	`import com.iab.gpp.encoder.error.DecodingException;`
`11`	`10`	`import com.iab.gpp.encoder.error.EncodingException;`
`12`	`11`
`@@ -67,6 +66,6 @@ public void setValue(Object value) {`
`67`	`66`
`68`	`67`	`@Override`
`69`	`68`	`public List<Integer> getValue() {`
`70`		`- return new ManagedList<>(this, super.getValue());`
	`69`	`+ return new ManagedFixedList<>(this, super.getValue());`
`71`	`70`	`}`
`72`	`71`	`}`