Skip to content

Commit

Permalink
automatic project update
Browse files Browse the repository at this point in the history
  • Loading branch information
jdubois committed Sep 2, 2015
1 parent 1911cb7 commit 7d27a2e
Show file tree
Hide file tree
Showing 27 changed files with 1,919 additions and 753 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
@@ -1,4 +1,4 @@
// Generated on 2015-08-31 using generator-jhipster 2.20.0
// Generated on 2015-09-02 using generator-jhipster 2.20.0
'use strict';
var fs = require('fs');

Expand Down
2 changes: 1 addition & 1 deletion README.md
@@ -1,4 +1,4 @@
# Developping sampleApplication
# Developing sampleApplication

sampleApplication was generated using JHipster, you can find documentation and help at [JHipster][].

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Expand Up @@ -24,7 +24,7 @@
"angular-local-storage": "0.2.0",
"angular-cache-buster": "0.4.3",
"ngInfiniteScroll": "1.2.0",
"ng-file-upload": "5.0.9",
"ng-file-upload": "7.0.15",
"swagger-ui": "2.1.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -10,7 +10,7 @@
"grunt-autoprefixer": "2.2.0",
"grunt-build-control": "0.3.0",
"grunt-wiredep": "2.0.0",
"grunt-browser-sync": "2.1.2",
"grunt-browser-sync": "2.1.3",
"grunt-contrib-copy": "0.8.0",
"grunt-contrib-clean": "0.6.0",
"grunt-contrib-concat": "0.5.1",
Expand Down
14 changes: 6 additions & 8 deletions src/main/java/com/mycompany/myapp/Application.java
Expand Up @@ -10,7 +10,6 @@
import org.springframework.context.annotation.ComponentScan;
import org.springframework.core.env.Environment;
import org.springframework.core.env.SimpleCommandLinePropertySource;
import com.google.common.base.Joiner;

