From 0acf65c040422062f63db18b79a3f5c8cabf5436 Mon Sep 17 00:00:00 2001 From: Julien Dubois Date: Wed, 7 Oct 2015 18:44:44 +0200 Subject: [PATCH] Remove Java 7 code --- app/index.js | 33 +---- app/templates/_build.gradle | 11 +- app/templates/_gradle.properties | 4 +- app/templates/_pom.xml | 15 +-- .../_ExceptionHandlingAsyncTaskExecutor.java | 31 +---- .../package/config/_CacheConfiguration.java | 7 +- .../package/config/_MetricsConfiguration.java | 8 +- .../config/apidoc/_SwaggerConfiguration.java | 4 +- .../metrics/_DatabaseHealthIndicator.java | 16 +-- .../package/repository/_UserRepository.java | 19 +-- .../_CustomPersistentRememberMeServices.java | 27 +--- .../package/security/_UserDetailsService.java | 26 +--- .../package/service/_AuditEventService.java | 16 +-- .../java/package/service/_UserService.java | 104 ++------------- .../package/web/rest/_AccountResource.java | 118 +++--------------- .../java/package/web/rest/_AuditResource.java | 10 +- .../java/package/web/rest/_LogsResource.java | 15 +-- .../java/package/web/rest/_UserResource.java | 49 ++------ .../java/package/web/rest/dto/_UserDTO.java | 18 +-- .../resources/config/_application-dev.yml | 2 - .../resources/config/_application-prod.yml | 2 - .../package/service/_UserServiceTest.java | 93 +------------- .../web/rest/_AccountResourceTest.java | 54 +++----- cloudfoundry/index.js | 1 - entity/index.js | 4 - .../package/web/rest/_EntityResource.java | 47 ++----- heroku/index.js | 1 - openshift/index.js | 7 +- .../templates/openshift/action_hooks/_build | 2 - .../templates/openshift/action_hooks/_start | 2 - test/test-creation.js | 6 - 31 files changed, 129 insertions(+), 623 deletions(-) diff --git a/app/index.js b/app/index.js index eff48accf1ad..91a05cecd0ef 100644 --- a/app/index.js +++ b/app/index.js @@ -41,6 +41,7 @@ JhipsterGenerator.prototype.askFor = function askFor() { console.log(chalk.white.bold(' http://jhipster.github.io\n')); console.log(chalk.white('Welcome to the JHipster Generator ') + chalk.yellow('v' + packagejs.version + '\n')); var insight = this.insight(); + this.javaVersion = '8'; // Java version is forced to be 1.8. We keep the variable as it might be useful in the future. var questions = 15; // making questions a variable to avoid updating each question by hand when adding additional options var prompts = [ @@ -73,22 +74,6 @@ JhipsterGenerator.prototype.askFor = function askFor() { message: '(2/' + questions + ') What is your default Java package name?', default: 'com.mycompany.myapp' }, - { - type: 'list', - name: 'javaVersion', - message: '(3/' + questions + ') Do you want to use Java 8?', - choices: [ - { - value: '8', - name: 'Yes (use Java 8)' - }, - { - value: '7', - name: 'No (use Java 7 - Warning! Cassandra and ElasticSearch support will not be available)' - } - ], - default: 0 - }, { type: 'list', name: 'authenticationType', @@ -111,7 +96,7 @@ JhipsterGenerator.prototype.askFor = function askFor() { }, { when: function (response) { - return (!(response.authenticationType == 'oauth2' || response.javaVersion == '7')); + return (response.authenticationType != 'oauth2'); }, type: 'list', name: 'databaseType', @@ -134,7 +119,7 @@ JhipsterGenerator.prototype.askFor = function askFor() { }, { when: function (response) { - return (response.authenticationType == 'oauth2' || response.javaVersion == '7'); + return (response.authenticationType == 'oauth2'); }, type: 'list', name: 'databaseType', @@ -255,9 +240,6 @@ JhipsterGenerator.prototype.askFor = function askFor() { default: 1 }, { - when: function (response) { - return (!(response.javaVersion == '7') && response.databaseType == 'sql'); - }, type: 'list', name: 'searchEngine', message: '(9/' + questions + ') Do you want to use a search engine in your application?', @@ -375,7 +357,6 @@ JhipsterGenerator.prototype.askFor = function askFor() { if (this.useSass == undefined) { // backward compatibility for existing compass users this.useSass = this.config.get('useCompass'); } - this.javaVersion = this.config.get('javaVersion'); this.buildTool = this.config.get('buildTool'); this.frontendBuilder = this.config.get('frontendBuilder'); this.rememberMeKey = this.config.get('rememberMeKey'); @@ -394,8 +375,7 @@ JhipsterGenerator.prototype.askFor = function askFor() { this.searchEngine != null && this.useSass != null && this.buildTool != null && - this.frontendBuilder != null && - this.javaVersion != null) { + this.frontendBuilder != null) { // Generate key if key does not already exist in config if (this.rememberMeKey == null) { @@ -429,7 +409,6 @@ JhipsterGenerator.prototype.askFor = function askFor() { this.useSass = props.useSass; this.buildTool = props.buildTool; this.frontendBuilder = props.frontendBuilder; - this.javaVersion = props.javaVersion; this.enableTranslation = props.enableTranslation; this.rememberMeKey = crypto.randomBytes(20).toString('hex'); @@ -465,7 +444,6 @@ JhipsterGenerator.prototype.app = function app() { insight.track('app/useSass', this.useSass); insight.track('app/buildTool', this.buildTool); insight.track('app/frontendBuilder', this.frontendBuilder); - insight.track('app/javaVersion', this.javaVersion); insight.track('app/enableTranslation', this.enableTranslation); var packageFolder = this.packageName.replace(/\./g, '/'); @@ -482,7 +460,7 @@ JhipsterGenerator.prototype.app = function app() { this.slugifiedBaseName = _.slugify(this.baseName); if (this.prodDatabaseType === 'oracle') { // create a folder for users to place ojdbc jar - this.ojdbcVersion = this.javaVersion == '7' ? '6' : '7'; + this.ojdbcVersion = '7'; this.libFolder = 'lib/oracle/ojdbc/' + this.ojdbcVersion + '/'; mkdirp(this.libFolder); } @@ -1145,7 +1123,6 @@ JhipsterGenerator.prototype.app = function app() { this.config.set('useSass', this.useSass); this.config.set('buildTool', this.buildTool); this.config.set('frontendBuilder', this.frontendBuilder); - this.config.set('javaVersion', this.javaVersion); this.config.set('enableTranslation', this.enableTranslation); this.config.set('rememberMeKey', this.rememberMeKey); }; diff --git a/app/templates/_build.gradle b/app/templates/_build.gradle index 996214d60a6c..38ea3cdc0920 100644 --- a/app/templates/_build.gradle +++ b/app/templates/_build.gradle @@ -40,8 +40,7 @@ apply from: 'sonar.gradle' <% if (databaseType == 'sql') { %> apply from: 'liquibase.gradle'<% } %> apply from: 'gatling.gradle' -<% if (javaVersion == '8') { %> -apply from: 'mapstruct.gradle'<% } %> +apply from: 'mapstruct.gradle' if (project.hasProperty('prod')) { apply from: 'profile_prod.gradle' @@ -165,9 +164,9 @@ dependencies { <% if (devDatabaseType == 'mysql' || prodDatabaseType == 'mysql') { %> compile group: 'mysql', name: 'mysql-connector-java'<% } %><% if (devDatabaseType == 'postgresql' || prodDatabaseType == 'postgresql') { %> compile group: 'org.postgresql', name: 'postgresql', version: postgresql_version<% } %><% if (devDatabaseType == 'h2Memory') { %> - compile group: 'com.h2database', name: 'h2'<% } %><% if (javaVersion == '8') { %> - compile group: 'fr.ippon.spark.metrics', name: 'metrics-spark-reporter', version: metrics_spark_reporter_version<% } %><% if (javaVersion == '8') { %> - compile group: 'org.mapstruct', name: 'mapstruct-jdk8', version: mapstruct_version<% } %> + compile group: 'com.h2database', name: 'h2'<% } %> + compile group: 'fr.ippon.spark.metrics', name: 'metrics-spark-reporter', version: metrics_spark_reporter_version + compile group: 'org.mapstruct', name: 'mapstruct-jdk8', version: mapstruct_version testCompile group: 'com.jayway.awaitility', name: 'awaitility', version: awaility_version testCompile group: 'com.jayway.jsonpath', name: 'json-path'<% if (databaseType == 'cassandra') { %> testCompile(group: 'org.cassandraunit', name: 'cassandra-unit-spring', version: cassandra_unit_spring_version) { @@ -184,7 +183,7 @@ dependencies { testCompile group: 'io.gatling.highcharts', name: 'gatling-charts-highcharts', version: gatling_version <% if (devDatabaseType != 'h2Memory') { %> testCompile group: 'com.h2database', name: 'h2'<% } %><% if (devDatabaseType == 'oracle' || prodDatabaseType == 'oracle') { %> - runtime files('lib/oracle/ojdbc/<% if (javaVersion == '7') { %>6/ojdbc-6<% }else { %>7/ojdbc-7<% } %>.jar') + runtime files('lib/oracle/ojdbc/7/ojdbc-7.jar') runtime fileTree(dir: 'lib', include: '*.jar')<% } %> optional group: 'org.springframework.boot', name:'spring-boot-configuration-processor', version: spring_boot_version diff --git a/app/templates/_gradle.properties b/app/templates/_gradle.properties index eb141e43e0cb..b75366fd8755 100644 --- a/app/templates/_gradle.properties +++ b/app/templates/_gradle.properties @@ -1,8 +1,6 @@ rootProject.name=<%= slugifiedBaseName %> profile=dev -<% if (javaVersion == '8') { %> -assertj_core_version=3.1.0<% } %><% if (javaVersion == '7') { %> -assertj_core_version=2.1.0<% } %> +assertj_core_version=3.1.0 awaility_version=1.4.0 commons_lang_version=2.6 commons_io_version=2.4<% if (databaseType == 'cassandra') { %> diff --git a/app/templates/_pom.xml b/app/templates/_pom.xml index 3a33eb6d824a..d27965fa4806 100755 --- a/app/templates/_pom.xml +++ b/app/templates/_pom.xml @@ -22,12 +22,7 @@ 2.4.1 - <%_ if (javaVersion == '8') { _%> 3.1.0 - <%_ } _%> - <%_ if (javaVersion == '7') { _%> - 2.1.0 - <%_ } _%> 1.4.0 2.4 2.6 @@ -319,7 +314,7 @@ oracle ojdbc - <% if (javaVersion == '7') { %>6<% }else { %>7<% } %> + 7 <%_ } _%> @@ -394,13 +389,11 @@ ${postgresql.version} <%_ } _%> - <%_ if (javaVersion == '8') { _%> org.mapstruct mapstruct-jdk8 ${mapstruct.version} - <%_ } _%> org.springframework spring-context-support @@ -537,13 +530,11 @@ <%_ } _%> - <%_ if (javaVersion == '8') { _%> fr.ippon.spark.metrics metrics-spark-reporter ${metrics-spark-reporter.version} - <%_ } _%> spring-boot:run @@ -637,7 +628,7 @@ org.apache.maven.plugins maven-surefire-plugin - <% if (javaVersion == '7') { %>-XX:MaxPermSize=128m <% } %>-Xmx256m ${surefireArgLine} + -Xmx256m ${surefireArgLine} alphabetical @@ -685,7 +676,6 @@ sonar-maven-plugin ${sonar-maven-plugin.version} - <%_ if (javaVersion == '8') { _%> org.bsc.maven maven-processor-plugin @@ -719,7 +709,6 @@ - <%_ } _%> <%_ if (databaseType == 'sql') { _%> org.liquibase diff --git a/app/templates/src/main/java/package/async/_ExceptionHandlingAsyncTaskExecutor.java b/app/templates/src/main/java/package/async/_ExceptionHandlingAsyncTaskExecutor.java index 317ce66824c8..319c5b005100 100644 --- a/app/templates/src/main/java/package/async/_ExceptionHandlingAsyncTaskExecutor.java +++ b/app/templates/src/main/java/package/async/_ExceptionHandlingAsyncTaskExecutor.java @@ -30,7 +30,7 @@ public void execute(Runnable task, long startTimeout) { executor.execute(createWrappedRunnable(task), startTimeout); } - private Callable createCallable(final Callable task) {<% if (javaVersion == '8') { %> + private Callable createCallable(final Callable task) { return () -> { try { return task.call(); @@ -38,40 +38,17 @@ private Callable createCallable(final Callable task) {<% if (javaVersi handle(e); throw e; } - };<% } else { %> - return new Callable() { - - @Override - public T call() throws Exception { - try { - return task.call(); - } catch (Exception e) { - handle(e); - throw e; - } - } - };<% } %> + }; } - private Runnable createWrappedRunnable(final Runnable task) {<% if (javaVersion == '8') { %> + private Runnable createWrappedRunnable(final Runnable task) { return () -> { try { task.run(); } catch (Exception e) { handle(e); } - };<% } else { %> - return new Runnable() { - - @Override - public void run() { - try { - task.run(); - } catch (Exception e) { - handle(e); - } - } - };<% } %> + }; } protected void handle(Exception e) { diff --git a/app/templates/src/main/java/package/config/_CacheConfiguration.java b/app/templates/src/main/java/package/config/_CacheConfiguration.java index 21ccfc63de50..d2565d446793 100644 --- a/app/templates/src/main/java/package/config/_CacheConfiguration.java +++ b/app/templates/src/main/java/package/config/_CacheConfiguration.java @@ -54,11 +54,8 @@ public class CacheConfiguration { @PreDestroy public void destroy() {<% if (hibernateCache == 'ehcache') { %> log.info("Remove Cache Manager metrics"); - SortedSet names = metricRegistry.getNames();<% if (javaVersion == '8') { %> - names.forEach(metricRegistry::remove);<% } else { %> - for (String name : names) { - metricRegistry.remove(name); - }<% } %><% } %> + SortedSet names = metricRegistry.getNames(); + names.forEach(metricRegistry::remove);<% } %> log.info("Closing Cache Manager");<% if (hibernateCache == 'ehcache') { %> cacheManager.shutdown();<% } %><% if (hibernateCache == 'hazelcast' || clusteredHttpSession == 'hazelcast') { %> Hazelcast.shutdownAll();<% } %> diff --git a/app/templates/src/main/java/package/config/_MetricsConfiguration.java b/app/templates/src/main/java/package/config/_MetricsConfiguration.java index f0662027abb0..f795b6a7de38 100644 --- a/app/templates/src/main/java/package/config/_MetricsConfiguration.java +++ b/app/templates/src/main/java/package/config/_MetricsConfiguration.java @@ -7,8 +7,8 @@ import com.codahale.metrics.health.HealthCheckRegistry; import com.codahale.metrics.jvm.*; import com.ryantenney.metrics.spring.config.annotation.EnableMetrics; -import com.ryantenney.metrics.spring.config.annotation.MetricsConfigurerAdapter;<% if (javaVersion == '8') { %> -import fr.ippon.spark.metrics.SparkReporter;<% } %> +import com.ryantenney.metrics.spring.config.annotation.MetricsConfigurerAdapter; +import fr.ippon.spark.metrics.SparkReporter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -98,7 +98,7 @@ private void init() { graphiteReporter.start(1, TimeUnit.MINUTES); } } - }<% if (javaVersion == '8') { %> + } @Configuration @ConditionalOnClass(SparkReporter.class) @@ -126,5 +126,5 @@ private void init() { sparkReporter.start(1, TimeUnit.MINUTES); } } - }<% } %> + } } diff --git a/app/templates/src/main/java/package/config/apidoc/_SwaggerConfiguration.java b/app/templates/src/main/java/package/config/apidoc/_SwaggerConfiguration.java index c985cfa94add..39c2ed9e71ba 100644 --- a/app/templates/src/main/java/package/config/apidoc/_SwaggerConfiguration.java +++ b/app/templates/src/main/java/package/config/apidoc/_SwaggerConfiguration.java @@ -58,10 +58,10 @@ public Docket swaggerSpringfoxDocket(JHipsterProperties jHipsterProperties) { .genericModelSubstitutes(ResponseEntity.class) .directModelSubstitute(org.joda.time.LocalDate.class, String.class) .directModelSubstitute(org.joda.time.LocalDateTime.class, Date.class) - .directModelSubstitute(org.joda.time.DateTime.class, Date.class)<% if (javaVersion == '8') { %> + .directModelSubstitute(org.joda.time.DateTime.class, Date.class) .directModelSubstitute(java.time.LocalDate.class, String.class) .directModelSubstitute(java.time.ZonedDateTime.class, Date.class) - .directModelSubstitute(java.time.LocalDateTime.class, Date.class)<% } %> + .directModelSubstitute(java.time.LocalDateTime.class, Date.class) .select() .paths(regex(DEFAULT_INCLUDE_PATTERN)) .build(); diff --git a/app/templates/src/main/java/package/config/metrics/_DatabaseHealthIndicator.java b/app/templates/src/main/java/package/config/metrics/_DatabaseHealthIndicator.java index 82f8da810b8f..e6dcd33e357c 100644 --- a/app/templates/src/main/java/package/config/metrics/_DatabaseHealthIndicator.java +++ b/app/templates/src/main/java/package/config/metrics/_DatabaseHealthIndicator.java @@ -1,15 +1,12 @@ package <%=packageName%>.config.metrics; import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health;<% if (databaseType == 'sql') { %><% if (javaVersion == '7') { %> -import org.springframework.dao.DataAccessException; -import org.springframework.jdbc.core.ConnectionCallback;<% } %> +import org.springframework.boot.actuate.health.Health;<% if (databaseType == 'sql') { %> import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.util.StringUtils; import javax.sql.DataSource; -import java.sql.Connection;<% if (javaVersion == '7') { %> -import java.sql.SQLException;<% } %> +import java.sql.Connection; import java.util.HashMap; import java.util.Map;<% } %> @@ -56,14 +53,7 @@ protected void doHealthCheck(Health.Builder builder) throws Exception { } private String getProduct() { - return this.jdbcTemplate.execute(<% if (javaVersion == '8') { %>(Connection connection) -> connection.getMetaData().getDatabaseProductName()<% } else { %>new ConnectionCallback() { - @Override - public String doInConnection(Connection connection) throws SQLException, - DataAccessException { - - return connection.getMetaData().getDatabaseProductName(); - } - }<% } %>); + return this.jdbcTemplate.execute((Connection connection) -> connection.getMetaData().getDatabaseProductName()); } protected String detectQuery(String product) { diff --git a/app/templates/src/main/java/package/repository/_UserRepository.java b/app/templates/src/main/java/package/repository/_UserRepository.java index 997cacfa4691..0fdcc3922edf 100644 --- a/app/templates/src/main/java/package/repository/_UserRepository.java +++ b/app/templates/src/main/java/package/repository/_UserRepository.java @@ -10,8 +10,8 @@ import org.springframework.data.jpa.repository.Query;<% } %><% if (databaseType == 'mongodb') { %> import org.springframework.data.mongodb.repository.MongoRepository;<% } %> -import java.util.List;<% if (javaVersion == '8') { %> -import java.util.Optional;<%}%><% if (databaseType == 'cassandra') { %> +import java.util.List; +import java.util.Optional;<% if (databaseType == 'cassandra') { %> import org.springframework.stereotype.Repository; import org.springframework.util.StringUtils; @@ -28,7 +28,7 @@ * Spring Data MongoDB repository for the User entity. */<% } %><% if (databaseType == 'cassandra') { %>/** * Cassandra repository for the User entity. - */<% } %><% if ((databaseType == 'sql' || databaseType == 'mongodb') && javaVersion == '8') { %> + */<% } %><% if (databaseType == 'sql' || databaseType == 'mongodb') { %> public interface UserRepository extends <% if (databaseType == 'sql') { %>JpaRepository<% } %><% if (databaseType == 'mongodb') { %>MongoRepository<% } %> { Optional findOneByActivationKey(String activationKey); @@ -44,19 +44,6 @@ public interface UserRepository extends <% if (databaseType == 'sql') { %>JpaRep @Override void delete(User t); -}<% } else if ((databaseType == 'sql' || databaseType == 'mongodb') && javaVersion == '7') { %> -public interface UserRepository extends <% if (databaseType == 'sql') { %>JpaRepository<% } %><% if (databaseType == 'mongodb') { %>MongoRepository<% } %> { - - User findOneByActivationKey(String activationKey); - - List findAllByActivatedIsFalseAndCreatedDateBefore(DateTime dateTime); - - User findOneByResetKey(String resetKey); - - User findOneByLogin(String login); - - User findOneByEmail(String email); - }<% } else if (databaseType == 'cassandra') { %> @Repository public class UserRepository { diff --git a/app/templates/src/main/java/package/security/_CustomPersistentRememberMeServices.java b/app/templates/src/main/java/package/security/_CustomPersistentRememberMeServices.java index 4957f2667882..be8e6bb83632 100644 --- a/app/templates/src/main/java/package/security/_CustomPersistentRememberMeServices.java +++ b/app/templates/src/main/java/package/security/_CustomPersistentRememberMeServices.java @@ -10,8 +10,8 @@ import org.springframework.core.env.Environment; import org.springframework.dao.DataAccessException; import org.springframework.security.core.Authentication; -import org.springframework.security.core.userdetails.UserDetails;<% if (javaVersion == '8') {%> -import org.springframework.security.core.userdetails.UsernameNotFoundException;<%}%> +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.crypto.codec.Base64; import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices; import org.springframework.security.web.authentication.rememberme.CookieTheftException; @@ -110,17 +110,17 @@ protected UserDetails processAutoLoginCookie(String[] cookieTokens, HttpServletR protected void onLoginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) { String login = successfulAuthentication.getName(); - log.debug("Creating new persistent login for user {}", login);<% if (javaVersion == '8') {%> + log.debug("Creating new persistent login for user {}", login); PersistentToken token = userRepository.findOneByLogin(login).map(u -> { PersistentToken t = new PersistentToken(); t.setSeries(generateSeriesData());<% if (databaseType == 'sql' || databaseType == 'mongodb') { %> t.setUser(u); t.setTokenValue(generateTokenData()); - t.setTokenDate(new LocalDate());<%}%><% if (databaseType == 'cassandra') { %> + t.setTokenDate(new LocalDate());<% } %><% if (databaseType == 'cassandra') { %> t.setLogin(login); t.setUserId(u.getId()); t.setTokenValue(generateTokenData()); - t.setTokenDate(new Date());<%}%> + t.setTokenDate(new Date());<% } %> t.setIpAddress(request.getRemoteAddr()); t.setUserAgent(request.getHeader("User-Agent")); return t; @@ -130,22 +130,7 @@ protected void onLoginSuccess(HttpServletRequest request, HttpServletResponse re addCookie(token, request, response); } catch (DataAccessException e) { log.error("Failed to save persistent token ", e); - }<% }else { %> - User user = userRepository.findOneByLogin(login); - - PersistentToken token = new PersistentToken(); - token.setSeries(generateSeriesData()); - token.setUser(user); - token.setTokenValue(generateTokenData()); - token.setTokenDate(new LocalDate()); - token.setIpAddress(request.getRemoteAddr()); - token.setUserAgent(request.getHeader("User-Agent")); - try { - <% if (databaseType == 'sql') { %>persistentTokenRepository.saveAndFlush(token);<% } %><% if (databaseType == 'mongodb') { %>persistentTokenRepository.save(token);<% } %> - addCookie(token, request, response); - } catch (DataAccessException e) { - log.error("Failed to save persistent token ", e); - }<% } %> + } } /** diff --git a/app/templates/src/main/java/package/security/_UserDetailsService.java b/app/templates/src/main/java/package/security/_UserDetailsService.java index f5eab56bc466..698dec829b8e 100644 --- a/app/templates/src/main/java/package/security/_UserDetailsService.java +++ b/app/templates/src/main/java/package/security/_UserDetailsService.java @@ -13,12 +13,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.inject.Inject; -import java.util.ArrayList; -import java.util.Collection;<%if (javaVersion == '8') {%> -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; -import java.util.Collections; -import java.util.List;<%}%> /** * Authenticate a user from the database. @@ -35,33 +31,19 @@ public class UserDetailsService implements org.springframework.security.core.use @Transactional public UserDetails loadUserByUsername(final String login) { log.debug("Authenticating {}", login); - String lowercaseLogin = login.toLowerCase();<%if (javaVersion == '8') {%> + String lowercaseLogin = login.toLowerCase(); Optional userFromDatabase = userRepository.findOneByLogin(lowercaseLogin); return userFromDatabase.map(user -> { if (!user.getActivated()) { throw new UserNotActivatedException("User " + lowercaseLogin + " was not activated"); } List grantedAuthorities = user.getAuthorities().stream()<% if (databaseType == 'sql' || databaseType == 'mongodb') { %> - .map(authority -> new SimpleGrantedAuthority(authority.getName()))<%}%><% if (databaseType == 'cassandra') { %> + .map(authority -> new SimpleGrantedAuthority(authority.getName()))<% } %><% if (databaseType == 'cassandra') { %> .map(authority -> new SimpleGrantedAuthority(authority))<% } %> .collect(Collectors.toList()); return new org.springframework.security.core.userdetails.User(lowercaseLogin, user.getPassword(), grantedAuthorities); - }).orElseThrow(() -> new UsernameNotFoundException("User " + lowercaseLogin + " was not found in the database"));<%} else {%> - User userFromDatabase = userRepository.findOneByLogin(lowercaseLogin); - if (userFromDatabase == null) { - throw new UsernameNotFoundException("User " + lowercaseLogin + " was not found in the database"); - } else if (!userFromDatabase.getActivated()) { - throw new UserNotActivatedException("User " + lowercaseLogin + " was not activated"); - } - - Collection grantedAuthorities = new ArrayList<>(); - for (Authority authority : userFromDatabase.getAuthorities()) { - GrantedAuthority grantedAuthority = new SimpleGrantedAuthority(authority.getName()); - grantedAuthorities.add(grantedAuthority); - } - return new org.springframework.security.core.userdetails.User(lowercaseLogin, - userFromDatabase.getPassword(), grantedAuthorities);<% } %> + }).orElseThrow(() -> new UsernameNotFoundException("User " + lowercaseLogin + " was not found in the database")); } } diff --git a/app/templates/src/main/java/package/service/_AuditEventService.java b/app/templates/src/main/java/package/service/_AuditEventService.java index 61b2a6bd3f64..8c46f7153240 100644 --- a/app/templates/src/main/java/package/service/_AuditEventService.java +++ b/app/templates/src/main/java/package/service/_AuditEventService.java @@ -9,8 +9,8 @@ import org.springframework.transaction.annotation.Transactional;<% } %> import javax.inject.Inject; -import java.util.List;<% if (javaVersion == '8') { %> -import java.util.Optional;<% } %> +import java.util.List; +import java.util.Optional; /** * Service for managing audit events. @@ -45,15 +45,7 @@ public List findByDates(LocalDateTime fromDate, LocalDateTime toDate return auditEventConverter.convertToAuditEvent(persistentAuditEvents); } - <% if (javaVersion == '7') { %>public AuditEvent find(<% if (databaseType == 'sql') { %>Long <% } %><% if (databaseType == 'mongodb') { %>String <% } %>id) { - PersistentAuditEvent event = persistenceAuditEventRepository.findOne(id); - AuditEvent auditEvent = null; - if(event != null){ - auditEvent = auditEventConverter.convertToAuditEvent(event); - } - return auditEvent; - }<% } %><% if (javaVersion == '8') { %>public Optional find(<% if (databaseType == 'sql') { %>Long <% } %><% if (databaseType == 'mongodb') { %>String <% } %>id) { + public Optional find(<% if (databaseType == 'sql') { %>Long <% } %><% if (databaseType == 'mongodb') { %>String <% } %>id) { return Optional.ofNullable(persistenceAuditEventRepository.findOne(id)).map(auditEventConverter::convertToAuditEvent); - }<% } %> - + } } diff --git a/app/templates/src/main/java/package/service/_UserService.java b/app/templates/src/main/java/package/service/_UserService.java index 1509da385682..e1fa5881fedd 100644 --- a/app/templates/src/main/java/package/service/_UserService.java +++ b/app/templates/src/main/java/package/service/_UserService.java @@ -19,12 +19,8 @@ import org.springframework.stereotype.Service;<% if (databaseType == 'sql') { %> import org.springframework.transaction.annotation.Transactional;<% } %> -import javax.inject.Inject;<% if (databaseType == 'sql' || databaseType == 'mongodb') { %> -import java.util.HashSet; -import java.util.List;<% if (javaVersion == '8') { %> -import java.util.Optional;<% } %> -import java.util.Set;<% } %><% if (databaseType == 'cassandra') { %> -import java.util.*;<% } %> +import javax.inject.Inject; +import java.util.*; /** * Service class for managing users. @@ -49,7 +45,7 @@ public class UserService { <% if (databaseType == 'sql' || databaseType == 'mongodb') { %> @Inject private AuthorityRepository authorityRepository;<% } %> -<% if (javaVersion == '8') { %> + public Optional activateRegistration(String key) { log.debug("Activating user for activation key {}", key); userRepository.findOneByActivationKey(key) @@ -91,50 +87,8 @@ public Optional requestPasswordReset(String mail) { userRepository.save(user); return user; }); - }<% } else { %> - public User activateRegistration(String key) { - log.debug("Activating user for activation key {}", key); - User user = userRepository.findOneByActivationKey(key); - // activate given user for the registration key. - if (user != null) { - user.setActivated(true); - user.setActivationKey(null); - userRepository.save(user);<% if (searchEngine == 'elasticsearch') { %> - userSearchRepository.save(user);<% } %> - log.debug("Activated user: {}", user); - } - return user; } - public User completePasswordReset(String newPassword, String key) { - log.debug("Reset user password for reset key {}", key); - User user = userRepository.findOneByResetKey(key); - DateTime oneDayAgo = DateTime.now().minusHours(24); - if (user != null && user.getActivated()) { - if (user.getResetDate().isAfter(oneDayAgo.toInstant().getMillis())) { - user.setPassword(passwordEncoder.encode(newPassword)); - user.setResetKey(null); - user.setResetDate(null); - userRepository.save(user); - return user; - } else { - return null; - } - } - return null; - } - - public User requestPasswordReset(String mail) { - User user = userRepository.findOneByEmail(mail); - if (user != null && user.getActivated()) { - user.setResetKey(RandomUtil.generateResetKey()); - user.setResetDate(DateTime.now()); - userRepository.save(user); - return user; - } - return null; - }<% } %> - public User createUserInformation(String login, String password, String firstName, String lastName, String email, String langKey) { @@ -164,7 +118,7 @@ public User createUserInformation(String login, String password, String firstNam return newUser; } - public void updateUserInformation(String firstName, String lastName, String email, String langKey) {<% if (javaVersion == '8') { %> + public void updateUserInformation(String firstName, String lastName, String email, String langKey) { userRepository.findOneByLogin(SecurityUtils.getCurrentLogin()).ifPresent(u -> { u.setFirstName(firstName); u.setLastName(lastName); @@ -173,49 +127,26 @@ public void updateUserInformation(String firstName, String lastName, String emai userRepository.save(u);<% if (searchEngine == 'elasticsearch') { %> userSearchRepository.save(u);<% } %> log.debug("Changed Information for User: {}", u); - });<%} else {%> - User currentUser = userRepository.findOneByLogin(SecurityUtils.getCurrentLogin()); - currentUser.setFirstName(firstName); - currentUser.setLastName(lastName); - currentUser.setEmail(email); - currentUser.setLangKey(langKey); - userRepository.save(currentUser);<% if (searchEngine == 'elasticsearch') { %> - userSearchRepository.save(user);<% } %> - log.debug("Changed Information for User: {}", currentUser);<%}%> + }); } - public void changePassword(String password) {<% if (javaVersion == '8') { %><% if (databaseType == 'sql' || databaseType == 'mongodb') { %> + public void changePassword(String password) {<% if (databaseType == 'sql' || databaseType == 'mongodb') { %> userRepository.findOneByLogin(SecurityUtils.getCurrentLogin()).ifPresent(u-> {<% } %><% if (databaseType == 'cassandra') { %> userRepository.findOneByLogin(SecurityUtils.getCurrentLogin()).ifPresent(u -> {<% } %> String encryptedPassword = passwordEncoder.encode(password); u.setPassword(encryptedPassword); userRepository.save(u); log.debug("Changed password for User: {}", u); - });<%} else {%> - User currentUser = userRepository.findOneByLogin(SecurityUtils.getCurrentLogin()); - String encryptedPassword = passwordEncoder.encode(password); - currentUser.setPassword(encryptedPassword); - userRepository.save(currentUser);<% if (searchEngine == 'elasticsearch') { %> - userSearchRepository.save(user);<% } %> - log.debug("Changed password for User: {}", currentUser);<% } %> + }); } -<% if (javaVersion == '8') { %><% if (databaseType == 'sql') { %> +<% if (databaseType == 'sql') { %> @Transactional(readOnly = true)<% } %> public Optional getUserWithAuthoritiesByLogin(String login) { return userRepository.findOneByLogin(login).map(u -> { u.getAuthorities().size(); return u; }); - }<% } else { %><% if (databaseType == 'sql') { %> - @Transactional(readOnly = true)<% } %> - public User getUserWithAuthoritiesByLogin(String login) { - User user = userRepository.findOneByLogin(login); - if (user == null) { - return null; - } - user.getAuthorities().size(); - return user; - }<% } %> + } <% if (databaseType == 'sql') { %> @Transactional(readOnly = true)<% } %><% if (databaseType == 'sql' || databaseType == 'mongodb') { %> public User getUserWithAuthorities(<% if (databaseType == 'mongodb') { %>String id<% } else { %>Long id<% } %>) { @@ -225,11 +156,9 @@ public User getUserWithAuthorities(<% if (databaseType == 'mongodb') { %>String }<% } %> <% if (databaseType == 'sql') { %> @Transactional(readOnly = true)<% } %> - public User getUserWithAuthorities() {<% if (javaVersion == '8') { %> + public User getUserWithAuthorities() { User user = userRepository.findOneByLogin(SecurityUtils.getCurrentLogin()).get(); - user.getAuthorities().size(); // eagerly load the association<% } else { %> - User user = userRepository.findOneByLogin(SecurityUtils.getCurrentLogin()); - user.getAuthorities().size(); // eagerly load the association<% } %> + user.getAuthorities().size(); // eagerly load the association return user; }<% if ((databaseType == 'sql' || databaseType == 'mongodb') && authenticationType == 'session') { %> @@ -243,20 +172,13 @@ public User getUserWithAuthorities() {<% if (javaVersion == '8') { %> */ @Scheduled(cron = "0 0 0 * * ?") public void removeOldPersistentTokens() { - LocalDate now = new LocalDate();<% if (javaVersion == '8') { %> + LocalDate now = new LocalDate(); persistentTokenRepository.findByTokenDateBefore(now.minusMonths(1)).stream().forEach(token ->{ log.debug("Deleting token {}", token.getSeries());<% if (databaseType == 'sql') { %> User user = token.getUser(); user.getPersistentTokens().remove(token);<% } %> persistentTokenRepository.delete(token); - });<% }else { %> - List tokens = persistentTokenRepository.findByTokenDateBefore(now.minusMonths(1)); - for (PersistentToken token : tokens) { - log.debug("Deleting token {}", token.getSeries());<% if (databaseType == 'sql') { %> - User user = token.getUser(); - user.getPersistentTokens().remove(token);<% } %> - persistentTokenRepository.delete(token); - }<% } %> + }); }<% } %><% if (databaseType == 'sql' || databaseType == 'mongodb') { %> /** diff --git a/app/templates/src/main/java/package/web/rest/_AccountResource.java b/app/templates/src/main/java/package/web/rest/_AccountResource.java index a0db65f89a17..355dd4d9af9d 100644 --- a/app/templates/src/main/java/package/web/rest/_AccountResource.java +++ b/app/templates/src/main/java/package/web/rest/_AccountResource.java @@ -24,8 +24,7 @@ import javax.validation.Valid; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -import java.util.*;<% if (javaVersion == '8') { %> -import java.util.stream.Collectors;<% } %> +import java.util.*; /** * REST controller for managing the current user's account. @@ -55,7 +54,7 @@ public class AccountResource { method = RequestMethod.POST, produces = MediaType.TEXT_PLAIN_VALUE) @Timed - public ResponseEntity registerAccount(@Valid @RequestBody UserDTO userDTO, HttpServletRequest request) {<% if (javaVersion == '8') { %> + public ResponseEntity registerAccount(@Valid @RequestBody UserDTO userDTO, HttpServletRequest request) { return userRepository.findOneByLogin(userDTO.getLogin()) .map(user -> new ResponseEntity<>("login already in use", HttpStatus.BAD_REQUEST)) .orElseGet(() -> userRepository.findOneByEmail(userDTO.getEmail()) @@ -73,26 +72,7 @@ public ResponseEntity registerAccount(@Valid @RequestBody UserDTO userDTO, Ht mailService.sendActivationEmail(user, baseUrl); return new ResponseEntity<>(HttpStatus.CREATED); }) - );<% } else { %> - User user = userRepository.findOneByLogin(userDTO.getLogin()); - if (user != null) { - return ResponseEntity.badRequest().contentType(MediaType.TEXT_PLAIN).body("login already in use"); - } else { - if (userRepository.findOneByEmail(userDTO.getEmail()) != null) { - return ResponseEntity.badRequest().contentType(MediaType.TEXT_PLAIN).body("e-mail address already in use"); - } - user = userService.createUserInformation(userDTO.getLogin(), userDTO.getPassword(), - userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail().toLowerCase(), - userDTO.getLangKey()); - String baseUrl = request.getScheme() + // "http" - "://" + // "://" - request.getServerName() + // "myhost" - ":" + // ":" - request.getServerPort(); // "80" - - mailService.sendActivationEmail(user, baseUrl); - return new ResponseEntity<>(HttpStatus.CREATED); - }<% } %> + ); } /** @@ -102,15 +82,10 @@ public ResponseEntity registerAccount(@Valid @RequestBody UserDTO userDTO, Ht method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @Timed - public ResponseEntity activateAccount(@RequestParam(value = "key") String key) {<% if (javaVersion == '8') { %> + public ResponseEntity activateAccount(@RequestParam(value = "key") String key) { return Optional.ofNullable(userService.activateRegistration(key)) .map(user -> new ResponseEntity(HttpStatus.OK)) - .orElse(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));<% } else { %> - User user = userService.activateRegistration(key); - if (user == null) { - return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); - } - return new ResponseEntity(HttpStatus.OK);<% } %> + .orElse(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR)); } /** @@ -132,29 +107,10 @@ public String isAuthenticated(HttpServletRequest request) { method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @Timed - public ResponseEntity getAccount() {<% if (javaVersion == '8') { %> + public ResponseEntity getAccount() { return Optional.ofNullable(userService.getUserWithAuthorities()) .map(user -> new ResponseEntity<>(new UserDTO(user), HttpStatus.OK)) - .orElse(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));<% } else { %> - User user = userService.getUserWithAuthorities(); - if (user == null) { - return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); - } - Set authorities = new HashSet<>(); - for (Authority authority : user.getAuthorities()) { - authorities.add(authority.getName()); - } - return new ResponseEntity<>( - new UserDTO( - user.getLogin(), - null, - user.getFirstName(), - user.getLastName(), - user.getEmail(), - user.getActivated(), - user.getLangKey(), - authorities), - HttpStatus.OK);<% } %> + .orElse(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR)); } /** @@ -164,7 +120,7 @@ public ResponseEntity getAccount() {<% if (javaVersion == '8') { %> method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) @Timed - public ResponseEntity saveAccount(@RequestBody UserDTO userDTO) {<% if (javaVersion == '8') { %> + public ResponseEntity saveAccount(@RequestBody UserDTO userDTO) { return userRepository .findOneByLogin(userDTO.getLogin()) .filter(u -> u.getLogin().equals(SecurityUtils.getCurrentLogin())) @@ -173,14 +129,7 @@ public ResponseEntity saveAccount(@RequestBody UserDTO userDTO) {<% if ( userDTO.getLangKey()); return new ResponseEntity(HttpStatus.OK); }) - .orElseGet(() -> new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));<% } else { %> - User userHavingThisLogin = userRepository.findOneByLogin(userDTO.getLogin()); - if (userHavingThisLogin != null && !userHavingThisLogin.getLogin().equals(SecurityUtils.getCurrentLogin())) { - return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); - } - userService.updateUserInformation(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(), - userDTO.getLangKey()); - return new ResponseEntity<>(HttpStatus.OK);<% } %> + .orElseGet(() -> new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR)); } /** @@ -205,19 +154,12 @@ public ResponseEntity changePassword(@RequestBody String password) { method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @Timed - public ResponseEntity> getCurrentSessions() {<% if (javaVersion == '8') { %> + public ResponseEntity> getCurrentSessions() { return userRepository.findOneByLogin(SecurityUtils.getCurrentLogin()) .map(user -> new ResponseEntity<>( persistentTokenRepository.findByUser(user), HttpStatus.OK)) - .orElse(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));<% } else { %> - User user = userRepository.findOneByLogin(SecurityUtils.getCurrentLogin()); - if (user == null) { - return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); - } - return new ResponseEntity<>( - persistentTokenRepository.findByUser(user), - HttpStatus.OK);<% } %> + .orElse(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR)); } /** @@ -237,19 +179,12 @@ public ResponseEntity> getCurrentSessions() {<% if (javaVe method = RequestMethod.DELETE) @Timed public void invalidateSession(@PathVariable String series) throws UnsupportedEncodingException { - String decodedSeries = URLDecoder.decode(series, "UTF-8");<% if (javaVersion == '8') { %> + String decodedSeries = URLDecoder.decode(series, "UTF-8"); userRepository.findOneByLogin(SecurityUtils.getCurrentLogin()).ifPresent(u -> { persistentTokenRepository.findByUser(u).stream() .filter(persistentToken -> StringUtils.equals(persistentToken.getSeries(), decodedSeries)) .findAny().ifPresent(t -> persistentTokenRepository.delete(decodedSeries)); - });<% } else { %> - User user = userRepository.findOneByLogin(SecurityUtils.getCurrentLogin()); - List persistentTokens = persistentTokenRepository.findByUser(user); - for (PersistentToken persistentToken : persistentTokens) { - if (StringUtils.equals(persistentToken.getSeries(), decodedSeries)) { - persistentTokenRepository.delete(decodedSeries); - } - }<% } %> + }); }<% } %> @RequestMapping(value = "/account/reset_password/init", @@ -257,7 +192,6 @@ public void invalidateSession(@PathVariable String series) throws UnsupportedEnc produces = MediaType.TEXT_PLAIN_VALUE) @Timed public ResponseEntity requestPasswordReset(@RequestBody String mail, HttpServletRequest request) { -<% if (javaVersion == '8') { %> return userService.requestPasswordReset(mail) .map(user -> { String baseUrl = request.getScheme() + @@ -268,21 +202,6 @@ public ResponseEntity requestPasswordReset(@RequestBody String mail, HttpServ mailService.sendPasswordResetMail(user, baseUrl); return new ResponseEntity<>("e-mail was sent", HttpStatus.OK); }).orElse(new ResponseEntity<>("e-mail address not registered", HttpStatus.BAD_REQUEST)); -<% } else {%> - User user = userService.requestPasswordReset(mail); - - if (user != null) { - String baseUrl = request.getScheme() + - "://" + - request.getServerName() + - ":" + - request.getServerPort(); - mailService.sendPasswordResetMail(user, baseUrl); - return new ResponseEntity<>("e-mail was sent", HttpStatus.OK); - } else { - return new ResponseEntity<>("e-mail address not registered", HttpStatus.BAD_REQUEST); - } - <%}%> } @RequestMapping(value = "/account/reset_password/finish", @@ -292,15 +211,9 @@ public ResponseEntity requestPasswordReset(@RequestBody String mail, HttpServ public ResponseEntity finishPasswordReset(@RequestBody KeyAndPasswordDTO keyAndPassword) { if (!checkPasswordLength(keyAndPassword.getNewPassword())) { return new ResponseEntity<>("Incorrect password", HttpStatus.BAD_REQUEST); - }<% if (javaVersion == '8') { %> + } return userService.completePasswordReset(keyAndPassword.getNewPassword(), keyAndPassword.getKey()) - .map(user -> new ResponseEntity(HttpStatus.OK)).orElse(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));<% } else {%> - User user = userService.completePasswordReset(keyAndPassword.getNewPassword(), keyAndPassword.getKey()); - if (user != null) { - return new ResponseEntity(HttpStatus.OK); - } else { - return new ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR); - }<% }%> + .map(user -> new ResponseEntity(HttpStatus.OK)).orElse(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR)); } private boolean checkPasswordLength(String password) { @@ -308,5 +221,4 @@ private boolean checkPasswordLength(String password) { password.length() >= UserDTO.PASSWORD_MIN_LENGTH && password.length() <= UserDTO.PASSWORD_MAX_LENGTH); } - } diff --git a/app/templates/src/main/java/package/web/rest/_AuditResource.java b/app/templates/src/main/java/package/web/rest/_AuditResource.java index e67762b62610..10e2968d7c51 100644 --- a/app/templates/src/main/java/package/web/rest/_AuditResource.java +++ b/app/templates/src/main/java/package/web/rest/_AuditResource.java @@ -47,14 +47,8 @@ public List getByDates(@RequestParam(value = "fromDate") LocalDateTi @RequestMapping(value = "/{id:.+}", method = RequestMethod.GET) public ResponseEntity get(@PathVariable <% if (databaseType == 'sql') { %>Long <% } %><% if (databaseType == 'mongodb') { %>String <% } %>id) { - <% if (javaVersion == '7') { %>AuditEvent event = auditEventService.find(id); - if(event != null){ - return new ResponseEntity(event, HttpStatus.OK); - }else{ - return new ResponseEntity<>(HttpStatus.NOT_FOUND); - }<% } %> - <% if (javaVersion == '8') { %>return auditEventService.find(id) + return auditEventService.find(id) .map((entity) -> new ResponseEntity<>(entity, HttpStatus.OK)) - .orElse(new ResponseEntity<>(HttpStatus.NOT_FOUND));<% } else { %><% } %> + .orElse(new ResponseEntity<>(HttpStatus.NOT_FOUND)); } } diff --git a/app/templates/src/main/java/package/web/rest/_LogsResource.java b/app/templates/src/main/java/package/web/rest/_LogsResource.java index 18e1630dd143..db2c72044997 100644 --- a/app/templates/src/main/java/package/web/rest/_LogsResource.java +++ b/app/templates/src/main/java/package/web/rest/_LogsResource.java @@ -8,10 +8,9 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; -<% if (javaVersion != '8') { %> -import java.util.ArrayList;<% } %> -import java.util.List;<% if (javaVersion == '8') { %> -import java.util.stream.Collectors;<% } %> + +import java.util.List; +import java.util.stream.Collectors; /** * Controller for view and managing Log Level at runtime. @@ -25,17 +24,11 @@ public class LogsResource { produces = MediaType.APPLICATION_JSON_VALUE) @Timed public List getList() { - LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();<% if (javaVersion == '8') { %> + LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); return context.getLoggerList() .stream() .map(LoggerDTO::new) .collect(Collectors.toList()); - <% } else { %> - List loggers = new ArrayList<>(); - for (ch.qos.logback.classic.Logger logger : context.getLoggerList()) { - loggers.add(new LoggerDTO(logger)); - } - return loggers;<% } %> } @RequestMapping(value = "/logs", diff --git a/app/templates/src/main/java/package/web/rest/_UserResource.java b/app/templates/src/main/java/package/web/rest/_UserResource.java index bf1b252c7cda..b900c0b285b0 100644 --- a/app/templates/src/main/java/package/web/rest/_UserResource.java +++ b/app/templates/src/main/java/package/web/rest/_UserResource.java @@ -27,8 +27,8 @@ import javax.inject.Inject; import java.net.URI; import java.net.URISyntaxException; -import java.util.*;<% if (javaVersion == '8') { %> -import java.util.stream.Collectors;<% } %><% if (searchEngine == 'elasticsearch') { %> +import java.util.*; +import java.util.stream.Collectors;<% if (searchEngine == 'elasticsearch') { %> import java.util.stream.StreamSupport; import static org.elasticsearch.index.query.QueryBuilders.*;<% } %> @@ -104,7 +104,7 @@ public ResponseEntity createUser(@RequestBody User user) throws URISyntaxE @Transactional<% } %> @Secured(AuthoritiesConstants.ADMIN) public ResponseEntity updateUser(@RequestBody ManagedUserDTO managedUserDTO) throws URISyntaxException { - log.debug("REST request to update User : {}", managedUserDTO);<% if (javaVersion == '8') { %><% if (databaseType == 'cassandra') { %> + log.debug("REST request to update User : {}", managedUserDTO);<% if (databaseType == 'cassandra') { %> return userRepository .findOne(managedUserDTO.getId())<% } else { %> return Optional.of(userRepository @@ -133,27 +133,7 @@ public ResponseEntity updateUser(@RequestBody ManagedUserDTO man .body(new ManagedUserDTO(userRepository .findOne(managedUserDTO.getId())<% if (databaseType == 'cassandra') { %>.get()<% } %>));<% } %> }) - .orElseGet(() -> new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));<% } else {%> - User user = userRepository.findOne(managedUserDTO.getId()); - if (user != null) { - user.setId(managedUserDTO.getId()); - user.setFirstName(managedUserDTO.getFirstName()); - user.setLastName(managedUserDTO.getLastName()); - user.setEmail(managedUserDTO.getEmail()); - user.setActivated(managedUserDTO.isActivated()); - user.setLangKey(managedUserDTO.getLangKey()); - Set authorities = user.getAuthorities(); - authorities.clear(); - for (String authority : managedUserDTO.getAuthorities()) { - authorities.add(authorityRepository.findOne(authority)); - } - return ResponseEntity.ok() - .headers(HeaderUtil.createEntityUpdateAlert("user", managedUserDTO.getLogin())) - .body(new ManagedUserDTO(userRepository - .findOne(managedUserDTO.getId()))); - } else { - return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); - }<% } %> + .orElseGet(() -> new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR)); } /** @@ -166,15 +146,10 @@ public ResponseEntity updateUser(@RequestBody ManagedUserDTO man @Transactional(readOnly = true)<% } %><% if (databaseType == 'sql' || databaseType == 'mongodb') { %> public ResponseEntity> getAllUsers(Pageable pageable) throws URISyntaxException { - Page page = userRepository.findAll(pageable);<% if (javaVersion == '8') { %> + Page page = userRepository.findAll(pageable); List managedUserDTOs = page.getContent().stream() .map(user -> new ManagedUserDTO(user)) - .collect(Collectors.toList());<% } else { %> - List managedUserDTOs = new ArrayList<>(); - for (User user : page.getContent()) { - ManagedUserDTO managedUserDTO = new ManagedUserDTO(user); - managedUserDTOs.add(managedUserDTO); - }<% } %> + .collect(Collectors.toList()); HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(page, "/api/users"); return new ResponseEntity<>(managedUserDTOs, headers, HttpStatus.OK); }<% } else { %> @@ -193,22 +168,14 @@ public ResponseEntity> getAllUsers() @RequestMapping(value = "/users/{login}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - @Timed<% if (javaVersion == '8') { %> + @Timed public ResponseEntity getUser(@PathVariable String login) { log.debug("REST request to get User : {}", login); return userService.getUserWithAuthoritiesByLogin(login) .map(user -> new ManagedUserDTO(user)) .map(managedUserDTO -> new ResponseEntity<>(managedUserDTO, HttpStatus.OK)) .orElse(new ResponseEntity<>(HttpStatus.NOT_FOUND)); - }<% } else { %> - public ResponseEntity getUser(@PathVariable String login) { - log.debug("REST request to get User : {}", login); - User user = userService.getUserWithAuthoritiesByLogin(login); - if (user == null) { - return new ResponseEntity<>(HttpStatus.NOT_FOUND); - } - return new ResponseEntity<>(new ManagedUserDTO(user), HttpStatus.OK); - }<% } %><% if (searchEngine == 'elasticsearch') { %> + }<% if (searchEngine == 'elasticsearch') { %> /** * SEARCH /_search/users/:query -> search for the User corresponding diff --git a/app/templates/src/main/java/package/web/rest/dto/_UserDTO.java b/app/templates/src/main/java/package/web/rest/dto/_UserDTO.java index dc935bc8a1a7..aa18496ed858 100644 --- a/app/templates/src/main/java/package/web/rest/dto/_UserDTO.java +++ b/app/templates/src/main/java/package/web/rest/dto/_UserDTO.java @@ -8,10 +8,8 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; -import java.util.Set;<% if (javaVersion == '8') { %> -import java.util.stream.Collectors;<% } else { %> -import java.util.HashSet;<% } %> - +import java.util.Set; +import java.util.stream.Collectors; /** * A DTO representing a user, with his authorities. */ @@ -49,20 +47,12 @@ public class UserDTO { public UserDTO() { } - public UserDTO(User user) {<% if (javaVersion == '8') { %> + public UserDTO(User user) { this(user.getLogin(), null, user.getFirstName(), user.getLastName(), user.getEmail(), user.getActivated(), user.getLangKey(),<% if (databaseType == 'sql' || databaseType == 'mongodb') { %> user.getAuthorities().stream().map(Authority::getName) .collect(Collectors.toSet()));<% } else { %> - user.getAuthorities());<% } %><% } else { %> - this(user.getLogin(), null, user.getFirstName(), user.getLastName(), - user.getEmail(), user.getActivated(), user.getLangKey(), - null); - Set authorities = new HashSet<>(); - for (Authority authority : user.getAuthorities()) { - authorities.add(authority.getName()); - } - this.authorities = authorities;<% } %> + user.getAuthorities());<% } %> } public UserDTO(String login, String password, String firstName, String lastName, diff --git a/app/templates/src/main/resources/config/_application-dev.yml b/app/templates/src/main/resources/config/_application-dev.yml index 394a47e76361..ef8b0d730692 100644 --- a/app/templates/src/main/resources/config/_application-dev.yml +++ b/app/templates/src/main/resources/config/_application-dev.yml @@ -138,12 +138,10 @@ jhipster: <%_ } _%> metrics: # DropWizard Metrics configuration, used by MetricsConfiguration jmx.enabled: true - <%_ if (javaVersion == '8') { _%> spark: enabled: false host: localhost port: 9999 - <%_ } _%> graphite: enabled: false host: localhost diff --git a/app/templates/src/main/resources/config/_application-prod.yml b/app/templates/src/main/resources/config/_application-prod.yml index ddfa24807ef5..d7e435ab95c7 100644 --- a/app/templates/src/main/resources/config/_application-prod.yml +++ b/app/templates/src/main/resources/config/_application-prod.yml @@ -137,12 +137,10 @@ jhipster: <%_ } _%> metrics: # DropWizard Metrics configuration, used by MetricsConfiguration jmx.enabled: true - <%_ if (javaVersion == '8') { _%> spark: enabled: false host: localhost port: 9999 - <%_ } _%> graphite: enabled: false host: localhost diff --git a/app/templates/src/test/java/package/service/_UserServiceTest.java b/app/templates/src/test/java/package/service/_UserServiceTest.java index 8d17141aac15..b242694596d3 100644 --- a/app/templates/src/test/java/package/service/_UserServiceTest.java +++ b/app/templates/src/test/java/package/service/_UserServiceTest.java @@ -19,7 +19,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; -import javax.inject.Inject;<% if ((databaseType == 'sql' || databaseType == 'mongodb') && javaVersion == '8') { %> +import javax.inject.Inject;<% if (databaseType == 'sql' || databaseType == 'mongodb') { %> import java.util.Optional;<%}%> import java.util.List; @@ -48,9 +48,8 @@ public class UserServiceTest <% if (databaseType == 'cassandra') { %>extends Abs private UserService userService;<% if ((databaseType == 'sql' || databaseType == 'mongodb') && authenticationType == 'session') { %> @Test - public void testRemoveOldPersistentTokens() {<% if (javaVersion == '8') { %> - User admin = userRepository.findOneByLogin("admin").get();<% } else { %> - User admin = userRepository.findOneByLogin("admin");<% } %> + public void testRemoveOldPersistentTokens() { + User admin = userRepository.findOneByLogin("admin").get(); int existingCount = persistentTokenRepository.findByUser(admin).size(); generateUserToken(admin, "1111-1111", new LocalDate()); LocalDate now = new LocalDate(); @@ -62,7 +61,6 @@ public void testRemoveOldPersistentTokens() {<% if (javaVersion == '8') { %> @Test public void assertThatUserMustExistToResetPassword() { - <% if (javaVersion == '8') { %> Optional maybeUser = userService.requestPasswordReset("john.doe@localhost"); assertThat(maybeUser.isPresent()).isFalse(); @@ -72,31 +70,18 @@ public void assertThatUserMustExistToResetPassword() { assertThat(maybeUser.get().getEmail()).isEqualTo("admin@localhost"); assertThat(maybeUser.get().getResetDate()).isNotNull(); assertThat(maybeUser.get().getResetKey()).isNotNull(); - <% } else { %> - User user = userService.requestPasswordReset("john.doe@localhost"); - assertThat(user).isNull(); - - user = userService.requestPasswordReset("admin@localhost"); - assertThat(user).isNotNull(); - assertThat(user.getEmail()).isEqualTo("admin@localhost"); - assertThat(user.getResetDate()).isNotNull(); - assertThat(user.getResetKey()).isNotNull(); - <% } %> } @Test public void assertThatOnlyActivatedUserCanRequestPasswordReset() { - User user = userService.createUserInformation("johndoe", "johndoe", "John", "Doe", "john.doe@localhost", "en-US");<% if (javaVersion == '8') { %> + User user = userService.createUserInformation("johndoe", "johndoe", "John", "Doe", "john.doe@localhost", "en-US"); Optional maybeUser = userService.requestPasswordReset("john.doe@localhost"); - assertThat(maybeUser.isPresent()).isFalse();<% } else { %> - User maybeUser = userService.requestPasswordReset("john.doe@localhost"); - assertThat(maybeUser).isNull();<% } %> + assertThat(maybeUser.isPresent()).isFalse(); userRepository.delete(user); } @Test public void assertThatResetKeyMustNotBeOlderThan24Hours() { - <% if (javaVersion == '8') { %> User user = userService.createUserInformation("johndoe", "johndoe", "John", "Doe", "john.doe@localhost", "en-US"); DateTime daysAgo = DateTime.now().minusHours(25); @@ -112,105 +97,37 @@ public void assertThatResetKeyMustNotBeOlderThan24Hours() { assertThat(maybeUser.isPresent()).isFalse(); userRepository.delete(user); - <% } else { %> - User user = userService.createUserInformation("johndoe", "johndoe", "John", "Doe", "john.doe@localhost", "en-US"); - - DateTime daysAgo = DateTime.now().minusHours(25); - String resetKey = RandomUtil.generateResetKey(); - user.setActivated(true); - user.setResetDate(daysAgo); - user.setResetKey(resetKey); - - userRepository.save(user); - - User maybeUser = userService.completePasswordReset("johndoe2", user.getResetKey()); - - assertThat(maybeUser).isNull(); - - userRepository.delete(user); - <% } %> } @Test public void assertThatResetKeyMustBeValid() { - <% if (javaVersion == '8') { %> User user = userService.createUserInformation("johndoe", "johndoe", "John", "Doe", "john.doe@localhost", "en-US"); - DateTime daysAgo = DateTime.now().minusHours(25); user.setActivated(true); user.setResetDate(daysAgo); user.setResetKey("1234"); - userRepository.save(user); - Optional maybeUser = userService.completePasswordReset("johndoe2", user.getResetKey()); - assertThat(maybeUser.isPresent()).isFalse(); - userRepository.delete(user); - <% } else { %> - User user = userService.createUserInformation("johndoe", "johndoe", "John", "Doe", "john.doe@localhost", "en-US"); - - DateTime daysAgo = DateTime.now().minusHours(25); - user.setActivated(true); - user.setResetDate(daysAgo); - user.setResetKey("1234"); - - userRepository.save(user); - - User maybeUser = userService.completePasswordReset("johndoe2", user.getResetKey()); - - assertThat(maybeUser).isNull(); - - userRepository.delete(user); - <% } %> } @Test public void assertThatUserCanResetPassword() { - <% if (javaVersion == '8') { %> User user = userService.createUserInformation("johndoe", "johndoe", "John", "Doe", "john.doe@localhost", "en-US"); - String oldPassword = user.getPassword(); - DateTime daysAgo = DateTime.now().minusHours(2); String resetKey = RandomUtil.generateResetKey(); user.setActivated(true); user.setResetDate(daysAgo); user.setResetKey(resetKey); - userRepository.save(user); - Optional maybeUser = userService.completePasswordReset("johndoe2", user.getResetKey()); - assertThat(maybeUser.isPresent()).isTrue(); assertThat(maybeUser.get().getResetDate()).isNull(); assertThat(maybeUser.get().getResetKey()).isNull(); assertThat(maybeUser.get().getPassword()).isNotEqualTo(oldPassword); - - userRepository.delete(user); - <% } else { %> - User user = userService.createUserInformation("johndoe", "johndoe", "John", "Doe", "john.doe@localhost", "en-US"); - - String oldPassword = user.getPassword(); - - DateTime daysAgo = DateTime.now().minusHours(2); - String resetKey = RandomUtil.generateResetKey(); - user.setActivated(true); - user.setResetDate(daysAgo); - user.setResetKey(resetKey); - - userRepository.save(user); - - User maybeUser = userService.completePasswordReset("johndoe2", user.getResetKey()); - - assertThat(maybeUser).isNotNull(); - assertThat(maybeUser.getResetDate()).isNull(); - assertThat(maybeUser.getResetKey()).isNull(); - assertThat(maybeUser.getPassword()).isNotEqualTo(oldPassword); - userRepository.delete(user); - <% } %> } @Test diff --git a/app/templates/src/test/java/package/web/rest/_AccountResourceTest.java b/app/templates/src/test/java/package/web/rest/_AccountResourceTest.java index 71b999c37051..57bb2700cbb9 100644 --- a/app/templates/src/test/java/package/web/rest/_AccountResourceTest.java +++ b/app/templates/src/test/java/package/web/rest/_AccountResourceTest.java @@ -19,21 +19,16 @@ import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration;<% if (databaseType == 'mongodb') { %> import org.springframework.context.annotation.Import;<% } %> -import org.springframework.http.MediaType;<% if (javaVersion == '7') { %> -import org.springframework.mock.web.MockHttpServletRequest;<% } %> +import org.springframework.http.MediaType; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.util.ReflectionTestUtils; -import org.springframework.test.web.servlet.MockMvc;<% if (javaVersion == '7') { %> -import org.springframework.test.web.servlet.request.RequestPostProcessor;<% } %> +import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import javax.inject.Inject; import javax.transaction.Transactional; -import java.util.Arrays; -import java.util.HashSet;<% if (javaVersion == '8') { %> -import java.util.Optional;<% } %> -import java.util.Set; +import java.util.*; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.anyObject; @@ -78,7 +73,7 @@ public class AccountResourceTest <% if (databaseType == 'cassandra') { %>extends @Before public void setup() { MockitoAnnotations.initMocks(this); - doNothing().when(mockMailService).sendActivationEmail(<% if (javaVersion != '8') { %>(User) <% } %>anyObject(), anyString()); + doNothing().when(mockMailService).sendActivationEmail((User) anyObject(), anyString()); AccountResource accountResource = new AccountResource(); ReflectionTestUtils.setField(accountResource, "userRepository", userRepository); @@ -105,13 +100,9 @@ public void testNonAuthenticatedUser() throws Exception { @Test public void testAuthenticatedUser() throws Exception { restUserMockMvc.perform(get("/api/authenticate") - .with(<% if (javaVersion == '8') { %>request -> { + .with(request -> { request.setRemoteUser("test"); - return request;<% } else { %>new RequestPostProcessor() { - public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) { - request.setRemoteUser("test"); - return request; - }<% } %> + return request; }) .accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) @@ -175,9 +166,8 @@ public void testRegisterValid() throws Exception { .content(TestUtil.convertObjectToJsonBytes(u))) .andExpect(status().isCreated()); - <% if (javaVersion == '8') { %>Optional user = userRepository.findOneByLogin("joe"); - assertThat(user.isPresent()).isTrue();<% } else { %>User user = userRepository.findOneByLogin("joe"); - assertThat(user).isNotNull();<% } %> + Optional user = userRepository.findOneByLogin("joe"); + assertThat(user.isPresent()).isTrue(); } @Test @@ -200,9 +190,8 @@ public void testRegisterInvalidLogin() throws Exception { .content(TestUtil.convertObjectToJsonBytes(u))) .andExpect(status().isBadRequest()); - <% if (javaVersion == '8') { %>Optional user = userRepository.findOneByEmail("funky@example.com"); - assertThat(user.isPresent()).isFalse();<% } else { %>User user = userRepository.findOneByEmail("funky@example.com"); - assertThat(user).isNull();<% } %> + Optional user = userRepository.findOneByEmail("funky@example.com"); + assertThat(user.isPresent()).isFalse(); } @Test @@ -225,9 +214,8 @@ public void testRegisterInvalidEmail() throws Exception { .content(TestUtil.convertObjectToJsonBytes(u))) .andExpect(status().isBadRequest()); - <% if (javaVersion == '8') { %>Optional user = userRepository.findOneByLogin("bob"); - assertThat(user.isPresent()).isFalse();<% } else { %>User user = userRepository.findOneByLogin("bob"); - assertThat(user).isNull();<% } %> + Optional user = userRepository.findOneByLogin("bob"); + assertThat(user.isPresent()).isFalse(); } @Test @@ -263,9 +251,8 @@ public void testRegisterDuplicateLogin() throws Exception { .content(TestUtil.convertObjectToJsonBytes(dup))) .andExpect(status().is4xxClientError()); - <% if (javaVersion == '8') { %>Optional userDup = userRepository.findOneByEmail("alicejr@example.com"); - assertThat(userDup.isPresent()).isFalse();<% } else { %>User userDup = userRepository.findOneByEmail("alicejr@example.com"); - assertThat(userDup).isNull();<% } %> + Optional userDup = userRepository.findOneByEmail("alicejr@example.com"); + assertThat(userDup.isPresent()).isFalse(); } @Test @@ -301,9 +288,8 @@ public void testRegisterDuplicateEmail() throws Exception { .content(TestUtil.convertObjectToJsonBytes(dup))) .andExpect(status().is4xxClientError()); - <% if (javaVersion == '8') { %>Optional userDup = userRepository.findOneByLogin("johnjr"); - assertThat(userDup.isPresent()).isFalse();<% } else { %>User userDup = userRepository.findOneByLogin("johnjr"); - assertThat(userDup).isNull();<% } %> + Optional userDup = userRepository.findOneByLogin("johnjr"); + assertThat(userDup.isPresent()).isFalse(); } @Test @@ -325,14 +311,10 @@ public void testRegisterAdminIsIgnored() throws Exception { .contentType(TestUtil.APPLICATION_JSON_UTF8) .content(TestUtil.convertObjectToJsonBytes(u))) .andExpect(status().isCreated()); -<% if (javaVersion == '8') { %> + Optional userDup = userRepository.findOneByLogin("badguy"); assertThat(userDup.isPresent()).isTrue(); assertThat(userDup.get().getAuthorities()).hasSize(1) - .containsExactly(<% if (databaseType == 'sql' || databaseType == 'mongodb') { %>authorityRepository.findOne(AuthoritiesConstants.USER)<% } %><% if (databaseType == 'cassandra') { %>AuthoritiesConstants.USER<% } %>);<% } else { %> - User userDup = userRepository.findOneByLogin("badguy"); - assertThat(userDup).isNotNull(); - assertThat(userDup.getAuthorities()).hasSize(1) - .containsExactly(authorityRepository.findOne(AuthoritiesConstants.USER));<% } %> + .containsExactly(<% if (databaseType == 'sql' || databaseType == 'mongodb') { %>authorityRepository.findOne(AuthoritiesConstants.USER)<% } %><% if (databaseType == 'cassandra') { %>AuthoritiesConstants.USER<% } %>); } } diff --git a/cloudfoundry/index.js b/cloudfoundry/index.js index 9d406df28a2a..eecfab4f9718 100644 --- a/cloudfoundry/index.js +++ b/cloudfoundry/index.js @@ -17,7 +17,6 @@ var CloudFoundryGenerator = module.exports = function CloudFoundryGenerator() { this.baseName = this.config.get('baseName'); this.packageName = this.config.get('packageName'); this.packageFolder = this.config.get('packageFolder'); - this.javaVersion = this.config.get('javaVersion'); this.hibernateCache = this.config.get('hibernateCache'); this.databaseType = this.config.get('databaseType'); this.devDatabaseType = this.config.get('devDatabaseType'); diff --git a/entity/index.js b/entity/index.js index 822e3576cb1f..688968745e6d 100644 --- a/entity/index.js +++ b/entity/index.js @@ -38,7 +38,6 @@ var EntityGenerator = module.exports = function EntityGenerator(args, options, c this.baseName = this.config.get('baseName'); this.packageName = this.config.get('packageName'); this.packageFolder = this.config.get('packageFolder'); - this.javaVersion = this.config.get('javaVersion'); this.authenticationType = this.config.get('authenticationType'); this.hibernateCache = this.config.get('hibernateCache'); this.databaseType = this.config.get('databaseType'); @@ -784,9 +783,6 @@ EntityGenerator.prototype.askForDTO = function askForDTO() { if (this.useConfigurationFile == true) { // don't prompt if data are imported from a file return; } - if (this.javaVersion == '7') { - return; - } var cb = this.async(); var prompts = [ { diff --git a/entity/templates/src/main/java/package/web/rest/_EntityResource.java b/entity/templates/src/main/java/package/web/rest/_EntityResource.java index cc3eba24526c..d06dd4e4a71c 100644 --- a/entity/templates/src/main/java/package/web/rest/_EntityResource.java +++ b/entity/templates/src/main/java/package/web/rest/_EntityResource.java @@ -22,14 +22,12 @@ import javax.inject.Inject;<% if (validation) { %> import javax.validation.Valid;<% } %> import java.net.URI; -import java.net.URISyntaxException;<% if (javaVersion == '7') { %> -import javax.servlet.http.HttpServletResponse;<% } %><% if (javaVersion == '7' && fieldsContainNoOwnerOneToOne == true) { %> -import java.util.ArrayList;<% } %><% if (dto == 'mapstruct') { %> +import java.net.URISyntaxException;<% if (dto == 'mapstruct') { %> import java.util.LinkedList;<% } %> -import java.util.List;<% if (javaVersion == '8') { %> -import java.util.Optional;<% } %><% if (databaseType == 'cassandra') { %> -import java.util.UUID;<% } %><% if (searchEngine == 'elasticsearch' || dto == 'mapstruct' || (javaVersion == '8' && fieldsContainNoOwnerOneToOne == true)) { %> -import java.util.stream.Collectors;<% } %><% if (searchEngine == 'elasticsearch' || (javaVersion == '8' && fieldsContainNoOwnerOneToOne == true)) { %> +import java.util.List; +import java.util.Optional;<% if (databaseType == 'cassandra') { %> +import java.util.UUID;<% } %><% if (searchEngine == 'elasticsearch' || dto == 'mapstruct' || fieldsContainNoOwnerOneToOne == true) { %> +import java.util.stream.Collectors;<% } %><% if (searchEngine == 'elasticsearch' || fieldsContainNoOwnerOneToOne == true) { %> import java.util.stream.StreamSupport;<% } %><% if (searchEngine == 'elasticsearch') { %> import static org.elasticsearch.index.query.QueryBuilders.*;<% } %> @@ -108,20 +106,13 @@ public class <%= entityClass %>Resource { @Transactional(readOnly = true)<% } %><% if (pagination == 'no') { %> public List<<%= entityClass %><% if (dto == 'mapstruct') { %>DTO<% } %>> getAll<%= entityClass %>s(<% if (fieldsContainNoOwnerOneToOne == true) { %>@RequestParam(required = false) String filter<% } %>) {<% for (idx in relationships) { if (relationships[idx].relationshipType == 'one-to-one' && relationships[idx].ownerSide != true) { %> if ("<%= relationships[idx].relationshipName.toLowerCase() %>-is-null".equals(filter)) { - log.debug("REST request to get all <%= entityClass %>s where <%= relationships[idx].relationshipName %> is null");<% if (javaVersion == '7') { %> - List <%= entityInstance %>s = new ArrayList<<%= entityClass %>>(); - for (<%= entityClass %> <%= entityInstance %> : <%= entityInstance %>Repository.findAll()) { - if (<%= entityInstance %>.get<%= relationships[idx].relationshipNameCapitalized %>() == null) { - <%= entityInstance %>s.add(<%= entityInstance %>); - } - } - return <%= entityInstance %>s;<% } else { %> + log.debug("REST request to get all <%= entityClass %>s where <%= relationships[idx].relationshipName %> is null"); return StreamSupport .stream(<%= entityInstance %>Repository.findAll().spliterator(), false) .filter(<%= entityInstance %> -> <%= entityInstance %>.get<%= relationships[idx].relationshipNameCapitalized %>() == null)<% if (dto == 'mapstruct') { %> .map(<%= entityInstance %> -> <%= entityInstance %>Mapper.<%= entityInstance %>To<%= entityClass %>DTO(<%= entityInstance %>)) .collect(Collectors.toCollection(LinkedList::new));<% } else { %> - .collect(Collectors.toList());<% } %><% } %> + .collect(Collectors.toList());<% } %> } <% } } %> log.debug("REST request to get all <%= entityClass %>s"); @@ -131,24 +122,17 @@ public class <%= entityClass %>Resource { public ResponseEntity<% if (dto == 'mapstruct') { %>DTO<% } %>>> getAll<%= entityClass %>s(Pageable pageable<% if (fieldsContainNoOwnerOneToOne == true) { %>, @RequestParam(required = false) String filter<% } %>) throws URISyntaxException {<% for (idx in relationships) { if (relationships[idx].relationshipType == 'one-to-one' && relationships[idx].ownerSide != true) { %> if ("<%= relationships[idx].relationshipName.toLowerCase() %>-is-null".equals(filter)) { - log.debug("REST request to get all <%= entityClass %>s where <%= relationships[idx].relationshipName %> is null");<% if (javaVersion == '7') { %> - List<<%= entityClass %>> <%= entityInstance %>s = new ArrayList<<%= entityClass %>>(); - for (<%= entityClass %> <%= entityInstance %> : <%= entityInstance %>Repository.findAll()) { - if (<%= entityInstance %>.get<%= relationships[idx].relationshipNameCapitalized %>() == null) { - <%= entityInstance %>s.add(<%= entityInstance %>); - } - } - return new ResponseEntity<>(<%= entityInstance %>s, HttpStatus.OK);<% } else { %> + log.debug("REST request to get all <%= entityClass %>s where <%= relationships[idx].relationshipName %> is null"); return new ResponseEntity<>(StreamSupport .stream(<%= entityInstance %>Repository.findAll().spliterator(), false) .filter(<%= entityInstance %> -> <%= entityInstance %>.get<%= relationships[idx].relationshipNameCapitalized %>() == null)<% if (dto == 'mapstruct') { %> .map(<%= entityInstance %> -> <%= entityInstance %>Mapper.<%= entityInstance %>To<%= entityClass %>DTO(<%= entityInstance %>))<% } %> - .collect(Collectors.toList()), HttpStatus.OK);<% } %> + .collect(Collectors.toList()), HttpStatus.OK); } <% } } %> Page<<%= entityClass %>> page = <%= entityInstance %>Repository.findAll(pageable); HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(page, "/api/<%= entityInstance %>s"); - return new ResponseEntity<<% if (javaVersion == '7') { %>List<<%= entityClass %>><% } %>>(page.getContent()<% if (dto == 'mapstruct') { %>.stream() + return new ResponseEntity<>(page.getContent()<% if (dto == 'mapstruct') { %>.stream() .map(<%= entityInstance %>Mapper::<%= entityInstance %>To<%= entityClass %>DTO) .collect(Collectors.toCollection(LinkedList::new))<% } %>, headers, HttpStatus.OK);<% } %> } @@ -160,20 +144,15 @@ public class <%= entityClass %>Resource { method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @Timed - public ResponseEntity<<%= entityClass %><% if (dto == 'mapstruct') { %>DTO<% } %>> get<%= entityClass %>(@PathVariable <% if (databaseType == 'sql') { %>Long<% } %><% if (databaseType == 'mongodb' || databaseType == 'cassandra') { %>String<% } %> id<% if (javaVersion == '7') { %>, HttpServletResponse response<% } %>) { - log.debug("REST request to get <%= entityClass %> : {}", id);<% if (javaVersion == '8') { %><% if (databaseType == 'sql' || databaseType == 'mongodb') { %> + public ResponseEntity<<%= entityClass %><% if (dto == 'mapstruct') { %>DTO<% } %>> get<%= entityClass %>(@PathVariable <% if (databaseType == 'sql') { %>Long<% } %><% if (databaseType == 'mongodb' || databaseType == 'cassandra') { %>String<% } %> id) { + log.debug("REST request to get <%= entityClass %> : {}", id);<% if (databaseType == 'sql' || databaseType == 'mongodb') { %> return Optional.ofNullable(<%= entityInstance %>Repository.<% if (fieldsContainOwnerManyToMany == true) { %>findOneWithEagerRelationships<% } else { %>findOne<% } %>(id))<% } %><% if (databaseType == 'cassandra') { %> return Optional.ofNullable(<%= entityInstance %>Repository.findOne(UUID.fromString(id)))<% } %><% if (dto == 'mapstruct') { %> .map(<%= entityInstance %>Mapper::<%= entityInstance %>To<%= entityClass %>DTO)<% } %> .map(<%= entityInstance %><% if (dto == 'mapstruct') { %>DTO<% } %> -> new ResponseEntity<>( <%= entityInstance %><% if (dto == 'mapstruct') { %>DTO<% } %>, HttpStatus.OK)) - .orElse(new ResponseEntity<>(HttpStatus.NOT_FOUND));<% } else { %> - <%= entityClass %> <%= entityInstance %> = <%= entityInstance %>Repository.<% if (fieldsContainOwnerManyToMany == true) { %>findOneWithEagerRelationships<% } else { %>findOne<% } %>(id); - if (<%= entityInstance %> == null) { - return new ResponseEntity<>(HttpStatus.NOT_FOUND); - } - return new ResponseEntity<>(<%= entityInstance %>, HttpStatus.OK);<% } %> + .orElse(new ResponseEntity<>(HttpStatus.NOT_FOUND)); } /** diff --git a/heroku/index.js b/heroku/index.js index 873c3ebac69a..afcd61cb00c4 100644 --- a/heroku/index.js +++ b/heroku/index.js @@ -15,7 +15,6 @@ var HerokuGenerator = module.exports = function HerokuGenerator(args, options, c this.baseName = this.config.get('baseName'); this.packageName = this.config.get('packageName'); this.packageFolder = this.config.get('packageFolder'); - this.javaVersion = this.config.get('javaVersion'); this.hibernateCache = this.config.get('hibernateCache'); this.databaseType = this.config.get('databaseType'); this.prodDatabaseType = this.config.get('prodDatabaseType'); diff --git a/openshift/index.js b/openshift/index.js index c4dbe59e0dbb..69f623004c1a 100644 --- a/openshift/index.js +++ b/openshift/index.js @@ -17,7 +17,6 @@ var OpenshiftGenerator = module.exports = function OpenshiftGenerator() { this.baseName = this.config.get('baseName'); this.packageName = this.config.get('packageName'); this.packageFolder = this.config.get('packageFolder'); - this.javaVersion = this.config.get('javaVersion'); this.hibernateCache = this.config.get('hibernateCache'); this.databaseType = this.config.get('databaseType'); this.prodDatabaseType = this.config.get('prodDatabaseType'); @@ -194,9 +193,7 @@ OpenshiftGenerator.prototype.copyOpenshiftFiles = function copyOpenshiftFiles() this.template('openshift/action_hooks/_build', 'deploy/openshift/.openshift/action_hooks/build', null, { 'interpolate': /<%=([\s\S]+?)%>/g }); this.template('openshift/action_hooks/_start', 'deploy/openshift/.openshift/action_hooks/start', null, { 'interpolate': /<%=([\s\S]+?)%>/g }); this.copy('openshift/action_hooks/stop', 'deploy/openshift/.openshift/action_hooks/stop'); - if (this.javaVersion === "8") { - this.copy('openshift/action_hooks/pre_build', 'deploy/openshift/.openshift/action_hooks/pre_build'); - } + this.copy('openshift/action_hooks/pre_build', 'deploy/openshift/.openshift/action_hooks/pre_build'); this.conflicter.resolve(function (err) { done(); }); @@ -248,7 +245,7 @@ OpenshiftGenerator.prototype.gitChmod = function gitChmod() { var child = exec('git update-index --chmod=+x .openshift/action_hooks/build && '+ 'git update-index --chmod=+x .openshift/action_hooks/start && '+ 'git update-index --chmod=+x .openshift/action_hooks/stop && ' + - (this.javaVersion === "8" ? 'git update-index --chmod=+x .openshift/action_hooks/pre_build && ' : '') + + 'git update-index --chmod=+x .openshift/action_hooks/pre_build && ' + 'git commit -m "Chmod"', { cwd: 'deploy/openshift' }, function (err, stdout, stderr) { if (stdout.search('nothing to commit') >= 0) { this.log('+x already set'); diff --git a/openshift/templates/openshift/action_hooks/_build b/openshift/templates/openshift/action_hooks/_build index 79b374571acf..c65600f4e293 100755 --- a/openshift/templates/openshift/action_hooks/_build +++ b/openshift/templates/openshift/action_hooks/_build @@ -4,10 +4,8 @@ set -x cd ${OPENSHIFT_REPO_DIR} -<% if (javaVersion === '8') { %> export M2=${OPENSHIFT_DATA_DIR}apache-maven-3.3.3/bin export JAVA_HOME=${OPENSHIFT_DATA_DIR}jdk1.8.0_40 export PATH=$JAVA_HOME/bin:$M2:$PATH -<% } %> mvn -B package -DskipTests=true -Dmaven.repo.local=${OPENSHIFT_DATA_DIR}maven/repository diff --git a/openshift/templates/openshift/action_hooks/_start b/openshift/templates/openshift/action_hooks/_start index 7fe32d26de71..dbe71910cf9b 100644 --- a/openshift/templates/openshift/action_hooks/_start +++ b/openshift/templates/openshift/action_hooks/_start @@ -4,10 +4,8 @@ set -x jar=$(ls ${OPENSHIFT_REPO_DIR}target/*.war | head -n1) -<% if (javaVersion === '8') { %> export JAVA_HOME=${OPENSHIFT_DATA_DIR}jdk1.8.0_40 export PATH=$JAVA_HOME/bin:$PATH -<% } %> nohup java -server \ -jar ${jar} \ diff --git a/test/test-creation.js b/test/test-creation.js index 1b44991e373a..2dcbab9906e5 100644 --- a/test/test-creation.js +++ b/test/test-creation.js @@ -25,7 +25,6 @@ describe('JHipster generator ', function () { "enableTranslation" : true, "buildTool": "maven", "frontendBuilder": "grunt", - "javaVersion": "8", "rememberMeKey": "5c37379956bd1242f5636c8cb322c2966ad81277", "searchEngine": "no" }) @@ -302,7 +301,6 @@ describe('JHipster generator ', function () { "enableTranslation" : true, "buildTool": "maven", "frontendBuilder": "grunt", - "javaVersion": "8", "rememberMeKey": "5c37379956bd1242f5636c8cb322c2966ad81277", "searchEngine": "no" }) @@ -336,7 +334,6 @@ describe('JHipster generator ', function () { "enableTranslation" : true, "buildTool": "maven", "frontendBuilder": "grunt", - "javaVersion": "8", "rememberMeKey": "5c37379956bd1242f5636c8cb322c2966ad81277", "searchEngine": "no" }) .on('end', done); @@ -369,7 +366,6 @@ describe('JHipster generator ', function () { "enableTranslation" : true, "buildTool": "maven", "frontendBuilder": "grunt", - "javaVersion": "8", "rememberMeKey": "5c37379956bd1242f5636c8cb322c2966ad81277", "searchEngine": "no" }) .on('end', done); @@ -401,7 +397,6 @@ describe('JHipster generator ', function () { "enableTranslation" : true, "buildTool": "maven", "frontendBuilder": "grunt", - "javaVersion": "8", "rememberMeKey": "5c37379956bd1242f5636c8cb322c2966ad81277", "searchEngine": "no" }) .on('end', done); @@ -434,7 +429,6 @@ describe('JHipster generator ', function () { "enableTranslation" : false, "buildTool": "maven", "frontendBuilder": "grunt", - "javaVersion": "8", "rememberMeKey": "5c37379956bd1242f5636c8cb322c2966ad81277", "searchEngine": "no" }) .on('end', done);