[4269] Just use ProfileActivation. There's only 1.

openrewrite#4269
crankydillo · Jul 31, 2024 · 2f598bc · 2f598bc
1 parent 1db298d
commit 2f598bc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/MavenSettings.java b/rewrite-maven/src/main/java/org/openrewrite/maven/MavenSettings.java
@@ -328,16 +328,6 @@ public static class Profile implements WithProfiles.Profile {
         @Nullable
         RawRepositories repositories;
 
-        @Override
-        public boolean isActive() {
-            return activation != null && activation.isActive();
-        }
-
-        @Override
-        public boolean isActiveByDefault() {
-            return activation != null && Boolean.TRUE.equals(activation.getActiveByDefault());
-        }
-
         /**
          * Returns true if this profile was activated either by the supplied active profiles
          * or by activation property, <i>but not solely by activeByDefault</i>.

diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/WithProfiles.java b/rewrite-maven/src/main/java/org/openrewrite/maven/WithProfiles.java
@@ -1,13 +1,18 @@
 package org.openrewrite.maven;
 
+import org.openrewrite.internal.lang.Nullable;
+import org.openrewrite.maven.tree.ProfileActivation;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
 public interface WithProfiles<P extends WithProfiles.Profile> {
     interface Profile {
+        @Nullable
         String getId();
-        boolean isActive();
-        boolean isActiveByDefault();
+
+        @Nullable
+        ProfileActivation getActivation();
     }
 
     List<P> listProfiles();
@@ -28,7 +33,7 @@ default List<P> activeProfiles(final Iterable<String> userSpecifiedProfiles) {
         }
 
         return profiles.stream()
-                .filter(p -> Boolean.TRUE.equals(p.isActiveByDefault()))
+                .filter(p -> p.getActivation() != null && Boolean.TRUE.equals(p.getActivation().getActiveByDefault()))
                 .collect(Collectors.toList());
     }
 
@@ -40,7 +45,7 @@ default boolean isActivated(final P profile, final Iterable<String> userSpecifie
                 }
             }
         }
-        return profile.isActive();
+        return profile.getActivation() != null && profile.getActivation().isActive();
     }
 
 }
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Profile.java b/rewrite-maven/src/main/java/org/openrewrite/maven/tree/Profile.java
@@ -45,16 +45,6 @@ public class Profile implements WithProfiles.Profile {
     List<Plugin> plugins;
     List<Plugin> pluginManagement;
 
-    @Override
-    public boolean isActive() {
-        return activation != null && activation.isActive();
-    }
-
-    @Override
-    public boolean isActiveByDefault() {
-        return activation != null && Boolean.TRUE.equals(activation.getActiveByDefault());
-    }
-
     /**
      * Returns true if this profile was activated either by the supplied active profiles
      * or by activation property, <i>but not solely by activeByDefault</i>.