hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

Merge branch 'jhipster-generated'

Browse Source 
# Conflicts:
#	build.gradle
#	cfg/spotless/eclipse_formatter.xml
#	cfg/spotless/hsadminng.importorder
#	src/main/java/org/hostsharing/hsadminng/HsadminNgApp.java
#	src/main/java/org/hostsharing/hsadminng/domain/Asset.java
#	src/main/java/org/hostsharing/hsadminng/domain/Membership.java
#	src/main/java/org/hostsharing/hsadminng/domain/SepaMandate.java
#	src/main/java/org/hostsharing/hsadminng/domain/Share.java
#	src/main/java/org/hostsharing/hsadminng/repository/MembershipRepository.java
#	src/main/java/org/hostsharing/hsadminng/security/SecurityUtils.java
#	src/main/java/org/hostsharing/hsadminng/service/AssetService.java
#	src/main/java/org/hostsharing/hsadminng/service/CustomerQueryService.java
#	src/main/java/org/hostsharing/hsadminng/service/MembershipQueryService.java
#	src/main/java/org/hostsharing/hsadminng/service/MembershipService.java
#	src/main/java/org/hostsharing/hsadminng/service/SepaMandateQueryService.java
#	src/main/java/org/hostsharing/hsadminng/service/ShareService.java
#	src/main/java/org/hostsharing/hsadminng/service/dto/AssetDTO.java
#	src/main/java/org/hostsharing/hsadminng/service/dto/CustomerCriteria.java
#	src/main/java/org/hostsharing/hsadminng/service/dto/CustomerDTO.java
#	src/main/java/org/hostsharing/hsadminng/service/dto/MembershipDTO.java
#	src/main/java/org/hostsharing/hsadminng/service/dto/SepaMandateDTO.java
#	src/main/java/org/hostsharing/hsadminng/service/dto/ShareDTO.java
#	src/main/java/org/hostsharing/hsadminng/service/mapper/CustomerMapper.java
#	src/main/java/org/hostsharing/hsadminng/web/rest/AssetResource.java
#	src/main/java/org/hostsharing/hsadminng/web/rest/ShareResource.java
#	src/main/java/org/hostsharing/hsadminng/web/rest/errors/ExceptionTranslator.java
#	src/test/java/org/hostsharing/hsadminng/web/rest/AssetResourceIntTest.java
#	src/test/java/org/hostsharing/hsadminng/web/rest/CustomerResourceIntTest.java
#	src/test/java/org/hostsharing/hsadminng/web/rest/MembershipResourceIntTest.java
#	src/test/java/org/hostsharing/hsadminng/web/rest/SepaMandateResourceIntTest.java
#	src/test/java/org/hostsharing/hsadminng/web/rest/ShareResourceIntTest.java
This commit is contained in:
Michael Hoennig 2019-04-30 17:13:06 +02:00
commit 1aed3236a5
18 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.jhipster/Asset.json
View File

@ -49,7 +49,7 @@
"otherEntityField": "admissionDocumentDate" "otherEntityField": "admissionDocumentDate"
} }
], ],
"changelogDate": "20190424123258", "changelogDate": "20190430150327",
"entityTableName": "asset", "entityTableName": "asset",
"dto": "mapstruct", "dto": "mapstruct",
"pagination": "infinite-scroll", "pagination": "infinite-scroll",

2
.jhipster/Customer.json
View File

@ -142,7 +142,7 @@
"relationshipName": "sepamandate" "relationshipName": "sepamandate"
} }
], ],
"changelogDate": "20190424123255", "changelogDate": "20190430150324",
"entityTableName": "customer", "entityTableName": "customer",
"dto": "mapstruct", "dto": "mapstruct",
"pagination": "infinite-scroll", "pagination": "infinite-scroll",

2
.jhipster/Membership.json
View File

@ -54,7 +54,7 @@
"otherEntityField": "prefix" "otherEntityField": "prefix"
} }
], ],
"changelogDate": "20190424123256", "changelogDate": "20190430150325",
"entityTableName": "membership", "entityTableName": "membership",
"dto": "mapstruct", "dto": "mapstruct",
"pagination": "infinite-scroll", "pagination": "infinite-scroll",

2
.jhipster/SepaMandate.json
View File

@ -72,7 +72,7 @@
"otherEntityField": "prefix" "otherEntityField": "prefix"
} }
], ],
"changelogDate": "20190424123259", "changelogDate": "20190430150328",
"entityTableName": "sepa_mandate", "entityTableName": "sepa_mandate",
"dto": "mapstruct", "dto": "mapstruct",
"pagination": "infinite-scroll", "pagination": "infinite-scroll",

2
.jhipster/Share.json
View File

@ -49,7 +49,7 @@
"otherEntityField": "admissionDocumentDate" "otherEntityField": "admissionDocumentDate"
} }
], ],
"changelogDate": "20190424123257", "changelogDate": "20190430150326",
"entityTableName": "share", "entityTableName": "share",
"dto": "mapstruct", "dto": "mapstruct",
"pagination": "infinite-scroll", "pagination": "infinite-scroll",

23
build.gradle
View File

