This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new bcf4fa82e1 Cleanup XML of action Write To Log #2004 Replace CCombo by
Combo
new bb6b153bde Merge pull request #2899 from nadment/2004
bcf4fa82e1 is described below
commit bcf4fa82e1a3c61157c14f8376479a19e72ac832
Author: Nicolas Adment <[email protected]>
AuthorDate: Thu May 4 21:03:07 2023 +0200
Cleanup XML of action Write To Log #2004
Replace CCombo by Combo
---
.../actions/writetolog/ActionWriteToLog.java | 92 ++++++----------------
.../actions/writetolog/ActionWriteToLogDialog.java | 6 +-
.../writetolog/WriteToLogMetaSymmetric.java | 2 +-
3 files changed, 31 insertions(+), 69 deletions(-)
diff --git
a/plugins/actions/writetolog/src/main/java/org/apache/hop/workflow/actions/writetolog/ActionWriteToLog.java
b/plugins/actions/writetolog/src/main/java/org/apache/hop/workflow/actions/writetolog/ActionWriteToLog.java
index 1bd7c6efb0..ad15e46723 100644
---
a/plugins/actions/writetolog/src/main/java/org/apache/hop/workflow/actions/writetolog/ActionWriteToLog.java
+++
b/plugins/actions/writetolog/src/main/java/org/apache/hop/workflow/actions/writetolog/ActionWriteToLog.java
@@ -20,21 +20,16 @@ package org.apache.hop.workflow.actions.writetolog;
import org.apache.hop.core.Const;
import org.apache.hop.core.Result;
import org.apache.hop.core.annotations.Action;
-import org.apache.hop.core.exception.HopXmlException;
import org.apache.hop.core.logging.ILogChannel;
import org.apache.hop.core.logging.ILoggingObject;
import org.apache.hop.core.logging.LogChannel;
import org.apache.hop.core.logging.LogLevel;
import org.apache.hop.core.logging.LoggingObjectType;
import org.apache.hop.core.util.Utils;
-import org.apache.hop.core.variables.IVariables;
-import org.apache.hop.core.xml.XmlHandler;
import org.apache.hop.i18n.BaseMessages;
-import org.apache.hop.metadata.api.IHopMetadataProvider;
+import org.apache.hop.metadata.api.HopMetadataProperty;
import org.apache.hop.workflow.action.ActionBase;
import org.apache.hop.workflow.action.IAction;
-import org.w3c.dom.Node;
-
import java.util.Date;
/** Action type to output message to the workflow log. */
@@ -50,15 +45,19 @@ public class ActionWriteToLog extends ActionBase implements
Cloneable, IAction {
private static final Class<?> PKG = ActionWriteToLog.class; // For Translator
/** The log level with which the message should be logged. */
+ @HopMetadataProperty(key = "loglevel", storeWithCode=true)
private LogLevel actionLogLevel;
-
- private String logsubject;
- private String logmessage;
+
+ @HopMetadataProperty(key = "logsubject")
+ private String logSubject;
+
+ @HopMetadataProperty(key = "logmessage")
+ private String logMessage;
public ActionWriteToLog(String n) {
super(n, "");
- logmessage = null;
- logsubject = null;
+ logMessage = null;
+ logSubject = null;
}
public ActionWriteToLog() {
@@ -71,40 +70,9 @@ public class ActionWriteToLog extends ActionBase implements
Cloneable, IAction {
return je;
}
- @Override
- public String getXml() {
- StringBuilder retval = new StringBuilder(200);
-
- retval.append(super.getXml());
- retval.append(" ").append(XmlHandler.addTagValue("logmessage",
logmessage));
- retval
- .append(" ")
- .append(
- XmlHandler.addTagValue(
- "loglevel", (getActionLogLevel() == null) ? null :
getActionLogLevel().getCode()));
- retval.append(" ").append(XmlHandler.addTagValue("logsubject",
logsubject));
-
- return retval.toString();
- }
-
- @Override
- public void loadXml(Node entrynode, IHopMetadataProvider metadataProvider,
IVariables variables)
- throws HopXmlException {
- try {
- super.loadXml(entrynode);
- logmessage = XmlHandler.getTagValue(entrynode, "logmessage");
- actionLogLevel =
LogLevel.getLogLevelForCode(XmlHandler.getTagValue(entrynode, "loglevel"));
- logsubject = XmlHandler.getTagValue(entrynode, "logsubject");
- } catch (Exception e) {
- throw new HopXmlException(
- BaseMessages.getString(PKG,
"WriteToLog.Error.UnableToLoadFromXML.Label"), e);
- }
- }
-
private class LogWriterObject implements ILoggingObject {
private ILogChannel writerLog;
-
private LogLevel logLevel;
private ILoggingObject parent;
private String subject;
@@ -190,16 +158,16 @@ public class ActionWriteToLog extends ActionBase
implements Cloneable, IAction {
}
}
- ILogChannel createLogChannel() {
- LogWriterObject logWriterObject =
- new LogWriterObject(getRealLogSubject(), this,
parentWorkflow.getLogLevel());
+ protected ILogChannel createLogChannel() {
+ String subject = Const.nullToEmpty(resolve(getLogSubject()));
+ LogWriterObject logWriterObject = new LogWriterObject(subject, this,
parentWorkflow.getLogLevel());
return logWriterObject.getLogChannel();
}
/** Output message to workflow log. */
public boolean evaluate(Result result) {
ILogChannel logChannel = createLogChannel();
- String message = getRealLogMessage();
+ String message = Const.nullToEmpty(resolve(getLogMessage()));
// Filter out empty messages and those that are not visible with the
workflow's log level
if (Utils.isEmpty(message) ||
!getActionLogLevel().isVisible(logChannel.getLogLevel())) {
@@ -270,41 +238,33 @@ public class ActionWriteToLog extends ActionBase
implements Cloneable, IAction {
return false;
}
- public String getRealLogMessage() {
- return Const.NVL(resolve(getLogMessage()), "");
- }
-
- public String getRealLogSubject() {
- return Const.NVL(resolve(getLogSubject()), "");
- }
-
public String getLogMessage() {
- if (logmessage == null) {
- logmessage = "";
+ if (logMessage == null) {
+ logMessage = "";
}
- return logmessage;
+ return logMessage;
}
public String getLogSubject() {
- if (logsubject == null) {
- logsubject = "";
+ if (logSubject == null) {
+ logSubject = "";
}
- return logsubject;
+ return logSubject;
}
- public void setLogMessage(String s) {
- logmessage = s;
+ public void setLogMessage(String message) {
+ this.logMessage = message;
}
- public void setLogSubject(String logsubjectin) {
- logsubject = logsubjectin;
+ public void setLogSubject(String subject) {
+ this.logSubject = subject;
}
public LogLevel getActionLogLevel() {
return actionLogLevel;
}
- public void setActionLogLevel(LogLevel in) {
- this.actionLogLevel = in;
+ public void setActionLogLevel(LogLevel level) {
+ this.actionLogLevel = level;
}
}
diff --git
a/plugins/actions/writetolog/src/main/java/org/apache/hop/workflow/actions/writetolog/ActionWriteToLogDialog.java
b/plugins/actions/writetolog/src/main/java/org/apache/hop/workflow/actions/writetolog/ActionWriteToLogDialog.java
index de536b6a1d..872301f213 100644
---
a/plugins/actions/writetolog/src/main/java/org/apache/hop/workflow/actions/writetolog/ActionWriteToLogDialog.java
+++
b/plugins/actions/writetolog/src/main/java/org/apache/hop/workflow/actions/writetolog/ActionWriteToLogDialog.java
@@ -40,6 +40,7 @@ import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
@@ -58,7 +59,7 @@ public class ActionWriteToLogDialog extends ActionDialog
implements IActionDialo
private TextVar wLogSubject;
- private CCombo wLoglevel;
+ private Combo wLoglevel;
public ActionWriteToLogDialog(
Shell parent, IAction action, WorkflowMeta workflowMeta, IVariables
variables) {
@@ -74,6 +75,7 @@ public class ActionWriteToLogDialog extends ActionDialog
implements IActionDialo
Shell parent = getParent();
shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.MAX |
SWT.RESIZE);
+ shell.setMinimumSize(350, 250);
PropsUi.setLook(shell);
WorkflowDialog.setShellImage(shell, action);
@@ -127,7 +129,7 @@ public class ActionWriteToLogDialog extends ActionDialog
implements IActionDialo
fdlLoglevel.right = new FormAttachment(middle, -margin);
fdlLoglevel.top = new FormAttachment(wName, margin);
wlLoglevel.setLayoutData(fdlLoglevel);
- wLoglevel = new CCombo(shell, SWT.SINGLE | SWT.READ_ONLY | SWT.BORDER);
+ wLoglevel = new Combo(shell, SWT.SINGLE | SWT.READ_ONLY | SWT.BORDER);
wLoglevel.setItems(LogLevel.getLogLevelDescriptions());
PropsUi.setLook(wLoglevel);
FormData fdLoglevel = new FormData();
diff --git
a/plugins/transforms/writetolog/src/test/java/org/apache/pipeline/transforms/writetolog/WriteToLogMetaSymmetric.java
b/plugins/transforms/writetolog/src/test/java/org/apache/pipeline/transforms/writetolog/WriteToLogMetaSymmetric.java
index 4ec4cf31bf..696bb2e592 100644
---
a/plugins/transforms/writetolog/src/test/java/org/apache/pipeline/transforms/writetolog/WriteToLogMetaSymmetric.java
+++
b/plugins/transforms/writetolog/src/test/java/org/apache/pipeline/transforms/writetolog/WriteToLogMetaSymmetric.java
@@ -42,7 +42,7 @@ public class WriteToLogMetaSymmetric extends WriteToLogMeta {
}
public void setLogLevelString(String value) {
- LogLevel lvl = LogLevel.getLogLevelForCode(value);
+ LogLevel lvl = LogLevel.lookupCode(value);
super.setLogLevel(lvl.getLevel());
}
}
