Merge branch '3.11' of https://github.com/JumpMind/symmetric-ds.git i…

…nto 3.11
JumpMind · Sep 1, 2020 · 7b35b46 · 7b35b46
2 parents 4502218 + 814ea3d
commit 7b35b46
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 39 deletions.
diff --git 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
@@ -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
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
@@ -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
@@ -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
@@ -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
+ * <http://www.gnu.org/licenses/>.
+ *
+ * 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<IDatabaseWriterFilter> 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
@@ -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;
     }