Clean up IDEA warnings

gradle · Apr 26, 2024 · 4b02fa0 · 4b02fa0
1 parent f4188de
commit 4b02fa0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...uration/model-core/src/main/java/org/gradle/internal/snapshot/impl/EnumValueSnapshot.java b/...uration/model-core/src/main/java/org/gradle/internal/snapshot/impl/EnumValueSnapshot.java
@@ -20,6 +20,8 @@
 import org.gradle.internal.snapshot.ValueSnapshot;
 import org.gradle.internal.snapshot.ValueSnapshotter;
 
+import javax.annotation.Nullable;
+
 public class EnumValueSnapshot implements ValueSnapshot {
     private final String className;
     private final String name;
@@ -44,19 +46,17 @@ public String getName() {
     }
 
     @Override
-    public ValueSnapshot snapshot(Object value, ValueSnapshotter snapshotter) {
+    public ValueSnapshot snapshot(@Nullable Object value, ValueSnapshotter snapshotter) {
         if (isEqualEnum(value)) {
             return this;
         }
         return snapshotter.snapshot(value);
     }
 
-    private boolean isEqualEnum(Object value) {
-        if (value instanceof Enum) {
+    private boolean isEqualEnum(@Nullable Object value) {
+        if (value instanceof Enum<?>) {
             Enum<?> enumValue = (Enum<?>) value;
-            if (enumValue.name().equals(name) && enumValue.getDeclaringClass().getName().equals(className)) {
-                return true;
-            }
+            return enumValue.name().equals(name) && enumValue.getDeclaringClass().getName().equals(className);
         }
         return false;
     }

diff --git a/...model-core/src/main/java/org/gradle/internal/snapshot/impl/IsolatedEnumValueSnapshot.java b/...model-core/src/main/java/org/gradle/internal/snapshot/impl/IsolatedEnumValueSnapshot.java
@@ -25,7 +25,7 @@
 /**
  * Isolates an Enum value and is a snapshot for that value.
  */
-public class IsolatedEnumValueSnapshot extends EnumValueSnapshot implements Isolatable<Enum> {
+public class IsolatedEnumValueSnapshot extends EnumValueSnapshot implements Isolatable<Enum<?>> {
     private final Enum<?> value;
 
     public IsolatedEnumValueSnapshot(Enum<?> value) {
@@ -43,7 +43,7 @@ public ValueSnapshot asSnapshot() {
     }
 
     @Override
-    public Enum isolate() {
+    public Enum<?> isolate() {
         return value;
     }