Merge pull request #5279 from sramazzina/5263

fix #5263

Author: hansva

plugins/transforms/selectvalues/src/main/java/org/apache/hop/pipeline/transforms/selectvalues/DeleteField.java

@@ -26,7 +26,10 @@
 @Setter
 public class DeleteField implements Cloneable {
 
-  @HopMetadataProperty(key = "name", injectionKey = "REMOVE_NAME", injectionGroupKey = "REMOVE")
+  @HopMetadataProperty(
+      key = "name",
+      injectionKeyDescription = "SelectValues.Injection.REMOVE_NAME",
+      injectionKey = "REMOVE_NAME")
   private String name;
 
   public DeleteField() {}

plugins/transforms/selectvalues/src/main/java/org/apache/hop/pipeline/transforms/selectvalues/SelectField.java

@@ -28,24 +28,30 @@ public class SelectField {
   public SelectField() {}
 
   /** Select: Name of the selected field */
-  @HopMetadataProperty(key = "name", injectionKey = "FIELD_NAME", injectionGroupKey = "FIELD")
+  @HopMetadataProperty(
+      key = "name",
+      injectionKey = "FIELD_NAME",
+      injectionKeyDescription = "SelectValues.Injection.FIELD_NAME")
   private String name;
 
   /** Select: Rename to ... */
-  // @Injection(name = "FIELD_RENAME", group = "FIELDS")
-  @HopMetadataProperty(key = "rename", injectionKey = "FIELD_RENAME", injectionGroupKey = "FIELD")
+  @HopMetadataProperty(
+      key = "rename",
+      injectionKey = "FIELD_RENAME",
+      injectionKeyDescription = "SelectValues.Injection.FIELD_RENAME")
   private String rename;
 
   /** Select: length of field */
-  // @Injection(name = "FIELD_LENGTH", group = "FIELDS")
-  @HopMetadataProperty(key = "length", injectionKey = "FIELD_LENGTH", injectionGroupKey = "FIELD")
+  @HopMetadataProperty(
+      key = "length",
+      injectionKey = "FIELD_LENGTH",
+      injectionKeyDescription = "SelectValues.Injection.FIELD_LENGTH")
   private int length = SelectValuesMeta.UNDEFINED;
 
   /** Select: Precision of field (for numbers) */
-  // @Injection(name = "FIELD_PRECISION", group = "FIELDS")
   @HopMetadataProperty(
       key = "precision",
       injectionKey = "FIELD_PRECISION",
-      injectionGroupKey = "FIELD")
+      injectionKeyDescription = "SelectValues.Injection.FIELD_PRECISION")
   private int precision = SelectValuesMeta.UNDEFINED;
 }

plugins/transforms/selectvalues/src/main/java/org/apache/hop/pipeline/transforms/selectvalues/SelectMetadataChange.java

@@ -19,6 +19,7 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.hop.core.row.IValueMeta;
 import org.apache.hop.core.row.value.ValueMetaFactory;
 import org.apache.hop.metadata.api.HopMetadataProperty;
 
