You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/10/13 18:56:28 UTC
[incubator-hop] branch master updated: HOP-3386 Deprecated
getUsedDatabaseConnections() method
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 93b2c12 HOP-3386 Deprecated getUsedDatabaseConnections() method
new 647037d Merge pull request #1136 from nadment/HOP-3386
93b2c12 is described below
commit 93b2c125d032e4b9a0c32dd4aae8326bafd3bf5d
Author: Nicolas Adment <na...@gmail.com>
AuthorDate: Wed Oct 13 20:26:00 2021 +0200
HOP-3386 Deprecated getUsedDatabaseConnections() method
---
.../hop/pipeline/transform/BaseTransformMeta.java | 1 +
.../transforms/addsequence/AddSequenceMeta.java | 9 ---------
.../combinationlookup/CombinationLookupMeta.java | 9 ---------
.../transforms/databaselookup/DatabaseLookupMeta.java | 9 ---------
.../hop/pipeline/transforms/dbproc/DBProcMeta.java | 9 ---------
.../dimensionlookup/DimensionLookupMeta.java | 9 ---------
.../transforms/dynamicsqlrow/DynamicSqlRowMeta.java | 9 ---------
.../pipeline/transforms/execsqlrow/ExecSqlRowMeta.java | 9 ---------
.../transforms/gettablenames/GetTableNamesMeta.java | 9 ---------
.../transforms/insertupdate/InsertUpdateMeta.java | 9 ---------
.../monetdbbulkloader/MonetDbBulkLoaderMeta.java | 9 ---------
.../transforms/pgbulkloader/PGBulkLoaderMeta.java | 9 ---------
.../hop/pipeline/transforms/sql/ExecSqlMeta.java | 9 ---------
.../transforms/sqlfileoutput/SQLFileOutputMeta.java | 9 ---------
.../SynchronizeAfterMergeMeta.java | 9 ---------
.../transforms/tablecompare/TableCompareMeta.java | 18 ------------------
.../transforms/tableexists/TableExistsMeta.java | 9 ---------
17 files changed, 1 insertion(+), 153 deletions(-)
diff --git a/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransformMeta.java b/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransformMeta.java
index a44e58a..dc7a0f8 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransformMeta.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransformMeta.java
@@ -302,6 +302,7 @@ public class BaseTransformMeta implements Cloneable {
* @return an array of database connections meta-data. Return an empty array if no connections are
* used.
*/
+ @Deprecated
public DatabaseMeta[] getUsedDatabaseConnections() {
return new DatabaseMeta[] {};
}
diff --git a/plugins/transforms/addsequence/src/main/java/org/apache/hop/pipeline/transforms/addsequence/AddSequenceMeta.java b/plugins/transforms/addsequence/src/main/java/org/apache/hop/pipeline/transforms/addsequence/AddSequenceMeta.java
index 5469f98..b1a832c 100644
--- a/plugins/transforms/addsequence/src/main/java/org/apache/hop/pipeline/transforms/addsequence/AddSequenceMeta.java
+++ b/plugins/transforms/addsequence/src/main/java/org/apache/hop/pipeline/transforms/addsequence/AddSequenceMeta.java
@@ -357,15 +357,6 @@ public class AddSequenceMeta extends BaseTransformMeta
return new AddSequenceData();
}
- @Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (databaseMeta != null) {
- return new DatabaseMeta[] {databaseMeta};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
/** @return the counterName */
public String getCounterName() {
return counterName;
diff --git a/plugins/transforms/combinationlookup/src/main/java/org/apache/hop/pipeline/transforms/combinationlookup/CombinationLookupMeta.java b/plugins/transforms/combinationlookup/src/main/java/org/apache/hop/pipeline/transforms/combinationlookup/CombinationLookupMeta.java
index 53fc245..2c908d8 100644
--- a/plugins/transforms/combinationlookup/src/main/java/org/apache/hop/pipeline/transforms/combinationlookup/CombinationLookupMeta.java
+++ b/plugins/transforms/combinationlookup/src/main/java/org/apache/hop/pipeline/transforms/combinationlookup/CombinationLookupMeta.java
@@ -975,15 +975,6 @@ public class CombinationLookupMeta extends BaseTransformMeta
}
@Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (databaseMeta != null) {
- return new DatabaseMeta[] {databaseMeta};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
- @Override
public boolean equals(Object other) {
if (other == this) {
return true;
diff --git a/plugins/transforms/databaselookup/src/main/java/org/apache/hop/pipeline/transforms/databaselookup/DatabaseLookupMeta.java b/plugins/transforms/databaselookup/src/main/java/org/apache/hop/pipeline/transforms/databaselookup/DatabaseLookupMeta.java
index bc015b4..f52c5db 100644
--- a/plugins/transforms/databaselookup/src/main/java/org/apache/hop/pipeline/transforms/databaselookup/DatabaseLookupMeta.java
+++ b/plugins/transforms/databaselookup/src/main/java/org/apache/hop/pipeline/transforms/databaselookup/DatabaseLookupMeta.java
@@ -480,15 +480,6 @@ public class DatabaseLookupMeta extends BaseTransformMeta
}
@Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (databaseMeta != null) {
- return new DatabaseMeta[] {databaseMeta};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
- @Override
public String getMissingDatabaseConnectionInformationMessage() {
return null;
}
diff --git a/plugins/transforms/dbproc/src/main/java/org/apache/hop/pipeline/transforms/dbproc/DBProcMeta.java b/plugins/transforms/dbproc/src/main/java/org/apache/hop/pipeline/transforms/dbproc/DBProcMeta.java
index 8e64c7c..0454b50 100644
--- a/plugins/transforms/dbproc/src/main/java/org/apache/hop/pipeline/transforms/dbproc/DBProcMeta.java
+++ b/plugins/transforms/dbproc/src/main/java/org/apache/hop/pipeline/transforms/dbproc/DBProcMeta.java
@@ -438,15 +438,6 @@ public class DBProcMeta extends BaseTransformMeta implements ITransformMeta<DBPr
}
@Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (database != null) {
- return new DatabaseMeta[] {database};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
- @Override
public boolean supportsErrorHandling() {
return true;
}
diff --git a/plugins/transforms/dimensionlookup/src/main/java/org/apache/hop/pipeline/transforms/dimensionlookup/DimensionLookupMeta.java b/plugins/transforms/dimensionlookup/src/main/java/org/apache/hop/pipeline/transforms/dimensionlookup/DimensionLookupMeta.java
index 6664081..ca4e786 100644
--- a/plugins/transforms/dimensionlookup/src/main/java/org/apache/hop/pipeline/transforms/dimensionlookup/DimensionLookupMeta.java
+++ b/plugins/transforms/dimensionlookup/src/main/java/org/apache/hop/pipeline/transforms/dimensionlookup/DimensionLookupMeta.java
@@ -1798,15 +1798,6 @@ public class DimensionLookupMeta extends BaseTransformMeta
return new DimensionLookupData();
}
- @Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (databaseMeta != null) {
- return new DatabaseMeta[] {databaseMeta};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
/** @return the schemaName */
@Override
public String getSchemaName() {
diff --git a/plugins/transforms/dynamicsqlrow/src/main/java/org/apache/hop/pipeline/transforms/dynamicsqlrow/DynamicSqlRowMeta.java b/plugins/transforms/dynamicsqlrow/src/main/java/org/apache/hop/pipeline/transforms/dynamicsqlrow/DynamicSqlRowMeta.java
index 59c0324..7a059a4 100644
--- a/plugins/transforms/dynamicsqlrow/src/main/java/org/apache/hop/pipeline/transforms/dynamicsqlrow/DynamicSqlRowMeta.java
+++ b/plugins/transforms/dynamicsqlrow/src/main/java/org/apache/hop/pipeline/transforms/dynamicsqlrow/DynamicSqlRowMeta.java
@@ -416,15 +416,6 @@ public class DynamicSqlRowMeta extends BaseTransformMeta
}
@Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (databaseMeta != null) {
- return new DatabaseMeta[] {databaseMeta};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
- @Override
public boolean supportsErrorHandling() {
return true;
}
diff --git a/plugins/transforms/execsqlrow/src/main/java/org/apache/hop/pipeline/transforms/execsqlrow/ExecSqlRowMeta.java b/plugins/transforms/execsqlrow/src/main/java/org/apache/hop/pipeline/transforms/execsqlrow/ExecSqlRowMeta.java
index 86e0bef..aa85439 100644
--- a/plugins/transforms/execsqlrow/src/main/java/org/apache/hop/pipeline/transforms/execsqlrow/ExecSqlRowMeta.java
+++ b/plugins/transforms/execsqlrow/src/main/java/org/apache/hop/pipeline/transforms/execsqlrow/ExecSqlRowMeta.java
@@ -370,15 +370,6 @@ public class ExecSqlRowMeta extends BaseTransformMeta
}
@Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (databaseMeta != null) {
- return new DatabaseMeta[] {databaseMeta};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
- @Override
public boolean supportsErrorHandling() {
return true;
}
diff --git a/plugins/transforms/gettablenames/src/main/java/org/apache/hop/pipeline/transforms/gettablenames/GetTableNamesMeta.java b/plugins/transforms/gettablenames/src/main/java/org/apache/hop/pipeline/transforms/gettablenames/GetTableNamesMeta.java
index 44e78ea..13b7516 100644
--- a/plugins/transforms/gettablenames/src/main/java/org/apache/hop/pipeline/transforms/gettablenames/GetTableNamesMeta.java
+++ b/plugins/transforms/gettablenames/src/main/java/org/apache/hop/pipeline/transforms/gettablenames/GetTableNamesMeta.java
@@ -462,15 +462,6 @@ public class GetTableNamesMeta extends BaseTransformMeta
}
@Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (database != null) {
- return new DatabaseMeta[] {database};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
- @Override
public boolean supportsErrorHandling() {
return true;
}
diff --git a/plugins/transforms/insertupdate/src/main/java/org/apache/hop/pipeline/transforms/insertupdate/InsertUpdateMeta.java b/plugins/transforms/insertupdate/src/main/java/org/apache/hop/pipeline/transforms/insertupdate/InsertUpdateMeta.java
index ac6ab8e..a21d5bb 100644
--- a/plugins/transforms/insertupdate/src/main/java/org/apache/hop/pipeline/transforms/insertupdate/InsertUpdateMeta.java
+++ b/plugins/transforms/insertupdate/src/main/java/org/apache/hop/pipeline/transforms/insertupdate/InsertUpdateMeta.java
@@ -792,15 +792,6 @@ public class InsertUpdateMeta extends BaseTransformMeta
return new InsertUpdateData();
}
- @Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (databaseMeta != null) {
- return new DatabaseMeta[] {databaseMeta};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
/** @return Returns the updateBypassed. */
public boolean isUpdateBypassed() {
return updateBypassed;
diff --git a/plugins/transforms/monetdbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/monetdbbulkloader/MonetDbBulkLoaderMeta.java b/plugins/transforms/monetdbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/monetdbbulkloader/MonetDbBulkLoaderMeta.java
index 4a5f5f0..28ed9f6 100644
--- a/plugins/transforms/monetdbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/monetdbbulkloader/MonetDbBulkLoaderMeta.java
+++ b/plugins/transforms/monetdbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/monetdbbulkloader/MonetDbBulkLoaderMeta.java
@@ -705,15 +705,6 @@ public class MonetDbBulkLoaderMeta extends BaseTransformMeta
}
@Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (databaseMeta != null) {
- return new DatabaseMeta[] {databaseMeta};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
- @Override
public IRowMeta getRequiredFields(IVariables variables) throws HopException {
String realTableName = variables.resolve(tableName);
String realSchemaName = variables.resolve(schemaName);
diff --git a/plugins/transforms/pgbulkloader/src/main/java/org/apache/hop/pipeline/transforms/pgbulkloader/PGBulkLoaderMeta.java b/plugins/transforms/pgbulkloader/src/main/java/org/apache/hop/pipeline/transforms/pgbulkloader/PGBulkLoaderMeta.java
index 4180be9..9345035 100644
--- a/plugins/transforms/pgbulkloader/src/main/java/org/apache/hop/pipeline/transforms/pgbulkloader/PGBulkLoaderMeta.java
+++ b/plugins/transforms/pgbulkloader/src/main/java/org/apache/hop/pipeline/transforms/pgbulkloader/PGBulkLoaderMeta.java
@@ -463,15 +463,6 @@ public class PGBulkLoaderMeta extends BaseTransformMeta
}
@Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (databaseMeta != null) {
- return new DatabaseMeta[] {databaseMeta};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
- @Override
public IRowMeta getRequiredFields(IVariables variables) throws HopException {
String realTableName = variables.resolve(tableName);
String realSchemaName = variables.resolve(schemaName);
diff --git a/plugins/transforms/sql/src/main/java/org/apache/hop/pipeline/transforms/sql/ExecSqlMeta.java b/plugins/transforms/sql/src/main/java/org/apache/hop/pipeline/transforms/sql/ExecSqlMeta.java
index c7f846f..13e6f73 100644
--- a/plugins/transforms/sql/src/main/java/org/apache/hop/pipeline/transforms/sql/ExecSqlMeta.java
+++ b/plugins/transforms/sql/src/main/java/org/apache/hop/pipeline/transforms/sql/ExecSqlMeta.java
@@ -449,15 +449,6 @@ public class ExecSqlMeta extends BaseTransformMeta implements ITransformMeta<Exe
impact.add(ii);
}
- @Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (databaseMeta != null) {
- return new DatabaseMeta[] {databaseMeta};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
/** @return Returns the variableReplacementActive. */
public boolean isReplaceVariables() {
return replaceVariables;
diff --git a/plugins/transforms/sqlfileoutput/src/main/java/org/apache/hop/pipeline/transforms/sqlfileoutput/SQLFileOutputMeta.java b/plugins/transforms/sqlfileoutput/src/main/java/org/apache/hop/pipeline/transforms/sqlfileoutput/SQLFileOutputMeta.java
index d451a0e..0784b9a 100644
--- a/plugins/transforms/sqlfileoutput/src/main/java/org/apache/hop/pipeline/transforms/sqlfileoutput/SQLFileOutputMeta.java
+++ b/plugins/transforms/sqlfileoutput/src/main/java/org/apache/hop/pipeline/transforms/sqlfileoutput/SQLFileOutputMeta.java
@@ -796,15 +796,6 @@ public class SQLFileOutputMeta extends BaseTransformMeta
}
}
- @Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (databaseMeta != null) {
- return new DatabaseMeta[] {databaseMeta};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
/** @return the schemaName */
public String getSchemaName() {
return schemaName;
diff --git a/plugins/transforms/synchronizeaftermerge/src/main/java/org/apache/hop/pipeline/transforms/synchronizeaftermerge/SynchronizeAfterMergeMeta.java b/plugins/transforms/synchronizeaftermerge/src/main/java/org/apache/hop/pipeline/transforms/synchronizeaftermerge/SynchronizeAfterMergeMeta.java
index f40044e..95aff4f 100644
--- a/plugins/transforms/synchronizeaftermerge/src/main/java/org/apache/hop/pipeline/transforms/synchronizeaftermerge/SynchronizeAfterMergeMeta.java
+++ b/plugins/transforms/synchronizeaftermerge/src/main/java/org/apache/hop/pipeline/transforms/synchronizeaftermerge/SynchronizeAfterMergeMeta.java
@@ -1022,15 +1022,6 @@ public class SynchronizeAfterMergeMeta extends BaseTransformMeta
}
@Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (databaseMeta != null) {
- return new DatabaseMeta[] {databaseMeta};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
- @Override
public IRowMeta getRequiredFields(IVariables variables) throws HopException {
String realTableName = variables.resolve(tableName);
String realSchemaName = variables.resolve(schemaName);
diff --git a/plugins/transforms/tablecompare/src/main/java/org/apache/hop/pipeline/transforms/tablecompare/TableCompareMeta.java b/plugins/transforms/tablecompare/src/main/java/org/apache/hop/pipeline/transforms/tablecompare/TableCompareMeta.java
index 72f455f..97bdb6d 100644
--- a/plugins/transforms/tablecompare/src/main/java/org/apache/hop/pipeline/transforms/tablecompare/TableCompareMeta.java
+++ b/plugins/transforms/tablecompare/src/main/java/org/apache/hop/pipeline/transforms/tablecompare/TableCompareMeta.java
@@ -150,24 +150,6 @@ public class TableCompareMeta extends BaseTransformMeta
this.compareConnection = compareConnection;
}
- @Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- List<DatabaseMeta> connList = new ArrayList<>(2);
- if (compareConnection != null) {
- connList.add(compareConnection);
- }
- if (referenceConnection != null) {
- connList.add(referenceConnection);
- }
- if (connList.size() > 0) {
- DatabaseMeta[] rtn = new DatabaseMeta[connList.size()];
- connList.toArray(rtn);
- return rtn;
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
/** @return the keyFieldsField */
public String getKeyFieldsField() {
return keyFieldsField;
diff --git a/plugins/transforms/tableexists/src/main/java/org/apache/hop/pipeline/transforms/tableexists/TableExistsMeta.java b/plugins/transforms/tableexists/src/main/java/org/apache/hop/pipeline/transforms/tableexists/TableExistsMeta.java
index 58134b5..81b2219 100644
--- a/plugins/transforms/tableexists/src/main/java/org/apache/hop/pipeline/transforms/tableexists/TableExistsMeta.java
+++ b/plugins/transforms/tableexists/src/main/java/org/apache/hop/pipeline/transforms/tableexists/TableExistsMeta.java
@@ -211,15 +211,6 @@ public class TableExistsMeta extends BaseTransformMeta
}
@Override
- public DatabaseMeta[] getUsedDatabaseConnections() {
- if (database != null) {
- return new DatabaseMeta[] {database};
- } else {
- return super.getUsedDatabaseConnections();
- }
- }
-
- @Override
public boolean supportsErrorHandling() {
return true;
}