Skip to content

Commit 9a9ece9

Browse files
author
bwajtr
committed
Split build.gradle to two files -> extracted jooq code generation part to it's own file (jooq.gradle) -> I did this because the code generation actually attaches itself to the build process and it's run every time, which is actually not what we want...
1 parent 3e3b298 commit 9a9ece9

17 files changed

Lines changed: 217 additions & 82 deletions

build.gradle

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@
22
buildscript {
33
repositories {
44
jcenter()
5-
maven {
6-
url "https://plugins.gradle.org/m2/"
7-
}
85
}
96
dependencies {
107
classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.1.RELEASE" // to include SpringBoot parent BOM
11-
classpath "nu.studer:gradle-jooq-plugin:2.0.2" // to allow jooq gradle plugin
128
}
139
}
1410

15-
apply plugin: 'nu.studer.jooq' // see details in https://github.com/etiennestuder/gradle-jooq-plugin
1611
apply plugin: 'spring-boot'
1712
apply plugin: 'java'
1813

@@ -37,44 +32,11 @@ dependencies {
3732
compile "org.apache.commons:commons-collections4:4.1"
3833

3934
testCompile "org.springframework.boot:spring-boot-starter-test"
40-
41-
jooqRuntime "org.postgresql:postgresql:9.4.1211.jre7"
4235
}
4336

4437
// we want to show following test events in the log
4538
test {
4639
testLogging {
4740
events "PASSED", "FAILED", "SKIPPED"
4841
}
49-
}
50-
51-
// jooq configuration
52-
53-
jooq {
54-
version = '3.8.4'
55-
edition = 'OSS' // the default (can be omitted), other allowed values are PRO, PRO_JAVA_6, and TRIAL
56-
DbTestsApplication(sourceSets.main) {
57-
jdbc {
58-
driver = 'org.postgresql.Driver'
59-
url = 'jdbc:postgresql://localhost:5432/testdb'
60-
user = 'test'
61-
password = 'test'
62-
schema = 'public'
63-
}
64-
generator {
65-
name = 'org.jooq.util.DefaultGenerator'
66-
strategy {
67-
name = 'org.jooq.util.DefaultGeneratorStrategy'
68-
}
69-
database {
70-
name = 'org.jooq.util.postgres.PostgresDatabase'
71-
inputSchema = 'public'
72-
}
73-
target {
74-
packageName = 'com.clevergang.dbtests.repository.impl.jooq.generated'
75-
directory = './src/main/java/'
76-
}
77-
}
78-
}
79-
}
80-
42+
}

jooq.gradle

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
// You can invoke JOOQ code generation using this script.
2+
// Just run it from IDE, or use "gradle --rerun-tasks -b jooq.gradle"
3+
4+
buildscript {
5+
repositories {
6+
maven {
7+
url "https://plugins.gradle.org/m2/"
8+
}
9+
}
10+
dependencies {
11+
classpath "nu.studer:gradle-jooq-plugin:2.0.2" // to allow jooq gradle plugin
12+
}
13+
}
14+
15+
apply plugin: 'nu.studer.jooq' // see details in https://github.com/etiennestuder/gradle-jooq-plugin
16+
apply plugin: 'java'
17+
18+
defaultTasks 'generateDbTestsApplicationJooqSchemaSource'
19+
20+
repositories {
21+
jcenter()
22+
}
23+
24+
group = 'com.clevergang'
25+
version = '1.0.0'
26+
27+
repositories {
28+
jcenter()
29+
}
30+
31+
// We need Java8 for this project
32+
tasks.withType(JavaCompile) {
33+
sourceCompatibility = '1.8'
34+
}
35+
36+
dependencies {
37+
jooqRuntime "org.postgresql:postgresql:9.4.1211.jre7"
38+
}
39+
40+
// jooq configuration
41+
jooq {
42+
version = '3.8.4'
43+
edition = 'OSS' // the default (can be omitted), other allowed values are PRO, PRO_JAVA_6, and TRIAL
44+
DbTestsApplication(sourceSets.main) {
45+
jdbc {
46+
driver = 'org.postgresql.Driver'
47+
url = 'jdbc:postgresql://localhost:5432/testdb'
48+
user = 'test'
49+
password = 'test'
50+
schema = 'public'
51+
}
52+
generator {
53+
name = 'org.jooq.util.DefaultGenerator'
54+
strategy {
55+
name = 'org.jooq.util.DefaultGeneratorStrategy'
56+
}
57+
database {
58+
name = 'org.jooq.util.postgres.PostgresDatabase'
59+
inputSchema = 'public'
60+
}
61+
target {
62+
packageName = 'com.clevergang.dbtests.repository.impl.jooq.generated'
63+
directory = './src/main/java/'
64+
}
65+
}
66+
}
67+
}
68+

