diff --git a/core/src/main/java/org/apache/hop/metadata/api/HopMetadataPropertyType.java b/core/src/main/java/org/apache/hop/metadata/api/HopMetadataPropertyType.java index 4291e1e7271..5ac20530ae5 100644 --- a/core/src/main/java/org/apache/hop/metadata/api/HopMetadataPropertyType.java +++ b/core/src/main/java/org/apache/hop/metadata/api/HopMetadataPropertyType.java @@ -22,6 +22,7 @@ public enum HopMetadataPropertyType { NONE, // MISC + HOP_FILE, EXEC_INFO_LOCATION, EXEC_INFO_DATA_PROFILE, PARTITION_SCHEMA, @@ -30,6 +31,7 @@ public enum HopMetadataPropertyType { SPLUNK_CONNECTION, // PIPELINE + PIPELINE_FILE, PIPELINE_RUN_CONFIG, PIPELINE_LOG, PIPELINE_PROBE, @@ -40,6 +42,7 @@ public enum HopMetadataPropertyType { BEAM_FILE_DEFINITION, // WORKFLOW + WORKFLOW_FILE, WORKFLOW_RUN_CONFIG, WORKFLOW_LOG, diff --git a/engine/src/main/java/org/apache/hop/core/annotations/ActionTransformType.java b/engine/src/main/java/org/apache/hop/core/annotations/ActionTransformType.java index dfa3fd43230..5316f4c0572 100644 --- a/engine/src/main/java/org/apache/hop/core/annotations/ActionTransformType.java +++ b/engine/src/main/java/org/apache/hop/core/annotations/ActionTransformType.java @@ -28,5 +28,9 @@ public enum ActionTransformType { FILE, RDBMS, GRAPH, - NOSQL + NOSQL, + + HOP_FILE, + HOP_PIPELINE, + HOP_WORKFLOW } diff --git a/plugins/actions/pipeline/src/main/java/org/apache/hop/workflow/actions/pipeline/ActionPipeline.java b/plugins/actions/pipeline/src/main/java/org/apache/hop/workflow/actions/pipeline/ActionPipeline.java index f2a8f06806a..c35c2489a28 100644 --- a/plugins/actions/pipeline/src/main/java/org/apache/hop/workflow/actions/pipeline/ActionPipeline.java +++ b/plugins/actions/pipeline/src/main/java/org/apache/hop/workflow/actions/pipeline/ActionPipeline.java @@ -30,6 +30,7 @@ import org.apache.hop.core.RowMetaAndData; import org.apache.hop.core.SqlStatement; import org.apache.hop.core.annotations.Action; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.exception.HopException; import org.apache.hop.core.file.IHasFilename; import org.apache.hop.core.logging.LogChannelFileWriter; @@ -70,7 +71,8 @@ description = "i18n::ActionPipeline.Description", categoryDescription = "i18n:org.apache.hop.workflow:ActionCategory.Category.General", keywords = "i18n::ActionPipeline.keyword", - documentationUrl = "/workflow/actions/pipeline.html") + documentationUrl = "/workflow/actions/pipeline.html", + actionTransformTypes = {ActionTransformType.HOP_FILE, ActionTransformType.HOP_PIPELINE}) public class ActionPipeline extends ActionBase implements Cloneable, IAction { private static final Class PKG = ActionPipeline.class; diff --git a/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/Repeat.java b/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/Repeat.java index f7d4cf4d152..4e52731be2f 100644 --- a/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/Repeat.java +++ b/plugins/actions/repeat/src/main/java/org/apache/hop/workflow/actions/repeat/Repeat.java @@ -31,6 +31,7 @@ import org.apache.hop.core.Const; import org.apache.hop.core.Result; import org.apache.hop.core.annotations.Action; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.exception.HopException; import org.apache.hop.core.file.IHasFilename; import org.apache.hop.core.logging.ILoggingObject; @@ -42,6 +43,7 @@ import org.apache.hop.core.vfs.HopVfs; import org.apache.hop.core.xml.XmlHandler; import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.HopMetadataPropertyType; import org.apache.hop.metadata.api.IHopMetadataProvider; import org.apache.hop.pipeline.PipelineMeta; import org.apache.hop.pipeline.engine.IPipelineEngine; @@ -63,14 +65,19 @@ categoryDescription = "i18n:org.apache.hop.workflow:ActionCategory.Category.General", keywords = "i18n::Repeat.keywords", image = "repeat.svg", - documentationUrl = "/workflow/actions/repeat.html") + documentationUrl = "/workflow/actions/repeat.html", + actionTransformTypes = { + ActionTransformType.HOP_FILE, + ActionTransformType.HOP_PIPELINE, + ActionTransformType.HOP_WORKFLOW + }) @Getter @Setter public class Repeat extends ActionBase implements IAction, Cloneable { public static final String REPEAT_END_LOOP = "_REPEAT_END_LOOP_"; - @HopMetadataProperty(key = "filename") + @HopMetadataProperty(key = "filename", hopMetadataPropertyType = HopMetadataPropertyType.HOP_FILE) private String filename; @HopMetadataProperty(key = "parameter", groupKey = "parameters") diff --git a/plugins/actions/workflow/src/main/java/org/apache/hop/workflow/actions/workflow/ActionWorkflow.java b/plugins/actions/workflow/src/main/java/org/apache/hop/workflow/actions/workflow/ActionWorkflow.java index c7121c8ca1e..f1fd2c14b0f 100644 --- a/plugins/actions/workflow/src/main/java/org/apache/hop/workflow/actions/workflow/ActionWorkflow.java +++ b/plugins/actions/workflow/src/main/java/org/apache/hop/workflow/actions/workflow/ActionWorkflow.java @@ -31,6 +31,7 @@ import org.apache.hop.core.RowMetaAndData; import org.apache.hop.core.SqlStatement; import org.apache.hop.core.annotations.Action; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.exception.HopException; import org.apache.hop.core.file.IHasFilename; import org.apache.hop.core.logging.LogChannelFileWriter; @@ -44,6 +45,7 @@ import org.apache.hop.core.vfs.HopVfs; import org.apache.hop.i18n.BaseMessages; import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.HopMetadataPropertyType; import org.apache.hop.metadata.api.IHopMetadataProvider; import org.apache.hop.resource.IResourceNaming; import org.apache.hop.resource.ResourceDefinition; @@ -70,7 +72,8 @@ description = "i18n::ActionWorkflow.Description", categoryDescription = "i18n:org.apache.hop.workflow:ActionCategory.Category.General", keywords = "i18n::ActionWorkflow.keyword", - documentationUrl = "/workflow/actions/workflow.html") + documentationUrl = "/workflow/actions/workflow.html", + actionTransformTypes = {ActionTransformType.HOP_FILE, ActionTransformType.HOP_WORKFLOW}) public class ActionWorkflow extends ActionBase implements Cloneable, IAction { private static final Class PKG = ActionWorkflow.class; @@ -134,7 +137,9 @@ public void setField(String field) { } } - @HopMetadataProperty(key = "filename") + @HopMetadataProperty( + key = "filename", + hopMetadataPropertyType = HopMetadataPropertyType.WORKFLOW_FILE) private String filename; @HopMetadataProperty(key = "params_from_previous") diff --git a/plugins/transforms/columnexists/src/main/java/org/apache/hop/pipeline/transforms/columnexists/ColumnExistsMeta.java b/plugins/transforms/columnexists/src/main/java/org/apache/hop/pipeline/transforms/columnexists/ColumnExistsMeta.java index 08727b953ca..f5fc6defc3d 100644 --- a/plugins/transforms/columnexists/src/main/java/org/apache/hop/pipeline/transforms/columnexists/ColumnExistsMeta.java +++ b/plugins/transforms/columnexists/src/main/java/org/apache/hop/pipeline/transforms/columnexists/ColumnExistsMeta.java @@ -20,6 +20,7 @@ import java.util.List; import org.apache.hop.core.CheckResult; import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.exception.HopTransformException; import org.apache.hop.core.row.IRowMeta; @@ -29,6 +30,7 @@ import org.apache.hop.core.variables.IVariables; import org.apache.hop.i18n.BaseMessages; import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.HopMetadataPropertyType; import org.apache.hop.metadata.api.IHopMetadataProvider; import org.apache.hop.pipeline.PipelineMeta; import org.apache.hop.pipeline.transform.BaseTransformMeta; @@ -41,7 +43,8 @@ description = "i18n::ColumnExists.Description", categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Lookup", keywords = "i18n::ColumnExistsMeta.keyword", - documentationUrl = "/pipeline/transforms/columnexists.html") + documentationUrl = "/pipeline/transforms/columnexists.html", + actionTransformTypes = {ActionTransformType.RDBMS}) public class ColumnExistsMeta extends BaseTransformMeta { private static final Class PKG = ColumnExistsMeta.class; @@ -49,29 +52,34 @@ public class ColumnExistsMeta extends BaseTransformMeta { private static final Class PKG = DBProcMeta.class; /** database connection */ - @HopMetadataProperty(key = "connection") + @HopMetadataProperty( + key = "connection", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_CONNECTION) private String connection; /** procedure name to be called */ 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 3b5e524429d..163fc43314c 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 @@ -26,6 +26,7 @@ import org.apache.hop.core.Const; import org.apache.hop.core.ICheckResult; import org.apache.hop.core.SqlStatement; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.database.Database; import org.apache.hop.core.database.DatabaseMeta; @@ -42,6 +43,7 @@ import org.apache.hop.core.variables.IVariables; import org.apache.hop.i18n.BaseMessages; import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.HopMetadataPropertyType; import org.apache.hop.metadata.api.IEnumHasCode; import org.apache.hop.metadata.api.IEnumHasCodeAndDescription; import org.apache.hop.metadata.api.IHopMetadataProvider; @@ -58,7 +60,8 @@ categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.DataWarehouse", keywords = "i18n::DimensionLookupMeta.keyword", - documentationUrl = "/pipeline/transforms/dimensionlookup.html") + documentationUrl = "/pipeline/transforms/dimensionlookup.html", + actionTransformTypes = {ActionTransformType.RDBMS, ActionTransformType.LOOKUP}) public class DimensionLookupMeta extends BaseTransformMeta { private static final Class PKG = DimensionLookupMeta.class; public static final String CONST_DIMENSION_LOOKUP_META_CHECK_RESULT_KEY_HAS_PROBLEM = @@ -69,21 +72,24 @@ public class DimensionLookupMeta extends BaseTransformMeta { private static final Class PKG = DynamicSqlRowMeta.class; /** database connection */ @HopMetadataProperty( key = "connection", - injectionKeyDescription = "DynamicSQLRow.Injection.Connection") + injectionKeyDescription = "DynamicSQLRow.Injection.Connection", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_CONNECTION) private String connection; private DatabaseMeta databaseMeta; /** SQL Statement */ - @HopMetadataProperty(key = "sql", injectionKeyDescription = "DynamicSQLRow.Injection.Sql") + @HopMetadataProperty( + key = "sql", + injectionKeyDescription = "DynamicSQLRow.Injection.Sql", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_SQL) private String sql; @HopMetadataProperty( key = "sql_fieldname", - injectionKeyDescription = "DynamicSQLRow.Injection.SqlFieldName") + injectionKeyDescription = "DynamicSQLRow.Injection.SqlFieldName", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_SQL) private String sqlFieldName; /** Number of rows to return (0=ALL) */ 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 3a06c382499..a5ad7e91756 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 @@ -22,6 +22,7 @@ import org.apache.hop.core.ICheckResult; import org.apache.hop.core.Result; import org.apache.hop.core.RowMetaAndData; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.database.Database; import org.apache.hop.core.database.DatabaseMeta; @@ -31,6 +32,7 @@ import org.apache.hop.core.variables.IVariables; import org.apache.hop.i18n.BaseMessages; import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.HopMetadataPropertyType; import org.apache.hop.metadata.api.IHopMetadataProvider; import org.apache.hop.pipeline.PipelineMeta; import org.apache.hop.pipeline.transform.BaseTransformMeta; @@ -43,7 +45,8 @@ description = "i18n::ExecSqlRow.Description", categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Scripting", keywords = "i18n::ExecSqlRowMeta.keyword", - documentationUrl = "/pipeline/transforms/execsqlrow.html") + documentationUrl = "/pipeline/transforms/execsqlrow.html", + actionTransformTypes = {ActionTransformType.RDBMS}) public class ExecSqlRowMeta extends BaseTransformMeta { private static final Class PKG = ExecSqlRowMeta.class; @@ -52,7 +55,8 @@ public class ExecSqlRowMeta extends BaseTransformMeta, BETWEEN, ... */ diff --git a/plugins/transforms/insertupdate/src/main/java/org/apache/hop/pipeline/transforms/insertupdate/InsertUpdateLookupField.java b/plugins/transforms/insertupdate/src/main/java/org/apache/hop/pipeline/transforms/insertupdate/InsertUpdateLookupField.java index fcdd416a313..2d2b8b76d5b 100644 --- a/plugins/transforms/insertupdate/src/main/java/org/apache/hop/pipeline/transforms/insertupdate/InsertUpdateLookupField.java +++ b/plugins/transforms/insertupdate/src/main/java/org/apache/hop/pipeline/transforms/insertupdate/InsertUpdateLookupField.java @@ -21,6 +21,7 @@ import java.util.List; import org.apache.hop.i18n.BaseMessages; import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.HopMetadataPropertyType; public class InsertUpdateLookupField { @@ -46,14 +47,16 @@ public class InsertUpdateLookupField { @HopMetadataProperty( key = "schema", injectionKeyDescription = "InsertUpdateMeta.Injection.SCHEMA_NAME", - injectionKey = "SCHEMA_NAME") + injectionKey = "SCHEMA_NAME", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_SCHEMA) private String schemaName; /** The lookup table name */ @HopMetadataProperty( key = "table", injectionKeyDescription = "InsertUpdateMeta.Injection.TABLE_NAME", - injectionKey = "TABLE_NAME") + injectionKey = "TABLE_NAME", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_TABLE) private String tableName; public InsertUpdateLookupField() { diff --git a/plugins/transforms/kafka/src/main/java/org/apache/hop/pipeline/transforms/kafka/consumer/KafkaConsumerInputMeta.java b/plugins/transforms/kafka/src/main/java/org/apache/hop/pipeline/transforms/kafka/consumer/KafkaConsumerInputMeta.java index 5db8fb94729..f9cb9c27892 100644 --- a/plugins/transforms/kafka/src/main/java/org/apache/hop/pipeline/transforms/kafka/consumer/KafkaConsumerInputMeta.java +++ b/plugins/transforms/kafka/src/main/java/org/apache/hop/pipeline/transforms/kafka/consumer/KafkaConsumerInputMeta.java @@ -30,6 +30,7 @@ import org.apache.hop.core.CheckResult; import org.apache.hop.core.Const; import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.exception.HopException; import org.apache.hop.core.exception.HopTransformException; @@ -61,7 +62,8 @@ description = "i18n::KafkaConsumer.TypeTooltipDesc", categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Streaming", keywords = "i18n::KafkaConsumerInputMeta.keyword", - documentationUrl = "/pipeline/transforms/kafkaconsumer.html") + documentationUrl = "/pipeline/transforms/kafkaconsumer.html", + actionTransformTypes = {ActionTransformType.HOP_FILE, ActionTransformType.HOP_PIPELINE}) @InjectionSupported( localizationPrefix = "KafkaConsumerInputMeta.Injection.", groups = {"CONFIGURATION_PROPERTIES"}) diff --git a/plugins/transforms/mapping/src/main/java/org/apache/hop/pipeline/transforms/mapping/SimpleMappingMeta.java b/plugins/transforms/mapping/src/main/java/org/apache/hop/pipeline/transforms/mapping/SimpleMappingMeta.java index 661788c5d9c..6466d3bbe22 100644 --- a/plugins/transforms/mapping/src/main/java/org/apache/hop/pipeline/transforms/mapping/SimpleMappingMeta.java +++ b/plugins/transforms/mapping/src/main/java/org/apache/hop/pipeline/transforms/mapping/SimpleMappingMeta.java @@ -22,6 +22,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.hop.core.CheckResult; import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.exception.HopException; import org.apache.hop.core.exception.HopTransformException; @@ -52,7 +53,8 @@ image = "MAP.svg", categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Mapping", keywords = "i18n::SimpleMappingMeta.keyword", - documentationUrl = "/pipeline/transforms/simple-mapping.html") + documentationUrl = "/pipeline/transforms/simple-mapping.html", + actionTransformTypes = {ActionTransformType.HOP_FILE, ActionTransformType.HOP_PIPELINE}) public class SimpleMappingMeta extends TransformWithMappingMeta implements ISubPipelineAwareMeta { diff --git a/plugins/transforms/metainject/src/main/java/org/apache/hop/pipeline/transforms/metainject/MetaInjectMeta.java b/plugins/transforms/metainject/src/main/java/org/apache/hop/pipeline/transforms/metainject/MetaInjectMeta.java index 69eb5fae383..70adbc77564 100644 --- a/plugins/transforms/metainject/src/main/java/org/apache/hop/pipeline/transforms/metainject/MetaInjectMeta.java +++ b/plugins/transforms/metainject/src/main/java/org/apache/hop/pipeline/transforms/metainject/MetaInjectMeta.java @@ -23,6 +23,7 @@ import java.util.Map; import java.util.Map.Entry; import org.apache.hop.core.Const; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.exception.HopException; import org.apache.hop.core.exception.HopPluginException; @@ -60,7 +61,8 @@ description = "i18n::MetaInject.Description", categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Transform", keywords = "i18n::MetaInjectMeta.keyword", - documentationUrl = "/pipeline/transforms/metainject.html") + documentationUrl = "/pipeline/transforms/metainject.html", + actionTransformTypes = {ActionTransformType.HOP_FILE, ActionTransformType.HOP_PIPELINE}) @InjectionSupported( localizationPrefix = "MetaInject.Injection.", groups = {"SOURCE_OUTPUT_FIELDS", "MAPPING_FIELDS"}) 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 7c16835181d..51e800246ad 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 @@ -21,6 +21,7 @@ import org.apache.hop.core.Const; import org.apache.hop.core.ICheckResult; import org.apache.hop.core.SqlStatement; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.database.Database; import org.apache.hop.core.database.DatabaseMeta; @@ -53,7 +54,8 @@ keywords = "i18n::MonetDbBulkLoaderMeta.keyword", categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Bulk", isIncludeJdbcDrivers = true, - classLoaderGroup = "monetdb") + classLoaderGroup = "monetdb", + actionTransformTypes = {ActionTransformType.RDBMS, ActionTransformType.OUTPUT}) @InjectionSupported(localizationPrefix = "MonetDBBulkLoaderDialog.Injection.") public class MonetDbBulkLoaderMeta extends BaseTransformMeta { diff --git a/plugins/transforms/orabulkloader/src/main/java/org/apache/hop/pipeline/transforms/orabulkloader/OraBulkLoaderMeta.java b/plugins/transforms/orabulkloader/src/main/java/org/apache/hop/pipeline/transforms/orabulkloader/OraBulkLoaderMeta.java index d1656236830..070d8fb0656 100644 --- a/plugins/transforms/orabulkloader/src/main/java/org/apache/hop/pipeline/transforms/orabulkloader/OraBulkLoaderMeta.java +++ b/plugins/transforms/orabulkloader/src/main/java/org/apache/hop/pipeline/transforms/orabulkloader/OraBulkLoaderMeta.java @@ -22,6 +22,7 @@ import org.apache.hop.core.Const; import org.apache.hop.core.ICheckResult; import org.apache.hop.core.SqlStatement; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.database.Database; import org.apache.hop.core.database.DatabaseMeta; @@ -34,6 +35,7 @@ import org.apache.hop.core.variables.IVariables; import org.apache.hop.i18n.BaseMessages; import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.HopMetadataPropertyType; import org.apache.hop.metadata.api.IHopMetadataProvider; import org.apache.hop.pipeline.DatabaseImpact; import org.apache.hop.pipeline.PipelineMeta; @@ -47,7 +49,8 @@ name = "i18n::OraBulkLoader.Name", categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Bulk", keywords = "i18n::OraBulkLoader.Keywords", - documentationUrl = "/pipeline/transforms/orabulkloader.html") + documentationUrl = "/pipeline/transforms/orabulkloader.html", + actionTransformTypes = {ActionTransformType.RDBMS, ActionTransformType.OUTPUT}) public class OraBulkLoaderMeta extends BaseTransformMeta { private static final Class PKG = OraBulkLoaderMeta.class; // for i18n purposes, needed by Translator2!! @@ -60,21 +63,24 @@ public class OraBulkLoaderMeta extends BaseTransformMeta PKG = PGBulkLoaderMeta.class; @@ -26,7 +27,8 @@ public class PGBulkLoaderMappingMeta { /** Field value to dateMask after lookup */ @HopMetadataProperty( key = "stream_name", - injectionKeyDescription = "PGBulkLoader.Injection.StreamName.Label") + injectionKeyDescription = "PGBulkLoader.Injection.StreamName.Label", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_COLUMN) private String fieldTable; /** Field name in the stream */ 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 ee807450b46..a443def01fd 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 @@ -23,6 +23,7 @@ import org.apache.hop.core.Const; import org.apache.hop.core.ICheckResult; import org.apache.hop.core.SqlStatement; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.database.Database; import org.apache.hop.core.database.DatabaseMeta; @@ -35,6 +36,7 @@ import org.apache.hop.core.variables.IVariables; import org.apache.hop.i18n.BaseMessages; import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.HopMetadataPropertyType; import org.apache.hop.metadata.api.IHopMetadataProvider; import org.apache.hop.pipeline.DatabaseImpact; import org.apache.hop.pipeline.PipelineMeta; @@ -50,7 +52,8 @@ keywords = "i18n::PGBulkLoaderMeta.keyword", documentationUrl = "/pipeline/transforms/postgresbulkloader.html", classLoaderGroup = "postgres-db", - isIncludeJdbcDrivers = true) + isIncludeJdbcDrivers = true, + actionTransformTypes = {ActionTransformType.RDBMS, ActionTransformType.OUTPUT}) public class PGBulkLoaderMeta extends BaseTransformMeta { private static final Class PKG = PGBulkLoaderMeta.class; @@ -58,19 +61,22 @@ public class PGBulkLoaderMeta extends BaseTransformMeta implements ISubPipelineAwareMeta { diff --git a/plugins/transforms/snowflake/src/main/java/org/apache/hop/pipeline/transforms/snowflake/bulkloader/SnowflakeBulkLoaderField.java b/plugins/transforms/snowflake/src/main/java/org/apache/hop/pipeline/transforms/snowflake/bulkloader/SnowflakeBulkLoaderField.java index 05aed45729c..aab9c6ca414 100644 --- a/plugins/transforms/snowflake/src/main/java/org/apache/hop/pipeline/transforms/snowflake/bulkloader/SnowflakeBulkLoaderField.java +++ b/plugins/transforms/snowflake/src/main/java/org/apache/hop/pipeline/transforms/snowflake/bulkloader/SnowflakeBulkLoaderField.java @@ -19,6 +19,7 @@ import org.apache.hop.core.exception.HopException; import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.HopMetadataPropertyType; /** Describes a single field mapping from the Hop stream to the Snowflake table */ public class SnowflakeBulkLoaderField implements Cloneable { @@ -28,7 +29,10 @@ public class SnowflakeBulkLoaderField implements Cloneable { private String streamField; /** The field name on the table */ - @HopMetadataProperty(key = "table_field", injectionGroupKey = "OUTPUT_FIELDS") + @HopMetadataProperty( + key = "table_field", + injectionGroupKey = "OUTPUT_FIELDS", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_COLUMN) private String tableField; /** diff --git a/plugins/transforms/snowflake/src/main/java/org/apache/hop/pipeline/transforms/snowflake/bulkloader/SnowflakeBulkLoaderMeta.java b/plugins/transforms/snowflake/src/main/java/org/apache/hop/pipeline/transforms/snowflake/bulkloader/SnowflakeBulkLoaderMeta.java index c3beba7d746..b6a188cd3be 100644 --- a/plugins/transforms/snowflake/src/main/java/org/apache/hop/pipeline/transforms/snowflake/bulkloader/SnowflakeBulkLoaderMeta.java +++ b/plugins/transforms/snowflake/src/main/java/org/apache/hop/pipeline/transforms/snowflake/bulkloader/SnowflakeBulkLoaderMeta.java @@ -26,6 +26,7 @@ import org.apache.hop.core.Const; import org.apache.hop.core.ICheckResult; import org.apache.hop.core.SqlStatement; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.database.Database; import org.apache.hop.core.database.DatabaseMeta; @@ -39,6 +40,7 @@ import org.apache.hop.core.vfs.HopVfs; import org.apache.hop.i18n.BaseMessages; import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.HopMetadataPropertyType; import org.apache.hop.metadata.api.IHopMetadataProvider; import org.apache.hop.pipeline.PipelineMeta; import org.apache.hop.pipeline.transform.BaseTransformMeta; @@ -54,7 +56,8 @@ documentationUrl = "/pipeline/transforms/snowflakebulkloader.html", keywords = "i18n::SnowflakeBulkLoader.Keyword", classLoaderGroup = "snowflake", - isIncludeJdbcDrivers = true) + isIncludeJdbcDrivers = true, + actionTransformTypes = {ActionTransformType.RDBMS, ActionTransformType.OUTPUT}) public class SnowflakeBulkLoaderMeta extends BaseTransformMeta { @@ -100,15 +103,24 @@ public class SnowflakeBulkLoaderMeta private String fileDate; /** The database connection to use */ - @HopMetadataProperty(key = "connection", injectionKeyDescription = "") + @HopMetadataProperty( + key = "connection", + injectionKeyDescription = "", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_CONNECTION) private String connection; /** The schema to use */ - @HopMetadataProperty(key = "target_schema", injectionKeyDescription = "") + @HopMetadataProperty( + key = "target_schema", + injectionKeyDescription = "", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_SCHEMA) private String targetSchema; /** The table to load */ - @HopMetadataProperty(key = "target_table", injectionKeyDescription = "") + @HopMetadataProperty( + key = "target_table", + injectionKeyDescription = "", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_TABLE) private String targetTable; /** The location type (user, table, internal_stage) */ 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 5aadcdb1086..7a87f97f122 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 @@ -20,6 +20,7 @@ import java.util.List; import org.apache.hop.core.CheckResult; import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.exception.HopTransformException; import org.apache.hop.core.row.IRowMeta; @@ -29,6 +30,7 @@ import org.apache.hop.core.variables.IVariables; import org.apache.hop.i18n.BaseMessages; import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.HopMetadataPropertyType; import org.apache.hop.metadata.api.IHopMetadataProvider; import org.apache.hop.pipeline.PipelineMeta; import org.apache.hop.pipeline.transform.BaseTransformMeta; @@ -41,38 +43,45 @@ name = "i18n::BaseTransform.TypeLongDesc.TableCompare", categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Flow", keywords = "i18n::TableCompareMeta.keyword", - documentationUrl = "/pipeline/transforms/tablecompare.html") + documentationUrl = "/pipeline/transforms/tablecompare.html", + actionTransformTypes = {ActionTransformType.RDBMS}) public class TableCompareMeta extends BaseTransformMeta { private static final Class PKG = TableCompare.class; @HopMetadataProperty( key = "reference_connection", - injectionKeyDescription = "TableCompareMeta.Injection.ReferenceConnection") + injectionKeyDescription = "TableCompareMeta.Injection.ReferenceConnection", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_CONNECTION) private String referenceConnection; @HopMetadataProperty( key = "reference_schema_field", - injectionKeyDescription = "TableCompareMeta.Injection.ReferenceSchemaField") + injectionKeyDescription = "TableCompareMeta.Injection.ReferenceSchemaField", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_SCHEMA) private String referenceSchemaField; @HopMetadataProperty( key = "reference_table_field", - injectionKeyDescription = "TableCompareMeta.Injection.ReferenceTableField") + injectionKeyDescription = "TableCompareMeta.Injection.ReferenceTableField", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_TABLE) private String referenceTableField; @HopMetadataProperty( key = "compare_connection", - injectionKeyDescription = "TableCompareMeta.Injection.CompareConnection") + injectionKeyDescription = "TableCompareMeta.Injection.CompareConnection", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_CONNECTION) private String compareConnection; @HopMetadataProperty( key = "compare_schema_field", - injectionKeyDescription = "TableCompareMeta.Injection.CompareSchemaField") + injectionKeyDescription = "TableCompareMeta.Injection.CompareSchemaField", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_SCHEMA) private String compareSchemaField; @HopMetadataProperty( key = "compare_table_field", - injectionKeyDescription = "TableCompareMeta.Injection.CompareTableField") + injectionKeyDescription = "TableCompareMeta.Injection.CompareTableField", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_TABLE) private String compareTableField; @HopMetadataProperty( 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 63665c4dcde..2e7a33a6508 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 @@ -20,6 +20,7 @@ import java.util.List; import org.apache.hop.core.CheckResult; import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.database.Database; import org.apache.hop.core.database.DatabaseMeta; @@ -32,6 +33,7 @@ import org.apache.hop.core.variables.IVariables; import org.apache.hop.i18n.BaseMessages; import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.HopMetadataPropertyType; import org.apache.hop.metadata.api.IHopMetadataProvider; import org.apache.hop.pipeline.PipelineMeta; import org.apache.hop.pipeline.transform.BaseTransformMeta; @@ -44,18 +46,22 @@ description = "i18n::TableExists.Description", categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Lookup", keywords = "i18n::TableExistsMeta.keyword", - documentationUrl = "/pipeline/transforms/tableexists.html") + documentationUrl = "/pipeline/transforms/tableexists.html", + actionTransformTypes = {ActionTransformType.RDBMS}) public class TableExistsMeta extends BaseTransformMeta { private static final Class PKG = TableExistsMeta.class; /** database connection */ - @HopMetadataProperty(injectionKeyDescription = "TableExistsMeta.Injection.Connection") + @HopMetadataProperty( + injectionKeyDescription = "TableExistsMeta.Injection.Connection", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_CONNECTION) private String connection; /** dynamic tablename */ @HopMetadataProperty( key = "tablenamefield", - injectionKeyDescription = "TableExistsMeta.Injection.TableNameField") + injectionKeyDescription = "TableExistsMeta.Injection.TableNameField", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_TABLE) private String tableNameField; /** function result: new value name */ @@ -66,7 +72,8 @@ public class TableExistsMeta extends BaseTransformMeta { public static final PluginMessages MESSAGES = PluginMessages.getMessages(TeraFastMeta.class); diff --git a/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderField.java b/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderField.java index 1368fe9a317..32e6f38c12f 100644 --- a/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderField.java +++ b/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderField.java @@ -19,6 +19,7 @@ import java.util.Objects; import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.HopMetadataPropertyType; public class VerticaBulkLoaderField { @@ -38,7 +39,8 @@ public VerticaBulkLoaderField(String fieldDatabase, String fieldStream) { @HopMetadataProperty( key = "column_name", injectionKey = "DATABASE_FIELDNAME", - injectionKeyDescription = "VerticaBulkLoader.Inject.FIELDDATABASE") + injectionKeyDescription = "VerticaBulkLoader.Inject.FIELDDATABASE", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_COLUMN) private String fieldDatabase; public String getFieldStream() { diff --git a/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderMeta.java b/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderMeta.java index 9604077f980..26122b7f573 100644 --- a/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderMeta.java +++ b/plugins/transforms/verticabulkloader/src/main/java/org/apache/hop/pipeline/transforms/vertica/bulkloader/VerticaBulkLoaderMeta.java @@ -23,6 +23,7 @@ import org.apache.hop.core.Const; import org.apache.hop.core.ICheckResult; import org.apache.hop.core.SqlStatement; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.database.Database; import org.apache.hop.core.database.DatabaseMeta; @@ -35,6 +36,7 @@ import org.apache.hop.core.variables.IVariables; import org.apache.hop.i18n.BaseMessages; import org.apache.hop.metadata.api.HopMetadataProperty; +import org.apache.hop.metadata.api.HopMetadataPropertyType; import org.apache.hop.metadata.api.IHopMetadataProvider; import org.apache.hop.pipeline.DatabaseImpact; import org.apache.hop.pipeline.PipelineMeta; @@ -49,7 +51,8 @@ categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Bulk", documentationUrl = "pipeline/transforms/verticabulkloader.html", isIncludeJdbcDrivers = true, - classLoaderGroup = "vertica5") + classLoaderGroup = "vertica5", + actionTransformTypes = {ActionTransformType.RDBMS, ActionTransformType.OUTPUT}) public class VerticaBulkLoaderMeta extends BaseTransformMeta { private static final Class PKG = VerticaBulkLoaderMeta.class; @@ -57,25 +60,29 @@ public class VerticaBulkLoaderMeta @HopMetadataProperty( key = "connection", injectionKey = "CONNECTIONNAME", - injectionKeyDescription = "VerticaBulkLoader.Injection.CONNECTIONNAME") + injectionKeyDescription = "VerticaBulkLoader.Injection.CONNECTIONNAME", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_CONNECTION) private String connection; @HopMetadataProperty( key = "schema", injectionKey = "SCHEMANAME", - injectionKeyDescription = "VerticaBulkLoader.Injection.SCHEMANAME") + injectionKeyDescription = "VerticaBulkLoader.Injection.SCHEMANAME", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_SCHEMA) private String schemaName; @HopMetadataProperty( key = "table", injectionKey = "TABLENAME", - injectionKeyDescription = "VerticaBulkLoader.Injection.TABLENAME") + injectionKeyDescription = "VerticaBulkLoader.Injection.TABLENAME", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_TABLE) private String tablename; @HopMetadataProperty( key = "truncate", injectionKey = "TRUNCATE_TABLE", - injectionKeyDescription = "VerticaBulkLoader.Injection.TruncateTable.Field") + injectionKeyDescription = "VerticaBulkLoader.Injection.TruncateTable.Field", + hopMetadataPropertyType = HopMetadataPropertyType.RDBMS_TRUNCATE) private boolean truncateTable; @HopMetadataProperty( diff --git a/plugins/transforms/workflowexecutor/src/main/java/org/apache/hop/pipeline/transforms/workflowexecutor/WorkflowExecutorMeta.java b/plugins/transforms/workflowexecutor/src/main/java/org/apache/hop/pipeline/transforms/workflowexecutor/WorkflowExecutorMeta.java index b428aae1e14..0eed83fb4d7 100644 --- a/plugins/transforms/workflowexecutor/src/main/java/org/apache/hop/pipeline/transforms/workflowexecutor/WorkflowExecutorMeta.java +++ b/plugins/transforms/workflowexecutor/src/main/java/org/apache/hop/pipeline/transforms/workflowexecutor/WorkflowExecutorMeta.java @@ -24,6 +24,7 @@ import org.apache.hop.core.CheckResult; import org.apache.hop.core.Const; import org.apache.hop.core.ICheckResult; +import org.apache.hop.core.annotations.ActionTransformType; import org.apache.hop.core.annotations.Transform; import org.apache.hop.core.exception.HopException; import org.apache.hop.core.exception.HopPluginException; @@ -70,7 +71,8 @@ description = "i18n::WorkflowExecutor.Description", categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Flow", documentationUrl = "/pipeline/transforms/workflow-executor.html", - keywords = "i18n::WorkflowExecutorMeta.keyword") + keywords = "i18n::WorkflowExecutorMeta.keyword", + actionTransformTypes = {ActionTransformType.HOP_FILE, ActionTransformType.HOP_WORKFLOW}) public class WorkflowExecutorMeta extends BaseTransformMeta { private static final Class PKG = WorkflowExecutorMeta.class;