Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Cleanup XML of action Workflow #2002 and Pipeline #1986" #2179

Merged
merged 1 commit into from
Jan 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 41 additions & 50 deletions core/src/main/java/org/apache/hop/core/logging/LogLevel.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,71 +18,61 @@
package org.apache.hop.core.logging;

import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.metadata.api.IEnumHasCode;
import org.apache.hop.metadata.api.IEnumHasCodeAndDescription;

public enum LogLevel implements IEnumHasCodeAndDescription {
NOTHING(0, "Nothing", "LogWriter.Level.Nothing.LongDesc"),
ERROR(1, "Error", "LogWriter.Level.Error.LongDesc"),
MINIMAL(2, "Minimal", "LogWriter.Level.Minimal.LongDesc"),
BASIC(3, "Basic", "LogWriter.Level.Basic.LongDesc"),
DETAILED(4, "Detailed", "LogWriter.Level.Detailed.LongDesc"),
DEBUG(5, "Debug", "LogWriter.Level.Debug.LongDesc"),
ROWLEVEL(6, "Rowlevel", "LogWriter.Level.Rowlevel.LongDesc");

private final int level;
private final String code;
private final String description;

private LogLevel(int level, String code, String description) {

public enum LogLevel {
NOTHING(0, "Nothing"),
ERROR(1, "Error"),
MINIMAL(2, "Minimal"),
BASIC(3, "Basic"),
DETAILED(4, "Detailed"),
DEBUG(5, "Debug"),
ROWLEVEL(6, "Rowlevel");

private static final Class<?> PKG = LogLevel.class; // For Translator

public static final String[] logLevelDescriptions = {
BaseMessages.getString(PKG, "LogWriter.Level.Nothing.LongDesc"),
BaseMessages.getString(PKG, "LogWriter.Level.Error.LongDesc"),
BaseMessages.getString(PKG, "LogWriter.Level.Minimal.LongDesc"),
BaseMessages.getString(PKG, "LogWriter.Level.Basic.LongDesc"),
BaseMessages.getString(PKG, "LogWriter.Level.Detailed.LongDesc"),
BaseMessages.getString(PKG, "LogWriter.Level.Debug.LongDesc"),
BaseMessages.getString(PKG, "LogWriter.Level.Rowlevel.LongDesc"),
};

private int level;
private String code;

private LogLevel(int level, String code) {
this.level = level;
this.code = code;
this.description = BaseMessages.getString(LogLevel.class, description);
}

public int getLevel() {
return level;
}

@Override
public String getCode() {
return code;
}

@Override
public String getDescription() {
return description;
return logLevelDescriptions[level];
}

/**
* Return the log level for a certain log level code
*
* @param code the code to look for
* @return the log level or BASIC if nothing matches.
*/
@Deprecated
public static LogLevel getLogLevelForCode(String code) {
return IEnumHasCode.lookupCode(LogLevel.class, code, LogLevel.BASIC);
}

/**
* Return the log level for a certain log level code
*
* @param code the code to look for
* @return the log level or BASIC if nothing matches.
*/
public static LogLevel lookupCode(final String code) {
return IEnumHasCode.lookupCode(LogLevel.class, code, LogLevel.BASIC);
}

/**
* Return the log level for a certain log level description
*
* @param description the description to look for
* @return the log level or BASIC if nothing matches.
*/
public static LogLevel lookupDescription(final String description) {
return IEnumHasCodeAndDescription.lookupDescription(LogLevel.class, description, LogLevel.BASIC);
for (LogLevel logLevel : values()) {
if (logLevel.getCode().equalsIgnoreCase(code)) {
return logLevel;
}
}
return BASIC;
}

/**
Expand Down Expand Up @@ -128,16 +118,17 @@ public boolean isRowlevel() {
return this.level >= ROWLEVEL.level;
}

/**
* Return an array of log level descriptions, sorted by level (0==Nothing, 6=Row Level)
* @return An array of log level descriptions
*/
/** @return An array of log level descriptions, sorted by level (0==Nothing, 6=Row Level) */
public static String[] getLogLevelDescriptions() {
return IEnumHasCodeAndDescription.getDescriptions(LogLevel.class);
return logLevelDescriptions;
}

/** @return An array of log level codes, sorted by level (0==Nothing, 6=Row Level) */
public static String[] logLogLevelCodes() {
return IEnumHasCode.getCodes(LogLevel.class);
String[] codes = new String[values().length];
for (int i = 0; i < codes.length; i++) {
codes[i] = values()[i].getCode();
}
return codes;
}
}
Loading