Skip to content

Commit

Permalink
WebFlux module
Browse files Browse the repository at this point in the history
  • Loading branch information
DamnClin committed Jul 20, 2022
1 parent f2574dc commit f74a54b
Show file tree
Hide file tree
Showing 28 changed files with 209 additions and 989 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,5 @@ private GeneratorAction() {}

public static final String REACT_CYPRESS = "react-cypress";

public static final String SPRINGBOOT_WEBFLUX_NETTY = "springboot-webflux-netty";

public static final String CLIENT_COMMON_PLAYWRIGHT = "client-common-playwright";
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,50 +18,26 @@ public void addProperties(Project project, String key, Object value) {
springBootCommonService.addProperties(project, key, value);
}

public void addPropertiesLocal(Project project, String key, Object value) {
springBootCommonService.addPropertiesLocal(project, key, value);
}

public void addPropertiesTest(Project project, String key, Object value) {
springBootCommonService.addPropertiesTest(project, key, value);
}

public void addPropertiesTestLogging(Project project, String key, Level value) {
springBootCommonService.addPropertiesTestLogging(project, key, value);
}

public void addPropertiesNewLine(Project project) {
springBootCommonService.addPropertiesNewLine(project);
}

public void addPropertiesLocalNewLine(Project project) {
springBootCommonService.addPropertiesLocalNewLine(project);
}

public void addPropertiesTestNewLine(Project project) {
springBootCommonService.addPropertiesTestNewLine(project);
}

public void addPropertiesTestLoggingNewLine(Project project) {
springBootCommonService.addPropertiesTestLoggingNewLine(project);
}

public void addPropertiesComment(Project project, String text) {
springBootCommonService.addPropertiesComment(project, text);
}

public void addPropertiesLocalComment(Project project, String text) {
springBootCommonService.addPropertiesLocalComment(project, text);
}

public void addPropertiesTestComment(Project project, String text) {
springBootCommonService.addPropertiesTestComment(project, text);
}

public void addPropertiesTestLoggingComment(Project project, String text) {
springBootCommonService.addPropertiesTestLoggingComment(project, text);
}

