(hop) 01/01: Merge pull request #4146 from apache/4145

[hansva]

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

commit 9bff6ff9a3658e96611a0de3cd9725bf0fb16b7c
Merge: 91d90943a6 722919395d
Author: Hans Van Akelyen <hans.van.akel...@gmail.com>
AuthorDate: Wed Jul 31 14:55:43 2024 +0200

    Merge pull request #4146 from apache/4145
    
    Cleanup XML of transform WriteToLog #4145

 .../ROOT/pages/pipeline/metadata-injection.adoc    |   2 +-
 .../{WriteToLogData.java => LogField.java}         |  45 +++--
 .../pipeline/transforms/writetolog/WriteToLog.java |  56 ++----
 .../transforms/writetolog/WriteToLogData.java      |   4 +-
 .../transforms/writetolog/WriteToLogDialog.java    |  87 ++++-----
 .../transforms/writetolog/WriteToLogMeta.java      | 201 +++++++--------------
 .../writetolog/messages/messages_de_DE.properties  |   6 +-
 .../writetolog/messages/messages_en_US.properties  |  12 +-
 .../writetolog/messages/messages_fr_FR.properties  |   4 +-
 .../writetolog/messages/messages_it_IT.properties  |   4 +-
 .../writetolog/messages/messages_ja_JP.properties  |   4 +-
 .../writetolog/messages/messages_pt_BR.properties  |   6 +-
 .../writetolog/messages/messages_zh_CN.properties  |   6 +-
 .../writetolog/WriteToLogMetaSymmetric.java        |  48 -----
 .../transforms/writetolog/WriteToLogMetaTest.java  |  99 +++++-----
 15 files changed, 231 insertions(+), 353 deletions(-)

diff --cc 
plugins/transforms/writetolog/src/main/java/org/apache/hop/pipeline/transforms/writetolog/WriteToLogMeta.java
index ec69be5536,456c38ea39..faf09a7f53
--- 
a/plugins/transforms/writetolog/src/main/java/org/apache/hop/pipeline/transforms/writetolog/WriteToLogMeta.java
+++ 
b/plugins/transforms/writetolog/src/main/java/org/apache/hop/pipeline/transforms/writetolog/WriteToLogMeta.java
@@@ -41,74 -39,60 +39,60 @@@ import org.apache.hop.pipeline.transfor
      name = "i18n::WriteToLog.Name",
      description = "i18n::WriteToLog.Description",
      categoryDescription = 
"i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Utility",
-     keywords = "i18n::WriteToLogMeta.keyword",
+     keywords = "i18n::WriteToLogMeta.Keyword",
      documentationUrl = "/pipeline/transforms/writetolog.html")
  public class WriteToLogMeta extends BaseTransformMeta<WriteToLog, 
WriteToLogData> {
 -  private static final Class<?> PKG = WriteToLogMeta.class; // For Translator
 +  private static final Class<?> PKG = WriteToLogMeta.class;
  
-   /** by which fields to display? */
-   private String[] fieldName;
- 
-   public static String[] logLevelCodes = {
-     "log_level_nothing",
-     "log_level_error",
-     "log_level_minimal",
-     "log_level_basic",
-     "log_level_detailed",
-     "log_level_debug",
-     "log_level_rowlevel"
-   };
- 
+   @HopMetadataProperty(
+       key = "displayHeader",
+       injectionKey = "DISPLAY_HEADER",
+       injectionKeyDescription = "WriteToLogMeta.Injection.DisplayHeader")
    private boolean displayHeader;
  
+   @HopMetadataProperty(
+       key = "limitRows",
+       injectionKey = "LIMIT_ROWS",
+       injectionKeyDescription = "WriteToLogMeta.Injection.LimitRows")
    private boolean limitRows;
  
+   @HopMetadataProperty(
+       key = "limitRowsNumber",
+       injectionKey = "LIMIT_ROWS_NUMBER",
+       injectionKeyDescription = "WriteToLogMeta.Injection.LimitRowsNumber")
    private int limitRowsNumber;
  
-   private String logmessage;
- 
-   private String loglevel;
+   @HopMetadataProperty(
+       key = "logmessage",
+       injectionKey = "LOG_MESSAGE",
+       injectionKeyDescription = "WriteToLogMeta.Injection.LogMessage")
+   private String logMessage;
+ 
+   /** The log level with which the message should be logged. */
+   @HopMetadataProperty(
+       key = "loglevel",
+       storeWithCode = true,
+       injectionKeyDescription = "WriteToLogMeta.Injection.LogLevel")
+   private LogLevel logLevel;
+ 
+   /** The fields which should be to logged. */
+   @HopMetadataProperty(
+       key = "field",
+       groupKey = "fields",
+       injectionGroupDescription = "WriteToLogMeta.Injection.Fields",
+       injectionKeyDescription = "WriteToLogMeta.Injection.Field")
+   private List<LogField> logFields = new ArrayList<>();
  
    public WriteToLogMeta() {
-     super(); // allocate BaseTransformMeta
+     super();
    }
  
-   // For testing purposes only
-   public int getLogLevel() {
-     return Arrays.asList(logLevelCodes).indexOf(loglevel);
-   }
- 
-   public void setLogLevel(int i) {
-     loglevel = logLevelCodes[i];
-   }
- 
-   public LogLevel getLogLevelByDesc() {
-     if (loglevel == null) {
-       return LogLevel.BASIC;
-     }
-     LogLevel retval;
-     if (loglevel.equals(logLevelCodes[0])) {
-       retval = LogLevel.NOTHING;
-     } else if (loglevel.equals(logLevelCodes[1])) {
-       retval = LogLevel.ERROR;
-     } else if (loglevel.equals(logLevelCodes[2])) {
-       retval = LogLevel.MINIMAL;
-     } else if (loglevel.equals(logLevelCodes[3])) {
-       retval = LogLevel.BASIC;
-     } else if (loglevel.equals(logLevelCodes[4])) {
-       retval = LogLevel.DETAILED;
-     } else if (loglevel.equals(logLevelCodes[5])) {
-       retval = LogLevel.DEBUG;
-     } else {
-       retval = LogLevel.ROWLEVEL;
-     }
-     return retval;
+   public LogLevel getLogLevel() {
+     return this.logLevel;
    }
  
-   @Override
-   public void loadXml(Node transformNode, IHopMetadataProvider 
metadataProvider)
-       throws HopXmlException {
-     readData(transformNode);
+   public void setLogLevel(LogLevel logLevel) {
+     this.logLevel = logLevel;
    }
  
    @Override