fix: null handling with Structure, Value

pom.xml

@@ -53,7 +53,7 @@
       <!-- used so that lombok can generate suppressions for spotbugs. It needs to find it on the relevant classpath -->
       <groupId>com.github.spotbugs</groupId>
       <artifactId>spotbugs</artifactId>
-      <version>4.7.3</version>
+      <version>4.8.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -365,7 +365,7 @@
           <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs</artifactId>
-            <version>4.7.3</version>
+            <version>4.8.0</version>
           </dependency>
         </dependencies>
         <executions>

spotbugs-exclusions.xml

@@ -26,6 +26,26 @@
         <Class name="dev.openfeature.sdk.OpenFeatureAPI"/>
         <Bug pattern="EI_EXPOSE_REP2"/>
     </And>
+    <And>
+        Added in spotbugs 4.8.0 - EventProvider shares a name with something from the standard lib (confuising), but change would be breaking
+        <Class name="dev.openfeature.sdk.EventProvider"/>
+        <Bug pattern="PI_DO_NOT_REUSE_PUBLIC_IDENTIFIERS_CLASS_NAMES"/>
+    </And>
+    <And>
+        Added in spotbugs 4.8.0 - Metadata shares a name with something from the standard lib (confuising), but change would be breaking
+        <Class name="dev.openfeature.sdk.Metadata"/>
+        <Bug pattern="PI_DO_NOT_REUSE_PUBLIC_IDENTIFIERS_CLASS_NAMES"/>
+    </And>
+    <And>
+        Added in spotbugs 4.8.0 - Reason shares a name with something from the standard lib (confuising), but change would be breaking
+        <Class name="dev.openfeature.sdk.Reason"/>
+        <Bug pattern="PI_DO_NOT_REUSE_PUBLIC_IDENTIFIERS_CLASS_NAMES"/>
+    </And>
+    <And>
+        Added in spotbugs 4.8.0 - FlagValueType.STRING shares a name with something from the standard lib (confuising), but change would be breaking
+        <Class name="dev.openfeature.sdk.FlagValueType"/>
+        <Bug pattern="PI_DO_NOT_REUSE_PUBLIC_IDENTIFIERS_FIELD_NAMES"/>
+    </And>
 
     <!-- Test class that should be excluded -->
     <Match>

src/main/java/dev/openfeature/sdk/ImmutableStructure.java

@@ -79,9 +79,10 @@ public Map<String, Object> asObjectMap() {
         return attributes
                 .entrySet()
                 .stream()
-                .collect(Collectors.toMap(
-                        Map.Entry::getKey,
-                        e -> convertValue(getValue(e.getKey()))
-                ));
+                // custom collector, workaround for Collectors.toMap in JDK8
+                // https://bugs.openjdk.org/browse/JDK-8148463
+                .collect(HashMap::new,
+                        (accumulated, entry) -> accumulated.put(entry.getKey(), convertValue(entry.getValue())),
+                        HashMap::putAll);
     }
-}
+}

src/main/java/dev/openfeature/sdk/Structure.java

@@ -54,6 +54,11 @@ public interface Structure {
      * @return an Object containing the primitive type.
      */
     default Object convertValue(Value value) {
+
+        if (value == null || value.isNull()) {
+            return null;
+        }
+
         if (value.isBoolean()) {
             return value.asBoolean();
         }

src/main/java/dev/openfeature/sdk/Value.java

@@ -19,11 +19,15 @@
  */
 @ToString
 @EqualsAndHashCode
-@SuppressWarnings({"PMD.BeanMembersShouldSerialize", "checkstyle:MissingJavadocType"})
+@SuppressWarnings({"PMD.BeanMembersShouldSerialize", "checkstyle:MissingJavadocType", "checkstyle:NoFinalizer"})
 public class Value implements Cloneable {
 
     private final Object innerObject;
 
+    protected final void finalize() {
+        // DO NOT REMOVE, spotbugs: CT_CONSTRUCTOR_THROW
+    }
+
     /**
      * Construct a new null Value.
      */

src/test/java/dev/openfeature/sdk/StructureTest.java

@@ -100,4 +100,18 @@ void mapToStructureTest() {
         assertEquals(new Value(immutableContext), res.getValue("ImmutableContext"));
         assertNull(res.getValue("nullKey"));
     }
+
+    @Test
+    void asObjectHandlesNullValue() {
+        Map<String, Value> map = new HashMap<>();
+        map.put("null", new Value((String)null));
+        ImmutableStructure structure = new ImmutableStructure(map);
+        assertNull(structure.asObjectMap().get("null"));
+    }
+
+    @Test
+    void convertValueHandlesNullValue() {
+        ImmutableStructure structure = new ImmutableStructure();
+        assertNull(structure.convertValue(new Value((String)null)));
+    }
 }