public void addLogger(Project project, String packageName, Level level) {
springBootCommonService.addLogger(project, packageName, level);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,11 @@ public void addProperties(Project project, String key, Object value) {
addKeyValueToProperties(project, key, value, MAIN_RESOURCES, APPLICATION_PROPERTIES, NEEDLE_APPLICATION_PROPERTIES);
}

@Override
public void addPropertiesLocal(Project project, String key, Object value) {
addKeyValueToProperties(project, key, value, MAIN_RESOURCES, APPLICATION_LOCAL_PROPERTIES, NEEDLE_APPLICATION_LOCAL_PROPERTIES);
}

@Override
public void addPropertiesTest(Project project, String key, Object value) {
addKeyValueToProperties(project, key, value, TEST_RESOURCES, APPLICATION_PROPERTIES, NEEDLE_APPLICATION_TEST_PROPERTIES);
}

@Override
public void addPropertiesTestLogging(Project project, String key, Level value) {
addKeyValueToProperties(
project,
"logging.level." + key,
value,
TEST_RESOURCES,
APPLICATION_PROPERTIES,
NEEDLE_APPLICATION_TEST_LOGGING_PROPERTIES
);
}

private void addKeyValueToProperties(
Project project,
String key,
Expand All @@ -67,21 +50,11 @@ public void addPropertiesNewLine(Project project) {
addNewLineToProperties(project, MAIN_RESOURCES, APPLICATION_PROPERTIES, NEEDLE_APPLICATION_PROPERTIES);
}

@Override
public void addPropertiesLocalNewLine(Project project) {
addNewLineToProperties(project, MAIN_RESOURCES, APPLICATION_LOCAL_PROPERTIES, NEEDLE_APPLICATION_LOCAL_PROPERTIES);
}

@Override
public void addPropertiesTestNewLine(Project project) {
addNewLineToProperties(project, TEST_RESOURCES, APPLICATION_PROPERTIES, NEEDLE_APPLICATION_TEST_PROPERTIES);
}

@Override
public void addPropertiesTestLoggingNewLine(Project project) {
addNewLineToProperties(project, TEST_RESOURCES, APPLICATION_PROPERTIES, NEEDLE_APPLICATION_TEST_LOGGING_PROPERTIES);
}

private void addNewLineToProperties(Project project, String folderProperties, String fileProperties, String needleProperties) {
String propertiesWithNeedle = LF + needleProperties;
projectRepository.replaceText(project, getPath(folderProperties, CONFIG), fileProperties, needleProperties, propertiesWithNeedle);
Expand All @@ -92,21 +65,11 @@ public void addPropertiesComment(Project project, String text) {
addCommentToProperties(project, text, MAIN_RESOURCES, APPLICATION_PROPERTIES, NEEDLE_APPLICATION_PROPERTIES);
}

@Override
public void addPropertiesLocalComment(Project project, String text) {
addCommentToProperties(project, text, MAIN_RESOURCES, APPLICATION_LOCAL_PROPERTIES, NEEDLE_APPLICATION_LOCAL_PROPERTIES);
}

@Override
public void addPropertiesTestComment(Project project, String text) {
addCommentToProperties(project, text, TEST_RESOURCES, APPLICATION_PROPERTIES, NEEDLE_APPLICATION_TEST_PROPERTIES);
}

@Override
public void addPropertiesTestLoggingComment(Project project, String text) {
addCommentToProperties(project, text, TEST_RESOURCES, APPLICATION_PROPERTIES, NEEDLE_APPLICATION_TEST_LOGGING_PROPERTIES);
}

private void addCommentToProperties(
Project project,
String text,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,11 @@

public interface SpringBootCommonService {
void addProperties(Project project, String key, Object value);
void addPropertiesLocal(Project project, String key, Object value);
void addPropertiesTest(Project project, String key, Object value);
void addPropertiesTestLogging(Project project, String key, Level value);
void addPropertiesNewLine(Project project);
void addPropertiesLocalNewLine(Project project);
void addPropertiesTestNewLine(Project project);
void addPropertiesTestLoggingNewLine(Project project);
void addPropertiesComment(Project project, String text);
void addPropertiesLocalComment(Project project, String text);
void addPropertiesTestComment(Project project, String text);
void addPropertiesTestLoggingComment(Project project, String text);

void addLogger(Project project, String packageName, Level level);
void addLoggerTest(Project project, String packageName, Level level);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,20 @@
package tech.jhipster.lite.generator.server.springboot.webflux.web.application;

import org.springframework.stereotype.Service;
import tech.jhipster.lite.generator.project.domain.Project;
import tech.jhipster.lite.generator.server.springboot.webflux.web.domain.SpringBootWebfluxService;
import tech.jhipster.lite.generator.server.springboot.webflux.web.domain.SpringBootWebfluxModuleFactory;
import tech.jhipster.lite.module.domain.JHipsterModule;
import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties;

@Service
public class SpringBootWebfluxApplicationService {

private final SpringBootWebfluxService springBootWebfluxService;
private final SpringBootWebfluxModuleFactory factory;

public SpringBootWebfluxApplicationService(SpringBootWebfluxService springBootWebfluxService) {
this.springBootWebfluxService = springBootWebfluxService;
public SpringBootWebfluxApplicationService() {
factory = new SpringBootWebfluxModuleFactory();
}

public void init(Project project) {
springBootWebfluxService.init(project);
}

public void addSpringBootWebflux(Project project) {
springBootWebfluxService.addSpringBootWebflux(project);
}

public void addExceptionHandler(Project project) {
springBootWebfluxService.addExceptionHandler(project);
public JHipsterModule buildModule(JHipsterModuleProperties properties) {
return factory.buildModule(properties);
}
}

This file was deleted.

This file was deleted.

Loading

0 comments on commit f74a54b

Please sign in to comment.