import javax.annotation.PostConstruct;
import javax.inject.Inject;
Expand Down Expand Up @@ -94,12 +93,11 @@ private static void addDefaultProfile(SpringApplication app, SimpleCommandLinePr
* Set the liquibases.scan.packages to avoid an exception from ServiceLocator.
*/
private static void addLiquibaseScanPackages() {
System.setProperty("liquibase.scan.packages", Joiner.on(",").join(
"liquibase.change", "liquibase.database", "liquibase.parser",
"liquibase.precondition", "liquibase.datatype",
"liquibase.serializer", "liquibase.sqlgenerator", "liquibase.executor",
"liquibase.snapshot", "liquibase.logging", "liquibase.diff",
"liquibase.structure", "liquibase.structurecompare", "liquibase.lockservice",
"liquibase.ext", "liquibase.changelog"));
System.setProperty("liquibase.scan.packages", "liquibase.change,liquibase.database," +
"liquibase.parser,liquibase.precondition,liquibase.datatype," +
"liquibase.serializer,liquibase.sqlgenerator,liquibase.executor," +
"liquibase.snapshot,liquibase.logging,liquibase.diff," +
"liquibase.structure,liquibase.structurecompare,liquibase.lockservice," +
"liquibase.ext,liquibase.changelog");
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/mycompany/myapp/domain/BankAccount.java
Expand Up @@ -17,7 +17,7 @@
* A BankAccount.
*/
@Entity
@Table(name = "BANKACCOUNT")
@Table(name = "BANK_ACCOUNT")
@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
public class BankAccount implements Serializable {

Expand Down
Expand Up @@ -38,7 +38,7 @@ public class BankAccountResource {
method = RequestMethod.POST,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public ResponseEntity<BankAccount> create(@Valid @RequestBody BankAccount bankAccount) throws URISyntaxException {
public ResponseEntity<BankAccount> createBankAccount(@Valid @RequestBody BankAccount bankAccount) throws URISyntaxException {
log.debug("REST request to save BankAccount : {}", bankAccount);
if (bankAccount.getId() != null) {
return ResponseEntity.badRequest().header("Failure", "A new bankAccount cannot already have an ID").body(null);
Expand All @@ -56,10 +56,10 @@ public ResponseEntity<BankAccount> create(@Valid @RequestBody BankAccount bankAc
method = RequestMethod.PUT,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public ResponseEntity<BankAccount> update(@Valid @RequestBody BankAccount bankAccount) throws URISyntaxException {
public ResponseEntity<BankAccount> updateBankAccount(@Valid @RequestBody BankAccount bankAccount) throws URISyntaxException {
log.debug("REST request to update BankAccount : {}", bankAccount);
if (bankAccount.getId() == null) {
return create(bankAccount);
return createBankAccount(bankAccount);
}
BankAccount result = bankAccountRepository.save(bankAccount);
return ResponseEntity.ok()
Expand All @@ -74,7 +74,7 @@ public ResponseEntity<BankAccount> update(@Valid @RequestBody BankAccount bankAc
method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public List<BankAccount> getAll() {
public List<BankAccount> getAllBankAccounts() {
log.debug("REST request to get all BankAccounts");
return bankAccountRepository.findAll();
}
Expand All @@ -86,7 +86,7 @@ public List<BankAccount> getAll() {
method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public ResponseEntity<BankAccount> get(@PathVariable Long id) {
public ResponseEntity<BankAccount> getBankAccount(@PathVariable Long id) {
log.debug("REST request to get BankAccount : {}", id);
return Optional.ofNullable(bankAccountRepository.findOne(id))
.map(bankAccount -> new ResponseEntity<>(
Expand All @@ -102,7 +102,7 @@ public ResponseEntity<BankAccount> get(@PathVariable Long id) {
method = RequestMethod.DELETE,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public ResponseEntity<Void> delete(@PathVariable Long id) {
public ResponseEntity<Void> deleteBankAccount(@PathVariable Long id) {
log.debug("REST request to delete BankAccount : {}", id);
bankAccountRepository.delete(id);
return ResponseEntity.ok().headers(HeaderUtil.createEntityDeletionAlert("bankAccount", id.toString())).build();
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/mycompany/myapp/web/rest/LabelResource.java
Expand Up @@ -38,7 +38,7 @@ public class LabelResource {
method = RequestMethod.POST,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public ResponseEntity<Label> create(@Valid @RequestBody Label label) throws URISyntaxException {
public ResponseEntity<Label> createLabel(@Valid @RequestBody Label label) throws URISyntaxException {
log.debug("REST request to save Label : {}", label);
if (label.getId() != null) {
return ResponseEntity.badRequest().header("Failure", "A new label cannot already have an ID").body(null);
Expand All @@ -56,10 +56,10 @@ public ResponseEntity<Label> create(@Valid @RequestBody Label label) throws URIS
method = RequestMethod.PUT,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public ResponseEntity<Label> update(@Valid @RequestBody Label label) throws URISyntaxException {
public ResponseEntity<Label> updateLabel(@Valid @RequestBody Label label) throws URISyntaxException {
log.debug("REST request to update Label : {}", label);
if (label.getId() == null) {
return create(label);
return createLabel(label);
}
Label result = labelRepository.save(label);
return ResponseEntity.ok()
Expand All @@ -74,7 +74,7 @@ public ResponseEntity<Label> update(@Valid @RequestBody Label label) throws URIS
method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public List<Label> getAll() {
public List<Label> getAllLabels() {
log.debug("REST request to get all Labels");
return labelRepository.findAll();
}
Expand All @@ -86,7 +86,7 @@ public List<Label> getAll() {
method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public ResponseEntity<Label> get(@PathVariable Long id) {
public ResponseEntity<Label> getLabel(@PathVariable Long id) {
log.debug("REST request to get Label : {}", id);
return Optional.ofNullable(labelRepository.findOne(id))
.map(label -> new ResponseEntity<>(
Expand All @@ -102,7 +102,7 @@ public ResponseEntity<Label> get(@PathVariable Long id) {
method = RequestMethod.DELETE,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public ResponseEntity<Void> delete(@PathVariable Long id) {
public ResponseEntity<Void> deleteLabel(@PathVariable Long id) {
log.debug("REST request to delete Label : {}", id);
labelRepository.delete(id);
return ResponseEntity.ok().headers(HeaderUtil.createEntityDeletionAlert("label", id.toString())).build();
Expand Down
Expand Up @@ -40,7 +40,7 @@ public class OperationResource {
method = RequestMethod.POST,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public ResponseEntity<Operation> create(@Valid @RequestBody Operation operation) throws URISyntaxException {
public ResponseEntity<Operation> createOperation(@Valid @RequestBody Operation operation) throws URISyntaxException {
log.debug("REST request to save Operation : {}", operation);
if (operation.getId() != null) {
return ResponseEntity.badRequest().header("Failure", "A new operation cannot already have an ID").body(null);
Expand All @@ -58,10 +58,10 @@ public ResponseEntity<Operation> create(@Valid @RequestBody Operation operation)
method = RequestMethod.PUT,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public ResponseEntity<Operation> update(@Valid @RequestBody Operation operation) throws URISyntaxException {
public ResponseEntity<Operation> updateOperation(@Valid @RequestBody Operation operation) throws URISyntaxException {
log.debug("REST request to update Operation : {}", operation);
if (operation.getId() == null) {
return create(operation);
return createOperation(operation);
}
Operation result = operationRepository.save(operation);
return ResponseEntity.ok()
Expand All @@ -76,7 +76,7 @@ public ResponseEntity<Operation> update(@Valid @RequestBody Operation operation)
method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public ResponseEntity<List<Operation>> getAll(@RequestParam(value = "page" , required = false) Integer offset,
public ResponseEntity<List<Operation>> getAllOperations(@RequestParam(value = "page" , required = false) Integer offset,
@RequestParam(value = "per_page", required = false) Integer limit)
throws URISyntaxException {
Page<Operation> page = operationRepository.findAll(PaginationUtil.generatePageRequest(offset, limit));
Expand All @@ -91,7 +91,7 @@ public ResponseEntity<List<Operation>> getAll(@RequestParam(value = "page" , req
method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public ResponseEntity<Operation> get(@PathVariable Long id) {
public ResponseEntity<Operation> getOperation(@PathVariable Long id) {
log.debug("REST request to get Operation : {}", id);
return Optional.ofNullable(operationRepository.findOneWithEagerRelationships(id))
.map(operation -> new ResponseEntity<>(
Expand All @@ -107,7 +107,7 @@ public ResponseEntity<Operation> get(@PathVariable Long id) {
method = RequestMethod.DELETE,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
public ResponseEntity<Void> delete(@PathVariable Long id) {
public ResponseEntity<Void> deleteOperation(@PathVariable Long id) {
log.debug("REST request to delete Operation : {}", id);
operationRepository.delete(id);
return ResponseEntity.ok().headers(HeaderUtil.createEntityDeletionAlert("operation", id.toString())).build();
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/config/application-dev.yml
Expand Up @@ -23,7 +23,7 @@ spring:
generate-ddl: false
hibernate:
ddl-auto: none
naming-strategy: org.hibernate.cfg.EJB3NamingStrategy
naming-strategy: org.springframework.boot.orm.jpa.hibernate.SpringNamingStrategy
properties:
hibernate.cache.use_second_level_cache: true
hibernate.cache.use_query_cache: false
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/config/application-prod.yml
Expand Up @@ -27,7 +27,7 @@ spring:
generate-ddl: false
hibernate:
ddl-auto: none
naming-strategy: org.hibernate.cfg.EJB3NamingStrategy
naming-strategy: org.springframework.boot.orm.jpa.hibernate.SpringNamingStrategy
properties:
hibernate.cache.use_second_level_cache: true
hibernate.cache.use_query_cache: false
Expand Down
Expand Up @@ -11,14 +11,14 @@
<property name="autoIncrement" value="true" dbms="mysql,h2,postgresql"/>
<property name="autoIncrement" value="false" dbms="oracle"/>

<property name="floatType" value="real" dbms="postgresql, h2"/>
<property name="floatType" value="float4" dbms="postgresql, h2"/>
<property name="floatType" value="float" dbms="mysql, oracle"/>

<!--
Added the entity BankAccount.
-->
<changeSet id="20150805124838" author="jhipster">
<createTable tableName="BANKACCOUNT">
<createTable tableName="BANK_ACCOUNT">
<column name="id" type="bigint" autoIncrement="${autoIncrement}" >
<constraints primaryKey="true" nullable="false"/>
</column>
Expand All @@ -32,7 +32,7 @@
</createTable>

<addForeignKeyConstraint baseColumnNames="user_id"
baseTableName="BANKACCOUNT"
baseTableName="BANK_ACCOUNT"
constraintName="fk_bankaccount_user_id"
referencedColumnNames="id"
referencedTableName="JHI_USER"/>
Expand Down
Expand Up @@ -11,7 +11,7 @@
<property name="autoIncrement" value="true" dbms="mysql,h2,postgresql"/>
<property name="autoIncrement" value="false" dbms="oracle"/>

<property name="floatType" value="real" dbms="postgresql, h2"/>
<property name="floatType" value="float4" dbms="postgresql, h2"/>
<property name="floatType" value="float" dbms="mysql, oracle"/>

<!--
Expand Down
Expand Up @@ -11,7 +11,7 @@
<property name="autoIncrement" value="true" dbms="mysql,h2,postgresql"/>
<property name="autoIncrement" value="false" dbms="oracle"/>

<property name="floatType" value="real" dbms="postgresql, h2"/>
<property name="floatType" value="float4" dbms="postgresql, h2"/>
<property name="floatType" value="float" dbms="mysql, oracle"/>

<!--
Expand All @@ -29,16 +29,16 @@
<column name="amount" type="decimal(10,2)">
<constraints nullable="false" />
</column>
<column name="bankaccount_id" type="bigint"/>
<column name="bank_account_id" type="bigint"/>
</createTable>
<dropDefaultValue tableName="OPERATION" columnName="date" columnDataType="datetime"/>


<addForeignKeyConstraint baseColumnNames="bankaccount_id"
<addForeignKeyConstraint baseColumnNames="bank_account_id"
baseTableName="OPERATION"
constraintName="fk_operation_bankaccount_id"
referencedColumnNames="id"
referencedTableName="BANKACCOUNT"/>
referencedTableName="BANK_ACCOUNT"/>

<createTable tableName="OPERATION_LABEL">
<column name="labels_id" type="bigint">
Expand Down
15 changes: 9 additions & 6 deletions src/main/webapp/bower_components/ng-file-upload/.bower.json
@@ -1,21 +1,24 @@
{
"name": "ng-file-upload",
"main": "ng-file-upload.js",
"version": "5.0.9",
"homepage": "https://github.com/danialfarid/ng-file-upload",
"dependencies": {
"angular": ">1.2.0"
},
"authors": [
"danialf <danial.farid@gmail.com>"
],
"description": "Lightweight Angular JS directive to upload files. Support drag&drop, progress and abort",
"description": "Lightweight Angular JS directive to upload files. Support drag&drop, paste image, progress and abort",
"ignore": [],
"license": "MIT",
"_release": "5.0.9",
"version": "7.0.15",
"_release": "7.0.15",
"_resolution": {
"type": "version",
"tag": "5.0.9",
"commit": "87ec6917d5ec19f38d7ead3cfe393c33088c61de"
"tag": "7.0.15",
"commit": "5d0d74bc6d8420ea1856a6a0a2478613a0607cd2"
},
"_source": "git://github.com/danialfarid/angular-file-upload-bower.git",
"_target": "5.0.9",
"_target": "7.0.15",
"_originalSource": "ng-file-upload"
}
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 0 additions & 17 deletions src/main/webapp/bower_components/ng-file-upload/README.md
Expand Up @@ -3,20 +3,3 @@
bower distribution of [angular-file-upload](https://github.com/danialfarid/angular-file-upload).
All issues and pull request must be sumbitted to [angular-file-upload](https://github.com/danialfarid/angular-file-upload)

## Install

Install with `bower`:

```shell
bower install ng-file-upload
```

Add a `<script>` to your `index.html`:

```html
<script src="/bower_components/angular/angular.js"></script>

<!--only needed if you support non HTML5 FormData browsers.-->
<script src="/bower_components/angular/angular-file-upload-shim.js"></script>
<script src="/bower_components/angular/angular-file-upload.js"></script>
```
6 changes: 4 additions & 2 deletions src/main/webapp/bower_components/ng-file-upload/bower.json
@@ -1,12 +1,14 @@
{
"name": "ng-file-upload",
"main": "ng-file-upload.js",
"version": "5.0.9",
"homepage": "https://github.com/danialfarid/ng-file-upload",
"dependencies": {
"angular": ">1.2.0"
},
"authors": [
"danialf <danial.farid@gmail.com>"
],
"description": "Lightweight Angular JS directive to upload files. Support drag&drop, progress and abort",
"description": "Lightweight Angular JS directive to upload files. Support drag&drop, paste image, progress and abort",
"ignore": [],
"license": "MIT"
}

0 comments on commit 7d27a2e

Please sign in to comment.