Skip to content

Commit

Permalink
#64 Update Spring Boot submodule configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
dvoraka committed Mar 31, 2019
1 parent 00657cb commit 456c55a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ public DefaultMicroservice(BuilderHelper helper, SpringConfigGenerator configGen
netSubmodule.addSubmoduleTo(srcBase);

// Spring Boot application
SpringBootAppSubmodule springBootAppSubmodule =
new DefaultSpringBootAppSubmodule(helper.getBaseName(), helper.getPackageName());
SpringBootAppSubmodule springBootAppSubmodule = new DefaultSpringBootAppSubmodule(helper);
springBootAppSubmodule.addSubmoduleTo(srcBase);

// Spring configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ public DefaultRestMicroservice(BuilderHelper helper, SpringConfigGenerator confi
restSubmodule.addSubmoduleTo(srcBase);

// Spring Boot application
SpringBootAppSubmodule springBootAppSubmodule =
new DefaultSpringBootAppSubmodule(helper.getBaseName(), helper.getPackageName());
SpringBootAppSubmodule springBootAppSubmodule = new DefaultSpringBootAppSubmodule(helper);
springBootAppSubmodule.addSubmoduleTo(srcBase);

// Spring configuration
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dvoraka.archbuilder.submodule.spring;

import dvoraka.archbuilder.BuilderHelper;
import dvoraka.archbuilder.data.Directory;
import dvoraka.archbuilder.springconfig.BeanMapping;
import dvoraka.archbuilder.template.TemplateHelper;
Expand All @@ -11,19 +12,17 @@

public class DefaultSpringBootAppSubmodule implements SpringBootAppSubmodule, TemplateHelper {

private final String baseName;
private final String packageName;
private final BuilderHelper helper;


public DefaultSpringBootAppSubmodule(String baseName, String packageName) {
this.baseName = baseName;
this.packageName = packageName;
public DefaultSpringBootAppSubmodule(BuilderHelper helper) {
this.helper = helper;
}

@Override
public void addSubmoduleTo(Directory srcBase) {
String appClassName = buildServiceAppName(baseName);
SourceTemplate appSourceTemplate = new SpringBootApp2Template(appClassName, packageName);
SourceTemplate appSourceTemplate =
new SpringBootApp2Template(helper.serviceAppName(), helper.getPackageName());
springBootApp(srcBase, appSourceTemplate);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,6 @@ default Directory springBootApp(Directory root, SourceTemplate template) {

//TODO: move to builder helper
////////////////////////////////
default String buildServiceName(String serviceName) {
return serviceName + "Service";
}

default String buildServiceAppName(String serviceName) {
return serviceName + "App";
}

default String buildConfigurationName(String baseName) {
return baseName + "Config";
}
Expand Down

0 comments on commit 456c55a

Please sign in to comment.