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 1e90c96 HOP-3238 Rename somes methods with Interface word and
duplicate methods
new 53a7621 Merge pull request #1033 from nadment/HOP-3238
1e90c96 is described below
commit 1e90c96a2588a3b6497b4773d2af43e028dbe0de
Author: Nicolas Adment <[email protected]>
AuthorDate: Wed Sep 1 22:27:24 2021 +0200
HOP-3238 Rename somes methods with Interface word and duplicate methods
---
.../modules/ROOT/pages/sdk/hop-sdk.adoc | 2 +-
.../java/org/apache/hop/pipeline/Pipeline.java | 145 ++++++---------------
.../apache/hop/www/SniffTransformServletTest.java | 10 +-
.../pipeline/transforms/mapping/SimpleMapping.java | 2 +-
.../transforms/mapping/SimpleMappingTest.java | 6 +-
.../pipeline/transforms/metainject/MetaInject.java | 2 +-
.../transforms/xml/PipelineTestFactory.java | 8 +-
.../transforms/xml/getxmldata/GetXMLDataTest.java | 4 +-
.../hop/pipeline/transforms/xml/xslt/XsltTest.java | 2 +-
9 files changed, 61 insertions(+), 120 deletions(-)
diff --git a/docs/hop-dev-manual/modules/ROOT/pages/sdk/hop-sdk.adoc
b/docs/hop-dev-manual/modules/ROOT/pages/sdk/hop-sdk.adoc
index c7cd994..8ad7bab 100644
--- a/docs/hop-dev-manual/modules/ROOT/pages/sdk/hop-sdk.adoc
+++ b/docs/hop-dev-manual/modules/ROOT/pages/sdk/hop-sdk.adoc
@@ -160,7 +160,7 @@ After `prepareExecution()` you can add row listeners to the
various transforms:
[source,java]
----
-ITransform transform = localPipeline.findTransformInterface("transform-name",
0);
+ITransform transform = localPipeline.getTransform("transform-name", 0);
transform.addRowListener(new RowAdapter() {
void rowWrittenEvent( IRowMeta rowMeta, Object[] row ) throws
HopTransformException {
// A row was written during execution
diff --git a/engine/src/main/java/org/apache/hop/pipeline/Pipeline.java
b/engine/src/main/java/org/apache/hop/pipeline/Pipeline.java
index 0bb479e..b1897e7 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/Pipeline.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/Pipeline.java
@@ -1744,92 +1744,6 @@ public abstract class Pipeline
}
/**
- * Find the base transforms for the transform with the specified name.
- *
- * @param transformName the transform name
- * @return the list of base transforms for the specified transform
- */
- public List<ITransform> findBaseTransforms(String transformName) {
- List<ITransform> baseTransforms = new ArrayList<>();
-
- if (transforms == null) {
- return baseTransforms;
- }
-
- for (TransformMetaDataCombi sid : transforms) {
- ITransform iTransform = sid.transform;
- if (iTransform.getTransformName().equalsIgnoreCase(transformName)) {
- baseTransforms.add(iTransform);
- }
- }
- return baseTransforms;
- }
-
- /**
- * Find the executing transform copy for the transform with the specified
name and copy number
- *
- * @param transformName the transform name
- * @param copyNr
- * @return the executing transform found or null if no copy could be found.
- */
- public ITransform findTransformInterface(String transformName, int copyNr) {
- if (transforms == null) {
- return null;
- }
-
- for (TransformMetaDataCombi sid : transforms) {
- ITransform iTransform = sid.transform;
- if (iTransform.getTransformName().equalsIgnoreCase(transformName) &&
sid.copy == copyNr) {
- return iTransform;
- }
- }
- return null;
- }
-
- /**
- * Find the available executing transform copies for the transform with the
specified name
- *
- * @param transformName the transform name
- * @return the list of executing transform copies found or null if no
transforms are available yet
- * (incorrect usage)
- */
- public List<ITransform> findTransformInterfaces(String transformName) {
- if (transforms == null) {
- return null;
- }
-
- List<ITransform> list = new ArrayList<>();
-
- for (TransformMetaDataCombi sid : transforms) {
- ITransform iTransform = sid.transform;
- if (iTransform.getTransformName().equalsIgnoreCase(transformName)) {
- list.add(iTransform);
- }
- }
- return list;
- }
-
- /**
- * Find the data interface for the transform with the specified name.
- *
- * @param name the transform name
- * @return the transform data interface
- */
- public ITransformData findDataInterface(String name) {
- if (transforms == null) {
- return null;
- }
-
- for (TransformMetaDataCombi sid : transforms) {
- ITransform rt = sid.transform;
- if (rt.getTransformName().equalsIgnoreCase(name)) {
- return sid.data;
- }
- }
- return null;
- }
-
- /**
* Gets sortingTransformsTopologically
*
* @return value of sortingTransformsTopologically
@@ -1962,25 +1876,51 @@ public abstract class Pipeline
/**
* Find the ITransform (thread) by looking it up using the name.
*
- * @param transformName The name of the transform to look for
- * @param copy the copy number of the transform to look for
+ * @param name The name of the transform to look for
+ * @param copyNr The copy number of the transform to look for
* @return the ITransform or null if nothing was found.
*/
- public ITransform getTransformInterface(String transformName, int copy) {
+ public ITransform getTransform(String name, int copyNr) {
if (transforms == null) {
return null;
}
// Now start all the threads...
for (TransformMetaDataCombi sid : transforms) {
- if (sid.transformName.equalsIgnoreCase(transformName) && sid.copy ==
copy) {
- return sid.transform;
+ ITransform transform = sid.transform;
+ if (transform.getTransformName().equalsIgnoreCase(name) && sid.copy ==
copyNr) {
+ return transform;
}
}
return null;
}
+
+
+ /**
+ * Find the available executing transform copies for the transform with the
specified name
+ *
+ * @param name The transform name
+ * @return the list of executing transform copies found or null if no
transforms are available yet
+ * (incorrect usage)
+ */
+ public List<ITransform> getTransforms(String name) {
+ if (transforms == null) {
+ return null;
+ }
+
+ List<ITransform> list = new ArrayList<>();
+
+ for (TransformMetaDataCombi sid : transforms) {
+ ITransform transform = sid.transform;
+ if (transform.getTransformName().equalsIgnoreCase(name)) {
+ list.add(transform);
+ }
+ }
+ return list;
+ }
+
/**
* Turn on safe mode during running: the pipeline will run slower but with
more checking enabled.
*
@@ -2014,8 +1954,8 @@ public abstract class Pipeline
* @see Pipeline#prepareExecution()
*/
public RowProducer addRowProducer(String transformName, int copynr) throws
HopException {
- ITransform iTransform = getTransformInterface(transformName, copynr);
- if (iTransform == null) {
+ ITransform transform = getTransform(transformName, copynr);
+ if (transform == null) {
throw new HopException(
"Unable to find thread with name " + transformName + " and copy
number " + copynr);
}
@@ -2034,9 +1974,9 @@ public abstract class Pipeline
}
// Add this rowset to the list of active rowsets for the selected transform
- iTransform.addRowSetToInputRowSets(rowSet);
+ transform.addRowSetToInputRowSets(rowSet);
- return new RowProducer(iTransform, rowSet);
+ return new RowProducer(transform, rowSet);
}
/**
@@ -2062,17 +2002,18 @@ public abstract class Pipeline
/**
* Finds the ITransformData (currently) associated with the specified
transform.
*
- * @param transformName The name of the transform to look for
- * @param transformcopy The copy number (0 based) of the transform
+ * @param name The name of the transform to look for
+ * @param copyNr The copy number (0 based) of the transform
* @return The ITransformData or null if non found.
*/
- public ITransformData getTransformDataInterface(String transformName, int
transformcopy) {
+ public ITransformData getTransformData(String name, int copyNr) {
if (transforms == null) {
return null;
}
for (TransformMetaDataCombi sid : transforms) {
- if (sid.transformName.equals(transformName) && sid.copy ==
transformcopy) {
+ ITransform transform = sid.transform;
+ if (transform.getTransformName().equalsIgnoreCase(name) && sid.copy ==
copyNr) {
return sid.data;
}
}
@@ -3389,7 +3330,7 @@ public abstract class Pipeline
@Override
public String getComponentLogText(String componentName, int copyNr) {
- ITransform transform = findTransformInterface(componentName, copyNr);
+ ITransform transform = getTransform(componentName, copyNr);
if (transform == null) {
return null;
}
@@ -3416,7 +3357,7 @@ public abstract class Pipeline
@Override
public IEngineComponent findComponent(String name, int copyNr) {
- return findTransformInterface(name, copyNr);
+ return getTransform(name, copyNr);
}
@Override
@@ -3461,7 +3402,7 @@ public abstract class Pipeline
int nrRows,
IPipelineComponentRowsReceived rowsReceived)
throws HopException {
- ITransform iTransform = findTransformInterface(componentName, copyNr);
+ ITransform iTransform = getTransform(componentName, copyNr);
if (iTransform == null) {
throw new HopException(
"Unable to find transform '"
diff --git
a/engine/src/test/java/org/apache/hop/www/SniffTransformServletTest.java
b/engine/src/test/java/org/apache/hop/www/SniffTransformServletTest.java
index 653962b..ea3eb1f 100644
--- a/engine/src/test/java/org/apache/hop/www/SniffTransformServletTest.java
+++ b/engine/src/test/java/org/apache/hop/www/SniffTransformServletTest.java
@@ -89,9 +89,9 @@ public class SniffTransformServletTest {
HttpServletResponse mockHttpServletResponse =
mock(HttpServletResponse.class);
Pipeline mockPipeline = mock(Pipeline.class);
PipelineMeta mockPipelineMeta = mock(PipelineMeta.class);
- ITransform mockTransformInterface = mock(ITransform.class);
- List<ITransform> transformInterfaces = new ArrayList<>();
- transformInterfaces.add(mockTransformInterface);
+ ITransform mockTransform = mock(ITransform.class);
+ List<ITransform> transforms = new ArrayList<>();
+ transforms.add(mockTransform);
ILogChannel mockChannelInterface = mock(ILogChannel.class);
StringWriter out = new StringWriter();
PrintWriter printWriter = new PrintWriter(out);
@@ -106,8 +106,8 @@ public class SniffTransformServletTest {
when(mockPipeline.getLogChannelId()).thenReturn("test");
when(mockPipeline.getPipelineMeta()).thenReturn(mockPipelineMeta);
when(mockPipelineMeta.getMaximum()).thenReturn(new Point(10, 10));
- when(mockPipeline.findBaseTransforms(ServletTestUtils.BAD_STRING_TO_TEST))
- .thenReturn(transformInterfaces);
+ when(mockPipeline.getTransforms(ServletTestUtils.BAD_STRING_TO_TEST))
+ .thenReturn(transforms);
sniffTransformServlet.doGet(mockHttpServletRequest,
mockHttpServletResponse);
assertFalse(ServletTestUtils.hasBadText(ServletTestUtils.getInsideOfTag("H1",
out.toString())));
diff --git
a/plugins/transforms/mapping/src/main/java/org/apache/hop/pipeline/transforms/mapping/SimpleMapping.java
b/plugins/transforms/mapping/src/main/java/org/apache/hop/pipeline/transforms/mapping/SimpleMapping.java
index 591c8c9..eab1cfd 100644
---
a/plugins/transforms/mapping/src/main/java/org/apache/hop/pipeline/transforms/mapping/SimpleMapping.java
+++
b/plugins/transforms/mapping/src/main/java/org/apache/hop/pipeline/transforms/mapping/SimpleMapping.java
@@ -80,7 +80,7 @@ public class SimpleMapping extends
BaseTransform<SimpleMappingMeta, SimpleMappin
//
String mappingOutputTransformName =
data.mappingOutput.getTransformName();
ITransform iOutputTransform =
-
data.mappingPipeline.findTransformInterface(mappingOutputTransformName, 0);
+ data.mappingPipeline.getTransform(mappingOutputTransformName, 0);
RowOutputDataMapper outputDataMapper =
new RowOutputDataMapper(meta.getInputMapping(),
meta.getOutputMapping(), this::putRow);
iOutputTransform.addRowListener(outputDataMapper);
diff --git
a/plugins/transforms/mapping/src/test/java/org/apache/hop/pipeline/transforms/mapping/SimpleMappingTest.java
b/plugins/transforms/mapping/src/test/java/org/apache/hop/pipeline/transforms/mapping/SimpleMappingTest.java
index 741a845..2ea3ed8 100644
---
a/plugins/transforms/mapping/src/test/java/org/apache/hop/pipeline/transforms/mapping/SimpleMappingTest.java
+++
b/plugins/transforms/mapping/src/test/java/org/apache/hop/pipeline/transforms/mapping/SimpleMappingTest.java
@@ -89,7 +89,7 @@ public class SimpleMappingTest {
Mockito.doReturn(mpOutputMock)
.when(transformMockHelper.pipeline)
- .findTransformInterface(MAPPING_OUTPUT_TRANSFORM_NAME, 0);
+ .getTransform(MAPPING_OUTPUT_TRANSFORM_NAME, 0);
Mockito.doReturn(rProducerMock)
.when(transformMockHelper.pipeline)
.addRowProducer(MAPPING_INPUT_TRANSFORM_NAME, 0);
@@ -166,11 +166,11 @@ public class SimpleMappingTest {
when(rowProducer.putRow(any(IRowMeta.class), any(Object[].class),
anyBoolean()))
.thenReturn(true);
- ITransform iTransform = mock(ITransform.class);
+ ITransform transform = mock(ITransform.class);
Pipeline mappingPipeline = mock(Pipeline.class);
when(mappingPipeline.addRowProducer(anyString(),
anyInt())).thenReturn(rowProducer);
- when(mappingPipeline.findTransformInterface(anyString(),
anyInt())).thenReturn(iTransform);
+ when(mappingPipeline.getTransform(anyString(),
anyInt())).thenReturn(transform);
when(mappingPipeline.isFinishedOrStopped()).thenReturn(Boolean.FALSE).thenReturn(Boolean.TRUE);
transformMockHelper.iTransformData.mappingPipeline = mappingPipeline;
diff --git
a/plugins/transforms/metainject/src/main/java/org/apache/hop/pipeline/transforms/metainject/MetaInject.java
b/plugins/transforms/metainject/src/main/java/org/apache/hop/pipeline/transforms/metainject/MetaInject.java
index b635c0c..18a9915 100644
---
a/plugins/transforms/metainject/src/main/java/org/apache/hop/pipeline/transforms/metainject/MetaInject.java
+++
b/plugins/transforms/metainject/src/main/java/org/apache/hop/pipeline/transforms/metainject/MetaInject.java
@@ -167,7 +167,7 @@ public class MetaInject extends
BaseTransform<MetaInjectMeta, MetaInjectData>
if (!Utils.isEmpty(meta.getSourceTransformName())) {
ITransform transformInterface =
-
injectPipeline.getTransformInterface(meta.getSourceTransformName(), 0);
+ injectPipeline.getTransform(meta.getSourceTransformName(), 0);
if (transformInterface == null) {
throw new HopException(
"Unable to find transform '" + meta.getSourceTransformName() +
"' to read from.");
diff --git
a/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/PipelineTestFactory.java
b/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/PipelineTestFactory.java
index 4f97b7a..4e2c21a 100644
---
a/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/PipelineTestFactory.java
+++
b/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/PipelineTestFactory.java
@@ -152,7 +152,7 @@ public class PipelineTestFactory {
// Capture the rows that come out of the dummy transform...
//
- ITransform si = pipeline.getTransformInterface(dummyTransformName, 0);
+ ITransform si = pipeline.getTransform(dummyTransformName, 0);
RowTransformCollector dummyRc = new RowTransformCollector();
si.addRowListener(dummyRc);
@@ -216,16 +216,16 @@ public class PipelineTestFactory {
// Capture the rows that come out of the dummy transform...
//
- ITransform si = pipeline.getTransformInterface(dummyTransformName, 0);
+ ITransform si = pipeline.getTransform(dummyTransformName, 0);
RowTransformCollector dummyRc = new RowTransformCollector();
si.addRowListener(dummyRc);
- ITransform junit = pipeline.getTransformInterface(testTransformName, 0);
+ ITransform junit = pipeline.getTransform(testTransformName, 0);
RowTransformCollector dummyJu = new RowTransformCollector();
junit.addRowListener(dummyJu);
// add error handler
- ITransform er = pipeline.getTransformInterface(errorTransformName, 0);
+ ITransform er = pipeline.getTransform(errorTransformName, 0);
RowTransformCollector erColl = new RowTransformCollector();
er.addRowListener(erColl);
diff --git
a/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXMLDataTest.java
b/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXMLDataTest.java
index cdf276a..609ac44 100644
---
a/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXMLDataTest.java
+++
b/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXMLDataTest.java
@@ -322,7 +322,7 @@ public class GetXMLDataTest extends TestCase {
pipeline.prepareExecution();
- ITransform si = pipeline.getTransformInterface(dummyTransformName1, 0);
+ ITransform si = pipeline.getTransform(dummyTransformName1, 0);
RowTransformCollector dummyRc1 = new RowTransformCollector();
si.addRowListener(dummyRc1);
@@ -426,7 +426,7 @@ public class GetXMLDataTest extends TestCase {
pipeline.prepareExecution();
- ITransform si = pipeline.getTransformInterface(dummyTransformName1, 0);
+ ITransform si = pipeline.getTransform(dummyTransformName1, 0);
RowTransformCollector dummyRc1 = new RowTransformCollector();
si.addRowListener(dummyRc1);
diff --git
a/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/xslt/XsltTest.java
b/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/xslt/XsltTest.java
index c08f2a2..78bea0c 100644
---
a/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/xslt/XsltTest.java
+++
b/plugins/transforms/xml/src/test/java/org/apache/hop/pipeline/transforms/xml/xslt/XsltTest.java
@@ -353,7 +353,7 @@ public class XsltTest extends TestCase {
pipeline.prepareExecution();
- ITransform si = pipeline.getTransformInterface(dummyTransformName1, 0);
+ ITransform si = pipeline.getTransform(dummyTransformName1, 0);
RowTransformCollector dummyRc1 = new RowTransformCollector();
si.addRowListener(dummyRc1);
