This is an automated email from the ASF dual-hosted git repository.
hansva 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 edacf6fd41 Remove unused method parameter from ValueDataUtil to
address Sonar warning (#6301)
edacf6fd41 is described below
commit edacf6fd41367af8ceb722a7568d18d17876454b
Author: lance <[email protected]>
AuthorDate: Sat Jan 10 20:49:57 2026 +0800
Remove unused method parameter from ValueDataUtil to address Sonar warning
(#6301)
* Remove ValueDataUtil unused method parameter
Signed-off-by: lance <[email protected]>
* Remove ValueDataUtil unused method parameter
Signed-off-by: lance <[email protected]>
---------
Signed-off-by: lance <[email protected]>
---
.../org/apache/hop/core/row/ValueDataUtil.java | 81 ++++----
.../org/apache/hop/core/row/ValueDataUtilTest.java | 213 +++++++++------------
.../org/apache/hop/core/row/ValueDateUtilTest.java | 24 +--
.../calculations/conversion/EscapeHTML.java | 3 +-
.../calculations/conversion/EscapeSQL.java | 3 +-
.../calculations/conversion/MaskXML.java | 3 +-
.../calculations/conversion/UnescapeHTML.java | 3 +-
.../calculations/conversion/UnescapeXML.java | 3 +-
.../calculations/conversion/UrlDecode.java | 3 +-
.../calculations/conversion/UrlEncode.java | 3 +-
.../calculations/conversion/UseCDATA.java | 3 +-
.../calculator/calculations/date/DateDiff.java | 2 +-
.../calculations/date/DateWorkingDiff.java | 2 +-
.../calculator/calculations/file/ADLER32.java | 3 +-
.../calculator/calculations/file/CRC32.java | 2 +-
.../calculations/file/CheckXMLFileWellFormed.java | 3 +-
.../calculations/file/LoadFileContentBinary.java | 3 +-
.../calculations/file/MessageDigest.java | 2 +-
.../calculations/math/GetOnlyDigits.java | 3 +-
.../calculator/calculations/math/RemoveDigits.java | 3 +-
.../statistics/DamerauLevenshtein.java | 3 +-
.../calculations/statistics/DoubleMetaphone.java | 2 +-
.../calculator/calculations/statistics/Jaro.java | 3 +-
.../calculations/statistics/JaroWinkler.java | 3 +-
.../statistics/LevenshteinDistance.java | 3 +-
.../calculations/statistics/Metaphone.java | 3 +-
.../calculations/statistics/RefinedSoundex.java | 3 +-
.../calculations/statistics/Soundex.java | 3 +-
.../calculator/calculations/text/InitCap.java | 2 +-
.../calculator/calculations/text/LowerCase.java | 3 +-
.../calculator/calculations/text/RemoveCR.java | 3 +-
.../calculator/calculations/text/RemoveCRLF.java | 3 +-
.../calculator/calculations/text/RemoveLF.java | 3 +-
.../calculator/calculations/text/RemoveTab.java | 3 +-
.../calculator/calculations/text/StringLen.java | 3 +-
.../calculator/calculations/text/UpperCase.java | 3 +-
.../calculator/CalculatorValueDataUtilTest.java | 97 ++++------
.../javascript/ScriptValuesAddedFunctions.java | 2 +-
.../stringoperations/StringOperations.java | 2 +-
39 files changed, 221 insertions(+), 291 deletions(-)
diff --git a/core/src/main/java/org/apache/hop/core/row/ValueDataUtil.java
b/core/src/main/java/org/apache/hop/core/row/ValueDataUtil.java
index bbdce6c6e1..218bdc0572 100644
--- a/core/src/main/java/org/apache/hop/core/row/ValueDataUtil.java
+++ b/core/src/main/java/org/apache/hop/core/row/ValueDataUtil.java
@@ -29,6 +29,7 @@ import java.util.Locale;
import java.util.zip.Adler32;
import java.util.zip.CRC32;
import java.util.zip.CheckedInputStream;
+import lombok.experimental.UtilityClass;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.EncoderException;
import org.apache.commons.codec.language.DoubleMetaphone;
@@ -52,6 +53,7 @@ import org.apache.hop.core.util.Utils;
import org.apache.hop.core.vfs.HopVfs;
import org.apache.hop.core.xml.XmlCheck;
+@UtilityClass
public class ValueDataUtil {
private static final Log log = LogFactory.getLog(ValueDataUtil.class);
@@ -124,7 +126,8 @@ public class ValueDataUtil {
private static void throwsErrorOnFileNotFound(FileObject file)
throws HopFileNotFoundException, FileSystemException {
if (file == null || !file.exists()) {
- throw new HopFileNotFoundException("File not found",
file.getName().getPath());
+ throw new HopFileNotFoundException(
+ "File not found", file != null ? file.getName().getPath() : "null");
}
}
@@ -133,8 +136,7 @@ public class ValueDataUtil {
* refer to as the source string (s) and the target string (t). The distance
is the number of
* deletions, insertions, or substitutions required to transform s into t.
*/
- public static Long getLevenshtein_Distance(
- IValueMeta metaA, Object dataA, IValueMeta metaB, Object dataB) {
+ public static Long getLevenshteinDistance(Object dataA, Object dataB) {
if (dataA == null || dataB == null) {
return null;
}
@@ -146,8 +148,7 @@ public class ValueDataUtil {
* refer to as the source string (s) and the target string (t). The distance
is the number of
* deletions, insertions, or substitutions required to transform s into t.
*/
- public static Long getDamerauLevenshtein_Distance(
- IValueMeta metaA, Object dataA, IValueMeta metaB, Object dataB) {
+ public static Long getDamerauLevenshteinDistance(Object dataA, Object dataB)
{
if (dataA == null || dataB == null) {
return null;
}
@@ -158,8 +159,7 @@ public class ValueDataUtil {
* Jaro similitude is a measure of the similarity between two strings, which
we will refer to as
* the source string (s) and the target string (t).
*/
- public static Double getJaro_Similitude(
- IValueMeta metaA, Object dataA, IValueMeta metaB, Object dataB) {
+ public static Double getJaroSimilitude(Object dataA, Object dataB) {
if (dataA == null || dataB == null) {
return null;
}
@@ -172,8 +172,7 @@ public class ValueDataUtil {
* JaroWinkler similitude is a measure of the similarity between two
strings, which we will refer
* to as the source string (s) and the target string (t).
*/
- public static Double getJaroWinkler_Similitude(
- IValueMeta metaA, Object dataA, IValueMeta metaB, Object dataB) {
+ public static Double getJaroWinklerSimilitude(Object dataA, Object dataB) {
if (dataA == null || dataB == null) {
return null;
}
@@ -182,140 +181,140 @@ public class ValueDataUtil {
return pjwd.getJaroWinklerDistance();
}
- public static String get_Metaphone(IValueMeta metaA, Object dataA) {
+ public static String getMetaphone(Object dataA) {
if (dataA == null) {
return null;
}
return (new Metaphone()).metaphone(dataA.toString());
}
- public static String get_Double_Metaphone(IValueMeta metaA, Object dataA) {
+ public static String getDoubleMetaphone(Object dataA) {
if (dataA == null) {
return null;
}
return (new DoubleMetaphone()).doubleMetaphone(dataA.toString());
}
- public static String get_SoundEx(IValueMeta metaA, Object dataA) {
+ public static String getSoundEx(Object dataA) {
if (dataA == null) {
return null;
}
return (new Soundex()).encode(dataA.toString());
}
- public static String get_RefinedSoundEx(IValueMeta metaA, Object dataA) {
+ public static String getRefinedSoundEx(Object dataA) {
if (dataA == null) {
return null;
}
return (new RefinedSoundex()).encode(dataA.toString());
}
- public static String initCap(IValueMeta metaA, Object dataA) {
+ public static String initCap(Object dataA) {
if (dataA == null) {
return null;
}
return WordUtils.capitalizeFully(dataA.toString(), new char[] {' ', '_',
',', ':', ';', '-'});
}
- public static String upperCase(IValueMeta metaA, Object dataA) {
+ public static String upperCase(Object dataA) {
if (dataA == null) {
return null;
}
return dataA.toString().toUpperCase();
}
- public static String lowerCase(IValueMeta metaA, Object dataA) {
+ public static String lowerCase(Object dataA) {
if (dataA == null) {
return null;
}
return dataA.toString().toLowerCase();
}
- public static String escapeXml(IValueMeta metaA, Object dataA) {
+ public static String escapeXml(Object dataA) {
if (dataA == null) {
return null;
}
return Const.escapeXml(dataA.toString());
}
- public static String unEscapeXml(IValueMeta metaA, Object dataA) {
+ public static String unEscapeXml(Object dataA) {
if (dataA == null) {
return null;
}
return Const.unEscapeXml(dataA.toString());
}
- public static String escapeHtml(IValueMeta metaA, Object dataA) {
+ public static String escapeHtml(Object dataA) {
if (dataA == null) {
return null;
}
return Const.escapeHtml(dataA.toString());
}
- public static String unEscapeHtml(IValueMeta metaA, Object dataA) {
+ public static String unEscapeHtml(Object dataA) {
if (dataA == null) {
return null;
}
return Const.unEscapeHtml(dataA.toString());
}
- public static String escapeSql(IValueMeta metaA, Object dataA) {
+ public static String escapeSql(Object dataA) {
if (dataA == null) {
return null;
}
return Const.escapeSql(dataA.toString());
}
- public static String useCDATA(IValueMeta metaA, Object dataA) {
+ public static String useCDATA(Object dataA) {
if (dataA == null) {
return null;
}
return "<![CDATA[" + dataA + "]]>";
}
- public static String removeCR(IValueMeta metaA, Object dataA) {
+ public static String removeCR(Object dataA) {
if (dataA == null) {
return null;
}
return Const.removeCR(dataA.toString());
}
- public static String removeLF(IValueMeta metaA, Object dataA) {
+ public static String removeLF(Object dataA) {
if (dataA == null) {
return null;
}
return Const.removeLF(dataA.toString());
}
- public static String removeCRLF(IValueMeta metaA, Object dataA) {
+ public static String removeCRLF(Object dataA) {
if (dataA == null) {
return null;
}
return Const.removeCRLF(dataA.toString());
}
- public static String removeTAB(IValueMeta metaA, Object dataA) {
+ public static String removeTAB(Object dataA) {
if (dataA == null) {
return null;
}
return Const.removeTAB(dataA.toString());
}
- public static String getDigits(IValueMeta metaA, Object dataA) {
+ public static String getDigits(Object dataA) {
if (dataA == null) {
return null;
}
return Const.getDigitsOnly(dataA.toString());
}
- public static String removeDigits(IValueMeta metaA, Object dataA) {
+ public static String removeDigits(Object dataA) {
if (dataA == null) {
return null;
}
return Const.removeDigits(dataA.toString());
}
- public static long stringLen(IValueMeta metaA, Object dataA) {
+ public static long stringLen(Object dataA) {
if (dataA == null) {
return 0;
}
@@ -323,15 +322,13 @@ public class ValueDataUtil {
}
/**
- * @param metaA The IValueMeta
* @param dataA Filename
* @param type Algorithm to be used when computing the checksum (MD5 or
SHA-1)
* @param failIfNoFile Indicates if the pipeline should fail if no file is
found
* @return File's checksum
* @throws HopFileNotFoundException
*/
- public static String createChecksum(
- IValueMeta metaA, Object dataA, String type, boolean failIfNoFile)
+ public static String createChecksum(Object dataA, String type, boolean
failIfNoFile)
throws HopFileNotFoundException {
if (dataA == null) {
return null;
@@ -372,13 +369,12 @@ public class ValueDataUtil {
}
/**
- * @param metaA The IValueMeta
* @param dataA Filename
* @param failIfNoFile Indicates if the pipeline should fail if no file is
found
* @return File's CRC32 checksum
* @throws HopFileNotFoundException
*/
- public static Long checksumCRC32(IValueMeta metaA, Object dataA, boolean
failIfNoFile)
+ public static Long checksumCRC32(Object dataA, boolean failIfNoFile)
throws HopFileNotFoundException {
long checksum = 0;
@@ -417,13 +413,12 @@ public class ValueDataUtil {
}
/**
- * @param metaA The IValueMeta
* @param dataA Filename
* @param failIfNoFile Indicates if the pipeline should fail if no file is
found
* @return File's Adler32 checksum
* @throws HopFileNotFoundException
*/
- public static Long checksumAdler32(IValueMeta metaA, Object dataA, boolean
failIfNoFile)
+ public static Long checksumAdler32(Object dataA, boolean failIfNoFile)
throws HopFileNotFoundException {
long checksum = 0;
@@ -570,14 +565,13 @@ public class ValueDataUtil {
}
/**
- * @param metaA The IValueMeta
* @param dataA Filename
* @param failIfNoFile Indicates if the pipeline should fail if no file is
found
* @return File's content in binary
* @throws HopValueException
* @throws HopFileNotFoundException
*/
- public static byte[] loadFileContentInBinary(IValueMeta metaA, Object dataA,
boolean failIfNoFile)
+ public static byte[] loadFileContentInBinary(Object dataA, boolean
failIfNoFile)
throws HopValueException, HopFileNotFoundException {
if (dataA == null) {
return null;
@@ -1303,7 +1297,7 @@ public class ValueDataUtil {
* @return Number of days
* @throws HopValueException
*/
- public static Object DateDiff(
+ public static Object dateDiff(
IValueMeta metaA, Object dataA, IValueMeta metaB, Object dataB, String
resultType)
throws HopValueException {
@@ -1344,7 +1338,7 @@ public class ValueDataUtil {
}
}
- public static Object DateWorkingDiff(
+ public static Object dateWorkingDiff(
IValueMeta metaA, Object dataA, IValueMeta metaB, Object dataB) throws
HopValueException {
if (dataA != null && dataB != null) {
Date fromDate = metaB.getDate(dataB);
@@ -1819,13 +1813,12 @@ public class ValueDataUtil {
/**
* Checks an xml file is well formed.
*
- * @param metaA The IValueMeta
* @param dataA The value (filename)
* @param failIfNoFile Indicates if the pipeline should fail if no file is
found
* @return true if the file is well formed.
* @throws HopFileNotFoundException
*/
- public static boolean isXmlFileWellFormed(IValueMeta metaA, Object dataA,
boolean failIfNoFile)
+ public static boolean isXmlFileWellFormed(Object dataA, boolean failIfNoFile)
throws HopFileNotFoundException {
if (dataA == null) {
return false;
@@ -1928,7 +1921,7 @@ public class ValueDataUtil {
};
}
- public static String urlEncode(IValueMeta metaA, Object dataA) {
+ public static String urlEncode(Object dataA) {
if (dataA == null) {
return null;
}
@@ -1939,7 +1932,7 @@ public class ValueDataUtil {
}
}
- public static String urlDecode(IValueMeta metaA, Object dataA) {
+ public static String urlDecode(Object dataA) {
if (dataA == null) {
return null;
}
diff --git a/core/src/test/java/org/apache/hop/core/row/ValueDataUtilTest.java
b/core/src/test/java/org/apache/hop/core/row/ValueDataUtilTest.java
index e9afec4a87..295adb1a6a 100644
--- a/core/src/test/java/org/apache/hop/core/row/ValueDataUtilTest.java
+++ b/core/src/test/java/org/apache/hop/core/row/ValueDataUtilTest.java
@@ -19,6 +19,7 @@ package org.apache.hop.core.row;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
@@ -58,207 +59,200 @@ public class ValueDataUtilTest {
@Test
public void checksumTest() throws Exception {
String path = getClass().getResource("txt-sample.txt").getPath();
- String checksum = ValueDataUtil.createChecksum(new ValueMetaString(),
path, "MD5", false);
+ String checksum = ValueDataUtil.createChecksum(path, "MD5", false);
assertEquals("098f6bcd4621d373cade4e832627b4f6", checksum);
}
@Test
public void checksumMissingFileTest() throws Exception {
String nonExistingFile = "nonExistingFile";
- String checksum =
- ValueDataUtil.createChecksum(new ValueMetaString(), nonExistingFile,
"MD5", false);
+ String checksum = ValueDataUtil.createChecksum(nonExistingFile, "MD5",
false);
assertNull(checksum);
}
@Test
public void checksumWithFailIfNoFileTest() throws Exception {
String path = getClass().getResource("txt-sample.txt").getPath();
- String checksum = ValueDataUtil.createChecksum(new ValueMetaString(),
path, "MD5", true);
+ String checksum = ValueDataUtil.createChecksum(path, "MD5", true);
assertEquals("098f6bcd4621d373cade4e832627b4f6", checksum);
}
@Test(expected = HopFileNotFoundException.class)
public void checksumFailIfNoFileTest() throws HopFileNotFoundException {
String nonExistingPath = "nonExistingPath";
- ValueDataUtil.createChecksum(new ValueMetaString(), nonExistingPath,
"MD5", true);
+ ValueDataUtil.createChecksum(nonExistingPath, "MD5", true);
}
@Test
public void checksumNullPathNoFailTest() throws HopFileNotFoundException {
- assertNull(ValueDataUtil.createChecksum(new ValueMetaString(), null,
"MD5", false));
+ assertNull(ValueDataUtil.createChecksum(null, "MD5", false));
}
@Test
public void checksumNullPathFailTest() throws HopFileNotFoundException {
- assertNull(ValueDataUtil.createChecksum(new ValueMetaString(), null,
"MD5", true));
+ assertNull(ValueDataUtil.createChecksum(null, "MD5", true));
}
@Test
public void checksumCRC32Test() throws Exception {
String path = getClass().getResource("txt-sample.txt").getPath();
- long checksum = ValueDataUtil.checksumCRC32(new ValueMetaString(), path,
false);
+ long checksum = ValueDataUtil.checksumCRC32(path, false);
assertEquals(3632233996l, checksum);
}
@Test
public void checksumCRC32MissingFileTest() throws Exception {
String nonExistingFile = "nonExistingFile";
- long checksum = ValueDataUtil.checksumCRC32(new ValueMetaString(),
nonExistingFile, false);
+ long checksum = ValueDataUtil.checksumCRC32(nonExistingFile, false);
assertEquals(0, checksum);
}
@Test
public void checksumCRC32NoFailIfNoFileTest() throws
HopFileNotFoundException {
String nonExistingPath = "nonExistingPath";
- long checksum = ValueDataUtil.checksumCRC32(new ValueMetaString(),
nonExistingPath, false);
+ long checksum = ValueDataUtil.checksumCRC32(nonExistingPath, false);
assertEquals(0, checksum);
}
@Test(expected = HopFileNotFoundException.class)
public void checksumCRC32FailIfNoFileTest() throws HopFileNotFoundException {
String nonExistingPath = "nonExistingPath";
- ValueDataUtil.checksumCRC32(new ValueMetaString(), nonExistingPath, true);
+ ValueDataUtil.checksumCRC32(nonExistingPath, true);
}
@Test
public void checksumCRC32NullPathNoFailTest() throws
HopFileNotFoundException {
- long checksum = ValueDataUtil.checksumCRC32(new ValueMetaString(), null,
false);
+ long checksum = ValueDataUtil.checksumCRC32(null, false);
assertEquals(0, checksum);
}
@Test
public void checksumCRC32NullPathFailTest() throws HopFileNotFoundException {
- long checksum = ValueDataUtil.checksumCRC32(new ValueMetaString(), null,
true);
+ long checksum = ValueDataUtil.checksumCRC32(null, true);
assertEquals(0, checksum);
}
@Test
public void checksumAdlerWithFailIfNoFileTest() throws Exception {
String path = getClass().getResource("txt-sample.txt").getPath();
- long checksum = ValueDataUtil.checksumAdler32(new ValueMetaString(), path,
true);
+ long checksum = ValueDataUtil.checksumAdler32(path, true);
assertEquals(73204161L, checksum);
}
@Test
public void checksumAdlerWithoutFailIfNoFileTest() throws Exception {
String path = getClass().getResource("txt-sample.txt").getPath();
- long checksum = ValueDataUtil.checksumAdler32(new ValueMetaString(), path,
false);
+ long checksum = ValueDataUtil.checksumAdler32(path, false);
assertEquals(73204161L, checksum);
}
@Test
public void checksumAdlerNoFailIfNoFileTest() throws
HopFileNotFoundException {
String nonExistingPath = "nonExistingPath";
- long checksum = ValueDataUtil.checksumAdler32(new ValueMetaString(),
nonExistingPath, false);
+ long checksum = ValueDataUtil.checksumAdler32(nonExistingPath, false);
assertEquals(0, checksum);
}
@Test(expected = HopFileNotFoundException.class)
public void checksumAdlerFailIfNoFileTest() throws HopFileNotFoundException {
String nonExistingPath = "nonExistingPath";
- ValueDataUtil.checksumAdler32(new ValueMetaString(), nonExistingPath,
true);
+ ValueDataUtil.checksumAdler32(nonExistingPath, true);
}
@Test
public void checksumAdlerNullPathNoFailTest() throws
HopFileNotFoundException {
- long checksum = ValueDataUtil.checksumAdler32(new ValueMetaString(), null,
false);
+ long checksum = ValueDataUtil.checksumAdler32(null, false);
assertEquals(0, checksum);
}
@Test
public void checksumAdlerNullPathFailTest() throws HopFileNotFoundException {
- long checksum = ValueDataUtil.checksumAdler32(new ValueMetaString(), null,
true);
+ long checksum = ValueDataUtil.checksumAdler32(null, true);
assertEquals(0, checksum);
}
@Test
public void xmlFileWellFormedTest() throws HopFileNotFoundException {
String xmlFilePath = getClass().getResource("xml-sample.xml").getPath();
- boolean wellFormed =
- ValueDataUtil.isXmlFileWellFormed(new ValueMetaString(), xmlFilePath,
true);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(xmlFilePath, true);
assertTrue(wellFormed);
}
@Test
public void xmlFileBadlyFormedTest() throws HopFileNotFoundException {
String invalidXmlFilePath =
getClass().getResource("invalid-xml-sample.xml").getPath();
- boolean wellFormed =
- ValueDataUtil.isXmlFileWellFormed(new ValueMetaString(),
invalidXmlFilePath, true);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(invalidXmlFilePath,
true);
assertFalse(wellFormed);
}
@Test
public void xmlFileWellFormedWithoutFailIfNoFileTest() throws
HopFileNotFoundException {
String xmlFilePath = getClass().getResource("xml-sample.xml").getPath();
- boolean wellFormed =
- ValueDataUtil.isXmlFileWellFormed(new ValueMetaString(), xmlFilePath,
false);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(xmlFilePath, false);
assertTrue(wellFormed);
}
@Test
public void xmlFileBadlyFormedWithNoFailIfNoFileTest() throws
HopFileNotFoundException {
String invalidXmlFilePath =
getClass().getResource("invalid-xml-sample.xml").getPath();
- boolean wellFormed =
- ValueDataUtil.isXmlFileWellFormed(new ValueMetaString(),
invalidXmlFilePath, false);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(invalidXmlFilePath,
false);
assertFalse(wellFormed);
}
@Test
public void xmlFileWellFormedNoFailIfNoFileTest() throws
HopFileNotFoundException {
String nonExistingPath = "nonExistingPath";
- boolean wellFormed =
- ValueDataUtil.isXmlFileWellFormed(new ValueMetaString(),
nonExistingPath, false);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(nonExistingPath,
false);
assertFalse(wellFormed);
}
@Test(expected = HopFileNotFoundException.class)
public void xmlFileWellFormedFailIfNoFileTest() throws
HopFileNotFoundException {
String nonExistingPath = "nonExistingPath";
- ValueDataUtil.isXmlFileWellFormed(new ValueMetaString(), nonExistingPath,
true);
+ ValueDataUtil.isXmlFileWellFormed(nonExistingPath, true);
}
@Test
public void xmlFileWellFormedNullPathNoFailTest() throws
HopFileNotFoundException {
- boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(new
ValueMetaString(), null, false);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(null, false);
assertFalse(wellFormed);
}
@Test
public void xmlFileWellFormedNullPathFailTest() throws
HopFileNotFoundException {
- boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(new
ValueMetaString(), null, true);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(null, true);
assertFalse(wellFormed);
}
@Test
public void loadFileContentInBinary() throws Exception {
String path = getClass().getResource("txt-sample.txt").getPath();
- byte[] content = ValueDataUtil.loadFileContentInBinary(new
ValueMetaString(), path, true);
+ byte[] content = ValueDataUtil.loadFileContentInBinary(path, true);
assertTrue(Arrays.equals("test".getBytes(), content));
}
@Test
public void loadFileContentInBinaryNoFailIfNoFileTest() throws Exception {
String nonExistingPath = "nonExistingPath";
- assertNull(
- ValueDataUtil.loadFileContentInBinary(new ValueMetaString(),
nonExistingPath, false));
+ assertNull(ValueDataUtil.loadFileContentInBinary(nonExistingPath, false));
}
@Test(expected = HopFileNotFoundException.class)
public void loadFileContentInBinaryFailIfNoFileTest()
throws HopFileNotFoundException, HopValueException {
String nonExistingPath = "nonExistingPath";
- ValueDataUtil.loadFileContentInBinary(new ValueMetaString(),
nonExistingPath, true);
+ ValueDataUtil.loadFileContentInBinary(nonExistingPath, true);
}
@Test
public void loadFileContentInBinaryNullPathNoFailTest() throws Exception {
- assertNull(ValueDataUtil.loadFileContentInBinary(new ValueMetaString(),
null, false));
+ assertNull(ValueDataUtil.loadFileContentInBinary(null, false));
}
@Test
public void loadFileContentInBinaryNullPathFailTest()
throws HopFileNotFoundException, HopValueException {
- assertNull(ValueDataUtil.loadFileContentInBinary(new ValueMetaString(),
null, true));
+ assertNull(ValueDataUtil.loadFileContentInBinary(null, true));
}
@Test
@@ -392,148 +386,131 @@ public class ValueDataUtilTest {
// String manipulation tests
@Test
public void testInitCap() {
- assertEquals("Hello World", ValueDataUtil.initCap(new ValueMetaString(),
"hello world"));
- assertEquals("Apache Hop", ValueDataUtil.initCap(new ValueMetaString(),
"apache hop"));
- assertNull(ValueDataUtil.initCap(new ValueMetaString(), null));
+ assertEquals("Hello World", ValueDataUtil.initCap("hello world"));
+ assertEquals("Apache Hop", ValueDataUtil.initCap("apache hop"));
+ assertNull(ValueDataUtil.initCap(null));
}
@Test
public void testUpperCase() {
- assertEquals("HELLO", ValueDataUtil.upperCase(new ValueMetaString(),
"hello"));
- assertEquals("APACHE HOP", ValueDataUtil.upperCase(new ValueMetaString(),
"Apache Hop"));
- assertNull(ValueDataUtil.upperCase(new ValueMetaString(), null));
+ assertEquals("HELLO", ValueDataUtil.upperCase("hello"));
+ assertEquals("APACHE HOP", ValueDataUtil.upperCase("Apache Hop"));
+ assertNull(ValueDataUtil.upperCase(null));
}
@Test
public void testLowerCase() {
- assertEquals("hello", ValueDataUtil.lowerCase(new ValueMetaString(),
"HELLO"));
- assertEquals("apache hop", ValueDataUtil.lowerCase(new ValueMetaString(),
"Apache Hop"));
- assertNull(ValueDataUtil.lowerCase(new ValueMetaString(), null));
+ assertEquals("hello", ValueDataUtil.lowerCase("HELLO"));
+ assertEquals("apache hop", ValueDataUtil.lowerCase("Apache Hop"));
+ assertNull(ValueDataUtil.lowerCase(null));
}
@Test
public void testRemoveCR() {
- assertEquals("helloworld", ValueDataUtil.removeCR(new ValueMetaString(),
"hello\rworld"));
- assertNull(ValueDataUtil.removeCR(new ValueMetaString(), null));
+ assertEquals("helloworld", ValueDataUtil.removeCR("hello\rworld"));
+ assertNull(ValueDataUtil.removeCR(null));
}
@Test
public void testRemoveLF() {
- assertEquals("helloworld", ValueDataUtil.removeLF(new ValueMetaString(),
"hello\nworld"));
- assertNull(ValueDataUtil.removeLF(new ValueMetaString(), null));
+ assertEquals("helloworld", ValueDataUtil.removeLF("hello\nworld"));
+ assertNull(ValueDataUtil.removeLF(null));
}
@Test
public void testRemoveCRLF() {
- assertEquals("helloworld", ValueDataUtil.removeCRLF(new ValueMetaString(),
"hello\r\nworld"));
- assertNull(ValueDataUtil.removeCRLF(new ValueMetaString(), null));
+ assertEquals("helloworld", ValueDataUtil.removeCRLF("hello\r\nworld"));
+ assertNull(ValueDataUtil.removeCRLF(null));
}
@Test
public void testRemoveTAB() {
- assertEquals("helloworld", ValueDataUtil.removeTAB(new ValueMetaString(),
"hello\tworld"));
- assertNull(ValueDataUtil.removeTAB(new ValueMetaString(), null));
+ assertEquals("helloworld", ValueDataUtil.removeTAB("hello\tworld"));
+ assertNull(ValueDataUtil.removeTAB(null));
}
@Test
public void testGetDigits() {
- assertEquals("123", ValueDataUtil.getDigits(new ValueMetaString(),
"abc123def"));
- assertEquals("", ValueDataUtil.getDigits(new ValueMetaString(), "abcdef"));
- assertNull(ValueDataUtil.getDigits(new ValueMetaString(), null));
+ assertEquals("123", ValueDataUtil.getDigits("abc123def"));
+ assertEquals("", ValueDataUtil.getDigits("abcdef"));
+ assertNull(ValueDataUtil.getDigits(null));
}
@Test
public void testRemoveDigits() {
- assertEquals("abcdef", ValueDataUtil.removeDigits(new ValueMetaString(),
"abc123def"));
- assertEquals("abcdef", ValueDataUtil.removeDigits(new ValueMetaString(),
"abcdef"));
- assertNull(ValueDataUtil.removeDigits(new ValueMetaString(), null));
+ assertEquals("abcdef", ValueDataUtil.removeDigits("abc123def"));
+ assertEquals("abcdef", ValueDataUtil.removeDigits("abcdef"));
+ assertNull(ValueDataUtil.removeDigits(null));
}
@Test
public void testStringLen() {
- assertEquals(5, ValueDataUtil.stringLen(new ValueMetaString(), "hello"));
- assertEquals(0, ValueDataUtil.stringLen(new ValueMetaString(), ""));
- assertEquals(0, ValueDataUtil.stringLen(new ValueMetaString(), null));
+ assertEquals(5, ValueDataUtil.stringLen("hello"));
+ assertEquals(0, ValueDataUtil.stringLen(""));
+ assertEquals(0, ValueDataUtil.stringLen(null));
}
// String distance/similarity tests
@Test
public void testLevenshteinDistance() {
- Long distance =
- ValueDataUtil.getLevenshtein_Distance(
- new ValueMetaString(), "kitten", new ValueMetaString(), "sitting");
+ Long distance = ValueDataUtil.getLevenshteinDistance("kitten", "sitting");
assertEquals(Long.valueOf(3), distance);
- assertNull(
- ValueDataUtil.getLevenshtein_Distance(
- new ValueMetaString(), null, new ValueMetaString(), "test"));
- assertNull(
- ValueDataUtil.getLevenshtein_Distance(
- new ValueMetaString(), "test", new ValueMetaString(), null));
+ assertNull(ValueDataUtil.getLevenshteinDistance(null, "test"));
+ assertNull(ValueDataUtil.getLevenshteinDistance("test", null));
}
@Test
public void testDamerauLevenshteinDistance() {
- Long distance =
- ValueDataUtil.getDamerauLevenshtein_Distance(
- new ValueMetaString(), "abc", new ValueMetaString(), "acb");
+ Long distance = ValueDataUtil.getDamerauLevenshteinDistance("abc", "acb");
assertEquals(Long.valueOf(1), distance);
- assertNull(
- ValueDataUtil.getDamerauLevenshtein_Distance(
- new ValueMetaString(), null, new ValueMetaString(), "test"));
+ assertNull(ValueDataUtil.getDamerauLevenshteinDistance(null, "test"));
}
@Test
public void testJaroSimilitude() {
- Double similarity =
- ValueDataUtil.getJaro_Similitude(
- new ValueMetaString(), "martha", new ValueMetaString(), "marhta");
+ Double similarity = ValueDataUtil.getJaroSimilitude("martha", "marhta");
assertTrue(similarity > 0.9);
- assertNull(
- ValueDataUtil.getJaro_Similitude(
- new ValueMetaString(), null, new ValueMetaString(), "test"));
+ assertNull(ValueDataUtil.getJaroSimilitude(null, "test"));
}
@Test
public void testJaroWinklerSimilitude() {
- Double similarity =
- ValueDataUtil.getJaroWinkler_Similitude(
- new ValueMetaString(), "martha", new ValueMetaString(), "marhta");
+ Double similarity = ValueDataUtil.getJaroWinklerSimilitude("martha",
"marhta");
assertTrue(similarity > 0.9);
- assertNull(
- ValueDataUtil.getJaroWinkler_Similitude(
- new ValueMetaString(), null, new ValueMetaString(), "test"));
+ assertNull(ValueDataUtil.getJaroWinklerSimilitude(null, "test"));
}
// Phonetic algorithms tests
@Test
public void testMetaphone() {
- String metaphone = ValueDataUtil.get_Metaphone(new ValueMetaString(),
"hello");
+ String metaphone = ValueDataUtil.getMetaphone("hello");
assertEquals("HL", metaphone);
- assertNull(ValueDataUtil.get_Metaphone(new ValueMetaString(), null));
+ assertNull(ValueDataUtil.getMetaphone(null));
}
@Test
public void testDoubleMetaphone() {
- String doubleMetaphone = ValueDataUtil.get_Double_Metaphone(new
ValueMetaString(), "hello");
+ String doubleMetaphone = ValueDataUtil.getDoubleMetaphone("hello");
assertEquals("HL", doubleMetaphone);
- assertNull(ValueDataUtil.get_Double_Metaphone(new ValueMetaString(),
null));
+ assertNull(ValueDataUtil.getDoubleMetaphone(null));
}
@Test
public void testSoundEx() {
- String soundex = ValueDataUtil.get_SoundEx(new ValueMetaString(), "hello");
+ String soundex = ValueDataUtil.getSoundEx("hello");
assertEquals("H400", soundex);
- assertNull(ValueDataUtil.get_SoundEx(new ValueMetaString(), null));
+ assertNull(ValueDataUtil.getSoundEx(null));
}
@Test
public void testRefinedSoundEx() {
- String refinedSoundex = ValueDataUtil.get_RefinedSoundEx(new
ValueMetaString(), "hello");
- assertNull(ValueDataUtil.get_RefinedSoundEx(new ValueMetaString(), null));
+ String refinedSoundex = ValueDataUtil.getRefinedSoundEx("hello");
+ assertNotNull(refinedSoundex);
+ assertNull(ValueDataUtil.getRefinedSoundEx(null));
}
// Math operations tests
@@ -712,16 +689,16 @@ public class ValueDataUtilTest {
// URL encoding/decoding tests
@Test
public void testUrlEncode() {
- String encoded = ValueDataUtil.urlEncode(new ValueMetaString(), "hello
world");
+ String encoded = ValueDataUtil.urlEncode("hello world");
assertEquals("hello+world", encoded);
- assertNull(ValueDataUtil.urlEncode(new ValueMetaString(), null));
+ assertNull(ValueDataUtil.urlEncode(null));
}
@Test
public void testUrlDecode() {
- String decoded = ValueDataUtil.urlDecode(new ValueMetaString(),
"hello+world");
+ String decoded = ValueDataUtil.urlDecode("hello+world");
assertEquals("hello world", decoded);
- assertNull(ValueDataUtil.urlDecode(new ValueMetaString(), null));
+ assertNull(ValueDataUtil.urlDecode(null));
}
// Hex encoding/decoding tests
@@ -740,30 +717,30 @@ public class ValueDataUtilTest {
// XML/HTML escape tests
@Test
public void testEscapeXml() {
- String escaped = ValueDataUtil.escapeXml(new ValueMetaString(), "<hello>");
+ String escaped = ValueDataUtil.escapeXml("<hello>");
assertTrue(escaped.contains("<") && escaped.contains(">"));
- assertNull(ValueDataUtil.escapeXml(new ValueMetaString(), null));
+ assertNull(ValueDataUtil.escapeXml(null));
}
@Test
public void testUnEscapeXml() {
- String unescaped = ValueDataUtil.unEscapeXml(new ValueMetaString(),
"<hello>");
+ String unescaped = ValueDataUtil.unEscapeXml("<hello>");
assertEquals("<hello>", unescaped);
- assertNull(ValueDataUtil.unEscapeXml(new ValueMetaString(), null));
+ assertNull(ValueDataUtil.unEscapeXml(null));
}
@Test
public void testEscapeHtml() {
- String escaped = ValueDataUtil.escapeHtml(new ValueMetaString(),
"<hello>");
+ String escaped = ValueDataUtil.escapeHtml("<hello>");
assertTrue(escaped.contains("<") && escaped.contains(">"));
- assertNull(ValueDataUtil.escapeHtml(new ValueMetaString(), null));
+ assertNull(ValueDataUtil.escapeHtml(null));
}
@Test
public void testUnEscapeHtml() {
- String unescaped = ValueDataUtil.unEscapeHtml(new ValueMetaString(),
"<hello>");
+ String unescaped = ValueDataUtil.unEscapeHtml("<hello>");
assertEquals("<hello>", unescaped);
- assertNull(ValueDataUtil.unEscapeHtml(new ValueMetaString(), null));
+ assertNull(ValueDataUtil.unEscapeHtml(null));
}
// Test getZeroForValueMetaType
@@ -847,17 +824,17 @@ public class ValueDataUtilTest {
// SQL escape test
@Test
public void testEscapeSql() {
- String escaped = ValueDataUtil.escapeSql(new ValueMetaString(),
"O'Reilly");
+ String escaped = ValueDataUtil.escapeSql("O'Reilly");
assertEquals("O''Reilly", escaped);
- assertNull(ValueDataUtil.escapeSql(new ValueMetaString(), null));
+ assertNull(ValueDataUtil.escapeSql(null));
}
// CDATA test
@Test
public void testUseCDATA() {
- String cdata = ValueDataUtil.useCDATA(new ValueMetaString(),
"<test>data</test>");
+ String cdata = ValueDataUtil.useCDATA("<test>data</test>");
assertTrue(cdata.startsWith("<![CDATA[") && cdata.endsWith("]]>"));
- assertNull(ValueDataUtil.useCDATA(new ValueMetaString(), null));
+ assertNull(ValueDataUtil.useCDATA(null));
}
// Percentage functions tests
@@ -1119,7 +1096,7 @@ public class ValueDataUtilTest {
Date date2 = cal2.getTime();
Long diff =
- (Long) ValueDataUtil.DateDiff(new ValueMetaDate(), date2, new
ValueMetaDate(), date1, "d");
+ (Long) ValueDataUtil.dateDiff(new ValueMetaDate(), date2, new
ValueMetaDate(), date1, "d");
assertEquals(Long.valueOf(5), diff);
}
@@ -1134,7 +1111,7 @@ public class ValueDataUtilTest {
Date date2 = cal2.getTime();
Long diff =
- (Long) ValueDataUtil.DateDiff(new ValueMetaDate(), date2, new
ValueMetaDate(), date1, "h");
+ (Long) ValueDataUtil.dateDiff(new ValueMetaDate(), date2, new
ValueMetaDate(), date1, "h");
assertEquals(Long.valueOf(5), diff);
}
@@ -1149,7 +1126,7 @@ public class ValueDataUtilTest {
Date date2 = cal2.getTime();
Long diff =
- (Long) ValueDataUtil.DateDiff(new ValueMetaDate(), date2, new
ValueMetaDate(), date1, "mn");
+ (Long) ValueDataUtil.dateDiff(new ValueMetaDate(), date2, new
ValueMetaDate(), date1, "mn");
assertEquals(Long.valueOf(30), diff);
}
diff --git a/core/src/test/java/org/apache/hop/core/row/ValueDateUtilTest.java
b/core/src/test/java/org/apache/hop/core/row/ValueDateUtilTest.java
index e82b884032..12b7dc8327 100644
--- a/core/src/test/java/org/apache/hop/core/row/ValueDateUtilTest.java
+++ b/core/src/test/java/org/apache/hop/core/row/ValueDateUtilTest.java
@@ -71,7 +71,7 @@ public class ValueDateUtilTest {
startDate.setTimeInMillis(1230768000000L); // 2009-01-01 00:00:00
endDate.setTimeInMillis(1233360000000L); // 2009-01-31 00:00:00
Object workingDayOfJAN =
- ValueDataUtil.DateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
+ ValueDataUtil.dateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
assertEquals("Working days count in JAN ", 22L, workingDayOfJAN);
}
@@ -84,7 +84,7 @@ public class ValueDateUtilTest {
startDate.setTimeInMillis(1233446400000L); // 2009-02-01 00:00:00
endDate.setTimeInMillis(1235779200000L); // 2009-02-28 00:00:00
Object workingDayOfFEB =
- ValueDataUtil.DateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
+ ValueDataUtil.dateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
assertEquals("Working days count in FEB ", 20L, workingDayOfFEB);
}
@@ -97,7 +97,7 @@ public class ValueDateUtilTest {
startDate.setTimeInMillis(1235865600000L); // 2009-03-01 00:00:00
endDate.setTimeInMillis(1238457600000L); // 2009-03-31 00:00:00
Object workingDayOfMAR =
- ValueDataUtil.DateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
+ ValueDataUtil.dateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
assertEquals("Working days count in MAR ", 22L, workingDayOfMAR);
}
@@ -110,7 +110,7 @@ public class ValueDateUtilTest {
startDate.setTimeInMillis(1238544000000L); // 2009-04-01 00:00:00
endDate.setTimeInMillis(1241049600000L); // 2009-04-30 00:00:00
Object workingDayOfAPR =
- ValueDataUtil.DateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
+ ValueDataUtil.dateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
assertEquals("Working days count in APR ", 22L, workingDayOfAPR);
}
@@ -123,7 +123,7 @@ public class ValueDateUtilTest {
startDate.setTimeInMillis(1241136000000L); // 2009-05-01 00:00:00
endDate.setTimeInMillis(1243728000000L); // 2009-05-31 00:00:00
Object workingDayOfMAY =
- ValueDataUtil.DateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
+ ValueDataUtil.dateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
assertEquals("Working days count in MAY ", 21L, workingDayOfMAY);
}
@@ -136,7 +136,7 @@ public class ValueDateUtilTest {
startDate.setTimeInMillis(1243814400000L); // 2009-06-01 00:00:00
endDate.setTimeInMillis(1246320000000L); // 2009-06-30 00:00:00
Object workingDayOfJUN =
- ValueDataUtil.DateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
+ ValueDataUtil.dateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
assertEquals("Working days count in JUN ", 22L, workingDayOfJUN);
}
@@ -149,7 +149,7 @@ public class ValueDateUtilTest {
startDate.setTimeInMillis(1246406400000L); // 2009-07-01 00:00:00
endDate.setTimeInMillis(1248998400000L); // 2009-07-31 00:00:00
Object workingDayOfJUL =
- ValueDataUtil.DateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
+ ValueDataUtil.dateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
assertEquals("Working days count in JUL ", 23L, workingDayOfJUL);
}
@@ -162,7 +162,7 @@ public class ValueDateUtilTest {
startDate.setTimeInMillis(1249084800000L); // 2009-08-01 00:00:00
endDate.setTimeInMillis(1251676800000L); // 2009-08-31 00:00:00
Object workingDayOfAUG =
- ValueDataUtil.DateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
+ ValueDataUtil.dateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
assertEquals("Working days count in AUG ", 21L, workingDayOfAUG);
}
@@ -175,7 +175,7 @@ public class ValueDateUtilTest {
startDate.setTimeInMillis(1251763200000L); // 2009-09-01 00:00:00
endDate.setTimeInMillis(1254268800000L); // 2009-09-30 00:00:00
Object workingDayOfSEP =
- ValueDataUtil.DateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
+ ValueDataUtil.dateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
assertEquals("Working days count in SEP ", 22L, workingDayOfSEP);
}
@@ -188,7 +188,7 @@ public class ValueDateUtilTest {
startDate.setTimeInMillis(1254355200000L); // 2009-10-01 00:00:00
endDate.setTimeInMillis(1256947200000L); // 2009-10-31 00:00:00
Object workingDayOfOCT =
- ValueDataUtil.DateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
+ ValueDataUtil.dateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
assertEquals("Working days count in OCT ", 22L, workingDayOfOCT);
}
@@ -201,7 +201,7 @@ public class ValueDateUtilTest {
startDate.setTimeInMillis(1257033600000L); // 2009-11-01 00:00:00
endDate.setTimeInMillis(1259539200000L); // 2009-11-30 00:00:00
Object workingDayOfNOV =
- ValueDataUtil.DateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
+ ValueDataUtil.dateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
assertEquals("Working days count in NOV ", 21L, workingDayOfNOV);
}
@@ -214,7 +214,7 @@ public class ValueDateUtilTest {
startDate.setTimeInMillis(1259625600000L); // 2009-12-01 00:00:00
endDate.setTimeInMillis(1262217600000L); // 2009-12-31 00:00:00
Object workingDayOfDEC =
- ValueDataUtil.DateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
+ ValueDataUtil.dateWorkingDiff(metaA, endDate.getTime(), metaB,
startDate.getTime());
assertEquals("Working days count in DEC ", 23L, workingDayOfDEC);
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/EscapeHTML.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/EscapeHTML.java
index 44f6da2970..2738078f49 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/EscapeHTML.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/EscapeHTML.java
@@ -45,7 +45,6 @@ public class EscapeHTML implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.escapeHtml(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.escapeHtml(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/EscapeSQL.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/EscapeSQL.java
index 4cf1831ef3..2e3fb85247 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/EscapeSQL.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/EscapeSQL.java
@@ -45,7 +45,6 @@ public class EscapeSQL implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.escapeSql(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.escapeSql(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/MaskXML.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/MaskXML.java
index f223ded434..b510dc3fa5 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/MaskXML.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/MaskXML.java
@@ -46,7 +46,6 @@ public class MaskXML implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.escapeXml(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.escapeXml(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UnescapeHTML.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UnescapeHTML.java
index ea0b5d8723..2596b4adf3 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UnescapeHTML.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UnescapeHTML.java
@@ -45,7 +45,6 @@ public class UnescapeHTML implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.unEscapeHtml(in.metaA,
in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.unEscapeHtml(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UnescapeXML.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UnescapeXML.java
index 7661da8a57..aa2caadfcb 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UnescapeXML.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UnescapeXML.java
@@ -45,7 +45,6 @@ public class UnescapeXML implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.unEscapeXml(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.unEscapeXml(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UrlDecode.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UrlDecode.java
index 3832ed286f..3360e6f0f2 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UrlDecode.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UrlDecode.java
@@ -45,7 +45,6 @@ public class UrlDecode implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.urlDecode(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.urlDecode(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UrlEncode.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UrlEncode.java
index 21ab20d56b..73722adfea 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UrlEncode.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UrlEncode.java
@@ -45,7 +45,6 @@ public class UrlEncode implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.urlEncode(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.urlEncode(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UseCDATA.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UseCDATA.java
index 6ec042c793..de99a68e78 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UseCDATA.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/conversion/UseCDATA.java
@@ -45,7 +45,6 @@ public class UseCDATA implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.useCDATA(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.useCDATA(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/date/DateDiff.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/date/DateDiff.java
index 657232b7fe..adf8021f89 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/date/DateDiff.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/date/DateDiff.java
@@ -55,7 +55,7 @@ public class DateDiff implements ICalculation {
public CalculationOutput calculate(CalculationInput in) throws
HopValueException {
return new CalculationOutput(
getDefaultResultType(),
- ValueDataUtil.DateDiff(in.metaA, in.dataA, in.metaB, in.dataB,
resultType));
+ ValueDataUtil.dateDiff(in.metaA, in.dataA, in.metaB, in.dataB,
resultType));
}
public enum INTERVAL {
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/date/DateWorkingDiff.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/date/DateWorkingDiff.java
index 0546f3a2f6..393764e36c 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/date/DateWorkingDiff.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/date/DateWorkingDiff.java
@@ -48,6 +48,6 @@ public class DateWorkingDiff implements ICalculation {
public CalculationOutput calculate(CalculationInput in) throws
HopValueException {
return new CalculationOutput(
getDefaultResultType(),
- ValueDataUtil.DateWorkingDiff(in.metaA, in.dataA, in.metaB, in.dataB));
+ ValueDataUtil.dateWorkingDiff(in.metaA, in.dataA, in.metaB, in.dataB));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/ADLER32.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/ADLER32.java
index f5f798dfb6..2ddc732447 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/ADLER32.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/ADLER32.java
@@ -47,7 +47,6 @@ public class ADLER32 implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) throws
HopFileNotFoundException {
return new CalculationOutput(
- getDefaultResultType(),
- ValueDataUtil.checksumAdler32(in.metaA, in.dataA, in.isFailIfNoFile));
+ getDefaultResultType(), ValueDataUtil.checksumAdler32(in.dataA,
in.isFailIfNoFile));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/CRC32.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/CRC32.java
index ee1de758bc..220cc99928 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/CRC32.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/CRC32.java
@@ -47,6 +47,6 @@ public class CRC32 implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) throws
HopFileNotFoundException {
return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.checksumCRC32(in.metaA,
in.dataA, in.isFailIfNoFile));
+ getDefaultResultType(), ValueDataUtil.checksumCRC32(in.dataA,
in.isFailIfNoFile));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/CheckXMLFileWellFormed.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/CheckXMLFileWellFormed.java
index fa2e10f90e..19d8721eb9 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/CheckXMLFileWellFormed.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/CheckXMLFileWellFormed.java
@@ -49,7 +49,6 @@ public class CheckXMLFileWellFormed implements ICalculation {
public CalculationOutput calculate(CalculationInput in)
throws HopValueException, HopFileNotFoundException {
return new CalculationOutput(
- getDefaultResultType(),
- ValueDataUtil.isXmlFileWellFormed(in.metaA, in.dataA,
in.isFailIfNoFile));
+ getDefaultResultType(), ValueDataUtil.isXmlFileWellFormed(in.dataA,
in.isFailIfNoFile));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/LoadFileContentBinary.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/LoadFileContentBinary.java
index f0584a35d0..d3bc966ab6 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/LoadFileContentBinary.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/LoadFileContentBinary.java
@@ -50,7 +50,6 @@ public class LoadFileContentBinary implements ICalculation {
public CalculationOutput calculate(CalculationInput in)
throws HopValueException, HopFileNotFoundException {
return new CalculationOutput(
- getDefaultResultType(),
- ValueDataUtil.loadFileContentInBinary(in.metaA, in.dataA,
in.isFailIfNoFile));
+ getDefaultResultType(),
ValueDataUtil.loadFileContentInBinary(in.dataA, in.isFailIfNoFile));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/MessageDigest.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/MessageDigest.java
index 638e81315a..f672da1584 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/MessageDigest.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/file/MessageDigest.java
@@ -55,7 +55,7 @@ public class MessageDigest implements ICalculation {
public CalculationOutput calculate(CalculationInput in) throws
HopFileNotFoundException {
return new CalculationOutput(
getDefaultResultType(),
- ValueDataUtil.createChecksum(in.metaA, in.dataA, algorithmType,
in.isFailIfNoFile));
+ ValueDataUtil.createChecksum(in.dataA, algorithmType,
in.isFailIfNoFile));
}
public enum ALGORITHM {
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/math/GetOnlyDigits.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/math/GetOnlyDigits.java
index 5392fa1137..330bea3a67 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/math/GetOnlyDigits.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/math/GetOnlyDigits.java
@@ -46,7 +46,6 @@ public class GetOnlyDigits implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) throws
HopValueException {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.getDigits(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.getDigits(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/math/RemoveDigits.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/math/RemoveDigits.java
index 5e56762f23..f51b9ee093 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/math/RemoveDigits.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/math/RemoveDigits.java
@@ -46,7 +46,6 @@ public class RemoveDigits implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) throws
HopValueException {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.removeDigits(in.metaA,
in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.removeDigits(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/DamerauLevenshtein.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/DamerauLevenshtein.java
index 7b2cf59467..9483deef3d 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/DamerauLevenshtein.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/DamerauLevenshtein.java
@@ -46,7 +46,6 @@ public class DamerauLevenshtein implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
return new CalculationOutput(
- getDefaultResultType(),
- ValueDataUtil.getDamerauLevenshtein_Distance(in.metaA, in.dataA,
in.metaB, in.dataB));
+ getDefaultResultType(),
ValueDataUtil.getDamerauLevenshteinDistance(in.dataA, in.dataB));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/DoubleMetaphone.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/DoubleMetaphone.java
index 095f5aa757..6f12e3c693 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/DoubleMetaphone.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/DoubleMetaphone.java
@@ -46,6 +46,6 @@ public class DoubleMetaphone implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.get_Double_Metaphone(in.metaA,
in.dataA));
+ getDefaultResultType(), ValueDataUtil.getDoubleMetaphone(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/Jaro.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/Jaro.java
index c9ff910af2..f87a9ead28 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/Jaro.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/Jaro.java
@@ -46,7 +46,6 @@ public class Jaro implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
return new CalculationOutput(
- getDefaultResultType(),
- ValueDataUtil.getJaro_Similitude(in.metaA, in.dataA, in.metaB,
in.dataB));
+ getDefaultResultType(), ValueDataUtil.getJaroSimilitude(in.dataA,
in.dataB));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/JaroWinkler.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/JaroWinkler.java
index 18540f8d27..c2c48071f7 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/JaroWinkler.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/JaroWinkler.java
@@ -46,7 +46,6 @@ public class JaroWinkler implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
return new CalculationOutput(
- getDefaultResultType(),
- ValueDataUtil.getJaroWinkler_Similitude(in.metaA, in.dataA, in.metaB,
in.dataB));
+ getDefaultResultType(),
ValueDataUtil.getJaroWinklerSimilitude(in.dataA, in.dataB));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/LevenshteinDistance.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/LevenshteinDistance.java
index 6e64a7a63f..1b74944b19 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/LevenshteinDistance.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/LevenshteinDistance.java
@@ -46,7 +46,6 @@ public class LevenshteinDistance implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
return new CalculationOutput(
- getDefaultResultType(),
- ValueDataUtil.getLevenshtein_Distance(in.metaA, in.dataA, in.metaB,
in.dataB));
+ getDefaultResultType(), ValueDataUtil.getLevenshteinDistance(in.dataA,
in.dataB));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/Metaphone.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/Metaphone.java
index c4fbc10ab7..5726f5d4ba 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/Metaphone.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/Metaphone.java
@@ -45,7 +45,6 @@ public class Metaphone implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.get_Metaphone(in.metaA,
in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.getMetaphone(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/RefinedSoundex.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/RefinedSoundex.java
index b0d40b309e..a5a817cb50 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/RefinedSoundex.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/RefinedSoundex.java
@@ -45,7 +45,6 @@ public class RefinedSoundex implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.get_RefinedSoundEx(in.metaA,
in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.getRefinedSoundEx(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/Soundex.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/Soundex.java
index 65219f06d4..cd1916cf45 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/Soundex.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/statistics/Soundex.java
@@ -45,7 +45,6 @@ public class Soundex implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.get_SoundEx(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.getSoundEx(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/InitCap.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/InitCap.java
index c1e3cd9d4e..9e627cd43a 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/InitCap.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/InitCap.java
@@ -45,6 +45,6 @@ public class InitCap implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.initCap(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.initCap(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/LowerCase.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/LowerCase.java
index c902d24550..57cdd4ac5f 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/LowerCase.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/LowerCase.java
@@ -45,7 +45,6 @@ public class LowerCase implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.lowerCase(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.lowerCase(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveCR.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveCR.java
index bb9dbbf16e..8c803092c1 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveCR.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveCR.java
@@ -45,7 +45,6 @@ public class RemoveCR implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.removeCR(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.removeCR(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveCRLF.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveCRLF.java
index 7efac4472e..ee2b4b7524 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveCRLF.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveCRLF.java
@@ -45,7 +45,6 @@ public class RemoveCRLF implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.removeCRLF(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.removeCRLF(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveLF.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveLF.java
index e62b1d0f7c..66541d52af 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveLF.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveLF.java
@@ -45,7 +45,6 @@ public class RemoveLF implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.removeLF(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.removeLF(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveTab.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveTab.java
index 4f24a60e78..d1af17cd02 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveTab.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/RemoveTab.java
@@ -45,7 +45,6 @@ public class RemoveTab implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.removeTAB(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.removeTAB(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/StringLen.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/StringLen.java
index b2565638c1..750c95a7a5 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/StringLen.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/StringLen.java
@@ -45,7 +45,6 @@ public class StringLen implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.stringLen(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.stringLen(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/UpperCase.java
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/UpperCase.java
index 92f74d1107..1e152af2e0 100644
---
a/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/UpperCase.java
+++
b/plugins/transforms/calculator/src/main/java/org/apache/hop/pipeline/transforms/calculator/calculations/text/UpperCase.java
@@ -45,7 +45,6 @@ public class UpperCase implements ICalculation {
@Override
public CalculationOutput calculate(CalculationInput in) {
- return new CalculationOutput(
- getDefaultResultType(), ValueDataUtil.upperCase(in.metaA, in.dataA));
+ return new CalculationOutput(getDefaultResultType(),
ValueDataUtil.upperCase(in.dataA));
}
}
diff --git
a/plugins/transforms/calculator/src/test/java/org/apache/hop/pipeline/transforms/calculator/CalculatorValueDataUtilTest.java
b/plugins/transforms/calculator/src/test/java/org/apache/hop/pipeline/transforms/calculator/CalculatorValueDataUtilTest.java
index 4f72a0f643..28c4900a8e 100644
---
a/plugins/transforms/calculator/src/test/java/org/apache/hop/pipeline/transforms/calculator/CalculatorValueDataUtilTest.java
+++
b/plugins/transforms/calculator/src/test/java/org/apache/hop/pipeline/transforms/calculator/CalculatorValueDataUtilTest.java
@@ -107,45 +107,42 @@ class CalculatorValueDataUtilTest {
@Test
void checksumTest() throws Exception {
String path = getClass().getResource("txt-sample.txt").getPath();
- String checksum = ValueDataUtil.createChecksum(new ValueMetaString(),
path, "MD5", true);
+ String checksum = ValueDataUtil.createChecksum(path, "MD5", true);
assertEquals("098f6bcd4621d373cade4e832627b4f6", checksum);
}
@Test
void checksumMissingFileTest() throws Exception {
String nonExistingFile = "nonExistingFile";
- String checksum =
- ValueDataUtil.createChecksum(new ValueMetaString(), nonExistingFile,
"MD5", false);
+ String checksum = ValueDataUtil.createChecksum(nonExistingFile, "MD5",
false);
assertNull(checksum);
}
@Test
void checksumNullPathTest() throws Exception {
String nonExistingFile = "nonExistingFile";
- String checksum =
- ValueDataUtil.createChecksum(new ValueMetaString(), nonExistingFile,
"MD5", false);
+ String checksum = ValueDataUtil.createChecksum(nonExistingFile, "MD5",
false);
assertNull(checksum);
}
@Test
void checksumWithFailIfNoFileTest() throws Exception {
String path = getClass().getResource("txt-sample.txt").getPath();
- String checksum = ValueDataUtil.createChecksum(new ValueMetaString(),
path, "MD5", true);
+ String checksum = ValueDataUtil.createChecksum(path, "MD5", true);
assertEquals("098f6bcd4621d373cade4e832627b4f6", checksum);
}
@Test
void checksumWithoutFailIfNoFileTest() throws Exception {
String path = getClass().getResource("txt-sample.txt").getPath();
- String checksum = ValueDataUtil.createChecksum(new ValueMetaString(),
path, "MD5", false);
+ String checksum = ValueDataUtil.createChecksum(path, "MD5", false);
assertEquals("098f6bcd4621d373cade4e832627b4f6", checksum);
}
@Test
void checksumNoFailIfNoFileTest() throws HopFileNotFoundException {
String nonExistingFile = "nonExistingFile";
- String checksum =
- ValueDataUtil.createChecksum(new ValueMetaString(), nonExistingFile,
"MD5", false);
+ String checksum = ValueDataUtil.createChecksum(nonExistingFile, "MD5",
false);
assertNull(checksum);
}
@@ -155,52 +152,52 @@ class CalculatorValueDataUtilTest {
assertThrows(
HopFileNotFoundException.class,
() -> {
- ValueDataUtil.createChecksum(new ValueMetaString(), nonExistingPath,
"MD5", true);
+ ValueDataUtil.createChecksum(nonExistingPath, "MD5", true);
});
}
@Test
void checksumNullPathNoFailTest() throws HopFileNotFoundException {
- assertNull(ValueDataUtil.createChecksum(new ValueMetaString(), null,
"MD5", false));
+ assertNull(ValueDataUtil.createChecksum(null, "MD5", false));
}
@Test
void checksumNullPathFailTest() throws HopFileNotFoundException {
- assertNull(ValueDataUtil.createChecksum(new ValueMetaString(), null,
"MD5", true));
+ assertNull(ValueDataUtil.createChecksum(null, "MD5", true));
}
@Test
void checksumCRC32Test() throws Exception {
String path = getClass().getResource("txt-sample.txt").getPath();
- long checksum = ValueDataUtil.checksumCRC32(new ValueMetaString(), path,
false);
+ long checksum = ValueDataUtil.checksumCRC32(path, false);
assertEquals(3632233996L, checksum);
}
@Test
void checksumCRC32MissingFileTest() throws Exception {
String nonExistingFile = "nonExistingFile";
- long checksum = ValueDataUtil.checksumCRC32(new ValueMetaString(),
nonExistingFile, false);
+ long checksum = ValueDataUtil.checksumCRC32(nonExistingFile, false);
assertEquals(0, checksum);
}
@Test
void checksumCRC32NullPathTest() throws Exception {
String nonExistingFile = "nonExistingFile";
- long checksum = ValueDataUtil.checksumCRC32(new ValueMetaString(),
nonExistingFile, false);
+ long checksum = ValueDataUtil.checksumCRC32(nonExistingFile, false);
assertEquals(0, checksum);
}
@Test
void checksumCRC32WithoutFailIfNoFileTest() throws Exception {
String path = getClass().getResource("txt-sample.txt").getPath();
- long checksum = ValueDataUtil.checksumCRC32(new ValueMetaString(), path,
false);
+ long checksum = ValueDataUtil.checksumCRC32(path, false);
assertEquals(3632233996L, checksum);
}
@Test
void checksumCRC32NoFailIfNoFileTest() throws HopFileNotFoundException {
String nonExistingPath = "nonExistingPath";
- long checksum = ValueDataUtil.checksumCRC32(new ValueMetaString(),
nonExistingPath, false);
+ long checksum = ValueDataUtil.checksumCRC32(nonExistingPath, false);
assertEquals(0, checksum);
}
@@ -208,40 +205,39 @@ class CalculatorValueDataUtilTest {
void checksumCRC32FailIfNoFileTest() {
String nonExistingPath = "nonExistingPath";
assertThrows(
- HopFileNotFoundException.class,
- () -> ValueDataUtil.checksumCRC32(new ValueMetaString(),
nonExistingPath, true));
+ HopFileNotFoundException.class, () ->
ValueDataUtil.checksumCRC32(nonExistingPath, true));
}
@Test
void checksumCRC32NullPathNoFailTest() throws HopFileNotFoundException {
- long checksum = ValueDataUtil.checksumCRC32(new ValueMetaString(), null,
false);
+ long checksum = ValueDataUtil.checksumCRC32(null, false);
assertEquals(0, checksum);
}
@Test
void checksumCRC32NullPathFailTest() throws HopFileNotFoundException {
- long checksum = ValueDataUtil.checksumCRC32(new ValueMetaString(), null,
true);
+ long checksum = ValueDataUtil.checksumCRC32(null, true);
assertEquals(0, checksum);
}
@Test
void checksumAdlerWithFailIfNoFileTest() throws Exception {
String path = getClass().getResource("txt-sample.txt").getPath();
- long checksum = ValueDataUtil.checksumAdler32(new ValueMetaString(), path,
true);
+ long checksum = ValueDataUtil.checksumAdler32(path, true);
assertEquals(73204161L, checksum);
}
@Test
void checksumAdlerWithoutFailIfNoFileTest() throws Exception {
String path = getClass().getResource("txt-sample.txt").getPath();
- long checksum = ValueDataUtil.checksumAdler32(new ValueMetaString(), path,
false);
+ long checksum = ValueDataUtil.checksumAdler32(path, false);
assertEquals(73204161L, checksum);
}
@Test
void checksumAdlerNoFailIfNoFileTest() throws HopFileNotFoundException {
String nonExistingPath = "nonExistingPath";
- long checksum = ValueDataUtil.checksumAdler32(new ValueMetaString(),
nonExistingPath, false);
+ long checksum = ValueDataUtil.checksumAdler32(nonExistingPath, false);
assertEquals(0, checksum);
}
@@ -249,75 +245,67 @@ class CalculatorValueDataUtilTest {
void checksumAdlerFailIfNoFileTest() {
String nonExistingPath = "nonExistingPath";
assertThrows(
- HopFileNotFoundException.class,
- () -> ValueDataUtil.checksumAdler32(new ValueMetaString(),
nonExistingPath, true));
+ HopFileNotFoundException.class, () ->
ValueDataUtil.checksumAdler32(nonExistingPath, true));
}
@Test
void checksumAdlerNullPathNoFailTest() throws HopFileNotFoundException {
- long checksum = ValueDataUtil.checksumAdler32(new ValueMetaString(), null,
false);
+ long checksum = ValueDataUtil.checksumAdler32(null, false);
assertEquals(0, checksum);
}
@Test
void checksumAdlerNullPathFailTest() throws HopFileNotFoundException {
- long checksum = ValueDataUtil.checksumAdler32(new ValueMetaString(), null,
true);
+ long checksum = ValueDataUtil.checksumAdler32(null, true);
assertEquals(0, checksum);
}
@Test
void xmlFileWellFormedTest() throws HopFileNotFoundException {
String xmlFilePath = getClass().getResource("xml-sample.xml").getPath();
- boolean wellFormed =
- ValueDataUtil.isXmlFileWellFormed(new ValueMetaString(), xmlFilePath,
true);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(xmlFilePath, true);
assertTrue(wellFormed);
}
@Test
void xmlFileBadlyFormedTest() throws HopFileNotFoundException {
String invalidXmlFilePath =
getClass().getResource("invalid-xml-sample.xml").getPath();
- boolean wellFormed =
- ValueDataUtil.isXmlFileWellFormed(new ValueMetaString(),
invalidXmlFilePath, true);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(invalidXmlFilePath,
true);
assertFalse(wellFormed);
}
@Test
void xmlFileWellFormedWithFailIfNoFileTest() throws HopFileNotFoundException
{
String xmlFilePath = getClass().getResource("xml-sample.xml").getPath();
- boolean wellFormed =
- ValueDataUtil.isXmlFileWellFormed(new ValueMetaString(), xmlFilePath,
true);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(xmlFilePath, true);
assertTrue(wellFormed);
}
@Test
void xmlFileWellFormedWithoutFailIfNoFileTest() throws
HopFileNotFoundException {
String xmlFilePath = getClass().getResource("xml-sample.xml").getPath();
- boolean wellFormed =
- ValueDataUtil.isXmlFileWellFormed(new ValueMetaString(), xmlFilePath,
false);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(xmlFilePath, false);
assertTrue(wellFormed);
}
@Test
void xmlFileBadlyFormedWithFailIfNoFileTest() throws
HopFileNotFoundException {
String invalidXmlFilePath =
getClass().getResource("invalid-xml-sample.xml").getPath();
- boolean wellFormed =
- ValueDataUtil.isXmlFileWellFormed(new ValueMetaString(),
invalidXmlFilePath, true);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(invalidXmlFilePath,
true);
assertFalse(wellFormed);
}
@Test
void xmlFileBadlyFormedWithNoFailIfNoFileTest() throws
HopFileNotFoundException {
String invalidXmlFilePath =
getClass().getResource("invalid-xml-sample.xml").getPath();
- boolean wellFormed =
- ValueDataUtil.isXmlFileWellFormed(new ValueMetaString(),
invalidXmlFilePath, false);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(invalidXmlFilePath,
false);
assertFalse(wellFormed);
}
@Test
void xmlFileWellFormedNoFailIfNoFileTest() throws HopFileNotFoundException {
String nonExistingPath = "nonExistingPath";
- boolean wellFormed =
- ValueDataUtil.isXmlFileWellFormed(new ValueMetaString(),
nonExistingPath, false);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(nonExistingPath,
false);
assertFalse(wellFormed);
}
@@ -326,33 +314,32 @@ class CalculatorValueDataUtilTest {
String nonExistingPath = "nonExistingPath";
assertThrows(
HopFileNotFoundException.class,
- () -> ValueDataUtil.isXmlFileWellFormed(new ValueMetaString(),
nonExistingPath, true));
+ () -> ValueDataUtil.isXmlFileWellFormed(nonExistingPath, true));
}
@Test
void xmlFileWellFormedNullPathNoFailTest() throws HopFileNotFoundException {
- boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(new
ValueMetaString(), null, false);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(null, false);
assertFalse(wellFormed);
}
@Test
void xmlFileWellFormedNullPathFailTest() throws HopFileNotFoundException {
- boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(new
ValueMetaString(), null, true);
+ boolean wellFormed = ValueDataUtil.isXmlFileWellFormed(null, true);
assertFalse(wellFormed);
}
@Test
void loadFileContentInBinary() throws Exception {
String path = getClass().getResource("txt-sample.txt").getPath();
- byte[] content = ValueDataUtil.loadFileContentInBinary(new
ValueMetaString(), path, true);
+ byte[] content = ValueDataUtil.loadFileContentInBinary(path, true);
assertArrayEquals("test".getBytes(), content);
}
@Test
void loadFileContentInBinaryNoFailIfNoFileTest() throws Exception {
String nonExistingPath = "nonExistingPath";
- assertNull(
- ValueDataUtil.loadFileContentInBinary(new ValueMetaString(),
nonExistingPath, false));
+ assertNull(ValueDataUtil.loadFileContentInBinary(nonExistingPath, false));
}
@Test
@@ -360,18 +347,18 @@ class CalculatorValueDataUtilTest {
String nonExistingPath = "nonExistingPath";
assertThrows(
HopFileNotFoundException.class,
- () -> ValueDataUtil.loadFileContentInBinary(new ValueMetaString(),
nonExistingPath, true));
+ () -> ValueDataUtil.loadFileContentInBinary(nonExistingPath, true));
}
@Test
void loadFileContentInBinaryNullPathNoFailTest() throws Exception {
- assertNull(ValueDataUtil.loadFileContentInBinary(new ValueMetaString(),
null, false));
+ assertNull(ValueDataUtil.loadFileContentInBinary(null, false));
}
@Test
void loadFileContentInBinaryNullPathFailTest()
throws HopFileNotFoundException, HopValueException {
- assertNull(ValueDataUtil.loadFileContentInBinary(new ValueMetaString(),
null, true));
+ assertNull(ValueDataUtil.loadFileContentInBinary(null, true));
}
@Test
@@ -1401,15 +1388,15 @@ class CalculatorValueDataUtilTest {
} else if (calculatorMetaFunction == CalculationType.NVL) {
return ValueDataUtil.nvl(valueMetaA, dataA, valueMetaB, dataB);
} else if (calculatorMetaFunction == CalculationType.DATE_DIFF) {
- return ValueDataUtil.DateDiff(valueMetaA, dataA, valueMetaB, dataB,
"");
+ return ValueDataUtil.dateDiff(valueMetaA, dataA, valueMetaB, dataB,
"");
} else if (calculatorMetaFunction == CalculationType.DATE_WORKING_DIFF) {
- return ValueDataUtil.DateWorkingDiff(valueMetaA, dataA, valueMetaB,
dataB);
+ return ValueDataUtil.dateWorkingDiff(valueMetaA, dataA, valueMetaB,
dataB);
} else if (calculatorMetaFunction == CalculationType.REMAINDER) {
return ValueDataUtil.remainder(valueMetaA, dataA, valueMetaB, dataB);
} else if (calculatorMetaFunction == CalculationType.JARO) {
- return ValueDataUtil.getJaro_Similitude(valueMetaA, dataA, valueMetaB,
dataB);
+ return ValueDataUtil.getJaroSimilitude(dataA, dataB);
} else if (calculatorMetaFunction == CalculationType.JARO_WINKLER) {
- return ValueDataUtil.getJaroWinkler_Similitude(valueMetaA, dataA,
valueMetaB, dataB);
+ return ValueDataUtil.getJaroWinklerSimilitude(dataA, dataB);
} else if (calculatorMetaFunction == CalculationType.MULTIPLY) {
return ValueDataUtil.multiply(valueMetaA, dataA, valueMetaB, dataB);
} else {
diff --git
a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesAddedFunctions.java
b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesAddedFunctions.java
index 91a9843ccc..0f7a197fce 100644
---
a/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesAddedFunctions.java
+++
b/plugins/transforms/javascript/src/main/java/org/apache/hop/pipeline/transforms/javascript/ScriptValuesAddedFunctions.java
@@ -2873,7 +2873,7 @@ public class ScriptValuesAddedFunctions extends
ScriptableObject {
public static String initCap(
Context actualContext, Scriptable actualObject, Object[] argList,
Function functionContext) {
if (argList.length == 1) {
- return ValueDataUtil.initCap(null, Context.toString(argList[0]));
+ return ValueDataUtil.initCap(Context.toString(argList[0]));
} else {
throw Context.reportRuntimeError("The function call initCap requires 1
argument.");
}
diff --git
a/plugins/transforms/stringoperations/src/main/java/org/apache/hop/pipeline/transforms/stringoperations/StringOperations.java
b/plugins/transforms/stringoperations/src/main/java/org/apache/hop/pipeline/transforms/stringoperations/StringOperations.java
index e69d7d1d92..f885dab8d4 100644
---
a/plugins/transforms/stringoperations/src/main/java/org/apache/hop/pipeline/transforms/stringoperations/StringOperations.java
+++
b/plugins/transforms/stringoperations/src/main/java/org/apache/hop/pipeline/transforms/stringoperations/StringOperations.java
@@ -107,7 +107,7 @@ public class StringOperations extends
BaseTransform<StringOperationsMeta, String
case StringOperationsMeta.INIT_CAP_NO:
break;
case StringOperationsMeta.INIT_CAP_YES:
- rcode = ValueDataUtil.initCap(null, rcode);
+ rcode = ValueDataUtil.initCap(rcode);
break;
default:
break;
