diff --git a/Gruntfile.js b/Gruntfile.js index 808f95060..26cd89cb7 100644 --- a/Gruntfile.js +++ b/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'); diff --git a/README.md b/README.md index 5f1c9a2ec..3761408b4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Developping sampleApplication +# Developing sampleApplication sampleApplication was generated using JHipster, you can find documentation and help at [JHipster][]. diff --git a/bower.json b/bower.json index 69a65c31a..6a2baa37c 100644 --- a/bower.json +++ b/bower.json @@ -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": { diff --git a/package.json b/package.json index 45db241b5..fe198b2aa 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/main/java/com/mycompany/myapp/Application.java b/src/main/java/com/mycompany/myapp/Application.java index 9c401c031..a25d1c788 100644 --- a/src/main/java/com/mycompany/myapp/Application.java +++ b/src/main/java/com/mycompany/myapp/Application.java @@ -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; @@ -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"); } } diff --git a/src/main/java/com/mycompany/myapp/domain/BankAccount.java b/src/main/java/com/mycompany/myapp/domain/BankAccount.java index 3be670735..c679052b8 100644 --- a/src/main/java/com/mycompany/myapp/domain/BankAccount.java +++ b/src/main/java/com/mycompany/myapp/domain/BankAccount.java @@ -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 { diff --git a/src/main/java/com/mycompany/myapp/web/rest/BankAccountResource.java b/src/main/java/com/mycompany/myapp/web/rest/BankAccountResource.java index bcab245e7..d123abc41 100644 --- a/src/main/java/com/mycompany/myapp/web/rest/BankAccountResource.java +++ b/src/main/java/com/mycompany/myapp/web/rest/BankAccountResource.java @@ -38,7 +38,7 @@ public class BankAccountResource { method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) @Timed - public ResponseEntity create(@Valid @RequestBody BankAccount bankAccount) throws URISyntaxException { + public ResponseEntity 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); @@ -56,10 +56,10 @@ public ResponseEntity create(@Valid @RequestBody BankAccount bankAc method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_VALUE) @Timed - public ResponseEntity update(@Valid @RequestBody BankAccount bankAccount) throws URISyntaxException { + public ResponseEntity 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() @@ -74,7 +74,7 @@ public ResponseEntity update(@Valid @RequestBody BankAccount bankAc method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @Timed - public List getAll() { + public List getAllBankAccounts() { log.debug("REST request to get all BankAccounts"); return bankAccountRepository.findAll(); } @@ -86,7 +86,7 @@ public List getAll() { method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @Timed - public ResponseEntity get(@PathVariable Long id) { + public ResponseEntity getBankAccount(@PathVariable Long id) { log.debug("REST request to get BankAccount : {}", id); return Optional.ofNullable(bankAccountRepository.findOne(id)) .map(bankAccount -> new ResponseEntity<>( @@ -102,7 +102,7 @@ public ResponseEntity get(@PathVariable Long id) { method = RequestMethod.DELETE, produces = MediaType.APPLICATION_JSON_VALUE) @Timed - public ResponseEntity delete(@PathVariable Long id) { + public ResponseEntity 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(); diff --git a/src/main/java/com/mycompany/myapp/web/rest/LabelResource.java b/src/main/java/com/mycompany/myapp/web/rest/LabelResource.java index d4a63bc92..93ffbb097 100644 --- a/src/main/java/com/mycompany/myapp/web/rest/LabelResource.java +++ b/src/main/java/com/mycompany/myapp/web/rest/LabelResource.java @@ -38,7 +38,7 @@ public class LabelResource { method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) @Timed - public ResponseEntity