${project.basedir}/src/main/resources/config/liquibase/master.xml
${project.basedir}/src/main/resources/config/liquibase/changelog/${maven.build.timestamp}_changelog.xml
-
+ <%= devDbInfo.driver %>
<%= baseName %>
- hibernate:spring:<%=packageName%>.domain?dialect=&hibernate.physical_naming_strategy=<%=packageName%>.config.SnakeCasePhysicalNamingStrategy
+ hibernate:spring:<%=packageName%>.domain?dialect=<%= devDbInfo.dialect %>&hibernate.physical_naming_strategy=<%=packageName%>.config.SnakeCasePhysicalNamingStrategy
true
debug
!test
diff --git a/generators/server/templates/src/main/java/package/App.java.ejs b/generators/server/templates/src/main/java/package/App.java.ejs
index 163302a7..64f681e2 100644
--- a/generators/server/templates/src/main/java/package/App.java.ejs
+++ b/generators/server/templates/src/main/java/package/App.java.ejs
@@ -2,7 +2,7 @@ package <%=packageName%>;
import <%=packageName%>.config.DefaultProfileUtil;
-import io.github.jhipster.config.JHipsterConstants;
+import tech.jhipster.config.JHipsterConstants;
import io.micronaut.context.ApplicationContext;
import io.micronaut.context.env.Environment;
diff --git a/generators/server/templates/src/main/java/package/config/ApplicationProperties.java.ejs b/generators/server/templates/src/main/java/package/config/ApplicationProperties.java.ejs
index d45f7d9b..780c48af 100644
--- a/generators/server/templates/src/main/java/package/config/ApplicationProperties.java.ejs
+++ b/generators/server/templates/src/main/java/package/config/ApplicationProperties.java.ejs
@@ -7,7 +7,7 @@ import io.micronaut.context.annotation.ConfigurationProperties;
* Properties specific to Jhipster Sample Application.
*
* Properties are configured in the {@code application.yml} file.
- * See {@link io.github.jhipster.config.JHipsterProperties} for a good example.
+ * See {@link <%=packageName%>.util.JHipsterProperties} for a good example.
*/
@ConfigurationProperties("application")
public class ApplicationProperties {
diff --git a/generators/server/templates/src/main/java/package/config/DefaultProfileUtil.java.ejs b/generators/server/templates/src/main/java/package/config/DefaultProfileUtil.java.ejs
index 624191cd..75cf9ae6 100644
--- a/generators/server/templates/src/main/java/package/config/DefaultProfileUtil.java.ejs
+++ b/generators/server/templates/src/main/java/package/config/DefaultProfileUtil.java.ejs
@@ -1,6 +1,6 @@
package <%=packageName%>.config;
-import io.github.jhipster.config.JHipsterConstants;
+import tech.jhipster.config.JHipsterConstants;
import java.util.*;
diff --git a/generators/server/templates/src/main/java/package/config/LoggingConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/LoggingConfiguration.java.ejs
index 1650440e..7068a068 100644
--- a/generators/server/templates/src/main/java/package/config/LoggingConfiguration.java.ejs
+++ b/generators/server/templates/src/main/java/package/config/LoggingConfiguration.java.ejs
@@ -75,9 +75,6 @@ public class LoggingConfiguration {
if (this.jHipsterProperties.getLogging().isUseJsonFormat() || this.jHipsterProperties.getLogging().getLogstash().isEnabled()) {
addContextListener(context);
}
- if (this.jHipsterProperties.getMetrics().getLogs().isEnabled()) {
- setMetricsMarkerLogbackFilter(context);
- }
}
private void addJsonConsoleAppender(LoggerContext context) {
@@ -194,33 +191,6 @@ public class LoggingConfiguration {
context.addListener(loggerContextListener);
}
- // Configure a log filter to remove "metrics" logs from all appenders except the "LOGSTASH" appender
- private void setMetricsMarkerLogbackFilter(LoggerContext context) {
- log.info("Filtering metrics logs from all appenders except the {} appender", LOGSTASH_APPENDER_NAME);
- OnMarkerEvaluator onMarkerMetricsEvaluator = new OnMarkerEvaluator();
- onMarkerMetricsEvaluator.setContext(context);
- onMarkerMetricsEvaluator.addMarker("metrics");
- onMarkerMetricsEvaluator.start();
- EvaluatorFilter metricsFilter = new EvaluatorFilter<>();
- metricsFilter.setContext(context);
- metricsFilter.setEvaluator(onMarkerMetricsEvaluator);
- metricsFilter.setOnMatch(FilterReply.DENY);
- metricsFilter.start();
-
- context.getLoggerList().forEach((logger) -> {
- for (Iterator> it = logger.iteratorForAppenders(); it.hasNext();) {
- Appender appender = it.next();
- if (!appender.getName().equals(ASYNC_LOGSTASH_APPENDER_NAME)
- && !(appender.getName().equals(CONSOLE_APPENDER_NAME) && this.jHipsterProperties.getLogging().isUseJsonFormat())) {
- log.debug("Filter metrics logs from the {} appender", appender.getName());
- appender.setContext(context);
- appender.addFilter(metricsFilter);
- appender.start();
- }
- }
- });
- }
-
/**
* Logback configuration is achieved by configuration file and API.
* When configuration file change is detected, the configuration is reset.
diff --git a/generators/server/templates/src/main/java/package/util/JHipsterProperties.java.ejs b/generators/server/templates/src/main/java/package/util/JHipsterProperties.java.ejs
index 83abebc4..49f42d77 100644
--- a/generators/server/templates/src/main/java/package/util/JHipsterProperties.java.ejs
+++ b/generators/server/templates/src/main/java/package/util/JHipsterProperties.java.ejs
@@ -1,6 +1,7 @@
package <%=packageName%>.util;
import io.micronaut.context.annotation.ConfigurationProperties;
+import tech.jhipster.config.JHipsterDefaults;
@ConfigurationProperties("jhipster")
public class JHipsterProperties {
@@ -8,13 +9,11 @@ public class JHipsterProperties {
private Cache cache;
private Mail mail;
private Logging logging;
- private Metrics metrics;
- public JHipsterProperties(Cache cache, Mail mail, Logging logging, Metrics metrics) {
+ public JHipsterProperties(Cache cache, Mail mail, Logging logging) {
this.cache = cache;
this.mail = mail;
this.logging = logging;
- this.metrics = metrics;
}
public Cache getCache() {
@@ -29,10 +28,6 @@ public class JHipsterProperties {
return logging;
}
- public Metrics getMetrics() {
- return metrics;
- }
-
public void setCache(Cache cache) {
this.cache = cache;
}
@@ -45,11 +40,6 @@ public class JHipsterProperties {
this.logging = logging;
}
- public void setMetrics(Metrics metrics) {
- this.metrics = metrics;
- }
-
-
@ConfigurationProperties("logging")
public static class Logging {
private boolean useJsonFormat = false;
@@ -113,41 +103,6 @@ public class JHipsterProperties {
}
}
- @ConfigurationProperties("metrics")
- public static class Metrics {
- private Logs logs = new Logs();
-
- public Logs getLogs() {
- return this.logs;
- }
-
- public void setLogs(Logs logs) {
- this.logs = logs;
- }
-
- @ConfigurationProperties("logs")
- public static class Logs {
- private boolean enabled = false;
- private long reportFrequency = 60L;
-
- public boolean isEnabled() {
- return this.enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public long getReportFrequency() {
- return this.reportFrequency;
- }
-
- public void setReportFrequency(long reportFrequency) {
- this.reportFrequency = reportFrequency;
- }
- }
- }
-
@ConfigurationProperties("mail")
public static class Mail {
private boolean enabled = false;
@@ -506,7 +461,7 @@ public class JHipsterProperties {
private int subscriptionConnectionMinimumIdleSize;
public Redis() {
- this.server = io.github.jhipster.config.JHipsterDefaults.Cache.Redis.server;
+ this.server = JHipsterDefaults.Cache.Redis.server;
this.expiration = 300;
this.cluster = false;
this.connectionPoolSize = 64;
diff --git a/generators/server/templates/src/main/resources/application-dev.yml.ejs b/generators/server/templates/src/main/resources/application-dev.yml.ejs
index 9b1f340c..06d78f89 100644
--- a/generators/server/templates/src/main/resources/application-dev.yml.ejs
+++ b/generators/server/templates/src/main/resources/application-dev.yml.ejs
@@ -77,22 +77,25 @@ mail:
jpa:
default:
- show-sql: false
properties:
- hibernate.dialect: "<%=dbInfo.dialect%>"
-<%_ if (['ehcache', 'caffeine', 'hazelcast', 'infinispan', 'memcached'].includes(cacheProvider)) { _%>
- hibernate.javax.cache.missing_cache_strategy: create
+ hibernate:
+ dialect: "<%=dbInfo.dialect%>"
+<%_ if (['ehcache', 'caffeine', 'hazelcast', 'infinispan', 'memcached', 'redis'].includes(cacheProvider)) { _%>
+ javax.cache.missing_cache_strategy: create
<%_ } _%>
- hibernate.id.new_generator_mappings: true
- hibernate.connection.provider_disables_autocommit: true
- hibernate.connection.autocommit: false
+ id.new_generator_mappings: true
+ connection:
+ provider_disables_autocommit: true
+ autocommit: false
+ cache:
+ use_query_cache: false
<%_ if (enableHibernateCache) { _%>
- hibernate.cache.use_second_level_cache: true
+ use_second_level_cache: true
<%_ } else { _%>
- hibernate.cache.use_second_level_cache: false
+ use_second_level_cache: false
<%_ } _%>
- hibernate.cache.use_query_cache: false
- hibernate.generate_statistics: false
+ generate_statistics: false
+ show-sql: false
<%_ } _%>
logger:
@@ -157,10 +160,6 @@ jhipster:
mail: # specific JHipster mail property, for standard properties see MailProperties
from: <%= baseName %>@localhost
base-url: http://127.0.0.1:8080
- metrics:
- logs: # Reports metrics in the logs
- enabled: false
- report-frequency: 60 # in seconds
logging:
use-json-format: false # By default, logs are not in Json format
logstash: # Forward logs to logstash over a socket, used by LoggingConfiguration
diff --git a/generators/server/templates/src/main/resources/application-prod.yml.ejs b/generators/server/templates/src/main/resources/application-prod.yml.ejs
index 45c4afc7..53a642c9 100644
--- a/generators/server/templates/src/main/resources/application-prod.yml.ejs
+++ b/generators/server/templates/src/main/resources/application-prod.yml.ejs
@@ -73,22 +73,26 @@ datasources:
---
jpa:
default:
- show-sql: false
properties:
- hibernate.dialect: "<%=dbInfo.dialect%>"
+ hibernate:
+ dialect: "<%=dbInfo.dialect%>"
<%_ if (['ehcache', 'caffeine', 'hazelcast', 'infinispan', 'memcached', 'redis'].includes(cacheProvider)) { _%>
- hibernate.javax.cache.missing_cache_strategy: create
+ javax.cache.missing_cache_strategy: create
<%_ } _%>
- hibernate.id.new_generator_mappings: true
- hibernate.connection.provider_disables_autocommit: true
- hibernate.connection.autocommit: false
+ id.new_generator_mappings: true
+ connection:
+ provider_disables_autocommit: true
+ autocommit: false
+ cache:
+ use_query_cache: false
<%_ if (enableHibernateCache) { _%>
- hibernate.cache.use_second_level_cache: true
+ use_second_level_cache: true
<%_ } else { _%>
- hibernate.cache.use_second_level_cache: false
+ use_second_level_cache: false
<%_ } _%>
- hibernate.cache.use_query_cache: false
- hibernate.generate_statistics: false
+ generate_statistics: false
+ show-sql: false
+
# Replace by 'prod, faker' to add the faker context and have sample data loaded in production
liquibase:
@@ -178,10 +182,6 @@ jhipster:
mail: # specific JHipster mail property, for standard properties see MailProperties
from: <%= baseName %>@localhost
base-url: http://my-server-url-to-change # Modify according to your server's URL
- metrics:
- logs: # Reports metrics in the logs
- enabled: false
- report-frequency: 60 # in seconds
logging:
use-json-format: false # By default, logs are not in Json format
logstash: # Forward logs to logstash over a socket, used by LoggingConfiguration
diff --git a/generators/server/templates/src/main/resources/logback.xml.ejs b/generators/server/templates/src/main/resources/logback.xml.ejs
index c2f9c898..c9a86274 100644
--- a/generators/server/templates/src/main/resources/logback.xml.ejs
+++ b/generators/server/templates/src/main/resources/logback.xml.ejs
@@ -37,6 +37,11 @@
-->
+
+
diff --git a/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs b/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs
index 8885c2aa..b8586431 100644
--- a/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs
+++ b/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs
@@ -51,6 +51,7 @@ public class DomainUserDetailsServiceIT {
@BeforeAll
public void init() {
+ userRepository.deleteAll();
userOne = new User();
userOne.setLogin(USER_ONE_LOGIN);
userOne.setPassword(RandomStringUtils.random(60));
diff --git a/generators/server/templates/src/test/resources/application-test.yml.ejs b/generators/server/templates/src/test/resources/application-test.yml.ejs
index c8252553..ca455988 100644
--- a/generators/server/templates/src/test/resources/application-test.yml.ejs
+++ b/generators/server/templates/src/test/resources/application-test.yml.ejs
@@ -34,7 +34,6 @@ liquibase:
jpa:
default:
- database-platform: io.github.jhipster.domain.util.FixedH2Dialect
properties:
hibernate:
cache:
@@ -45,6 +44,7 @@ jpa:
time_zone: UTC
hbm2ddl:
auto: none
+ show_sql: false
micronaut:
security:
@@ -71,7 +71,3 @@ jhipster:
mail:
from: test@localhost
base-url: http://127.0.0.1:8080
- metrics:
- logs: # Reports metrics in the logs
- enabled: false
- report-frequency: 60 # in seconds