Added copy/consume constructor for JdbcRow.

joshmg · joshmg · commit 66d734bede7e · 2019-07-29T14:51:20.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ version '3.0.0'
 
 apply plugin: 'java'
 
-sourceCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_1_8
 
 task makeJar(type: Jar) {
     manifest {
@@ -58,12 +58,12 @@ tasks.withType(Javadoc) {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    archiveClassifier = 'sources'
+    archiveFileName = project.name + '-' + version + '-sources.jar'
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier = 'javadoc'
+    archiveFileName = project.name + '-' + version + '-javadoc.jar'
     from javadoc.destinationDir
 }
 
diff --git a/src/main/java/com/softwareverde/database/row/JdbcRow.java b/src/main/java/com/softwareverde/database/row/JdbcRow.java
@@ -25,10 +25,21 @@ public class JdbcRow implements Row {
         CHARSET = charset;
     }
 
-    protected final List<String> _orderedColumnNames = new ArrayList<String>();
-    protected final Map<String, TypedParameter> _columnValues = new HashMap<String, TypedParameter>();
+    protected final List<String> _orderedColumnNames;
+    protected final Map<String, TypedParameter> _columnValues;
 
-    protected JdbcRow() { }
+    protected JdbcRow() {
+        _orderedColumnNames = new ArrayList<String>();
+        _columnValues = new HashMap<String, TypedParameter>();
+    }
+
+    /**
+     * Consumes the internal values of the provided jdbcRow.
+     */
+    protected JdbcRow(final JdbcRow jdbcRow) {
+        _orderedColumnNames = jdbcRow._orderedColumnNames;
+        _columnValues = jdbcRow._columnValues;
+    }
 
     protected TypedParameter _getValue(final String columnName) throws IllegalArgumentException {
         final String lowerCaseColumnName = columnName.toLowerCase();

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ version '3.0.0'`
`3`	`3`
`4`	`4`	`apply plugin: 'java'`
`5`	`5`
`6`		`-sourceCompatibility = 1.8`
	`6`	`+sourceCompatibility = JavaVersion.VERSION_1_8`
`7`	`7`
`8`	`8`	`task makeJar(type: Jar) {`
`9`	`9`	`manifest {`
`@@ -58,12 +58,12 @@ tasks.withType(Javadoc) {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`task sourcesJar(type: Jar, dependsOn: classes) {`
`61`		`- archiveClassifier = 'sources'`
	`61`	`+ archiveFileName = project.name + '-' + version + '-sources.jar'`
`62`	`62`	`from sourceSets.main.allSource`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`task javadocJar(type: Jar, dependsOn: javadoc) {`
`66`		`- archiveClassifier = 'javadoc'`
	`66`	`+ archiveFileName = project.name + '-' + version + '-javadoc.jar'`
`67`	`67`	`from javadoc.destinationDir`
`68`	`68`	`}`
`69`	`69`