Improved examples.

core/src/main/java/com/github/cowwoc/pouch/core/Scope.java

@@ -7,7 +7,6 @@
  * {@link #removeChild(Scope) parent.removeChild(this)} at the end of their {@link #close()} method.
  * <p>
  * Example implementation of the {@code close()} method:
- * <p>
  * <pre>
  * {@code
  * public void close()

dropwizard/src/main/java/com/github/cowwoc/pouch/dropwizard/resource/HelloWorldResource.java

@@ -33,7 +33,7 @@ public HelloWorldResource(RequestScope scope)
 	public String getHello()
 	{
 		return "Hello world!\n" +
-			"HTTP-scoped value       : " + scope.getRequestedUri() + "\n" +
-			"Application-scoped value: " + scope.getMode();
+			"HTTP-scoped value: " + scope.getRequestedUri() + "\n" +
+			"JVM-scoped value : " + scope.getMode();
 	}
 }

dropwizard/src/main/java/com/github/cowwoc/pouch/dropwizard/scope/AbstractDatabaseScope.java

@@ -40,7 +40,7 @@ public Duration getScopeCloseTimeout()
 	}
 
 	@Override
-	public String getMode()
+	public RunMode getMode()
 	{
 		return parent.getMode();
 	}

dropwizard/src/main/java/com/github/cowwoc/pouch/dropwizard/scope/AbstractRequestScope.java

@@ -68,7 +68,7 @@ public Connection getConnection()
 	}
 
 	@Override
-	public String getMode()
+	public RunMode getMode()
 	{
 		return parent.getMode();
 	}

dropwizard/src/main/java/com/github/cowwoc/pouch/dropwizard/scope/AbstractServerScope.java

@@ -43,7 +43,7 @@ public Duration getScopeCloseTimeout()
 	}
 
 	@Override
-	public String getMode()
+	public RunMode getMode()
 	{
 		return parent.getMode();
 	}

dropwizard/src/main/java/com/github/cowwoc/pouch/dropwizard/scope/AbstractJvmScope.java → dropwizard/src/main/java/com/github/cowwoc/pouch/dropwizard/scope/DefaultJvmScope.java

@@ -19,9 +19,11 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * Code common to all JvmScope implementations.
+ * Values specific to the lifetime of a JVM.
+ * <p>
+ * Implementations must be thread-safe.
  */
-abstract class AbstractJvmScope extends AbstractScope
+public final class DefaultJvmScope extends AbstractScope
 	implements JvmScope
 {
 	/**
@@ -58,13 +60,26 @@ protected void disposeValue(ScheduledExecutorService scheduler)
 			}
 		}
 	};
-	private final Logger log = LoggerFactory.getLogger(AbstractJvmScope.class);
+	private final RunMode mode;
+	private final Logger log = LoggerFactory.getLogger(DefaultJvmScope.class);
 
 	/**
-	 * Creates a new application scope.
+	 * Creates a new scope.
+	 *
+	 * @param mode the runtime mode of the JVM
+	 * @throws NullPointerException if {@code mode} is null
 	 */
-	protected AbstractJvmScope()
+	public DefaultJvmScope(RunMode mode)
 	{
+		if (mode == null)
+			throw new NullPointerException("mode may not be null");
+		this.mode = mode;
+	}
+
+	@Override
+	public RunMode getMode()
+	{
+		return mode;
 	}
 
 	@Override

dropwizard/src/main/java/com/github/cowwoc/pouch/dropwizard/scope/DefaultTransactionScope.java

@@ -73,7 +73,7 @@ public DataSource getDataSource()
 	}
 
 	@Override
-	public String getMode()
+	public RunMode getMode()
 	{
 		return parent.getMode();
 	}

dropwizard/src/main/java/com/github/cowwoc/pouch/dropwizard/scope/JvmScope.java