@@ -29,101 +30,114 @@ public class SelectMetadataChange {
   // META-DATA mode
   /** Fields of which we want to change the meta data */
   // @Injection(name = "META_NAME", group = "METAS")
-  @HopMetadataProperty(key = "name", injectionKey = "META_NAME", injectionGroupKey = "METAS")
+  @HopMetadataProperty(
+      key = "name",
+      injectionKey = "META_NAME",
+      injectionKeyDescription = "SelectValues.Injection.META_NAME")
   private String name;
 
   /** Meta: new name of field */
   // @Injection(name = "META_RENAME", group = "METAS")
-  @HopMetadataProperty(key = "rename", injectionKey = "META_RENAME", injectionGroupKey = "METAS")
+  @HopMetadataProperty(
+      key = "rename",
+      injectionKey = "META_RENAME",
+      injectionKeyDescription = "SelectValues.Injection.META_RENAME")
   private String rename;
 
   /** Meta: new Value type for this field or TYPE_NONE if no change needed! */
-  @HopMetadataProperty(key = "type", injectionKey = "META_TYPE", injectionGroupKey = "METAS")
+  @HopMetadataProperty(
+      key = "type",
+      injectionKey = "META_TYPE",
+      injectionKeyDescription = "SelectValues.Injection.META_TYPE")
   private String type;
 
   /** Meta: new length of field */
-  @HopMetadataProperty(key = "length", injectionKey = "META_LENGTH", injectionGroupKey = "METAS")
+  @HopMetadataProperty(
+      key = "length",
+      injectionKey = "META_LENGTH",
+      injectionKeyDescription = "SelectValues.Injection.META_LENGTH")
   private int length = -1;
 
   /** Meta: new precision of field (for numbers) */
   @HopMetadataProperty(
       key = "precision",
       injectionKey = "META_PRECISION",
-      injectionGroupKey = "METAS")
+      injectionKeyDescription = "SelectValues.Injection.META_PRECISION")
   private int precision = -1;
 
   /** Meta: the storage type, NORMAL or BINARY_STRING */
   @HopMetadataProperty(
       key = "storage_type",
       injectionKey = "META_STORAGE_TYPE",
-      injectionGroupKey = "METAS")
+      injectionKeyDescription = "SelectValues.Injection.META_STORAGE_TYPE")
   private String storageType;
 
   /** The conversion metadata if any conversion needs to take place */
   @HopMetadataProperty(
       key = "conversion_mask",
       injectionKey = "META_CONVERSION_MASK",
-      injectionGroupKey = "METAS")
+      injectionKeyDescription = "SelectValues.Injection.META_CONVERSION_MASK")
   private String conversionMask;
 
   /** Treat the date format as lenient */
   @HopMetadataProperty(
       key = "date_format_lenient",
       injectionKey = "META_DATE_FORMAT_LENIENT",
-      injectionGroupKey = "METAS")
+      injectionKeyDescription = "SelectValues.Injection.META_DATE_FORMAT_LENIENT")
   private boolean dateFormatLenient;
 
   /** This is the locale to use for date parsing */
   @HopMetadataProperty(
       key = "date_format_locale",
       injectionKey = "META_DATE_FORMAT_LOCALE",
-      injectionGroupKey = "METAS")
+      injectionKeyDescription = "SelectValues.Injection.META_DATE_FORMAT_LOCALE")
   private String dateFormatLocale;
 
   /** This is the time zone to use for date parsing */
   @HopMetadataProperty(
       key = "date_format_timezone",
       injectionKey = "META_DATE_FORMAT_TIMEZONE",
-      injectionGroupKey = "METAS")
+      injectionKeyDescription = "SelectValues.Injection.META_DATE_FORMAT_TIMEZONE")
   private String dateFormatTimeZone;
 
   /** Treat string to number format as lenient */
   @HopMetadataProperty(
       key = "lenient_string_to_number",
       injectionKey = "META_LENIENT_STRING_TO_NUMBER",
-      injectionGroupKey = "METAS")
+      injectionKeyDescription = "SelectValues.Injection.META_LENIENT_STRING_TO_NUMBER")
   private boolean lenientStringToNumber;
 
   /** The decimal symbol for number conversions */
   @HopMetadataProperty(
       key = "decimal_symbol",
       injectionKey = "META_DECIMAL",
-      injectionGroupKey = "METAS")
+      injectionKeyDescription = "SelectValues.Injection.META_DECIMAL")
   private String decimalSymbol;
 
   /** The grouping symbol for number conversions */
   @HopMetadataProperty(
       key = "grouping_symbol",
       injectionKey = "META_GROUPING",
-      injectionGroupKey = "METAS")
+      injectionKeyDescription = "SelectValues.Injection.META_GROUPING")
   private String groupingSymbol;
 
   /** The currency symbol for number conversions */
   @HopMetadataProperty(
       key = "currency_symbol",
       injectionKey = "META_CURRENCY",
-      injectionGroupKey = "METAS")
+      injectionKeyDescription = "SelectValues.Injection.META_CURRENCY")
   private String currencySymbol;
 
   /** The encoding to use when decoding binary data to Strings */
   @HopMetadataProperty(
       key = "encoding",
       injectionKey = "META_ENCODING",
-      injectionGroupKey = "METAS")
+      injectionKeyDescription = "SelectValues.Injection.META_ENCODING")
   private String encoding;
 
   public SelectMetadataChange() {
     storageType = "";
+    type = ValueMetaFactory.getValueMetaName(IValueMeta.TYPE_NONE);
   }
 
   public SelectMetadataChange(

plugins/transforms/selectvalues/src/main/java/org/apache/hop/pipeline/transforms/selectvalues/SelectOptions.java

@@ -33,18 +33,30 @@ public SelectOptions() {
     meta = new ArrayList<>();
   }
 
-  @HopMetadataProperty(key = "field", injectionKey = "FIELD", injectionGroupKey = "FIELDS")
+  @HopMetadataProperty(
+      key = "field",
+      injectionGroupKey = "FIELDS",
+      injectionGroupDescription = "SelectValues.Injection.FIELDS")
   private List<SelectField> selectFields;
 
-  @HopMetadataProperty(key = "select_unspecified", injectionKey = "SELECT_UNSPECIFIED")
+  @HopMetadataProperty(
+      key = "select_unspecified",
+      injectionKey = "SELECT_UNSPECIFIED",
+      injectionKeyDescription = "SelectValues.Injection.SELECT_UNSPECIFIED")
   private boolean selectingAndSortingUnspecifiedFields;
 
   // DE-SELECT mode
   /** Names of the fields to be removed! */
-  @HopMetadataProperty(key = "remove", injectionKey = "REMOVE", injectionGroupKey = "REMOVES")
+  @HopMetadataProperty(
+      key = "remove",
+      injectionGroupKey = "REMOVES",
+      injectionGroupDescription = "SelectValues.Injection.REMOVES")
   private List<DeleteField> deleteName;
 
   // META-DATA mode
-  @HopMetadataProperty(key = "meta", injectionKey = "META", injectionGroupKey = "METAS")
+  @HopMetadataProperty(
+      key = "meta",
+      injectionGroupKey = "METAS",
+      injectionGroupDescription = "SelectValues.Injection.METAS")
   private List<SelectMetadataChange> meta;
 }

plugins/transforms/selectvalues/src/main/resources/org/apache/hop/pipeline/transforms/selectvalues/messages/messages_en_US.properties

@@ -43,9 +43,9 @@ SelectValues.Injection.META_PRECISION=Precision
 SelectValues.Injection.META_RENAME=Rename to
 SelectValues.Injection.META_STORAGE_TYPE=Binary to Normal?
 SelectValues.Injection.META_TYPE=Type
-SelectValues.Injection.METAS=List of fields to change metadata for
+SelectValues.Injection.METAS=Fields to change metadata for
 SelectValues.Injection.REMOVE_NAME=Fieldname
-SelectValues.Injection.REMOVES=Removed fields
+SelectValues.Injection.REMOVES=Fields to remove
 SelectValues.Injection.SELECT_UNSPECIFIED=Include unspecified fields, ordered by name
 SelectValues.Log.CouldNotFindField=Couldn''t find field ''{0}'' in row!
 SelectValues.Log.FieldCouldNotSpecifiedMoreThanTwice=Field ''{0}'' is specified twice (or more) with the same name!