automatic project update

.yo-rc.json

@@ -24,7 +24,7 @@
       "en"
     ],
     "serverPort": 8080,
-    "jhipsterVersion": "4.5.6",
+    "jhipsterVersion": "4.6.0",
     "enableSocialSignIn": false,
     "useSass": false,
     "jhiPrefix": "jhi",

README.md

@@ -1,5 +1,5 @@
 # jhipsterSampleApplication
-This application was generated using JHipster 4.5.6, you can find documentation and help at [https://jhipster.github.io/documentation-archive/v4.5.6](https://jhipster.github.io/documentation-archive/v4.5.6).
+This application was generated using JHipster 4.6.0, you can find documentation and help at [https://jhipster.github.io/documentation-archive/v4.6.0](https://jhipster.github.io/documentation-archive/v4.6.0).
 
 ## Development
 
@@ -96,13 +96,13 @@ For more information refer to [Using Docker and Docker-Compose][], this page als
 To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information.
 
 [JHipster Homepage and latest documentation]: https://jhipster.github.io
-[JHipster 4.5.6 archive]: https://jhipster.github.io/documentation-archive/v4.5.6
+[JHipster 4.6.0 archive]: https://jhipster.github.io/documentation-archive/v4.6.0
 
-[Using JHipster in development]: https://jhipster.github.io/documentation-archive/v4.5.6/development/
-[Using Docker and Docker-Compose]: https://jhipster.github.io/documentation-archive/v4.5.6/docker-compose
-[Using JHipster in production]: https://jhipster.github.io/documentation-archive/v4.5.6/production/
-[Running tests page]: https://jhipster.github.io/documentation-archive/v4.5.6/running-tests/
-[Setting up Continuous Integration]: https://jhipster.github.io/documentation-archive/v4.5.6/setting-up-ci/
+[Using JHipster in development]: https://jhipster.github.io/documentation-archive/v4.6.0/development/
+[Using Docker and Docker-Compose]: https://jhipster.github.io/documentation-archive/v4.6.0/docker-compose
+[Using JHipster in production]: https://jhipster.github.io/documentation-archive/v4.6.0/production/
+[Running tests page]: https://jhipster.github.io/documentation-archive/v4.6.0/running-tests/
+[Setting up Continuous Integration]: https://jhipster.github.io/documentation-archive/v4.6.0/setting-up-ci/
 
 [Gatling]: http://gatling.io/
 [Node.js]: https://nodejs.org/

gulpfile.js

@@ -1,4 +1,4 @@
-// Generated on 2017-06-23 using generator-jhipster 4.5.6
+// Generated on 2017-07-06 using generator-jhipster 4.6.0
 'use strict';
 
 var gulp = require('gulp'),
@@ -100,7 +100,8 @@ gulp.task('ngconstant:dev', function () {
         name: 'jhipsterSampleApplicationApp',
         constants: {
             VERSION: util.parseVersion(),
-            DEBUG_INFO_ENABLED: true
+            DEBUG_INFO_ENABLED: true,
+            BUILD_TIMESTAMP: ''
         },
         template: config.constantTemplate,
         stream: true
@@ -114,7 +115,8 @@ gulp.task('ngconstant:prod', function () {
         name: 'jhipsterSampleApplicationApp',
         constants: {
             VERSION: util.parseVersion(),
-            DEBUG_INFO_ENABLED: false
+            DEBUG_INFO_ENABLED: false,
+            BUILD_TIMESTAMP: new Date().getTime()
         },
         template: config.constantTemplate,
         stream: true

package.json

@@ -3,6 +3,7 @@
   "version": "0.0.0",
   "description": "Description for jhipsterSampleApplication",
   "private": true,
+  "license": "UNLICENSED",
   "cacheDirectories": [
     "node_modules",
     "src/main/webapp/bower_components"
@@ -14,7 +15,7 @@
     "eslint-config-angular": "0.5.0",
     "eslint-plugin-angular": "2.2.1",
     "event-stream": "3.3.4",
-    "generator-jhipster": "4.5.6",
+    "generator-jhipster": "4.6.0",
     "gulp": "3.9.1",
     "gulp-angular-filesort": "1.1.1",
     "gulp-angular-templatecache": "2.0.0",

pom.xml

@@ -25,15 +25,15 @@
         <!-- Overridden to get metrics-jcache -->
         <dropwizard-metrics.version>3.2.2</dropwizard-metrics.version>
         <frontend-maven-plugin.version>1.4</frontend-maven-plugin.version>
-        <gatling.version>2.2.3</gatling.version>
-        <gatling-maven-plugin.version>2.2.1</gatling-maven-plugin.version>
+        <gatling.version>2.2.5</gatling.version>
+        <gatling-maven-plugin.version>2.2.4</gatling-maven-plugin.version>
         <hibernate.version>5.2.8.Final</hibernate.version>
         <hikaricp.version>2.6.0</hikaricp.version>
         <jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
         <java.version>1.8</java.version>
         <jcache.version>1.0.0</jcache.version>
         <jzlib.version>1.1.3</jzlib.version>
-        <jhipster.server.version>1.1.7</jhipster.server.version>
+        <jhipster.server.version>1.1.8</jhipster.server.version>
         <liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
         <liquibase-slf4j.version>2.0.0</liquibase-slf4j.version>
         <logstash-logback-encoder.version>4.9</logstash-logback-encoder.version>
@@ -88,7 +88,7 @@
         <sonar.tests>${project.basedir}/src/test/</sonar.tests>
 
         <!-- Spring properties -->
-        <springfox.version>2.6.1</springfox.version>
+        <springfox.version>2.7.0</springfox.version>
         <validation-api.version>1.1.0.Final</validation-api.version>
         <yarn.version>v0.24.6</yarn.version>
     </properties>
@@ -382,10 +382,15 @@
                 <version>${gatling-maven-plugin.version}</version>
                 <configuration>
                     <configFolder>src/test/gatling/conf</configFolder>
-                    <dataFolder>src/test/gatling/data</dataFolder>
-                    <resultsFolder>target/gatling/results</resultsFolder>
-                    <bodiesFolder>src/test/gatling/bodies</bodiesFolder>
-                    <simulationsFolder>src/test/gatling/simulations</simulationsFolder>
+                    <dataFolder>src/test/gatling/user-files/data</dataFolder>
+                    <resultsFolder>target/gatling/results/${maven.build.timestamp}/</resultsFolder>
+                    <bodiesFolder>src/test/gatling/user-files/bodies</bodiesFolder>
+                    <simulationsFolder>src/test/gatling/user-files/simulations</simulationsFolder>
+                    <!-- If uncommented, these arguments below will be applied to all your gatling tests -->
+                    <!--<jvmArgs>
+                        <jvmArg>-Dusers=100</jvmArg>
+                        <jvmArg>-Dramp=1</jvmArg>
+                    </jvmArgs>-->
                     <!--
                     This will run multiple simulations one by one. Useful when doing Gatling
                     tests in CI.
@@ -805,7 +810,7 @@
                 Profile for doing "continuous compilation" with the Scala Maven plugin.
                 It allows automatic compilation of Java classes as soon as they are saved.
                 To use it, run in 3 terminals:
-                - './mvnw -Pcc scala:cc' for continous compilation of your classes
+                - './mvnw -Pcc scala:cc' for continuous compilation of your classes
                 - './mvnw -Pcc' for hot reload of Spring boot
                 - 'gulp' for hot reload of the HTML/JavaScript assets
                 Everything should hot reload automatically!

src/main/java/io/github/jhipster/sample/domain/User.java

@@ -15,6 +15,7 @@
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Set;
 import java.time.Instant;
 
@@ -111,7 +112,7 @@ public String getLogin() {
 
     //Lowercase the login before saving it in database
     public void setLogin(String login) {
-        this.login = login.toLowerCase(Locale.ENGLISH);
+        this.login = login == null ? null : login.toLowerCase(Locale.ENGLISH);
     }
 
     public String getPassword() {
@@ -219,13 +220,12 @@ public boolean equals(Object o) {
         }
 
         User user = (User) o;
-
-        return login.equals(user.login);
+        return !(user.getId() == null || getId() == null) && Objects.equals(getId(), user.getId());
     }
 
     @Override
     public int hashCode() {
-        return login.hashCode();
+        return Objects.hashCode(getId());
     }
 
     @Override

src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml

@@ -3,7 +3,7 @@
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
     <property name="now" value="now()" dbms="h2"/>

src/main/resources/config/liquibase/changelog/20150805124838_added_entity_BankAccount.xml

@@ -3,7 +3,7 @@
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
     <property name="now" value="now()" dbms="h2"/>

src/main/resources/config/liquibase/changelog/20150805124838_added_entity_constraints_BankAccount.xml

@@ -2,7 +2,7 @@
 <databaseChangeLog
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
     <!--
         Added the constraints for entity BankAccount.
     -->

src/main/resources/config/liquibase/changelog/20150805124936_added_entity_Label.xml

@@ -3,7 +3,7 @@
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
     <property name="now" value="now()" dbms="h2"/>

src/main/resources/config/liquibase/changelog/20150805125054_added_entity_Operation.xml

@@ -3,7 +3,7 @@
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
     <property name="now" value="now()" dbms="h2"/>

src/main/resources/config/liquibase/changelog/20150805125054_added_entity_constraints_Operation.xml

@@ -2,7 +2,7 @@
 <databaseChangeLog
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
     <!--
         Added the constraints for entity Operation.
     -->

src/main/resources/config/liquibase/master.xml

@@ -2,7 +2,7 @@
 <databaseChangeLog
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
 
     <include file="classpath:config/liquibase/changelog/00000000000000_initial_schema.xml" relativeToChangelogFile="false"/>
     <include file="classpath:config/liquibase/changelog/20150805124838_added_entity_BankAccount.xml" relativeToChangelogFile="false"/>

src/main/resources/mails/activationEmail.html

@@ -14,7 +14,7 @@
         </p>
         <p>
             <a th:href="@{|${baseUrl}/#/activate?key=${user.activationKey}|}"
-               th:text="|${user.login}|">Activation Link</a>
+               th:text="@{|${baseUrl}/#/activate?key=${user.activationKey}|}">Activation Link</a>
         </p>
         <p>
             <span th:text="#{email.activation.text2}">Regards, </span>

src/main/resources/mails/creationEmail.html

@@ -14,7 +14,7 @@
         </p>
         <p>
           <a th:href="@{|${baseUrl}/#/reset/finish?key=${user.resetKey}|}"
-             th:text="|${user.login}|">login</a>
+             th:text="@{|${baseUrl}/#/reset/finish?key=${user.resetKey}|}">Login link</a>
         </p>
         <p>
             <span th:text="#{email.activation.text2}">Regards, </span>

src/main/resources/mails/passwordResetEmail.html

@@ -14,7 +14,7 @@
         </p>
         <p>
             <a th:href="@{|${baseUrl}/#/reset/finish?key=${user.resetKey}|}"
-               th:text="|${user.login}|">Reset Link</a>
+               th:text="@{|${baseUrl}/#/reset/finish?key=${user.resetKey}|}">Reset Link</a>
         </p>
         <p>
             <span th:text="#{email.reset.text2}">Regards, </span>

src/main/webapp/app/admin/user-management/user-management-dialog.html

@@ -17,7 +17,7 @@ <h4 class="modal-title" id="myUserLabel" data-translate="userManagement.home.cre
         <div class="form-group">
             <label class="control-label" data-translate="userManagement.login">Login</label>
             <input type="text" class="form-control" name="login"
-                   ng-model="vm.user.login" ng-required="vm.user.id == null" ng-minlength=1 ng-maxlength=50 ng-pattern="/^[_'.@A-Za-z0-9-]*$/">
+                   ng-model="vm.user.login" required ng-minlength=1 ng-maxlength=50 ng-pattern="/^[_'.@A-Za-z0-9-]*$/">
 
             <div ng-show="editForm.login.$invalid">
                 <p class="help-block"

src/main/webapp/app/app.constants.js

@@ -5,5 +5,6 @@
         .module('jhipsterSampleApplicationApp')
         .constant('VERSION', "0.0.1-SNAPSHOT")
         .constant('DEBUG_INFO_ENABLED', true)
+        .constant('BUILD_TIMESTAMP', "")
 ;
 })();

src/main/webapp/app/blocks/config/translation.config.js

@@ -5,12 +5,12 @@
         .module('jhipsterSampleApplicationApp')
         .config(translationConfig);
 
-    translationConfig.$inject = ['$translateProvider', 'tmhDynamicLocaleProvider'];
+    translationConfig.$inject = ['$translateProvider', 'tmhDynamicLocaleProvider', 'BUILD_TIMESTAMP'];
 
-    function translationConfig($translateProvider, tmhDynamicLocaleProvider) {
+    function translationConfig($translateProvider, tmhDynamicLocaleProvider, BUILD_TIMESTAMP) {
         // Initialize angular-translate
         $translateProvider.useLoader('$translatePartialLoader', {
-            urlTemplate: 'i18n/{lang}/{part}.json'
+            urlTemplate: 'i18n/{lang}/{part}.json' + (BUILD_TIMESTAMP ? '?build=' + BUILD_TIMESTAMP : '')
         });
 
         $translateProvider.preferredLanguage('en');

src/main/webapp/app/blocks/handlers/translation.handler.js

@@ -26,6 +26,7 @@
             });
         }
 
+
         // update the window title using params in the following
         // precedence
         // 1. titleKey parameter

src/main/webapp/app/components/language/language.filter.js

@@ -3,47 +3,60 @@
 
     angular
         .module('jhipsterSampleApplicationApp')
-        .filter('findLanguageFromKey', findLanguageFromKey);
+        .filter('findLanguageFromKey', findLanguageFromKey)
+        .filter('findLanguageRtlFromKey', findLanguageRtlFromKey);
+
+    var languages = {
+        'ca': { name: 'Català' },
+        'cs': { name: 'Český' },
+        'da': { name: 'Dansk' },
+        'de': { name: 'Deutsch' },
+        'el': { name: 'Ελληνικά' },
+        'en': { name: 'English' },
+        'es': { name: 'Español' },
+        'et': { name: 'Eesti' },
+        'fa': { name: 'فارسی', rtl: true },
+        'fr': { name: 'Français' },
+        'gl': { name: 'Galego' },
+        'hu': { name: 'Magyar' },
+        'hi': { name: 'हिंदी' },
+        'hy': { name: 'Հայերեն' },
+        'it': { name: 'Italiano' },
+        'ja': { name: '日本語' },
+        'ko': { name: '한국어' },
+        'mr': { name: 'मराठी' },
+        'nl': { name: 'Nederlands' },
+        'pl': { name: 'Polski' },
+        'pt-br': { name: 'Português (Brasil)' },
+        'pt-pt': { name: 'Português' },
+        'ro': { name: 'Română' },
+        'ru': { name: 'Русский' },
+        'sk': { name: 'Slovenský' },
+        'sr': { name: 'Srpski' },
+        'sv': { name: 'Svenska' },
+        'ta': { name: 'தமிழ்' },
+        'th': { name: 'ไทย' },
+        'tr': { name: 'Türkçe' },
+        'ua': { name: 'Українська' },
+        'vi': { name: 'Tiếng Việt' },
+        'zh-cn': { name: '中文（简体）' },
+        'zh-tw': { name: '繁體中文' }
+    };
 
     function findLanguageFromKey() {
         return findLanguageFromKeyFilter;
 
         function findLanguageFromKeyFilter(lang) {
-            return {
-                'ca': 'Català',
-                'cs': 'Český',
-                'da': 'Dansk',
-                'de': 'Deutsch',
-                'el': 'Ελληνικά',
-                'en': 'English',
-                'es': 'Español',
-                'et': 'Eesti',
-                'fr': 'Français',
-                'gl': 'Galego',
-                'hu': 'Magyar',
-                'hi': 'हिंदी',
-                'hy': 'Հայերեն',
-                'it': 'Italiano',
-                'ja': '日本語',
-                'ko': '한국어',
-                'mr': 'मराठी',
-                'nl': 'Nederlands',
-                'pl': 'Polski',
-                'pt-br': 'Português (Brasil)',
-                'pt-pt': 'Português',
-                'ro': 'Română',
-                'ru': 'Русский',
-                'sk': 'Slovenský',
-                'sr': 'Srpski',
-                'sv': 'Svenska',
-                'ta': 'தமிழ்',
-                'th': 'ไทย',
-                'tr': 'Türkçe',
-                'ua': 'Українська',
-                'vi': 'Tiếng Việt',
-                'zh-cn': '中文（简体）',
-                'zh-tw': '繁體中文'
-            }[lang];
+            return languages[lang].name;
+        }
+    }
+
+    function findLanguageRtlFromKey() {
+        return findLanguageRtlFromKeyFilter;
+
+        function findLanguageRtlFromKeyFilter(lang) {
+            return languages[lang].rtl;
         }
     }
+
 })();