Move LogConfigurationTask into dropwizard-servlets

dropwizard · Jan 17, 2015 · 2f9ec0e · 2f9ec0e
1 parent b61b601
commit 2f9ec0e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 32 deletions.
diff --git a/dropwizard-core/src/main/java/io/dropwizard/setup/AdminEnvironment.java b/dropwizard-core/src/main/java/io/dropwizard/setup/AdminEnvironment.java
@@ -5,7 +5,7 @@
 import com.codahale.metrics.health.jvm.ThreadDeadlockHealthCheck;
 import io.dropwizard.jetty.MutableServletContextHandler;
 import io.dropwizard.jetty.setup.ServletEnvironment;
-import io.dropwizard.logging.tasks.LogConfigurationTask;
+import io.dropwizard.servlets.tasks.LogConfigurationTask;
 import io.dropwizard.servlets.tasks.GarbageCollectionTask;
 import io.dropwizard.servlets.tasks.Task;
 import io.dropwizard.servlets.tasks.TaskServlet;

diff --git a/dropwizard-logging/pom.xml b/dropwizard-logging/pom.xml
@@ -22,11 +22,6 @@
             <artifactId>dropwizard-validation</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.dropwizard</groupId>
-            <artifactId>dropwizard-servlets</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-logback</artifactId>

diff --git a/dropwizard-servlets/pom.xml b/dropwizard-servlets/pom.xml
@@ -44,6 +44,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
         <dependency>
             <!-- this is required because jetty-server pom
             put servlet-api into default scope when it should
@@ -61,12 +66,6 @@
             <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/...d/logging/tasks/LogConfigurationTask.java → .../servlets/tasks/LogConfigurationTask.java b/...d/logging/tasks/LogConfigurationTask.java → .../servlets/tasks/LogConfigurationTask.java
@@ -1,32 +1,32 @@
-package io.dropwizard.logging.tasks;
+package io.dropwizard.servlets.tasks;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.LoggerContext;
 import com.google.common.collect.ImmutableMultimap;
-import io.dropwizard.servlets.tasks.Task;
 import org.slf4j.LoggerFactory;
 
 import java.io.PrintWriter;
 import java.util.List;
 
 /**
- * <p>Sets the logging level for a number of loggers</p>
- *
+ * Sets the logging level for a number of loggers
+ * <p>
  * <b>Parameters:</b>
  * <table>
- *     <tr>
- *         <td>Name</td>
- *         <td>Description</td>
- *     </tr>
- *     <tr>
- *         <td>logger</td>
- *         <td>One or more logger names to be configured with the specified log level.</td>
- *     </tr>
- *     <tr>
- *         <td>level</td>
- *         <td>An optional Logback {@link Level} to configure. If not provided, the log level will be set to null.</td>
- *     </tr>
+ * <tr>
+ * <td>Name</td>
+ * <td>Description</td>
+ * </tr>
+ * <tr>
+ * <td>logger</td>
+ * <td>One or more logger names to be configured with the specified log level.</td>
+ * </tr>
+ * <tr>
+ * <td>level</td>
+ * <td>An optional {@link Level} to configure. If not provided, the log level will be set to null.</td>
+ * </tr>
  * </table>
+ * </p>
  */
 public class LogConfigurationTask extends Task {
 

diff --git a/...gging/tasks/LogConfigurationTaskTest.java → ...vlets/tasks/LogConfigurationTaskTest.java b/...gging/tasks/LogConfigurationTaskTest.java → ...vlets/tasks/LogConfigurationTaskTest.java
@@ -1,4 +1,4 @@
-package io.dropwizard.logging.tasks;
+package io.dropwizard.servlets.tasks;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
@@ -79,8 +79,7 @@ public void configuresLevelForMultipleLoggers() throws Exception {
         assertThat(logger1.getLevel()).isEqualTo(Level.INFO);
         assertThat(logger2.getLevel()).isEqualTo(Level.INFO);
 
-        assertThat(stringWriter.toString()).isEqualTo(
-                "Configured logging level for logger.one to INFO\n" +
-                        "Configured logging level for logger.two to INFO\n");
+        assertThat(stringWriter.toString())
+                .isEqualTo("Configured logging level for logger.one to INFO\nConfigured logging level for logger.two to INFO\n");
     }
 }