From 38b111eb94f63c3e914f32d498b8ab662d8ac374 Mon Sep 17 00:00:00 2001 From: Eric Long Date: Thu, 20 Aug 2020 11:32:55 -0400 Subject: [PATCH 1/2] 0004505: Regression NPE in Oracle, Tibero bulk loader and Hbase, and Mongo data loader factory --- .../ext/OracleBulkDataLoaderFactory.java | 5 +-- .../ext/TiberoBulkDataLoaderFactory.java | 5 +-- .../symmetric/io/HbaseDataLoaderFactory.java | 34 ++++++++++++------- .../symmetric/io/MongoDataLoaderFactory.java | 17 +--------- 4 files changed, 24 insertions(+), 37 deletions(-) diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/ext/OracleBulkDataLoaderFactory.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/ext/OracleBulkDataLoaderFactory.java index 852d2b27ed..e82de9c34f 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/ext/OracleBulkDataLoaderFactory.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/ext/OracleBulkDataLoaderFactory.java @@ -41,11 +41,8 @@ public class OracleBulkDataLoaderFactory extends DefaultDataLoaderFactory { - private ISymmetricEngine engine; - public OracleBulkDataLoaderFactory(ISymmetricEngine engine) { - this.engine = engine; - this.parameterService = engine.getParameterService(); + super(engine); } public String getTypeName() { diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/ext/TiberoBulkDataLoaderFactory.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/ext/TiberoBulkDataLoaderFactory.java index 62fc724a9a..97d0313abf 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/ext/TiberoBulkDataLoaderFactory.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/ext/TiberoBulkDataLoaderFactory.java @@ -41,11 +41,8 @@ public class TiberoBulkDataLoaderFactory extends DefaultDataLoaderFactory { - private ISymmetricEngine engine; - public TiberoBulkDataLoaderFactory(ISymmetricEngine engine) { - this.engine = engine; - this.parameterService = engine.getParameterService(); + super(engine); } public String getTypeName() { diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/io/HbaseDataLoaderFactory.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/io/HbaseDataLoaderFactory.java index 0e1c6016c3..ae24add98d 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/io/HbaseDataLoaderFactory.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/io/HbaseDataLoaderFactory.java @@ -1,12 +1,30 @@ +/** + * Licensed to JumpMind Inc under one or more contributor + * license agreements. See the NOTICE file distributed + * with this work for additional information regarding + * copyright ownership. JumpMind Inc licenses this file + * to you under the GNU General Public License, version 3.0 (GPLv3) + * (the "License"); you may not use this file except in compliance + * with the License. + * + * You should have received a copy of the GNU General Public License, + * version 3.0 (GPLv3) along with this library; if not, see + * . + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.jumpmind.symmetric.io; import java.util.List; import org.jumpmind.extension.IBuiltInExtensionPoint; -import org.jumpmind.symmetric.ISymmetricEngine; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.ISymmetricDialect; -import org.jumpmind.symmetric.ext.ISymmetricEngineAware; import org.jumpmind.symmetric.io.data.IDataWriter; import org.jumpmind.symmetric.io.data.writer.Conflict; import org.jumpmind.symmetric.io.data.writer.IDatabaseWriterErrorHandler; @@ -15,10 +33,7 @@ import org.jumpmind.symmetric.io.data.writer.TransformWriter; import org.jumpmind.symmetric.load.DefaultDataLoaderFactory; -public class HbaseDataLoaderFactory extends DefaultDataLoaderFactory implements - ISymmetricEngineAware, IBuiltInExtensionPoint { - - protected ISymmetricEngine engine; +public class HbaseDataLoaderFactory extends DefaultDataLoaderFactory implements IBuiltInExtensionPoint { protected String typeName = "hbase"; @@ -30,12 +45,6 @@ public HbaseDataLoaderFactory() { super(); } - @Override - public void setSymmetricEngine(ISymmetricEngine engine) { - this.engine = engine; - this.parameterService = engine.getParameterService(); - } - @Override public String getTypeName() { return typeName; @@ -45,7 +54,6 @@ public void setTypeName(String typeName) { this.typeName = typeName; } - @Override public IDataWriter getDataWriter(String sourceNodeId, ISymmetricDialect symmetricDialect, TransformWriter transformWriter, List filters, diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/io/MongoDataLoaderFactory.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/io/MongoDataLoaderFactory.java index 2ba3140697..1617484360 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/io/MongoDataLoaderFactory.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/io/MongoDataLoaderFactory.java @@ -24,11 +24,8 @@ import java.lang.reflect.Method; import java.util.List; -import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.extension.IBuiltInExtensionPoint; -import org.jumpmind.symmetric.ISymmetricEngine; import org.jumpmind.symmetric.db.ISymmetricDialect; -import org.jumpmind.symmetric.ext.ISymmetricEngineAware; import org.jumpmind.symmetric.io.data.IDataWriter; import org.jumpmind.symmetric.io.data.writer.Conflict; import org.jumpmind.symmetric.io.data.writer.DatabaseWriterSettings; @@ -41,8 +38,7 @@ import org.jumpmind.symmetric.load.DefaultDataLoaderFactory; import org.jumpmind.symmetric.service.IParameterService; -public class MongoDataLoaderFactory extends DefaultDataLoaderFactory implements - ISymmetricEngineAware, IBuiltInExtensionPoint { +public class MongoDataLoaderFactory extends DefaultDataLoaderFactory implements IBuiltInExtensionPoint { protected String typeName = "mongodb"; @@ -52,12 +48,6 @@ public MongoDataLoaderFactory() { super(); } - @Override - public void setSymmetricEngine(ISymmetricEngine engine) { - this.engine = engine; - this.parameterService = engine.getParameterService(); - } - @Override public String getTypeName() { return typeName; @@ -108,11 +98,6 @@ public IDataWriter getDataWriter(String sourceNodeId, ISymmetricDialect symmetri } } - @Override - public boolean isPlatformSupported(IDatabasePlatform platform) { - return true; - } - public void setTypeName(String typeName) { this.typeName = typeName; } From 814ea3d776eae0358ec053bdffb72507a9cd8964 Mon Sep 17 00:00:00 2001 From: Eric Long Date: Mon, 31 Aug 2020 08:48:46 -0400 Subject: [PATCH 2/2] 0004515: Upgrade Postgres JDBC driver --- symmetric-assemble/common.gradle | 2 +- symmetric-assemble/gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/symmetric-assemble/common.gradle b/symmetric-assemble/common.gradle index e071f6cc09..ac0a48ca33 100644 --- a/symmetric-assemble/common.gradle +++ b/symmetric-assemble/common.gradle @@ -233,7 +233,7 @@ subprojects { subproject -> h2Version = '1.3.176' derbyVersion = '10.14.2.0' mariaDbVersion = '2.4.0' - postgresqlVersion = '42.2.8' + postgresqlVersion = '42.2.16' hsqldbVersion = '2.4.1' sqliteVersion = '3.25.2' firebirdVersion = '3.0.5' diff --git a/symmetric-assemble/gradle.properties b/symmetric-assemble/gradle.properties index 6e6059bedb..755f382a91 100644 --- a/symmetric-assemble/gradle.properties +++ b/symmetric-assemble/gradle.properties @@ -11,7 +11,7 @@ publishPort=? publishServer=symmetricds.org sourceforgeUser=? sourceforgePassword=? -jetty.version=9.4.28.v20200408 +jetty.version=9.4.31.v20200723 vaadinVersion=8.7.1 org.gradle.daemon=false \ No newline at end of file