Skip to content

Commit

Permalink
automatic project update
Browse files Browse the repository at this point in the history
  • Loading branch information
jdubois committed Nov 14, 2016
1 parent 8e4cb7e commit 5139398
Show file tree
Hide file tree
Showing 27 changed files with 33 additions and 52 deletions.
2 changes: 1 addition & 1 deletion .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"en"
],
"serverPort": 8080,
"jhipsterVersion": "3.10.0",
"jhipsterVersion": "3.11.0",
"enableSocialSignIn": false,
"useSass": false,
"jhiPrefix": "jhi",
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated on 2016-11-14 using generator-jhipster 3.10.0
// Generated on 2016-11-14 using generator-jhipster 3.11.0
'use strict';

var gulp = require('gulp'),
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"eslint-config-angular": "0.5.0",
"eslint-plugin-angular": "1.3.1",
"event-stream": "3.3.4",
"generator-jhipster": "3.10.0",
"generator-jhipster": "3.11.0",
"gulp": "3.9.1",
"gulp-angular-filesort": "1.1.1",
"gulp-angular-templatecache": "2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2'
services:
jhipstersampleapplication-sonar:
container_name: jhipstersampleapplication-sonar
image: sonarqube:6.0-alpine
image: sonarqube:6.1-alpine
ports:
- 9000:9000
- 9092:9092
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public ResponseEntity<ManagedUserVM> updateUser(@RequestBody ManagedUserVM manag

/**
* GET /users : get all users.
*
*
* @param pageable the pagination information
* @return the ResponseEntity with status 200 (OK) and with body all users
* @throws URISyntaxException if the pagination headers couldn't be generated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
/**
* Custom, parameterized exception, which can be translated on the client side.
* For example:
*
*
* <pre>
* throw new CustomParameterizedException(&quot;myCustomError&quot;, &quot;hello&quot;, &quot;world&quot;);
* </pre>
*
*
* Can be translated with:
*
*
* <pre>
* "error.myCustomError" : "The server says {{params[0]}} to {{params[1]}}"
* </pre>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
The initial schema has the '00000000000001' id, so that it is over-written if we re-generate it.
-->
<changeSet id="00000000000001" author="jhipster">

<createTable tableName="jhi_user">
<column name="id" type="bigint" autoIncrement="${autoIncrement}">
<constraints primaryKey="true" nullable="false"/>
Expand Down Expand Up @@ -51,7 +50,6 @@
<column name="last_modified_by" type="varchar(50)"/>
<column name="last_modified_date" type="timestamp"/>
</createTable>

<createIndex indexName="idx_user_login"
tableName="jhi_user"
unique="true">
Expand All @@ -63,7 +61,6 @@
unique="true">
<column name="email" type="varchar(100)"/>
</createIndex>

<createTable tableName="jhi_authority">
<column name="name" type="varchar(50)">
<constraints primaryKey="true" nullable="false"/>
Expand Down Expand Up @@ -130,7 +127,6 @@
file="config/liquibase/users_authorities.csv"
separator=";"
tableName="jhi_user_authority"/>

<createTable tableName="jhi_persistent_audit_event">
<column name="event_id" type="bigint" autoIncrement="${autoIncrement}">
<constraints primaryKey="true" nullable="false"/>
Expand Down Expand Up @@ -171,7 +167,6 @@
constraintName="fk_evt_pers_audit_evt_data"
referencedColumnNames="event_id"
referencedTableName="jhi_persistent_audit_event"/>

</changeSet>

</databaseChangeLog>
2 changes: 1 addition & 1 deletion src/main/resources/ehcache.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<cache name="io.github.jhipster.sample.domain.User.persistentTokens"
timeToLiveSeconds="3600">
</cache>

<cache name="io.github.jhipster.sample.domain.BankAccount"
timeToLiveSeconds="3600">
</cache>
Expand Down
2 changes: 0 additions & 2 deletions src/main/webapp/app/admin/metrics/metrics.html
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ <h3 data-translate="metrics.servicesstats.title">Services statistics (time in mi
</tbody>
</table>
</div>

<h3 data-translate="metrics.ehcache.title">Ehcache statistics</h3>
<div class="table-responsive">
<table class="table table-striped">
Expand All @@ -194,7 +193,6 @@ <h3 data-translate="metrics.ehcache.title">Ehcache statistics</h3>
</tbody>
</table>
</div>

<h3 data-translate="metrics.datasource.title" ng-show="vm.metrics.gauges['HikariPool-1.pool.TotalConnections'].value > 0">DataSource statistics (time in millisecond)</h3>
<div class="table-responsive" ng-show="vm.metrics.gauges['HikariPool-1.pool.TotalConnections'].value > 0">
<table class="table table-striped">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
vm.transition = transition;

vm.loadAll();

JhiLanguageService.getAll().then(function (languages) {
vm.languages = languages;
});
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/app/app.module.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

angular
.module('jhipsterSampleApplicationApp', [
'ngStorage',
'ngStorage',
'tmh.dynamicLocale',
'pascalprecht.translate',
'pascalprecht.translate',
'ngResource',
'ngCookies',
'ngAria',
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/blocks/config/compile.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
function compileServiceConfig($compileProvider,DEBUG_INFO_ENABLED) {
// disable debug data on prod profile to improve performance
$compileProvider.debugInfoEnabled(DEBUG_INFO_ENABLED);

/*
If you wish to debug an application with this information
then you should open up a debug console in the browser
Expand Down
2 changes: 0 additions & 2 deletions src/main/webapp/app/blocks/handlers/state.handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,10 @@
Auth.authorize();
}


// Update the language
JhiLanguageService.getCurrent().then(function (language) {
$translate.use(language);
});

});

var stateChangeSuccess = $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
.module('jhipsterSampleApplicationApp')
.factory('authExpiredInterceptor', authExpiredInterceptor);


authExpiredInterceptor.$inject = ['$rootScope', '$q', '$injector'];

function authExpiredInterceptor($rootScope, $q, $injector) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
angular
.module('jhipsterSampleApplicationApp')
.filter('characters', characters);

function characters () {
return charactersFilter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
input = inputWords.slice(0, words).join(' ') + '...';
}
}

return input;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
vm.bankAccount = entity;
vm.clear = clear;
vm.confirmDelete = confirmDelete;

function clear () {
$uibModalInstance.dismiss('cancel');
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

function BankAccountController ($scope, $state, BankAccount) {
var vm = this;

vm.bankAccounts = [];

loadAll();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
vm.label = entity;
vm.clear = clear;
vm.confirmDelete = confirmDelete;

function clear () {
$uibModalInstance.dismiss('cancel');
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/entities/label/label.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

function LabelController ($scope, $state, Label) {
var vm = this;

vm.labels = [];

loadAll();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
vm.operation = entity;
vm.clear = clear;
vm.confirmDelete = confirmDelete;

function clear () {
$uibModalInstance.dismiss('cancel');
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

function OperationController ($scope, $state, Operation, ParseLinks, AlertService) {
var vm = this;

vm.operations = [];
vm.loadPage = loadPage;
vm.page = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/i18n/en/metrics.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"evictioncount": "Eviction count"
},
"datasource": {
"usage": "Usage",
"usage": "Usage",
"title": "DataSource statistics (time in millisecond)",
"name": "Pool usage",
"count": "Count",
Expand Down
5 changes: 0 additions & 5 deletions src/main/webapp/swagger-ui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,8 @@
});

function addApiKeyAuthorization(){

var apiKeyAuth = new SwaggerClient.ApiKeyAuthorization("X-XSRF-TOKEN", getCSRF(), "header");
window.swaggerUi.api.clientAuthorizations.add("key", apiKeyAuth);




}

function getCSRF() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import java.math.BigDecimal;
Expand All @@ -39,8 +38,8 @@
@SpringBootTest(classes = JhipsterSampleApplicationApp.class)
public class BankAccountResourceIntTest {

private static final String DEFAULT_NAME = "AAAAA";
private static final String UPDATED_NAME = "BBBBB";
private static final String DEFAULT_NAME = "AAAAAAAAAA";
private static final String UPDATED_NAME = "BBBBBBBBBB";

private static final BigDecimal DEFAULT_BALANCE = new BigDecimal(1);
private static final BigDecimal UPDATED_BALANCE = new BigDecimal(2);
Expand All @@ -61,7 +60,7 @@ public class BankAccountResourceIntTest {

private BankAccount bankAccount;

@PostConstruct
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
BankAccountResource bankAccountResource = new BankAccountResource();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import java.util.List;
Expand All @@ -38,8 +37,8 @@
@SpringBootTest(classes = JhipsterSampleApplicationApp.class)
public class LabelResourceIntTest {

private static final String DEFAULT_LABEL = "AAA";
private static final String UPDATED_LABEL = "BBB";
private static final String DEFAULT_LABEL = "AAAAAAAAAA";
private static final String UPDATED_LABEL = "BBBBBBBBBB";

@Inject
private LabelRepository labelRepository;
Expand All @@ -57,7 +56,7 @@ public class LabelResourceIntTest {

private Label label;

@PostConstruct
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
LabelResource labelResource = new LabelResource();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import java.time.Instant;
import java.time.ZonedDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.time.ZoneId;
import java.math.BigDecimal;
Expand All @@ -43,12 +43,12 @@
@SpringBootTest(classes = JhipsterSampleApplicationApp.class)
public class OperationResourceIntTest {

private static final ZonedDateTime DEFAULT_DATE = ZonedDateTime.ofInstant(Instant.ofEpochMilli(0L), ZoneId.systemDefault());
private static final ZonedDateTime DEFAULT_DATE = ZonedDateTime.ofInstant(Instant.ofEpochMilli(0L), ZoneOffset.UTC);
private static final ZonedDateTime UPDATED_DATE = ZonedDateTime.now(ZoneId.systemDefault()).withNano(0);
private static final String DEFAULT_DATE_STR = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(DEFAULT_DATE);
private static final String DEFAULT_DATE_STR = DateTimeFormatter.ISO_INSTANT.format(DEFAULT_DATE);

private static final String DEFAULT_DESCRIPTION = "AAAAA";
private static final String UPDATED_DESCRIPTION = "BBBBB";
private static final String DEFAULT_DESCRIPTION = "AAAAAAAAAA";
private static final String UPDATED_DESCRIPTION = "BBBBBBBBBB";

private static final BigDecimal DEFAULT_AMOUNT = new BigDecimal(1);
private static final BigDecimal UPDATED_AMOUNT = new BigDecimal(2);
Expand All @@ -69,7 +69,7 @@ public class OperationResourceIntTest {

private Operation operation;

@PostConstruct
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
OperationResource operationResource = new OperationResource();
Expand Down

0 comments on commit 5139398

Please sign in to comment.