This is an automated email from the ASF dual-hosted git repository.
bamaer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new 97c53ea336 Add ValueMetaFactory.createParseMeta and
createParseRowMeta, fixes #9288 (#9290)
97c53ea336 is described below
commit 97c53ea336fbb9136aa919ff21844ca69c678987
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Fri Nov 6 06:39:49 2026 +0100
Add ValueMetaFactory.createParseMeta and createParseRowMeta, fixes #9288
(#9290)
---
.../database/types/StandardJdbcTypeMapper.java | 5 +-
.../java/org/apache/hop/core/row/IRowMeta.java | 5 +
.../main/java/org/apache/hop/core/row/RowMeta.java | 3 +
.../apache/hop/core/row/value/ValueMetaBase.java | 4 +-
.../hop/core/row/value/ValueMetaFactory.java | 55 ++++++
.../row/value/ValueMetaFactoryParseMetaTest.java | 189 +++++++++++++++++++++
.../modules/ROOT/pages/sdk/plugins/transforms.adoc | 36 ++++
.../hop/pipeline/debug/DebugSessionStore.java | 3 +-
.../transforms/file/BaseFileInputTransform.java | 4 +-
.../org/apache/hop/ui/testing/EditRowsDialog.java | 3 +-
.../salesforceinput/SalesforceInput.java | 3 +-
.../hop/pipeline/transforms/datagrid/DataGrid.java | 3 +-
.../transforms/fieldsplitter/FieldSplitter.java | 3 +-
.../transforms/getvariable/GetVariable.java | 3 +-
.../hop/pipeline/transforms/ifnull/IfNull.java | 3 +-
.../pipeline/transforms/jsoninput/JsonInput.java | 4 +-
.../jsonnormalize/JsonNormalizeInput.java | 4 +-
.../reader/RowOutputConverterNullTest.java | 3 +-
.../pipeline/transforms/ldapinput/LdapInput.java | 5 +-
.../transforms/loadfileinput/LoadFileInput.java | 5 +-
.../transforms/propertyinput/PropertyInput.java | 5 +-
.../propertyinput/BasePropertyParsingTest.java | 4 +-
.../pipeline/transforms/regexeval/RegexEval.java | 3 +-
.../transforms/rowgenerator/RowGenerator.java | 2 +-
.../setvalueconstant/SetValueConstant.java | 3 +-
.../pipeline/transforms/switchcase/SwitchCase.java | 3 +-
.../pipeline/transforms/csvinput/CsvInputMeta.java | 12 +-
.../text/TextFileCSVImportProgressDialog.java | 3 +-
.../transforms/fileinput/text/TextFileInput.java | 4 +-
.../transforms/csvinput/BaseCsvParsingTest.java | 4 +-
.../fileinput/text/BaseTextParsingTest.java | 4 +-
.../apache/hop/pipeline/transforms/tika/Tika.java | 6 +-
.../pipeline/transforms/validator/Validator.java | 6 +-
.../transforms/xml/getxmldata/GetXmlData.java | 7 +-
.../apache/hop/ui/core/dialog/EditRowsDialog.java | 3 +-
.../org/apache/hop/ui/core/widget/TableView.java | 2 +-
36 files changed, 347 insertions(+), 67 deletions(-)
diff --git
a/core/src/main/java/org/apache/hop/core/database/types/StandardJdbcTypeMapper.java
b/core/src/main/java/org/apache/hop/core/database/types/StandardJdbcTypeMapper.java
index c2d8f2906c..40b23bf475 100644
---
a/core/src/main/java/org/apache/hop/core/database/types/StandardJdbcTypeMapper.java
+++
b/core/src/main/java/org/apache/hop/core/database/types/StandardJdbcTypeMapper.java
@@ -243,10 +243,7 @@ public final class StandardJdbcTypeMapper {
if (lazyConversion && valtype == IValueMeta.TYPE_STRING) {
valueMeta.setStorageType(IValueMeta.STORAGE_TYPE_BINARY_STRING);
- IValueMeta storageMetaData =
- ValueMetaFactory.cloneValueMeta(valueMeta, IValueMeta.TYPE_STRING);
- storageMetaData.setStorageType(IValueMeta.STORAGE_TYPE_NORMAL);
- valueMeta.setStorageMetadata(storageMetaData);
+
valueMeta.setStorageMetadata(ValueMetaFactory.createParseMeta(valueMeta));
}
// Only the result set metadata path can offer this hook, which is what
it took before.
diff --git a/core/src/main/java/org/apache/hop/core/row/IRowMeta.java
b/core/src/main/java/org/apache/hop/core/row/IRowMeta.java
index 4032db819d..694e7caab3 100644
--- a/core/src/main/java/org/apache/hop/core/row/IRowMeta.java
+++ b/core/src/main/java/org/apache/hop/core/row/IRowMeta.java
@@ -259,7 +259,12 @@ public interface IRowMeta extends Cloneable {
* @param targetType The target type
* @return The cloned metadata
* @throws HopValueException if the target type could not be loaded from the
plugin registry
+ * @deprecated To parse text into these fields, use {@link
+ *
org.apache.hop.core.row.value.ValueMetaFactory#createParseRowMeta(IRowMeta)}:
this copy
+ * keeps the storage type of lazy fields and drops the currency symbol,
so parsing with it
+ * fails for those fields.
*/
+ @Deprecated(since = "2.21")
IRowMeta cloneToType(int targetType) throws HopValueException;
/**
diff --git a/core/src/main/java/org/apache/hop/core/row/RowMeta.java
b/core/src/main/java/org/apache/hop/core/row/RowMeta.java
index 9ef4ea1add..b970586378 100644
--- a/core/src/main/java/org/apache/hop/core/row/RowMeta.java
+++ b/core/src/main/java/org/apache/hop/core/row/RowMeta.java
@@ -150,8 +150,11 @@ public class RowMeta implements IRowMeta {
* @return The cloned metadata
* @throws org.apache.hop.core.exception.HopValueException if the target
type could not be loaded
* from the plugin registry
+ * @deprecated To parse text into these fields, use {@link
+ *
org.apache.hop.core.row.value.ValueMetaFactory#createParseRowMeta(IRowMeta)}.
*/
@Override
+ @Deprecated(since = "2.21")
public IRowMeta cloneToType(int targetType) throws HopValueException {
lock.readLock().lock();
try {
diff --git
a/core/src/main/java/org/apache/hop/core/row/value/ValueMetaBase.java
b/core/src/main/java/org/apache/hop/core/row/value/ValueMetaBase.java
index 8daa1301f7..546a53c6dc 100644
--- a/core/src/main/java/org/apache/hop/core/row/value/ValueMetaBase.java
+++ b/core/src/main/java/org/apache/hop/core/row/value/ValueMetaBase.java
@@ -5504,9 +5504,7 @@ public class ValueMetaBase implements IValueMeta {
// Also set the storage metadata. a copy of the parent, set to String
too.
//
try {
- IValueMeta storageMetaData = ValueMetaFactory.cloneValueMeta(v,
IValueMeta.TYPE_STRING);
- storageMetaData.setStorageType(IValueMeta.STORAGE_TYPE_NORMAL);
- v.setStorageMetadata(storageMetaData);
+ v.setStorageMetadata(ValueMetaFactory.createParseMeta(v));
} catch (Exception e) {
throw new SQLException(e);
}
diff --git
a/core/src/main/java/org/apache/hop/core/row/value/ValueMetaFactory.java
b/core/src/main/java/org/apache/hop/core/row/value/ValueMetaFactory.java
index bf4e55e077..e780a270fc 100644
--- a/core/src/main/java/org/apache/hop/core/row/value/ValueMetaFactory.java
+++ b/core/src/main/java/org/apache/hop/core/row/value/ValueMetaFactory.java
@@ -27,9 +27,12 @@ import java.util.List;
import org.apache.hop.core.exception.HopEofException;
import org.apache.hop.core.exception.HopFileException;
import org.apache.hop.core.exception.HopPluginException;
+import org.apache.hop.core.exception.HopValueException;
import org.apache.hop.core.plugins.IPlugin;
import org.apache.hop.core.plugins.PluginRegistry;
+import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.row.IValueMeta;
+import org.apache.hop.core.row.RowMeta;
import org.json.simple.JSONObject;
/** This class will hand out value meta objects from the plugin registry. */
@@ -83,6 +86,58 @@ public class ValueMetaFactory {
return target;
}
+ /**
+ * Creates the String value metadata to parse text into {@code target} with:
a constant, a default
+ * value, a lookup key or a value read from a file. Pass it as the source
metadata, for example
+ * {@code target.convertData(parseMeta, text)} or {@code
target.convertDataFromString(text,
+ * parseMeta, nullIf, ifNull, trimType)}.
+ *
+ * <p>The result carries everything that decides how text is parsed: the
conversion mask, the
+ * decimal, grouping and currency symbols, the trim type, the string
encoding, the date format
+ * locale, time zone and leniency, and lenient number parsing. It always has
normal storage: the
+ * text to parse is a plain {@code String}, also when the target is a lazy
(binary string) field.
+ *
+ * @param target the field the text is parsed into
+ * @return a new String value meta, safe to change
+ * @throws HopPluginException if the String value type can't be loaded
+ */
+ public static IValueMeta createParseMeta(IValueMeta target) throws
HopPluginException {
+ IValueMeta parseMeta = cloneValueMeta(target, IValueMeta.TYPE_STRING);
+ // cloneInfo() drops the currency symbol, which a mask with a currency
sign needs to parse
+ // the text the field itself writes
+ parseMeta.setCurrencySymbol(target.getCurrencySymbol());
+ // cloneInfo() copies the target's storage: a lazy target would make every
parse fail with a
+ // ClassCastException, because the text is a String and not a byte[]
+ parseMeta.setStorageType(IValueMeta.STORAGE_TYPE_NORMAL);
+ parseMeta.setStorageMetadata(null);
+ parseMeta.setIndex(null);
+ // A String meta parses with the mask or the default parse masks; its
length plays no part
+ parseMeta.setLength(-1, -1);
+ return parseMeta;
+ }
+
+ /**
+ * Creates the parse metadata of every field in {@code target}, in the same
order: see {@link
+ * #createParseMeta(IValueMeta)}.
+ *
+ * @param target the row metadata of the fields the text is parsed into
+ * @return new row metadata with one String value meta per field
+ * @throws HopValueException if the String value type can't be loaded
+ */
+ public static IRowMeta createParseRowMeta(IRowMeta target) throws
HopValueException {
+ List<IValueMeta> parseMetas = new ArrayList<>(target.size());
+ try {
+ for (IValueMeta valueMeta : target.getValueMetaList()) {
+ parseMetas.add(createParseMeta(valueMeta));
+ }
+ } catch (HopPluginException e) {
+ throw new HopValueException(e);
+ }
+ IRowMeta parseRowMeta = new RowMeta();
+ parseRowMeta.setValueMetaList(parseMetas);
+ return parseRowMeta;
+ }
+
public static void cloneInfo(IValueMeta source, IValueMeta target) throws
HopPluginException {
target.setConversionMask(source.getConversionMask());
target.setDecimalSymbol(source.getDecimalSymbol());
diff --git
a/core/src/test/java/org/apache/hop/core/row/value/ValueMetaFactoryParseMetaTest.java
b/core/src/test/java/org/apache/hop/core/row/value/ValueMetaFactoryParseMetaTest.java
new file mode 100644
index 0000000000..a0d5e2f280
--- /dev/null
+++
b/core/src/test/java/org/apache/hop/core/row/value/ValueMetaFactoryParseMetaTest.java
@@ -0,0 +1,189 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hop.core.row.value;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.math.BigDecimal;
+import java.util.Locale;
+import java.util.TimeZone;
+import org.apache.hop.core.HopClientEnvironment;
+import org.apache.hop.core.row.IRowMeta;
+import org.apache.hop.core.row.IValueMeta;
+import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.junit.rules.RestoreHopEnvironmentExtension;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/** {@link ValueMetaFactory#createParseMeta(IValueMeta)} and its row variant.
*/
+@ExtendWith(RestoreHopEnvironmentExtension.class)
+class ValueMetaFactoryParseMetaTest {
+
+ @BeforeAll
+ static void init() throws Exception {
+ HopClientEnvironment.init();
+ }
+
+ private static IValueMeta number(String mask, String decimal, String
grouping) {
+ IValueMeta meta = new ValueMetaNumber("amount");
+ meta.setConversionMask(mask);
+ meta.setDecimalSymbol(decimal);
+ meta.setGroupingSymbol(grouping);
+ return meta;
+ }
+
+ @Test
+ void parseMetaCarriesTheFormatOfTheTarget() throws Exception {
+ ValueMetaDate target = new ValueMetaDate("d");
+ target.setConversionMask("dd/MM/yyyy");
+ target.setDateFormatLocale(Locale.FRANCE);
+ target.setDateFormatTimeZone(TimeZone.getTimeZone("Asia/Tokyo"));
+ target.setDateFormatLenient(true);
+ target.setLenientStringToNumber(true);
+ target.setTrimType(IValueMeta.TRIM_TYPE_BOTH);
+ target.setStringEncoding("UTF-16");
+ target.setDecimalSymbol(",");
+ target.setGroupingSymbol(".");
+ target.setCurrencySymbol("€");
+
+ IValueMeta parseMeta = ValueMetaFactory.createParseMeta(target);
+
+ assertEquals(IValueMeta.TYPE_STRING, parseMeta.getType());
+ assertEquals("d", parseMeta.getName());
+ assertEquals("dd/MM/yyyy", parseMeta.getConversionMask());
+ assertEquals(Locale.FRANCE, parseMeta.getDateFormatLocale());
+ assertEquals("Asia/Tokyo", parseMeta.getDateFormatTimeZone().getID());
+ assertTrue(parseMeta.isDateFormatLenient());
+ assertTrue(parseMeta.isLenientStringToNumber());
+ assertEquals(IValueMeta.TRIM_TYPE_BOTH, parseMeta.getTrimType());
+ assertEquals("UTF-16", parseMeta.getStringEncoding());
+ assertEquals(",", parseMeta.getDecimalSymbol());
+ assertEquals(".", parseMeta.getGroupingSymbol());
+ assertEquals("€", parseMeta.getCurrencySymbol());
+ assertEquals(IValueMeta.STORAGE_TYPE_NORMAL, parseMeta.getStorageType());
+ assertEquals(-1, parseMeta.getLength());
+ }
+
+ @Test
+ void aFieldParsesTheCurrencyTextItWrites() throws Exception {
+ IValueMeta amount = number("¤#,##0.00", ".", ",");
+ amount.setCurrencySymbol("€");
+ String text = amount.getString(1234.5);
+
+ Object value =
amount.convertData(ValueMetaFactory.createParseMeta(amount), text);
+
+ assertEquals("€1,234.50", text);
+ assertEquals(1234.5, value);
+ }
+
+ @Test
+ void parsingIntoALazyFieldWorks() throws Exception {
+ IValueMeta lazy = new ValueMetaInteger("id");
+ lazy.setStorageType(IValueMeta.STORAGE_TYPE_BINARY_STRING);
+ lazy.setStorageMetadata(new ValueMetaString("id"));
+
+ IValueMeta parseMeta = ValueMetaFactory.createParseMeta(lazy);
+
+ assertEquals(IValueMeta.STORAGE_TYPE_NORMAL, parseMeta.getStorageType());
+ assertNull(parseMeta.getStorageMetadata());
+ assertEquals(42L, lazy.convertData(parseMeta, "42"));
+ }
+
+ @Test
+ void theTargetIsNotChanged() throws Exception {
+ IValueMeta amount = number("#,##0.00", ",", ".");
+ amount.setLength(9, 2);
+
+ ValueMetaFactory.createParseMeta(amount).setConversionMask("0");
+
+ assertEquals("#,##0.00", amount.getConversionMask());
+ assertEquals(9, amount.getLength());
+ assertEquals(IValueMeta.TYPE_NUMBER, amount.getType());
+ }
+
+ /** For every value type the helper parses exactly what the cloneValueMeta
recipe parsed. */
+ @Test
+ void parsesTheSameAsTheCloneRecipe() throws Exception {
+ Object[][] cases = {
+ {number("#,##0.00", ",", "."), "1.234,56"},
+ {number(null, null, null), "12.5"},
+ {number("", "", ""), "7"},
+ {withMask(new ValueMetaInteger("i"), "#,##0"), "1,234"},
+ {new ValueMetaInteger("i"), "-42"},
+ {withMask(new ValueMetaBigNumber("b"), "#,##0.000"), "1,234.567"},
+ {new ValueMetaBigNumber("b"), "12345678901234567890.123"},
+ {withMask(new ValueMetaDate("d"), "yyyy-MM-dd"), "2024-05-17"},
+ {new ValueMetaDate("d"), "2024/05/17 10:11:12.123"},
+ {new ValueMetaTimestamp("t"), "2024/05/17 10:11:12.123456789"},
+ {new ValueMetaBoolean("bool"), "Y"},
+ {withTrim(new ValueMetaString("s"), IValueMeta.TRIM_TYPE_BOTH), "
padded "},
+ };
+ for (Object[] c : cases) {
+ IValueMeta target = (IValueMeta) c[0];
+ String text = (String) c[1];
+
+ Object viaClone =
+ target.convertData(ValueMetaFactory.cloneValueMeta(target,
IValueMeta.TYPE_STRING), text);
+ Object viaHelper =
target.convertData(ValueMetaFactory.createParseMeta(target), text);
+
+ if (viaClone instanceof BigDecimal big) {
+ assertEquals(0, big.compareTo((BigDecimal) viaHelper), target + " / "
+ text);
+ } else {
+ assertEquals(viaClone, viaHelper, target + " / " + text);
+ }
+ }
+ }
+
+ @Test
+ void rowVariantKeepsTheFieldsInOrder() throws Exception {
+ IRowMeta target = new RowMeta();
+ target.addValueMeta(number("#,##0.00", ",", "."));
+ target.addValueMeta(new ValueMetaDate("when"));
+ IValueMeta lazy = new ValueMetaString("lazy");
+ lazy.setStorageType(IValueMeta.STORAGE_TYPE_BINARY_STRING);
+ lazy.setStorageMetadata(new ValueMetaString("lazy"));
+ target.addValueMeta(lazy);
+
+ IRowMeta parseRowMeta = ValueMetaFactory.createParseRowMeta(target);
+
+ assertEquals(3, parseRowMeta.size());
+ assertEquals("amount", parseRowMeta.getValueMeta(0).getName());
+ assertEquals("when", parseRowMeta.getValueMeta(1).getName());
+ assertEquals("lazy", parseRowMeta.getValueMeta(2).getName());
+ for (IValueMeta parseMeta : parseRowMeta.getValueMetaList()) {
+ assertEquals(IValueMeta.TYPE_STRING, parseMeta.getType());
+ assertEquals(IValueMeta.STORAGE_TYPE_NORMAL, parseMeta.getStorageType());
+ }
+ assertEquals(",", parseRowMeta.getValueMeta(0).getDecimalSymbol());
+ assertFalse(parseRowMeta.getValueMeta(2).isStorageBinaryString());
+ }
+
+ private static IValueMeta withMask(IValueMeta meta, String mask) {
+ meta.setConversionMask(mask);
+ return meta;
+ }
+
+ private static IValueMeta withTrim(IValueMeta meta, int trimType) {
+ meta.setTrimType(trimType);
+ return meta;
+ }
+}
diff --git a/docs/hop-dev-manual/modules/ROOT/pages/sdk/plugins/transforms.adoc
b/docs/hop-dev-manual/modules/ROOT/pages/sdk/plugins/transforms.adoc
index a37e121d17..4b90ddd0a5 100644
--- a/docs/hop-dev-manual/modules/ROOT/pages/sdk/plugins/transforms.adoc
+++ b/docs/hop-dev-manual/modules/ROOT/pages/sdk/plugins/transforms.adoc
@@ -188,6 +188,42 @@ The dialog extends `BaseTransformDialog`.
Annotate the metadata fields with `@GuiWidgetElement` and build them with
`GuiCompositeWidgets`.
The `open()` recipe is xref:annotation-derived-widgets.adoc[Annotation derived
widgets], under "Transform and action dialogs".
+== Parsing text into a field
+
+A transform that turns text into a typed value parses it with String metadata
built from the target field.
+Examples are a value read from a file, a constant, a default value or a lookup
key.
+Build that metadata with `ValueMetaFactory.createParseMeta` for one field or
`ValueMetaFactory.createParseRowMeta` for a whole row.
+Build it once, for example on the first row, and keep it in the data class.
+
+[source,java]
+----
+if (first) {
+ first = false;
+ data.outputRowMeta = getInputRowMeta().clone();
+ meta.getFields(data.outputRowMeta, getTransformName(), null, null, this,
metadataProvider);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
+}
+
+for (int i = 0; i < data.outputRowMeta.size(); i++) {
+ IValueMeta valueMeta = data.outputRowMeta.getValueMeta(i);
+ IValueMeta convertMeta = data.convertRowMeta.getValueMeta(i);
+ outputRow[i] = valueMeta.convertDataFromString(texts[i], convertMeta, null,
null, 0);
+}
+----
+
+The parse metadata keeps everything that decides how text is parsed: the
conversion mask, the decimal, grouping and currency symbols, the trim type, the
string encoding, the date format locale, time zone and leniency.
+It always has normal storage, because the text to parse is a plain `String`,
also when the target field is lazy (binary string).
+Pass it as the source metadata, to `convertDataFromString(text, parseMeta,
nullIf, ifNull, trimType)` or `convertData(parseMeta, text)`.
+
+Don't build the parse metadata in any of these ways:
+
+* `rowMeta.cloneToType(IValueMeta.TYPE_STRING)` or
`ValueMetaFactory.cloneValueMeta(valueMeta, IValueMeta.TYPE_STRING)`: drops the
currency symbol and keeps the storage type of a lazy field.
+With a `¤` mask the field then can't read back the text it writes, and a lazy
field fails with a `ClassCastException`.
+`IRowMeta.cloneToType` is deprecated for this reason.
+* `new ValueMetaString(name)`: has none of the target's mask or symbols, so
every value is parsed with the defaults of the machine.
+
+`plugins/transforms/datagrid` (`DataGrid`) is a short example of this pattern.
+
== Concrete Codebase Examples
* `plugins/transforms/detectemptystream`: Minimal transform example.
diff --git
a/engine/src/main/java/org/apache/hop/pipeline/debug/DebugSessionStore.java
b/engine/src/main/java/org/apache/hop/pipeline/debug/DebugSessionStore.java
index 49606a4d45..309383eba4 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/debug/DebugSessionStore.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/debug/DebugSessionStore.java
@@ -42,6 +42,7 @@ import org.apache.hop.core.json.HopJson;
import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.vfs.HopVfs;
import org.apache.hop.pipeline.Pipeline;
import org.apache.hop.pipeline.PipelineHopMeta;
@@ -357,7 +358,7 @@ public final class DebugSessionStore {
}
IRowMeta rowMeta = rowSet.getRowMeta();
// convertDataFromString expects the source description to be a string,
not the target type.
- IRowMeta convertMeta = rowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ IRowMeta convertMeta = ValueMetaFactory.createParseRowMeta(rowMeta);
int added = 0;
try (BufferedReader reader =
new BufferedReader(
diff --git
a/engine/src/main/java/org/apache/hop/pipeline/transforms/file/BaseFileInputTransform.java
b/engine/src/main/java/org/apache/hop/pipeline/transforms/file/BaseFileInputTransform.java
index fdc2fc0df4..22ad30841c 100644
---
a/engine/src/main/java/org/apache/hop/pipeline/transforms/file/BaseFileInputTransform.java
+++
b/engine/src/main/java/org/apache/hop/pipeline/transforms/file/BaseFileInputTransform.java
@@ -26,8 +26,8 @@ import org.apache.hop.core.ResultFile;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.exception.HopFileException;
import org.apache.hop.core.row.IRowMeta;
-import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.vfs.HopVfs;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.lineage.LineageFileIoEmitter;
@@ -144,7 +144,7 @@ public abstract class BaseFileInputTransform<
data.outputRowMeta, getTransformName(), infoTransform, null, this,
metadataProvider);
// Create convert meta-data objects that will contain Date & Number
formatters
//
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
BaseFileInputTransformUtils.handleMissingFiles(
data.files, getLogChannel(), errorIgnored, data.dataErrorLineHandler);
diff --git
a/plugins/misc/testing/src/main/java/org/apache/hop/ui/testing/EditRowsDialog.java
b/plugins/misc/testing/src/main/java/org/apache/hop/ui/testing/EditRowsDialog.java
index e13ef20e67..222d990318 100644
---
a/plugins/misc/testing/src/main/java/org/apache/hop/ui/testing/EditRowsDialog.java
+++
b/plugins/misc/testing/src/main/java/org/apache/hop/ui/testing/EditRowsDialog.java
@@ -323,8 +323,7 @@ public class EditRowsDialog {
try {
stringRowMeta = new RowMeta();
for (IValueMeta valueMeta : rowMeta.getValueMetaList()) {
- IValueMeta stringValueMeta =
- ValueMetaFactory.cloneValueMeta(valueMeta, IValueMeta.TYPE_STRING);
+ IValueMeta stringValueMeta =
ValueMetaFactory.createParseMeta(valueMeta);
stringRowMeta.addValueMeta(stringValueMeta);
}
diff --git
a/plugins/tech/salesforce/src/main/java/org/apache/hop/pipeline/transforms/salesforceinput/SalesforceInput.java
b/plugins/tech/salesforce/src/main/java/org/apache/hop/pipeline/transforms/salesforceinput/SalesforceInput.java
index aaf5bf1081..208e9b4e10 100644
---
a/plugins/tech/salesforce/src/main/java/org/apache/hop/pipeline/transforms/salesforceinput/SalesforceInput.java
+++
b/plugins/tech/salesforce/src/main/java/org/apache/hop/pipeline/transforms/salesforceinput/SalesforceInput.java
@@ -28,6 +28,7 @@ import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowDataUtil;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.util.Utils;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.pipeline.Pipeline;
@@ -66,7 +67,7 @@ public class SalesforceInput extends
SalesforceTransform<SalesforceInputMeta, Sa
// For String to <type> conversions, we allocate a conversion meta data
row as well...
//
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
// Let's query Salesforce
data.connection.query(meta.isSpecifyQuery());
diff --git
a/plugins/transforms/datagrid/src/main/java/org/apache/hop/pipeline/transforms/datagrid/DataGrid.java
b/plugins/transforms/datagrid/src/main/java/org/apache/hop/pipeline/transforms/datagrid/DataGrid.java
index 253765c35b..adcbe02c2d 100644
---
a/plugins/transforms/datagrid/src/main/java/org/apache/hop/pipeline/transforms/datagrid/DataGrid.java
+++
b/plugins/transforms/datagrid/src/main/java/org/apache/hop/pipeline/transforms/datagrid/DataGrid.java
@@ -21,6 +21,7 @@ import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowDataUtil;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.util.StringUtil;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.pipeline.Pipeline;
@@ -63,7 +64,7 @@ public class DataGrid extends BaseTransform<DataGridMeta,
DataGridData> {
// Use these metadata values to convert data...
//
- data.convertMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
}
Object[] outputRowData =
RowDataUtil.allocateRowData(data.outputRowMeta.size());
diff --git
a/plugins/transforms/fieldsplitter/src/main/java/org/apache/hop/pipeline/transforms/fieldsplitter/FieldSplitter.java
b/plugins/transforms/fieldsplitter/src/main/java/org/apache/hop/pipeline/transforms/fieldsplitter/FieldSplitter.java
index 346431a1f2..c7f4e62de4 100644
---
a/plugins/transforms/fieldsplitter/src/main/java/org/apache/hop/pipeline/transforms/fieldsplitter/FieldSplitter.java
+++
b/plugins/transforms/fieldsplitter/src/main/java/org/apache/hop/pipeline/transforms/fieldsplitter/FieldSplitter.java
@@ -25,6 +25,7 @@ import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.exception.HopValueException;
import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowDataUtil;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.pipeline.Pipeline;
import org.apache.hop.pipeline.PipelineMeta;
@@ -77,7 +78,7 @@ public class FieldSplitter extends
BaseTransform<FieldSplitterMeta, FieldSplitte
// Now create objects to do string to data type conversion...
//
- data.conversionMeta =
data.outputMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.conversionMeta =
ValueMetaFactory.createParseRowMeta(data.outputMeta);
data.delimiter = resolve(meta.getDelimiter());
data.enclosure = resolve(meta.getEnclosure());
diff --git
a/plugins/transforms/getvariable/src/main/java/org/apache/hop/pipeline/transforms/getvariable/GetVariable.java
b/plugins/transforms/getvariable/src/main/java/org/apache/hop/pipeline/transforms/getvariable/GetVariable.java
index b3f9e391c9..491cfbbd64 100644
---
a/plugins/transforms/getvariable/src/main/java/org/apache/hop/pipeline/transforms/getvariable/GetVariable.java
+++
b/plugins/transforms/getvariable/src/main/java/org/apache/hop/pipeline/transforms/getvariable/GetVariable.java
@@ -22,6 +22,7 @@ import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowDataUtil;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.util.Utils;
import org.apache.hop.pipeline.Pipeline;
import org.apache.hop.pipeline.PipelineMeta;
@@ -71,7 +72,7 @@ public class GetVariable extends
BaseTransform<GetVariableMeta, GetVariableData>
// Create a copy of the output row metadata to do the data conversion...
//
- data.conversionMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.conversionMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
// Add the variables to the row...
//
diff --git
a/plugins/transforms/ifnull/src/main/java/org/apache/hop/pipeline/transforms/ifnull/IfNull.java
b/plugins/transforms/ifnull/src/main/java/org/apache/hop/pipeline/transforms/ifnull/IfNull.java
index 800811ecc5..f068326464 100644
---
a/plugins/transforms/ifnull/src/main/java/org/apache/hop/pipeline/transforms/ifnull/IfNull.java
+++
b/plugins/transforms/ifnull/src/main/java/org/apache/hop/pipeline/transforms/ifnull/IfNull.java
@@ -22,6 +22,7 @@ import java.util.HashSet;
import java.util.List;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IValueMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.util.StringUtil;
import org.apache.hop.core.util.Utils;
import org.apache.hop.i18n.BaseMessages;
@@ -68,7 +69,7 @@ public class IfNull extends BaseTransform<IfNullMeta,
IfNullData> {
// For String to <type> conversions, we allocate a conversion meta data
row as well...
//
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
if (meta.isSelectFields()) {
// Consider only selected fields
diff --git
a/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInput.java
b/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInput.java
index 3ee496c9e9..5531fddfc8 100644
---
a/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInput.java
+++
b/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsoninput/JsonInput.java
@@ -36,9 +36,9 @@ import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.exception.HopTransformException;
import org.apache.hop.core.exception.HopValueException;
import org.apache.hop.core.io.CountingInputStream;
-import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowDataUtil;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.util.StringUtil;
import org.apache.hop.core.util.Utils;
import org.apache.hop.core.vfs.HopVfs;
@@ -240,7 +240,7 @@ public class JsonInput extends
BaseFileInputTransform<JsonInputMeta, JsonInputDa
meta.getFields(data.outputRowMeta, getTransformName(), null, null, this,
metadataProvider);
// Create convert meta-data objects that will contain Date & Number
formatters
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
// behave differently if the incoming value is JsonNode or String
if (data.inputRowMeta != null
diff --git
a/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsonnormalize/JsonNormalizeInput.java
b/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsonnormalize/JsonNormalizeInput.java
index 1b7b1c2016..db2cb6f511 100644
---
a/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsonnormalize/JsonNormalizeInput.java
+++
b/plugins/transforms/json/src/main/java/org/apache/hop/pipeline/transforms/jsonnormalize/JsonNormalizeInput.java
@@ -32,9 +32,9 @@ import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.exception.HopTransformException;
import org.apache.hop.core.exception.HopValueException;
import org.apache.hop.core.io.CountingInputStream;
-import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowDataUtil;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.util.StringUtil;
import org.apache.hop.core.util.Utils;
import org.apache.hop.core.vfs.HopVfs;
@@ -188,7 +188,7 @@ public class JsonNormalizeInput
}
meta.getFields(data.outputRowMeta, getTransformName(), null, null, this,
metadataProvider);
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
NormalizeInputsReader readerFactory =
new NormalizeInputsReader(this, meta, data, new InputErrorHandler());
diff --git
a/plugins/transforms/json/src/test/java/org/apache/hop/pipeline/transforms/jsoninput/reader/RowOutputConverterNullTest.java
b/plugins/transforms/json/src/test/java/org/apache/hop/pipeline/transforms/jsoninput/reader/RowOutputConverterNullTest.java
index 378f71dd0d..9e15127bdd 100644
---
a/plugins/transforms/json/src/test/java/org/apache/hop/pipeline/transforms/jsoninput/reader/RowOutputConverterNullTest.java
+++
b/plugins/transforms/json/src/test/java/org/apache/hop/pipeline/transforms/jsoninput/reader/RowOutputConverterNullTest.java
@@ -28,6 +28,7 @@ import java.util.BitSet;
import org.apache.hop.core.Const;
import org.apache.hop.core.logging.ILogChannel;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.row.value.ValueMetaString;
import org.apache.hop.pipeline.transforms.jsoninput.JsonInputData;
import org.junit.jupiter.params.ParameterizedTest;
@@ -44,7 +45,7 @@ class RowOutputConverterNullTest {
data.outputRowMeta = new RowMeta();
data.outputRowMeta.addValueMeta(new ValueMetaString("nullValue"));
data.outputRowMeta.addValueMeta(new ValueMetaString("emptyValue"));
- data.convertRowMeta =
data.outputRowMeta.cloneToType(ValueMetaString.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
data.totalpreviousfields = 0;
data.repeatedFields = new BitSet();
RowOutputConverter converter = new
RowOutputConverter(mock(ILogChannel.class));
diff --git
a/plugins/transforms/ldap/src/main/java/org/apache/hop/pipeline/transforms/ldapinput/LdapInput.java
b/plugins/transforms/ldap/src/main/java/org/apache/hop/pipeline/transforms/ldapinput/LdapInput.java
index 41802c9aa9..e270c81e87 100644
---
a/plugins/transforms/ldap/src/main/java/org/apache/hop/pipeline/transforms/ldapinput/LdapInput.java
+++
b/plugins/transforms/ldap/src/main/java/org/apache/hop/pipeline/transforms/ldapinput/LdapInput.java
@@ -26,6 +26,7 @@ import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowDataUtil;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.util.Utils;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.pipeline.Pipeline;
@@ -63,7 +64,7 @@ public class LdapInput extends BaseTransform<LdapInputMeta,
LdapInputData> {
// Create convert meta-data objects that will contain Date & Number
formatters
//
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
// Search records once
search(data.staticSearchBase, data.staticFilter);
@@ -153,7 +154,7 @@ public class LdapInput extends BaseTransform<LdapInputMeta,
LdapInputData> {
// Create convert meta-data objects that will contain Date & Number
formatters
//
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
if (meta.isDynamicSearch()) {
data.indexOfSearchBaseField =
diff --git
a/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInput.java
b/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInput.java
index f707aa0b71..8be427bd14 100644
---
a/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInput.java
+++
b/plugins/transforms/loadfileinput/src/main/java/org/apache/hop/pipeline/transforms/loadfileinput/LoadFileInput.java
@@ -33,6 +33,7 @@ import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowDataUtil;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.core.vfs.HopVfs;
@@ -96,7 +97,7 @@ public class LoadFileInput extends
BaseTransform<LoadFileInputMeta, LoadFileInpu
// Create convert meta-data objects that will contain Date & Number
formatters
// All non binary content is handled as a String. It would be
converted to the target type
// after the processing.
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
if (meta.isFileInField()) {
// Check is filename field is provided
@@ -502,7 +503,7 @@ public class LoadFileInput extends
BaseTransform<LoadFileInputMeta, LoadFileInpu
// Create convert meta-data objects that will contain Date & Number
formatters
// All non-binary content is handled as a String. It would be
converted to the target type
// after the processing.
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
} catch (Exception e) {
logError("Error at transform initialization: " + e.toString());
logError(Const.getStackTracker(e));
diff --git
a/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInput.java
b/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInput.java
index 7d3bbb7e68..1467b91e71 100644
---
a/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInput.java
+++
b/plugins/transforms/propertyinput/src/main/java/org/apache/hop/pipeline/transforms/propertyinput/PropertyInput.java
@@ -33,6 +33,7 @@ import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowDataUtil;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.util.Utils;
import org.apache.hop.core.vfs.HopVfs;
import org.apache.hop.i18n.BaseMessages;
@@ -85,7 +86,7 @@ public class PropertyInput extends
BaseTransform<PropertyInputMeta, PropertyInpu
// Create convert meta-data objects that will contain Date & Number
formatters
//
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
}
try {
// Grab one row
@@ -386,7 +387,7 @@ public class PropertyInput extends
BaseTransform<PropertyInputMeta, PropertyInpu
data.totalPreviousFields = data.inputRowMeta.size();
// Create convert meta-data objects that will contain Date & Number
formatters
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
// Check is filename field is provided
if (Utils.isEmpty(meta.getDynamicFilenameField())) {
diff --git
a/plugins/transforms/propertyinput/src/test/java/org/apache/hop/pipeline/transforms/propertyinput/BasePropertyParsingTest.java
b/plugins/transforms/propertyinput/src/test/java/org/apache/hop/pipeline/transforms/propertyinput/BasePropertyParsingTest.java
index 6d158de602..901fb6d9fd 100644
---
a/plugins/transforms/propertyinput/src/test/java/org/apache/hop/pipeline/transforms/propertyinput/BasePropertyParsingTest.java
+++
b/plugins/transforms/propertyinput/src/test/java/org/apache/hop/pipeline/transforms/propertyinput/BasePropertyParsingTest.java
@@ -19,8 +19,8 @@ package org.apache.hop.pipeline.transforms.propertyinput;
import java.util.Arrays;
import org.apache.hop.core.exception.HopRuntimeException;
-import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.variables.Variables;
import org.apache.hop.pipeline.transforms.file.BaseFileField;
import
org.apache.hop.pipeline.transforms.propertyinput.PropertyInputMeta.PIField;
@@ -56,7 +56,7 @@ class BasePropertyParsingTest
protected void setFields(PIField... fields) throws Exception {
meta.setInputFields(Arrays.asList(fields));
meta.getFields(data.outputRowMeta, meta.getName(), null, null, new
Variables(), null);
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
}
/** For BaseFileInput fields. */
diff --git
a/plugins/transforms/regexeval/src/main/java/org/apache/hop/pipeline/transforms/regexeval/RegexEval.java
b/plugins/transforms/regexeval/src/main/java/org/apache/hop/pipeline/transforms/regexeval/RegexEval.java
index 9136305652..5a17f493e8 100644
---
a/plugins/transforms/regexeval/src/main/java/org/apache/hop/pipeline/transforms/regexeval/RegexEval.java
+++
b/plugins/transforms/regexeval/src/main/java/org/apache/hop/pipeline/transforms/regexeval/RegexEval.java
@@ -23,6 +23,7 @@ import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.exception.HopTransformException;
import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowDataUtil;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.util.Utils;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.pipeline.Pipeline;
@@ -121,7 +122,7 @@ public class RegexEval extends BaseTransform<RegexEvalMeta,
RegexEvalData> {
// Now create objects to do string to data type conversion...
//
- data.conversionRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.conversionRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
}
// reserve room
diff --git
a/plugins/transforms/rowgenerator/src/main/java/org/apache/hop/pipeline/transforms/rowgenerator/RowGenerator.java
b/plugins/transforms/rowgenerator/src/main/java/org/apache/hop/pipeline/transforms/rowgenerator/RowGenerator.java
index 5d7aa9ace5..ed2e142ad3 100644
---
a/plugins/transforms/rowgenerator/src/main/java/org/apache/hop/pipeline/transforms/rowgenerator/RowGenerator.java
+++
b/plugins/transforms/rowgenerator/src/main/java/org/apache/hop/pipeline/transforms/rowgenerator/RowGenerator.java
@@ -89,7 +89,7 @@ public class RowGenerator extends
BaseTransform<RowGeneratorMeta, RowGeneratorDa
valueMeta.setDecimalSymbol(field.getDecimal());
valueMeta.setOrigin(origin);
- IValueMeta stringMeta = ValueMetaFactory.cloneValueMeta(valueMeta,
IValueMeta.TYPE_STRING);
+ IValueMeta stringMeta = ValueMetaFactory.createParseMeta(valueMeta);
if (field.isSetEmptyString()) {
// Set empty string
diff --git
a/plugins/transforms/setvalueconstant/src/main/java/org/apache/hop/pipeline/transforms/setvalueconstant/SetValueConstant.java
b/plugins/transforms/setvalueconstant/src/main/java/org/apache/hop/pipeline/transforms/setvalueconstant/SetValueConstant.java
index 3d5b35ba7e..a7eb44e9af 100644
---
a/plugins/transforms/setvalueconstant/src/main/java/org/apache/hop/pipeline/transforms/setvalueconstant/SetValueConstant.java
+++
b/plugins/transforms/setvalueconstant/src/main/java/org/apache/hop/pipeline/transforms/setvalueconstant/SetValueConstant.java
@@ -20,6 +20,7 @@ package org.apache.hop.pipeline.transforms.setvalueconstant;
import java.util.List;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.row.IValueMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.util.StringUtil;
import org.apache.hop.core.util.Utils;
import org.apache.hop.i18n.BaseMessages;
@@ -61,7 +62,7 @@ public class SetValueConstant extends
BaseTransform<SetValueConstantMeta, SetVal
// For String to <type> conversions, we allocate a conversion meta data
row as well...
//
-
data.setConvertRowMeta(data.getOutputRowMeta().cloneToType(IValueMeta.TYPE_STRING));
+
data.setConvertRowMeta(ValueMetaFactory.createParseRowMeta(data.getOutputRowMeta()));
// Consider only selected fields
List<SetValueConstantMeta.Field> fields = meta.getFields();
diff --git
a/plugins/transforms/switchcase/src/main/java/org/apache/hop/pipeline/transforms/switchcase/SwitchCase.java
b/plugins/transforms/switchcase/src/main/java/org/apache/hop/pipeline/transforms/switchcase/SwitchCase.java
index 69e433e7f0..f3ab81ccab 100644
---
a/plugins/transforms/switchcase/src/main/java/org/apache/hop/pipeline/transforms/switchcase/SwitchCase.java
+++
b/plugins/transforms/switchcase/src/main/java/org/apache/hop/pipeline/transforms/switchcase/SwitchCase.java
@@ -113,8 +113,7 @@ public class SwitchCase extends
BaseTransform<SwitchCaseMeta, SwitchCaseData> {
data.valueMeta.setConversionMask(meta.getCaseValueFormat());
data.valueMeta.setGroupingSymbol(meta.getCaseValueGroup());
data.valueMeta.setDecimalSymbol(meta.getCaseValueDecimal());
- data.stringValueMeta =
- ValueMetaFactory.cloneValueMeta(data.valueMeta,
IValueMeta.TYPE_STRING);
+ data.stringValueMeta = ValueMetaFactory.createParseMeta(data.valueMeta);
} catch (Exception e) {
logError(BaseMessages.getString(PKG, "SwitchCase.Log.UnexpectedError",
e));
}
diff --git
a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/csvinput/CsvInputMeta.java
b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/csvinput/CsvInputMeta.java
index fbf0878a9d..56f346face 100644
---
a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/csvinput/CsvInputMeta.java
+++
b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/csvinput/CsvInputMeta.java
@@ -252,11 +252,7 @@ public class CsvInputMeta extends
BaseTransformMeta<CsvInput, CsvInputData>
// This layout is then taken further down the road by the
metadata through the
// pipeline.
//
- IValueMeta storageMetadata =
- ValueMetaFactory.cloneValueMeta(v, IValueMeta.TYPE_STRING);
- storageMetadata.setStorageType(IValueMeta.STORAGE_TYPE_NORMAL);
- storageMetadata.setLength(
- -1, -1); // we don't really know the lengths of the
strings read in advance.
+ IValueMeta storageMetadata =
ValueMetaFactory.createParseMeta(v);
v.setStorageMetadata(storageMetadata);
v.setOrigin(origin);
@@ -295,11 +291,7 @@ public class CsvInputMeta extends
BaseTransformMeta<CsvInput, CsvInputData>
// Preview will show the data the same way as we read it.
// This layout is then taken further down the road by the metadata
through the pipeline.
//
- IValueMeta storageMetadata =
- ValueMetaFactory.cloneValueMeta(valueMeta,
IValueMeta.TYPE_STRING);
- storageMetadata.setStorageType(IValueMeta.STORAGE_TYPE_NORMAL);
- storageMetadata.setLength(
- -1, -1); // we don't really know the lengths of the strings read
in advance.
+ IValueMeta storageMetadata =
ValueMetaFactory.createParseMeta(valueMeta);
valueMeta.setStorageMetadata(storageMetadata);
valueMeta.setOrigin(origin);
diff --git
a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileCSVImportProgressDialog.java
b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileCSVImportProgressDialog.java
index 18507be2f2..8c8cc3c381 100644
---
a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileCSVImportProgressDialog.java
+++
b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileCSVImportProgressDialog.java
@@ -37,6 +37,7 @@ import org.apache.hop.core.logging.LogChannel;
import org.apache.hop.core.row.IRowMeta;
import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.util.StringEvaluationResult;
import org.apache.hop.core.util.StringEvaluator;
import org.apache.hop.core.util.Utils;
@@ -203,7 +204,7 @@ public class TextFileCSVImportProgressDialog<T extends
ITextFileInputField>
valueMeta.setStorageMetadata(null);
valueMeta.setStorageType(IValueMeta.STORAGE_TYPE_NORMAL);
}
- IRowMeta convertRowMeta =
outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ IRowMeta convertRowMeta =
ValueMetaFactory.createParseRowMeta(outputRowMeta);
ICsvInputAwareMeta<T> inputMeta = meta.clone();
for (int i = 0; i < nrFields; i++) {
diff --git
a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInput.java
b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInput.java
index b41b6ba9f7..7eaaf125d2 100644
---
a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInput.java
+++
b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/fileinput/text/TextFileInput.java
@@ -32,9 +32,9 @@ import org.apache.hop.core.exception.HopTransformException;
import org.apache.hop.core.file.TextFileInputField;
import org.apache.hop.core.playlist.FilePlayListAll;
import org.apache.hop.core.row.IRowMeta;
-import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowDataUtil;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.util.Utils;
import org.apache.hop.core.vfs.HopVfs;
import org.apache.hop.i18n.BaseMessages;
@@ -343,7 +343,7 @@ public class TextFileInput extends
BaseFileInputTransform<TextFileInputMeta, Tex
// their passed-through fields: it takes the row layout of a copy that
received some.
if (passingThru && data.passThruFields == null &&
shared.passThruOutputRowMeta != null) {
data.outputRowMeta = shared.passThruOutputRowMeta.clone();
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
data.nrPassThruFields = shared.nrPassThruFields;
}
}
diff --git
a/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/csvinput/BaseCsvParsingTest.java
b/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/csvinput/BaseCsvParsingTest.java
index 7ba222a1e8..83af1cdb45 100644
---
a/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/csvinput/BaseCsvParsingTest.java
+++
b/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/csvinput/BaseCsvParsingTest.java
@@ -20,8 +20,8 @@ package org.apache.hop.pipeline.transforms.csvinput;
import java.nio.charset.StandardCharsets;
import org.apache.commons.lang3.StringUtils;
import org.apache.hop.core.exception.HopRuntimeException;
-import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.variables.Variables;
import org.apache.hop.pipeline.transforms.file.BaseFileField;
import org.junit.jupiter.api.BeforeEach;
@@ -64,7 +64,7 @@ public abstract class BaseCsvParsingTest
protected void setFields(CsvInputField... fields) throws Exception {
meta.setFields(fields);
meta.getFields(data.outputRowMeta, meta.getName(), null, null, new
Variables(), null);
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
}
/** For BaseFileInput fields. */
diff --git
a/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/fileinput/text/BaseTextParsingTest.java
b/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/fileinput/text/BaseTextParsingTest.java
index 969b61e57f..a14d2d5aa6 100644
---
a/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/fileinput/text/BaseTextParsingTest.java
+++
b/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/fileinput/text/BaseTextParsingTest.java
@@ -20,8 +20,8 @@ package org.apache.hop.pipeline.transforms.fileinput.text;
import java.util.List;
import org.apache.hop.core.file.TextFileInputField;
import org.apache.hop.core.fileinput.InputFile;
-import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.variables.Variables;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
@@ -64,6 +64,6 @@ public abstract class BaseTextParsingTest
protected void setFields(TextFileInputField... fields) throws Exception {
meta.getInputFields().addAll(List.of(fields));
meta.getFields(data.outputRowMeta, meta.getName(), null, null, new
Variables(), null);
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
}
}
diff --git
a/plugins/transforms/tika/src/main/java/org/apache/hop/pipeline/transforms/tika/Tika.java
b/plugins/transforms/tika/src/main/java/org/apache/hop/pipeline/transforms/tika/Tika.java
index b5b0e7de8f..aba8f32cfe 100755
---
a/plugins/transforms/tika/src/main/java/org/apache/hop/pipeline/transforms/tika/Tika.java
+++
b/plugins/transforms/tika/src/main/java/org/apache/hop/pipeline/transforms/tika/Tika.java
@@ -31,9 +31,9 @@ import org.apache.hop.core.exception.HopFileException;
import org.apache.hop.core.exception.HopTransformException;
import org.apache.hop.core.fileinput.FileInputList;
import org.apache.hop.core.io.CountingInputStream;
-import org.apache.hop.core.row.IValueMeta;
import org.apache.hop.core.row.RowDataUtil;
import org.apache.hop.core.row.RowMeta;
+import org.apache.hop.core.row.value.ValueMetaFactory;
import org.apache.hop.core.vfs.HopVfs;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.lineage.LineageFileIoEmitter;
@@ -93,7 +93,7 @@ public class Tika extends BaseTransform<TikaMeta, TikaData> {
// Create convert meta-data objects that will contain Date & Number
formatters
//
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
if (meta.isFileInField()) {
// Check is filename field is provided
@@ -463,7 +463,7 @@ public class Tika extends BaseTransform<TikaMeta, TikaData>
{
// Create convert meta-data objects that will contain Date & Number
formatters
//
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
} catch (Exception e) {
logError("Error at step initialization: " + e.toString());
logError(Const.getStackTracker(e));
diff --git
a/plugins/transforms/validator/src/main/java/org/apache/hop/pipeline/transforms/validator/Validator.java
b/plugins/transforms/validator/src/main/java/org/apache/hop/pipeline/transforms/validator/Validator.java
index 5cde229056..adac94167c 100644
---
a/plugins/transforms/validator/src/main/java/org/apache/hop/pipeline/transforms/validator/Validator.java
+++
b/plugins/transforms/validator/src/main/java/org/apache/hop/pipeline/transforms/validator/Validator.java
@@ -900,7 +900,7 @@ public class Validator extends BaseTransform<ValidatorMeta,
ValidatorData> imple
try {
initBasics(i, field);
- IValueMeta stringMeta = cloneValueMeta(data.constantsMeta[i],
IValueMeta.TYPE_STRING);
+ IValueMeta stringMeta =
ValueMetaFactory.createParseMeta(data.constantsMeta[i]);
initMinMaxValues(i, stringMeta);
initMinStringLength(i);
initMaxStringLength(i);
@@ -1030,8 +1030,4 @@ public class Validator extends
BaseTransform<ValidatorMeta, ValidatorData> imple
int dataType = ValueMetaFactory.getIdForValueMeta(type);
return ValueMetaFactory.createValueMeta(name, dataType);
}
-
- protected IValueMeta cloneValueMeta(IValueMeta valueMeta, int type) throws
HopPluginException {
- return ValueMetaFactory.cloneValueMeta(valueMeta, type);
- }
}
diff --git
a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlData.java
b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlData.java
index b7f94de7ad..7f59eb9f7a 100644
---
a/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlData.java
+++
b/plugins/transforms/xml/src/main/java/org/apache/hop/pipeline/transforms/xml/getxmldata/GetXmlData.java
@@ -477,13 +477,12 @@ public class GetXmlData extends
BaseTransform<GetXmlDataMeta, GetXmlDataData> {
// Create convert meta-data objects that will contain Date & Number
formatters
data.convertRowMeta = new RowMeta();
for (IValueMeta valueMeta : data.convertRowMeta.getValueMetaList()) {
- data.convertRowMeta.addValueMeta(
- ValueMetaFactory.cloneValueMeta(valueMeta,
IValueMeta.TYPE_STRING));
+
data.convertRowMeta.addValueMeta(ValueMetaFactory.createParseMeta(valueMeta));
}
// For String to <type> conversions, we allocate a conversion meta
data row as well...
//
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
// Check is XML field is provided
if (Utils.isEmpty(meta.getXmlField())) {
@@ -845,7 +844,7 @@ public class GetXmlData extends
BaseTransform<GetXmlDataMeta, GetXmlDataData> {
// Create convert meta-data objects that will contain Date & Number
formatters
// For String to <type> conversions, we allocate a conversion meta data
row as well...
//
- data.convertRowMeta =
data.outputRowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ data.convertRowMeta =
ValueMetaFactory.createParseRowMeta(data.outputRowMeta);
}
// Grab a row
Object[] r = getXmlRow();
diff --git a/ui/src/main/java/org/apache/hop/ui/core/dialog/EditRowsDialog.java
b/ui/src/main/java/org/apache/hop/ui/core/dialog/EditRowsDialog.java
index 0cf01cb0b7..7349b335cb 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/dialog/EditRowsDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/dialog/EditRowsDialog.java
@@ -332,8 +332,7 @@ public class EditRowsDialog {
try {
stringRowMeta = new RowMeta();
for (IValueMeta valueMeta : rowMeta.getValueMetaList()) {
- IValueMeta stringValueMeta =
- ValueMetaFactory.cloneValueMeta(valueMeta, IValueMeta.TYPE_STRING);
+ IValueMeta stringValueMeta =
ValueMetaFactory.createParseMeta(valueMeta);
stringRowMeta.addValueMeta(stringValueMeta);
}
diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/TableView.java
b/ui/src/main/java/org/apache/hop/ui/core/widget/TableView.java
index 3b7d162501..2b5080d285 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/widget/TableView.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/widget/TableView.java
@@ -2142,7 +2142,7 @@ public class TableView extends Composite {
public static @NonNull IRowMeta buildTableSourceRowMeta(
IRowMeta rowMeta, IRowMeta conversionRowMeta) throws HopValueException {
- final IRowMeta sourceRowMeta = rowMeta.cloneToType(IValueMeta.TYPE_STRING);
+ final IRowMeta sourceRowMeta =
ValueMetaFactory.createParseRowMeta(rowMeta);
// Set it all to string...
// Also set the storage value metadata: this will allow us to convert back