You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/04/26 10:09:25 UTC
[11/19] cayenne git commit: + slf4j to
maven-plugins/cayenne-maven-plugin
+ slf4j to maven-plugins/cayenne-maven-plugin
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/00ef6135
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/00ef6135
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/00ef6135
Branch: refs/heads/master
Commit: 00ef6135976eb2481e7c2afb47b60b1b1a9d4b94
Parents: 620f767
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Wed Apr 12 12:52:47 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Wed Apr 12 12:52:47 2017 +0300
----------------------------------------------------------------------
.../cayenne/tools/CayenneGeneratorMojo.java | 4 +-
.../apache/cayenne/tools/DbGeneratorMojo.java | 4 +-
.../apache/cayenne/tools/DbImporterMojo.java | 6 +-
.../org/apache/cayenne/tools/MavenLogger.java | 302 +++++++++++++++++--
.../tools/DbImporterMojoConfigurationTest.java | 6 +-
.../cayenne/tools/DbImporterMojoTest.java | 14 +-
.../DbImporterOldMojoConfigurationTest.java | 6 +-
7 files changed, 289 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00ef6135/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
index 98e54e3..3736cef 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.dbsync.filter.NamePatternMatcher;
import org.apache.cayenne.gen.ClassGenerationAction;
import org.apache.cayenne.gen.ClientClassGenerationAction;
import org.apache.cayenne.map.DataMap;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -189,7 +189,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
destDir.mkdirs();
}
- Log logger = new MavenLogger(this);
+ Logger logger = new MavenLogger(this);
CayenneGeneratorMapLoaderAction loaderAction = new CayenneGeneratorMapLoaderAction();
loaderAction.setMainDataMapFile(map);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00ef6135/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
index fa88296..131f3de 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.MapLoader;
import org.apache.cayenne.dbsync.reverse.configuration.ToolsModule;
import org.apache.cayenne.util.Util;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -119,7 +119,7 @@ public class DbGeneratorMojo extends AbstractMojo {
public void execute() throws MojoExecutionException, MojoFailureException {
- Log logger = new MavenLogger(this);
+ Logger logger = new MavenLogger(this);
// check missing data source parameters
dataSource.validate();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00ef6135/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
index ae9aa90..fc1a4e4 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.dbsync.reverse.filters.FiltersConfigBuilder;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.util.Util;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -108,7 +108,7 @@ public class DbImporterMojo extends AbstractMojo {
public void execute() throws MojoExecutionException, MojoFailureException {
- Log logger = new MavenLogger(this);
+ Logger logger = new MavenLogger(this);
// check missing data source parameters
dataSource.validate();
@@ -141,7 +141,7 @@ public class DbImporterMojo extends AbstractMojo {
}
}
- DbImportConfiguration createConfig(Log logger) {
+ DbImportConfiguration createConfig(Logger logger) {
DbImportConfiguration config = new DbImportConfiguration();
config.setAdapter(adapter);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00ef6135/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java
index c439f98..f684528 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java
@@ -19,87 +19,323 @@
package org.apache.cayenne.tools;
import org.apache.maven.plugin.AbstractMojo;
+import org.slf4j.Logger;
+import org.slf4j.Marker;
+import org.apache.maven.plugin.logging.Log;
/**
* @since 3.0
*/
-class MavenLogger implements org.apache.commons.logging.Log {
+class MavenLogger implements Logger {
- private org.apache.maven.plugin.logging.Log logger;
+ private Log logger;
public MavenLogger(AbstractMojo parent) {
this.logger = parent.getLog();
}
- public void debug(Object message, Throwable th) {
- logger.debug(String.valueOf(message), th);
+ @Override
+ public void debug(String s) {
+ logger.debug(s);
}
- public void debug(Object message) {
- logger.debug(String.valueOf(message));
+ @Override
+ public void debug(String s, Object o) {
+ logger.debug(s);
}
- public void error(Object message, Throwable th) {
- logger.error(String.valueOf(message), th);
+ @Override
+ public void debug(String s, Object o, Object o1) {
+ logger.debug(s);
}
- public void error(Object message) {
- logger.error(String.valueOf(message));
+ @Override
+ public void debug(String s, Object... objects) {
+ logger.debug(s);
}
- public void fatal(Object message, Throwable th) {
- logger.error(String.valueOf(message), th);
+ @Override
+ public void debug(String s, Throwable throwable) {
+ logger.debug(s, throwable);
}
- public void fatal(Object message) {
- logger.error(String.valueOf(message));
+ @Override
+ public boolean isDebugEnabled(Marker marker) {
+ return logger.isDebugEnabled();
}
- public void info(Object message, Throwable th) {
- logger.info(String.valueOf(message), th);
+ @Override
+ public void debug(Marker marker, String s) {
+ logger.debug(s);
}
- public void info(Object message) {
- logger.info(String.valueOf(message));
+ @Override
+ public void debug(Marker marker, String s, Object o) {
+ logger.debug(s);
}
- public boolean isDebugEnabled() {
- return logger.isDebugEnabled();
+ @Override
+ public void debug(Marker marker, String s, Object o, Object o1) {
+ logger.debug(s);
}
- public boolean isErrorEnabled() {
- return logger.isErrorEnabled();
+ @Override
+ public void debug(Marker marker, String s, Object... objects) {
+ logger.debug(s);
}
- public boolean isFatalEnabled() {
- return logger.isErrorEnabled();
+ @Override
+ public void debug(Marker marker, String s, Throwable throwable) {
+ logger.debug(s, throwable);
}
+ @Override
public boolean isInfoEnabled() {
return logger.isInfoEnabled();
}
+ @Override
+ public void error(String s) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(String s, Object o) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(String s, Object o, Object o1) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(String s, Object... objects) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(String s, Throwable throwable) {
+ logger.error(s, throwable);
+ }
+
+ @Override
+ public boolean isErrorEnabled(Marker marker) {
+ return logger.isErrorEnabled();
+ }
+
+ @Override
+ public void error(Marker marker, String s) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(Marker marker, String s, Object o) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(Marker marker, String s, Object o, Object o1) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(Marker marker, String s, Object... objects) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(Marker marker, String s, Throwable throwable) {
+ logger.error(s, throwable);
+ }
+
+ @Override
+ public void info(String s) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(String s, Object o) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(String s, Object o, Object o1) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(String s, Object... objects) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(String s, Throwable throwable) {
+ logger.info(s, throwable);
+ }
+
+ @Override
+ public boolean isInfoEnabled(Marker marker) {
+ return isInfoEnabled();
+ }
+
+ @Override
+ public void info(Marker marker, String s) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(Marker marker, String s, Object o) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(Marker marker, String s, Object o, Object o1) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(Marker marker, String s, Object... objects) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(Marker marker, String s, Throwable throwable) {
+ logger.info(s, throwable);
+ }
+
+ @Override
+ public boolean isWarnEnabled() {
+ return logger.isWarnEnabled();
+ }
+
+ @Override
+ public String getName() {
+ return this.getName();
+ }
+
+ @Override
public boolean isTraceEnabled() {
return logger.isDebugEnabled();
}
- public boolean isWarnEnabled() {
+ @Override
+ public void trace(String s) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(String s, Object o) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(String s, Object o, Object o1) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(String s, Object... objects) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(String s, Throwable throwable) {
+ logger.debug(s, throwable);
+ }
+
+ @Override
+ public boolean isTraceEnabled(Marker marker) {
+ return logger.isDebugEnabled();
+ }
+
+ @Override
+ public void trace(Marker marker, String s) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(Marker marker, String s, Object o) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(Marker marker, String s, Object o, Object o1) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(Marker marker, String s, Object... objects) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(Marker marker, String s, Throwable throwable) {
+ logger.debug(s, throwable);
+ }
+
+ @Override
+ public boolean isDebugEnabled() {
+ return logger.isDebugEnabled();
+ }
+
+ @Override
+ public void warn(String s) {
+ logger.warn(s);
+ }
+
+ @Override
+ public void warn(String s, Object o) {
+ logger.warn(s);
+ }
+
+ @Override
+ public void warn(String s, Object... objects) {
+ logger.warn(s);
+ }
+
+ @Override
+ public void warn(String s, Object o, Object o1) {
+ logger.warn(s);
+ }
+
+ @Override
+ public void warn(String s, Throwable throwable) {
+ logger.warn(s, throwable);
+ }
+
+ @Override
+ public boolean isWarnEnabled(Marker marker) {
return logger.isWarnEnabled();
}
- public void trace(Object message, Throwable th) {
- logger.debug(String.valueOf(message), th);
+ @Override
+ public void warn(Marker marker, String s) {
+ logger.warn(s);
}
- public void trace(Object message) {
- logger.debug(String.valueOf(message));
+ @Override
+ public void warn(Marker marker, String s, Object o) {
+ logger.warn(s);
}
- public void warn(Object message, Throwable th) {
- logger.warn(String.valueOf(message), th);
+ @Override
+ public void warn(Marker marker, String s, Object o, Object o1) {
+ logger.warn(s);
}
- public void warn(Object message) {
- logger.warn(String.valueOf(message));
+ @Override
+ public void warn(Marker marker, String s, Object... objects) {
+ logger.warn(s);
+ }
+
+ @Override
+ public void warn(Marker marker, String s, Throwable throwable) {
+ logger.warn(s, throwable);
+ }
+
+ @Override
+ public boolean isErrorEnabled() {
+ return logger.isErrorEnabled();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00ef6135/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoConfigurationTest.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoConfigurationTest.java b/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoConfigurationTest.java
index e904216..6bae7e0 100644
--- a/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoConfigurationTest.java
+++ b/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoConfigurationTest.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.dbsync.reverse.filters.FiltersConfig;
import org.apache.cayenne.dbsync.reverse.filters.IncludeTableFilter;
import org.apache.cayenne.dbsync.reverse.filters.PatternFilter;
import org.apache.cayenne.dbsync.reverse.filters.TableFilter;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.junit.Test;
@@ -67,7 +67,7 @@ public class DbImporterMojoConfigurationTest extends AbstractMojoTestCase {
@Test
public void testLoadSchema2() throws Exception {
- FiltersConfig filters = getCdbImport("pom-schema-2.xml").createConfig(mock(Log.class))
+ FiltersConfig filters = getCdbImport("pom-schema-2.xml").createConfig(mock(Logger.class))
.getDbLoaderConfig().getFiltersConfig();
TreeSet<IncludeTableFilter> includes = new TreeSet<>();
@@ -87,7 +87,7 @@ public class DbImporterMojoConfigurationTest extends AbstractMojoTestCase {
@Test
public void testDefaultPackage() throws Exception {
- DbImportConfiguration config = getCdbImport("pom-default-package.xml").createConfig(mock(Log.class));
+ DbImportConfiguration config = getCdbImport("pom-default-package.xml").createConfig(mock(Logger.class));
assertEquals("com.example.test", config.getDefaultPackage());
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00ef6135/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java b/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
index eec1c18..63a349d 100644
--- a/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
+++ b/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
import org.apache.cayenne.test.jdbc.SQLReader;
import org.apache.cayenne.test.resource.ResourceUtil;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.codehaus.plexus.util.FileUtils;
@@ -75,23 +75,23 @@ public class DbImporterMojoTest extends AbstractMojoTestCase {
@Test
public void testToParameters_MeaningfulPkTables() throws Exception {
- DbImportConfiguration parameters1 = getCdbImport("dbimporter-pom1.xml").createConfig(mock(Log.class));
+ DbImportConfiguration parameters1 = getCdbImport("dbimporter-pom1.xml").createConfig(mock(Logger.class));
assertNull(parameters1.getMeaningfulPkTables());
assertPathEquals("target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml", parameters1.getTargetDataMap()
.getPath());
- assertEquals("x,b*", getCdbImport("dbimporter-pom2.xml").createConfig(mock(Log.class)).getMeaningfulPkTables());
- assertEquals("*", getCdbImport("dbimporter-pom3.xml").createConfig(mock(Log.class)).getMeaningfulPkTables());
+ assertEquals("x,b*", getCdbImport("dbimporter-pom2.xml").createConfig(mock(Logger.class)).getMeaningfulPkTables());
+ assertEquals("*", getCdbImport("dbimporter-pom3.xml").createConfig(mock(Logger.class)).getMeaningfulPkTables());
}
public void testToParameters_Map() throws Exception {
- DbImportConfiguration parameters1 = getCdbImport("dbimporter-pom1.xml").createConfig(mock(Log.class));
+ DbImportConfiguration parameters1 = getCdbImport("dbimporter-pom1.xml").createConfig(mock(Logger.class));
assertNotNull(parameters1.getTargetDataMap());
assertPathEquals("target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml", parameters1.getTargetDataMap()
.getPath());
- assertNull(getCdbImport("dbimporter-pom2.xml").createConfig(mock(Log.class)).getTargetDataMap());
+ assertNull(getCdbImport("dbimporter-pom2.xml").createConfig(mock(Logger.class)).getTargetDataMap());
}
private DbImporterMojo getCdbImport(String pomFileName) throws Exception {
@@ -340,7 +340,7 @@ public class DbImporterMojoTest extends AbstractMojoTestCase {
mapFileCopy = mapFile;
}
- DbImportConfiguration parameters = cdbImport.createConfig(mock(Log.class));
+ DbImportConfiguration parameters = cdbImport.createConfig(mock(Logger.class));
prepareDatabase(name, parameters);
try {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00ef6135/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java b/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java
index a14a6b3..17f06b1 100644
--- a/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java
+++ b/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.dbsync.reverse.filters.FiltersConfig;
import org.apache.cayenne.dbsync.reverse.filters.IncludeTableFilter;
import org.apache.cayenne.dbsync.reverse.filters.PatternFilter;
import org.apache.cayenne.dbsync.reverse.filters.TableFilter;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import static org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineeringUtils.*;
@@ -64,7 +64,7 @@ public class DbImporterOldMojoConfigurationTest extends AbstractMojoTestCase {
}
public void testLoadSchema2() throws Exception {
- FiltersConfig filters = getCdbImport("pom-schema-2.xml").createConfig(mock(Log.class))
+ FiltersConfig filters = getCdbImport("pom-schema-2.xml").createConfig(mock(Logger.class))
.getDbLoaderConfig().getFiltersConfig();
TreeSet<IncludeTableFilter> includes = new TreeSet<>();
@@ -82,7 +82,7 @@ public class DbImporterOldMojoConfigurationTest extends AbstractMojoTestCase {
}
public void testDefaultPackage() throws Exception {
- DbImportConfiguration config = getCdbImport("pom-default-package.xml").createConfig(mock(Log.class));
+ DbImportConfiguration config = getCdbImport("pom-default-package.xml").createConfig(mock(Logger.class));
assertEquals("com.example.test", config.getDefaultPackage());
}