src/main/java/com/clevergang/dbtests/repository/impl/jooq/generated/DefaultCatalog.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1+
/**
2+
* This class is generated by jOOQ
3+
*/
14
package com.clevergang.dbtests.repository.impl.jooq.generated;
25

36

4-
import org.jooq.Schema;
5-
import org.jooq.impl.CatalogImpl;
6-
7-
import javax.annotation.Generated;
87
import java.util.ArrayList;
98
import java.util.Arrays;
109
import java.util.List;
1110

11+
import javax.annotation.Generated;
12+
13+
import org.jooq.Schema;
14+
import org.jooq.impl.CatalogImpl;
15+
1216

1317
/**
1418
* This class is generated by jOOQ.

src/main/java/com/clevergang/dbtests/repository/impl/jooq/generated/Keys.java

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
1+
/**
2+
* This class is generated by jOOQ
3+
*/
14
package com.clevergang.dbtests.repository.impl.jooq.generated;
25

36

4-
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.*;
5-
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.records.*;
7+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.Company;
8+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.Department;
9+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.Employee;
10+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.Project;
11+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.Projectemployee;
12+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.records.CompanyRecord;
13+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.records.DepartmentRecord;
14+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.records.EmployeeRecord;
15+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.records.ProjectRecord;
16+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.records.ProjectemployeeRecord;
17+
18+
import javax.annotation.Generated;
19+
620
import org.jooq.ForeignKey;
721
import org.jooq.Identity;
822
import org.jooq.UniqueKey;
923
import org.jooq.impl.AbstractKeys;
1024

11-
import javax.annotation.Generated;
12-
1325

1426
/**
1527
* A class modelling foreign key relationships between tables of the <code>public</code>

src/main/java/com/clevergang/dbtests/repository/impl/jooq/generated/Public.java

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
1+
/**
2+
* This class is generated by jOOQ
3+
*/
14
package com.clevergang.dbtests.repository.impl.jooq.generated;
25

36

4-
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.*;
5-
import org.jooq.Catalog;
6-
import org.jooq.Sequence;
7-
import org.jooq.Table;
8-
import org.jooq.impl.SchemaImpl;
7+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.Company;
8+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.Department;
9+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.Employee;
10+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.Project;
11+
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.Projectemployee;
912

10-
import javax.annotation.Generated;
1113
import java.util.ArrayList;
1214
import java.util.Arrays;
1315
import java.util.List;
1416

17+
import javax.annotation.Generated;
18+
19+
import org.jooq.Catalog;
20+
import org.jooq.Sequence;
21+
import org.jooq.Table;
22+
import org.jooq.impl.SchemaImpl;
23+
1524

1625
/**
1726
* This class is generated by jOOQ.

src/main/java/com/clevergang/dbtests/repository/impl/jooq/generated/Sequences.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
/**
2+
* This class is generated by jOOQ
3+
*/
14
package com.clevergang.dbtests.repository.impl.jooq.generated;
25

36

