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 217f206 HOP-3238 Rename somes methods with Interface word
new f1eda15 Merge pull request #1034 from nadment/HOP-3238
217f206 is described below
commit 217f206625f3e3cbd5032835041e7fe01b8a6835
Author: Nicolas Adment <[email protected]>
AuthorDate: Thu Sep 2 20:08:53 2021 +0200
HOP-3238 Rename somes methods with Interface word
---
.../apache/hop/core/plugins/PluginRegistry.java | 14 ++++----
.../hop/core/row/value/ValueMetaConverter.java | 40 +++++++++++-----------
.../java/org/apache/hop/pipeline/PipelineMeta.java | 6 ++--
.../java/org/apache/hop/pipeline/RowProducer.java | 18 +++++-----
.../hop/pipeline/transform/BaseTransform.java | 4 +--
.../org/apache/hop/pipeline/RowProducerTest.java | 14 ++++----
6 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/core/src/main/java/org/apache/hop/core/plugins/PluginRegistry.java
b/core/src/main/java/org/apache/hop/core/plugins/PluginRegistry.java
index 4716367..2641d38 100644
--- a/core/src/main/java/org/apache/hop/core/plugins/PluginRegistry.java
+++ b/core/src/main/java/org/apache/hop/core/plugins/PluginRegistry.java
@@ -1056,10 +1056,10 @@ public class PluginRegistry {
Class<? extends IPluginType> pluginType,
String pluginId,
boolean waitForPluginToBeAvailable) {
- IPlugin pluginInterface = findPluginWithId(pluginType, pluginId);
- return waitForPluginToBeAvailable && pluginInterface == null
+ IPlugin plugin = findPluginWithId(pluginType, pluginId);
+ return waitForPluginToBeAvailable && plugin == null
? waitForPluginToBeAvailable(pluginType, pluginId,
WAIT_FOR_PLUGIN_TO_BE_AVAILABLE_LIMIT)
- : pluginInterface;
+ : plugin;
}
private IPlugin waitForPluginToBeAvailable(
@@ -1073,11 +1073,11 @@ public class PluginRegistry {
Thread.currentThread().interrupt();
return null;
}
- IPlugin pluginInterface = findPluginWithId(pluginType, pluginId);
- return waitLimit <= 0 && pluginInterface == null
+ IPlugin plugin = findPluginWithId(pluginType, pluginId);
+ return waitLimit <= 0 && plugin == null
? null
- : pluginInterface != null
- ? pluginInterface
+ : plugin != null
+ ? plugin
: waitForPluginToBeAvailable(pluginType, pluginId, waitLimit);
}
diff --git
a/core/src/main/java/org/apache/hop/core/row/value/ValueMetaConverter.java
b/core/src/main/java/org/apache/hop/core/row/value/ValueMetaConverter.java
index 48edf18..3e34b8e 100644
--- a/core/src/main/java/org/apache/hop/core/row/value/ValueMetaConverter.java
+++ b/core/src/main/java/org/apache/hop/core/row/value/ValueMetaConverter.java
@@ -70,32 +70,32 @@ public class ValueMetaConverter implements Serializable,
IValueMetaConverter {
switch (sourceValueMetaType) {
case IValueMeta.TYPE_INET:
- return convertFromInetMetaInterface(targetValueMetaType, value);
+ return convertFromInetMeta(targetValueMetaType, value);
case IValueMeta.TYPE_STRING:
- return convertFromStringMetaInterface(targetValueMetaType, value);
+ return convertFromStringMeta(targetValueMetaType, value);
case IValueMeta.TYPE_INTEGER:
- return convertFromIntegerMetaInterface(targetValueMetaType, value);
+ return convertFromIntegerMeta(targetValueMetaType, value);
case IValueMeta.TYPE_NUMBER:
- return convertFromNumberMetaInterface(targetValueMetaType, value);
+ return convertFromNumberMeta(targetValueMetaType, value);
case IValueMeta.TYPE_BIGNUMBER:
- return convertFromBigNumberMetaInterface(targetValueMetaType, value);
+ return convertFromBigNumberMeta(targetValueMetaType, value);
case IValueMeta.TYPE_TIMESTAMP:
- return convertFromTimestampMetaInterface(targetValueMetaType, value);
+ return convertFromTimestampMeta(targetValueMetaType, value);
case IValueMeta.TYPE_DATE:
- return convertFromDateMetaInterface(targetValueMetaType, value);
+ return convertFromDateMeta(targetValueMetaType, value);
case IValueMeta.TYPE_BOOLEAN:
- return convertFromBooleanMetaInterface(targetValueMetaType, value);
+ return convertFromBooleanMeta(targetValueMetaType, value);
case IValueMeta.TYPE_BINARY:
- return convertFromBinaryMetaInterface(targetValueMetaType, value);
+ return convertFromBinaryMeta(targetValueMetaType, value);
case IValueMeta.TYPE_SERIALIZABLE:
- return convertFromSerializableMetaInterface(targetValueMetaType,
value);
+ return convertFromSerializableMeta(targetValueMetaType, value);
default:
throwBadConversionCombination(sourceValueMetaType,
targetValueMetaType, value);
}
return null;
}
- protected Object convertFromStringMetaInterface(int targetValueMetaType,
Object value)
+ protected Object convertFromStringMeta(int targetValueMetaType, Object value)
throws ValueMetaConversionException {
if (value == null) {
return null;
@@ -150,7 +150,7 @@ public class ValueMetaConverter implements Serializable,
IValueMetaConverter {
return null;
}
- protected Object convertFromDateMetaInterface(int targetValueMetaType,
Object value)
+ protected Object convertFromDateMeta(int targetValueMetaType, Object value)
throws ValueMetaConversionException {
if (value == null) {
@@ -187,7 +187,7 @@ public class ValueMetaConverter implements Serializable,
IValueMetaConverter {
return null;
}
- protected Object convertFromNumberMetaInterface(int targetValueMetaType,
Object value)
+ protected Object convertFromNumberMeta(int targetValueMetaType, Object value)
throws ValueMetaConversionException {
if (value == null) {
@@ -227,7 +227,7 @@ public class ValueMetaConverter implements Serializable,
IValueMetaConverter {
return null;
}
- protected Object convertFromBooleanMetaInterface(int targetValueMetaType,
Object value)
+ protected Object convertFromBooleanMeta(int targetValueMetaType, Object
value)
throws ValueMetaConversionException {
if (value == null) {
@@ -259,7 +259,7 @@ public class ValueMetaConverter implements Serializable,
IValueMetaConverter {
return null;
}
- protected Object convertFromIntegerMetaInterface(int targetValueMetaType,
Object value)
+ protected Object convertFromIntegerMeta(int targetValueMetaType, Object
value)
throws ValueMetaConversionException {
if (value == null) {
@@ -304,7 +304,7 @@ public class ValueMetaConverter implements Serializable,
IValueMetaConverter {
return value;
}
- protected Object convertFromBigNumberMetaInterface(int targetValueMetaType,
Object value)
+ protected Object convertFromBigNumberMeta(int targetValueMetaType, Object
value)
throws ValueMetaConversionException {
if (value == null) {
@@ -345,7 +345,7 @@ public class ValueMetaConverter implements Serializable,
IValueMetaConverter {
return value;
}
- protected Object convertFromTimestampMetaInterface(int targetValueMetaType,
Object value)
+ protected Object convertFromTimestampMeta(int targetValueMetaType, Object
value)
throws ValueMetaConversionException {
if (value == null) {
@@ -383,7 +383,7 @@ public class ValueMetaConverter implements Serializable,
IValueMetaConverter {
return value;
}
- protected Object convertFromInetMetaInterface(int targetValueMetaType,
Object value)
+ protected Object convertFromInetMeta(int targetValueMetaType, Object value)
throws ValueMetaConversionException {
if (value == null) {
@@ -420,7 +420,7 @@ public class ValueMetaConverter implements Serializable,
IValueMetaConverter {
return null;
}
- protected Object convertFromBinaryMetaInterface(int targetValueMetaType,
Object value)
+ protected Object convertFromBinaryMeta(int targetValueMetaType, Object value)
throws ValueMetaConversionException {
if (value == null) {
@@ -452,7 +452,7 @@ public class ValueMetaConverter implements Serializable,
IValueMetaConverter {
return null;
}
- protected Object convertFromSerializableMetaInterface(int
targetValueMetaType, Object value)
+ protected Object convertFromSerializableMeta(int targetValueMetaType, Object
value)
throws ValueMetaConversionException {
if (value == null) {
diff --git a/engine/src/main/java/org/apache/hop/pipeline/PipelineMeta.java
b/engine/src/main/java/org/apache/hop/pipeline/PipelineMeta.java
index 10f0133..24d6fac 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/PipelineMeta.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/PipelineMeta.java
@@ -345,9 +345,9 @@ public class PipelineMeta extends AbstractMeta
}
// Transform references are original yet. Set them to the clones.
for (TransformMeta transform : pipelineMeta.getTransforms()) {
- final ITransformMeta transformMetaInterface = transform.getTransform();
- if (transformMetaInterface != null) {
- final ITransformIOMeta transformIOMeta =
transformMetaInterface.getTransformIOMeta();
+ final ITransformMeta transformMeta = transform.getTransform();
+ if (transformMeta != null) {
+ final ITransformIOMeta transformIOMeta =
transformMeta.getTransformIOMeta();
if (transformIOMeta != null) {
for (IStream stream : transformIOMeta.getInfoStreams()) {
String streamTransformName = stream.getTransformName();
diff --git a/engine/src/main/java/org/apache/hop/pipeline/RowProducer.java
b/engine/src/main/java/org/apache/hop/pipeline/RowProducer.java
index d696b7f..a04f0cf 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/RowProducer.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/RowProducer.java
@@ -30,10 +30,10 @@ import java.util.concurrent.TimeUnit;
*/
public class RowProducer {
private IRowSet rowSet;
- private ITransform iTransform;
+ private ITransform transform;
- public RowProducer(ITransform iTransform, IRowSet rowSet) {
- this.iTransform = iTransform;
+ public RowProducer(ITransform transform, IRowSet rowSet) {
+ this.transform = transform;
this.rowSet = rowSet;
}
@@ -89,13 +89,13 @@ public class RowProducer {
this.rowSet = rowSet;
}
- /** @return Returns the iTransform. */
- public ITransform getTransformInterface() {
- return iTransform;
+ /** @return Returns the ITransform. */
+ public ITransform getTransform() {
+ return transform;
}
- /** @param iTransform The iTransform to set. */
- public void setTransformInterface(ITransform iTransform) {
- this.iTransform = iTransform;
+ /** @param transform The ITransform to set. */
+ public void setTransform(ITransform transform) {
+ this.transform = transform;
}
}
diff --git
a/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransform.java
b/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransform.java
index c42d80a..e93e535 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransform.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/transform/BaseTransform.java
@@ -903,13 +903,13 @@ public class BaseTransform<Meta extends ITransformMeta,
Data extends ITransformD
return getStatus().getDescription();
}
- /** @return Returns the transformMetaInterface. */
+ /** @return Returns the transformMeta. */
@Override
public Meta getMeta() {
return meta;
}
- /** @param meta The transformMetaInterface to set. */
+ /** @param meta The transformMeta to set. */
@Override
public void setMeta(Meta meta) {
this.meta = meta;
diff --git a/engine/src/test/java/org/apache/hop/pipeline/RowProducerTest.java
b/engine/src/test/java/org/apache/hop/pipeline/RowProducerTest.java
index 35bfe2c..52049db 100644
--- a/engine/src/test/java/org/apache/hop/pipeline/RowProducerTest.java
+++ b/engine/src/test/java/org/apache/hop/pipeline/RowProducerTest.java
@@ -90,12 +90,12 @@ public class RowProducerTest {
}
@Test
- public void testGetSetTransformInterface() throws Exception {
- assertEquals(iTransform, rowProducer.getTransformInterface());
- rowProducer.setTransformInterface(null);
- assertNull(rowProducer.getTransformInterface());
- ITransform newTransformInterface = mock(ITransform.class);
- rowProducer.setTransformInterface(newTransformInterface);
- assertEquals(newTransformInterface, rowProducer.getTransformInterface());
+ public void testGetSetTransform() throws Exception {
+ assertEquals(iTransform, rowProducer.getTransform());
+ rowProducer.setTransform(null);
+ assertNull(rowProducer.getTransform());
+ ITransform newTransform = mock(ITransform.class);
+ rowProducer.setTransform(newTransform);
+ assertEquals(newTransform, rowProducer.getTransform());
}
}
