remove unnecessary serialization and add back set isSet to TestSetting

Author: daniel-mohedano

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java

@@ -50,7 +50,7 @@ public class ExecutionSettings {
   @Nonnull private final Map<TestIdentifier, TestMetadata> skippableTests;
   @Nonnull private final Map<String, BitSet> skippableTestsCoverage;
   @Nonnull private final Map<TestFQN, Integer> testSettings;
-  @Nonnull private final EnumMap<TestSetting, Integer> settingsCount;
+  @Nonnull private final Map<TestSetting, Integer> settingsCount;
   @Nonnull private final Diff pullRequestDiff;
 
   public ExecutionSettings(
@@ -194,7 +194,7 @@ public boolean isKnownTestsDataAvailable() {
 
   private boolean isSetting(TestFQN test, TestSetting setting) {
     int mask = testSettings.getOrDefault(test, 0);
-    return (setting.getFlag() & mask) != 0;
+    return TestSetting.isSet(mask, setting);
   }
 
   public boolean isFlaky(TestFQN test) {
@@ -279,8 +279,6 @@ public static class ExecutionSettingsSerializer {
     private static final int TEST_SKIPPING_ENABLED_FLAG = 4;
     private static final int FLAKY_TEST_RETRIES_ENABLED_FLAG = 8;
     private static final int IMPACTED_TESTS_DETECTION_ENABLED_FLAG = 16;
-    private static final int FLAKY_TESTS_RECEIVED = 32;
-    private static final int KNOWN_TESTS_RECEIVED = 64;
 
     public static ByteBuffer serialize(ExecutionSettings settings) {
       Serializer s = new Serializer();
@@ -346,7 +344,7 @@ public static ExecutionSettings deserialize(ByteBuffer buffer) {
           (EnumMap<TestSetting, Integer>)
               Serializer.readMap(
                   buffer,
-                  new EnumMap<>(TestSetting.class),
+                  () -> new EnumMap<>(TestSetting.class),
                   TestSetting.TestSettingsSerializer::deserialize,
                   Serializer::readInt);
 

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TestSetting.java

@@ -26,6 +26,14 @@ public String asString() {
     return name;
   }
 
+  public static int set(int mask, TestSetting setting) {
+    return mask | setting.flag;
+  }
+
+  public static boolean isSet(int mask, TestSetting setting) {
+    return (mask & setting.flag) != 0;
+  }
+
   public static class TestSettingsSerializer {
     public static void serialize(Serializer serializer, TestSetting setting) {
       serializer.write(setting.flag);

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ipc/serialization/Serializer.java

@@ -187,18 +187,6 @@ public static <K, V> Map<K, V> readMap(
     return fillMap(byteBuffer, m, keyDeserializer, valueDeserializer, size);
   }
 
-  public static <K, V> Map<K, V> readMap(
-      ByteBuffer byteBuffer,
-      Map<K, V> m,
-      Function<ByteBuffer, K> keyDeserializer,
-      Function<ByteBuffer, V> valueDeserializer) {
-    int size = byteBuffer.getInt();
-    if (size == -1) {
-      return null;
-    }
-    return fillMap(byteBuffer, m, keyDeserializer, valueDeserializer, size);
-  }
-
   public static <K, V> Map<K, V> readMap(
       ByteBuffer byteBuffer,
       Supplier<Map<K, V>> mapSupplier,

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ipc/serialization/SerializerTest.groovy

@@ -123,46 +123,25 @@ class SerializerTest extends Specification {
     given:
     def serializer = new Serializer()
 
-    when:
-    serializer.write((Map) m)
-    def buf = serializer.flush()
-
-    then:
-    def deserializedMap = Serializer.readMap(buf, provider, Serializer::readString, Serializer::readString)
-    deserializedMap == m
-    deserializedMap.getClass() == clazz
-
-    where:
-    m                    | clazz         | provider
-    [:]                  | HashMap       | HashMap::new
-    ["a": "1", "b": "2"] | HashMap       | HashMap::new
-    [:]                  | LinkedHashMap | LinkedHashMap::new
-    ["a": "1", "b": "2"] | LinkedHashMap | LinkedHashMap::new
-    [:]                  | TreeMap       | TreeMap::new
-    ["a": "1", "b": "2"] | TreeMap       | TreeMap::new
-  }
-
-  def "test map deserialization with provided map: #m #mapProvided"() {
-    given:
-    def serializer = new Serializer()
-
     when:
     serializer.write((Map) m, keySerializer, Serializer::write)
     def buf = serializer.flush()
 
     then:
-    def deserializedMap = Serializer.readMap(buf, mapProvided, keyDeserializer, Serializer::readString)
+    def deserializedMap = Serializer.readMap(buf, provider, keyDeserializer, Serializer::readString)
     deserializedMap == m
-    deserializedMap == mapProvided
+    deserializedMap.getClass() == clazz
 
     where:
-    m                                  | mapProvided                 | keySerializer     | keyDeserializer
-    [:]                                | new HashMap<>()             | Serializer::write | Serializer::readString
-    ["a": "1", "b": "2"]               | new HashMap<>()             | Serializer::write | Serializer::readString
-    [:]                                | new HashMap<>()             | Serializer::write | Serializer::readInt
-    [1: "a", 2: "c"]                   | new HashMap<>()             | Serializer::write | Serializer::readInt
-    [:]                                | new EnumMap<>(MyEnum.class) | MyEnum::serialize | MyEnum::deserialize
-    [(MyEnum.A): "1", (MyEnum.B): "2"] | new EnumMap<>(MyEnum.class) | MyEnum::serialize | MyEnum::deserialize
+    m                                  | clazz         | provider                            | keySerializer     | keyDeserializer
+    [:]                                | HashMap       | HashMap::new                        | Serializer::write | Serializer::readString
+    ["a": "1", "b": "2"]               | HashMap       | HashMap::new                        | Serializer::write | Serializer::readString
+    [:]                                | LinkedHashMap | LinkedHashMap::new                  | Serializer::write | Serializer::readString
+    ["a": "1", "b": "2"]               | LinkedHashMap | LinkedHashMap::new                  | Serializer::write | Serializer::readString
+    [:]                                | TreeMap       | TreeMap::new                        | Serializer::write | Serializer::readString
+    ["a": "1", "b": "2"]               | TreeMap       | TreeMap::new                        | Serializer::write | Serializer::readString
+    [:]                                | EnumMap       | (() -> new EnumMap<>(MyEnum.class)) | MyEnum::serialize | MyEnum::deserialize
+    [(MyEnum.A): "1", (MyEnum.B): "2"] | EnumMap       | (() -> new EnumMap<>(MyEnum.class)) | MyEnum::serialize | MyEnum::deserialize
   }
 
   def "test mixed serialization"() {