7+
import javax.annotation.Generated;
8+
49
import org.jooq.Sequence;
510
import org.jooq.impl.SequenceImpl;
611

7-
import javax.annotation.Generated;
8-
912

1013
/**
1114
* Convenience access to all sequences in public

src/main/java/com/clevergang/dbtests/repository/impl/jooq/generated/Tables.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/**
2+
* This class is generated by jOOQ
3+
*/
14
package com.clevergang.dbtests.repository.impl.jooq.generated;
25

36

src/main/java/com/clevergang/dbtests/repository/impl/jooq/generated/tables/Company.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
1+
/**
2+
* This class is generated by jOOQ
3+
*/
14
package com.clevergang.dbtests.repository.impl.jooq.generated.tables;
25

36

47
import com.clevergang.dbtests.repository.impl.jooq.generated.Keys;
58
import com.clevergang.dbtests.repository.impl.jooq.generated.Public;
69
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.records.CompanyRecord;
7-
import org.jooq.*;
8-
import org.jooq.impl.TableImpl;
910

10-
import javax.annotation.Generated;
1111
import java.util.Arrays;
1212
import java.util.List;
1313

14+
import javax.annotation.Generated;
15+
16+
import org.jooq.Field;
17+
import org.jooq.Identity;
18+
import org.jooq.Schema;
19+
import org.jooq.Table;
20+
import org.jooq.TableField;
21+
import org.jooq.UniqueKey;
22+
import org.jooq.impl.TableImpl;
23+
1424

1525
/**
1626
* This class is generated by jOOQ.

src/main/java/com/clevergang/dbtests/repository/impl/jooq/generated/tables/Department.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,27 @@
1+
/**
2+
* This class is generated by jOOQ
3+
*/
14
package com.clevergang.dbtests.repository.impl.jooq.generated.tables;
25

36

47
import com.clevergang.dbtests.repository.impl.jooq.generated.Keys;
58
import com.clevergang.dbtests.repository.impl.jooq.generated.Public;
69
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.records.DepartmentRecord;
7-
import org.jooq.*;
8-
import org.jooq.impl.TableImpl;
910

10-
import javax.annotation.Generated;
1111
import java.util.Arrays;
1212
import java.util.List;
1313

14+
import javax.annotation.Generated;
15+
16+
import org.jooq.Field;
17+
import org.jooq.ForeignKey;
18+
import org.jooq.Identity;
19+
import org.jooq.Schema;
20+
import org.jooq.Table;
21+
import org.jooq.TableField;
22+
import org.jooq.UniqueKey;
23+
import org.jooq.impl.TableImpl;
24+
1425

1526
/**
1627
* This class is generated by jOOQ.

src/main/java/com/clevergang/dbtests/repository/impl/jooq/generated/tables/Employee.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
1+
/**
2+
* This class is generated by jOOQ
3+
*/
14
package com.clevergang.dbtests.repository.impl.jooq.generated.tables;
25

36

47
import com.clevergang.dbtests.repository.impl.jooq.generated.Keys;
58
import com.clevergang.dbtests.repository.impl.jooq.generated.Public;
69
import com.clevergang.dbtests.repository.impl.jooq.generated.tables.records.EmployeeRecord;
7-
import org.jooq.*;
8-
import org.jooq.impl.TableImpl;
910

10-
import javax.annotation.Generated;
1111
import java.math.BigDecimal;
1212
import java.util.Arrays;
1313
import java.util.List;
1414

15+
import javax.annotation.Generated;
16+
17+
import org.jooq.Field;
18+
import org.jooq.ForeignKey;
19+
import org.jooq.Identity;
20+
import org.jooq.Schema;
21+
import org.jooq.Table;
22+
import org.jooq.TableField;
23+
import org.jooq.UniqueKey;
24+
import org.jooq.impl.TableImpl;
25+
1526

1627
/**
1728
* This class is generated by jOOQ.

0 commit comments

Comments
 (0)