Skip to content

Commit

Permalink
Merge pull request #11780 from qmonmert/typo240125
Browse files Browse the repository at this point in the history
Rename variables
  • Loading branch information
pascalgrimaud authored Jan 25, 2025
2 parents 924511f + da266a1 commit 47eec22
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public class AngularOauth2ModuleFactory {
import { Oauth2AuthService } from './auth/oauth2-auth.service';
""";

private static final ElementReplacer APPNAME_NEEDLE = lineAfterRegex("appName = signal\\(''\\);");
private static final ElementReplacer APP_NAME_NEEDLE = lineAfterRegex("appName = signal\\(''\\);");

private static final String INJECT_OAUTH2_AUTH_SERVICE =
"""
Expand Down Expand Up @@ -139,7 +139,7 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
.add(lineAfterRegex("from '@angular/core';"), OAUTH2_AUTH_SERVICE_IMPORT)
.add(lineAfterRegex("from './auth/oauth2-auth.service';"), LOGIN_IMPORT)
.add(INJECT_NEEDLE, INJECT_IMPORT)
.add(APPNAME_NEEDLE, INJECT_OAUTH2_AUTH_SERVICE)
.add(APP_NAME_NEEDLE, INJECT_OAUTH2_AUTH_SERVICE)
.add(lineAfterRegex("this.appName.set\\('" + properties.projectBaseName().name() + "'\\);"), INIT_AUTHENTICATION)
.and()
.in(path("src/main/webapp/app/app.component.html"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class ProtobufModuleFactory {

private static final String PROTOBUF_PACKAGE = "shared/protobuf";
private static final VersionSlug PROTOBUF_VERSION_SLUG = versionSlug("protobuf");
private static final GroupId PROTOBUF_GROUPID = groupId("com.google.protobuf");
private static final GroupId PROTOBUF_GROUP_ID = groupId("com.google.protobuf");

public JHipsterModule buildProtobufModule(JHipsterModuleProperties properties) {
Assert.notNull("properties", properties);
Expand All @@ -58,8 +58,8 @@ public JHipsterModule buildProtobufModule(JHipsterModuleProperties properties) {
)
.and()
.javaDependencies()
.addDependency(PROTOBUF_GROUPID, artifactId("protobuf-java"), PROTOBUF_VERSION_SLUG)
.addTestDependency(PROTOBUF_GROUPID, artifactId("protobuf-java-util"), PROTOBUF_VERSION_SLUG)
.addDependency(PROTOBUF_GROUP_ID, artifactId("protobuf-java"), PROTOBUF_VERSION_SLUG)
.addTestDependency(PROTOBUF_GROUP_ID, artifactId("protobuf-java-util"), PROTOBUF_VERSION_SLUG)
.and()
.mavenPlugins()
.pluginManagement(protobufMavenPluginManagement())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class OAuth2AccountModuleFactory {
private static final String INFRASTRUCTURE = "infrastructure";
private static final String PRIMARY = INFRASTRUCTURE + "/primary";
private static final String SECONDARY = INFRASTRUCTURE + "/secondary";
private static final String USERIDENTITY_DESTINATION = "shared/useridentity";
private static final String USER_IDENTITY_DESTINATION = "shared/useridentity";

private static final JHipsterSource ACCOUNT_SOURCE = from("server/springboot/mvc/security/oauth2/account");
private static final JHipsterSource ACCOUNT_MAIN_SOURCE = ACCOUNT_SOURCE.append("main");
Expand All @@ -33,8 +33,8 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
JHipsterDestination accountMainDestination = toSrcMainJava().append(packagePath).append("account");
JHipsterDestination accountTestDestination = toSrcTestJava().append(packagePath).append("account");

JHipsterDestination userIdentityMainDestination = toSrcMainJava().append(packagePath).append(USERIDENTITY_DESTINATION);
JHipsterDestination userIdentityTestDestination = toSrcTestJava().append(packagePath).append(USERIDENTITY_DESTINATION);
JHipsterDestination userIdentityMainDestination = toSrcMainJava().append(packagePath).append(USER_IDENTITY_DESTINATION);
JHipsterDestination userIdentityTestDestination = toSrcTestJava().append(packagePath).append(USER_IDENTITY_DESTINATION);

//@formatter:off
return moduleBuilder(properties)
Expand Down

0 comments on commit 47eec22

Please sign in to comment.