@@ -17,16 +17,18 @@
 public interface JvmScope extends Scope
 {
 	/**
-	 * Returns the execution mode (e.g. "main", "test").
+	 * Returns the runtime mode.
 	 *
-	 * @return the execution mode (e.g. "main", "test")
+	 * @return the runtime mode
+	 * @throws IllegalStateException if the scope is closed
 	 */
-	String getMode();
+	RunMode getMode();
 
 	/**
 	 * Returns the scheduler to use for background tasks.
 	 *
 	 * @return the scheduler to use for background tasks
+	 * @throws IllegalStateException if the scope is closed
 	 */
 	ScheduledExecutorService getScheduler();
 

dropwizard/src/main/java/com/github/cowwoc/pouch/dropwizard/scope/MainPouchBinder.java

@@ -25,7 +25,7 @@ private static class JvmScopeFactory implements Factory<JvmScope>
 		@Override
 		public JvmScope provide()
 		{
-			return new MainJvmScope();
+			return new DefaultJvmScope(RunMode.RELEASE);
 		}
 
 		@Override

dropwizard/src/main/java/com/github/cowwoc/pouch/dropwizard/scope/RunMode.java

@@ -0,0 +1,17 @@
+package com.github.cowwoc.pouch.dropwizard.scope;
+
+/**
+ * Runtime modes.
+ */
+public enum RunMode
+{
+	/**
+	 * Optimized for debugging problems (extra runtime checks, logging of the program state, disabled web client
+	 * cache).
+	 */
+	DEBUG,
+	/**
+	 * Optimized for maximum performance.
+	 */
+	RELEASE
+}

dropwizard/src/test/java/com/github/cowwoc/pouch/dropwizard/database/TestDatabase.java

@@ -1,9 +1,10 @@
 package com.github.cowwoc.pouch.dropwizard.database;
 
 import com.github.cowwoc.pouch.dropwizard.scope.DatabaseScope;
+import com.github.cowwoc.pouch.dropwizard.scope.DefaultJvmScope;
 import com.github.cowwoc.pouch.dropwizard.scope.JvmScope;
+import com.github.cowwoc.pouch.dropwizard.scope.RunMode;
 import com.github.cowwoc.pouch.dropwizard.scope.TestDatabaseScope;
-import com.github.cowwoc.pouch.dropwizard.scope.TestJvmScope;
 import com.github.cowwoc.pouch.dropwizard.scope.TransactionScope;
 import org.junit.jupiter.api.Test;
 
@@ -15,7 +16,7 @@ public final class TestDatabase
 	@Test
 	public void test1() throws SQLException
 	{
-		try (JvmScope jvmScope = new TestJvmScope();
+		try (JvmScope jvmScope = new DefaultJvmScope(RunMode.DEBUG);
 		     DatabaseScope databaseScope = new TestDatabaseScope(jvmScope);
 		     TransactionScope transaction = databaseScope.createTransactionScope())
 		{
@@ -27,7 +28,7 @@ public void test1() throws SQLException
 	@Test
 	public void test2() throws SQLException
 	{
-		try (JvmScope jvmScope = new TestJvmScope();
+		try (JvmScope jvmScope = new DefaultJvmScope(RunMode.DEBUG);
 		     DatabaseScope databaseScope = new TestDatabaseScope(jvmScope);
 		     TransactionScope transaction = databaseScope.createTransactionScope())
 		{

dropwizard/src/test/java/com/github/cowwoc/pouch/dropwizard/scope/TestPouchBinder.java

@@ -24,7 +24,7 @@ private static class JvmScopeFactory implements Factory<JvmScope>
 		@Override
 		public JvmScope provide()
 		{
-			return new TestJvmScope();
+			return new DefaultJvmScope(RunMode.DEBUG);
 		}
 
 		@Override

jersey/README.md

@@ -55,8 +55,8 @@ public final class HelloWorldResource
   public String getHello()
   {
     return "Hello world!\n" +
-      "HTTP-scoped value       : " + scope.getRequestedUri() + "\n" +
-      "Application-scoped value: " + scope.getMode();
+      "HTTP-scoped value: " + scope.getRequestedUri() + "\n" +
+      "JVM-scoped value : " + scope.getMode();
   }
 }
 ```

jersey/src/main/java/com/github/cowwoc/pouch/jersey/resource/HelloWorldResource.java

@@ -34,7 +34,7 @@ public HelloWorldResource(RequestScope scope)
 	public String getHello()
 	{
 		return "Hello world!\n" +
-			"HTTP-scoped value       : " + scope.getRequestedUri() + "\n" +
-			"Application-scoped value: " + scope.getMode();
+			"HTTP-scoped value: " + scope.getRequestedUri() + "\n" +
+			"JVM-scoped value : " + scope.getMode();
 	}
 }

jersey/src/main/java/com/github/cowwoc/pouch/jersey/scope/AbstractDatabaseScope.java

@@ -40,7 +40,7 @@ public Duration getScopeCloseTimeout()
 	}
 
 	@Override
-	public String getMode()
+	public RunMode getMode()
 	{
 		return parent.getMode();
 	}
@@ -50,7 +50,7 @@ public ScheduledExecutorService getScheduler()
 	{
 		return parent.getScheduler();
 	}
-	
+
 	@Override
 	public Connection getConnection()
 	{

jersey/src/main/java/com/github/cowwoc/pouch/jersey/scope/AbstractRequestScope.java

@@ -68,7 +68,7 @@ public Connection getConnection()
 	}
 
 	@Override
-	public String getMode()
+	public RunMode getMode()
 	{
 		return parent.getMode();
 	}

jersey/src/main/java/com/github/cowwoc/pouch/jersey/scope/AbstractServerScope.java

@@ -39,7 +39,7 @@ public Duration getScopeCloseTimeout()
 	}
 
 	@Override
-	public String getMode()
+	public RunMode getMode()
 	{
 		return parent.getMode();
 	}

jersey/src/main/java/com/github/cowwoc/pouch/jersey/scope/AbstractJvmScope.java → jersey/src/main/java/com/github/cowwoc/pouch/jersey/scope/DefaultJvmScope.java

@@ -20,19 +20,18 @@
 import java.util.concurrent.atomic.LongAdder;
 
 /**
- * Code common to all JvmScope implementations.
+ * The default implementation of JvmScope.
+ * <p>
+ * This class ensures that globals, such as slf4j, are initialized in a thread-safe manner.
  */
-public abstract class AbstractJvmScope extends AbstractScope
+public final class DefaultJvmScope extends AbstractScope
 	implements JvmScope
 {
 	/**
 	 * The maximum amount of time to wait for child scopes to close.
 	 */
 	private static final Duration CLOSE_TIMEOUT = Duration.ofSeconds(10);
-	/**
-	 * {@code true} if the scope has been closed.
-	 */
-	private final AtomicBoolean closed = new AtomicBoolean();
+	private final RunMode mode;
 	private final Factory<ScheduledExecutorService> schedulerFactory = new ConcurrentLazyFactory<>()
 	{
 		@Override
@@ -70,13 +69,29 @@ protected void disposeValue(ScheduledExecutorService scheduler)
 			}
 		}
 	};
-	private final Logger log = LoggerFactory.getLogger(AbstractJvmScope.class);
+	/**
+	 * {@code true} if the scope has been closed.
+	 */
+	private final AtomicBoolean closed = new AtomicBoolean();
+	private final Logger log = LoggerFactory.getLogger(DefaultJvmScope.class);
 
 	/**
-	 * Creates a new JVM scope.
+	 * Creates a new scope.
+	 *
+	 * @param mode the runtime mode of the JVM
+	 * @throws NullPointerException if {@code mode} is null
 	 */
-	public AbstractJvmScope()
+	public DefaultJvmScope(RunMode mode)
+	{
+		if (mode == null)
+			throw new NullPointerException("mode may not be null");
+		this.mode = mode;
+	}
+
+	@Override
+	public RunMode getMode()
 	{
+		return mode;
 	}
 
 	@Override

jersey/src/main/java/com/github/cowwoc/pouch/jersey/scope/DefaultTransactionScope.java

@@ -80,7 +80,7 @@ public DataSource getDataSource()
 	}
 
 	@Override
-	public String getMode()
+	public RunMode getMode()
 	{
 		return parent.getMode();
 	}
@@ -102,7 +102,7 @@ public Connection getConnection()
 	{
 		return connection.getValue();
 	}
-	
+
 	@Override
 	public boolean isClosed()
 	{

jersey/src/main/java/com/github/cowwoc/pouch/jersey/scope/JvmScope.java

@@ -17,11 +17,12 @@
 public interface JvmScope extends Scope
 {
 	/**
-	 * Returns the execution mode (e.g. "main", "test").
+	 * Returns the runtime mode
 	 *
-	 * @return the execution mode (e.g. "main", "test")
+	 * @return the runtime mode
+	 * @throws IllegalStateException if the scope is closed
 	 */
-	String getMode();
+	RunMode getMode();
 
 	/**
 	 * @return the amount of time to wait for scopes to close
@@ -33,6 +34,7 @@ public interface JvmScope extends Scope
 	 * Returns the scheduler to use for background tasks.
 	 *
 	 * @return the scheduler to use for background tasks
+	 * @throws IllegalStateException if the scope is closed
 	 */
 	ScheduledExecutorService getScheduler();
 }