Skip to content

Commit df1e3f2

Browse files
synapticloopsynapticloop
committed
fix build of all projects - h2zero regen
1 parent fa0bd65 commit df1e3f2

122 files changed

Lines changed: 6932 additions & 4103 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.all.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33

44
./gradlew assemble pTML -b build.gradle
5-
./gradlew -b build.h2zero.cockroach.gradle h2zero
6-
./gradlew -b build.h2zero.mysql.gradle h2zero
7-
./gradlew -b build.h2zero.postgresql.gradle h2zero
5+
./gradlew --no-daemon -b build.h2zero.cockroach.gradle h2zero
6+
./gradlew --no-daemon -b build.h2zero.mysql.gradle h2zero
7+
./gradlew --no-daemon -b build.h2zero.postgresql.gradle h2zero
88

99

‎build.h2zero.cockroach.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ buildscript {
33
mavenCentral()
44
jcenter()
55
mavenLocal()
6-
maven {
7-
url "https://plugins.gradle.org/"
8-
}
6+
maven { url "https://plugins.gradle.org/" }
7+
maven { url "https://jitpack.io/" }
98
}
109

1110
dependencies {
@@ -23,7 +22,7 @@ apply plugin: 'synapticloop.h2zero'
2322
repositories {
2423
mavenLocal()
2524
mavenCentral()
26-
jcenter()
25+
maven { url "https://jitpack.io/" }
2726
}
2827

2928
h2zero {

‎build.h2zero.mysql.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ buildscript {
33
mavenCentral()
44
jcenter()
55
mavenLocal()
6-
maven {
7-
url "https://plugins.gradle.org/"
8-
}
6+
maven { url "https://plugins.gradle.org/" }
7+
maven { url "https://jitpack.io/" }
98
}
109

1110
dependencies {
@@ -23,7 +22,7 @@ apply plugin: 'synapticloop.h2zero'
2322
repositories {
2423
mavenLocal()
2524
mavenCentral()
26-
jcenter()
25+
maven { url "https://jitpack.io/" }
2726
}
2827

2928
h2zero {

‎build.h2zero.postgresql.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ buildscript {
33
mavenCentral()
44
jcenter()
55
mavenLocal()
6-
maven {
7-
url "https://plugins.gradle.org/"
8-
}
6+
maven { url "https://plugins.gradle.org/" }
7+
maven { url "https://jitpack.io/" }
98
}
109

1110
dependencies {
@@ -23,7 +22,7 @@ apply plugin: 'synapticloop.h2zero'
2322
repositories {
2423
mavenLocal()
2524
mavenCentral()
26-
jcenter()
25+
maven { url "https://jitpack.io/" }
2726
}
2827

2928
h2zero {

‎build.h2zero.sqlite3.gradle‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@ buildscript {
33
mavenCentral()
44
jcenter()
55
mavenLocal()
6-
maven {
7-
url "https://plugins.gradle.org/"
8-
}
9-
maven {
10-
url "https://jitpack.io/"
11-
}
6+
maven { url "https://plugins.gradle.org/" }
7+
maven { url "https://jitpack.io/" }
128
}
139

1410
dependencies {
@@ -26,7 +22,7 @@ apply plugin: 'synapticloop.h2zero'
2622
repositories {
2723
mavenLocal()
2824
mavenCentral()
29-
jcenter()
25+
maven { url "https://jitpack.io/" }
3026
}
3127

3228
h2zero {

‎src/test/java/synapticloop/sample/h2zero/cockroach/bean/UserTitleFindIdUserTitleNmUserTitleOrderedBean.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package synapticloop.sample.h2zero.cockroach.bean;
2+
3+
// - - - - thoughtfully generated by synapticloop h2zero - - - -
4+
// with the use of synapticloop templar templating language
5+
// (java-create-select-clause-bean.templar)
6+
7+
import java.sql.Date;
8+
import java.sql.Timestamp;
9+
import synapticloop.sample.h2zero.cockroach.model.util.Constants;
10+
11+
/**
12+
* This is the generated bean for the selectClause finder from
13+
* <p>
14+
* table name: user_title
15+
* <p>
16+
* finder name: findIdUserTitleNmUserTitleOrdered
17+
* <p>
18+
* and is returned either as a single object, or a list of objects
19+
*/
20+
public class UserTitleFindIdUserTitleNmUserTitleOrderedBean {
21+
// the binder is unused in code, but will generate compile problems if this
22+
// class is no longer referenced in the h2zero file. Just a nicety for
23+
// removing dead code
24+
@SuppressWarnings("unused")
25+
private static final String BINDER = Constants.USER_TITLE_findIdUserTitleNmUserTitleOrdered_BINDER;
26+
27+
private Long idUserTitle = null; // maps to id_user_title
28+
private String nmUserTitle = null; // maps to nm_user_title
29+
30+
public UserTitleFindIdUserTitleNmUserTitleOrderedBean(Long idUserTitle, String nmUserTitle) {
31+
this.idUserTitle = idUserTitle;
32+
this.nmUserTitle = nmUserTitle;
33+
}
34+
35+
public Long getIdUserTitle() { return(this.idUserTitle); }
36+
public void setIdUserTitle(Long idUserTitle) { this.idUserTitle = idUserTitle; }
37+
public String getNmUserTitle() { return(this.nmUserTitle); }
38+
public void setNmUserTitle(String nmUserTitle) { this.nmUserTitle = nmUserTitle; }
39+
}

‎src/test/java/synapticloop/sample/h2zero/cockroach/bean/UserUserFindGroupNumAgeBean.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package synapticloop.sample.h2zero.cockroach.bean;
2+
3+
// - - - - thoughtfully generated by synapticloop h2zero - - - -
4+
// with the use of synapticloop templar templating language
5+
// (java-create-select-clause-bean.templar)
6+
7+
import java.sql.Date;
8+
import java.sql.Timestamp;
9+
import synapticloop.sample.h2zero.cockroach.model.util.Constants;
10+
11+
/**
12+
* This is the generated bean for the selectClause finder from
13+
* <p>
14+
* table name: user_user
15+
* <p>
16+
* finder name: findGroupNumAge
17+
* <p>
18+
* and is returned either as a single object, or a list of objects
19+
*/
20+
public class UserUserFindGroupNumAgeBean {
21+
// the binder is unused in code, but will generate compile problems if this
22+
// class is no longer referenced in the h2zero file. Just a nicety for
23+
// removing dead code
24+
@SuppressWarnings("unused")
25+
private static final String BINDER = Constants.USER_USER_findGroupNumAge_BINDER;
26+
27+
private Integer numCount = null; // maps to num_count
28+
private Integer numAge = null; // maps to num_age
29+
30+
public UserUserFindGroupNumAgeBean(Integer numCount, Integer numAge) {
31+
this.numCount = numCount;
32+
this.numAge = numAge;
33+
}
34+
35+
public Integer getNumCount() { return(this.numCount); }
36+
public void setNumCount(Integer numCount) { this.numCount = numCount; }
37+
public Integer getNumAge() { return(this.numAge); }
38+
public void setNumAge(Integer numAge) { this.numAge = numAge; }
39+
}

‎src/test/java/synapticloop/sample/h2zero/cockroach/bean/UserUserFindNmUserDtmSignupBean.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package synapticloop.sample.h2zero.cockroach.bean;
2+
3+
// - - - - thoughtfully generated by synapticloop h2zero - - - -
4+
// with the use of synapticloop templar templating language
5+
// (java-create-select-clause-bean.templar)
6+
7+
import java.sql.Date;
8+
import java.sql.Timestamp;
9+
import synapticloop.sample.h2zero.cockroach.model.util.Constants;
10+
11+
/**
12+
* This is the generated bean for the selectClause finder from
13+
* <p>
14+
* table name: user_user
15+
* <p>
16+
* finder name: findNmUserDtmSignup
17+
* <p>
18+
* and is returned either as a single object, or a list of objects
19+
*/
20+
public class UserUserFindNmUserDtmSignupBean {
21+
// the binder is unused in code, but will generate compile problems if this
22+
// class is no longer referenced in the h2zero file. Just a nicety for
23+
// removing dead code
24+
@SuppressWarnings("unused")
25+
private static final String BINDER = Constants.USER_USER_findNmUserDtmSignup_BINDER;
26+
27+
private String nmUser = null; // maps to nm_user
28+
private Timestamp dtmSignup = null; // maps to dtm_signup
29+
30+
public UserUserFindNmUserDtmSignupBean(String nmUser, Timestamp dtmSignup) {
31+
this.nmUser = nmUser;
32+
this.dtmSignup = dtmSignup;
33+
}
34+
35+
public String getNmUser() { return(this.nmUser); }
36+
public void setNmUser(String nmUser) { this.nmUser = nmUser; }
37+
public Timestamp getDtmSignup() { return(this.dtmSignup); }
38+
public void setDtmSignup(Timestamp dtmSignup) { this.dtmSignup = dtmSignup; }
39+
}

‎src/test/java/synapticloop/sample/h2zero/cockroach/counter/AllTypesCounter.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,12 @@ private AllTypesCounter() {}
5151
public static int countAll(Connection connection) throws SQLException {
5252
PreparedStatement preparedStatement = null;
5353
ResultSet resultSet = null;
54-
int count = -1;
5554

5655
try {
5756
preparedStatement = connection.prepareStatement(SQL_BUILTIN_COUNT_ALL);
5857
resultSet = preparedStatement.executeQuery();
5958
if(resultSet.next()) {
60-
count = resultSet.getInt(1);
59+
return(resultSet.getInt(1));
6160
}
6261
} catch(SQLException sqlex) {
6362
if(LOGGER.isWarnEnabled()) {
@@ -71,7 +70,7 @@ public static int countAll(Connection connection) throws SQLException {
7170
ConnectionManager.closeAll(resultSet, preparedStatement);
7271
}
7372

74-
return(count);
73+
return(-1);
7574
}
7675

7776
/**
@@ -82,10 +81,8 @@ public static int countAll(Connection connection) throws SQLException {
8281
* @throws SQLException if there was an error in the SQL statement
8382
*/
8483
public static int countAll() throws SQLException {
85-
Connection connection = null;
8684

87-
try {
88-
connection = ConnectionManager.getConnection();
85+
try (Connection connection = ConnectionManager.getConnection()) {
8986
return(countAll(connection));
9087
} catch(SQLException sqlex) {
9188
if(LOGGER.isWarnEnabled()) {
@@ -95,8 +92,6 @@ public static int countAll() throws SQLException {
9592
}
9693
}
9794
throw sqlex;
98-
} finally {
99-
ConnectionManager.closeAll(connection);
10095
}
10196
}
10297

‎src/test/java/synapticloop/sample/h2zero/cockroach/counter/PetCounter.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,12 @@ private PetCounter() {}
5151
public static int countAll(Connection connection) throws SQLException {
5252
PreparedStatement preparedStatement = null;
5353
ResultSet resultSet = null;
54-
int count = -1;
5554

5655
try {
5756
preparedStatement = connection.prepareStatement(SQL_BUILTIN_COUNT_ALL);
5857
resultSet = preparedStatement.executeQuery();
5958
if(resultSet.next()) {
60-
count = resultSet.getInt(1);
59+
return(resultSet.getInt(1));
6160
}
6261
} catch(SQLException sqlex) {
6362
if(LOGGER.isWarnEnabled()) {
@@ -71,7 +70,7 @@ public static int countAll(Connection connection) throws SQLException {
7170
ConnectionManager.closeAll(resultSet, preparedStatement);
7271
}
7372

74-
return(count);
73+
return(-1);
7574
}
7675

7776
/**
@@ -82,10 +81,8 @@ public static int countAll(Connection connection) throws SQLException {
8281
* @throws SQLException if there was an error in the SQL statement
8382
*/
8483
public static int countAll() throws SQLException {
85-
Connection connection = null;
8684

87-
try {
88-
connection = ConnectionManager.getConnection();
85+
try (Connection connection = ConnectionManager.getConnection()) {
8986
return(countAll(connection));
9087
} catch(SQLException sqlex) {
9188
if(LOGGER.isWarnEnabled()) {
@@ -95,8 +92,6 @@ public static int countAll() throws SQLException {
9592
}
9693
}
9794
throw sqlex;
98-
} finally {
99-
ConnectionManager.closeAll(connection);
10095
}
10196
}
10297

0 commit comments

Comments
 (0)