Merge pull request #15005 from apache/forge-servlet-selection

Hide servlet features, should be selected via --servlet instead

Author: jamesfredley

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/spring/SpringBootEmbeddedServlet.java

@@ -33,4 +33,9 @@ public Class<?> getFeatureClass() {
     public String getCategory() {
         return Category.SERVER;
     }
+
+    @Override
+    public boolean isVisible() {
+        return false;
+    }
 }

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/spring/SpringBootJettyFeature.java

@@ -58,6 +58,6 @@ public void apply(GeneratorContext generatorContext) {
 
     @Override
     public boolean shouldApply(ApplicationType applicationType, Options options, Set<Feature> selectedFeatures) {
-        return selectedFeatures.stream().anyMatch(f -> f instanceof SpringBootJettyFeature) || options.getServletImpl() == ServletImpl.JETTY;
+        return options.getServletImpl() == ServletImpl.JETTY;
     }
 }

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/spring/SpringBootTomcatFeature.java

@@ -60,6 +60,6 @@ public void apply(GeneratorContext generatorContext) {
 
     @Override
     public boolean shouldApply(ApplicationType applicationType, Options options, Set<Feature> selectedFeatures) {
-        return selectedFeatures.stream().anyMatch(f -> f instanceof SpringBootTomcatFeature) || options.getServletImpl() == ServletImpl.TOMCAT;
+        return options.getServletImpl() == ServletImpl.TOMCAT;
     }
 }

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/spring/SpringBootUndertowFeature.java

@@ -58,6 +58,6 @@ public void apply(GeneratorContext generatorContext) {
 
     @Override
     public boolean shouldApply(ApplicationType applicationType, Options options, Set<Feature> selectedFeatures) {
-        return selectedFeatures.stream().anyMatch(f -> f instanceof SpringBootUndertowFeature) || options.getServletImpl() == ServletImpl.UNDERTOW;
+        return options.getServletImpl() == ServletImpl.UNDERTOW;
     }
 }