Merge pull request #8529 from murdos/fix-builders-visibility

Fix visibility of builders

src/main/java/tech/jhipster/lite/module/domain/JHipsterModuleChanges.java

@@ -131,7 +131,7 @@ public SpringFactories springFactories() {
     return springFactories;
   }
 
-  public static class JHipsterModuleChangesBuilder
+  private static class JHipsterModuleChangesBuilder
     implements
       JHipsterModuleChangesProjectFolderBuilder,
       JHipsterModuleChangesIndentationBuilder,

src/main/java/tech/jhipster/lite/module/domain/javabuild/MavenBuildExtension.java

@@ -59,7 +59,7 @@ public boolean equals(Object obj) {
       .isEquals();
   }
 
-  public static class MavenBuildExtensionBuilder
+  private static class MavenBuildExtensionBuilder
     implements MavenBuildExtensionGroupIdBuilder, MavenBuildExtensionArtifactIdBuilder, MavenBuildExtensionOptionalValueBuilder {
 
     private GroupId groupId;

src/main/java/tech/jhipster/lite/module/domain/javabuildplugin/JavaBuildPlugin.java

@@ -45,7 +45,7 @@ public DependencyId dependencyId() {
     return dependencyId;
   }
 
-  public static class JavaBuildPluginBuilder
+  private static class JavaBuildPluginBuilder
     implements JavaBuildPluginGroupIdBuilder, JavaBuildPluginArtifactIdBuilder, JavaBuildPluginOptionalBuilder {
 
     private GroupId groupId;

src/main/java/tech/jhipster/lite/module/domain/javabuildplugin/JavaBuildPluginExecution.java

@@ -42,7 +42,7 @@ public Optional<JavaBuildPluginConfiguration> configuration() {
     return configuration;
   }
 
-  public static class JavaBuildPluginExecutionBuilder
+  private static class JavaBuildPluginExecutionBuilder
     implements JavaBuildPluginExecutionGoalsBuilder, JavaBuildPluginExecutionOptionalBuilder {
 
     private JavaBuildPluginExecutionId id;

src/main/java/tech/jhipster/lite/module/domain/javadependency/JavaDependency.java

@@ -192,7 +192,7 @@ public boolean equals(Object obj) {
       .isEquals();
   }
 
-  public static class JavaDependencyBuilder
+  private static class JavaDependencyBuilder
     implements JavaDependencyGroupIdBuilder, JavaDependencyArtifactIdBuilder, JavaDependencyOptionalValueBuilder {
 
     private GroupId groupId;

src/main/java/tech/jhipster/lite/module/domain/javadependency/ProjectJavaDependencies.java

@@ -61,7 +61,7 @@ public JavaDependencies dependencies() {
     return dependencies;
   }
 
-  public static class ProjectJavaDependenciesBuilder
+  private static class ProjectJavaDependenciesBuilder
     implements
       ProjectJavaDependenciesVersionsBuilder,
       ProjectJavaDependenciesDependenciesManagementBuilder,

src/main/java/tech/jhipster/lite/module/domain/javaproperties/SpringComment.java

@@ -27,7 +27,7 @@ private SpringProfile buildProfile(SpringProfile profile) {
     return profile;
   }
 
-  public static SpringCommentBuilder builder(SpringPropertyType type) {
+  public static SpringCommentPropertyKeyBuilder builder(SpringPropertyType type) {
     return new SpringCommentBuilder(type);
   }
 
@@ -53,7 +53,7 @@ public String filename() {
     return type.filePrefix() + "-" + profile.get();
   }
 
-  public static class SpringCommentBuilder
+  private static class SpringCommentBuilder
     implements SpringCommentPropertyKeyBuilder, SpringCommentCommentBuilder, SpringCommentProfileBuilder {
 
     private final SpringPropertyType type;

src/main/java/tech/jhipster/lite/module/domain/javaproperties/SpringProperty.java

@@ -27,7 +27,7 @@ private SpringProfile buildProfile(SpringProfile profile) {
     return profile;
   }
 
-  public static SpringPropertyBuilder builder(SpringPropertyType type) {
+  public static SpringPropertyKeyBuilder builder(SpringPropertyType type) {
     return new SpringPropertyBuilder(type);
   }
 
@@ -53,7 +53,7 @@ public String filename() {
     return type.filePrefix() + "-" + profile.get();
   }
 
-  public static class SpringPropertyBuilder implements SpringPropertyKeyBuilder, SpringPropertyValueBuilder, SpringPropertyProfileBuilder {
+  private static class SpringPropertyBuilder implements SpringPropertyKeyBuilder, SpringPropertyValueBuilder, SpringPropertyProfileBuilder {
 
     private final SpringPropertyType type;
     private PropertyKey key;

src/main/java/tech/jhipster/lite/module/domain/landscape/JHipsterLandscapeModule.java

@@ -84,7 +84,7 @@ public boolean equals(Object obj) {
     return new EqualsBuilder().append(module, other.module).isEquals();
   }
 
-  public static class JHipsterLandscapeModuleBuilder
+  private static class JHipsterLandscapeModuleBuilder
     implements
       JHipsterLandscapeModuleSlugBuilder,
       JHipsterLandscapeModuleOperationBuilder,

src/main/java/tech/jhipster/lite/module/domain/packagejson/PackageJsonDependency.java

@@ -56,11 +56,11 @@ public String toString() {
     return "PackageJsonDependency[" + "packageName=" + packageName + ", " + "versionSource=" + versionSource + ']';
   }
 
-  public static PackageJsonDependencyBuilder builder() {
+  public static PackageJsonDependencyPackageNameBuilder builder() {
     return new PackageJsonDependencyBuilder();
   }
 
-  public static class PackageJsonDependencyBuilder
+  private static class PackageJsonDependencyBuilder
     implements PackageJsonDependencyPackageNameBuilder, PackageJsonDependencyVersionSourceBuilder, PackageJsonDependencyOptionalBuilder {
 
     private PackageName packageName;

src/main/java/tech/jhipster/lite/module/domain/resource/JHipsterModulePropertyDefinition.java

@@ -133,7 +133,7 @@ public int order() {
     return order;
   }
 
-  public static class JHipsterModulePropertyDefinitionBuilder
+  private static class JHipsterModulePropertyDefinitionBuilder
     implements
       JHipsterModulePropertyDefinitionTypeBuilder,
       JHipsterModulePropertyDefinitionOptionalityBuilder,

src/main/java/tech/jhipster/lite/module/domain/resource/JHipsterModuleResource.java

@@ -65,7 +65,7 @@ public JHipsterModulePropertiesDefinition propertiesDefinition() {
     return propertiesDefinition;
   }
 
-  public static class JHipsterModuleResourceBuilder
+  private static class JHipsterModuleResourceBuilder
     implements
       JHipsterModuleResourceSlugBuilder,
       JHipsterModuleResourcePropertiesDefinitionBuilder,

src/main/java/tech/jhipster/lite/project/domain/history/ProjectAction.java

@@ -36,7 +36,8 @@ public ModuleParameters parameters() {
     return parameters;
   }
 
-  public static class ProjectActionBuilder implements ProjectActionModuleBuilder, ProjectActionDateBuilder, ProjectActionParametersBuilder {
+  private static class ProjectActionBuilder
+    implements ProjectActionModuleBuilder, ProjectActionDateBuilder, ProjectActionParametersBuilder {
 
     private ModuleSlug module;
     private Instant date;

src/main/java/tech/jhipster/lite/statistic/domain/AppliedModule.java

@@ -55,7 +55,7 @@ public ModuleProperties properties() {
     return properties;
   }
 
-  public static class ModuleAppliedBuilder
+  private static class ModuleAppliedBuilder
     implements
       ModuleAppliedIdBuilder,
       ModuleAppliedPathBuilder,

src/main/resources/generator/server/springboot/mvc/dummy/feature/main/domain/beer/Beer.java.mustache

@@ -11,7 +11,7 @@ public class Beer {
   private final BeerId id;
   private final BeerName name;
   private final Amount unitPrice;
-  
+
   private BeerSellingState sellingState;
 
   private Beer(BeerBuilder builder) {
@@ -49,12 +49,12 @@ public class Beer {
   public void removeFromSell() {
     sellingState = BeerSellingState.NOT_SOLD;
   }
-  
+
   public BeerSellingState sellingState() {
     return sellingState;
   }
 
-  public static class BeerBuilder
+  private static class BeerBuilder
     implements BeerIdBuilder, BeerNameBuilder, BeerUnitPriceBuilder, BeerSellStateBuilder, BeerOptionalBuilder {
 
     private BeerId id;

src/main/resources/generator/server/springboot/mvc/security/jwt/basic-auth/main/domain/AuthenticationQuery.java.mustache

@@ -35,7 +35,7 @@ public class AuthenticationQuery {
     return rememberMe;
   }
 
-  public static class AuthenticationQueryBuilder
+  private static class AuthenticationQueryBuilder
     implements AuthenticationQueryUsernameBuilder, AuthenticationQueryRolesBuilder, AuthenticationQueryRememberMeBuilder {
 
     private Username username;

src/main/resources/generator/server/springboot/mvc/security/oauth2/account/main/domain/Account.java.mustache

@@ -51,7 +51,7 @@ public class Account {
     return roles;
   }
 
-  public static class UserBuilder implements AccountUsernameBuilder, AccountFirstnameBuilder, AccountLastnameBuilder,
+  private static class UserBuilder implements AccountUsernameBuilder, AccountFirstnameBuilder, AccountLastnameBuilder,
       AccountEmailBuilder, AccountRolesBuilder, AccountOptionalFieldBuilder {
 
     private Username username;