You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2022/01/23 00:47:52 UTC
[empire-db] branch version3 updated: EMPIREDB-362 plugin-update
This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch version3
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/version3 by this push:
new 6a7a61a EMPIREDB-362 plugin-update
6a7a61a is described below
commit 6a7a61a011e194a98c4f74d4570b564eb631fddc
Author: Rainer Döbele <do...@apache.org>
AuthorDate: Sun Jan 23 01:47:51 2022 +0100
EMPIREDB-362 plugin-update
---
empire-db-jsf2/pom.xml | 6 ++--
empire-db-maven-plugin/pom.xml | 16 +++++----
.../main/java/org/apache/empire/db/DBRecord.java | 40 +++++++---------------
.../main/java/org/apache/empire/db/DBRowSet.java | 8 ++---
.../org/apache/empire/commons/ObjectUtilsTest.java | 1 -
.../apache/empire/db/PreparedStatementTest.java | 1 +
.../empire/db/hsql/DBDatabaseDriverHSqlTest.java | 9 +++++
pom.xml | 26 ++++++++------
8 files changed, 54 insertions(+), 53 deletions(-)
diff --git a/empire-db-jsf2/pom.xml b/empire-db-jsf2/pom.xml
index 658e046..e2668a0 100644
--- a/empire-db-jsf2/pom.xml
+++ b/empire-db-jsf2/pom.xml
@@ -72,12 +72,12 @@
<plugins>
<!-- allow java 6 api calls for this module -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java16</artifactId>
+ <artifactId>java18</artifactId>
<version>1.0</version>
</signature>
</configuration>
diff --git a/empire-db-maven-plugin/pom.xml b/empire-db-maven-plugin/pom.xml
index a3dd6c7..8376867 100644
--- a/empire-db-maven-plugin/pom.xml
+++ b/empire-db-maven-plugin/pom.xml
@@ -37,23 +37,25 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0</version>
+ <version>3.5.4</version>
</dependency>
- <!-- <dependency>
+ <!--
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0</version>
- </dependency> -->
+ <version>3.5.4</version>
+ </dependency>
+ -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0</version>
+ <version>2.2.1</version>
</dependency>
<!-- dependencies to annotations -->
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.3</version>
+ <version>3.5.2</version>
<scope>provided</scope><!-- annotations are needed only to build the plugin -->
</dependency>
<dependency>
@@ -79,7 +81,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
+ <version>3.5.2</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBRecord.java b/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
index 6e0d6b8..aeaf459 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
@@ -838,6 +838,19 @@ public class DBRecord extends DBRecordData implements DBContextAware, Record, Cl
public void init(Object[] key, boolean insert)
{ // Init with keys
rowset.initRecord(this, key, insert);
+ // fill default values
+ for (int i = 0; i < fields.length; i++)
+ { // already set ?
+ if (fields[i]!=null)
+ continue;
+ // check default
+ DBTableColumn col = (DBTableColumn) rowset.getColumn(i);
+ Object value = col.getRecordDefaultValue(null);
+ if (value==null)
+ continue;
+ // Modify value
+ modifyValue(i, value, true);
+ }
}
/**
@@ -1205,33 +1218,6 @@ public class DBRecord extends DBRecordData implements DBContextAware, Record, Cl
onFieldChanged(index);
}
- /**
- * Set the record default value for the fields with
- * the value {@link ObjectUtils#NO_VALUE}
- *
- * @param conn the sql connection
- *
- * @return the number of fields set to default
- */
- protected int fillMissingDefaults(Connection conn)
- {
- int count = 0;
- for (int i = 0; i < fields.length; i++)
- {
- if (fields[i] == ObjectUtils.NO_VALUE)
- {
- DBTableColumn col = (DBTableColumn) rowset.getColumn(i);
- Object value = col.getRecordDefaultValue(conn);
- if (value==null)
- continue;
- // Modify value
- modifyValue(i, value, true);
- count++;
- }
- }
- return count;
- }
-
/*
* Sets the modified state of a column.<BR>
* This will force the field to be updated in the database, if set to TRUE.
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java b/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
index 3b7520e..cc9d77b 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
@@ -535,10 +535,10 @@ public abstract class DBRowSet extends DBExpr
prepareInitRecord(rec, null, insert);
// Initialize all Fields
Object[] fields = rec.getFields();
- /* obsolete
- for (int i = 0; i < fields.length; i++)
- fields[i] = ObjectUtils.NO_VALUE;
- */
+ /*
+ * DO NOT fill with ObjectUtils.NO_VALUE
+ * ![fields[i] <> ObjectUtils.NO_VALUE];
+ */
// Init Key Values
if (keyValues != null && primaryKey != null)
{ // Check Columns
diff --git a/empire-db/src/test/java/org/apache/empire/commons/ObjectUtilsTest.java b/empire-db/src/test/java/org/apache/empire/commons/ObjectUtilsTest.java
index 208d400..72025bf 100644
--- a/empire-db/src/test/java/org/apache/empire/commons/ObjectUtilsTest.java
+++ b/empire-db/src/test/java/org/apache/empire/commons/ObjectUtilsTest.java
@@ -46,7 +46,6 @@ public class ObjectUtilsTest
@Test
public void testIsEmpty()
{
- assertTrue(ObjectUtils.isEmpty(ObjectUtils.NO_VALUE));
assertTrue(ObjectUtils.isEmpty(""));
assertTrue(ObjectUtils.isEmpty(null));
assertFalse(ObjectUtils.isEmpty(" "));
diff --git a/empire-db/src/test/java/org/apache/empire/db/PreparedStatementTest.java b/empire-db/src/test/java/org/apache/empire/db/PreparedStatementTest.java
index 910d47d..fc13f81 100644
--- a/empire-db/src/test/java/org/apache/empire/db/PreparedStatementTest.java
+++ b/empire-db/src/test/java/org/apache/empire/db/PreparedStatementTest.java
@@ -52,6 +52,7 @@ public class PreparedStatementTest{
script.executeAll(false);
DBRecord department = new DBRecord(context, db.DEPARTMENT);
+ department.create();
department.setValue(db.DEPARTMENT.NAME, "junit");
department.setValue(db.DEPARTMENT.BUSINESS_UNIT, "test");
department.update();
diff --git a/empire-db/src/test/java/org/apache/empire/db/hsql/DBDatabaseDriverHSqlTest.java b/empire-db/src/test/java/org/apache/empire/db/hsql/DBDatabaseDriverHSqlTest.java
index 7b03242..33c7461 100644
--- a/empire-db/src/test/java/org/apache/empire/db/hsql/DBDatabaseDriverHSqlTest.java
+++ b/empire-db/src/test/java/org/apache/empire/db/hsql/DBDatabaseDriverHSqlTest.java
@@ -72,12 +72,21 @@ public class DBDatabaseDriverHSqlTest{
assertTrue("No departments", dep.getInt(db.DEPARTMENT.ID) > 0);
DBRecord emp = new DBRecord(context, db.EMPLOYEE);
+ emp.create();
emp.setValue(db.EMPLOYEE.FIRSTNAME, "junit");
emp.setValue(db.EMPLOYEE.LASTNAME, "test");
emp.setValue(db.EMPLOYEE.GENDER, "m");
emp.setValue(db.EMPLOYEE.DEPARTMENT_ID, dep.getInt(db.DEPARTMENT.ID));
emp.update();
+ DBRecord emp2 = new DBRecord(context, db.EMPLOYEE);
+ emp2.init(null, true);
+ emp2.setValue(db.EMPLOYEE.FIRSTNAME, "junit2");
+ emp2.setValue(db.EMPLOYEE.LASTNAME, "test2");
+ emp2.setValue(db.EMPLOYEE.GENDER, "m");
+ emp2.setValue(db.EMPLOYEE.DEPARTMENT_ID, dep.getInt(db.DEPARTMENT.ID));
+ emp2.update();
+
date = emp.getDateTime(db.EMPLOYEE.UPDATE_TIMESTAMP);
assertNotNull("Date is null", date);
assertTrue("Employee id O or less", emp.getInt(db.EMPLOYEE.ID) > 0);
diff --git a/pom.xml b/pom.xml
index 5562c3f..3660b67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -528,9 +528,11 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.5</version>
+ <version>3.1.2</version>
<configuration>
+ <!--
<useDefaultManifestFile>true</useDefaultManifestFile>
+ -->
<archive>
<manifestEntries>
<X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
@@ -543,9 +545,11 @@
<goals>
<goal>test-jar</goal>
</goals>
+ <!--
<configuration>
<useDefaultManifestFile>false</useDefaultManifestFile>
</configuration>
+ -->
</execution>
</executions>
</plugin>
@@ -589,7 +593,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M2</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>enforce-maven</id>
@@ -615,7 +619,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.14</version>
+ <version>1.20</version>
<executions>
<execution>
<id>check-api</id>
@@ -628,7 +632,7 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java16</artifactId>
+ <artifactId>java18</artifactId>
<version>1.0</version>
</signature>
</configuration>
@@ -636,7 +640,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10</version>
<configuration>
<downloadSources>true</downloadSources>
<!-- downloadJavadocs>true</downloadJavadocs -->
@@ -645,7 +649,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.0</version>
+ <version>3.5.1</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -666,7 +670,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
+ <version>2.22.2</version>
<configuration>
<systemPropertyVariables>
<derby.stream.error.file>target/derby.log</derby.stream.error.file>
@@ -740,7 +744,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.8</version>
+ <version>3.1.2</version>
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -768,9 +772,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.1</version>
+ <version>3.15.0</version>
<configuration>
- <targetJdk>1.6</targetJdk>
+ <targetJdk>1.8</targetJdk>
</configuration>
</plugin>
<!-- findbugs-maven-plugin -->
@@ -806,7 +810,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.4</version>
+ <version>3.1.1</version>
</plugin>
<!-- maven-javadoc-plugin
<plugin>