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 429e602013 remove output to servlet as it is no longer supported,
fixes #6297 (#6937)
429e602013 is described below
commit 429e60201345537bd07b57f54d81b4bf1c7ee68e
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Thu Apr 2 16:17:00 2026 +0200
remove output to servlet as it is no longer supported, fixes #6297 (#6937)
---
.../ROOT/pages/pipeline/transforms/jsonoutput.adoc | 1 -
.../pages/pipeline/transforms/textfileoutput.adoc | 1 -
.../ROOT/pages/pipeline/transforms/xmloutput.adoc | 1 -
.../java/org/apache/hop/pipeline/Pipeline.java | 31 ----------
.../hop/pipeline/transform/ITransformMeta.java | 11 ----
.../hop/pipeline/PDI_11948_PipelineTest.java | 35 -----------
.../jsonoutput/messages/messages_en_US.properties | 1 -
.../jsonoutput/messages/messages_pt_BR.properties | 1 -
.../messages/messages_en_US.properties | 1 -
.../messages/messages_pt_BR.properties | 2 -
.../transforms/textfileoutput/TextFileOutput.java | 12 ++--
.../textfileoutput/TextFileOutputDialog.java | 69 +---------------------
.../textfileoutput/TextFileOutputMeta.java | 18 ------
.../messages/messages_de_DE.properties | 3 -
.../messages/messages_en_US.properties | 3 -
.../messages/messages_fr_FR.properties | 2 -
.../messages/messages_it_IT.properties | 2 -
.../messages/messages_ja_JP.properties | 2 -
.../messages/messages_pt_BR.properties | 3 -
.../messages/messages_zh_CN.properties | 2 -
.../textfileoutput/TextFileOutputMetaTest.java | 4 --
.../xmloutput/messages/messages_en_US.properties | 1 -
.../xmloutput/messages/messages_pt_BR.properties | 1 -
23 files changed, 6 insertions(+), 201 deletions(-)
diff --git
a/docs/hop-user-manual/modules/ROOT/pages/pipeline/transforms/jsonoutput.adoc
b/docs/hop-user-manual/modules/ROOT/pages/pipeline/transforms/jsonoutput.adoc
index 10f89404b2..cdb9f423e2 100644
---
a/docs/hop-user-manual/modules/ROOT/pages/pipeline/transforms/jsonoutput.adoc
+++
b/docs/hop-user-manual/modules/ROOT/pages/pipeline/transforms/jsonoutput.adoc
@@ -83,7 +83,6 @@ file and parent folder will be created only after transform
will get any first i
|Extension|Output file extension.
Default value is 'json'
|Encoding|Output file encoding
-|Pass output to servlet|Enable this option to return the data via a web
service instead writing into a file.
|Include date in filename?|If checked - output file name will contains File
name value + current date.
This may help to generate unique output files.
|Include time in filename|If checked - output file name will contains file
creation time.
diff --git
a/docs/hop-user-manual/modules/ROOT/pages/pipeline/transforms/textfileoutput.adoc
b/docs/hop-user-manual/modules/ROOT/pages/pipeline/transforms/textfileoutput.adoc
index e3ca609318..887395fb5b 100644
---
a/docs/hop-user-manual/modules/ROOT/pages/pipeline/transforms/textfileoutput.adoc
+++
b/docs/hop-user-manual/modules/ROOT/pages/pipeline/transforms/textfileoutput.adoc
@@ -58,7 +58,6 @@ The File tab is where you define basic properties about the
file being created,
|Option|Description
|Transform name|Name of the transform. This name has to be unique in a single
pipeline.
|Filename|Specifies the filename and location of the output text file. Click
Browse to select a location.
-|Pass output to servlet|Enable this to return the data via a web service
instead writing into a file.
|Create parent folder|Enable this to create the parent folder when the file is
created. Otherwise the folder must already exist or the write fails.
|Do not create file at start|Enable this to avoid empty files when no rows are
getting processed. Otherwise the file is created before any data is processed,
and might produce an empty file.
|Accept file name from field?|Enable this to specify the file name(s) in a
field in the input stream
diff --git
a/docs/hop-user-manual/modules/ROOT/pages/pipeline/transforms/xmloutput.adoc
b/docs/hop-user-manual/modules/ROOT/pages/pipeline/transforms/xmloutput.adoc
index fb60abdd0e..b0347c4fd3 100644
--- a/docs/hop-user-manual/modules/ROOT/pages/pipeline/transforms/xmloutput.adoc
+++ b/docs/hop-user-manual/modules/ROOT/pages/pipeline/transforms/xmloutput.adoc
@@ -50,7 +50,6 @@ The file tab is where you set general properties for the XML
output file format.
|Transform name|Name of the transform.
|Filename|Specifies the file name and location of the output text file.
|Do not create file at start|Enable to avoid empty files when no rows are
getting processed.
-|Pass output to servlet|Enable this option to return the data via a web
service instead writing into a file (see Hop data over web service).
|Extension|Adds a period and the extension to the end of the file name (.xml).
|Include transformnr in filename|If you run the transform in multiple copies
(see also Launching Several Copies of a transform), the copy number is included
in the file name, before the extension (_0).
|Include date in filename|Includes the system date in the file name
(_20041231).
diff --git a/engine/src/main/java/org/apache/hop/pipeline/Pipeline.java
b/engine/src/main/java/org/apache/hop/pipeline/Pipeline.java
index 18dc4228eb..738071c5e1 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/Pipeline.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/Pipeline.java
@@ -26,8 +26,6 @@ import static
org.apache.hop.pipeline.Pipeline.BitMaskStatus.PREPARING;
import static org.apache.hop.pipeline.Pipeline.BitMaskStatus.RUNNING;
import static org.apache.hop.pipeline.Pipeline.BitMaskStatus.STOPPED;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -44,7 +42,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import lombok.Getter;
import lombok.Setter;
-import org.apache.commons.lang3.StringUtils;
import org.apache.commons.vfs2.FileName;
import org.apache.commons.vfs2.FileObject;
import org.apache.hop.core.BlockingBatchingRowSet;
@@ -349,10 +346,6 @@ public abstract class Pipeline
/** The command line arguments for the pipeline. */
protected String[] arguments;
- @Getter private HttpServletResponse servletResponse;
-
- @Setter @Getter private HttpServletRequest servletRequest;
-
private final Map<String, Object> extensionDataMap;
@Getter @Setter protected int rowSetSize;
@@ -2985,30 +2978,6 @@ public abstract class Pipeline
}
}
- /**
- * Sets encoding of HttpServletResponse according to System encoding.Check
if system encoding is
- * null or an empty and set it to HttpServletResponse when not and writes
error to log if null.
- * Throw IllegalArgumentException if input parameter is null.
- *
- * @param response the HttpServletResponse to set encoding, mayn't be null
- */
- public void setServletReponse(HttpServletResponse response) {
- if (response == null) {
- throw new IllegalArgumentException("HttpServletResponse cannot be null
");
- }
- String encoding = System.getProperty(Const.HOP_DEFAULT_SERVLET_ENCODING,
null);
- // true if encoding is null or an empty (also for the next kin of strings:
" ")
- if (!StringUtils.isBlank(encoding)) {
- try {
- response.setCharacterEncoding(encoding.trim());
- response.setContentType("text/html; charset=" + encoding);
- } catch (Exception ex) {
- LogChannel.GENERAL.logError("Unable to encode data with encoding : '"
+ encoding + "'", ex);
- }
- }
- this.servletResponse = response;
- }
-
public synchronized void doTopologySortOfTransforms() {
// The bubble sort algorithm in contrast to the QuickSort or MergeSort
// algorithms
diff --git
a/engine/src/main/java/org/apache/hop/pipeline/transform/ITransformMeta.java
b/engine/src/main/java/org/apache/hop/pipeline/transform/ITransformMeta.java
index cd8e0a5f5a..d57bead9e9 100644
--- a/engine/src/main/java/org/apache/hop/pipeline/transform/ITransformMeta.java
+++ b/engine/src/main/java/org/apache/hop/pipeline/transform/ITransformMeta.java
@@ -494,17 +494,6 @@ public interface ITransformMeta extends ILegacyXml {
return false;
}
- /**
- * True if the transform passes it's result data straight to the servlet
output. See exposing Hop
- * data over a web service
- *
- * @return True if the transform passes it's result data straight to the
servlet output, false
- * otherwise
- */
- default boolean passDataToServletOutput() {
- return false;
- }
-
/**
*  * This returns the expected name for the dialog that edits a action.
The expected name is in
* the org.apache.hop.ui  * tree and has a class name that is the name of
the action with
diff --git
a/engine/src/test/java/org/apache/hop/pipeline/PDI_11948_PipelineTest.java
b/engine/src/test/java/org/apache/hop/pipeline/PDI_11948_PipelineTest.java
deleted file mode 100644
index 92e197dec7..0000000000
--- a/engine/src/test/java/org/apache/hop/pipeline/PDI_11948_PipelineTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.pipeline;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.doCallRealMethod;
-import static org.mockito.Mockito.mock;
-
-import org.junit.jupiter.api.Test;
-
-class PDI_11948_PipelineTest {
-
- @Test
- void setServletResponseTest() {
- Pipeline pipelineMock = mock(Pipeline.class);
-
- doCallRealMethod().when(pipelineMock).setServletReponse(null);
- assertThrows(IllegalArgumentException.class, () ->
pipelineMock.setServletReponse(null));
- }
-}
diff --git
a/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutput/messages/messages_en_US.properties
b/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutput/messages/messages_en_US.properties
index 0bd06d9e3b..a938de9ec7 100644
---
a/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutput/messages/messages_en_US.properties
+++
b/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutput/messages/messages_en_US.properties
@@ -58,7 +58,6 @@ JsonOutput.Injection.KEY_FIELDS=The stream key to loop over
to get the right JSO
JsonOutput.Injection.NR_ROWS_IN_BLOC=The number of rows in a bloc,
JsonOutput.Injection.OPERATION=The operation to perform (Output Value, Write
to File, Output value and write to file)
JsonOutput.Injection.OUTPUT_VALUE=The field to contain the output JSON,
-JsonOutput.Injection.PASS_TO_SERVLET=Pass output to servlet? (Y/N)
JsonOutput.Injection.PRITTIFY=Do you want the output JSON prittified? (Y/N)
JsonOutput.Injection.RUN_AS_COMMAND=Run as command
JsonOutput.Injection.SPECIFY_DATE_FORMAT=Specify date format
diff --git
a/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutput/messages/messages_pt_BR.properties
b/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutput/messages/messages_pt_BR.properties
index 024d9ffc00..582b25ccc9 100644
---
a/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutput/messages/messages_pt_BR.properties
+++
b/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutput/messages/messages_pt_BR.properties
@@ -94,7 +94,6 @@ JsonOutput.Injection.JSON_REMOVEIFBLANK=Não gerar atributo se
em branco? (S/N)
JsonOutput.Injection.KEY_FIELDS=A chave de fluxo para obter o conteúdo JSON
certo
JsonOutput.Injection.OPERATION=A operação para executar (Valor de Saída,
Escreva para Arquivo, Valor de Saída e escreva para arquivo)
JsonOutput.Injection.OUTPUT_VALUE=O campo para conter a saída JSON,
-JsonOutput.Injection.PASS_TO_SERVLET=Passar saída para servlet?
JsonOutput.Injection.PRITTIFY=Você quer que a saída JSON pritifique? (S/N)
JsonOutput.Injection.RUN_AS_COMMAND=Corra como comando
JsonOutput.Injection.SPECIFY_DATE_FORMAT=Especifique o formato da data
diff --git
a/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutputenhanced/messages/messages_en_US.properties
b/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutputenhanced/messages/messages_en_US.properties
index 2ac1234fb4..e736e5ae2c 100644
---
a/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutputenhanced/messages/messages_en_US.properties
+++
b/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutputenhanced/messages/messages_en_US.properties
@@ -57,7 +57,6 @@ JsonEOutput.Injection.KEY_FIELDS=The stream key to loop over
to get the right JS
JsonEOutput.Injection.NR_ROWS_IN_BLOC=The number of rows in a block"),
JsonEOutput.Injection.OPERATION=The operation to perform (Output Value, Write
to File, Output value and write to file)
JsonEOutput.Injection.OUTPUT_VALUE=The field to contain the output JSON"),
-JsonEOutput.Injection.PASS_TO_SERVLET=Pass output to servlet? (Y/N)
JsonEOutput.Injection.PRITTIFY=Do you want the output JSON prettified? (Y/N)
JsonEOutput.Injection.SPLIT_OUTPUT_AFTER=Split JSON output after n rows
JsonEOutput.Log.ParentFolderCreated=Folder parent was created.
diff --git
a/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutputenhanced/messages/messages_pt_BR.properties
b/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutputenhanced/messages/messages_pt_BR.properties
index ea0f30dcb2..12dc871567 100644
---
a/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutputenhanced/messages/messages_pt_BR.properties
+++
b/plugins/transforms/json/src/main/resources/org/apache/hop/pipeline/transforms/jsonoutputenhanced/messages/messages_pt_BR.properties
@@ -94,7 +94,6 @@ JsonOutput.Injection.JSON_REMOVEIFBLANK=Não gerar atributo se
em branco? (S/N)
JsonOutput.Injection.KEY_FIELDS=A chave de fluxo para obter o conteúdo JSON
certo
JsonOutput.Injection.OPERATION=A operação para executar (Valor de Saída,
Escreva para Arquivo, Valor de Saída e escreva para arquivo)
JsonOutput.Injection.OUTPUT_VALUE=O campo para conter a saída JSON"),
-JsonOutput.Injection.PASS_TO_SERVLET=Passar saída para servlet?
JsonOutput.Injection.PRITTIFY=Você quer que a saída JSON seja embelezada ?
(S/N)
Jsonoutput.Injection.SPLIT_OUTPUT_AFTER=Dividir saída JSON após n linhas
JsonOutput.Log.ParentFolderCreated=O pai da pasta foi criado.
@@ -160,7 +159,6 @@ JsonEOutput.Injection.KEY_FIELDS=A chave de fluxo para
obter o conteúdo JSON ce
JsonEOutput.Injection.NR_ROWS_IN_BLOC=O número de linhas em um bloco"),
JsonEOutput.Injection.OPERATION=A operação para executar (Valor de Saída,
Escrever em Arquivo, Valor de Saída e escrever em arquivo)
JsonEOutput.Injection.OUTPUT_VALUE=O campo para conter a saída JSON"),
-JsonEOutput.Injection.PASS_TO_SERVLET=Passar saída para servlet ?
JsonEOutput.Injection.PRITTIFY=Você quer que a saída JSON seja embelezada ?
(S/N)
JsonEOutput.Injection.SPLIT_OUTPUT_AFTER=Dividir saída JSON após n linhas
JsonEOutput.Log.ParentFolderCreated=A pasta superior foi criada
diff --git
a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutput.java
b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutput.java
index 6417eb39fa..fbc86f8053 100644
---
a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutput.java
+++
b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutput.java
@@ -1005,14 +1005,12 @@ public class TextFileOutput extends
BaseTransform<TextFileOutputMeta, TextFileOu
}
protected void close() throws IOException {
- if (!meta.getFileSettings().isServletOutput()) {
- TextFileOutputData.IFileStreamsCollection coll =
data.getFileStreamsCollection();
- if (coll != null) {
- coll.forEachOpenStream(this::collectDataVolumeOut);
- coll.flushOpenFiles(true);
- }
- data.writer = null;
+ TextFileOutputData.IFileStreamsCollection coll =
data.getFileStreamsCollection();
+ if (coll != null) {
+ coll.forEachOpenStream(this::collectDataVolumeOut);
+ coll.flushOpenFiles(true);
}
+ data.writer = null;
}
@Override
diff --git
a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputDialog.java
b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputDialog.java
index d6d65cea7a..4489f6dfc1 100644
---
a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputDialog.java
+++
b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputDialog.java
@@ -80,8 +80,6 @@ public class TextFileOutputDialog extends BaseTransformDialog
{
private Button wbFilename;
private TextVar wFilename;
- protected Button wServletOutput;
-
private Label wlExtension;
private TextVar wExtension;
@@ -232,35 +230,6 @@ public class TextFileOutputDialog extends
BaseTransformDialog {
Control topControl = addAdditionalComponentIfNeed(middle, margin,
wFileComp, wFilename);
- // Output to servlet (browser, ws)
- //
- Label wlServletOutput = new Label(wFileComp, SWT.RIGHT);
- wlServletOutput.setText(
- BaseMessages.getString(PKG,
"TextFileOutputDialog.ServletOutput.Label"));
- PropsUi.setLook(wlServletOutput);
- FormData fdlServletOutput = new FormData();
- fdlServletOutput.left = new FormAttachment(0, 0);
- fdlServletOutput.top = new FormAttachment(topControl, margin);
- fdlServletOutput.right = new FormAttachment(middle, -margin);
- wlServletOutput.setLayoutData(fdlServletOutput);
- wServletOutput = new Button(wFileComp, SWT.CHECK);
- wServletOutput.setToolTipText(
- BaseMessages.getString(PKG,
"TextFileOutputDialog.ServletOutput.Tooltip"));
- PropsUi.setLook(wServletOutput);
- FormData fdServletOutput = new FormData();
- fdServletOutput.left = new FormAttachment(middle, 0);
- fdServletOutput.top = new FormAttachment(wlServletOutput, 0, SWT.CENTER);
- fdServletOutput.right = new FormAttachment(100, 0);
- wServletOutput.setLayoutData(fdServletOutput);
- wServletOutput.addSelectionListener(
- new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- input.setChanged();
- setFlagsServletOption();
- }
- });
-
// Create Parent Folder
wlCreateParentFolder = new Label(wFileComp, SWT.RIGHT);
wlCreateParentFolder.setText(
@@ -268,7 +237,7 @@ public class TextFileOutputDialog extends
BaseTransformDialog {
PropsUi.setLook(wlCreateParentFolder);
FormData fdlCreateParentFolder = new FormData();
fdlCreateParentFolder.left = new FormAttachment(0, 0);
- fdlCreateParentFolder.top = new FormAttachment(wServletOutput, margin);
+ fdlCreateParentFolder.top = new FormAttachment(topControl, margin);
fdlCreateParentFolder.right = new FormAttachment(middle, -margin);
wlCreateParentFolder.setLayoutData(fdlCreateParentFolder);
wCreateParentFolder = new Button(wFileComp, SWT.CHECK);
@@ -1321,39 +1290,6 @@ public class TextFileOutputDialog extends
BaseTransformDialog {
return topComp;
}
- protected void setFlagsServletOption() {
- boolean enableFilename = !wServletOutput.getSelection();
- wlFilename.setEnabled(enableFilename);
- wFilename.setEnabled(enableFilename);
- wlDoNotOpenNewFileInit.setEnabled(enableFilename);
- wDoNotOpenNewFileInit.setEnabled(enableFilename);
- wlCreateParentFolder.setEnabled(enableFilename);
- wCreateParentFolder.setEnabled(enableFilename);
- wlFileNameField.setEnabled(enableFilename);
- wFileNameField.setEnabled(enableFilename);
- wlExtension.setEnabled(enableFilename);
- wExtension.setEnabled(enableFilename);
- wlSplitEvery.setEnabled(enableFilename);
- wSplitEvery.setEnabled(enableFilename);
- wlAddDate.setEnabled(enableFilename);
- wAddDate.setEnabled(enableFilename);
- wlAddTime.setEnabled(enableFilename);
- wAddTime.setEnabled(enableFilename);
- wlDateTimeFormat.setEnabled(enableFilename);
- wDateTimeFormat.setEnabled(enableFilename);
- wlSpecifyFormat.setEnabled(enableFilename);
- wSpecifyFormat.setEnabled(enableFilename);
- wlAppend.setEnabled(enableFilename);
- wAppend.setEnabled(enableFilename);
- wlAddTransformNr.setEnabled(enableFilename);
- wAddTransformNr.setEnabled(enableFilename);
- wlAddPartnr.setEnabled(enableFilename);
- wAddPartnr.setEnabled(enableFilename);
- wbShowFiles.setEnabled(enableFilename);
- wlAddToResult.setEnabled(enableFilename);
- wAddToResult.setEnabled(enableFilename);
- }
-
private void activeFileNameField() {
wlFileNameField.setEnabled(wFileNameInField.getSelection());
wFileNameField.setEnabled(wFileNameInField.getSelection());
@@ -1461,7 +1397,6 @@ public class TextFileOutputDialog extends
BaseTransformDialog {
/** Copy information from the meta-data input to the dialog fields. */
public void getData() {
wFilename.setText(Const.NVL(input.getFileSettings().getFileName(), ""));
- wServletOutput.setSelection(input.getFileSettings().isServletOutput());
wSchemaDefinition.setText(Const.NVL(input.getSchemaDefinition(), ""));
wIgnoreFields.setSelection(input.isIgnoreFields());
@@ -1473,7 +1408,6 @@ public class TextFileOutputDialog extends
BaseTransformDialog {
wGet.setEnabled(!input.isIgnoreFields());
wMinWidth.setEnabled(!input.isIgnoreFields());
- setFlagsServletOption();
wDoNotOpenNewFileInit.setSelection(input.getFileSettings().isDoNotOpenNewFileInit());
wCreateParentFolder.setSelection(input.isCreateParentFolder());
wExtension.setText(Const.NVL(input.getFileSettings().getExtension(), ""));
@@ -1554,7 +1488,6 @@ public class TextFileOutputDialog extends
BaseTransformDialog {
tfoi.getFileSettings().setFileName(wFilename.getText());
tfoi.setSchemaDefinition(wSchemaDefinition.getText());
tfoi.setIgnoreFields(wIgnoreFields.getSelection());
- tfoi.getFileSettings().setServletOutput(wServletOutput.getSelection());
tfoi.setCreateParentFolder(wCreateParentFolder.getSelection());
tfoi.getFileSettings().setDoNotOpenNewFileInit(wDoNotOpenNewFileInit.getSelection());
tfoi.setFileFormat(TextFileOutputMeta.formatMapperLineTerminator[wFormat.getSelectionIndex()]);
diff --git
a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputMeta.java
b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputMeta.java
index 3071dc16ae..8346439fed 100644
---
a/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputMeta.java
+++
b/plugins/transforms/textfile/src/main/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputMeta.java
@@ -86,16 +86,6 @@ public class TextFileOutputMeta extends
BaseTransformMeta<TextFileOutput, TextFi
injectionKeyDescription = "TextFileOutput.Injection.FILENAME")
protected String fileName;
- /**
- * Whether to push the output into the output of a servlet with the
executePipeline
- * HopServer/DI-Server servlet
- */
- @HopMetadataProperty(
- key = "servlet_output",
- injectionKey = "PASS_TO_SERVLET",
- injectionKeyDescription = "TextFileOutput.Injection.PASS_TO_SERVLET")
- private boolean servletOutput;
-
/** Flag : Do not open new file when pipeline start */
@HopMetadataProperty(
key = "do_not_open_new_file_init",
@@ -194,7 +184,6 @@ public class TextFileOutputMeta extends
BaseTransformMeta<TextFileOutput, TextFi
setSpecifyingFormat(false);
setDateTimeFormat(null);
fileName = "";
- servletOutput = false;
doNotOpenNewFileInit = true;
extension = "";
transformNrInFilename = false;
@@ -219,7 +208,6 @@ public class TextFileOutputMeta extends
BaseTransformMeta<TextFileOutput, TextFi
this.fileName = f.fileName;
this.padded = f.padded;
this.partNrInFilename = f.partNrInFilename;
- this.servletOutput = f.servletOutput;
this.specifyingFormat = f.specifyingFormat;
this.splitEveryRows = f.splitEveryRows;
this.timeInFilename = f.timeInFilename;
@@ -619,12 +607,6 @@ public class TextFileOutputMeta extends
BaseTransformMeta<TextFileOutput, TextFi
}
}
- /** {@inheritDoc} */
- @Override
- public boolean passDataToServletOutput() {
- return fileSettings.servletOutput;
- }
-
public String[] getFiles(final IVariables variables) {
return getFiles(variables, true);
}
diff --git
a/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_de_DE.properties
b/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_de_DE.properties
index 082a1226e1..997ab98ada 100644
---
a/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_de_DE.properties
+++
b/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_de_DE.properties
@@ -56,7 +56,6 @@ TextFileOutput.Injection.OUTPUT_NULL=Null wird durch Wert
ersetzt
TextFileOutput.Injection.OUTPUT_PRECISION=Genauigkeit
TextFileOutput.Injection.OUTPUT_TRIM=Trimtyp (keiner,links,beide,rechts)
TextFileOutput.Injection.OUTPUT_TYPE=Feldtyp
-TextFileOutput.Injection.PASS_TO_SERVLET=Aktivieren, um Daten \u00FCber das
Servlet auszugeben (Hop Server)
TextFileOutput.Injection.RIGHT_PAD_FIELDS=Feld rechts auff\u00FCllen (J/N)
TextFileOutput.Injection.RUN_AS_COMMAND=Aktivieren, um den Dateinamen als
Kommando zu behandeln.
TextFileOutput.Injection.SEPARATOR=Trennzeichen
@@ -123,8 +122,6 @@
TextFileOutputDialog.SelectOutputFiles.DialogMessage=Ausgabedatei(en):
TextFileOutputDialog.SelectOutputFiles.DialogTitle=Ausgabedateien
TextFileOutputDialog.Separator.Button=TAB eingeben
TextFileOutputDialog.Separator.Label=Trennzeichen
-TextFileOutputDialog.ServletOutput.Label=Ausgabe an Servlet weitergeben
-TextFileOutputDialog.ServletOutput.Tooltip=Ausgabe an das Servlet weitergeben
(Webservice), wenn mit Hop Server ausgef\u00FChrt wird.
TextFileOutputDialog.ShowFiles.Button=&Zeige Dateiname(n)...
TextFileOutputDialog.SpecifyFormat.Label=Datetime Format angeben
TextFileOutputDialog.SpecifyFormat.Tooltip=Datetime Format angeben
diff --git
a/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_en_US.properties
b/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_en_US.properties
index bf4009e42b..ed18a58904 100644
---
a/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_en_US.properties
+++
b/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_en_US.properties
@@ -57,7 +57,6 @@ TextFileOutput.Injection.OUTPUT_PRECISION=Field precision
TextFileOutput.Injection.OUTPUT_TRIM=Field trim type (none, left, both, right)
TextFileOutput.Injection.OUTPUT_TYPE=Field type
TextFileOutput.Injection.OUTPUT_ROUNDING=Rounding type
-TextFileOutput.Injection.PASS_TO_SERVLET=Enable this option to write data on
the servlet output (Hop Server).
TextFileOutput.Injection.RIGHT_PAD_FIELDS=Right pad fields? (Y/N)
TextFileOutput.Injection.RUN_AS_COMMAND=Enable this option to treat the
filename as a command and write data into the output stream created by it.
TextFileOutput.Injection.SEPARATOR=The separator
@@ -128,8 +127,6 @@ TextFileOutputDialog.SelectOutputFiles.DialogMessage=Output
file(s)\:
TextFileOutputDialog.SelectOutputFiles.DialogTitle=Output files
TextFileOutputDialog.Separator.Button=Insert &TAB
TextFileOutputDialog.Separator.Label=Separator
-TextFileOutputDialog.ServletOutput.Label=Pass output to servlet
-TextFileOutputDialog.ServletOutput.Tooltip=Pass the output to the servlet
output (web service) when executed by Hop Server (executePipeline service)
TextFileOutputDialog.ShowFiles.Button=&Show filename(s)...
TextFileOutputDialog.SpecifyFormat.Label=Specify Date time format
TextFileOutputDialog.SpecifyFormat.Tooltip=Specify Date time format
diff --git
a/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_fr_FR.properties
b/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_fr_FR.properties
index 167549b04e..de779f49ba 100644
---
a/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_fr_FR.properties
+++
b/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_fr_FR.properties
@@ -79,8 +79,6 @@
TextFileOutputDialog.SelectOutputFiles.DialogMessage=Fichier(s) en sortie\:
TextFileOutputDialog.SelectOutputFiles.DialogTitle=Fichiers en sortie
TextFileOutputDialog.Separator.Button=Ins\u00E9rer &TAB
TextFileOutputDialog.Separator.Label=D\u00E9limiteur
-TextFileOutputDialog.ServletOutput.Label=Envoyer la sortie vers un servlet
-TextFileOutputDialog.ServletOutput.Tooltip=Envoyer la sortie de cette
transformation vers un servlet afin de cr\u00E9er un contenu
dynamique\r\nex\u00E9cutable depuis le serveur Hop Server.
TextFileOutputDialog.ShowFiles.Button=&Afficher nom fichier(s)...
TextFileOutputDialog.SpecifyFormat.Label=Sp\u00E9cifier format date
TextFileOutputDialog.SpecifyFormat.Tooltip=Sp\u00E9cifier format date
diff --git
a/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_it_IT.properties
b/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_it_IT.properties
index e3de708cb7..03b7484a5c 100644
---
a/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_it_IT.properties
+++
b/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_it_IT.properties
@@ -72,8 +72,6 @@ TextFileOutputDialog.SelectOutputFiles.DialogMessage=File di
output\:
TextFileOutputDialog.SelectOutputFiles.DialogTitle=File di output
TextFileOutputDialog.Separator.Button=Inserisci &TAB
TextFileOutputDialog.Separator.Label=Separatore
-TextFileOutputDialog.ServletOutput.Label=Passa output al servlet
-TextFileOutputDialog.ServletOutput.Tooltip=Passa l''output al servlet (web
service) quando viene eseguito da Hop Server (servizio executePipeline)
TextFileOutputDialog.ShowFiles.Button=&Mostra file...
TextFileOutputDialog.SpecifyFormat.Label=Specifica il formato di data e ora
TextFileOutputDialog.SpecifyFormat.Tooltip=Specifica il formato di data e ora
diff --git
a/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_ja_JP.properties
b/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_ja_JP.properties
index 4fd5211204..c7ed606ddd 100644
---
a/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_ja_JP.properties
+++
b/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_ja_JP.properties
@@ -76,8 +76,6 @@
TextFileOutputDialog.SelectOutputFiles.DialogMessage=\u51FA\u529B\u3059\u308B\u3
TextFileOutputDialog.SelectOutputFiles.DialogTitle=\u51FA\u529B\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u53C2\u7167
TextFileOutputDialog.Separator.Button=\u30BF\u30D6\u306E\u633F\u5165(&T)
TextFileOutputDialog.Separator.Label=\u533A\u5207\u308A\u6587\u5B57
-TextFileOutputDialog.ServletOutput.Label=\u51FA\u529B\u3092\u30B5\u30FC\u30D6\u30EC\u30C3\u30C8\u306B\u6E21\u3059
-TextFileOutputDialog.ServletOutput.Tooltip=Hop
Server\u3067\u5B9F\u884C\u3057\u305F\u6642\u306B\u51FA\u529B\u3092\u30B5\u30FC\u30D6\u30EC\u30C3\u30C8(web\u30B5\u30FC\u30D3\u30B9)\u306B\u6E21\u3057\u307E\u3059\u3002
TextFileOutputDialog.ShowFiles.Button=\u30D5\u30A1\u30A4\u30EB\u540D\u306E\u53C2\u7167(&S)
TextFileOutputDialog.SpecifyFormat.Label=\u65E5\u4ED8\u306E\u8868\u793A\u5F62\u5F0F\u3092\u6307\u5B9A\u3059\u308B
TextFileOutputDialog.SpecifyFormat.Tooltip=\u65E5\u4ED8\u306E\u8868\u793A\u5F62\u5F0F\u3092\u6307\u5B9A\u3059\u308B\u5834\u5408\u306F\u30C1\u30A7\u30C3\u30AF\u30DC\u30C3\u30AF\u30B9\u3092\u6709\u52B9\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
diff --git
a/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_pt_BR.properties
b/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_pt_BR.properties
index a6f09cec75..2f2643c501 100644
---
a/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_pt_BR.properties
+++
b/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_pt_BR.properties
@@ -121,7 +121,6 @@ TextFileOutput.Injection.FORCE_ENCLOSURE=Forçar o cerco ao
redor dos campos?
TextFileOutput.Injection.FORMAT=O formato do arquivo terminação da linha?
(DOS, UNIX, CR, Nenhum)
TextFileOutput.Injection.INC_TRANSFORMNR_IN_FILENAME=Incluir nr transformada
no nome do arquivo?
TextFileOutput.Injection.NEW_LINE=Especifique qual string usar na saída quando
uma nova linha é escrita.
-TextFileOutput.Injection.PASS_TO_SERVLET=Active esta opção para escrever dados
na saída do servlet (Servidor Hop).
TextFileOutput.Injection.RIGHT_PAD_FIELDS=Campo direito?
TextFileOutput.Injection.RUN_AS_COMMAND=Active esta opção para tratar o nome
do ficheiro como um comando e escrever dados no fluxo de saída criado por ele.
TextFileOutput.Injection.SPECIFY_DATE_FORMAT=Especificar o formato da data
para o nome do arquivo?
@@ -138,8 +137,6 @@ TextFileOutputDialog.Load.SchemaDefinition.Message=A
definição do esquema ser
TextFileOutputDialog.Load.SchemaDefinition.Title=Definição do esquema
TextFileOutputDialog.Pad.Label=Campo direito
TextFileOutputDialog.SchemaDefinition.Tooltip=Selecione a definição do esquema
que você quer aplicar às linhas de entrada/saída
-TextFileOutputDialog.ServletOutput.Label=Passe a saída para servlet
-TextFileOutputDialog.ServletOutput.Tooltip=Passe a saída para a saída servlet
(serviço web) quando executado pelo Servidor Hop (serviço executePipeline)
TextFileOutputDialog.RoundingTypeColumn.Column=Tipo Arredondamento
TextFileOutputDialog.IgnoreTransformFields.Label=Ignorar campos manuais
TextFileOutput.Injection.OUTPUT_FIELD=O campo para saída
diff --git
a/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_zh_CN.properties
b/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_zh_CN.properties
index 174bf16de6..c2d9470740 100644
---
a/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_zh_CN.properties
+++
b/plugins/transforms/textfile/src/main/resources/org/apache/hop/pipeline/transforms/textfileoutput/messages/messages_zh_CN.properties
@@ -74,8 +74,6 @@
TextFileOutputDialog.SelectOutputFiles.DialogMessage=\u8F93\u51FA\u6587\u4EF6\:
TextFileOutputDialog.SelectOutputFiles.DialogTitle=\u8F93\u51FA\u6587\u4EF6
TextFileOutputDialog.Separator.Button=\u63D2\u5165&TAB
TextFileOutputDialog.Separator.Label=\u5206\u9694\u7B26:
-TextFileOutputDialog.ServletOutput.Label=\u8F93\u51FA\u4F20\u9012\u5230servlet\:
-TextFileOutputDialog.ServletOutput.Tooltip=\u7531 Hop Server(\u6267\u884C
Pipeline
\u7684\u670D\u52A1)\u6267\u884C\u65F6\u5C06\u8F93\u51FA\u4F20\u9012\u7ED9
servlet \u670D\u52A1(Web \u670D\u52A1)\u5E76\u7531\u5176\u8F93\u51FA
TextFileOutputDialog.ShowFiles.Button=\u663E\u793A\u6587\u4EF6\u540D(&S)...
TextFileOutputDialog.SpecifyFormat.Label=\u6307\u5B9A\u65E5\u671F\u65F6\u95F4\u683C\u5F0F\:
TextFileOutputDialog.SpecifyFormat.Tooltip=\u81EA\u5B9A\u4E49\u65F6\u95F4\u683C\u5F0F
diff --git
a/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputMetaTest.java
b/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputMetaTest.java
index 391ca18da6..cd9d7cf116 100644
---
a/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputMetaTest.java
+++
b/plugins/transforms/textfile/src/test/java/org/apache/hop/pipeline/transforms/textfileoutput/TextFileOutputMetaTest.java
@@ -75,7 +75,6 @@ class TextFileOutputMetaTest {
"fileNameField",
"create_parent_folder",
"fileName",
- "servlet_output",
"do_not_open_new_file_init",
"extention",
"append",
@@ -110,7 +109,6 @@ class TextFileOutputMetaTest {
getterMap.put("fileNameField", "getFileNameField");
getterMap.put("create_parent_folder", "isCreateParentFolder");
getterMap.put("fileName", "getFileName");
- getterMap.put("servlet_output", "isServletOutput");
getterMap.put("do_not_open_new_file_init", "isDoNotOpenNewFileInit");
getterMap.put("extention", "getExtension");
getterMap.put("append", "isFileAppended");
@@ -146,7 +144,6 @@ class TextFileOutputMetaTest {
setterMap.put("fileNameField", "setFileNameField");
setterMap.put("create_parent_folder", "setCreateParentFolder");
setterMap.put("fileName", "setFileName");
- setterMap.put("servlet_output", "setServletOutput");
setterMap.put("do_not_open_new_file_init", "setDoNotOpenNewFileInit");
setterMap.put("extention", "setExtension");
setterMap.put("append", "setFileAppended");
@@ -226,7 +223,6 @@ class TextFileOutputMetaTest {
assertNotNull(meta.getFileSettings());
assertEquals("filename.txt", meta.getFileSettings().getFileName());
- assertFalse(meta.getFileSettings().isServletOutput());
assertTrue(meta.getFileSettings().isDoNotOpenNewFileInit());
assertEquals("txt", meta.getFileSettings().getExtension());
assertTrue(meta.getFileSettings().isFileAppended());
diff --git
a/plugins/transforms/xml/src/main/resources/org/apache/hop/pipeline/transforms/xml/xmloutput/messages/messages_en_US.properties
b/plugins/transforms/xml/src/main/resources/org/apache/hop/pipeline/transforms/xml/xmloutput/messages/messages_en_US.properties
index 87ed9b8f2c..cebd807b8c 100644
---
a/plugins/transforms/xml/src/main/resources/org/apache/hop/pipeline/transforms/xml/xmloutput/messages/messages_en_US.properties
+++
b/plugins/transforms/xml/src/main/resources/org/apache/hop/pipeline/transforms/xml/xmloutput/messages/messages_en_US.properties
@@ -42,7 +42,6 @@ XMLOutput.Injection.OUTPUT_LENGTH=Specify the length of the
field type used.
XMLOutput.Injection.OUTPUT_NULL=Specify the string to insert into the textfile
if a value is null.
XMLOutput.Injection.OUTPUT_PRECISION=Specify how many digits after a decimal
will be used.
XMLOutput.Injection.OUTPUT_TYPE=The format mask to convert the field. This can
be a String, Date, Boolean, Integer, BigNumber, Binary, Timestamp, Internet
Address.
-XMLOutput.Injection.PASS_TO_SERVLET=Enable this option to return the data
through a web service instead of a file.
XMLOutput.Injection.REPEAT_ELEMENT=The name of the row element to use in the
XML document.
XMLOutput.Injection.SPEFICY_FORMAT=Enable this option to specify the date time
format.
XMLOutput.Injection.SPLIT_EVERY=The maximum number of data to put in a single
XML file before another is created.
diff --git
a/plugins/transforms/xml/src/main/resources/org/apache/hop/pipeline/transforms/xml/xmloutput/messages/messages_pt_BR.properties
b/plugins/transforms/xml/src/main/resources/org/apache/hop/pipeline/transforms/xml/xmloutput/messages/messages_pt_BR.properties
index f3d820c33e..3713501473 100644
---
a/plugins/transforms/xml/src/main/resources/org/apache/hop/pipeline/transforms/xml/xmloutput/messages/messages_pt_BR.properties
+++
b/plugins/transforms/xml/src/main/resources/org/apache/hop/pipeline/transforms/xml/xmloutput/messages/messages_pt_BR.properties
@@ -89,7 +89,6 @@ XMLOutput.Injection.OUTPUT_GROUP=Digite um símbolo para
representar um agrupame
XMLOutput.Injection.OUTPUT_LENGTH=Especifique o comprimento do campo usado.
XMLOutput.Injection.OUTPUT_NULL=Especifique o texto para inserir no arquivo de
texto se um valor for nulo.
XMLOutput.Injection.OUTPUT_TYPE=A máscara de formato para converter o campo.
Isso pode ser uma String, Date, Boolean, Integer, BigNumber, Binary, Timestamp,
Endereço da Internet.
-XMLOutput.Injection.PASS_TO_SERVLET=Active esta opção para devolver os dados
através de um serviço web em vez de um arquivo.
XMLOutput.Injection.REPEAT_ELEMENT=O nome do elemento linha para usar no
documento XML.
XMLOutput.Injection.SPEFICY_FORMAT=Habilite esta opção para especificar o
formato da data.
XMLOutput.Injection.SPLIT_EVERY=O número máximo de dados para colocar em um
único arquivo XML antes que outro seja criado.
