github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-01-18 09:37:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

checkstyle/pmd/findbugs recommended updates

Browse Source
This commit is contained in:
Jeremy Long
2015-07-29 07:00:30 -04:00
parent 1eecd13ea7
commit 79b59f2aae
19 changed files with 209 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/MavenLoggerAdapter.java
View File

@@ -28,12 +28,15 @@ import org.slf4j.helpers.MessageFormatter;
*/
public class MavenLoggerAdapter extends MarkerIgnoringBase {
private Log log;
/**
* A reference to the Maven log.
*/
private final Log log;
/**
* Creates a new Maven Logger Adapter.
*
* @param log the maven log
* @param log the Maven log
*/
public MavenLoggerAdapter(Log log) {
super();
@@ -41,8 +44,9 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
}
/**
* Returns true if trace is enabled.
*
* @return
* @return whether or not trace is enabled
*/
@Override
public boolean isTraceEnabled() {
@@ -63,7 +67,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void trace(String format, Object arg) {
String message = MessageFormatter.format(format, arg).getMessage();
final String message = MessageFormatter.format(format, arg).getMessage();
if (log != null) {
log.debug(message);
} else {
@@ -73,7 +77,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void trace(String format, Object arg1, Object arg2) {
String message = MessageFormatter.format(format, arg1, arg2).getMessage();
final String message = MessageFormatter.format(format, arg1, arg2).getMessage();
if (log != null) {
log.debug(message);
} else {
@@ -83,7 +87,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void trace(String format, Object... arguments) {
String message = MessageFormatter.format(format, arguments).getMessage();
final String message = MessageFormatter.format(format, arguments).getMessage();
if (log != null) {
log.debug(message);
} else {
@@ -120,7 +124,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void debug(String format, Object arg) {
String message = MessageFormatter.format(format, arg).getMessage();
final String message = MessageFormatter.format(format, arg).getMessage();
if (log != null) {
log.debug(message);
} else {
@@ -130,7 +134,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void debug(String format, Object arg1, Object arg2) {
String message = MessageFormatter.format(format, arg1, arg2).getMessage();
final String message = MessageFormatter.format(format, arg1, arg2).getMessage();
if (log != null) {
log.debug(message);
} else {
@@ -140,7 +144,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void debug(String format, Object... arguments) {
String message = MessageFormatter.format(format, arguments).getMessage();
final String message = MessageFormatter.format(format, arguments).getMessage();
if (log != null) {
log.debug(message);
} else {
@@ -177,7 +181,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void info(String format, Object arg) {
String message = MessageFormatter.format(format, arg).getMessage();
final String message = MessageFormatter.format(format, arg).getMessage();
if (log != null) {
log.info(message);
} else {
@@ -187,7 +191,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void info(String format, Object arg1, Object arg2) {
String message = MessageFormatter.format(format, arg1, arg2).getMessage();
final String message = MessageFormatter.format(format, arg1, arg2).getMessage();
if (log != null) {
log.info(message);
} else {
@@ -197,7 +201,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void info(String format, Object... arguments) {
String message = MessageFormatter.format(format, arguments).getMessage();
final String message = MessageFormatter.format(format, arguments).getMessage();
if (log != null) {
log.info(message);
} else {
@@ -234,7 +238,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void warn(String format, Object arg) {
String message = MessageFormatter.format(format, arg).getMessage();
final String message = MessageFormatter.format(format, arg).getMessage();
if (log != null) {
log.warn(message);
} else {
@@ -244,7 +248,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void warn(String format, Object arg1, Object arg2) {
String message = MessageFormatter.format(format, arg1, arg2).getMessage();
final String message = MessageFormatter.format(format, arg1, arg2).getMessage();
if (log != null) {
log.warn(message);
} else {
@@ -254,7 +258,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void warn(String format, Object... arguments) {
String message = MessageFormatter.format(format, arguments).getMessage();
final String message = MessageFormatter.format(format, arguments).getMessage();
if (log != null) {
log.warn(message);
} else {
@@ -291,7 +295,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void error(String format, Object arg) {
String message = MessageFormatter.format(format, arg).getMessage();
final String message = MessageFormatter.format(format, arg).getMessage();
if (log != null) {
log.error(message);
} else {
@@ -301,7 +305,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void error(String format, Object arg1, Object arg2) {
String message = MessageFormatter.format(format, arg1, arg2).getMessage();
final String message = MessageFormatter.format(format, arg1, arg2).getMessage();
if (log != null) {
log.error(message);
} else {
@@ -311,7 +315,7 @@ public class MavenLoggerAdapter extends MarkerIgnoringBase {
@Override
public void error(String format, Object... arguments) {
String message = MessageFormatter.format(format, arguments).getMessage();
final String message = MessageFormatter.format(format, arguments).getMessage();
if (log != null) {
log.error(message);
} else {

17
dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/slf4j/MavenLoggerFactory.java
View File

@@ -28,13 +28,28 @@ import org.slf4j.Logger;
*/
public class MavenLoggerFactory implements ILoggerFactory {
private MavenLoggerAdapter mavenLoggerAdapter;
/**
* A reference to the Maven log adapter.
*/
private final MavenLoggerAdapter mavenLoggerAdapter;
/**
* Constructs a new logger factory.
*
* @param log a reference to the Maven log
*/
public MavenLoggerFactory(Log log) {
super();
this.mavenLoggerAdapter = new MavenLoggerAdapter(log);
}
/**
* Returns the Maven Logger Adapter.
*
* @param name ignored in this implementation
* @return the maven logger adapter
*/
@Override
public Logger getLogger(String name) {
return mavenLoggerAdapter;
}

11
dependency-check-maven/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
View File

@@ -32,7 +32,6 @@ public class StaticLoggerBinder implements LoggerFactoryBinder {
/**
* The unique instance of this class
*
*/
private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder();
@@ -67,13 +66,19 @@ public class StaticLoggerBinder implements LoggerFactoryBinder {
// to avoid constant folding by the compiler, this field must *not* be final
public static String REQUESTED_API_VERSION = "1.7.12"; // final
private static final String loggerFactoryClassStr = MavenLoggerFactory.class.getName();
/**
* The logger factory class string.
*/
private static final String LOGGER_FACTORY_CLASS = MavenLoggerFactory.class.getName();
/**
* The ILoggerFactory instance returned by the {@link #getLoggerFactory} method should always be the same object
*/
private ILoggerFactory loggerFactory;
/**
* Constructs the static logger factory.
*/
private StaticLoggerBinder() {
loggerFactory = new MavenLoggerFactory(log);
}
@@ -95,6 +100,6 @@ public class StaticLoggerBinder implements LoggerFactoryBinder {
*/
@Override
public String getLoggerFactoryClassStr() {
return loggerFactoryClassStr;
return LOGGER_FACTORY_CLASS;
}
}