@ -48,7 +48,6 @@ apply plugin: 'idea'
apply from: 'build-jacoco.gradle' apply from: 'build-jacoco.gradle'
apply from: 'build-pitest.gradle' apply from: 'build-pitest.gradle'
apply from: 'build-cucumber.gradle'
apply from: 'build-spotless.gradle' apply from: 'build-spotless.gradle'
idea { idea {
@ -117,7 +116,27 @@ test {
reports.html.enabled = false reports.html.enabled = false
} }
// ------------------------------ task cucumberTest(type: Test) {
description = "Execute cucumber BDD tests."
group = "verification"
include '**/CucumberTest*'
// uncomment if the tests reports are not generated
// see https://github.com/jhipster/generator-jhipster/pull/2771 and https://github.com/jhipster/generator-jhipster/pull/4484
// ignoreFailures true
reports.html.enabled = false
}
check.dependsOn cucumberTest
task testReport(type: TestReport) {
destinationDir = file("$buildDir/reports/tests")
reportOn test
}
task cucumberTestReport(type: TestReport) {
destinationDir = file("$buildDir/reports/tests")
reportOn cucumberTest
}
apply from: 'gradle/docker.gradle' apply from: 'gradle/docker.gradle'
apply from: 'gradle/sonar.gradle' apply from: 'gradle/sonar.gradle'

0
cfg/spotless/eclipse_formatter.xml Executable file → Normal file
View File

0
cfg/spotless/hsadminng.importorder Executable file → Normal file
View File

2
src/main/resources/config/liquibase/changelog/20190424123255_added_entity_Customer.xml → src/main/resources/config/liquibase/changelog/20190430150324_added_entity_Customer.xml
View File

@ -14,7 +14,7 @@
<!-- <!--
Added the entity Customer. Added the entity Customer.
--> -->
<changeSet id="20190424123255-1" author="jhipster"> <changeSet id="20190430150324-1" author="jhipster">
<createTable tableName="customer"> <createTable tableName="customer">
<column name="id" type="bigint" autoIncrement="${autoIncrement}"> <column name="id" type="bigint" autoIncrement="${autoIncrement}">
<constraints primaryKey="true" nullable="false"/> <constraints primaryKey="true" nullable="false"/>

2
src/main/resources/config/liquibase/changelog/20190424123256_added_entity_Membership.xml → src/main/resources/config/liquibase/changelog/20190430150325_added_entity_Membership.xml
View File

@ -14,7 +14,7 @@
<!-- <!--
Added the entity Membership. Added the entity Membership.
--> -->
<changeSet id="20190424123256-1" author="jhipster"> <changeSet id="20190430150325-1" author="jhipster">
<createTable tableName="membership"> <createTable tableName="membership">
<column name="id" type="bigint" autoIncrement="${autoIncrement}"> <column name="id" type="bigint" autoIncrement="${autoIncrement}">
<constraints primaryKey="true" nullable="false"/> <constraints primaryKey="true" nullable="false"/>

2
src/main/resources/config/liquibase/changelog/20190424123256_added_entity_constraints_Membership.xml → src/main/resources/config/liquibase/changelog/20190430150325_added_entity_constraints_Membership.xml
View File

@ -6,7 +6,7 @@
<!-- <!--
Added the constraints for entity Membership. Added the constraints for entity Membership.
--> -->
<changeSet id="20190424123256-2" author="jhipster"> <changeSet id="20190430150325-2" author="jhipster">
<addForeignKeyConstraint baseColumnNames="customer_id" <addForeignKeyConstraint baseColumnNames="customer_id"
baseTableName="membership" baseTableName="membership"

2
src/main/resources/config/liquibase/changelog/20190424123257_added_entity_Share.xml → src/main/resources/config/liquibase/changelog/20190430150326_added_entity_Share.xml
View File

@ -14,7 +14,7 @@
<!-- <!--
Added the entity Share. Added the entity Share.
--> -->
<changeSet id="20190424123257-1" author="jhipster"> <changeSet id="20190430150326-1" author="jhipster">
<createTable tableName="share"> <createTable tableName="share">
<column name="id" type="bigint" autoIncrement="${autoIncrement}"> <column name="id" type="bigint" autoIncrement="${autoIncrement}">
<constraints primaryKey="true" nullable="false"/> <constraints primaryKey="true" nullable="false"/>

2
src/main/resources/config/liquibase/changelog/20190424123257_added_entity_constraints_Share.xml → src/main/resources/config/liquibase/changelog/20190430150326_added_entity_constraints_Share.xml
View File

@ -6,7 +6,7 @@
<!-- <!--
Added the constraints for entity Share. Added the constraints for entity Share.
--> -->
<changeSet id="20190424123257-2" author="jhipster"> <changeSet id="20190430150326-2" author="jhipster">
<addForeignKeyConstraint baseColumnNames="membership_id" <addForeignKeyConstraint baseColumnNames="membership_id"
baseTableName="share" baseTableName="share"

2
src/main/resources/config/liquibase/changelog/20190424123258_added_entity_Asset.xml → src/main/resources/config/liquibase/changelog/20190430150327_added_entity_Asset.xml
View File

