Skip to content

Commit d36dafc

Browse files
puneetbehlpuneetbehl
committed
Rename StarterConfiguration to GrailsForgeConfiguration
1 parent 9854b11 commit d36dafc

16 files changed

+48
-47
lines changed

‎grails-cli/src/main/java/org/grails/forge/cli/Application.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ static int execute(String[] args) {
100100
}
101101

102102
private static CommandLine createCommandLine(BeanContext beanContext, boolean noOpConsole) {
103-
Application starter = beanContext.getBean(Application.class);
104-
CommandLine commandLine = new CommandLine(starter, new GrailsPicocliFactory(beanContext));
103+
Application application = beanContext.getBean(Application.class);
104+
CommandLine commandLine = new CommandLine(application, new GrailsPicocliFactory(beanContext));
105105
commandLine.setExecutionExceptionHandler((ex, commandLine1, parseResult) -> EXCEPTION_HANDLER.apply(ex, commandLine1));
106106
commandLine.setUsageHelpWidth(100);
107107

108-
CodeGenConfig codeGenConfig = CodeGenConfig.load(beanContext, noOpConsole ? ConsoleOutput.NOOP : starter);
108+
CodeGenConfig codeGenConfig = CodeGenConfig.load(beanContext, noOpConsole ? ConsoleOutput.NOOP : application);
109109
if (codeGenConfig != null) {
110110
beanContext.getBeanDefinitions(CodeGenCommand.class).stream()
111111
.map(BeanDefinition::getBeanType)

‎grails-forge-api/src/main/java/org/grails/forge/api/ApplicationController.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import java.util.stream.Collectors;
4949

5050
/**
51-
* Main interface on the the starter API.
51+
* Main interface on the the Grails Application Forge API.
5252
*
5353
* @author graemerocher
5454
* @since 1.0.0
@@ -65,16 +65,16 @@
6565
public class ApplicationController implements ApplicationTypeOperations {
6666

6767
private final FeatureOperations featureOperations;
68-
private final StarterConfiguration configuration;
68+
private final GrailsForgeConfiguration configuration;
6969
private final MessageSource messageSource;
7070

7171
/**
7272
* Default constructor.
7373
* @param featureOperations The feature operations.
74-
* @param configuration The starter configuration
74+
* @param configuration The Grails Application Forge configuration
7575
* @param messageSource The message source
7676
*/
77-
public ApplicationController(FeatureOperations featureOperations, StarterConfiguration configuration, MessageSource messageSource) {
77+
public ApplicationController(FeatureOperations featureOperations, GrailsForgeConfiguration configuration, MessageSource messageSource) {
7878
this.featureOperations = featureOperations;
7979
this.configuration = configuration;
8080
this.messageSource = messageSource;

‎grails-forge-api/src/main/java/org/grails/forge/api/ApplicationTypeDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
@Introspected
3838
public class ApplicationTypeDTO extends Linkable implements Named, Described, Selectable<ApplicationType> {
3939

40-
static final String MESSAGE_PREFIX = StarterConfiguration.PREFIX + ".application-types.";
40+
static final String MESSAGE_PREFIX = GrailsForgeConfiguration.PREFIX + ".application-types.";
4141
private final String name;
4242
private final List<FeatureDTO> features;
4343
private final String title;

‎grails-forge-api/src/main/java/org/grails/forge/api/BuildToolDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
@Schema(name = "BuildToolInfo")
3333
public class BuildToolDTO implements Selectable<BuildTool> {
3434

35-
static final String MESSAGE_PREFIX = StarterConfiguration.PREFIX + ".buildTools.";
35+
static final String MESSAGE_PREFIX = GrailsForgeConfiguration.PREFIX + ".buildTools.";
3636

3737
BuildTool value;
3838
String label;

‎grails-forge-api/src/main/java/org/grails/forge/api/FeatureDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
@Schema(name = "Feature")
3434
public class FeatureDTO extends Linkable implements Named, Described {
3535

36-
static final String MESSAGE_PREFIX = StarterConfiguration.PREFIX + ".features.";
36+
static final String MESSAGE_PREFIX = GrailsForgeConfiguration.PREFIX + ".features.";
3737

3838
private final String name;
3939
private final String title;

‎grails-forge-api/src/main/java/org/grails/forge/api/GormImplDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@Schema(name = "GormImplInfo")
3636
@Introspected
3737
public class GormImplDTO extends Linkable implements Named, Described, Selectable<GormImpl> {
38-
static final String MESSAGE_PREFIX = StarterConfiguration.PREFIX + ".gormImpl.";
38+
static final String MESSAGE_PREFIX = GrailsForgeConfiguration.PREFIX + ".gormImpl.";
3939
private final String name;
4040
private final String description;
4141
private final GormImpl value;

‎grails-forge-api/src/main/java/org/grails/forge/api/StarterConfiguration.java ‎grails-forge-api/src/main/java/org/grails/forge/api/GrailsForgeConfiguration.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,19 @@
3030
* @author graemerocher
3131
* @since 1.0.0
3232
*/
33-
@ConfigurationProperties(StarterConfiguration.PREFIX)
34-
public class StarterConfiguration {
33+
@ConfigurationProperties(GrailsForgeConfiguration.PREFIX)
34+
public class GrailsForgeConfiguration {
3535
public static final String PREFIX = "grails.forge";
3636

3737
private URL url;
3838
private String path;
39-
private URI redirectUri = URI.create("https://start.grails.org");
39+
//TODO: Fix this before deploying
40+
private URI redirectUri = URI.create("http://localhost:3000");
4041

4142
/**
4243
* Default constructor.
4344
*/
44-
public StarterConfiguration() {
45+
public GrailsForgeConfiguration() {
4546
String hostname = System.getenv(Environment.HOSTNAME);
4647
if (hostname != null) {
4748
try {

‎grails-forge-api/src/main/java/org/grails/forge/api/JdkVersionDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
@Schema(name = "JdkVersionInfo")
3535
@Introspected
3636
public class JdkVersionDTO extends Linkable implements Named, Described, Selectable<JdkVersion> {
37-
static final String MESSAGE_PREFIX = StarterConfiguration.PREFIX + ".jdkVersion.";
37+
static final String MESSAGE_PREFIX = GrailsForgeConfiguration.PREFIX + ".jdkVersion.";
3838
private final JdkVersion value;
3939
private final String name;
4040
private final String description;

‎grails-forge-api/src/main/java/org/grails/forge/api/LanguageDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
@Schema(name = "LanguageInfo")
3838
@Introspected
3939
public class LanguageDTO extends Linkable implements Named, Described, Selectable<Language>, IncludesDefaults<LanguageDefaults> {
40-
static final String MESSAGE_PREFIX = StarterConfiguration.PREFIX + ".language.";
40+
static final String MESSAGE_PREFIX = GrailsForgeConfiguration.PREFIX + ".language.";
4141
private final String name;
4242
private final String extension;
4343
private final String description;

‎grails-forge-api/src/main/java/org/grails/forge/api/TestFrameworkDTO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
@Schema(name = "TestFrameworkInfo")
3939
@Introspected
4040
public class TestFrameworkDTO extends Linkable implements Named, Described, Selectable<TestFramework> {
41-
static final String MESSAGE_PREFIX = StarterConfiguration.PREFIX + ".testFramework.";
41+
static final String MESSAGE_PREFIX = GrailsForgeConfiguration.PREFIX + ".testFramework.";
4242
private final String name;
4343
private final String description;
4444
private final LanguageDTO defaultLanguage;

‎grails-forge-api/src/main/java/org/grails/forge/api/bind/RequestInfoArgumentBinder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import io.micronaut.http.HttpRequest;
2323
import io.micronaut.http.bind.binders.TypedRequestArgumentBinder;
2424
import org.grails.forge.api.RequestInfo;
25-
import org.grails.forge.api.StarterConfiguration;
25+
import org.grails.forge.api.GrailsForgeConfiguration;
2626
import jakarta.inject.Singleton;
2727

2828
import java.util.Locale;
@@ -38,13 +38,13 @@
3838
public class RequestInfoArgumentBinder implements TypedRequestArgumentBinder<RequestInfo> {
3939

4040
private static final Argument<RequestInfo> TYPE = Argument.of(RequestInfo.class);
41-
private final StarterConfiguration configuration;
41+
private final GrailsForgeConfiguration configuration;
4242

4343
/**
4444
* Default constructor.
4545
* @param configuration The configuration
4646
*/
47-
public RequestInfoArgumentBinder(StarterConfiguration configuration) {
47+
public RequestInfoArgumentBinder(GrailsForgeConfiguration configuration) {
4848
this.configuration = configuration;
4949
}
5050

‎grails-forge-api/src/main/java/org/grails/forge/api/create/github/GitHubCreateController.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public HttpResponse<GitHubCreateDTO> createApp(
122122
if (launcherURI == null) {
123123
return HttpResponse.ok(new GitHubCreateDTO(repository.getUrl(), repository.getCloneUrl(), repository.getHtmlUrl()));
124124
} else {
125-
return HttpResponse.temporaryRedirect(redirectService.constructLauncherRedirectUrl(repository));
125+
return HttpResponse.temporaryRedirect(redirectService.constructGrailsForgeRedirectUrl(repository));
126126
}
127127
}
128128
} catch (Exception e) {
@@ -133,7 +133,7 @@ public HttpResponse<GitHubCreateDTO> createApp(
133133
if (launcherURI == null) {
134134
throw e;
135135
} else {
136-
return HttpResponse.temporaryRedirect(redirectService.constructLauncherErrorRedirectUrl(e.getMessage()));
136+
return HttpResponse.temporaryRedirect(redirectService.constructGrailsForgeErrorRedirectUrl(e.getMessage()));
137137
}
138138
}
139139
}
@@ -161,7 +161,7 @@ public HttpResponse<String> handleCallback(
161161
@Nullable @QueryValue("error_description") String errorDescription) {
162162
URI redirect;
163163
if (!StringUtils.isEmpty(error)) {
164-
redirect = redirectService.constructLauncherErrorRedirectUrl(errorDescription);
164+
redirect = redirectService.constructGrailsForgeErrorRedirectUrl(errorDescription);
165165
} else {
166166
redirect = redirectService.getLauncherURI();
167167
}

‎grails-forge-api/src/main/java/org/grails/forge/api/create/github/GitHubCreateService.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import io.micronaut.core.annotation.Nullable;
2222
import io.micronaut.http.client.exceptions.HttpClientResponseException;
2323
import jakarta.inject.Singleton;
24-
import org.grails.forge.api.StarterConfiguration;
24+
import org.grails.forge.api.GrailsForgeConfiguration;
2525
import org.grails.forge.api.TestFramework;
2626
import org.grails.forge.api.create.AbstractCreateController;
2727
import org.grails.forge.application.ApplicationType;
@@ -69,14 +69,14 @@ public class GitHubCreateService extends AbstractCreateController {
6969

7070
private final GitHubOAuthClient gitHubOAuthClient;
7171
private final GitHubApiClient gitHubApiClient;
72-
private final StarterConfiguration.GitHubConfiguration gitHubConfiguration;
72+
private final GrailsForgeConfiguration.GitHubConfiguration gitHubConfiguration;
7373

7474
public GitHubCreateService(
7575
@NotNull ProjectGenerator projectGenerator,
7676
@NotNull ApplicationEventPublisher eventPublisher,
7777
@NotNull GitHubOAuthClient gitHubOAuthClient,
7878
@NotNull GitHubApiClient gitHubApiClient,
79-
@NotNull StarterConfiguration.GitHubConfiguration gitHubConfiguration) {
79+
@NotNull GrailsForgeConfiguration.GitHubConfiguration gitHubConfiguration) {
8080
super(projectGenerator, eventPublisher);
8181
this.gitHubOAuthClient = gitHubOAuthClient;
8282
this.gitHubApiClient = gitHubApiClient;

‎grails-forge-api/src/main/java/org/grails/forge/api/create/github/GitHubRedirectService.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import io.micronaut.context.annotation.Requires;
2020
import io.micronaut.http.uri.UriBuilder;
2121
import org.grails.forge.api.RequestInfo;
22-
import org.grails.forge.api.StarterConfiguration;
22+
import org.grails.forge.api.GrailsForgeConfiguration;
2323
import org.grails.forge.client.github.oauth.GitHubOAuthClient;
2424
import org.grails.forge.client.github.v3.GitHubRepository;
2525
import jakarta.inject.Singleton;
@@ -45,13 +45,13 @@ public class GitHubRedirectService {
4545
private static final String AUTHORIZE_PATH = "/login/oauth/authorize";
4646

4747
private final String githubOAuthUrl;
48-
private final StarterConfiguration starterConfiguration;
49-
private final StarterConfiguration.GitHubConfiguration gitHubConfiguration;
48+
private final GrailsForgeConfiguration starterConfiguration;
49+
private final GrailsForgeConfiguration.GitHubConfiguration gitHubConfiguration;
5050

5151
public GitHubRedirectService(
5252
@NotNull @Property(name = OAUTH_URL) String githubOAuthUrl,
53-
@NotNull StarterConfiguration starterConfiguration,
54-
@NotNull StarterConfiguration.GitHubConfiguration gitHubConfiguration) {
53+
@NotNull GrailsForgeConfiguration starterConfiguration,
54+
@NotNull GrailsForgeConfiguration.GitHubConfiguration gitHubConfiguration) {
5555
this.githubOAuthUrl = githubOAuthUrl + AUTHORIZE_PATH;
5656
this.starterConfiguration = starterConfiguration;
5757
this.gitHubConfiguration = gitHubConfiguration;
@@ -83,16 +83,16 @@ protected URI constructOAuthRedirectUrl(RequestInfo requestInfo) {
8383
}
8484

8585
/**
86-
* Creates redirect URI back to launcher app with details about created github repository in query parameters.
86+
* Creates redirect URI back to Grails Application Forge with details about created github repository in query parameters.
8787
*
88-
* @param gitHubRepository github repository
89-
* @return URI or null if the launcher url is missing in starter
88+
* @param gitHubRepository GitHub Repository
89+
* @return URI or null if the Grails Application Forge URL is missing
9090
*/
91-
protected URI constructLauncherRedirectUrl(GitHubRepository gitHubRepository) {
91+
protected URI constructGrailsForgeRedirectUrl(GitHubRepository gitHubRepository) {
9292
URI redirectUri = getLauncherURI();
9393
if (redirectUri == null) {
9494
if (LOG.isWarnEnabled()) {
95-
LOG.warn("Can't construct redirect back to launcher as configuration is missing redirect uri.");
95+
LOG.warn("Can't construct redirect back to Grails Application Forge as configuration is missing redirect uri.");
9696
}
9797
return null;
9898
}
@@ -104,23 +104,23 @@ protected URI constructLauncherRedirectUrl(GitHubRepository gitHubRepository) {
104104
.queryParam("htmlUrl", gitHubRepository.getHtmlUrl())
105105
.build();
106106
} catch (Exception e) {
107-
String msg = "Failed to construct redirect to URI back to launcher: " + e.getMessage();
107+
String msg = "Failed to construct redirect to URI back to Grails Application Forge: " + e.getMessage();
108108
LOG.error(msg, e);
109109
throw new RuntimeException(msg);
110110
}
111111
}
112112

113113
/**
114-
* Creates redirect URI back to launcher app with error message.
114+
* Creates redirect URI back to Grails app forge with error message.
115115
*
116116
* @param error message
117-
* @return URI or null if the launcher url is missing in starter
117+
* @return URI or null if the Grails Forge url is missing
118118
*/
119-
protected URI constructLauncherErrorRedirectUrl(String error) {
119+
protected URI constructGrailsForgeErrorRedirectUrl(String error) {
120120
URI redirectUri = getLauncherURI();
121121
if (redirectUri == null) {
122122
if (LOG.isWarnEnabled()) {
123-
LOG.warn("Can't construct redirect back to launcher as configuration is missing redirect uri.");
123+
LOG.warn("Can't construct redirect back to Grails Application Forge as configuration is missing redirect uri.");
124124
}
125125
return null;
126126
}
@@ -130,7 +130,7 @@ protected URI constructLauncherErrorRedirectUrl(String error) {
130130
.queryParam("error", error)
131131
.build();
132132
} catch (Exception e) {
133-
String msg = "Failed to construct error redirect to URI back to launcher: " + e.getMessage();
133+
String msg = "Failed to construct error redirect to URI back to Grails Application Forge: " + e.getMessage();
134134
LOG.error(msg, e);
135135
throw new RuntimeException(msg);
136136
}

‎grails-forge-api/src/main/java/org/grails/forge/api/options/SelectOptionsController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import jakarta.inject.Singleton;
2727

2828
/**
29-
* Gets Information about select options for the starter.
29+
* Gets Information about select options for the Grails Forge.
3030
*
3131
* @since 2.2.0
3232
*/
@@ -37,7 +37,7 @@ public class SelectOptionsController implements SelectOptionsOperations {
3737
MessageSource messageSource;
3838

3939
/**
40-
* Gets select options for the starter
40+
* Gets select options for the Grails Forge
4141
*
4242
* @return Select Options and their defaults.
4343
*/

‎grails-forge-core/src/main/java/org/grails/forge/util/VersionInfo.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class VersionInfo {
4545
}
4646

4747
/**
48-
* @return The starter version
48+
* @return The Grails version
4949
*/
5050
public static String getVersion() {
5151
Package aPackage = VersionInfo.class.getPackage();
@@ -59,7 +59,7 @@ public static String getVersion() {
5959
}
6060

6161
/**
62-
* @return Checks whether the starter is a snapshot version.
62+
* @return Checks whether the Grails is a snapshot version.
6363
*/
6464
public static boolean isSnapshot() {
6565
return getVersion().endsWith("-SNAPSHOT");

0 commit comments

Comments
 (0)