You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by ma...@apache.org on 2026/04/15 10:46:10 UTC
(grails-core) 01/01: fix: clean up labels used in the forge ui
This is an automated email from the ASF dual-hosted git repository.
matrei pushed a commit to branch forge-label-cleanup
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 8d844a42d2bfc45d5bbaa32361284e49cddadf7c
Author: Mattias Reichel <ma...@gmail.com>
AuthorDate: Wed Apr 15 12:44:10 2026 +0200
fix: clean up labels used in the forge ui
---
.../org/grails/forge/api/DevelopmentReloadingDTO.java | 3 ++-
.../main/java/org/grails/forge/api/GormImplDTO.java | 3 ++-
.../main/java/org/grails/forge/api/ServletImplDTO.java | 3 ++-
.../grails/forge/api/preview/PreviewController.java | 2 +-
.../feature/micronaut/GrailsMicronautValidator.java | 2 +-
.../main/java/org/grails/forge/feature/test/Spock.java | 16 ++++++++++++++++
.../java/org/grails/forge/feature/view/GrailsGsp.java | 14 ++++++++++++--
.../org/grails/forge/options/DevelopmentReloading.java | 16 +++++++++++++---
.../main/java/org/grails/forge/options/GormImpl.java | 13 ++++++++++---
.../java/org/grails/forge/options/ServletImpl.java | 18 +++++++++++++-----
.../org/grails/forge/feature/view/GrailsGspSpec.groovy | 14 ++++++--------
11 files changed, 78 insertions(+), 26 deletions(-)
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/DevelopmentReloadingDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/DevelopmentReloadingDTO.java
index 67abe4d6d2..412bab03f1 100644
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/DevelopmentReloadingDTO.java
+++ b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/DevelopmentReloadingDTO.java
@@ -74,6 +74,7 @@ public class DevelopmentReloadingDTO extends Linkable implements Named, Describe
this.description = messageSource.getMessage(MESSAGE_PREFIX + name + ".description", messageContext, NameUtils.getNaturalNameOfEnum(name));
}
+ @NonNull
@Override
@Schema(description = "A description of the developmentReloading")
public String getDescription() {
@@ -97,6 +98,6 @@ public class DevelopmentReloadingDTO extends Linkable implements Named, Describe
@Override
@Schema(description = "The label of the developmentReloading for select options")
public String getLabel() {
- return description;
+ return value.getLabel();
}
}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/GormImplDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/GormImplDTO.java
index 5d41a0b4bf..c92448a2f1 100644
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/GormImplDTO.java
+++ b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/GormImplDTO.java
@@ -84,6 +84,7 @@ public class GormImplDTO extends Linkable implements Named, Described, Selectabl
}
+ @NonNull
@Override
@Schema(description = "A description of the GORM Implementation")
public String getDescription() {
@@ -106,6 +107,6 @@ public class GormImplDTO extends Linkable implements Named, Described, Selectabl
@Override
@Schema(description = "The label of the GORM Implementation for select options")
public String getLabel() {
- return NameUtils.getNaturalNameOfEnum(name);
+ return value.getLabel();
}
}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ServletImplDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ServletImplDTO.java
index 221eddd736..bf0e572188 100644
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ServletImplDTO.java
+++ b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ServletImplDTO.java
@@ -73,6 +73,7 @@ public class ServletImplDTO extends Linkable implements Named, Described, Select
this.description = messageSource.getMessage(MESSAGE_PREFIX + name + ".description", messageContext, name);
}
+ @NonNull
@Override
@Schema(description = "A description of the GORM Implementation")
public String getDescription() {
@@ -95,6 +96,6 @@ public class ServletImplDTO extends Linkable implements Named, Described, Select
@Override
@Schema(description = "The label of the Servlet Implementation for select options")
public String getLabel() {
- return NameUtils.getNaturalNameOfEnum(name);
+ return value.getLabel();
}
}
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/preview/PreviewController.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/preview/PreviewController.java
index 1cb72a9b16..5f92955ddd 100644
--- a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/preview/PreviewController.java
+++ b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/preview/PreviewController.java
@@ -72,7 +72,7 @@ public class PreviewController extends AbstractCreateController implements Previ
* @param name The name of the application The name of the application
* @param features The features The chosen features
* @param build The build type (optional, defaults to Gradle)
- * @param reloading the development reloading (jrebel, dev tools, none, etc)
+ * @param reloading the development reloading (jrebel, spring boot devtools, none, etc)
* @param gorm The GORM (optional, defaults to Hibernate)
* @param servlet The Servlet (optional, defaults to Embedded Tomcat)
* @return A preview of the application contents.
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/GrailsMicronautValidator.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/GrailsMicronautValidator.java
index fb1d3851f2..725f0532be 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/GrailsMicronautValidator.java
+++ b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/GrailsMicronautValidator.java
@@ -36,7 +36,7 @@ public class GrailsMicronautValidator implements FeatureValidator {
if (features.stream().anyMatch(f -> f instanceof GrailsMicronaut)) {
if (features.stream().anyMatch(f -> (f instanceof SpringBootDevTools))) {
// See: https://github.com/micronaut-projects/micronaut-spring/issues/769
- throw new IllegalArgumentException("Spring Boot Dev Tools are not supported with Grails Micronaut");
+ throw new IllegalArgumentException("Spring Boot DevTools are not supported with Grails Micronaut");
}
}
}
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/Spock.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/Spock.java
index b897413111..53ce37d421 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/Spock.java
+++ b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/Spock.java
@@ -18,6 +18,7 @@
*/
package org.grails.forge.feature.test;
+import io.micronaut.core.annotation.NonNull;
import jakarta.inject.Singleton;
import org.grails.forge.application.ApplicationType;
import org.grails.forge.application.generator.GeneratorContext;
@@ -36,6 +37,21 @@ public class Spock implements Feature, DefaultFeature {
return "spock";
}
+ @NonNull
+ @Override
+ public String getTitle() {
+ return "Spock Testing Framework";
+ }
+
+ @NonNull
+ @Override
+ public String getDescription() {
+ return "Spock is a testing, specification, and mocking framework for JVM developers " +
+ "that emphasizes readability and clarity. By blending BDD concepts and Groovy's " +
+ "concise syntax, Spock helps teams write tests that are easy to understand and " +
+ "enjoyable to maintain.";
+ }
+
@Override
public boolean supports(ApplicationType applicationType) {
return true;
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/GrailsGsp.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/GrailsGsp.java
index 2c86c0de92..f91683320b 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/GrailsGsp.java
+++ b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/GrailsGsp.java
@@ -18,6 +18,7 @@
*/
package org.grails.forge.feature.view;
+import io.micronaut.core.annotation.NonNull;
import jakarta.inject.Singleton;
import org.grails.forge.application.ApplicationType;
import org.grails.forge.application.generator.GeneratorContext;
@@ -51,12 +52,21 @@ public class GrailsGsp implements DefaultFeature {
@Override
public String getTitle() {
- return "Grails GSP";
+ return "GSP";
}
+ @NonNull
@Override
public String getName() {
- return "grails-gsp";
+ return "gsp";
+ }
+
+ @NonNull
+ @Override
+ public String getDescription() {
+ return "GSP (Groovy Server Pages) is the server-side view technology used in Grails. " +
+ "It is designed to be familiar to developers with experience in ASP or JSP, while providing " +
+ "a more flexible, expressive, and intuitive way to build web pages.";
}
@Override
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/DevelopmentReloading.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/DevelopmentReloading.java
index 7408e09b52..e6896565a5 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/DevelopmentReloading.java
+++ b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/DevelopmentReloading.java
@@ -24,11 +24,16 @@ import java.util.Locale;
public enum DevelopmentReloading {
- DEVTOOLS,
- JREBEL,
- NONE;
+ DEVTOOLS("Spring Boot DevTools"),
+ JREBEL("JRebel"),
+ NONE("None");
public static final DevelopmentReloading DEFAULT_OPTION = DEVTOOLS;
+ private final String label;
+
+ DevelopmentReloading(String label) {
+ this.label = label;
+ }
@Override
public String toString() {
@@ -40,6 +45,11 @@ public enum DevelopmentReloading {
return name().toLowerCase(Locale.ENGLISH);
}
+ @NonNull
+ public String getLabel() {
+ return label;
+ }
+
public DevelopmentReloading toDevelopmentReloading() {
return switch (this) {
case DEVTOOLS -> DevelopmentReloading.DEVTOOLS;
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/GormImpl.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/GormImpl.java
index a216c382ee..3bfc9ac5d2 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/GormImpl.java
+++ b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/GormImpl.java
@@ -22,14 +22,16 @@ import io.micronaut.core.annotation.NonNull;
public enum GormImpl {
- HIBERNATE("gorm-hibernate5"),
- MONGODB("gorm-mongodb");
+ HIBERNATE("gorm-hibernate5", "Hibernate 5"),
+ MONGODB("gorm-mongodb", "MongoDB");
public static final GormImpl DEFAULT_OPTION = HIBERNATE;
private final String featureName;
+ private final String label;
- GormImpl(String featureName) {
+ GormImpl(String featureName, String label) {
this.featureName = featureName;
+ this.label = label;
}
@NonNull
@@ -37,4 +39,9 @@ public enum GormImpl {
return featureName;
}
+ @NonNull
+ public String getLabel() {
+ return label;
+ }
+
}
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/ServletImpl.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/ServletImpl.java
index 222c4dea4f..b7de75f099 100644
--- a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/ServletImpl.java
+++ b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/ServletImpl.java
@@ -27,20 +27,28 @@ import io.micronaut.core.annotation.NonNull;
* @since 6.0.0
*/
public enum ServletImpl {
- NONE("NONE"),
- TOMCAT("spring-boot-starter-tomcat"),
- JETTY("spring-boot-starter-jetty"),
- UNDERTOW("spring-boot-starter-undertow");
+
+ TOMCAT("spring-boot-starter-tomcat", "Tomcat"),
+ JETTY("spring-boot-starter-jetty", "Jetty"),
+ UNDERTOW("spring-boot-starter-undertow", "Undertow"),
+ NONE("NONE", "None");
public static final ServletImpl DEFAULT_OPTION = TOMCAT;
private final String featureName;
+ private final String label;
- ServletImpl(String featureName) {
+ ServletImpl(String featureName, String label) {
this.featureName = featureName;
+ this.label = label;
}
@NonNull
public String getName() {
return featureName;
}
+
+ @NonNull
+ public String getLabel() {
+ return label;
+ }
}
diff --git a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/view/GrailsGspSpec.groovy b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/view/GrailsGspSpec.groovy
index b654cd79c0..e87edf1696 100644
--- a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/view/GrailsGspSpec.groovy
+++ b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/view/GrailsGspSpec.groovy
@@ -27,26 +27,24 @@ import org.grails.forge.application.generator.GeneratorContext
import org.grails.forge.feature.Features
import org.grails.forge.fixture.CommandOutputFixture
import org.grails.forge.options.DevelopmentReloading
-import org.grails.forge.options.JdkVersion
import org.grails.forge.options.Options
-import org.grails.forge.options.TestFramework
import spock.lang.Unroll
class GrailsGspSpec extends ApplicationContextSpec implements CommandOutputFixture {
- void "test grails-gsp feature"() {
+ void "test gsp feature"() {
when:
- final Features features = getFeatures(["grails-gsp"])
+ final Features features = getFeatures(["gsp"])
then:
features.contains("grails-web")
- features.contains("grails-gsp")
+ features.contains("gsp")
}
void "test dependencies are present for Gradle"() {
when:
final String template = new BuildBuilder(beanContext)
- .features(["grails-gsp"])
+ .features(["gsp"])
.render()
then:
@@ -57,7 +55,7 @@ class GrailsGspSpec extends ApplicationContextSpec implements CommandOutputFixtu
void "test gsp configuration"() {
when:
- final GeneratorContext ctx = buildGeneratorContext(["grails-gsp"])
+ final GeneratorContext ctx = buildGeneratorContext(["gsp"])
then:
ctx.getConfiguration().containsKey("grails.views.gsp.encoding")
@@ -70,7 +68,7 @@ class GrailsGspSpec extends ApplicationContextSpec implements CommandOutputFixtu
void "test mime configuration"() {
when:
- final GeneratorContext ctx = buildGeneratorContext(["grails-gsp"])
+ final GeneratorContext ctx = buildGeneratorContext(["gsp"])
then:
ctx.getConfiguration().get("grails.mime.disable.accept.header.userAgents") == Arrays.asList("Gecko", "WebKit", "Presto", "Trident")