@ -14,7 +14,7 @@
<!-- <!--
Added the entity Asset. Added the entity Asset.
--> -->
<changeSet id="20190424123258-1" author="jhipster"> <changeSet id="20190430150327-1" author="jhipster">
<createTable tableName="asset"> <createTable tableName="asset">
<column name="id" type="bigint" autoIncrement="${autoIncrement}"> <column name="id" type="bigint" autoIncrement="${autoIncrement}">
<constraints primaryKey="true" nullable="false"/> <constraints primaryKey="true" nullable="false"/>

2
src/main/resources/config/liquibase/changelog/20190424123258_added_entity_constraints_Asset.xml → src/main/resources/config/liquibase/changelog/20190430150327_added_entity_constraints_Asset.xml
View File

@ -6,7 +6,7 @@
<!-- <!--
Added the constraints for entity Asset. Added the constraints for entity Asset.
--> -->
<changeSet id="20190424123258-2" author="jhipster"> <changeSet id="20190430150327-2" author="jhipster">
<addForeignKeyConstraint baseColumnNames="membership_id" <addForeignKeyConstraint baseColumnNames="membership_id"
baseTableName="asset" baseTableName="asset"

2
src/main/resources/config/liquibase/changelog/20190424123259_added_entity_SepaMandate.xml → src/main/resources/config/liquibase/changelog/20190430150328_added_entity_SepaMandate.xml
View File

@ -14,7 +14,7 @@
<!-- <!--
Added the entity SepaMandate. Added the entity SepaMandate.
--> -->
<changeSet id="20190424123259-1" author="jhipster"> <changeSet id="20190430150328-1" author="jhipster">
<createTable tableName="sepa_mandate"> <createTable tableName="sepa_mandate">
<column name="id" type="bigint" autoIncrement="${autoIncrement}"> <column name="id" type="bigint" autoIncrement="${autoIncrement}">
<constraints primaryKey="true" nullable="false"/> <constraints primaryKey="true" nullable="false"/>

2
src/main/resources/config/liquibase/changelog/20190424123259_added_entity_constraints_SepaMandate.xml → src/main/resources/config/liquibase/changelog/20190430150328_added_entity_constraints_SepaMandate.xml
View File

@ -6,7 +6,7 @@
<!-- <!--
Added the constraints for entity SepaMandate. Added the constraints for entity SepaMandate.
--> -->
<changeSet id="20190424123259-2" author="jhipster"> <changeSet id="20190430150328-2" author="jhipster">
<addForeignKeyConstraint baseColumnNames="customer_id" <addForeignKeyConstraint baseColumnNames="customer_id"
baseTableName="sepa_mandate" baseTableName="sepa_mandate"

18
src/main/resources/config/liquibase/master.xml
View File

@ -5,16 +5,16 @@
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
<include file="config/liquibase/changelog/00000000000000_initial_schema.xml" relativeToChangelogFile="false"/> <include file="config/liquibase/changelog/00000000000000_initial_schema.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190424123255_added_entity_Customer.xml" relativeToChangelogFile="false"/> <include file="config/liquibase/changelog/20190430150324_added_entity_Customer.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190424123256_added_entity_Membership.xml" relativeToChangelogFile="false"/> <include file="config/liquibase/changelog/20190430150325_added_entity_Membership.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190424123257_added_entity_Share.xml" relativeToChangelogFile="false"/> <include file="config/liquibase/changelog/20190430150326_added_entity_Share.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190424123258_added_entity_Asset.xml" relativeToChangelogFile="false"/> <include file="config/liquibase/changelog/20190430150327_added_entity_Asset.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190424123259_added_entity_SepaMandate.xml" relativeToChangelogFile="false"/> <include file="config/liquibase/changelog/20190430150328_added_entity_SepaMandate.xml" relativeToChangelogFile="false"/>
<!-- jhipster-needle-liquibase-add-changelog - JHipster will add liquibase changelogs here --> <!-- jhipster-needle-liquibase-add-changelog - JHipster will add liquibase changelogs here -->
<include file="config/liquibase/changelog/20190424123256_added_entity_constraints_Membership.xml" relativeToChangelogFile="false"/> <include file="config/liquibase/changelog/20190430150325_added_entity_constraints_Membership.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190424123257_added_entity_constraints_Share.xml" relativeToChangelogFile="false"/> <include file="config/liquibase/changelog/20190430150326_added_entity_constraints_Share.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190424123258_added_entity_constraints_Asset.xml" relativeToChangelogFile="false"/> <include file="config/liquibase/changelog/20190430150327_added_entity_constraints_Asset.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190424123259_added_entity_constraints_SepaMandate.xml" relativeToChangelogFile="false"/> <include file="config/liquibase/changelog/20190430150328_added_entity_constraints_SepaMandate.xml" relativeToChangelogFile="false"/>
<!-- jhipster-needle-liquibase-add-constraints-changelog - JHipster will add liquibase constraints changelogs here --> <!-- jhipster-needle-liquibase-add-constraints-changelog - JHipster will add liquibase constraints changelogs here -->
<!-- sample data --> <!-- sample data -->