diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..c396f22
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,23 @@
+name: analogweb core CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          cache: maven
+          distribution: 'temurin'
+      - name: Code Format Validation
+        run: mvn formatter:validate
+      - name: Test
+        run: mvn clean test
diff --git a/README.md b/README.md
index 1f5889b..43d88fd 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 Analogweb Framework
 ===============================================
 
-[![Build Status](https://travis-ci.org/analogweb/core.svg?branch=master)](https://travis-ci.org/analogweb/core)
+[![Build Status](https://github.com/analogweb/core/actions/workflows/ci.yml/badge.svg)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.analogweb/analogweb-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.analogweb/analogweb-core)
 
 Analogweb is a tiny HTTP oriented framework.
-It depends only Java 8+.
+It depends only Java 11+.
 
 ## Example
 
diff --git a/pom.xml b/pom.xml
index 7df3fe9..9edced2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <!-- 
-    The MIT Lisence Copyright (c) 2011 - 2017 Analog Web Framework Development Team.
+    The MIT Lisence Copyright (c) 2011 - 2023 Analog Web Framework Development Team.
     
     Permission is hereby granted, free of charge, to any person obtaining 
 	a copy of this software and associated documentation files (the "Software"), 
@@ -23,7 +23,7 @@
 	<groupId>org.analogweb</groupId>
 	<artifactId>analogweb-core</artifactId>
 	<packaging>jar</packaging>
-	<version>0.11.2-SNAPSHOT</version>
+	<version>0.12.0-SNAPSHOT</version>
 	<name>analogweb-core</name>
 	<url>http://analogweb.org</url>
 	<organization>
@@ -50,7 +50,7 @@
 	<parent>
 		<groupId>org.analogweb</groupId>
 		<artifactId>analogweb-parent-modules</artifactId>
-		<version>18</version>
+		<version>21</version>
 		<relativePath />
 	</parent>
 	<build>
diff --git a/src/main/java/org/analogweb/Application.java b/src/main/java/org/analogweb/Application.java
index a65e1fd..e30b00c 100644
--- a/src/main/java/org/analogweb/Application.java
+++ b/src/main/java/org/analogweb/Application.java
@@ -7,59 +7,59 @@
 
 /**
  * An Analogweb application.
- * 
+ *
  * @author snowgoose
  */
 public interface Application extends Disposable {
 
-	String DEFAULT_PACKAGE_NAME = Application.class.getPackage().getName();
-	/**
-	 * {@link RequestPath} not found.
-	 */
-	Response NOT_FOUND = Response.NOT_FOUND;
+    String DEFAULT_PACKAGE_NAME = Application.class.getPackage().getName();
+    /**
+     * {@link RequestPath} not found.
+     */
+    Response NOT_FOUND = Response.NOT_FOUND;
 
-	/**
-	 * Run application.
-	 * 
-	 * @param resolver
-	 *            {@link ApplicationContext}
-	 * @param collectors
-	 *            {@link ClassCollector}
-	 * @param props
-	 *            {@link ApplicationProperties}
-	 * @param classLoader
-	 *            {@link ClassLoader}
-	 */
-	void run(ApplicationContext resolver, ApplicationProperties props,
-			Collection<ClassCollector> collectors, ClassLoader classLoader);
+    /**
+     * Run application.
+     *
+     * @param resolver
+     *            {@link ApplicationContext}
+     * @param collectors
+     *            {@link ClassCollector}
+     * @param props
+     *            {@link ApplicationProperties}
+     * @param classLoader
+     *            {@link ClassLoader}
+     */
+    void run(ApplicationContext resolver, ApplicationProperties props, Collection<ClassCollector> collectors,
+            ClassLoader classLoader);
 
-	/**
-	 * Process request. Before then {@link Application} should be running.
-	 * 
-	 * @param path
-	 *            {@link RequestPath}
-	 * @param context
-	 *            {@link RequestContext}
-	 * @param responseContext
-	 *            {@link ResponseContext}
-	 * @throws IOException
-	 * @throws WebApplicationException
-	 */
-	Response processRequest(RequestPath path, RequestContext context,
-			ResponseContext responseContext) throws IOException,
-			WebApplicationException;
+    /**
+     * Process request. Before then {@link Application} should be running.
+     *
+     * @param path
+     *            {@link RequestPath}
+     * @param context
+     *            {@link RequestContext}
+     * @param responseContext
+     *            {@link ResponseContext}
+     *
+     * @throws IOException
+     * @throws WebApplicationException
+     */
+    Response processRequest(RequestPath path, RequestContext context, ResponseContext responseContext)
+            throws IOException, WebApplicationException;
 
-	/**
-	 * Obtain {@link Modules}.
-	 * 
-	 * @return {@link Modules}
-	 */
-	Modules getModules();
+    /**
+     * Obtain {@link Modules}.
+     *
+     * @return {@link Modules}
+     */
+    Modules getModules();
 
-	/**
-	 * Obtain {@link RouteRegistry}.
-	 * 
-	 * @return {@link RouteRegistry}
-	 */
-	RouteRegistry getRouteRegistry();
+    /**
+     * Obtain {@link RouteRegistry}.
+     *
+     * @return {@link RouteRegistry}
+     */
+    RouteRegistry getRouteRegistry();
 }
diff --git a/src/main/java/org/analogweb/ApplicationContext.java b/src/main/java/org/analogweb/ApplicationContext.java
index badb0d2..f3ef072 100644
--- a/src/main/java/org/analogweb/ApplicationContext.java
+++ b/src/main/java/org/analogweb/ApplicationContext.java
@@ -2,19 +2,20 @@
 
 /**
  * Context of application.
- * 
+ *
  * @author snowgoose
  */
 public interface ApplicationContext {
 
-	/**
-	 * Obtain application scoped attributes.
-	 * 
-	 * @param requiredType
-	 *            Type of attribute value.
-	 * @param contextKey
-	 *            Key of attribute value.
-	 * @return Attribute value.
-	 */
-	<T> T getAttribute(Class<T> requiredType, String contextKey);
+    /**
+     * Obtain application scoped attributes.
+     *
+     * @param requiredType
+     *            Type of attribute value.
+     * @param contextKey
+     *            Key of attribute value.
+     *
+     * @return Attribute value.
+     */
+    <T> T getAttribute(Class<T> requiredType, String contextKey);
 }
diff --git a/src/main/java/org/analogweb/ApplicationProcessor.java b/src/main/java/org/analogweb/ApplicationProcessor.java
index c0f4458..3be409c 100644
--- a/src/main/java/org/analogweb/ApplicationProcessor.java
+++ b/src/main/java/org/analogweb/ApplicationProcessor.java
@@ -2,98 +2,96 @@
 
 /**
  * Interrupt application phases.
- * 
+ *
  * @author snowgoose
  */
 public interface ApplicationProcessor extends MultiModule, Precedence {
 
-	/**
-	 * End of process without interruption.
-	 */
-	Object NO_INTERRUPTION = new Object();
+    /**
+     * End of process without interruption.
+     */
+    Object NO_INTERRUPTION = new Object();
 
-	/**
-	 * Interrupt before matching requested URI. Returns expect
-	 * {@link #NO_INTERRUPTION}, finish process request with return value.
-	 * 
-	 * @param request
-	 *            {@link MutableRequestContext}
-	 * @param path
-	 *            {@link RequestPath}
-	 * @return {@link #NO_INTERRUPTION} or {@link Renderable}
-	 */
-	Object preMatching(MutableRequestContext request, RequestPath path);
+    /**
+     * Interrupt before matching requested URI. Returns expect {@link #NO_INTERRUPTION}, finish process request with
+     * return value.
+     *
+     * @param request
+     *            {@link MutableRequestContext}
+     * @param path
+     *            {@link RequestPath}
+     *
+     * @return {@link #NO_INTERRUPTION} or {@link Renderable}
+     */
+    Object preMatching(MutableRequestContext request, RequestPath path);
 
-	/**
-	 * Interrupt before invoking {@link Invocation}. Returns expect
-	 * {@link #NO_INTERRUPTION}, finish process request with return value.
-	 * 
-	 * @param args
-	 *            {@link InvocationArguments}
-	 * @param metadata
-	 *            {@link InvocationMetadata}
-	 * @param context
-	 *            {@link RequestContext}
-	 * @param converters
-	 *            {@link TypeMapperContext}
-	 * @param resolvers
-	 *            {@link RequestValueResolvers}
-	 * @return {@link #NO_INTERRUPTION} or {@link Renderable}
-	 */
-	Object prepareInvoke(InvocationArguments args, InvocationMetadata metadata,
-			RequestContext context, TypeMapperContext converters,
-			RequestValueResolvers resolvers);
+    /**
+     * Interrupt before invoking {@link Invocation}. Returns expect {@link #NO_INTERRUPTION}, finish process request
+     * with return value.
+     *
+     * @param args
+     *            {@link InvocationArguments}
+     * @param metadata
+     *            {@link InvocationMetadata}
+     * @param context
+     *            {@link RequestContext}
+     * @param converters
+     *            {@link TypeMapperContext}
+     * @param resolvers
+     *            {@link RequestValueResolvers}
+     *
+     * @return {@link #NO_INTERRUPTION} or {@link Renderable}
+     */
+    Object prepareInvoke(InvocationArguments args, InvocationMetadata metadata, RequestContext context,
+            TypeMapperContext converters, RequestValueResolvers resolvers);
 
-	/**
-	 * Interrupt after cause exception when execute {@link Application}. Returns
-	 * expect {@link #NO_INTERRUPTION}, finish process request with return
-	 * value.
-	 * 
-	 * @param ex
-	 *            Caused exception when execute {@link Application}.
-	 * @param request
-	 *            {@link RequestContext}
-	 * @param args
-	 *            {@link InvocationArguments}
-	 * @param metadata
-	 *            {@link InvocationMetadata}
-	 * @return {@link #NO_INTERRUPTION} or {@link Renderable}
-	 */
-	Object processException(Exception ex, RequestContext request,
-			PreparedInvocationArguments args, InvocationMetadata metadata);
+    /**
+     * Interrupt after cause exception when execute {@link Application}. Returns expect {@link #NO_INTERRUPTION}, finish
+     * process request with return value.
+     *
+     * @param ex
+     *            Caused exception when execute {@link Application}.
+     * @param request
+     *            {@link RequestContext}
+     * @param args
+     *            {@link InvocationArguments}
+     * @param metadata
+     *            {@link InvocationMetadata}
+     *
+     * @return {@link #NO_INTERRUPTION} or {@link Renderable}
+     */
+    Object processException(Exception ex, RequestContext request, PreparedInvocationArguments args,
+            InvocationMetadata metadata);
 
-	/**
-	 * Interrupt after execute {@link Application}. Returns expect
-	 * {@link #NO_INTERRUPTION}, finish process request with return value.
-	 * 
-	 * @param invocationResult
-	 *            {@link Application}の実行結果
-	 * @param args
-	 *            {@link InvocationArguments}
-	 * @param metadata
-	 *            {@link InvocationMetadata}
-	 * @param context
-	 *            {@link RequestContext}
-	 * @param resolvers
-	 *            {@link RequestValueResolvers}
-	 */
-	void postInvoke(Object invocationResult, InvocationArguments args,
-			InvocationMetadata metadata, RequestContext context,
-			RequestValueResolvers resolvers);
+    /**
+     * Interrupt after execute {@link Application}. Returns expect {@link #NO_INTERRUPTION}, finish process request with
+     * return value.
+     *
+     * @param invocationResult
+     *            {@link Application}の実行結果
+     * @param args
+     *            {@link InvocationArguments}
+     * @param metadata
+     *            {@link InvocationMetadata}
+     * @param context
+     *            {@link RequestContext}
+     * @param resolvers
+     *            {@link RequestValueResolvers}
+     */
+    void postInvoke(Object invocationResult, InvocationArguments args, InvocationMetadata metadata,
+            RequestContext context, RequestValueResolvers resolvers);
 
-	/**
-	 * Interrupt after execute {@link Application}(include exception occurred).
-	 * When
-	 * {@link #processException(Exception, RequestContext, PreparedInvocationArguments, InvocationMetadata)}
-	 * returns value, this method has no effect.
-	 * 
-	 * @param request
-	 *            {@link RequestContext}
-	 * @param response
-	 *            {@link ResponseContext}
-	 * @param e
-	 *            {@link Exception}
-	 */
-	void afterCompletion(RequestContext request, ResponseContext response,
-			Exception e);
+    /**
+     * Interrupt after execute {@link Application}(include exception occurred). When
+     * {@link #processException(Exception, RequestContext, PreparedInvocationArguments, InvocationMetadata)} returns
+     * value, this method has no effect.
+     *
+     * @param request
+     *            {@link RequestContext}
+     * @param response
+     *            {@link ResponseContext}
+     * @param e
+     *            {@link Exception}
+     */
+    void afterCompletion(RequestContext request, ResponseContext response, Exception e);
 }
diff --git a/src/main/java/org/analogweb/ApplicationProperties.java b/src/main/java/org/analogweb/ApplicationProperties.java
index 3aeac9c..2c54880 100644
--- a/src/main/java/org/analogweb/ApplicationProperties.java
+++ b/src/main/java/org/analogweb/ApplicationProperties.java
@@ -7,24 +7,24 @@
 
 /**
  * Global settings properties for {@link Application}。
- * 
+ *
  * @author snowgoose
  */
 public interface ApplicationProperties {
 
-	String PACKAGES = "analogweb.packages";
-	String TEMP_DIR = "analogweb.tmpdir";
-	String LOCALE = "analogweb.default.locale";
+    String PACKAGES = "analogweb.packages";
+    String TEMP_DIR = "analogweb.tmpdir";
+    String LOCALE = "analogweb.default.locale";
 
-	Collection<String> getComponentPackageNames();
+    Collection<String> getComponentPackageNames();
 
-	File getTempDir();
+    File getTempDir();
 
-	Locale getDefaultClientLocale();
+    Locale getDefaultClientLocale();
 
-	Map<String, Object> getProperties();
+    Map<String, Object> getProperties();
 
-	String getStringProperty(String key);
+    String getStringProperty(String key);
 
-	Object getProperty(String key);
+    Object getProperty(String key);
 }
diff --git a/src/main/java/org/analogweb/AttributesHandler.java b/src/main/java/org/analogweb/AttributesHandler.java
index 796f4d3..f5473b2 100644
--- a/src/main/java/org/analogweb/AttributesHandler.java
+++ b/src/main/java/org/analogweb/AttributesHandler.java
@@ -5,8 +5,7 @@
  */
 public interface AttributesHandler extends RequestValueResolver {
 
-	void putAttributeValue(RequestContext requestContext, String query,
-			Object value);
+    void putAttributeValue(RequestContext requestContext, String query, Object value);
 
-	void removeAttribute(RequestContext requestContext, String query);
+    void removeAttribute(RequestContext requestContext, String query);
 }
diff --git a/src/main/java/org/analogweb/ContainerAdaptor.java b/src/main/java/org/analogweb/ContainerAdaptor.java
index db7aec9..58124a1 100644
--- a/src/main/java/org/analogweb/ContainerAdaptor.java
+++ b/src/main/java/org/analogweb/ContainerAdaptor.java
@@ -4,26 +4,28 @@
 
 /**
  * Facade of a instance container like Spring,Guice,CDI and so on.
- * 
+ *
  * @author snowgoose
  */
 public interface ContainerAdaptor extends Module {
 
-	/**
-	 * Obtain required type instance from container.
-	 * 
-	 * @param type
-	 *            required type.
-	 * @return a instance on container.
-	 */
-	<T> T getInstanceOfType(Class<T> type);
+    /**
+     * Obtain required type instance from container.
+     *
+     * @param type
+     *            required type.
+     *
+     * @return a instance on container.
+     */
+    <T> T getInstanceOfType(Class<T> type);
 
-	/**
-	 * Obtain required type instances from container.
-	 * 
-	 * @param type
-	 *            required type.
-	 * @return instances on container.
-	 */
-	<T> List<T> getInstancesOfType(Class<T> type);
+    /**
+     * Obtain required type instances from container.
+     *
+     * @param type
+     *            required type.
+     *
+     * @return instances on container.
+     */
+    <T> List<T> getInstancesOfType(Class<T> type);
 }
diff --git a/src/main/java/org/analogweb/ContainerAdaptorFactory.java b/src/main/java/org/analogweb/ContainerAdaptorFactory.java
index 624460a..70dcd69 100644
--- a/src/main/java/org/analogweb/ContainerAdaptorFactory.java
+++ b/src/main/java/org/analogweb/ContainerAdaptorFactory.java
@@ -2,21 +2,21 @@
 
 /**
  * Factory of {@link ContainerAdaptor}.
- * 
+ *
  * @param <T>
  *            type of {@link ContainerAdaptor}.
+ *
  * @author snowgoose
  */
-public interface ContainerAdaptorFactory<T extends ContainerAdaptor>
-		extends
-			Module {
+public interface ContainerAdaptorFactory<T extends ContainerAdaptor> extends Module {
 
-	/**
-	 * Create new {@link ContainerAdaptor}.
-	 * 
-	 * @param resolver
-	 *            {@link ApplicationContext}
-	 * @return Created {@link ContainerAdaptor}
-	 */
-	T createContainerAdaptor(ApplicationContext resolver);
+    /**
+     * Create new {@link ContainerAdaptor}.
+     *
+     * @param resolver
+     *            {@link ApplicationContext}
+     *
+     * @return Created {@link ContainerAdaptor}
+     */
+    T createContainerAdaptor(ApplicationContext resolver);
 }
diff --git a/src/main/java/org/analogweb/Cookies.java b/src/main/java/org/analogweb/Cookies.java
index 250a67d..528e651 100644
--- a/src/main/java/org/analogweb/Cookies.java
+++ b/src/main/java/org/analogweb/Cookies.java
@@ -2,59 +2,60 @@
 
 /**
  * Cookie based on <a href="http://www.ietf.org/rfc/rfc2109.txt">RFC 2109</a>.
- * 
+ *
  * @author snowgoose
  */
 public interface Cookies {
 
-	/**
-	 * Get {@link Cookie}.
-	 * 
-	 * @param name
-	 *            Key of {@link Cookie}
-	 * @return {@link Cookie}
-	 */
-	Cookie getCookie(String name);
-
-	/**
-	 * Put {@link Cookie}.
-	 * 
-	 * @param name
-	 *            Key of {@link Cookie}.
-	 * @param value
-	 *            Value of {@link Cookie}.
-	 */
-	void putCookie(String name, Object value);
-
-	/**
-	 * Put {@link Cookie}.
-	 * 
-	 * @param cookie
-	 *            {@link Cookie}
-	 */
-	void putCookie(Cookie cookie);
-
-	/**
-	 * A Cookie.
-	 * 
-	 * @author snowgoose
-	 */
-	interface Cookie {
-
-		String getName();
-
-		String getValue();
-
-		String getComment();
-
-		String getPath();
-
-		int getMaxAge();
-
-		boolean isSecure();
-
-		int getVersion();
-
-		String getDomain();
-	}
+    /**
+     * Get {@link Cookie}.
+     *
+     * @param name
+     *            Key of {@link Cookie}
+     *
+     * @return {@link Cookie}
+     */
+    Cookie getCookie(String name);
+
+    /**
+     * Put {@link Cookie}.
+     *
+     * @param name
+     *            Key of {@link Cookie}.
+     * @param value
+     *            Value of {@link Cookie}.
+     */
+    void putCookie(String name, Object value);
+
+    /**
+     * Put {@link Cookie}.
+     *
+     * @param cookie
+     *            {@link Cookie}
+     */
+    void putCookie(Cookie cookie);
+
+    /**
+     * A Cookie.
+     *
+     * @author snowgoose
+     */
+    interface Cookie {
+
+        String getName();
+
+        String getValue();
+
+        String getComment();
+
+        String getPath();
+
+        int getMaxAge();
+
+        boolean isSecure();
+
+        int getVersion();
+
+        String getDomain();
+    }
 }
diff --git a/src/main/java/org/analogweb/Disposable.java b/src/main/java/org/analogweb/Disposable.java
index 0616f00..62fcec4 100644
--- a/src/main/java/org/analogweb/Disposable.java
+++ b/src/main/java/org/analogweb/Disposable.java
@@ -5,8 +5,8 @@
  */
 public interface Disposable {
 
-	/**
-	 * Dispose all the states.
-	 */
-	void dispose();
+    /**
+     * Dispose all the states.
+     */
+    void dispose();
 }
diff --git a/src/main/java/org/analogweb/ExceptionHandler.java b/src/main/java/org/analogweb/ExceptionHandler.java
index c99f170..93f8264 100644
--- a/src/main/java/org/analogweb/ExceptionHandler.java
+++ b/src/main/java/org/analogweb/ExceptionHandler.java
@@ -2,18 +2,19 @@
 
 /**
  * Handle {@link Throwable} that caused by invoking route method.
- * 
+ *
  * @author snowgoose
  */
 public interface ExceptionHandler extends Module {
 
-	/**
-	 * Handle caused {@link Throwable}. The return value handle by
-	 * {@link RenderableResolver} when that is not {@code null}.
-	 * 
-	 * @param exception
-	 *            {@link Exception}
-	 * @return Result of exception handling.({@link Renderable} etc...)
-	 */
-	Object handleException(Exception exception);
+    /**
+     * Handle caused {@link Throwable}. The return value handle by {@link RenderableResolver} when that is not
+     * {@code null}.
+     *
+     * @param exception
+     *            {@link Exception}
+     *
+     * @return Result of exception handling.({@link Renderable} etc...)
+     */
+    Object handleException(Exception exception);
 }
diff --git a/src/main/java/org/analogweb/ExceptionMapper.java b/src/main/java/org/analogweb/ExceptionMapper.java
index 9801695..4d14f90 100644
--- a/src/main/java/org/analogweb/ExceptionMapper.java
+++ b/src/main/java/org/analogweb/ExceptionMapper.java
@@ -5,23 +5,23 @@
  */
 public interface ExceptionMapper extends MultiModule {
 
-	/**
-	 * Return {@code true} when this {@link ExceptionMapper} can handle
-	 * {@link Throwable}.
-	 * 
-	 * @param throwable
-	 *            {@link Throwable}
-	 * @return true - this {@link ExceptionMapper} can handle {@link Throwable}.
-	 */
-	boolean isMatch(Throwable throwable);
+    /**
+     * Return {@code true} when this {@link ExceptionMapper} can handle {@link Throwable}.
+     *
+     * @param throwable
+     *            {@link Throwable}
+     *
+     * @return true - this {@link ExceptionMapper} can handle {@link Throwable}.
+     */
+    boolean isMatch(Throwable throwable);
 
-	/**
-	 * Convert {@link Throwable} to handleable result.(like a {@link Renderable}
-	 * )
-	 * 
-	 * @param throwable
-	 *            {@link Throwable}
-	 * @return handleable result.(like a {@link Renderable})
-	 */
-	Object mapToResult(Throwable throwable);
+    /**
+     * Convert {@link Throwable} to handleable result.(like a {@link Renderable} )
+     *
+     * @param throwable
+     *            {@link Throwable}
+     *
+     * @return handleable result.(like a {@link Renderable})
+     */
+    Object mapToResult(Throwable throwable);
 }
diff --git a/src/main/java/org/analogweb/Headers.java b/src/main/java/org/analogweb/Headers.java
index b0ca4f0..fa008a2 100644
--- a/src/main/java/org/analogweb/Headers.java
+++ b/src/main/java/org/analogweb/Headers.java
@@ -5,50 +5,52 @@
 
 /**
  * Request or response header.
- * 
+ *
  * @author y2k2mt
  */
 public interface Headers {
 
-	/**
-	 * Get header values.
-	 * 
-	 * @param name
-	 *            Key of header value.
-	 * @return header value.
-	 */
-	List<String> getValues(String name);
+    /**
+     * Get header values.
+     *
+     * @param name
+     *            Key of header value.
+     *
+     * @return header value.
+     */
+    List<String> getValues(String name);
 
-	/**
-	 * Get all header keys.
-	 * 
-	 * @return All header keys
-	 */
-	List<String> getNames();
+    /**
+     * Get all header keys.
+     *
+     * @return All header keys
+     */
+    List<String> getNames();
 
-	/**
-	 * Put header value.
-	 * 
-	 * @param name
-	 *            key of header value.
-	 * @param value
-	 *            header value.
-	 */
-	void putValue(String name, String value);
+    /**
+     * Put header value.
+     *
+     * @param name
+     *            key of header value.
+     * @param value
+     *            header value.
+     */
+    void putValue(String name, String value);
 
-	/**
-	 * Test header value presence.
-	 * 
-	 * @param name
-	 *            key of header value.
-	 * @return when header value presence, returns {@code true}
-	 */
-	boolean contains(String name);
+    /**
+     * Test header value presence.
+     *
+     * @param name
+     *            key of header value.
+     *
+     * @return when header value presence, returns {@code true}
+     */
+    boolean contains(String name);
 
-	/**
-	 * Get current header values snapshot as read-only {@link java.util.Map}.
-	 *
-	 * @return all header key and values as {@link java.util.Map}
-	 */
-	Map<String,List<String>> toMap();
+    /**
+     * Get current header values snapshot as read-only {@link java.util.Map}.
+     *
+     * @return all header key and values as {@link java.util.Map}
+     */
+    Map<String, List<String>> toMap();
 }
diff --git a/src/main/java/org/analogweb/Invocation.java b/src/main/java/org/analogweb/Invocation.java
index 008ce44..a4d9d88 100644
--- a/src/main/java/org/analogweb/Invocation.java
+++ b/src/main/java/org/analogweb/Invocation.java
@@ -2,30 +2,31 @@
 
 /**
  * Invocation of entry-point method.
- * 
+ *
  * @author snowgoose
  */
 public interface Invocation {
 
-	/**
-	 * Invoke entry-point method.
-	 * 
-	 * @see ApplicationProcessor
-	 * @return result of method invocation.
-	 */
-	Object invoke();
+    /**
+     * Invoke entry-point method.
+     *
+     * @see ApplicationProcessor
+     *
+     * @return result of method invocation.
+     */
+    Object invoke();
 
-	/**
-	 * Get entry-point object instance.
-	 * 
-	 * @return entry-point object instance.
-	 */
-	Object getInvocationInstance();
+    /**
+     * Get entry-point object instance.
+     *
+     * @return entry-point object instance.
+     */
+    Object getInvocationInstance();
 
-	/**
-	 * Get {@link InvocationArguments}
-	 * 
-	 * @return {@link InvocationArguments}
-	 */
-	InvocationArguments getInvocationArguments();
+    /**
+     * Get {@link InvocationArguments}
+     *
+     * @return {@link InvocationArguments}
+     */
+    InvocationArguments getInvocationArguments();
 }
diff --git a/src/main/java/org/analogweb/InvocationArguments.java b/src/main/java/org/analogweb/InvocationArguments.java
index 392fc2e..62c710c 100644
--- a/src/main/java/org/analogweb/InvocationArguments.java
+++ b/src/main/java/org/analogweb/InvocationArguments.java
@@ -2,22 +2,22 @@
 
 /**
  * Parameters of {@link Invocation#invoke()}.
- * 
+ *
  * @author snowgoose
  */
 public interface InvocationArguments extends PreparedInvocationArguments {
 
-	/**
-	 * @param newInvocationInstance
-	 *            instance of entry-point.
-	 */
-	void replace(Object newInvocationInstance);
+    /**
+     * @param newInvocationInstance
+     *            instance of entry-point.
+     */
+    void replace(Object newInvocationInstance);
 
-	/**
-	 * @param index
-	 *            index of argument.
-	 * @param arg
-	 *            value of argument.
-	 */
-	void putInvocationArgument(int index, Object arg);
+    /**
+     * @param index
+     *            index of argument.
+     * @param arg
+     *            value of argument.
+     */
+    void putInvocationArgument(int index, Object arg);
 }
diff --git a/src/main/java/org/analogweb/InvocationFactory.java b/src/main/java/org/analogweb/InvocationFactory.java
index 2c6c4c7..68b5eea 100644
--- a/src/main/java/org/analogweb/InvocationFactory.java
+++ b/src/main/java/org/analogweb/InvocationFactory.java
@@ -2,30 +2,29 @@
 
 /**
  * Factory of {@link Invocation}.
- * 
+ *
  * @author snowgoose
  */
 public interface InvocationFactory extends Module {
 
-	/**
-	 * Create new {@link Invocation}.
-	 * 
-	 * @param instanceProvider
-	 *            {@link ContainerAdaptor}
-	 * @param metadata
-	 *            {@link InvocationMetadata}
-	 * @param request
-	 *            {@link RequestContext}
-	 * @param response
-	 *            {@link ResponseContext}
-	 * @param typeMapperContext
-	 *            {@link TypeMapperContext}
-	 * @param resolvers
-	 *            {@link RequestValueResolvers}
-	 * @return Created {@link Invocation}
-	 */
-	Invocation createInvocation(ContainerAdaptor instanceProvider,
-			InvocationMetadata metadata, RequestContext request,
-			ResponseContext response, TypeMapperContext typeMapperContext,
-			RequestValueResolvers resolvers);
+    /**
+     * Create new {@link Invocation}.
+     *
+     * @param instanceProvider
+     *            {@link ContainerAdaptor}
+     * @param metadata
+     *            {@link InvocationMetadata}
+     * @param request
+     *            {@link RequestContext}
+     * @param response
+     *            {@link ResponseContext}
+     * @param typeMapperContext
+     *            {@link TypeMapperContext}
+     * @param resolvers
+     *            {@link RequestValueResolvers}
+     *
+     * @return Created {@link Invocation}
+     */
+    Invocation createInvocation(ContainerAdaptor instanceProvider, InvocationMetadata metadata, RequestContext request,
+            ResponseContext response, TypeMapperContext typeMapperContext, RequestValueResolvers resolvers);
 }
diff --git a/src/main/java/org/analogweb/InvocationInterceptor.java b/src/main/java/org/analogweb/InvocationInterceptor.java
index e3a25c8..bf5daf3 100644
--- a/src/main/java/org/analogweb/InvocationInterceptor.java
+++ b/src/main/java/org/analogweb/InvocationInterceptor.java
@@ -2,5 +2,5 @@
 
 public interface InvocationInterceptor extends MultiModule, Precedence {
 
-	Object onInvoke(Invocation invocation, InvocationMetadata metadata);
+    Object onInvoke(Invocation invocation, InvocationMetadata metadata);
 }
diff --git a/src/main/java/org/analogweb/InvocationMetadata.java b/src/main/java/org/analogweb/InvocationMetadata.java
index d7f54c2..e79439f 100644
--- a/src/main/java/org/analogweb/InvocationMetadata.java
+++ b/src/main/java/org/analogweb/InvocationMetadata.java
@@ -4,33 +4,33 @@
 
 /**
  * Metadata of {@link Invocation}.
- * 
+ *
  * @author snowgoose
  */
 public interface InvocationMetadata {
 
-	/**
-	 * Get invocation {@link Class}.
-	 * 
-	 * @return {@link Class}
-	 */
-	Class<?> getInvocationClass();
+    /**
+     * Get invocation {@link Class}.
+     *
+     * @return {@link Class}
+     */
+    Class<?> getInvocationClass();
 
-	/**
-	 * Get name of the invocation method.
-	 * 
-	 * @return name of the invocation method.
-	 */
-	String getMethodName();
+    /**
+     * Get name of the invocation method.
+     *
+     * @return name of the invocation method.
+     */
+    String getMethodName();
 
-	Class<?>[] getArgumentTypes();
+    Class<?>[] getArgumentTypes();
 
-	RequestPathMetadata getDefinedPath();
+    RequestPathMetadata getDefinedPath();
 
-	/**
-	 * Resolve {@link Method} by reflection.
-	 * 
-	 * @return {@link Method}
-	 */
-	Method resolveMethod();
+    /**
+     * Resolve {@link Method} by reflection.
+     *
+     * @return {@link Method}
+     */
+    Method resolveMethod();
 }
diff --git a/src/main/java/org/analogweb/InvocationMetadataFactory.java b/src/main/java/org/analogweb/InvocationMetadataFactory.java
index a8c3bed..52ecf17 100644
--- a/src/main/java/org/analogweb/InvocationMetadataFactory.java
+++ b/src/main/java/org/analogweb/InvocationMetadataFactory.java
@@ -4,12 +4,12 @@
 
 /**
  * Factory of {@link InvocationMetadata} from class metadatas.
- * 
+ *
  * @author y2k2mt
  */
 public interface InvocationMetadataFactory extends MultiModule {
 
-	Collection<InvocationMetadata> createInvocationMetadatas(
-			ApplicationProperties properties, ContainerAdaptor instanceProvider);
+    Collection<InvocationMetadata> createInvocationMetadatas(ApplicationProperties properties,
+            ContainerAdaptor instanceProvider);
 
 }
diff --git a/src/main/java/org/analogweb/InvocationMetadataFinder.java b/src/main/java/org/analogweb/InvocationMetadataFinder.java
index f32a6be..a86c549 100644
--- a/src/main/java/org/analogweb/InvocationMetadataFinder.java
+++ b/src/main/java/org/analogweb/InvocationMetadataFinder.java
@@ -4,17 +4,15 @@
 
 /**
  * Finder strategy of {@link InvocationMetadata} from {@link RouteRegistry}s
- * 
+ *
  * @author snowgooseyk
  */
 public interface InvocationMetadataFinder extends Precedence, MultiModule {
 
-	InvocationMetadata find(
-			Map<RequestPathMetadata, InvocationMetadata> metadatas,
-			RequestContext request);
+    InvocationMetadata find(Map<RequestPathMetadata, InvocationMetadata> metadatas, RequestContext request);
 
-	public interface Cacheable extends InvocationMetadata {
+    public interface Cacheable extends InvocationMetadata {
 
-		InvocationMetadata getCachable();
-	}
+        InvocationMetadata getCachable();
+    }
 }
diff --git a/src/main/java/org/analogweb/Invoker.java b/src/main/java/org/analogweb/Invoker.java
index 4067090..8b4ae72 100644
--- a/src/main/java/org/analogweb/Invoker.java
+++ b/src/main/java/org/analogweb/Invoker.java
@@ -2,11 +2,10 @@
 
 /**
  * Entry-point {@link Invocation}.
- * 
+ *
  * @author snowgoose
  */
 public interface Invoker extends Module {
 
-	Object invoke(Invocation invocation, InvocationMetadata metadata,
-			RequestContext request, ResponseContext response);
+    Object invoke(Invocation invocation, InvocationMetadata metadata, RequestContext request, ResponseContext response);
 }
diff --git a/src/main/java/org/analogweb/InvokerFactory.java b/src/main/java/org/analogweb/InvokerFactory.java
index 16b4170..fa3836f 100644
--- a/src/main/java/org/analogweb/InvokerFactory.java
+++ b/src/main/java/org/analogweb/InvokerFactory.java
@@ -4,10 +4,10 @@
 
 /**
  * Factory of {@link Invoker}
- * 
+ *
  * @author snowgoose
  */
 public interface InvokerFactory extends Module {
 
-	Invoker createInvoker(List<InvocationInterceptor> interceptors);
+    Invoker createInvoker(List<InvocationInterceptor> interceptors);
 }
diff --git a/src/main/java/org/analogweb/MediaType.java b/src/main/java/org/analogweb/MediaType.java
index e9b0e58..c94657c 100644
--- a/src/main/java/org/analogweb/MediaType.java
+++ b/src/main/java/org/analogweb/MediaType.java
@@ -4,16 +4,16 @@
 
 /**
  * Media type.
- * 
+ *
  * @author snowgoose
  */
 public interface MediaType {
 
-	String getType();
+    String getType();
 
-	String getSubType();
+    String getSubType();
 
-	Map<String, String> getParameters();
+    Map<String, String> getParameters();
 
-	boolean isCompatible(MediaType other);
+    boolean isCompatible(MediaType other);
 }
diff --git a/src/main/java/org/analogweb/Module.java b/src/main/java/org/analogweb/Module.java
index 14f5066..c9acd73 100644
--- a/src/main/java/org/analogweb/Module.java
+++ b/src/main/java/org/analogweb/Module.java
@@ -2,7 +2,7 @@
 
 /**
  * Mark interface as a pluggable object.
- * 
+ *
  * @author snowgoose
  */
 public interface Module {
diff --git a/src/main/java/org/analogweb/Modules.java b/src/main/java/org/analogweb/Modules.java
index fc2d176..3fb37d9 100644
--- a/src/main/java/org/analogweb/Modules.java
+++ b/src/main/java/org/analogweb/Modules.java
@@ -4,39 +4,38 @@
 
 /**
  * All modules that compose an application.
- * 
+ *
  * @author snowgoose
  */
 public interface Modules extends Disposable, ResponseFormatterFinder {
 
-	List<InvocationMetadataFactory> getInvocationMetadataFactories();
+    List<InvocationMetadataFactory> getInvocationMetadataFactories();
 
-	List<InvocationMetadataFinder> getInvocationMetadataFinders();
+    List<InvocationMetadataFinder> getInvocationMetadataFinders();
 
-	List<ExceptionMapper> getExceptionMappers();
+    List<ExceptionMapper> getExceptionMappers();
 
-	Invoker getInvoker();
+    Invoker getInvoker();
 
-	ContainerAdaptor getInvocationInstanceProvider();
+    ContainerAdaptor getInvocationInstanceProvider();
 
-	List<ApplicationProcessor> getApplicationProcessors();
+    List<ApplicationProcessor> getApplicationProcessors();
 
-	List<InvocationInterceptor> getInvocationInterceptors();
+    List<InvocationInterceptor> getInvocationInterceptors();
 
-	InvocationFactory getInvocationFactory();
+    InvocationFactory getInvocationFactory();
 
-	RenderableResolver getResponseResolver();
+    RenderableResolver getResponseResolver();
 
-	ResponseHandler getResponseHandler();
+    ResponseHandler getResponseHandler();
 
-	ExceptionHandler getExceptionHandler();
+    ExceptionHandler getExceptionHandler();
 
-	TypeMapperContext getTypeMapperContext();
+    TypeMapperContext getTypeMapperContext();
 
-	ContainerAdaptor getModulesContainerAdaptor();
+    ContainerAdaptor getModulesContainerAdaptor();
 
-	RequestValueResolvers getRequestValueResolvers();
+    RequestValueResolvers getRequestValueResolvers();
 
-	ResponseFormatter findResponseFormatter(
-			Class<? extends Renderable> mapToResponse);
+    ResponseFormatter findResponseFormatter(Class<? extends Renderable> mapToResponse);
 }
diff --git a/src/main/java/org/analogweb/ModulesAware.java b/src/main/java/org/analogweb/ModulesAware.java
index 8dcacb4..e95d5c7 100644
--- a/src/main/java/org/analogweb/ModulesAware.java
+++ b/src/main/java/org/analogweb/ModulesAware.java
@@ -5,5 +5,5 @@
  */
 public interface ModulesAware extends Disposable {
 
-	void setModules(Modules modules);
+    void setModules(Modules modules);
 }
diff --git a/src/main/java/org/analogweb/ModulesBuilder.java b/src/main/java/org/analogweb/ModulesBuilder.java
index 1b15d2a..5479291 100644
--- a/src/main/java/org/analogweb/ModulesBuilder.java
+++ b/src/main/java/org/analogweb/ModulesBuilder.java
@@ -2,131 +2,111 @@
 
 /**
  * Builder of {@link Modules}.
- * 
+ *
  * @author y2k2mt
  */
 public interface ModulesBuilder {
 
-	Modules buildModules(ApplicationContext resolver,
-			ContainerAdaptor defaultContainer);
+    Modules buildModules(ApplicationContext resolver, ContainerAdaptor defaultContainer);
 
-	ModulesBuilder setModulesProviderClass(
-			Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>> modulesProviderClass);
+    ModulesBuilder setModulesProviderClass(
+            Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>> modulesProviderClass);
 
-	ModulesBuilder setModulesProvider(
-			ContainerAdaptorFactory<? extends ContainerAdaptor> modulesProvider);
+    ModulesBuilder setModulesProvider(ContainerAdaptorFactory<? extends ContainerAdaptor> modulesProvider);
 
-	ModulesBuilder setInvocationInstanceProviderClass(
-			Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>> invocationInstanceProviderClass);
+    ModulesBuilder setInvocationInstanceProviderClass(
+            Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>> invocationInstanceProviderClass);
 
-	ModulesBuilder setInvocationInstanceProvider(
-			ContainerAdaptorFactory<? extends ContainerAdaptor> invocationInstanceProvider);
+    ModulesBuilder setInvocationInstanceProvider(
+            ContainerAdaptorFactory<? extends ContainerAdaptor> invocationInstanceProvider);
 
-	ModulesBuilder setInvocationFactoryClass(
-			Class<? extends InvocationFactory> invocationFactoryClass);
+    ModulesBuilder setInvocationFactoryClass(Class<? extends InvocationFactory> invocationFactoryClass);
 
-	ModulesBuilder setInvocationFactory(InvocationFactory invocationFactory);
+    ModulesBuilder setInvocationFactory(InvocationFactory invocationFactory);
 
-	ModulesBuilder setInvokerFactoryClass(
-			Class<? extends InvokerFactory> invokerFactoryClass);
+    ModulesBuilder setInvokerFactoryClass(Class<? extends InvokerFactory> invokerFactoryClass);
 
-	ModulesBuilder setInvokerFactory(InvokerFactory invokerFactory);
+    ModulesBuilder setInvokerFactory(InvokerFactory invokerFactory);
 
-	ModulesBuilder setRenderableResolverClass(
-			Class<? extends RenderableResolver> responseResolverClass);
+    ModulesBuilder setRenderableResolverClass(Class<? extends RenderableResolver> responseResolverClass);
 
-	ModulesBuilder setRenderableResolver(RenderableResolver responseResolver);
+    ModulesBuilder setRenderableResolver(RenderableResolver responseResolver);
 
-	ModulesBuilder setExceptionHandlerClass(
-			Class<? extends ExceptionHandler> exceptionHandlerClass);
+    ModulesBuilder setExceptionHandlerClass(Class<? extends ExceptionHandler> exceptionHandlerClass);
 
-	ModulesBuilder setExceptionHandler(ExceptionHandler exceptionHandler);
+    ModulesBuilder setExceptionHandler(ExceptionHandler exceptionHandler);
 
-	ModulesBuilder setResponseHandlerClass(
-			Class<? extends ResponseHandler> responseHandlerClass);
+    ModulesBuilder setResponseHandlerClass(Class<? extends ResponseHandler> responseHandlerClass);
 
-	ModulesBuilder setResponseHandler(ResponseHandler responseHandler);
+    ModulesBuilder setResponseHandler(ResponseHandler responseHandler);
 
-	ModulesBuilder setTypeMapperContextClass(
-			Class<? extends TypeMapperContext> typeMapperContextClass);
+    ModulesBuilder setTypeMapperContextClass(Class<? extends TypeMapperContext> typeMapperContextClass);
 
-	ModulesBuilder setTypeMapperContext(TypeMapperContext typeMapperContext);
+    ModulesBuilder setTypeMapperContext(TypeMapperContext typeMapperContext);
 
-	ModulesBuilder addInvocationMetadataFactoriesClass(
-			Class<? extends InvocationMetadataFactory> invocationMetadataFactoryClass);
+    ModulesBuilder addInvocationMetadataFactoriesClass(
+            Class<? extends InvocationMetadataFactory> invocationMetadataFactoryClass);
 
-	ModulesBuilder addInvocationMetadataFactories(
-			InvocationMetadataFactory... invocationMetadataFactories);
+    ModulesBuilder addInvocationMetadataFactories(InvocationMetadataFactory... invocationMetadataFactories);
 
-	ModulesBuilder clearInvocationMetadataFactoriesClass();
+    ModulesBuilder clearInvocationMetadataFactoriesClass();
 
-	ModulesBuilder clearInvocationMetadataFactories();
+    ModulesBuilder clearInvocationMetadataFactories();
 
-	ModulesBuilder addInvocationMetadataFinderClass(
-			Class<? extends InvocationMetadataFinder> invocationMetadataFinderClass);
+    ModulesBuilder addInvocationMetadataFinderClass(
+            Class<? extends InvocationMetadataFinder> invocationMetadataFinderClass);
 
-	ModulesBuilder addInvocationMetadataFinder(
-			InvocationMetadataFinder... invocationMetadataFinder);
+    ModulesBuilder addInvocationMetadataFinder(InvocationMetadataFinder... invocationMetadataFinder);
 
-	ModulesBuilder clearInvocationMetadataFinderClass();
+    ModulesBuilder clearInvocationMetadataFinderClass();
 
-	ModulesBuilder clearInvocationMetadataFinder();
+    ModulesBuilder clearInvocationMetadataFinder();
 
-	ModulesBuilder addApplicationProcessorClass(
-			Class<? extends ApplicationProcessor> applicationProcessorClass);
+    ModulesBuilder addApplicationProcessorClass(Class<? extends ApplicationProcessor> applicationProcessorClass);
 
-	ModulesBuilder addApplicationProcessor(
-			ApplicationProcessor... applicationProcessors);
+    ModulesBuilder addApplicationProcessor(ApplicationProcessor... applicationProcessors);
 
-	ModulesBuilder clearApplicationProcessorClass();
+    ModulesBuilder clearApplicationProcessorClass();
 
-	ModulesBuilder clearApplicationProcessors();
+    ModulesBuilder clearApplicationProcessors();
 
-	ModulesBuilder addInvocationInterceptorClass(
-			Class<? extends InvocationInterceptor> invocationInterceptorClass);
+    ModulesBuilder addInvocationInterceptorClass(Class<? extends InvocationInterceptor> invocationInterceptorClass);
 
-	ModulesBuilder addInvocationInterceptor(
-			InvocationInterceptor... invocationInterceptors);
+    ModulesBuilder addInvocationInterceptor(InvocationInterceptor... invocationInterceptors);
 
-	ModulesBuilder clearInvocationInterceptorClass();
+    ModulesBuilder clearInvocationInterceptorClass();
 
-	ModulesBuilder clearInvocationInterceptors();
+    ModulesBuilder clearInvocationInterceptors();
 
-	ModulesBuilder addAttributesHandlerClass(
-			Class<? extends AttributesHandler> attributesHandlerClass);
+    ModulesBuilder addAttributesHandlerClass(Class<? extends AttributesHandler> attributesHandlerClass);
 
-	ModulesBuilder addAttributesHandler(AttributesHandler... attributesHandler);
+    ModulesBuilder addAttributesHandler(AttributesHandler... attributesHandler);
 
-	ModulesBuilder clearAttributesHanderClass();
+    ModulesBuilder clearAttributesHanderClass();
 
-	ModulesBuilder clearAttributesHanders();
+    ModulesBuilder clearAttributesHanders();
 
-	ModulesBuilder addRequestValueResolverClass(
-			Class<? extends RequestValueResolver> requestValueResolverClass);
+    ModulesBuilder addRequestValueResolverClass(Class<? extends RequestValueResolver> requestValueResolverClass);
 
-	ModulesBuilder addRequestValueResolver(
-			RequestValueResolver... requestValueResolver);
+    ModulesBuilder addRequestValueResolver(RequestValueResolver... requestValueResolver);
 
-	ModulesBuilder clearRequestValueResolverClass();
+    ModulesBuilder clearRequestValueResolverClass();
 
-	ModulesBuilder clearRequestValueResolvers();
+    ModulesBuilder clearRequestValueResolvers();
 
-	ModulesBuilder addResponseFormatterClass(
-			Class<? extends Renderable> mapToResponseClass,
-			Class<? extends ResponseFormatter> responseFormatterClass);
+    ModulesBuilder addResponseFormatterClass(Class<? extends Renderable> mapToResponseClass,
+            Class<? extends ResponseFormatter> responseFormatterClass);
 
-	ModulesBuilder addResponseFormatters(
-			Class<? extends Renderable> mapToResponseClass,
-			ResponseFormatter... responseFormatters);
+    ModulesBuilder addResponseFormatters(Class<? extends Renderable> mapToResponseClass,
+            ResponseFormatter... responseFormatters);
 
-	ModulesBuilder addExceptionMapperClass(
-			Class<? extends ExceptionMapper> exceptionMapperClass);
+    ModulesBuilder addExceptionMapperClass(Class<? extends ExceptionMapper> exceptionMapperClass);
 
-	ModulesBuilder addExceptionMapper(ExceptionMapper... exceptionMappers);
+    ModulesBuilder addExceptionMapper(ExceptionMapper... exceptionMappers);
 
-	ModulesBuilder clearDirectionFormatterClass();
+    ModulesBuilder clearDirectionFormatterClass();
 
-	ModulesBuilder ignore(Class<? extends MultiModule> multiModuleClass);
+    ModulesBuilder ignore(Class<? extends MultiModule> multiModuleClass);
 
-	ModulesBuilder filter(MultiModule.Filter multiModuleFilter);
+    ModulesBuilder filter(MultiModule.Filter multiModuleFilter);
 }
diff --git a/src/main/java/org/analogweb/ModulesConfig.java b/src/main/java/org/analogweb/ModulesConfig.java
index 33e498f..88c7a37 100644
--- a/src/main/java/org/analogweb/ModulesConfig.java
+++ b/src/main/java/org/analogweb/ModulesConfig.java
@@ -2,17 +2,18 @@
 
 /**
  * Configure {@link Modules} through the {@link ModulesBuilder}.
- * 
+ *
  * @author y2k2mt
  */
 public interface ModulesConfig {
 
-	/**
-	 * Compose and return {@link Modules}.
-	 * 
-	 * @param builder
-	 *            {@link ModulesBuilder}.
-	 * @return configured {@link ModulesBuilder}.
-	 */
-	ModulesBuilder prepare(ModulesBuilder builder);
+    /**
+     * Compose and return {@link Modules}.
+     *
+     * @param builder
+     *            {@link ModulesBuilder}.
+     *
+     * @return configured {@link ModulesBuilder}.
+     */
+    ModulesBuilder prepare(ModulesBuilder builder);
 }
diff --git a/src/main/java/org/analogweb/ModulesContainerAdaptorAware.java b/src/main/java/org/analogweb/ModulesContainerAdaptorAware.java
index 52bd4c7..e100723 100644
--- a/src/main/java/org/analogweb/ModulesContainerAdaptorAware.java
+++ b/src/main/java/org/analogweb/ModulesContainerAdaptorAware.java
@@ -5,5 +5,5 @@
  */
 public interface ModulesContainerAdaptorAware {
 
-	void setModulesContainerAdaptor(ContainerAdaptor containerAdaptor);
+    void setModulesContainerAdaptor(ContainerAdaptor containerAdaptor);
 }
diff --git a/src/main/java/org/analogweb/MultiModule.java b/src/main/java/org/analogweb/MultiModule.java
index 0383bbc..37c6aea 100644
--- a/src/main/java/org/analogweb/MultiModule.java
+++ b/src/main/java/org/analogweb/MultiModule.java
@@ -2,13 +2,13 @@
 
 /**
  * A Definable multiple {@link Module}.
- * 
+ *
  * @author snowgoose
  */
 public interface MultiModule extends Module {
 
-	interface Filter {
+    interface Filter {
 
-		<T extends MultiModule> boolean isAppreciable(T aMultiModule);
-	}
+        <T extends MultiModule> boolean isAppreciable(T aMultiModule);
+    }
 }
diff --git a/src/main/java/org/analogweb/Multipart.java b/src/main/java/org/analogweb/Multipart.java
index 27de10d..36fdf7d 100644
--- a/src/main/java/org/analogweb/Multipart.java
+++ b/src/main/java/org/analogweb/Multipart.java
@@ -4,18 +4,18 @@
 
 /**
  * Multiple part request.
- * 
+ *
  * @author snowgoose
  */
 public interface Multipart {
 
-	String getName();
+    String getName();
 
-	String getResourceName();
+    String getResourceName();
 
-	InputStream getInputStream();
+    InputStream getInputStream();
 
-	byte[] getBytes();
+    byte[] getBytes();
 
-	String getContentType();
+    String getContentType();
 }
diff --git a/src/main/java/org/analogweb/MultipartParameters.java b/src/main/java/org/analogweb/MultipartParameters.java
index 8d0fc08..33c901f 100644
--- a/src/main/java/org/analogweb/MultipartParameters.java
+++ b/src/main/java/org/analogweb/MultipartParameters.java
@@ -2,14 +2,12 @@
 
 /**
  * Multiple part request {@link Parameters}.
- * 
+ *
  * @author snowgooseyk
+ *
  * @param <T>
  */
-public interface MultipartParameters<T extends Multipart>
-		extends
-			Iterable<T>,
-			Parameters {
+public interface MultipartParameters<T extends Multipart> extends Iterable<T>, Parameters {
 
-	T[] getMultiparts(String name);
+    T[] getMultiparts(String name);
 }
diff --git a/src/main/java/org/analogweb/MutableRequestContext.java b/src/main/java/org/analogweb/MutableRequestContext.java
index 1c4fe87..d1e8052 100644
--- a/src/main/java/org/analogweb/MutableRequestContext.java
+++ b/src/main/java/org/analogweb/MutableRequestContext.java
@@ -5,9 +5,9 @@
  */
 public interface MutableRequestContext extends RequestContext {
 
-	void setRequestMethod(String method);
+    void setRequestMethod(String method);
 
-	void setRequestPath(RequestPath path);
+    void setRequestPath(RequestPath path);
 
-	RequestContext unwrap();
+    RequestContext unwrap();
 }
diff --git a/src/main/java/org/analogweb/Parameters.java b/src/main/java/org/analogweb/Parameters.java
index b7a8bd1..a3ee2e5 100644
--- a/src/main/java/org/analogweb/Parameters.java
+++ b/src/main/java/org/analogweb/Parameters.java
@@ -5,12 +5,12 @@
 
 /**
  * Request parameters.
- * 
+ *
  * @author snowgoose
  */
 public interface Parameters {
 
-	List<String> getValues(String key);
+    List<String> getValues(String key);
 
-	Map<String, String[]> asMap();
+    Map<String, String[]> asMap();
 }
diff --git a/src/main/java/org/analogweb/Precedence.java b/src/main/java/org/analogweb/Precedence.java
index cc51514..88fbf67 100644
--- a/src/main/java/org/analogweb/Precedence.java
+++ b/src/main/java/org/analogweb/Precedence.java
@@ -2,13 +2,13 @@
 
 /**
  * A precedence of modules.
- * 
+ *
  * @author snowgoose
  */
 public interface Precedence {
 
-	int HIGHEST = Integer.MIN_VALUE;
-	int LOWEST = Integer.MAX_VALUE;
+    int HIGHEST = Integer.MIN_VALUE;
+    int LOWEST = Integer.MAX_VALUE;
 
-	int getPrecedence();
+    int getPrecedence();
 }
diff --git a/src/main/java/org/analogweb/PreparedInvocationArguments.java b/src/main/java/org/analogweb/PreparedInvocationArguments.java
index 04bc1bf..1af1289 100644
--- a/src/main/java/org/analogweb/PreparedInvocationArguments.java
+++ b/src/main/java/org/analogweb/PreparedInvocationArguments.java
@@ -4,10 +4,10 @@
 
 /**
  * Arguments of invocation.
- * 
+ *
  * @author snowgoose
  */
 public interface PreparedInvocationArguments {
 
-	List<Object> asList();
+    List<Object> asList();
 }
diff --git a/src/main/java/org/analogweb/ReadableBuffer.java b/src/main/java/org/analogweb/ReadableBuffer.java
index 5d8f070..a14125d 100644
--- a/src/main/java/org/analogweb/ReadableBuffer.java
+++ b/src/main/java/org/analogweb/ReadableBuffer.java
@@ -8,11 +8,17 @@
 
 public interface ReadableBuffer {
 
-	ReadableBuffer read(byte[] dst, int index, int length) throws IOException;
-	ReadableBuffer read(ByteBuffer buffer) throws IOException;
-	String asString(Charset charset) throws IOException;
-	InputStream asInputStream() throws IOException;
-	ReadableByteChannel asChannel() throws IOException;
-	ReadableBuffer to(WritableBuffer writable) throws IOException;
-	long getLength();
+    ReadableBuffer read(byte[] dst, int index, int length) throws IOException;
+
+    ReadableBuffer read(ByteBuffer buffer) throws IOException;
+
+    String asString(Charset charset) throws IOException;
+
+    InputStream asInputStream() throws IOException;
+
+    ReadableByteChannel asChannel() throws IOException;
+
+    ReadableBuffer to(WritableBuffer writable) throws IOException;
+
+    long getLength();
 }
diff --git a/src/main/java/org/analogweb/Renderable.java b/src/main/java/org/analogweb/Renderable.java
index 15493d5..6b53111 100644
--- a/src/main/java/org/analogweb/Renderable.java
+++ b/src/main/java/org/analogweb/Renderable.java
@@ -4,23 +4,23 @@
 
 /**
  * A renderable response.
- * 
+ *
  * @author snowgoose
  */
 public interface Renderable {
 
-	/**
-	 * Render invocation result to response.
-	 * 
-	 * @param context
-	 *            {@link RequestContext}
-	 * @param response
-	 *            {@link ResponseContext}
-	 * @throws IOException
-	 *             I/O error.
-	 * @throws WebApplicationException
-	 *             other exception.
-	 */
-	Response render(RequestContext context, ResponseContext response)
-			throws IOException, WebApplicationException;
+    /**
+     * Render invocation result to response.
+     *
+     * @param context
+     *            {@link RequestContext}
+     * @param response
+     *            {@link ResponseContext}
+     *
+     * @throws IOException
+     *             I/O error.
+     * @throws WebApplicationException
+     *             other exception.
+     */
+    Response render(RequestContext context, ResponseContext response) throws IOException, WebApplicationException;
 }
diff --git a/src/main/java/org/analogweb/RenderableHolder.java b/src/main/java/org/analogweb/RenderableHolder.java
index fb69fd0..65f59a5 100644
--- a/src/main/java/org/analogweb/RenderableHolder.java
+++ b/src/main/java/org/analogweb/RenderableHolder.java
@@ -5,5 +5,5 @@
  */
 public interface RenderableHolder {
 
-	Renderable getRenderable();
+    Renderable getRenderable();
 }
diff --git a/src/main/java/org/analogweb/RenderableResolver.java b/src/main/java/org/analogweb/RenderableResolver.java
index a33bea4..fb20dcf 100644
--- a/src/main/java/org/analogweb/RenderableResolver.java
+++ b/src/main/java/org/analogweb/RenderableResolver.java
@@ -2,11 +2,11 @@
 
 /**
  * Resolve {@link Renderable} from result of entry-point invocation.
- * 
+ *
  * @author snowgoose
  */
 public interface RenderableResolver extends Module {
 
-	Renderable resolve(Object invocationResult, InvocationMetadata metadata,
-			RequestContext context, ResponseContext responseContext);
+    Renderable resolve(Object invocationResult, InvocationMetadata metadata, RequestContext context,
+            ResponseContext responseContext);
 }
diff --git a/src/main/java/org/analogweb/RequestContext.java b/src/main/java/org/analogweb/RequestContext.java
index 27eb532..4ec20b4 100644
--- a/src/main/java/org/analogweb/RequestContext.java
+++ b/src/main/java/org/analogweb/RequestContext.java
@@ -6,38 +6,38 @@
 
 /**
  * Context per request.
- * 
+ *
  * @author snowgoose
  */
 public interface RequestContext {
 
-	Cookies getCookies();
+    Cookies getCookies();
 
-	Headers getRequestHeaders();
+    Headers getRequestHeaders();
 
-	Parameters getFormParameters();
+    Parameters getFormParameters();
 
-	Parameters getQueryParameters();
+    Parameters getQueryParameters();
 
-	Parameters getMatrixParameters();
+    Parameters getMatrixParameters();
 
-	ReadableBuffer getRequestBody() throws IOException;
+    ReadableBuffer getRequestBody() throws IOException;
 
-	MediaType getContentType();
+    MediaType getContentType();
 
-	RequestPath getRequestPath();
+    RequestPath getRequestPath();
 
-	Locale getLocale();
+    Locale getLocale();
 
-	List<Locale> getLocales();
+    List<Locale> getLocales();
 
-	long getContentLength();
+    long getContentLength();
 
-	String getCharacterEncoding();
+    String getCharacterEncoding();
 
-	String getRequestMethod();
+    String getRequestMethod();
 
-	<T> T getAttribute(String name);
+    <T> T getAttribute(String name);
 
-	<T> void setAttribute(String name, T value);
+    <T> void setAttribute(String name, T value);
 }
diff --git a/src/main/java/org/analogweb/RequestPath.java b/src/main/java/org/analogweb/RequestPath.java
index 3dde620..4468d1d 100644
--- a/src/main/java/org/analogweb/RequestPath.java
+++ b/src/main/java/org/analogweb/RequestPath.java
@@ -4,30 +4,29 @@
 
 /**
  * A path actually requested.
- * 
+ *
  * @author y2k2mt
  */
 public interface RequestPath extends RequestPathMetadata {
 
-	/**
-	 * Requested HTTP method.
-	 * 
-	 * @return Requested HTTP method.
-	 */
-	String getRequestMethod();
+    /**
+     * Requested HTTP method.
+     *
+     * @return Requested HTTP method.
+     */
+    String getRequestMethod();
 
-	/**
-	 * Actually requested {@link URI}.
-	 * 
-	 * @return {@link URI}
-	 */
-	URI getRequestURI();
+    /**
+     * Actually requested {@link URI}.
+     *
+     * @return {@link URI}
+     */
+    URI getRequestURI();
 
-	/**
-	 * Application's context {@link URI}. mostly this {@link URI} contains
-	 * protocol ,host and port.
-	 * 
-	 * @return {@link URI}
-	 */
-	URI getBaseURI();
+    /**
+     * Application's context {@link URI}. mostly this {@link URI} contains protocol ,host and port.
+     *
+     * @return {@link URI}
+     */
+    URI getBaseURI();
 }
diff --git a/src/main/java/org/analogweb/RequestPathMetadata.java b/src/main/java/org/analogweb/RequestPathMetadata.java
index bdc0d52..8022a44 100644
--- a/src/main/java/org/analogweb/RequestPathMetadata.java
+++ b/src/main/java/org/analogweb/RequestPathMetadata.java
@@ -4,31 +4,32 @@
 
 /**
  * A entry point path.
- * 
+ *
  * @author y2k2mt
  */
 public interface RequestPathMetadata {
 
-	/**
-	 * Obtain defined path.
-	 * 
-	 * @return path
-	 */
-	String getActualPath();
+    /**
+     * Obtain defined path.
+     *
+     * @return path
+     */
+    String getActualPath();
 
-	/**
-	 * Obtain defined (HTTP) request methods.
-	 * 
-	 * @return request methods
-	 */
-	List<String> getRequestMethods();
+    /**
+     * Obtain defined (HTTP) request methods.
+     *
+     * @return request methods
+     */
+    List<String> getRequestMethods();
 
-	/**
-	 * Check own {@link RequestPath} match assigned one.
-	 * 
-	 * @param requestPath
-	 *            {@link RequestPath}
-	 * @return {@code true} - if matched {@link RequestPath}
-	 */
-	boolean match(RequestPath requestPath);
+    /**
+     * Check own {@link RequestPath} match assigned one.
+     *
+     * @param requestPath
+     *            {@link RequestPath}
+     *
+     * @return {@code true} - if matched {@link RequestPath}
+     */
+    boolean match(RequestPath requestPath);
 }
diff --git a/src/main/java/org/analogweb/RequestValueResolver.java b/src/main/java/org/analogweb/RequestValueResolver.java
index ed65056..b273c04 100644
--- a/src/main/java/org/analogweb/RequestValueResolver.java
+++ b/src/main/java/org/analogweb/RequestValueResolver.java
@@ -4,30 +4,30 @@
 
 /**
  * Resolve variables from application states or passed by request or another.
- * 
- * @see org.analogweb.Application#processRequest(RequestPath, RequestContext,
- *      ResponseContext)
+ *
+ * @see org.analogweb.Application#processRequest(RequestPath, RequestContext, ResponseContext)
  * @see org.analogweb.annotation.Resolver
+ *
  * @author snowgooseyk
  */
 public interface RequestValueResolver extends MultiModule {
 
-	/**
-	 * Retrieve value from resolvable scope.
-	 * 
-	 * @param request
-	 *            {@link RequestContext}
-	 * @param metadata
-	 *            {@link InvocationMetadata}
-	 * @param name
-	 *            query for retrieval
-	 * @param requiredType
-	 *            required type
-	 * @param parameterAnnotations
-	 *            parameter field {@link Annotation}s.
-	 * @return resolved value from specified scope.
-	 */
-	Object resolveValue(RequestContext request, InvocationMetadata metadata,
-			String name, Class<?> requiredType,
-			Annotation[] parameterAnnotations);
+    /**
+     * Retrieve value from resolvable scope.
+     *
+     * @param request
+     *            {@link RequestContext}
+     * @param metadata
+     *            {@link InvocationMetadata}
+     * @param name
+     *            query for retrieval
+     * @param requiredType
+     *            required type
+     * @param parameterAnnotations
+     *            parameter field {@link Annotation}s.
+     *
+     * @return resolved value from specified scope.
+     */
+    Object resolveValue(RequestContext request, InvocationMetadata metadata, String name, Class<?> requiredType,
+            Annotation[] parameterAnnotations);
 }
diff --git a/src/main/java/org/analogweb/RequestValueResolvers.java b/src/main/java/org/analogweb/RequestValueResolvers.java
index de84e1f..6630300 100644
--- a/src/main/java/org/analogweb/RequestValueResolvers.java
+++ b/src/main/java/org/analogweb/RequestValueResolvers.java
@@ -4,19 +4,18 @@
 
 /**
  * Holder of RequestValueResolver.
- * 
+ *
  * @see RequestValueResolver
+ *
  * @author snowgooseyk
  */
 public interface RequestValueResolvers {
 
-	RequestValueResolver findDefaultRequestValueResolver();
+    RequestValueResolver findDefaultRequestValueResolver();
 
-	RequestValueResolver findRequestValueResolver(
-			Class<? extends RequestValueResolver> resolverClass);
+    RequestValueResolver findRequestValueResolver(Class<? extends RequestValueResolver> resolverClass);
 
-	AttributesHandler findAttributesHandler(
-			Class<? extends AttributesHandler> handlerClass);
+    AttributesHandler findAttributesHandler(Class<? extends AttributesHandler> handlerClass);
 
-	Collection<RequestValueResolver> all();
+    Collection<RequestValueResolver> all();
 }
diff --git a/src/main/java/org/analogweb/Response.java b/src/main/java/org/analogweb/Response.java
index 0b85ab4..31c42d3 100644
--- a/src/main/java/org/analogweb/Response.java
+++ b/src/main/java/org/analogweb/Response.java
@@ -2,75 +2,75 @@
 
 /**
  * Holding response entity to write.
- * 
+ *
  * @author y2k2mt
  */
 public interface Response {
 
-	ResponseEntity getEntity();
+    ResponseEntity getEntity();
 
-	long getContentLength();
+    long getContentLength();
 
-	void commit(RequestContext request, ResponseContext response);
+    void commit(RequestContext request, ResponseContext response);
 
-	Response NOT_FOUND = new Response() {
+    Response NOT_FOUND = new Response() {
 
-		@Override
-		public ResponseEntity getEntity() {
-			// NOP
-			return null;
-		}
+        @Override
+        public ResponseEntity getEntity() {
+            // NOP
+            return null;
+        }
 
-		@Override
-		public long getContentLength() {
-			// NOP
-			return 0;
-		}
+        @Override
+        public long getContentLength() {
+            // NOP
+            return 0;
+        }
 
-		@Override
-		public void commit(RequestContext request, ResponseContext response) {
-			try {
-				response.commit(request, this);
-			} finally {
-				response.ensure();
-			}
-		}
-	};
-	Response EMPTY = new Response() {
+        @Override
+        public void commit(RequestContext request, ResponseContext response) {
+            try {
+                response.commit(request, this);
+            } finally {
+                response.ensure();
+            }
+        }
+    };
+    Response EMPTY = new Response() {
 
-		ResponseEntity EMPTY_ENTITY = new ResponseEntity<String>() {
+        ResponseEntity EMPTY_ENTITY = new ResponseEntity<String>() {
 
-			@Override
-			public String entity() {
-				// NOP
-				return "";
-			}
+            @Override
+            public String entity() {
+                // NOP
+                return "";
+            }
 
-			@Override
-			public long getContentLength() {
-				// NOP
-				return 0;
-			}
-		};
+            @Override
+            public long getContentLength() {
+                // NOP
+                return 0;
+            }
+        };
 
-		@Override
-		public ResponseEntity getEntity() {
-			// NOP
-			return EMPTY_ENTITY;
-		}
+        @Override
+        public ResponseEntity getEntity() {
+            // NOP
+            return EMPTY_ENTITY;
+        }
 
-		@Override
-		public long getContentLength() {
-			return getEntity().getContentLength();
-		}
+        @Override
+        public long getContentLength() {
+            return getEntity().getContentLength();
+        }
 
-		@Override
-		public void commit(RequestContext request, ResponseContext response) {
-			try {
-				response.commit(request, this);
-			} finally {
-				response.ensure();
-			}
-		}
-	};
+        @Override
+        public void commit(RequestContext request, ResponseContext response) {
+            try {
+                response.commit(request, this);
+            } finally {
+                response.ensure();
+            }
+        }
+    };
 }
diff --git a/src/main/java/org/analogweb/ResponseContext.java b/src/main/java/org/analogweb/ResponseContext.java
index 653f148..6444097 100644
--- a/src/main/java/org/analogweb/ResponseContext.java
+++ b/src/main/java/org/analogweb/ResponseContext.java
@@ -5,41 +5,41 @@
  */
 public interface ResponseContext {
 
-	/**
-	 * Commit response to stream.
-	 * 
-	 * @param context
-	 *            {@link RequestContext}
-	 * @param response
-	 *            {@link Response}
-	 */
-	void commit(RequestContext context, Response response);
+    /**
+     * Commit response to stream.
+     *
+     * @param context
+     *            {@link RequestContext}
+     * @param response
+     *            {@link Response}
+     */
+    void commit(RequestContext context, Response response);
 
-	/**
-	 * Obtain response headers.
-	 * 
-	 * @return response header
-	 */
-	Headers getResponseHeaders();
+    /**
+     * Obtain response headers.
+     *
+     * @return response header
+     */
+    Headers getResponseHeaders();
 
-	/**
-	 * Set HTTP status code.
-	 * 
-	 * @param status
-	 *            HTTP status code
-	 */
-	void setStatus(int status);
+    /**
+     * Set HTTP status code.
+     *
+     * @param status
+     *            HTTP status code
+     */
+    void setStatus(int status);
 
-	/**
-	 * Test response has completed.
-	 * 
-	 * @return true when response has completed.
-	 */
-	boolean completed();
+    /**
+     * Test response has completed.
+     *
+     * @return true when response has completed.
+     */
+    boolean completed();
 
-	/**
-	 * Ensure response has completed.
-	 */
-	void ensure();
+    /**
+     * Ensure response has completed.
+     */
+    void ensure();
 
 }
diff --git a/src/main/java/org/analogweb/ResponseEntity.java b/src/main/java/org/analogweb/ResponseEntity.java
index 75a3d37..58f3417 100644
--- a/src/main/java/org/analogweb/ResponseEntity.java
+++ b/src/main/java/org/analogweb/ResponseEntity.java
@@ -6,7 +6,7 @@
 
 public interface ResponseEntity<T> {
 
-	T entity();
+    T entity();
 
-	long getContentLength();
+    long getContentLength();
 }
diff --git a/src/main/java/org/analogweb/ResponseFormatter.java b/src/main/java/org/analogweb/ResponseFormatter.java
index d3af5b3..26a13da 100644
--- a/src/main/java/org/analogweb/ResponseFormatter.java
+++ b/src/main/java/org/analogweb/ResponseFormatter.java
@@ -2,11 +2,10 @@
 
 /**
  * Formatter for {@link Renderable}.
- * 
+ *
  * @author snowgoose
  */
 public interface ResponseFormatter extends MultiModule {
 
-	ResponseEntity formatAndWriteInto(RequestContext request,
-			ResponseContext response, String charset, Object source);
+    ResponseEntity formatAndWriteInto(RequestContext request, ResponseContext response, String charset, Object source);
 }
diff --git a/src/main/java/org/analogweb/ResponseFormatterAware.java b/src/main/java/org/analogweb/ResponseFormatterAware.java
index 98c6c86..6ba2294 100644
--- a/src/main/java/org/analogweb/ResponseFormatterAware.java
+++ b/src/main/java/org/analogweb/ResponseFormatterAware.java
@@ -3,9 +3,7 @@
 /**
  * @author snowgoose
  */
-public interface ResponseFormatterAware<T extends Renderable>
-		extends
-			Renderable {
+public interface ResponseFormatterAware<T extends Renderable> extends Renderable {
 
-	T attach(ResponseFormatter formatter);
+    T attach(ResponseFormatter formatter);
 }
diff --git a/src/main/java/org/analogweb/ResponseFormatterFinder.java b/src/main/java/org/analogweb/ResponseFormatterFinder.java
index 4bf8ef9..48b918a 100644
--- a/src/main/java/org/analogweb/ResponseFormatterFinder.java
+++ b/src/main/java/org/analogweb/ResponseFormatterFinder.java
@@ -1,5 +1,5 @@
 package org.analogweb;
 
 public interface ResponseFormatterFinder {
-	ResponseFormatter findResponseFormatter(Class<? extends Renderable> clazz);
+    ResponseFormatter findResponseFormatter(Class<? extends Renderable> clazz);
 }
diff --git a/src/main/java/org/analogweb/ResponseHandler.java b/src/main/java/org/analogweb/ResponseHandler.java
index e8a4f61..0351506 100644
--- a/src/main/java/org/analogweb/ResponseHandler.java
+++ b/src/main/java/org/analogweb/ResponseHandler.java
@@ -3,17 +3,14 @@
 import java.io.IOException;
 
 /**
- * Handle {@link Renderable}.<br/>
- * Usually,this handler executes only
+ * Handle {@link Renderable}. Usually,this handler executes only
  * {@link Renderable#render(RequestContext, ResponseContext)}.
- * 
- * @author snowgoose
+ *
+ * @author y2k2mt
  */
 public interface ResponseHandler extends Module {
 
-	Response handleResult(Object result, InvocationMetadata metadata,
-			RenderableResolver renderableResolver, RequestContext context,
-			ResponseContext response, ExceptionHandler exceptionHandler,
-			ResponseFormatterFinder finder) throws IOException,
-			WebApplicationException;
+    Response handleResult(Object result, InvocationMetadata metadata, RenderableResolver renderableResolver,
+            RequestContext context, ResponseContext response, ExceptionHandler exceptionHandler,
+            ResponseFormatterFinder finder) throws IOException, WebApplicationException;
 }
diff --git a/src/main/java/org/analogweb/RouteRegistry.java b/src/main/java/org/analogweb/RouteRegistry.java
index 6fbee0f..aa50431 100644
--- a/src/main/java/org/analogweb/RouteRegistry.java
+++ b/src/main/java/org/analogweb/RouteRegistry.java
@@ -4,26 +4,26 @@
 
 /**
  * Registry of {@link InvocationMetadata}.
- * 
- * @author snowgoose
+ *
+ * @author y2k2mt
  */
 public interface RouteRegistry extends Disposable {
 
-	/**
-	 * Find matched {@link InvocationMetadata}.<br/>
-	 * 
-	 * @param requestContext
-	 *            {@link RequestContext}
-	 * @return {@link InvocationMetadata}
-	 */
-	InvocationMetadata findInvocationMetadata(RequestContext requestContext,
-			List<InvocationMetadataFinder> finders);
+    /**
+     * Find matched {@link InvocationMetadata}.
+     *
+     * @param requestContext
+     *            {@link RequestContext}
+     *
+     * @return {@link InvocationMetadata}
+     */
+    InvocationMetadata findInvocationMetadata(RequestContext requestContext, List<InvocationMetadataFinder> finders);
 
-	/**
-	 * Register {@link InvocationMetadata}.
-	 * 
-	 * @param invocationMetadata
-	 *            {@link InvocationMetadata}
-	 */
-	void register(InvocationMetadata invocationMetadata);
+    /**
+     * Register {@link InvocationMetadata}.
+     *
+     * @param invocationMetadata
+     *            {@link InvocationMetadata}
+     */
+    void register(InvocationMetadata invocationMetadata);
 }
diff --git a/src/main/java/org/analogweb/ScopedAttributeName.java b/src/main/java/org/analogweb/ScopedAttributeName.java
index e941252..5bdfc61 100644
--- a/src/main/java/org/analogweb/ScopedAttributeName.java
+++ b/src/main/java/org/analogweb/ScopedAttributeName.java
@@ -5,7 +5,7 @@
  */
 public interface ScopedAttributeName {
 
-	String getScope();
+    String getScope();
 
-	String getName();
+    String getName();
 }
diff --git a/src/main/java/org/analogweb/Server.java b/src/main/java/org/analogweb/Server.java
index dc57373..a7fb3f7 100644
--- a/src/main/java/org/analogweb/Server.java
+++ b/src/main/java/org/analogweb/Server.java
@@ -5,7 +5,7 @@
  */
 public interface Server {
 
-	void run();
+    void run();
 
-	void shutdown(int mode);
+    void shutdown(int mode);
 }
diff --git a/src/main/java/org/analogweb/ServerFactory.java b/src/main/java/org/analogweb/ServerFactory.java
index f2f499b..090ed05 100644
--- a/src/main/java/org/analogweb/ServerFactory.java
+++ b/src/main/java/org/analogweb/ServerFactory.java
@@ -7,6 +7,5 @@
  */
 public interface ServerFactory {
 
-	Server create(URI uri, ApplicationProperties properties,
-			ApplicationContext context, Application application);
+    Server create(URI uri, ApplicationProperties properties, ApplicationContext context, Application application);
 }
diff --git a/src/main/java/org/analogweb/TypeMapper.java b/src/main/java/org/analogweb/TypeMapper.java
index d2898ee..f441b30 100644
--- a/src/main/java/org/analogweb/TypeMapper.java
+++ b/src/main/java/org/analogweb/TypeMapper.java
@@ -5,5 +5,5 @@
  */
 public interface TypeMapper extends Module {
 
-	Object mapToType(Object from, Class<?> requiredType, String[] formats);
+    Object mapToType(Object from, Class<?> requiredType, String[] formats);
 }
diff --git a/src/main/java/org/analogweb/TypeMapperContext.java b/src/main/java/org/analogweb/TypeMapperContext.java
index 6e3093b..22a36ee 100644
--- a/src/main/java/org/analogweb/TypeMapperContext.java
+++ b/src/main/java/org/analogweb/TypeMapperContext.java
@@ -5,6 +5,6 @@
  */
 public interface TypeMapperContext extends Module {
 
-	<T> T mapToType(Class<? extends TypeMapper> typeMapperClass, Object from,
-			Class<T> requiredType, String[] mappingFormats);
+    <T> T mapToType(Class<? extends TypeMapper> typeMapperClass, Object from, Class<T> requiredType,
+            String[] mappingFormats);
 }
diff --git a/src/main/java/org/analogweb/WebApplicationException.java b/src/main/java/org/analogweb/WebApplicationException.java
index 6eec4bf..83e524c 100644
--- a/src/main/java/org/analogweb/WebApplicationException.java
+++ b/src/main/java/org/analogweb/WebApplicationException.java
@@ -5,9 +5,9 @@
  */
 public class WebApplicationException extends Exception {
 
-	private static final long serialVersionUID = 7186804233007757288L;
+    private static final long serialVersionUID = 7186804233007757288L;
 
-	public WebApplicationException(Throwable cause) {
-		super(cause);
-	}
+    public WebApplicationException(Throwable cause) {
+        super(cause);
+    }
 }
diff --git a/src/main/java/org/analogweb/WritableBuffer.java b/src/main/java/org/analogweb/WritableBuffer.java
index 30c70c5..3007359 100644
--- a/src/main/java/org/analogweb/WritableBuffer.java
+++ b/src/main/java/org/analogweb/WritableBuffer.java
@@ -7,11 +7,15 @@
 
 public interface WritableBuffer {
 
-	WritableBuffer writeBytes(byte[] bytes) throws IOException;
-	WritableBuffer writeBytes(byte[] bytes, int index, int length)
-			throws IOException;
-	WritableBuffer writeBytes(ByteBuffer buffer) throws IOException;
-	OutputStream asOutputStream() throws IOException;
-	WritableByteChannel asChannel() throws IOException;
-	WritableBuffer from(ReadableBuffer readable) throws IOException;
+    WritableBuffer writeBytes(byte[] bytes) throws IOException;
+
+    WritableBuffer writeBytes(byte[] bytes, int index, int length) throws IOException;
+
+    WritableBuffer writeBytes(ByteBuffer buffer) throws IOException;
+
+    OutputStream asOutputStream() throws IOException;
+
+    WritableByteChannel asChannel() throws IOException;
+
+    WritableBuffer from(ReadableBuffer readable) throws IOException;
 }
diff --git a/src/main/java/org/analogweb/annotation/As.java b/src/main/java/org/analogweb/annotation/As.java
index 7be5318..4a0880e 100644
--- a/src/main/java/org/analogweb/annotation/As.java
+++ b/src/main/java/org/analogweb/annotation/As.java
@@ -11,11 +11,11 @@
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
 public @interface As {
 
-	/**
-	 * @return attribute name.
-	 */
-	String value() default "";
+    /**
+     * @return attribute name.
+     */
+    String value() default "";
 }
diff --git a/src/main/java/org/analogweb/annotation/Attributes.java b/src/main/java/org/analogweb/annotation/Attributes.java
index 84642ba..f0a550b 100644
--- a/src/main/java/org/analogweb/annotation/Attributes.java
+++ b/src/main/java/org/analogweb/annotation/Attributes.java
@@ -11,13 +11,13 @@
 /**
  * @author snowgoose
  */
-@Target({ElementType.PARAMETER})
+@Target({ ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface Attributes {
 
-	/**
-	 * @return {@link AttributesHandler}
-	 */
-	Class<? extends AttributesHandler> value();
+    /**
+     * @return {@link AttributesHandler}
+     */
+    Class<? extends AttributesHandler> value();
 }
diff --git a/src/main/java/org/analogweb/annotation/Bean.java b/src/main/java/org/analogweb/annotation/Bean.java
index a9f34e5..1075f89 100644
--- a/src/main/java/org/analogweb/annotation/Bean.java
+++ b/src/main/java/org/analogweb/annotation/Bean.java
@@ -10,7 +10,7 @@
 
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
 @Resolver(BeanAttributeValueResolver.class)
 @Valiables
 public @interface Bean {
diff --git a/src/main/java/org/analogweb/annotation/Body.java b/src/main/java/org/analogweb/annotation/Body.java
index 7906029..494c337 100644
--- a/src/main/java/org/analogweb/annotation/Body.java
+++ b/src/main/java/org/analogweb/annotation/Body.java
@@ -14,7 +14,7 @@
 @As
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
 @Resolver(RequestBodyValueResolver.class)
 public @interface Body {
 }
diff --git a/src/main/java/org/analogweb/annotation/Context.java b/src/main/java/org/analogweb/annotation/Context.java
index 11df002..c101a9d 100644
--- a/src/main/java/org/analogweb/annotation/Context.java
+++ b/src/main/java/org/analogweb/annotation/Context.java
@@ -10,14 +10,15 @@
 
 /**
  * Resolves {@link org.analogweb.RequestContext} specific instances.
- * 
+ *
  * @see RequestContextValueResolver
+ *
  * @author snowgooseyk
  */
 @As
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
 @Resolver(RequestContextValueResolver.class)
 public @interface Context {
 }
diff --git a/src/main/java/org/analogweb/annotation/Convert.java b/src/main/java/org/analogweb/annotation/Convert.java
index 7c19a52..c362659 100644
--- a/src/main/java/org/analogweb/annotation/Convert.java
+++ b/src/main/java/org/analogweb/annotation/Convert.java
@@ -13,11 +13,11 @@
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
 public @interface Convert {
 
-	/**
-	 * @return {@link TypeMapper}
-	 */
-	Class<? extends TypeMapper> value() default TypeMapper.class;
+    /**
+     * @return {@link TypeMapper}
+     */
+    Class<? extends TypeMapper> value() default TypeMapper.class;
 }
diff --git a/src/main/java/org/analogweb/annotation/Cookie.java b/src/main/java/org/analogweb/annotation/Cookie.java
index 9034cf7..493350c 100644
--- a/src/main/java/org/analogweb/annotation/Cookie.java
+++ b/src/main/java/org/analogweb/annotation/Cookie.java
@@ -14,10 +14,10 @@
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
 @Resolver(CookieValueResolver.class)
 @Valiables
 public @interface Cookie {
 
-	String value() default StringUtils.EMPTY;
+    String value() default StringUtils.EMPTY;
 }
diff --git a/src/main/java/org/analogweb/annotation/Delete.java b/src/main/java/org/analogweb/annotation/Delete.java
index a6e3ccd..75aea2d 100644
--- a/src/main/java/org/analogweb/annotation/Delete.java
+++ b/src/main/java/org/analogweb/annotation/Delete.java
@@ -11,7 +11,7 @@
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD})
+@Target({ ElementType.METHOD })
 @HttpMethod("DELETE")
 public @interface Delete {
 }
diff --git a/src/main/java/org/analogweb/annotation/Formats.java b/src/main/java/org/analogweb/annotation/Formats.java
index b6e60bf..084d8e1 100644
--- a/src/main/java/org/analogweb/annotation/Formats.java
+++ b/src/main/java/org/analogweb/annotation/Formats.java
@@ -11,11 +11,11 @@
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
 public @interface Formats {
 
-	/**
-	 * @return format string.
-	 */
-	String[] value() default {};
+    /**
+     * @return format string.
+     */
+    String[] value() default {};
 }
diff --git a/src/main/java/org/analogweb/annotation/Get.java b/src/main/java/org/analogweb/annotation/Get.java
index 42779a8..742f64f 100644
--- a/src/main/java/org/analogweb/annotation/Get.java
+++ b/src/main/java/org/analogweb/annotation/Get.java
@@ -13,7 +13,7 @@
 @Documented
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD})
+@Target({ ElementType.METHOD })
 @HttpMethod("GET")
 public @interface Get {
 }
diff --git a/src/main/java/org/analogweb/annotation/Head.java b/src/main/java/org/analogweb/annotation/Head.java
index ace5a1a..532a2c9 100644
--- a/src/main/java/org/analogweb/annotation/Head.java
+++ b/src/main/java/org/analogweb/annotation/Head.java
@@ -13,7 +13,7 @@
 @Documented
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD})
+@Target({ ElementType.METHOD })
 @HttpMethod("HEAD")
 public @interface Head {
 }
diff --git a/src/main/java/org/analogweb/annotation/Header.java b/src/main/java/org/analogweb/annotation/Header.java
index cf66a07..e448306 100644
--- a/src/main/java/org/analogweb/annotation/Header.java
+++ b/src/main/java/org/analogweb/annotation/Header.java
@@ -14,10 +14,10 @@
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
 @Resolver(HeaderValueResolver.class)
 @Valiables
 public @interface Header {
 
-	String value() default StringUtils.EMPTY;
+    String value() default StringUtils.EMPTY;
 }
diff --git a/src/main/java/org/analogweb/annotation/HttpMethod.java b/src/main/java/org/analogweb/annotation/HttpMethod.java
index 745fdca..972ddff 100644
--- a/src/main/java/org/analogweb/annotation/HttpMethod.java
+++ b/src/main/java/org/analogweb/annotation/HttpMethod.java
@@ -13,8 +13,8 @@
 @Documented
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.ANNOTATION_TYPE })
 public @interface HttpMethod {
 
-	String value();
+    String value();
 }
diff --git a/src/main/java/org/analogweb/annotation/MultipartParam.java b/src/main/java/org/analogweb/annotation/MultipartParam.java
index ef38d47..3ec27a3 100644
--- a/src/main/java/org/analogweb/annotation/MultipartParam.java
+++ b/src/main/java/org/analogweb/annotation/MultipartParam.java
@@ -16,10 +16,10 @@
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
 @Resolver(MultipartParameterResolver.class)
 @Valiables
 public @interface MultipartParam {
 
-	String value() default StringUtils.EMPTY;
+    String value() default StringUtils.EMPTY;
 }
diff --git a/src/main/java/org/analogweb/annotation/Param.java b/src/main/java/org/analogweb/annotation/Param.java
index c7b087e..5f515d1 100644
--- a/src/main/java/org/analogweb/annotation/Param.java
+++ b/src/main/java/org/analogweb/annotation/Param.java
@@ -11,16 +11,17 @@
 
 /**
  * Resolves query ,form, matrix parameter values.
- * 
+ *
  * @see ParameterValueResolver
+ *
  * @author snowgooseyk
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
 @Resolver(ParameterValueResolver.class)
 @Valiables
 public @interface Param {
 
-	String value() default StringUtils.EMPTY;
+    String value() default StringUtils.EMPTY;
 }
diff --git a/src/main/java/org/analogweb/annotation/PathVariable.java b/src/main/java/org/analogweb/annotation/PathVariable.java
index 81abfe9..51221d4 100644
--- a/src/main/java/org/analogweb/annotation/PathVariable.java
+++ b/src/main/java/org/analogweb/annotation/PathVariable.java
@@ -14,10 +14,10 @@
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
 @Resolver(PathVariableValueResolver.class)
 @Valiables
 public @interface PathVariable {
 
-	String value() default StringUtils.EMPTY;
+    String value() default StringUtils.EMPTY;
 }
diff --git a/src/main/java/org/analogweb/annotation/Post.java b/src/main/java/org/analogweb/annotation/Post.java
index 656472b..625d7f3 100644
--- a/src/main/java/org/analogweb/annotation/Post.java
+++ b/src/main/java/org/analogweb/annotation/Post.java
@@ -13,7 +13,7 @@
 @Documented
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD})
+@Target({ ElementType.METHOD })
 @HttpMethod("POST")
 public @interface Post {
 }
diff --git a/src/main/java/org/analogweb/annotation/Put.java b/src/main/java/org/analogweb/annotation/Put.java
index ee3449f..0eed24a 100644
--- a/src/main/java/org/analogweb/annotation/Put.java
+++ b/src/main/java/org/analogweb/annotation/Put.java
@@ -13,7 +13,7 @@
 @Documented
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD})
+@Target({ ElementType.METHOD })
 @HttpMethod("PUT")
 public @interface Put {
 }
diff --git a/src/main/java/org/analogweb/annotation/RequestFormats.java b/src/main/java/org/analogweb/annotation/RequestFormats.java
index 95e0381..32212e4 100644
--- a/src/main/java/org/analogweb/annotation/RequestFormats.java
+++ b/src/main/java/org/analogweb/annotation/RequestFormats.java
@@ -13,11 +13,11 @@
 @Documented
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
+@Target({ ElementType.METHOD, ElementType.TYPE })
 public @interface RequestFormats {
 
-	/**
-	 * @return Media-Type
-	 */
-	String[] value() default {};
+    /**
+     * @return Media-Type
+     */
+    String[] value() default {};
 }
diff --git a/src/main/java/org/analogweb/annotation/Resolver.java b/src/main/java/org/analogweb/annotation/Resolver.java
index f50b960..f76ccc4 100644
--- a/src/main/java/org/analogweb/annotation/Resolver.java
+++ b/src/main/java/org/analogweb/annotation/Resolver.java
@@ -13,8 +13,8 @@
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
 public @interface Resolver {
 
-	Class<? extends RequestValueResolver> value();
+    Class<? extends RequestValueResolver> value();
 }
diff --git a/src/main/java/org/analogweb/annotation/Route.java b/src/main/java/org/analogweb/annotation/Route.java
index 8bc9ee8..122c8ad 100644
--- a/src/main/java/org/analogweb/annotation/Route.java
+++ b/src/main/java/org/analogweb/annotation/Route.java
@@ -13,11 +13,11 @@
 @Documented
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
+@Target({ ElementType.METHOD, ElementType.TYPE })
 public @interface Route {
 
-	/**
-	 * @return mapped by route.
-	 */
-	String value() default "";
+    /**
+     * @return mapped by route.
+     */
+    String value() default "";
 }
diff --git a/src/main/java/org/analogweb/core/AbstractApplicationProcessor.java b/src/main/java/org/analogweb/core/AbstractApplicationProcessor.java
index ad333d2..b38d18e 100644
--- a/src/main/java/org/analogweb/core/AbstractApplicationProcessor.java
+++ b/src/main/java/org/analogweb/core/AbstractApplicationProcessor.java
@@ -15,46 +15,41 @@
 /**
  * @author snowgoose
  */
-public abstract class AbstractApplicationProcessor
-		implements
-			ApplicationProcessor {
-
-	@Override
-	public Object preMatching(MutableRequestContext request, RequestPath path) {
-		return NO_INTERRUPTION;
-	}
-
-	@Override
-	public Object prepareInvoke(InvocationArguments args,
-			InvocationMetadata metadata, RequestContext context,
-			TypeMapperContext converters, RequestValueResolvers resolvers) {
-		return NO_INTERRUPTION;
-	}
-
-	@Override
-	public Object processException(Exception ex, RequestContext request,
-			PreparedInvocationArguments args, InvocationMetadata metadata) {
-		if (ex instanceof InvocationFailureException) {
-			throw (InvocationFailureException) ex;
-		}
-		return NO_INTERRUPTION;
-	}
-
-	@Override
-	public void postInvoke(Object invocationResult, InvocationArguments args,
-			InvocationMetadata metadata, RequestContext context,
-			RequestValueResolvers resolvers) {
-		// nop.
-	}
-
-	@Override
-	public void afterCompletion(RequestContext request,
-			ResponseContext response, Exception e) {
-		// nop.
-	}
-
-	@Override
-	public int getPrecedence() {
-		return Precedence.LOWEST;
-	}
+public abstract class AbstractApplicationProcessor implements ApplicationProcessor {
+
+    @Override
+    public Object preMatching(MutableRequestContext request, RequestPath path) {
+        return NO_INTERRUPTION;
+    }
+
+    @Override
+    public Object prepareInvoke(InvocationArguments args, InvocationMetadata metadata, RequestContext context,
+            TypeMapperContext converters, RequestValueResolvers resolvers) {
+        return NO_INTERRUPTION;
+    }
+
+    @Override
+    public Object processException(Exception ex, RequestContext request, PreparedInvocationArguments args,
+            InvocationMetadata metadata) {
+        if (ex instanceof InvocationFailureException) {
+            throw (InvocationFailureException) ex;
+        }
+        return NO_INTERRUPTION;
+    }
+
+    @Override
+    public void postInvoke(Object invocationResult, InvocationArguments args, InvocationMetadata metadata,
+            RequestContext context, RequestValueResolvers resolvers) {
+        // nop.
+    }
+
+    @Override
+    public void afterCompletion(RequestContext request, ResponseContext response, Exception e) {
+        // nop.
+    }
+
+    @Override
+    public int getPrecedence() {
+        return Precedence.LOWEST;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/AbstractAttributesHandler.java b/src/main/java/org/analogweb/core/AbstractAttributesHandler.java
index 4e7a830..3a9c5b0 100644
--- a/src/main/java/org/analogweb/core/AbstractAttributesHandler.java
+++ b/src/main/java/org/analogweb/core/AbstractAttributesHandler.java
@@ -10,22 +10,20 @@
  */
 public abstract class AbstractAttributesHandler implements AttributesHandler {
 
-	@Override
-	public Object resolveValue(RequestContext requestContext,
-			InvocationMetadata metadata, String key, Class<?> requiredType,
-			Annotation[] annotations) {
-		// nop
-		return null;
-	}
+    @Override
+    public Object resolveValue(RequestContext requestContext, InvocationMetadata metadata, String key,
+            Class<?> requiredType, Annotation[] annotations) {
+        // nop
+        return null;
+    }
 
-	@Override
-	public void putAttributeValue(RequestContext requestContext, String query,
-			Object value) {
-		// nop
-	}
+    @Override
+    public void putAttributeValue(RequestContext requestContext, String query, Object value) {
+        // nop
+    }
 
-	@Override
-	public void removeAttribute(RequestContext requestContext, String query) {
-		// nop
-	}
+    @Override
+    public void removeAttribute(RequestContext requestContext, String query) {
+        // nop
+    }
 }
diff --git a/src/main/java/org/analogweb/core/AbstractInvocationInterceptor.java b/src/main/java/org/analogweb/core/AbstractInvocationInterceptor.java
index 9e236ce..ec24cab 100644
--- a/src/main/java/org/analogweb/core/AbstractInvocationInterceptor.java
+++ b/src/main/java/org/analogweb/core/AbstractInvocationInterceptor.java
@@ -10,13 +10,13 @@
  */
 public class AbstractInvocationInterceptor implements InvocationInterceptor {
 
-	@Override
-	public int getPrecedence() {
-		return Precedence.LOWEST;
-	}
+    @Override
+    public int getPrecedence() {
+        return Precedence.LOWEST;
+    }
 
-	@Override
-	public Object onInvoke(Invocation invocation, InvocationMetadata metadata) {
-		return invocation.invoke();
-	}
+    @Override
+    public Object onInvoke(Invocation invocation, InvocationMetadata metadata) {
+        return invocation.invoke();
+    }
 }
diff --git a/src/main/java/org/analogweb/core/AbstractInvocationMetadataFinder.java b/src/main/java/org/analogweb/core/AbstractInvocationMetadataFinder.java
index 787f695..b70067e 100644
--- a/src/main/java/org/analogweb/core/AbstractInvocationMetadataFinder.java
+++ b/src/main/java/org/analogweb/core/AbstractInvocationMetadataFinder.java
@@ -9,47 +9,45 @@
 /**
  * @author snowgooseyk
  */
-public abstract class AbstractInvocationMetadataFinder
-		implements
-			InvocationMetadataFinder {
-
-	@Override
-	public int getPrecedence() {
-		return Integer.MIN_VALUE;
-	}
-
-	protected Cacheable cacheable(final InvocationMetadata found) {
-		return new Cacheable() {
-
-			@Override
-			public Class<?> getInvocationClass() {
-				return found.getInvocationClass();
-			}
-
-			@Override
-			public String getMethodName() {
-				return found.getMethodName();
-			}
-
-			@Override
-			public Class<?>[] getArgumentTypes() {
-				return found.getArgumentTypes();
-			}
-
-			@Override
-			public RequestPathMetadata getDefinedPath() {
-				return found.getDefinedPath();
-			}
-
-			@Override
-			public InvocationMetadata getCachable() {
-				return found;
-			}
-
-			@Override
-			public Method resolveMethod() {
-				return found.resolveMethod();
-			}
-		};
-	}
+public abstract class AbstractInvocationMetadataFinder implements InvocationMetadataFinder {
+
+    @Override
+    public int getPrecedence() {
+        return Integer.MIN_VALUE;
+    }
+
+    protected Cacheable cacheable(final InvocationMetadata found) {
+        return new Cacheable() {
+
+            @Override
+            public Class<?> getInvocationClass() {
+                return found.getInvocationClass();
+            }
+
+            @Override
+            public String getMethodName() {
+                return found.getMethodName();
+            }
+
+            @Override
+            public Class<?>[] getArgumentTypes() {
+                return found.getArgumentTypes();
+            }
+
+            @Override
+            public RequestPathMetadata getDefinedPath() {
+                return found.getDefinedPath();
+            }
+
+            @Override
+            public InvocationMetadata getCachable() {
+                return found;
+            }
+
+            @Override
+            public Method resolveMethod() {
+                return found.resolveMethod();
+            }
+        };
+    }
 }
diff --git a/src/main/java/org/analogweb/core/AbstractModulesConfig.java b/src/main/java/org/analogweb/core/AbstractModulesConfig.java
index 5a95e34..2331042 100644
--- a/src/main/java/org/analogweb/core/AbstractModulesConfig.java
+++ b/src/main/java/org/analogweb/core/AbstractModulesConfig.java
@@ -9,15 +9,14 @@
  */
 public abstract class AbstractModulesConfig implements ModulesConfig {
 
-	@Override
-	public boolean equals(Object other) {
-		return other instanceof ModulesConfig
-				&& other.getClass().getCanonicalName()
-						.equals(getClass().getCanonicalName());
-	}
+    @Override
+    public boolean equals(Object other) {
+        return other instanceof ModulesConfig
+                && other.getClass().getCanonicalName().equals(getClass().getCanonicalName());
+    }
 
-	@Override
-	public int hashCode() {
-		return getClass().getCanonicalName().hashCode();
-	}
+    @Override
+    public int hashCode() {
+        return getClass().getCanonicalName().hashCode();
+    }
 }
diff --git a/src/main/java/org/analogweb/core/AbstractRequestContext.java b/src/main/java/org/analogweb/core/AbstractRequestContext.java
index de6ba02..8ad5f36 100644
--- a/src/main/java/org/analogweb/core/AbstractRequestContext.java
+++ b/src/main/java/org/analogweb/core/AbstractRequestContext.java
@@ -26,125 +26,122 @@
  */
 public abstract class AbstractRequestContext implements RequestContext {
 
-	private static final String DEFAULT_CHARACTER_ENCODING = "UTF-8";
-	private final RequestPath requestPath;
-	private final Parameters params;
-	private final Parameters matrixParams;
-	private Parameters formParams;
-	private final AcceptLanguages langs;
-	private final Locale defaultLocale;
-	private final Map<String, Object> attributes;
-
-	protected AbstractRequestContext(RequestPath requestPath,
-			Locale defaultLocale) {
-		this.requestPath = requestPath;
-		this.params = new QueryParameters(getRequestPath().getRequestURI());
-		this.matrixParams = new MatrixParameters(getRequestPath()
-				.getRequestURI());
-		this.langs = new AcceptLanguages(this);
-		this.defaultLocale = defaultLocale;
-		this.attributes = Maps.newEmptyHashMap();
-	}
-
-	@Override
-	public MediaType getContentType() {
-		List<String> header = getRequestHeaders().getValues("Content-Type");
-		if (CollectionUtils.isEmpty(header)) {
-			return null;
-		}
-		return MediaTypes.valueOf(header.get(0));
-	}
-
-	@Override
-	public Cookies getCookies() {
-		List<String> cookieHeader = getRequestHeaders().getValues("Cookie");
-		if (CollectionUtils.isEmpty(cookieHeader)) {
-			return new EmptyCookies();
-		}
-		return new RequestCookies(cookieHeader.get(0));
-	}
-
-	@Override
-	public Parameters getQueryParameters() {
-		return this.params;
-	}
-
-	@Override
-	public Parameters getMatrixParameters() {
-		return this.matrixParams;
-	}
-
-	@Override
-	public Parameters getFormParameters() {
-		if (this.formParams == null) {
-			try {
-				this.formParams = new FormParameters(getRequestPath()
-						.getRequestURI(), getRequestBody(), getContentType());
-			} catch (IOException e) {
-				throw new ApplicationRuntimeException(e) {
-
-					// TODO
-					private static final long serialVersionUID = 1L;
-				};
-			}
-		}
-		return this.formParams;
-	}
-
-	@Override
-	public RequestPath getRequestPath() {
-		return this.requestPath;
-	}
-
-	@Override
-	public List<Locale> getLocales() {
-		return this.langs.getLocales();
-	}
-
-	@Override
-	public Locale getLocale() {
-		return CollectionUtils.indexOf(getLocales(), 0, this.defaultLocale);
-	}
-
-	@Override
-	public long getContentLength() {
-		List<String> contentLength = getRequestHeaders().getValues(
-				"Content-Length");
-		if (contentLength.isEmpty() == false) {
-			try {
-				return Long.valueOf(contentLength.get(0));
-			} catch (NumberFormatException e) {
-				return 0;
-			}
-		}
-		return 0;
-	}
-
-	@Override
-	public String getCharacterEncoding() {
-		MediaType contentType = getContentType();
-		if (contentType == null) {
-			return getDefaultCharacterEncoding();
-		}
-		Map<String, String> params = contentType.getParameters();
-		if (params.containsKey("charset")) {
-			return params.get("charset");
-		}
-		return getDefaultCharacterEncoding();
-	}
-
-	protected String getDefaultCharacterEncoding() {
-		return DEFAULT_CHARACTER_ENCODING;
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public <T> T getAttribute(String name) {
-		return (T) this.attributes.get(name);
-	}
-
-	@Override
-	public <T> void setAttribute(String name, T value) {
-		this.attributes.put(name, value);
-	}
+    private static final String DEFAULT_CHARACTER_ENCODING = "UTF-8";
+    private final RequestPath requestPath;
+    private final Parameters params;
+    private final Parameters matrixParams;
+    private Parameters formParams;
+    private final AcceptLanguages langs;
+    private final Locale defaultLocale;
+    private final Map<String, Object> attributes;
+
+    protected AbstractRequestContext(RequestPath requestPath, Locale defaultLocale) {
+        this.requestPath = requestPath;
+        this.params = new QueryParameters(getRequestPath().getRequestURI());
+        this.matrixParams = new MatrixParameters(getRequestPath().getRequestURI());
+        this.langs = new AcceptLanguages(this);
+        this.defaultLocale = defaultLocale;
+        this.attributes = Maps.newEmptyHashMap();
+    }
+
+    @Override
+    public MediaType getContentType() {
+        List<String> header = getRequestHeaders().getValues("Content-Type");
+        if (CollectionUtils.isEmpty(header)) {
+            return null;
+        }
+        return MediaTypes.valueOf(header.get(0));
+    }
+
+    @Override
+    public Cookies getCookies() {
+        List<String> cookieHeader = getRequestHeaders().getValues("Cookie");
+        if (CollectionUtils.isEmpty(cookieHeader)) {
+            return new EmptyCookies();
+        }
+        return new RequestCookies(cookieHeader.get(0));
+    }
+
+    @Override
+    public Parameters getQueryParameters() {
+        return this.params;
+    }
+
+    @Override
+    public Parameters getMatrixParameters() {
+        return this.matrixParams;
+    }
+
+    @Override
+    public Parameters getFormParameters() {
+        if (this.formParams == null) {
+            try {
+                this.formParams = new FormParameters(getRequestPath().getRequestURI(), getRequestBody(),
+                        getContentType());
+            } catch (IOException e) {
+                throw new ApplicationRuntimeException(e) {
+
+                    // TODO
+                    private static final long serialVersionUID = 1L;
+                };
+            }
+        }
+        return this.formParams;
+    }
+
+    @Override
+    public RequestPath getRequestPath() {
+        return this.requestPath;
+    }
+
+    @Override
+    public List<Locale> getLocales() {
+        return this.langs.getLocales();
+    }
+
+    @Override
+    public Locale getLocale() {
+        return CollectionUtils.indexOf(getLocales(), 0, this.defaultLocale);
+    }
+
+    @Override
+    public long getContentLength() {
+        List<String> contentLength = getRequestHeaders().getValues("Content-Length");
+        if (contentLength.isEmpty() == false) {
+            try {
+                return Long.valueOf(contentLength.get(0));
+            } catch (NumberFormatException e) {
+                return 0;
+            }
+        }
+        return 0;
+    }
+
+    @Override
+    public String getCharacterEncoding() {
+        MediaType contentType = getContentType();
+        if (contentType == null) {
+            return getDefaultCharacterEncoding();
+        }
+        Map<String, String> params = contentType.getParameters();
+        if (params.containsKey("charset")) {
+            return params.get("charset");
+        }
+        return getDefaultCharacterEncoding();
+    }
+
+    protected String getDefaultCharacterEncoding() {
+        return DEFAULT_CHARACTER_ENCODING;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T getAttribute(String name) {
+        return (T) this.attributes.get(name);
+    }
+
+    @Override
+    public <T> void setAttribute(String name, T value) {
+        this.attributes.put(name, value);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/AbstractRequestPathMetadata.java b/src/main/java/org/analogweb/core/AbstractRequestPathMetadata.java
index 90999f3..a930ccd 100644
--- a/src/main/java/org/analogweb/core/AbstractRequestPathMetadata.java
+++ b/src/main/java/org/analogweb/core/AbstractRequestPathMetadata.java
@@ -5,26 +5,24 @@
 /**
  * @author snowgoose
  */
-public abstract class AbstractRequestPathMetadata
-		implements
-			RequestPathMetadata {
+public abstract class AbstractRequestPathMetadata implements RequestPathMetadata {
 
-	@Override
-	public boolean equals(Object other) {
-		if (other instanceof RequestPathMetadata) {
-			RequestPathMetadata rpm = (RequestPathMetadata) other;
-			return getActualPath().equals(rpm.getActualPath())
-					&& getRequestMethods().containsAll(rpm.getRequestMethods());
-		}
-		return false;
-	}
+    @Override
+    public boolean equals(Object other) {
+        if (other instanceof RequestPathMetadata) {
+            RequestPathMetadata rpm = (RequestPathMetadata) other;
+            return getActualPath().equals(rpm.getActualPath())
+                    && getRequestMethods().containsAll(rpm.getRequestMethods());
+        }
+        return false;
+    }
 
-	@Override
-	public int hashCode() {
-		int hash = getActualPath().hashCode();
-		for (String method : getRequestMethods()) {
-			hash = 31 * hash + (method != null ? method.hashCode() : 0);
-		}
-		return hash;
-	}
+    @Override
+    public int hashCode() {
+        int hash = getActualPath().hashCode();
+        for (String method : getRequestMethods()) {
+            hash = 31 * hash + (method != null ? method.hashCode() : 0);
+        }
+        return hash;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/AbstractResponseContext.java b/src/main/java/org/analogweb/core/AbstractResponseContext.java
index fb62983..75aee0a 100644
--- a/src/main/java/org/analogweb/core/AbstractResponseContext.java
+++ b/src/main/java/org/analogweb/core/AbstractResponseContext.java
@@ -10,39 +10,39 @@
  */
 public abstract class AbstractResponseContext implements ResponseContext {
 
-	private int status = HttpStatus.OK.getStatusCode();
-	private final Headers headers;
-	private boolean completed;
-
-	public AbstractResponseContext() {
-		this(new MapHeaders());
-	}
-
-	public AbstractResponseContext(Headers headers) {
-		this.headers = headers;
-	}
-
-	@Override
-	public Headers getResponseHeaders() {
-		return headers;
-	}
-
-	protected int getStatus() {
-		return this.status;
-	}
-
-	@Override
-	public void setStatus(int status) {
-		this.status = status;
-	}
-
-	@Override
-	public boolean completed() {
-		return this.completed;
-	}
-
-	@Override
-	public void ensure() {
-		this.completed = true;
-	}
+    private int status = HttpStatus.OK.getStatusCode();
+    private final Headers headers;
+    private boolean completed;
+
+    public AbstractResponseContext() {
+        this(new MapHeaders());
+    }
+
+    public AbstractResponseContext(Headers headers) {
+        this.headers = headers;
+    }
+
+    @Override
+    public Headers getResponseHeaders() {
+        return headers;
+    }
+
+    protected int getStatus() {
+        return this.status;
+    }
+
+    @Override
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    @Override
+    public boolean completed() {
+        return this.completed;
+    }
+
+    @Override
+    public void ensure() {
+        this.completed = true;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/AcceptLanguages.java b/src/main/java/org/analogweb/core/AcceptLanguages.java
index f3b7ed0..618c22a 100644
--- a/src/main/java/org/analogweb/core/AcceptLanguages.java
+++ b/src/main/java/org/analogweb/core/AcceptLanguages.java
@@ -16,119 +16,114 @@
  */
 public class AcceptLanguages {
 
-	private final RequestContext request;
-	private List<Locale> locales;
-
-	public AcceptLanguages(RequestContext context) {
-		this.request = context;
-	}
-
-	protected List<String> getHeaderValues(RequestContext context) {
-		Headers headers = context.getRequestHeaders();
-		if (headers == null) {
-			return Collections.emptyList();
-		}
-		return headers.getValues("Accept-Language");
-	}
-
-	public static class AcceptLanguage {
-
-		private float q;
-		private Locale locale;
-
-		private AcceptLanguage(Locale locale, float q) {
-			this.locale = locale;
-			this.q = q;
-		}
-
-		public static AcceptLanguage valueOf(Locale locale, float q) {
-			return new AcceptLanguage(locale, q);
-		}
-
-		public Locale getLocale() {
-			return this.locale;
-		}
-
-		public float getQualityFactor() {
-			return this.q;
-		}
-	}
-
-	public List<Locale> getLocales() {
-		if (this.locales == null) {
-			List<String> headerValues = getHeaderValues(this.request);
-			if (CollectionUtils.isEmpty(headerValues)) {
-				this.locales = Collections.emptyList();
-				return this.locales;
-			}
-			List<AcceptLanguage> ac = new ArrayList<AcceptLanguage>();
-			for (String acceptLanguage : headerValues) {
-				for (String aLanguage : StringUtils.split(acceptLanguage, ',')) {
-					List<String> codeAndParam = StringUtils.split(
-							StringUtils.trimToEmpty(aLanguage), ';');
-					if (CollectionUtils.isNotEmpty(codeAndParam)) {
-						String code = codeAndParam.get(0);
-						float quality = 1.0f;
-						if (codeAndParam.size() > 1) {
-							for (int i = 1; i < codeAndParam.size(); i++) {
-								String param = StringUtils
-										.trimToEmpty(codeAndParam.get(i));
-								if (param.startsWith("q=")) {
-									quality = Float.valueOf(StringUtils
-											.substring(param, 2));
-									break;
-								}
-							}
-						}
-						List<String> codes = StringUtils.split(
-								code.replace('-', '_'), '_');
-						Locale locale;
-						switch (codes.size()) {
-							case 2 :
-								locale = new Locale(codes.get(0), codes.get(1));
-								break;
-							case 3 :
-								locale = new Locale(codes.get(0), codes.get(1),
-										codes.get(2));
-								break;
-							default :
-								locale = new Locale(codes.get(0));
-						}
-						ac.add(AcceptLanguage.valueOf(locale, quality));
-					}
-				}
-			}
-			Collections.sort(ac, getComparator());
-			locales = new ArrayList<Locale>();
-			for (AcceptLanguage a : ac) {
-				locales.add(a.getLocale());
-			}
-			locales = Collections.unmodifiableList(locales);
-		}
-		return this.locales;
-	}
-
-	protected final Comparator<AcceptLanguage> DEFAULT_COMPARATOR = new Comparator<AcceptLanguage>() {
-
-		@Override
-		public int compare(AcceptLanguage o1, AcceptLanguage o2) {
-			float q1 = o1.getQualityFactor();
-			float q2 = o2.getQualityFactor();
-			if (q1 == q2) {
-				return 0;
-			} else if (q1 < q2) {
-				return 1;
-			} else {
-				return -1;
-			}
-		}
-	};
-
-	protected Comparator<AcceptLanguage> getComparator() {
-		return DEFAULT_COMPARATOR;
-	}
-
-	public Locale getLocale() {
-		return CollectionUtils.indexOf(getLocales(), 0);
-	}
+    private final RequestContext request;
+    private List<Locale> locales;
+
+    public AcceptLanguages(RequestContext context) {
+        this.request = context;
+    }
+
+    protected List<String> getHeaderValues(RequestContext context) {
+        Headers headers = context.getRequestHeaders();
+        if (headers == null) {
+            return Collections.emptyList();
+        }
+        return headers.getValues("Accept-Language");
+    }
+
+    public static class AcceptLanguage {
+
+        private float q;
+        private Locale locale;
+
+        private AcceptLanguage(Locale locale, float q) {
+            this.locale = locale;
+            this.q = q;
+        }
+
+        public static AcceptLanguage valueOf(Locale locale, float q) {
+            return new AcceptLanguage(locale, q);
+        }
+
+        public Locale getLocale() {
+            return this.locale;
+        }
+
+        public float getQualityFactor() {
+            return this.q;
+        }
+    }
+
+    public List<Locale> getLocales() {
+        if (this.locales == null) {
+            List<String> headerValues = getHeaderValues(this.request);
+            if (CollectionUtils.isEmpty(headerValues)) {
+                this.locales = Collections.emptyList();
+                return this.locales;
+            }
+            List<AcceptLanguage> ac = new ArrayList<AcceptLanguage>();
+            for (String acceptLanguage : headerValues) {
+                for (String aLanguage : StringUtils.split(acceptLanguage, ',')) {
+                    List<String> codeAndParam = StringUtils.split(StringUtils.trimToEmpty(aLanguage), ';');
+                    if (CollectionUtils.isNotEmpty(codeAndParam)) {
+                        String code = codeAndParam.get(0);
+                        float quality = 1.0f;
+                        if (codeAndParam.size() > 1) {
+                            for (int i = 1; i < codeAndParam.size(); i++) {
+                                String param = StringUtils.trimToEmpty(codeAndParam.get(i));
+                                if (param.startsWith("q=")) {
+                                    quality = Float.valueOf(StringUtils.substring(param, 2));
+                                    break;
+                                }
+                            }
+                        }
+                        List<String> codes = StringUtils.split(code.replace('-', '_'), '_');
+                        Locale locale;
+                        switch (codes.size()) {
+                        case 2:
+                            locale = new Locale(codes.get(0), codes.get(1));
+                            break;
+                        case 3:
+                            locale = new Locale(codes.get(0), codes.get(1), codes.get(2));
+                            break;
+                        default:
+                            locale = new Locale(codes.get(0));
+                        }
+                        ac.add(AcceptLanguage.valueOf(locale, quality));
+                    }
+                }
+            }
+            Collections.sort(ac, getComparator());
+            locales = new ArrayList<Locale>();
+            for (AcceptLanguage a : ac) {
+                locales.add(a.getLocale());
+            }
+            locales = Collections.unmodifiableList(locales);
+        }
+        return this.locales;
+    }
+
+    protected final Comparator<AcceptLanguage> DEFAULT_COMPARATOR = new Comparator<AcceptLanguage>() {
+
+        @Override
+        public int compare(AcceptLanguage o1, AcceptLanguage o2) {
+            float q1 = o1.getQualityFactor();
+            float q2 = o2.getQualityFactor();
+            if (q1 == q2) {
+                return 0;
+            } else if (q1 < q2) {
+                return 1;
+            } else {
+                return -1;
+            }
+        }
+    };
+
+    protected Comparator<AcceptLanguage> getComparator() {
+        return DEFAULT_COMPARATOR;
+    }
+
+    public Locale getLocale() {
+        return CollectionUtils.indexOf(getLocales(), 0);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/AnnotatedArguments.java b/src/main/java/org/analogweb/core/AnnotatedArguments.java
index aea690a..3bea2eb 100644
--- a/src/main/java/org/analogweb/core/AnnotatedArguments.java
+++ b/src/main/java/org/analogweb/core/AnnotatedArguments.java
@@ -18,67 +18,60 @@
 
 final class AnnotatedArguments {
 
-	private AnnotatedArguments() {
-		// nop.
-	}
+    private AnnotatedArguments() {
+        // nop.
+    }
 
-	static <T> T resolveArguent(Annotation[] parameterAnnotations,
-			Class<T> argType, RequestContext context,
-			InvocationMetadata metadata, TypeMapperContext converters,
-			RequestValueResolvers handlers) {
-		return resolveArguent(StringUtils.EMPTY, parameterAnnotations, argType,
-				context, metadata, converters, handlers);
-	}
+    static <T> T resolveArguent(Annotation[] parameterAnnotations, Class<T> argType, RequestContext context,
+            InvocationMetadata metadata, TypeMapperContext converters, RequestValueResolvers handlers) {
+        return resolveArguent(StringUtils.EMPTY, parameterAnnotations, argType, context, metadata, converters,
+                handlers);
+    }
 
-	static <T> T resolveArguent(String name, Annotation[] parameterAnnotations,
-			Class<T> argType, RequestContext context,
-			InvocationMetadata metadata, TypeMapperContext converters,
-			RequestValueResolvers handlers) {
-		String bindAttributeName = resolveName(parameterAnnotations);
-		if (StringUtils.isEmpty(bindAttributeName)) {
-			bindAttributeName = name;
-		}
-		if (bindAttributeName != null) {
-			Resolver scope = AnnotationUtils.findAnnotation(Resolver.class,
-					parameterAnnotations);
-			RequestValueResolver handler;
-			if (scope == null) {
-				handler = handlers.findDefaultRequestValueResolver();
-			} else {
-				handler = handlers.findRequestValueResolver(scope.value());
-			}
-			if (handler != null) {
-				Object value = handler.resolveValue(context, metadata,
-						bindAttributeName, argType, parameterAnnotations);
-				if (value != null) {
-					Convert mapWith = AnnotationUtils.findAnnotation(
-							Convert.class, parameterAnnotations);
-					Class<? extends TypeMapper> mapperType = TypeMapper.class;
-					if (mapWith != null) {
-						mapperType = mapWith.value();
-					}
-					Formats f = AnnotationUtils.findAnnotation(Formats.class,
-							parameterAnnotations);
-					T convertedValue = converters.mapToType(mapperType, value,
-							argType, (f != null) ? f.value() : new String[0]);
-					return convertedValue;
-				}
-			}
-		}
-		return null;
-	}
+    static <T> T resolveArguent(String name, Annotation[] parameterAnnotations, Class<T> argType,
+            RequestContext context, InvocationMetadata metadata, TypeMapperContext converters,
+            RequestValueResolvers handlers) {
+        String bindAttributeName = resolveName(parameterAnnotations);
+        if (StringUtils.isEmpty(bindAttributeName)) {
+            bindAttributeName = name;
+        }
+        if (bindAttributeName != null) {
+            Resolver scope = AnnotationUtils.findAnnotation(Resolver.class, parameterAnnotations);
+            RequestValueResolver handler;
+            if (scope == null) {
+                handler = handlers.findDefaultRequestValueResolver();
+            } else {
+                handler = handlers.findRequestValueResolver(scope.value());
+            }
+            if (handler != null) {
+                Object value = handler.resolveValue(context, metadata, bindAttributeName, argType,
+                        parameterAnnotations);
+                if (value != null) {
+                    Convert mapWith = AnnotationUtils.findAnnotation(Convert.class, parameterAnnotations);
+                    Class<? extends TypeMapper> mapperType = TypeMapper.class;
+                    if (mapWith != null) {
+                        mapperType = mapWith.value();
+                    }
+                    Formats f = AnnotationUtils.findAnnotation(Formats.class, parameterAnnotations);
+                    T convertedValue = converters.mapToType(mapperType, value, argType,
+                            (f != null) ? f.value() : new String[0]);
+                    return convertedValue;
+                }
+            }
+        }
+        return null;
+    }
 
-	private static String resolveName(Annotation[] parameterAnnotations) {
-		for (Annotation an : parameterAnnotations) {
-			if (AnnotationUtils
-					.isDeclared(Valiables.class, an.annotationType())) {
-				return AnnotationUtils.getValue(an);
-			}
-		}
-		As as = AnnotationUtils.findAnnotation(As.class, parameterAnnotations);
-		if (as != null) {
-			return as.value();
-		}
-		return null;
-	}
+    private static String resolveName(Annotation[] parameterAnnotations) {
+        for (Annotation an : parameterAnnotations) {
+            if (AnnotationUtils.isDeclared(Valiables.class, an.annotationType())) {
+                return AnnotationUtils.getValue(an);
+            }
+        }
+        As as = AnnotationUtils.findAnnotation(As.class, parameterAnnotations);
+        if (as != null) {
+            return as.value();
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/AnnotationInvocationMetadataFactory.java b/src/main/java/org/analogweb/core/AnnotationInvocationMetadataFactory.java
index 7bca905..6d68537 100644
--- a/src/main/java/org/analogweb/core/AnnotationInvocationMetadataFactory.java
+++ b/src/main/java/org/analogweb/core/AnnotationInvocationMetadataFactory.java
@@ -12,123 +12,107 @@
 /**
  * @author snowgoose
  */
-public class AnnotationInvocationMetadataFactory
-		implements
-			InvocationMetadataFactory {
+public class AnnotationInvocationMetadataFactory implements InvocationMetadataFactory {
 
-	@Override
-	public Collection<InvocationMetadata> createInvocationMetadatas(
-			ApplicationProperties properties, ContainerAdaptor instanceProvider) {
-		Collection<Class<?>> invocationClasses = collectAllClasses();
-		Collection<String> packageNames = new ArrayList<String>();
-		packageNames.add(Application.DEFAULT_PACKAGE_NAME);
-		packageNames.addAll(properties.getComponentPackageNames() == null
-				? Collections.<String> emptyList()
-				: properties.getComponentPackageNames());
-		invocationClasses.addAll(collectClasses(packageNames,
-				getClassCollectors()));
-		List<InvocationMetadata> metadatas = new ArrayList<InvocationMetadata>();
-		for (Class<?> invocationClass : invocationClasses) {
-			Method[] methods = ReflectionUtils.getMethods(invocationClass);
-			for (Method method : methods) {
-				InvocationMetadata metadata = createInvocationMetadata(
-						invocationClass, method);
-				if (metadata != null) {
-					metadatas.add(metadata);
-				}
-			}
-		}
-		return metadatas;
-	}
+    @Override
+    public Collection<InvocationMetadata> createInvocationMetadatas(ApplicationProperties properties,
+            ContainerAdaptor instanceProvider) {
+        Collection<Class<?>> invocationClasses = collectAllClasses();
+        Collection<String> packageNames = new ArrayList<String>();
+        packageNames.add(Application.DEFAULT_PACKAGE_NAME);
+        packageNames.addAll(properties.getComponentPackageNames() == null ? Collections.<String> emptyList()
+                : properties.getComponentPackageNames());
+        invocationClasses.addAll(collectClasses(packageNames, getClassCollectors()));
+        List<InvocationMetadata> metadatas = new ArrayList<InvocationMetadata>();
+        for (Class<?> invocationClass : invocationClasses) {
+            Method[] methods = ReflectionUtils.getMethods(invocationClass);
+            for (Method method : methods) {
+                InvocationMetadata metadata = createInvocationMetadata(invocationClass, method);
+                if (metadata != null) {
+                    metadatas.add(metadata);
+                }
+            }
+        }
+        return metadatas;
+    }
 
-	InvocationMetadata createInvocationMetadata(Class<?> invocationClass,
-			Method invocationMethod) {
-		Route typePathMapping = AnnotationUtils.findAnnotation(Route.class,
-				invocationClass);
-		Route methodPathMapping = invocationMethod.getAnnotation(Route.class);
-		if (typePathMapping != null && methodPathMapping != null) {
-			return new DefaultInvocationMetadata(invocationClass,
-					invocationMethod.getName(),
-					invocationMethod.getParameterTypes(), relativeRequestPath(
-							invocationClass, invocationMethod, typePathMapping,
-							methodPathMapping));
-		} else {
-			return null;
-		}
-	}
+    InvocationMetadata createInvocationMetadata(Class<?> invocationClass, Method invocationMethod) {
+        Route typePathMapping = AnnotationUtils.findAnnotation(Route.class, invocationClass);
+        Route methodPathMapping = invocationMethod.getAnnotation(Route.class);
+        if (typePathMapping != null && methodPathMapping != null) {
+            return new DefaultInvocationMetadata(invocationClass, invocationMethod.getName(),
+                    invocationMethod.getParameterTypes(),
+                    relativeRequestPath(invocationClass, invocationMethod, typePathMapping, methodPathMapping));
+        } else {
+            return null;
+        }
+    }
 
-	protected RequestPathMetadata relativeRequestPath(Class<?> invocationClass,
-			Method invocationMethod, Route typePathMapping,
-			Route methodPathMapping) {
-		String editedRoot = typePathMapping.value();
-		if (StringUtils.isEmpty(editedRoot)) {
-			editedRoot = invocationClass.getSimpleName()
-					.replace("Resource", "").toLowerCase();
-		}
-		String editedPath = methodPathMapping.value();
-		if (StringUtils.isEmpty(editedPath)) {
-			editedPath = invocationMethod.getName();
-		}
-		return newRequestPathDefinition(editedRoot, editedPath,
-				resolveRequestMethods(invocationMethod));
-	}
+    protected RequestPathMetadata relativeRequestPath(Class<?> invocationClass, Method invocationMethod,
+            Route typePathMapping, Route methodPathMapping) {
+        String editedRoot = typePathMapping.value();
+        if (StringUtils.isEmpty(editedRoot)) {
+            editedRoot = invocationClass.getSimpleName().replace("Resource", "").toLowerCase();
+        }
+        String editedPath = methodPathMapping.value();
+        if (StringUtils.isEmpty(editedPath)) {
+            editedPath = invocationMethod.getName();
+        }
+        return newRequestPathDefinition(editedRoot, editedPath, resolveRequestMethods(invocationMethod));
+    }
 
-	protected RequestPathMetadata newRequestPathDefinition(String root,
-			String path, String[] methods) {
-		return RequestPathDefinition.define(root, path, methods);
-	}
+    protected RequestPathMetadata newRequestPathDefinition(String root, String path, String[] methods) {
+        return RequestPathDefinition.define(root, path, methods);
+    }
 
-	private String[] resolveRequestMethods(Method method) {
-		List<String> methods;
-		List<HttpMethod> httpMethods = AnnotationUtils.findAnnotations(
-				HttpMethod.class, method);
-		if (CollectionUtils.isEmpty(httpMethods)) {
-			methods = Arrays.asList("GET", "POST");
-			return methods.toArray(new String[methods.size()]);
-		}
-		methods = new ArrayList<String>();
-		for (HttpMethod hm : httpMethods) {
-			methods.add(hm.value());
-		}
-		return methods.toArray(new String[methods.size()]);
-	}
-	protected Collection<Class<?>> collectAllClasses() {
-		Collection<Class<?>> collectedClasses = new HashSet<Class<?>>();
-		for (String resourceName : SystemProperties.classPathes()) {
-			URL resourceURL = ResourceUtils.findResource(resourceName);
-			for (ClassCollector collector : getClassCollectors()) {
-				collectedClasses.addAll(collector.collect(StringUtils.EMPTY,
-						resourceURL, Thread.currentThread()
-								.getContextClassLoader()));
-			}
-		}
-		return collectedClasses;
-	}
-	protected ClassLoader currentClassLoader() {
-		return Thread.currentThread().getContextClassLoader();
-	}
+    private String[] resolveRequestMethods(Method method) {
+        List<String> methods;
+        List<HttpMethod> httpMethods = AnnotationUtils.findAnnotations(HttpMethod.class, method);
+        if (CollectionUtils.isEmpty(httpMethods)) {
+            methods = Arrays.asList("GET", "POST");
+            return methods.toArray(new String[methods.size()]);
+        }
+        methods = new ArrayList<String>();
+        for (HttpMethod hm : httpMethods) {
+            methods.add(hm.value());
+        }
+        return methods.toArray(new String[methods.size()]);
+    }
 
-	protected Collection<Class<?>> collectClasses(
-			Collection<String> rootPackageNames,
-			Collection<ClassCollector> collectors) {
-		ClassLoader classLoader = currentClassLoader();
-		Collection<Class<?>> collectedClasses = new HashSet<Class<?>>();
-		for (String packageName : rootPackageNames) {
-			for (URL resourceURL : ResourceUtils.findPackageResources(
-					packageName, classLoader)) {
-				for (ClassCollector collector : collectors) {
-					collectedClasses.addAll(collector.collect(packageName,
-							resourceURL, classLoader));
-				}
-			}
-		}
-		return collectedClasses;
-	}
+    protected Collection<Class<?>> collectAllClasses() {
+        Collection<Class<?>> collectedClasses = new HashSet<Class<?>>();
+        for (String resourceName : SystemProperties.classPathes()) {
+            URL resourceURL = ResourceUtils.findResource(resourceName);
+            for (ClassCollector collector : getClassCollectors()) {
+                collectedClasses.addAll(collector.collect(StringUtils.EMPTY, resourceURL,
+                        Thread.currentThread().getContextClassLoader()));
+            }
+        }
+        return collectedClasses;
+    }
 
-	protected List<ClassCollector> getClassCollectors() {
-		List<ClassCollector> list = new ArrayList<ClassCollector>();
-		list.add(new JarClassCollector());
-		list.add(new FileClassCollector());
-		return Collections.unmodifiableList(list);
-	}
+    protected ClassLoader currentClassLoader() {
+        return Thread.currentThread().getContextClassLoader();
+    }
+
+    protected Collection<Class<?>> collectClasses(Collection<String> rootPackageNames,
+            Collection<ClassCollector> collectors) {
+        ClassLoader classLoader = currentClassLoader();
+        Collection<Class<?>> collectedClasses = new HashSet<Class<?>>();
+        for (String packageName : rootPackageNames) {
+            for (URL resourceURL : ResourceUtils.findPackageResources(packageName, classLoader)) {
+                for (ClassCollector collector : collectors) {
+                    collectedClasses.addAll(collector.collect(packageName, resourceURL, classLoader));
+                }
+            }
+        }
+        return collectedClasses;
+    }
+
+    protected List<ClassCollector> getClassCollectors() {
+        List<ClassCollector> list = new ArrayList<ClassCollector>();
+        list.add(new JarClassCollector());
+        list.add(new FileClassCollector());
+        return Collections.unmodifiableList(list);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/ApplicationConfigurationException.java b/src/main/java/org/analogweb/core/ApplicationConfigurationException.java
index bd11cbe..cd3d3e1 100644
--- a/src/main/java/org/analogweb/core/ApplicationConfigurationException.java
+++ b/src/main/java/org/analogweb/core/ApplicationConfigurationException.java
@@ -3,13 +3,11 @@
 /**
  * @author snowgoose
  */
-public class ApplicationConfigurationException
-		extends
-			ApplicationRuntimeException {
+public class ApplicationConfigurationException extends ApplicationRuntimeException {
 
-	private static final long serialVersionUID = 8633406823498650746L;
+    private static final long serialVersionUID = 8633406823498650746L;
 
-	public ApplicationConfigurationException(String message) {
-		super(message);
-	}
+    public ApplicationConfigurationException(String message) {
+        super(message);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/ApplicationRuntimeException.java b/src/main/java/org/analogweb/core/ApplicationRuntimeException.java
index 1917900..52e53bc 100644
--- a/src/main/java/org/analogweb/core/ApplicationRuntimeException.java
+++ b/src/main/java/org/analogweb/core/ApplicationRuntimeException.java
@@ -5,17 +5,17 @@
  */
 public abstract class ApplicationRuntimeException extends RuntimeException {
 
-	private static final long serialVersionUID = -5102446288115183932L;
+    private static final long serialVersionUID = -5102446288115183932L;
 
-	public ApplicationRuntimeException() {
-		super();
-	}
+    public ApplicationRuntimeException() {
+        super();
+    }
 
-	public ApplicationRuntimeException(String message) {
-		super(message);
-	}
+    public ApplicationRuntimeException(String message) {
+        super(message);
+    }
 
-	public ApplicationRuntimeException(Throwable cause) {
-		super(cause);
-	}
+    public ApplicationRuntimeException(Throwable cause) {
+        super(cause);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/AssertionFailureException.java b/src/main/java/org/analogweb/core/AssertionFailureException.java
index f1d3b63..f28a494 100644
--- a/src/main/java/org/analogweb/core/AssertionFailureException.java
+++ b/src/main/java/org/analogweb/core/AssertionFailureException.java
@@ -5,15 +5,15 @@
  */
 public class AssertionFailureException extends ApplicationRuntimeException {
 
-	private static final long serialVersionUID = 7617581467229787706L;
-	private final String requiredName;
+    private static final long serialVersionUID = 7617581467229787706L;
+    private final String requiredName;
 
-	public AssertionFailureException(String requiredName) {
-		super((String) null);
-		this.requiredName = requiredName;
-	}
+    public AssertionFailureException(String requiredName) {
+        super((String) null);
+        this.requiredName = requiredName;
+    }
 
-	public String getRequiredName() {
-		return this.requiredName;
-	}
+    public String getRequiredName() {
+        return this.requiredName;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/AutoTypeMapper.java b/src/main/java/org/analogweb/core/AutoTypeMapper.java
index b8997d0..9201456 100644
--- a/src/main/java/org/analogweb/core/AutoTypeMapper.java
+++ b/src/main/java/org/analogweb/core/AutoTypeMapper.java
@@ -22,302 +22,261 @@
  */
 public class AutoTypeMapper implements TypeMapper {
 
-	private static final Log log = Logs.getLog(AutoTypeMapper.class);
-	private final Map<ClassPair, TypeMapper> mappers = Maps.newEmptyHashMap();
-
-	public AutoTypeMapper() {
-		initAutoTypeMappers();
-	}
-
-	protected void initAutoTypeMappers() {
-		putTypeMapper(String.class, Boolean.class, new StringToBoolean());
-		putTypeMapper(String.class, boolean.class, new StringToBoolean());
-		putTypeMapper(String.class, Character.class, new StringToCharactor());
-		putTypeMapper(String.class, char.class, new StringToCharactor());
-		putTypeMapper(String.class, Short.class, new StringToShort());
-		putTypeMapper(String.class, short.class, new StringToShort());
-		putTypeMapper(String.class, Double.class, new StringToDouble());
-		putTypeMapper(String.class, double.class, new StringToDouble());
-		putTypeMapper(String.class, Float.class, new StringToFloat());
-		putTypeMapper(String.class, float.class, new StringToFloat());
-		putTypeMapper(String.class, Integer.class, new StringToInteger());
-		putTypeMapper(String.class, int.class, new StringToInteger());
-		putTypeMapper(String.class, Long.class, new StringToLong());
-		putTypeMapper(String.class, long.class, new StringToLong());
-		putTypeMapper(String.class, Date.class, new StringToDate());
-		putTypeMapper(String.class, BigDecimal.class, new StringToBigDecimal());
-		putTypeMapper(String[].class, String.class, new StringArrayToString());
-	}
-
-	protected void putTypeMapper(Class<?> convertFrom, Class<?> convertTo,
-			TypeMapper typeMapper) {
-		mappers.put(ClassPair.valueOf(convertFrom, convertTo), typeMapper);
-	}
-
-	@Override
-	public Object mapToType(Object from, Class<?> requiredType, String[] formats) {
-		if (from == null) {
-			return nullSafePrimitive(requiredType);
-		}
-		if (from.getClass().equals(requiredType)) {
-			return from;
-		}
-		TypeMapper mapper = mappers.get(ClassPair.valueOf(from.getClass(),
-				requiredType));
-		if (mapper != null) {
-			return mapper.mapToType(from, requiredType, formats);
-		}
-		return null;
-	}
-
-	private Object nullSafePrimitive(Class<?> requiredType) {
-		if (requiredType.isPrimitive() == false) {
-			return null;
-		} else if (requiredType.equals(char.class)) {
-			return Character.MIN_VALUE;
-		} else if (requiredType.equals(short.class)) {
-			return (short) 0;
-		} else if (requiredType.equals(int.class)) {
-			return 0;
-		} else if (requiredType.equals(long.class)) {
-			return 0L;
-		} else if (requiredType.equals(double.class)) {
-			return 0.0d;
-		} else if (requiredType.equals(float.class)) {
-			return 0.0f;
-		} else if (requiredType.equals(byte.class)) {
-			return (byte) 0;
-		} else {
-			// remains boolean only.
-			return false;
-		}
-	}
-
-	protected static final class ClassPair {
-
-		private final Class<?> convertFrom;
-		private final Class<?> convertTo;
-
-		public static ClassPair valueOf(Class<?> convertFrom, Class<?> convertTo) {
-			return new ClassPair(convertFrom, convertTo);
-		}
-
-		private ClassPair(Class<?> convertFrom, Class<?> convertTo) {
-			Assertion.notNull(convertTo, "convert-to");
-			Assertion.notNull(convertFrom, "convert-from");
-			this.convertFrom = convertFrom;
-			this.convertTo = convertTo;
-		}
-
-		@Override
-		public boolean equals(Object other) {
-			if (other instanceof ClassPair) {
-				ClassPair otherPair = (ClassPair) other;
-				return otherPair.convertFrom.equals(convertFrom)
-						&& otherPair.convertTo.equals(convertTo);
-			}
-			return false;
-		}
-
-		@Override
-		public int hashCode() {
-			int hashCode = 1;
-			hashCode = 31 * hashCode + convertFrom.hashCode();
-			hashCode = 31 * hashCode + convertTo.hashCode();
-			return hashCode;
-		}
-	}
-
-	private static final class StringToCharactor
-			extends
-				TypeSafeTypeMapper<String, Character> {
-
-		@Override
-		public Character mapToTypeInternal(String from,
-				Class<Character> requiredType, String[] formats) {
-			if (StringUtils.isNotEmpty(from)) {
-				return from.toCharArray()[0];
-			}
-			return null;
-		}
-	}
-
-	private static final class StringToBoolean
-			extends
-				TypeSafeTypeMapper<String, Boolean> {
-
-		@Override
-		public Boolean mapToTypeInternal(String from,
-				Class<Boolean> requiredType, String[] formats) {
-			return ((from.equalsIgnoreCase("true")
-					|| from.equalsIgnoreCase("yes") || from
-						.equalsIgnoreCase("on")));
-		}
-	}
-
-	private static final class StringToShort
-			extends
-				TypeSafeTypeMapper<String, Short> {
-
-		@Override
-		public Short mapToTypeInternal(String from, Class<Short> requiredType,
-				String[] formats) {
-			if (StringUtils.isNotEmpty(from)) {
-				try {
-					return Short.valueOf(from);
-				} catch (NumberFormatException e) {
-					// nop.
-					log.log(Markers.VARIABLE_ACCESS, "TV000004", e, from,
-							requiredType);
-				}
-			}
-			return null;
-		}
-	}
-
-	private static final class StringToFloat
-			extends
-				TypeSafeTypeMapper<String, Float> {
-
-		@Override
-		public Float mapToTypeInternal(String from, Class<Float> requiredType,
-				String[] formats) {
-			if (StringUtils.isNotEmpty(from)) {
-				try {
-					return Float.valueOf(from);
-				} catch (NumberFormatException e) {
-					// nop.
-					log.log(Markers.VARIABLE_ACCESS, "TV000004", e, from,
-							requiredType);
-				}
-			}
-			return null;
-		}
-	}
-
-	private static final class StringToDouble
-			extends
-				TypeSafeTypeMapper<String, Double> {
-
-		@Override
-		public Double mapToTypeInternal(String from,
-				Class<Double> requiredType, String[] formats) {
-			if (StringUtils.isNotEmpty(from)) {
-				try {
-					return Double.valueOf(from);
-				} catch (NumberFormatException e) {
-					// nop.
-					log.log(Markers.VARIABLE_ACCESS, "TV000004", e, from,
-							requiredType);
-				}
-			}
-			return null;
-		}
-	}
-
-	private static final class StringToInteger
-			extends
-				TypeSafeTypeMapper<String, Integer> {
-
-		@Override
-		public Integer mapToTypeInternal(String from,
-				Class<Integer> requiredType, String[] formats) {
-			if (StringUtils.isNotEmpty(from)) {
-				try {
-					return Integer.valueOf(from);
-				} catch (NumberFormatException e) {
-					// nop.
-					log.log(Markers.VARIABLE_ACCESS, "TV000004", e, from,
-							requiredType);
-				}
-			}
-			return null;
-		}
-	}
-
-	private static final class StringToLong
-			extends
-				TypeSafeTypeMapper<String, Long> {
-
-		@Override
-		public Long mapToTypeInternal(String from, Class<Long> requiredType,
-				String[] formats) {
-			if (StringUtils.isNotEmpty(from)) {
-				try {
-					return Long.valueOf(from);
-				} catch (NumberFormatException e) {
-					// nop.
-					log.log(Markers.VARIABLE_ACCESS, "TV000004", e, from,
-							requiredType);
-				}
-			}
-			return null;
-		}
-	}
-
-	private static final class StringToBigDecimal
-			extends
-				TypeSafeTypeMapper<String, BigDecimal> {
-
-		@Override
-		public BigDecimal mapToTypeInternal(String from,
-				Class<BigDecimal> requiredType, String[] formats) {
-			if (formats != null && formats.length > 0) {
-				DecimalFormat formatter = new DecimalFormat();
-				for (String formatPattern : formats) {
-					formatter.applyPattern(formatPattern);
-					formatter.setParseBigDecimal(true);
-					Number number = formatter.parse(from, new ParsePosition(0));
-					if (number != null) {
-						return (BigDecimal) number;
-					}
-				}
-			} else {
-				return new BigDecimal(from);
-			}
-			return null;
-		}
-	}
-
-	private static final class StringToDate
-			extends
-				TypeSafeTypeMapper<String, Date> {
-
-		private static final String[] DEFAULT_FORMAT_PATTERNS = new String[]{
-				"yyyy/MM/dd", "yyyy-MM-dd", "yyyy/MM/dd hh:mm:ss"};
-
-		@Override
-		public Date mapToTypeInternal(String from, Class<Date> requiredType,
-				String[] formats) {
-			SimpleDateFormat formatter = new SimpleDateFormat();
-			if (formats == null || formats.length == 0) {
-				formats = DEFAULT_FORMAT_PATTERNS;
-			}
-			for (String pattern : formats) {
-				formatter.applyPattern(pattern);
-				try {
-					return formatter.parse(from);
-				} catch (ParseException e) {
-					// ignore.
-					log.log(Markers.VARIABLE_ACCESS, "TV000004", e, from,
-							requiredType);
-				}
-			}
-			return null;
-		}
-	}
-
-	private static final class StringArrayToString
-			extends
-				TypeSafeTypeMapper<String[], String> {
-
-		@Override
-		public String mapToTypeInternal(String[] from,
-				Class<String> requiredType, String[] formats) {
-			if (ArrayUtils.isNotEmpty(from)) {
-				return from[0];
-			}
-			return null;
-		}
-	}
+    private static final Log log = Logs.getLog(AutoTypeMapper.class);
+    private final Map<ClassPair, TypeMapper> mappers = Maps.newEmptyHashMap();
+
+    public AutoTypeMapper() {
+        initAutoTypeMappers();
+    }
+
+    protected void initAutoTypeMappers() {
+        putTypeMapper(String.class, Boolean.class, new StringToBoolean());
+        putTypeMapper(String.class, boolean.class, new StringToBoolean());
+        putTypeMapper(String.class, Character.class, new StringToCharactor());
+        putTypeMapper(String.class, char.class, new StringToCharactor());
+        putTypeMapper(String.class, Short.class, new StringToShort());
+        putTypeMapper(String.class, short.class, new StringToShort());
+        putTypeMapper(String.class, Double.class, new StringToDouble());
+        putTypeMapper(String.class, double.class, new StringToDouble());
+        putTypeMapper(String.class, Float.class, new StringToFloat());
+        putTypeMapper(String.class, float.class, new StringToFloat());
+        putTypeMapper(String.class, Integer.class, new StringToInteger());
+        putTypeMapper(String.class, int.class, new StringToInteger());
+        putTypeMapper(String.class, Long.class, new StringToLong());
+        putTypeMapper(String.class, long.class, new StringToLong());
+        putTypeMapper(String.class, Date.class, new StringToDate());
+        putTypeMapper(String.class, BigDecimal.class, new StringToBigDecimal());
+        putTypeMapper(String[].class, String.class, new StringArrayToString());
+    }
+
+    protected void putTypeMapper(Class<?> convertFrom, Class<?> convertTo, TypeMapper typeMapper) {
+        mappers.put(ClassPair.valueOf(convertFrom, convertTo), typeMapper);
+    }
+
+    @Override
+    public Object mapToType(Object from, Class<?> requiredType, String[] formats) {
+        if (from == null) {
+            return nullSafePrimitive(requiredType);
+        }
+        if (from.getClass().equals(requiredType)) {
+            return from;
+        }
+        TypeMapper mapper = mappers.get(ClassPair.valueOf(from.getClass(), requiredType));
+        if (mapper != null) {
+            return mapper.mapToType(from, requiredType, formats);
+        }
+        return null;
+    }
+
+    private Object nullSafePrimitive(Class<?> requiredType) {
+        if (requiredType.isPrimitive() == false) {
+            return null;
+        } else if (requiredType.equals(char.class)) {
+            return Character.MIN_VALUE;
+        } else if (requiredType.equals(short.class)) {
+            return (short) 0;
+        } else if (requiredType.equals(int.class)) {
+            return 0;
+        } else if (requiredType.equals(long.class)) {
+            return 0L;
+        } else if (requiredType.equals(double.class)) {
+            return 0.0d;
+        } else if (requiredType.equals(float.class)) {
+            return 0.0f;
+        } else if (requiredType.equals(byte.class)) {
+            return (byte) 0;
+        } else {
+            // remains boolean only.
+            return false;
+        }
+    }
+
+    protected static final class ClassPair {
+
+        private final Class<?> convertFrom;
+        private final Class<?> convertTo;
+
+        public static ClassPair valueOf(Class<?> convertFrom, Class<?> convertTo) {
+            return new ClassPair(convertFrom, convertTo);
+        }
+
+        private ClassPair(Class<?> convertFrom, Class<?> convertTo) {
+            Assertion.notNull(convertTo, "convert-to");
+            Assertion.notNull(convertFrom, "convert-from");
+            this.convertFrom = convertFrom;
+            this.convertTo = convertTo;
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            if (other instanceof ClassPair) {
+                ClassPair otherPair = (ClassPair) other;
+                return otherPair.convertFrom.equals(convertFrom) && otherPair.convertTo.equals(convertTo);
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            int hashCode = 1;
+            hashCode = 31 * hashCode + convertFrom.hashCode();
+            hashCode = 31 * hashCode + convertTo.hashCode();
+            return hashCode;
+        }
+    }
+
+    private static final class StringToCharactor extends TypeSafeTypeMapper<String, Character> {
+
+        @Override
+        public Character mapToTypeInternal(String from, Class<Character> requiredType, String[] formats) {
+            if (StringUtils.isNotEmpty(from)) {
+                return from.toCharArray()[0];
+            }
+            return null;
+        }
+    }
+
+    private static final class StringToBoolean extends TypeSafeTypeMapper<String, Boolean> {
+
+        @Override
+        public Boolean mapToTypeInternal(String from, Class<Boolean> requiredType, String[] formats) {
+            return ((from.equalsIgnoreCase("true") || from.equalsIgnoreCase("yes") || from.equalsIgnoreCase("on")));
+        }
+    }
+
+    private static final class StringToShort extends TypeSafeTypeMapper<String, Short> {
+
+        @Override
+        public Short mapToTypeInternal(String from, Class<Short> requiredType, String[] formats) {
+            if (StringUtils.isNotEmpty(from)) {
+                try {
+                    return Short.valueOf(from);
+                } catch (NumberFormatException e) {
+                    // nop.
+                    log.log(Markers.VARIABLE_ACCESS, "TV000004", e, from, requiredType);
+                }
+            }
+            return null;
+        }
+    }
+
+    private static final class StringToFloat extends TypeSafeTypeMapper<String, Float> {
+
+        @Override
+        public Float mapToTypeInternal(String from, Class<Float> requiredType, String[] formats) {
+            if (StringUtils.isNotEmpty(from)) {
+                try {
+                    return Float.valueOf(from);
+                } catch (NumberFormatException e) {
+                    // nop.
+                    log.log(Markers.VARIABLE_ACCESS, "TV000004", e, from, requiredType);
+                }
+            }
+            return null;
+        }
+    }
+
+    private static final class StringToDouble extends TypeSafeTypeMapper<String, Double> {
+
+        @Override
+        public Double mapToTypeInternal(String from, Class<Double> requiredType, String[] formats) {
+            if (StringUtils.isNotEmpty(from)) {
+                try {
+                    return Double.valueOf(from);
+                } catch (NumberFormatException e) {
+                    // nop.
+                    log.log(Markers.VARIABLE_ACCESS, "TV000004", e, from, requiredType);
+                }
+            }
+            return null;
+        }
+    }
+
+    private static final class StringToInteger extends TypeSafeTypeMapper<String, Integer> {
+
+        @Override
+        public Integer mapToTypeInternal(String from, Class<Integer> requiredType, String[] formats) {
+            if (StringUtils.isNotEmpty(from)) {
+                try {
+                    return Integer.valueOf(from);
+                } catch (NumberFormatException e) {
+                    // nop.
+                    log.log(Markers.VARIABLE_ACCESS, "TV000004", e, from, requiredType);
+                }
+            }
+            return null;
+        }
+    }
+
+    private static final class StringToLong extends TypeSafeTypeMapper<String, Long> {
+
+        @Override
+        public Long mapToTypeInternal(String from, Class<Long> requiredType, String[] formats) {
+            if (StringUtils.isNotEmpty(from)) {
+                try {
+                    return Long.valueOf(from);
+                } catch (NumberFormatException e) {
+                    // nop.
+                    log.log(Markers.VARIABLE_ACCESS, "TV000004", e, from, requiredType);
+                }
+            }
+            return null;
+        }
+    }
+
+    private static final class StringToBigDecimal extends TypeSafeTypeMapper<String, BigDecimal> {
+
+        @Override
+        public BigDecimal mapToTypeInternal(String from, Class<BigDecimal> requiredType, String[] formats) {
+            if (formats != null && formats.length > 0) {
+                DecimalFormat formatter = new DecimalFormat();
+                for (String formatPattern : formats) {
+                    formatter.applyPattern(formatPattern);
+                    formatter.setParseBigDecimal(true);
+                    Number number = formatter.parse(from, new ParsePosition(0));
+                    if (number != null) {
+                        return (BigDecimal) number;
+                    }
+                }
+            } else {
+                return new BigDecimal(from);
+            }
+            return null;
+        }
+    }
+
+    private static final class StringToDate extends TypeSafeTypeMapper<String, Date> {
+
+        private static final String[] DEFAULT_FORMAT_PATTERNS = new String[] { "yyyy/MM/dd", "yyyy-MM-dd",
+                "yyyy/MM/dd hh:mm:ss" };
+
+        @Override
+        public Date mapToTypeInternal(String from, Class<Date> requiredType, String[] formats) {
+            SimpleDateFormat formatter = new SimpleDateFormat();
+            if (formats == null || formats.length == 0) {
+                formats = DEFAULT_FORMAT_PATTERNS;
+            }
+            for (String pattern : formats) {
+                formatter.applyPattern(pattern);
+                try {
+                    return formatter.parse(from);
+                } catch (ParseException e) {
+                    // ignore.
+                    log.log(Markers.VARIABLE_ACCESS, "TV000004", e, from, requiredType);
+                }
+            }
+            return null;
+        }
+    }
+
+    private static final class StringArrayToString extends TypeSafeTypeMapper<String[], String> {
+
+        @Override
+        public String mapToTypeInternal(String[] from, Class<String> requiredType, String[] formats) {
+            if (ArrayUtils.isNotEmpty(from)) {
+                return from[0];
+            }
+            return null;
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/core/BeanAttributeValueResolver.java b/src/main/java/org/analogweb/core/BeanAttributeValueResolver.java
index 3ef4175..79d1aa1 100644
--- a/src/main/java/org/analogweb/core/BeanAttributeValueResolver.java
+++ b/src/main/java/org/analogweb/core/BeanAttributeValueResolver.java
@@ -18,73 +18,60 @@
 /**
  * @author snowgoose
  */
-public class BeanAttributeValueResolver
-		implements
-			RequestValueResolver,
-			ModulesAware {
+public class BeanAttributeValueResolver implements RequestValueResolver, ModulesAware {
 
-	private RequestValueResolvers resolvers;
-	private TypeMapperContext converters;
+    private RequestValueResolvers resolvers;
+    private TypeMapperContext converters;
 
-	@Override
-	public Object resolveValue(RequestContext context,
-			InvocationMetadata metadata, String key, Class<?> requiredType,
-			Annotation[] parameterAnnotations) {
-		Object beanInstance = instanticate(requiredType,
-				AnnotationUtils.findAnnotation(Resolver.class,
-						parameterAnnotations), metadata, context,
-				getRequestValueResolvers(), parameterAnnotations);
-		if (beanInstance != null) {
-			for (Field field : requiredType.getDeclaredFields()) {
-				Object convertedValue = AnnotatedArguments.resolveArguent(
-						field.getName(), field.getAnnotations(),
-						field.getType(), context, metadata,
-						getTypeMapperContext(), getRequestValueResolvers());
-				if (convertedValue != null) {
-					ReflectionUtils.writeValueToField(field, beanInstance,
-							convertedValue);
-				}
-			}
-		}
-		return beanInstance;
-	}
+    @Override
+    public Object resolveValue(RequestContext context, InvocationMetadata metadata, String key, Class<?> requiredType,
+            Annotation[] parameterAnnotations) {
+        Object beanInstance = instanticate(requiredType,
+                AnnotationUtils.findAnnotation(Resolver.class, parameterAnnotations), metadata, context,
+                getRequestValueResolvers(), parameterAnnotations);
+        if (beanInstance != null) {
+            for (Field field : requiredType.getDeclaredFields()) {
+                Object convertedValue = AnnotatedArguments.resolveArguent(field.getName(), field.getAnnotations(),
+                        field.getType(), context, metadata, getTypeMapperContext(), getRequestValueResolvers());
+                if (convertedValue != null) {
+                    ReflectionUtils.writeValueToField(field, beanInstance, convertedValue);
+                }
+            }
+        }
+        return beanInstance;
+    }
 
-	protected final TypeMapperContext getTypeMapperContext() {
-		return this.converters;
-	}
+    protected final TypeMapperContext getTypeMapperContext() {
+        return this.converters;
+    }
 
-	protected final RequestValueResolvers getRequestValueResolvers() {
-		return this.resolvers;
-	}
+    protected final RequestValueResolvers getRequestValueResolvers() {
+        return this.resolvers;
+    }
 
-	private Object instanticate(Class<?> clazz, Resolver resolverAnn,
-			InvocationMetadata metadata, RequestContext context,
-			RequestValueResolvers resolvers, Annotation[] parameterAnnotations) {
-		if (resolverAnn != null) {
-			Class<? extends RequestValueResolver> resolverClass = resolverAnn
-					.value();
-			RequestValueResolver resolver = resolvers
-					.findRequestValueResolver(resolverClass);
-			if (resolver != null
-			// Cyclic reference limitation.
-					&& BeanAttributeValueResolver.class.equals(resolver
-							.getClass()) == false) {
-				return resolver.resolveValue(context, metadata,
-						StringUtils.EMPTY, clazz, parameterAnnotations);
-			}
-		}
-		return ReflectionUtils.getInstanceQuietly(clazz);
-	}
+    private Object instanticate(Class<?> clazz, Resolver resolverAnn, InvocationMetadata metadata,
+            RequestContext context, RequestValueResolvers resolvers, Annotation[] parameterAnnotations) {
+        if (resolverAnn != null) {
+            Class<? extends RequestValueResolver> resolverClass = resolverAnn.value();
+            RequestValueResolver resolver = resolvers.findRequestValueResolver(resolverClass);
+            if (resolver != null
+                    // Cyclic reference limitation.
+                    && BeanAttributeValueResolver.class.equals(resolver.getClass()) == false) {
+                return resolver.resolveValue(context, metadata, StringUtils.EMPTY, clazz, parameterAnnotations);
+            }
+        }
+        return ReflectionUtils.getInstanceQuietly(clazz);
+    }
 
-	@Override
-	public void dispose() {
-		this.converters = null;
-		this.resolvers = null;
-	}
+    @Override
+    public void dispose() {
+        this.converters = null;
+        this.resolvers = null;
+    }
 
-	@Override
-	public void setModules(Modules modules) {
-		this.converters = modules.getTypeMapperContext();
-		this.resolvers = modules.getRequestValueResolvers();
-	}
+    @Override
+    public void setModules(Modules modules) {
+        this.converters = modules.getTypeMapperContext();
+        this.resolvers = modules.getRequestValueResolvers();
+    }
 }
diff --git a/src/main/java/org/analogweb/core/BindAttributeArgumentPreparator.java b/src/main/java/org/analogweb/core/BindAttributeArgumentPreparator.java
index 3327ff0..8355637 100644
--- a/src/main/java/org/analogweb/core/BindAttributeArgumentPreparator.java
+++ b/src/main/java/org/analogweb/core/BindAttributeArgumentPreparator.java
@@ -13,32 +13,27 @@
 /**
  * @author snowgoose
  */
-public class BindAttributeArgumentPreparator
-		extends
-			AbstractApplicationProcessor {
+public class BindAttributeArgumentPreparator extends AbstractApplicationProcessor {
 
-	@Override
-	public Object prepareInvoke(InvocationArguments args,
-			InvocationMetadata metadata, RequestContext context,
-			TypeMapperContext converters, RequestValueResolvers resolvers) {
-		Method method = metadata.resolveMethod();
-		if (method == null) {
-			return NO_INTERRUPTION;
-		}
-		Annotation[][] parameterAnnotations = method.getParameterAnnotations();
-		Class<?>[] argTypes = metadata.getArgumentTypes();
-		if (ArrayUtils.isEmpty(parameterAnnotations)
-				|| ArrayUtils.isEmpty(argTypes)) {
-			return NO_INTERRUPTION;
-		}
-		for (int index = 0, limit = argTypes.length; index < limit; index++) {
-			Object convertedValue = AnnotatedArguments.resolveArguent(
-					parameterAnnotations[index], argTypes[index], context,
-					metadata, converters, resolvers);
-			if (convertedValue != null) {
-				args.putInvocationArgument(index, convertedValue);
-			}
-		}
-		return NO_INTERRUPTION;
-	}
+    @Override
+    public Object prepareInvoke(InvocationArguments args, InvocationMetadata metadata, RequestContext context,
+            TypeMapperContext converters, RequestValueResolvers resolvers) {
+        Method method = metadata.resolveMethod();
+        if (method == null) {
+            return NO_INTERRUPTION;
+        }
+        Annotation[][] parameterAnnotations = method.getParameterAnnotations();
+        Class<?>[] argTypes = metadata.getArgumentTypes();
+        if (ArrayUtils.isEmpty(parameterAnnotations) || ArrayUtils.isEmpty(argTypes)) {
+            return NO_INTERRUPTION;
+        }
+        for (int index = 0, limit = argTypes.length; index < limit; index++) {
+            Object convertedValue = AnnotatedArguments.resolveArguent(parameterAnnotations[index], argTypes[index],
+                    context, metadata, converters, resolvers);
+            if (convertedValue != null) {
+                args.putInvocationArgument(index, convertedValue);
+            }
+        }
+        return NO_INTERRUPTION;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/ConsumesMediaTypeVerifier.java b/src/main/java/org/analogweb/core/ConsumesMediaTypeVerifier.java
index 40d225e..48e3b59 100644
--- a/src/main/java/org/analogweb/core/ConsumesMediaTypeVerifier.java
+++ b/src/main/java/org/analogweb/core/ConsumesMediaTypeVerifier.java
@@ -20,64 +20,55 @@
  */
 public class ConsumesMediaTypeVerifier extends AbstractApplicationProcessor {
 
-	@Override
-	public Object prepareInvoke(InvocationArguments args,
-			InvocationMetadata metadata, RequestContext context,
-			TypeMapperContext converters, RequestValueResolvers resolvers) {
-		if (context.getRequestMethod().equalsIgnoreCase("GET")) {
-			return NO_INTERRUPTION;
-		}
-		Method method = metadata.resolveMethod();
-		if (method == null) {
-			return NO_INTERRUPTION;
-		}
-		Annotation[] ann = method.getAnnotations();
-		RequestFormats formats = AnnotationUtils.findAnnotation(
-				RequestFormats.class, ann);
-		MediaType contentType = context.getContentType();
-		if (contentType == null) {
-			throw new UnsupportedMediaTypeException(metadata.getDefinedPath());
-		}
-		String[] expectMimes;
-		if (formats == null
-				|| ArrayUtils.isEmpty(expectMimes = formats.value())) {
-			if (mediaTypeUnsupported(contentType, method, resolvers)) {
-				throw new UnsupportedMediaTypeException(
-						metadata.getDefinedPath());
-			}
-		} else {
-			for (String expectMime : expectMimes) {
-				if (contentType.isCompatible(MediaTypes.valueOf(expectMime))) {
-					return super.prepareInvoke(args, metadata, context,
-							converters, resolvers);
-				}
-			}
-			throw new UnsupportedMediaTypeException(metadata.getDefinedPath());
-		}
-		return super.prepareInvoke(args, metadata, context, converters,
-				resolvers);
-	}
+    @Override
+    public Object prepareInvoke(InvocationArguments args, InvocationMetadata metadata, RequestContext context,
+            TypeMapperContext converters, RequestValueResolvers resolvers) {
+        if (context.getRequestMethod().equalsIgnoreCase("GET")) {
+            return NO_INTERRUPTION;
+        }
+        Method method = metadata.resolveMethod();
+        if (method == null) {
+            return NO_INTERRUPTION;
+        }
+        Annotation[] ann = method.getAnnotations();
+        RequestFormats formats = AnnotationUtils.findAnnotation(RequestFormats.class, ann);
+        MediaType contentType = context.getContentType();
+        if (contentType == null) {
+            throw new UnsupportedMediaTypeException(metadata.getDefinedPath());
+        }
+        String[] expectMimes;
+        if (formats == null || ArrayUtils.isEmpty(expectMimes = formats.value())) {
+            if (mediaTypeUnsupported(contentType, method, resolvers)) {
+                throw new UnsupportedMediaTypeException(metadata.getDefinedPath());
+            }
+        } else {
+            for (String expectMime : expectMimes) {
+                if (contentType.isCompatible(MediaTypes.valueOf(expectMime))) {
+                    return super.prepareInvoke(args, metadata, context, converters, resolvers);
+                }
+            }
+            throw new UnsupportedMediaTypeException(metadata.getDefinedPath());
+        }
+        return super.prepareInvoke(args, metadata, context, converters, resolvers);
+    }
 
-	private boolean mediaTypeUnsupported(MediaType contentType, Method method,
-			RequestValueResolvers handlers) {
-		Annotation[][] parameterAnn = method.getParameterAnnotations();
-		for (Annotation[] pa : parameterAnn) {
-			Resolver by = AnnotationUtils.findAnnotation(Resolver.class, pa);
-			if (by != null) {
-				RequestValueResolver ha = handlers.findRequestValueResolver(by
-						.value());
-				if (ha instanceof SpecificMediaTypeRequestValueResolver
-						&& ((SpecificMediaTypeRequestValueResolver) ha)
-								.supports(contentType) == false) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
+    private boolean mediaTypeUnsupported(MediaType contentType, Method method, RequestValueResolvers handlers) {
+        Annotation[][] parameterAnn = method.getParameterAnnotations();
+        for (Annotation[] pa : parameterAnn) {
+            Resolver by = AnnotationUtils.findAnnotation(Resolver.class, pa);
+            if (by != null) {
+                RequestValueResolver ha = handlers.findRequestValueResolver(by.value());
+                if (ha instanceof SpecificMediaTypeRequestValueResolver
+                        && ((SpecificMediaTypeRequestValueResolver) ha).supports(contentType) == false) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 
-	@Override
-	public int getPrecedence() {
-		return 1;
-	}
+    @Override
+    public int getPrecedence() {
+        return 1;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/ContextSpecificAttributesHandler.java b/src/main/java/org/analogweb/core/ContextSpecificAttributesHandler.java
index 62b79db..4991b11 100644
--- a/src/main/java/org/analogweb/core/ContextSpecificAttributesHandler.java
+++ b/src/main/java/org/analogweb/core/ContextSpecificAttributesHandler.java
@@ -5,44 +5,37 @@
 import org.analogweb.InvocationMetadata;
 import org.analogweb.RequestContext;
 
-public abstract class ContextSpecificAttributesHandler<T extends RequestContext>
-		extends
-			AbstractAttributesHandler {
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public final Object resolveValue(RequestContext requestContext,
-			InvocationMetadata metadata, String key, Class<?> requiredType,
-			Annotation[] annotations) {
-		return this.resolveAttributeValueOnContext((T) requestContext,
-				metadata, key, requiredType);
-	}
-
-	protected Object resolveAttributeValueOnContext(T requestContext,
-			InvocationMetadata metadata, String key, Class<?> requiredType) {
-		return null;
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public final void putAttributeValue(RequestContext requestContext,
-			String query, Object value) {
-		this.putAttributeValueOnContext((T) requestContext, query, value);
-	}
-
-	protected void putAttributeValueOnContext(T requestContext, String query,
-			Object value) {
-		// nop.
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public final void removeAttribute(RequestContext requestContext,
-			String query) {
-		this.removeAttributeOnContext((T) requestContext, query);
-	}
-
-	protected void removeAttributeOnContext(T requestContext, String query) {
-		// nop.
-	}
+public abstract class ContextSpecificAttributesHandler<T extends RequestContext> extends AbstractAttributesHandler {
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public final Object resolveValue(RequestContext requestContext, InvocationMetadata metadata, String key,
+            Class<?> requiredType, Annotation[] annotations) {
+        return this.resolveAttributeValueOnContext((T) requestContext, metadata, key, requiredType);
+    }
+
+    protected Object resolveAttributeValueOnContext(T requestContext, InvocationMetadata metadata, String key,
+            Class<?> requiredType) {
+        return null;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public final void putAttributeValue(RequestContext requestContext, String query, Object value) {
+        this.putAttributeValueOnContext((T) requestContext, query, value);
+    }
+
+    protected void putAttributeValueOnContext(T requestContext, String query, Object value) {
+        // nop.
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public final void removeAttribute(RequestContext requestContext, String query) {
+        this.removeAttributeOnContext((T) requestContext, query);
+    }
+
+    protected void removeAttributeOnContext(T requestContext, String query) {
+        // nop.
+    }
 }
diff --git a/src/main/java/org/analogweb/core/CookieValueResolver.java b/src/main/java/org/analogweb/core/CookieValueResolver.java
index 0856a84..c3b92d5 100644
--- a/src/main/java/org/analogweb/core/CookieValueResolver.java
+++ b/src/main/java/org/analogweb/core/CookieValueResolver.java
@@ -12,20 +12,18 @@
  */
 public class CookieValueResolver implements RequestValueResolver {
 
-	@Override
-	public Object resolveValue(RequestContext requestContext,
-			InvocationMetadata metadatan, String key, Class<?> requiredType,
-			Annotation[] annotations) {
-		Cookies cookies = requestContext.getCookies();
-		if (cookies != null) {
-			Cookies.Cookie cookie = cookies.getCookie(key);
-			if (requiredType != null
-					&& requiredType.equals(Cookies.Cookie.class)) {
-				return cookie;
-			} else if (cookie != null) {
-				return cookie.getValue();
-			}
-		}
-		return null;
-	}
+    @Override
+    public Object resolveValue(RequestContext requestContext, InvocationMetadata metadatan, String key,
+            Class<?> requiredType, Annotation[] annotations) {
+        Cookies cookies = requestContext.getCookies();
+        if (cookies != null) {
+            Cookies.Cookie cookie = cookies.getCookie(key);
+            if (requiredType != null && requiredType.equals(Cookies.Cookie.class)) {
+                return cookie;
+            } else if (cookie != null) {
+                return cookie.getValue();
+            }
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultApplicationContext.java b/src/main/java/org/analogweb/core/DefaultApplicationContext.java
index 3a82b7b..35c904c 100644
--- a/src/main/java/org/analogweb/core/DefaultApplicationContext.java
+++ b/src/main/java/org/analogweb/core/DefaultApplicationContext.java
@@ -8,28 +8,28 @@
 
 /**
  * Default implementation of {@link ApplicationContext}.
- * 
+ *
  * @author snowgooseyk
  */
 public class DefaultApplicationContext implements ApplicationContext {
 
-	private final Map<String, ?> context;
+    private final Map<String, ?> context;
 
-	public static DefaultApplicationContext context(String key, Object value) {
-		return new DefaultApplicationContext(Maps.newHashMap(key, value));
-	}
+    public static DefaultApplicationContext context(String key, Object value) {
+        return new DefaultApplicationContext(Maps.newHashMap(key, value));
+    }
 
-	public static DefaultApplicationContext context(Map<String, ?> context) {
-		return new DefaultApplicationContext(context);
-	}
+    public static DefaultApplicationContext context(Map<String, ?> context) {
+        return new DefaultApplicationContext(context);
+    }
 
-	public DefaultApplicationContext(Map<String, ?> context) {
-		this.context = new ConcurrentHashMap<String, Object>(context);
-	}
+    public DefaultApplicationContext(Map<String, ?> context) {
+        this.context = new ConcurrentHashMap<String, Object>(context);
+    }
 
-	@Override
-	@SuppressWarnings("unchecked")
-	public <T> T getAttribute(Class<T> requiredType, String contextKey) {
-		return (T) context.get(contextKey);
-	}
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T getAttribute(Class<T> requiredType, String contextKey) {
+        return (T) context.get(contextKey);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultApplicationProperties.java b/src/main/java/org/analogweb/core/DefaultApplicationProperties.java
index 1c7a7cc..d85a182 100644
--- a/src/main/java/org/analogweb/core/DefaultApplicationProperties.java
+++ b/src/main/java/org/analogweb/core/DefaultApplicationProperties.java
@@ -19,145 +19,136 @@
 
 /**
  * Default implementation of {@link ApplicationProperties}
- * 
+ *
  * @author snowgooseyk
  */
 public class DefaultApplicationProperties implements ApplicationProperties {
 
-	private Map<String, Object> properties;
-
-	public static DefaultApplicationProperties defaultProperties() {
-		return properties(StringUtils.EMPTY);
-	}
-
-	public static DefaultApplicationProperties properties(String packageNames) {
-		return properties(packageNames, null, null);
-	}
-
-	public static DefaultApplicationProperties properties(String packageNames,
-			String tmpDirectoryPath, String defaultClientLocale) {
-		Map<String, Object> properties = Maps.newHashMap(TEMP_DIR,
-				(Object) createTempDirPath(tmpDirectoryPath));
-		properties.put(LOCALE, createDefaultClientLocale(defaultClientLocale));
-		properties.put(PACKAGES, createUserDefinedPackageNames(packageNames));
-		return new DefaultApplicationProperties(properties);
-	}
-
-	public static DefaultApplicationProperties properties(String[] options) {
-		return properties(toMap(options));
-	}
-
-	private static Map<String, Object> toMap(String[] options) {
-		Map<String, Object> params = Maps.newEmptyHashMap();
-		if (ArrayUtils.isEmpty(options)) {
-			return params;
-		}
-		for (String opt : options) {
-			List<String> arg = StringUtils.split(opt, '=');
-			if (arg.size() > 1) {
-				params.put(arg.get(0), arg.get(1));
-			} else if (arg.isEmpty() == false) {
-				params.put(arg.get(0), Boolean.TRUE);
-			}
-		}
-		return params;
-	}
-
-	public static DefaultApplicationProperties properties(
-			Map<String, Object> properties) {
-		Map<String, Object> defaults = Maps.newHashMap(TEMP_DIR,
-				(Object) createTempDirPath(null));
-		defaults.put(LOCALE, createDefaultClientLocale(null));
-		defaults.put(PACKAGES, createUserDefinedPackageNames(null));
-		defaults.putAll(properties);
-		return new DefaultApplicationProperties(defaults);
-	}
-
-	protected DefaultApplicationProperties(Map<String, Object> properties) {
-		this.properties = properties;
-	}
-
-	@Override
-	public File getTempDir() {
-		Object o = getProperties().get(TEMP_DIR);
-		if (o instanceof File) {
-			return (File) o;
-		} else if (o instanceof String) {
-			return new File(o.toString());
-		}
-		return null;
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public Collection<String> getComponentPackageNames() {
-		return (Collection<String>) getProperties().get(PACKAGES);
-	}
-
-	@Override
-	public Locale getDefaultClientLocale() {
-		return (Locale) getProperties().get(LOCALE);
-	}
-
-	public String getStringProperty(String key) {
-		return (String) getProperties().get(key);
-	}
-
-	public Object getProperty(String key) {
-		return getProperties().get(key);
-	}
-
-	public Map<String, Object> getProperties() {
-		return this.properties;
-	};
-
-	private static Locale createDefaultClientLocale(String locale) {
-		if (StringUtils.isEmpty(locale)) {
-			return Locale.getDefault();
-		}
-		List<String> values = StringUtils.split(locale.replace('_', '-'), '-');
-		switch (values.size()) {
-			case 2 :
-				return new Locale(values.get(0), values.get(1));
-			case 3 :
-				return new Locale(values.get(0), values.get(1), values.get(2));
-			default :
-				return new Locale(values.get(0));
-		}
-	}
-
-	private static Set<String> createUserDefinedPackageNames(
-			String tokenizedRootPackageNames) {
-		Set<String> packageNames = new HashSet<String>();
-		if (StringUtils.isNotEmpty(tokenizedRootPackageNames)) {
-			for (String packageName : StringUtils.split(
-					tokenizedRootPackageNames, ',')) {
-				packageNames.add(packageName);
-			}
-		}
-		packageNames.add(Application.DEFAULT_PACKAGE_NAME);
-		return Collections.unmodifiableSet(packageNames);
-	}
-
-	private static File createTempDirPath(String tmpDirPath) {
-		String tmpDir = tmpDirPath;
-		if (StringUtils.isEmpty(tmpDir)) {
-			tmpDir = SystemProperties.tmpDir()
-					+ SystemProperties.fileSeparator()
-					+ Application.class.getCanonicalName();
-		}
-		if (tmpDir.endsWith(SystemProperties.fileSeparator())) {
-			tmpDir = tmpDir + Application.class.getCanonicalName();
-		} else {
-			tmpDir = tmpDir + SystemProperties.fileSeparator()
-					+ Application.class.getCanonicalName();
-		}
-		String path = tmpDir + SystemProperties.fileSeparator()
-				+ UUID.randomUUID();
-		while (new File(path).exists()) {
-			path = tmpDir + SystemProperties.fileSeparator()
-					+ UUID.randomUUID();
-		}
-		return new File(path);
-	}
+    private Map<String, Object> properties;
+
+    public static DefaultApplicationProperties defaultProperties() {
+        return properties(StringUtils.EMPTY);
+    }
+
+    public static DefaultApplicationProperties properties(String packageNames) {
+        return properties(packageNames, null, null);
+    }
+
+    public static DefaultApplicationProperties properties(String packageNames, String tmpDirectoryPath,
+            String defaultClientLocale) {
+        Map<String, Object> properties = Maps.newHashMap(TEMP_DIR, (Object) createTempDirPath(tmpDirectoryPath));
+        properties.put(LOCALE, createDefaultClientLocale(defaultClientLocale));
+        properties.put(PACKAGES, createUserDefinedPackageNames(packageNames));
+        return new DefaultApplicationProperties(properties);
+    }
+
+    public static DefaultApplicationProperties properties(String[] options) {
+        return properties(toMap(options));
+    }
+
+    private static Map<String, Object> toMap(String[] options) {
+        Map<String, Object> params = Maps.newEmptyHashMap();
+        if (ArrayUtils.isEmpty(options)) {
+            return params;
+        }
+        for (String opt : options) {
+            List<String> arg = StringUtils.split(opt, '=');
+            if (arg.size() > 1) {
+                params.put(arg.get(0), arg.get(1));
+            } else if (arg.isEmpty() == false) {
+                params.put(arg.get(0), Boolean.TRUE);
+            }
+        }
+        return params;
+    }
+
+    public static DefaultApplicationProperties properties(Map<String, Object> properties) {
+        Map<String, Object> defaults = Maps.newHashMap(TEMP_DIR, (Object) createTempDirPath(null));
+        defaults.put(LOCALE, createDefaultClientLocale(null));
+        defaults.put(PACKAGES, createUserDefinedPackageNames(null));
+        defaults.putAll(properties);
+        return new DefaultApplicationProperties(defaults);
+    }
+
+    protected DefaultApplicationProperties(Map<String, Object> properties) {
+        this.properties = properties;
+    }
+
+    @Override
+    public File getTempDir() {
+        Object o = getProperties().get(TEMP_DIR);
+        if (o instanceof File) {
+            return (File) o;
+        } else if (o instanceof String) {
+            return new File(o.toString());
+        }
+        return null;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Collection<String> getComponentPackageNames() {
+        return (Collection<String>) getProperties().get(PACKAGES);
+    }
+
+    @Override
+    public Locale getDefaultClientLocale() {
+        return (Locale) getProperties().get(LOCALE);
+    }
+
+    public String getStringProperty(String key) {
+        return (String) getProperties().get(key);
+    }
+
+    public Object getProperty(String key) {
+        return getProperties().get(key);
+    }
+
+    public Map<String, Object> getProperties() {
+        return this.properties;
+    };
+
+    private static Locale createDefaultClientLocale(String locale) {
+        if (StringUtils.isEmpty(locale)) {
+            return Locale.getDefault();
+        }
+        List<String> values = StringUtils.split(locale.replace('_', '-'), '-');
+        switch (values.size()) {
+        case 2:
+            return new Locale(values.get(0), values.get(1));
+        case 3:
+            return new Locale(values.get(0), values.get(1), values.get(2));
+        default:
+            return new Locale(values.get(0));
+        }
+    }
+
+    private static Set<String> createUserDefinedPackageNames(String tokenizedRootPackageNames) {
+        Set<String> packageNames = new HashSet<String>();
+        if (StringUtils.isNotEmpty(tokenizedRootPackageNames)) {
+            for (String packageName : StringUtils.split(tokenizedRootPackageNames, ',')) {
+                packageNames.add(packageName);
+            }
+        }
+        packageNames.add(Application.DEFAULT_PACKAGE_NAME);
+        return Collections.unmodifiableSet(packageNames);
+    }
+
+    private static File createTempDirPath(String tmpDirPath) {
+        String tmpDir = tmpDirPath;
+        if (StringUtils.isEmpty(tmpDir)) {
+            tmpDir = SystemProperties.tmpDir() + SystemProperties.fileSeparator()
+                    + Application.class.getCanonicalName();
+        }
+        if (tmpDir.endsWith(SystemProperties.fileSeparator())) {
+            tmpDir = tmpDir + Application.class.getCanonicalName();
+        } else {
+            tmpDir = tmpDir + SystemProperties.fileSeparator() + Application.class.getCanonicalName();
+        }
+        String path = tmpDir + SystemProperties.fileSeparator() + UUID.randomUUID();
+        while (new File(path).exists()) {
+            path = tmpDir + SystemProperties.fileSeparator() + UUID.randomUUID();
+        }
+        return new File(path);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultCookie.java b/src/main/java/org/analogweb/core/DefaultCookie.java
index 60e759e..0b72fd7 100644
--- a/src/main/java/org/analogweb/core/DefaultCookie.java
+++ b/src/main/java/org/analogweb/core/DefaultCookie.java
@@ -7,146 +7,145 @@
 
 public class DefaultCookie implements Cookies.Cookie {
 
-	private final String name;
-	private final String value;
-	private final String domain;
-	private final String path;
-	private final Date expires;
-	private final int maxAge;
-	private final boolean secure;
-	private final boolean httpOnly;
-
-	public DefaultCookie(String name, String value) {
-		this(name, value, null, null, null, -1, false, false);
-	}
-
-	public DefaultCookie(String name, String value, String domain, String path,
-			Date expires, int maxAge, boolean secure, boolean httpOnly) {
-		super();
-		this.name = name;
-		this.value = value;
-		this.domain = domain;
-		this.path = path;
-		this.expires = expires;
-		this.maxAge = maxAge;
-		this.secure = secure;
-		this.httpOnly = httpOnly;
-	}
-
-	@Override
-	public String getComment() {
-		// TODO remove.
-		// return this.comment;
-		return null;
-	}
-
-	public Date getExpires() {
-		return this.expires;
-	}
-
-	@Override
-	public String getDomain() {
-		return this.domain;
-	}
-
-	@Override
-	public int getMaxAge() {
-		return this.maxAge;
-	}
-
-	@Override
-	public String getName() {
-		return this.name;
-	}
-
-	@Override
-	public String getPath() {
-		return this.path;
-	}
-
-	@Override
-	public String getValue() {
-		return this.value;
-	}
-
-	@Override
-	public int getVersion() {
-		// TODO remove
-		return -1;
-	}
-
-	@Override
-	public boolean isSecure() {
-		return this.secure;
-	}
-
-	public boolean isHttpOnly() {
-		return this.httpOnly;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder b = new StringBuilder();
-		b.append(getName()).append('=');
-		appendQuotedIfWhitespace(b, getValue());
-		if (getPath() != null) {
-			b.append(";Path=");
-			appendQuotedIfWhitespace(b, getPath());
-		}
-		if (getDomain() != null) {
-			b.append(";Domain=");
-			appendQuotedIfWhitespace(b, getDomain());
-		}
-		if (getExpires() != null) {
-			b.append(";Expires=");
-			// RFC 2616
-			SimpleDateFormat formatter = new SimpleDateFormat(
-					"EEE, dd MMM yyyy HH:mm:ss zzz");
-			appendQuotedIfWhitespace(b, formatter.format(getExpires()));
-		}
-		if (getMaxAge() > 0) {
-			b.append(";Max-Age=");
-			appendQuotedIfWhitespace(b, String.valueOf(getMaxAge()));
-		}
-		if (isSecure()) {
-			b.append(";Secure");
-		}
-		if (isHttpOnly()) {
-			b.append(";HttpOnly");
-		}
-		return b.toString();
-	}
-
-	public static void appendQuotedIfWhitespace(StringBuilder b, String value) {
-		if (value == null)
-			return;
-		boolean quote = containsWhiteSpace(value);
-		if (quote)
-			b.append('"');
-		appendEscapingQuotes(b, value);
-		if (quote)
-			b.append('"');
-	}
-
-	public static boolean containsWhiteSpace(String s) {
-		for (char c : s.toCharArray()) {
-			if (isWhiteSpace(c)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static boolean isWhiteSpace(char c) {
-		return (c < 128 && (c == '\t' || c == '\r' || c == '\n' || c == ' '));
-	}
-
-	public static void appendEscapingQuotes(StringBuilder b, String value) {
-		for (int i = 0; i < value.length(); i++) {
-			char c = value.charAt(i);
-			if (c == '"')
-				b.append('\\');
-			b.append(c);
-		}
-	}
+    private final String name;
+    private final String value;
+    private final String domain;
+    private final String path;
+    private final Date expires;
+    private final int maxAge;
+    private final boolean secure;
+    private final boolean httpOnly;
+
+    public DefaultCookie(String name, String value) {
+        this(name, value, null, null, null, -1, false, false);
+    }
+
+    public DefaultCookie(String name, String value, String domain, String path, Date expires, int maxAge,
+            boolean secure, boolean httpOnly) {
+        super();
+        this.name = name;
+        this.value = value;
+        this.domain = domain;
+        this.path = path;
+        this.expires = expires;
+        this.maxAge = maxAge;
+        this.secure = secure;
+        this.httpOnly = httpOnly;
+    }
+
+    @Override
+    public String getComment() {
+        // TODO remove.
+        // return this.comment;
+        return null;
+    }
+
+    public Date getExpires() {
+        return this.expires;
+    }
+
+    @Override
+    public String getDomain() {
+        return this.domain;
+    }
+
+    @Override
+    public int getMaxAge() {
+        return this.maxAge;
+    }
+
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    @Override
+    public String getPath() {
+        return this.path;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public int getVersion() {
+        // TODO remove
+        return -1;
+    }
+
+    @Override
+    public boolean isSecure() {
+        return this.secure;
+    }
+
+    public boolean isHttpOnly() {
+        return this.httpOnly;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder b = new StringBuilder();
+        b.append(getName()).append('=');
+        appendQuotedIfWhitespace(b, getValue());
+        if (getPath() != null) {
+            b.append(";Path=");
+            appendQuotedIfWhitespace(b, getPath());
+        }
+        if (getDomain() != null) {
+            b.append(";Domain=");
+            appendQuotedIfWhitespace(b, getDomain());
+        }
+        if (getExpires() != null) {
+            b.append(";Expires=");
+            // RFC 2616
+            SimpleDateFormat formatter = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz");
+            appendQuotedIfWhitespace(b, formatter.format(getExpires()));
+        }
+        if (getMaxAge() > 0) {
+            b.append(";Max-Age=");
+            appendQuotedIfWhitespace(b, String.valueOf(getMaxAge()));
+        }
+        if (isSecure()) {
+            b.append(";Secure");
+        }
+        if (isHttpOnly()) {
+            b.append(";HttpOnly");
+        }
+        return b.toString();
+    }
+
+    public static void appendQuotedIfWhitespace(StringBuilder b, String value) {
+        if (value == null)
+            return;
+        boolean quote = containsWhiteSpace(value);
+        if (quote)
+            b.append('"');
+        appendEscapingQuotes(b, value);
+        if (quote)
+            b.append('"');
+    }
+
+    public static boolean containsWhiteSpace(String s) {
+        for (char c : s.toCharArray()) {
+            if (isWhiteSpace(c)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isWhiteSpace(char c) {
+        return (c < 128 && (c == '\t' || c == '\r' || c == '\n' || c == ' '));
+    }
+
+    public static void appendEscapingQuotes(StringBuilder b, String value) {
+        for (int i = 0; i < value.length(); i++) {
+            char c = value.charAt(i);
+            if (c == '"')
+                b.append('\\');
+            b.append(c);
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultExceptionHandler.java b/src/main/java/org/analogweb/core/DefaultExceptionHandler.java
index fe653c1..c04884f 100644
--- a/src/main/java/org/analogweb/core/DefaultExceptionHandler.java
+++ b/src/main/java/org/analogweb/core/DefaultExceptionHandler.java
@@ -16,86 +16,85 @@
 
 /**
  * Default {@link ExceptionHandler} implementation.
- * 
+ *
  * @author snowgoose
  */
 public class DefaultExceptionHandler implements ExceptionHandler, ModulesAware {
 
-	protected static final Log log = Logs.getLog(DefaultExceptionHandler.class);
-	private List<ExceptionMapper> mappers;
+    protected static final Log log = Logs.getLog(DefaultExceptionHandler.class);
+    private List<ExceptionMapper> mappers;
 
-	@Override
-	public Object handleException(Exception exception) {
-		Object result = verifyException(exception);
-		if (result != null) {
-			return result;
-		}
-		result = verifyCause(exception);
-		if (result != null) {
-			return result;
-		}
-		logThrowable(exception);
-		return internalServerError(exception);
-	}
+    @Override
+    public Object handleException(Exception exception) {
+        Object result = verifyException(exception);
+        if (result != null) {
+            return result;
+        }
+        result = verifyCause(exception);
+        if (result != null) {
+            return result;
+        }
+        logThrowable(exception);
+        return internalServerError(exception);
+    }
 
-	protected Object internalServerError(Exception e) {
-		return HttpStatus.INTERNAL_SERVER_ERROR
-				.byReasonOf(stackTraceToString(e));
-	}
+    protected Object internalServerError(Exception e) {
+        return HttpStatus.INTERNAL_SERVER_ERROR.byReasonOf(stackTraceToString(e));
+    }
 
-	private String stackTraceToString(Exception e) {
-		StringWriter s = new StringWriter();
-		PrintWriter p = new PrintWriter(s);
-		e.printStackTrace(p);
-		p.flush();
-		return s.toString();
-	}
+    private String stackTraceToString(Exception e) {
+        StringWriter s = new StringWriter();
+        PrintWriter p = new PrintWriter(s);
+        e.printStackTrace(p);
+        p.flush();
+        return s.toString();
+    }
 
-	protected Object verifyCause(Exception exception) {
-		Throwable cause = exception.getCause();
-		while (cause != null) {
-			Object result = handleMappers(cause);
-			if (result != null) {
-				return result;
-			}
-			cause = cause.getCause();
-		}
-		return null;
-	}
+    protected Object verifyCause(Exception exception) {
+        Throwable cause = exception.getCause();
+        while (cause != null) {
+            Object result = handleMappers(cause);
+            if (result != null) {
+                return result;
+            }
+            cause = cause.getCause();
+        }
+        return null;
+    }
 
-	protected Object verifyException(Throwable exception) {
-		if (exception == null) {
-			return null;
-		}
-		return handleMappers(exception);
-	}
+    protected Object verifyException(Throwable exception) {
+        if (exception == null) {
+            return null;
+        }
+        return handleMappers(exception);
+    }
 
-	private Object handleMappers(Throwable t) {
-		for (ExceptionMapper mapper : getExceptionMappers()) {
-			Object result;
-			if (mapper.isMatch(t) && (result = mapper.mapToResult(t)) != null) {
-				return result;
-			}
-		}
-		return null;
-	}
+    private Object handleMappers(Throwable t) {
+        for (ExceptionMapper mapper : getExceptionMappers()) {
+            Object result;
+            if (mapper.isMatch(t) && (result = mapper.mapToResult(t)) != null) {
+                return result;
+            }
+        }
+        return null;
+    }
 
-	protected List<ExceptionMapper> getExceptionMappers() {
-		return Collections.unmodifiableList(this.mappers);
-	}
+    protected List<ExceptionMapper> getExceptionMappers() {
+        return Collections.unmodifiableList(this.mappers);
+    }
 
-	protected void logThrowable(Exception exception) {
-		log.warn(exception.toString());
-	}
+    protected void logThrowable(Exception exception) {
+        log.warn(exception.toString());
+    }
 
-	@Override
-	public void dispose() {
-		this.mappers.clear();
-	}
+    @Override
+    public void dispose() {
+        this.mappers.clear();
+    }
 
-	@Override
-	public void setModules(Modules modules) {
-		this.mappers = new ArrayList<ExceptionMapper>();
-		this.mappers.addAll(modules.getExceptionMappers());
-	}
+    @Override
+    public void setModules(Modules modules) {
+        this.mappers = new ArrayList<ExceptionMapper>();
+        this.mappers.addAll(modules.getExceptionMappers());
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultInvocation.java b/src/main/java/org/analogweb/core/DefaultInvocation.java
index 6624177..52a4656 100644
--- a/src/main/java/org/analogweb/core/DefaultInvocation.java
+++ b/src/main/java/org/analogweb/core/DefaultInvocation.java
@@ -20,93 +20,90 @@
  */
 public class DefaultInvocation implements Invocation, InvocationArguments {
 
-	private Object invocationInstance;
-	private final InvocationMetadata metadata;
-	private final RequestContext requestContext;
-	private final ResponseContext responseContext;
-	private final TreeMap<Integer, Object> preparedArgsMap;
-	private List<Object> argumentList;
+    private Object invocationInstance;
+    private final InvocationMetadata metadata;
+    private final RequestContext requestContext;
+    private final ResponseContext responseContext;
+    private final TreeMap<Integer, Object> preparedArgsMap;
+    private List<Object> argumentList;
 
-	public DefaultInvocation(Object invocationInstance,
-			InvocationMetadata metadata, RequestContext context,
-			ResponseContext responseContext) {
-		this.invocationInstance = invocationInstance;
-		this.metadata = metadata;
-		this.requestContext = context;
-		this.responseContext = responseContext;
-		this.preparedArgsMap = Maps.newTreeMap();
-	}
+    public DefaultInvocation(Object invocationInstance, InvocationMetadata metadata, RequestContext context,
+            ResponseContext responseContext) {
+        this.invocationInstance = invocationInstance;
+        this.metadata = metadata;
+        this.requestContext = context;
+        this.responseContext = responseContext;
+        this.preparedArgsMap = Maps.newTreeMap();
+    }
 
-	@Override
-	public Object invoke() throws InvocationFailureException {
-		Object[] args = asList().toArray(new Object[argumentList.size()]);
-		try {
-			Method method = ReflectionUtils.getInvocationMethod(metadata);
-			if (method == null) {
-				throw new InvocationFailureException(
-						new NoSuchMethodException(), metadata, args);
-			}
-			return method.invoke(invocationInstance, args);
-		} catch (IllegalArgumentException e) {
-			throw new InvocationFailureException(e, metadata, args);
-		} catch (IllegalAccessException e) {
-			throw new InvocationFailureException(e, metadata, args);
-		} catch (InvocationTargetException e) {
-			Throwable th = e.getCause();
-			throw new InvocationFailureException(th, metadata, args);
-		}
-	}
+    @Override
+    public Object invoke() throws InvocationFailureException {
+        Object[] args = asList().toArray(new Object[argumentList.size()]);
+        try {
+            Method method = ReflectionUtils.getInvocationMethod(metadata);
+            if (method == null) {
+                throw new InvocationFailureException(new NoSuchMethodException(), metadata, args);
+            }
+            return method.invoke(invocationInstance, args);
+        } catch (IllegalArgumentException e) {
+            throw new InvocationFailureException(e, metadata, args);
+        } catch (IllegalAccessException e) {
+            throw new InvocationFailureException(e, metadata, args);
+        } catch (InvocationTargetException e) {
+            Throwable th = e.getCause();
+            throw new InvocationFailureException(th, metadata, args);
+        }
+    }
 
-	@Override
-	public Object getInvocationInstance() {
-		return invocationInstance;
-	}
+    @Override
+    public Object getInvocationInstance() {
+        return invocationInstance;
+    }
 
-	protected Map<Integer, Object> getPreparedArgs() {
-		return this.preparedArgsMap;
-	}
+    protected Map<Integer, Object> getPreparedArgs() {
+        return this.preparedArgsMap;
+    }
 
-	@Override
-	public void putInvocationArgument(int index, Object arg) {
-		this.preparedArgsMap.put(index, arg);
-	}
+    @Override
+    public void putInvocationArgument(int index, Object arg) {
+        this.preparedArgsMap.put(index, arg);
+    }
 
-	protected InvocationMetadata getMetadata() {
-		return metadata;
-	}
+    protected InvocationMetadata getMetadata() {
+        return metadata;
+    }
 
-	protected RequestContext getRequestContext() {
-		return requestContext;
-	}
+    protected RequestContext getRequestContext() {
+        return requestContext;
+    }
 
-	protected ResponseContext getResponseContext() {
-		return this.responseContext;
-	}
+    protected ResponseContext getResponseContext() {
+        return this.responseContext;
+    }
 
-	@Override
-	public List<Object> asList() {
-		if (this.argumentList == null) {
-			this.argumentList = new ArrayList<Object>();
-			Map<Integer, Object> preparedArgs = getPreparedArgs();
-			for (int argumentIndex = 0; argumentIndex < getMetadata()
-					.getArgumentTypes().length; argumentIndex++) {
-				if (preparedArgs.containsKey(argumentIndex)) {
-					argumentList.add(preparedArgs.get(argumentIndex));
-				} else {
-					argumentList.add((Object) null);
-				}
-			}
-		}
-		return argumentList;
-	}
+    @Override
+    public List<Object> asList() {
+        if (this.argumentList == null) {
+            this.argumentList = new ArrayList<Object>();
+            Map<Integer, Object> preparedArgs = getPreparedArgs();
+            for (int argumentIndex = 0; argumentIndex < getMetadata().getArgumentTypes().length; argumentIndex++) {
+                if (preparedArgs.containsKey(argumentIndex)) {
+                    argumentList.add(preparedArgs.get(argumentIndex));
+                } else {
+                    argumentList.add((Object) null);
+                }
+            }
+        }
+        return argumentList;
+    }
 
-	@Override
-	public void replace(Object newInvocationInstance) {
-		this.invocationInstance = newInvocationInstance;
-	}
+    @Override
+    public void replace(Object newInvocationInstance) {
+        this.invocationInstance = newInvocationInstance;
+    }
 
-	@Override
-	public InvocationArguments getInvocationArguments() {
-		return this;
-	}
+    @Override
+    public InvocationArguments getInvocationArguments() {
+        return this;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultInvocationFactory.java b/src/main/java/org/analogweb/core/DefaultInvocationFactory.java
index aadfa93..72140a4 100644
--- a/src/main/java/org/analogweb/core/DefaultInvocationFactory.java
+++ b/src/main/java/org/analogweb/core/DefaultInvocationFactory.java
@@ -24,55 +24,45 @@
  */
 public class DefaultInvocationFactory implements InvocationFactory {
 
-	private static final Log log = Logs.getLog(DefaultInvocationFactory.class);
+    private static final Log log = Logs.getLog(DefaultInvocationFactory.class);
 
-	@Override
-	public Invocation createInvocation(ContainerAdaptor instanceProvider,
-			InvocationMetadata metadata, RequestContext context,
-			ResponseContext responseContext, TypeMapperContext converters,
-			RequestValueResolvers handlers) {
-		Object invocationInstance = resolveInvocationInstance(instanceProvider,
-				metadata, context);
-		if (invocationInstance == null) {
-			invocationInstance = resolveByDefault(metadata, context,
-					responseContext, converters, handlers);
-			if (invocationInstance == null) {
-				throw new UnresolvableInvocationException(metadata);
-			}
-		}
-		log.log(Markers.LIFECYCLE, "DL000001", invocationInstance,
-				instanceProvider);
-		return new DefaultInvocation(invocationInstance, metadata, context,
-				responseContext);
-	}
+    @Override
+    public Invocation createInvocation(ContainerAdaptor instanceProvider, InvocationMetadata metadata,
+            RequestContext context, ResponseContext responseContext, TypeMapperContext converters,
+            RequestValueResolvers handlers) {
+        Object invocationInstance = resolveInvocationInstance(instanceProvider, metadata, context);
+        if (invocationInstance == null) {
+            invocationInstance = resolveByDefault(metadata, context, responseContext, converters, handlers);
+            if (invocationInstance == null) {
+                throw new UnresolvableInvocationException(metadata);
+            }
+        }
+        log.log(Markers.LIFECYCLE, "DL000001", invocationInstance, instanceProvider);
+        return new DefaultInvocation(invocationInstance, metadata, context, responseContext);
+    }
 
-	protected Object resolveByDefault(InvocationMetadata metadata,
-			RequestContext context, ResponseContext responseContext,
-			TypeMapperContext converters, RequestValueResolvers handlers) {
-		Class<?> invocationClass = metadata.getInvocationClass();
-		Constructor<?>[] crs = invocationClass.getConstructors();
-		if (ArrayUtils.isEmpty(crs)) {
-			return ReflectionUtils.getInstanceQuietly(invocationClass);
-		}
-		Constructor<?> firstConstructor = crs[0];
-		Annotation[][] ans = firstConstructor.getParameterAnnotations();
-		Class<?>[] types = firstConstructor.getParameterTypes();
-		List<Object> argValues = new ArrayList<Object>();
-		for (int index = 0, limit = types.length; index < limit; index++) {
-			Class<?> type = types[index];
-			Annotation[] ann = ans[index];
-			argValues.add(AnnotatedArguments.resolveArguent(ann, type, context,
-					metadata, converters, handlers));
-		}
-		return ReflectionUtils.getInstanceQuietly(firstConstructor,
-				argValues.toArray(new Object[argValues.size()]));
-	}
+    protected Object resolveByDefault(InvocationMetadata metadata, RequestContext context,
+            ResponseContext responseContext, TypeMapperContext converters, RequestValueResolvers handlers) {
+        Class<?> invocationClass = metadata.getInvocationClass();
+        Constructor<?>[] crs = invocationClass.getConstructors();
+        if (ArrayUtils.isEmpty(crs)) {
+            return ReflectionUtils.getInstanceQuietly(invocationClass);
+        }
+        Constructor<?> firstConstructor = crs[0];
+        Annotation[][] ans = firstConstructor.getParameterAnnotations();
+        Class<?>[] types = firstConstructor.getParameterTypes();
+        List<Object> argValues = new ArrayList<Object>();
+        for (int index = 0, limit = types.length; index < limit; index++) {
+            Class<?> type = types[index];
+            Annotation[] ann = ans[index];
+            argValues.add(AnnotatedArguments.resolveArguent(ann, type, context, metadata, converters, handlers));
+        }
+        return ReflectionUtils.getInstanceQuietly(firstConstructor, argValues.toArray(new Object[argValues.size()]));
+    }
 
-	protected Object resolveInvocationInstance(
-			ContainerAdaptor instanceProvider, InvocationMetadata metadata,
-			RequestContext context) throws UnresolvableInvocationException {
-		Object invocationInstance = instanceProvider.getInstanceOfType(metadata
-				.getInvocationClass());
-		return invocationInstance;
-	}
+    protected Object resolveInvocationInstance(ContainerAdaptor instanceProvider, InvocationMetadata metadata,
+            RequestContext context) throws UnresolvableInvocationException {
+        Object invocationInstance = instanceProvider.getInstanceOfType(metadata.getInvocationClass());
+        return invocationInstance;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultInvocationMetadata.java b/src/main/java/org/analogweb/core/DefaultInvocationMetadata.java
index 7bc9616..54bb0f9 100644
--- a/src/main/java/org/analogweb/core/DefaultInvocationMetadata.java
+++ b/src/main/java/org/analogweb/core/DefaultInvocationMetadata.java
@@ -12,49 +12,48 @@
  */
 public class DefaultInvocationMetadata implements InvocationMetadata {
 
-	private final Class<?> actionClass;
-	private final String methodName;
-	private final Class<?>[] argumentType;
-	private final RequestPathMetadata definedPath;
-
-	public DefaultInvocationMetadata(Class<?> actionClass, String methodName,
-			Class<?>[] argumentType, RequestPathMetadata definedPath) {
-		super();
-		this.actionClass = actionClass;
-		this.methodName = methodName;
-		this.argumentType = ArrayUtils.clone(Class.class, argumentType);
-		this.definedPath = definedPath;
-	}
-
-	@Override
-	public Class<?> getInvocationClass() {
-		return actionClass;
-	}
-
-	@Override
-	public String getMethodName() {
-		return methodName;
-	}
-
-	@Override
-	public Class<?>[] getArgumentTypes() {
-		return ArrayUtils.clone(Class.class, argumentType);
-	}
-
-	@Override
-	public RequestPathMetadata getDefinedPath() {
-		return this.definedPath;
-	}
-
-	@Override
-	public Method resolveMethod() {
-		return ReflectionUtils.getInvocationMethod(this);
-	}
-
-	@Override
-	public String toString() {
-		return String.format(super.toString() + " on %s", getDefinedPath()
-				.toString());
-	}
+    private final Class<?> actionClass;
+    private final String methodName;
+    private final Class<?>[] argumentType;
+    private final RequestPathMetadata definedPath;
+
+    public DefaultInvocationMetadata(Class<?> actionClass, String methodName, Class<?>[] argumentType,
+            RequestPathMetadata definedPath) {
+        super();
+        this.actionClass = actionClass;
+        this.methodName = methodName;
+        this.argumentType = ArrayUtils.clone(Class.class, argumentType);
+        this.definedPath = definedPath;
+    }
+
+    @Override
+    public Class<?> getInvocationClass() {
+        return actionClass;
+    }
+
+    @Override
+    public String getMethodName() {
+        return methodName;
+    }
+
+    @Override
+    public Class<?>[] getArgumentTypes() {
+        return ArrayUtils.clone(Class.class, argumentType);
+    }
+
+    @Override
+    public RequestPathMetadata getDefinedPath() {
+        return this.definedPath;
+    }
+
+    @Override
+    public Method resolveMethod() {
+        return ReflectionUtils.getInvocationMethod(this);
+    }
+
+    @Override
+    public String toString() {
+        return String.format(super.toString() + " on %s", getDefinedPath().toString());
+    }
 
 }
diff --git a/src/main/java/org/analogweb/core/DefaultInvocationMetadataFinder.java b/src/main/java/org/analogweb/core/DefaultInvocationMetadataFinder.java
index 7a17db8..b6d47b3 100644
--- a/src/main/java/org/analogweb/core/DefaultInvocationMetadataFinder.java
+++ b/src/main/java/org/analogweb/core/DefaultInvocationMetadataFinder.java
@@ -12,39 +12,33 @@
 
 /**
  * Default implementation of {@link org.analogweb.InvocationMetadataFinder}
- * 
+ *
  * @author y2k2mt
  */
-public class DefaultInvocationMetadataFinder
-		extends
-			AbstractInvocationMetadataFinder {
+public class DefaultInvocationMetadataFinder extends AbstractInvocationMetadataFinder {
 
-	@Override
-	public InvocationMetadata find(
-			Map<RequestPathMetadata, InvocationMetadata> metadatas,
-			RequestContext request) {
-		RequestPath requestPath = request.getRequestPath();
-		// direct match
-		InvocationMetadata direct = metadatas.get(requestPath);
-		if (direct != null) {
-			return direct;
-		}
-		// pattern match
-		List<String> requireMethods = new ArrayList<String>();
-		for (Entry<RequestPathMetadata, InvocationMetadata> pathEntry : metadatas
-				.entrySet()) {
-			try {
-				if (pathEntry.getKey().match(requestPath)) {
-					return cacheable(pathEntry.getValue());
-				}
-			} catch (RequestMethodUnsupportedException e) {
-				requireMethods.addAll(e.getDefinedMethods());
-			}
-		}
-		if (!requireMethods.isEmpty()) {
-			throw new RequestMethodUnsupportedException(requestPath,
-					requireMethods, request.getRequestMethod());
-		}
-		return null;
-	}
+    @Override
+    public InvocationMetadata find(Map<RequestPathMetadata, InvocationMetadata> metadatas, RequestContext request) {
+        RequestPath requestPath = request.getRequestPath();
+        // direct match
+        InvocationMetadata direct = metadatas.get(requestPath);
+        if (direct != null) {
+            return direct;
+        }
+        // pattern match
+        List<String> requireMethods = new ArrayList<String>();
+        for (Entry<RequestPathMetadata, InvocationMetadata> pathEntry : metadatas.entrySet()) {
+            try {
+                if (pathEntry.getKey().match(requestPath)) {
+                    return cacheable(pathEntry.getValue());
+                }
+            } catch (RequestMethodUnsupportedException e) {
+                requireMethods.addAll(e.getDefinedMethods());
+            }
+        }
+        if (!requireMethods.isEmpty()) {
+            throw new RequestMethodUnsupportedException(requestPath, requireMethods, request.getRequestMethod());
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultInvoker.java b/src/main/java/org/analogweb/core/DefaultInvoker.java
index 9cfdcb1..011b258 100644
--- a/src/main/java/org/analogweb/core/DefaultInvoker.java
+++ b/src/main/java/org/analogweb/core/DefaultInvoker.java
@@ -14,21 +14,20 @@
  */
 public class DefaultInvoker implements Invoker {
 
-	private final List<InvocationInterceptor> interceptors;
+    private final List<InvocationInterceptor> interceptors;
 
-	public DefaultInvoker(List<InvocationInterceptor> interceptors) {
-		super();
-		this.interceptors = interceptors;
-	}
+    public DefaultInvoker(List<InvocationInterceptor> interceptors) {
+        super();
+        this.interceptors = interceptors;
+    }
 
-	@Override
-	public Object invoke(Invocation invocation, InvocationMetadata metadata,
-			RequestContext request, ResponseContext response) {
-		return InvocationChain.create(invocation, metadata,
-				getInvocationInterceptors()).invoke();
-	}
+    @Override
+    public Object invoke(Invocation invocation, InvocationMetadata metadata, RequestContext request,
+            ResponseContext response) {
+        return InvocationChain.create(invocation, metadata, getInvocationInterceptors()).invoke();
+    }
 
-	protected List<InvocationInterceptor> getInvocationInterceptors() {
-		return this.interceptors;
-	}
+    protected List<InvocationInterceptor> getInvocationInterceptors() {
+        return this.interceptors;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultInvokerFactory.java b/src/main/java/org/analogweb/core/DefaultInvokerFactory.java
index cb0f143..c885280 100644
--- a/src/main/java/org/analogweb/core/DefaultInvokerFactory.java
+++ b/src/main/java/org/analogweb/core/DefaultInvokerFactory.java
@@ -11,8 +11,8 @@
  */
 public class DefaultInvokerFactory implements InvokerFactory {
 
-	@Override
-	public Invoker createInvoker(List<InvocationInterceptor> interceptors) {
-		return new DefaultInvoker(interceptors);
-	}
+    @Override
+    public Invoker createInvoker(List<InvocationInterceptor> interceptors) {
+        return new DefaultInvoker(interceptors);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultModulesBuilder.java b/src/main/java/org/analogweb/core/DefaultModulesBuilder.java
index db403ce..2d64082 100644
--- a/src/main/java/org/analogweb/core/DefaultModulesBuilder.java
+++ b/src/main/java/org/analogweb/core/DefaultModulesBuilder.java
@@ -45,801 +45,731 @@
  */
 public class DefaultModulesBuilder implements ModulesBuilder {
 
-	private ContainerAdaptorFactory<? extends ContainerAdaptor> modulesProvider;
-	private Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>> modulesProviderClass;
-	private ContainerAdaptorFactory<? extends ContainerAdaptor> invocationInstanceProvider;
-	private Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>> invocationInstanceProviderClass;
-	private InvokerFactory invokerFactory;
-	private Class<? extends InvokerFactory> invokerFactoryClass;
-	private InvocationFactory invocationFactory;
-	private Class<? extends InvocationFactory> invocationFactoryClass;
-	private RenderableResolver renderableResolver;
-	private Class<? extends RenderableResolver> directionResolverClass;
-	private ResponseHandler responseHandler;
-	private Class<? extends ResponseHandler> directionHandlerClass;
-	private ExceptionHandler exceptionHandler;
-	private Class<? extends ExceptionHandler> exceptionHandlerClass;
-	private TypeMapperContext typeMapperContext;
-	private Class<? extends TypeMapperContext> typeMapperContextClass;
-	private final List<ApplicationProcessor> applicationProcessors;
-	private final List<Class<? extends ApplicationProcessor>> applicationProcessorClasses;
-	private final List<InvocationInterceptor> invocationInterceptors;
-	private final List<Class<? extends InvocationInterceptor>> invocationInterceptorClasses;
-	private final List<InvocationMetadataFactory> invocationMetadataFactories;
-	private final List<Class<? extends InvocationMetadataFactory>> invocationMetadataFactoryClasses;
-	private final List<InvocationMetadataFinder> invocationMetadataFinders;
-	private final List<Class<? extends InvocationMetadataFinder>> invocationMetadataFinderClasses;
-	private final List<AttributesHandler> attributesHandlers;
-	private final List<Class<? extends AttributesHandler>> attributesHandlerClasses;
-	private final List<RequestValueResolver> requestValueResolvers;
-	private final List<Class<? extends RequestValueResolver>> requestValueResolverClasses;
-	private final List<ExceptionMapper> exceptionMappers;
-	private final List<Class<? extends ExceptionMapper>> exceptionMapperClasses;
-	private final Map<Class<? extends Renderable>, ResponseFormatter> responseFormatters;
-	private final Map<Class<? extends Renderable>, Class<? extends ResponseFormatter>> directionFormatterClasses;
-	private final List<Class<? extends MultiModule>> ignoreClasses;
-	private final List<MultiModule.Filter> ignoreFilters;
-
-	public DefaultModulesBuilder() {
-		this.applicationProcessorClasses = new LinkedList<Class<? extends ApplicationProcessor>>();
-		this.invocationInterceptorClasses = new LinkedList<Class<? extends InvocationInterceptor>>();
-		this.invocationMetadataFactoryClasses = new LinkedList<Class<? extends InvocationMetadataFactory>>();
-		this.invocationMetadataFinderClasses = new LinkedList<Class<? extends InvocationMetadataFinder>>();
-		this.attributesHandlerClasses = new LinkedList<Class<? extends AttributesHandler>>();
-		this.requestValueResolverClasses = new LinkedList<Class<? extends RequestValueResolver>>();
-		this.exceptionMapperClasses = new LinkedList<Class<? extends ExceptionMapper>>();
-		this.directionFormatterClasses = Maps.newConcurrentHashMap();
-		this.ignoreClasses = new LinkedList<Class<? extends MultiModule>>();
-		this.ignoreFilters = new LinkedList<MultiModule.Filter>();
-		this.applicationProcessors = new LinkedList<ApplicationProcessor>();
-		this.invocationInterceptors = new LinkedList<InvocationInterceptor>();
-		this.invocationMetadataFactories = new LinkedList<InvocationMetadataFactory>();
-		this.invocationMetadataFinders = new LinkedList<InvocationMetadataFinder>();
-		this.attributesHandlers = new LinkedList<AttributesHandler>();
-		this.requestValueResolvers = new LinkedList<RequestValueResolver>();
-		this.exceptionMappers = new LinkedList<ExceptionMapper>();
-		this.responseFormatters = Maps.newConcurrentHashMap();
-	}
-
-	@Override
-	public Modules buildModules(final ApplicationContext resolver,
-			final ContainerAdaptor defaultContainer) {
-		final ContainerAdaptor moduleContainerAdaptor = createModuleContainerAdaptor(
-				resolver, defaultContainer);
-		if (moduleContainerAdaptor == null) {
-			throw new MissingModulesProviderException();
-		}
-		return new Modules() {
-
-			@Override
-			public List<InvocationMetadataFactory> getInvocationMetadataFactories() {
-				List<InvocationMetadataFactory> factories = getComponentInstances(
-						moduleContainerAdaptor,
-						getInvocationMetadataFactoryClasses());
-				factories.addAll(invocationMetadataFactories);
-				return factories;
-			}
-
-			private List<InvocationMetadataFinder> metadataFinders;
-
-			@Override
-			public List<InvocationMetadataFinder> getInvocationMetadataFinders() {
-				if (metadataFinders == null) {
-					metadataFinders = getComponentInstances(
-							moduleContainerAdaptor,
-							getInvocationMetadataFinderClasses());
-					metadataFinders.addAll(invocationMetadataFinders);
-				}
-				return this.metadataFinders;
-			}
-
-			private Invoker invoker;
-
-			@Override
-			public Invoker getInvoker() {
-				if (invoker == null) {
-					InvokerFactory factory;
-					if (invokerFactory == null) {
-						factory = getComponentInstance(moduleContainerAdaptor,
-								getInvokerFactoryClass());
-					} else {
-						factory = invokerFactory;
-					}
-					invoker = factory
-							.createInvoker(getInvocationInterceptors());
-				}
-				return invoker;
-			}
-
-			private ContainerAdaptor instanceProvider;
-
-			@Override
-			public ContainerAdaptor getInvocationInstanceProvider() {
-				if (this.instanceProvider == null) {
-					ContainerAdaptorFactory<?> factory;
-					if (invocationInstanceProvider == null) {
-						factory = moduleContainerAdaptor
-								.getInstanceOfType(getInvocationInstanceProviderClass());
-					} else {
-						factory = invocationInstanceProvider;
-					}
-					this.instanceProvider = factory
-							.createContainerAdaptor(resolver);
-				}
-				return this.instanceProvider;
-			}
-
-			private List<ApplicationProcessor> processors;
-
-			@Override
-			public List<ApplicationProcessor> getApplicationProcessors() {
-				if (this.processors == null) {
-					this.processors = getComponentInstances(
-							moduleContainerAdaptor,
-							getApplicationProcessorClasses(),
-							new PrecedenceComparator<ApplicationProcessor>());
-					this.processors.addAll(applicationProcessors);
-				}
-				return this.processors;
-			}
-
-			private List<InvocationInterceptor> interceptors;
-
-			@Override
-			public List<InvocationInterceptor> getInvocationInterceptors() {
-				if (this.interceptors == null) {
-					this.interceptors = getComponentInstances(
-							moduleContainerAdaptor,
-							getInvocationInterceptorClasses(),
-							new PrecedenceComparator<InvocationInterceptor>());
-					this.interceptors.addAll(invocationInterceptors);
-				}
-				return this.interceptors;
-			}
-
-			@Override
-			public InvocationFactory getInvocationFactory() {
-				if (invocationFactory == null) {
-					return getComponentInstance(moduleContainerAdaptor,
-							getInvocationFactoryClass());
-				} else {
-					return invocationFactory;
-				}
-			}
-
-			@Override
-			public RenderableResolver getResponseResolver() {
-				if (renderableResolver == null) {
-					return getComponentInstance(moduleContainerAdaptor,
-							getResponseResolverClass());
-				} else {
-					return renderableResolver;
-				}
-			}
-
-			@Override
-			public ResponseHandler getResponseHandler() {
-				if (responseHandler == null) {
-					return getComponentInstance(moduleContainerAdaptor,
-							getResponseHandlerClass());
-				} else {
-					return responseHandler;
-				}
-			}
-
-			@Override
-			public ExceptionHandler getExceptionHandler() {
-				if (exceptionHandler == null) {
-					return getComponentInstance(moduleContainerAdaptor,
-							getExceptionHandlerClass());
-				} else {
-					return exceptionHandler;
-				}
-			}
-
-			@Override
-			public TypeMapperContext getTypeMapperContext() {
-				if (typeMapperContext == null) {
-					return getComponentInstance(moduleContainerAdaptor,
-							getTypeMapperContextClass());
-				} else {
-					return typeMapperContext;
-				}
-			}
-
-			@Override
-			public ContainerAdaptor getModulesContainerAdaptor() {
-				return moduleContainerAdaptor;
-			}
-
-			private ContainerAdaptor getOptionalContainerAdaptor() {
-				return defaultContainer;
-			}
-
-			@Override
-			public ResponseFormatter findResponseFormatter(
-					Class<? extends Renderable> mapToResponse) {
-				ResponseFormatter formatter = responseFormatters
-						.get(mapToResponse);
-				if (formatter != null) {
-					return formatter;
-				}
-				Class<? extends ResponseFormatter> formatterClass = getResponseFormatterClass(mapToResponse);
-				if (formatterClass != null) {
-					return getComponentInstance(moduleContainerAdaptor,
-							formatterClass);
-				}
-				return null;
-			}
-
-			// prevent cyclic reference.
-			private Set<String> alreadyInjected;
-
-			private Set<String> getAlreadyInjectedTypeNames() {
-				if (this.alreadyInjected == null) {
-					this.alreadyInjected = new HashSet<String>();
-				}
-				return this.alreadyInjected;
-			}
-
-			private <T> T getComponentInstance(ContainerAdaptor adaptor,
-					Class<T> componentClass) {
-				Assertion.notNull(componentClass, "component-class");
-				T instance = adaptor.getInstanceOfType(componentClass);
-				if (instance == null) {
-					instance = getOptionalContainerAdaptor().getInstanceOfType(
-							componentClass);
-					if (instance == null) {
-						throw new MissingModuleException(componentClass);
-					}
-				}
-				if (instance instanceof ModulesContainerAdaptorAware) {
-					((ModulesContainerAdaptorAware) instance)
-							.setModulesContainerAdaptor(getModulesContainerAdaptor());
-				}
-				Set<String> ai = getAlreadyInjectedTypeNames();
-				if (ai.contains(componentClass.getCanonicalName()) == false
-						&& instance instanceof ModulesAware) {
-					ai.add(componentClass.getCanonicalName());
-					((ModulesAware) instance).setModules(this);
-				}
-				return instance;
-			}
-
-			private <T extends MultiModule> List<T> getComponentInstances(
-					ContainerAdaptor adaptor,
-					List<Class<? extends T>> componentClasses,
-					Comparator<T> comparator) {
-				List<T> result = getComponentInstances(moduleContainerAdaptor,
-						componentClasses);
-				Collections.sort(result, comparator);
-				return result;
-			}
-
-			private <T extends MultiModule> List<T> getComponentInstances(
-					ContainerAdaptor adaptor,
-					List<Class<? extends T>> componentClasses) {
-				List<T> instances = new ArrayList<T>();
-				Set<String> instanceFQDNs = new HashSet<String>();
-				for (Class<? extends T> clazz : componentClasses) {
-					for (List<? extends T> list : Arrays.asList(
-							adaptor.getInstancesOfType(clazz),
-							getOptionalContainerAdaptor().getInstancesOfType(
-									clazz))) {
-						for (T clazzInstance : list) {
-							// filter same FQDN's instance.
-							String FQDN = clazzInstance.getClass()
-									.getCanonicalName();
-							if (instanceFQDNs.contains(FQDN) == false) {
-								if (clazzInstance instanceof ModulesContainerAdaptorAware) {
-									((ModulesContainerAdaptorAware) clazzInstance)
-											.setModulesContainerAdaptor(getModulesContainerAdaptor());
-								}
-								Set<String> ai = getAlreadyInjectedTypeNames();
-								if (ai.contains(clazz.getCanonicalName()) == false
-										&& clazzInstance instanceof ModulesAware) {
-									ai.add(clazz.getCanonicalName());
-									((ModulesAware) clazzInstance)
-											.setModules(this);
-								}
-								instances.add(clazzInstance);
-							}
-							instanceFQDNs.add(FQDN);
-						}
-					}
-				}
-				Iterator<T> itr = instances.iterator();
-				while (itr.hasNext()) {
-					T next = itr.next();
-					for (MultiModule.Filter moduleClass : getIgnoringFilters()) {
-						if (moduleClass.isAppreciable(next) == false) {
-							itr.remove();
-							break;
-						}
-					}
-				}
-				return instances;
-			}
-
-			@Override
-			public void dispose() {
-				setResponseHandlerClass(null);
-				setRenderableResolverClass(null);
-				setExceptionHandlerClass(null);
-				setInvocationFactoryClass(null);
-				setInvocationInstanceProviderClass(null);
-				setInvokerFactoryClass(null);
-				setModulesProviderClass(null);
-				setTypeMapperContextClass(null);
-				if (this.processors != null) {
-					this.processors.clear();
-					this.processors = null;
-				}
-				if (this.interceptors != null) {
-					this.interceptors.clear();
-					this.interceptors = null;
-				}
-				if (this.alreadyInjected != null) {
-					this.alreadyInjected.clear();
-					this.alreadyInjected = null;
-				}
-			}
-
-			private RequestValueResolvers resolvers;
-
-			@Override
-			public RequestValueResolvers getRequestValueResolvers() {
-				if (this.resolvers == null) {
-					List<RequestValueResolver> resolverList = new LinkedList<RequestValueResolver>();
-					resolverList.addAll(requestValueResolvers);
-					resolverList.addAll(getComponentInstances(
-							moduleContainerAdaptor,
-							getAttributesHandlerClasses()));
-					resolverList.addAll(getComponentInstances(
-							moduleContainerAdaptor,
-							getRequestValueResolverClasses()));
-					this.resolvers = new DefaultReqestValueResolvers(
-							resolverList);
-				}
-				return resolvers;
-			}
-
-			private List<ExceptionMapper> exMappers;
-
-			@Override
-			public List<ExceptionMapper> getExceptionMappers() {
-				if (this.exMappers == null) {
-					this.exMappers = getComponentInstances(
-							moduleContainerAdaptor, getExceptionMapperClasses());
-					this.exMappers.addAll(exceptionMappers);
-				}
-				return this.exMappers;
-			}
-		};
-	}
-
-	protected ContainerAdaptor createModuleContainerAdaptor(
-			final ApplicationContext resolver,
-			final ContainerAdaptor defaultContainer) {
-		if (modulesProvider != null) {
-			return modulesProvider.createContainerAdaptor(resolver);
-		}
-		Assertion.notNull(getModulesProviderClass(), "ModulesProviderClass");
-		if (getModulesProviderClass().equals(
-				StaticMappingContainerAdaptorFactory.class)) {
-			return defaultContainer;
-		} else {
-			ContainerAdaptorFactory<? extends ContainerAdaptor> factory = ReflectionUtils
-					.getInstanceQuietly(getModulesProviderClass());
-			return factory.createContainerAdaptor(resolver);
-		}
-	}
-
-	@Override
-	public ModulesBuilder setModulesProviderClass(
-			Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>> modulesProviderClass) {
-		this.modulesProviderClass = modulesProviderClass;
-		return this;
-	}
-
-	// TODO:implement.
-	@Override
-	public ModulesBuilder setModulesProvider(
-			ContainerAdaptorFactory<? extends ContainerAdaptor> modulesProvider) {
-		this.modulesProvider = modulesProvider;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addInvocationMetadataFactoriesClass(
-			Class<? extends InvocationMetadataFactory> actionMethodMetadataFactoryClass) {
-		this.invocationMetadataFactoryClasses
-				.add(actionMethodMetadataFactoryClass);
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addInvocationMetadataFactories(
-			InvocationMetadataFactory... invocationMetadataFactories) {
-		this.invocationMetadataFactories.addAll(Arrays
-				.asList(invocationMetadataFactories));
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addInvocationMetadataFinderClass(
-			Class<? extends InvocationMetadataFinder> actionMethodMetadataFinderClass) {
-		this.invocationMetadataFinderClasses
-				.add(actionMethodMetadataFinderClass);
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addInvocationMetadataFinder(
-			InvocationMetadataFinder... invocationMetadataFinder) {
-		this.invocationMetadataFinders.addAll(Arrays
-				.asList(invocationMetadataFinder));
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder setInvokerFactoryClass(
-			Class<? extends InvokerFactory> invokerFactoryClass) {
-		this.invokerFactoryClass = invokerFactoryClass;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder setInvokerFactory(InvokerFactory invokerFactory) {
-		this.invokerFactory = invokerFactory;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder setInvocationInstanceProviderClass(
-			Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>> actionInstanceProviderClass) {
-		this.invocationInstanceProviderClass = actionInstanceProviderClass;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder setInvocationInstanceProvider(
-			ContainerAdaptorFactory<? extends ContainerAdaptor> invocationInstanceProvider) {
-		this.invocationInstanceProvider = invocationInstanceProvider;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder setInvocationFactoryClass(
-			Class<? extends InvocationFactory> actionInvocationFactoryClass) {
-		this.invocationFactoryClass = actionInvocationFactoryClass;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder setInvocationFactory(
-			InvocationFactory invocationFactory) {
-		this.invocationFactory = invocationFactory;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder setRenderableResolverClass(
-			Class<? extends RenderableResolver> actionResultResolverClass) {
-		this.directionResolverClass = actionResultResolverClass;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder setRenderableResolver(
-			RenderableResolver responseResolver) {
-		this.renderableResolver = renderableResolver;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder setResponseHandlerClass(
-			Class<? extends ResponseHandler> actionResultHandlerClass) {
-		this.directionHandlerClass = actionResultHandlerClass;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder setResponseHandler(ResponseHandler responseHandler) {
-		this.responseHandler = responseHandler;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder setTypeMapperContextClass(
-			Class<? extends TypeMapperContext> typeMapperContextClass) {
-		this.typeMapperContextClass = typeMapperContextClass;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder setTypeMapperContext(
-			TypeMapperContext typeMapperContext) {
-		this.typeMapperContext = typeMapperContext;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder setExceptionHandlerClass(
-			Class<? extends ExceptionHandler> exceptionHandlerClass) {
-		this.exceptionHandlerClass = exceptionHandlerClass;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder setExceptionHandler(ExceptionHandler exceptionHandler) {
-		this.exceptionHandler = exceptionHandler;
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addApplicationProcessorClass(
-			Class<? extends ApplicationProcessor> applicationProcessorClass) {
-		this.applicationProcessorClasses.add(applicationProcessorClass);
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addApplicationProcessor(
-			ApplicationProcessor... applicationProcessors) {
-		this.applicationProcessors.addAll(Arrays.asList(applicationProcessors));
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addInvocationInterceptorClass(
-			Class<? extends InvocationInterceptor> invocationInterceptorClass) {
-		this.invocationInterceptorClasses.add(invocationInterceptorClass);
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addInvocationInterceptor(
-			InvocationInterceptor... invocationInterceptors) {
-		this.invocationInterceptors.addAll(Arrays
-				.asList(invocationInterceptors));
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder clearInvocationInterceptorClass() {
-		this.invocationInterceptorClasses.clear();
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder clearInvocationInterceptors() {
-		this.invocationInterceptors.clear();
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addAttributesHandlerClass(
-			Class<? extends AttributesHandler> requestAttributesResolverClass) {
-		this.attributesHandlerClasses.add(requestAttributesResolverClass);
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addAttributesHandler(
-			AttributesHandler... attributesHandler) {
-		this.attributesHandlers.addAll(Arrays.asList(attributesHandler));
-		return this;
-	}
-
-	protected Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>> getModulesProviderClass() {
-		return this.modulesProviderClass;
-	}
-
-	protected List<Class<? extends InvocationMetadataFactory>> getInvocationMetadataFactoryClasses() {
-		return this.invocationMetadataFactoryClasses;
-	}
-
-	protected List<Class<? extends InvocationMetadataFinder>> getInvocationMetadataFinderClasses() {
-		return this.invocationMetadataFinderClasses;
-	}
-
-	protected Class<? extends InvokerFactory> getInvokerFactoryClass() {
-		return this.invokerFactoryClass;
-	}
-
-	protected Class<? extends ContainerAdaptorFactory<?>> getInvocationInstanceProviderClass() {
-		return this.invocationInstanceProviderClass;
-	}
-
-	protected Class<? extends InvocationFactory> getInvocationFactoryClass() {
-		return this.invocationFactoryClass;
-	}
-
-	protected Class<? extends RenderableResolver> getResponseResolverClass() {
-		return this.directionResolverClass;
-	}
-
-	protected Class<? extends ResponseHandler> getResponseHandlerClass() {
-		return this.directionHandlerClass;
-	}
-
-	protected Class<? extends ExceptionHandler> getExceptionHandlerClass() {
-		return this.exceptionHandlerClass;
-	}
-
-	protected Class<? extends TypeMapperContext> getTypeMapperContextClass() {
-		return this.typeMapperContextClass;
-	}
-
-	protected List<Class<? extends InvocationInterceptor>> getInvocationInterceptorClasses() {
-		return this.invocationInterceptorClasses;
-	}
-
-	protected List<Class<? extends ApplicationProcessor>> getApplicationProcessorClasses() {
-		return this.applicationProcessorClasses;
-	}
-
-	protected List<Class<? extends AttributesHandler>> getAttributesHandlerClasses() {
-		return attributesHandlerClasses;
-	}
-
-	protected List<Class<? extends RequestValueResolver>> getRequestValueResolverClasses() {
-		return this.requestValueResolverClasses;
-	}
-
-	protected Class<? extends ResponseFormatter> getResponseFormatterClass(
-			Class<? extends Renderable> mapToResponse) {
-		return this.directionFormatterClasses.get(mapToResponse);
-	}
-
-	protected List<Class<? extends ExceptionMapper>> getExceptionMapperClasses() {
-		return this.exceptionMapperClasses;
-	}
-
-	protected List<Class<? extends MultiModule>> getIgnoringClasses() {
-		return this.ignoreClasses;
-	}
-
-	protected List<MultiModule.Filter> getIgnoringFilters() {
-		return this.ignoreFilters;
-	}
-
-	@Override
-	public ModulesBuilder clearInvocationMetadataFactoriesClass() {
-		this.invocationMetadataFactoryClasses.clear();
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder clearInvocationMetadataFactories() {
-		this.invocationMetadataFactories.clear();
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder clearInvocationMetadataFinderClass() {
-		this.invocationMetadataFinderClasses.clear();
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder clearInvocationMetadataFinder() {
-		this.invocationMetadataFinders.clear();
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder clearApplicationProcessorClass() {
-		this.applicationProcessorClasses.clear();
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder clearApplicationProcessors() {
-		this.applicationProcessors.clear();
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder clearAttributesHanderClass() {
-		this.attributesHandlerClasses.clear();
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder clearAttributesHanders() {
-		this.attributesHandlers.clear();
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addRequestValueResolverClass(
-			Class<? extends RequestValueResolver> requestValueResolverClass) {
-		this.requestValueResolverClasses.add(requestValueResolverClass);
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addRequestValueResolver(
-			RequestValueResolver... requestValueResolver) {
-		this.requestValueResolvers.addAll(Arrays.asList(requestValueResolver));
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder clearRequestValueResolverClass() {
-		this.requestValueResolverClasses.clear();
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder clearRequestValueResolvers() {
-		this.requestValueResolvers.clear();
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addResponseFormatterClass(
-			Class<? extends Renderable> mapToResponseClass,
-			Class<? extends ResponseFormatter> directionFormatterClass) {
-		this.directionFormatterClasses.put(mapToResponseClass,
-				directionFormatterClass);
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addResponseFormatters(
-			Class<? extends Renderable> mapToResponseClass,
-			ResponseFormatter... responseFormatters) {
-		for (ResponseFormatter responseFormatter : responseFormatters) {
-			this.responseFormatters.put(mapToResponseClass, responseFormatter);
-		}
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addExceptionMapperClass(
-			Class<? extends ExceptionMapper> exceptionMapperClass) {
-		this.exceptionMapperClasses.add(exceptionMapperClass);
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder addExceptionMapper(
-			ExceptionMapper... exceptionMappers) {
-		this.exceptionMappers.addAll(Arrays.asList(exceptionMappers));
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder clearDirectionFormatterClass() {
-		this.directionFormatterClasses.clear();
-		return this;
-	}
-
-	@Override
-	public ModulesBuilder ignore(
-			final Class<? extends MultiModule> multiModuleClass) {
-		Assertion.notNull(multiModuleClass,
-				MultiModule.class.getCanonicalName());
-		return filter(new MultiModule.Filter() {
-
-			@Override
-			public <T extends MultiModule> boolean isAppreciable(T aMultiModule) {
-				if (multiModuleClass.isInstance(aMultiModule)) {
-					return false;
-				}
-				return true;
-			}
-		});
-	}
-
-	@Override
-	public ModulesBuilder filter(MultiModule.Filter multiModuleFilter) {
-		Assertion.notNull(multiModuleFilter,
-				MultiModule.Filter.class.getCanonicalName());
-		this.ignoreFilters.add(multiModuleFilter);
-		return this;
-	}
+    private ContainerAdaptorFactory<? extends ContainerAdaptor> modulesProvider;
+    private Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>> modulesProviderClass;
+    private ContainerAdaptorFactory<? extends ContainerAdaptor> invocationInstanceProvider;
+    private Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>> invocationInstanceProviderClass;
+    private InvokerFactory invokerFactory;
+    private Class<? extends InvokerFactory> invokerFactoryClass;
+    private InvocationFactory invocationFactory;
+    private Class<? extends InvocationFactory> invocationFactoryClass;
+    private RenderableResolver renderableResolver;
+    private Class<? extends RenderableResolver> directionResolverClass;
+    private ResponseHandler responseHandler;
+    private Class<? extends ResponseHandler> directionHandlerClass;
+    private ExceptionHandler exceptionHandler;
+    private Class<? extends ExceptionHandler> exceptionHandlerClass;
+    private TypeMapperContext typeMapperContext;
+    private Class<? extends TypeMapperContext> typeMapperContextClass;
+    private final List<ApplicationProcessor> applicationProcessors;
+    private final List<Class<? extends ApplicationProcessor>> applicationProcessorClasses;
+    private final List<InvocationInterceptor> invocationInterceptors;
+    private final List<Class<? extends InvocationInterceptor>> invocationInterceptorClasses;
+    private final List<InvocationMetadataFactory> invocationMetadataFactories;
+    private final List<Class<? extends InvocationMetadataFactory>> invocationMetadataFactoryClasses;
+    private final List<InvocationMetadataFinder> invocationMetadataFinders;
+    private final List<Class<? extends InvocationMetadataFinder>> invocationMetadataFinderClasses;
+    private final List<AttributesHandler> attributesHandlers;
+    private final List<Class<? extends AttributesHandler>> attributesHandlerClasses;
+    private final List<RequestValueResolver> requestValueResolvers;
+    private final List<Class<? extends RequestValueResolver>> requestValueResolverClasses;
+    private final List<ExceptionMapper> exceptionMappers;
+    private final List<Class<? extends ExceptionMapper>> exceptionMapperClasses;
+    private final Map<Class<? extends Renderable>, ResponseFormatter> responseFormatters;
+    private final Map<Class<? extends Renderable>, Class<? extends ResponseFormatter>> directionFormatterClasses;
+    private final List<Class<? extends MultiModule>> ignoreClasses;
+    private final List<MultiModule.Filter> ignoreFilters;
+
+    public DefaultModulesBuilder() {
+        this.applicationProcessorClasses = new LinkedList<Class<? extends ApplicationProcessor>>();
+        this.invocationInterceptorClasses = new LinkedList<Class<? extends InvocationInterceptor>>();
+        this.invocationMetadataFactoryClasses = new LinkedList<Class<? extends InvocationMetadataFactory>>();
+        this.invocationMetadataFinderClasses = new LinkedList<Class<? extends InvocationMetadataFinder>>();
+        this.attributesHandlerClasses = new LinkedList<Class<? extends AttributesHandler>>();
+        this.requestValueResolverClasses = new LinkedList<Class<? extends RequestValueResolver>>();
+        this.exceptionMapperClasses = new LinkedList<Class<? extends ExceptionMapper>>();
+        this.directionFormatterClasses = Maps.newConcurrentHashMap();
+        this.ignoreClasses = new LinkedList<Class<? extends MultiModule>>();
+        this.ignoreFilters = new LinkedList<MultiModule.Filter>();
+        this.applicationProcessors = new LinkedList<ApplicationProcessor>();
+        this.invocationInterceptors = new LinkedList<InvocationInterceptor>();
+        this.invocationMetadataFactories = new LinkedList<InvocationMetadataFactory>();
+        this.invocationMetadataFinders = new LinkedList<InvocationMetadataFinder>();
+        this.attributesHandlers = new LinkedList<AttributesHandler>();
+        this.requestValueResolvers = new LinkedList<RequestValueResolver>();
+        this.exceptionMappers = new LinkedList<ExceptionMapper>();
+        this.responseFormatters = Maps.newConcurrentHashMap();
+    }
+
+    @Override
+    public Modules buildModules(final ApplicationContext resolver, final ContainerAdaptor defaultContainer) {
+        final ContainerAdaptor moduleContainerAdaptor = createModuleContainerAdaptor(resolver, defaultContainer);
+        if (moduleContainerAdaptor == null) {
+            throw new MissingModulesProviderException();
+        }
+        return new Modules() {
+
+            @Override
+            public List<InvocationMetadataFactory> getInvocationMetadataFactories() {
+                List<InvocationMetadataFactory> factories = getComponentInstances(moduleContainerAdaptor,
+                        getInvocationMetadataFactoryClasses());
+                factories.addAll(invocationMetadataFactories);
+                return factories;
+            }
+
+            private List<InvocationMetadataFinder> metadataFinders;
+
+            @Override
+            public List<InvocationMetadataFinder> getInvocationMetadataFinders() {
+                if (metadataFinders == null) {
+                    metadataFinders = getComponentInstances(moduleContainerAdaptor,
+                            getInvocationMetadataFinderClasses());
+                    metadataFinders.addAll(invocationMetadataFinders);
+                }
+                return this.metadataFinders;
+            }
+
+            private Invoker invoker;
+
+            @Override
+            public Invoker getInvoker() {
+                if (invoker == null) {
+                    InvokerFactory factory;
+                    if (invokerFactory == null) {
+                        factory = getComponentInstance(moduleContainerAdaptor, getInvokerFactoryClass());
+                    } else {
+                        factory = invokerFactory;
+                    }
+                    invoker = factory.createInvoker(getInvocationInterceptors());
+                }
+                return invoker;
+            }
+
+            private ContainerAdaptor instanceProvider;
+
+            @Override
+            public ContainerAdaptor getInvocationInstanceProvider() {
+                if (this.instanceProvider == null) {
+                    ContainerAdaptorFactory<?> factory;
+                    if (invocationInstanceProvider == null) {
+                        factory = moduleContainerAdaptor.getInstanceOfType(getInvocationInstanceProviderClass());
+                    } else {
+                        factory = invocationInstanceProvider;
+                    }
+                    this.instanceProvider = factory.createContainerAdaptor(resolver);
+                }
+                return this.instanceProvider;
+            }
+
+            private List<ApplicationProcessor> processors;
+
+            @Override
+            public List<ApplicationProcessor> getApplicationProcessors() {
+                if (this.processors == null) {
+                    this.processors = getComponentInstances(moduleContainerAdaptor, getApplicationProcessorClasses(),
+                            new PrecedenceComparator<ApplicationProcessor>());
+                    this.processors.addAll(applicationProcessors);
+                }
+                return this.processors;
+            }
+
+            private List<InvocationInterceptor> interceptors;
+
+            @Override
+            public List<InvocationInterceptor> getInvocationInterceptors() {
+                if (this.interceptors == null) {
+                    this.interceptors = getComponentInstances(moduleContainerAdaptor, getInvocationInterceptorClasses(),
+                            new PrecedenceComparator<InvocationInterceptor>());
+                    this.interceptors.addAll(invocationInterceptors);
+                }
+                return this.interceptors;
+            }
+
+            @Override
+            public InvocationFactory getInvocationFactory() {
+                if (invocationFactory == null) {
+                    return getComponentInstance(moduleContainerAdaptor, getInvocationFactoryClass());
+                } else {
+                    return invocationFactory;
+                }
+            }
+
+            @Override
+            public RenderableResolver getResponseResolver() {
+                if (renderableResolver == null) {
+                    return getComponentInstance(moduleContainerAdaptor, getResponseResolverClass());
+                } else {
+                    return renderableResolver;
+                }
+            }
+
+            @Override
+            public ResponseHandler getResponseHandler() {
+                if (responseHandler == null) {
+                    return getComponentInstance(moduleContainerAdaptor, getResponseHandlerClass());
+                } else {
+                    return responseHandler;
+                }
+            }
+
+            @Override
+            public ExceptionHandler getExceptionHandler() {
+                if (exceptionHandler == null) {
+                    return getComponentInstance(moduleContainerAdaptor, getExceptionHandlerClass());
+                } else {
+                    return exceptionHandler;
+                }
+            }
+
+            @Override
+            public TypeMapperContext getTypeMapperContext() {
+                if (typeMapperContext == null) {
+                    return getComponentInstance(moduleContainerAdaptor, getTypeMapperContextClass());
+                } else {
+                    return typeMapperContext;
+                }
+            }
+
+            @Override
+            public ContainerAdaptor getModulesContainerAdaptor() {
+                return moduleContainerAdaptor;
+            }
+
+            private ContainerAdaptor getOptionalContainerAdaptor() {
+                return defaultContainer;
+            }
+
+            @Override
+            public ResponseFormatter findResponseFormatter(Class<? extends Renderable> mapToResponse) {
+                ResponseFormatter formatter = responseFormatters.get(mapToResponse);
+                if (formatter != null) {
+                    return formatter;
+                }
+                Class<? extends ResponseFormatter> formatterClass = getResponseFormatterClass(mapToResponse);
+                if (formatterClass != null) {
+                    return getComponentInstance(moduleContainerAdaptor, formatterClass);
+                }
+                return null;
+            }
+
+            // prevent cyclic reference.
+            private Set<String> alreadyInjected;
+
+            private Set<String> getAlreadyInjectedTypeNames() {
+                if (this.alreadyInjected == null) {
+                    this.alreadyInjected = new HashSet<String>();
+                }
+                return this.alreadyInjected;
+            }
+
+            private <T> T getComponentInstance(ContainerAdaptor adaptor, Class<T> componentClass) {
+                Assertion.notNull(componentClass, "component-class");
+                T instance = adaptor.getInstanceOfType(componentClass);
+                if (instance == null) {
+                    instance = getOptionalContainerAdaptor().getInstanceOfType(componentClass);
+                    if (instance == null) {
+                        throw new MissingModuleException(componentClass);
+                    }
+                }
+                if (instance instanceof ModulesContainerAdaptorAware) {
+                    ((ModulesContainerAdaptorAware) instance).setModulesContainerAdaptor(getModulesContainerAdaptor());
+                }
+                Set<String> ai = getAlreadyInjectedTypeNames();
+                if (ai.contains(componentClass.getCanonicalName()) == false && instance instanceof ModulesAware) {
+                    ai.add(componentClass.getCanonicalName());
+                    ((ModulesAware) instance).setModules(this);
+                }
+                return instance;
+            }
+
+            private <T extends MultiModule> List<T> getComponentInstances(ContainerAdaptor adaptor,
+                    List<Class<? extends T>> componentClasses, Comparator<T> comparator) {
+                List<T> result = getComponentInstances(moduleContainerAdaptor, componentClasses);
+                Collections.sort(result, comparator);
+                return result;
+            }
+
+            private <T extends MultiModule> List<T> getComponentInstances(ContainerAdaptor adaptor,
+                    List<Class<? extends T>> componentClasses) {
+                List<T> instances = new ArrayList<T>();
+                Set<String> instanceFQDNs = new HashSet<String>();
+                for (Class<? extends T> clazz : componentClasses) {
+                    for (List<? extends T> list : Arrays.asList(adaptor.getInstancesOfType(clazz),
+                            getOptionalContainerAdaptor().getInstancesOfType(clazz))) {
+                        for (T clazzInstance : list) {
+                            // filter same FQDN's instance.
+                            String FQDN = clazzInstance.getClass().getCanonicalName();
+                            if (instanceFQDNs.contains(FQDN) == false) {
+                                if (clazzInstance instanceof ModulesContainerAdaptorAware) {
+                                    ((ModulesContainerAdaptorAware) clazzInstance)
+                                            .setModulesContainerAdaptor(getModulesContainerAdaptor());
+                                }
+                                Set<String> ai = getAlreadyInjectedTypeNames();
+                                if (ai.contains(clazz.getCanonicalName()) == false
+                                        && clazzInstance instanceof ModulesAware) {
+                                    ai.add(clazz.getCanonicalName());
+                                    ((ModulesAware) clazzInstance).setModules(this);
+                                }
+                                instances.add(clazzInstance);
+                            }
+                            instanceFQDNs.add(FQDN);
+                        }
+                    }
+                }
+                Iterator<T> itr = instances.iterator();
+                while (itr.hasNext()) {
+                    T next = itr.next();
+                    for (MultiModule.Filter moduleClass : getIgnoringFilters()) {
+                        if (moduleClass.isAppreciable(next) == false) {
+                            itr.remove();
+                            break;
+                        }
+                    }
+                }
+                return instances;
+            }
+
+            @Override
+            public void dispose() {
+                setResponseHandlerClass(null);
+                setRenderableResolverClass(null);
+                setExceptionHandlerClass(null);
+                setInvocationFactoryClass(null);
+                setInvocationInstanceProviderClass(null);
+                setInvokerFactoryClass(null);
+                setModulesProviderClass(null);
+                setTypeMapperContextClass(null);
+                if (this.processors != null) {
+                    this.processors.clear();
+                    this.processors = null;
+                }
+                if (this.interceptors != null) {
+                    this.interceptors.clear();
+                    this.interceptors = null;
+                }
+                if (this.alreadyInjected != null) {
+                    this.alreadyInjected.clear();
+                    this.alreadyInjected = null;
+                }
+            }
+
+            private RequestValueResolvers resolvers;
+
+            @Override
+            public RequestValueResolvers getRequestValueResolvers() {
+                if (this.resolvers == null) {
+                    List<RequestValueResolver> resolverList = new LinkedList<RequestValueResolver>();
+                    resolverList.addAll(requestValueResolvers);
+                    resolverList.addAll(getComponentInstances(moduleContainerAdaptor, getAttributesHandlerClasses()));
+                    resolverList
+                            .addAll(getComponentInstances(moduleContainerAdaptor, getRequestValueResolverClasses()));
+                    this.resolvers = new DefaultReqestValueResolvers(resolverList);
+                }
+                return resolvers;
+            }
+
+            private List<ExceptionMapper> exMappers;
+
+            @Override
+            public List<ExceptionMapper> getExceptionMappers() {
+                if (this.exMappers == null) {
+                    this.exMappers = getComponentInstances(moduleContainerAdaptor, getExceptionMapperClasses());
+                    this.exMappers.addAll(exceptionMappers);
+                }
+                return this.exMappers;
+            }
+        };
+    }
+
+    protected ContainerAdaptor createModuleContainerAdaptor(final ApplicationContext resolver,
+            final ContainerAdaptor defaultContainer) {
+        if (modulesProvider != null) {
+            return modulesProvider.createContainerAdaptor(resolver);
+        }
+        Assertion.notNull(getModulesProviderClass(), "ModulesProviderClass");
+        if (getModulesProviderClass().equals(StaticMappingContainerAdaptorFactory.class)) {
+            return defaultContainer;
+        } else {
+            ContainerAdaptorFactory<? extends ContainerAdaptor> factory = ReflectionUtils
+                    .getInstanceQuietly(getModulesProviderClass());
+            return factory.createContainerAdaptor(resolver);
+        }
+    }
+
+    @Override
+    public ModulesBuilder setModulesProviderClass(
+            Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>> modulesProviderClass) {
+        this.modulesProviderClass = modulesProviderClass;
+        return this;
+    }
+
+    // TODO:implement.
+    @Override
+    public ModulesBuilder setModulesProvider(ContainerAdaptorFactory<? extends ContainerAdaptor> modulesProvider) {
+        this.modulesProvider = modulesProvider;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addInvocationMetadataFactoriesClass(
+            Class<? extends InvocationMetadataFactory> actionMethodMetadataFactoryClass) {
+        this.invocationMetadataFactoryClasses.add(actionMethodMetadataFactoryClass);
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addInvocationMetadataFactories(InvocationMetadataFactory... invocationMetadataFactories) {
+        this.invocationMetadataFactories.addAll(Arrays.asList(invocationMetadataFactories));
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addInvocationMetadataFinderClass(
+            Class<? extends InvocationMetadataFinder> actionMethodMetadataFinderClass) {
+        this.invocationMetadataFinderClasses.add(actionMethodMetadataFinderClass);
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addInvocationMetadataFinder(InvocationMetadataFinder... invocationMetadataFinder) {
+        this.invocationMetadataFinders.addAll(Arrays.asList(invocationMetadataFinder));
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder setInvokerFactoryClass(Class<? extends InvokerFactory> invokerFactoryClass) {
+        this.invokerFactoryClass = invokerFactoryClass;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder setInvokerFactory(InvokerFactory invokerFactory) {
+        this.invokerFactory = invokerFactory;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder setInvocationInstanceProviderClass(
+            Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>> actionInstanceProviderClass) {
+        this.invocationInstanceProviderClass = actionInstanceProviderClass;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder setInvocationInstanceProvider(
+            ContainerAdaptorFactory<? extends ContainerAdaptor> invocationInstanceProvider) {
+        this.invocationInstanceProvider = invocationInstanceProvider;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder setInvocationFactoryClass(Class<? extends InvocationFactory> actionInvocationFactoryClass) {
+        this.invocationFactoryClass = actionInvocationFactoryClass;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder setInvocationFactory(InvocationFactory invocationFactory) {
+        this.invocationFactory = invocationFactory;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder setRenderableResolverClass(Class<? extends RenderableResolver> actionResultResolverClass) {
+        this.directionResolverClass = actionResultResolverClass;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder setRenderableResolver(RenderableResolver responseResolver) {
+        this.renderableResolver = renderableResolver;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder setResponseHandlerClass(Class<? extends ResponseHandler> actionResultHandlerClass) {
+        this.directionHandlerClass = actionResultHandlerClass;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder setResponseHandler(ResponseHandler responseHandler) {
+        this.responseHandler = responseHandler;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder setTypeMapperContextClass(Class<? extends TypeMapperContext> typeMapperContextClass) {
+        this.typeMapperContextClass = typeMapperContextClass;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder setTypeMapperContext(TypeMapperContext typeMapperContext) {
+        this.typeMapperContext = typeMapperContext;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder setExceptionHandlerClass(Class<? extends ExceptionHandler> exceptionHandlerClass) {
+        this.exceptionHandlerClass = exceptionHandlerClass;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder setExceptionHandler(ExceptionHandler exceptionHandler) {
+        this.exceptionHandler = exceptionHandler;
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addApplicationProcessorClass(
+            Class<? extends ApplicationProcessor> applicationProcessorClass) {
+        this.applicationProcessorClasses.add(applicationProcessorClass);
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addApplicationProcessor(ApplicationProcessor... applicationProcessors) {
+        this.applicationProcessors.addAll(Arrays.asList(applicationProcessors));
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addInvocationInterceptorClass(
+            Class<? extends InvocationInterceptor> invocationInterceptorClass) {
+        this.invocationInterceptorClasses.add(invocationInterceptorClass);
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addInvocationInterceptor(InvocationInterceptor... invocationInterceptors) {
+        this.invocationInterceptors.addAll(Arrays.asList(invocationInterceptors));
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder clearInvocationInterceptorClass() {
+        this.invocationInterceptorClasses.clear();
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder clearInvocationInterceptors() {
+        this.invocationInterceptors.clear();
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addAttributesHandlerClass(Class<? extends AttributesHandler> requestAttributesResolverClass) {
+        this.attributesHandlerClasses.add(requestAttributesResolverClass);
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addAttributesHandler(AttributesHandler... attributesHandler) {
+        this.attributesHandlers.addAll(Arrays.asList(attributesHandler));
+        return this;
+    }
+
+    protected Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>> getModulesProviderClass() {
+        return this.modulesProviderClass;
+    }
+
+    protected List<Class<? extends InvocationMetadataFactory>> getInvocationMetadataFactoryClasses() {
+        return this.invocationMetadataFactoryClasses;
+    }
+
+    protected List<Class<? extends InvocationMetadataFinder>> getInvocationMetadataFinderClasses() {
+        return this.invocationMetadataFinderClasses;
+    }
+
+    protected Class<? extends InvokerFactory> getInvokerFactoryClass() {
+        return this.invokerFactoryClass;
+    }
+
+    protected Class<? extends ContainerAdaptorFactory<?>> getInvocationInstanceProviderClass() {
+        return this.invocationInstanceProviderClass;
+    }
+
+    protected Class<? extends InvocationFactory> getInvocationFactoryClass() {
+        return this.invocationFactoryClass;
+    }
+
+    protected Class<? extends RenderableResolver> getResponseResolverClass() {
+        return this.directionResolverClass;
+    }
+
+    protected Class<? extends ResponseHandler> getResponseHandlerClass() {
+        return this.directionHandlerClass;
+    }
+
+    protected Class<? extends ExceptionHandler> getExceptionHandlerClass() {
+        return this.exceptionHandlerClass;
+    }
+
+    protected Class<? extends TypeMapperContext> getTypeMapperContextClass() {
+        return this.typeMapperContextClass;
+    }
+
+    protected List<Class<? extends InvocationInterceptor>> getInvocationInterceptorClasses() {
+        return this.invocationInterceptorClasses;
+    }
+
+    protected List<Class<? extends ApplicationProcessor>> getApplicationProcessorClasses() {
+        return this.applicationProcessorClasses;
+    }
+
+    protected List<Class<? extends AttributesHandler>> getAttributesHandlerClasses() {
+        return attributesHandlerClasses;
+    }
+
+    protected List<Class<? extends RequestValueResolver>> getRequestValueResolverClasses() {
+        return this.requestValueResolverClasses;
+    }
+
+    protected Class<? extends ResponseFormatter> getResponseFormatterClass(Class<? extends Renderable> mapToResponse) {
+        return this.directionFormatterClasses.get(mapToResponse);
+    }
+
+    protected List<Class<? extends ExceptionMapper>> getExceptionMapperClasses() {
+        return this.exceptionMapperClasses;
+    }
+
+    protected List<Class<? extends MultiModule>> getIgnoringClasses() {
+        return this.ignoreClasses;
+    }
+
+    protected List<MultiModule.Filter> getIgnoringFilters() {
+        return this.ignoreFilters;
+    }
+
+    @Override
+    public ModulesBuilder clearInvocationMetadataFactoriesClass() {
+        this.invocationMetadataFactoryClasses.clear();
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder clearInvocationMetadataFactories() {
+        this.invocationMetadataFactories.clear();
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder clearInvocationMetadataFinderClass() {
+        this.invocationMetadataFinderClasses.clear();
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder clearInvocationMetadataFinder() {
+        this.invocationMetadataFinders.clear();
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder clearApplicationProcessorClass() {
+        this.applicationProcessorClasses.clear();
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder clearApplicationProcessors() {
+        this.applicationProcessors.clear();
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder clearAttributesHanderClass() {
+        this.attributesHandlerClasses.clear();
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder clearAttributesHanders() {
+        this.attributesHandlers.clear();
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addRequestValueResolverClass(
+            Class<? extends RequestValueResolver> requestValueResolverClass) {
+        this.requestValueResolverClasses.add(requestValueResolverClass);
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addRequestValueResolver(RequestValueResolver... requestValueResolver) {
+        this.requestValueResolvers.addAll(Arrays.asList(requestValueResolver));
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder clearRequestValueResolverClass() {
+        this.requestValueResolverClasses.clear();
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder clearRequestValueResolvers() {
+        this.requestValueResolvers.clear();
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addResponseFormatterClass(Class<? extends Renderable> mapToResponseClass,
+            Class<? extends ResponseFormatter> directionFormatterClass) {
+        this.directionFormatterClasses.put(mapToResponseClass, directionFormatterClass);
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addResponseFormatters(Class<? extends Renderable> mapToResponseClass,
+            ResponseFormatter... responseFormatters) {
+        for (ResponseFormatter responseFormatter : responseFormatters) {
+            this.responseFormatters.put(mapToResponseClass, responseFormatter);
+        }
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addExceptionMapperClass(Class<? extends ExceptionMapper> exceptionMapperClass) {
+        this.exceptionMapperClasses.add(exceptionMapperClass);
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder addExceptionMapper(ExceptionMapper... exceptionMappers) {
+        this.exceptionMappers.addAll(Arrays.asList(exceptionMappers));
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder clearDirectionFormatterClass() {
+        this.directionFormatterClasses.clear();
+        return this;
+    }
+
+    @Override
+    public ModulesBuilder ignore(final Class<? extends MultiModule> multiModuleClass) {
+        Assertion.notNull(multiModuleClass, MultiModule.class.getCanonicalName());
+        return filter(new MultiModule.Filter() {
+
+            @Override
+            public <T extends MultiModule> boolean isAppreciable(T aMultiModule) {
+                if (multiModuleClass.isInstance(aMultiModule)) {
+                    return false;
+                }
+                return true;
+            }
+        });
+    }
+
+    @Override
+    public ModulesBuilder filter(MultiModule.Filter multiModuleFilter) {
+        Assertion.notNull(multiModuleFilter, MultiModule.Filter.class.getCanonicalName());
+        this.ignoreFilters.add(multiModuleFilter);
+        return this;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultMutableRequestContext.java b/src/main/java/org/analogweb/core/DefaultMutableRequestContext.java
index 76cc463..c5502ff 100644
--- a/src/main/java/org/analogweb/core/DefaultMutableRequestContext.java
+++ b/src/main/java/org/analogweb/core/DefaultMutableRequestContext.java
@@ -7,42 +7,40 @@
 /**
  * @author snowgooseyk
  */
-public class DefaultMutableRequestContext extends RequestContextWrapper
-		implements
-			MutableRequestContext {
-
-	private String overrideMethod;
-	private RequestPath overridePath;
-
-	public DefaultMutableRequestContext(RequestContext context) {
-		super(context);
-		this.overrideMethod = context.getRequestMethod();
-		this.overridePath = context.getRequestPath();
-	}
-
-	@Override
-	public void setRequestMethod(String method) {
-		this.overrideMethod = method;
-	}
-
-	@Override
-	public void setRequestPath(RequestPath path) {
-		this.overridePath = path;
-	}
-
-	@Override
-	public RequestContext unwrap() {
-		return new RequestContextWrapper(getOriginalRequestContext()) {
-
-			@Override
-			public String getRequestMethod() {
-				return overrideMethod;
-			}
-
-			@Override
-			public RequestPath getRequestPath() {
-				return overridePath;
-			}
-		};
-	}
+public class DefaultMutableRequestContext extends RequestContextWrapper implements MutableRequestContext {
+
+    private String overrideMethod;
+    private RequestPath overridePath;
+
+    public DefaultMutableRequestContext(RequestContext context) {
+        super(context);
+        this.overrideMethod = context.getRequestMethod();
+        this.overridePath = context.getRequestPath();
+    }
+
+    @Override
+    public void setRequestMethod(String method) {
+        this.overrideMethod = method;
+    }
+
+    @Override
+    public void setRequestPath(RequestPath path) {
+        this.overridePath = path;
+    }
+
+    @Override
+    public RequestContext unwrap() {
+        return new RequestContextWrapper(getOriginalRequestContext()) {
+
+            @Override
+            public String getRequestMethod() {
+                return overrideMethod;
+            }
+
+            @Override
+            public RequestPath getRequestPath() {
+                return overridePath;
+            }
+        };
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultReadableBuffer.java b/src/main/java/org/analogweb/core/DefaultReadableBuffer.java
index 0e50609..3bc9e37 100644
--- a/src/main/java/org/analogweb/core/DefaultReadableBuffer.java
+++ b/src/main/java/org/analogweb/core/DefaultReadableBuffer.java
@@ -17,104 +17,102 @@
  */
 public class DefaultReadableBuffer implements ReadableBuffer {
 
-	private final ReadableByteChannel channel;
-	private long length;
-	private InputStream stream;
-
-	public static DefaultReadableBuffer readBuffer(byte[] content) {
-		return new DefaultReadableBuffer(content, 0, content.length);
-	}
-
-	public static DefaultReadableBuffer readBuffer(InputStream in) {
-		return readBuffer(Channels.newChannel(in));
-	}
-
-	public static DefaultReadableBuffer readBuffer(ReadableByteChannel content) {
-		return new DefaultReadableBuffer(content);
-	}
-
-	DefaultReadableBuffer(byte[] content, int offset, int length) {
-		this(Channels.newChannel(new ByteArrayInputStream(content, offset,
-				length)));
-		this.length = length - offset;
-	}
-
-	DefaultReadableBuffer(ReadableByteChannel content) {
-		this.channel = content;
-	}
-
-	protected ReadableByteChannel getChannel() {
-		return this.channel;
-	}
-
-	@Override
-	public ReadableBuffer read(byte[] dst, int index, int length)
-			throws IOException {
-		return read(ByteBuffer.wrap(dst, index, length));
-	}
-
-	@Override
-	public ReadableBuffer read(ByteBuffer buffer) throws IOException {
-		getChannel().read(buffer);
-		return this;
-	}
-
-	@Override
-	public String asString(Charset charset) throws IOException {
-		ByteBuffer buffer = ByteBuffer.allocate(8192);
-		readFully(buffer);
-		buffer.flip();
-		byte[] dst = new byte[buffer.remaining()];
-		buffer.get(dst);
-		return new String(dst, charset);
-	}
-
-	@Override
-	public String toString() {
-		try {
-			return asString(Charset.defaultCharset());
-		} catch (IOException e) {
-			throw new ApplicationRuntimeException(e) {
-			};
-		}
-	}
-
-	private int readFully(ByteBuffer b) throws IOException {
-		int total = 0;
-		ReadableByteChannel ch = getChannel();
-		while (true) {
-			int got = ch.read(b);
-			if (got < 0) {
-				return (total == 0) ? -1 : total;
-			}
-			total += got;
-			if (total == b.capacity() || b.position() == b.capacity()) {
-				return total;
-			}
-		}
-	}
-
-	@Override
-	public InputStream asInputStream() throws IOException {
-		if (stream == null) {
-			this.stream = Channels.newInputStream(getChannel());
-		}
-		return this.stream;
-	}
-
-	@Override
-	public ReadableByteChannel asChannel() throws IOException {
-		return getChannel();
-	}
-
-	@Override
-	public ReadableBuffer to(WritableBuffer writable) throws IOException {
-		IOUtils.copy(asChannel(), writable.asChannel());
-		return this;
-	}
-
-	@Override
-	public long getLength() {
-		return this.length;
-	}
+    private final ReadableByteChannel channel;
+    private long length;
+    private InputStream stream;
+
+    public static DefaultReadableBuffer readBuffer(byte[] content) {
+        return new DefaultReadableBuffer(content, 0, content.length);
+    }
+
+    public static DefaultReadableBuffer readBuffer(InputStream in) {
+        return readBuffer(Channels.newChannel(in));
+    }
+
+    public static DefaultReadableBuffer readBuffer(ReadableByteChannel content) {
+        return new DefaultReadableBuffer(content);
+    }
+
+    DefaultReadableBuffer(byte[] content, int offset, int length) {
+        this(Channels.newChannel(new ByteArrayInputStream(content, offset, length)));
+        this.length = length - offset;
+    }
+
+    DefaultReadableBuffer(ReadableByteChannel content) {
+        this.channel = content;
+    }
+
+    protected ReadableByteChannel getChannel() {
+        return this.channel;
+    }
+
+    @Override
+    public ReadableBuffer read(byte[] dst, int index, int length) throws IOException {
+        return read(ByteBuffer.wrap(dst, index, length));
+    }
+
+    @Override
+    public ReadableBuffer read(ByteBuffer buffer) throws IOException {
+        getChannel().read(buffer);
+        return this;
+    }
+
+    @Override
+    public String asString(Charset charset) throws IOException {
+        ByteBuffer buffer = ByteBuffer.allocate(8192);
+        readFully(buffer);
+        buffer.flip();
+        byte[] dst = new byte[buffer.remaining()];
+        buffer.get(dst);
+        return new String(dst, charset);
+    }
+
+    @Override
+    public String toString() {
+        try {
+            return asString(Charset.defaultCharset());
+        } catch (IOException e) {
+            throw new ApplicationRuntimeException(e) {
+            };
+        }
+    }
+
+    private int readFully(ByteBuffer b) throws IOException {
+        int total = 0;
+        ReadableByteChannel ch = getChannel();
+        while (true) {
+            int got = ch.read(b);
+            if (got < 0) {
+                return (total == 0) ? -1 : total;
+            }
+            total += got;
+            if (total == b.capacity() || b.position() == b.capacity()) {
+                return total;
+            }
+        }
+    }
+
+    @Override
+    public InputStream asInputStream() throws IOException {
+        if (stream == null) {
+            this.stream = Channels.newInputStream(getChannel());
+        }
+        return this.stream;
+    }
+
+    @Override
+    public ReadableByteChannel asChannel() throws IOException {
+        return getChannel();
+    }
+
+    @Override
+    public ReadableBuffer to(WritableBuffer writable) throws IOException {
+        IOUtils.copy(asChannel(), writable.asChannel());
+        return this;
+    }
+
+    @Override
+    public long getLength() {
+        return this.length;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultRenderableResolver.java b/src/main/java/org/analogweb/core/DefaultRenderableResolver.java
index a19e00d..12c140f 100644
--- a/src/main/java/org/analogweb/core/DefaultRenderableResolver.java
+++ b/src/main/java/org/analogweb/core/DefaultRenderableResolver.java
@@ -14,46 +14,42 @@
  */
 public class DefaultRenderableResolver implements RenderableResolver {
 
-	@Override
-	public Renderable resolve(Object invocationResult,
-			InvocationMetadata metadata, RequestContext context,
-			ResponseContext responseContext) {
-		if (invocationResult == null) {
-			return nullToResponse(metadata, context);
-		}
-		Class<?> type = invocationResult.getClass();
-		if (Acceptable.class.isAssignableFrom(type)) {
-			return ((Acceptable) invocationResult).selectAcceptableOne(context);
-		}
-		if (Renderable.class.isAssignableFrom(type)) {
-			return (Renderable) invocationResult;
-		}
-		if (type.equals(Integer.TYPE) || Number.class.isAssignableFrom(type)) {
-			return numberToResponse((Number) invocationResult);
-		}
-		if (String.class.isAssignableFrom(type)) {
-			return stringToResponse((String) invocationResult, metadata,
-					context);
-		}
-		return anyObjectToResponse(invocationResult, metadata, context);
-	}
+    @Override
+    public Renderable resolve(Object invocationResult, InvocationMetadata metadata, RequestContext context,
+            ResponseContext responseContext) {
+        if (invocationResult == null) {
+            return nullToResponse(metadata, context);
+        }
+        Class<?> type = invocationResult.getClass();
+        if (Acceptable.class.isAssignableFrom(type)) {
+            return ((Acceptable) invocationResult).selectAcceptableOne(context);
+        }
+        if (Renderable.class.isAssignableFrom(type)) {
+            return (Renderable) invocationResult;
+        }
+        if (type.equals(Integer.TYPE) || Number.class.isAssignableFrom(type)) {
+            return numberToResponse((Number) invocationResult);
+        }
+        if (String.class.isAssignableFrom(type)) {
+            return stringToResponse((String) invocationResult, metadata, context);
+        }
+        return anyObjectToResponse(invocationResult, metadata, context);
+    }
 
-	protected Renderable nullToResponse(InvocationMetadata metadata,
-			RequestContext context) {
-		return HttpStatus.NO_CONTENT;
-	}
+    protected Renderable nullToResponse(InvocationMetadata metadata, RequestContext context) {
+        return HttpStatus.NO_CONTENT;
+    }
 
-	protected Renderable numberToResponse(Number num) {
-		return HttpStatus.valueOf(num.intValue());
-	}
+    protected Renderable numberToResponse(Number num) {
+        return HttpStatus.valueOf(num.intValue());
+    }
 
-	protected Renderable stringToResponse(String str,
-			InvocationMetadata metadata, RequestContext context) {
-		return Text.with(str);
-	}
+    protected Renderable stringToResponse(String str, InvocationMetadata metadata, RequestContext context) {
+        return Text.with(str);
+    }
 
-	protected Renderable anyObjectToResponse(Object invocationResult,
-			InvocationMetadata metadata, RequestContext context) {
-		throw new UnresolvableResultException(invocationResult);
-	}
+    protected Renderable anyObjectToResponse(Object invocationResult, InvocationMetadata metadata,
+            RequestContext context) {
+        throw new UnresolvableResultException(invocationResult);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultReqestValueResolvers.java b/src/main/java/org/analogweb/core/DefaultReqestValueResolvers.java
index 3feffd1..61ca37b 100644
--- a/src/main/java/org/analogweb/core/DefaultReqestValueResolvers.java
+++ b/src/main/java/org/analogweb/core/DefaultReqestValueResolvers.java
@@ -12,100 +12,92 @@
 
 public class DefaultReqestValueResolvers implements RequestValueResolvers {
 
-	protected static final Class<? extends RequestValueResolver> DEFAULT_RESOLVER_CLASS = ParameterValueResolver.class;
-	private final Map<Key, RequestValueResolver> resolverMap;
-
-	public DefaultReqestValueResolvers(
-			List<? extends RequestValueResolver> resolvers) {
-		this.resolverMap = Maps.newConcurrentHashMap();
-		for (RequestValueResolver resolver : resolvers) {
-			if (resolver != null) {
-				this.resolverMap
-						.put(Key.valueOf(resolver.getClass()), resolver);
-			}
-		}
-	}
-
-	@Override
-	public RequestValueResolver findDefaultRequestValueResolver() {
-		return findRequestValueResolver(getDefaultRequestValueResolverClass());
-	}
-
-	@Override
-	public RequestValueResolver findRequestValueResolver(
-			Class<? extends RequestValueResolver> resolverClass) {
-		if (resolverClass == null) {
-			return getResolverMap().get(
-					Key.valueOf(getDefaultRequestValueResolverClass()));
-		}
-		RequestValueResolver resolver = getResolverMap().get(
-				Key.valueOf(resolverClass));
-		if (resolver == null) {
-			return getResolverMap().get(
-					Key.valueOf(getDefaultRequestValueResolverClass()));
-		}
-		return resolver;
-	}
-
-	@Override
-	public AttributesHandler findAttributesHandler(
-			Class<? extends AttributesHandler> handlerClass) {
-		RequestValueResolver resolver = findRequestValueResolver(handlerClass);
-		if (resolver instanceof AttributesHandler) {
-			return (AttributesHandler) resolver;
-		}
-		return null;
-	}
-
-	@Override
-	public Collection<RequestValueResolver> all() {
-		return getResolverMap().values();
-	}
-
-	protected final Map<Key, RequestValueResolver> getResolverMap() {
-		return this.resolverMap;
-	}
-
-	protected Class<? extends RequestValueResolver> getDefaultRequestValueResolverClass() {
-		return DEFAULT_RESOLVER_CLASS;
-	}
-
-	protected static class Key implements Serializable {
-
-		private static final long serialVersionUID = 1L;
-		private int hashCode;
-		private final String name;
-
-		private Key(Class<? extends RequestValueResolver> resolverClass) {
-			this.name = resolverClass.getCanonicalName();
-			calculateEquality(resolverClass);
-		}
-
-		private void calculateEquality(
-				Class<? extends RequestValueResolver> resolverClass) {
-			Class<?> target = resolverClass;
-			this.hashCode = target.hashCode();
-		}
-
-		static Key valueOf(Class<? extends RequestValueResolver> resolverClass) {
-			return new Key(resolverClass);
-		}
-
-		@Override
-		public int hashCode() {
-			return this.hashCode;
-		}
-
-		@Override
-		public boolean equals(Object other) {
-			if (other instanceof Key) {
-				Key otherKey = (Key) other;
-				if (name.equals(otherKey.name)) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
+    protected static final Class<? extends RequestValueResolver> DEFAULT_RESOLVER_CLASS = ParameterValueResolver.class;
+    private final Map<Key, RequestValueResolver> resolverMap;
+
+    public DefaultReqestValueResolvers(List<? extends RequestValueResolver> resolvers) {
+        this.resolverMap = Maps.newConcurrentHashMap();
+        for (RequestValueResolver resolver : resolvers) {
+            if (resolver != null) {
+                this.resolverMap.put(Key.valueOf(resolver.getClass()), resolver);
+            }
+        }
+    }
+
+    @Override
+    public RequestValueResolver findDefaultRequestValueResolver() {
+        return findRequestValueResolver(getDefaultRequestValueResolverClass());
+    }
+
+    @Override
+    public RequestValueResolver findRequestValueResolver(Class<? extends RequestValueResolver> resolverClass) {
+        if (resolverClass == null) {
+            return getResolverMap().get(Key.valueOf(getDefaultRequestValueResolverClass()));
+        }
+        RequestValueResolver resolver = getResolverMap().get(Key.valueOf(resolverClass));
+        if (resolver == null) {
+            return getResolverMap().get(Key.valueOf(getDefaultRequestValueResolverClass()));
+        }
+        return resolver;
+    }
+
+    @Override
+    public AttributesHandler findAttributesHandler(Class<? extends AttributesHandler> handlerClass) {
+        RequestValueResolver resolver = findRequestValueResolver(handlerClass);
+        if (resolver instanceof AttributesHandler) {
+            return (AttributesHandler) resolver;
+        }
+        return null;
+    }
+
+    @Override
+    public Collection<RequestValueResolver> all() {
+        return getResolverMap().values();
+    }
+
+    protected final Map<Key, RequestValueResolver> getResolverMap() {
+        return this.resolverMap;
+    }
+
+    protected Class<? extends RequestValueResolver> getDefaultRequestValueResolverClass() {
+        return DEFAULT_RESOLVER_CLASS;
+    }
+
+    protected static class Key implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+        private int hashCode;
+        private final String name;
+
+        private Key(Class<? extends RequestValueResolver> resolverClass) {
+            this.name = resolverClass.getCanonicalName();
+            calculateEquality(resolverClass);
+        }
+
+        private void calculateEquality(Class<? extends RequestValueResolver> resolverClass) {
+            Class<?> target = resolverClass;
+            this.hashCode = target.hashCode();
+        }
+
+        static Key valueOf(Class<? extends RequestValueResolver> resolverClass) {
+            return new Key(resolverClass);
+        }
+
+        @Override
+        public int hashCode() {
+            return this.hashCode;
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            if (other instanceof Key) {
+                Key otherKey = (Key) other;
+                if (name.equals(otherKey.name)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
 
 }
diff --git a/src/main/java/org/analogweb/core/DefaultRequestPath.java b/src/main/java/org/analogweb/core/DefaultRequestPath.java
index 6dcf8c1..4188183 100644
--- a/src/main/java/org/analogweb/core/DefaultRequestPath.java
+++ b/src/main/java/org/analogweb/core/DefaultRequestPath.java
@@ -11,95 +11,92 @@
 
 /**
  * Default implementation of {@link RequestPath}.
- * 
+ *
  * @author y2k2mt
  */
-public class DefaultRequestPath extends AbstractRequestPathMetadata
-		implements
-			RequestPath {
-
-	private final String actualPath;
-	private final String requestMethod;
-	private final URI requestURI;
-	private final URI baseURI;
-
-	public DefaultRequestPath(URI baseURI, URI requestedURI,
-			String requestMethod) {
-		this.requestURI = requestedURI;
-		this.baseURI = (baseURI == null) ? URI.create("/") : baseURI;
-		String path = this.baseURI.relativize(this.requestURI).getPath();
-		if (StringUtils.charAt(0, path) != '/') {
-			path = '/' + path;
-		}
-		this.actualPath = getFormattedPath(path, this.baseURI.getPath());
-		Assertion.notNull(requestMethod, "Request method.");
-		this.requestMethod = requestMethod.toUpperCase();
-	}
-
-	@Override
-	public String getActualPath() {
-		return actualPath;
-	}
-
-	@Override
-	public boolean match(RequestPath requestPath) {
-		return getActualPath().equals(requestPath.getActualPath())
-				&& getRequestMethod().equals(requestPath.getRequestMethod());
-	}
-
-	private String getFormattedPath(String requestUri, String contextPath) {
-		String uri = removeJsessionId(requestUri);
-		return uri;
-	}
-
-	private String removeJsessionId(String uri) {
-		int indexOfSessionIdSeparator = uri.indexOf(";");
-		if (indexOfSessionIdSeparator == -1) {
-			return uri;
-		} else {
-			return uri.substring(0, indexOfSessionIdSeparator);
-		}
-	}
-
-	@Override
-	public String getRequestMethod() {
-		return requestMethod;
-	}
-
-	@Override
-	public List<String> getRequestMethods() {
-		return Arrays.asList(getRequestMethod());
-	}
-
-	@Override
-	public URI getRequestURI() {
-		return this.requestURI;
-	}
-
-	@Override
-	public String toString() {
-		return new StringBuilder(64).append('[').append(getRequestMethod())
-				.append("]:").append(getRequestMethod()).toString();
-	}
-
-	@Override
-	public URI getBaseURI() {
-		return this.baseURI;
-	}
-
-	@Override
-	public boolean equals(Object other) {
-		if (other instanceof RequestPath) {
-			RequestPath otherPath = (RequestPath) other;
-			return getActualPath().equals(otherPath.getActualPath())
-					&& getRequestMethod().equals(otherPath.getRequestMethod());
-		} else {
-			return false;
-		}
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(getActualPath(), getRequestMethod());
-	}
+public class DefaultRequestPath extends AbstractRequestPathMetadata implements RequestPath {
+
+    private final String actualPath;
+    private final String requestMethod;
+    private final URI requestURI;
+    private final URI baseURI;
+
+    public DefaultRequestPath(URI baseURI, URI requestedURI, String requestMethod) {
+        this.requestURI = requestedURI;
+        this.baseURI = (baseURI == null) ? URI.create("/") : baseURI;
+        String path = this.baseURI.relativize(this.requestURI).getPath();
+        if (StringUtils.charAt(0, path) != '/') {
+            path = '/' + path;
+        }
+        this.actualPath = getFormattedPath(path, this.baseURI.getPath());
+        Assertion.notNull(requestMethod, "Request method.");
+        this.requestMethod = requestMethod.toUpperCase();
+    }
+
+    @Override
+    public String getActualPath() {
+        return actualPath;
+    }
+
+    @Override
+    public boolean match(RequestPath requestPath) {
+        return getActualPath().equals(requestPath.getActualPath())
+                && getRequestMethod().equals(requestPath.getRequestMethod());
+    }
+
+    private String getFormattedPath(String requestUri, String contextPath) {
+        String uri = removeJsessionId(requestUri);
+        return uri;
+    }
+
+    private String removeJsessionId(String uri) {
+        int indexOfSessionIdSeparator = uri.indexOf(";");
+        if (indexOfSessionIdSeparator == -1) {
+            return uri;
+        } else {
+            return uri.substring(0, indexOfSessionIdSeparator);
+        }
+    }
+
+    @Override
+    public String getRequestMethod() {
+        return requestMethod;
+    }
+
+    @Override
+    public List<String> getRequestMethods() {
+        return Arrays.asList(getRequestMethod());
+    }
+
+    @Override
+    public URI getRequestURI() {
+        return this.requestURI;
+    }
+
+    @Override
+    public String toString() {
+        return new StringBuilder(64).append('[').append(getRequestMethod()).append("]:").append(getRequestMethod())
+                .toString();
+    }
+
+    @Override
+    public URI getBaseURI() {
+        return this.baseURI;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other instanceof RequestPath) {
+            RequestPath otherPath = (RequestPath) other;
+            return getActualPath().equals(otherPath.getActualPath())
+                    && getRequestMethod().equals(otherPath.getRequestMethod());
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getActualPath(), getRequestMethod());
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultResponse.java b/src/main/java/org/analogweb/core/DefaultResponse.java
index 85bf754..a1edc03 100644
--- a/src/main/java/org/analogweb/core/DefaultResponse.java
+++ b/src/main/java/org/analogweb/core/DefaultResponse.java
@@ -10,31 +10,31 @@
  */
 public class DefaultResponse implements Response {
 
-	private ResponseEntity entity;
+    private ResponseEntity entity;
 
-	public DefaultResponse(ResponseEntity entity) {
-		this.entity = entity;
-	}
+    public DefaultResponse(ResponseEntity entity) {
+        this.entity = entity;
+    }
 
-	@Override
-	public ResponseEntity getEntity() {
-		return entity;
-	}
+    @Override
+    public ResponseEntity getEntity() {
+        return entity;
+    }
 
-	public long getContentLength() {
-		ResponseEntity e = getEntity();
-		if (e != null) {
-			return e.getContentLength();
-		}
-		return 0L;
-	}
+    public long getContentLength() {
+        ResponseEntity e = getEntity();
+        if (e != null) {
+            return e.getContentLength();
+        }
+        return 0L;
+    }
 
-	@Override
-	public void commit(RequestContext request, ResponseContext response) {
-		try {
-			response.commit(request, this);
-		} finally {
-			response.ensure();
-		}
-	}
+    @Override
+    public void commit(RequestContext request, ResponseContext response) {
+        try {
+            response.commit(request, this);
+        } finally {
+            response.ensure();
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultResponseEntity.java b/src/main/java/org/analogweb/core/DefaultResponseEntity.java
index b430f2a..0226260 100644
--- a/src/main/java/org/analogweb/core/DefaultResponseEntity.java
+++ b/src/main/java/org/analogweb/core/DefaultResponseEntity.java
@@ -9,31 +9,31 @@
  */
 public class DefaultResponseEntity implements ResponseEntity<byte[]> {
 
-	private byte[] body;
-	private int length;
-
-	public DefaultResponseEntity(String entity) {
-		this(entity, Charset.defaultCharset());
-	}
-
-	public DefaultResponseEntity(String entity, Charset charset) {
-		this(entity.getBytes(charset));
-	}
-
-	public DefaultResponseEntity(byte[] entity) {
-		this.body = entity;
-		this.length = entity.length;
-	}
-
-	public byte[] entity() {
-		return this.body;
-	}
-
-	@Override
-	public long getContentLength() {
-		if (this.length < 0) {
-			length = -1;
-		}
-		return length;
-	}
+    private byte[] body;
+    private int length;
+
+    public DefaultResponseEntity(String entity) {
+        this(entity, Charset.defaultCharset());
+    }
+
+    public DefaultResponseEntity(String entity, Charset charset) {
+        this(entity.getBytes(charset));
+    }
+
+    public DefaultResponseEntity(byte[] entity) {
+        this.body = entity;
+        this.length = entity.length;
+    }
+
+    public byte[] entity() {
+        return this.body;
+    }
+
+    @Override
+    public long getContentLength() {
+        if (this.length < 0) {
+            length = -1;
+        }
+        return length;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultResponseHandler.java b/src/main/java/org/analogweb/core/DefaultResponseHandler.java
index 3f462b0..a9e064a 100644
--- a/src/main/java/org/analogweb/core/DefaultResponseHandler.java
+++ b/src/main/java/org/analogweb/core/DefaultResponseHandler.java
@@ -24,59 +24,49 @@
  */
 public class DefaultResponseHandler implements ResponseHandler {
 
-	private static final Log log = Logs.getLog(DefaultResponseHandler.class);
+    private static final Log log = Logs.getLog(DefaultResponseHandler.class);
 
-	@Override
-	public Response handleResult(Object result, InvocationMetadata metadata,
-			RenderableResolver renderableResolver, RequestContext context,
-			ResponseContext response, ExceptionHandler exceptionHandler,
-			ResponseFormatterFinder finder) throws IOException,
-			WebApplicationException {
-		Renderable resolved = renderableResolver.resolve(result, metadata,
-				context, response);
-		log.log(Markers.LIFECYCLE, "DL000008", result, result);
-		ResponseFormatter resultFormatter = null;
-		if (resolved instanceof RenderableHolder) {
-			Renderable renderable = ((RenderableHolder) resolved)
-					.getRenderable();
-			if (renderable != null) {
-				resultFormatter = finder.findResponseFormatter(renderable
-						.getClass());
-			}
-		} else {
-			resultFormatter = finder.findResponseFormatter(resolved.getClass());
-		}
-		if (resultFormatter != null) {
-			log.log(Markers.LIFECYCLE, "DL000010", result, resultFormatter);
-		} else {
-			log.log(Markers.LIFECYCLE, "DL000011", result);
-		}
-		return handleResultInternal(resolved, metadata, renderableResolver,
-				resultFormatter, context, response, exceptionHandler, finder);
-	}
+    @Override
+    public Response handleResult(Object result, InvocationMetadata metadata, RenderableResolver renderableResolver,
+            RequestContext context, ResponseContext response, ExceptionHandler exceptionHandler,
+            ResponseFormatterFinder finder) throws IOException, WebApplicationException {
+        Renderable resolved = renderableResolver.resolve(result, metadata, context, response);
+        log.log(Markers.LIFECYCLE, "DL000008", result, result);
+        ResponseFormatter resultFormatter = null;
+        if (resolved instanceof RenderableHolder) {
+            Renderable renderable = ((RenderableHolder) resolved).getRenderable();
+            if (renderable != null) {
+                resultFormatter = finder.findResponseFormatter(renderable.getClass());
+            }
+        } else {
+            resultFormatter = finder.findResponseFormatter(resolved.getClass());
+        }
+        if (resultFormatter != null) {
+            log.log(Markers.LIFECYCLE, "DL000010", result, resultFormatter);
+        } else {
+            log.log(Markers.LIFECYCLE, "DL000011", result);
+        }
+        return handleResultInternal(resolved, metadata, renderableResolver, resultFormatter, context, response,
+                exceptionHandler, finder);
+    }
 
-	protected Response handleResultInternal(Renderable result,
-			InvocationMetadata metadata, RenderableResolver renderableResolver,
-			ResponseFormatter resultFormatter, RequestContext context,
-			ResponseContext response, ExceptionHandler exceptionHandler,
-			ResponseFormatterFinder finder) throws IOException,
-			WebApplicationException {
-		try {
-			if (result instanceof ResponseFormatterAware<?>) {
-				((ResponseFormatterAware<?>) result).attach(resultFormatter);
-			} else if (result instanceof RenderableHolder) {
-				Renderable renderable = ((RenderableHolder) result)
-						.getRenderable();
-				if (renderable instanceof ResponseFormatterAware<?>) {
-					((ResponseFormatterAware<?>) renderable)
-							.attach(resultFormatter);
-				}
-			}
-			return result.render(context, response);
-		} catch (Exception e) {
-			return handleResult(exceptionHandler.handleException(e), metadata,
-					renderableResolver, context, response, exceptionHandler,
-					finder);
-		}
-	}
+    protected Response handleResultInternal(Renderable result, InvocationMetadata metadata,
+            RenderableResolver renderableResolver, ResponseFormatter resultFormatter, RequestContext context,
+            ResponseContext response, ExceptionHandler exceptionHandler, ResponseFormatterFinder finder)
+            throws IOException, WebApplicationException {
+        try {
+            if (result instanceof ResponseFormatterAware<?>) {
+                ((ResponseFormatterAware<?>) result).attach(resultFormatter);
+            } else if (result instanceof RenderableHolder) {
+                Renderable renderable = ((RenderableHolder) result).getRenderable();
+                if (renderable instanceof ResponseFormatterAware<?>) {
+                    ((ResponseFormatterAware<?>) renderable).attach(resultFormatter);
+                }
+            }
+            return result.render(context, response);
+        } catch (Exception e) {
+            return handleResult(exceptionHandler.handleException(e), metadata, renderableResolver, context, response,
+                    exceptionHandler, finder);
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultRouteRegistry.java b/src/main/java/org/analogweb/core/DefaultRouteRegistry.java
index a93fb0b..3ff85c4 100644
--- a/src/main/java/org/analogweb/core/DefaultRouteRegistry.java
+++ b/src/main/java/org/analogweb/core/DefaultRouteRegistry.java
@@ -16,49 +16,44 @@
  */
 public class DefaultRouteRegistry implements RouteRegistry {
 
-	private final Map<RequestPathMetadata, InvocationMetadata> actionMetadataMap = Maps
-			.newConcurrentHashMap();
-
-	@Override
-	public InvocationMetadata findInvocationMetadata(
-			RequestContext requestContext,
-			List<InvocationMetadataFinder> finders) {
-		Map<RequestPathMetadata, InvocationMetadata> readOnly = Collections
-				.unmodifiableMap(actionMetadataMap);
-		for (InvocationMetadataFinder finder : finders) {
-			InvocationMetadata found = finder.find(readOnly, requestContext);
-			if (found == null) {
-				continue;
-			} else if (found instanceof InvocationMetadataFinder.Cacheable) {
-				InvocationMetadataFinder.Cacheable cacheable = (InvocationMetadataFinder.Cacheable) found;
-				return update(requestContext.getRequestPath(), cacheable);
-			} else {
-				return found;
-			}
-		}
-		return null;
-	}
-
-	protected InvocationMetadata update(RequestPathMetadata path,
-			InvocationMetadataFinder.Cacheable metadata) {
-		InvocationMetadata i = metadata.getCachable();
-		this.actionMetadataMap.put(path, i);
-		return i;
-	}
-
-	@Override
-	public void register(InvocationMetadata actionMethodMetadata) {
-		this.actionMetadataMap.put(actionMethodMetadata.getDefinedPath(),
-				actionMethodMetadata);
-	}
-
-	@Override
-	public void dispose() {
-		this.actionMetadataMap.clear();
-	}
-
-	@Override
-	public String toString() {
-		return this.actionMetadataMap.toString();
-	}
+    private final Map<RequestPathMetadata, InvocationMetadata> actionMetadataMap = Maps.newConcurrentHashMap();
+
+    @Override
+    public InvocationMetadata findInvocationMetadata(RequestContext requestContext,
+            List<InvocationMetadataFinder> finders) {
+        Map<RequestPathMetadata, InvocationMetadata> readOnly = Collections.unmodifiableMap(actionMetadataMap);
+        for (InvocationMetadataFinder finder : finders) {
+            InvocationMetadata found = finder.find(readOnly, requestContext);
+            if (found == null) {
+                continue;
+            } else if (found instanceof InvocationMetadataFinder.Cacheable) {
+                InvocationMetadataFinder.Cacheable cacheable = (InvocationMetadataFinder.Cacheable) found;
+                return update(requestContext.getRequestPath(), cacheable);
+            } else {
+                return found;
+            }
+        }
+        return null;
+    }
+
+    protected InvocationMetadata update(RequestPathMetadata path, InvocationMetadataFinder.Cacheable metadata) {
+        InvocationMetadata i = metadata.getCachable();
+        this.actionMetadataMap.put(path, i);
+        return i;
+    }
+
+    @Override
+    public void register(InvocationMetadata actionMethodMetadata) {
+        this.actionMetadataMap.put(actionMethodMetadata.getDefinedPath(), actionMethodMetadata);
+    }
+
+    @Override
+    public void dispose() {
+        this.actionMetadataMap.clear();
+    }
+
+    @Override
+    public String toString() {
+        return this.actionMetadataMap.toString();
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultServer.java b/src/main/java/org/analogweb/core/DefaultServer.java
index c2ce9e8..711d9d5 100644
--- a/src/main/java/org/analogweb/core/DefaultServer.java
+++ b/src/main/java/org/analogweb/core/DefaultServer.java
@@ -46,809 +46,752 @@
 
 public class DefaultServer implements Server {
 
-	private static final int CR = 13;
-	private static final int LF = 10;
-	private static final byte[] CRLF = new byte[]{CR, LF};
-	private final URI serverURI;
-	private final AtomicReference<Application> app;
-	private final ApplicationContext resolver;
-	private final ApplicationProperties props;
-
-	public DefaultServer(String uri) {
-		this(URI.create(uri));
-	}
-
-	public DefaultServer(URI uri) {
-		this(uri, new WebApplication());
-	}
-
-	public DefaultServer(URI uri, Application app) {
-		this(uri, app, (ApplicationContext) null);
-	}
-
-	public DefaultServer(URI uri, Application app,
-			ApplicationContext contextResolver) {
-		this(uri, app, contextResolver, defaultProperties());
-	}
-
-	public DefaultServer(URI uri, Application app, ApplicationProperties props) {
-		this(uri, app, null, props);
-	}
-
-	public DefaultServer(URI uri, Application app,
-			ApplicationContext contextResolver, ApplicationProperties props) {
-		Assertion.notNull(app, Application.class.getName());
-		this.serverURI = uri;
-		this.app = new AtomicReference<Application>(app);
-		this.resolver = contextResolver;
-		this.props = props;
-	}
-
-	@Override
-	public void run() {
-		ServerSocketChannel cnl = null;
-		try {
-			this.app.get().run(resolver, props, getClassCollectors(),
-					Thread.currentThread().getContextClassLoader());
-			cnl = SelectorProvider.provider().openServerSocketChannel();
-			cnl.configureBlocking(false);
-			cnl.socket().bind(new InetSocketAddress(this.serverURI.getPort()));
-			final Selector sl = Selector.open();
-			cnl.register(sl, SelectionKey.OP_ACCEPT);
-			runInternal(sl);
-		} catch (IOException e) {
-			throw new ApplicationRuntimeException(e) {
-
-				private static final long serialVersionUID = 1L;
-			};
-		} finally {
-			IOUtils.closeQuietly(cnl);
-		}
-	}
-
-	private Map<SelectableChannel, Handler> requests = Maps
-			.newConcurrentHashMap();
-
-	private void runInternal(Selector sl) throws IOException {
-		while (true) {
-			while (sl.select(10) > 0) {
-				Iterator<SelectionKey> keys = sl.selectedKeys().iterator();
-				while (keys.hasNext()) {
-					SelectionKey key = keys.next();
-					keys.remove();
-					if (key.isAcceptable()) {
-						ServerSocketChannel ssock = (ServerSocketChannel) key
-								.channel();
-						SocketChannel channel = ssock.accept();
-						channel.configureBlocking(false);
-						channel.register(sl, SelectionKey.OP_READ);
-					} else {
-						if (key.isReadable()) {
-							SelectableChannel channel = key.channel();
-							Handler handler;
-							if (requests.containsKey(channel)) {
-								handler = requests.get(channel);
-							} else {
-								handler = new Handler();
-								requests.put(channel, handler);
-							}
-							try {
-								handler.read(key);
-							} catch (RequestCancelledException e) {
-								sendStatus((SocketChannel) key.channel(),
-										e.getStatus(), e.getBody());
-								requests.remove(channel);
-							}
-						}
-						if (key.isValid() && key.isWritable()) {
-							SelectableChannel channel = key.channel();
-							boolean completed = false;
-							try {
-								completed = requests.get(channel).write(key);
-							} finally {
-								if (completed) {
-									requests.remove(channel);
-									channel.close();
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	final class Handler {
-
-		private RequestPath path;
-		private Map<String, List<String>> headerMap;
-		private RequestBody body;
-		private boolean executed;
-
-		public void read(SelectionKey key) throws IOException {
-			SocketChannel sock = (SocketChannel) key.channel();
-			sock.configureBlocking(false);
-			ByteBuffer buf = ByteBuffer.allocate(8192);
-			int read = sock.read(buf);
-			if (read == 1) {
-				// spinning.
-				return;
-			}
-			buf.flip();
-			if (read > 0) {
-				// Read first.
-				int eoh = 0;
-				if (headerMap == null || path == null) {
-					eoh = endOfHeader(buf, read);
-					while (eoh == 0) {
-						buf.limit(8192);
-						read = sock.read(buf);
-						buf.flip();
-						eoh = endOfHeader(buf, read);
-					}
-					BufferedReader r = new BufferedReader(
-							new InputStreamReader(new ByteArrayInputStream(
-									((ByteBuffer) buf.duplicate().limit(eoh))
-											.array())));
-					String aLine = r.readLine();
-					if (aLine == null) {
-						throw new RequestCancelledException(
-								HttpStatus.BAD_REQUEST, StringUtils.EMPTY);
-					}
-					StringTokenizer st = new StringTokenizer(aLine);
-					if (st.countTokens() < 2) {
-						throw new RequestCancelledException(
-								HttpStatus.BAD_REQUEST, StringUtils.EMPTY);
-					}
-					final String method = st.nextToken();
-					final URI uri = URI.create(st.nextToken());
-					path = new DefaultRequestPath(URI.create("/"), uri, method);
-					headerMap = Maps.newEmptyHashMap();
-					while ((aLine = r.readLine()) != null
-							&& aLine.trim().length() != 0) {
-						int i = aLine.indexOf(':');
-						if (i > 0 && i < aLine.length()) {
-							String k = aLine.substring(0, i).trim();
-							String value = aLine.substring(i + 1).trim();
-							headerMap.put(k, Arrays.asList(value));
-						}
-					}
-				}
-				body = resolveRequestBody(sock, buf, eoh, read,
-						path.getRequestMethod(),
-						headerMap.get("Content-Length"));
-				if (body.resolved() && executed == false) {
-					RequestContextImpl request = new RequestContextImpl(path,
-							Locale.getDefault(), headerMap, body);
-					ResponseContextImpl response = new ResponseContextImpl(
-							request, sock);
-					try {
-						Response proceed = app.get().processRequest(
-								request.getRequestPath(), request, response);
-						if (proceed == Application.NOT_FOUND) {
-							throw new RequestCancelledException(
-									HttpStatus.NOT_FOUND, StringUtils.EMPTY);
-						} else {
-							proceed.commit(request, response);
-						}
-					} catch (WebApplicationException e) {
-						e.printStackTrace();
-						throw new RequestCancelledException(
-								HttpStatus.INTERNAL_SERVER_ERROR,
-								e.getMessage());
-					} finally {
-						key.attach(response);
-						this.executed = true;
-						key.interestOps(SelectionKey.OP_WRITE);
-					}
-				} else {
-					key.interestOps(SelectionKey.OP_READ);
-				}
-			}
-		}
-
-		private RequestBody resolveRequestBody(SocketChannel sock,
-				ByteBuffer buf, int eoh, int read, String method,
-				List<String> contentLengthHeader) throws IOException {
-			if (this.body != null) {
-				byte[] dst = new byte[read];
-				buf.get(dst);
-				body.update(dst);
-				buf.clear();
-				return body;
-			}
-			if (method.equalsIgnoreCase("POST")
-					|| method.equalsIgnoreCase("PUT")) {
-				int contentLength = CollectionUtils
-						.isEmpty(contentLengthHeader) ? -1 : Integer
-						.valueOf(contentLengthHeader.get(0));
-				if (contentLength < 0) {
-					throw new RequestCancelledException(HttpStatus.BAD_REQUEST,
-							StringUtils.EMPTY);
-				}
-				int firstBodySize = buf.limit() - eoh;
-				byte[] ba = new byte[firstBodySize];
-				buf = (ByteBuffer) buf.position(eoh);
-				buf.get(ba);
-				buf.clear();
-				return new RequestBody(contentLength, ba, props);
-			} else {
-				return new RequestBody();
-			}
-		}
-
-		public boolean write(SelectionKey key) throws IOException {
-			SocketChannel sock = (SocketChannel) key.channel();
-			sock.configureBlocking(false);
-			ResponseContextImpl ri = (ResponseContextImpl) key.attachment();
-			if (ri.completed() == false) {
-				key.interestOps(SelectionKey.OP_WRITE);
-				return false;
-			}
-			ResponseBody rb = ri.getBody();
-			if (rb == null) {
-				key.channel().register(key.selector(), SelectionKey.OP_READ);
-				sock.close();
-				return true;
-			}
-			ByteBuffer buffer = rb.getByteBuffer();
-			if (buffer == null) {
-				key.channel().register(key.selector(), SelectionKey.OP_READ);
-				sock.close();
-				return true;
-			}
-			buffer.flip();
-			try {
-				sock.write(buffer);
-			} catch (Exception e) {
-			} finally {
-				if (buffer.hasRemaining() == false) {
-					key.channel()
-							.register(key.selector(), SelectionKey.OP_READ);
-					sock.close();
-				} else {
-					buffer.compact();
-					key.interestOps(SelectionKey.OP_WRITE);
-				}
-			}
-			return buffer.hasRemaining() == false;
-		}
-	}
-
-	private int endOfHeader(final ByteBuffer buf, int length) {
-		int splitbyte = 0;
-		while (splitbyte + 3 < length) {
-			if (buf.get(splitbyte) == '\r' && buf.get(splitbyte + 1) == '\n'
-					&& buf.get(splitbyte + 2) == '\r'
-					&& buf.get(splitbyte + 3) == '\n') {
-				return splitbyte + 4;
-			}
-			splitbyte++;
-		}
-		return 0;
-	}
-
-	private void sendStatus(final SocketChannel sock, HttpStatus status,
-			String body) {
-		CharBuffer buffer = CharBuffer.allocate(8192);
-		buffer.append("HTTP/1.1").append(' ')
-				.append(String.valueOf(status.getStatusCode())).append(' ')
-				.append(status.getPhrase()).append('\r').append('\n');
-		SimpleDateFormat dateFormat = new SimpleDateFormat(
-				"E, d MMM yyyy HH:mm:ss 'GMT'", Locale.US);
-		dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
-		buffer.append("Date: ").append(dateFormat.format(new Date()))
-				.append('\r').append('\n');
-		if (StringUtils.isNotEmpty(body)) {
-			buffer.append("Content-Length: ")
-					.append(String.valueOf(body.length())).append('\r')
-					.append('\n');
-		}
-		buffer.append("Connection: close");
-		buffer.append("\r\n");
-		buffer.append("\r\n");
-		buffer.flip();
-		Charset iso = Charset.forName("ISO-8859-1");
-		try {
-			sock.write(iso.encode(buffer));
-			if (StringUtils.isNotEmpty(body)) {
-				sock.write(ByteBuffer.wrap(body.getBytes()));
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			IOUtils.closeQuietly(sock);
-		}
-	}
-
-	private static final class RequestCancelledException
-			extends
-				RuntimeException {
-
-		private static final long serialVersionUID = -5041505179564601790L;
-		private HttpStatus status;
-		private String body;
-
-		RequestCancelledException(HttpStatus status, String body) {
-			this.status = status;
-			this.body = body;
-		}
-
-		public HttpStatus getStatus() {
-			return this.status;
-		}
-
-		public String getBody() {
-			return this.body;
-		}
-	}
-
-	private static final class RequestContextImpl
-			extends
-				AbstractRequestContext implements Disposable {
-
-		private Map<String, List<String>> headerMap;
-		private RequestBody body;
-
-		RequestContextImpl(RequestPath requestPath, Locale defaultLocale,
-				Map<String, List<String>> headerMap, RequestBody body) {
-			super(requestPath, defaultLocale);
-			this.body = body;
-			this.headerMap = headerMap;
-		}
-
-		@Override
-		public String getRequestMethod() {
-			return getRequestPath().getRequestMethods().get(0);
-		}
-
-		@Override
-		public Headers getRequestHeaders() {
-			return new MapHeaders(headerMap);
-		}
-
-		@Override
-		public ReadableBuffer getRequestBody() throws IOException {
-			return body.open();
-		}
-
-		@Override
-		public void dispose() {
-			this.headerMap.clear();
-			this.body.dispose();
-		}
-	}
-
-	private static final class RequestBody implements Disposable {
-
-		private static final ByteArrayInputStream EMPTY = new ByteArrayInputStream(
-				new byte[0]);
-		private OutputStream out;
-		private InputStream in;
-		private int remain;
-		private boolean resolved;
-		private File file;
-		private RandomAccessFile ra;
-
-		RequestBody() {
-			this.in = new ByteArrayInputStream(new byte[0]);
-			this.resolved = true;
-		}
-
-		RequestBody(int remain, byte[] first, ApplicationProperties props)
-				throws IOException {
-			this.remain = remain;
-			if (remain > 1024 * 1024) {
-				// Over 1M bytes.
-				this.file = File.createTempFile("Analogweb", "Request",
-						props.getTempDir());
-				this.ra = new RandomAccessFile(file, "rw");
-				this.out = new FileOutputStream(ra.getFD());
-			} else {
-				// In memory mode.
-				this.out = new ByteArrayOutputStream();
-			}
-			update(first);
-		}
-
-		public boolean resolved() {
-			return this.resolved;
-		}
-
-		@Override
-		public void dispose() {
-			IOUtils.closeQuietly(this.ra);
-			IOUtils.closeQuietly(in);
-			this.in = null;
-			IOUtils.closeQuietly(out);
-			this.out = null;
-			if (this.file != null) {
-				this.file.deleteOnExit();
-			}
-		}
-
-		public void update(byte[] buffer) throws IOException {
-			if (this.out == null) {
-				return;
-			}
-			this.remain -= buffer.length;
-			this.out.write(buffer);
-			if (this.remain < 1) {
-				this.resolved = true;
-			}
-		}
-
-		public ReadableBuffer open() throws IOException {
-			if (this.ra != null) {
-				IOUtils.closeQuietly(this.ra);
-				this.ra = new RandomAccessFile(file, "r");
-				return DefaultReadableBuffer.readBuffer(Channels
-						.newChannel(new FileInputStream(this.ra.getFD())));
-			} else {
-				if (this.out instanceof ByteArrayOutputStream) {
-					return DefaultReadableBuffer
-							.readBuffer(Channels
-									.newChannel(new ByteArrayInputStream(
-											((ByteArrayOutputStream) out)
-													.toByteArray())));
-				} else {
-					return DefaultReadableBuffer.readBuffer(Channels
-							.newChannel(EMPTY));
-				}
-			}
-		}
-	}
-
-	static final class ResponseContextImpl extends AbstractResponseContext {
-
-		private RequestContext request;
-		private SocketChannel sock;
-		private ResponseBody body;
-
-		ResponseContextImpl(final RequestContext request,
-				final SocketChannel sock) {
-			this.request = request;
-			this.sock = sock;
-		}
-
-		public ResponseBody getBody() {
-			return this.body;
-		}
-
-		@Override
-		public void commit(RequestContext context, Response response) {
-			// write headers
-			CharBuffer buffer = CharBuffer.allocate(8192);
-			buffer.append("HTTP/1.1").append(' ')
-					.append(String.valueOf(getStatus())).append(' ')
-					.append(HttpStatus.valueOf(getStatus()).getPhrase())
-					.append("\r\n");
-			Headers h = getResponseHeaders();
-			if (h.contains("Date") == false) {
-				SimpleDateFormat dateFormat = new SimpleDateFormat(
-						"E, d MMM yyyy HH:mm:ss 'GMT'", Locale.US);
-				dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
-				buffer.append("Date: ").append(dateFormat.format(new Date()))
-						.append("\r\n");
-			}
-			long length = response.getContentLength();
-			OutputStream out = null;
-			if (request.getRequestMethod().equals("HEAD") == false) {
-				if (h.contains("Content-Length") == false && length != -1) {
-					buffer.append("Content-Length: ")
-							.append(String.valueOf(length)).append("\r\n");
-					out = toFixedLengthOutputStream(length, sock);
-				}
-				if (length == -1) {
-					buffer.append("Transfer-Encoding: chunked").append("\r\n");
-					out = toChunkedOutputStream(sock);
-				}
-			}
-			for (String headerName : h.getNames()) {
-				Iterator<String> values = h.getValues(headerName).iterator();
-				buffer.append(headerName).append(": ").append(values.next());
-				while (values.hasNext()) {
-					buffer.append(',').append(values.next());
-				}
-				buffer.append("\r\n");
-			}
-			buffer.append("\r\n");
-			buffer.flip();
-			Charset iso = Charset.forName("ISO-8859-1");
-			try {
-				sock.write(iso.encode(buffer));
-				ResponseEntity entity = response.getEntity();
-				if (entity != null) {
-					Object entityBody = entity.entity();
-					if (entityBody instanceof byte[]) {
-						out.write((byte[]) entityBody);
-					} else if (entityBody instanceof InputStream) {
-						IOUtils.copy((InputStream) entityBody, out);
-					} else if (entityBody instanceof ReadableBuffer) {
-						DefaultWritableBuffer.writeBuffer(out).from(
-								(ReadableBuffer) entityBody);
-					}
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			// write contents.s
-		}
-
-		private FixedLengthOutputStream toFixedLengthOutputStream(long length,
-				SocketChannel sock) {
-			return new FixedLengthOutputStream(toOutputStream(), length);
-		}
-
-		private ChunkedOutputStream toChunkedOutputStream(SocketChannel sock) {
-			return new ChunkedOutputStream(8192, toOutputStream());
-		}
-
-		private OutputStream toOutputStream() {
-			this.body = new ResponseBody(ByteBuffer.allocate(64 * 1024));
-			return new OutputStream() {
-
-				@Override
-				public void write(int b) throws IOException {
-					body.put(new byte[]{(byte) b});
-				}
-
-				@Override
-				public void write(byte[] b, int off, int len)
-						throws IOException {
-					body.put(b);
-				}
-			};
-		}
-	}
-
-	static final class ResponseBody {
-
-		private ByteBuffer backend;
-
-		private ResponseBody(ByteBuffer bb) {
-			this.backend = bb;
-		}
-
-		public static ResponseBody allocate(int capacity) {
-			return new ResponseBody(ByteBuffer.allocate(capacity));
-		}
-
-		public void put(byte[] src) {
-			ensureCapacity(src.length);
-			backend.put(src);
-		}
-
-		private void ensureCapacity(int size) {
-			int remaining = backend.remaining();
-			if (size > remaining) {
-				int missing = size - remaining;
-				int newSize = (int) ((backend.capacity() + missing) * 1.5);
-				reallocate(newSize);
-			}
-		}
-
-		// Preserves position.
-		private void reallocate(int newCapacity) {
-			int oldPosition = backend.position();
-			byte[] newBuffer = new byte[newCapacity];
-			System.arraycopy(backend.array(), 0, newBuffer, 0,
-					backend.position());
-			backend = ByteBuffer.wrap(newBuffer);
-			backend.position(oldPosition);
-		}
-
-		public ByteBuffer getByteBuffer() {
-			return backend;
-		}
-
-		public void flip() {
-			backend.flip();
-		}
-
-		public int limit() {
-			return backend.limit();
-		}
-
-		public int position() {
-			return backend.position();
-		}
-
-		public byte[] array() {
-			return backend.array();
-		}
-
-		public int capacity() {
-			return backend.capacity();
-		}
-
-		public boolean hasRemaining() {
-			return backend.hasRemaining();
-		}
-
-		public ResponseBody compact() {
-			backend.compact();
-			return this;
-		}
-
-		public ResponseBody clear() {
-			backend.clear();
-			return this;
-		}
-	}
-
-	static final class FixedLengthOutputStream extends OutputStream {
-
-		private final OutputStream out;
-		private final long contentLength;
-		private long total = 0;
-		private boolean closed = false;
-
-		FixedLengthOutputStream(final OutputStream out, final long contentLength) {
-			super();
-			this.out = out;
-			this.contentLength = contentLength;
-		}
-
-		@Override
-		public void close() throws IOException {
-			if (!this.closed) {
-				this.closed = true;
-				this.out.flush();
-			}
-		}
-
-		@Override
-		public void flush() throws IOException {
-			this.out.flush();
-		}
-
-		@Override
-		public void write(final byte[] b, final int off, final int len)
-				throws IOException {
-			if (this.closed) {
-				throw new IOException("Attempted write to closed stream.");
-			}
-			if (this.total < this.contentLength) {
-				final long max = this.contentLength - this.total;
-				int chunk = len;
-				if (chunk > max) {
-					chunk = (int) max;
-				}
-				this.out.write(b, off, chunk);
-				this.total += chunk;
-			}
-		}
-
-		@Override
-		public void write(final byte[] b) throws IOException {
-			write(b, 0, b.length);
-		}
-
-		@Override
-		public void write(final int b) throws IOException {
-			if (this.closed) {
-				throw new IOException("Attempted write to closed stream.");
-			}
-			if (this.total < this.contentLength) {
-				this.out.write(b);
-				this.total++;
-			}
-		}
-	}
-
-	static final class ChunkedOutputStream extends OutputStream {
-
-		private final OutputStream out;
-		private final byte[] cache;
-		private int cachePosition = 0;
-		private boolean wroteLastChunk = false;
-		private boolean closed = false;
-
-		ChunkedOutputStream(final int bufferSize, final OutputStream out) {
-			super();
-			this.cache = new byte[bufferSize];
-			this.out = out;
-		}
-
-		protected void flushCache() throws IOException {
-			if (this.cachePosition > 0) {
-				this.out.write(Integer.toHexString(this.cachePosition)
-						.getBytes());
-				this.out.write(CRLF);
-				this.out.write(this.cache, 0, this.cachePosition);
-				this.out.write("".getBytes());
-				this.cachePosition = 0;
-			}
-		}
-
-		protected void flushCacheWithAppend(final byte bufferToAppend[],
-				final int off, final int len) throws IOException {
-			this.out.write(Integer.toHexString(this.cachePosition + len)
-					.getBytes());
-			this.out.write(CRLF);
-			this.out.write(this.cache, 0, this.cachePosition);
-			this.out.write(bufferToAppend, off, len);
-			this.out.write("".getBytes());
-			this.cachePosition = 0;
-		}
-
-		protected void writeClosingChunk() throws IOException {
-			this.out.write("0".getBytes());
-			this.out.write("".getBytes());
-		}
-
-		public void finish() throws IOException {
-			if (!this.wroteLastChunk) {
-				flushCache();
-				writeClosingChunk();
-				this.wroteLastChunk = true;
-			}
-		}
-
-		@Override
-		public void write(final int b) throws IOException {
-			if (this.closed) {
-				throw new IOException("Attempted write to closed stream.");
-			}
-			this.cache[this.cachePosition] = (byte) b;
-			this.cachePosition++;
-			if (this.cachePosition == this.cache.length) {
-				flushCache();
-			}
-		}
-
-		@Override
-		public void write(final byte b[]) throws IOException {
-			write(b, 0, b.length);
-		}
-
-		@Override
-		public void write(final byte src[], final int off, final int len)
-				throws IOException {
-			if (this.closed) {
-				throw new IOException("Attempted write to closed stream.");
-			}
-			if (len >= this.cache.length - this.cachePosition) {
-				flushCacheWithAppend(src, off, len);
-			} else {
-				System.arraycopy(src, off, cache, this.cachePosition, len);
-				this.cachePosition += len;
-			}
-		}
-
-		@Override
-		public void flush() throws IOException {
-			flushCache();
-			this.out.flush();
-		}
-
-		@Override
-		public void close() throws IOException {
-			if (!this.closed) {
-				this.closed = true;
-				finish();
-				this.out.flush();
-			}
-		}
-	}
-
-	@Override
-	public void shutdown(int mode) {
-		app.get().dispose();
-	}
-
-	protected List<ClassCollector> getClassCollectors() {
-		List<ClassCollector> list = new ArrayList<ClassCollector>();
-		list.add(new JarClassCollector());
-		list.add(new FileClassCollector());
-		return Collections.unmodifiableList(list);
-	}
-
-	public void reload() {
-		Application newApplication = new WebApplication();
-		newApplication.run(resolver, props, getClassCollectors(), Thread
-				.currentThread().getContextClassLoader());
-		this.app.compareAndSet(this.app.get(), newApplication);
-	}
+    private static final int CR = 13;
+    private static final int LF = 10;
+    private static final byte[] CRLF = new byte[] { CR, LF };
+    private final URI serverURI;
+    private final AtomicReference<Application> app;
+    private final ApplicationContext resolver;
+    private final ApplicationProperties props;
+
+    public DefaultServer(String uri) {
+        this(URI.create(uri));
+    }
+
+    public DefaultServer(URI uri) {
+        this(uri, new WebApplication());
+    }
+
+    public DefaultServer(URI uri, Application app) {
+        this(uri, app, (ApplicationContext) null);
+    }
+
+    public DefaultServer(URI uri, Application app, ApplicationContext contextResolver) {
+        this(uri, app, contextResolver, defaultProperties());
+    }
+
+    public DefaultServer(URI uri, Application app, ApplicationProperties props) {
+        this(uri, app, null, props);
+    }
+
+    public DefaultServer(URI uri, Application app, ApplicationContext contextResolver, ApplicationProperties props) {
+        Assertion.notNull(app, Application.class.getName());
+        this.serverURI = uri;
+        this.app = new AtomicReference<Application>(app);
+        this.resolver = contextResolver;
+        this.props = props;
+    }
+
+    @Override
+    public void run() {
+        ServerSocketChannel cnl = null;
+        try {
+            this.app.get().run(resolver, props, getClassCollectors(), Thread.currentThread().getContextClassLoader());
+            cnl = SelectorProvider.provider().openServerSocketChannel();
+            cnl.configureBlocking(false);
+            cnl.socket().bind(new InetSocketAddress(this.serverURI.getPort()));
+            final Selector sl = Selector.open();
+            cnl.register(sl, SelectionKey.OP_ACCEPT);
+            runInternal(sl);
+        } catch (IOException e) {
+            throw new ApplicationRuntimeException(e) {
+
+                private static final long serialVersionUID = 1L;
+            };
+        } finally {
+            IOUtils.closeQuietly(cnl);
+        }
+    }
+
+    private Map<SelectableChannel, Handler> requests = Maps.newConcurrentHashMap();
+
+    private void runInternal(Selector sl) throws IOException {
+        while (true) {
+            while (sl.select(10) > 0) {
+                Iterator<SelectionKey> keys = sl.selectedKeys().iterator();
+                while (keys.hasNext()) {
+                    SelectionKey key = keys.next();
+                    keys.remove();
+                    if (key.isAcceptable()) {
+                        ServerSocketChannel ssock = (ServerSocketChannel) key.channel();
+                        SocketChannel channel = ssock.accept();
+                        channel.configureBlocking(false);
+                        channel.register(sl, SelectionKey.OP_READ);
+                    } else {
+                        if (key.isReadable()) {
+                            SelectableChannel channel = key.channel();
+                            Handler handler;
+                            if (requests.containsKey(channel)) {
+                                handler = requests.get(channel);
+                            } else {
+                                handler = new Handler();
+                                requests.put(channel, handler);
+                            }
+                            try {
+                                handler.read(key);
+                            } catch (RequestCancelledException e) {
+                                sendStatus((SocketChannel) key.channel(), e.getStatus(), e.getBody());
+                                requests.remove(channel);
+                            }
+                        }
+                        if (key.isValid() && key.isWritable()) {
+                            SelectableChannel channel = key.channel();
+                            boolean completed = false;
+                            try {
+                                completed = requests.get(channel).write(key);
+                            } finally {
+                                if (completed) {
+                                    requests.remove(channel);
+                                    channel.close();
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    final class Handler {
+
+        private RequestPath path;
+        private Map<String, List<String>> headerMap;
+        private RequestBody body;
+        private boolean executed;
+
+        public void read(SelectionKey key) throws IOException {
+            SocketChannel sock = (SocketChannel) key.channel();
+            sock.configureBlocking(false);
+            ByteBuffer buf = ByteBuffer.allocate(8192);
+            int read = sock.read(buf);
+            if (read == 1) {
+                // spinning.
+                return;
+            }
+            buf.flip();
+            if (read > 0) {
+                // Read first.
+                int eoh = 0;
+                if (headerMap == null || path == null) {
+                    eoh = endOfHeader(buf, read);
+                    while (eoh == 0) {
+                        buf.limit(8192);
+                        read = sock.read(buf);
+                        buf.flip();
+                        eoh = endOfHeader(buf, read);
+                    }
+                    BufferedReader r = new BufferedReader(new InputStreamReader(
+                            new ByteArrayInputStream(((ByteBuffer) buf.duplicate().limit(eoh)).array())));
+                    String aLine = r.readLine();
+                    if (aLine == null) {
+                        throw new RequestCancelledException(HttpStatus.BAD_REQUEST, StringUtils.EMPTY);
+                    }
+                    StringTokenizer st = new StringTokenizer(aLine);
+                    if (st.countTokens() < 2) {
+                        throw new RequestCancelledException(HttpStatus.BAD_REQUEST, StringUtils.EMPTY);
+                    }
+                    final String method = st.nextToken();
+                    final URI uri = URI.create(st.nextToken());
+                    path = new DefaultRequestPath(URI.create("/"), uri, method);
+                    headerMap = Maps.newEmptyHashMap();
+                    while ((aLine = r.readLine()) != null && aLine.trim().length() != 0) {
+                        int i = aLine.indexOf(':');
+                        if (i > 0 && i < aLine.length()) {
+                            String k = aLine.substring(0, i).trim();
+                            String value = aLine.substring(i + 1).trim();
+                            headerMap.put(k, Arrays.asList(value));
+                        }
+                    }
+                }
+                body = resolveRequestBody(sock, buf, eoh, read, path.getRequestMethod(),
+                        headerMap.get("Content-Length"));
+                if (body.resolved() && executed == false) {
+                    RequestContextImpl request = new RequestContextImpl(path, Locale.getDefault(), headerMap, body);
+                    ResponseContextImpl response = new ResponseContextImpl(request, sock);
+                    try {
+                        Response proceed = app.get().processRequest(request.getRequestPath(), request, response);
+                        if (proceed == Application.NOT_FOUND) {
+                            throw new RequestCancelledException(HttpStatus.NOT_FOUND, StringUtils.EMPTY);
+                        } else {
+                            proceed.commit(request, response);
+                        }
+                    } catch (WebApplicationException e) {
+                        e.printStackTrace();
+                        throw new RequestCancelledException(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage());
+                    } finally {
+                        key.attach(response);
+                        this.executed = true;
+                        key.interestOps(SelectionKey.OP_WRITE);
+                    }
+                } else {
+                    key.interestOps(SelectionKey.OP_READ);
+                }
+            }
+        }
+
+        private RequestBody resolveRequestBody(SocketChannel sock, ByteBuffer buf, int eoh, int read, String method,
+                List<String> contentLengthHeader) throws IOException {
+            if (this.body != null) {
+                byte[] dst = new byte[read];
+                buf.get(dst);
+                body.update(dst);
+                buf.clear();
+                return body;
+            }
+            if (method.equalsIgnoreCase("POST") || method.equalsIgnoreCase("PUT")) {
+                int contentLength = CollectionUtils.isEmpty(contentLengthHeader) ? -1
+                        : Integer.valueOf(contentLengthHeader.get(0));
+                if (contentLength < 0) {
+                    throw new RequestCancelledException(HttpStatus.BAD_REQUEST, StringUtils.EMPTY);
+                }
+                int firstBodySize = buf.limit() - eoh;
+                byte[] ba = new byte[firstBodySize];
+                buf = (ByteBuffer) buf.position(eoh);
+                buf.get(ba);
+                buf.clear();
+                return new RequestBody(contentLength, ba, props);
+            } else {
+                return new RequestBody();
+            }
+        }
+
+        public boolean write(SelectionKey key) throws IOException {
+            SocketChannel sock = (SocketChannel) key.channel();
+            sock.configureBlocking(false);
+            ResponseContextImpl ri = (ResponseContextImpl) key.attachment();
+            if (ri.completed() == false) {
+                key.interestOps(SelectionKey.OP_WRITE);
+                return false;
+            }
+            ResponseBody rb = ri.getBody();
+            if (rb == null) {
+                key.channel().register(key.selector(), SelectionKey.OP_READ);
+                sock.close();
+                return true;
+            }
+            ByteBuffer buffer = rb.getByteBuffer();
+            if (buffer == null) {
+                key.channel().register(key.selector(), SelectionKey.OP_READ);
+                sock.close();
+                return true;
+            }
+            buffer.flip();
+            try {
+                sock.write(buffer);
+            } catch (Exception e) {
+            } finally {
+                if (buffer.hasRemaining() == false) {
+                    key.channel().register(key.selector(), SelectionKey.OP_READ);
+                    sock.close();
+                } else {
+                    buffer.compact();
+                    key.interestOps(SelectionKey.OP_WRITE);
+                }
+            }
+            return buffer.hasRemaining() == false;
+        }
+    }
+
+    private int endOfHeader(final ByteBuffer buf, int length) {
+        int splitbyte = 0;
+        while (splitbyte + 3 < length) {
+            if (buf.get(splitbyte) == '\r' && buf.get(splitbyte + 1) == '\n' && buf.get(splitbyte + 2) == '\r'
+                    && buf.get(splitbyte + 3) == '\n') {
+                return splitbyte + 4;
+            }
+            splitbyte++;
+        }
+        return 0;
+    }
+
+    private void sendStatus(final SocketChannel sock, HttpStatus status, String body) {
+        CharBuffer buffer = CharBuffer.allocate(8192);
+        buffer.append("HTTP/1.1").append(' ').append(String.valueOf(status.getStatusCode())).append(' ')
+                .append(status.getPhrase()).append('\r').append('\n');
+        SimpleDateFormat dateFormat = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss 'GMT'", Locale.US);
+        dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
+        buffer.append("Date: ").append(dateFormat.format(new Date())).append('\r').append('\n');
+        if (StringUtils.isNotEmpty(body)) {
+            buffer.append("Content-Length: ").append(String.valueOf(body.length())).append('\r').append('\n');
+        }
+        buffer.append("Connection: close");
+        buffer.append("\r\n");
+        buffer.append("\r\n");
+        buffer.flip();
+        Charset iso = Charset.forName("ISO-8859-1");
+        try {
+            sock.write(iso.encode(buffer));
+            if (StringUtils.isNotEmpty(body)) {
+                sock.write(ByteBuffer.wrap(body.getBytes()));
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            IOUtils.closeQuietly(sock);
+        }
+    }
+
+    private static final class RequestCancelledException extends RuntimeException {
+
+        private static final long serialVersionUID = -5041505179564601790L;
+        private HttpStatus status;
+        private String body;
+
+        RequestCancelledException(HttpStatus status, String body) {
+            this.status = status;
+            this.body = body;
+        }
+
+        public HttpStatus getStatus() {
+            return this.status;
+        }
+
+        public String getBody() {
+            return this.body;
+        }
+    }
+
+    private static final class RequestContextImpl extends AbstractRequestContext implements Disposable {
+
+        private Map<String, List<String>> headerMap;
+        private RequestBody body;
+
+        RequestContextImpl(RequestPath requestPath, Locale defaultLocale, Map<String, List<String>> headerMap,
+                RequestBody body) {
+            super(requestPath, defaultLocale);
+            this.body = body;
+            this.headerMap = headerMap;
+        }
+
+        @Override
+        public String getRequestMethod() {
+            return getRequestPath().getRequestMethods().get(0);
+        }
+
+        @Override
+        public Headers getRequestHeaders() {
+            return new MapHeaders(headerMap);
+        }
+
+        @Override
+        public ReadableBuffer getRequestBody() throws IOException {
+            return body.open();
+        }
+
+        @Override
+        public void dispose() {
+            this.headerMap.clear();
+            this.body.dispose();
+        }
+    }
+
+    private static final class RequestBody implements Disposable {
+
+        private static final ByteArrayInputStream EMPTY = new ByteArrayInputStream(new byte[0]);
+        private OutputStream out;
+        private InputStream in;
+        private int remain;
+        private boolean resolved;
+        private File file;
+        private RandomAccessFile ra;
+
+        RequestBody() {
+            this.in = new ByteArrayInputStream(new byte[0]);
+            this.resolved = true;
+        }
+
+        RequestBody(int remain, byte[] first, ApplicationProperties props) throws IOException {
+            this.remain = remain;
+            if (remain > 1024 * 1024) {
+                // Over 1M bytes.
+                this.file = File.createTempFile("Analogweb", "Request", props.getTempDir());
+                this.ra = new RandomAccessFile(file, "rw");
+                this.out = new FileOutputStream(ra.getFD());
+            } else {
+                // In memory mode.
+                this.out = new ByteArrayOutputStream();
+            }
+            update(first);
+        }
+
+        public boolean resolved() {
+            return this.resolved;
+        }
+
+        @Override
+        public void dispose() {
+            IOUtils.closeQuietly(this.ra);
+            IOUtils.closeQuietly(in);
+            this.in = null;
+            IOUtils.closeQuietly(out);
+            this.out = null;
+            if (this.file != null) {
+                this.file.deleteOnExit();
+            }
+        }
+
+        public void update(byte[] buffer) throws IOException {
+            if (this.out == null) {
+                return;
+            }
+            this.remain -= buffer.length;
+            this.out.write(buffer);
+            if (this.remain < 1) {
+                this.resolved = true;
+            }
+        }
+
+        public ReadableBuffer open() throws IOException {
+            if (this.ra != null) {
+                IOUtils.closeQuietly(this.ra);
+                this.ra = new RandomAccessFile(file, "r");
+                return DefaultReadableBuffer.readBuffer(Channels.newChannel(new FileInputStream(this.ra.getFD())));
+            } else {
+                if (this.out instanceof ByteArrayOutputStream) {
+                    return DefaultReadableBuffer.readBuffer(
+                            Channels.newChannel(new ByteArrayInputStream(((ByteArrayOutputStream) out).toByteArray())));
+                } else {
+                    return DefaultReadableBuffer.readBuffer(Channels.newChannel(EMPTY));
+                }
+            }
+        }
+    }
+
+    static final class ResponseContextImpl extends AbstractResponseContext {
+
+        private RequestContext request;
+        private SocketChannel sock;
+        private ResponseBody body;
+
+        ResponseContextImpl(final RequestContext request, final SocketChannel sock) {
+            this.request = request;
+            this.sock = sock;
+        }
+
+        public ResponseBody getBody() {
+            return this.body;
+        }
+
+        @Override
+        public void commit(RequestContext context, Response response) {
+            // write headers
+            CharBuffer buffer = CharBuffer.allocate(8192);
+            buffer.append("HTTP/1.1").append(' ').append(String.valueOf(getStatus())).append(' ')
+                    .append(HttpStatus.valueOf(getStatus()).getPhrase()).append("\r\n");
+            Headers h = getResponseHeaders();
+            if (h.contains("Date") == false) {
+                SimpleDateFormat dateFormat = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss 'GMT'", Locale.US);
+                dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
+                buffer.append("Date: ").append(dateFormat.format(new Date())).append("\r\n");
+            }
+            long length = response.getContentLength();
+            OutputStream out = null;
+            if (request.getRequestMethod().equals("HEAD") == false) {
+                if (h.contains("Content-Length") == false && length != -1) {
+                    buffer.append("Content-Length: ").append(String.valueOf(length)).append("\r\n");
+                    out = toFixedLengthOutputStream(length, sock);
+                }
+                if (length == -1) {
+                    buffer.append("Transfer-Encoding: chunked").append("\r\n");
+                    out = toChunkedOutputStream(sock);
+                }
+            }
+            for (String headerName : h.getNames()) {
+                Iterator<String> values = h.getValues(headerName).iterator();
+                buffer.append(headerName).append(": ").append(values.next());
+                while (values.hasNext()) {
+                    buffer.append(',').append(values.next());
+                }
+                buffer.append("\r\n");
+            }
+            buffer.append("\r\n");
+            buffer.flip();
+            Charset iso = Charset.forName("ISO-8859-1");
+            try {
+                sock.write(iso.encode(buffer));
+                ResponseEntity entity = response.getEntity();
+                if (entity != null) {
+                    Object entityBody = entity.entity();
+                    if (entityBody instanceof byte[]) {
+                        out.write((byte[]) entityBody);
+                    } else if (entityBody instanceof InputStream) {
+                        IOUtils.copy((InputStream) entityBody, out);
+                    } else if (entityBody instanceof ReadableBuffer) {
+                        DefaultWritableBuffer.writeBuffer(out).from((ReadableBuffer) entityBody);
+                    }
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            // write contents.s
+        }
+
+        private FixedLengthOutputStream toFixedLengthOutputStream(long length, SocketChannel sock) {
+            return new FixedLengthOutputStream(toOutputStream(), length);
+        }
+
+        private ChunkedOutputStream toChunkedOutputStream(SocketChannel sock) {
+            return new ChunkedOutputStream(8192, toOutputStream());
+        }
+
+        private OutputStream toOutputStream() {
+            this.body = new ResponseBody(ByteBuffer.allocate(64 * 1024));
+            return new OutputStream() {
+
+                @Override
+                public void write(int b) throws IOException {
+                    body.put(new byte[] { (byte) b });
+                }
+
+                @Override
+                public void write(byte[] b, int off, int len) throws IOException {
+                    body.put(b);
+                }
+            };
+        }
+    }
+
+    static final class ResponseBody {
+
+        private ByteBuffer backend;
+
+        private ResponseBody(ByteBuffer bb) {
+            this.backend = bb;
+        }
+
+        public static ResponseBody allocate(int capacity) {
+            return new ResponseBody(ByteBuffer.allocate(capacity));
+        }
+
+        public void put(byte[] src) {
+            ensureCapacity(src.length);
+            backend.put(src);
+        }
+
+        private void ensureCapacity(int size) {
+            int remaining = backend.remaining();
+            if (size > remaining) {
+                int missing = size - remaining;
+                int newSize = (int) ((backend.capacity() + missing) * 1.5);
+                reallocate(newSize);
+            }
+        }
+
+        // Preserves position.
+        private void reallocate(int newCapacity) {
+            int oldPosition = backend.position();
+            byte[] newBuffer = new byte[newCapacity];
+            System.arraycopy(backend.array(), 0, newBuffer, 0, backend.position());
+            backend = ByteBuffer.wrap(newBuffer);
+            backend.position(oldPosition);
+        }
+
+        public ByteBuffer getByteBuffer() {
+            return backend;
+        }
+
+        public void flip() {
+            backend.flip();
+        }
+
+        public int limit() {
+            return backend.limit();
+        }
+
+        public int position() {
+            return backend.position();
+        }
+
+        public byte[] array() {
+            return backend.array();
+        }
+
+        public int capacity() {
+            return backend.capacity();
+        }
+
+        public boolean hasRemaining() {
+            return backend.hasRemaining();
+        }
+
+        public ResponseBody compact() {
+            backend.compact();
+            return this;
+        }
+
+        public ResponseBody clear() {
+            backend.clear();
+            return this;
+        }
+    }
+
+    static final class FixedLengthOutputStream extends OutputStream {
+
+        private final OutputStream out;
+        private final long contentLength;
+        private long total = 0;
+        private boolean closed = false;
+
+        FixedLengthOutputStream(final OutputStream out, final long contentLength) {
+            super();
+            this.out = out;
+            this.contentLength = contentLength;
+        }
+
+        @Override
+        public void close() throws IOException {
+            if (!this.closed) {
+                this.closed = true;
+                this.out.flush();
+            }
+        }
+
+        @Override
+        public void flush() throws IOException {
+            this.out.flush();
+        }
+
+        @Override
+        public void write(final byte[] b, final int off, final int len) throws IOException {
+            if (this.closed) {
+                throw new IOException("Attempted write to closed stream.");
+            }
+            if (this.total < this.contentLength) {
+                final long max = this.contentLength - this.total;
+                int chunk = len;
+                if (chunk > max) {
+                    chunk = (int) max;
+                }
+                this.out.write(b, off, chunk);
+                this.total += chunk;
+            }
+        }
+
+        @Override
+        public void write(final byte[] b) throws IOException {
+            write(b, 0, b.length);
+        }
+
+        @Override
+        public void write(final int b) throws IOException {
+            if (this.closed) {
+                throw new IOException("Attempted write to closed stream.");
+            }
+            if (this.total < this.contentLength) {
+                this.out.write(b);
+                this.total++;
+            }
+        }
+    }
+
+    static final class ChunkedOutputStream extends OutputStream {
+
+        private final OutputStream out;
+        private final byte[] cache;
+        private int cachePosition = 0;
+        private boolean wroteLastChunk = false;
+        private boolean closed = false;
+
+        ChunkedOutputStream(final int bufferSize, final OutputStream out) {
+            super();
+            this.cache = new byte[bufferSize];
+            this.out = out;
+        }
+
+        protected void flushCache() throws IOException {
+            if (this.cachePosition > 0) {
+                this.out.write(Integer.toHexString(this.cachePosition).getBytes());
+                this.out.write(CRLF);
+                this.out.write(this.cache, 0, this.cachePosition);
+                this.out.write("".getBytes());
+                this.cachePosition = 0;
+            }
+        }
+
+        protected void flushCacheWithAppend(final byte bufferToAppend[], final int off, final int len)
+                throws IOException {
+            this.out.write(Integer.toHexString(this.cachePosition + len).getBytes());
+            this.out.write(CRLF);
+            this.out.write(this.cache, 0, this.cachePosition);
+            this.out.write(bufferToAppend, off, len);
+            this.out.write("".getBytes());
+            this.cachePosition = 0;
+        }
+
+        protected void writeClosingChunk() throws IOException {
+            this.out.write("0".getBytes());
+            this.out.write("".getBytes());
+        }
+
+        public void finish() throws IOException {
+            if (!this.wroteLastChunk) {
+                flushCache();
+                writeClosingChunk();
+                this.wroteLastChunk = true;
+            }
+        }
+
+        @Override
+        public void write(final int b) throws IOException {
+            if (this.closed) {
+                throw new IOException("Attempted write to closed stream.");
+            }
+            this.cache[this.cachePosition] = (byte) b;
+            this.cachePosition++;
+            if (this.cachePosition == this.cache.length) {
+                flushCache();
+            }
+        }
+
+        @Override
+        public void write(final byte b[]) throws IOException {
+            write(b, 0, b.length);
+        }
+
+        @Override
+        public void write(final byte src[], final int off, final int len) throws IOException {
+            if (this.closed) {
+                throw new IOException("Attempted write to closed stream.");
+            }
+            if (len >= this.cache.length - this.cachePosition) {
+                flushCacheWithAppend(src, off, len);
+            } else {
+                System.arraycopy(src, off, cache, this.cachePosition, len);
+                this.cachePosition += len;
+            }
+        }
+
+        @Override
+        public void flush() throws IOException {
+            flushCache();
+            this.out.flush();
+        }
+
+        @Override
+        public void close() throws IOException {
+            if (!this.closed) {
+                this.closed = true;
+                finish();
+                this.out.flush();
+            }
+        }
+    }
+
+    @Override
+    public void shutdown(int mode) {
+        app.get().dispose();
+    }
+
+    protected List<ClassCollector> getClassCollectors() {
+        List<ClassCollector> list = new ArrayList<ClassCollector>();
+        list.add(new JarClassCollector());
+        list.add(new FileClassCollector());
+        return Collections.unmodifiableList(list);
+    }
+
+    public void reload() {
+        Application newApplication = new WebApplication();
+        newApplication.run(resolver, props, getClassCollectors(), Thread.currentThread().getContextClassLoader());
+        this.app.compareAndSet(this.app.get(), newApplication);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultTypeMapperContext.java b/src/main/java/org/analogweb/core/DefaultTypeMapperContext.java
index 79bbc2e..8ecd367 100644
--- a/src/main/java/org/analogweb/core/DefaultTypeMapperContext.java
+++ b/src/main/java/org/analogweb/core/DefaultTypeMapperContext.java
@@ -16,106 +16,98 @@
 /**
  * @author snowgoose
  */
-public class DefaultTypeMapperContext
-		implements
-			TypeMapperContext,
-			ModulesContainerAdaptorAware {
+public class DefaultTypeMapperContext implements TypeMapperContext, ModulesContainerAdaptorAware {
 
-	private static final Log log = Logs.getLog(DefaultTypeMapperContext.class);
-	private TypeMapper defaultTypeMapper = new AutoTypeMapper();
-	private ContainerAdaptor containerAdapter;
+    private static final Log log = Logs.getLog(DefaultTypeMapperContext.class);
+    private TypeMapper defaultTypeMapper = new AutoTypeMapper();
+    private ContainerAdaptor containerAdapter;
 
-	@Override
-	@SuppressWarnings("unchecked")
-	public <T> T mapToType(Class<? extends TypeMapper> typeMapperClass,
-			Object from, Class<T> requiredType, String[] formats) {
-		Assertion.notNull(requiredType, "RequiredType");
-		log.log(Markers.VARIABLE_ACCESS, "DC000001", from, requiredType,
-				formats);
-		if (requiredType.isAssignableFrom((from.getClass()))) {
-			return (T) from;
-		}
-		T result = handleCollection(requiredType, from);
-		if (result != null) {
-			return result;
-		}
-		result = handleArray(requiredType, from);
-		if (result != null) {
-			return result;
-		}
-		TypeMapper typeMapper = findTypeMapper(typeMapperClass);
-		if (typeMapper != null) {
-			return (T) typeMapper.mapToType(from, requiredType, formats);
-		} else {
-			return (T) getDefaultTypeMapper().mapToType(from, requiredType,
-					formats);
-		}
-	}
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T mapToType(Class<? extends TypeMapper> typeMapperClass, Object from, Class<T> requiredType,
+            String[] formats) {
+        Assertion.notNull(requiredType, "RequiredType");
+        log.log(Markers.VARIABLE_ACCESS, "DC000001", from, requiredType, formats);
+        if (requiredType.isAssignableFrom((from.getClass()))) {
+            return (T) from;
+        }
+        T result = handleCollection(requiredType, from);
+        if (result != null) {
+            return result;
+        }
+        result = handleArray(requiredType, from);
+        if (result != null) {
+            return result;
+        }
+        TypeMapper typeMapper = findTypeMapper(typeMapperClass);
+        if (typeMapper != null) {
+            return (T) typeMapper.mapToType(from, requiredType, formats);
+        } else {
+            return (T) getDefaultTypeMapper().mapToType(from, requiredType, formats);
+        }
+    }
 
-	@SuppressWarnings("unchecked")
-	protected <T> T handleArray(Class<T> requiredType, Object from) {
-		if (from == null) {
-			return null;
-		}
-		Object result = null;
-		if (from.getClass().isArray() && ArrayUtils.isNotEmpty((Object[]) from)
-				&& (result = Array.get(from, 0)) != null) {
-			if (requiredType.isAssignableFrom(result.getClass())) {
-				return (T) result;
-			} else if (requiredType.isArray()
-					&& requiredType.getComponentType().isAssignableFrom(
-							result.getClass())) {
-				return (T) from;
-			}
-		}
-		return null;
-	}
+    @SuppressWarnings("unchecked")
+    protected <T> T handleArray(Class<T> requiredType, Object from) {
+        if (from == null) {
+            return null;
+        }
+        Object result = null;
+        if (from.getClass().isArray() && ArrayUtils.isNotEmpty((Object[]) from)
+                && (result = Array.get(from, 0)) != null) {
+            if (requiredType.isAssignableFrom(result.getClass())) {
+                return (T) result;
+            } else if (requiredType.isArray() && requiredType.getComponentType().isAssignableFrom(result.getClass())) {
+                return (T) from;
+            }
+        }
+        return null;
+    }
 
-	@SuppressWarnings("unchecked")
-	protected <T> T handleCollection(Class<T> requiredType, Object from) {
-		if (from == null) {
-			return null;
-		}
-		if (from instanceof Collection) {
-			Collection<?> fromCollection = (Collection<?>) from;
-			if (Collection.class.isAssignableFrom(requiredType)) {
-				return (T) fromCollection;
-			}
-			Object result = null;
-			if (fromCollection.isEmpty() == false
-					&& requiredType.isAssignableFrom((result = fromCollection
-							.iterator().next()).getClass())) {
-				return (T) result;
-			}
-		}
-		return null;
-	}
+    @SuppressWarnings("unchecked")
+    protected <T> T handleCollection(Class<T> requiredType, Object from) {
+        if (from == null) {
+            return null;
+        }
+        if (from instanceof Collection) {
+            Collection<?> fromCollection = (Collection<?>) from;
+            if (Collection.class.isAssignableFrom(requiredType)) {
+                return (T) fromCollection;
+            }
+            Object result = null;
+            if (fromCollection.isEmpty() == false
+                    && requiredType.isAssignableFrom((result = fromCollection.iterator().next()).getClass())) {
+                return (T) result;
+            }
+        }
+        return null;
+    }
 
-	protected TypeMapper findTypeMapper(Class<? extends TypeMapper> clazz) {
-		if (clazz == null || isDefaultTypeMapper(clazz)) {
-			return null;
-		}
-		return getContainerAdaptor().getInstanceOfType(clazz);
-	}
+    protected TypeMapper findTypeMapper(Class<? extends TypeMapper> clazz) {
+        if (clazz == null || isDefaultTypeMapper(clazz)) {
+            return null;
+        }
+        return getContainerAdaptor().getInstanceOfType(clazz);
+    }
 
-	protected ContainerAdaptor getContainerAdaptor() {
-		return this.containerAdapter;
-	}
+    protected ContainerAdaptor getContainerAdaptor() {
+        return this.containerAdapter;
+    }
 
-	protected boolean isDefaultTypeMapper(Class<? extends TypeMapper> clazz) {
-		return clazz.equals(TypeMapper.class);
-	}
+    protected boolean isDefaultTypeMapper(Class<? extends TypeMapper> clazz) {
+        return clazz.equals(TypeMapper.class);
+    }
 
-	protected TypeMapper getDefaultTypeMapper() {
-		return this.defaultTypeMapper;
-	}
+    protected TypeMapper getDefaultTypeMapper() {
+        return this.defaultTypeMapper;
+    }
 
-	public void setDefaultTypeMapper(TypeMapper defaultTypeMapper) {
-		this.defaultTypeMapper = defaultTypeMapper;
-	}
+    public void setDefaultTypeMapper(TypeMapper defaultTypeMapper) {
+        this.defaultTypeMapper = defaultTypeMapper;
+    }
 
-	@Override
-	public void setModulesContainerAdaptor(ContainerAdaptor containerAdaptor) {
-		this.containerAdapter = containerAdaptor;
-	}
+    @Override
+    public void setModulesContainerAdaptor(ContainerAdaptor containerAdaptor) {
+        this.containerAdapter = containerAdaptor;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/DefaultWritableBuffer.java b/src/main/java/org/analogweb/core/DefaultWritableBuffer.java
index 2e4d5db..2944911 100644
--- a/src/main/java/org/analogweb/core/DefaultWritableBuffer.java
+++ b/src/main/java/org/analogweb/core/DefaultWritableBuffer.java
@@ -15,68 +15,67 @@
  */
 public class DefaultWritableBuffer implements WritableBuffer {
 
-	private WritableByteChannel channel;
-	private long length;
-
-	DefaultWritableBuffer(WritableByteChannel c, long length) {
-		this.channel = c;
-		this.length = length;
-	}
-
-	public static WritableBuffer writeBuffer(OutputStream out) {
-		return writeBuffer(Channels.newChannel(out));
-	}
-
-	public static WritableBuffer writeBuffer(WritableByteChannel c) {
-		return new DefaultWritableBuffer(c, 0);
-	}
-
-	public static WritableBuffer writeBuffer(WritableByteChannel c, long length) {
-		return new DefaultWritableBuffer(c, length);
-	}
-
-	protected WritableByteChannel getChannel() {
-		return this.channel;
-	}
-
-	@Override
-	public WritableBuffer writeBytes(byte[] bytes) throws IOException {
-		return writeBytes(bytes, 0, bytes.length);
-	}
-
-	@Override
-	public WritableBuffer writeBytes(byte[] bytes, int index, int length)
-			throws IOException {
-		getChannel().write(ByteBuffer.wrap(bytes, index, length));
-		if (this.length > -1) {
-			this.length += length - index;
-		}
-		return this;
-	}
-
-	@Override
-	public WritableBuffer writeBytes(ByteBuffer buffer) throws IOException {
-		if (this.length > -1) {
-			this.length += buffer.remaining();
-		}
-		getChannel().write(buffer);
-		return this;
-	}
-
-	@Override
-	public OutputStream asOutputStream() throws IOException {
-		return Channels.newOutputStream(getChannel());
-	}
-
-	@Override
-	public WritableByteChannel asChannel() throws IOException {
-		return getChannel();
-	}
-
-	@Override
-	public WritableBuffer from(ReadableBuffer readable) throws IOException {
-		IOUtils.copy(readable.asChannel(), asChannel());
-		return this;
-	}
+    private WritableByteChannel channel;
+    private long length;
+
+    DefaultWritableBuffer(WritableByteChannel c, long length) {
+        this.channel = c;
+        this.length = length;
+    }
+
+    public static WritableBuffer writeBuffer(OutputStream out) {
+        return writeBuffer(Channels.newChannel(out));
+    }
+
+    public static WritableBuffer writeBuffer(WritableByteChannel c) {
+        return new DefaultWritableBuffer(c, 0);
+    }
+
+    public static WritableBuffer writeBuffer(WritableByteChannel c, long length) {
+        return new DefaultWritableBuffer(c, length);
+    }
+
+    protected WritableByteChannel getChannel() {
+        return this.channel;
+    }
+
+    @Override
+    public WritableBuffer writeBytes(byte[] bytes) throws IOException {
+        return writeBytes(bytes, 0, bytes.length);
+    }
+
+    @Override
+    public WritableBuffer writeBytes(byte[] bytes, int index, int length) throws IOException {
+        getChannel().write(ByteBuffer.wrap(bytes, index, length));
+        if (this.length > -1) {
+            this.length += length - index;
+        }
+        return this;
+    }
+
+    @Override
+    public WritableBuffer writeBytes(ByteBuffer buffer) throws IOException {
+        if (this.length > -1) {
+            this.length += buffer.remaining();
+        }
+        getChannel().write(buffer);
+        return this;
+    }
+
+    @Override
+    public OutputStream asOutputStream() throws IOException {
+        return Channels.newOutputStream(getChannel());
+    }
+
+    @Override
+    public WritableByteChannel asChannel() throws IOException {
+        return getChannel();
+    }
+
+    @Override
+    public WritableBuffer from(ReadableBuffer readable) throws IOException {
+        IOUtils.copy(readable.asChannel(), asChannel());
+        return this;
+    }
 
 }
diff --git a/src/main/java/org/analogweb/core/EmptyCookies.java b/src/main/java/org/analogweb/core/EmptyCookies.java
index 74e4678..0e30d96 100644
--- a/src/main/java/org/analogweb/core/EmptyCookies.java
+++ b/src/main/java/org/analogweb/core/EmptyCookies.java
@@ -7,19 +7,19 @@
  */
 public class EmptyCookies implements Cookies {
 
-	@Override
-	public Cookie getCookie(String name) {
-		// nop.
-		return null;
-	}
+    @Override
+    public Cookie getCookie(String name) {
+        // nop.
+        return null;
+    }
 
-	@Override
-	public void putCookie(Cookie cookie) {
-		// nop.
-	}
+    @Override
+    public void putCookie(Cookie cookie) {
+        // nop.
+    }
 
-	@Override
-	public void putCookie(String name, Object value) {
-		// nop.
-	}
+    @Override
+    public void putCookie(String name, Object value) {
+        // nop.
+    }
 }
diff --git a/src/main/java/org/analogweb/core/FormParameters.java b/src/main/java/org/analogweb/core/FormParameters.java
index 48386d0..7e2e1f8 100644
--- a/src/main/java/org/analogweb/core/FormParameters.java
+++ b/src/main/java/org/analogweb/core/FormParameters.java
@@ -13,19 +13,16 @@
 
 public class FormParameters extends QueryParameters {
 
-	public FormParameters(URI requestURI, ReadableBuffer body,
-			MediaType contentType) {
-		super(requestURI, body, contentType);
-	}
+    public FormParameters(URI requestURI, ReadableBuffer body, MediaType contentType) {
+        super(requestURI, body, contentType);
+    }
 
-	@Override
-	protected String resolveParametersParts(URI requestURI,
-			ReadableBuffer body, MediaType contentType, Charset charset)
-			throws IOException {
-		if (MediaTypes.APPLICATION_FORM_URLENCODED_TYPE
-				.isCompatible(contentType)) {
-			return body.asString(charset);
-		}
-		return StringUtils.EMPTY;
-	}
+    @Override
+    protected String resolveParametersParts(URI requestURI, ReadableBuffer body, MediaType contentType, Charset charset)
+            throws IOException {
+        if (MediaTypes.APPLICATION_FORM_URLENCODED_TYPE.isCompatible(contentType)) {
+            return body.asString(charset);
+        }
+        return StringUtils.EMPTY;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/FormatFailureException.java b/src/main/java/org/analogweb/core/FormatFailureException.java
index c54ab11..97b555d 100644
--- a/src/main/java/org/analogweb/core/FormatFailureException.java
+++ b/src/main/java/org/analogweb/core/FormatFailureException.java
@@ -5,22 +5,21 @@
  */
 public class FormatFailureException extends ApplicationRuntimeException {
 
-	private static final long serialVersionUID = -9139072067367686900L;
-	private String format;
-	private Object formattingObject;
+    private static final long serialVersionUID = -9139072067367686900L;
+    private String format;
+    private Object formattingObject;
 
-	public FormatFailureException(Throwable cause, Object formattingObject,
-			String format) {
-		super(cause);
-		this.format = format;
-		this.formattingObject = formattingObject;
-	}
+    public FormatFailureException(Throwable cause, Object formattingObject, String format) {
+        super(cause);
+        this.format = format;
+        this.formattingObject = formattingObject;
+    }
 
-	public String getFormat() {
-		return format;
-	}
+    public String getFormat() {
+        return format;
+    }
 
-	public Object getFormattingObject() {
-		return formattingObject;
-	}
+    public Object getFormattingObject() {
+        return formattingObject;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/HeaderValueResolver.java b/src/main/java/org/analogweb/core/HeaderValueResolver.java
index 0588e39..cb25f5a 100644
--- a/src/main/java/org/analogweb/core/HeaderValueResolver.java
+++ b/src/main/java/org/analogweb/core/HeaderValueResolver.java
@@ -14,18 +14,17 @@
  */
 public class HeaderValueResolver implements RequestValueResolver {
 
-	@Override
-	public Object resolveValue(RequestContext requestContext,
-			InvocationMetadata metadatan, String name, Class<?> requiredtype,
-			Annotation[] annotations) {
-		if (StringUtils.isEmpty(name)) {
-			return null;
-		}
-		Headers headers = requestContext.getRequestHeaders();
-		List<String> headerValues = headers.getValues(name);
-		if (headerValues == null || headerValues.isEmpty()) {
-			return null;
-		}
-		return headerValues.toArray(new String[headerValues.size()]);
-	}
+    @Override
+    public Object resolveValue(RequestContext requestContext, InvocationMetadata metadatan, String name,
+            Class<?> requiredtype, Annotation[] annotations) {
+        if (StringUtils.isEmpty(name)) {
+            return null;
+        }
+        Headers headers = requestContext.getRequestHeaders();
+        List<String> headerValues = headers.getValues(name);
+        if (headerValues == null || headerValues.isEmpty()) {
+            return null;
+        }
+        return headerValues.toArray(new String[headerValues.size()]);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/InvalidRequestFormatException.java b/src/main/java/org/analogweb/core/InvalidRequestFormatException.java
index 21a1573..a71b1b9 100644
--- a/src/main/java/org/analogweb/core/InvalidRequestFormatException.java
+++ b/src/main/java/org/analogweb/core/InvalidRequestFormatException.java
@@ -7,22 +7,20 @@
  */
 public class InvalidRequestFormatException extends ApplicationRuntimeException {
 
-	private static final long serialVersionUID = -5549705070830618945L;
-	private final Class<? extends RequestValueResolver> resolverType;
+    private static final long serialVersionUID = -5549705070830618945L;
+    private final Class<? extends RequestValueResolver> resolverType;
 
-	public InvalidRequestFormatException(
-			Class<? extends RequestValueResolver> resolverType) {
-		super();
-		this.resolverType = resolverType;
-	}
+    public InvalidRequestFormatException(Class<? extends RequestValueResolver> resolverType) {
+        super();
+        this.resolverType = resolverType;
+    }
 
-	public InvalidRequestFormatException(Throwable t,
-			Class<? extends RequestValueResolver> resolverType) {
-		super(t);
-		this.resolverType = resolverType;
-	}
+    public InvalidRequestFormatException(Throwable t, Class<? extends RequestValueResolver> resolverType) {
+        super(t);
+        this.resolverType = resolverType;
+    }
 
-	public Class<? extends RequestValueResolver> getResolverType() {
-		return this.resolverType;
-	}
+    public Class<? extends RequestValueResolver> getResolverType() {
+        return this.resolverType;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/InvalidRequestFormatExceptionMapper.java b/src/main/java/org/analogweb/core/InvalidRequestFormatExceptionMapper.java
index 6c9175a..0b79cb8 100644
--- a/src/main/java/org/analogweb/core/InvalidRequestFormatExceptionMapper.java
+++ b/src/main/java/org/analogweb/core/InvalidRequestFormatExceptionMapper.java
@@ -6,11 +6,10 @@
  * @author snowgooseyk
  */
 public class InvalidRequestFormatExceptionMapper
-		extends
-			TypeAssignableFromExceptionMapper<InvalidRequestFormatException> {
+        extends TypeAssignableFromExceptionMapper<InvalidRequestFormatException> {
 
-	@Override
-	public Object mapToResult(Throwable throwable) {
-		return HttpStatus.BAD_REQUEST;
-	}
+    @Override
+    public Object mapToResult(Throwable throwable) {
+        return HttpStatus.BAD_REQUEST;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/InvalidRequestPathException.java b/src/main/java/org/analogweb/core/InvalidRequestPathException.java
index a696cc6..1b587ff 100644
--- a/src/main/java/org/analogweb/core/InvalidRequestPathException.java
+++ b/src/main/java/org/analogweb/core/InvalidRequestPathException.java
@@ -5,21 +5,20 @@
  */
 public class InvalidRequestPathException extends ApplicationRuntimeException {
 
-	private static final long serialVersionUID = -4471053025891886083L;
-	private String invalidRootPath;
-	private String invalidPath;
+    private static final long serialVersionUID = -4471053025891886083L;
+    private String invalidRootPath;
+    private String invalidPath;
 
-	public InvalidRequestPathException(String invalidRootPath,
-			String invalidPath) {
-		this.invalidRootPath = invalidRootPath;
-		this.invalidPath = invalidPath;
-	}
+    public InvalidRequestPathException(String invalidRootPath, String invalidPath) {
+        this.invalidRootPath = invalidRootPath;
+        this.invalidPath = invalidPath;
+    }
 
-	public String getInvalidPath() {
-		return this.invalidPath;
-	}
+    public String getInvalidPath() {
+        return this.invalidPath;
+    }
 
-	public String getInvalidRootPath() {
-		return this.invalidRootPath;
-	}
+    public String getInvalidRootPath() {
+        return this.invalidRootPath;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/InvocationChain.java b/src/main/java/org/analogweb/core/InvocationChain.java
index 5093da1..1d11aeb 100644
--- a/src/main/java/org/analogweb/core/InvocationChain.java
+++ b/src/main/java/org/analogweb/core/InvocationChain.java
@@ -15,59 +15,56 @@
  */
 class InvocationChain implements Invocation {
 
-	private Invocation root;
-	private InvocationMetadata metadata;
-	private Iterator<InvocationInterceptor> interceptors;
-	private boolean notArchiveTail = true;
-	private Object result;
+    private Invocation root;
+    private InvocationMetadata metadata;
+    private Iterator<InvocationInterceptor> interceptors;
+    private boolean notArchiveTail = true;
+    private Object result;
 
-	public static InvocationChain create(Invocation root,
-			InvocationMetadata metadata,
-			List<InvocationInterceptor> interceptors) {
-		return new InvocationChain(root, metadata, interceptors);
-	}
+    public static InvocationChain create(Invocation root, InvocationMetadata metadata,
+            List<InvocationInterceptor> interceptors) {
+        return new InvocationChain(root, metadata, interceptors);
+    }
 
-	@SuppressWarnings("unchecked")
-	private InvocationChain(Invocation root, InvocationMetadata metadata,
-			List<InvocationInterceptor> interceptors) {
-		super();
-		this.root = root;
-		this.metadata = metadata;
-		if (CollectionUtils.isEmpty(interceptors)) {
-			this.interceptors = Collections.EMPTY_LIST.iterator();
-		} else {
-			this.interceptors = interceptors.iterator();
-		}
-	}
+    @SuppressWarnings("unchecked")
+    private InvocationChain(Invocation root, InvocationMetadata metadata, List<InvocationInterceptor> interceptors) {
+        super();
+        this.root = root;
+        this.metadata = metadata;
+        if (CollectionUtils.isEmpty(interceptors)) {
+            this.interceptors = Collections.EMPTY_LIST.iterator();
+        } else {
+            this.interceptors = interceptors.iterator();
+        }
+    }
 
-	@Override
-	public Object invoke() {
-		if (interceptors.hasNext()) {
-			InvocationInterceptor interceptor = interceptors.next();
-			result = interceptor.onInvoke(this, metadata);
-		} else {
-			if (notArchiveTail) {
-				result = new AbstractInvocationInterceptor() {
+    @Override
+    public Object invoke() {
+        if (interceptors.hasNext()) {
+            InvocationInterceptor interceptor = interceptors.next();
+            result = interceptor.onInvoke(this, metadata);
+        } else {
+            if (notArchiveTail) {
+                result = new AbstractInvocationInterceptor() {
 
-					@Override
-					public Object onInvoke(Invocation invocation,
-							InvocationMetadata metadata) {
-						return root.invoke();
-					}
-				}.onInvoke(this, metadata);
-				notArchiveTail = false;
-			}
-		}
-		return result;
-	}
+                    @Override
+                    public Object onInvoke(Invocation invocation, InvocationMetadata metadata) {
+                        return root.invoke();
+                    }
+                }.onInvoke(this, metadata);
+                notArchiveTail = false;
+            }
+        }
+        return result;
+    }
 
-	@Override
-	public Object getInvocationInstance() {
-		return root.getInvocationInstance();
-	}
+    @Override
+    public Object getInvocationInstance() {
+        return root.getInvocationInstance();
+    }
 
-	@Override
-	public InvocationArguments getInvocationArguments() {
-		return root.getInvocationArguments();
-	}
+    @Override
+    public InvocationArguments getInvocationArguments() {
+        return root.getInvocationArguments();
+    }
 }
diff --git a/src/main/java/org/analogweb/core/InvocationFailureException.java b/src/main/java/org/analogweb/core/InvocationFailureException.java
index 6b1aeef..e7d1cd5 100644
--- a/src/main/java/org/analogweb/core/InvocationFailureException.java
+++ b/src/main/java/org/analogweb/core/InvocationFailureException.java
@@ -11,32 +11,31 @@
  */
 public class InvocationFailureException extends ApplicationRuntimeException {
 
-	private static final long serialVersionUID = -7102039116582504501L;
-	private final InvocationMetadata metadata;
-	private final List<Object> args;
-
-	public InvocationFailureException(Throwable cause,
-			InvocationMetadata metadata, Object[] args) {
-		super(cause);
-		this.metadata = metadata;
-		this.args = Arrays.asList(args);
-	}
-
-	public InvocationMetadata getMetadata() {
-		return metadata;
-	}
-
-	public Object[] getArgs() {
-		return args.toArray(new Object[args.size()]);
-	}
-
-	@Override
-	public Throwable getCause() {
-		Throwable th = super.getCause();
-		if (th instanceof InvocationTargetException) {
-			InvocationTargetException iv = (InvocationTargetException) th;
-			return iv.getCause();
-		}
-		return th;
-	}
+    private static final long serialVersionUID = -7102039116582504501L;
+    private final InvocationMetadata metadata;
+    private final List<Object> args;
+
+    public InvocationFailureException(Throwable cause, InvocationMetadata metadata, Object[] args) {
+        super(cause);
+        this.metadata = metadata;
+        this.args = Arrays.asList(args);
+    }
+
+    public InvocationMetadata getMetadata() {
+        return metadata;
+    }
+
+    public Object[] getArgs() {
+        return args.toArray(new Object[args.size()]);
+    }
+
+    @Override
+    public Throwable getCause() {
+        Throwable th = super.getCause();
+        if (th instanceof InvocationTargetException) {
+            InvocationTargetException iv = (InvocationTargetException) th;
+            return iv.getCause();
+        }
+        return th;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/InvokeInterruptedException.java b/src/main/java/org/analogweb/core/InvokeInterruptedException.java
index 00bc5eb..138b8e2 100644
--- a/src/main/java/org/analogweb/core/InvokeInterruptedException.java
+++ b/src/main/java/org/analogweb/core/InvokeInterruptedException.java
@@ -5,14 +5,14 @@
  */
 public class InvokeInterruptedException extends ApplicationRuntimeException {
 
-	private static final long serialVersionUID = -257851055148255108L;
-	private final Object interruption;
+    private static final long serialVersionUID = -257851055148255108L;
+    private final Object interruption;
 
-	public InvokeInterruptedException(Object interruption) {
-		this.interruption = interruption;
-	}
+    public InvokeInterruptedException(Object interruption) {
+        this.interruption = interruption;
+    }
 
-	public Object getInterruption() {
-		return this.interruption;
-	}
+    public Object getInterruption() {
+        return this.interruption;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/MapHeaders.java b/src/main/java/org/analogweb/core/MapHeaders.java
index f7a0a0f..72ae92c 100644
--- a/src/main/java/org/analogweb/core/MapHeaders.java
+++ b/src/main/java/org/analogweb/core/MapHeaders.java
@@ -15,46 +15,46 @@
  */
 public class MapHeaders implements Headers {
 
-	private final Map<String, List<String>> source;
-
-	public MapHeaders() {
-		this(Maps.<String, List<String>> newEmptyHashMap());
-	}
-
-	public MapHeaders(Map<String, List<String>> source) {
-		this.source = source;
-	}
-
-	@Override
-	public boolean contains(String name) {
-		return this.source.containsKey(name);
-	}
-
-	@Override
-	public List<String> getNames() {
-		return new ArrayList<String>(this.source.keySet());
-	}
-
-	@Override
-	public List<String> getValues(String name) {
-		List<String> list = this.source.get(name);
-		if (list == null) {
-			return Collections.emptyList();
-		}
-		return list;
-	}
-
-	@Override
-	public void putValue(String name, String value) {
-		List<String> values = getValues(name);
-		if (CollectionUtils.isEmpty(values)) {
-			values = new LinkedList<String>();
-		}
-		values.add(value);
-		this.source.put(name, values);
-	}
-
-	public Map<String, List<String>> toMap() {
-		return Collections.unmodifiableMap(this.source);
-	}
+    private final Map<String, List<String>> source;
+
+    public MapHeaders() {
+        this(Maps.<String, List<String>> newEmptyHashMap());
+    }
+
+    public MapHeaders(Map<String, List<String>> source) {
+        this.source = source;
+    }
+
+    @Override
+    public boolean contains(String name) {
+        return this.source.containsKey(name);
+    }
+
+    @Override
+    public List<String> getNames() {
+        return new ArrayList<String>(this.source.keySet());
+    }
+
+    @Override
+    public List<String> getValues(String name) {
+        List<String> list = this.source.get(name);
+        if (list == null) {
+            return Collections.emptyList();
+        }
+        return list;
+    }
+
+    @Override
+    public void putValue(String name, String value) {
+        List<String> values = getValues(name);
+        if (CollectionUtils.isEmpty(values)) {
+            values = new LinkedList<String>();
+        }
+        values.add(value);
+        this.source.put(name, values);
+    }
+
+    public Map<String, List<String>> toMap() {
+        return Collections.unmodifiableMap(this.source);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/MatrixParameters.java b/src/main/java/org/analogweb/core/MatrixParameters.java
index 4fd6e9c..478b552 100644
--- a/src/main/java/org/analogweb/core/MatrixParameters.java
+++ b/src/main/java/org/analogweb/core/MatrixParameters.java
@@ -13,30 +13,29 @@
  */
 public class MatrixParameters extends QueryParameters {
 
-	public MatrixParameters(URI requestURI) {
-		super(requestURI);
-	}
+    public MatrixParameters(URI requestURI) {
+        super(requestURI);
+    }
 
-	@Override
-	protected String resolveParametersParts(URI requestURI,
-			ReadableBuffer body, MediaType contentType, Charset charset)
-			throws IOException {
-		String path = requestURI.getRawQuery();
-		if (StringUtils.isEmpty(path)) {
-			path = requestURI.getRawPath();
-		} else {
-			path = requestURI.getRawPath() + '?' + path;
-		}
-		int splitted = path.indexOf(';');
-		if (splitted < 0) {
-			return StringUtils.EMPTY;
-		} else {
-			return StringUtils.substring(path, splitted + 1);
-		}
-	}
+    @Override
+    protected String resolveParametersParts(URI requestURI, ReadableBuffer body, MediaType contentType, Charset charset)
+            throws IOException {
+        String path = requestURI.getRawQuery();
+        if (StringUtils.isEmpty(path)) {
+            path = requestURI.getRawPath();
+        } else {
+            path = requestURI.getRawPath() + '?' + path;
+        }
+        int splitted = path.indexOf(';');
+        if (splitted < 0) {
+            return StringUtils.EMPTY;
+        } else {
+            return StringUtils.substring(path, splitted + 1);
+        }
+    }
 
-	@Override
-	protected char getParameterSeparator() {
-		return ';';
-	}
+    @Override
+    protected char getParameterSeparator() {
+        return ';';
+    }
 }
diff --git a/src/main/java/org/analogweb/core/MediaTypes.java b/src/main/java/org/analogweb/core/MediaTypes.java
index 6c11ae4..a2e4766 100644
--- a/src/main/java/org/analogweb/core/MediaTypes.java
+++ b/src/main/java/org/analogweb/core/MediaTypes.java
@@ -16,187 +16,167 @@
  */
 public final class MediaTypes {
 
-	protected final static String WILDCARD_VALUE = "*";
-	/** "*&#47;*" */
-	public final static MediaType WILDCARD_TYPE = new DefaultMediaType();
-	/** "*&#47;*" */
-	public final static String WILDCARD = "*/*";
-	/** "application/xml" */
-	public final static String APPLICATION_XML = "application/xml";
-	/** "application/xml" */
-	public final static MediaType APPLICATION_XML_TYPE = new DefaultMediaType(
-			"application", "xml");
-	/** "application/atom+xml" */
-	public final static String APPLICATION_ATOM_XML = "application/atom+xml";
-	/** "application/atom+xml" */
-	public final static MediaType APPLICATION_ATOM_XML_TYPE = new DefaultMediaType(
-			"application", "atom+xml");
-	/** "application/xhtml+xml" */
-	public final static String APPLICATION_XHTML_XML = "application/xhtml+xml";
-	/** "application/xhtml+xml" */
-	public final static MediaType APPLICATION_XHTML_XML_TYPE = new DefaultMediaType(
-			"application", "xhtml+xml");
-	/** "application/svg+xml" */
-	public final static String APPLICATION_SVG_XML = "application/svg+xml";
-	/** "application/svg+xml" */
-	public final static MediaType APPLICATION_SVG_XML_TYPE = new DefaultMediaType(
-			"application", "svg+xml");
-	/** "application/json" */
-	public final static String APPLICATION_JSON = "application/json";
-	/** "application/json" */
-	public final static MediaType APPLICATION_JSON_TYPE = new DefaultMediaType(
-			"application", "json");
-	/** "application/javascript" */
-	public final static String APPLICATION_JAVASCRIPT = "application/javascript";
-	/** "application/javascript" */
-	public final static MediaType APPLICATION_JAVASCRIPT_TYPE = new DefaultMediaType(
-			"application", "javascript");
-	/** "application/x-www-form-urlencoded" */
-	public final static String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded";
-	/** "application/x-www-form-urlencoded" */
-	public final static MediaType APPLICATION_FORM_URLENCODED_TYPE = new DefaultMediaType(
-			"application", "x-www-form-urlencoded");
-	/** "multipart/form-data" */
-	public final static String MULTIPART_FORM_DATA = "multipart/form-data";
-	/** "multipart/form-data" */
-	public final static MediaType MULTIPART_FORM_DATA_TYPE = new DefaultMediaType(
-			"multipart", "form-data");
-	/** "application/octet-stream" */
-	public final static String APPLICATION_OCTET_STREAM = "application/octet-stream";
-	/** "application/octet-stream" */
-	public final static MediaType APPLICATION_OCTET_STREAM_TYPE = new DefaultMediaType(
-			"application", "octet-stream");
-	/** "text/plain" */
-	public final static String TEXT_PLAIN = "text/plain";
-	/** "text/plain" */
-	public final static MediaType TEXT_PLAIN_TYPE = new DefaultMediaType(
-			"text", "plain");
-	/** "text/xml" */
-	public final static String TEXT_XML = "text/xml";
-	/** "text/xml" */
-	public final static MediaType TEXT_XML_TYPE = new DefaultMediaType("text",
-			"xml");
-	/** "text/html" */
-	public final static String TEXT_HTML = "text/html";
-	/** "text/html" */
-	public final static MediaType TEXT_HTML_TYPE = new DefaultMediaType("text",
-			"html");
-	/** "text/javascript" */
-	public final static String TEXT_JAVASCRIPT = "text/javascript";
-	/** "text/javascript" */
-	public final static MediaType TEXT_JAVASCRIPT_TYPE = new DefaultMediaType(
-			"text", "javascript");
-
-	private static final class DefaultMediaType implements MediaType {
-
-		private Map<String, String> parameters;
-		private String type = WILDCARD_VALUE;
-		private String subType = WILDCARD_VALUE;
-		private String value;
-
-		DefaultMediaType() {
-			this(null, null);
-		}
-
-		DefaultMediaType(String type, String subType) {
-			this(type, subType, null);
-		}
-
-		@SuppressWarnings("unchecked")
-		DefaultMediaType(String type, String subType,
-				Map<String, String> parameters) {
-			this.type = (StringUtils.isEmpty(type)) ? WILDCARD_VALUE : type;
-			this.subType = (StringUtils.isEmpty(subType))
-					? WILDCARD_VALUE
-					: subType;
-			this.parameters = (Map<String, String>) ((parameters == null)
-					? Maps.newEmptyHashMap()
-					: initParameters(parameters));
-			this.parameters = Collections.unmodifiableMap(this.parameters);
-		}
-
-		private Map<String, String> initParameters(
-				Map<String, String> parameters) {
-			Map<String, String> map = new TreeMap<String, String>(
-					new Comparator<String>() {
-
-						public int compare(String o1, String o2) {
-							return o1.compareToIgnoreCase(o2);
-						}
-					});
-			for (Map.Entry<String, String> e : parameters.entrySet()) {
-				map.put(e.getKey().toLowerCase(), e.getValue());
-			}
-			return Collections.unmodifiableMap(map);
-		}
-
-		@Override
-		public String getType() {
-			return this.type;
-		}
-
-		@Override
-		public String getSubType() {
-			return this.subType;
-		}
-
-		@Override
-		public Map<String, String> getParameters() {
-			return this.parameters;
-		}
-
-		@Override
-		public boolean isCompatible(MediaType other) {
-			if (other == null) {
-				return false;
-			}
-			if (getType().equalsIgnoreCase(WILDCARD_VALUE)
-					|| other.getType().equalsIgnoreCase(getType())) {
-				return getSubType().equalsIgnoreCase(WILDCARD_VALUE)
-						|| other.getSubType().equalsIgnoreCase(getSubType());
-			}
-			return false;
-		}
-
-		@Override
-		public String toString() {
-			if (this.value == null) {
-				StringBuilder b = new StringBuilder();
-				b.append(getType()).append("/").append(getSubType());
-				for (Entry<String, String> e : getParameters().entrySet()) {
-					b.append(';').append(e.getKey()).append('=')
-							.append(e.getValue());
-				}
-				this.value = b.toString();
-			}
-			return this.value;
-		}
-	}
-
-	public static MediaType valueOf(String value) {
-		if (StringUtils.isEmpty(value)) {
-			return WILDCARD_TYPE;
-		}
-		int s = value.indexOf('/');
-		if (s < 1) {
-			return WILDCARD_TYPE;
-		}
-		String type = value.substring(0, s);
-		int p = value.indexOf(';');
-		String subType = "*";
-		Map<String, String> parameterMap = null;
-		if (p > s) {
-			subType = value.substring(s + 1, p);
-			parameterMap = Maps.newEmptyHashMap();
-			for (String param : StringUtils.split(value.substring(p + 1), ';')) {
-				List<String> sp = StringUtils.split(param.trim(), '=');
-				if (sp.size() > 1) {
-					parameterMap.put(sp.get(0), sp.get(1));
-				}
-			}
-		} else {
-			subType = value.substring(s + 1);
-		}
-		return new DefaultMediaType(type, subType, parameterMap);
-	}
+    protected final static String WILDCARD_VALUE = "*";
+    /** "*&#47;*" */
+    public final static MediaType WILDCARD_TYPE = new DefaultMediaType();
+    /** "*&#47;*" */
+    public final static String WILDCARD = "*/*";
+    /** "application/xml" */
+    public final static String APPLICATION_XML = "application/xml";
+    /** "application/xml" */
+    public final static MediaType APPLICATION_XML_TYPE = new DefaultMediaType("application", "xml");
+    /** "application/atom+xml" */
+    public final static String APPLICATION_ATOM_XML = "application/atom+xml";
+    /** "application/atom+xml" */
+    public final static MediaType APPLICATION_ATOM_XML_TYPE = new DefaultMediaType("application", "atom+xml");
+    /** "application/xhtml+xml" */
+    public final static String APPLICATION_XHTML_XML = "application/xhtml+xml";
+    /** "application/xhtml+xml" */
+    public final static MediaType APPLICATION_XHTML_XML_TYPE = new DefaultMediaType("application", "xhtml+xml");
+    /** "application/svg+xml" */
+    public final static String APPLICATION_SVG_XML = "application/svg+xml";
+    /** "application/svg+xml" */
+    public final static MediaType APPLICATION_SVG_XML_TYPE = new DefaultMediaType("application", "svg+xml");
+    /** "application/json" */
+    public final static String APPLICATION_JSON = "application/json";
+    /** "application/json" */
+    public final static MediaType APPLICATION_JSON_TYPE = new DefaultMediaType("application", "json");
+    /** "application/javascript" */
+    public final static String APPLICATION_JAVASCRIPT = "application/javascript";
+    /** "application/javascript" */
+    public final static MediaType APPLICATION_JAVASCRIPT_TYPE = new DefaultMediaType("application", "javascript");
+    /** "application/x-www-form-urlencoded" */
+    public final static String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded";
+    /** "application/x-www-form-urlencoded" */
+    public final static MediaType APPLICATION_FORM_URLENCODED_TYPE = new DefaultMediaType("application",
+            "x-www-form-urlencoded");
+    /** "multipart/form-data" */
+    public final static String MULTIPART_FORM_DATA = "multipart/form-data";
+    /** "multipart/form-data" */
+    public final static MediaType MULTIPART_FORM_DATA_TYPE = new DefaultMediaType("multipart", "form-data");
+    /** "application/octet-stream" */
+    public final static String APPLICATION_OCTET_STREAM = "application/octet-stream";
+    /** "application/octet-stream" */
+    public final static MediaType APPLICATION_OCTET_STREAM_TYPE = new DefaultMediaType("application", "octet-stream");
+    /** "text/plain" */
+    public final static String TEXT_PLAIN = "text/plain";
+    /** "text/plain" */
+    public final static MediaType TEXT_PLAIN_TYPE = new DefaultMediaType("text", "plain");
+    /** "text/xml" */
+    public final static String TEXT_XML = "text/xml";
+    /** "text/xml" */
+    public final static MediaType TEXT_XML_TYPE = new DefaultMediaType("text", "xml");
+    /** "text/html" */
+    public final static String TEXT_HTML = "text/html";
+    /** "text/html" */
+    public final static MediaType TEXT_HTML_TYPE = new DefaultMediaType("text", "html");
+    /** "text/javascript" */
+    public final static String TEXT_JAVASCRIPT = "text/javascript";
+    /** "text/javascript" */
+    public final static MediaType TEXT_JAVASCRIPT_TYPE = new DefaultMediaType("text", "javascript");
+
+    private static final class DefaultMediaType implements MediaType {
+
+        private Map<String, String> parameters;
+        private String type = WILDCARD_VALUE;
+        private String subType = WILDCARD_VALUE;
+        private String value;
+
+        DefaultMediaType() {
+            this(null, null);
+        }
+
+        DefaultMediaType(String type, String subType) {
+            this(type, subType, null);
+        }
+
+        @SuppressWarnings("unchecked")
+        DefaultMediaType(String type, String subType, Map<String, String> parameters) {
+            this.type = (StringUtils.isEmpty(type)) ? WILDCARD_VALUE : type;
+            this.subType = (StringUtils.isEmpty(subType)) ? WILDCARD_VALUE : subType;
+            this.parameters = (Map<String, String>) ((parameters == null) ? Maps.newEmptyHashMap()
+                    : initParameters(parameters));
+            this.parameters = Collections.unmodifiableMap(this.parameters);
+        }
+
+        private Map<String, String> initParameters(Map<String, String> parameters) {
+            Map<String, String> map = new TreeMap<String, String>(new Comparator<String>() {
+
+                public int compare(String o1, String o2) {
+                    return o1.compareToIgnoreCase(o2);
+                }
+            });
+            for (Map.Entry<String, String> e : parameters.entrySet()) {
+                map.put(e.getKey().toLowerCase(), e.getValue());
+            }
+            return Collections.unmodifiableMap(map);
+        }
+
+        @Override
+        public String getType() {
+            return this.type;
+        }
+
+        @Override
+        public String getSubType() {
+            return this.subType;
+        }
+
+        @Override
+        public Map<String, String> getParameters() {
+            return this.parameters;
+        }
+
+        @Override
+        public boolean isCompatible(MediaType other) {
+            if (other == null) {
+                return false;
+            }
+            if (getType().equalsIgnoreCase(WILDCARD_VALUE) || other.getType().equalsIgnoreCase(getType())) {
+                return getSubType().equalsIgnoreCase(WILDCARD_VALUE)
+                        || other.getSubType().equalsIgnoreCase(getSubType());
+            }
+            return false;
+        }
+
+        @Override
+        public String toString() {
+            if (this.value == null) {
+                StringBuilder b = new StringBuilder();
+                b.append(getType()).append("/").append(getSubType());
+                for (Entry<String, String> e : getParameters().entrySet()) {
+                    b.append(';').append(e.getKey()).append('=').append(e.getValue());
+                }
+                this.value = b.toString();
+            }
+            return this.value;
+        }
+    }
+
+    public static MediaType valueOf(String value) {
+        if (StringUtils.isEmpty(value)) {
+            return WILDCARD_TYPE;
+        }
+        int s = value.indexOf('/');
+        if (s < 1) {
+            return WILDCARD_TYPE;
+        }
+        String type = value.substring(0, s);
+        int p = value.indexOf(';');
+        String subType = "*";
+        Map<String, String> parameterMap = null;
+        if (p > s) {
+            subType = value.substring(s + 1, p);
+            parameterMap = Maps.newEmptyHashMap();
+            for (String param : StringUtils.split(value.substring(p + 1), ';')) {
+                List<String> sp = StringUtils.split(param.trim(), '=');
+                if (sp.size() > 1) {
+                    parameterMap.put(sp.get(0), sp.get(1));
+                }
+            }
+        } else {
+            subType = value.substring(s + 1);
+        }
+        return new DefaultMediaType(type, subType, parameterMap);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/MissingModuleException.java b/src/main/java/org/analogweb/core/MissingModuleException.java
index 4e66f70..376c9a0 100644
--- a/src/main/java/org/analogweb/core/MissingModuleException.java
+++ b/src/main/java/org/analogweb/core/MissingModuleException.java
@@ -5,15 +5,15 @@
  */
 public class MissingModuleException extends ApplicationConfigurationException {
 
-	private static final long serialVersionUID = 998032904612234430L;
-	private final Class<?> requiredModuleClass;
+    private static final long serialVersionUID = 998032904612234430L;
+    private final Class<?> requiredModuleClass;
 
-	public MissingModuleException(Class<?> requiredModuleClass) {
-		super(requiredModuleClass.toString());
-		this.requiredModuleClass = requiredModuleClass;
-	}
+    public MissingModuleException(Class<?> requiredModuleClass) {
+        super(requiredModuleClass.toString());
+        this.requiredModuleClass = requiredModuleClass;
+    }
 
-	public Class<?> getRequiredModuleClass() {
-		return this.requiredModuleClass;
-	}
+    public Class<?> getRequiredModuleClass() {
+        return this.requiredModuleClass;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/MissingModulesProviderException.java b/src/main/java/org/analogweb/core/MissingModulesProviderException.java
index 25df1cd..b0aaa01 100644
--- a/src/main/java/org/analogweb/core/MissingModulesProviderException.java
+++ b/src/main/java/org/analogweb/core/MissingModulesProviderException.java
@@ -3,13 +3,11 @@
 /**
  * @author snowgoose
  */
-public class MissingModulesProviderException
-		extends
-			ApplicationConfigurationException {
+public class MissingModulesProviderException extends ApplicationConfigurationException {
 
-	private static final long serialVersionUID = -5644327410943838553L;
+    private static final long serialVersionUID = -5644327410943838553L;
 
-	public MissingModulesProviderException() {
-		super((String) null);
-	}
+    public MissingModulesProviderException() {
+        super((String) null);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/MissingRequiredParameterException.java b/src/main/java/org/analogweb/core/MissingRequiredParameterException.java
index b24ccce..ea43367 100644
--- a/src/main/java/org/analogweb/core/MissingRequiredParameterException.java
+++ b/src/main/java/org/analogweb/core/MissingRequiredParameterException.java
@@ -3,19 +3,17 @@
 /**
  * @author snowgoose
  */
-public class MissingRequiredParameterException
-		extends
-			ApplicationConfigurationException {
+public class MissingRequiredParameterException extends ApplicationConfigurationException {
 
-	private static final long serialVersionUID = 6261526221128455478L;
-	private final String parameterName;
+    private static final long serialVersionUID = 6261526221128455478L;
+    private final String parameterName;
 
-	public MissingRequiredParameterException(String parameterName) {
-		super((String) null);
-		this.parameterName = parameterName;
-	}
+    public MissingRequiredParameterException(String parameterName) {
+        super((String) null);
+        this.parameterName = parameterName;
+    }
 
-	public String getMissedParameterName() {
-		return this.parameterName;
-	}
+    public String getMissedParameterName() {
+        return this.parameterName;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/MissingRequirmentsException.java b/src/main/java/org/analogweb/core/MissingRequirmentsException.java
index 350286e..c55f090 100644
--- a/src/main/java/org/analogweb/core/MissingRequirmentsException.java
+++ b/src/main/java/org/analogweb/core/MissingRequirmentsException.java
@@ -5,16 +5,15 @@
  */
 public class MissingRequirmentsException extends UnresolvableResultException {
 
-	private static final long serialVersionUID = -4724232642503365850L;
-	private final String requirment;
+    private static final long serialVersionUID = -4724232642503365850L;
+    private final String requirment;
 
-	public MissingRequirmentsException(String requirment,
-			Object invocationResult) {
-		super(invocationResult);
-		this.requirment = requirment;
-	}
+    public MissingRequirmentsException(String requirment, Object invocationResult) {
+        super(invocationResult);
+        this.requirment = requirment;
+    }
 
-	public String getRequirment() {
-		return this.requirment;
-	}
+    public String getRequirment() {
+        return this.requirment;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/ModulesConfigComparator.java b/src/main/java/org/analogweb/core/ModulesConfigComparator.java
index 3f79af5..2c52e94 100644
--- a/src/main/java/org/analogweb/core/ModulesConfigComparator.java
+++ b/src/main/java/org/analogweb/core/ModulesConfigComparator.java
@@ -11,71 +11,67 @@
 /**
  * @author snowgoose
  */
-public class ModulesConfigComparator
-		implements
-			Comparator<ModulesConfig>,
-			Serializable {
+public class ModulesConfigComparator implements Comparator<ModulesConfig>, Serializable {
 
-	private static final long serialVersionUID = -8129615702089570460L;
+    private static final long serialVersionUID = -8129615702089570460L;
 
-	@Override
-	public int compare(ModulesConfig modulesConfig1,
-			ModulesConfig modulesConfig2) {
-		Assertion.notNull(modulesConfig1, "ModuleConfig");
-		Assertion.notNull(modulesConfig2, "ModuleConfig");
-		int type1 = ModulesConfigType.valueIsOf(modulesConfig1).ordinal();
-		int type2 = ModulesConfigType.valueIsOf(modulesConfig2).ordinal();
-		if (type1 > type2) {
-			return 1;
-		} else if (type1 < type2) {
-			return -1;
-		} else {
-			return 0;
-		}
-	}
+    @Override
+    public int compare(ModulesConfig modulesConfig1, ModulesConfig modulesConfig2) {
+        Assertion.notNull(modulesConfig1, "ModuleConfig");
+        Assertion.notNull(modulesConfig2, "ModuleConfig");
+        int type1 = ModulesConfigType.valueIsOf(modulesConfig1).ordinal();
+        int type2 = ModulesConfigType.valueIsOf(modulesConfig2).ordinal();
+        if (type1 > type2) {
+            return 1;
+        } else if (type1 < type2) {
+            return -1;
+        } else {
+            return 0;
+        }
+    }
 
-	private interface IsOf {
+    private interface IsOf {
 
-		boolean isOf(ModulesConfig moduleConfig);
-	}
+        boolean isOf(ModulesConfig moduleConfig);
+    }
 
-	private enum ModulesConfigType implements IsOf {
-		ROOT {
+    private enum ModulesConfigType implements IsOf {
+        ROOT {
 
-			@Override
-			public boolean isOf(ModulesConfig moduleConfig) {
-				return RootModulesConfig.class.isInstance(moduleConfig);
-			}
-		},
-		PLUGIN {
+            @Override
+            public boolean isOf(ModulesConfig moduleConfig) {
+                return RootModulesConfig.class.isInstance(moduleConfig);
+            }
+        },
+        PLUGIN {
 
-			@Override
-			public boolean isOf(ModulesConfig moduleConfig) {
-				return PluginModulesConfig.class.isInstance(moduleConfig);
-			}
-		},
-		USERDEF {
+            @Override
+            public boolean isOf(ModulesConfig moduleConfig) {
+                return PluginModulesConfig.class.isInstance(moduleConfig);
+            }
+        },
+        USERDEF {
 
-			@Override
-			public boolean isOf(ModulesConfig moduleConfig) {
-				return UserModulesConfig.class.isInstance(moduleConfig);
-			}
-		},
-		OTHER {
+            @Override
+            public boolean isOf(ModulesConfig moduleConfig) {
+                return UserModulesConfig.class.isInstance(moduleConfig);
+            }
+        },
+        OTHER {
 
-			@Override
-			public boolean isOf(ModulesConfig moduleConfig) {
-				return false;
-			}
-		};
+            @Override
+            public boolean isOf(ModulesConfig moduleConfig) {
+                return false;
+            }
+        };
 
-		static ModulesConfigType valueIsOf(ModulesConfig modulesConfig) {
-			for (ModulesConfigType type : values()) {
-				if (type.isOf(modulesConfig)) {
-					return type;
-				}
-			}
-			return OTHER;
-		}
-	}
+        static ModulesConfigType valueIsOf(ModulesConfig modulesConfig) {
+            for (ModulesConfigType type : values()) {
+                if (type.isOf(modulesConfig)) {
+                    return type;
+                }
+            }
+            return OTHER;
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/core/MultipartParameterResolver.java b/src/main/java/org/analogweb/core/MultipartParameterResolver.java
index 50a1a2a..2c93a81 100644
--- a/src/main/java/org/analogweb/core/MultipartParameterResolver.java
+++ b/src/main/java/org/analogweb/core/MultipartParameterResolver.java
@@ -35,359 +35,329 @@
  * @author snowgooseyk
  */
 public class MultipartParameterResolver extends ParameterValueResolver
-		implements
-			SpecificMediaTypeRequestValueResolver {
-
-	private static final Log log = Logs
-			.getLog(MultipartParameterResolver.class);
-	private final String defaultEncoding = "UTF-8";
-	private static final String MULTIPARTPARAMETERS_ON_CURRENT_REQUEST = MultipartParameterResolver.class
-			.getCanonicalName() + "_MULTIPARTPARAMETERS_ON_CURRENT_REQUEST";
-
-	@Override
-	public boolean supports(MediaType mediaType) {
-		return MediaTypes.MULTIPART_FORM_DATA_TYPE.isCompatible(mediaType);
-	}
-
-	@Override
-	public Object resolveValue(RequestContext request,
-			InvocationMetadata metadata, String name, Class<?> requiredType,
-			Annotation[] annotations) {
-		try {
-			MultipartParameters<Multipart> multiparts = request
-					.getAttribute(MULTIPARTPARAMETERS_ON_CURRENT_REQUEST);
-			if (multiparts == null) {
-				multiparts = extractMultipart(request.getContentType()
-						.toString(), request.getRequestBody());
-				request.setAttribute(MULTIPARTPARAMETERS_ON_CURRENT_REQUEST,
-						multiparts);
-			}
-			return resolveParameterizedValue(request, metadata, name,
-					requiredType, annotations, multiparts);
-		} catch (IOException e) {
-			throw new ApplicationRuntimeException(e) {
-
-				private static final long serialVersionUID = 2628554296029294446L;
-			};
-		}
-	}
-
-	private MultipartParameters<Multipart> extractMultipart(String contentType,
-			ReadableBuffer in) throws IOException {
-		byte[] boundary = extractBoundary(contentType);
-		if (log.isTraceEnabled()) {
-			log.trace(String.format("Multipart Boundary : %s", new String(
-					boundary)));
-		}
-		List<Multipart> params = new LinkedList<Multipart>();
-		ReadableByteChannel source = in.asChannel();
-		ByteBuffer buffer = ByteBuffer.allocate(8192);
-		source.read(buffer);
-		buffer.flip();
-		int beginOfBoundary = nextPosition(0, boundary, buffer);
-		while (true) {
-			int endOfBoundary = beginOfBoundary + boundary.length;
-			int endOfHeader = nextPosition(endOfBoundary, new byte[]{13, 10,
-					13, 10}, buffer);
-			if (endOfHeader == -1) {
-				break;
-			}
-			byte[] dst = new byte[endOfHeader - endOfBoundary - 2];
-			buffer.position(endOfBoundary + 2);// CRLF
-			buffer.get(dst);
-			Map<String, String> header = parseHeader(new String(dst));
-			if (log.isTraceEnabled()) {
-				log.trace(String.format("Header of part : %s", header));
-			}
-			buffer.position(buffer.position() + 4);// CRLF + CRLF
-			int nextBeginOfBoundary;
-			File file = File.createTempFile(
-					MultipartParameterResolver.class.getCanonicalName(),
-					"parameter");
-			RandomAccessFile raf = new RandomAccessFile(file, "rw");
-			FileOutputStream fo = new FileOutputStream(raf.getFD());
-			while ((nextBeginOfBoundary = nextPosition(endOfHeader, boundary,
-					buffer)) < 0) {
-				dst = new byte[buffer.remaining()];
-				buffer.get(dst);
-				fo.write(dst);
-				buffer.clear();
-				source.read(buffer);
-				buffer.flip();
-				endOfHeader = 0;
-			}
-			int remaining = (nextBeginOfBoundary - 8) - endOfHeader;
-			dst = new byte[remaining];
-			buffer.get(dst);
-			fo.write(dst);
-			fo.flush();
-			fo.close();
-			raf.close();
-			params.add(new MultipartImpl(header, file));
-			if (log.isTraceEnabled()) {
-				log.trace(String.format("Body of part : %s", new String(dst)));
-			}
-			beginOfBoundary = nextBeginOfBoundary;
-		}
-		return new MultipartsImpl(params, Charset.forName(defaultEncoding));
-	}
-
-	private int nextPosition(int start, byte[] boundary, ByteBuffer buffer) {
-		int matches = 0;
-		int matchedPosition = -1;
-		for (int i = start; i < buffer.limit(); i++) {
-			if (buffer.get(i) == boundary[matches]) {
-				if (matches == 0)
-					matchedPosition = i;
-				matches++;
-				if (matches == boundary.length) {
-					return matchedPosition;
-				}
-			} else {
-				i -= matches;
-				matches = 0;
-				matchedPosition = -1;
-			}
-		}
-		return -1;
-	}
-
-	private byte[] extractBoundary(String contentType) {
-		String prefix = "boundary=";
-		String boundary = contentType.substring(contentType.indexOf(prefix)
-				+ prefix.length(), contentType.length());
-		if (boundary.startsWith("\"") && boundary.endsWith("\"")) {
-			return boundary.substring(1, boundary.length() - 1).getBytes();
-		} else {
-			return contentType.substring(
-					contentType.indexOf(prefix) + prefix.length(),
-					contentType.length()).getBytes();
-		}
-	}
-
-	private Map<String, String> parseHeader(String buffer) throws IOException {
-		BufferedReader r = new BufferedReader(new StringReader(buffer));
-		String aLine = null;
-		Map<String, String> m = Maps.newEmptyHashMap();
-		while ((aLine = r.readLine()) != null && aLine.trim().length() != 0) {
-			int i = aLine.indexOf(':');
-			if (i > 0 && i < aLine.length()) {
-				String key = aLine.substring(0, i).trim();
-				String value = aLine.substring(i + 1).trim();
-				m.put(key, value);
-			}
-		}
-		return m;
-	}
-
-	protected Object resolveParameterizedValue(RequestContext request,
-			InvocationMetadata metadata, String name, Class<?> requiredType,
-			Annotation[] annotations, MultipartParameters<Multipart> parameters) {
-		if (isEqualsType(Iterable.class, requiredType)) {
-			return parameters;
-		}
-		final Multipart[] value = parameters.getMultiparts(name);
-		if (ArrayUtils.isNotEmpty(value)) {
-			if (isEqualsType(ClassUtils.forNameQuietly("[L"
-					+ File.class.getName() + ";"), requiredType)) {
-				final List<File> files = new ArrayList<File>();
-				for (final Multipart mp : value) {
-					File f;
-					if (mp instanceof MultipartImpl
-							&& (f = ((MultipartImpl) mp).getAsFile()) != null) {
-						files.add(f);
-					}
-				}
-				return files.toArray(new File[files.size()]);
-			} else if (isEqualsType(
-					ClassUtils.forNameQuietly("[L" + Multipart.class.getName()
-							+ ";"), requiredType)) {
-				return value;
-			} else if (isEqualsType(
-					ClassUtils.forNameQuietly("[L" + String.class.getName()
-							+ ";"), requiredType)) {
-				List<String> values = new ArrayList<String>();
-				for (final Multipart mp : value) {
-					values.add(resolveParameterizedValueAsString(mp));
-				}
-				return values.toArray(new String[values.size()]);
-			}
-			final Multipart mp = value[0];
-			if (isEqualsType(InputStream.class, requiredType)) {
-				return mp.getInputStream();
-			} else if (isEqualsType(File.class, requiredType)) {
-				if (mp instanceof MultipartImpl) {
-					return ((MultipartImpl) mp).getAsFile();
-				}
-			} else if (isEqualsType(byte[].class, requiredType)) {
-				return mp.getBytes();
-			} else if (isEqualsType(String.class, requiredType)) {
-				return resolveParameterizedValueAsString(mp);
-			} else if (isEqualsType(Multipart.class, requiredType)) {
-				return mp;
-			} else {
-				throw new UnresolvableValueException(this, requiredType, name);
-			}
-		}
-		return super.resolveValue(request, metadata, name, requiredType,
-				annotations);
-	}
-
-	private String resolveParameterizedValueAsString(Multipart mp) {
-		String charset = MediaTypes.valueOf(mp.getContentType())
-				.getParameters().get("charset");
-		if (StringUtils.isNotEmpty(charset)) {
-			return new String(mp.getBytes(), Charset.forName(charset));
-		} else {
-			return new String(mp.getBytes(), Charset.forName("ISO-8859-1"));
-		}
-	}
-
-	private boolean isEqualsType(Class<?> clazz, Class<?> other) {
-		if (clazz == null || other == null) {
-			return false;
-		}
-		return (clazz == other)
-				|| clazz.getCanonicalName().equals(other.getCanonicalName());
-	}
-
-	static final class MultipartImpl implements Multipart {
-
-		private Map<String, String> header;
-		private Map<String, String> contentDisposition;
-		private File tempFile;
-
-		MultipartImpl(Map<String, String> header, File temp) {
-			this.header = header;
-			this.tempFile = temp;
-		}
-
-		@Override
-		public String getName() {
-			return getContentDisposition().get("name");
-		}
-
-		public void dispose() {
-			this.tempFile.deleteOnExit();
-		}
-
-		@Override
-		public String getResourceName() {
-			return getContentDisposition().get("filename");
-		}
-
-		private Map<String, String> getContentDisposition() {
-			if (contentDisposition == null) {
-				contentDisposition = Maps.newEmptyHashMap();
-				String value = this.header.get("Content-Disposition");
-				for (String param : StringUtils.split(value, ';')) {
-					List<String> sp = StringUtils.split(param.trim(), '=');
-					if (sp.size() > 1) {
-						String p = sp.get(1);
-						if (p.endsWith("\"") && p.startsWith("\"")) {
-							contentDisposition.put(sp.get(0),
-									p.substring(1, p.length() - 1));
-						} else {
-							contentDisposition.put(sp.get(0), p);
-						}
-					} else {
-						contentDisposition.put(sp.get(0), "");
-					}
-				}
-			}
-			return contentDisposition;
-		}
-
-		@Override
-		public InputStream getInputStream() {
-			try {
-				return new FileInputStream(tempFile);
-			} catch (IOException e) {
-				throw new ApplicationRuntimeException(e) {
-
-					private static final long serialVersionUID = 1L;
-				};
-			}
-		}
-
-		public File getAsFile() {
-			return this.tempFile;
-		}
-
-		@Override
-		public byte[] getBytes() {
-			ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-			IOUtils.copyQuietly(getInputStream(), bytes);
-			return bytes.toByteArray();
-		}
-
-		@Override
-		public String getContentType() {
-			return header.get("Content-Type");
-		}
-	}
-
-	static final class MultipartsImpl implements MultipartParameters<Multipart> {
-
-		private List<Multipart> multiparts;
-		private Charset encoding;
-		private Map<String, Multipart[]> mapped;
-
-		MultipartsImpl(List<Multipart> multiparts, Charset encoding) {
-			this.multiparts = multiparts;
-			this.encoding = encoding;
-		}
-
-		@Override
-		public Iterator<Multipart> iterator() {
-			return this.multiparts.iterator();
-		}
-
-		@Override
-		public List<String> getValues(String key) {
-			String[] values = asMap().get(key);
-			if (ArrayUtils.isEmpty(values)) {
-				return Collections.emptyList();
-			} else {
-				return Arrays.asList(values);
-			}
-		}
-
-		@Override
-		public Map<String, String[]> asMap() {
-			Map<String, Multipart[]> mps = extract();
-			Map<String, String[]> sms = Maps.newEmptyHashMap();
-			for (Entry<String, Multipart[]> e : mps.entrySet()) {
-				String[] values = ArrayUtils.newArray();
-				for (Multipart m : e.getValue()) {
-					ArrayUtils.add(String.class, new String(m.getBytes(),
-							encoding), values);
-				}
-				sms.put(e.getKey(), values);
-			}
-			return null;
-		}
-
-		@Override
-		public Multipart[] getMultiparts(String name) {
-			return extract().get(name);
-		}
-
-		private Map<String, Multipart[]> extract() {
-			if (mapped == null) {
-				mapped = Maps.newEmptyHashMap();
-				for (Multipart mp : this.multiparts) {
-					if (mapped.containsKey(mp.getName())) {
-						mapped.put(
-								mp.getName(),
-								ArrayUtils.add(Multipart.class, mp,
-										mapped.get(mp.getName())));
-					} else {
-						mapped.put(mp.getName(), ArrayUtils.newArray(mp));
-					}
-				}
-			}
-			return mapped;
-		}
-	}
+        implements SpecificMediaTypeRequestValueResolver {
+
+    private static final Log log = Logs.getLog(MultipartParameterResolver.class);
+    private final String defaultEncoding = "UTF-8";
+    private static final String MULTIPARTPARAMETERS_ON_CURRENT_REQUEST = MultipartParameterResolver.class
+            .getCanonicalName() + "_MULTIPARTPARAMETERS_ON_CURRENT_REQUEST";
+
+    @Override
+    public boolean supports(MediaType mediaType) {
+        return MediaTypes.MULTIPART_FORM_DATA_TYPE.isCompatible(mediaType);
+    }
+
+    @Override
+    public Object resolveValue(RequestContext request, InvocationMetadata metadata, String name, Class<?> requiredType,
+            Annotation[] annotations) {
+        try {
+            MultipartParameters<Multipart> multiparts = request.getAttribute(MULTIPARTPARAMETERS_ON_CURRENT_REQUEST);
+            if (multiparts == null) {
+                multiparts = extractMultipart(request.getContentType().toString(), request.getRequestBody());
+                request.setAttribute(MULTIPARTPARAMETERS_ON_CURRENT_REQUEST, multiparts);
+            }
+            return resolveParameterizedValue(request, metadata, name, requiredType, annotations, multiparts);
+        } catch (IOException e) {
+            throw new ApplicationRuntimeException(e) {
+
+                private static final long serialVersionUID = 2628554296029294446L;
+            };
+        }
+    }
+
+    private MultipartParameters<Multipart> extractMultipart(String contentType, ReadableBuffer in) throws IOException {
+        byte[] boundary = extractBoundary(contentType);
+        if (log.isTraceEnabled()) {
+            log.trace(String.format("Multipart Boundary : %s", new String(boundary)));
+        }
+        List<Multipart> params = new LinkedList<Multipart>();
+        ReadableByteChannel source = in.asChannel();
+        ByteBuffer buffer = ByteBuffer.allocate(8192);
+        source.read(buffer);
+        buffer.flip();
+        int beginOfBoundary = nextPosition(0, boundary, buffer);
+        while (true) {
+            int endOfBoundary = beginOfBoundary + boundary.length;
+            int endOfHeader = nextPosition(endOfBoundary, new byte[] { 13, 10, 13, 10 }, buffer);
+            if (endOfHeader == -1) {
+                break;
+            }
+            byte[] dst = new byte[endOfHeader - endOfBoundary - 2];
+            buffer.position(endOfBoundary + 2);// CRLF
+            buffer.get(dst);
+            Map<String, String> header = parseHeader(new String(dst));
+            if (log.isTraceEnabled()) {
+                log.trace(String.format("Header of part : %s", header));
+            }
+            buffer.position(buffer.position() + 4);// CRLF + CRLF
+            int nextBeginOfBoundary;
+            File file = File.createTempFile(MultipartParameterResolver.class.getCanonicalName(), "parameter");
+            RandomAccessFile raf = new RandomAccessFile(file, "rw");
+            FileOutputStream fo = new FileOutputStream(raf.getFD());
+            while ((nextBeginOfBoundary = nextPosition(endOfHeader, boundary, buffer)) < 0) {
+                dst = new byte[buffer.remaining()];
+                buffer.get(dst);
+                fo.write(dst);
+                buffer.clear();
+                source.read(buffer);
+                buffer.flip();
+                endOfHeader = 0;
+            }
+            int remaining = (nextBeginOfBoundary - 8) - endOfHeader;
+            dst = new byte[remaining];
+            buffer.get(dst);
+            fo.write(dst);
+            fo.flush();
+            fo.close();
+            raf.close();
+            params.add(new MultipartImpl(header, file));
+            if (log.isTraceEnabled()) {
+                log.trace(String.format("Body of part : %s", new String(dst)));
+            }
+            beginOfBoundary = nextBeginOfBoundary;
+        }
+        return new MultipartsImpl(params, Charset.forName(defaultEncoding));
+    }
+
+    private int nextPosition(int start, byte[] boundary, ByteBuffer buffer) {
+        int matches = 0;
+        int matchedPosition = -1;
+        for (int i = start; i < buffer.limit(); i++) {
+            if (buffer.get(i) == boundary[matches]) {
+                if (matches == 0)
+                    matchedPosition = i;
+                matches++;
+                if (matches == boundary.length) {
+                    return matchedPosition;
+                }
+            } else {
+                i -= matches;
+                matches = 0;
+                matchedPosition = -1;
+            }
+        }
+        return -1;
+    }
+
+    private byte[] extractBoundary(String contentType) {
+        String prefix = "boundary=";
+        String boundary = contentType.substring(contentType.indexOf(prefix) + prefix.length(), contentType.length());
+        if (boundary.startsWith("\"") && boundary.endsWith("\"")) {
+            return boundary.substring(1, boundary.length() - 1).getBytes();
+        } else {
+            return contentType.substring(contentType.indexOf(prefix) + prefix.length(), contentType.length())
+                    .getBytes();
+        }
+    }
+
+    private Map<String, String> parseHeader(String buffer) throws IOException {
+        BufferedReader r = new BufferedReader(new StringReader(buffer));
+        String aLine = null;
+        Map<String, String> m = Maps.newEmptyHashMap();
+        while ((aLine = r.readLine()) != null && aLine.trim().length() != 0) {
+            int i = aLine.indexOf(':');
+            if (i > 0 && i < aLine.length()) {
+                String key = aLine.substring(0, i).trim();
+                String value = aLine.substring(i + 1).trim();
+                m.put(key, value);
+            }
+        }
+        return m;
+    }
+
+    protected Object resolveParameterizedValue(RequestContext request, InvocationMetadata metadata, String name,
+            Class<?> requiredType, Annotation[] annotations, MultipartParameters<Multipart> parameters) {
+        if (isEqualsType(Iterable.class, requiredType)) {
+            return parameters;
+        }
+        final Multipart[] value = parameters.getMultiparts(name);
+        if (ArrayUtils.isNotEmpty(value)) {
+            if (isEqualsType(ClassUtils.forNameQuietly("[L" + File.class.getName() + ";"), requiredType)) {
+                final List<File> files = new ArrayList<File>();
+                for (final Multipart mp : value) {
+                    File f;
+                    if (mp instanceof MultipartImpl && (f = ((MultipartImpl) mp).getAsFile()) != null) {
+                        files.add(f);
+                    }
+                }
+                return files.toArray(new File[files.size()]);
+            } else if (isEqualsType(ClassUtils.forNameQuietly("[L" + Multipart.class.getName() + ";"), requiredType)) {
+                return value;
+            } else if (isEqualsType(ClassUtils.forNameQuietly("[L" + String.class.getName() + ";"), requiredType)) {
+                List<String> values = new ArrayList<String>();
+                for (final Multipart mp : value) {
+                    values.add(resolveParameterizedValueAsString(mp));
+                }
+                return values.toArray(new String[values.size()]);
+            }
+            final Multipart mp = value[0];
+            if (isEqualsType(InputStream.class, requiredType)) {
+                return mp.getInputStream();
+            } else if (isEqualsType(File.class, requiredType)) {
+                if (mp instanceof MultipartImpl) {
+                    return ((MultipartImpl) mp).getAsFile();
+                }
+            } else if (isEqualsType(byte[].class, requiredType)) {
+                return mp.getBytes();
+            } else if (isEqualsType(String.class, requiredType)) {
+                return resolveParameterizedValueAsString(mp);
+            } else if (isEqualsType(Multipart.class, requiredType)) {
+                return mp;
+            } else {
+                throw new UnresolvableValueException(this, requiredType, name);
+            }
+        }
+        return super.resolveValue(request, metadata, name, requiredType, annotations);
+    }
+
+    private String resolveParameterizedValueAsString(Multipart mp) {
+        String charset = MediaTypes.valueOf(mp.getContentType()).getParameters().get("charset");
+        if (StringUtils.isNotEmpty(charset)) {
+            return new String(mp.getBytes(), Charset.forName(charset));
+        } else {
+            return new String(mp.getBytes(), Charset.forName("ISO-8859-1"));
+        }
+    }
+
+    private boolean isEqualsType(Class<?> clazz, Class<?> other) {
+        if (clazz == null || other == null) {
+            return false;
+        }
+        return (clazz == other) || clazz.getCanonicalName().equals(other.getCanonicalName());
+    }
+
+    static final class MultipartImpl implements Multipart {
+
+        private Map<String, String> header;
+        private Map<String, String> contentDisposition;
+        private File tempFile;
+
+        MultipartImpl(Map<String, String> header, File temp) {
+            this.header = header;
+            this.tempFile = temp;
+        }
+
+        @Override
+        public String getName() {
+            return getContentDisposition().get("name");
+        }
+
+        public void dispose() {
+            this.tempFile.deleteOnExit();
+        }
+
+        @Override
+        public String getResourceName() {
+            return getContentDisposition().get("filename");
+        }
+
+        private Map<String, String> getContentDisposition() {
+            if (contentDisposition == null) {
+                contentDisposition = Maps.newEmptyHashMap();
+                String value = this.header.get("Content-Disposition");
+                for (String param : StringUtils.split(value, ';')) {
+                    List<String> sp = StringUtils.split(param.trim(), '=');
+                    if (sp.size() > 1) {
+                        String p = sp.get(1);
+                        if (p.endsWith("\"") && p.startsWith("\"")) {
+                            contentDisposition.put(sp.get(0), p.substring(1, p.length() - 1));
+                        } else {
+                            contentDisposition.put(sp.get(0), p);
+                        }
+                    } else {
+                        contentDisposition.put(sp.get(0), "");
+                    }
+                }
+            }
+            return contentDisposition;
+        }
+
+        @Override
+        public InputStream getInputStream() {
+            try {
+                return new FileInputStream(tempFile);
+            } catch (IOException e) {
+                throw new ApplicationRuntimeException(e) {
+
+                    private static final long serialVersionUID = 1L;
+                };
+            }
+        }
+
+        public File getAsFile() {
+            return this.tempFile;
+        }
+
+        @Override
+        public byte[] getBytes() {
+            ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+            IOUtils.copyQuietly(getInputStream(), bytes);
+            return bytes.toByteArray();
+        }
+
+        @Override
+        public String getContentType() {
+            return header.get("Content-Type");
+        }
+    }
+
+    static final class MultipartsImpl implements MultipartParameters<Multipart> {
+
+        private List<Multipart> multiparts;
+        private Charset encoding;
+        private Map<String, Multipart[]> mapped;
+
+        MultipartsImpl(List<Multipart> multiparts, Charset encoding) {
+            this.multiparts = multiparts;
+            this.encoding = encoding;
+        }
+
+        @Override
+        public Iterator<Multipart> iterator() {
+            return this.multiparts.iterator();
+        }
+
+        @Override
+        public List<String> getValues(String key) {
+            String[] values = asMap().get(key);
+            if (ArrayUtils.isEmpty(values)) {
+                return Collections.emptyList();
+            } else {
+                return Arrays.asList(values);
+            }
+        }
+
+        @Override
+        public Map<String, String[]> asMap() {
+            Map<String, Multipart[]> mps = extract();
+            Map<String, String[]> sms = Maps.newEmptyHashMap();
+            for (Entry<String, Multipart[]> e : mps.entrySet()) {
+                String[] values = ArrayUtils.newArray();
+                for (Multipart m : e.getValue()) {
+                    ArrayUtils.add(String.class, new String(m.getBytes(), encoding), values);
+                }
+                sms.put(e.getKey(), values);
+            }
+            return null;
+        }
+
+        @Override
+        public Multipart[] getMultiparts(String name) {
+            return extract().get(name);
+        }
+
+        private Map<String, Multipart[]> extract() {
+            if (mapped == null) {
+                mapped = Maps.newEmptyHashMap();
+                for (Multipart mp : this.multiparts) {
+                    if (mapped.containsKey(mp.getName())) {
+                        mapped.put(mp.getName(), ArrayUtils.add(Multipart.class, mp, mapped.get(mp.getName())));
+                    } else {
+                        mapped.put(mp.getName(), ArrayUtils.newArray(mp));
+                    }
+                }
+            }
+            return mapped;
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/core/ParameterValueResolver.java b/src/main/java/org/analogweb/core/ParameterValueResolver.java
index d5c6d37..61f9d6a 100644
--- a/src/main/java/org/analogweb/core/ParameterValueResolver.java
+++ b/src/main/java/org/analogweb/core/ParameterValueResolver.java
@@ -9,38 +9,34 @@
 import org.analogweb.util.StringUtils;
 
 /**
- * Resolve parameter value via query parameter, matrix parameter and form
- * parameter.
- * 
+ * Resolve parameter value via query parameter, matrix parameter and form parameter.
+ *
  * @author snowgoose
  */
 public class ParameterValueResolver implements RequestValueResolver {
 
-	@Override
-	public Object resolveValue(RequestContext requestContext,
-			InvocationMetadata metadata, String name, Class<?> requiredType,
-			Annotation[] annotations) {
-		if (StringUtils.isEmpty(name)) {
-			return null;
-		}
-		List<String> values = requestContext.getQueryParameters().getValues(
-				name);
-		if (values == null || values.isEmpty()) {
-			values = requestContext.getMatrixParameters().getValues(name);
-			if (values == null || values.isEmpty()) {
-				if (requestContext.getRequestMethod().equalsIgnoreCase("GET")) {
-					return null;
-				}
-				values = requestContext.getFormParameters().getValues(name);
-				if (values == null || values.isEmpty()) {
-					return null;
-				}
-			}
-		}
-		if (String[].class.equals(requiredType)) {
-			return (values.isEmpty()) ? null : values.toArray(new String[values
-					.size()]);
-		}
-		return values.get(0);
-	}
+    @Override
+    public Object resolveValue(RequestContext requestContext, InvocationMetadata metadata, String name,
+            Class<?> requiredType, Annotation[] annotations) {
+        if (StringUtils.isEmpty(name)) {
+            return null;
+        }
+        List<String> values = requestContext.getQueryParameters().getValues(name);
+        if (values == null || values.isEmpty()) {
+            values = requestContext.getMatrixParameters().getValues(name);
+            if (values == null || values.isEmpty()) {
+                if (requestContext.getRequestMethod().equalsIgnoreCase("GET")) {
+                    return null;
+                }
+                values = requestContext.getFormParameters().getValues(name);
+                if (values == null || values.isEmpty()) {
+                    return null;
+                }
+            }
+        }
+        if (String[].class.equals(requiredType)) {
+            return (values.isEmpty()) ? null : values.toArray(new String[values.size()]);
+        }
+        return values.get(0);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/PathVariableValueResolver.java b/src/main/java/org/analogweb/core/PathVariableValueResolver.java
index a53d381..4b06585 100644
--- a/src/main/java/org/analogweb/core/PathVariableValueResolver.java
+++ b/src/main/java/org/analogweb/core/PathVariableValueResolver.java
@@ -18,67 +18,59 @@
  */
 public class PathVariableValueResolver implements RequestValueResolver {
 
-	private static final String VARIABLES_CACHE_KEY = PathVariableValueResolver.class
-			.getName() + ParameterValueResolver.class.hashCode();
+    private static final String VARIABLES_CACHE_KEY = PathVariableValueResolver.class.getName()
+            + ParameterValueResolver.class.hashCode();
 
-	@Override
-	public Object resolveValue(RequestContext requestContext,
-			InvocationMetadata metadata, String name, Class<?> requiredType,
-			Annotation[] annotations) {
-		RequestPathMetadata definedPath = metadata.getDefinedPath();
-		String actualPath = definedPath.getActualPath();
-		if (hasPlaceHolder(actualPath)
-				|| (StringUtils.isNotEmpty(actualPath) && actualPath
-						.contains("$<"))) {
-			RequestPath requestedPath = requestContext.getRequestPath();
-			if (definedPath.match(requestedPath)) {
-				Map<String, String> pathVariables = extractPathValues(
-						definedPath.getActualPath(), requestContext);
-				return pathVariables.get(name);
-			}
-		}
-		return null;
-	}
+    @Override
+    public Object resolveValue(RequestContext requestContext, InvocationMetadata metadata, String name,
+            Class<?> requiredType, Annotation[] annotations) {
+        RequestPathMetadata definedPath = metadata.getDefinedPath();
+        String actualPath = definedPath.getActualPath();
+        if (hasPlaceHolder(actualPath) || (StringUtils.isNotEmpty(actualPath) && actualPath.contains("$<"))) {
+            RequestPath requestedPath = requestContext.getRequestPath();
+            if (definedPath.match(requestedPath)) {
+                Map<String, String> pathVariables = extractPathValues(definedPath.getActualPath(), requestContext);
+                return pathVariables.get(name);
+            }
+        }
+        return null;
+    }
 
-	@SuppressWarnings("unchecked")
-	private Map<String, String> extractPathValues(String definedPath,
-			RequestContext rc) {
-		Object expected = rc.getAttribute(VARIABLES_CACHE_KEY);
-		if (expected instanceof Map<?, ?>) {
-			return (Map<String, String>) expected;
-		}
-		String requestedPath = rc.getRequestPath().getActualPath();
-		List<String> definedPathes = StringUtils.split(definedPath, '/');
-		List<String> requestedPathes = StringUtils.split(requestedPath, '/');
-		Map<String, String> context = Maps.newEmptyHashMap();
-		int index = 0;
-		for (String definedPathPart : definedPathes) {
-			if (definedPathPart.startsWith("{")
-					&& definedPathPart.endsWith("}")) {
-				String key = StringUtils.substring(definedPathPart, 1,
-						definedPathPart.length() - 1);
-				context.put(key, requestedPathes.get(index));
-			}
-			List<String> identifiners = StringUtils.split(definedPathPart, '$');
-			if (identifiners.size() == 2) {
-				String pattern = identifiners.get(1);
-				if (pattern.startsWith("<") && pattern.endsWith(">")) {
-					String regex = StringUtils.substring(pattern, 1,
-							pattern.length() - 1);
-					String value = requestedPathes.get(index);
-					if (Pattern.matches(regex, value)) {
-						context.put(identifiners.get(0), value);
-					}
-				}
-			}
-			index++;
-		}
-		rc.setAttribute(VARIABLES_CACHE_KEY, context);
-		return context;
-	}
+    @SuppressWarnings("unchecked")
+    private Map<String, String> extractPathValues(String definedPath, RequestContext rc) {
+        Object expected = rc.getAttribute(VARIABLES_CACHE_KEY);
+        if (expected instanceof Map<?, ?>) {
+            return (Map<String, String>) expected;
+        }
+        String requestedPath = rc.getRequestPath().getActualPath();
+        List<String> definedPathes = StringUtils.split(definedPath, '/');
+        List<String> requestedPathes = StringUtils.split(requestedPath, '/');
+        Map<String, String> context = Maps.newEmptyHashMap();
+        int index = 0;
+        for (String definedPathPart : definedPathes) {
+            if (definedPathPart.startsWith("{") && definedPathPart.endsWith("}")) {
+                String key = StringUtils.substring(definedPathPart, 1, definedPathPart.length() - 1);
+                context.put(key, requestedPathes.get(index));
+            }
+            List<String> identifiners = StringUtils.split(definedPathPart, '$');
+            if (identifiners.size() == 2) {
+                String pattern = identifiners.get(1);
+                if (pattern.startsWith("<") && pattern.endsWith(">")) {
+                    String regex = StringUtils.substring(pattern, 1, pattern.length() - 1);
+                    String value = requestedPathes.get(index);
+                    if (Pattern.matches(regex, value)) {
+                        context.put(identifiners.get(0), value);
+                    }
+                }
+            }
+            index++;
+        }
+        rc.setAttribute(VARIABLES_CACHE_KEY, context);
+        return context;
+    }
 
-	private boolean hasPlaceHolder(String value) {
-		Pattern hasPlaceHolder = Pattern.compile(".*\\{[a-zA-z0-9]*\\}.*");
-		return hasPlaceHolder.matcher(value).matches();
-	}
+    private boolean hasPlaceHolder(String value) {
+        Pattern hasPlaceHolder = Pattern.compile(".*\\{[a-zA-z0-9]*\\}.*");
+        return hasPlaceHolder.matcher(value).matches();
+    }
 }
diff --git a/src/main/java/org/analogweb/core/PrecedenceComparator.java b/src/main/java/org/analogweb/core/PrecedenceComparator.java
index 04e44ea..d417538 100644
--- a/src/main/java/org/analogweb/core/PrecedenceComparator.java
+++ b/src/main/java/org/analogweb/core/PrecedenceComparator.java
@@ -7,18 +7,16 @@
 /**
  * @author snowgoose
  */
-public class PrecedenceComparator<T extends Precedence>
-		implements
-			Comparator<T> {
+public class PrecedenceComparator<T extends Precedence> implements Comparator<T> {
 
-	@Override
-	public int compare(T arg0, T arg1) {
-		if (arg0.getPrecedence() == arg1.getPrecedence()) {
-			return 0;
-		}
-		if (arg0.getPrecedence() > arg1.getPrecedence()) {
-			return 1;
-		}
-		return -1;
-	}
+    @Override
+    public int compare(T arg0, T arg1) {
+        if (arg0.getPrecedence() == arg1.getPrecedence()) {
+            return 0;
+        }
+        if (arg0.getPrecedence() > arg1.getPrecedence()) {
+            return 1;
+        }
+        return -1;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/QueryParameters.java b/src/main/java/org/analogweb/core/QueryParameters.java
index 3a5fe8f..c6524d1 100644
--- a/src/main/java/org/analogweb/core/QueryParameters.java
+++ b/src/main/java/org/analogweb/core/QueryParameters.java
@@ -22,108 +22,97 @@
  */
 public class QueryParameters implements Parameters {
 
-	private Map<String, String[]> extracted;
-	private final URI requestURI;
-	private final ReadableBuffer body;
-	private final MediaType contentType;
+    private Map<String, String[]> extracted;
+    private final URI requestURI;
+    private final ReadableBuffer body;
+    private final MediaType contentType;
 
-	public QueryParameters(URI requestURI) {
-		this(requestURI, null, null);
-	}
+    public QueryParameters(URI requestURI) {
+        this(requestURI, null, null);
+    }
 
-	public QueryParameters(URI requestURI, ReadableBuffer body,
-			MediaType contentType) {
-		this.requestURI = requestURI;
-		this.body = body;
-		this.contentType = contentType;
-	}
+    public QueryParameters(URI requestURI, ReadableBuffer body, MediaType contentType) {
+        this.requestURI = requestURI;
+        this.body = body;
+        this.contentType = contentType;
+    }
 
-	protected Map<String, String[]> extract(URI requestURI,
-			ReadableBuffer body, MediaType contentType) {
-		Charset charset = Charset.defaultCharset();
-		if (contentType != null) {
-			String c = contentType.getParameters().get("charset");
-			if (StringUtils.isNotEmpty(c)) {
-				charset = Charset.forName(c);
-			}
-		}
-		try {
-			String parameterParts = resolveParametersParts(requestURI, body,
-					contentType, charset);
-			return extractEncodedParams(parameterParts, charset,
-					getParameterSeparator());
-		} catch (IllegalArgumentException e) {
-			throw new ApplicationRuntimeException(e) {
+    protected Map<String, String[]> extract(URI requestURI, ReadableBuffer body, MediaType contentType) {
+        Charset charset = Charset.defaultCharset();
+        if (contentType != null) {
+            String c = contentType.getParameters().get("charset");
+            if (StringUtils.isNotEmpty(c)) {
+                charset = Charset.forName(c);
+            }
+        }
+        try {
+            String parameterParts = resolveParametersParts(requestURI, body, contentType, charset);
+            return extractEncodedParams(parameterParts, charset, getParameterSeparator());
+        } catch (IllegalArgumentException e) {
+            throw new ApplicationRuntimeException(e) {
 
-				// TODO
-				private static final long serialVersionUID = 1L;
-			};
-		} catch (IOException e) {
-			throw new ApplicationRuntimeException(e) {
+                // TODO
+                private static final long serialVersionUID = 1L;
+            };
+        } catch (IOException e) {
+            throw new ApplicationRuntimeException(e) {
 
-				// TODO
-				private static final long serialVersionUID = 1L;
-			};
-		}
-	}
+                // TODO
+                private static final long serialVersionUID = 1L;
+            };
+        }
+    }
 
-	protected String resolveParametersParts(URI requestURI,
-			ReadableBuffer body, MediaType contentType, Charset charset)
-			throws IOException {
-		return requestURI.getRawQuery();
-	}
+    protected String resolveParametersParts(URI requestURI, ReadableBuffer body, MediaType contentType, Charset charset)
+            throws IOException {
+        return requestURI.getRawQuery();
+    }
 
-	protected char getParameterSeparator() {
-		return '&';
-	}
+    protected char getParameterSeparator() {
+        return '&';
+    }
 
-	protected Map<String, String[]> extractEncodedParams(String encoded,
-			Charset charset, char separator) throws IOException {
-		Map<String, String[]> map = Maps.newEmptyHashMap();
-		if (StringUtils.isEmpty(encoded)) {
-			return map;
-		}
-		final List<String> tokenized = StringUtils.split(encoded, separator);
-		for (String token : tokenized) {
-			int idx = token.indexOf('=');
-			if (idx < 0) {
-				map.put(URLDecoder.decode(token, charset.name()),
-						(String[]) null);
-			} else if (idx > 0) {
-				String key = URLDecoder.decode(token.substring(0, idx),
-						charset.name());
-				String[] values;
-				if (map.containsKey(key)) {
-					values = map.get(key);
-					values = ArrayUtils.add(
-							String.class,
-							URLDecoder.decode(token.substring(idx + 1),
-									charset.name()), values);
-				} else {
-					values = ArrayUtils.newArray(URLDecoder.decode(
-							token.substring(idx + 1), charset.name()));
-				}
-				map.put(key, values);
-			}
-		}
-		return map;
-	}
+    protected Map<String, String[]> extractEncodedParams(String encoded, Charset charset, char separator)
+            throws IOException {
+        Map<String, String[]> map = Maps.newEmptyHashMap();
+        if (StringUtils.isEmpty(encoded)) {
+            return map;
+        }
+        final List<String> tokenized = StringUtils.split(encoded, separator);
+        for (String token : tokenized) {
+            int idx = token.indexOf('=');
+            if (idx < 0) {
+                map.put(URLDecoder.decode(token, charset.name()), (String[]) null);
+            } else if (idx > 0) {
+                String key = URLDecoder.decode(token.substring(0, idx), charset.name());
+                String[] values;
+                if (map.containsKey(key)) {
+                    values = map.get(key);
+                    values = ArrayUtils.add(String.class, URLDecoder.decode(token.substring(idx + 1), charset.name()),
+                            values);
+                } else {
+                    values = ArrayUtils.newArray(URLDecoder.decode(token.substring(idx + 1), charset.name()));
+                }
+                map.put(key, values);
+            }
+        }
+        return map;
+    }
 
-	@Override
-	public Map<String, String[]> asMap() {
-		if (extracted == null) {
-			this.extracted = extract(this.requestURI, this.body,
-					this.contentType);
-		}
-		return extracted;
-	}
+    @Override
+    public Map<String, String[]> asMap() {
+        if (extracted == null) {
+            this.extracted = extract(this.requestURI, this.body, this.contentType);
+        }
+        return extracted;
+    }
 
-	@Override
-	public List<String> getValues(String key) {
-		String[] array = asMap().get(key);
-		if (ArrayUtils.isEmpty(array)) {
-			return Collections.emptyList();
-		}
-		return Arrays.asList(array);
-	}
+    @Override
+    public List<String> getValues(String key) {
+        String[] array = asMap().get(key);
+        if (ArrayUtils.isEmpty(array)) {
+            return Collections.emptyList();
+        }
+        return Arrays.asList(array);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/ReadableBufferResponseEntity.java b/src/main/java/org/analogweb/core/ReadableBufferResponseEntity.java
index 3022c85..a13f383 100644
--- a/src/main/java/org/analogweb/core/ReadableBufferResponseEntity.java
+++ b/src/main/java/org/analogweb/core/ReadableBufferResponseEntity.java
@@ -3,25 +3,23 @@
 import org.analogweb.ReadableBuffer;
 import org.analogweb.ResponseEntity;
 
-public class ReadableBufferResponseEntity
-		implements
-			ResponseEntity<ReadableBuffer> {
+public class ReadableBufferResponseEntity implements ResponseEntity<ReadableBuffer> {
 
-	private ReadableBuffer entity;
-	private long length;
+    private ReadableBuffer entity;
+    private long length;
 
-	public ReadableBufferResponseEntity(ReadableBuffer in) {
-		this.entity = in;
-		this.length = in.getLength();
-	}
+    public ReadableBufferResponseEntity(ReadableBuffer in) {
+        this.entity = in;
+        this.length = in.getLength();
+    }
 
-	@Override
-	public ReadableBuffer entity() {
-		return this.entity;
-	}
+    @Override
+    public ReadableBuffer entity() {
+        return this.entity;
+    }
 
-	@Override
-	public long getContentLength() {
-		return this.length;
-	}
+    @Override
+    public long getContentLength() {
+        return this.length;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/RequestBodyValueResolver.java b/src/main/java/org/analogweb/core/RequestBodyValueResolver.java
index 373868b..f7bf70e 100644
--- a/src/main/java/org/analogweb/core/RequestBodyValueResolver.java
+++ b/src/main/java/org/analogweb/core/RequestBodyValueResolver.java
@@ -13,39 +13,36 @@
 import org.analogweb.util.logging.Markers;
 
 /**
- * Resolve request body as {@link InputStream} or {@link String}. returns
- * {@code null} when request body not readable.
- * 
+ * Resolve request body as {@link InputStream} or {@link String}. returns {@code null} when request body not readable.
+ *
  * @see RequestContext#getRequestBody()
+ *
  * @author snowgoose
  */
 public class RequestBodyValueResolver implements RequestValueResolver {
 
-	private Log log = Logs.getLog(RequestBodyValueResolver.class);
+    private Log log = Logs.getLog(RequestBodyValueResolver.class);
 
-	@Override
-	public Object resolveValue(RequestContext requestContext,
-			InvocationMetadata metadata, String query, Class<?> type,
-			Annotation[] annotations) {
-		if (type == null) {
-			return null;
-		}
-		try {
-			if (InputStream.class.isAssignableFrom(type)) {
-				return requestContext.getRequestBody().asInputStream();
-			} else if (String.class.isAssignableFrom(type)) {
-				return requestContext.getRequestBody().asString(
-						Charset.defaultCharset());
-			}
-			log.log(Markers.BOOT_APPLICATION, "WV000001",
-					RequestBodyValueResolver.class.getCanonicalName(),
-					type.getCanonicalName());
-			throw new UnresolvableValueException(this, type, query);
-		} catch (IOException e) {
-			throw new ApplicationRuntimeException(e) {
+    @Override
+    public Object resolveValue(RequestContext requestContext, InvocationMetadata metadata, String query, Class<?> type,
+            Annotation[] annotations) {
+        if (type == null) {
+            return null;
+        }
+        try {
+            if (InputStream.class.isAssignableFrom(type)) {
+                return requestContext.getRequestBody().asInputStream();
+            } else if (String.class.isAssignableFrom(type)) {
+                return requestContext.getRequestBody().asString(Charset.defaultCharset());
+            }
+            log.log(Markers.BOOT_APPLICATION, "WV000001", RequestBodyValueResolver.class.getCanonicalName(),
+                    type.getCanonicalName());
+            throw new UnresolvableValueException(this, type, query);
+        } catch (IOException e) {
+            throw new ApplicationRuntimeException(e) {
 
-				private static final long serialVersionUID = 1L;
-			};
-		}
-	}
+                private static final long serialVersionUID = 1L;
+            };
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/core/RequestContextValueResolver.java b/src/main/java/org/analogweb/core/RequestContextValueResolver.java
index a1332d6..147c119 100644
--- a/src/main/java/org/analogweb/core/RequestContextValueResolver.java
+++ b/src/main/java/org/analogweb/core/RequestContextValueResolver.java
@@ -11,29 +11,27 @@
 import org.analogweb.RequestValueResolver;
 
 /**
- * Resolve {@link RequestContext} specific instances.(like {@link RequestPath}
- * and so on.)
- * 
+ * Resolve {@link RequestContext} specific instances.(like {@link RequestPath} and so on.)
+ *
  * @author snowgooseyk
  */
 public class RequestContextValueResolver implements RequestValueResolver {
 
-	@Override
-	public Object resolveValue(RequestContext request,
-			InvocationMetadata metadata, String name, Class<?> requiredType,
-			Annotation[] parameterAnnotations) {
-		if (requiredType == null) {
-			return null;
-		}
-		if (RequestPath.class.isAssignableFrom(requiredType)) {
-			return request.getRequestPath();
-		} else if (MediaType.class.isAssignableFrom(requiredType)) {
-			return request.getContentType();
-		} else if (Headers.class.isAssignableFrom(requiredType)) {
-			return request.getRequestHeaders();
-		} else if (Cookies.class.isAssignableFrom(requiredType)) {
-			return request.getCookies();
-		}
-		return null;
-	}
+    @Override
+    public Object resolveValue(RequestContext request, InvocationMetadata metadata, String name, Class<?> requiredType,
+            Annotation[] parameterAnnotations) {
+        if (requiredType == null) {
+            return null;
+        }
+        if (RequestPath.class.isAssignableFrom(requiredType)) {
+            return request.getRequestPath();
+        } else if (MediaType.class.isAssignableFrom(requiredType)) {
+            return request.getContentType();
+        } else if (Headers.class.isAssignableFrom(requiredType)) {
+            return request.getRequestHeaders();
+        } else if (Cookies.class.isAssignableFrom(requiredType)) {
+            return request.getCookies();
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/RequestContextWrapper.java b/src/main/java/org/analogweb/core/RequestContextWrapper.java
index 9be991e..dc7a818 100644
--- a/src/main/java/org/analogweb/core/RequestContextWrapper.java
+++ b/src/main/java/org/analogweb/core/RequestContextWrapper.java
@@ -13,89 +13,89 @@
  */
 public class RequestContextWrapper implements RequestContext {
 
-	private RequestContext original;
-
-	public RequestContextWrapper(RequestContext context) {
-		Assertion.notNull(context, RequestContext.class.getName());
-		this.original = context;
-	}
-
-	public RequestContext getOriginalRequestContext() {
-		return this.original;
-	}
-
-	@Override
-	public Cookies getCookies() {
-		return getOriginalRequestContext().getCookies();
-	}
-
-	@Override
-	public Headers getRequestHeaders() {
-		return getOriginalRequestContext().getRequestHeaders();
-	}
-
-	@Override
-	public Parameters getFormParameters() {
-		return getOriginalRequestContext().getFormParameters();
-	}
-
-	@Override
-	public Parameters getQueryParameters() {
-		return getOriginalRequestContext().getQueryParameters();
-	}
-
-	@Override
-	public Parameters getMatrixParameters() {
-		return getOriginalRequestContext().getMatrixParameters();
-	}
-
-	@Override
-	public ReadableBuffer getRequestBody() throws IOException {
-		return getOriginalRequestContext().getRequestBody();
-	}
-
-	@Override
-	public MediaType getContentType() {
-		return getOriginalRequestContext().getContentType();
-	}
-
-	@Override
-	public RequestPath getRequestPath() {
-		return getOriginalRequestContext().getRequestPath();
-	}
-
-	@Override
-	public Locale getLocale() {
-		return getOriginalRequestContext().getLocale();
-	}
-
-	@Override
-	public List<Locale> getLocales() {
-		return getOriginalRequestContext().getLocales();
-	}
-
-	@Override
-	public long getContentLength() {
-		return getOriginalRequestContext().getContentLength();
-	}
-
-	@Override
-	public String getCharacterEncoding() {
-		return getOriginalRequestContext().getCharacterEncoding();
-	}
-
-	@Override
-	public String getRequestMethod() {
-		return getOriginalRequestContext().getRequestMethod();
-	}
-
-	@Override
-	public <T> T getAttribute(String name) {
-		return getOriginalRequestContext().getAttribute(name);
-	}
-
-	@Override
-	public <T> void setAttribute(String name, T value) {
-		getOriginalRequestContext().setAttribute(name, value);
-	}
+    private RequestContext original;
+
+    public RequestContextWrapper(RequestContext context) {
+        Assertion.notNull(context, RequestContext.class.getName());
+        this.original = context;
+    }
+
+    public RequestContext getOriginalRequestContext() {
+        return this.original;
+    }
+
+    @Override
+    public Cookies getCookies() {
+        return getOriginalRequestContext().getCookies();
+    }
+
+    @Override
+    public Headers getRequestHeaders() {
+        return getOriginalRequestContext().getRequestHeaders();
+    }
+
+    @Override
+    public Parameters getFormParameters() {
+        return getOriginalRequestContext().getFormParameters();
+    }
+
+    @Override
+    public Parameters getQueryParameters() {
+        return getOriginalRequestContext().getQueryParameters();
+    }
+
+    @Override
+    public Parameters getMatrixParameters() {
+        return getOriginalRequestContext().getMatrixParameters();
+    }
+
+    @Override
+    public ReadableBuffer getRequestBody() throws IOException {
+        return getOriginalRequestContext().getRequestBody();
+    }
+
+    @Override
+    public MediaType getContentType() {
+        return getOriginalRequestContext().getContentType();
+    }
+
+    @Override
+    public RequestPath getRequestPath() {
+        return getOriginalRequestContext().getRequestPath();
+    }
+
+    @Override
+    public Locale getLocale() {
+        return getOriginalRequestContext().getLocale();
+    }
+
+    @Override
+    public List<Locale> getLocales() {
+        return getOriginalRequestContext().getLocales();
+    }
+
+    @Override
+    public long getContentLength() {
+        return getOriginalRequestContext().getContentLength();
+    }
+
+    @Override
+    public String getCharacterEncoding() {
+        return getOriginalRequestContext().getCharacterEncoding();
+    }
+
+    @Override
+    public String getRequestMethod() {
+        return getOriginalRequestContext().getRequestMethod();
+    }
+
+    @Override
+    public <T> T getAttribute(String name) {
+        return getOriginalRequestContext().getAttribute(name);
+    }
+
+    @Override
+    public <T> void setAttribute(String name, T value) {
+        getOriginalRequestContext().setAttribute(name, value);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/RequestCookies.java b/src/main/java/org/analogweb/core/RequestCookies.java
index af2e255..6f6b672 100644
--- a/src/main/java/org/analogweb/core/RequestCookies.java
+++ b/src/main/java/org/analogweb/core/RequestCookies.java
@@ -11,40 +11,40 @@
  */
 public class RequestCookies extends EmptyCookies {
 
-	private final String header;
-	private Map<String, Cookie> map;
-
-	public RequestCookies(String header) {
-		this.header = header;
-	}
-
-	protected String getHeaderValue() {
-		return this.header;
-	}
-
-	@Override
-	public Cookie getCookie(String name) {
-		if (map == null) {
-			map = toMap(getHeaderValue());
-		}
-		return map.get(name);
-	}
-
-	protected Map<String, Cookie> toMap(String header) {
-		List<String> splitted = StringUtils.split(header, ';');
-		Map<String, Cookie> map = Maps.newEmptyHashMap();
-		for (String pair : splitted) {
-			int eq = pair.indexOf('=');
-			String name, value;
-			if (eq < 0 || (eq == header.length() - 1)) {
-				name = pair;
-				value = StringUtils.EMPTY;
-			} else {
-				name = pair.substring(0, eq).trim();
-				value = pair.substring(eq + 1).trim();
-			}
-			map.put(name, new DefaultCookie(name, value));
-		}
-		return map;
-	}
+    private final String header;
+    private Map<String, Cookie> map;
+
+    public RequestCookies(String header) {
+        this.header = header;
+    }
+
+    protected String getHeaderValue() {
+        return this.header;
+    }
+
+    @Override
+    public Cookie getCookie(String name) {
+        if (map == null) {
+            map = toMap(getHeaderValue());
+        }
+        return map.get(name);
+    }
+
+    protected Map<String, Cookie> toMap(String header) {
+        List<String> splitted = StringUtils.split(header, ';');
+        Map<String, Cookie> map = Maps.newEmptyHashMap();
+        for (String pair : splitted) {
+            int eq = pair.indexOf('=');
+            String name, value;
+            if (eq < 0 || (eq == header.length() - 1)) {
+                name = pair;
+                value = StringUtils.EMPTY;
+            } else {
+                name = pair.substring(0, eq).trim();
+                value = pair.substring(eq + 1).trim();
+            }
+            map.put(name, new DefaultCookie(name, value));
+        }
+        return map;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/RequestMethodUnsupportedException.java b/src/main/java/org/analogweb/core/RequestMethodUnsupportedException.java
index 04bd243..ae457b7 100644
--- a/src/main/java/org/analogweb/core/RequestMethodUnsupportedException.java
+++ b/src/main/java/org/analogweb/core/RequestMethodUnsupportedException.java
@@ -7,26 +7,24 @@
 /**
  * @author snowgoose
  */
-public class RequestMethodUnsupportedException
-		extends
-			UnsatisfiedRequestException {
+public class RequestMethodUnsupportedException extends UnsatisfiedRequestException {
 
-	private static final long serialVersionUID = -5103029925778697441L;
-	private final List<String> definedMethods;
-	private final String requestedMethod;
+    private static final long serialVersionUID = -5103029925778697441L;
+    private final List<String> definedMethods;
+    private final String requestedMethod;
 
-	public RequestMethodUnsupportedException(RequestPathMetadata metadata,
-			List<String> definedMethods, String requestedMethod) {
-		super(metadata);
-		this.definedMethods = definedMethods;
-		this.requestedMethod = requestedMethod;
-	}
+    public RequestMethodUnsupportedException(RequestPathMetadata metadata, List<String> definedMethods,
+            String requestedMethod) {
+        super(metadata);
+        this.definedMethods = definedMethods;
+        this.requestedMethod = requestedMethod;
+    }
 
-	public List<String> getDefinedMethods() {
-		return definedMethods;
-	}
+    public List<String> getDefinedMethods() {
+        return definedMethods;
+    }
 
-	public String getRequestedMethod() {
-		return requestedMethod;
-	}
+    public String getRequestedMethod() {
+        return requestedMethod;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/RequestMethodUnsupportedExceptionMapper.java b/src/main/java/org/analogweb/core/RequestMethodUnsupportedExceptionMapper.java
index 3e666f2..400c0cd 100644
--- a/src/main/java/org/analogweb/core/RequestMethodUnsupportedExceptionMapper.java
+++ b/src/main/java/org/analogweb/core/RequestMethodUnsupportedExceptionMapper.java
@@ -6,11 +6,10 @@
  * @author snowgooseyk
  */
 public class RequestMethodUnsupportedExceptionMapper
-		extends
-			TypeAssignableFromExceptionMapper<RequestMethodUnsupportedException> {
+        extends TypeAssignableFromExceptionMapper<RequestMethodUnsupportedException> {
 
-	@Override
-	public Object mapToResult(Throwable throwable) {
-		return HttpStatus.METHOD_NOT_ALLOWED;
-	}
+    @Override
+    public Object mapToResult(Throwable throwable) {
+        return HttpStatus.METHOD_NOT_ALLOWED;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/RequestPathDefinition.java b/src/main/java/org/analogweb/core/RequestPathDefinition.java
index ce9cb7a..57e81d5 100644
--- a/src/main/java/org/analogweb/core/RequestPathDefinition.java
+++ b/src/main/java/org/analogweb/core/RequestPathDefinition.java
@@ -13,180 +13,167 @@
 
 /**
  * Define {@link RequestPath} that enable entry-point to invoke.
- * 
+ *
  * @author y2k2mt
  */
 public class RequestPathDefinition extends AbstractRequestPathMetadata {
 
-	private static final List<String> DEFAULT_METHODS = Collections
-			.unmodifiableList(Arrays.asList("GET", "POST"));
-	public static final RequestPathMetadata EMPTY = new EmptyDefinePath();
-	protected final String actualPath;
-	protected final List<String> requestMethods;
-
-	protected RequestPathDefinition(String path, String[] requestMethods) {
-		this.actualPath = path;
-		if (ArrayUtils.isNotEmpty(requestMethods)) {
-			this.requestMethods = Arrays.asList(requestMethods);
-		} else {
-			this.requestMethods = DEFAULT_METHODS;
-		}
-	}
-
-	public static RequestPathDefinition define(String root, String path) {
-		return define(root, path, new String[0]);
-	}
-
-	public static RequestPathDefinition define(String root, String path,
-			String[] requestMethods) {
-		if (StringUtils.isEmpty(root)) {
-			root = StringUtils.EMPTY;
-		}
-		if (StringUtils.isEmpty(path)) {
-			throw new InvalidRequestPathException(root, path);
-		}
-		StringBuilder editedRoot = editRoot(root, path);
-		StringBuilder editedPath = editPath(root, path);
-		return new RequestPathDefinition(editedRoot.append(editedPath)
-				.toString(), requestMethods);
-	}
-
-	protected static StringBuilder editPath(String root, String path) {
-		StringBuilder editedPath = new StringBuilder(path);
-		if (editedPath.indexOf("/") != 0) {
-			editedPath = new StringBuilder().append('/').append(path);
-		}
-		// int lastIndexOfSuffix = editedPath.lastIndexOf(".");
-		// if (editedPath.lastIndexOf("/") < lastIndexOfSuffix) {
-		// editedPath = new StringBuilder(editedPath.substring(0,
-		// lastIndexOfSuffix));
-		// }
-		return editedPath;
-	}
-
-	protected static StringBuilder editRoot(String root, String path) {
-		StringBuilder editedRoot = new StringBuilder(root);
-		if (root.indexOf("*") > 0) {
-			throw new InvalidRequestPathException(root, path);
-		}
-		if (root.startsWith("/") == false) {
-			editedRoot = new StringBuilder().append('/').append(root);
-		}
-		if (editedRoot.lastIndexOf("/") == editedRoot.length() - 1) {
-			editedRoot = new StringBuilder(editedRoot.substring(0,
-					editedRoot.length() - 1));
-		}
-		return editedRoot;
-	}
-
-	@Override
-	public String getActualPath() {
-		return this.actualPath;
-	}
-
-	@Override
-	public List<String> getRequestMethods() {
-		return this.requestMethods;
-	}
-
-	@Override
-	public boolean match(RequestPath requestPath) {
-		return matchWildCard(requestPath, getActualPath())
-				|| matchPlaceHolder(requestPath)
-				|| matchRegexPlaceHolder(requestPath)
-				|| getActualPath().equals(requestPath.getActualPath())
-				&& containsRequestMethod(requestPath);
-	}
-
-	private boolean matchRegexPlaceHolder(RequestPath rp) {
-		String requestedPath = rp.getActualPath();
-		List<String> requestedPathes = StringUtils.split(requestedPath, '/');
-		List<String> actualPathes = StringUtils.split(getActualPath(), '/');
-		if (requestedPathes.size() != actualPathes.size()) {
-			return false;
-		}
-		Iterator<String> actualPathesIterator = actualPathes.iterator();
-		for (String path : requestedPathes) {
-			String actualPath = actualPathesIterator.next();
-			List<String> identifiners = StringUtils.split(actualPath, '$');
-			if (identifiners.size() == 2) {
-				String pattern = identifiners.get(1);
-				if (pattern.startsWith("<")
-						&& pattern.endsWith(">")
-						&& Pattern.matches(
-								StringUtils.substring(pattern, 1,
-										pattern.length() - 1), path)) {
-					return containsRequestMethod(rp);
-				}
-			}
-		}
-		return false;
-	}
-
-	private boolean containsRequestMethod(RequestPath other) {
-		if (getRequestMethods().contains(other.getRequestMethod()) == false) {
-			throw new RequestMethodUnsupportedException(this,
-					getRequestMethods(), other.getRequestMethod());
-		} else {
-			return true;
-		}
-	}
-
-	private boolean matchPlaceHolder(RequestPath rp) {
-		String requestedPath = rp.getActualPath();
-		List<String> requestedPathes = StringUtils.split(requestedPath, '/');
-		List<String> actualPathes = StringUtils.split(getActualPath(), '/');
-		if (requestedPathes.size() != actualPathes.size()) {
-			return false;
-		}
-		Iterator<String> actualPathesIterator = actualPathes.iterator();
-		for (String path : requestedPathes) {
-			String actualPath = actualPathesIterator.next();
-			if ((actualPath.startsWith("{") == false || actualPath
-					.endsWith("}") == false)
-					&& actualPath.equals(path) == false) {
-				return false;
-			}
-		}
-		return containsRequestMethod(rp);
-	}
-
-	private boolean matchWildCard(RequestPath rp, String pattern) {
-		String text = rp.getActualPath();
-		if (pattern.indexOf('*') < 0) {
-			return false;
-		}
-		List<String> sp = StringUtils.split(pattern, '*');
-		for (int i = 0; i < sp.size(); i++) {
-			String card = sp.get(i);
-			// at first.
-			if (i == 0 && card.startsWith("/")
-					&& text.startsWith(card) == false) {
-				return false;
-			}
-			int idx = text.indexOf(card);
-			if (idx == -1) {
-				return false;
-			}
-			// at last.
-			if (i == sp.size() - 1 && StringUtils.isNotEmpty(card)
-					&& text.endsWith(card) == false) {
-				return false;
-			}
-			text = text.substring(idx + card.length());
-		}
-		return containsRequestMethod(rp);
-	}
-
-	@Override
-	public String toString() {
-		return getActualPath();
-	}
-
-	private static final class EmptyDefinePath extends RequestPathDefinition {
-
-		private EmptyDefinePath() {
-			super(StringUtils.EMPTY, new String[0]);
-		}
-	}
+    private static final List<String> DEFAULT_METHODS = Collections.unmodifiableList(Arrays.asList("GET", "POST"));
+    public static final RequestPathMetadata EMPTY = new EmptyDefinePath();
+    protected final String actualPath;
+    protected final List<String> requestMethods;
+
+    protected RequestPathDefinition(String path, String[] requestMethods) {
+        this.actualPath = path;
+        if (ArrayUtils.isNotEmpty(requestMethods)) {
+            this.requestMethods = Arrays.asList(requestMethods);
+        } else {
+            this.requestMethods = DEFAULT_METHODS;
+        }
+    }
+
+    public static RequestPathDefinition define(String root, String path) {
+        return define(root, path, new String[0]);
+    }
+
+    public static RequestPathDefinition define(String root, String path, String[] requestMethods) {
+        if (StringUtils.isEmpty(root)) {
+            root = StringUtils.EMPTY;
+        }
+        if (StringUtils.isEmpty(path)) {
+            throw new InvalidRequestPathException(root, path);
+        }
+        StringBuilder editedRoot = editRoot(root, path);
+        StringBuilder editedPath = editPath(root, path);
+        return new RequestPathDefinition(editedRoot.append(editedPath).toString(), requestMethods);
+    }
+
+    protected static StringBuilder editPath(String root, String path) {
+        StringBuilder editedPath = new StringBuilder(path);
+        if (editedPath.indexOf("/") != 0) {
+            editedPath = new StringBuilder().append('/').append(path);
+        }
+        // int lastIndexOfSuffix = editedPath.lastIndexOf(".");
+        // if (editedPath.lastIndexOf("/") < lastIndexOfSuffix) {
+        // editedPath = new StringBuilder(editedPath.substring(0,
+        // lastIndexOfSuffix));
+        // }
+        return editedPath;
+    }
+
+    protected static StringBuilder editRoot(String root, String path) {
+        StringBuilder editedRoot = new StringBuilder(root);
+        if (root.indexOf("*") > 0) {
+            throw new InvalidRequestPathException(root, path);
+        }
+        if (root.startsWith("/") == false) {
+            editedRoot = new StringBuilder().append('/').append(root);
+        }
+        if (editedRoot.lastIndexOf("/") == editedRoot.length() - 1) {
+            editedRoot = new StringBuilder(editedRoot.substring(0, editedRoot.length() - 1));
+        }
+        return editedRoot;
+    }
+
+    @Override
+    public String getActualPath() {
+        return this.actualPath;
+    }
+
+    @Override
+    public List<String> getRequestMethods() {
+        return this.requestMethods;
+    }
+
+    @Override
+    public boolean match(RequestPath requestPath) {
+        return matchWildCard(requestPath, getActualPath()) || matchPlaceHolder(requestPath)
+                || matchRegexPlaceHolder(requestPath)
+                || getActualPath().equals(requestPath.getActualPath()) && containsRequestMethod(requestPath);
+    }
+
+    private boolean matchRegexPlaceHolder(RequestPath rp) {
+        String requestedPath = rp.getActualPath();
+        List<String> requestedPathes = StringUtils.split(requestedPath, '/');
+        List<String> actualPathes = StringUtils.split(getActualPath(), '/');
+        if (requestedPathes.size() != actualPathes.size()) {
+            return false;
+        }
+        Iterator<String> actualPathesIterator = actualPathes.iterator();
+        for (String path : requestedPathes) {
+            String actualPath = actualPathesIterator.next();
+            List<String> identifiners = StringUtils.split(actualPath, '$');
+            if (identifiners.size() == 2) {
+                String pattern = identifiners.get(1);
+                if (pattern.startsWith("<") && pattern.endsWith(">")
+                        && Pattern.matches(StringUtils.substring(pattern, 1, pattern.length() - 1), path)) {
+                    return containsRequestMethod(rp);
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean containsRequestMethod(RequestPath other) {
+        if (getRequestMethods().contains(other.getRequestMethod()) == false) {
+            throw new RequestMethodUnsupportedException(this, getRequestMethods(), other.getRequestMethod());
+        } else {
+            return true;
+        }
+    }
+
+    private boolean matchPlaceHolder(RequestPath rp) {
+        String requestedPath = rp.getActualPath();
+        List<String> requestedPathes = StringUtils.split(requestedPath, '/');
+        List<String> actualPathes = StringUtils.split(getActualPath(), '/');
+        if (requestedPathes.size() != actualPathes.size()) {
+            return false;
+        }
+        Iterator<String> actualPathesIterator = actualPathes.iterator();
+        for (String path : requestedPathes) {
+            String actualPath = actualPathesIterator.next();
+            if ((actualPath.startsWith("{") == false || actualPath.endsWith("}") == false)
+                    && actualPath.equals(path) == false) {
+                return false;
+            }
+        }
+        return containsRequestMethod(rp);
+    }
+
+    private boolean matchWildCard(RequestPath rp, String pattern) {
+        String text = rp.getActualPath();
+        if (pattern.indexOf('*') < 0) {
+            return false;
+        }
+        List<String> sp = StringUtils.split(pattern, '*');
+        for (int i = 0; i < sp.size(); i++) {
+            String card = sp.get(i);
+            // at first.
+            if (i == 0 && card.startsWith("/") && text.startsWith(card) == false) {
+                return false;
+            }
+            int idx = text.indexOf(card);
+            if (idx == -1) {
+                return false;
+            }
+            // at last.
+            if (i == sp.size() - 1 && StringUtils.isNotEmpty(card) && text.endsWith(card) == false) {
+                return false;
+            }
+            text = text.substring(idx + card.length());
+        }
+        return containsRequestMethod(rp);
+    }
+
+    @Override
+    public String toString() {
+        return getActualPath();
+    }
+
+    private static final class EmptyDefinePath extends RequestPathDefinition {
+
+        private EmptyDefinePath() {
+            super(StringUtils.EMPTY, new String[0]);
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/core/ResponseCookies.java b/src/main/java/org/analogweb/core/ResponseCookies.java
index 3760518..fc97a8f 100644
--- a/src/main/java/org/analogweb/core/ResponseCookies.java
+++ b/src/main/java/org/analogweb/core/ResponseCookies.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.analogweb.core;
 
@@ -14,28 +14,28 @@
  */
 public class ResponseCookies implements Cookies {
 
-	private final Map<String, Cookie> map;
-
-	public ResponseCookies() {
-		this.map = Maps.newEmptyHashMap();
-	}
-
-	@Override
-	public Cookie getCookie(String name) {
-		return map.get(name);
-	}
-
-	@Override
-	public void putCookie(Cookie cookie) {
-		this.map.put(cookie.getName(), cookie);
-	}
-
-	@Override
-	public void putCookie(String name, Object value) {
-		if (value instanceof Cookie) {
-			putCookie((Cookie) value);
-		} else {
-			putCookie(new DefaultCookie(name, value.toString()));
-		}
-	}
+    private final Map<String, Cookie> map;
+
+    public ResponseCookies() {
+        this.map = Maps.newEmptyHashMap();
+    }
+
+    @Override
+    public Cookie getCookie(String name) {
+        return map.get(name);
+    }
+
+    @Override
+    public void putCookie(Cookie cookie) {
+        this.map.put(cookie.getName(), cookie);
+    }
+
+    @Override
+    public void putCookie(String name, Object value) {
+        if (value instanceof Cookie) {
+            putCookie((Cookie) value);
+        } else {
+            putCookie(new DefaultCookie(name, value.toString()));
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/core/ResponseEvaluationException.java b/src/main/java/org/analogweb/core/ResponseEvaluationException.java
index 7efe6bb..9587c0b 100644
--- a/src/main/java/org/analogweb/core/ResponseEvaluationException.java
+++ b/src/main/java/org/analogweb/core/ResponseEvaluationException.java
@@ -7,15 +7,15 @@
  */
 public class ResponseEvaluationException extends ApplicationRuntimeException {
 
-	private static final long serialVersionUID = 1L;
-	private final Renderable result;
+    private static final long serialVersionUID = 1L;
+    private final Renderable result;
 
-	public ResponseEvaluationException(Throwable cause, Renderable result) {
-		super(cause);
-		this.result = result;
-	}
+    public ResponseEvaluationException(Throwable cause, Renderable result) {
+        super(cause);
+        this.result = result;
+    }
 
-	public Renderable getActionResult() {
-		return this.result;
-	}
+    public Renderable getActionResult() {
+        return this.result;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/RootModulesConfig.java b/src/main/java/org/analogweb/core/RootModulesConfig.java
index dbb25d9..7631e37 100644
--- a/src/main/java/org/analogweb/core/RootModulesConfig.java
+++ b/src/main/java/org/analogweb/core/RootModulesConfig.java
@@ -18,32 +18,24 @@
 
 /**
  * default implementation of {@link ModulesConfig}
- * 
+ *
  * @author y2k2mt
  */
 public final class RootModulesConfig extends AbstractModulesConfig {
 
-	@Override
-	public ModulesBuilder prepare(ModulesBuilder builder) {
-		Assertion.notNull(builder, ModulesBuilder.class.getCanonicalName());
-		return builder
-				.setModulesProviderClass(
-						StaticMappingContainerAdaptorFactory.class)
-				.setInvocationInstanceProviderClass(
-						SingletonInstanceContainerAdaptorFactory.class)
-				.setInvocationFactoryClass(InvocationFactory.class)
-				.setInvokerFactoryClass(InvokerFactory.class)
-				.setResponseHandlerClass(ResponseHandler.class)
-				.setRenderableResolverClass(RenderableResolver.class)
-				.setExceptionHandlerClass(ExceptionHandler.class)
-				.setTypeMapperContextClass(TypeMapperContext.class)
-				.addApplicationProcessorClass(ApplicationProcessor.class)
-				.addInvocationMetadataFactoriesClass(
-						InvocationMetadataFactory.class)
-				.addInvocationMetadataFinderClass(
-						InvocationMetadataFinder.class)
-				.addAttributesHandlerClass(AttributesHandler.class)
-				.addRequestValueResolverClass(RequestValueResolver.class)
-				.addExceptionMapperClass(ExceptionMapper.class);
-	}
+    @Override
+    public ModulesBuilder prepare(ModulesBuilder builder) {
+        Assertion.notNull(builder, ModulesBuilder.class.getCanonicalName());
+        return builder.setModulesProviderClass(StaticMappingContainerAdaptorFactory.class)
+                .setInvocationInstanceProviderClass(SingletonInstanceContainerAdaptorFactory.class)
+                .setInvocationFactoryClass(InvocationFactory.class).setInvokerFactoryClass(InvokerFactory.class)
+                .setResponseHandlerClass(ResponseHandler.class).setRenderableResolverClass(RenderableResolver.class)
+                .setExceptionHandlerClass(ExceptionHandler.class).setTypeMapperContextClass(TypeMapperContext.class)
+                .addApplicationProcessorClass(ApplicationProcessor.class)
+                .addInvocationMetadataFactoriesClass(InvocationMetadataFactory.class)
+                .addInvocationMetadataFinderClass(InvocationMetadataFinder.class)
+                .addAttributesHandlerClass(AttributesHandler.class)
+                .addRequestValueResolverClass(RequestValueResolver.class)
+                .addExceptionMapperClass(ExceptionMapper.class);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/ScopedMapArgumentPreparator.java b/src/main/java/org/analogweb/core/ScopedMapArgumentPreparator.java
index 76cd872..80630d9 100644
--- a/src/main/java/org/analogweb/core/ScopedMapArgumentPreparator.java
+++ b/src/main/java/org/analogweb/core/ScopedMapArgumentPreparator.java
@@ -22,79 +22,70 @@
  */
 public class ScopedMapArgumentPreparator extends AbstractApplicationProcessor {
 
-	@Override
-	public Object prepareInvoke(InvocationArguments args,
-			InvocationMetadata metadata, RequestContext context,
-			TypeMapperContext converters, RequestValueResolvers handlers) {
-		Method method = metadata.resolveMethod();
-		if (method == null) {
-			return NO_INTERRUPTION;
-		}
-		Annotation[][] argumentAnnotations = method.getParameterAnnotations();
-		Class<?>[] argTypes = metadata.getArgumentTypes();
-		if (ArrayUtils.isEmpty(argTypes)
-				|| ArrayUtils.isEmpty(argumentAnnotations)) {
-			return NO_INTERRUPTION;
-		}
-		for (int index = 0, limit = argTypes.length; index < limit; index++) {
-			Attributes viewAttributes = AnnotationUtils.findAnnotation(
-					Attributes.class, argumentAnnotations[index]);
-			if (viewAttributes != null
-					&& argTypes[index].getCanonicalName().equals(
-							Map.class.getCanonicalName())) {
-				args.putInvocationArgument(index, new ContextExtractor<Object>(
-						viewAttributes.value()));
-			}
-		}
-		return NO_INTERRUPTION;
-	}
+    @Override
+    public Object prepareInvoke(InvocationArguments args, InvocationMetadata metadata, RequestContext context,
+            TypeMapperContext converters, RequestValueResolvers handlers) {
+        Method method = metadata.resolveMethod();
+        if (method == null) {
+            return NO_INTERRUPTION;
+        }
+        Annotation[][] argumentAnnotations = method.getParameterAnnotations();
+        Class<?>[] argTypes = metadata.getArgumentTypes();
+        if (ArrayUtils.isEmpty(argTypes) || ArrayUtils.isEmpty(argumentAnnotations)) {
+            return NO_INTERRUPTION;
+        }
+        for (int index = 0, limit = argTypes.length; index < limit; index++) {
+            Attributes viewAttributes = AnnotationUtils.findAnnotation(Attributes.class, argumentAnnotations[index]);
+            if (viewAttributes != null && argTypes[index].getCanonicalName().equals(Map.class.getCanonicalName())) {
+                args.putInvocationArgument(index, new ContextExtractor<Object>(viewAttributes.value()));
+            }
+        }
+        return NO_INTERRUPTION;
+    }
 
-	@Override
-	public void postInvoke(Object invocationResult, InvocationArguments args,
-			InvocationMetadata metadata, RequestContext context,
-			RequestValueResolvers handlers) {
-		for (Object arg : args.asList()) {
-			if (arg instanceof ContextExtractor) {
-				ContextExtractor<?> scopedAttributes = (ContextExtractor<?>) arg;
-				scopedAttributes.extract(context, handlers);
-			}
-		}
-	}
+    @Override
+    public void postInvoke(Object invocationResult, InvocationArguments args, InvocationMetadata metadata,
+            RequestContext context, RequestValueResolvers handlers) {
+        for (Object arg : args.asList()) {
+            if (arg instanceof ContextExtractor) {
+                ContextExtractor<?> scopedAttributes = (ContextExtractor<?>) arg;
+                scopedAttributes.extract(context, handlers);
+            }
+        }
+    }
 
-	static final class ContextExtractor<V> extends HashMap<String, V> {
+    static final class ContextExtractor<V> extends HashMap<String, V> {
 
-		private static final long serialVersionUID = -944143676425859153L;
-		private final Set<String> removedKeys = new HashSet<String>();
-		private final Class<? extends AttributesHandler> handlerClass;
+        private static final long serialVersionUID = -944143676425859153L;
+        private final Set<String> removedKeys = new HashSet<String>();
+        private final Class<? extends AttributesHandler> handlerClass;
 
-		ContextExtractor(Class<? extends AttributesHandler> handlerClass) {
-			super();
-			this.handlerClass = handlerClass;
-		}
+        ContextExtractor(Class<? extends AttributesHandler> handlerClass) {
+            super();
+            this.handlerClass = handlerClass;
+        }
 
-		Class<? extends AttributesHandler> getHandlerClass() {
-			return this.handlerClass;
-		}
+        Class<? extends AttributesHandler> getHandlerClass() {
+            return this.handlerClass;
+        }
 
-		@Override
-		public V remove(Object key) {
-			V removed = super.remove(key);
-			removedKeys.add((String) key);
-			return removed;
-		}
+        @Override
+        public V remove(Object key) {
+            V removed = super.remove(key);
+            removedKeys.add((String) key);
+            return removed;
+        }
 
-		void extract(RequestContext context, RequestValueResolvers handlers) {
-			AttributesHandler handler = handlers
-					.findAttributesHandler(getHandlerClass());
-			if (handler != null) {
-				for (java.util.Map.Entry<String, ?> entry : entrySet()) {
-					handler.putAttributeValue(context, entry.getKey(),
-							entry.getValue());
-				}
-				for (String removedKey : removedKeys) {
-					handler.removeAttribute(context, removedKey);
-				}
-			}
-		}
-	}
+        void extract(RequestContext context, RequestValueResolvers handlers) {
+            AttributesHandler handler = handlers.findAttributesHandler(getHandlerClass());
+            if (handler != null) {
+                for (java.util.Map.Entry<String, ?> entry : entrySet()) {
+                    handler.putAttributeValue(context, entry.getKey(), entry.getValue());
+                }
+                for (String removedKey : removedKeys) {
+                    handler.removeAttribute(context, removedKey);
+                }
+            }
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/core/Servers.java b/src/main/java/org/analogweb/core/Servers.java
index 846cb78..6a0847b 100644
--- a/src/main/java/org/analogweb/core/Servers.java
+++ b/src/main/java/org/analogweb/core/Servers.java
@@ -20,84 +20,77 @@
  */
 public final class Servers {
 
-	private static final Log log = Logs.getLog(Servers.class);
-
-	private static final int DEFAULT_PORT = 8000;
-
-	private Servers() {
-		// nop.
-	}
-
-	public static void run(String... packageNames) {
-		run(DEFAULT_PORT, packageNames);
-	}
-
-	public static void run(int port, String... packageNames) {
-		create(port, packageNames).run();
-	}
-
-	public static Server create(int port, String... packageNames) {
-		return create("http://localhost:" + port, packageNames);
-	}
-
-	public static Server create(String uri, String... packageNames) {
-		String names;
-		if (ArrayUtils.isEmpty(packageNames)) {
-			Set<String> detectedPackages = new HashSet<String>();
-			for (Class<?> clz : ReflectionUtils.getCallerClasses()) {
-				detectedPackages.add(clz.getPackage().getName());
-			}
-			names = StringUtils.join(',', detectedPackages
-					.toArray(new String[detectedPackages.size()]));
-		} else {
-			names = StringUtils.join(',', packageNames);
-		}
-		return create(URI.create(uri),
-				DefaultApplicationProperties.properties(names));
-	}
-
-	public static Server create(String uri, ApplicationProperties properties) {
-		return create(URI.create(uri), properties);
-	}
-
-	public static Server create(URI uri, ApplicationProperties properties) {
-		return create(uri, properties, DefaultApplicationContext.context(Maps
-				.<String, Object> newEmptyHashMap()), new WebApplication());
-	}
-
-	public static Server create(URI uri, ApplicationProperties properties,
-			ApplicationContext context) {
-		return create(uri, properties, context, new WebApplication());
-	}
-
-	public static Server create(URI uri, ApplicationProperties properties,
-			ApplicationContext context, List<ModulesConfig> modules) {
-		return create(uri, properties, context, new WebApplication(modules));
-	}
-
-	public static Server create(URI uri, ApplicationProperties properties,
-			ApplicationContext context, Application application) {
-		log.log(Markers.BOOT_APPLICATION, "IB000005");
-		Class<?> probablyFactoryClass = ClassUtils
-				.forNameQuietly(ServerFactory.class.getPackage().getName()
-						+ ".ServerFactoryImpl");
-		if (probablyFactoryClass != null) {
-			Object probablyFactory = ReflectionUtils
-					.getInstanceQuietly(probablyFactoryClass);
-			if (probablyFactory instanceof ServerFactory) {
-				ServerFactory factory = (ServerFactory) probablyFactory;
-				log.log(Markers.BOOT_APPLICATION, "IB000006",
-						factory.toString());
-				return factory.create(uri, properties, context, application);
-			}
-		}
-		return createDefaultServer(uri, properties, context, application);
-	}
-
-	private static Server createDefaultServer(URI uri,
-			ApplicationProperties properties, ApplicationContext context,
-			Application application) {
-		log.log(Markers.BOOT_APPLICATION, "IB000007", "Analogweb HTTP Server");
-		return new DefaultServer(uri, application, context, properties);
-	}
+    private static final Log log = Logs.getLog(Servers.class);
+
+    private static final int DEFAULT_PORT = 8000;
+
+    private Servers() {
+        // nop.
+    }
+
+    public static void run(String... packageNames) {
+        run(DEFAULT_PORT, packageNames);
+    }
+
+    public static void run(int port, String... packageNames) {
+        create(port, packageNames).run();
+    }
+
+    public static Server create(int port, String... packageNames) {
+        return create("http://localhost:" + port, packageNames);
+    }
+
+    public static Server create(String uri, String... packageNames) {
+        String names;
+        if (ArrayUtils.isEmpty(packageNames)) {
+            Set<String> detectedPackages = new HashSet<String>();
+            for (Class<?> clz : ReflectionUtils.getCallerClasses()) {
+                detectedPackages.add(clz.getPackage().getName());
+            }
+            names = StringUtils.join(',', detectedPackages.toArray(new String[detectedPackages.size()]));
+        } else {
+            names = StringUtils.join(',', packageNames);
+        }
+        return create(URI.create(uri), DefaultApplicationProperties.properties(names));
+    }
+
+    public static Server create(String uri, ApplicationProperties properties) {
+        return create(URI.create(uri), properties);
+    }
+
+    public static Server create(URI uri, ApplicationProperties properties) {
+        return create(uri, properties, DefaultApplicationContext.context(Maps.<String, Object> newEmptyHashMap()),
+                new WebApplication());
+    }
+
+    public static Server create(URI uri, ApplicationProperties properties, ApplicationContext context) {
+        return create(uri, properties, context, new WebApplication());
+    }
+
+    public static Server create(URI uri, ApplicationProperties properties, ApplicationContext context,
+            List<ModulesConfig> modules) {
+        return create(uri, properties, context, new WebApplication(modules));
+    }
+
+    public static Server create(URI uri, ApplicationProperties properties, ApplicationContext context,
+            Application application) {
+        log.log(Markers.BOOT_APPLICATION, "IB000005");
+        Class<?> probablyFactoryClass = ClassUtils
+                .forNameQuietly(ServerFactory.class.getPackage().getName() + ".ServerFactoryImpl");
+        if (probablyFactoryClass != null) {
+            Object probablyFactory = ReflectionUtils.getInstanceQuietly(probablyFactoryClass);
+            if (probablyFactory instanceof ServerFactory) {
+                ServerFactory factory = (ServerFactory) probablyFactory;
+                log.log(Markers.BOOT_APPLICATION, "IB000006", factory.toString());
+                return factory.create(uri, properties, context, application);
+            }
+        }
+        return createDefaultServer(uri, properties, context, application);
+    }
+
+    private static Server createDefaultServer(URI uri, ApplicationProperties properties, ApplicationContext context,
+            Application application) {
+        log.log(Markers.BOOT_APPLICATION, "IB000007", "Analogweb HTTP Server");
+        return new DefaultServer(uri, application, context, properties);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/SingletonInstanceContainerAdaptor.java b/src/main/java/org/analogweb/core/SingletonInstanceContainerAdaptor.java
index 1b055e9..81dfa57 100644
--- a/src/main/java/org/analogweb/core/SingletonInstanceContainerAdaptor.java
+++ b/src/main/java/org/analogweb/core/SingletonInstanceContainerAdaptor.java
@@ -12,29 +12,27 @@
  */
 public class SingletonInstanceContainerAdaptor implements ContainerAdaptor {
 
-	private final Map<String, Object> map = Maps.newConcurrentHashMap();
+    private final Map<String, Object> map = Maps.newConcurrentHashMap();
 
-	@SuppressWarnings("unchecked")
-	public <T> T getInstanceOfType(Class<T> type) {
-		if (map.containsKey(type.getCanonicalName()) == false) {
-			try {
-				map.put(type.getCanonicalName(), type.newInstance());
-			} catch (InstantiationException e) {
-				throw new UnsupportedOperationException(
-						"this adaptor unsupported instanticate" + type + ".");
-			} catch (IllegalAccessException e) {
-				throw new UnsupportedOperationException(
-						"this adaptor unsupported instanticate" + type + ".");
-			}
-		}
-		return (T) map.get(type.getCanonicalName());
-	}
+    @SuppressWarnings("unchecked")
+    public <T> T getInstanceOfType(Class<T> type) {
+        if (map.containsKey(type.getCanonicalName()) == false) {
+            try {
+                map.put(type.getCanonicalName(), type.newInstance());
+            } catch (InstantiationException e) {
+                throw new UnsupportedOperationException("this adaptor unsupported instanticate" + type + ".");
+            } catch (IllegalAccessException e) {
+                throw new UnsupportedOperationException("this adaptor unsupported instanticate" + type + ".");
+            }
+        }
+        return (T) map.get(type.getCanonicalName());
+    }
 
-	public <T> List<T> getInstancesOfType(Class<T> type) {
-		return Arrays.asList(getInstanceOfType(type));
-	}
+    public <T> List<T> getInstancesOfType(Class<T> type) {
+        return Arrays.asList(getInstanceOfType(type));
+    }
 
-	public <T> T getInstanceOfId(String id) {
-		throw new UnsupportedOperationException();
-	}
+    public <T> T getInstanceOfId(String id) {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/src/main/java/org/analogweb/core/SingletonInstanceContainerAdaptorFactory.java b/src/main/java/org/analogweb/core/SingletonInstanceContainerAdaptorFactory.java
index 216a33d..388512a 100644
--- a/src/main/java/org/analogweb/core/SingletonInstanceContainerAdaptorFactory.java
+++ b/src/main/java/org/analogweb/core/SingletonInstanceContainerAdaptorFactory.java
@@ -7,12 +7,10 @@
  * @author snowgoose
  */
 public class SingletonInstanceContainerAdaptorFactory
-		implements
-			ContainerAdaptorFactory<SingletonInstanceContainerAdaptor> {
+        implements ContainerAdaptorFactory<SingletonInstanceContainerAdaptor> {
 
-	@Override
-	public SingletonInstanceContainerAdaptor createContainerAdaptor(
-			ApplicationContext resolver) {
-		return new SingletonInstanceContainerAdaptor();
-	}
+    @Override
+    public SingletonInstanceContainerAdaptor createContainerAdaptor(ApplicationContext resolver) {
+        return new SingletonInstanceContainerAdaptor();
+    }
 }
diff --git a/src/main/java/org/analogweb/core/SpecificMediaTypeRequestValueResolver.java b/src/main/java/org/analogweb/core/SpecificMediaTypeRequestValueResolver.java
index a64f468..5e62425 100644
--- a/src/main/java/org/analogweb/core/SpecificMediaTypeRequestValueResolver.java
+++ b/src/main/java/org/analogweb/core/SpecificMediaTypeRequestValueResolver.java
@@ -6,15 +6,13 @@
 /**
  * @author snowgoose
  */
-public interface SpecificMediaTypeRequestValueResolver
-		extends
-			RequestValueResolver {
+public interface SpecificMediaTypeRequestValueResolver extends RequestValueResolver {
 
-	/**
-	 * @param mediaType
-	 *            {@link MediaType}
-	 * @return Returns {@code true} when this resolver supports certain media
-	 *         type.
-	 */
-	boolean supports(MediaType mediaType);
+    /**
+     * @param mediaType
+     *            {@link MediaType}
+     *
+     * @return Returns {@code true} when this resolver supports certain media type.
+     */
+    boolean supports(MediaType mediaType);
 }
diff --git a/src/main/java/org/analogweb/core/StaticMappingContainerAdaptor.java b/src/main/java/org/analogweb/core/StaticMappingContainerAdaptor.java
index 3f4d756..777c2ef 100644
--- a/src/main/java/org/analogweb/core/StaticMappingContainerAdaptor.java
+++ b/src/main/java/org/analogweb/core/StaticMappingContainerAdaptor.java
@@ -22,120 +22,112 @@
  */
 public final class StaticMappingContainerAdaptor implements ContainerAdaptor {
 
-	private final Map<AssignableFromClassKey, Values> instanceMap;
-	private static final Log log = Logs
-			.getLog(StaticMappingContainerAdaptor.class);
-
-	public StaticMappingContainerAdaptor() {
-		instanceMap = new ConcurrentHashMap<AssignableFromClassKey, Values>();
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public <T> T getInstanceOfType(Class<T> type) {
-		Values values = instanceMap.get(AssignableFromClassKey.valueOf(type));
-		if (values == null) {
-			return null;
-		}
-		return (T) values.collection().iterator().next();
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public <T> List<T> getInstancesOfType(Class<T> type) {
-		Values values = instanceMap.get(AssignableFromClassKey.valueOf(type));
-		if (values != null) {
-			return new ArrayList<T>((Collection<T>) values.collection());
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	@SuppressWarnings("unchecked")
-	public <T> void register(Class<? extends T> concleteType) {
-		Assertion.notNull(concleteType, "conclete type");
-		for (Class<?> inf : ReflectionUtils
-				.findAllImplementsInterfacesRecursivery(concleteType)) {
-			register((Class<T>) inf, concleteType);
-		}
-		register((Class<T>) concleteType, concleteType);
-	}
-
-	public <T> void register(Class<T> requiredType,
-			Class<? extends T> concleteType) {
-		Assertion.notNull(requiredType, "instance of type");
-		Assertion.notNull(concleteType, "conclete type");
-		if (concleteType.isInterface()) {
-			return;
-		}
-		T value = ReflectionUtils.getInstanceQuietly(concleteType);
-		if (value == null) {
-			log.log(Markers.BOOT_APPLICATION, "TB000003", concleteType,
-					getClass().getSimpleName(), requiredType);
-			return;
-		}
-		AssignableFromClassKey requiredTypeKey = AssignableFromClassKey
-				.valueOf(requiredType);
-		Values values = null;
-		if (this.instanceMap.containsKey(requiredTypeKey)) {
-			values = this.instanceMap.get(requiredTypeKey);
-		} else {
-			values = new Values();
-		}
-		values.add(value);
-		log.log(Markers.BOOT_APPLICATION, "TB000002", value, getClass()
-				.getSimpleName(), requiredTypeKey);
-		instanceMap.put(requiredTypeKey, values);
-	}
-
-	static class AssignableFromClassKey implements Serializable {
-
-		private static final long serialVersionUID = 6877097524294606292L;
-		private final Class<?> key;
-
-		static AssignableFromClassKey valueOf(Class<?> key) {
-			return new AssignableFromClassKey(key);
-		}
-
-		private AssignableFromClassKey(Class<?> key) {
-			this.key = key;
-		}
-
-		@Override
-		public boolean equals(Object other) {
-			if ((other instanceof AssignableFromClassKey) == false) {
-				return false;
-			}
-			return this.key
-					.isAssignableFrom(((AssignableFromClassKey) other).key);
-		}
-
-		@Override
-		public int hashCode() {
-			return this.key.hashCode();
-		}
-
-		@Override
-		public String toString() {
-			return new StringBuilder("assignable from ").append(
-					this.key.getCanonicalName()).toString();
-		}
-	}
-
-	private static class Values implements Serializable {
-
-		private static final long serialVersionUID = 7232656030740922324L;
-		private final Set<Object> values;
-
-		Values() {
-			values = new HashSet<Object>();
-		}
-
-		void add(Object object) {
-			this.values.add(object);
-		}
-
-		Collection<Object> collection() {
-			return this.values;
-		}
-	}
+    private final Map<AssignableFromClassKey, Values> instanceMap;
+    private static final Log log = Logs.getLog(StaticMappingContainerAdaptor.class);
+
+    public StaticMappingContainerAdaptor() {
+        instanceMap = new ConcurrentHashMap<AssignableFromClassKey, Values>();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T getInstanceOfType(Class<T> type) {
+        Values values = instanceMap.get(AssignableFromClassKey.valueOf(type));
+        if (values == null) {
+            return null;
+        }
+        return (T) values.collection().iterator().next();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> List<T> getInstancesOfType(Class<T> type) {
+        Values values = instanceMap.get(AssignableFromClassKey.valueOf(type));
+        if (values != null) {
+            return new ArrayList<T>((Collection<T>) values.collection());
+        }
+        return Collections.EMPTY_LIST;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> void register(Class<? extends T> concleteType) {
+        Assertion.notNull(concleteType, "conclete type");
+        for (Class<?> inf : ReflectionUtils.findAllImplementsInterfacesRecursivery(concleteType)) {
+            register((Class<T>) inf, concleteType);
+        }
+        register((Class<T>) concleteType, concleteType);
+    }
+
+    public <T> void register(Class<T> requiredType, Class<? extends T> concleteType) {
+        Assertion.notNull(requiredType, "instance of type");
+        Assertion.notNull(concleteType, "conclete type");
+        if (concleteType.isInterface()) {
+            return;
+        }
+        T value = ReflectionUtils.getInstanceQuietly(concleteType);
+        if (value == null) {
+            log.log(Markers.BOOT_APPLICATION, "TB000003", concleteType, getClass().getSimpleName(), requiredType);
+            return;
+        }
+        AssignableFromClassKey requiredTypeKey = AssignableFromClassKey.valueOf(requiredType);
+        Values values = null;
+        if (this.instanceMap.containsKey(requiredTypeKey)) {
+            values = this.instanceMap.get(requiredTypeKey);
+        } else {
+            values = new Values();
+        }
+        values.add(value);
+        log.log(Markers.BOOT_APPLICATION, "TB000002", value, getClass().getSimpleName(), requiredTypeKey);
+        instanceMap.put(requiredTypeKey, values);
+    }
+
+    static class AssignableFromClassKey implements Serializable {
+
+        private static final long serialVersionUID = 6877097524294606292L;
+        private final Class<?> key;
+
+        static AssignableFromClassKey valueOf(Class<?> key) {
+            return new AssignableFromClassKey(key);
+        }
+
+        private AssignableFromClassKey(Class<?> key) {
+            this.key = key;
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            if ((other instanceof AssignableFromClassKey) == false) {
+                return false;
+            }
+            return this.key.isAssignableFrom(((AssignableFromClassKey) other).key);
+        }
+
+        @Override
+        public int hashCode() {
+            return this.key.hashCode();
+        }
+
+        @Override
+        public String toString() {
+            return new StringBuilder("assignable from ").append(this.key.getCanonicalName()).toString();
+        }
+    }
+
+    private static class Values implements Serializable {
+
+        private static final long serialVersionUID = 7232656030740922324L;
+        private final Set<Object> values;
+
+        Values() {
+            values = new HashSet<Object>();
+        }
+
+        void add(Object object) {
+            this.values.add(object);
+        }
+
+        Collection<Object> collection() {
+            return this.values;
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/core/StaticMappingContainerAdaptorFactory.java b/src/main/java/org/analogweb/core/StaticMappingContainerAdaptorFactory.java
index 64e6cc0..d0b56db 100644
--- a/src/main/java/org/analogweb/core/StaticMappingContainerAdaptorFactory.java
+++ b/src/main/java/org/analogweb/core/StaticMappingContainerAdaptorFactory.java
@@ -6,18 +6,15 @@
 /**
  * @author snowgoose
  */
-public class StaticMappingContainerAdaptorFactory
-		implements
-			ContainerAdaptorFactory<StaticMappingContainerAdaptor> {
+public class StaticMappingContainerAdaptorFactory implements ContainerAdaptorFactory<StaticMappingContainerAdaptor> {
 
-	private static StaticMappingContainerAdaptor adaptor;
+    private static StaticMappingContainerAdaptor adaptor;
 
-	@Override
-	public StaticMappingContainerAdaptor createContainerAdaptor(
-			ApplicationContext resolver) {
-		if (adaptor == null) {
-			adaptor = new StaticMappingContainerAdaptor();
-		}
-		return adaptor;
-	}
+    @Override
+    public StaticMappingContainerAdaptor createContainerAdaptor(ApplicationContext resolver) {
+        if (adaptor == null) {
+            adaptor = new StaticMappingContainerAdaptor();
+        }
+        return adaptor;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/TypeAssignableFromExceptionMapper.java b/src/main/java/org/analogweb/core/TypeAssignableFromExceptionMapper.java
index 880b931..278c6ed 100644
--- a/src/main/java/org/analogweb/core/TypeAssignableFromExceptionMapper.java
+++ b/src/main/java/org/analogweb/core/TypeAssignableFromExceptionMapper.java
@@ -6,17 +6,14 @@
 /**
  * @author snowgooseyk
  */
-public abstract class TypeAssignableFromExceptionMapper<T extends Throwable>
-		implements
-			ExceptionMapper {
+public abstract class TypeAssignableFromExceptionMapper<T extends Throwable> implements ExceptionMapper {
 
-	@Override
-	public boolean isMatch(Throwable throwable) {
-		Class<?> clazz = ((Class<?>) ReflectionUtils.findParameterizedType(
-				getClass()).getActualTypeArguments()[0]);
-		if (clazz == null) {
-			return false;
-		}
-		return clazz.isAssignableFrom(throwable.getClass());
-	}
+    @Override
+    public boolean isMatch(Throwable throwable) {
+        Class<?> clazz = ((Class<?>) ReflectionUtils.findParameterizedType(getClass()).getActualTypeArguments()[0]);
+        if (clazz == null) {
+            return false;
+        }
+        return clazz.isAssignableFrom(throwable.getClass());
+    }
 }
diff --git a/src/main/java/org/analogweb/core/TypeSafeTypeMapper.java b/src/main/java/org/analogweb/core/TypeSafeTypeMapper.java
index 8bb0b9a..2d9699b 100644
--- a/src/main/java/org/analogweb/core/TypeSafeTypeMapper.java
+++ b/src/main/java/org/analogweb/core/TypeSafeTypeMapper.java
@@ -7,13 +7,11 @@
  */
 public abstract class TypeSafeTypeMapper<F, T> implements TypeMapper {
 
-	@Override
-	@SuppressWarnings("unchecked")
-	public final Object mapToType(Object from, Class<?> requiredType,
-			String[] formats) {
-		return mapToTypeInternal((F) from, (Class<T>) requiredType, formats);
-	}
+    @Override
+    @SuppressWarnings("unchecked")
+    public final Object mapToType(Object from, Class<?> requiredType, String[] formats) {
+        return mapToTypeInternal((F) from, (Class<T>) requiredType, formats);
+    }
 
-	public abstract T mapToTypeInternal(F from, Class<T> requiredType,
-			String[] formats);
+    public abstract T mapToTypeInternal(F from, Class<T> requiredType, String[] formats);
 }
diff --git a/src/main/java/org/analogweb/core/UnresolvableInvocationException.java b/src/main/java/org/analogweb/core/UnresolvableInvocationException.java
index 892663d..803bfd2 100644
--- a/src/main/java/org/analogweb/core/UnresolvableInvocationException.java
+++ b/src/main/java/org/analogweb/core/UnresolvableInvocationException.java
@@ -5,18 +5,16 @@
 /**
  * @author snowgoose
  */
-public class UnresolvableInvocationException
-		extends
-			ApplicationRuntimeException {
+public class UnresolvableInvocationException extends ApplicationRuntimeException {
 
-	private static final long serialVersionUID = -7930360311054396569L;
-	private InvocationMetadata sourceMetadata;
+    private static final long serialVersionUID = -7930360311054396569L;
+    private InvocationMetadata sourceMetadata;
 
-	public UnresolvableInvocationException(InvocationMetadata source) {
-		this.sourceMetadata = source;
-	}
+    public UnresolvableInvocationException(InvocationMetadata source) {
+        this.sourceMetadata = source;
+    }
 
-	public InvocationMetadata getSourceMetadata() {
-		return this.sourceMetadata;
-	}
+    public InvocationMetadata getSourceMetadata() {
+        return this.sourceMetadata;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/UnresolvableResultException.java b/src/main/java/org/analogweb/core/UnresolvableResultException.java
index 85746d7..1c5fdb6 100644
--- a/src/main/java/org/analogweb/core/UnresolvableResultException.java
+++ b/src/main/java/org/analogweb/core/UnresolvableResultException.java
@@ -5,21 +5,20 @@
  */
 public class UnresolvableResultException extends ApplicationRuntimeException {
 
-	private static final long serialVersionUID = 1L;
-	private final Object invocationResult;
+    private static final long serialVersionUID = 1L;
+    private final Object invocationResult;
 
-	public UnresolvableResultException(Object invocationResult) {
-		super();
-		this.invocationResult = invocationResult;
-	}
+    public UnresolvableResultException(Object invocationResult) {
+        super();
+        this.invocationResult = invocationResult;
+    }
 
-	public Object getUnresolvableInvocationResult() {
-		return this.invocationResult;
-	}
+    public Object getUnresolvableInvocationResult() {
+        return this.invocationResult;
+    }
 
-	@Override
-	public String getMessage() {
-		return String.format("Unresolvable Result [%s].",
-				getUnresolvableInvocationResult());
-	}
+    @Override
+    public String getMessage() {
+        return String.format("Unresolvable Result [%s].", getUnresolvableInvocationResult());
+    }
 }
diff --git a/src/main/java/org/analogweb/core/UnresolvableValueException.java b/src/main/java/org/analogweb/core/UnresolvableValueException.java
index 4ebd00b..1c5cff0 100644
--- a/src/main/java/org/analogweb/core/UnresolvableValueException.java
+++ b/src/main/java/org/analogweb/core/UnresolvableValueException.java
@@ -4,36 +4,32 @@
 import org.analogweb.util.StringUtils;
 
 /**
- * {@link RequestValueResolver} throws this exception when specified type or
- * name not resolvable.
- * 
+ * {@link RequestValueResolver} throws this exception when specified type or name not resolvable.
+ *
  * @author snowgooseyk
  */
 public class UnresolvableValueException extends ApplicationRuntimeException {
 
-	private static final long serialVersionUID = -5294948155134136581L;
-	private final RequestValueResolver resolver;
-	private final String typeName;
-	private final String name;
+    private static final long serialVersionUID = -5294948155134136581L;
+    private final RequestValueResolver resolver;
+    private final String typeName;
+    private final String name;
 
-	public UnresolvableValueException(RequestValueResolver resolver,
-			Class<?> requiredType, String name) {
-		this.typeName = (requiredType == null)
-				? StringUtils.EMPTY
-				: requiredType.getCanonicalName();
-		this.name = name;
-		this.resolver = resolver;
-	}
+    public UnresolvableValueException(RequestValueResolver resolver, Class<?> requiredType, String name) {
+        this.typeName = (requiredType == null) ? StringUtils.EMPTY : requiredType.getCanonicalName();
+        this.name = name;
+        this.resolver = resolver;
+    }
 
-	public RequestValueResolver getRequestValueResolver() {
-		return resolver;
-	}
+    public RequestValueResolver getRequestValueResolver() {
+        return resolver;
+    }
 
-	public String getTypeName() {
-		return typeName;
-	}
+    public String getTypeName() {
+        return typeName;
+    }
 
-	public String getName() {
-		return name;
-	}
+    public String getName() {
+        return name;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/UnsatisfiedRequestException.java b/src/main/java/org/analogweb/core/UnsatisfiedRequestException.java
index 8de9794..1e2ba61 100644
--- a/src/main/java/org/analogweb/core/UnsatisfiedRequestException.java
+++ b/src/main/java/org/analogweb/core/UnsatisfiedRequestException.java
@@ -7,14 +7,14 @@
  */
 public class UnsatisfiedRequestException extends ApplicationRuntimeException {
 
-	private static final long serialVersionUID = -5701810553477314954L;
-	private RequestPathMetadata metadata;
+    private static final long serialVersionUID = -5701810553477314954L;
+    private RequestPathMetadata metadata;
 
-	public UnsatisfiedRequestException(RequestPathMetadata metadata) {
-		this.metadata = metadata;
-	}
+    public UnsatisfiedRequestException(RequestPathMetadata metadata) {
+        this.metadata = metadata;
+    }
 
-	public RequestPathMetadata getMetadata() {
-		return this.metadata;
-	}
+    public RequestPathMetadata getMetadata() {
+        return this.metadata;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/UnsupportedMediaTypeException.java b/src/main/java/org/analogweb/core/UnsupportedMediaTypeException.java
index e7c3859..e067ddf 100644
--- a/src/main/java/org/analogweb/core/UnsupportedMediaTypeException.java
+++ b/src/main/java/org/analogweb/core/UnsupportedMediaTypeException.java
@@ -4,14 +4,14 @@
 
 /**
  * Throws when requested Content-Type not verified.
- * 
+ *
  * @author snowgooseyk
  */
 public class UnsupportedMediaTypeException extends UnsatisfiedRequestException {
 
-	private static final long serialVersionUID = 851954945303138560L;
+    private static final long serialVersionUID = 851954945303138560L;
 
-	public UnsupportedMediaTypeException(RequestPathMetadata metadata) {
-		super(metadata);
-	}
+    public UnsupportedMediaTypeException(RequestPathMetadata metadata) {
+        super(metadata);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/UnsupportedMediaTypeExceptionMapper.java b/src/main/java/org/analogweb/core/UnsupportedMediaTypeExceptionMapper.java
index 0f361c9..e29ea38 100644
--- a/src/main/java/org/analogweb/core/UnsupportedMediaTypeExceptionMapper.java
+++ b/src/main/java/org/analogweb/core/UnsupportedMediaTypeExceptionMapper.java
@@ -6,11 +6,10 @@
  * @author snowgooseyk
  */
 public class UnsupportedMediaTypeExceptionMapper
-		extends
-			TypeAssignableFromExceptionMapper<UnsupportedMediaTypeException> {
+        extends TypeAssignableFromExceptionMapper<UnsupportedMediaTypeException> {
 
-	@Override
-	public Object mapToResult(Throwable throwable) {
-		return HttpStatus.UNSUPPORTED_MEDIA_TYPE;
-	}
+    @Override
+    public Object mapToResult(Throwable throwable) {
+        return HttpStatus.UNSUPPORTED_MEDIA_TYPE;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/WebApplication.java b/src/main/java/org/analogweb/core/WebApplication.java
index 552d779..1a2ec95 100644
--- a/src/main/java/org/analogweb/core/WebApplication.java
+++ b/src/main/java/org/analogweb/core/WebApplication.java
@@ -51,437 +51,378 @@
  */
 public class WebApplication implements Application {
 
-	private static final Log log = Logs.getLog(WebApplication.class);
-	private List<ModulesConfig> modulesConfigs;
-	private Modules modules;
-	private RouteRegistry routes;
-	private ClassLoader classLoader;
-	private ApplicationContext resolver;
+    private static final Log log = Logs.getLog(WebApplication.class);
+    private List<ModulesConfig> modulesConfigs;
+    private Modules modules;
+    private RouteRegistry routes;
+    private ClassLoader classLoader;
+    private ApplicationContext resolver;
 
-	public WebApplication() {
-		this(Collections.<ModulesConfig> emptyList());
-	}
+    public WebApplication() {
+        this(Collections.<ModulesConfig> emptyList());
+    }
 
-	public WebApplication(List<ModulesConfig> modulesConfigs) {
-		Assertion.notNull(modulesConfigs, "ModulesConfig");
-		this.modulesConfigs = modulesConfigs;
-	}
+    public WebApplication(List<ModulesConfig> modulesConfigs) {
+        Assertion.notNull(modulesConfigs, "ModulesConfig");
+        this.modulesConfigs = modulesConfigs;
+    }
 
-	@Override
-	public void run(ApplicationContext resolver, ApplicationProperties props,
-			Collection<ClassCollector> collectors, ClassLoader classLoader) {
-		StopWatch sw = new StopWatch();
-		sw.start();
-		this.resolver = resolver;
-		this.classLoader = classLoader;
-		ApplicationPropertiesHolder.configure(this, props);
-		log.log(Markers.BOOT_APPLICATION, "IB000001");
-		List<Version> versions = Version.load(classLoader);
-		if (versions.isEmpty() == false
-				&& log.isInfoEnabled(Markers.BOOT_APPLICATION)) {
-			log.log(Markers.BOOT_APPLICATION, "IB000008");
-			for (Version v : versions) {
-				log.info("   " + v.getVersion() + " : " + v.getArtifactId());
-			}
-		}
-		Collection<String> invocationPackageNames = props
-				.getComponentPackageNames();
-		log.log(Markers.BOOT_APPLICATION, "DB000001", invocationPackageNames);
-		Set<String> modulesPackageNames = new HashSet<String>();
-		if (CollectionUtils.isNotEmpty(invocationPackageNames)) {
-			modulesPackageNames.addAll(invocationPackageNames);
-		}
-		modulesPackageNames.add(DEFAULT_PACKAGE_NAME);
-		log.log(Markers.BOOT_APPLICATION, "DB000002", modulesPackageNames);
-		initApplication(collectors, modulesPackageNames, props);
-		log.log(Markers.BOOT_APPLICATION, "IB000002", sw.stop());
-	}
+    @Override
+    public void run(ApplicationContext resolver, ApplicationProperties props, Collection<ClassCollector> collectors,
+            ClassLoader classLoader) {
+        StopWatch sw = new StopWatch();
+        sw.start();
+        this.resolver = resolver;
+        this.classLoader = classLoader;
+        ApplicationPropertiesHolder.configure(this, props);
+        log.log(Markers.BOOT_APPLICATION, "IB000001");
+        List<Version> versions = Version.load(classLoader);
+        if (versions.isEmpty() == false && log.isInfoEnabled(Markers.BOOT_APPLICATION)) {
+            log.log(Markers.BOOT_APPLICATION, "IB000008");
+            for (Version v : versions) {
+                log.info("   " + v.getVersion() + " : " + v.getArtifactId());
+            }
+        }
+        Collection<String> invocationPackageNames = props.getComponentPackageNames();
+        log.log(Markers.BOOT_APPLICATION, "DB000001", invocationPackageNames);
+        Set<String> modulesPackageNames = new HashSet<String>();
+        if (CollectionUtils.isNotEmpty(invocationPackageNames)) {
+            modulesPackageNames.addAll(invocationPackageNames);
+        }
+        modulesPackageNames.add(DEFAULT_PACKAGE_NAME);
+        log.log(Markers.BOOT_APPLICATION, "DB000002", modulesPackageNames);
+        initApplication(collectors, modulesPackageNames, props);
+        log.log(Markers.BOOT_APPLICATION, "IB000002", sw.stop());
+    }
 
-	@Override
-	public Response processRequest(RequestPath requestedPath,
-			RequestContext requestContext, ResponseContext responseContext)
-			throws IOException, WebApplicationException {
-		InvocationMetadata metadata = null;
-		Modules mod = null;
-		List<ApplicationProcessor> processors = null;
-		RequestContext context = requestContext;
-		Response response = null;
-		try {
-			mod = getModules();
-			processors = mod.getApplicationProcessors();
-			MutableRequestContext mutableContext = new DefaultMutableRequestContext(
-					context);
-			preMatching(processors, mutableContext, requestedPath);
-			context = mutableContext.unwrap();
-			RouteRegistry mapping = getRouteRegistry();
-			log.log(Markers.LIFECYCLE, "DL000004", requestedPath);
-			metadata = mapping.findInvocationMetadata(context,
-					mod.getInvocationMetadataFinders());
-			if (metadata == null) {
-				log.log(Markers.LIFECYCLE, "DL000005", requestedPath);
-				return NOT_FOUND;
-			}
-			log.log(Markers.LIFECYCLE, "DL000006", requestedPath, metadata);
-			ContainerAdaptor invocationInstances = mod
-					.getInvocationInstanceProvider();
-			RequestValueResolvers resolvers = mod.getRequestValueResolvers();
-			TypeMapperContext typeMapperContext = mod.getTypeMapperContext();
-			Invocation invocation = mod.getInvocationFactory()
-					.createInvocation(invocationInstances, metadata, context,
-							responseContext, typeMapperContext, resolvers);
-			InvocationArguments arguments = invocation.getInvocationArguments();
-			prepareInvoke(processors, arguments, metadata, context, resolvers,
-					typeMapperContext);
-			try {
-				Object invocationResult = mod.getInvoker().invoke(invocation,
-						metadata, context, responseContext);
-				log.log(Markers.LIFECYCLE, "DL000007",
-						invocation.getInvocationInstance(), invocationResult);
-				postInvoke(processors, invocationResult, arguments, metadata,
-						context, resolvers);
-				response = handleResponse(mod, invocationResult, metadata,
-						context, responseContext);
-			} catch (Exception e) {
-				log.log(Markers.LIFECYCLE, "DL000012",
-						invocation.getInvocationInstance(), e);
-				onException(processors, e, arguments, metadata, context);
-				List<Object> args = arguments.asList();
-				throw new InvocationFailureException(e, metadata,
-						args.toArray(new Object[args.size()]));
-			}
-			afterCompletion(processors, context, responseContext, null);
-		} catch (InvokeInterruptedException e) {
-			response = handleResponse(mod, e.getInterruption(), metadata,
-					context, responseContext);
-			afterCompletion(processors, context, responseContext, e);
-		} catch (Exception e) {
-			ExceptionHandler handler = mod.getExceptionHandler();
-			log.log(Markers.LIFECYCLE, "DL000009", (Object) e, handler);
-			Object exceptionResult = handler.handleException(e);
-			if (exceptionResult != null) {
-				response = handleResponse(mod, exceptionResult, metadata,
-						context, responseContext);
-				afterCompletion(processors, context, responseContext, e);
-			} else {
-				afterCompletion(processors, context, responseContext, e);
-				throw new WebApplicationException(e);
-			}
-		}
-		return response;
-	}
+    @Override
+    public Response processRequest(RequestPath requestedPath, RequestContext requestContext,
+            ResponseContext responseContext) throws IOException, WebApplicationException {
+        InvocationMetadata metadata = null;
+        Modules mod = null;
+        List<ApplicationProcessor> processors = null;
+        RequestContext context = requestContext;
+        Response response = null;
+        try {
+            mod = getModules();
+            processors = mod.getApplicationProcessors();
+            MutableRequestContext mutableContext = new DefaultMutableRequestContext(context);
+            preMatching(processors, mutableContext, requestedPath);
+            context = mutableContext.unwrap();
+            RouteRegistry mapping = getRouteRegistry();
+            log.log(Markers.LIFECYCLE, "DL000004", requestedPath);
+            metadata = mapping.findInvocationMetadata(context, mod.getInvocationMetadataFinders());
+            if (metadata == null) {
+                log.log(Markers.LIFECYCLE, "DL000005", requestedPath);
+                return NOT_FOUND;
+            }
+            log.log(Markers.LIFECYCLE, "DL000006", requestedPath, metadata);
+            ContainerAdaptor invocationInstances = mod.getInvocationInstanceProvider();
+            RequestValueResolvers resolvers = mod.getRequestValueResolvers();
+            TypeMapperContext typeMapperContext = mod.getTypeMapperContext();
+            Invocation invocation = mod.getInvocationFactory().createInvocation(invocationInstances, metadata, context,
+                    responseContext, typeMapperContext, resolvers);
+            InvocationArguments arguments = invocation.getInvocationArguments();
+            prepareInvoke(processors, arguments, metadata, context, resolvers, typeMapperContext);
+            try {
+                Object invocationResult = mod.getInvoker().invoke(invocation, metadata, context, responseContext);
+                log.log(Markers.LIFECYCLE, "DL000007", invocation.getInvocationInstance(), invocationResult);
+                postInvoke(processors, invocationResult, arguments, metadata, context, resolvers);
+                response = handleResponse(mod, invocationResult, metadata, context, responseContext);
+            } catch (Exception e) {
+                log.log(Markers.LIFECYCLE, "DL000012", invocation.getInvocationInstance(), e);
+                onException(processors, e, arguments, metadata, context);
+                List<Object> args = arguments.asList();
+                throw new InvocationFailureException(e, metadata, args.toArray(new Object[args.size()]));
+            }
+            afterCompletion(processors, context, responseContext, null);
+        } catch (InvokeInterruptedException e) {
+            response = handleResponse(mod, e.getInterruption(), metadata, context, responseContext);
+            afterCompletion(processors, context, responseContext, e);
+        } catch (Exception e) {
+            ExceptionHandler handler = mod.getExceptionHandler();
+            log.log(Markers.LIFECYCLE, "DL000009", (Object) e, handler);
+            Object exceptionResult = handler.handleException(e);
+            if (exceptionResult != null) {
+                response = handleResponse(mod, exceptionResult, metadata, context, responseContext);
+                afterCompletion(processors, context, responseContext, e);
+            } else {
+                afterCompletion(processors, context, responseContext, e);
+                throw new WebApplicationException(e);
+            }
+        }
+        return response;
+    }
 
-	protected void preMatching(List<ApplicationProcessor> processors,
-			MutableRequestContext request, RequestPath requestedPath) {
-		log.log(Markers.LIFECYCLE, "DL000017");
-		Object interruption = ApplicationProcessor.NO_INTERRUPTION;
-		for (ApplicationProcessor processor : processors) {
-			interruption = processor.preMatching(request, requestedPath);
-			if (interruption != ApplicationProcessor.NO_INTERRUPTION) {
-				throw new InvokeInterruptedException(interruption);
-			}
-		}
-	}
+    protected void preMatching(List<ApplicationProcessor> processors, MutableRequestContext request,
+            RequestPath requestedPath) {
+        log.log(Markers.LIFECYCLE, "DL000017");
+        Object interruption = ApplicationProcessor.NO_INTERRUPTION;
+        for (ApplicationProcessor processor : processors) {
+            interruption = processor.preMatching(request, requestedPath);
+            if (interruption != ApplicationProcessor.NO_INTERRUPTION) {
+                throw new InvokeInterruptedException(interruption);
+            }
+        }
+    }
 
-	protected void prepareInvoke(List<ApplicationProcessor> processors,
-			InvocationArguments args, InvocationMetadata metadata,
-			RequestContext request, RequestValueResolvers attributesHandlers,
-			TypeMapperContext typeMapperContext) {
-		log.log(Markers.LIFECYCLE, "DL000013");
-		Object interruption = ApplicationProcessor.NO_INTERRUPTION;
-		for (ApplicationProcessor processor : processors) {
-			interruption = processor.prepareInvoke(args, metadata, request,
-					typeMapperContext, attributesHandlers);
-			if (interruption != ApplicationProcessor.NO_INTERRUPTION) {
-				throw new InvokeInterruptedException(interruption);
-			}
-		}
-	}
+    protected void prepareInvoke(List<ApplicationProcessor> processors, InvocationArguments args,
+            InvocationMetadata metadata, RequestContext request, RequestValueResolvers attributesHandlers,
+            TypeMapperContext typeMapperContext) {
+        log.log(Markers.LIFECYCLE, "DL000013");
+        Object interruption = ApplicationProcessor.NO_INTERRUPTION;
+        for (ApplicationProcessor processor : processors) {
+            interruption = processor.prepareInvoke(args, metadata, request, typeMapperContext, attributesHandlers);
+            if (interruption != ApplicationProcessor.NO_INTERRUPTION) {
+                throw new InvokeInterruptedException(interruption);
+            }
+        }
+    }
 
-	protected void postInvoke(List<ApplicationProcessor> processors,
-			Object invocationResult, InvocationArguments args,
-			InvocationMetadata metadata, RequestContext request,
-			RequestValueResolvers attributesHandlers) {
-		log.log(Markers.LIFECYCLE, "DL000014");
-		for (ApplicationProcessor processor : processors) {
-			processor.postInvoke(invocationResult, args, metadata, request,
-					attributesHandlers);
-		}
-	}
+    protected void postInvoke(List<ApplicationProcessor> processors, Object invocationResult, InvocationArguments args,
+            InvocationMetadata metadata, RequestContext request, RequestValueResolvers attributesHandlers) {
+        log.log(Markers.LIFECYCLE, "DL000014");
+        for (ApplicationProcessor processor : processors) {
+            processor.postInvoke(invocationResult, args, metadata, request, attributesHandlers);
+        }
+    }
 
-	protected void onException(List<ApplicationProcessor> processors,
-			Exception thrown, InvocationArguments args,
-			InvocationMetadata metadata, RequestContext request) {
-		log.log(Markers.LIFECYCLE, "DL000015");
-		Object interruption = ApplicationProcessor.NO_INTERRUPTION;
-		for (ApplicationProcessor processor : processors) {
-			interruption = processor.processException(thrown, request, args,
-					metadata);
-			if (interruption != ApplicationProcessor.NO_INTERRUPTION) {
-				throw new InvokeInterruptedException(interruption);
-			}
-		}
-	}
+    protected void onException(List<ApplicationProcessor> processors, Exception thrown, InvocationArguments args,
+            InvocationMetadata metadata, RequestContext request) {
+        log.log(Markers.LIFECYCLE, "DL000015");
+        Object interruption = ApplicationProcessor.NO_INTERRUPTION;
+        for (ApplicationProcessor processor : processors) {
+            interruption = processor.processException(thrown, request, args, metadata);
+            if (interruption != ApplicationProcessor.NO_INTERRUPTION) {
+                throw new InvokeInterruptedException(interruption);
+            }
+        }
+    }
 
-	protected void afterCompletion(List<ApplicationProcessor> processors,
-			RequestContext context, ResponseContext responseContext, Exception e) {
-		log.log(Markers.LIFECYCLE, "DL000016");
-		for (ApplicationProcessor processor : processors) {
-			processor.afterCompletion(context, responseContext, e);
-		}
-	}
+    protected void afterCompletion(List<ApplicationProcessor> processors, RequestContext context,
+            ResponseContext responseContext, Exception e) {
+        log.log(Markers.LIFECYCLE, "DL000016");
+        for (ApplicationProcessor processor : processors) {
+            processor.afterCompletion(context, responseContext, e);
+        }
+    }
 
-	protected Response handleResponse(Modules modules, Object result,
-			InvocationMetadata metadata, RequestContext context,
-			ResponseContext responseContext) throws IOException,
-			WebApplicationException {
-		ResponseHandler resultHandler = modules.getResponseHandler();
-		return resultHandler.handleResult(result, metadata,
-				modules.getResponseResolver(), context, responseContext,
-				modules.getExceptionHandler(), modules);
-	}
+    protected Response handleResponse(Modules modules, Object result, InvocationMetadata metadata,
+            RequestContext context, ResponseContext responseContext) throws IOException, WebApplicationException {
+        ResponseHandler resultHandler = modules.getResponseHandler();
+        return resultHandler.handleResult(result, metadata, modules.getResponseResolver(), context, responseContext,
+                modules.getExceptionHandler(), modules);
+    }
 
-	protected void initApplication(Collection<ClassCollector> collectors,
-			Set<String> modulePackageNames, ApplicationProperties properties) {
-		Collection<Class<?>> moduleClasses = collectClasses(modulePackageNames,
-				collectors);
-		ModulesBuilder modulesBuilder = processConfigPreparation(moduleClasses);
-		ApplicationContext resolver = getApplicationContextResolver();
-		ContainerAdaptor defaultContainer = setUpDefaultContainer(resolver,
-				moduleClasses);
-		Modules modules = modulesBuilder.buildModules(resolver,
-				defaultContainer);
-		monitorModules(modules);
-		setModules(modules);
-		log.log(Markers.BOOT_APPLICATION, "DB000003", modules);
-		setRouteRegistry(createRouteRegistry(
-				modules.getInvocationMetadataFactories(), properties,
-				modules.getInvocationInstanceProvider()));
-	}
+    protected void initApplication(Collection<ClassCollector> collectors, Set<String> modulePackageNames,
+            ApplicationProperties properties) {
+        Collection<Class<?>> moduleClasses = collectClasses(modulePackageNames, collectors);
+        ModulesBuilder modulesBuilder = processConfigPreparation(moduleClasses);
+        ApplicationContext resolver = getApplicationContextResolver();
+        ContainerAdaptor defaultContainer = setUpDefaultContainer(resolver, moduleClasses);
+        Modules modules = modulesBuilder.buildModules(resolver, defaultContainer);
+        monitorModules(modules);
+        setModules(modules);
+        log.log(Markers.BOOT_APPLICATION, "DB000003", modules);
+        setRouteRegistry(createRouteRegistry(modules.getInvocationMetadataFactories(), properties,
+                modules.getInvocationInstanceProvider()));
+    }
 
-	private void monitorModules(Modules modules) {
-		if (log.isDebugEnabled(Markers.MONITOR_MODULES)) {
-			log.log(Markers.MONITOR_MODULES, "IB000009");
-			log.debug(Markers.MONITOR_MODULES, "++++++++++++++++++++++++++++");
-			log.debug(Markers.MONITOR_MODULES, "ApplicationProcessor");
-			log.debug(Markers.MONITOR_MODULES, "===");
-			for (ApplicationProcessor m : modules.getApplicationProcessors()) {
-				log.debug(Markers.MONITOR_MODULES, " - "
-						+ m.getClass().getCanonicalName());
-			}
-			log.debug(Markers.MONITOR_MODULES, "");
-			ExceptionHandler eh = modules.getExceptionHandler();
-			log.debug(Markers.MONITOR_MODULES, "ExceptionHandler");
-			log.debug(Markers.MONITOR_MODULES, "===");
-			log.debug(Markers.MONITOR_MODULES, " - "
-					+ eh.getClass().getCanonicalName());
-			log.debug(Markers.MONITOR_MODULES, "");
-			log.debug(Markers.MONITOR_MODULES, "ExceptionMapper");
-			log.debug(Markers.MONITOR_MODULES, "===");
-			for (ExceptionMapper m : modules.getExceptionMappers()) {
-				log.debug(Markers.MONITOR_MODULES, " - "
-						+ m.getClass().getCanonicalName());
-			}
-			log.debug(Markers.MONITOR_MODULES, "");
-			InvocationFactory f = modules.getInvocationFactory();
-			log.debug(Markers.MONITOR_MODULES, "InvocationFactory");
-			log.debug(Markers.MONITOR_MODULES, "===");
-			log.debug(Markers.MONITOR_MODULES, " - "
-					+ f.getClass().getCanonicalName());
-			log.debug(Markers.MONITOR_MODULES, "");
-			ContainerAdaptor ii = modules.getInvocationInstanceProvider();
-			log.debug(Markers.MONITOR_MODULES, "InvocationInstanceProvider");
-			log.debug(Markers.MONITOR_MODULES, "===");
-			log.debug(Markers.MONITOR_MODULES, " - "
-					+ ii.getClass().getCanonicalName());
-			log.debug(Markers.MONITOR_MODULES, "");
-			log.debug(Markers.MONITOR_MODULES, "InvocationInterceptor");
-			log.debug(Markers.MONITOR_MODULES, "===");
-			for (InvocationInterceptor m : modules.getInvocationInterceptors()) {
-				log.debug(Markers.MONITOR_MODULES, " - "
-						+ m.getClass().getCanonicalName());
-			}
-			log.debug(Markers.MONITOR_MODULES, "");
-			log.debug(Markers.MONITOR_MODULES, "InvocationMetadataFactory");
-			log.debug(Markers.MONITOR_MODULES, "===");
-			for (InvocationMetadataFactory m : modules
-					.getInvocationMetadataFactories()) {
-				log.debug(Markers.MONITOR_MODULES, " - "
-						+ m.getClass().getCanonicalName());
-			}
-			log.debug(Markers.MONITOR_MODULES, "");
-			log.debug(Markers.MONITOR_MODULES, "InvocationMetadataFinder");
-			log.debug(Markers.MONITOR_MODULES, "===");
-			for (InvocationMetadataFinder m : modules
-					.getInvocationMetadataFinders()) {
-				log.debug(Markers.MONITOR_MODULES, " - "
-						+ m.getClass().getCanonicalName());
-			}
-			Invoker ik = modules.getInvoker();
-			log.debug(Markers.MONITOR_MODULES, "");
-			log.debug(Markers.MONITOR_MODULES, "Invoker");
-			log.debug(Markers.MONITOR_MODULES, "===");
-			log.debug(Markers.MONITOR_MODULES, " - "
-					+ ik.getClass().getCanonicalName());
-			ContainerAdaptor mca = modules.getModulesContainerAdaptor();
-			log.debug(Markers.MONITOR_MODULES, "");
-			log.debug(Markers.MONITOR_MODULES, "ModulesContainerAdaptor");
-			log.debug(Markers.MONITOR_MODULES, "===");
-			log.debug(Markers.MONITOR_MODULES, " - "
-					+ mca.getClass().getCanonicalName());
-			log.debug(Markers.MONITOR_MODULES, "");
-			log.debug(Markers.MONITOR_MODULES, "RequestValueResolver");
-			log.debug(Markers.MONITOR_MODULES, "===");
-			for (RequestValueResolver m : modules.getRequestValueResolvers()
-					.all()) {
-				log.debug(Markers.MONITOR_MODULES, " - "
-						+ m.getClass().getCanonicalName());
-			}
-			ResponseHandler rh = modules.getResponseHandler();
-			log.debug(Markers.MONITOR_MODULES, "");
-			log.debug(Markers.MONITOR_MODULES, "ResponseHandler");
-			log.debug(Markers.MONITOR_MODULES, "===");
-			log.debug(Markers.MONITOR_MODULES, " - "
-					+ rh.getClass().getCanonicalName());
-			RenderableResolver rr = modules.getResponseResolver();
-			log.debug(Markers.MONITOR_MODULES, "");
-			log.debug(Markers.MONITOR_MODULES, "RenderableResolver");
-			log.debug(Markers.MONITOR_MODULES, "===");
-			log.debug(Markers.MONITOR_MODULES, " - "
-					+ rr.getClass().getCanonicalName());
-			log.debug(Markers.MONITOR_MODULES, "++++++++++++++++++++++++++++");
-		}
-	}
+    private void monitorModules(Modules modules) {
+        if (log.isDebugEnabled(Markers.MONITOR_MODULES)) {
+            log.log(Markers.MONITOR_MODULES, "IB000009");
+            log.debug(Markers.MONITOR_MODULES, "++++++++++++++++++++++++++++");
+            log.debug(Markers.MONITOR_MODULES, "ApplicationProcessor");
+            log.debug(Markers.MONITOR_MODULES, "===");
+            for (ApplicationProcessor m : modules.getApplicationProcessors()) {
+                log.debug(Markers.MONITOR_MODULES, " - " + m.getClass().getCanonicalName());
+            }
+            log.debug(Markers.MONITOR_MODULES, "");
+            ExceptionHandler eh = modules.getExceptionHandler();
+            log.debug(Markers.MONITOR_MODULES, "ExceptionHandler");
+            log.debug(Markers.MONITOR_MODULES, "===");
+            log.debug(Markers.MONITOR_MODULES, " - " + eh.getClass().getCanonicalName());
+            log.debug(Markers.MONITOR_MODULES, "");
+            log.debug(Markers.MONITOR_MODULES, "ExceptionMapper");
+            log.debug(Markers.MONITOR_MODULES, "===");
+            for (ExceptionMapper m : modules.getExceptionMappers()) {
+                log.debug(Markers.MONITOR_MODULES, " - " + m.getClass().getCanonicalName());
+            }
+            log.debug(Markers.MONITOR_MODULES, "");
+            InvocationFactory f = modules.getInvocationFactory();
+            log.debug(Markers.MONITOR_MODULES, "InvocationFactory");
+            log.debug(Markers.MONITOR_MODULES, "===");
+            log.debug(Markers.MONITOR_MODULES, " - " + f.getClass().getCanonicalName());
+            log.debug(Markers.MONITOR_MODULES, "");
+            ContainerAdaptor ii = modules.getInvocationInstanceProvider();
+            log.debug(Markers.MONITOR_MODULES, "InvocationInstanceProvider");
+            log.debug(Markers.MONITOR_MODULES, "===");
+            log.debug(Markers.MONITOR_MODULES, " - " + ii.getClass().getCanonicalName());
+            log.debug(Markers.MONITOR_MODULES, "");
+            log.debug(Markers.MONITOR_MODULES, "InvocationInterceptor");
+            log.debug(Markers.MONITOR_MODULES, "===");
+            for (InvocationInterceptor m : modules.getInvocationInterceptors()) {
+                log.debug(Markers.MONITOR_MODULES, " - " + m.getClass().getCanonicalName());
+            }
+            log.debug(Markers.MONITOR_MODULES, "");
+            log.debug(Markers.MONITOR_MODULES, "InvocationMetadataFactory");
+            log.debug(Markers.MONITOR_MODULES, "===");
+            for (InvocationMetadataFactory m : modules.getInvocationMetadataFactories()) {
+                log.debug(Markers.MONITOR_MODULES, " - " + m.getClass().getCanonicalName());
+            }
+            log.debug(Markers.MONITOR_MODULES, "");
+            log.debug(Markers.MONITOR_MODULES, "InvocationMetadataFinder");
+            log.debug(Markers.MONITOR_MODULES, "===");
+            for (InvocationMetadataFinder m : modules.getInvocationMetadataFinders()) {
+                log.debug(Markers.MONITOR_MODULES, " - " + m.getClass().getCanonicalName());
+            }
+            Invoker ik = modules.getInvoker();
+            log.debug(Markers.MONITOR_MODULES, "");
+            log.debug(Markers.MONITOR_MODULES, "Invoker");
+            log.debug(Markers.MONITOR_MODULES, "===");
+            log.debug(Markers.MONITOR_MODULES, " - " + ik.getClass().getCanonicalName());
+            ContainerAdaptor mca = modules.getModulesContainerAdaptor();
+            log.debug(Markers.MONITOR_MODULES, "");
+            log.debug(Markers.MONITOR_MODULES, "ModulesContainerAdaptor");
+            log.debug(Markers.MONITOR_MODULES, "===");
+            log.debug(Markers.MONITOR_MODULES, " - " + mca.getClass().getCanonicalName());
+            log.debug(Markers.MONITOR_MODULES, "");
+            log.debug(Markers.MONITOR_MODULES, "RequestValueResolver");
+            log.debug(Markers.MONITOR_MODULES, "===");
+            for (RequestValueResolver m : modules.getRequestValueResolvers().all()) {
+                log.debug(Markers.MONITOR_MODULES, " - " + m.getClass().getCanonicalName());
+            }
+            ResponseHandler rh = modules.getResponseHandler();
+            log.debug(Markers.MONITOR_MODULES, "");
+            log.debug(Markers.MONITOR_MODULES, "ResponseHandler");
+            log.debug(Markers.MONITOR_MODULES, "===");
+            log.debug(Markers.MONITOR_MODULES, " - " + rh.getClass().getCanonicalName());
+            RenderableResolver rr = modules.getResponseResolver();
+            log.debug(Markers.MONITOR_MODULES, "");
+            log.debug(Markers.MONITOR_MODULES, "RenderableResolver");
+            log.debug(Markers.MONITOR_MODULES, "===");
+            log.debug(Markers.MONITOR_MODULES, " - " + rr.getClass().getCanonicalName());
+            log.debug(Markers.MONITOR_MODULES, "++++++++++++++++++++++++++++");
+        }
+    }
 
-	protected ModulesBuilder processConfigPreparation(
-			Collection<Class<?>> moduleClasses) {
-		List<ModulesConfig> reflectiveModuleConfigInstances = new ArrayList<ModulesConfig>();
-		List<Class<ModulesConfig>> clazzes = ReflectionUtils
-				.filterClassAsImplementsInterface(ModulesConfig.class,
-						moduleClasses);
-		for (Class<ModulesConfig> configClass : clazzes) {
-			ModulesConfig config = ReflectionUtils
-					.getInstanceQuietly(configClass);
-			if (config != null) {
-				reflectiveModuleConfigInstances.add(config);
-			}
-		}
-		List<ModulesConfig> moduleConfigInstances = new ArrayList<ModulesConfig>(
-				getModulesConfigs());
-		for (ModulesConfig reflectiveModule : reflectiveModuleConfigInstances) {
-			if (!moduleConfigInstances.contains(reflectiveModule)) {
-				moduleConfigInstances.add(reflectiveModule);
-			}
-		}
-		Collections.sort(moduleConfigInstances, getModulesConfigComparator());
-		ModulesBuilder modulesBuilder = new DefaultModulesBuilder();
-		for (ModulesConfig config : moduleConfigInstances) {
-			log.log(Markers.BOOT_APPLICATION, "IB000003", config);
-			modulesBuilder = config.prepare(modulesBuilder);
-		}
-		return modulesBuilder;
-	}
+    protected ModulesBuilder processConfigPreparation(Collection<Class<?>> moduleClasses) {
+        List<ModulesConfig> reflectiveModuleConfigInstances = new ArrayList<ModulesConfig>();
+        List<Class<ModulesConfig>> clazzes = ReflectionUtils.filterClassAsImplementsInterface(ModulesConfig.class,
+                moduleClasses);
+        for (Class<ModulesConfig> configClass : clazzes) {
+            ModulesConfig config = ReflectionUtils.getInstanceQuietly(configClass);
+            if (config != null) {
+                reflectiveModuleConfigInstances.add(config);
+            }
+        }
+        List<ModulesConfig> moduleConfigInstances = new ArrayList<ModulesConfig>(getModulesConfigs());
+        for (ModulesConfig reflectiveModule : reflectiveModuleConfigInstances) {
+            if (!moduleConfigInstances.contains(reflectiveModule)) {
+                moduleConfigInstances.add(reflectiveModule);
+            }
+        }
+        Collections.sort(moduleConfigInstances, getModulesConfigComparator());
+        ModulesBuilder modulesBuilder = new DefaultModulesBuilder();
+        for (ModulesConfig config : moduleConfigInstances) {
+            log.log(Markers.BOOT_APPLICATION, "IB000003", config);
+            modulesBuilder = config.prepare(modulesBuilder);
+        }
+        return modulesBuilder;
+    }
 
-	protected Comparator<ModulesConfig> getModulesConfigComparator() {
-		return new ModulesConfigComparator();
-	}
+    protected Comparator<ModulesConfig> getModulesConfigComparator() {
+        return new ModulesConfigComparator();
+    }
 
-	protected ContainerAdaptor setUpDefaultContainer(
-			ApplicationContext resolver, Collection<Class<?>> rootModuleClasses) {
-		StaticMappingContainerAdaptorFactory factory = new StaticMappingContainerAdaptorFactory();
-		StaticMappingContainerAdaptor adaptor = factory
-				.createContainerAdaptor(resolver);
-		for (Class<?> moduleClass : rootModuleClasses) {
-			if (Module.class.isAssignableFrom(moduleClass)) {
-				adaptor.register(moduleClass);
-			}
-		}
-		return adaptor;
-	}
+    protected ContainerAdaptor setUpDefaultContainer(ApplicationContext resolver,
+            Collection<Class<?>> rootModuleClasses) {
+        StaticMappingContainerAdaptorFactory factory = new StaticMappingContainerAdaptorFactory();
+        StaticMappingContainerAdaptor adaptor = factory.createContainerAdaptor(resolver);
+        for (Class<?> moduleClass : rootModuleClasses) {
+            if (Module.class.isAssignableFrom(moduleClass)) {
+                adaptor.register(moduleClass);
+            }
+        }
+        return adaptor;
+    }
 
-	protected RouteRegistry createRouteRegistry(
-			List<InvocationMetadataFactory> factories,
-			ApplicationProperties properties, ContainerAdaptor instanceProvider) {
-		RouteRegistry mapping = new DefaultRouteRegistry();
-		for (InvocationMetadataFactory factory : factories) {
-			for (InvocationMetadata actionMethodMetadata : factory
-					.createInvocationMetadatas(properties, instanceProvider)) {
-				log.log(Markers.BOOT_APPLICATION, "IB000004",
-						actionMethodMetadata.getDefinedPath(),
-						actionMethodMetadata.getInvocationClass(),
-						actionMethodMetadata.getMethodName());
-				mapping.register(actionMethodMetadata);
-			}
-		}
-		return mapping;
-	}
+    protected RouteRegistry createRouteRegistry(List<InvocationMetadataFactory> factories,
+            ApplicationProperties properties, ContainerAdaptor instanceProvider) {
+        RouteRegistry mapping = new DefaultRouteRegistry();
+        for (InvocationMetadataFactory factory : factories) {
+            for (InvocationMetadata actionMethodMetadata : factory.createInvocationMetadatas(properties,
+                    instanceProvider)) {
+                log.log(Markers.BOOT_APPLICATION, "IB000004", actionMethodMetadata.getDefinedPath(),
+                        actionMethodMetadata.getInvocationClass(), actionMethodMetadata.getMethodName());
+                mapping.register(actionMethodMetadata);
+            }
+        }
+        return mapping;
+    }
 
-	protected Collection<Class<?>> collectAllClasses(
-			Collection<ClassCollector> collectors) {
-		Collection<Class<?>> collectedClasses = new HashSet<Class<?>>();
-		for (String resourceName : SystemProperties.classPathes()) {
-			URL resourceURL = ResourceUtils.findResource(resourceName);
-			for (ClassCollector collector : collectors) {
-				collectedClasses.addAll(collector.collect(StringUtils.EMPTY,
-						resourceURL, classLoader));
-			}
-		}
-		return collectedClasses;
-	}
+    protected Collection<Class<?>> collectAllClasses(Collection<ClassCollector> collectors) {
+        Collection<Class<?>> collectedClasses = new HashSet<Class<?>>();
+        for (String resourceName : SystemProperties.classPathes()) {
+            URL resourceURL = ResourceUtils.findResource(resourceName);
+            for (ClassCollector collector : collectors) {
+                collectedClasses.addAll(collector.collect(StringUtils.EMPTY, resourceURL, classLoader));
+            }
+        }
+        return collectedClasses;
+    }
 
-	protected Collection<Class<?>> collectClasses(
-			Collection<String> rootPackageNames,
-			Collection<ClassCollector> collectors) {
-		Collection<Class<?>> collectedClasses = new HashSet<Class<?>>();
-		for (String packageName : rootPackageNames) {
-			for (URL resourceURL : ResourceUtils.findPackageResources(
-					packageName, classLoader)) {
-				for (ClassCollector collector : collectors) {
-					collectedClasses.addAll(collector.collect(packageName,
-							resourceURL, classLoader));
-				}
-			}
-		}
-		return collectedClasses;
-	}
+    protected Collection<Class<?>> collectClasses(Collection<String> rootPackageNames,
+            Collection<ClassCollector> collectors) {
+        Collection<Class<?>> collectedClasses = new HashSet<Class<?>>();
+        for (String packageName : rootPackageNames) {
+            for (URL resourceURL : ResourceUtils.findPackageResources(packageName, classLoader)) {
+                for (ClassCollector collector : collectors) {
+                    collectedClasses.addAll(collector.collect(packageName, resourceURL, classLoader));
+                }
+            }
+        }
+        return collectedClasses;
+    }
 
-	@Override
-	public RouteRegistry getRouteRegistry() {
-		return routes;
-	}
+    @Override
+    public RouteRegistry getRouteRegistry() {
+        return routes;
+    }
 
-	protected void setRouteRegistry(RouteRegistry registry) {
-		this.routes = registry;
-	}
+    protected void setRouteRegistry(RouteRegistry registry) {
+        this.routes = registry;
+    }
 
-	protected List<ModulesConfig> getModulesConfigs() {
-		return this.modulesConfigs;
-	}
+    protected List<ModulesConfig> getModulesConfigs() {
+        return this.modulesConfigs;
+    }
 
-	@Override
-	public Modules getModules() {
-		return this.modules;
-	}
+    @Override
+    public Modules getModules() {
+        return this.modules;
+    }
 
-	protected void setModules(Modules modules) {
-		this.modules = modules;
-	}
+    protected void setModules(Modules modules) {
+        this.modules = modules;
+    }
 
-	protected final ApplicationContext getApplicationContextResolver() {
-		return this.resolver;
-	}
+    protected final ApplicationContext getApplicationContextResolver() {
+        return this.resolver;
+    }
 
-	@Override
-	public void dispose() {
-		this.classLoader = null;
-		this.resolver = null;
-		if (this.modules != null) {
-			this.modules.dispose();
-			this.modules = null;
-		}
-		if (this.routes != null) {
-			this.routes.dispose();
-			this.routes = null;
-		}
-		ApplicationPropertiesHolder.dispose(this);
-	}
+    @Override
+    public void dispose() {
+        this.classLoader = null;
+        this.resolver = null;
+        if (this.modules != null) {
+            this.modules.dispose();
+            this.modules = null;
+        }
+        if (this.routes != null) {
+            this.routes.dispose();
+            this.routes = null;
+        }
+        ApplicationPropertiesHolder.dispose(this);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/package-info.java b/src/main/java/org/analogweb/core/package-info.java
index 478c787..43c6d59 100644
--- a/src/main/java/org/analogweb/core/package-info.java
+++ b/src/main/java/org/analogweb/core/package-info.java
@@ -1,5 +1,4 @@
 /**
- * Analogweb's core (default) implementations.<br/>
- * These instance are recognized by an application automatically.
+ * Analogweb's core (default) implementations. These instance are recognized by an application automatically.
  */
 package org.analogweb.core;
diff --git a/src/main/java/org/analogweb/core/response/Acceptable.java b/src/main/java/org/analogweb/core/response/Acceptable.java
index 19c382e..5e6533e 100644
--- a/src/main/java/org/analogweb/core/response/Acceptable.java
+++ b/src/main/java/org/analogweb/core/response/Acceptable.java
@@ -21,169 +21,165 @@
  */
 public class Acceptable implements Renderable {
 
-	private Object source;
-	protected static final Map<String, Creator> DEFAULT_MEDIA_TYPE_MAP = new HashMap<String, Creator>() {
-
-		private static final long serialVersionUID = 1L;
-
-		{
-			put(MediaTypes.APPLICATION_JSON, Creators.json());
-			put(MediaTypes.WILDCARD, Creators.json());
-		}
-	};
-	private Map<String, Creator> mediaTypeMap;
-
-	public static Acceptable as(Object obj) {
-		return new Acceptable(obj);
-	}
-
-	protected Acceptable(Object obj) {
-		this.source = obj;
-		this.mediaTypeMap = new HashMap<String, Creator>(DEFAULT_MEDIA_TYPE_MAP);
-	}
-
-	@Override
-	public Response render(RequestContext context, ResponseContext response)
-			throws IOException, WebApplicationException {
-		List<String> mediaTypes = getAcceptableMediaType(context);
-		if (mediaTypes.isEmpty()) {
-			return HttpStatus.NOT_ACCEPTABLE.render(context, response);
-		}
-		Renderable d = selectResponse(mediaTypes, getSource());
-		if (d == null) {
-			return HttpStatus.NOT_ACCEPTABLE.render(context, response);
-		}
-		return d.render(context, response);
-	}
-
-	public Acceptable mapToAny(Renderable matchesAny) {
-		return map(matchesAny, MediaTypes.WILDCARD);
-	}
-
-	public Acceptable map(Renderable matches, String... mediaTypesStartWith) {
-		for (String mediaTypeStartWith : mediaTypesStartWith) {
-			putToMediaTypeMap(mediaTypeStartWith, Creators.self(matches));
-		}
-		return this;
-	}
-
-	public Renderable selectAcceptableOne(RequestContext context) {
-		Renderable r = selectResponse(getAcceptableMediaType(context),
-				getSource());
-		if (r == null) {
-			return HttpStatus.NOT_ACCEPTABLE;
-		}
-		return r;
-	}
-
-	private Renderable selectResponse(List<String> mediaTypes, Object source) {
-		for (String mediaType : mediaTypes) {
-			for (Entry<String, Creator> entry : getMediaTypeMap().entrySet()) {
-				if (StringUtils.trimToEmpty(mediaType).startsWith(
-						entry.getKey())) {
-					return entry.getValue().create(source);
-				}
-			}
-		}
-		return null;
-	}
-
-	private List<String> getAcceptableMediaType(RequestContext context) {
-		Headers headers = context.getRequestHeaders();
-		return headers.getValues("Accept");
-	}
-
-	protected Object getSource() {
-		return this.source;
-	}
-
-	protected Map<String, Creator> getMediaTypeMap() {
-		return this.mediaTypeMap;
-	}
-
-	protected void putToMediaTypeMap(String mediaType, Creator c) {
-		this.mediaTypeMap.put(mediaType, c);
-	}
-
-	static final class AcceptHeaderComparator implements Comparator<String> {
-
-		@Override
-		public int compare(String arg0, String arg1) {
-			if (arg0.contains("*")) {
-				if (arg1.contains("*")) {
-					if (StringUtils.trimToEmpty(arg0).startsWith("*/")) {
-						return 1;
-					} else if (StringUtils.trimToEmpty(arg1).startsWith("*/")) {
-						return -1;
-					}
-					List<String> s0 = StringUtils.split(arg0, ';');
-					List<String> s1 = StringUtils.split(arg1, ';');
-					if (s0.size() == s1.size()) {
-						return 0;
-					}
-					return (s0.size() > s1.size()) ? -1 : 1;
-				} else {
-					return 1;
-				}
-			} else if (arg1.contains("*")) {
-				return -1;
-			} else {
-				List<String> s0 = StringUtils.split(arg0, ';');
-				List<String> s1 = StringUtils.split(arg1, ';');
-				if (s0.size() == s1.size()) {
-					return 0;
-				}
-				return (s0.size() > s1.size()) ? -1 : 1;
-			}
-		}
-	}
-
-	public static interface Creator {
-
-		Renderable create(Object source);
-	}
-
-	public static class Creators {
-
-		public static Creator json() {
-			return new Creator() {
-
-				public Renderable create(Object source) {
-					return Json.as(source);
-				}
-
-				public String toString() {
-					return "map with " + Json.class;
-				}
-			};
-		}
-
-		public static Creator text() {
-			return new Creator() {
-
-				public Renderable create(Object source) {
-					return Text.with(source != null
-							? source.toString()
-							: StringUtils.EMPTY);
-				}
-
-				public String toString() {
-					return "map with " + Text.class;
-				}
-			};
-		}
-
-		public static Creator self(final Renderable d) {
-			return new Creator() {
-
-				public Renderable create(Object source) {
-					return d;
-				}
-
-				public String toString() {
-					return "map with " + d.getClass();
-				}
-			};
-		}
-	}
+    private Object source;
+    protected static final Map<String, Creator> DEFAULT_MEDIA_TYPE_MAP = new HashMap<String, Creator>() {
+
+        private static final long serialVersionUID = 1L;
+
+        {
+            put(MediaTypes.APPLICATION_JSON, Creators.json());
+            put(MediaTypes.WILDCARD, Creators.json());
+        }
+    };
+    private Map<String, Creator> mediaTypeMap;
+
+    public static Acceptable as(Object obj) {
+        return new Acceptable(obj);
+    }
+
+    protected Acceptable(Object obj) {
+        this.source = obj;
+        this.mediaTypeMap = new HashMap<String, Creator>(DEFAULT_MEDIA_TYPE_MAP);
+    }
+
+    @Override
+    public Response render(RequestContext context, ResponseContext response)
+            throws IOException, WebApplicationException {
+        List<String> mediaTypes = getAcceptableMediaType(context);
+        if (mediaTypes.isEmpty()) {
+            return HttpStatus.NOT_ACCEPTABLE.render(context, response);
+        }
+        Renderable d = selectResponse(mediaTypes, getSource());
+        if (d == null) {
+            return HttpStatus.NOT_ACCEPTABLE.render(context, response);
+        }
+        return d.render(context, response);
+    }
+
+    public Acceptable mapToAny(Renderable matchesAny) {
+        return map(matchesAny, MediaTypes.WILDCARD);
+    }
+
+    public Acceptable map(Renderable matches, String... mediaTypesStartWith) {
+        for (String mediaTypeStartWith : mediaTypesStartWith) {
+            putToMediaTypeMap(mediaTypeStartWith, Creators.self(matches));
+        }
+        return this;
+    }
+
+    public Renderable selectAcceptableOne(RequestContext context) {
+        Renderable r = selectResponse(getAcceptableMediaType(context), getSource());
+        if (r == null) {
+            return HttpStatus.NOT_ACCEPTABLE;
+        }
+        return r;
+    }
+
+    private Renderable selectResponse(List<String> mediaTypes, Object source) {
+        for (String mediaType : mediaTypes) {
+            for (Entry<String, Creator> entry : getMediaTypeMap().entrySet()) {
+                if (StringUtils.trimToEmpty(mediaType).startsWith(entry.getKey())) {
+                    return entry.getValue().create(source);
+                }
+            }
+        }
+        return null;
+    }
+
+    private List<String> getAcceptableMediaType(RequestContext context) {
+        Headers headers = context.getRequestHeaders();
+        return headers.getValues("Accept");
+    }
+
+    protected Object getSource() {
+        return this.source;
+    }
+
+    protected Map<String, Creator> getMediaTypeMap() {
+        return this.mediaTypeMap;
+    }
+
+    protected void putToMediaTypeMap(String mediaType, Creator c) {
+        this.mediaTypeMap.put(mediaType, c);
+    }
+
+    static final class AcceptHeaderComparator implements Comparator<String> {
+
+        @Override
+        public int compare(String arg0, String arg1) {
+            if (arg0.contains("*")) {
+                if (arg1.contains("*")) {
+                    if (StringUtils.trimToEmpty(arg0).startsWith("*/")) {
+                        return 1;
+                    } else if (StringUtils.trimToEmpty(arg1).startsWith("*/")) {
+                        return -1;
+                    }
+                    List<String> s0 = StringUtils.split(arg0, ';');
+                    List<String> s1 = StringUtils.split(arg1, ';');
+                    if (s0.size() == s1.size()) {
+                        return 0;
+                    }
+                    return (s0.size() > s1.size()) ? -1 : 1;
+                } else {
+                    return 1;
+                }
+            } else if (arg1.contains("*")) {
+                return -1;
+            } else {
+                List<String> s0 = StringUtils.split(arg0, ';');
+                List<String> s1 = StringUtils.split(arg1, ';');
+                if (s0.size() == s1.size()) {
+                    return 0;
+                }
+                return (s0.size() > s1.size()) ? -1 : 1;
+            }
+        }
+    }
+
+    public static interface Creator {
+
+        Renderable create(Object source);
+    }
+
+    public static class Creators {
+
+        public static Creator json() {
+            return new Creator() {
+
+                public Renderable create(Object source) {
+                    return Json.as(source);
+                }
+
+                public String toString() {
+                    return "map with " + Json.class;
+                }
+            };
+        }
+
+        public static Creator text() {
+            return new Creator() {
+
+                public Renderable create(Object source) {
+                    return Text.with(source != null ? source.toString() : StringUtils.EMPTY);
+                }
+
+                public String toString() {
+                    return "map with " + Text.class;
+                }
+            };
+        }
+
+        public static Creator self(final Renderable d) {
+            return new Creator() {
+
+                public Renderable create(Object source) {
+                    return d;
+                }
+
+                public String toString() {
+                    return "map with " + d.getClass();
+                }
+            };
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/core/response/BasicResponses.java b/src/main/java/org/analogweb/core/response/BasicResponses.java
index 259b202..45f0b5a 100644
--- a/src/main/java/org/analogweb/core/response/BasicResponses.java
+++ b/src/main/java/org/analogweb/core/response/BasicResponses.java
@@ -7,47 +7,47 @@
  */
 public final class BasicResponses {
 
-	private BasicResponses() {
-		// nop.
-	}
+    private BasicResponses() {
+        // nop.
+    }
 
-	public static Acceptable acceptable(Object object) {
-		return Acceptable.as(object);
-	}
+    public static Acceptable acceptable(Object object) {
+        return Acceptable.as(object);
+    }
 
-	public static Text text(String text) {
-		return Text.with(text);
-	}
+    public static Text text(String text) {
+        return Text.with(text);
+    }
 
-	public static Html htmlText(String text) {
-		return Html.with(text);
-	}
+    public static Html htmlText(String text) {
+        return Html.with(text);
+    }
 
-	public static Html html(String template, Map<String, Object> parameters) {
-		return Html.as(template, parameters);
-	}
+    public static Html html(String template, Map<String, Object> parameters) {
+        return Html.as(template, parameters);
+    }
 
-	public static Html html(String template) {
-		return Html.as(template);
-	}
+    public static Html html(String template) {
+        return Html.as(template);
+    }
 
-	public static Redirect redirect(String to) {
-		return Redirect.to(to);
-	}
+    public static Redirect redirect(String to) {
+        return Redirect.to(to);
+    }
 
-	public static Json json(String json) {
-		return Json.with(json);
-	}
+    public static Json json(String json) {
+        return Json.with(json);
+    }
 
-	public static Json json(Object obj) {
-		return Json.as(obj);
-	}
+    public static Json json(Object obj) {
+        return Json.as(obj);
+    }
 
-	public static HttpStatus status(int statusCode) {
-		return HttpStatus.valueOf(statusCode);
-	}
+    public static HttpStatus status(int statusCode) {
+        return HttpStatus.valueOf(statusCode);
+    }
 
-	public static HttpStatus status(String status) {
-		return HttpStatus.valueOf(status);
-	}
+    public static HttpStatus status(String status) {
+        return HttpStatus.valueOf(status);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/response/BuildAndRenderableResponse.java b/src/main/java/org/analogweb/core/response/BuildAndRenderableResponse.java
index 1ea2580..6ab2d14 100644
--- a/src/main/java/org/analogweb/core/response/BuildAndRenderableResponse.java
+++ b/src/main/java/org/analogweb/core/response/BuildAndRenderableResponse.java
@@ -9,32 +9,30 @@
  * @author snowgooseyk
  */
 @SuppressWarnings("unchecked")
-public class BuildAndRenderableResponse<T extends Renderable>
-		extends
-			DefaultRenderable {
-
-	public T status(int st) {
-		super.setStatus(st);
-		return (T) this;
-	}
-
-	public T status(HttpStatus status) {
-		super.setStatus(status);
-		return (T) this;
-	}
-
-	public T header(String attribute, String value) {
-		super.addHeader(attribute, value);
-		return (T) this;
-	}
-
-	public T header(Map<String, String> headers) {
-		super.addHeaders(headers);
-		return (T) this;
-	}
-
-	public T entity(ResponseEntity entity) {
-		super.setResponseEntity(entity);
-		return (T) this;
-	}
+public class BuildAndRenderableResponse<T extends Renderable> extends DefaultRenderable {
+
+    public T status(int st) {
+        super.setStatus(st);
+        return (T) this;
+    }
+
+    public T status(HttpStatus status) {
+        super.setStatus(status);
+        return (T) this;
+    }
+
+    public T header(String attribute, String value) {
+        super.addHeader(attribute, value);
+        return (T) this;
+    }
+
+    public T header(Map<String, String> headers) {
+        super.addHeaders(headers);
+        return (T) this;
+    }
+
+    public T entity(ResponseEntity entity) {
+        super.setResponseEntity(entity);
+        return (T) this;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/response/ContextSpecifiedResponse.java b/src/main/java/org/analogweb/core/response/ContextSpecifiedResponse.java
index df2b82b..62ee70b 100644
--- a/src/main/java/org/analogweb/core/response/ContextSpecifiedResponse.java
+++ b/src/main/java/org/analogweb/core/response/ContextSpecifiedResponse.java
@@ -8,18 +8,15 @@
 import org.analogweb.ResponseContext;
 import org.analogweb.WebApplicationException;
 
-public abstract class ContextSpecifiedResponse<T extends RequestContext>
-		implements
-			Renderable {
+public abstract class ContextSpecifiedResponse<T extends RequestContext> implements Renderable {
 
-	@Override
-	@SuppressWarnings("unchecked")
-	public Response render(RequestContext context, ResponseContext response)
-			throws IOException, WebApplicationException {
-		return renderInternal((T) context, response);
-	}
+    @Override
+    @SuppressWarnings("unchecked")
+    public Response render(RequestContext context, ResponseContext response)
+            throws IOException, WebApplicationException {
+        return renderInternal((T) context, response);
+    }
 
-	protected abstract Response renderInternal(T context,
-			ResponseContext response) throws IOException,
-			WebApplicationException;
+    protected abstract Response renderInternal(T context, ResponseContext response)
+            throws IOException, WebApplicationException;
 }
diff --git a/src/main/java/org/analogweb/core/response/DefaultRenderable.java b/src/main/java/org/analogweb/core/response/DefaultRenderable.java
index 785e89a..8eb4923 100644
--- a/src/main/java/org/analogweb/core/response/DefaultRenderable.java
+++ b/src/main/java/org/analogweb/core/response/DefaultRenderable.java
@@ -19,83 +19,77 @@
  */
 public class DefaultRenderable implements Renderable {
 
-	private Map<String, String> header = Maps.newEmptyHashMap();
-	private HttpStatus status;
-	private ResponseEntity entity;
-
-	@Override
-	public Response render(RequestContext request,
-			ResponseContext responseContext) throws IOException,
-			WebApplicationException {
-		ResponseEntity entity = getResponseEntity();
-		HttpStatus defaultStatus = HttpStatus.OK;
-		Response response;
-		if (entity == null) {
-			entity = extractResponseEntity(request, responseContext);
-			if (entity == null) {
-				defaultStatus = HttpStatus.NO_CONTENT;
-				response = Response.EMPTY;
-			} else {
-				response = new DefaultResponse(entity);
-			}
-		} else {
-			response = new DefaultResponse(entity);
-		}
-		mergeHeaders(request, responseContext, getHeaders(), entity);
-		updateStatusToResponse(responseContext, getStatus() == null
-				? defaultStatus
-				: getStatus());
-		return response;
-	}
-
-	protected void updateStatusToResponse(ResponseContext response,
-			HttpStatus status) {
-		response.setStatus(status.getStatusCode());
-	}
-
-	protected void mergeHeaders(RequestContext request,
-			ResponseContext response, Map<String, String> headers,
-			ResponseEntity entity) {
-		Headers responseHeader = response.getResponseHeaders();
-		for (Entry<String, String> entry : headers.entrySet()) {
-			responseHeader.putValue(entry.getKey(), entry.getValue());
-		}
-	}
-
-	protected final void setStatus(int status) {
-		setStatus(HttpStatus.valueOf(status));
-	}
-
-	protected final void setStatus(HttpStatus status) {
-		this.status = status;
-	}
-
-	protected final void addHeader(String attribute, String value) {
-		this.header.put(attribute, value);
-	}
-
-	protected final void addHeaders(Map<String, String> headers) {
-		this.header.putAll(headers);
-	}
-
-	protected final void setResponseEntity(ResponseEntity entity) {
-		this.entity = entity;
-	}
-
-	protected final Map<String, String> getHeaders() {
-		return header;
-	}
-
-	protected final HttpStatus getStatus() {
-		return status;
-	}
-
-	protected final ResponseEntity getResponseEntity() {
-		return this.entity;
-	}
-
-	protected ResponseEntity extractResponseEntity(RequestContext request,
-			ResponseContext response) {
-		return null;
-	}
+    private Map<String, String> header = Maps.newEmptyHashMap();
+    private HttpStatus status;
+    private ResponseEntity entity;
+
+    @Override
+    public Response render(RequestContext request, ResponseContext responseContext)
+            throws IOException, WebApplicationException {
+        ResponseEntity entity = getResponseEntity();
+        HttpStatus defaultStatus = HttpStatus.OK;
+        Response response;
+        if (entity == null) {
+            entity = extractResponseEntity(request, responseContext);
+            if (entity == null) {
+                defaultStatus = HttpStatus.NO_CONTENT;
+                response = Response.EMPTY;
+            } else {
+                response = new DefaultResponse(entity);
+            }
+        } else {
+            response = new DefaultResponse(entity);
+        }
+        mergeHeaders(request, responseContext, getHeaders(), entity);
+        updateStatusToResponse(responseContext, getStatus() == null ? defaultStatus : getStatus());
+        return response;
+    }
+
+    protected void updateStatusToResponse(ResponseContext response, HttpStatus status) {
+        response.setStatus(status.getStatusCode());
+    }
+
+    protected void mergeHeaders(RequestContext request, ResponseContext response, Map<String, String> headers,
+            ResponseEntity entity) {
+        Headers responseHeader = response.getResponseHeaders();
+        for (Entry<String, String> entry : headers.entrySet()) {
+            responseHeader.putValue(entry.getKey(), entry.getValue());
+        }
+    }
+
+    protected final void setStatus(int status) {
+        setStatus(HttpStatus.valueOf(status));
+    }
+
+    protected final void setStatus(HttpStatus status) {
+        this.status = status;
+    }
+
+    protected final void addHeader(String attribute, String value) {
+        this.header.put(attribute, value);
+    }
+
+    protected final void addHeaders(Map<String, String> headers) {
+        this.header.putAll(headers);
+    }
+
+    protected final void setResponseEntity(ResponseEntity entity) {
+        this.entity = entity;
+    }
+
+    protected final Map<String, String> getHeaders() {
+        return header;
+    }
+
+    protected final HttpStatus getStatus() {
+        return status;
+    }
+
+    protected final ResponseEntity getResponseEntity() {
+        return this.entity;
+    }
+
+    protected ResponseEntity extractResponseEntity(RequestContext request, ResponseContext response) {
+        return null;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/response/Html.java b/src/main/java/org/analogweb/core/response/Html.java
index 2a3a137..67f109b 100644
--- a/src/main/java/org/analogweb/core/response/Html.java
+++ b/src/main/java/org/analogweb/core/response/Html.java
@@ -11,61 +11,59 @@
  */
 public class Html extends TextFormattable<Html> {
 
-	private static final String DEFAULT_HTML_CHARSET = "UTF-8";
-	private static final String DEFAULT_HTML_CONTENT_TYPE = "text/html";
+    private static final String DEFAULT_HTML_CHARSET = "UTF-8";
+    private static final String DEFAULT_HTML_CONTENT_TYPE = "text/html";
 
-	public static Html as(String templatePath) {
-		Html html = new Html(new HtmlTemplate(templatePath,
-				Maps.<String, Object> newEmptyHashMap()));
-		return html;
-	}
+    public static Html as(String templatePath) {
+        Html html = new Html(new HtmlTemplate(templatePath, Maps.<String, Object> newEmptyHashMap()));
+        return html;
+    }
 
-	public static Html as(String templatePath, Map<String, Object> context) {
-		Html html = new Html(new HtmlTemplate(templatePath, context));
-		return html;
-	}
+    public static Html as(String templatePath, Map<String, Object> context) {
+        Html html = new Html(new HtmlTemplate(templatePath, context));
+        return html;
+    }
 
-	public static class HtmlTemplate {
+    public static class HtmlTemplate {
 
-		private String templateResourcePath;
-		private Map<String, Object> context;
+        private String templateResourcePath;
+        private Map<String, Object> context;
 
-		public HtmlTemplate(String templateResourcePath,
-				Map<String, Object> context) {
-			Assertion.notNull(templateResourcePath, "Template resource path");
-			this.templateResourcePath = templateResourcePath;
-			this.context = context;
-		}
+        public HtmlTemplate(String templateResourcePath, Map<String, Object> context) {
+            Assertion.notNull(templateResourcePath, "Template resource path");
+            this.templateResourcePath = templateResourcePath;
+            this.context = context;
+        }
 
-		public String getTemplateResource() {
-			return templateResourcePath;
-		}
+        public String getTemplateResource() {
+            return templateResourcePath;
+        }
 
-		public Map<String, Object> getContext() {
-			return context;
-		}
-	}
+        public Map<String, Object> getContext() {
+            return context;
+        }
+    }
 
-	public static Html with(String str) {
-		Html html = new Html(str);
-		return html;
-	}
+    public static Html with(String str) {
+        Html html = new Html(str);
+        return html;
+    }
 
-	protected Html(Object source) {
-		super(source);
-		super.typeAs(DEFAULT_HTML_CONTENT_TYPE);
-		super.withCharset(DEFAULT_HTML_CHARSET);
-	}
+    protected Html(Object source) {
+        super(source);
+        super.typeAs(DEFAULT_HTML_CONTENT_TYPE);
+        super.withCharset(DEFAULT_HTML_CHARSET);
+    }
 
-	protected Html(String input) {
-		super(input);
-		super.typeAs(DEFAULT_HTML_CONTENT_TYPE);
-		super.withCharset(DEFAULT_HTML_CHARSET);
-	}
+    protected Html(String input) {
+        super(input);
+        super.typeAs(DEFAULT_HTML_CONTENT_TYPE);
+        super.withCharset(DEFAULT_HTML_CHARSET);
+    }
 
-	@Override
-	protected ResponseFormatter getDefaultFormatter() {
-		// TODO Implement!
-		throw new UnsupportedOperationException();
-	}
+    @Override
+    protected ResponseFormatter getDefaultFormatter() {
+        // TODO Implement!
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/src/main/java/org/analogweb/core/response/HttpStatus.java b/src/main/java/org/analogweb/core/response/HttpStatus.java
index 2995402..c0dcf74 100644
--- a/src/main/java/org/analogweb/core/response/HttpStatus.java
+++ b/src/main/java/org/analogweb/core/response/HttpStatus.java
@@ -17,120 +17,108 @@
  * @author snowgoose
  */
 public enum HttpStatus implements Renderable, RenderableHolder {
-	CONTINUE(100, "Continue"), SWITCHING_PROTOCOLS(101, "Switching Protocols"), PROCESSING(
-			102, "Processing"), OK(200, "OK"), CREATED(201, "Created"), ACCEPTED(
-			202, "Accepted"), NON_AUTHORITATIVE_INFORMATION(203,
-			"Non-Authoritative Information"), NO_CONTENT(204, "No Content"), RESET_CONTENT(
-			205, "Reset Content"), PARTIAL_CONTENT(206, "Partial Content"), MULTI_STATUS(
-			207, "Multi Status"), ALREADY_REPORTED(208, "Already Reported"), IM_USED(
-			226, "IM Used"), MULTIPLE_CHOICES(300, "Multiple Choices"), MOVED_PERMANENTLY(
-			301, "Moved Permanently"), FOUND(302, "Found"), SEE_OTHER(303,
-			"See Other"), NOT_MODIFIED(304, "Not Modified"), USE_PROXY(305,
-			"Use Proxy"), TEMPORARY_REDIRECT(307, "Temporary Redirect"), BAD_REQUEST(
-			400, "Bad Request"), UNAUTHORIZED(401, "Unauthorized"), PAYMENT_REQUIRED(
-			402, "Payment Required"), FORBIDDEN(403, "Forbidden"), NOT_FOUND(
-			404, "Not Found"), METHOD_NOT_ALLOWED(405, "Method Not Allowed"), NOT_ACCEPTABLE(
-			406, "Not Acceptable"), PROXY_AUTHENTICATION_REQUIRED(407,
-			"Proxy Authentication Required"), REQUEST_TIMEOUT(408,
-			"Request Timeout"), CONFLICT(409, "Conflict"), GONE(410, "Gone"), LENGTH_REQUIRED(
-			411, "Length Required"), PRECONDITION_FAILED(412,
-			"Precondition Failed"), REQUEST_ENTITY_TOO_LARGE(413,
-			"Payload Too Large"), REQUEST_URI_TOO_LONG(414, "URI Too Long"), UNSUPPORTED_MEDIA_TYPE(
-			415, "Unsupported Media Type"), REQUESTED_RANGE_NOT_SATISFIABLE(
-			416, "Range Not Satisfiable"), EXPECTATION_FAILED(417,
-			"Expectation Failed"), INSUFFICIENT_SPACE_ON_RESOURCE(419,
-			"Insufficient Space On Resource"), METHOD_FAILURE(420,
-			"Method Failure"), DESTINATION_LOCKED(421, "Destination Locked"), UNPROCESSABLE_ENTITY(
-			422, "Unprocessable Entity"), LOCKED(423, "Locked"), FAILED_DEPENDENCY(
-			424, "Failed Dependency"), UPGRADE_REQUIRED(426, "Upgrade Required"), INTERNAL_SERVER_ERROR(
-			500, "Internal Server Error"), NOT_IMPLEMENTED(501,
-			"Not Implemented"), BAD_GATEWAY(502, "Bad Gateway"), SERVICE_UNAVAILABLE(
-			503, "Service Unavailable"), GATEWAY_TIMEOUT(504, "Gateway Timeout"), HTTP_VERSION_NOT_SUPPORTED(
-			505, "HTTP Version Not Supported"), VARIANT_ALSO_NEGOTIATES(506,
-			"Variant Also Negotiates"), INSUFFICIENT_STORAGE(507,
-			"Insufficient Storage"), LOOP_DETECTED(508, "Loop Detected"), NOT_EXTENDED(
-			510, "Not Extended");
+    CONTINUE(100, "Continue"), SWITCHING_PROTOCOLS(101, "Switching Protocols"), PROCESSING(102, "Processing"),
+    OK(200, "OK"), CREATED(201, "Created"), ACCEPTED(202, "Accepted"),
+    NON_AUTHORITATIVE_INFORMATION(203, "Non-Authoritative Information"), NO_CONTENT(204, "No Content"),
+    RESET_CONTENT(205, "Reset Content"), PARTIAL_CONTENT(206, "Partial Content"), MULTI_STATUS(207, "Multi Status"),
+    ALREADY_REPORTED(208, "Already Reported"), IM_USED(226, "IM Used"), MULTIPLE_CHOICES(300, "Multiple Choices"),
+    MOVED_PERMANENTLY(301, "Moved Permanently"), FOUND(302, "Found"), SEE_OTHER(303, "See Other"),
+    NOT_MODIFIED(304, "Not Modified"), USE_PROXY(305, "Use Proxy"), TEMPORARY_REDIRECT(307, "Temporary Redirect"),
+    BAD_REQUEST(400, "Bad Request"), UNAUTHORIZED(401, "Unauthorized"), PAYMENT_REQUIRED(402, "Payment Required"),
+    FORBIDDEN(403, "Forbidden"), NOT_FOUND(404, "Not Found"), METHOD_NOT_ALLOWED(405, "Method Not Allowed"),
+    NOT_ACCEPTABLE(406, "Not Acceptable"), PROXY_AUTHENTICATION_REQUIRED(407, "Proxy Authentication Required"),
+    REQUEST_TIMEOUT(408, "Request Timeout"), CONFLICT(409, "Conflict"), GONE(410, "Gone"),
+    LENGTH_REQUIRED(411, "Length Required"), PRECONDITION_FAILED(412, "Precondition Failed"),
+    REQUEST_ENTITY_TOO_LARGE(413, "Payload Too Large"), REQUEST_URI_TOO_LONG(414, "URI Too Long"),
+    UNSUPPORTED_MEDIA_TYPE(415, "Unsupported Media Type"),
+    REQUESTED_RANGE_NOT_SATISFIABLE(416, "Range Not Satisfiable"), EXPECTATION_FAILED(417, "Expectation Failed"),
+    INSUFFICIENT_SPACE_ON_RESOURCE(419, "Insufficient Space On Resource"), METHOD_FAILURE(420, "Method Failure"),
+    DESTINATION_LOCKED(421, "Destination Locked"), UNPROCESSABLE_ENTITY(422, "Unprocessable Entity"),
+    LOCKED(423, "Locked"), FAILED_DEPENDENCY(424, "Failed Dependency"), UPGRADE_REQUIRED(426, "Upgrade Required"),
+    INTERNAL_SERVER_ERROR(500, "Internal Server Error"), NOT_IMPLEMENTED(501, "Not Implemented"),
+    BAD_GATEWAY(502, "Bad Gateway"), SERVICE_UNAVAILABLE(503, "Service Unavailable"),
+    GATEWAY_TIMEOUT(504, "Gateway Timeout"), HTTP_VERSION_NOT_SUPPORTED(505, "HTTP Version Not Supported"),
+    VARIANT_ALSO_NEGOTIATES(506, "Variant Also Negotiates"), INSUFFICIENT_STORAGE(507, "Insufficient Storage"),
+    LOOP_DETECTED(508, "Loop Detected"), NOT_EXTENDED(510, "Not Extended");
 
-	private int statusCode;
-	private String phrase;
-	private String reason;
-	private Map<String, String> responseHeaders;
-	private Renderable actuallyRenderable;
+    private int statusCode;
+    private String phrase;
+    private String reason;
+    private Map<String, String> responseHeaders;
+    private Renderable actuallyRenderable;
 
-	HttpStatus(final int statusCode, final String phrase) {
-		this.statusCode = statusCode;
-		this.phrase = phrase;
-	}
+    HttpStatus(final int statusCode, final String phrase) {
+        this.statusCode = statusCode;
+        this.phrase = phrase;
+    }
 
-	@Override
-	public Response render(RequestContext context,
-			ResponseContext responseContext) throws IOException,
-			WebApplicationException {
-		String reason = getReason();
-		Response response = Response.EMPTY;
-		if (StringUtils.isNotEmpty(reason)) {
-			response = Text.with(reason).render(context, responseContext);
-		} else {
-			Renderable preRenderDirection = getRenderable();
-			if (preRenderDirection != null) {
-				response = preRenderDirection.render(context, responseContext);
-			}
-		}
-		Headers headers = responseContext.getResponseHeaders();
-		Map<String, String> headersMap = getResponseHeaders();
-		if (headersMap != null) {
-			for (Entry<String, String> e : headersMap.entrySet()) {
-				headers.putValue(e.getKey(), e.getValue());
-			}
-		}
-		responseContext.setStatus(getStatusCode());
-		return response;
-	}
+    @Override
+    public Response render(RequestContext context, ResponseContext responseContext)
+            throws IOException, WebApplicationException {
+        String reason = getReason();
+        Response response = Response.EMPTY;
+        if (StringUtils.isNotEmpty(reason)) {
+            response = Text.with(reason).render(context, responseContext);
+        } else {
+            Renderable preRenderDirection = getRenderable();
+            if (preRenderDirection != null) {
+                response = preRenderDirection.render(context, responseContext);
+            }
+        }
+        Headers headers = responseContext.getResponseHeaders();
+        Map<String, String> headersMap = getResponseHeaders();
+        if (headersMap != null) {
+            for (Entry<String, String> e : headersMap.entrySet()) {
+                headers.putValue(e.getKey(), e.getValue());
+            }
+        }
+        responseContext.setStatus(getStatusCode());
+        return response;
+    }
 
-	public static HttpStatus valueOf(int statusCode) {
-		for (HttpStatus status : values()) {
-			if (statusCode == status.getStatusCode()) {
-				return status;
-			}
-		}
-		// TODO replace message code.
-		throw new IllegalArgumentException("invalid http status code "
-				+ statusCode);
-	}
+    public static HttpStatus valueOf(int statusCode) {
+        for (HttpStatus status : values()) {
+            if (statusCode == status.getStatusCode()) {
+                return status;
+            }
+        }
+        // TODO replace message code.
+        throw new IllegalArgumentException("invalid http status code " + statusCode);
+    }
 
-	public int getStatusCode() {
-		return this.statusCode;
-	}
+    public int getStatusCode() {
+        return this.statusCode;
+    }
 
-	public String getPhrase() {
-		return this.phrase;
-	}
+    public String getPhrase() {
+        return this.phrase;
+    }
 
-	public String getReason() {
-		return this.reason;
-	}
+    public String getReason() {
+        return this.reason;
+    }
 
-	public HttpStatus byReasonOf(String reason) {
-		this.reason = reason;
-		return this;
-	}
+    public HttpStatus byReasonOf(String reason) {
+        this.reason = reason;
+        return this;
+    }
 
-	public HttpStatus withHeader(Map<String, String> responseHeaders) {
-		this.responseHeaders = responseHeaders;
-		return this;
-	}
+    public HttpStatus withHeader(Map<String, String> responseHeaders) {
+        this.responseHeaders = responseHeaders;
+        return this;
+    }
 
-	public Map<String, String> getResponseHeaders() {
-		return this.responseHeaders;
-	}
+    public Map<String, String> getResponseHeaders() {
+        return this.responseHeaders;
+    }
 
-	public HttpStatus with(Renderable direction) {
-		this.actuallyRenderable = direction;
-		return this;
-	}
+    public HttpStatus with(Renderable direction) {
+        this.actuallyRenderable = direction;
+        return this;
+    }
 
-	@Override
-	public Renderable getRenderable() {
-		return this.actuallyRenderable;
-	}
+    @Override
+    public Renderable getRenderable() {
+        return this.actuallyRenderable;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/response/Json.java b/src/main/java/org/analogweb/core/response/Json.java
index 094a219..410bf33 100644
--- a/src/main/java/org/analogweb/core/response/Json.java
+++ b/src/main/java/org/analogweb/core/response/Json.java
@@ -21,145 +21,136 @@
  */
 public class Json extends TextFormattable<Json> {
 
-	private static final String DEFAULT_JSON_CHARSET = "UTF-8";
-	private static final String DEFAULT_JSON_CONTENT_TYPE = "application/json";
-
-	public static Json as(Object obj) {
-		Json json = new Json(obj);
-		return json;
-	}
-
-	public static Json with(String str) {
-		Json json = new Json(str);
-		return json;
-	}
-
-	protected Json(Object source) {
-		super(source);
-		super.typeAs(DEFAULT_JSON_CONTENT_TYPE);
-		super.withCharset(DEFAULT_JSON_CHARSET);
-	}
-
-	protected Json(String input) {
-		super(input);
-		super.typeAs(DEFAULT_JSON_CONTENT_TYPE);
-		super.withCharset(DEFAULT_JSON_CHARSET);
-	}
-
-	static class DefaultFormatter implements ResponseFormatter {
-
-		@Override
-		public ResponseEntity formatAndWriteInto(RequestContext request,
-				ResponseContext response, String charset, Object source)
-				throws FormatFailureException {
-			StringBuilder buffer = new StringBuilder();
-			format(buffer, source);
-			return new DefaultResponseEntity(buffer.toString(),
-					Charset.forName(charset));
-		}
-
-		private void format(StringBuilder buffer, Object source)
-				throws FormatFailureException {
-			Class<?> clazz = source.getClass();
-			if (clazz.isArray() || source instanceof Iterable) {
-				buffer.append("{");
-				formatNotNull(buffer, source, null);
-			} else {
-				BeanInfo info = null;
-				try {
-					info = Introspector.getBeanInfo(clazz);
-				} catch (IntrospectionException e) {
-					throw new FormatFailureException(e, source,
-							Json.class.getSimpleName());
-				}
-				PropertyDescriptor[] properties = info.getPropertyDescriptors();
-				if (ArrayUtils.isNotEmpty(properties)) {
-					buffer.append("{");
-				}
-				for (PropertyDescriptor desc : properties) {
-					if (desc.getDisplayName().equals("class")) {
-						continue;
-					}
-					Object propertyValue = readProperty(desc, source);
-					if (propertyValue == null) {
-						formatNull(buffer, desc);
-					} else {
-						formatNotNull(buffer, propertyValue, desc);
-					}
-				}
-			}
-			buffer = buffer.deleteCharAt(buffer.length() - 1);
-			buffer.append("}");
-		}
-
-		private Object readProperty(PropertyDescriptor desc, Object instance)
-				throws FormatFailureException {
-			try {
-				return desc.getReadMethod().invoke(instance);
-			} catch (IllegalArgumentException e) {
-				throw new FormatFailureException(e, instance,
-						Json.class.getSimpleName());
-			} catch (IllegalAccessException e) {
-				throw new FormatFailureException(e, instance,
-						Json.class.getSimpleName());
-			} catch (InvocationTargetException e) {
-				throw new FormatFailureException(e, instance,
-						Json.class.getSimpleName());
-			}
-		}
-
-		private void formatNull(StringBuilder buffer, PropertyDescriptor desc) {
-			buffer.append("\"");
-			buffer.append(desc.getDisplayName());
-			buffer.append("\"");
-			buffer.append(": null,");
-		}
-
-		private void formatNotNull(StringBuilder buffer, Object value,
-				PropertyDescriptor desc) {
-			if (desc != null) {
-				buffer.append("\"");
-				buffer.append(desc.getDisplayName());
-				buffer.append("\"");
-				buffer.append(": ");
-			}
-			if (value instanceof String) {
-				buffer.append("\"");
-				buffer.append(value.toString());
-				buffer.append("\"");
-			} else if (value instanceof Date) {
-				buffer.append(String.valueOf(((Date) value).getTime()));
-			} else if (value instanceof Number) {
-				buffer.append(value.toString());
-			} else if (value instanceof Boolean) {
-				buffer.append(String.valueOf(Boolean.valueOf(value.toString())));
-			} else if (value instanceof Iterable) {
-				buffer.append("[");
-				for (Object obj : (Iterable<?>) value) {
-					format(buffer, obj);
-					buffer.append(",");
-				}
-				buffer = buffer.deleteCharAt(buffer.length() - 1);
-				buffer.append("]");
-			} else if (value.getClass().isArray()) {
-				buffer.append("[");
-				for (Object obj : (Object[]) value) {
-					format(buffer, obj);
-					buffer.append(",");
-				}
-				buffer = buffer.deleteCharAt(buffer.length() - 1);
-				buffer.append("]");
-			}
-			buffer.append(",");
-		}
-	}
-
-	public static synchronized void flushCache() {
-		Introspector.flushCaches();
-	}
-
-	@Override
-	public ResponseFormatter getDefaultFormatter() {
-		return new Json.DefaultFormatter();
-	}
+    private static final String DEFAULT_JSON_CHARSET = "UTF-8";
+    private static final String DEFAULT_JSON_CONTENT_TYPE = "application/json";
+
+    public static Json as(Object obj) {
+        Json json = new Json(obj);
+        return json;
+    }
+
+    public static Json with(String str) {
+        Json json = new Json(str);
+        return json;
+    }
+
+    protected Json(Object source) {
+        super(source);
+        super.typeAs(DEFAULT_JSON_CONTENT_TYPE);
+        super.withCharset(DEFAULT_JSON_CHARSET);
+    }
+
+    protected Json(String input) {
+        super(input);
+        super.typeAs(DEFAULT_JSON_CONTENT_TYPE);
+        super.withCharset(DEFAULT_JSON_CHARSET);
+    }
+
+    static class DefaultFormatter implements ResponseFormatter {
+
+        @Override
+        public ResponseEntity formatAndWriteInto(RequestContext request, ResponseContext response, String charset,
+                Object source) throws FormatFailureException {
+            StringBuilder buffer = new StringBuilder();
+            format(buffer, source);
+            return new DefaultResponseEntity(buffer.toString(), Charset.forName(charset));
+        }
+
+        private void format(StringBuilder buffer, Object source) throws FormatFailureException {
+            Class<?> clazz = source.getClass();
+            if (clazz.isArray() || source instanceof Iterable) {
+                buffer.append("{");
+                formatNotNull(buffer, source, null);
+            } else {
+                BeanInfo info = null;
+                try {
+                    info = Introspector.getBeanInfo(clazz);
+                } catch (IntrospectionException e) {
+                    throw new FormatFailureException(e, source, Json.class.getSimpleName());
+                }
+                PropertyDescriptor[] properties = info.getPropertyDescriptors();
+                if (ArrayUtils.isNotEmpty(properties)) {
+                    buffer.append("{");
+                }
+                for (PropertyDescriptor desc : properties) {
+                    if (desc.getDisplayName().equals("class")) {
+                        continue;
+                    }
+                    Object propertyValue = readProperty(desc, source);
+                    if (propertyValue == null) {
+                        formatNull(buffer, desc);
+                    } else {
+                        formatNotNull(buffer, propertyValue, desc);
+                    }
+                }
+            }
+            buffer = buffer.deleteCharAt(buffer.length() - 1);
+            buffer.append("}");
+        }
+
+        private Object readProperty(PropertyDescriptor desc, Object instance) throws FormatFailureException {
+            try {
+                return desc.getReadMethod().invoke(instance);
+            } catch (IllegalArgumentException e) {
+                throw new FormatFailureException(e, instance, Json.class.getSimpleName());
+            } catch (IllegalAccessException e) {
+                throw new FormatFailureException(e, instance, Json.class.getSimpleName());
+            } catch (InvocationTargetException e) {
+                throw new FormatFailureException(e, instance, Json.class.getSimpleName());
+            }
+        }
+
+        private void formatNull(StringBuilder buffer, PropertyDescriptor desc) {
+            buffer.append("\"");
+            buffer.append(desc.getDisplayName());
+            buffer.append("\"");
+            buffer.append(": null,");
+        }
+
+        private void formatNotNull(StringBuilder buffer, Object value, PropertyDescriptor desc) {
+            if (desc != null) {
+                buffer.append("\"");
+                buffer.append(desc.getDisplayName());
+                buffer.append("\"");
+                buffer.append(": ");
+            }
+            if (value instanceof String) {
+                buffer.append("\"");
+                buffer.append(value.toString());
+                buffer.append("\"");
+            } else if (value instanceof Date) {
+                buffer.append(String.valueOf(((Date) value).getTime()));
+            } else if (value instanceof Number) {
+                buffer.append(value.toString());
+            } else if (value instanceof Boolean) {
+                buffer.append(String.valueOf(Boolean.valueOf(value.toString())));
+            } else if (value instanceof Iterable) {
+                buffer.append("[");
+                for (Object obj : (Iterable<?>) value) {
+                    format(buffer, obj);
+                    buffer.append(",");
+                }
+                buffer = buffer.deleteCharAt(buffer.length() - 1);
+                buffer.append("]");
+            } else if (value.getClass().isArray()) {
+                buffer.append("[");
+                for (Object obj : (Object[]) value) {
+                    format(buffer, obj);
+                    buffer.append(",");
+                }
+                buffer = buffer.deleteCharAt(buffer.length() - 1);
+                buffer.append("]");
+            }
+            buffer.append(",");
+        }
+    }
+
+    public static synchronized void flushCache() {
+        Introspector.flushCaches();
+    }
+
+    @Override
+    public ResponseFormatter getDefaultFormatter() {
+        return new Json.DefaultFormatter();
+    }
 }
diff --git a/src/main/java/org/analogweb/core/response/Redirect.java b/src/main/java/org/analogweb/core/response/Redirect.java
index d10928b..2c2b930 100644
--- a/src/main/java/org/analogweb/core/response/Redirect.java
+++ b/src/main/java/org/analogweb/core/response/Redirect.java
@@ -31,145 +31,134 @@
  */
 public class Redirect implements Renderable {
 
-	private static final Log log = Logs.getLog(Redirect.class);
-	protected static final String DEFAULT_ENCODING_CHARSET = "UTF-8";
-	protected static final int UNSET_RESPONSE_CODE = -1;
-	private final String to;
-	private final TreeMap<String, String> parameterMap = Maps.newTreeMap();
-	private int responseCode = UNSET_RESPONSE_CODE;
-	private String encoding = DEFAULT_ENCODING_CHARSET;
-
-	private Redirect(String to) {
-		this.to = to;
-	}
-
-	@Override
-	public Response render(RequestContext context, ResponseContext response)
-			throws IOException, WebApplicationException {
-		Assertion.notNull(context, RequestContext.class.getCanonicalName());
-		String path = getParametarizedPath();
-		sendRedirect(context, response, URI.create(path), getResponseCode());
-		return Response.EMPTY;
-	}
-
-	public Redirect encodeWith(String encodingCharset) {
-		this.encoding = encodingCharset;
-		return this;
-	}
-
-	protected void sendRedirect(RequestContext context,
-			ResponseContext response, URI encodedPath, int responseCode)
-			throws IOException {
-		if (responseCode > 299 && responseCode < 400) {
-			response.setStatus(responseCode);
-		} else {
-			// HTTP 1.0 compatible.
-			if (responseCode != UNSET_RESPONSE_CODE) {
-				log.log("WR000001", responseCode);
-			}
-			response.setStatus(HttpURLConnection.HTTP_MOVED_TEMP);
-		}
-		Headers responseHeader = response.getResponseHeaders();
-		responseHeader.putValue("Location", encodedPath.toString());
-	}
-
-	protected String getTo() {
-		return this.to;
-	}
-
-	protected Map<String, String> getParameters() {
-		return Collections.unmodifiableMap(this.parameterMap);
-	}
-
-	protected String getParametarizedPath() {
-		StringBuilder buffer = new StringBuilder(extractParameters(getTo()));
-		if (getParameters().isEmpty() == false) {
-			Set<Entry<String, String>> entries = getParameters().entrySet();
-			Iterator<Entry<String, String>> entriesIterator = entries
-					.iterator();
-			Entry<String, String> entry = entriesIterator.next();
-			try {
-				buffer.append('?')
-						.append(URLEncoder.encode(entry.getKey(),
-								getEncodingCharset()))
-						.append('=')
-						.append(URLEncoder.encode(entry.getValue(),
-								getEncodingCharset()));
-				while (entriesIterator.hasNext()) {
-					Entry<String, String> param = entriesIterator.next();
-					buffer.append('&')
-							.append(URLEncoder.encode(param.getKey(),
-									getEncodingCharset()))
-							.append('=')
-							.append(URLEncoder.encode(param.getValue(),
-									getEncodingCharset()));
-				}
-			} catch (UnsupportedEncodingException e) {
-				throw new ResponseEvaluationException(e, this);
-			}
-		}
-		return buffer.toString();
-	}
-
-	protected final String getEncodingCharset() {
-		return this.encoding;
-	}
-
-	private String extractParameters(String originalPath) {
-		int parameterIndex = 0;
-		if ((parameterIndex = originalPath.indexOf("?")) > 0) {
-			String query = originalPath.substring(parameterIndex + 1);
-			String[] params = query.split("&");
-			for (String param : params) {
-				String[] keyValue = param.split("=");
-				addParameter(keyValue[0], keyValue[1]);
-			}
-			return originalPath.substring(0, parameterIndex);
-		} else {
-			return originalPath;
-		}
-	}
-
-	public static Redirect to(String path) {
-		if (StringUtils.isEmpty(path)) {
-			throw new MissingRequirmentsException("redirect path", path);
-		}
-		return new Redirect(path);
-	}
-
-	public Redirect addParameter(String name, String value) {
-		this.parameterMap.put(name, value);
-		return this;
-	}
-
-	protected int getResponseCode() {
-		return this.responseCode;
-	}
-
-	public Redirect resoposeCode(int responseCode) {
-		this.responseCode = responseCode;
-		return this;
-	}
-
-	@Override
-	public boolean equals(final Object o) {
-		if (o instanceof Redirect) {
-			return getParametarizedPath().equals(
-					((Redirect) o).getParametarizedPath());
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		final int multiplier = 37;
-		int result = 17;
-		int hash = 0;
-		String path = getParametarizedPath();
-		if (path != null) {
-			hash = path.hashCode();
-		}
-		result = multiplier * result + hash;
-		return result;
-	}
+    private static final Log log = Logs.getLog(Redirect.class);
+    protected static final String DEFAULT_ENCODING_CHARSET = "UTF-8";
+    protected static final int UNSET_RESPONSE_CODE = -1;
+    private final String to;
+    private final TreeMap<String, String> parameterMap = Maps.newTreeMap();
+    private int responseCode = UNSET_RESPONSE_CODE;
+    private String encoding = DEFAULT_ENCODING_CHARSET;
+
+    private Redirect(String to) {
+        this.to = to;
+    }
+
+    @Override
+    public Response render(RequestContext context, ResponseContext response)
+            throws IOException, WebApplicationException {
+        Assertion.notNull(context, RequestContext.class.getCanonicalName());
+        String path = getParametarizedPath();
+        sendRedirect(context, response, URI.create(path), getResponseCode());
+        return Response.EMPTY;
+    }
+
+    public Redirect encodeWith(String encodingCharset) {
+        this.encoding = encodingCharset;
+        return this;
+    }
+
+    protected void sendRedirect(RequestContext context, ResponseContext response, URI encodedPath, int responseCode)
+            throws IOException {
+        if (responseCode > 299 && responseCode < 400) {
+            response.setStatus(responseCode);
+        } else {
+            // HTTP 1.0 compatible.
+            if (responseCode != UNSET_RESPONSE_CODE) {
+                log.log("WR000001", responseCode);
+            }
+            response.setStatus(HttpURLConnection.HTTP_MOVED_TEMP);
+        }
+        Headers responseHeader = response.getResponseHeaders();
+        responseHeader.putValue("Location", encodedPath.toString());
+    }
+
+    protected String getTo() {
+        return this.to;
+    }
+
+    protected Map<String, String> getParameters() {
+        return Collections.unmodifiableMap(this.parameterMap);
+    }
+
+    protected String getParametarizedPath() {
+        StringBuilder buffer = new StringBuilder(extractParameters(getTo()));
+        if (getParameters().isEmpty() == false) {
+            Set<Entry<String, String>> entries = getParameters().entrySet();
+            Iterator<Entry<String, String>> entriesIterator = entries.iterator();
+            Entry<String, String> entry = entriesIterator.next();
+            try {
+                buffer.append('?').append(URLEncoder.encode(entry.getKey(), getEncodingCharset())).append('=')
+                        .append(URLEncoder.encode(entry.getValue(), getEncodingCharset()));
+                while (entriesIterator.hasNext()) {
+                    Entry<String, String> param = entriesIterator.next();
+                    buffer.append('&').append(URLEncoder.encode(param.getKey(), getEncodingCharset())).append('=')
+                            .append(URLEncoder.encode(param.getValue(), getEncodingCharset()));
+                }
+            } catch (UnsupportedEncodingException e) {
+                throw new ResponseEvaluationException(e, this);
+            }
+        }
+        return buffer.toString();
+    }
+
+    protected final String getEncodingCharset() {
+        return this.encoding;
+    }
+
+    private String extractParameters(String originalPath) {
+        int parameterIndex = 0;
+        if ((parameterIndex = originalPath.indexOf("?")) > 0) {
+            String query = originalPath.substring(parameterIndex + 1);
+            String[] params = query.split("&");
+            for (String param : params) {
+                String[] keyValue = param.split("=");
+                addParameter(keyValue[0], keyValue[1]);
+            }
+            return originalPath.substring(0, parameterIndex);
+        } else {
+            return originalPath;
+        }
+    }
+
+    public static Redirect to(String path) {
+        if (StringUtils.isEmpty(path)) {
+            throw new MissingRequirmentsException("redirect path", path);
+        }
+        return new Redirect(path);
+    }
+
+    public Redirect addParameter(String name, String value) {
+        this.parameterMap.put(name, value);
+        return this;
+    }
+
+    protected int getResponseCode() {
+        return this.responseCode;
+    }
+
+    public Redirect resoposeCode(int responseCode) {
+        this.responseCode = responseCode;
+        return this;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (o instanceof Redirect) {
+            return getParametarizedPath().equals(((Redirect) o).getParametarizedPath());
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        final int multiplier = 37;
+        int result = 17;
+        int hash = 0;
+        String path = getParametarizedPath();
+        if (path != null) {
+            hash = path.hashCode();
+        }
+        result = multiplier * result + hash;
+        return result;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/response/RenderableResponses.java b/src/main/java/org/analogweb/core/response/RenderableResponses.java
index 682bbd9..3610242 100644
--- a/src/main/java/org/analogweb/core/response/RenderableResponses.java
+++ b/src/main/java/org/analogweb/core/response/RenderableResponses.java
@@ -7,28 +7,25 @@
 import org.analogweb.ResponseEntity;
 import org.analogweb.core.DefaultResponseEntity;
 
-public class RenderableResponses
-		extends
-			BuildAndRenderableResponse<RenderableResponses> {
-
-	private RenderableResponses() {
-		// not instantiate.
-	}
-
-	public static RenderableResponses ok() {
-		return new RenderableResponses().status(HttpStatus.OK);
-	}
-
-	public static RenderableResponses ok(ResponseEntity entity) {
-		return ok().entity(entity);
-	}
-
-	public static RenderableResponses ok(String entity, Charset charset) {
-		return ok(new DefaultResponseEntity(entity, charset));
-	}
-
-	public static RenderableResponses locates(URI location) {
-		return new RenderableResponses().status(HttpStatus.FOUND).header(
-				"Location", location.toString());
-	}
+public class RenderableResponses extends BuildAndRenderableResponse<RenderableResponses> {
+
+    private RenderableResponses() {
+        // not instantiate.
+    }
+
+    public static RenderableResponses ok() {
+        return new RenderableResponses().status(HttpStatus.OK);
+    }
+
+    public static RenderableResponses ok(ResponseEntity entity) {
+        return ok().entity(entity);
+    }
+
+    public static RenderableResponses ok(String entity, Charset charset) {
+        return ok(new DefaultResponseEntity(entity, charset));
+    }
+
+    public static RenderableResponses locates(URI location) {
+        return new RenderableResponses().status(HttpStatus.FOUND).header("Location", location.toString());
+    }
 }
diff --git a/src/main/java/org/analogweb/core/response/Resource.java b/src/main/java/org/analogweb/core/response/Resource.java
index fc60151..6e9e5fe 100644
--- a/src/main/java/org/analogweb/core/response/Resource.java
+++ b/src/main/java/org/analogweb/core/response/Resource.java
@@ -22,132 +22,126 @@
  */
 public class Resource extends BuildAndRenderableResponse<Resource> {
 
-	private static final String DEFAULT_CHARSET = "UTF-8";
-	private static final String DEFAULT_CONTENT_TYPE = "application/octet-stream";
-	protected static final String CONTENT_DISPOSITION = "Content-Disposition";
-	// private String contentType = DEFAULT_CONTENT_TYPE;
-	private String charset = DEFAULT_CHARSET;
-	private final String fileName;
-	private String disposition = "attachment";
-	private final ReadableBuffer input;
-	private boolean withoutContentDisposition = false;
-
-	protected Resource(ReadableBuffer input, String fileName) {
-		this(input, fileName, DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET);
-	}
-
-	protected Resource(ReadableBuffer input, String fileName, String contentType) {
-		this(input, fileName, contentType, DEFAULT_CHARSET);
-	}
-
-	protected Resource(ReadableBuffer input, String fileName,
-			String contentType, String charset) {
-		this.input = input;
-		this.fileName = fileName;
-		header("Content-Type", contentType);
-		this.charset = charset;
-	}
-
-	public static Resource as(ReadableBuffer input) {
-		return as(input, StringUtils.EMPTY);
-	}
-
-	public static Resource as(ReadableBuffer input, String fileName) {
-		Assertion.notNull(input, ReadableBuffer.class.getName());
-		return new Resource(input, fileName);
-	}
-
-	public static Resource as(ReadableBuffer input, String fileName,
-			String contentType) {
-		Assertion.notNull(input, ReadableBuffer.class.getName());
-		return new Resource(input, fileName, contentType);
-	}
-
-	public static Resource asFilePath(String filePath) {
-		Assertion.notNull(filePath, "FilePath");
-		return as(new File(filePath));
-	}
-
-	public static Resource as(File file) {
-		Assertion.notNull(file, File.class.getName());
-		try {
-			return new Resource(
-					DefaultReadableBuffer.readBuffer(new FileInputStream(file)
-							.getChannel()), file.getName());
-		} catch (FileNotFoundException e) {
-			throw new ApplicationRuntimeException(e) {
-
-				private static final long serialVersionUID = 1L;
-			};
-		}
-	}
-
-	@Override
-	protected void mergeHeaders(RequestContext request,
-			ResponseContext response, Map<String, String> headers,
-			ResponseEntity entity) {
-		try {
-			String contentDisposition = createContentDisposition();
-			if (StringUtils.isNotEmpty(contentDisposition)) {
-				headers.put(CONTENT_DISPOSITION, createContentDisposition());
-			}
-		} catch (UnsupportedEncodingException e) {
-			throw new ApplicationRuntimeException(e) {
-
-				// TODO
-				private static final long serialVersionUID = 1L;
-			};
-		}
-		super.mergeHeaders(request, response, headers, entity);
-	}
-
-	@Override
-	protected ResponseEntity extractResponseEntity(RequestContext request,
-			ResponseContext response) {
-		return new ReadableBufferResponseEntity(getInputStream());
-	}
-
-	protected String createContentDisposition()
-			throws UnsupportedEncodingException {
-		StringBuilder buffer = new StringBuilder();
-		if (withContentDisposition()) {
-			buffer.append(getDisposition());
-			String fileName = getFileName();
-			if (StringUtils.isNotEmpty(fileName)) {
-				buffer.append("; filename=");
-				buffer.append(URLEncoder.encode(fileName, getCharset()));
-			}
-		}
-		return buffer.toString();
-	}
-
-	protected String getFileName() {
-		return this.fileName;
-	}
-
-	protected ReadableBuffer getInputStream() {
-		return this.input;
-	}
-
-	protected String getDisposition() {
-		return this.disposition;
-	}
-
-	protected boolean withContentDisposition() {
-		return !this.withoutContentDisposition;
-	}
-
-	public String getCharset() {
-		return this.charset;
-	}
-
-	public Resource inline() {
-		this.disposition = "inline";
-		return this;
-	}
-
-	public Resource withoutContentDisposition() {
-		this.withoutContentDisposition = true;
-		return this;
-	}
+    private static final String DEFAULT_CHARSET = "UTF-8";
+    private static final String DEFAULT_CONTENT_TYPE = "application/octet-stream";
+    protected static final String CONTENT_DISPOSITION = "Content-Disposition";
+    // private String contentType = DEFAULT_CONTENT_TYPE;
+    private String charset = DEFAULT_CHARSET;
+    private final String fileName;
+    private String disposition = "attachment";
+    private final ReadableBuffer input;
+    private boolean withoutContentDisposition = false;
+
+    protected Resource(ReadableBuffer input, String fileName) {
+        this(input, fileName, DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET);
+    }
+
+    protected Resource(ReadableBuffer input, String fileName, String contentType) {
+        this(input, fileName, contentType, DEFAULT_CHARSET);
+    }
+
+    protected Resource(ReadableBuffer input, String fileName, String contentType, String charset) {
+        this.input = input;
+        this.fileName = fileName;
+        header("Content-Type", contentType);
+        this.charset = charset;
+    }
+
+    public static Resource as(ReadableBuffer input) {
+        return as(input, StringUtils.EMPTY);
+    }
+
+    public static Resource as(ReadableBuffer input, String fileName) {
+        Assertion.notNull(input, ReadableBuffer.class.getName());
+        return new Resource(input, fileName);
+    }
+
+    public static Resource as(ReadableBuffer input, String fileName, String contentType) {
+        Assertion.notNull(input, ReadableBuffer.class.getName());
+        return new Resource(input, fileName, contentType);
+    }
+
+    public static Resource asFilePath(String filePath) {
+        Assertion.notNull(filePath, "FilePath");
+        return as(new File(filePath));
+    }
+
+    public static Resource as(File file) {
+        Assertion.notNull(file, File.class.getName());
+        try {
+            return new Resource(DefaultReadableBuffer.readBuffer(new FileInputStream(file).getChannel()),
+                    file.getName());
+        } catch (FileNotFoundException e) {
+            throw new ApplicationRuntimeException(e) {
+
+                private static final long serialVersionUID = 1L;
+            };
+        }
+    }
+
+    @Override
+    protected void mergeHeaders(RequestContext request, ResponseContext response, Map<String, String> headers,
+            ResponseEntity entity) {
+        try {
+            String contentDisposition = createContentDisposition();
+            if (StringUtils.isNotEmpty(contentDisposition)) {
+                headers.put(CONTENT_DISPOSITION, createContentDisposition());
+            }
+        } catch (UnsupportedEncodingException e) {
+            throw new ApplicationRuntimeException(e) {
+
+                // TODO
+                private static final long serialVersionUID = 1L;
+            };
+        }
+        super.mergeHeaders(request, response, headers, entity);
+    }
+
+    @Override
+    protected ResponseEntity extractResponseEntity(RequestContext request, ResponseContext response) {
+        return new ReadableBufferResponseEntity(getInputStream());
+    }
+
+    protected String createContentDisposition() throws UnsupportedEncodingException {
+        StringBuilder buffer = new StringBuilder();
+        if (withContentDisposition()) {
+            buffer.append(getDisposition());
+            String fileName = getFileName();
+            if (StringUtils.isNotEmpty(fileName)) {
+                buffer.append("; filename=");
+                buffer.append(URLEncoder.encode(fileName, getCharset()));
+            }
+        }
+        return buffer.toString();
+    }
+
+    protected String getFileName() {
+        return this.fileName;
+    }
+
+    protected ReadableBuffer getInputStream() {
+        return this.input;
+    }
+
+    protected String getDisposition() {
+        return this.disposition;
+    }
+
+    protected boolean withContentDisposition() {
+        return !this.withoutContentDisposition;
+    }
+
+    public String getCharset() {
+        return this.charset;
+    }
+
+    public Resource inline() {
+        this.disposition = "inline";
+        return this;
+    }
+
+    public Resource withoutContentDisposition() {
+        this.withoutContentDisposition = true;
+        return this;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/response/Text.java b/src/main/java/org/analogweb/core/response/Text.java
index 280b6f5..31db53d 100644
--- a/src/main/java/org/analogweb/core/response/Text.java
+++ b/src/main/java/org/analogweb/core/response/Text.java
@@ -5,15 +5,15 @@
  */
 public class Text extends TextFormat<Text> {
 
-	protected Text(String input) {
-		super(input);
-	}
+    protected Text(String input) {
+        super(input);
+    }
 
-	protected Text(String input, String contentType, String charset) {
-		super(input, charset, contentType);
-	}
+    protected Text(String input, String contentType, String charset) {
+        super(input, charset, contentType);
+    }
 
-	public static Text with(final String responseText) {
-		return new Text(responseText);
-	}
+    public static Text with(final String responseText) {
+        return new Text(responseText);
+    }
 }
diff --git a/src/main/java/org/analogweb/core/response/TextFormat.java b/src/main/java/org/analogweb/core/response/TextFormat.java
index c948fc6..497978c 100644
--- a/src/main/java/org/analogweb/core/response/TextFormat.java
+++ b/src/main/java/org/analogweb/core/response/TextFormat.java
@@ -13,108 +13,102 @@
 /**
  * @author snowgoose
  */
-public class TextFormat<T extends TextFormat<T>>
-		extends
-			BuildAndRenderableResponse<T> implements Renderable {
-
-	private static final String DEFAULT_CHARSET = "UTF-8";
-	private static final String DEFAULT_CONTENT_TYPE = "text/plain";
-	private final String responseText;
-	private String contentType = DEFAULT_CONTENT_TYPE;
-	private String charset = DEFAULT_CHARSET;
-
-	protected TextFormat() {
-		this(StringUtils.EMPTY, DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET);
-	}
-
-	protected TextFormat(String input) {
-		this(input, DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET);
-	}
-
-	protected TextFormat(String input, String contentType, String charset) {
-		super();
-		this.responseText = StringUtils.isEmpty(input)
-				? StringUtils.EMPTY
-				: input;
-		this.charset = charset;
-		this.contentType = contentType;
-	}
-
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	public static <T extends TextFormat> T with(final String responseText) {
-		return (T) new TextFormat(responseText);
-	}
-
-	@SuppressWarnings("unchecked")
-	public T typeAs(String contentType) {
-		this.contentType = contentType;
-		return (T) this;
-	}
-
-	@SuppressWarnings("unchecked")
-	public T withCharset(String charset) {
-		if (StringUtils.isNotEmpty(charset)) {
-			this.charset = charset;
-		}
-		return (T) this;
-	}
-
-	@SuppressWarnings("unchecked")
-	public T withoutCharset() {
-		this.charset = StringUtils.EMPTY;
-		return (T) this;
-	}
-
-	@Override
-	protected ResponseEntity extractResponseEntity(RequestContext request,
-			ResponseContext response) {
-		Charset cs = getCharset();
-		if (cs == null) {
-			return new DefaultResponseEntity(getResponseText());
-		} else {
-			return new DefaultResponseEntity(getResponseText(), cs);
-		}
-	}
-
-	@Override
-	protected void mergeHeaders(RequestContext request,
-			ResponseContext response, Map<String, String> headers,
-			ResponseEntity entity) {
-		super.mergeHeaders(request, response, headers, entity);
-		String contentType = resolveContentType();
-		if (StringUtils.isNotEmpty(contentType)) {
-			response.getResponseHeaders().putValue("Content-Type", contentType);
-		}
-	}
-
-	protected String getResponseText() {
-		return this.responseText;
-	}
-
-	public Charset getCharset() {
-		String cs = getCharsetAsText();
-		if (StringUtils.isEmpty(cs)) {
-			return null;
-		}
-		return Charset.forName(cs);
-	}
-
-	public final String getCharsetAsText() {
-		return this.charset;
-	}
-
-	protected String resolveContentType() {
-		String charset = getCharsetAsText();
-		if (StringUtils.isEmpty(charset)) {
-			return this.contentType;
-		} else {
-			return new StringBuilder(32).append(this.contentType)
-					.append("; charset=").append(getCharsetAsText()).toString();
-		}
-	}
-
-	@Override
-	public String toString() {
-		return responseText;
-	}
+public class TextFormat<T extends TextFormat<T>> extends BuildAndRenderableResponse<T> implements Renderable {
+
+    private static final String DEFAULT_CHARSET = "UTF-8";
+    private static final String DEFAULT_CONTENT_TYPE = "text/plain";
+    private final String responseText;
+    private String contentType = DEFAULT_CONTENT_TYPE;
+    private String charset = DEFAULT_CHARSET;
+
+    protected TextFormat() {
+        this(StringUtils.EMPTY, DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET);
+    }
+
+    protected TextFormat(String input) {
+        this(input, DEFAULT_CONTENT_TYPE, DEFAULT_CHARSET);
+    }
+
+    protected TextFormat(String input, String contentType, String charset) {
+        super();
+        this.responseText = StringUtils.isEmpty(input) ? StringUtils.EMPTY : input;
+        this.charset = charset;
+        this.contentType = contentType;
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public static <T extends TextFormat> T with(final String responseText) {
+        return (T) new TextFormat(responseText);
+    }
+
+    @SuppressWarnings("unchecked")
+    public T typeAs(String contentType) {
+        this.contentType = contentType;
+        return (T) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    public T withCharset(String charset) {
+        if (StringUtils.isNotEmpty(charset)) {
+            this.charset = charset;
+        }
+        return (T) this;
+    }
+
+    @SuppressWarnings("unchecked")
+    public T withoutCharset() {
+        this.charset = StringUtils.EMPTY;
+        return (T) this;
+    }
+
+    @Override
+    protected ResponseEntity extractResponseEntity(RequestContext request, ResponseContext response) {
+        Charset cs = getCharset();
+        if (cs == null) {
+            return new DefaultResponseEntity(getResponseText());
+        } else {
+            return new DefaultResponseEntity(getResponseText(), cs);
+        }
+    }
+
+    @Override
+    protected void mergeHeaders(RequestContext request, ResponseContext response, Map<String, String> headers,
+            ResponseEntity entity) {
+        super.mergeHeaders(request, response, headers, entity);
+        String contentType = resolveContentType();
+        if (StringUtils.isNotEmpty(contentType)) {
+            response.getResponseHeaders().putValue("Content-Type", contentType);
+        }
+    }
+
+    protected String getResponseText() {
+        return this.responseText;
+    }
+
+    public Charset getCharset() {
+        String cs = getCharsetAsText();
+        if (StringUtils.isEmpty(cs)) {
+            return null;
+        }
+        return Charset.forName(cs);
+    }
+
+    public final String getCharsetAsText() {
+        return this.charset;
+    }
+
+    protected String resolveContentType() {
+        String charset = getCharsetAsText();
+        if (StringUtils.isEmpty(charset)) {
+            return this.contentType;
+        } else {
+            return new StringBuilder(32).append(this.contentType).append("; charset=").append(getCharsetAsText())
+                    .toString();
+        }
+    }
+
+    @Override
+    public String toString() {
+        return responseText;
+    }
 }
diff --git a/src/main/java/org/analogweb/core/response/TextFormattable.java b/src/main/java/org/analogweb/core/response/TextFormattable.java
index 055af5a..05ae9cb 100644
--- a/src/main/java/org/analogweb/core/response/TextFormattable.java
+++ b/src/main/java/org/analogweb/core/response/TextFormattable.java
@@ -9,69 +9,66 @@
 /**
  * @param <T>
  *            {@link TextFormattable}
+ *
  * @author snowgoose
  */
-public abstract class TextFormattable<T extends TextFormattable<T>>
-		extends
-			TextFormat<T> implements ResponseFormatterAware<T> {
+public abstract class TextFormattable<T extends TextFormattable<T>> extends TextFormat<T>
+        implements ResponseFormatterAware<T> {
 
-	private Object source;
-	private ResponseFormatter formatter;
+    private Object source;
+    private ResponseFormatter formatter;
 
-	public TextFormattable() {
-		super();
-	}
+    public TextFormattable() {
+        super();
+    }
 
-	public TextFormattable(String input, String contentType, String charset) {
-		super(input, contentType, charset);
-	}
+    public TextFormattable(String input, String contentType, String charset) {
+        super(input, contentType, charset);
+    }
 
-	public TextFormattable(String input) {
-		super(input);
-	}
+    public TextFormattable(String input) {
+        super(input);
+    }
 
-	public TextFormattable(Object source) {
-		this.source = source;
-	}
+    public TextFormattable(Object source) {
+        this.source = source;
+    }
 
-	protected final Object getSource() {
-		return this.source;
-	}
+    protected final Object getSource() {
+        return this.source;
+    }
 
-	protected ResponseFormatter getFormatter() {
-		return this.formatter;
-	}
+    protected ResponseFormatter getFormatter() {
+        return this.formatter;
+    }
 
-	protected abstract ResponseFormatter getDefaultFormatter();
+    protected abstract ResponseFormatter getDefaultFormatter();
 
-	@Override
-	protected ResponseEntity extractResponseEntity(RequestContext request,
-			ResponseContext response) {
-		Object source = getSource();
-		if (source == null) {
-			return super.extractResponseEntity(request, response);
-		}
-		ResponseFormatter formatter = getFormatter();
-		if (formatter == null) {
-			formatter = getDefaultFormatter();
-		}
-		return formatter.formatAndWriteInto(request, response,
-				getCharsetAsText(), source);
-	}
+    @Override
+    protected ResponseEntity extractResponseEntity(RequestContext request, ResponseContext response) {
+        Object source = getSource();
+        if (source == null) {
+            return super.extractResponseEntity(request, response);
+        }
+        ResponseFormatter formatter = getFormatter();
+        if (formatter == null) {
+            formatter = getDefaultFormatter();
+        }
+        return formatter.formatAndWriteInto(request, response, getCharsetAsText(), source);
+    }
 
-	@Override
-	@SuppressWarnings("unchecked")
-	public T attach(ResponseFormatter formatter) {
-		if (this.formatter == null) {
-			this.formatter = formatter;
-		}
-		return (T) this;
-	}
+    @Override
+    @SuppressWarnings("unchecked")
+    public T attach(ResponseFormatter formatter) {
+        if (this.formatter == null) {
+            this.formatter = formatter;
+        }
+        return (T) this;
+    }
 
-	@Override
-	public String toString() {
-		ResponseFormatter f;
-		return String.format("%s with %s", getClass(),
-				(f = getFormatter()) == null ? "default-formatter" : f);
-	}
+    @Override
+    public String toString() {
+        ResponseFormatter f;
+        return String.format("%s with %s", getClass(), (f = getFormatter()) == null ? "default-formatter" : f);
+    }
 }
diff --git a/src/main/java/org/analogweb/package-info.java b/src/main/java/org/analogweb/package-info.java
index d22d539..8e919a1 100644
--- a/src/main/java/org/analogweb/package-info.java
+++ b/src/main/java/org/analogweb/package-info.java
@@ -1,5 +1,4 @@
 /**
- * Root of <a href="http://analogweb.org">Analog Web Framework</a><br/>
- * This package defines fundamental interfaces.
+ * Root of <a href="http://analogweb.org">Analog Web Framework</a> This package defines fundamental interfaces.
  */
 package org.analogweb;
diff --git a/src/main/java/org/analogweb/util/AbstractClassCollector.java b/src/main/java/org/analogweb/util/AbstractClassCollector.java
index 6a146ad..8f2ea3b 100644
--- a/src/main/java/org/analogweb/util/AbstractClassCollector.java
+++ b/src/main/java/org/analogweb/util/AbstractClassCollector.java
@@ -5,12 +5,13 @@
 
 /**
  * @see ClassCollector
+ *
  * @author snowgoose
  */
 public abstract class AbstractClassCollector implements ClassCollector {
 
-	@Override
-	public Collection<Class<?>> collect(URL source, ClassLoader classLoader) {
-		return collect(StringUtils.EMPTY, source, classLoader);
-	}
+    @Override
+    public Collection<Class<?>> collect(URL source, ClassLoader classLoader) {
+        return collect(StringUtils.EMPTY, source, classLoader);
+    }
 }
diff --git a/src/main/java/org/analogweb/util/AnnotationUtils.java b/src/main/java/org/analogweb/util/AnnotationUtils.java
index 6168493..354de03 100644
--- a/src/main/java/org/analogweb/util/AnnotationUtils.java
+++ b/src/main/java/org/analogweb/util/AnnotationUtils.java
@@ -7,93 +7,85 @@
 
 /**
  * Utilities for {@link Annotation}
- * 
+ *
  * @author snowgoose
  */
 public final class AnnotationUtils {
 
-	public static <T extends Annotation> T findAnnotation(Class<T> target,
-			Class<?> annotationContainsClass) {
-		Assertion.notNull(annotationContainsClass, "Class must not be null");
-		if (Annotation.class.isAssignableFrom(annotationContainsClass)
-				&& !annotationContainsClass.getPackage().equals(
-						Annotation.class.getPackage())) {
-			return findAnnotation(target,
-					annotationContainsClass.getAnnotations());
-		}
-		T annotation = annotationContainsClass.getAnnotation(target);
-		if (annotation != null) {
-			return annotation;
-		}
-		for (Class<?> ifc : annotationContainsClass.getInterfaces()) {
-			annotation = findAnnotation(target, ifc);
-			if (annotation != null) {
-				return annotation;
-			}
-		}
-		if (!Annotation.class.isAssignableFrom(annotationContainsClass)) {
-			for (Annotation ann : annotationContainsClass.getAnnotations()) {
-				annotation = findAnnotation(target, ann.annotationType());
-				if (annotation != null) {
-					return annotation;
-				}
-			}
-		}
-		Class<?> superClass = annotationContainsClass.getSuperclass();
-		if (superClass == null || superClass == Object.class) {
-			return null;
-		}
-		return findAnnotation(target, superClass);
-	}
+    public static <T extends Annotation> T findAnnotation(Class<T> target, Class<?> annotationContainsClass) {
+        Assertion.notNull(annotationContainsClass, "Class must not be null");
+        if (Annotation.class.isAssignableFrom(annotationContainsClass)
+                && !annotationContainsClass.getPackage().equals(Annotation.class.getPackage())) {
+            return findAnnotation(target, annotationContainsClass.getAnnotations());
+        }
+        T annotation = annotationContainsClass.getAnnotation(target);
+        if (annotation != null) {
+            return annotation;
+        }
+        for (Class<?> ifc : annotationContainsClass.getInterfaces()) {
+            annotation = findAnnotation(target, ifc);
+            if (annotation != null) {
+                return annotation;
+            }
+        }
+        if (!Annotation.class.isAssignableFrom(annotationContainsClass)) {
+            for (Annotation ann : annotationContainsClass.getAnnotations()) {
+                annotation = findAnnotation(target, ann.annotationType());
+                if (annotation != null) {
+                    return annotation;
+                }
+            }
+        }
+        Class<?> superClass = annotationContainsClass.getSuperclass();
+        if (superClass == null || superClass == Object.class) {
+            return null;
+        }
+        return findAnnotation(target, superClass);
+    }
 
-	@SuppressWarnings("unchecked")
-	public static <T extends Annotation> T findAnnotation(Class<T> target,
-			Annotation... annotations) {
-		for (Annotation annotation : annotations) {
-			Class<?> annotationType = annotation.annotationType();
-			if (annotationType.equals(target)
-					|| (annotation = findAnnotation(target, annotationType)) != null) {
-				return (T) annotation;
-			}
-		}
-		return null;
-	}
+    @SuppressWarnings("unchecked")
+    public static <T extends Annotation> T findAnnotation(Class<T> target, Annotation... annotations) {
+        for (Annotation annotation : annotations) {
+            Class<?> annotationType = annotation.annotationType();
+            if (annotationType.equals(target) || (annotation = findAnnotation(target, annotationType)) != null) {
+                return (T) annotation;
+            }
+        }
+        return null;
+    }
 
-	public static <T extends Annotation> List<T> findAnnotations(
-			Class<T> target, Method method) {
-		List<T> annotations = new ArrayList<T>();
-		for (Annotation ann : method.getAnnotations()) {
-			T an = findAnnotation(target, ann);
-			if (an != null) {
-				annotations.add(an);
-			}
-		}
-		return annotations;
-	}
+    public static <T extends Annotation> List<T> findAnnotations(Class<T> target, Method method) {
+        List<T> annotations = new ArrayList<T>();
+        for (Annotation ann : method.getAnnotations()) {
+            T an = findAnnotation(target, ann);
+            if (an != null) {
+                annotations.add(an);
+            }
+        }
+        return annotations;
+    }
 
-	@SuppressWarnings("unchecked")
-	public static <T> T getValue(Annotation annotation) {
-		return (T) getValue(annotation, "value");
-	}
+    @SuppressWarnings("unchecked")
+    public static <T> T getValue(Annotation annotation) {
+        return (T) getValue(annotation, "value");
+    }
 
-	@SuppressWarnings("unchecked")
-	public static <T> T getValue(Annotation annotation, String attributeName) {
-		try {
-			Method method = annotation.annotationType().getDeclaredMethod(
-					attributeName, new Class[0]);
-			return (T) method.invoke(annotation);
-		} catch (Exception ex) {
-			return null;
-		}
-	}
+    @SuppressWarnings("unchecked")
+    public static <T> T getValue(Annotation annotation, String attributeName) {
+        try {
+            Method method = annotation.annotationType().getDeclaredMethod(attributeName, new Class[0]);
+            return (T) method.invoke(annotation);
+        } catch (Exception ex) {
+            return null;
+        }
+    }
 
-	public static boolean isDeclared(
-			Class<? extends Annotation> expectDeclared, Class<?> clazz) {
-		for (Annotation an : clazz.getDeclaredAnnotations()) {
-			if (an.annotationType().equals(expectDeclared)) {
-				return true;
-			}
-		}
-		return false;
-	}
+    public static boolean isDeclared(Class<? extends Annotation> expectDeclared, Class<?> clazz) {
+        for (Annotation an : clazz.getDeclaredAnnotations()) {
+            if (an.annotationType().equals(expectDeclared)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/main/java/org/analogweb/util/ApplicationPropertiesHolder.java b/src/main/java/org/analogweb/util/ApplicationPropertiesHolder.java
index 9bbfe80..3814c53 100644
--- a/src/main/java/org/analogweb/util/ApplicationPropertiesHolder.java
+++ b/src/main/java/org/analogweb/util/ApplicationPropertiesHolder.java
@@ -6,45 +6,43 @@
 
 /**
  * Holds {@link ApplicationProperties} instance.
- * 
+ *
  * @author snowgoose
  */
 public final class ApplicationPropertiesHolder {
 
-	private ApplicationPropertiesHolder() {
-		// nop.
-	}
+    private ApplicationPropertiesHolder() {
+        // nop.
+    }
 
-	private static ApplicationProperties properties;
+    private static ApplicationProperties properties;
 
-	/**
-	 * Set up {@link ApplicationProperties}.
-	 * 
-	 * @param app
-	 *            {@link Application}
-	 * @param config
-	 *            {@link ApplicationProperties}
-	 * @return {@link ApplicationProperties}
-	 */
-	public static ApplicationProperties configure(Application app,
-			ApplicationProperties config) {
-		if (properties != null) {
-			throw new ApplicationConfigurationException(
-					"re-configure ApplicationProperties not allowed.");
-		}
-		properties = config;
-		return properties;
-	}
+    /**
+     * Set up {@link ApplicationProperties}.
+     *
+     * @param app
+     *            {@link Application}
+     * @param config
+     *            {@link ApplicationProperties}
+     *
+     * @return {@link ApplicationProperties}
+     */
+    public static ApplicationProperties configure(Application app, ApplicationProperties config) {
+        if (properties != null) {
+            throw new ApplicationConfigurationException("re-configure ApplicationProperties not allowed.");
+        }
+        properties = config;
+        return properties;
+    }
 
-	public static ApplicationProperties current() {
-		if (properties == null) {
-			throw new ApplicationConfigurationException(
-					"ApplicationProperties not configured yet.");
-		}
-		return properties;
-	}
+    public static ApplicationProperties current() {
+        if (properties == null) {
+            throw new ApplicationConfigurationException("ApplicationProperties not configured yet.");
+        }
+        return properties;
+    }
 
-	public static void dispose(Application app) {
-		properties = null;
-	}
+    public static void dispose(Application app) {
+        properties = null;
+    }
 }
diff --git a/src/main/java/org/analogweb/util/ArrayUtils.java b/src/main/java/org/analogweb/util/ArrayUtils.java
index 4e3e4cd..a1e0ebb 100644
--- a/src/main/java/org/analogweb/util/ArrayUtils.java
+++ b/src/main/java/org/analogweb/util/ArrayUtils.java
@@ -7,48 +7,46 @@
  */
 public final class ArrayUtils {
 
-	@SuppressWarnings("unchecked")
-	public static <T> boolean isEmpty(T... anArray) {
-		return isNotEmpty(anArray) == false;
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <T> boolean isNotEmpty(T... anArray) {
-		return (anArray != null && anArray.length != 0);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <T> T[] newArray(T... objects) {
-		return objects;
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <T> T[] clone(Class<T> type, T... original) {
-		return clone(type, 0, original);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <T> T[] clone(Class<T> type, int additionalLength,
-			T... original) {
-		if (original == null) {
-			return null;
-		}
-		if (type == null) {
-			return original;
-		}
-		T[] array = (T[]) Array.newInstance(type, original.length
-				+ additionalLength);
-		System.arraycopy(original, 0, array, 0, original.length);
-		return array;
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <T> T[] add(Class<T> clazz, T addition, T... original) {
-		T[] array = clone(clazz, 1, original);
-		if (array != null) {
-			array[array.length - 1] = addition;
-			return array;
-		}
-		return null;
-	}
+    @SuppressWarnings("unchecked")
+    public static <T> boolean isEmpty(T... anArray) {
+        return isNotEmpty(anArray) == false;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> boolean isNotEmpty(T... anArray) {
+        return (anArray != null && anArray.length != 0);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T[] newArray(T... objects) {
+        return objects;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T[] clone(Class<T> type, T... original) {
+        return clone(type, 0, original);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T[] clone(Class<T> type, int additionalLength, T... original) {
+        if (original == null) {
+            return null;
+        }
+        if (type == null) {
+            return original;
+        }
+        T[] array = (T[]) Array.newInstance(type, original.length + additionalLength);
+        System.arraycopy(original, 0, array, 0, original.length);
+        return array;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T[] add(Class<T> clazz, T addition, T... original) {
+        T[] array = clone(clazz, 1, original);
+        if (array != null) {
+            array[array.length - 1] = addition;
+            return array;
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/org/analogweb/util/Assertion.java b/src/main/java/org/analogweb/util/Assertion.java
index c58f43c..62ff52c 100644
--- a/src/main/java/org/analogweb/util/Assertion.java
+++ b/src/main/java/org/analogweb/util/Assertion.java
@@ -7,10 +7,9 @@
  */
 public final class Assertion {
 
-	public static void notNull(Object anObject, String name)
-			throws AssertionFailureException {
-		if (anObject == null) {
-			throw new AssertionFailureException(name);
-		}
-	}
+    public static void notNull(Object anObject, String name) throws AssertionFailureException {
+        if (anObject == null) {
+            throw new AssertionFailureException(name);
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/util/ByteBufferInputStream.java b/src/main/java/org/analogweb/util/ByteBufferInputStream.java
index c360158..09d70f8 100644
--- a/src/main/java/org/analogweb/util/ByteBufferInputStream.java
+++ b/src/main/java/org/analogweb/util/ByteBufferInputStream.java
@@ -8,28 +8,28 @@
  * @author y2k2mt.
  */
 public class ByteBufferInputStream extends InputStream {
-	protected final ByteBuffer buffer;
+    protected final ByteBuffer buffer;
 
-	public ByteBufferInputStream(ByteBuffer buf) {
-		buffer = buf;
-	}
+    public ByteBufferInputStream(ByteBuffer buf) {
+        buffer = buf;
+    }
 
-	@Override
-	public int available() {
-		return buffer.remaining();
-	}
+    @Override
+    public int available() {
+        return buffer.remaining();
+    }
 
-	@Override
-	public int read() throws IOException {
-		return buffer.hasRemaining() ? (buffer.get() & 0xFF) : -1;
-	}
+    @Override
+    public int read() throws IOException {
+        return buffer.hasRemaining() ? (buffer.get() & 0xFF) : -1;
+    }
 
-	@Override
-	public int read(byte[] bytes, int off, int len) throws IOException {
-		if (!buffer.hasRemaining())
-			return -1;
-		len = Math.min(len, buffer.remaining());
-		buffer.get(bytes, off, len);
-		return len;
-	}
+    @Override
+    public int read(byte[] bytes, int off, int len) throws IOException {
+        if (!buffer.hasRemaining())
+            return -1;
+        len = Math.min(len, buffer.remaining());
+        buffer.get(bytes, off, len);
+        return len;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/analogweb/util/ByteBufferOutputStream.java b/src/main/java/org/analogweb/util/ByteBufferOutputStream.java
index dfbba5c..8f64a69 100644
--- a/src/main/java/org/analogweb/util/ByteBufferOutputStream.java
+++ b/src/main/java/org/analogweb/util/ByteBufferOutputStream.java
@@ -8,18 +8,19 @@
  * @author y2k2mt
  */
 public class ByteBufferOutputStream extends OutputStream {
-	protected final ByteBuffer buffer;
+    protected final ByteBuffer buffer;
 
-	public ByteBufferOutputStream(ByteBuffer buf) {
-		this.buffer = buf;
-	}
+    public ByteBufferOutputStream(ByteBuffer buf) {
+        this.buffer = buf;
+    }
 
-	@Override
-	public void write(int b) throws IOException {
-		this.buffer.put((byte) b);
-	}
-	@Override
-	public void write(byte[] bytes, int off, int len) throws IOException {
-		this.buffer.put(bytes, off, len);
-	}
+    @Override
+    public void write(int b) throws IOException {
+        this.buffer.put((byte) b);
+    }
+
+    @Override
+    public void write(byte[] bytes, int off, int len) throws IOException {
+        this.buffer.put(bytes, off, len);
+    }
 }
diff --git a/src/main/java/org/analogweb/util/ClassCollector.java b/src/main/java/org/analogweb/util/ClassCollector.java
index 0d2d55f..06da855 100644
--- a/src/main/java/org/analogweb/util/ClassCollector.java
+++ b/src/main/java/org/analogweb/util/ClassCollector.java
@@ -4,30 +4,31 @@
 import java.util.Collection;
 
 /**
- * Collecting　classes from ({@link URL}).
- * 
+ * Collecting classes from ({@link URL}).
+ *
  * @author snowgoose
  */
 public interface ClassCollector {
 
-	/**
-	 * @param source
-	 *            {@link URL}
-	 * @param classLoader
-	 *            {@link ClassLoader}
-	 * @return All loaded {@link Class}
-	 */
-	Collection<Class<?>> collect(URL source, ClassLoader classLoader);
+    /**
+     * @param source
+     *            {@link URL}
+     * @param classLoader
+     *            {@link ClassLoader}
+     *
+     * @return All loaded {@link Class}
+     */
+    Collection<Class<?>> collect(URL source, ClassLoader classLoader);
 
-	/**
-	 * @param packageName
-	 *            {@link Class}を取得する対象のパッケージ名
-	 * @param source
-	 *            {@link URL}
-	 * @param classLoader
-	 *            {@link ClassLoader}
-	 * @return All loaded {@link Class}
-	 */
-	Collection<Class<?>> collect(String packageName, URL source,
-			ClassLoader classLoader);
+    /**
+     * @param packageName
+     *            {@link Class}を取得する対象のパッケージ名
+     * @param source
+     *            {@link URL}
+     * @param classLoader
+     *            {@link ClassLoader}
+     *
+     * @return All loaded {@link Class}
+     */
+    Collection<Class<?>> collect(String packageName, URL source, ClassLoader classLoader);
 }
diff --git a/src/main/java/org/analogweb/util/ClassUtils.java b/src/main/java/org/analogweb/util/ClassUtils.java
index 785483c..4a8ce35 100644
--- a/src/main/java/org/analogweb/util/ClassUtils.java
+++ b/src/main/java/org/analogweb/util/ClassUtils.java
@@ -5,17 +5,15 @@
  */
 public final class ClassUtils {
 
-	public static Class<?> forNameQuietly(String canonicalName) {
-		return forNameQuietly(canonicalName, Thread.currentThread()
-				.getContextClassLoader());
-	}
+    public static Class<?> forNameQuietly(String canonicalName) {
+        return forNameQuietly(canonicalName, Thread.currentThread().getContextClassLoader());
+    }
 
-	public static Class<?> forNameQuietly(String canonicalName,
-			ClassLoader classLoader) {
-		try {
-			return Class.forName(canonicalName, false, classLoader);
-		} catch (ClassNotFoundException ignore) {
-			return null;
-		}
-	}
+    public static Class<?> forNameQuietly(String canonicalName, ClassLoader classLoader) {
+        try {
+            return Class.forName(canonicalName, false, classLoader);
+        } catch (ClassNotFoundException ignore) {
+            return null;
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/util/CollectionUtils.java b/src/main/java/org/analogweb/util/CollectionUtils.java
index ce27406..ada3e19 100644
--- a/src/main/java/org/analogweb/util/CollectionUtils.java
+++ b/src/main/java/org/analogweb/util/CollectionUtils.java
@@ -8,22 +8,22 @@
  */
 public class CollectionUtils {
 
-	public static <T> boolean isEmpty(Collection<T> aCollection) {
-		return (aCollection == null || aCollection.isEmpty());
-	}
+    public static <T> boolean isEmpty(Collection<T> aCollection) {
+        return (aCollection == null || aCollection.isEmpty());
+    }
 
-	public static <T> boolean isNotEmpty(Collection<T> aCollection) {
-		return isEmpty(aCollection) == false;
-	}
+    public static <T> boolean isNotEmpty(Collection<T> aCollection) {
+        return isEmpty(aCollection) == false;
+    }
 
-	public static <T> T indexOf(List<T> aCollection, int index) {
-		return indexOf(aCollection, index, null);
-	}
+    public static <T> T indexOf(List<T> aCollection, int index) {
+        return indexOf(aCollection, index, null);
+    }
 
-	public static <T> T indexOf(List<T> aCollection, int index, T defaultValue) {
-		if (isEmpty(aCollection) || index < 0 || aCollection.size() <= index) {
-			return defaultValue;
-		}
-		return aCollection.get(index);
-	}
+    public static <T> T indexOf(List<T> aCollection, int index, T defaultValue) {
+        if (isEmpty(aCollection) || index < 0 || aCollection.size() <= index) {
+            return defaultValue;
+        }
+        return aCollection.get(index);
+    }
 }
diff --git a/src/main/java/org/analogweb/util/CountingOutputStream.java b/src/main/java/org/analogweb/util/CountingOutputStream.java
index 58d161b..0e33e77 100644
--- a/src/main/java/org/analogweb/util/CountingOutputStream.java
+++ b/src/main/java/org/analogweb/util/CountingOutputStream.java
@@ -9,18 +9,18 @@
  */
 public class CountingOutputStream extends FilterOutputStream {
 
-	private long count = 0L;
+    private long count = 0L;
 
-	public CountingOutputStream(OutputStream out) {
-		super(out);
-	}
+    public CountingOutputStream(OutputStream out) {
+        super(out);
+    }
 
-	public void write(int b) throws IOException {
-		super.write(b);
-		count++;
-	}
+    public void write(int b) throws IOException {
+        super.write(b);
+        count++;
+    }
 
-	public long getCount() {
-		return this.count;
-	}
+    public long getCount() {
+        return this.count;
+    }
 }
diff --git a/src/main/java/org/analogweb/util/FileClassCollector.java b/src/main/java/org/analogweb/util/FileClassCollector.java
index 108a19c..25d620c 100644
--- a/src/main/java/org/analogweb/util/FileClassCollector.java
+++ b/src/main/java/org/analogweb/util/FileClassCollector.java
@@ -18,47 +18,42 @@
  */
 public class FileClassCollector extends AbstractClassCollector {
 
-	private static final Log log = Logs.getLog(FileClassCollector.class);
-	private static final String CLASS_SUFFIX = ".class";
+    private static final Log log = Logs.getLog(FileClassCollector.class);
+    private static final String CLASS_SUFFIX = ".class";
 
-	@Override
-	@SuppressWarnings("unchecked")
-	public Collection<Class<?>> collect(final String packageName,
-			final URL url, ClassLoader classLoader) {
-		if (url == null || url.getProtocol().equals("file") == false) {
-			return Collections.EMPTY_LIST;
-		}
-		File root = new File(url.getPath());
-		Set<Class<?>> classes = new HashSet<Class<?>>();
-		final File[] files = root.listFiles();
-		if (ArrayUtils.isEmpty(files)) {
-			return classes;
-		}
-		for (File file : files) {
-			final String fileName = file.getName();
-			if (file.isDirectory()) {
-				StringBuffer newPackageName = new StringBuffer();
-				if (StringUtils.isNotEmpty(packageName)) {
-					newPackageName.append(packageName);
-					newPackageName.append(".");
-				}
-				newPackageName.append(fileName);
-				classes.addAll(collect(
-						newPackageName.toString(),
-						ResourceUtils.findResource(file.getPath(),
-								Arrays.asList(FindResourceStrategies.FILE)),
-						classLoader));
-			} else if (fileName.endsWith(CLASS_SUFFIX)) {
-				final String shortClassName = fileName.substring(0,
-						fileName.length() - CLASS_SUFFIX.length());
-				Class<?> clazz = ClassUtils.forNameQuietly(packageName + "."
-						+ shortClassName, classLoader);
-				if (clazz != null) {
-					log.log(Markers.BOOT_APPLICATION, "TB000001", clazz, this);
-					classes.add(clazz);
-				}
-			}
-		}
-		return classes;
-	}
+    @Override
+    @SuppressWarnings("unchecked")
+    public Collection<Class<?>> collect(final String packageName, final URL url, ClassLoader classLoader) {
+        if (url == null || url.getProtocol().equals("file") == false) {
+            return Collections.EMPTY_LIST;
+        }
+        File root = new File(url.getPath());
+        Set<Class<?>> classes = new HashSet<Class<?>>();
+        final File[] files = root.listFiles();
+        if (ArrayUtils.isEmpty(files)) {
+            return classes;
+        }
+        for (File file : files) {
+            final String fileName = file.getName();
+            if (file.isDirectory()) {
+                StringBuffer newPackageName = new StringBuffer();
+                if (StringUtils.isNotEmpty(packageName)) {
+                    newPackageName.append(packageName);
+                    newPackageName.append(".");
+                }
+                newPackageName.append(fileName);
+                classes.addAll(collect(newPackageName.toString(),
+                        ResourceUtils.findResource(file.getPath(), Arrays.asList(FindResourceStrategies.FILE)),
+                        classLoader));
+            } else if (fileName.endsWith(CLASS_SUFFIX)) {
+                final String shortClassName = fileName.substring(0, fileName.length() - CLASS_SUFFIX.length());
+                Class<?> clazz = ClassUtils.forNameQuietly(packageName + "." + shortClassName, classLoader);
+                if (clazz != null) {
+                    log.log(Markers.BOOT_APPLICATION, "TB000001", clazz, this);
+                    classes.add(clazz);
+                }
+            }
+        }
+        return classes;
+    }
 }
diff --git a/src/main/java/org/analogweb/util/IOUtils.java b/src/main/java/org/analogweb/util/IOUtils.java
index 2462f29..e9d0c60 100644
--- a/src/main/java/org/analogweb/util/IOUtils.java
+++ b/src/main/java/org/analogweb/util/IOUtils.java
@@ -19,93 +19,88 @@
  */
 public final class IOUtils {
 
-	private static final Log log = Logs.getLog(IOUtils.class);
+    private static final Log log = Logs.getLog(IOUtils.class);
 
-	public static void closeQuietly(Closeable closeable) {
-		if (closeable == null) {
-			return;
-		}
-		try {
-			closeable.close();
-		} catch (IOException e) {
-			// nop.
-			log.log("DU000007", e, closeable);
-		}
-	}
+    public static void closeQuietly(Closeable closeable) {
+        if (closeable == null) {
+            return;
+        }
+        try {
+            closeable.close();
+        } catch (IOException e) {
+            // nop.
+            log.log("DU000007", e, closeable);
+        }
+    }
 
-	public static int copyQuietly(InputStream input, OutputStream output) {
-		try {
-			return copy(input, output, 8192);
-		} catch (IOException e) {
-			log.log("DU000008", e, input);
-			return -1;
-		}
-	}
+    public static int copyQuietly(InputStream input, OutputStream output) {
+        try {
+            return copy(input, output, 8192);
+        } catch (IOException e) {
+            log.log("DU000008", e, input);
+            return -1;
+        }
+    }
 
-	public static int copy(InputStream input, OutputStream output)
-			throws IOException {
-		return copy(input, output, 8192);
-	}
+    public static int copy(InputStream input, OutputStream output) throws IOException {
+        return copy(input, output, 8192);
+    }
 
-	public static int copy(InputStream input, OutputStream output,
-			int bufferSize) throws IOException {
-		Assertion.notNull(input, InputStream.class.getName());
-		Assertion.notNull(output, OutputStream.class.getName());
-		try {
-			byte[] buffer = new byte[bufferSize];
-			int read = input.read(buffer, 0, bufferSize);
-			int count = 0;
-			while (read > -1) {
-				output.write(buffer, 0, read);
-				count += read;
-				read = input.read(buffer, 0, bufferSize);
-			}
-			output.flush();
-			return count;
-		} finally {
-			closeQuietly(input);
-		}
-	}
+    public static int copy(InputStream input, OutputStream output, int bufferSize) throws IOException {
+        Assertion.notNull(input, InputStream.class.getName());
+        Assertion.notNull(output, OutputStream.class.getName());
+        try {
+            byte[] buffer = new byte[bufferSize];
+            int read = input.read(buffer, 0, bufferSize);
+            int count = 0;
+            while (read > -1) {
+                output.write(buffer, 0, read);
+                count += read;
+                read = input.read(buffer, 0, bufferSize);
+            }
+            output.flush();
+            return count;
+        } finally {
+            closeQuietly(input);
+        }
+    }
 
-	public static String toString(InputStream in) throws IOException {
-		return toString(new InputStreamReader(in));
-	}
+    public static String toString(InputStream in) throws IOException {
+        return toString(new InputStreamReader(in));
+    }
 
-	public static String toString(Reader reader) throws IOException {
-		return toString(reader, 4096);
-	}
+    public static String toString(Reader reader) throws IOException {
+        return toString(reader, 4096);
+    }
 
-	public static String toString(Reader reader, int bufferSize)
-			throws IOException {
-		StringBuilder sb = new StringBuilder();
-		CharBuffer buffer = CharBuffer.allocate(bufferSize);
-		while (-1 != reader.read(buffer)) {
-			buffer.flip();
-			sb.append(buffer);
-			buffer.clear();
-		}
-		return sb.toString();
-	}
+    public static String toString(Reader reader, int bufferSize) throws IOException {
+        StringBuilder sb = new StringBuilder();
+        CharBuffer buffer = CharBuffer.allocate(bufferSize);
+        while (-1 != reader.read(buffer)) {
+            buffer.flip();
+            sb.append(buffer);
+            buffer.clear();
+        }
+        return sb.toString();
+    }
 
-	public static final int DEFAULT_BUFFER_SIZE = 16 * 1024;
+    public static final int DEFAULT_BUFFER_SIZE = 16 * 1024;
 
-	public static void copy(final ReadableByteChannel src,
-			final WritableByteChannel dest) throws IOException {
-		copy(src, dest, 16 * 1024);
-	}
+    public static void copy(final ReadableByteChannel src, final WritableByteChannel dest) throws IOException {
+        copy(src, dest, 16 * 1024);
+    }
 
-	public static void copy(final ReadableByteChannel src,
-			final WritableByteChannel dest, final int bufferSize)
-			throws IOException {
-		final ByteBuffer buffer = ByteBuffer.allocateDirect(bufferSize);
-		while (src.read(buffer) != -1) {
-			buffer.flip();
-			dest.write(buffer);
-			buffer.compact();
-		}
-		buffer.flip();
-		while (buffer.hasRemaining()) {
-			dest.write(buffer);
-		}
-	}
+    public static void copy(final ReadableByteChannel src, final WritableByteChannel dest, final int bufferSize)
+            throws IOException {
+        final ByteBuffer buffer = ByteBuffer.allocateDirect(bufferSize);
+        while (src.read(buffer) != -1) {
+            buffer.flip();
+            dest.write(buffer);
+            buffer.compact();
+        }
+        buffer.flip();
+        while (buffer.hasRemaining()) {
+            dest.write(buffer);
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/util/JarClassCollector.java b/src/main/java/org/analogweb/util/JarClassCollector.java
index dbff29d..42811aa 100644
--- a/src/main/java/org/analogweb/util/JarClassCollector.java
+++ b/src/main/java/org/analogweb/util/JarClassCollector.java
@@ -20,52 +20,42 @@
  */
 public class JarClassCollector extends AbstractClassCollector {
 
-	private static final Log log = Logs.getLog(JarClassCollector.class);
-	private static final String CLASS_SUFFIX = ".class";
+    private static final Log log = Logs.getLog(JarClassCollector.class);
+    private static final String CLASS_SUFFIX = ".class";
 
-	@Override
-	@SuppressWarnings("unchecked")
-	public Collection<Class<?>> collect(String packageName, URL source,
-			ClassLoader classLoader) {
-		Assertion.notNull(classLoader, ClassLoader.class.getName());
-		if (source == null || source.getProtocol().equals("jar") == false) {
-			return Collections.EMPTY_LIST;
-		}
-		JarFile jarFile;
-		try {
-			JarURLConnection connection = (JarURLConnection) source
-					.openConnection();
-			jarFile = connection.getJarFile();
-		} catch (IOException ignore) {
-			return Collections.emptyList();
-		}
-		Set<Class<?>> collectedClasses = new HashSet<Class<?>>();
-		final Enumeration<JarEntry> enumeration = jarFile.entries();
-		while (enumeration.hasMoreElements()) {
-			final JarEntry entry = enumeration.nextElement();
-			final String entryName = entry.getName().replace('\\', '/');
-			if (entryName.endsWith(CLASS_SUFFIX)) {
-				final String className = entryName.substring(0,
-						entryName.length() - CLASS_SUFFIX.length()).replace(
-						'/', '.');
-				final int pos = className.lastIndexOf('.');
-				final String detectedPackageName = (pos == -1)
-						? null
-						: className.substring(0, pos);
-				final String shortClassName = (pos == -1)
-						? className
-						: className.substring(pos + 1);
-				if (detectedPackageName != null
-						&& (StringUtils.isEmpty(packageName) || detectedPackageName
-								.contains(packageName))) {
-					Class<?> clazz = ClassUtils.forNameQuietly(
-							detectedPackageName + "." + shortClassName,
-							classLoader);
-					log.log(Markers.BOOT_APPLICATION, "TB000001", clazz, this);
-					collectedClasses.add(clazz);
-				}
-			}
-		}
-		return collectedClasses;
-	}
+    @Override
+    @SuppressWarnings("unchecked")
+    public Collection<Class<?>> collect(String packageName, URL source, ClassLoader classLoader) {
+        Assertion.notNull(classLoader, ClassLoader.class.getName());
+        if (source == null || source.getProtocol().equals("jar") == false) {
+            return Collections.EMPTY_LIST;
+        }
+        JarFile jarFile;
+        try {
+            JarURLConnection connection = (JarURLConnection) source.openConnection();
+            jarFile = connection.getJarFile();
+        } catch (IOException ignore) {
+            return Collections.emptyList();
+        }
+        Set<Class<?>> collectedClasses = new HashSet<Class<?>>();
+        final Enumeration<JarEntry> enumeration = jarFile.entries();
+        while (enumeration.hasMoreElements()) {
+            final JarEntry entry = enumeration.nextElement();
+            final String entryName = entry.getName().replace('\\', '/');
+            if (entryName.endsWith(CLASS_SUFFIX)) {
+                final String className = entryName.substring(0, entryName.length() - CLASS_SUFFIX.length()).replace('/',
+                        '.');
+                final int pos = className.lastIndexOf('.');
+                final String detectedPackageName = (pos == -1) ? null : className.substring(0, pos);
+                final String shortClassName = (pos == -1) ? className : className.substring(pos + 1);
+                if (detectedPackageName != null
+                        && (StringUtils.isEmpty(packageName) || detectedPackageName.contains(packageName))) {
+                    Class<?> clazz = ClassUtils.forNameQuietly(detectedPackageName + "." + shortClassName, classLoader);
+                    log.log(Markers.BOOT_APPLICATION, "TB000001", clazz, this);
+                    collectedClasses.add(clazz);
+                }
+            }
+        }
+        return collectedClasses;
+    }
 }
diff --git a/src/main/java/org/analogweb/util/Maps.java b/src/main/java/org/analogweb/util/Maps.java
index 435f8d7..52ef320 100644
--- a/src/main/java/org/analogweb/util/Maps.java
+++ b/src/main/java/org/analogweb/util/Maps.java
@@ -9,22 +9,22 @@
  */
 public final class Maps {
 
-	public static <K, V> HashMap<K, V> newEmptyHashMap() {
-		return new HashMap<K, V>();
-	}
+    public static <K, V> HashMap<K, V> newEmptyHashMap() {
+        return new HashMap<K, V>();
+    }
 
-	public static <K, V> HashMap<K, V> newHashMap(K key, V value) {
-		HashMap<K, V> map = new HashMap<K, V>();
-		map.put(key, value);
-		return map;
-	}
+    public static <K, V> HashMap<K, V> newHashMap(K key, V value) {
+        HashMap<K, V> map = new HashMap<K, V>();
+        map.put(key, value);
+        return map;
+    }
 
-	public static <K, V> TreeMap<K, V> newTreeMap() {
-		return new TreeMap<K, V>();
-	}
+    public static <K, V> TreeMap<K, V> newTreeMap() {
+        return new TreeMap<K, V>();
+    }
 
-	public static <K, V> ConcurrentHashMap<K, V> newConcurrentHashMap() {
-		ConcurrentHashMap<K, V> map = new ConcurrentHashMap<K, V>();
-		return map;
-	}
+    public static <K, V> ConcurrentHashMap<K, V> newConcurrentHashMap() {
+        ConcurrentHashMap<K, V> map = new ConcurrentHashMap<K, V>();
+        return map;
+    }
 }
diff --git a/src/main/java/org/analogweb/util/MessageResource.java b/src/main/java/org/analogweb/util/MessageResource.java
index 4478f15..6224375 100644
--- a/src/main/java/org/analogweb/util/MessageResource.java
+++ b/src/main/java/org/analogweb/util/MessageResource.java
@@ -7,47 +7,51 @@
  */
 public interface MessageResource {
 
-	/**
-	 * 指定されたキーに一致するメッセージを取得する。
-	 * 
-	 * @param key
-	 *            メッセージキー
-	 * @return メッセージキーに一致するメッセージ
-	 */
-	String getMessage(String key);
+    /**
+     * 指定されたキーに一致するメッセージを取得する。
+     *
+     * @param key
+     *            メッセージキー
+     *
+     * @return メッセージキーに一致するメッセージ
+     */
+    String getMessage(String key);
 
-	/**
-	 * 指定されたキーに一致するメッセージを取得する。
-	 * 
-	 * @param key
-	 *            メッセージキー
-	 * @param args
-	 *            メッセージ引数
-	 * @return メッセージキーに一致するメッセージ
-	 */
-	String getMessage(String key, Object... args);
+    /**
+     * 指定されたキーに一致するメッセージを取得する。
+     *
+     * @param key
+     *            メッセージキー
+     * @param args
+     *            メッセージ引数
+     *
+     * @return メッセージキーに一致するメッセージ
+     */
+    String getMessage(String key, Object... args);
 
-	/**
-	 * 指定されたキーに一致するメッセージを取得する。
-	 * 
-	 * @param key
-	 *            メッセージキー
-	 * @param locale
-	 *            {@link Locale}
-	 * @return メッセージキーに一致するメッセージ
-	 */
-	String getMessage(String key, Locale locale);
+    /**
+     * 指定されたキーに一致するメッセージを取得する。
+     *
+     * @param key
+     *            メッセージキー
+     * @param locale
+     *            {@link Locale}
+     *
+     * @return メッセージキーに一致するメッセージ
+     */
+    String getMessage(String key, Locale locale);
 
-	/**
-	 * 指定されたキーに一致するメッセージを取得する。
-	 * 
-	 * @param key
-	 *            メッセージキー
-	 * @param locale
-	 *            {@link Locale}
-	 * @param args
-	 *            メッセージ引数
-	 * @return メッセージキーに一致するメッセージ
-	 */
-	String getMessage(String key, Locale locale, Object... args);
+    /**
+     * 指定されたキーに一致するメッセージを取得する。
+     *
+     * @param key
+     *            メッセージキー
+     * @param locale
+     *            {@link Locale}
+     * @param args
+     *            メッセージ引数
+     *
+     * @return メッセージキーに一致するメッセージ
+     */
+    String getMessage(String key, Locale locale, Object... args);
 }
diff --git a/src/main/java/org/analogweb/util/PropertyResourceBundleMessageResource.java b/src/main/java/org/analogweb/util/PropertyResourceBundleMessageResource.java
index 109c9ca..ad0be21 100644
--- a/src/main/java/org/analogweb/util/PropertyResourceBundleMessageResource.java
+++ b/src/main/java/org/analogweb/util/PropertyResourceBundleMessageResource.java
@@ -22,233 +22,212 @@
  */
 public class PropertyResourceBundleMessageResource implements MessageResource {
 
-	protected static final String DEFAULT_CHARSET = "UTF-8";
-	private final String baseName;
-	private final ClassLoader bundleClassLoader;
-	private final String charsetName;
-
-	public PropertyResourceBundleMessageResource(String baseName) {
-		this(baseName, DEFAULT_CHARSET);
-	}
-
-	public PropertyResourceBundleMessageResource(String baseName,
-			String bundleCharsetName) {
-		this(baseName, bundleCharsetName, Thread.currentThread()
-				.getContextClassLoader());
-	}
-
-	public PropertyResourceBundleMessageResource(String baseName,
-			ClassLoader classLoader) {
-		this(baseName, DEFAULT_CHARSET, classLoader);
-	}
-
-	public PropertyResourceBundleMessageResource(String baseName,
-			String bundleCharserName, ClassLoader classLoader) {
-		this.baseName = baseName;
-		this.charsetName = bundleCharserName;
-		this.bundleClassLoader = classLoader;
-	}
-
-	@Override
-	public String getMessage(String code) {
-		return getMessage(code, Locale.getDefault());
-	}
-
-	@Override
-	public String getMessage(String code, Object... args) {
-		return getMessage(code, Locale.getDefault(), args);
-	}
-
-	@Override
-	public String getMessage(String code, Locale locale) {
-		return getMessage(code, locale, new Object[0]);
-	}
-
-	private final Map<MessageFormatKey, MessageFormat> formatterCache = Maps
-			.newConcurrentHashMap();
-	private final Map<Locale, ResourceBundle> bundleCache = Maps
-			.newConcurrentHashMap();
-
-	@Override
-	public String getMessage(String code, Locale locale, Object... args) {
-		if (!bundleCache.containsKey(locale)) {
-			bundleCache.put(locale, getBundle(baseName, locale, getControl()));
-		}
-		ResourceBundle bundle = bundleCache.get(locale);
-		if (bundle.containsKey(code) == false) {
-			return code;
-		}
-		if (ArrayUtils.isEmpty(args)) {
-			return bundle.getString(code);
-		} else {
-			String message = bundle.getString(code);
-			MessageFormatKey key = MessageFormatKey.create(message, locale);
-			if (!formatterCache.containsKey(key)) {
-				formatterCache.put(key, new MessageFormat(message, locale));
-			}
-			MessageFormat formatter = formatterCache.get(key);
-			synchronized (formatter) {
-				return formatter.format(args);
-			}
-		}
-	}
-
-	protected ClassLoader getBundleClassLoader() {
-		return this.bundleClassLoader;
-	}
-
-	protected String getBundleResourceCharsetName() {
-		return this.charsetName;
-	}
-
-	private Control control;
-
-	protected Control getControl() {
-		if (control == null) {
-			control = new PropertyResourceBundleControl(
-					getBundleResourceCharsetName());
-		}
-		return control;
-	}
-
-	protected ResourceBundle getBundle(String baseName, Locale locale,
-			Control control) {
-		if (control == null) {
-			return PropertyResourceBundle.getBundle(baseName, locale,
-					getBundleClassLoader());
-		} else {
-			return PropertyResourceBundle.getBundle(baseName, locale,
-					getBundleClassLoader(), control);
-		}
-	}
-
-	protected static final class MessageFormatKey implements Serializable {
-
-		private static final long serialVersionUID = 1L;
-		private final Locale locale;
-		private final String format;
-
-		public static MessageFormatKey create(String formate, Locale locale) {
-			return new MessageFormatKey(formate, locale);
-		}
-
-		protected MessageFormatKey(String format, Locale locale) {
-			this.locale = locale;
-			this.format = format;
-		}
-
-		@Override
-		public boolean equals(Object obj) {
-			if (obj instanceof MessageFormatKey) {
-				MessageFormatKey other = (MessageFormatKey) obj;
-				return other.format.equals(format)
-						&& other.locale.equals(locale);
-			}
-			return false;
-		}
-
-		@Override
-		public int hashCode() {
-			int base = 17;
-			int result = 0;
-			result = base * 37 + locale.hashCode();
-			result = result * 37 + format.hashCode();
-			return result;
-		}
-	}
-
-	protected static class PropertyResourceBundleControl extends Control {
-
-		private final String charsetName;
-
-		protected PropertyResourceBundleControl(String charsetName) {
-			super();
-			this.charsetName = charsetName;
-		}
-
-		@Override
-		@SuppressWarnings("unchecked")
-		public ResourceBundle newBundle(String baseName, Locale locale,
-				String format, ClassLoader loader, boolean reload)
-				throws IllegalAccessException, InstantiationException,
-				IOException {
-			String bundleName = toBundleName(baseName, locale);
-			ResourceBundle bundle = null;
-			if (format.equals("java.class")) {
-				try {
-					Class<? extends ResourceBundle> bundleClass = (Class<? extends ResourceBundle>) loader
-							.loadClass(bundleName);
-					// If the class isn't a ResourceBundle subclass, throw a
-					// ClassCastException.
-					if (ResourceBundle.class.isAssignableFrom(bundleClass)) {
-						bundle = bundleClass.newInstance();
-					} else {
-						throw new ClassCastException(bundleClass.getName()
-								+ " cannot be cast to ResourceBundle");
-					}
-				} catch (ClassNotFoundException e) {
-					return null;
-				}
-			} else if (format.equals("java.properties")) {
-				final String resourceName = toResourceName(bundleName,
-						"properties");
-				final ClassLoader classLoader = loader;
-				final boolean reloadFlag = reload;
-				InputStream stream = null;
-				try {
-					stream = AccessController
-							.doPrivileged(new PrivilegedExceptionAction<InputStream>() {
-
-								public InputStream run() throws IOException {
-									InputStream is = null;
-									if (reloadFlag) {
-										URL url = classLoader
-												.getResource(resourceName);
-										if (url != null) {
-											URLConnection connection = url
-													.openConnection();
-											if (connection != null) {
-												// Disable caches to get
-												// fresh
-												// data
-												// for
-												// reloading.
-												connection.setUseCaches(false);
-												is = connection
-														.getInputStream();
-											}
-										}
-									} else {
-										is = classLoader
-												.getResourceAsStream(resourceName);
-									}
-									return is;
-								}
-							});
-				} catch (PrivilegedActionException e) {
-					throw (IOException) e.getException();
-				}
-				if (stream != null) {
-					BufferedReader br = null;
-					try {
-						if (charsetName != null) {
-							br = new BufferedReader(new InputStreamReader(
-									stream, charsetName));
-							bundle = new PropertyResourceBundle(br);
-						} else {
-							bundle = new PropertyResourceBundle(stream);
-						}
-					} finally {
-						if (br != null) {
-							br.close();
-						}
-						stream.close();
-					}
-				}
-			} else {
-				throw new IllegalArgumentException("unknown format: " + format);
-			}
-			return bundle;
-		}
-	}
+    protected static final String DEFAULT_CHARSET = "UTF-8";
+    private final String baseName;
+    private final ClassLoader bundleClassLoader;
+    private final String charsetName;
+
+    public PropertyResourceBundleMessageResource(String baseName) {
+        this(baseName, DEFAULT_CHARSET);
+    }
+
+    public PropertyResourceBundleMessageResource(String baseName, String bundleCharsetName) {
+        this(baseName, bundleCharsetName, Thread.currentThread().getContextClassLoader());
+    }
+
+    public PropertyResourceBundleMessageResource(String baseName, ClassLoader classLoader) {
+        this(baseName, DEFAULT_CHARSET, classLoader);
+    }
+
+    public PropertyResourceBundleMessageResource(String baseName, String bundleCharserName, ClassLoader classLoader) {
+        this.baseName = baseName;
+        this.charsetName = bundleCharserName;
+        this.bundleClassLoader = classLoader;
+    }
+
+    @Override
+    public String getMessage(String code) {
+        return getMessage(code, Locale.getDefault());
+    }
+
+    @Override
+    public String getMessage(String code, Object... args) {
+        return getMessage(code, Locale.getDefault(), args);
+    }
+
+    @Override
+    public String getMessage(String code, Locale locale) {
+        return getMessage(code, locale, new Object[0]);
+    }
+
+    private final Map<MessageFormatKey, MessageFormat> formatterCache = Maps.newConcurrentHashMap();
+    private final Map<Locale, ResourceBundle> bundleCache = Maps.newConcurrentHashMap();
+
+    @Override
+    public String getMessage(String code, Locale locale, Object... args) {
+        if (!bundleCache.containsKey(locale)) {
+            bundleCache.put(locale, getBundle(baseName, locale, getControl()));
+        }
+        ResourceBundle bundle = bundleCache.get(locale);
+        if (bundle.containsKey(code) == false) {
+            return code;
+        }
+        if (ArrayUtils.isEmpty(args)) {
+            return bundle.getString(code);
+        } else {
+            String message = bundle.getString(code);
+            MessageFormatKey key = MessageFormatKey.create(message, locale);
+            if (!formatterCache.containsKey(key)) {
+                formatterCache.put(key, new MessageFormat(message, locale));
+            }
+            MessageFormat formatter = formatterCache.get(key);
+            synchronized (formatter) {
+                return formatter.format(args);
+            }
+        }
+    }
+
+    protected ClassLoader getBundleClassLoader() {
+        return this.bundleClassLoader;
+    }
+
+    protected String getBundleResourceCharsetName() {
+        return this.charsetName;
+    }
+
+    private Control control;
+
+    protected Control getControl() {
+        if (control == null) {
+            control = new PropertyResourceBundleControl(getBundleResourceCharsetName());
+        }
+        return control;
+    }
+
+    protected ResourceBundle getBundle(String baseName, Locale locale, Control control) {
+        if (control == null) {
+            return PropertyResourceBundle.getBundle(baseName, locale, getBundleClassLoader());
+        } else {
+            return PropertyResourceBundle.getBundle(baseName, locale, getBundleClassLoader(), control);
+        }
+    }
+
+    protected static final class MessageFormatKey implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+        private final Locale locale;
+        private final String format;
+
+        public static MessageFormatKey create(String formate, Locale locale) {
+            return new MessageFormatKey(formate, locale);
+        }
+
+        protected MessageFormatKey(String format, Locale locale) {
+            this.locale = locale;
+            this.format = format;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj instanceof MessageFormatKey) {
+                MessageFormatKey other = (MessageFormatKey) obj;
+                return other.format.equals(format) && other.locale.equals(locale);
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            int base = 17;
+            int result = 0;
+            result = base * 37 + locale.hashCode();
+            result = result * 37 + format.hashCode();
+            return result;
+        }
+    }
+
+    protected static class PropertyResourceBundleControl extends Control {
+
+        private final String charsetName;
+
+        protected PropertyResourceBundleControl(String charsetName) {
+            super();
+            this.charsetName = charsetName;
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader,
+                boolean reload) throws IllegalAccessException, InstantiationException, IOException {
+            String bundleName = toBundleName(baseName, locale);
+            ResourceBundle bundle = null;
+            if (format.equals("java.class")) {
+                try {
+                    Class<? extends ResourceBundle> bundleClass = (Class<? extends ResourceBundle>) loader
+                            .loadClass(bundleName);
+                    // If the class isn't a ResourceBundle subclass, throw a
+                    // ClassCastException.
+                    if (ResourceBundle.class.isAssignableFrom(bundleClass)) {
+                        bundle = bundleClass.newInstance();
+                    } else {
+                        throw new ClassCastException(bundleClass.getName() + " cannot be cast to ResourceBundle");
+                    }
+                } catch (ClassNotFoundException e) {
+                    return null;
+                }
+            } else if (format.equals("java.properties")) {
+                final String resourceName = toResourceName(bundleName, "properties");
+                final ClassLoader classLoader = loader;
+                final boolean reloadFlag = reload;
+                InputStream stream = null;
+                try {
+                    stream = AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>() {
+
+                        public InputStream run() throws IOException {
+                            InputStream is = null;
+                            if (reloadFlag) {
+                                URL url = classLoader.getResource(resourceName);
+                                if (url != null) {
+                                    URLConnection connection = url.openConnection();
+                                    if (connection != null) {
+                                        // Disable caches to get
+                                        // fresh
+                                        // data
+                                        // for
+                                        // reloading.
+                                        connection.setUseCaches(false);
+                                        is = connection.getInputStream();
+                                    }
+                                }
+                            } else {
+                                is = classLoader.getResourceAsStream(resourceName);
+                            }
+                            return is;
+                        }
+                    });
+                } catch (PrivilegedActionException e) {
+                    throw (IOException) e.getException();
+                }
+                if (stream != null) {
+                    BufferedReader br = null;
+                    try {
+                        if (charsetName != null) {
+                            br = new BufferedReader(new InputStreamReader(stream, charsetName));
+                            bundle = new PropertyResourceBundle(br);
+                        } else {
+                            bundle = new PropertyResourceBundle(stream);
+                        }
+                    } finally {
+                        if (br != null) {
+                            br.close();
+                        }
+                        stream.close();
+                    }
+                }
+            } else {
+                throw new IllegalArgumentException("unknown format: " + format);
+            }
+            return bundle;
+        }
+    }
 }
diff --git a/src/main/java/org/analogweb/util/ReflectionUtils.java b/src/main/java/org/analogweb/util/ReflectionUtils.java
index 29781f4..16bcace 100644
--- a/src/main/java/org/analogweb/util/ReflectionUtils.java
+++ b/src/main/java/org/analogweb/util/ReflectionUtils.java
@@ -26,295 +26,275 @@
  */
 public final class ReflectionUtils {
 
-	private static final Log log = Logs.getLog(ReflectionUtils.class);
-
-	@SuppressWarnings("unchecked")
-	public static <T extends Annotation> T getMethodParameterAnnotation(
-			Method method, Class<T> annotationClass, int parameterIndex) {
-		Annotation[][] annotations = method.getParameterAnnotations();
-		if (annotations.length > parameterIndex) {
-			for (Annotation annotation : annotations[parameterIndex]) {
-				if (annotation.annotationType().equals(annotationClass)) {
-					return (T) annotation;
-				}
-			}
-		}
-		return null;
-	}
-
-	public static <T> T getInstanceQuietly(Class<T> clazz) {
-		try {
-			return clazz.newInstance();
-		} catch (InstantiationException e) {
-			log.log("TU000008", e, new Object[]{clazz});
-		} catch (IllegalAccessException e) {
-			log.log("TU000008", e, new Object[]{clazz});
-		}
-		return null;
-	}
-
-	public static Object getInstanceQuietly(Constructor<?> constructor,
-			Object... args) {
-		return getInstanceQuietly(Object.class, constructor, args);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <T> T getInstanceQuietly(Class<T> type,
-			Constructor<?> constructor, Object... args) {
-		try {
-			if (constructor == null) {
-				return null;
-			}
-			return (T) constructor.newInstance(args);
-		} catch (IllegalArgumentException e) {
-			log.log("TU000008", e,
-					new Object[]{constructor.getDeclaringClass()});
-		} catch (InstantiationException e) {
-			log.log("TU000008", e,
-					new Object[]{constructor.getDeclaringClass()});
-		} catch (IllegalAccessException e) {
-			log.log("TU000008", e,
-					new Object[]{constructor.getDeclaringClass()});
-		} catch (InvocationTargetException e) {
-			log.log("TU000008", e,
-					new Object[]{constructor.getDeclaringClass()});
-		}
-		return null;
-	}
-
-	public static <T> List<Class<T>> filterClassAsImplementsInterface(
-			Class<T> filteringType, Collection<Class<?>> collectedClasses) {
-		return filterClassAsImplementsInterface(filteringType,
-				collectedClasses, ASSIGNABLE_FROM_FILTER);
-	}
-
-	public static <T> List<Class<T>> filterClassAsImplementsInterface(
-			Class<T> filteringType, Collection<Class<?>> collectedClasses,
-			TypeFilter typeFilter) {
-		List<Class<T>> implementsTypes = new ArrayList<Class<T>>();
-		for (Class<?> clazz : collectedClasses) {
-			Class<T> filterResult = typeFilter.filterType(clazz, filteringType);
-			if (filterResult != null) {
-				implementsTypes.add(filterResult);
-			}
-		}
-		return implementsTypes;
-	}
-
-	public static Method[] getMethods(Class<?> clazz) {
-		return clazz.getMethods();
-	}
-
-	public interface TypeFilter {
-
-		<T> Class<T> filterType(Class<?> actualClass, Class<T> filteringType);
-	}
-
-	private static final TypeFilter ASSIGNABLE_FROM_FILTER = new TypeFilter() {
-
-		@Override
-		@SuppressWarnings("unchecked")
-		public <T> Class<T> filterType(Class<?> actualClass,
-				Class<T> filteringType) {
-			if (filteringType.isAssignableFrom(actualClass)) {
-				return (Class<T>) actualClass;
-			} else {
-				return null;
-			}
-		}
-	};
-
-	public static void writeValueToField(Field field, Object instance,
-			Object value) {
-		if (field == null) {
-			return;
-		}
-		try {
-			setAccessible(field);
-			field.set(instance, value);
-		} catch (IllegalAccessException e) {
-			// swallow
-			log.log("TU000009", e, field);
-		}
-	}
-
-	public static void writeValueToField(String fieldName, Object instance,
-			Object value) {
-		Field field = getAccessibleField(instance.getClass(), fieldName);
-		if (field == null) {
-			return;
-		}
-		try {
-			field.set(instance, value);
-		} catch (IllegalAccessException e) {
-			// swallow
-			log.log("TU000009", e, field);
-		}
-	}
-
-	public static Field getAccessibleField(final Class<?> targetClass,
-			final String fieldName) {
-		Field field;
-		try {
-			field = targetClass.getDeclaredField(fieldName);
-			if (Modifier.isPublic(field.getModifiers()) == false) {
-				setAccessible(field);
-			}
-			return field;
-		} catch (SecurityException e) {
-			return null;
-		} catch (NoSuchFieldException e) {
-			return null;
-		}
-	}
-
-	public static void setAccessible(final Field field) {
-		AccessController.doPrivileged(new PrivilegedAction<Field>() {
-
-			@Override
-			public Field run() {
-				try {
-					if (Modifier.isPublic(field.getModifiers()) == false
-							&& !field.isAccessible()) {
-						field.setAccessible(true);
-					}
-					return field;
-				} catch (SecurityException e) {
-					// ignore.
-					return null;
-				}
-			}
-		});
-	}
-
-	public static Object getValueOfField(final String fieldName,
-			final int modifier, final Object instance) {
-		return AccessController.doPrivileged(new PrivilegedAction<Object>() {
-
-			@Override
-			public Object run() {
-				try {
-					Field field = instance.getClass().getDeclaredField(
-							fieldName);
-					if (Modifier.isPrivate(modifier)) {
-						field.setAccessible(true);
-					}
-					return field.get(instance);
-				} catch (SecurityException e) {
-					log.log("TU000010", e, instance, fieldName);
-				} catch (NoSuchFieldException e) {
-					log.log("TU000010", e, instance, fieldName);
-				} catch (IllegalArgumentException e) {
-					log.log("TU000010", e, instance, fieldName);
-				} catch (IllegalAccessException e) {
-					log.log("TU000010", e, instance, fieldName);
-				}
-				return null;
-			}
-		});
-	}
-
-	public static Method getMethodQuietly(Class<?> clazz, String methodName,
-			Class<?>[] parameterTypes) {
-		// try inherit method.
-		try {
-			return clazz.getMethod(methodName, parameterTypes);
-		} catch (SecurityException e) {
-			log.log("TU000011", e, clazz, methodName);
-		} catch (NoSuchMethodException e) {
-			log.log("TU000011", e, clazz, methodName);
-		}
-		// try declared method.
-		try {
-			return clazz.getDeclaredMethod(methodName, parameterTypes);
-		} catch (SecurityException e) {
-			log.log("TU000011", e, clazz, methodName);
-		} catch (NoSuchMethodException e) {
-			log.log("TU000011", e, clazz, methodName);
-		}
-		return null;
-	}
-
-	public static Method getInvocationMethodDefault(InvocationMetadata metadata) {
-		Method method = getMethodQuietly(metadata.getInvocationClass(),
-				metadata.getMethodName(), metadata.getArgumentTypes());
-		if (method == null) {
-			return getMethodQuietly(ReflectionUtils.class, "nop",
-					new Class<?>[0]);
-		}
-		return method;
-	}
-
-	public void nop() {
-		// nop.
-	}
-
-	public static Method getInvocationMethod(InvocationMetadata metadata) {
-		return getMethodQuietly(metadata.getInvocationClass(),
-				metadata.getMethodName(), metadata.getArgumentTypes());
-	}
-
-	public static Set<Class<?>> findAllImplementsInterfacesRecursivery(
-			Class<?> find) {
-		Set<Class<?>> result = new HashSet<Class<?>>();
-		return findAllImplementsInterfacesRecursivery(find, result);
-	}
-
-	private static Set<Class<?>> findAllImplementsInterfacesRecursivery(
-			Class<?> find, Set<Class<?>> result) {
-		if (find == null) {
-			return result;
-		}
-		Class<?> supreClass = find.getSuperclass();
-		Class<?>[] interfaces;
-		if (supreClass != null && supreClass.equals(Object.class) == false) {
-			interfaces = supreClass.getInterfaces();
-		} else {
-			interfaces = find.getInterfaces();
-		}
-		for (Class<?> interfaci : interfaces) {
-			result.add(interfaci);
-			findAllImplementsInterfacesRecursivery(interfaci, result);
-		}
-		return result;
-	}
-
-	public static ParameterizedType findParameterizedType(Class<?> clazz) {
-		if (clazz == null || clazz.equals(Object.class)) {
-			return null;
-		}
-		final Type genericType = clazz.getGenericSuperclass();
-		if (genericType instanceof ParameterizedType) {
-			return (ParameterizedType) genericType;
-		} else {
-			final Type[] genericInterfaceTypes = clazz.getGenericInterfaces();
-			for (final Type genericInterfaceType : genericInterfaceTypes) {
-				if (genericInterfaceType instanceof ParameterizedType) {
-					return (ParameterizedType) genericInterfaceType;
-				}
-			}
-			final Class<?> next = (Class<?>) clazz.getGenericSuperclass();
-			return findParameterizedType(next);
-		}
-	}
-
-	public static List<Class<?>> getCallerClasses() {
-		return getCallerClasses(Thread.currentThread());
-	}
-
-	public static List<Class<?>> getCallerClasses(Thread thread) {
-		List<Class<?>> classes = new LinkedList<Class<?>>();
-		for (StackTraceElement ste : thread.getStackTrace()) {
-			String className = ste.getClassName();
-			if (className.equals(ReflectionUtils.class.getName()) == false
-					&& className.contains("java.lang.Thread") == false) {
-				Class<?> resolved = ClassUtils.forNameQuietly(className);
-				if (resolved != null) {
-					classes.add(resolved);
-				}
-			}
-		}
-		return classes;
-	}
+    private static final Log log = Logs.getLog(ReflectionUtils.class);
+
+    @SuppressWarnings("unchecked")
+    public static <T extends Annotation> T getMethodParameterAnnotation(Method method, Class<T> annotationClass,
+            int parameterIndex) {
+        Annotation[][] annotations = method.getParameterAnnotations();
+        if (annotations.length > parameterIndex) {
+            for (Annotation annotation : annotations[parameterIndex]) {
+                if (annotation.annotationType().equals(annotationClass)) {
+                    return (T) annotation;
+                }
+            }
+        }
+        return null;
+    }
+
+    public static <T> T getInstanceQuietly(Class<T> clazz) {
+        try {
+            return clazz.newInstance();
+        } catch (InstantiationException e) {
+            log.log("TU000008", e, new Object[] { clazz });
+        } catch (IllegalAccessException e) {
+            log.log("TU000008", e, new Object[] { clazz });
+        }
+        return null;
+    }
+
+    public static Object getInstanceQuietly(Constructor<?> constructor, Object... args) {
+        return getInstanceQuietly(Object.class, constructor, args);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T getInstanceQuietly(Class<T> type, Constructor<?> constructor, Object... args) {
+        try {
+            if (constructor == null) {
+                return null;
+            }
+            return (T) constructor.newInstance(args);
+        } catch (IllegalArgumentException e) {
+            log.log("TU000008", e, new Object[] { constructor.getDeclaringClass() });
+        } catch (InstantiationException e) {
+            log.log("TU000008", e, new Object[] { constructor.getDeclaringClass() });
+        } catch (IllegalAccessException e) {
+            log.log("TU000008", e, new Object[] { constructor.getDeclaringClass() });
+        } catch (InvocationTargetException e) {
+            log.log("TU000008", e, new Object[] { constructor.getDeclaringClass() });
+        }
+        return null;
+    }
+
+    public static <T> List<Class<T>> filterClassAsImplementsInterface(Class<T> filteringType,
+            Collection<Class<?>> collectedClasses) {
+        return filterClassAsImplementsInterface(filteringType, collectedClasses, ASSIGNABLE_FROM_FILTER);
+    }
+
+    public static <T> List<Class<T>> filterClassAsImplementsInterface(Class<T> filteringType,
+            Collection<Class<?>> collectedClasses, TypeFilter typeFilter) {
+        List<Class<T>> implementsTypes = new ArrayList<Class<T>>();
+        for (Class<?> clazz : collectedClasses) {
+            Class<T> filterResult = typeFilter.filterType(clazz, filteringType);
+            if (filterResult != null) {
+                implementsTypes.add(filterResult);
+            }
+        }
+        return implementsTypes;
+    }
+
+    public static Method[] getMethods(Class<?> clazz) {
+        return clazz.getMethods();
+    }
+
+    public interface TypeFilter {
+
+        <T> Class<T> filterType(Class<?> actualClass, Class<T> filteringType);
+    }
+
+    private static final TypeFilter ASSIGNABLE_FROM_FILTER = new TypeFilter() {
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public <T> Class<T> filterType(Class<?> actualClass, Class<T> filteringType) {
+            if (filteringType.isAssignableFrom(actualClass)) {
+                return (Class<T>) actualClass;
+            } else {
+                return null;
+            }
+        }
+    };
+
+    public static void writeValueToField(Field field, Object instance, Object value) {
+        if (field == null) {
+            return;
+        }
+        try {
+            setAccessible(field);
+            field.set(instance, value);
+        } catch (IllegalAccessException e) {
+            // swallow
+            log.log("TU000009", e, field);
+        }
+    }
+
+    public static void writeValueToField(String fieldName, Object instance, Object value) {
+        Field field = getAccessibleField(instance.getClass(), fieldName);
+        if (field == null) {
+            return;
+        }
+        try {
+            field.set(instance, value);
+        } catch (IllegalAccessException e) {
+            // swallow
+            log.log("TU000009", e, field);
+        }
+    }
+
+    public static Field getAccessibleField(final Class<?> targetClass, final String fieldName) {
+        Field field;
+        try {
+            field = targetClass.getDeclaredField(fieldName);
+            if (Modifier.isPublic(field.getModifiers()) == false) {
+                setAccessible(field);
+            }
+            return field;
+        } catch (SecurityException e) {
+            return null;
+        } catch (NoSuchFieldException e) {
+            return null;
+        }
+    }
+
+    public static void setAccessible(final Field field) {
+        AccessController.doPrivileged(new PrivilegedAction<Field>() {
+
+            @Override
+            public Field run() {
+                try {
+                    if (Modifier.isPublic(field.getModifiers()) == false && !field.isAccessible()) {
+                        field.setAccessible(true);
+                    }
+                    return field;
+                } catch (SecurityException e) {
+                    // ignore.
+                    return null;
+                }
+            }
+        });
+    }
+
+    public static Object getValueOfField(final String fieldName, final int modifier, final Object instance) {
+        return AccessController.doPrivileged(new PrivilegedAction<Object>() {
+
+            @Override
+            public Object run() {
+                try {
+                    Field field = instance.getClass().getDeclaredField(fieldName);
+                    if (Modifier.isPrivate(modifier)) {
+                        field.setAccessible(true);
+                    }
+                    return field.get(instance);
+                } catch (SecurityException e) {
+                    log.log("TU000010", e, instance, fieldName);
+                } catch (NoSuchFieldException e) {
+                    log.log("TU000010", e, instance, fieldName);
+                } catch (IllegalArgumentException e) {
+                    log.log("TU000010", e, instance, fieldName);
+                } catch (IllegalAccessException e) {
+                    log.log("TU000010", e, instance, fieldName);
+                }
+                return null;
+            }
+        });
+    }
+
+    public static Method getMethodQuietly(Class<?> clazz, String methodName, Class<?>[] parameterTypes) {
+        // try inherit method.
+        try {
+            return clazz.getMethod(methodName, parameterTypes);
+        } catch (SecurityException e) {
+            log.log("TU000011", e, clazz, methodName);
+        } catch (NoSuchMethodException e) {
+            log.log("TU000011", e, clazz, methodName);
+        }
+        // try declared method.
+        try {
+            return clazz.getDeclaredMethod(methodName, parameterTypes);
+        } catch (SecurityException e) {
+            log.log("TU000011", e, clazz, methodName);
+        } catch (NoSuchMethodException e) {
+            log.log("TU000011", e, clazz, methodName);
+        }
+        return null;
+    }
+
+    public static Method getInvocationMethodDefault(InvocationMetadata metadata) {
+        Method method = getMethodQuietly(metadata.getInvocationClass(), metadata.getMethodName(),
+                metadata.getArgumentTypes());
+        if (method == null) {
+            return getMethodQuietly(ReflectionUtils.class, "nop", new Class<?>[0]);
+        }
+        return method;
+    }
+
+    public void nop() {
+        // nop.
+    }
+
+    public static Method getInvocationMethod(InvocationMetadata metadata) {
+        return getMethodQuietly(metadata.getInvocationClass(), metadata.getMethodName(), metadata.getArgumentTypes());
+    }
+
+    public static Set<Class<?>> findAllImplementsInterfacesRecursivery(Class<?> find) {
+        Set<Class<?>> result = new HashSet<Class<?>>();
+        return findAllImplementsInterfacesRecursivery(find, result);
+    }
+
+    private static Set<Class<?>> findAllImplementsInterfacesRecursivery(Class<?> find, Set<Class<?>> result) {
+        if (find == null) {
+            return result;
+        }
+        Class<?> supreClass = find.getSuperclass();
+        Class<?>[] interfaces;
+        if (supreClass != null && supreClass.equals(Object.class) == false) {
+            interfaces = supreClass.getInterfaces();
+        } else {
+            interfaces = find.getInterfaces();
+        }
+        for (Class<?> interfaci : interfaces) {
+            result.add(interfaci);
+            findAllImplementsInterfacesRecursivery(interfaci, result);
+        }
+        return result;
+    }
+
+    public static ParameterizedType findParameterizedType(Class<?> clazz) {
+        if (clazz == null || clazz.equals(Object.class)) {
+            return null;
+        }
+        final Type genericType = clazz.getGenericSuperclass();
+        if (genericType instanceof ParameterizedType) {
+            return (ParameterizedType) genericType;
+        } else {
+            final Type[] genericInterfaceTypes = clazz.getGenericInterfaces();
+            for (final Type genericInterfaceType : genericInterfaceTypes) {
+                if (genericInterfaceType instanceof ParameterizedType) {
+                    return (ParameterizedType) genericInterfaceType;
+                }
+            }
+            final Class<?> next = (Class<?>) clazz.getGenericSuperclass();
+            return findParameterizedType(next);
+        }
+    }
+
+    public static List<Class<?>> getCallerClasses() {
+        return getCallerClasses(Thread.currentThread());
+    }
+
+    public static List<Class<?>> getCallerClasses(Thread thread) {
+        List<Class<?>> classes = new LinkedList<Class<?>>();
+        for (StackTraceElement ste : thread.getStackTrace()) {
+            String className = ste.getClassName();
+            if (className.equals(ReflectionUtils.class.getName()) == false
+                    && className.contains("java.lang.Thread") == false) {
+                Class<?> resolved = ClassUtils.forNameQuietly(className);
+                if (resolved != null) {
+                    classes.add(resolved);
+                }
+            }
+        }
+        return classes;
+    }
 
 }
diff --git a/src/main/java/org/analogweb/util/RequestContextResolverUtils.java b/src/main/java/org/analogweb/util/RequestContextResolverUtils.java
index 6a70c4b..28e15dc 100644
--- a/src/main/java/org/analogweb/util/RequestContextResolverUtils.java
+++ b/src/main/java/org/analogweb/util/RequestContextResolverUtils.java
@@ -8,17 +8,15 @@
  */
 public final class RequestContextResolverUtils {
 
-	private RequestContextResolverUtils() {
-		// nop.
-	}
+    private RequestContextResolverUtils() {
+        // nop.
+    }
 
-	@SuppressWarnings("unchecked")
-	public static <T extends RequestContext> T resolveRequestContext(
-			RequestContext incoming) {
-		if (incoming instanceof RequestContextWrapper) {
-			return (T) ((RequestContextWrapper) incoming)
-					.getOriginalRequestContext();
-		}
-		return (T) incoming;
-	}
+    @SuppressWarnings("unchecked")
+    public static <T extends RequestContext> T resolveRequestContext(RequestContext incoming) {
+        if (incoming instanceof RequestContextWrapper) {
+            return (T) ((RequestContextWrapper) incoming).getOriginalRequestContext();
+        }
+        return (T) incoming;
+    }
 }
diff --git a/src/main/java/org/analogweb/util/ResourceUtils.java b/src/main/java/org/analogweb/util/ResourceUtils.java
index 9726343..2a2dbb1 100644
--- a/src/main/java/org/analogweb/util/ResourceUtils.java
+++ b/src/main/java/org/analogweb/util/ResourceUtils.java
@@ -18,111 +18,108 @@
  */
 public final class ResourceUtils {
 
-	private static final Log log = Logs.getLog(ResourceUtils.class);
-	private static final List<ResourceFinder> DEFAULT_STRATEGIES = Arrays
-			.asList(new ResourceFinder[]{FindResourceStrategies.CLASSPATH,
-					FindResourceStrategies.URL, FindResourceStrategies.FILE});
+    private static final Log log = Logs.getLog(ResourceUtils.class);
+    private static final List<ResourceFinder> DEFAULT_STRATEGIES = Arrays.asList(new ResourceFinder[] {
+            FindResourceStrategies.CLASSPATH, FindResourceStrategies.URL, FindResourceStrategies.FILE });
 
-	public static URL findResource(String name) {
-		if (StringUtils.isEmpty(name)) {
-			return null;
-		}
-		return findResource(name, DEFAULT_STRATEGIES);
-	}
+    public static URL findResource(String name) {
+        if (StringUtils.isEmpty(name)) {
+            return null;
+        }
+        return findResource(name, DEFAULT_STRATEGIES);
+    }
 
-	public static URL findResource(String name, List<ResourceFinder> strategies) {
-		URL found;
-		for (ResourceFinder strategy : strategies) {
-			found = strategy.find(name);
-			if (found != null) {
-				return found;
-			}
-		}
-		return null;
-	}
+    public static URL findResource(String name, List<ResourceFinder> strategies) {
+        URL found;
+        for (ResourceFinder strategy : strategies) {
+            found = strategy.find(name);
+            if (found != null) {
+                return found;
+            }
+        }
+        return null;
+    }
 
-	public static List<URL> findPackageResources(String packageName,
-			ClassLoader classLoader) {
-		return findResources(packageName.replace('.', '/'), classLoader);
-	}
+    public static List<URL> findPackageResources(String packageName, ClassLoader classLoader) {
+        return findResources(packageName.replace('.', '/'), classLoader);
+    }
 
-	public static List<URL> findResources(String name, ClassLoader classLoader) {
-		List<URL> found = new ArrayList<URL>();
-		try {
-			Enumeration<URL> urls = classLoader.getResources(name);
-			while (urls.hasMoreElements()) {
-				if (urls != null) {
-					found.add(urls.nextElement());
-				}
-			}
-		} catch (IOException e) {
-			return Collections.emptyList();
-		}
-		return found;
-	}
+    public static List<URL> findResources(String name, ClassLoader classLoader) {
+        List<URL> found = new ArrayList<URL>();
+        try {
+            Enumeration<URL> urls = classLoader.getResources(name);
+            while (urls.hasMoreElements()) {
+                if (urls != null) {
+                    found.add(urls.nextElement());
+                }
+            }
+        } catch (IOException e) {
+            return Collections.emptyList();
+        }
+        return found;
+    }
 
-	public interface ResourceFinder {
+    public interface ResourceFinder {
 
-		URL find(String name);
-	}
+        URL find(String name);
+    }
 
-	public interface FindResourceStrategies {
+    public interface FindResourceStrategies {
 
-		static final ResourceFinder FILE = new ResourceFinder() {
+        static final ResourceFinder FILE = new ResourceFinder() {
 
-			@Override
-			public URL find(String filename) {
-				try {
-					char sep = File.separator.charAt(0);
-					String file = filename.replace(sep, '/');
-					if (file.charAt(0) != '/') {
-						String dir = SystemProperties.userDir();
-						dir = dir.replace(sep, '/') + '/';
-						if (dir.charAt(0) != '/') {
-							dir = "/" + dir;
-						}
-					}
-					URL fileURL = new URL("file", null, file);
-					if (new File(file).exists() == false) {
-						log.log("DU000002", fileURL);
-						return null;
-					}
-					log.log("DU000001", fileURL);
-					return fileURL;
-				} catch (MalformedURLException e) {
-					log.log("DU000002", e);
-					return null;
-				}
-			}
-		};
-		static final ResourceFinder CLASSPATH = new ResourceFinder() {
+            @Override
+            public URL find(String filename) {
+                try {
+                    char sep = File.separator.charAt(0);
+                    String file = filename.replace(sep, '/');
+                    if (file.charAt(0) != '/') {
+                        String dir = SystemProperties.userDir();
+                        dir = dir.replace(sep, '/') + '/';
+                        if (dir.charAt(0) != '/') {
+                            dir = "/" + dir;
+                        }
+                    }
+                    URL fileURL = new URL("file", null, file);
+                    if (new File(file).exists() == false) {
+                        log.log("DU000002", fileURL);
+                        return null;
+                    }
+                    log.log("DU000001", fileURL);
+                    return fileURL;
+                } catch (MalformedURLException e) {
+                    log.log("DU000002", e);
+                    return null;
+                }
+            }
+        };
+        static final ResourceFinder CLASSPATH = new ResourceFinder() {
 
-			@Override
-			public URL find(String name) {
-				URL resource = Thread.currentThread().getContextClassLoader()
-						.getResource(name);
-				if (resource != null) {
-					log.log("DU000003", resource.getPath());
-					return resource;
-				} else {
-					log.log("DU000004", name);
-					return null;
-				}
-			}
-		};
-		static final ResourceFinder URL = new ResourceFinder() {
+            @Override
+            public URL find(String name) {
+                URL resource = Thread.currentThread().getContextClassLoader().getResource(name);
+                if (resource != null) {
+                    log.log("DU000003", resource.getPath());
+                    return resource;
+                } else {
+                    log.log("DU000004", name);
+                    return null;
+                }
+            }
+        };
+        static final ResourceFinder URL = new ResourceFinder() {
 
-			@Override
-			public URL find(String name) {
-				try {
-					URL url = new URL(name);
-					log.log("DU000005", name);
-					return url;
-				} catch (MalformedURLException e) {
-					log.log("DU000006", name);
-					return null;
-				}
-			}
-		};
-	}
+            @Override
+            public URL find(String name) {
+                try {
+                    URL url = new URL(name);
+                    log.log("DU000005", name);
+                    return url;
+                } catch (MalformedURLException e) {
+                    log.log("DU000006", name);
+                    return null;
+                }
+            }
+        };
+    }
 }
diff --git a/src/main/java/org/analogweb/util/StopWatch.java b/src/main/java/org/analogweb/util/StopWatch.java
index c414c8a..127c8ad 100644
--- a/src/main/java/org/analogweb/util/StopWatch.java
+++ b/src/main/java/org/analogweb/util/StopWatch.java
@@ -5,46 +5,46 @@
  */
 public class StopWatch {
 
-	private static final long DIVISION = 1000 * 1000;
-	private long startTime;
-	private long stopTime;
-	private boolean running;
-	private Ticker ticker = Ticker.SYSTEM;
-
-	public StopWatch() {
-		// nop.
-	}
-
-	public StopWatch(Ticker ticker) {
-		this.ticker = ticker;
-	}
-
-	public void start() {
-		if (running == false) {
-			this.startTime = ticker.now();
-			this.running = true;
-		}
-	}
-
-	public long stop() {
-		if (running == false) {
-			throw new IllegalStateException("not run yet.");
-		}
-		this.stopTime = ticker.now();
-		this.running = false;
-		return (this.stopTime - this.startTime) / DIVISION;
-	}
-
-	public static interface Ticker {
-
-		Ticker SYSTEM = new Ticker() {
-
-			@Override
-			public long now() {
-				return System.nanoTime();
-			}
-		};
-
-		long now();
-	}
+    private static final long DIVISION = 1000 * 1000;
+    private long startTime;
+    private long stopTime;
+    private boolean running;
+    private Ticker ticker = Ticker.SYSTEM;
+
+    public StopWatch() {
+        // nop.
+    }
+
+    public StopWatch(Ticker ticker) {
+        this.ticker = ticker;
+    }
+
+    public void start() {
+        if (running == false) {
+            this.startTime = ticker.now();
+            this.running = true;
+        }
+    }
+
+    public long stop() {
+        if (running == false) {
+            throw new IllegalStateException("not run yet.");
+        }
+        this.stopTime = ticker.now();
+        this.running = false;
+        return (this.stopTime - this.startTime) / DIVISION;
+    }
+
+    public static interface Ticker {
+
+        Ticker SYSTEM = new Ticker() {
+
+            @Override
+            public long now() {
+                return System.nanoTime();
+            }
+        };
+
+        long now();
+    }
 }
diff --git a/src/main/java/org/analogweb/util/StringUtils.java b/src/main/java/org/analogweb/util/StringUtils.java
index f3b186f..1ea677d 100644
--- a/src/main/java/org/analogweb/util/StringUtils.java
+++ b/src/main/java/org/analogweb/util/StringUtils.java
@@ -7,134 +7,133 @@
 
 /**
  * Utilities for {@link String}
- * 
+ *
  * @author snowgoose
  */
 public final class StringUtils {
 
-	public static final String EMPTY = "";
+    public static final String EMPTY = "";
 
-	public static char charAt(int position, String s) {
-		if (isNotEmpty(s) && -1 < position && s.length() > position) {
-			return s.charAt(position);
-		}
-		return Character.MIN_VALUE;
-	}
+    public static char charAt(int position, String s) {
+        if (isNotEmpty(s) && -1 < position && s.length() > position) {
+            return s.charAt(position);
+        }
+        return Character.MIN_VALUE;
+    }
 
-	public static boolean isNotEmpty(String str) {
-		return (str != null && str.trim().length() != 0);
-	}
+    public static boolean isNotEmpty(String str) {
+        return (str != null && str.trim().length() != 0);
+    }
 
-	public static boolean isEmpty(String str) {
-		return isNotEmpty(str) == false;
-	}
+    public static boolean isEmpty(String str) {
+        return isNotEmpty(str) == false;
+    }
 
-	public static List<String> partition(int partitionPoint,
-			Character partitioner, String target) {
-		List<String> splitted = split(target, partitioner);
-		StringBuilder buffer = new StringBuilder();
-		Iterator<String> itr = splitted.iterator();
-		buffer.append(itr.next());
-		if (splitted.size() == 2) {
-			return splitted;
-		} else if (splitted.size() < 2) {
-			return Arrays.asList(buffer.toString(), null);
-		} else {
-			int index = 1;
-			while (index < partitionPoint) {
-				buffer.append(partitioner).append(itr.next());
-				index++;
-			}
-			StringBuilder afterBuffer = new StringBuilder();
-			afterBuffer.append(itr.next());
-			while (itr.hasNext()) {
-				afterBuffer.append(partitioner).append(itr.next());
-			}
-			return Arrays.asList(buffer.toString(), afterBuffer.toString());
-		}
-	}
+    public static List<String> partition(int partitionPoint, Character partitioner, String target) {
+        List<String> splitted = split(target, partitioner);
+        StringBuilder buffer = new StringBuilder();
+        Iterator<String> itr = splitted.iterator();
+        buffer.append(itr.next());
+        if (splitted.size() == 2) {
+            return splitted;
+        } else if (splitted.size() < 2) {
+            return Arrays.asList(buffer.toString(), null);
+        } else {
+            int index = 1;
+            while (index < partitionPoint) {
+                buffer.append(partitioner).append(itr.next());
+                index++;
+            }
+            StringBuilder afterBuffer = new StringBuilder();
+            afterBuffer.append(itr.next());
+            while (itr.hasNext()) {
+                afterBuffer.append(partitioner).append(itr.next());
+            }
+            return Arrays.asList(buffer.toString(), afterBuffer.toString());
+        }
+    }
 
-	public static List<String> split(String target, Character splitter) {
-		List<String> result = new ArrayList<String>();
-		if (isEmpty(target)) {
-			return result;
-		}
-		int length = target.length();
-		int lastIndex = 0;
-		int position = 0;
-		boolean matches = false;
-		if (splitter == null) {
-			while (position < length) {
-				if (Character.isWhitespace(target.charAt(position))) {
-					if (matches) {
-						lastIndex = ++position;
-						continue;
-					}
-					result.add(target.substring(lastIndex, position));
-					lastIndex = ++position;
-					matches = true;
-					continue;
-				}
-				position++;
-				matches = false;
-			}
-		} else {
-			while (position < length) {
-				if (target.charAt(position) == splitter) {
-					if (matches) {
-						lastIndex = ++position;
-						continue;
-					}
-					result.add(target.substring(lastIndex, position));
-					lastIndex = ++position;
-					matches = true;
-					continue;
-				}
-				position++;
-				matches = false;
-			}
-		}
-		result.add(target.substring(lastIndex, position));
-		return result;
-	}
+    public static List<String> split(String target, Character splitter) {
+        List<String> result = new ArrayList<String>();
+        if (isEmpty(target)) {
+            return result;
+        }
+        int length = target.length();
+        int lastIndex = 0;
+        int position = 0;
+        boolean matches = false;
+        if (splitter == null) {
+            while (position < length) {
+                if (Character.isWhitespace(target.charAt(position))) {
+                    if (matches) {
+                        lastIndex = ++position;
+                        continue;
+                    }
+                    result.add(target.substring(lastIndex, position));
+                    lastIndex = ++position;
+                    matches = true;
+                    continue;
+                }
+                position++;
+                matches = false;
+            }
+        } else {
+            while (position < length) {
+                if (target.charAt(position) == splitter) {
+                    if (matches) {
+                        lastIndex = ++position;
+                        continue;
+                    }
+                    result.add(target.substring(lastIndex, position));
+                    lastIndex = ++position;
+                    matches = true;
+                    continue;
+                }
+                position++;
+                matches = false;
+            }
+        }
+        result.add(target.substring(lastIndex, position));
+        return result;
+    }
 
-	public static String substring(String value, int beginIndex) {
-		if (value == null) {
-			return null;
-		}
-		return substring(value, beginIndex, value.length());
-	}
+    public static String substring(String value, int beginIndex) {
+        if (value == null) {
+            return null;
+        }
+        return substring(value, beginIndex, value.length());
+    }
 
-	public static String substring(String value, int beginIndex, int endIndex) {
-		if (value == null) {
-			return null;
-		}
-		if (beginIndex > endIndex) {
-			return null;
-		}
-		if (isEmpty(value)) {
-			return EMPTY;
-		}
-		if (endIndex > value.length()) {
-			return value.substring(beginIndex, value.length());
-		} else {
-			return value.substring(beginIndex, endIndex);
-		}
-	}
+    public static String substring(String value, int beginIndex, int endIndex) {
+        if (value == null) {
+            return null;
+        }
+        if (beginIndex > endIndex) {
+            return null;
+        }
+        if (isEmpty(value)) {
+            return EMPTY;
+        }
+        if (endIndex > value.length()) {
+            return value.substring(beginIndex, value.length());
+        } else {
+            return value.substring(beginIndex, endIndex);
+        }
+    }
 
-	public static String trimToEmpty(String value) {
-		return isEmpty(value) ? EMPTY : value.trim();
-	}
+    public static String trimToEmpty(String value) {
+        return isEmpty(value) ? EMPTY : value.trim();
+    }
 
-	public static String join(Character joiner, String... array) {
-		if (ArrayUtils.isEmpty(array)) {
-			return StringUtils.EMPTY;
-		}
-		StringBuilder buffer = new StringBuilder();
-		for (String value : array) {
-			buffer.append(value);
-			buffer.append(joiner);
-		}
-		return String.valueOf(buffer.substring(0, buffer.length() - 1));
-	}
+    public static String join(Character joiner, String... array) {
+        if (ArrayUtils.isEmpty(array)) {
+            return StringUtils.EMPTY;
+        }
+        StringBuilder buffer = new StringBuilder();
+        for (String value : array) {
+            buffer.append(value);
+            buffer.append(joiner);
+        }
+        return String.valueOf(buffer.substring(0, buffer.length() - 1));
+    }
 }
diff --git a/src/main/java/org/analogweb/util/SystemProperties.java b/src/main/java/org/analogweb/util/SystemProperties.java
index 3b2861d..5cc99c7 100644
--- a/src/main/java/org/analogweb/util/SystemProperties.java
+++ b/src/main/java/org/analogweb/util/SystemProperties.java
@@ -7,31 +7,31 @@
  */
 public final class SystemProperties {
 
-	public static List<String> classPathes() {
-		return StringUtils.split(classPath(), pathSeparator());
-	}
+    public static List<String> classPathes() {
+        return StringUtils.split(classPath(), pathSeparator());
+    }
 
-	public static char pathSeparator() {
-		return get("path.separator").charAt(0);
-	}
+    public static char pathSeparator() {
+        return get("path.separator").charAt(0);
+    }
 
-	public static String classPath() {
-		return get("java.class.path");
-	}
+    public static String classPath() {
+        return get("java.class.path");
+    }
 
-	public static String userDir() {
-		return get("user.dir");
-	}
+    public static String userDir() {
+        return get("user.dir");
+    }
 
-	public static String tmpDir() {
-		return get("java.io.tmpdir");
-	}
+    public static String tmpDir() {
+        return get("java.io.tmpdir");
+    }
 
-	public static String fileSeparator() {
-		return get("file.separator");
-	}
+    public static String fileSeparator() {
+        return get("file.separator");
+    }
 
-	private static String get(String name) {
-		return System.getProperty(name);
-	}
+    private static String get(String name) {
+        return System.getProperty(name);
+    }
 }
diff --git a/src/main/java/org/analogweb/util/Version.java b/src/main/java/org/analogweb/util/Version.java
index 00194ec..9c9c2ab 100644
--- a/src/main/java/org/analogweb/util/Version.java
+++ b/src/main/java/org/analogweb/util/Version.java
@@ -17,88 +17,83 @@
 
 public class Version {
 
-	private static final Log log = Logs.getLog(Version.class);
+    private static final Log log = Logs.getLog(Version.class);
 
-	public static List<Version> load(ClassLoader classLoader) {
-		try {
-			Enumeration<URL> resources = classLoader
-					.getResources("analogweb.version.properties");
-			Properties properties = new Properties();
-			while (resources.hasMoreElements()) {
-				URL p = resources.nextElement();
-				InputStream in = null;
-				try {
-					in = p.openStream();
-					properties.load(in);
-				} finally {
-					IOUtils.closeQuietly(in);
-				}
-			}
-			if (properties.isEmpty()) {
-				return Arrays.asList(loadViaPom(classLoader));
-			} else {
-				HashSet<String> artifactIds = new HashSet<String>();
-				for (Object obj : properties.keySet()) {
-					String key = (String) obj;
-					if (StringUtils.isNotEmpty(key)) {
-						int index = key.indexOf('.');
-						if (index >= 0) {
-							String artifactId = key.substring(0, index);
-							if (artifactIds.contains(artifactId)
-									|| properties.containsKey(artifactId
-											+ ".version") == false) {
-								continue;
-							}
-							artifactIds.add(artifactId);
-						}
-					}
-				}
-				List<Version> versions = new LinkedList<Version>();
-				for (String id : artifactIds) {
-					versions.add(new Version(id, properties.getProperty(id
-							+ ".version")));
-				}
-				return versions;
-			}
-		} catch (IOException e) {
-			// ignore it.
-			log.debug(e.getMessage());
-		}
-		log.log(Markers.BOOT_APPLICATION, "WB000001");
-		return Collections.emptyList();
-	}
+    public static List<Version> load(ClassLoader classLoader) {
+        try {
+            Enumeration<URL> resources = classLoader.getResources("analogweb.version.properties");
+            Properties properties = new Properties();
+            while (resources.hasMoreElements()) {
+                URL p = resources.nextElement();
+                InputStream in = null;
+                try {
+                    in = p.openStream();
+                    properties.load(in);
+                } finally {
+                    IOUtils.closeQuietly(in);
+                }
+            }
+            if (properties.isEmpty()) {
+                return Arrays.asList(loadViaPom(classLoader));
+            } else {
+                HashSet<String> artifactIds = new HashSet<String>();
+                for (Object obj : properties.keySet()) {
+                    String key = (String) obj;
+                    if (StringUtils.isNotEmpty(key)) {
+                        int index = key.indexOf('.');
+                        if (index >= 0) {
+                            String artifactId = key.substring(0, index);
+                            if (artifactIds.contains(artifactId)
+                                    || properties.containsKey(artifactId + ".version") == false) {
+                                continue;
+                            }
+                            artifactIds.add(artifactId);
+                        }
+                    }
+                }
+                List<Version> versions = new LinkedList<Version>();
+                for (String id : artifactIds) {
+                    versions.add(new Version(id, properties.getProperty(id + ".version")));
+                }
+                return versions;
+            }
+        } catch (IOException e) {
+            // ignore it.
+            log.debug(e.getMessage());
+        }
+        log.log(Markers.BOOT_APPLICATION, "WB000001");
+        return Collections.emptyList();
+    }
 
-	private static Version loadViaPom(ClassLoader classLoader)
-			throws IOException {
-		URL properties = classLoader
-				.getResource("META-INF/org.analogweb/analogweb-core/pom.properties");
-		if (properties == null) {
-			return new Version("", "Unknown");
-		}
-		Properties props = new Properties();
-		InputStream in = null;
-		try {
-			in = properties.openStream();
-			props.load(in);
-		} finally {
-			IOUtils.closeQuietly(in);
-		}
-		return new Version("analogweb-core", props.getProperty("version"));
-	}
+    private static Version loadViaPom(ClassLoader classLoader) throws IOException {
+        URL properties = classLoader.getResource("META-INF/org.analogweb/analogweb-core/pom.properties");
+        if (properties == null) {
+            return new Version("", "Unknown");
+        }
+        Properties props = new Properties();
+        InputStream in = null;
+        try {
+            in = properties.openStream();
+            props.load(in);
+        } finally {
+            IOUtils.closeQuietly(in);
+        }
+        return new Version("analogweb-core", props.getProperty("version"));
+    }
 
-	private String version;
-	private String artifactId;
+    private String version;
+    private String artifactId;
 
-	Version(String artifactId, String version) {
-		this.artifactId = artifactId;
-		this.version = version;
-	}
+    Version(String artifactId, String version) {
+        this.artifactId = artifactId;
+        this.version = version;
+    }
 
-	public String getVersion() {
-		return this.version;
-	}
+    public String getVersion() {
+        return this.version;
+    }
 
-	public String getArtifactId() {
-		return artifactId;
-	}
+    public String getArtifactId() {
+        return artifactId;
+    }
 }
diff --git a/src/main/java/org/analogweb/util/logging/AbstractLog.java b/src/main/java/org/analogweb/util/logging/AbstractLog.java
index a9cc668..1c1ed8a 100644
--- a/src/main/java/org/analogweb/util/logging/AbstractLog.java
+++ b/src/main/java/org/analogweb/util/logging/AbstractLog.java
@@ -10,161 +10,146 @@
  */
 public abstract class AbstractLog implements Log {
 
-	private String name;
-	private MessageResource defaultMessageResource;
-
-	public AbstractLog(String name, ClassLoader classLoader) {
-		this.name = name;
-		this.defaultMessageResource = createDefaultMessageResource(classLoader);
-	}
-
-	protected final String getName() {
-		return this.name;
-	}
-
-	@Override
-	public void log(String message) {
-		log(message, new Object[0]);
-	}
-
-	@Override
-	public void log(String message, Object... args) {
-		log(SimpleMarker.valueOf(StringUtils.EMPTY), message, args);
-	}
-
-	@Override
-	public void log(String message, Throwable t, Object... args) {
-		log(SimpleMarker.valueOf(StringUtils.EMPTY), message, t, args);
-	}
-
-	@Override
-	public void log(Marker marker, String message) {
-		log(marker, message, new Object[0]);
-	}
-
-	@Override
-	public void log(Marker marker, String message, Object... args) {
-		log(getDefaultMessageResource(), marker, message, null, args);
-	}
-
-	@Override
-	public void log(Marker marker, String message, Throwable t, Object... args) {
-		log(getDefaultMessageResource(), marker, message, t, args);
-	}
-
-	@Override
-	public void log(MessageResource messageResource, String message) {
-		log(messageResource, message, new Object[0]);
-	}
-
-	@Override
-	public void log(MessageResource messageResource, String message,
-			Object... args) {
-		log(messageResource, SimpleMarker.valueOf(StringUtils.EMPTY), message,
-				args);
-	}
-
-	@Override
-	public void log(MessageResource messageResource, String message,
-			Throwable t, Object... args) {
-		log(messageResource, SimpleMarker.valueOf(StringUtils.EMPTY), message,
-				t, args);
-	}
-
-	@Override
-	public void log(MessageResource messageResource, Marker marker,
-			String message) {
-		log(messageResource, marker, message, new Object[0]);
-	}
-
-	@Override
-	public void log(MessageResource messageResource, Marker marker,
-			String message, Throwable t, Object... args) {
-		logInternal(messageResource, marker, message, t, args);
-	}
-
-	@Override
-	public void log(MessageResource messageResource, Marker marker,
-			String message, Object... args) {
-		logInternal(messageResource, marker, message, null, args);
-	}
-
-	protected void logInternal(MessageResource messageResource, Marker marker,
-			String message, Throwable t, Object[] args) {
-		char prefix = message.charAt(0);
-		switch (prefix) {
-			case 'T' :
-				if (isTraceEnabled(marker)) {
-					trace(marker,
-							createMessage(messageResource, message, args), t);
-				}
-				break;
-			case 'D' :
-				if (isDebugEnabled(marker)) {
-					debug(marker,
-							createMessage(messageResource, message, args), t);
-				}
-				break;
-			case 'I' :
-				if (isInfoEnabled(marker)) {
-					info(marker, createMessage(messageResource, message, args),
-							t);
-				}
-				break;
-			case 'W' :
-				if (isWarnEnabled(marker)) {
-					warn(marker, createMessage(messageResource, message, args),
-							t);
-				}
-				break;
-			case 'E' :
-				if (isErrorEnabled(marker)) {
-					error(marker,
-							createMessage(messageResource, message, args), t);
-				}
-				break;
-			default :
-				break;
-		}
-	}
-
-	protected String createMessage(MessageResource messageResource,
-			String message, Object[] args) {
-		return messageResource.getMessage(message, args);
-	}
-
-	protected MessageResource createDefaultMessageResource(
-			ClassLoader classLoader) {
-		return new PropertyResourceBundleMessageResource("analog-messages",
-				classLoader);
-	}
-
-	protected MessageResource getDefaultMessageResource() {
-		return this.defaultMessageResource;
-	}
-
-	@Override
-	public void trace(String message) {
-		trace(message, new Object[0]);
-	}
-
-	@Override
-	public void debug(String message) {
-		debug(message, new Object[0]);
-	}
-
-	@Override
-	public void info(String message) {
-		info(message, new Object[0]);
-	}
-
-	@Override
-	public void warn(String message) {
-		warn(message, new Object[0]);
-	}
-
-	@Override
-	public void error(String message) {
-		error(message, new Object[0]);
-	}
+    private String name;
+    private MessageResource defaultMessageResource;
+
+    public AbstractLog(String name, ClassLoader classLoader) {
+        this.name = name;
+        this.defaultMessageResource = createDefaultMessageResource(classLoader);
+    }
+
+    protected final String getName() {
+        return this.name;
+    }
+
+    @Override
+    public void log(String message) {
+        log(message, new Object[0]);
+    }
+
+    @Override
+    public void log(String message, Object... args) {
+        log(SimpleMarker.valueOf(StringUtils.EMPTY), message, args);
+    }
+
+    @Override
+    public void log(String message, Throwable t, Object... args) {
+        log(SimpleMarker.valueOf(StringUtils.EMPTY), message, t, args);
+    }
+
+    @Override
+    public void log(Marker marker, String message) {
+        log(marker, message, new Object[0]);
+    }
+
+    @Override
+    public void log(Marker marker, String message, Object... args) {
+        log(getDefaultMessageResource(), marker, message, null, args);
+    }
+
+    @Override
+    public void log(Marker marker, String message, Throwable t, Object... args) {
+        log(getDefaultMessageResource(), marker, message, t, args);
+    }
+
+    @Override
+    public void log(MessageResource messageResource, String message) {
+        log(messageResource, message, new Object[0]);
+    }
+
+    @Override
+    public void log(MessageResource messageResource, String message, Object... args) {
+        log(messageResource, SimpleMarker.valueOf(StringUtils.EMPTY), message, args);
+    }
+
+    @Override
+    public void log(MessageResource messageResource, String message, Throwable t, Object... args) {
+        log(messageResource, SimpleMarker.valueOf(StringUtils.EMPTY), message, t, args);
+    }
+
+    @Override
+    public void log(MessageResource messageResource, Marker marker, String message) {
+        log(messageResource, marker, message, new Object[0]);
+    }
+
+    @Override
+    public void log(MessageResource messageResource, Marker marker, String message, Throwable t, Object... args) {
+        logInternal(messageResource, marker, message, t, args);
+    }
+
+    @Override
+    public void log(MessageResource messageResource, Marker marker, String message, Object... args) {
+        logInternal(messageResource, marker, message, null, args);
+    }
+
+    protected void logInternal(MessageResource messageResource, Marker marker, String message, Throwable t,
+            Object[] args) {
+        char prefix = message.charAt(0);
+        switch (prefix) {
+        case 'T':
+            if (isTraceEnabled(marker)) {
+                trace(marker, createMessage(messageResource, message, args), t);
+            }
+            break;
+        case 'D':
+            if (isDebugEnabled(marker)) {
+                debug(marker, createMessage(messageResource, message, args), t);
+            }
+            break;
+        case 'I':
+            if (isInfoEnabled(marker)) {
+                info(marker, createMessage(messageResource, message, args), t);
+            }
+            break;
+        case 'W':
+            if (isWarnEnabled(marker)) {
+                warn(marker, createMessage(messageResource, message, args), t);
+            }
+            break;
+        case 'E':
+            if (isErrorEnabled(marker)) {
+                error(marker, createMessage(messageResource, message, args), t);
+            }
+            break;
+        default:
+            break;
+        }
+    }
+
+    protected String createMessage(MessageResource messageResource, String message, Object[] args) {
+        return messageResource.getMessage(message, args);
+    }
+
+    protected MessageResource createDefaultMessageResource(ClassLoader classLoader) {
+        return new PropertyResourceBundleMessageResource("analog-messages", classLoader);
+    }
+
+    protected MessageResource getDefaultMessageResource() {
+        return this.defaultMessageResource;
+    }
+
+    @Override
+    public void trace(String message) {
+        trace(message, new Object[0]);
+    }
+
+    @Override
+    public void debug(String message) {
+        debug(message, new Object[0]);
+    }
+
+    @Override
+    public void info(String message) {
+        info(message, new Object[0]);
+    }
+
+    @Override
+    public void warn(String message) {
+        warn(message, new Object[0]);
+    }
+
+    @Override
+    public void error(String message) {
+        error(message, new Object[0]);
+    }
 }
diff --git a/src/main/java/org/analogweb/util/logging/JulLog.java b/src/main/java/org/analogweb/util/logging/JulLog.java
index 1e00758..1131e49 100644
--- a/src/main/java/org/analogweb/util/logging/JulLog.java
+++ b/src/main/java/org/analogweb/util/logging/JulLog.java
@@ -11,210 +11,209 @@
  */
 class JulLog extends AbstractLog {
 
-	private static final String DEFAULT_LOG_CONFIG_IMPLEMENTATION = AbstractLog.class
-			.getPackage().getName() + ".JulLogConfigImpl";
-	private static JulLogConfig runtimeConfig;
-	private final Logger log;
-
-	JulLog(String name, ClassLoader classLoader) {
-		super(name, classLoader);
-		if (runtimeConfig == null) {
-			runtimeConfig = configureViaRuntimeClass(classLoader);
-		}
-		log = runtimeConfig.createLogger(name);
-	}
-
-	private JulLogConfig configureViaRuntimeClass(ClassLoader classLoader) {
-		Class<?> clazz = ClassUtils.forNameQuietly(
-				DEFAULT_LOG_CONFIG_IMPLEMENTATION, classLoader);
-		if (clazz != null) {
-			Object obj = ReflectionUtils.getInstanceQuietly(clazz);
-			if (obj instanceof JulLogConfig) {
-				JulLogConfig config = (JulLogConfig) obj;
-				config.configure(classLoader);
-				return config;
-			}
-		}
-		return JulLogConfig.SIMPLE;
-	}
-
-	@Override
-	public void trace(String message, Throwable throwable) {
-		log.log(Level.FINEST, message, throwable);
-	}
-
-	@Override
-	public void trace(String message, Object... args) {
-		log.log(Level.FINEST, message, args);
-	}
-
-	@Override
-	public void trace(Marker marker, String message) {
-		trace(message);
-	}
-
-	@Override
-	public void trace(Marker marker, String message, Throwable throwable) {
-		trace(message, throwable);
-	}
-
-	@Override
-	public void trace(Marker marker, String message, Object... args) {
-		trace(message, args);
-	}
-
-	@Override
-	public boolean isTraceEnabled() {
-		return log.isLoggable(Level.FINEST);
-	}
-
-	@Override
-	public boolean isTraceEnabled(Marker marker) {
-		return isTraceEnabled();
-	}
-
-	@Override
-	public void debug(String message, Throwable throwable) {
-		log.log(Level.FINE, message, throwable);
-	}
-
-	@Override
-	public void debug(String message, Object... args) {
-		log.log(Level.FINE, message, args);
-	}
-
-	@Override
-	public void debug(Marker marker, String message) {
-		debug(message);
-	}
-
-	@Override
-	public void debug(Marker marker, String message, Throwable throwable) {
-		debug(message, throwable);
-	}
-
-	@Override
-	public void debug(Marker marker, String message, Object... args) {
-		debug(message, args);
-	}
-
-	@Override
-	public boolean isDebugEnabled() {
-		return log.isLoggable(Level.FINE);
-	}
-
-	@Override
-	public boolean isDebugEnabled(Marker marker) {
-		return isDebugEnabled();
-	}
-
-	@Override
-	public void info(String message, Throwable throwable) {
-		log.log(Level.INFO, message, throwable);
-	}
-
-	@Override
-	public void info(String message, Object... args) {
-		log.log(Level.INFO, message, args);
-	}
-
-	@Override
-	public void info(Marker marker, String message) {
-		info(message);
-	}
-
-	@Override
-	public void info(Marker marker, String message, Throwable throwable) {
-		info(message, throwable);
-	}
-
-	@Override
-	public void info(Marker marker, String message, Object... args) {
-		info(message, args);
-	}
-
-	@Override
-	public boolean isInfoEnabled() {
-		return log.isLoggable(Level.INFO);
-	}
-
-	@Override
-	public boolean isInfoEnabled(Marker marker) {
-		return isInfoEnabled();
-	}
-
-	@Override
-	public void warn(String message, Object... args) {
-		log.log(Level.WARNING, message, args);
-	}
-
-	@Override
-	public void warn(String message, Throwable throwable) {
-		log.log(Level.WARNING, message, throwable);
-	}
-
-	@Override
-	public void warn(Marker marker, String message) {
-		warn(message);
-	}
-
-	@Override
-	public void warn(Marker marker, String message, Throwable throwable) {
-		warn(message, throwable);
-	}
-
-	@Override
-	public void warn(Marker marker, String message, Object... args) {
-		warn(message, args);
-	}
-
-	@Override
-	public boolean isWarnEnabled() {
-		return log.isLoggable(Level.WARNING);
-	}
-
-	@Override
-	public boolean isWarnEnabled(Marker marker) {
-		return isWarnEnabled();
-	}
-
-	@Override
-	public void error(String message, Throwable throwable) {
-		log.log(Level.SEVERE, message, throwable);
-	}
-
-	@Override
-	public void error(String message, Object... args) {
-		log.log(Level.SEVERE, message, args);
-	}
-
-	@Override
-	public void error(Marker marker, String message) {
-		error(message);
-	}
-
-	@Override
-	public void error(Marker marker, String message, Throwable throwable) {
-		error(message, throwable);
-	}
-
-	@Override
-	public void error(Marker marker, String message, Object... args) {
-		error(message, args);
-	}
-
-	@Override
-	public boolean isErrorEnabled() {
-		return log.isLoggable(Level.SEVERE);
-	}
-
-	@Override
-	public boolean isErrorEnabled(Marker marker) {
-		return isErrorEnabled();
-	}
-
-	@Override
-	public String toString() {
-		return "Logger Facade for java.util.logging.Logger";
-	}
+    private static final String DEFAULT_LOG_CONFIG_IMPLEMENTATION = AbstractLog.class.getPackage().getName()
+            + ".JulLogConfigImpl";
+    private static JulLogConfig runtimeConfig;
+    private final Logger log;
+
+    JulLog(String name, ClassLoader classLoader) {
+        super(name, classLoader);
+        if (runtimeConfig == null) {
+            runtimeConfig = configureViaRuntimeClass(classLoader);
+        }
+        log = runtimeConfig.createLogger(name);
+    }
+
+    private JulLogConfig configureViaRuntimeClass(ClassLoader classLoader) {
+        Class<?> clazz = ClassUtils.forNameQuietly(DEFAULT_LOG_CONFIG_IMPLEMENTATION, classLoader);
+        if (clazz != null) {
+            Object obj = ReflectionUtils.getInstanceQuietly(clazz);
+            if (obj instanceof JulLogConfig) {
+                JulLogConfig config = (JulLogConfig) obj;
+                config.configure(classLoader);
+                return config;
+            }
+        }
+        return JulLogConfig.SIMPLE;
+    }
+
+    @Override
+    public void trace(String message, Throwable throwable) {
+        log.log(Level.FINEST, message, throwable);
+    }
+
+    @Override
+    public void trace(String message, Object... args) {
+        log.log(Level.FINEST, message, args);
+    }
+
+    @Override
+    public void trace(Marker marker, String message) {
+        trace(message);
+    }
+
+    @Override
+    public void trace(Marker marker, String message, Throwable throwable) {
+        trace(message, throwable);
+    }
+
+    @Override
+    public void trace(Marker marker, String message, Object... args) {
+        trace(message, args);
+    }
+
+    @Override
+    public boolean isTraceEnabled() {
+        return log.isLoggable(Level.FINEST);
+    }
+
+    @Override
+    public boolean isTraceEnabled(Marker marker) {
+        return isTraceEnabled();
+    }
+
+    @Override
+    public void debug(String message, Throwable throwable) {
+        log.log(Level.FINE, message, throwable);
+    }
+
+    @Override
+    public void debug(String message, Object... args) {
+        log.log(Level.FINE, message, args);
+    }
+
+    @Override
+    public void debug(Marker marker, String message) {
+        debug(message);
+    }
+
+    @Override
+    public void debug(Marker marker, String message, Throwable throwable) {
+        debug(message, throwable);
+    }
+
+    @Override
+    public void debug(Marker marker, String message, Object... args) {
+        debug(message, args);
+    }
+
+    @Override
+    public boolean isDebugEnabled() {
+        return log.isLoggable(Level.FINE);
+    }
+
+    @Override
+    public boolean isDebugEnabled(Marker marker) {
+        return isDebugEnabled();
+    }
+
+    @Override
+    public void info(String message, Throwable throwable) {
+        log.log(Level.INFO, message, throwable);
+    }
+
+    @Override
+    public void info(String message, Object... args) {
+        log.log(Level.INFO, message, args);
+    }
+
+    @Override
+    public void info(Marker marker, String message) {
+        info(message);
+    }
+
+    @Override
+    public void info(Marker marker, String message, Throwable throwable) {
+        info(message, throwable);
+    }
+
+    @Override
+    public void info(Marker marker, String message, Object... args) {
+        info(message, args);
+    }
+
+    @Override
+    public boolean isInfoEnabled() {
+        return log.isLoggable(Level.INFO);
+    }
+
+    @Override
+    public boolean isInfoEnabled(Marker marker) {
+        return isInfoEnabled();
+    }
+
+    @Override
+    public void warn(String message, Object... args) {
+        log.log(Level.WARNING, message, args);
+    }
+
+    @Override
+    public void warn(String message, Throwable throwable) {
+        log.log(Level.WARNING, message, throwable);
+    }
+
+    @Override
+    public void warn(Marker marker, String message) {
+        warn(message);
+    }
+
+    @Override
+    public void warn(Marker marker, String message, Throwable throwable) {
+        warn(message, throwable);
+    }
+
+    @Override
+    public void warn(Marker marker, String message, Object... args) {
+        warn(message, args);
+    }
+
+    @Override
+    public boolean isWarnEnabled() {
+        return log.isLoggable(Level.WARNING);
+    }
+
+    @Override
+    public boolean isWarnEnabled(Marker marker) {
+        return isWarnEnabled();
+    }
+
+    @Override
+    public void error(String message, Throwable throwable) {
+        log.log(Level.SEVERE, message, throwable);
+    }
+
+    @Override
+    public void error(String message, Object... args) {
+        log.log(Level.SEVERE, message, args);
+    }
+
+    @Override
+    public void error(Marker marker, String message) {
+        error(message);
+    }
+
+    @Override
+    public void error(Marker marker, String message, Throwable throwable) {
+        error(message, throwable);
+    }
+
+    @Override
+    public void error(Marker marker, String message, Object... args) {
+        error(message, args);
+    }
+
+    @Override
+    public boolean isErrorEnabled() {
+        return log.isLoggable(Level.SEVERE);
+    }
+
+    @Override
+    public boolean isErrorEnabled(Marker marker) {
+        return isErrorEnabled();
+    }
+
+    @Override
+    public String toString() {
+        return "Logger Facade for java.util.logging.Logger";
+    }
 }
diff --git a/src/main/java/org/analogweb/util/logging/JulLogConfig.java b/src/main/java/org/analogweb/util/logging/JulLogConfig.java
index 66fe05b..af9bafb 100644
--- a/src/main/java/org/analogweb/util/logging/JulLogConfig.java
+++ b/src/main/java/org/analogweb/util/logging/JulLogConfig.java
@@ -8,66 +8,66 @@
 
 /**
  * Configurable class for java.util.logging without logging.properties.
- * 
+ *
  * @author snowgoose
  */
 public abstract class JulLogConfig {
 
-	/**
-	 * Configuration for creating {@link Logger} rely on default JVM settings.
-	 */
-	public static final JulLogConfig SIMPLE = new JulLogConfig() {
+    /**
+     * Configuration for creating {@link Logger} rely on default JVM settings.
+     */
+    public static final JulLogConfig SIMPLE = new JulLogConfig() {
 
-		@Override
-		public void configure(ClassLoader classLoader) {
-			// nop.
-		}
+        @Override
+        public void configure(ClassLoader classLoader) {
+            // nop.
+        }
 
-		@Override
-		public Logger createLogger(String name) {
-			return Logger.getLogger(name);
-		}
-	};
+        @Override
+        public Logger createLogger(String name) {
+            return Logger.getLogger(name);
+        }
+    };
 
-	public JulLogConfig() {
-		// nop.
-	}
+    public JulLogConfig() {
+        // nop.
+    }
 
-	public void configure(ClassLoader classLoader) {
-		LogManager manager = LogManager.getLogManager();
-		resetLogManager(manager);
-		configureInternal(manager);
-	}
+    public void configure(ClassLoader classLoader) {
+        LogManager manager = LogManager.getLogManager();
+        resetLogManager(manager);
+        configureInternal(manager);
+    }
 
-	protected void configureInternal(LogManager manager) {
-		// only reset LogManager.
-	}
+    protected void configureInternal(LogManager manager) {
+        // only reset LogManager.
+    }
 
-	protected void resetLogManager(LogManager manager) {
-		manager.reset();
-		Logger globalLogger = Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
-		for (Handler handler : globalLogger.getHandlers()) {
-			globalLogger.removeHandler(handler);
-		}
-	}
+    protected void resetLogManager(LogManager manager) {
+        manager.reset();
+        Logger globalLogger = Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
+        for (Handler handler : globalLogger.getHandlers()) {
+            globalLogger.removeHandler(handler);
+        }
+    }
 
-	public Logger createLogger(String name) {
-		LogManager manager = LogManager.getLogManager();
-		return createLoggerInternal(name, manager);
-	}
+    public Logger createLogger(String name) {
+        LogManager manager = LogManager.getLogManager();
+        return createLoggerInternal(name, manager);
+    }
 
-	protected Logger createLoggerInternal(String name, LogManager manager) {
-		Logger logger = Logger.getLogger(name);
-		logger.setLevel(Level.INFO);
-		logger.addHandler(createConsoleHandler());
-		manager.addLogger(logger);
-		return logger;
-	}
+    protected Logger createLoggerInternal(String name, LogManager manager) {
+        Logger logger = Logger.getLogger(name);
+        logger.setLevel(Level.INFO);
+        logger.addHandler(createConsoleHandler());
+        manager.addLogger(logger);
+        return logger;
+    }
 
-	private ConsoleHandler createConsoleHandler() {
-		ConsoleHandler console = new ConsoleHandler();
-		console.setFormatter(new JulLogFormatter());
-		console.setLevel(Level.INFO);
-		return console;
-	}
+    private ConsoleHandler createConsoleHandler() {
+        ConsoleHandler console = new ConsoleHandler();
+        console.setFormatter(new JulLogFormatter());
+        console.setLevel(Level.INFO);
+        return console;
+    }
 }
diff --git a/src/main/java/org/analogweb/util/logging/JulLogFormatter.java b/src/main/java/org/analogweb/util/logging/JulLogFormatter.java
index 4383eb6..38c13f1 100644
--- a/src/main/java/org/analogweb/util/logging/JulLogFormatter.java
+++ b/src/main/java/org/analogweb/util/logging/JulLogFormatter.java
@@ -10,13 +10,11 @@
  */
 public class JulLogFormatter extends Formatter {
 
-	@Override
-	public String format(LogRecord record) {
-		SimpleDateFormat dateFormat = new SimpleDateFormat(
-				"yyyy-MM-dd hh:mm:ss.SSS");
-		String currentTime = dateFormat.format(new Date(record.getMillis()));
-		return String.format("%s %s %s {%s} - %s\n", currentTime,
-				record.getLoggerName(), record.getLevel(),
-				record.getThreadID(), record.getMessage());
-	}
+    @Override
+    public String format(LogRecord record) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS");
+        String currentTime = dateFormat.format(new Date(record.getMillis()));
+        return String.format("%s %s %s {%s} - %s\n", currentTime, record.getLoggerName(), record.getLevel(),
+                record.getThreadID(), record.getMessage());
+    }
 }
diff --git a/src/main/java/org/analogweb/util/logging/Log.java b/src/main/java/org/analogweb/util/logging/Log.java
index 38517de..0b188ef 100644
--- a/src/main/java/org/analogweb/util/logging/Log.java
+++ b/src/main/java/org/analogweb/util/logging/Log.java
@@ -7,110 +7,107 @@
  */
 public interface Log {
 
-	void log(String message);
+    void log(String message);
 
-	void log(String message, Object... args);
+    void log(String message, Object... args);
 
-	void log(String message, Throwable t, Object... args);
+    void log(String message, Throwable t, Object... args);
 
-	void log(Marker marker, String message);
+    void log(Marker marker, String message);
 
-	void log(Marker marker, String message, Throwable t, Object... args);
+    void log(Marker marker, String message, Throwable t, Object... args);
 
-	void log(Marker marker, String message, Object... args);
+    void log(Marker marker, String message, Object... args);
 
-	void log(MessageResource messageResource, String message);
+    void log(MessageResource messageResource, String message);
 
-	void log(MessageResource messageResource, String message, Object... args);
+    void log(MessageResource messageResource, String message, Object... args);
 
-	void log(MessageResource messageResource, String message, Throwable t,
-			Object... args);
+    void log(MessageResource messageResource, String message, Throwable t, Object... args);
 
-	void log(MessageResource messageResource, Marker marker, String message);
+    void log(MessageResource messageResource, Marker marker, String message);
 
-	void log(MessageResource messageResource, Marker marker, String message,
-			Throwable t, Object... args);
+    void log(MessageResource messageResource, Marker marker, String message, Throwable t, Object... args);
 
-	void log(MessageResource messageResource, Marker marker, String message,
-			Object... args);
+    void log(MessageResource messageResource, Marker marker, String message, Object... args);
 
-	void trace(String message);
+    void trace(String message);
 
-	void trace(String message, Object... args);
+    void trace(String message, Object... args);
 
-	void trace(String message, Throwable throwable);
+    void trace(String message, Throwable throwable);
 
-	void trace(Marker marker, String message);
+    void trace(Marker marker, String message);
 
-	void trace(Marker marker, String message, Object... args);
+    void trace(Marker marker, String message, Object... args);
 
-	void trace(Marker marker, String message, Throwable throwable);
+    void trace(Marker marker, String message, Throwable throwable);
 
-	boolean isTraceEnabled();
+    boolean isTraceEnabled();
 
-	boolean isTraceEnabled(Marker marker);
+    boolean isTraceEnabled(Marker marker);
 
-	void debug(String message);
+    void debug(String message);
 
-	void debug(String message, Throwable throwable);
+    void debug(String message, Throwable throwable);
 
-	void debug(String message, Object... args);
+    void debug(String message, Object... args);
 
-	void debug(Marker marker, String message);
+    void debug(Marker marker, String message);
 
-	void debug(Marker marker, String message, Throwable throwable);
+    void debug(Marker marker, String message, Throwable throwable);
 
-	void debug(Marker marker, String message, Object... args);
+    void debug(Marker marker, String message, Object... args);
 
-	boolean isDebugEnabled();
+    boolean isDebugEnabled();
 
-	boolean isDebugEnabled(Marker marker);
+    boolean isDebugEnabled(Marker marker);
 
-	void info(String message);
+    void info(String message);
 
-	void info(String message, Throwable throwable);
+    void info(String message, Throwable throwable);
 
-	void info(String message, Object... args);
+    void info(String message, Object... args);
 
-	void info(Marker marker, String message);
+    void info(Marker marker, String message);
 
-	void info(Marker marker, String message, Throwable throwable);
+    void info(Marker marker, String message, Throwable throwable);
 
-	void info(Marker marker, String message, Object... args);
+    void info(Marker marker, String message, Object... args);
 
-	boolean isInfoEnabled();
+    boolean isInfoEnabled();
 
-	boolean isInfoEnabled(Marker marker);
+    boolean isInfoEnabled(Marker marker);
 
-	void warn(String message);
+    void warn(String message);
 
-	void warn(String message, Throwable throwable);
+    void warn(String message, Throwable throwable);
 
-	void warn(String message, Object... args);
+    void warn(String message, Object... args);
 
-	void warn(Marker marker, String message);
+    void warn(Marker marker, String message);
 
-	void warn(Marker marker, String message, Throwable throwable);
+    void warn(Marker marker, String message, Throwable throwable);
 
-	void warn(Marker marker, String message, Object... args);
+    void warn(Marker marker, String message, Object... args);
 
-	boolean isWarnEnabled();
+    boolean isWarnEnabled();
 
-	boolean isWarnEnabled(Marker marker);
+    boolean isWarnEnabled(Marker marker);
 
-	void error(String message);
+    void error(String message);
 
-	void error(String message, Throwable throwable);
+    void error(String message, Throwable throwable);
 
-	void error(String message, Object... args);
+    void error(String message, Object... args);
 
-	void error(Marker marker, String message);
+    void error(Marker marker, String message);
 
-	void error(Marker marker, String message, Throwable throwable);
+    void error(Marker marker, String message, Throwable throwable);
 
-	void error(Marker marker, String message, Object... args);
+    void error(Marker marker, String message, Object... args);
 
-	boolean isErrorEnabled();
+    boolean isErrorEnabled();
 
-	boolean isErrorEnabled(Marker marker);
+    boolean isErrorEnabled(Marker marker);
 }
diff --git a/src/main/java/org/analogweb/util/logging/Logs.java b/src/main/java/org/analogweb/util/logging/Logs.java
index 8f22ada..f2c52a9 100644
--- a/src/main/java/org/analogweb/util/logging/Logs.java
+++ b/src/main/java/org/analogweb/util/logging/Logs.java
@@ -10,74 +10,64 @@
  */
 public final class Logs {
 
-	private static final String DEFAULT_LOG_IMPLEMENTATION = "org.analogweb.util.logging.LogImpl";
+    private static final String DEFAULT_LOG_IMPLEMENTATION = "org.analogweb.util.logging.LogImpl";
 
-	public static Log getLog(Class<?> clazz) {
-		return getLog(clazz.getCanonicalName());
-	}
+    public static Log getLog(Class<?> clazz) {
+        return getLog(clazz.getCanonicalName());
+    }
 
-	public static Log getLog(String name) {
-		return getLog(name, Thread.currentThread().getContextClassLoader());
-	}
+    public static Log getLog(String name) {
+        return getLog(name, Thread.currentThread().getContextClassLoader());
+    }
 
-	public static Log getLog(String name, ClassLoader loader) {
-		return getLog(name, loader, DEFAULT_LOG_IMPLEMENTATION);
-	}
+    public static Log getLog(String name, ClassLoader loader) {
+        return getLog(name, loader, DEFAULT_LOG_IMPLEMENTATION);
+    }
 
-	public static Log getLog(String name, ClassLoader loader,
-			String logImplementationClassName) {
-		Log logger = findImplementation(name, loader,
-				logImplementationClassName);
-		return logger;
-	}
+    public static Log getLog(String name, ClassLoader loader, String logImplementationClassName) {
+        Log logger = findImplementation(name, loader, logImplementationClassName);
+        return logger;
+    }
 
-	@SuppressWarnings("unchecked")
-	private static Log findImplementation(String name, ClassLoader loader,
-			String logImplementationClassName) {
-		try {
-			Class<?> implementationClass = ClassUtils
-					.forNameQuietly(logImplementationClassName);
-			if (implementationClass == null) {
-				return defaultImplementation(name, loader);
-			}
-			if (AbstractLog.class.isAssignableFrom(implementationClass)) {
-				Constructor<AbstractLog> constructor = (Constructor<AbstractLog>) implementationClass
-						.getConstructor(String.class, ClassLoader.class);
-				return constructor.newInstance(name, loader);
-			}
-			Log l = defaultImplementation(name, loader);
-			l.log(Markers.INIT_COMPONENT, "WU001005");
-			l.log(Markers.INIT_COMPONENT, "WU001004", l);
-			return l;
-		} catch (InstantiationException e) {
-			return defaultImplementationWithException(name, loader, e,
-					"WU001001", logImplementationClassName);
-		} catch (NoSuchMethodException e) {
-			return defaultImplementationWithException(name, loader, e,
-					"WU001002", logImplementationClassName);
-		} catch (InvocationTargetException e) {
-			Throwable cause = e.getCause();
-			return defaultImplementationWithException(name, loader,
-					(cause != null) ? cause : e, "WU001003");
-		} catch (IllegalAccessException e) {
-			return defaultImplementationWithException(name, loader, e,
-					"WU001000");
-		} catch (SecurityException e) {
-			return defaultImplementationWithException(name, loader, e,
-					"WU001000");
-		}
-	}
+    @SuppressWarnings("unchecked")
+    private static Log findImplementation(String name, ClassLoader loader, String logImplementationClassName) {
+        try {
+            Class<?> implementationClass = ClassUtils.forNameQuietly(logImplementationClassName);
+            if (implementationClass == null) {
+                return defaultImplementation(name, loader);
+            }
+            if (AbstractLog.class.isAssignableFrom(implementationClass)) {
+                Constructor<AbstractLog> constructor = (Constructor<AbstractLog>) implementationClass
+                        .getConstructor(String.class, ClassLoader.class);
+                return constructor.newInstance(name, loader);
+            }
+            Log l = defaultImplementation(name, loader);
+            l.log(Markers.INIT_COMPONENT, "WU001005");
+            l.log(Markers.INIT_COMPONENT, "WU001004", l);
+            return l;
+        } catch (InstantiationException e) {
+            return defaultImplementationWithException(name, loader, e, "WU001001", logImplementationClassName);
+        } catch (NoSuchMethodException e) {
+            return defaultImplementationWithException(name, loader, e, "WU001002", logImplementationClassName);
+        } catch (InvocationTargetException e) {
+            Throwable cause = e.getCause();
+            return defaultImplementationWithException(name, loader, (cause != null) ? cause : e, "WU001003");
+        } catch (IllegalAccessException e) {
+            return defaultImplementationWithException(name, loader, e, "WU001000");
+        } catch (SecurityException e) {
+            return defaultImplementationWithException(name, loader, e, "WU001000");
+        }
+    }
 
-	private static Log defaultImplementationWithException(String name,
-			ClassLoader loader, Throwable e, String message, Object... args) {
-		Log l = defaultImplementation(name, loader);
-		l.log(Markers.INIT_COMPONENT, message, e, args);
-		l.log(Markers.INIT_COMPONENT, "WU001004", l);
-		return l;
-	}
+    private static Log defaultImplementationWithException(String name, ClassLoader loader, Throwable e, String message,
+            Object... args) {
+        Log l = defaultImplementation(name, loader);
+        l.log(Markers.INIT_COMPONENT, message, e, args);
+        l.log(Markers.INIT_COMPONENT, "WU001004", l);
+        return l;
+    }
 
-	private static AbstractLog defaultImplementation(String name,
-			ClassLoader classLoader) {
-		return new JulLog(name, classLoader);
-	}
+    private static AbstractLog defaultImplementation(String name, ClassLoader classLoader) {
+        return new JulLog(name, classLoader);
+    }
 }
diff --git a/src/main/java/org/analogweb/util/logging/Marker.java b/src/main/java/org/analogweb/util/logging/Marker.java
index 34bc812..fa08807 100644
--- a/src/main/java/org/analogweb/util/logging/Marker.java
+++ b/src/main/java/org/analogweb/util/logging/Marker.java
@@ -5,5 +5,5 @@
  */
 public interface Marker {
 
-	String getName();
+    String getName();
 }
diff --git a/src/main/java/org/analogweb/util/logging/Markers.java b/src/main/java/org/analogweb/util/logging/Markers.java
index 3838787..c7d046a 100644
--- a/src/main/java/org/analogweb/util/logging/Markers.java
+++ b/src/main/java/org/analogweb/util/logging/Markers.java
@@ -7,45 +7,41 @@
  */
 public class Markers {
 
-	public static final Marker BOOT_APPLICATION = SimpleMarker
-			.valueOf("BOOT_APPLICATION");
-	public static final Marker MONITOR_MODULES = SimpleMarker
-			.valueOf("MONITOR_MODULES");
-	public static final Marker INIT_COMPONENT = SimpleMarker
-			.valueOf("INIT_COMPONENT");
-	public static final Marker LIFECYCLE = SimpleMarker.valueOf("LIFECYCLE");
-	public static final Marker VARIABLE_ACCESS = SimpleMarker
-			.valueOf("VARIABLE_ACCESS");
-
-	public static class SimpleMarker implements Marker {
-
-		public static SimpleMarker valueOf(String name) {
-			return new SimpleMarker(name);
-		}
-
-		private String name;
-
-		public SimpleMarker(String name) {
-			Assertion.notNull(name, "name");
-			this.name = name;
-		}
-
-		@Override
-		public String getName() {
-			return this.name;
-		}
-
-		@Override
-		public boolean equals(Object other) {
-			if (other instanceof Marker) {
-				return ((Marker) other).getName().equals(getName());
-			}
-			return false;
-		}
-
-		@Override
-		public int hashCode() {
-			return getName().hashCode();
-		}
-	}
+    public static final Marker BOOT_APPLICATION = SimpleMarker.valueOf("BOOT_APPLICATION");
+    public static final Marker MONITOR_MODULES = SimpleMarker.valueOf("MONITOR_MODULES");
+    public static final Marker INIT_COMPONENT = SimpleMarker.valueOf("INIT_COMPONENT");
+    public static final Marker LIFECYCLE = SimpleMarker.valueOf("LIFECYCLE");
+    public static final Marker VARIABLE_ACCESS = SimpleMarker.valueOf("VARIABLE_ACCESS");
+
+    public static class SimpleMarker implements Marker {
+
+        public static SimpleMarker valueOf(String name) {
+            return new SimpleMarker(name);
+        }
+
+        private String name;
+
+        public SimpleMarker(String name) {
+            Assertion.notNull(name, "name");
+            this.name = name;
+        }
+
+        @Override
+        public String getName() {
+            return this.name;
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            if (other instanceof Marker) {
+                return ((Marker) other).getName().equals(getName());
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return getName().hashCode();
+        }
+    }
 }
diff --git a/src/test/java/integration/resources/IntrgrationTest.java b/src/test/java/integration/resources/IntrgrationTest.java
index 61eef1c..a55d8ce 100644
--- a/src/test/java/integration/resources/IntrgrationTest.java
+++ b/src/test/java/integration/resources/IntrgrationTest.java
@@ -20,83 +20,68 @@
 @Ignore
 public class IntrgrationTest {
 
-	private FakeApplication app;
+    private FakeApplication app;
 
-	@After
-	public void tearDown() {
-		app.shutdown();
-	}
+    @After
+    public void tearDown() {
+        app.shutdown();
+    }
 
-	@Test
-	public void testFound() {
-		app = fakeApplication(DefaultApplicationProperties
-				.properties("integration.testcase"));
-		ResponseResult actual = app.request("/helloworld", "GET");
-		assertThat(actual.getStatus(), is(200));
-		assertThat(actual.toBody(), is("Hello World"));
-		assertThat(actual.getResponseHeader().get("Content-Type").get(0),
-				is("text/plain; charset=UTF-8"));
-	}
+    @Test
+    public void testFound() {
+        app = fakeApplication(DefaultApplicationProperties.properties("integration.testcase"));
+        ResponseResult actual = app.request("/helloworld", "GET");
+        assertThat(actual.getStatus(), is(200));
+        assertThat(actual.toBody(), is("Hello World"));
+        assertThat(actual.getResponseHeader().get("Content-Type").get(0), is("text/plain; charset=UTF-8"));
+    }
 
-	@Test
-	public void testMethodNotAllowed() {
-		app = fakeApplication(DefaultApplicationProperties
-				.properties("integration.testcase"));
-		ResponseResult actual = app.request("/helloworld", "POST");
-		assertThat(actual.getStatus(), is(405));
-	}
+    @Test
+    public void testMethodNotAllowed() {
+        app = fakeApplication(DefaultApplicationProperties.properties("integration.testcase"));
+        ResponseResult actual = app.request("/helloworld", "POST");
+        assertThat(actual.getStatus(), is(405));
+    }
 
-	@Test
-	public void testPathvariable() {
-		app = fakeApplication(DefaultApplicationProperties
-				.properties("integration.testcase"));
-		ResponseResult actual = app.request("/hello/snowgooseyk/world", "GET");
-		assertThat(actual.getStatus(), is(200));
-		assertThat(actual.toBody(), is("Hello snowgooseyk World"));
-		assertThat(actual.getResponseHeader().get("Content-Type").get(0),
-				is("text/plain; charset=UTF-8"));
-		actual = app.request("/hello/snowgoose/yk/world", "GET");
-		assertThat(actual.getStatus(), is(404));
-	}
+    @Test
+    public void testPathvariable() {
+        app = fakeApplication(DefaultApplicationProperties.properties("integration.testcase"));
+        ResponseResult actual = app.request("/hello/snowgooseyk/world", "GET");
+        assertThat(actual.getStatus(), is(200));
+        assertThat(actual.toBody(), is("Hello snowgooseyk World"));
+        assertThat(actual.getResponseHeader().get("Content-Type").get(0), is("text/plain; charset=UTF-8"));
+        actual = app.request("/hello/snowgoose/yk/world", "GET");
+        assertThat(actual.getStatus(), is(404));
+    }
 
-	@Test
-	public void testMetaAnnotation() {
-		app = fakeApplication(DefaultApplicationProperties
-				.properties("integration.testcase"));
-		ResponseResult actual = app.request("/helloUserAgent", "GET",
-				Maps.newHashMap("User-Agent", Arrays.asList("JUnit")));
-		assertThat(actual.getStatus(), is(200));
-		assertThat(actual.toBody(), is("Hello World JUnit"));
-		assertThat(actual.getResponseHeader().get("Content-Type").get(0),
-				is("text/plain; charset=UTF-8"));
-	}
+    @Test
+    public void testMetaAnnotation() {
+        app = fakeApplication(DefaultApplicationProperties.properties("integration.testcase"));
+        ResponseResult actual = app.request("/helloUserAgent", "GET",
+                Maps.newHashMap("User-Agent", Arrays.asList("JUnit")));
+        assertThat(actual.getStatus(), is(200));
+        assertThat(actual.toBody(), is("Hello World JUnit"));
+        assertThat(actual.getResponseHeader().get("Content-Type").get(0), is("text/plain; charset=UTF-8"));
+    }
 
-	@Test
-	public void testPostFormToBean() {
-		app = fakeApplication(DefaultApplicationProperties
-				.properties("integration.testcase"));
-		ReadableBuffer body = DefaultReadableBuffer
-				.readBuffer(new ByteArrayInputStream("baa=foo".getBytes()));
-		ResponseResult actual = app.request(
-				"/helloBean",
-				"POST",
-				Maps.newHashMap("Content-Type",
-						Arrays.asList("application/x-www-form-urlencoded")),
-				body);
-		assertThat(actual.getStatus(), is(200));
-		assertThat(actual.toBody(), is("foo"));
-		assertThat(actual.getResponseHeader().get("Content-Type").get(0),
-				is("text/plain; charset=UTF-8"));
-	}
+    @Test
+    public void testPostFormToBean() {
+        app = fakeApplication(DefaultApplicationProperties.properties("integration.testcase"));
+        ReadableBuffer body = DefaultReadableBuffer.readBuffer(new ByteArrayInputStream("baa=foo".getBytes()));
+        ResponseResult actual = app.request("/helloBean", "POST",
+                Maps.newHashMap("Content-Type", Arrays.asList("application/x-www-form-urlencoded")), body);
+        assertThat(actual.getStatus(), is(200));
+        assertThat(actual.toBody(), is("foo"));
+        assertThat(actual.getResponseHeader().get("Content-Type").get(0), is("text/plain; charset=UTF-8"));
+    }
 
-	@Test
-	public void testVoid() {
-		app = fakeApplication(DefaultApplicationProperties
-				.properties("integration.testcase"));
-		ResponseResult actual = app.request("/helloNothing", "GET");
-		assertThat(actual.getStatus(), is(204));
-		actual = app.request("/helloNull", "GET");
-		assertThat(actual.getStatus(), is(204));
-	}
+    @Test
+    public void testVoid() {
+        app = fakeApplication(DefaultApplicationProperties.properties("integration.testcase"));
+        ResponseResult actual = app.request("/helloNothing", "GET");
+        assertThat(actual.getStatus(), is(204));
+        actual = app.request("/helloNull", "GET");
+        assertThat(actual.getStatus(), is(204));
+    }
 
 }
diff --git a/src/test/java/integration/testcase/FooBean.java b/src/test/java/integration/testcase/FooBean.java
index e4d010f..c57e64a 100644
--- a/src/test/java/integration/testcase/FooBean.java
+++ b/src/test/java/integration/testcase/FooBean.java
@@ -1,15 +1,10 @@
 package integration.testcase;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
 public class FooBean {
 
-	@XmlElement
-	private String baa = "baz";
+    private String baa = "baz";
 
-	public String getBaa() {
-		return this.baa;
-	}
+    public String getBaa() {
+        return this.baa;
+    }
 }
diff --git a/src/test/java/integration/testcase/HelloWorld.java b/src/test/java/integration/testcase/HelloWorld.java
index 1b40406..41162db 100644
--- a/src/test/java/integration/testcase/HelloWorld.java
+++ b/src/test/java/integration/testcase/HelloWorld.java
@@ -22,49 +22,49 @@
 @Route("/")
 public class HelloWorld {
 
-	@Route
-	@Get
-	public String helloworld() {
-		return "Hello World";
-	}
+    @Route
+    @Get
+    public String helloworld() {
+        return "Hello World";
+    }
 
-	@Route("hello/{name}/world")
-	@Get
-	public Text helloworld(@PathVariable("name") String name) {
-		return text(String.format("Hello %s World", name));
-	}
+    @Route("hello/{name}/world")
+    @Get
+    public Text helloworld(@PathVariable("name") String name) {
+        return text(String.format("Hello %s World", name));
+    }
 
-	@Route
-	@Get
-	public Text helloUserAgent(@UserAgent String userAgent) {
-		return text(String.format("Hello World %s", userAgent));
-	}
+    @Route
+    @Get
+    public Text helloUserAgent(@UserAgent String userAgent) {
+        return text(String.format("Hello World %s", userAgent));
+    }
 
-	@Route
-	@RequestFormats(MediaTypes.APPLICATION_FORM_URLENCODED)
-	@Put
-	@Post
-	public Text helloBean(@Bean FooBean foo) {
-		return text(foo.getBaa());
-	}
+    @Route
+    @RequestFormats(MediaTypes.APPLICATION_FORM_URLENCODED)
+    @Put
+    @Post
+    public Text helloBean(@Bean FooBean foo) {
+        return text(foo.getBaa());
+    }
 
-	@Route
-	@Get
-	public void helloNothing() {
-		// Return no content(204)
-	}
+    @Route
+    @Get
+    public void helloNothing() {
+        // Return no content(204)
+    }
 
-	@Route
-	@Get
-	public Renderable helloNull() {
-		// Return no content(204)
-		return null;
-	}
+    @Route
+    @Get
+    public Renderable helloNull() {
+        // Return no content(204)
+        return null;
+    }
 
-	@Route
-	@Get
-	public HttpStatus ok() {
-		FooBean foo = new FooBean();
-		return HttpStatus.OK.with(text(foo.getBaa()));
-	}
+    @Route
+    @Get
+    public HttpStatus ok() {
+        FooBean foo = new FooBean();
+        return HttpStatus.OK.with(text(foo.getBaa()));
+    }
 }
diff --git a/src/test/java/integration/testcase/UserAgent.java b/src/test/java/integration/testcase/UserAgent.java
index a4132e2..1ee6cd8 100644
--- a/src/test/java/integration/testcase/UserAgent.java
+++ b/src/test/java/integration/testcase/UserAgent.java
@@ -11,6 +11,6 @@
 @Header
 @As("User-Agent")
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PARAMETER, ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
 public @interface UserAgent {
 }
diff --git a/src/test/java/jp/acme/test/actionsonly/BaaResource.java b/src/test/java/jp/acme/test/actionsonly/BaaResource.java
index 7a99176..b6aa5f9 100644
--- a/src/test/java/jp/acme/test/actionsonly/BaaResource.java
+++ b/src/test/java/jp/acme/test/actionsonly/BaaResource.java
@@ -5,12 +5,12 @@
 @Route
 public class BaaResource {
 
-	@Route("anything")
-	public String doAnything() {
-		return "forward";
-	}
+    @Route("anything")
+    public String doAnything() {
+        return "forward";
+    }
 
-	public String notAction() {
-		return "no!";
-	}
+    public String notAction() {
+        return "no!";
+    }
 }
diff --git a/src/test/java/jp/acme/test/additionalcomponents/StubModulesConfig.java b/src/test/java/jp/acme/test/additionalcomponents/StubModulesConfig.java
index 6b8971e..f543507 100644
--- a/src/test/java/jp/acme/test/additionalcomponents/StubModulesConfig.java
+++ b/src/test/java/jp/acme/test/additionalcomponents/StubModulesConfig.java
@@ -8,9 +8,9 @@
  */
 public class StubModulesConfig implements UserModulesConfig {
 
-	@Override
-	public ModulesBuilder prepare(ModulesBuilder builder) {
-		builder.addApplicationProcessorClass(StubPreProcessor.class);
-		return builder;
-	}
+    @Override
+    public ModulesBuilder prepare(ModulesBuilder builder) {
+        builder.addApplicationProcessorClass(StubPreProcessor.class);
+        return builder;
+    }
 }
diff --git a/src/test/java/jp/acme/test/additionalcomponents/StubPreProcessor.java b/src/test/java/jp/acme/test/additionalcomponents/StubPreProcessor.java
index 5313266..8a53051 100644
--- a/src/test/java/jp/acme/test/additionalcomponents/StubPreProcessor.java
+++ b/src/test/java/jp/acme/test/additionalcomponents/StubPreProcessor.java
@@ -13,10 +13,9 @@
  */
 public class StubPreProcessor extends AbstractApplicationProcessor {
 
-	@Override
-	public Invocation prepareInvoke(InvocationArguments args,
-			InvocationMetadata metadata, RequestContext context,
-			TypeMapperContext converters, RequestValueResolvers handlers) {
-		return null;
-	}
+    @Override
+    public Invocation prepareInvoke(InvocationArguments args, InvocationMetadata metadata, RequestContext context,
+            TypeMapperContext converters, RequestValueResolvers handlers) {
+        return null;
+    }
 }
diff --git a/src/test/java/jp/acme/test/additionalcomponents/actions/FooResource.java b/src/test/java/jp/acme/test/additionalcomponents/actions/FooResource.java
index 93041dc..5c10740 100644
--- a/src/test/java/jp/acme/test/additionalcomponents/actions/FooResource.java
+++ b/src/test/java/jp/acme/test/additionalcomponents/actions/FooResource.java
@@ -5,13 +5,13 @@
 @Route
 public class FooResource {
 
-	@Route
-	public String doSomething() {
-		return "forward";
-	}
+    @Route
+    public String doSomething() {
+        return "forward";
+    }
 
-	@Route("anything")
-	public String doAnything() {
-		return "forward";
-	}
+    @Route("anything")
+    public String doAnything() {
+        return "forward";
+    }
 }
diff --git a/src/test/java/org/analogweb/core/AbstractApplicationProcessorTest.java b/src/test/java/org/analogweb/core/AbstractApplicationProcessorTest.java
index 0311d79..6712ea7 100644
--- a/src/test/java/org/analogweb/core/AbstractApplicationProcessorTest.java
+++ b/src/test/java/org/analogweb/core/AbstractApplicationProcessorTest.java
@@ -26,104 +26,99 @@
  */
 public class AbstractApplicationProcessorTest {
 
-	private final AbstractApplicationProcessor processor = new AbstractApplicationProcessor() {
-	};
-	private InvocationMetadata metadata;
-	private InvocationArguments args;
-	private RequestContext context;
-	private ResponseContext response;
-	private TypeMapperContext converters;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    private final AbstractApplicationProcessor processor = new AbstractApplicationProcessor() {
+    };
+    private InvocationMetadata metadata;
+    private InvocationArguments args;
+    private RequestContext context;
+    private ResponseContext response;
+    private TypeMapperContext converters;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@Before
-	public void setUp() throws Exception {
-		metadata = mock(InvocationMetadata.class);
-		args = mock(InvocationArguments.class);
-		context = mock(RequestContext.class);
-		response = mock(ResponseContext.class);
-		converters = mock(TypeMapperContext.class);
-	}
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        metadata = mock(InvocationMetadata.class);
+        args = mock(InvocationArguments.class);
+        context = mock(RequestContext.class);
+        response = mock(ResponseContext.class);
+        converters = mock(TypeMapperContext.class);
+    }
 
-	@Test
-	public void testPrepareInvoke() {
-		Object actual = processor.prepareInvoke(args, metadata, context,
-				converters, null);
-		assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
-	}
+    @Test
+    public void testPrepareInvoke() {
+        Object actual = processor.prepareInvoke(args, metadata, context, converters, null);
+        assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
+    }
 
-	@Test
-	public void testPostInvoke() {
-		// do nothing.
-		RequestValueResolvers handlers = mock(RequestValueResolvers.class);
-		Object invocationResult = new Object();
-		processor.postInvoke(invocationResult, args, metadata, context,
-				handlers);
-	}
+    @Test
+    public void testPostInvoke() {
+        // do nothing.
+        RequestValueResolvers handlers = mock(RequestValueResolvers.class);
+        Object invocationResult = new Object();
+        processor.postInvoke(invocationResult, args, metadata, context, handlers);
+    }
 
-	@Test
-	public void testAfterCompletion() {
-		// do nothing.
-		processor.afterCompletion(context, response, null);
-	}
+    @Test
+    public void testAfterCompletion() {
+        // do nothing.
+        processor.afterCompletion(context, response, null);
+    }
 
-	@Test
-	public void testProcessExceptionWithActionInvocationFailureException() {
-		final Throwable th = new Throwable();
-		final Object[] messages = {"action invocation failure."};
-		InvocationFailureException ex = new InvocationFailureException(th,
-				metadata, messages);
-		thrown.expect(is(sameInstance(ex)));
-		thrown.expect(new NoDescribeMatcher<InvocationFailureException>() {
+    @Test
+    public void testProcessExceptionWithActionInvocationFailureException() {
+        final Throwable th = new Throwable();
+        final Object[] messages = { "action invocation failure." };
+        InvocationFailureException ex = new InvocationFailureException(th, metadata, messages);
+        thrown.expect(is(sameInstance(ex)));
+        thrown.expect(new NoDescribeMatcher<InvocationFailureException>() {
 
-			@Override
-			public boolean matches(Object arg0) {
-				if (arg0 instanceof InvocationFailureException) {
-					InvocationFailureException ex = (InvocationFailureException) arg0;
-					assertThat(ex.getArgs(), is(messages));
-					assertThat(ex.getMetadata(), is(metadata));
-					assertThat(ex.getCause(), is(th));
-					return true;
-				}
-				return false;
-			}
-		});
-		processor.processException(ex, context, args, metadata);
-	}
+            @Override
+            public boolean matches(Object arg0) {
+                if (arg0 instanceof InvocationFailureException) {
+                    InvocationFailureException ex = (InvocationFailureException) arg0;
+                    assertThat(ex.getArgs(), is(messages));
+                    assertThat(ex.getMetadata(), is(metadata));
+                    assertThat(ex.getCause(), is(th));
+                    return true;
+                }
+                return false;
+            }
+        });
+        processor.processException(ex, context, args, metadata);
+    }
 
-	@Test
-	public void testProcessExceptionWithActionInvocationFailureExceptionCausedInvocationTargetException() {
-		final NullPointerException cause = new NullPointerException();
-		final InvocationTargetException th = new InvocationTargetException(
-				cause);
-		final Object[] messages = {"action invocation failure."};
-		InvocationFailureException ex = new InvocationFailureException(th,
-				metadata, messages);
-		thrown.expect(is(sameInstance(ex)));
-		thrown.expect(new NoDescribeMatcher<InvocationFailureException>() {
+    @Test
+    public void testProcessExceptionWithActionInvocationFailureExceptionCausedInvocationTargetException() {
+        final NullPointerException cause = new NullPointerException();
+        final InvocationTargetException th = new InvocationTargetException(cause);
+        final Object[] messages = { "action invocation failure." };
+        InvocationFailureException ex = new InvocationFailureException(th, metadata, messages);
+        thrown.expect(is(sameInstance(ex)));
+        thrown.expect(new NoDescribeMatcher<InvocationFailureException>() {
 
-			@Override
-			public boolean matches(Object arg0) {
-				if (arg0 instanceof InvocationFailureException) {
-					InvocationFailureException ex = (InvocationFailureException) arg0;
-					assertThat(ex.getArgs(), is(messages));
-					assertThat(ex.getMetadata(), is(metadata));
-					assertThat(ex.getCause(), is((Throwable) cause));
-					return true;
-				}
-				return false;
-			}
-		});
-		processor.processException(ex, context, args, metadata);
-	}
+            @Override
+            public boolean matches(Object arg0) {
+                if (arg0 instanceof InvocationFailureException) {
+                    InvocationFailureException ex = (InvocationFailureException) arg0;
+                    assertThat(ex.getArgs(), is(messages));
+                    assertThat(ex.getMetadata(), is(metadata));
+                    assertThat(ex.getCause(), is((Throwable) cause));
+                    return true;
+                }
+                return false;
+            }
+        });
+        processor.processException(ex, context, args, metadata);
+    }
 
-	@Test
-	public void testProcessExceptionWithAnotherException() {
-		Exception ex = new Exception();
-		Object actual = processor.processException(ex, context, args, metadata);
-		assertThat(actual, is(ApplicationProcessor.NO_INTERRUPTION));
-	}
+    @Test
+    public void testProcessExceptionWithAnotherException() {
+        Exception ex = new Exception();
+        Object actual = processor.processException(ex, context, args, metadata);
+        assertThat(actual, is(ApplicationProcessor.NO_INTERRUPTION));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/AbstractAttributesHandlerTest.java b/src/test/java/org/analogweb/core/AbstractAttributesHandlerTest.java
index db1f578..26aa461 100644
--- a/src/test/java/org/analogweb/core/AbstractAttributesHandlerTest.java
+++ b/src/test/java/org/analogweb/core/AbstractAttributesHandlerTest.java
@@ -17,23 +17,23 @@
  */
 public class AbstractAttributesHandlerTest {
 
-	private AbstractAttributesHandler handler;
-	private RequestContext requestContext;
-	private InvocationMetadata metadata;
+    private AbstractAttributesHandler handler;
+    private RequestContext requestContext;
+    private InvocationMetadata metadata;
 
-	@Before
-	public void setUp() throws Exception {
-		handler = new AbstractAttributesHandler() {
-		};
-		requestContext = mock(RequestContext.class);
-		metadata = mock(InvocationMetadata.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        handler = new AbstractAttributesHandler() {
+        };
+        requestContext = mock(RequestContext.class);
+        metadata = mock(InvocationMetadata.class);
+    }
 
-	@Test
-	public void testNop() {
-		assertThat(handler.resolveValue(requestContext, metadata, "foo",
-				String.class, new Annotation[0]), is(nullValue()));
-		handler.putAttributeValue(requestContext, "foo", new Object());
-		handler.removeAttribute(requestContext, "foo");
-	}
+    @Test
+    public void testNop() {
+        assertThat(handler.resolveValue(requestContext, metadata, "foo", String.class, new Annotation[0]),
+                is(nullValue()));
+        handler.putAttributeValue(requestContext, "foo", new Object());
+        handler.removeAttribute(requestContext, "foo");
+    }
 }
diff --git a/src/test/java/org/analogweb/core/AbstractRequestContextTest.java b/src/test/java/org/analogweb/core/AbstractRequestContextTest.java
index 440682e..314fbac 100644
--- a/src/test/java/org/analogweb/core/AbstractRequestContextTest.java
+++ b/src/test/java/org/analogweb/core/AbstractRequestContextTest.java
@@ -24,20 +24,19 @@
  */
 public class AbstractRequestContextTest {
 
-	private AbstractRequestContext context;
-	private RequestPath path;
-	private Locale locale = Locale.JAPAN;
-	private Headers headers;
+    private AbstractRequestContext context;
+    private RequestPath path;
+    private Locale locale = Locale.JAPAN;
+    private Headers headers;
 
-	@Before
-	public void setUp() throws Exception {
-		path = mock(RequestPath.class);
-		headers = mock(Headers.class);
-		context = new StubRequestContext(path, locale, headers,
-				new ByteArrayInputStream("This is test.".getBytes()));
-	}
+    @Before
+    public void setUp() throws Exception {
+        path = mock(RequestPath.class);
+        headers = mock(Headers.class);
+        context = new StubRequestContext(path, locale, headers, new ByteArrayInputStream("This is test.".getBytes()));
+    }
 
-	@Test
+    @Test
 	public void testGetContentLength() {
 		when(headers.getValues("Content-Length")).thenReturn(
 				Arrays.asList("13"));
@@ -52,7 +51,7 @@ public void testGetContentLength() {
 		assertThat(actual, is(0L));
 	}
 
-	@Test
+    @Test
 	public void testGetCharacterEncoding() {
 		when(headers.getValues("Content-Type")).thenReturn(
 				Arrays.asList("text/html; charset=ISO-8859-4"));
@@ -68,38 +67,36 @@ public void testGetCharacterEncoding() {
 		assertThat(actual, is("UTF-8"));
 	}
 
-	private final class StubRequestContext extends AbstractRequestContext {
+    private final class StubRequestContext extends AbstractRequestContext {
 
-		private Headers headers;
-		private ReadableBuffer in;
-		private String method;
+        private Headers headers;
+        private ReadableBuffer in;
+        private String method;
 
-		protected StubRequestContext(RequestPath requestPath,
-				Locale defaultLocale, Headers headers, InputStream in) {
-			this(requestPath, defaultLocale, headers, in, "GET");
-		}
+        protected StubRequestContext(RequestPath requestPath, Locale defaultLocale, Headers headers, InputStream in) {
+            this(requestPath, defaultLocale, headers, in, "GET");
+        }
 
-		protected StubRequestContext(RequestPath requestPath,
-				Locale defaultLocale, Headers headers, InputStream in,
-				String method) {
-			super(requestPath, defaultLocale);
-			this.headers = headers;
-			this.in = DefaultReadableBuffer.readBuffer(Channels.newChannel(in));
-		}
+        protected StubRequestContext(RequestPath requestPath, Locale defaultLocale, Headers headers, InputStream in,
+                String method) {
+            super(requestPath, defaultLocale);
+            this.headers = headers;
+            this.in = DefaultReadableBuffer.readBuffer(Channels.newChannel(in));
+        }
 
-		@Override
-		public Headers getRequestHeaders() {
-			return headers;
-		}
+        @Override
+        public Headers getRequestHeaders() {
+            return headers;
+        }
 
-		@Override
-		public ReadableBuffer getRequestBody() throws IOException {
-			return in;
-		}
+        @Override
+        public ReadableBuffer getRequestBody() throws IOException {
+            return in;
+        }
 
-		@Override
-		public String getRequestMethod() {
-			return method;
-		}
-	}
+        @Override
+        public String getRequestMethod() {
+            return method;
+        }
+    }
 }
diff --git a/src/test/java/org/analogweb/core/AcceptLanguagesTest.java b/src/test/java/org/analogweb/core/AcceptLanguagesTest.java
index 3e6ad04..b7452ba 100644
--- a/src/test/java/org/analogweb/core/AcceptLanguagesTest.java
+++ b/src/test/java/org/analogweb/core/AcceptLanguagesTest.java
@@ -17,16 +17,16 @@
 
 public class AcceptLanguagesTest {
 
-	private RequestContext request;
-	private Headers headers;
+    private RequestContext request;
+    private Headers headers;
 
-	@Before
-	public void setUp() {
-		request = mock(RequestContext.class);
-		headers = mock(Headers.class);
-	}
+    @Before
+    public void setUp() {
+        request = mock(RequestContext.class);
+        headers = mock(Headers.class);
+    }
 
-	@Test
+    @Test
 	public void testGetLocale() {
 		when(request.getRequestHeaders()).thenReturn(headers);
 		when(headers.getValues("Accept-Language"))
@@ -39,7 +39,7 @@ public void testGetLocale() {
 		assertThat(lang.getLocale(), is(Locale.CANADA));
 	}
 
-	@Test
+    @Test
 	public void testGetLocaleWithEmptyHeader() {
 		when(request.getRequestHeaders()).thenReturn(headers);
 		when(headers.getValues("Accept-Language")).thenReturn(null);
diff --git a/src/test/java/org/analogweb/core/AnnotationInvocationMetadataFactoryTest.java b/src/test/java/org/analogweb/core/AnnotationInvocationMetadataFactoryTest.java
index afbde07..70e4831 100644
--- a/src/test/java/org/analogweb/core/AnnotationInvocationMetadataFactoryTest.java
+++ b/src/test/java/org/analogweb/core/AnnotationInvocationMetadataFactoryTest.java
@@ -25,330 +25,268 @@
  */
 public class AnnotationInvocationMetadataFactoryTest {
 
-	private AnnotationInvocationMetadataFactory factory;
-
-	@Before
-	public void setUp() {
-		factory = new AnnotationInvocationMetadataFactory();
-	}
-
-	@Test
-	public void testDetectAnnotatedAction() throws Exception {
-		Class<?> actionsClass = FooResource.class;
-		Method actionMethod = FooResource.class.getMethod("doSomething",
-				(Class[]) null);
-		InvocationMetadata actionMethodMetadata = factory
-				.createInvocationMetadata(actionsClass, actionMethod);
-		assertThat(
-				actionMethodMetadata.getInvocationClass().getCanonicalName(),
-				is(FooResource.class.getCanonicalName()));
-		assertThat(actionMethodMetadata.getArgumentTypes().length, is(0));
-		assertThat(actionMethodMetadata.getMethodName(), is("doSomething"));
-		assertThat(actionMethodMetadata.getDefinedPath().getActualPath(),
-				is("/foo/something/done"));
-		List<String> requestMethods = ((RequestPathDefinition) actionMethodMetadata
-				.getDefinedPath()).getRequestMethods();
-		assertThat(requestMethods.size(), is(2));
-		assertTrue(requestMethods.contains("GET"));
-		assertTrue(requestMethods.contains("POST"));
-	}
-
-	@Test
-	public void testDetectAnnotatedActionWithoutTypePathMapping()
-			throws Exception {
-		Class<?> actionsClass = BazResource.class;
-		Method actionMethod = FooResource.class.getMethod("doSomething",
-				(Class[]) null);
-		InvocationMetadata actionMethodMetadata = factory
-				.createInvocationMetadata(actionsClass, actionMethod);
-		assertThat(actionMethodMetadata, is(nullValue()));
-	}
-
-	@Test
-	public void testDetectAnnotatedActionWithPostMethod() throws Exception {
-		Class<?> actionsClass = BaaResource.class;
-		Method actionMethod = BaaResource.class.getMethod(
-				"doSomethingWithPostMethod", (Class[]) null);
-		InvocationMetadata actionMethodMetadata = factory
-				.createInvocationMetadata(actionsClass, actionMethod);
-		assertThat(
-				actionMethodMetadata.getInvocationClass().getCanonicalName(),
-				is(BaaResource.class.getCanonicalName()));
-		assertThat(actionMethodMetadata.getArgumentTypes().length, is(0));
-		assertThat(actionMethodMetadata.getMethodName(),
-				is("doSomethingWithPostMethod"));
-		assertThat(actionMethodMetadata.getDefinedPath().getActualPath(),
-				is("/baa/something/post"));
-		List<String> requestMethods = ((RequestPathDefinition) actionMethodMetadata
-				.getDefinedPath()).getRequestMethods();
-		assertThat(requestMethods.size(), is(1));
-		assertTrue(requestMethods.contains("POST"));
-	}
-
-	@Test
-	public void testDetectAnnotatedActionWithGetMethod() throws Exception {
-		Class<?> actionsClass = BaaResource.class;
-		Method actionMethod = BaaResource.class.getMethod(
-				"doSomethingWithGetMethod", (Class[]) null);
-		InvocationMetadata actionMethodMetadata = factory
-				.createInvocationMetadata(actionsClass, actionMethod);
-		assertThat(
-				actionMethodMetadata.getInvocationClass().getCanonicalName(),
-				is(BaaResource.class.getCanonicalName()));
-		assertThat(actionMethodMetadata.getArgumentTypes().length, is(0));
-		assertThat(actionMethodMetadata.getMethodName(),
-				is("doSomethingWithGetMethod"));
-		assertThat(actionMethodMetadata.getDefinedPath().getActualPath(),
-				is("/baa/something/get"));
-		List<String> requestMethods = ((RequestPathDefinition) actionMethodMetadata
-				.getDefinedPath()).getRequestMethods();
-		assertThat(requestMethods.size(), is(1));
-		assertTrue(requestMethods.contains("GET"));
-	}
-
-	@Test
-	public void testDetectAnnotatedActionWithPutMethod() throws Exception {
-		Class<?> actionsClass = BaaResource.class;
-		Method actionMethod = BaaResource.class.getMethod(
-				"doSomethingWithPutMethod", (Class[]) null);
-		InvocationMetadata actionMethodMetadata = factory
-				.createInvocationMetadata(actionsClass, actionMethod);
-		assertThat(
-				actionMethodMetadata.getInvocationClass().getCanonicalName(),
-				is(BaaResource.class.getCanonicalName()));
-		assertThat(actionMethodMetadata.getArgumentTypes().length, is(0));
-		assertThat(actionMethodMetadata.getMethodName(),
-				is("doSomethingWithPutMethod"));
-		assertThat(actionMethodMetadata.getDefinedPath().getActualPath(),
-				is("/baa/something/put"));
-		List<String> requestMethods = ((RequestPathDefinition) actionMethodMetadata
-				.getDefinedPath()).getRequestMethods();
-		assertThat(requestMethods.size(), is(1));
-		assertTrue(requestMethods.contains("PUT"));
-	}
-
-	@Test
-	public void testDetectAnnotatedActionWithDeleteMethod() throws Exception {
-		Class<?> actionsClass = BaaResource.class;
-		Method actionMethod = BaaResource.class.getMethod(
-				"doSomethingWithDeleteMethod", new Class[]{String.class});
-		InvocationMetadata actionMethodMetadata = factory
-				.createInvocationMetadata(actionsClass, actionMethod);
-		assertThat(
-				actionMethodMetadata.getInvocationClass().getCanonicalName(),
-				is(BaaResource.class.getCanonicalName()));
-		assertThat(actionMethodMetadata.getArgumentTypes().length, is(1));
-		assertThat(actionMethodMetadata.getMethodName(),
-				is("doSomethingWithDeleteMethod"));
-		assertThat(actionMethodMetadata.getDefinedPath().getActualPath(),
-				is("/baa/something/delete"));
-		List<String> requestMethods = ((RequestPathDefinition) actionMethodMetadata
-				.getDefinedPath()).getRequestMethods();
-		assertThat(requestMethods.size(), is(1));
-		assertTrue(requestMethods.contains("DELETE"));
-	}
-
-	@Test
-	public void testDetectAnnotatedActionWithArg() throws Exception {
-		Class<?> actionsClass = FooResource.class;
-		Method actionMethod = FooResource.class.getMethod("doSomethingWithArg",
-				new Class<?>[]{String.class});
-		InvocationMetadata actionMethodMetadata = factory
-				.createInvocationMetadata(actionsClass, actionMethod);
-		assertThat(
-				actionMethodMetadata.getInvocationClass().getCanonicalName(),
-				is(FooResource.class.getCanonicalName()));
-		assertThat(actionMethodMetadata.getArgumentTypes().length, is(1));
-		assertThat(
-				actionMethodMetadata.getArgumentTypes()[0].getCanonicalName(),
-				is(String.class.getCanonicalName()));
-		assertThat(actionMethodMetadata.getMethodName(),
-				is("doSomethingWithArg"));
-		assertThat(actionMethodMetadata.getDefinedPath().getActualPath(),
-				is("/foo/something/donewitharg"));
-	}
-
-	@Test
-	public void testDetectAnnotatedActionNoDetectable() throws Exception {
-		Class<?> actionsClass = FooResource.class;
-		Method actionMethod = FooResource.class.getMethod(
-				"doSomethingNoDetectable", new Class<?>[]{String.class,
-						Integer.class});
-		assertThat(
-				factory.createInvocationMetadata(actionsClass, actionMethod),
-				is(nullValue()));
-	}
-
-	@Test
-	public void testDetectAnnotatedActionWithArgAndPathAutoDetection()
-			throws Exception {
-		Class<?> actionsClass = FooResource.class;
-		Method actionMethod = FooResource.class.getMethod(
-				"doSomethingNameBased", new Class<?>[]{String.class});
-		InvocationMetadata actionMethodMetadata = factory
-				.createInvocationMetadata(actionsClass, actionMethod);
-		assertThat(
-				actionMethodMetadata.getInvocationClass().getCanonicalName(),
-				is(FooResource.class.getCanonicalName()));
-		assertThat(actionMethodMetadata.getArgumentTypes().length, is(1));
-		assertThat(
-				actionMethodMetadata.getArgumentTypes()[0].getCanonicalName(),
-				is(String.class.getCanonicalName()));
-		assertThat(actionMethodMetadata.getMethodName(),
-				is("doSomethingNameBased"));
-		assertThat(actionMethodMetadata.getDefinedPath().getActualPath(),
-				is("/foo/doSomethingNameBased"));
-	}
-
-	@Test
-	public void testDetectAnnotatedActionWithRootPathAutoDetection()
-			throws Exception {
-		Class<?> actionsClass = BaaResource.class;
-		Method actionMethod = BaaResource.class.getMethod(
-				"doSomethingNameBased", new Class<?>[]{String.class});
-		InvocationMetadata actionMethodMetadata = factory
-				.createInvocationMetadata(actionsClass, actionMethod);
-		assertThat(
-				actionMethodMetadata.getInvocationClass().getCanonicalName(),
-				is(BaaResource.class.getCanonicalName()));
-		assertThat(actionMethodMetadata.getArgumentTypes().length, is(1));
-		assertThat(
-				actionMethodMetadata.getArgumentTypes()[0].getCanonicalName(),
-				is(String.class.getCanonicalName()));
-		assertThat(actionMethodMetadata.getMethodName(),
-				is("doSomethingNameBased"));
-		assertThat(actionMethodMetadata.getDefinedPath().getActualPath(),
-				is("/baa/doSomethingNameBased"));
-	}
-
-	@Test
-	public void testDetectAnnotatedActionInhelitance() throws Exception {
-		Class<?> actionsClass = Child.class;
-		Method actionMethod = Child.class.getMethod("resolve", String.class);
-		InvocationMetadata actionMethodMetadata = factory
-				.createInvocationMetadata(actionsClass, actionMethod);
-		assertThat(
-				actionMethodMetadata.getInvocationClass().getCanonicalName(),
-				is(Child.class.getCanonicalName()));
-		assertThat(
-				actionMethodMetadata.getArgumentTypes()[0].getCanonicalName(),
-				is(String.class.getCanonicalName()));
-		assertThat(actionMethodMetadata.getMethodName(), is("resolve"));
-		assertThat(actionMethodMetadata.getDefinedPath().getActualPath(),
-				is("/child/resolve"));
-		List<String> requestMethods = ((RequestPathDefinition) actionMethodMetadata
-				.getDefinedPath()).getRequestMethods();
-		assertThat(requestMethods.size(), is(2));
-		assertTrue(requestMethods.contains("GET"));
-		assertTrue(requestMethods.contains("POST"));
-	}
-
-	@Test
-	@Ignore("Java8 resolves annotation via bridge methods.")
-	public void testDetectAnnotatedActionWithBridgeMethod() throws Exception {
-		Class<?> actionsClass = Child.class;
-		Method actionMethod = Child.class.getMethod("resolve", Object.class);
-		InvocationMetadata actionMethodMetadata = factory
-				.createInvocationMetadata(actionsClass, actionMethod);
-		assertThat(actionMethodMetadata, is(nullValue()));
-	}
-
-	@Route("/foo")
-	public static class FooResource {
-
-		@Route("/something/done")
-		public Renderable doSomething() {
-			return null;
-		}
-
-		@Route("something/donewitharg")
-		public Renderable doSomethingWithArg(@As("arg") String arg) {
-			return null;
-		}
-
-		public Renderable doSomethingNoDetectable(String arg,
-				@As("foo") Integer foo) {
-			return null;
-		}
-
-		@Route
-		public Renderable doSomethingNameBased(@As("arg") String arg) {
-			return null;
-		}
-	}
-
-	@Route
-	public static class BaaResource {
-
-		@Route("/something/done")
-		public Renderable doSomething() {
-			return null;
-		}
-
-		@Route("something/donewitharg")
-		public Renderable doSomethingWithArg(@As("arg") String arg) {
-			return null;
-		}
-
-		public Renderable doSomethingNoDetectable(String arg,
-				@As("foo") Integer foo) {
-			return null;
-		}
-
-		@Route
-		public Renderable doSomethingNameBased(@As("arg") String arg) {
-			return null;
-		}
-
-		@Route("/something/post")
-		@Post
-		public Renderable doSomethingWithPostMethod() {
-			return null;
-		}
-
-		@Route("/something/get")
-		@Get
-		public Renderable doSomethingWithGetMethod() {
-			return null;
-		}
-
-		@Route("/something/delete")
-		@Delete
-		public Renderable doSomethingWithDeleteMethod(@As("arg") String arg) {
-			return null;
-		}
-
-		@Route("/something/put")
-		@Put
-		public Renderable doSomethingWithPutMethod() {
-			return null;
-		}
-	}
-
-	public static class BazResource {
-
-		@Route("/something/done")
-		public Renderable doSomething() {
-			return null;
-		}
-	}
-
-	@Route
-	public static class Parent<T> {
-
-		@Route
-		public T resolve(T foo) {
-			return null;
-		}
-	}
-
-	public static class Child extends Parent<String> {
-
-		// generate bridge method.
-		@Override
-		@Route
-		public String resolve(String foo) {
-			return "resolved!";
-		}
-	}
+    private AnnotationInvocationMetadataFactory factory;
+
+    @Before
+    public void setUp() {
+        factory = new AnnotationInvocationMetadataFactory();
+    }
+
+    @Test
+    public void testDetectAnnotatedAction() throws Exception {
+        Class<?> actionsClass = FooResource.class;
+        Method actionMethod = FooResource.class.getMethod("doSomething", (Class[]) null);
+        InvocationMetadata actionMethodMetadata = factory.createInvocationMetadata(actionsClass, actionMethod);
+        assertThat(actionMethodMetadata.getInvocationClass().getCanonicalName(),
+                is(FooResource.class.getCanonicalName()));
+        assertThat(actionMethodMetadata.getArgumentTypes().length, is(0));
+        assertThat(actionMethodMetadata.getMethodName(), is("doSomething"));
+        assertThat(actionMethodMetadata.getDefinedPath().getActualPath(), is("/foo/something/done"));
+        List<String> requestMethods = ((RequestPathDefinition) actionMethodMetadata.getDefinedPath())
+                .getRequestMethods();
+        assertThat(requestMethods.size(), is(2));
+        assertTrue(requestMethods.contains("GET"));
+        assertTrue(requestMethods.contains("POST"));
+    }
+
+    @Test
+    public void testDetectAnnotatedActionWithoutTypePathMapping() throws Exception {
+        Class<?> actionsClass = BazResource.class;
+        Method actionMethod = FooResource.class.getMethod("doSomething", (Class[]) null);
+        InvocationMetadata actionMethodMetadata = factory.createInvocationMetadata(actionsClass, actionMethod);
+        assertThat(actionMethodMetadata, is(nullValue()));
+    }
+
+    @Test
+    public void testDetectAnnotatedActionWithPostMethod() throws Exception {
+        Class<?> actionsClass = BaaResource.class;
+        Method actionMethod = BaaResource.class.getMethod("doSomethingWithPostMethod", (Class[]) null);
+        InvocationMetadata actionMethodMetadata = factory.createInvocationMetadata(actionsClass, actionMethod);
+        assertThat(actionMethodMetadata.getInvocationClass().getCanonicalName(),
+                is(BaaResource.class.getCanonicalName()));
+        assertThat(actionMethodMetadata.getArgumentTypes().length, is(0));
+        assertThat(actionMethodMetadata.getMethodName(), is("doSomethingWithPostMethod"));
+        assertThat(actionMethodMetadata.getDefinedPath().getActualPath(), is("/baa/something/post"));
+        List<String> requestMethods = ((RequestPathDefinition) actionMethodMetadata.getDefinedPath())
+                .getRequestMethods();
+        assertThat(requestMethods.size(), is(1));
+        assertTrue(requestMethods.contains("POST"));
+    }
+
+    @Test
+    public void testDetectAnnotatedActionWithGetMethod() throws Exception {
+        Class<?> actionsClass = BaaResource.class;
+        Method actionMethod = BaaResource.class.getMethod("doSomethingWithGetMethod", (Class[]) null);
+        InvocationMetadata actionMethodMetadata = factory.createInvocationMetadata(actionsClass, actionMethod);
+        assertThat(actionMethodMetadata.getInvocationClass().getCanonicalName(),
+                is(BaaResource.class.getCanonicalName()));
+        assertThat(actionMethodMetadata.getArgumentTypes().length, is(0));
+        assertThat(actionMethodMetadata.getMethodName(), is("doSomethingWithGetMethod"));
+        assertThat(actionMethodMetadata.getDefinedPath().getActualPath(), is("/baa/something/get"));
+        List<String> requestMethods = ((RequestPathDefinition) actionMethodMetadata.getDefinedPath())
+                .getRequestMethods();
+        assertThat(requestMethods.size(), is(1));
+        assertTrue(requestMethods.contains("GET"));
+    }
+
+    @Test
+    public void testDetectAnnotatedActionWithPutMethod() throws Exception {
+        Class<?> actionsClass = BaaResource.class;
+        Method actionMethod = BaaResource.class.getMethod("doSomethingWithPutMethod", (Class[]) null);
+        InvocationMetadata actionMethodMetadata = factory.createInvocationMetadata(actionsClass, actionMethod);
+        assertThat(actionMethodMetadata.getInvocationClass().getCanonicalName(),
+                is(BaaResource.class.getCanonicalName()));
+        assertThat(actionMethodMetadata.getArgumentTypes().length, is(0));
+        assertThat(actionMethodMetadata.getMethodName(), is("doSomethingWithPutMethod"));
+        assertThat(actionMethodMetadata.getDefinedPath().getActualPath(), is("/baa/something/put"));
+        List<String> requestMethods = ((RequestPathDefinition) actionMethodMetadata.getDefinedPath())
+                .getRequestMethods();
+        assertThat(requestMethods.size(), is(1));
+        assertTrue(requestMethods.contains("PUT"));
+    }
+
+    @Test
+    public void testDetectAnnotatedActionWithDeleteMethod() throws Exception {
+        Class<?> actionsClass = BaaResource.class;
+        Method actionMethod = BaaResource.class.getMethod("doSomethingWithDeleteMethod", new Class[] { String.class });
+        InvocationMetadata actionMethodMetadata = factory.createInvocationMetadata(actionsClass, actionMethod);
+        assertThat(actionMethodMetadata.getInvocationClass().getCanonicalName(),
+                is(BaaResource.class.getCanonicalName()));
+        assertThat(actionMethodMetadata.getArgumentTypes().length, is(1));
+        assertThat(actionMethodMetadata.getMethodName(), is("doSomethingWithDeleteMethod"));
+        assertThat(actionMethodMetadata.getDefinedPath().getActualPath(), is("/baa/something/delete"));
+        List<String> requestMethods = ((RequestPathDefinition) actionMethodMetadata.getDefinedPath())
+                .getRequestMethods();
+        assertThat(requestMethods.size(), is(1));
+        assertTrue(requestMethods.contains("DELETE"));
+    }
+
+    @Test
+    public void testDetectAnnotatedActionWithArg() throws Exception {
+        Class<?> actionsClass = FooResource.class;
+        Method actionMethod = FooResource.class.getMethod("doSomethingWithArg", new Class<?>[] { String.class });
+        InvocationMetadata actionMethodMetadata = factory.createInvocationMetadata(actionsClass, actionMethod);
+        assertThat(actionMethodMetadata.getInvocationClass().getCanonicalName(),
+                is(FooResource.class.getCanonicalName()));
+        assertThat(actionMethodMetadata.getArgumentTypes().length, is(1));
+        assertThat(actionMethodMetadata.getArgumentTypes()[0].getCanonicalName(), is(String.class.getCanonicalName()));
+        assertThat(actionMethodMetadata.getMethodName(), is("doSomethingWithArg"));
+        assertThat(actionMethodMetadata.getDefinedPath().getActualPath(), is("/foo/something/donewitharg"));
+    }
+
+    @Test
+    public void testDetectAnnotatedActionNoDetectable() throws Exception {
+        Class<?> actionsClass = FooResource.class;
+        Method actionMethod = FooResource.class.getMethod("doSomethingNoDetectable",
+                new Class<?>[] { String.class, Integer.class });
+        assertThat(factory.createInvocationMetadata(actionsClass, actionMethod), is(nullValue()));
+    }
+
+    @Test
+    public void testDetectAnnotatedActionWithArgAndPathAutoDetection() throws Exception {
+        Class<?> actionsClass = FooResource.class;
+        Method actionMethod = FooResource.class.getMethod("doSomethingNameBased", new Class<?>[] { String.class });
+        InvocationMetadata actionMethodMetadata = factory.createInvocationMetadata(actionsClass, actionMethod);
+        assertThat(actionMethodMetadata.getInvocationClass().getCanonicalName(),
+                is(FooResource.class.getCanonicalName()));
+        assertThat(actionMethodMetadata.getArgumentTypes().length, is(1));
+        assertThat(actionMethodMetadata.getArgumentTypes()[0].getCanonicalName(), is(String.class.getCanonicalName()));
+        assertThat(actionMethodMetadata.getMethodName(), is("doSomethingNameBased"));
+        assertThat(actionMethodMetadata.getDefinedPath().getActualPath(), is("/foo/doSomethingNameBased"));
+    }
+
+    @Test
+    public void testDetectAnnotatedActionWithRootPathAutoDetection() throws Exception {
+        Class<?> actionsClass = BaaResource.class;
+        Method actionMethod = BaaResource.class.getMethod("doSomethingNameBased", new Class<?>[] { String.class });
+        InvocationMetadata actionMethodMetadata = factory.createInvocationMetadata(actionsClass, actionMethod);
+        assertThat(actionMethodMetadata.getInvocationClass().getCanonicalName(),
+                is(BaaResource.class.getCanonicalName()));
+        assertThat(actionMethodMetadata.getArgumentTypes().length, is(1));
+        assertThat(actionMethodMetadata.getArgumentTypes()[0].getCanonicalName(), is(String.class.getCanonicalName()));
+        assertThat(actionMethodMetadata.getMethodName(), is("doSomethingNameBased"));
+        assertThat(actionMethodMetadata.getDefinedPath().getActualPath(), is("/baa/doSomethingNameBased"));
+    }
+
+    @Test
+    public void testDetectAnnotatedActionInhelitance() throws Exception {
+        Class<?> actionsClass = Child.class;
+        Method actionMethod = Child.class.getMethod("resolve", String.class);
+        InvocationMetadata actionMethodMetadata = factory.createInvocationMetadata(actionsClass, actionMethod);
+        assertThat(actionMethodMetadata.getInvocationClass().getCanonicalName(), is(Child.class.getCanonicalName()));
+        assertThat(actionMethodMetadata.getArgumentTypes()[0].getCanonicalName(), is(String.class.getCanonicalName()));
+        assertThat(actionMethodMetadata.getMethodName(), is("resolve"));
+        assertThat(actionMethodMetadata.getDefinedPath().getActualPath(), is("/child/resolve"));
+        List<String> requestMethods = ((RequestPathDefinition) actionMethodMetadata.getDefinedPath())
+                .getRequestMethods();
+        assertThat(requestMethods.size(), is(2));
+        assertTrue(requestMethods.contains("GET"));
+        assertTrue(requestMethods.contains("POST"));
+    }
+
+    @Test
+    @Ignore("Java8 resolves annotation via bridge methods.")
+    public void testDetectAnnotatedActionWithBridgeMethod() throws Exception {
+        Class<?> actionsClass = Child.class;
+        Method actionMethod = Child.class.getMethod("resolve", Object.class);
+        InvocationMetadata actionMethodMetadata = factory.createInvocationMetadata(actionsClass, actionMethod);
+        assertThat(actionMethodMetadata, is(nullValue()));
+    }
+
+    @Route("/foo")
+    public static class FooResource {
+
+        @Route("/something/done")
+        public Renderable doSomething() {
+            return null;
+        }
+
+        @Route("something/donewitharg")
+        public Renderable doSomethingWithArg(@As("arg") String arg) {
+            return null;
+        }
+
+        public Renderable doSomethingNoDetectable(String arg, @As("foo") Integer foo) {
+            return null;
+        }
+
+        @Route
+        public Renderable doSomethingNameBased(@As("arg") String arg) {
+            return null;
+        }
+    }
+
+    @Route
+    public static class BaaResource {
+
+        @Route("/something/done")
+        public Renderable doSomething() {
+            return null;
+        }
+
+        @Route("something/donewitharg")
+        public Renderable doSomethingWithArg(@As("arg") String arg) {
+            return null;
+        }
+
+        public Renderable doSomethingNoDetectable(String arg, @As("foo") Integer foo) {
+            return null;
+        }
+
+        @Route
+        public Renderable doSomethingNameBased(@As("arg") String arg) {
+            return null;
+        }
+
+        @Route("/something/post")
+        @Post
+        public Renderable doSomethingWithPostMethod() {
+            return null;
+        }
+
+        @Route("/something/get")
+        @Get
+        public Renderable doSomethingWithGetMethod() {
+            return null;
+        }
+
+        @Route("/something/delete")
+        @Delete
+        public Renderable doSomethingWithDeleteMethod(@As("arg") String arg) {
+            return null;
+        }
+
+        @Route("/something/put")
+        @Put
+        public Renderable doSomethingWithPutMethod() {
+            return null;
+        }
+    }
+
+    public static class BazResource {
+
+        @Route("/something/done")
+        public Renderable doSomething() {
+            return null;
+        }
+    }
+
+    @Route
+    public static class Parent<T> {
+
+        @Route
+        public T resolve(T foo) {
+            return null;
+        }
+    }
+
+    public static class Child extends Parent<String> {
+
+        // generate bridge method.
+        @Override
+        @Route
+        public String resolve(String foo) {
+            return "resolved!";
+        }
+    }
 }
diff --git a/src/test/java/org/analogweb/core/AutoTypeMapperTest.java b/src/test/java/org/analogweb/core/AutoTypeMapperTest.java
index f1714bb..5f21756 100644
--- a/src/test/java/org/analogweb/core/AutoTypeMapperTest.java
+++ b/src/test/java/org/analogweb/core/AutoTypeMapperTest.java
@@ -21,265 +21,236 @@
  */
 public class AutoTypeMapperTest {
 
-	private AutoTypeMapper typeMapper;
+    private AutoTypeMapper typeMapper;
 
-	@Before
-	public void setUp() throws Exception {
-		typeMapper = new AutoTypeMapper();
-	}
+    @Before
+    public void setUp() throws Exception {
+        typeMapper = new AutoTypeMapper();
+    }
 
-	@Test
-	public void testMapToType() {
-		String actual = (String) typeMapper
-				.mapToType("foo", String.class, null);
-		assertThat(actual, is("foo"));
-	}
+    @Test
+    public void testMapToType() {
+        String actual = (String) typeMapper.mapToType("foo", String.class, null);
+        assertThat(actual, is("foo"));
+    }
 
-	@Test
-	public void testMapToTypeMapperNotFound() {
-		Object actual = typeMapper.mapToType("foo", TypeMapper.class, null);
-		assertNull(actual);
-	}
+    @Test
+    public void testMapToTypeMapperNotFound() {
+        Object actual = typeMapper.mapToType("foo", TypeMapper.class, null);
+        assertNull(actual);
+    }
 
-	@Test
-	public void testMapToTypeToByte() {
-		byte actual = (Byte) typeMapper.mapToType(null, byte.class, null);
-		assertThat(actual, is((byte) 0));
-	}
+    @Test
+    public void testMapToTypeToByte() {
+        byte actual = (Byte) typeMapper.mapToType(null, byte.class, null);
+        assertThat(actual, is((byte) 0));
+    }
 
-	@Test
-	public void testMapToTypeToBoolean() {
-		Boolean actual = (Boolean) typeMapper.mapToType("true", Boolean.class,
-				null);
-		assertTrue(actual);
-		boolean nativeActual = (Boolean) typeMapper.mapToType("true",
-				boolean.class, null);
-		assertTrue(nativeActual);
-		actual = (Boolean) typeMapper.mapToType("on", Boolean.class, null);
-		assertTrue(actual);
-		nativeActual = (Boolean) typeMapper
-				.mapToType("on", boolean.class, null);
-		assertTrue(nativeActual);
-		actual = (Boolean) typeMapper.mapToType("yes", Boolean.class, null);
-		assertTrue(actual);
-		nativeActual = (Boolean) typeMapper.mapToType("yes", boolean.class,
-				null);
-		assertTrue(nativeActual);
-		actual = (Boolean) typeMapper.mapToType("false", Boolean.class, null);
-		assertFalse(actual);
-		nativeActual = (Boolean) typeMapper.mapToType("false", boolean.class,
-				null);
-		assertFalse(nativeActual);
-		actual = (Boolean) typeMapper.mapToType("no", Boolean.class, null);
-		assertFalse(actual);
-		nativeActual = (Boolean) typeMapper
-				.mapToType("no", boolean.class, null);
-		assertFalse(nativeActual);
-		actual = (Boolean) typeMapper.mapToType("", Boolean.class, null);
-		assertFalse(actual);
-		nativeActual = (Boolean) typeMapper.mapToType("", boolean.class, null);
-		assertFalse(nativeActual);
-		boolean nativeBool = (Boolean) typeMapper.mapToType(null,
-				boolean.class, null);
-		assertFalse(nativeBool);
-	}
+    @Test
+    public void testMapToTypeToBoolean() {
+        Boolean actual = (Boolean) typeMapper.mapToType("true", Boolean.class, null);
+        assertTrue(actual);
+        boolean nativeActual = (Boolean) typeMapper.mapToType("true", boolean.class, null);
+        assertTrue(nativeActual);
+        actual = (Boolean) typeMapper.mapToType("on", Boolean.class, null);
+        assertTrue(actual);
+        nativeActual = (Boolean) typeMapper.mapToType("on", boolean.class, null);
+        assertTrue(nativeActual);
+        actual = (Boolean) typeMapper.mapToType("yes", Boolean.class, null);
+        assertTrue(actual);
+        nativeActual = (Boolean) typeMapper.mapToType("yes", boolean.class, null);
+        assertTrue(nativeActual);
+        actual = (Boolean) typeMapper.mapToType("false", Boolean.class, null);
+        assertFalse(actual);
+        nativeActual = (Boolean) typeMapper.mapToType("false", boolean.class, null);
+        assertFalse(nativeActual);
+        actual = (Boolean) typeMapper.mapToType("no", Boolean.class, null);
+        assertFalse(actual);
+        nativeActual = (Boolean) typeMapper.mapToType("no", boolean.class, null);
+        assertFalse(nativeActual);
+        actual = (Boolean) typeMapper.mapToType("", Boolean.class, null);
+        assertFalse(actual);
+        nativeActual = (Boolean) typeMapper.mapToType("", boolean.class, null);
+        assertFalse(nativeActual);
+        boolean nativeBool = (Boolean) typeMapper.mapToType(null, boolean.class, null);
+        assertFalse(nativeBool);
+    }
 
-	@Test
-	public void testMapToTypeToCharactor() throws Exception {
-		Character actual = (Character) typeMapper.mapToType("ab",
-				Character.class, null);
-		assertThat(actual, is('a'));
-		actual = (Character) typeMapper.mapToType("ab", char.class, null);
-		assertThat(actual, is('a'));
-		actual = (Character) typeMapper.mapToType("b", Character.class, null);
-		assertThat(actual, is('b'));
-		actual = (Character) typeMapper.mapToType("b", char.class, null);
-		assertThat(actual, is('b'));
-		actual = (Character) typeMapper.mapToType("A", Character.class, null);
-		assertThat(actual, is('A'));
-		actual = (Character) typeMapper.mapToType("ABC", Character.class, null);
-		assertThat(actual, is('A'));
-		assertNull(typeMapper.mapToType("", Character.class, null));
-		assertNull(typeMapper.mapToType(null, Character.class, null));
-		char actualChar = (Character) typeMapper.mapToType(null, char.class,
-				null);
-		assertThat(actualChar, is(Character.MIN_VALUE));
-	}
+    @Test
+    public void testMapToTypeToCharactor() throws Exception {
+        Character actual = (Character) typeMapper.mapToType("ab", Character.class, null);
+        assertThat(actual, is('a'));
+        actual = (Character) typeMapper.mapToType("ab", char.class, null);
+        assertThat(actual, is('a'));
+        actual = (Character) typeMapper.mapToType("b", Character.class, null);
+        assertThat(actual, is('b'));
+        actual = (Character) typeMapper.mapToType("b", char.class, null);
+        assertThat(actual, is('b'));
+        actual = (Character) typeMapper.mapToType("A", Character.class, null);
+        assertThat(actual, is('A'));
+        actual = (Character) typeMapper.mapToType("ABC", Character.class, null);
+        assertThat(actual, is('A'));
+        assertNull(typeMapper.mapToType("", Character.class, null));
+        assertNull(typeMapper.mapToType(null, Character.class, null));
+        char actualChar = (Character) typeMapper.mapToType(null, char.class, null);
+        assertThat(actualChar, is(Character.MIN_VALUE));
+    }
 
-	@Test
-	public void testMapToTypeToShort() throws Exception {
-		Short actual = (Short) typeMapper.mapToType("1", Short.class, null);
-		assertThat(actual, is((short) 1));
-		actual = (Short) typeMapper.mapToType("1", short.class, null);
-		assertThat(actual, is((short) 1));
-		actual = (Short) typeMapper.mapToType(null, Short.class, null);
-		assertNull(actual);
-		short actualShort = (Short) typeMapper.mapToType(null, short.class,
-				null);
-		assertThat(actualShort, is((short) 0));
-		actual = (Short) typeMapper.mapToType("", Short.class, null);
-		assertNull(actual);
-		actual = (Short) typeMapper.mapToType("", short.class, null);
-		assertNull(actual);
-		actual = (Short) typeMapper.mapToType("Nan", Short.class, null);
-		assertNull(actual);
-		actual = (Short) typeMapper
-				.mapToType("Not-A-Number", short.class, null);
-		assertNull(actual);
-	}
+    @Test
+    public void testMapToTypeToShort() throws Exception {
+        Short actual = (Short) typeMapper.mapToType("1", Short.class, null);
+        assertThat(actual, is((short) 1));
+        actual = (Short) typeMapper.mapToType("1", short.class, null);
+        assertThat(actual, is((short) 1));
+        actual = (Short) typeMapper.mapToType(null, Short.class, null);
+        assertNull(actual);
+        short actualShort = (Short) typeMapper.mapToType(null, short.class, null);
+        assertThat(actualShort, is((short) 0));
+        actual = (Short) typeMapper.mapToType("", Short.class, null);
+        assertNull(actual);
+        actual = (Short) typeMapper.mapToType("", short.class, null);
+        assertNull(actual);
+        actual = (Short) typeMapper.mapToType("Nan", Short.class, null);
+        assertNull(actual);
+        actual = (Short) typeMapper.mapToType("Not-A-Number", short.class, null);
+        assertNull(actual);
+    }
 
-	@Test
-	public void testMapToTypeToDouble() throws Exception {
-		Double actual = (Double) typeMapper
-				.mapToType("1.0", Double.class, null);
-		assertThat(actual, is(1.0));
-		actual = (Double) typeMapper.mapToType("2.2", double.class, null);
-		assertThat(actual, is(2.2));
-		actual = (Double) typeMapper.mapToType(null, Double.class, null);
-		assertNull(actual);
-		double actualDouble = (Double) typeMapper.mapToType(null, double.class,
-				null);
-		assertThat(actualDouble, is(0.0d));
-		actual = (Double) typeMapper.mapToType("", Double.class, null);
-		assertNull(actual);
-		actual = (Double) typeMapper.mapToType("", double.class, null);
-		assertNull(actual);
-		actual = (Double) typeMapper.mapToType("Nan", Double.class, null);
-		assertNull(actual);
-		actual = (Double) typeMapper.mapToType("Not-A-Number", double.class,
-				null);
-		assertNull(actual);
-	}
+    @Test
+    public void testMapToTypeToDouble() throws Exception {
+        Double actual = (Double) typeMapper.mapToType("1.0", Double.class, null);
+        assertThat(actual, is(1.0));
+        actual = (Double) typeMapper.mapToType("2.2", double.class, null);
+        assertThat(actual, is(2.2));
+        actual = (Double) typeMapper.mapToType(null, Double.class, null);
+        assertNull(actual);
+        double actualDouble = (Double) typeMapper.mapToType(null, double.class, null);
+        assertThat(actualDouble, is(0.0d));
+        actual = (Double) typeMapper.mapToType("", Double.class, null);
+        assertNull(actual);
+        actual = (Double) typeMapper.mapToType("", double.class, null);
+        assertNull(actual);
+        actual = (Double) typeMapper.mapToType("Nan", Double.class, null);
+        assertNull(actual);
+        actual = (Double) typeMapper.mapToType("Not-A-Number", double.class, null);
+        assertNull(actual);
+    }
 
-	@Test
-	public void testMapToTypeToFloat() throws Exception {
-		Float actual = (Float) typeMapper.mapToType("1.0", Float.class, null);
-		assertThat(actual, is(1.0f));
-		actual = (Float) typeMapper.mapToType("2.2", float.class, null);
-		assertThat(actual, is(2.2f));
-		actual = (Float) typeMapper.mapToType(null, Float.class, null);
-		assertNull(actual);
-		float actualFloat = (Float) typeMapper.mapToType(null, float.class,
-				null);
-		assertThat(actualFloat, is(0.0f));
-		actual = (Float) typeMapper.mapToType("", Float.class, null);
-		assertNull(actual);
-		actual = (Float) typeMapper.mapToType("", float.class, null);
-		assertNull(actual);
-		actual = (Float) typeMapper.mapToType("Nan", Float.class, null);
-		assertNull(actual);
-		actual = (Float) typeMapper
-				.mapToType("Not-A-Number", float.class, null);
-		assertNull(actual);
-	}
+    @Test
+    public void testMapToTypeToFloat() throws Exception {
+        Float actual = (Float) typeMapper.mapToType("1.0", Float.class, null);
+        assertThat(actual, is(1.0f));
+        actual = (Float) typeMapper.mapToType("2.2", float.class, null);
+        assertThat(actual, is(2.2f));
+        actual = (Float) typeMapper.mapToType(null, Float.class, null);
+        assertNull(actual);
+        float actualFloat = (Float) typeMapper.mapToType(null, float.class, null);
+        assertThat(actualFloat, is(0.0f));
+        actual = (Float) typeMapper.mapToType("", Float.class, null);
+        assertNull(actual);
+        actual = (Float) typeMapper.mapToType("", float.class, null);
+        assertNull(actual);
+        actual = (Float) typeMapper.mapToType("Nan", Float.class, null);
+        assertNull(actual);
+        actual = (Float) typeMapper.mapToType("Not-A-Number", float.class, null);
+        assertNull(actual);
+    }
 
-	@Test
-	public void testMapToTypeToInteger() throws Exception {
-		Integer actual = (Integer) typeMapper.mapToType("1", Integer.class,
-				null);
-		assertThat(actual, is(1));
-		actual = (Integer) typeMapper.mapToType("1", int.class, null);
-		assertThat(actual, is(1));
-		actual = (Integer) typeMapper.mapToType(null, Integer.class, null);
-		assertNull(actual);
-		int actualInt = (Integer) typeMapper.mapToType(null, int.class, null);
-		assertThat(actualInt, is(0));
-		actual = (Integer) typeMapper.mapToType("", Integer.class, null);
-		assertNull(actual);
-		actual = (Integer) typeMapper.mapToType("", int.class, null);
-		assertNull(actual);
-		actual = (Integer) typeMapper.mapToType("Nan", Integer.class, null);
-		assertNull(actual);
-		actual = (Integer) typeMapper
-				.mapToType("Not-A-Number", int.class, null);
-		assertNull(actual);
-	}
+    @Test
+    public void testMapToTypeToInteger() throws Exception {
+        Integer actual = (Integer) typeMapper.mapToType("1", Integer.class, null);
+        assertThat(actual, is(1));
+        actual = (Integer) typeMapper.mapToType("1", int.class, null);
+        assertThat(actual, is(1));
+        actual = (Integer) typeMapper.mapToType(null, Integer.class, null);
+        assertNull(actual);
+        int actualInt = (Integer) typeMapper.mapToType(null, int.class, null);
+        assertThat(actualInt, is(0));
+        actual = (Integer) typeMapper.mapToType("", Integer.class, null);
+        assertNull(actual);
+        actual = (Integer) typeMapper.mapToType("", int.class, null);
+        assertNull(actual);
+        actual = (Integer) typeMapper.mapToType("Nan", Integer.class, null);
+        assertNull(actual);
+        actual = (Integer) typeMapper.mapToType("Not-A-Number", int.class, null);
+        assertNull(actual);
+    }
 
-	@Test
-	public void testMapToTypeToLong() throws Exception {
-		Long actual = (Long) typeMapper.mapToType("55590", Long.class, null);
-		assertThat(actual, is(55590L));
-		actual = (Long) typeMapper.mapToType("1000", long.class, null);
-		assertThat(actual, is(1000L));
-		actual = (Long) typeMapper.mapToType(null, Long.class, null);
-		assertNull(actual);
-		long actualLong = (Long) typeMapper.mapToType(null, long.class, null);
-		assertThat(actualLong, is(0L));
-		actual = (Long) typeMapper.mapToType("", Long.class, null);
-		assertNull(actual);
-		actual = (Long) typeMapper.mapToType("", long.class, null);
-		assertNull(actual);
-		actual = (Long) typeMapper.mapToType("Nan", Long.class, null);
-		assertNull(actual);
-		actual = (Long) typeMapper.mapToType("Not-A-Number", long.class, null);
-		assertNull(actual);
-	}
+    @Test
+    public void testMapToTypeToLong() throws Exception {
+        Long actual = (Long) typeMapper.mapToType("55590", Long.class, null);
+        assertThat(actual, is(55590L));
+        actual = (Long) typeMapper.mapToType("1000", long.class, null);
+        assertThat(actual, is(1000L));
+        actual = (Long) typeMapper.mapToType(null, Long.class, null);
+        assertNull(actual);
+        long actualLong = (Long) typeMapper.mapToType(null, long.class, null);
+        assertThat(actualLong, is(0L));
+        actual = (Long) typeMapper.mapToType("", Long.class, null);
+        assertNull(actual);
+        actual = (Long) typeMapper.mapToType("", long.class, null);
+        assertNull(actual);
+        actual = (Long) typeMapper.mapToType("Nan", Long.class, null);
+        assertNull(actual);
+        actual = (Long) typeMapper.mapToType("Not-A-Number", long.class, null);
+        assertNull(actual);
+    }
 
-	@Test
-	public void testMapToTypeToDate() throws Exception {
-		Date expected = new SimpleDateFormat("yyyy/MM/dd").parse("2010/12/09");
-		Date actual = (Date) typeMapper.mapToType("2010-12-09", Date.class,
-				null);
-		assertThat(actual, is(expected));
-		actual = (Date) typeMapper.mapToType("2010-12-09", Date.class,
-				new String[0]);
-		assertThat(actual, is(expected));
-		expected = new SimpleDateFormat("yyyy/MM/dd").parse("2010/12/10");
-		actual = (Date) typeMapper.mapToType("2010/12/10", Date.class, null);
-		assertThat(actual, is(expected));
-		expected = new SimpleDateFormat("yyyy/MM/dd").parse("2010/12/10");
-		actual = (Date) typeMapper.mapToType("2010_12_10", Date.class, null);
-		assertNull(actual);
-		expected = new SimpleDateFormat("yyyy/MM/dd").parse("2010/12/11");
-		actual = (Date) typeMapper.mapToType("2010/12/11", Date.class,
-				new String[]{"yyyy/MM/dd"});
-		assertThat(actual, is(expected));
-		expected = new SimpleDateFormat("yyyy/MM/dd").parse("2010/12/11");
-		actual = (Date) typeMapper.mapToType("2010/12/11", Date.class,
-				new String[]{"yyyy-MM-dd", "yyyy=MM=dd"});
-		assertNull(actual);
-	}
+    @Test
+    public void testMapToTypeToDate() throws Exception {
+        Date expected = new SimpleDateFormat("yyyy/MM/dd").parse("2010/12/09");
+        Date actual = (Date) typeMapper.mapToType("2010-12-09", Date.class, null);
+        assertThat(actual, is(expected));
+        actual = (Date) typeMapper.mapToType("2010-12-09", Date.class, new String[0]);
+        assertThat(actual, is(expected));
+        expected = new SimpleDateFormat("yyyy/MM/dd").parse("2010/12/10");
+        actual = (Date) typeMapper.mapToType("2010/12/10", Date.class, null);
+        assertThat(actual, is(expected));
+        expected = new SimpleDateFormat("yyyy/MM/dd").parse("2010/12/10");
+        actual = (Date) typeMapper.mapToType("2010_12_10", Date.class, null);
+        assertNull(actual);
+        expected = new SimpleDateFormat("yyyy/MM/dd").parse("2010/12/11");
+        actual = (Date) typeMapper.mapToType("2010/12/11", Date.class, new String[] { "yyyy/MM/dd" });
+        assertThat(actual, is(expected));
+        expected = new SimpleDateFormat("yyyy/MM/dd").parse("2010/12/11");
+        actual = (Date) typeMapper.mapToType("2010/12/11", Date.class, new String[] { "yyyy-MM-dd", "yyyy=MM=dd" });
+        assertNull(actual);
+    }
 
-	@Test
-	public void testMapToTypeToBigDecimal() throws Exception {
-		BigDecimal actual = (BigDecimal) typeMapper.mapToType("1001.1",
-				BigDecimal.class, null);
-		assertThat(actual, is(new BigDecimal("1001.1")));
-		actual = (BigDecimal) typeMapper.mapToType("1001.1", BigDecimal.class,
-				new String[0]);
-		assertThat(actual, is(new BigDecimal("1001.1")));
-		actual = (BigDecimal) typeMapper.mapToType("57,311,001.11",
-				BigDecimal.class, new String[]{"#,###,###"});
-		assertThat(actual, is(new BigDecimal("57311001.11")));
-		actual = (BigDecimal) typeMapper.mapToType("57,311,001.11",
-				BigDecimal.class, new String[]{"invalid-format"});
-		assertThat(actual, is(nullValue()));
-	}
+    @Test
+    public void testMapToTypeToBigDecimal() throws Exception {
+        BigDecimal actual = (BigDecimal) typeMapper.mapToType("1001.1", BigDecimal.class, null);
+        assertThat(actual, is(new BigDecimal("1001.1")));
+        actual = (BigDecimal) typeMapper.mapToType("1001.1", BigDecimal.class, new String[0]);
+        assertThat(actual, is(new BigDecimal("1001.1")));
+        actual = (BigDecimal) typeMapper.mapToType("57,311,001.11", BigDecimal.class, new String[] { "#,###,###" });
+        assertThat(actual, is(new BigDecimal("57311001.11")));
+        actual = (BigDecimal) typeMapper.mapToType("57,311,001.11", BigDecimal.class,
+                new String[] { "invalid-format" });
+        assertThat(actual, is(nullValue()));
+    }
 
-	@Test
-	public void testMapToTypeArrayToString() throws Exception {
-		String actual = (String) typeMapper.mapToType(new String[]{"a"},
-				String.class, null);
-		assertThat(actual, is("a"));
-		actual = (String) typeMapper.mapToType(new String[]{"a", "b"},
-				String.class, null);
-		assertThat(actual, is("a"));
-		actual = (String) typeMapper.mapToType(new String[0], String.class,
-				null);
-		assertThat(actual, is(nullValue()));
-	}
+    @Test
+    public void testMapToTypeArrayToString() throws Exception {
+        String actual = (String) typeMapper.mapToType(new String[] { "a" }, String.class, null);
+        assertThat(actual, is("a"));
+        actual = (String) typeMapper.mapToType(new String[] { "a", "b" }, String.class, null);
+        assertThat(actual, is("a"));
+        actual = (String) typeMapper.mapToType(new String[0], String.class, null);
+        assertThat(actual, is(nullValue()));
+    }
 
-	@Test
-	public void testClassPair() {
-		ClassPair pair1 = ClassPair.valueOf(String.class, Integer.class);
-		ClassPair pair2 = ClassPair.valueOf(String.class, Long.class);
-		ClassPair pair3 = ClassPair.valueOf(String.class, int.class);
-		ClassPair pair4 = ClassPair.valueOf(Integer.class, String.class);
-		ClassPair pair5 = ClassPair.valueOf(String.class, Integer.class);
-		assertFalse(pair1.equals(pair2));
-		assertFalse(pair1.equals(pair3));
-		assertFalse(pair1.equals(pair4));
-		assertFalse(pair1.equals(new Object()));
-		assertTrue(pair1.equals(pair5));
-	}
+    @Test
+    public void testClassPair() {
+        ClassPair pair1 = ClassPair.valueOf(String.class, Integer.class);
+        ClassPair pair2 = ClassPair.valueOf(String.class, Long.class);
+        ClassPair pair3 = ClassPair.valueOf(String.class, int.class);
+        ClassPair pair4 = ClassPair.valueOf(Integer.class, String.class);
+        ClassPair pair5 = ClassPair.valueOf(String.class, Integer.class);
+        assertFalse(pair1.equals(pair2));
+        assertFalse(pair1.equals(pair3));
+        assertFalse(pair1.equals(pair4));
+        assertFalse(pair1.equals(new Object()));
+        assertTrue(pair1.equals(pair5));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/BeanAttributeArgumentPreparatorTest.java b/src/test/java/org/analogweb/core/BeanAttributeArgumentPreparatorTest.java
index f343d36..c98d814 100644
--- a/src/test/java/org/analogweb/core/BeanAttributeArgumentPreparatorTest.java
+++ b/src/test/java/org/analogweb/core/BeanAttributeArgumentPreparatorTest.java
@@ -2,8 +2,8 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -27,165 +27,127 @@
 
 public class BeanAttributeArgumentPreparatorTest {
 
-	private BeanAttributeValueResolver preparator;
-	private TypeMapperContext converters = mock(TypeMapperContext.class);
-	private RequestValueResolvers resolvers = mock(RequestValueResolvers.class);
-	private Modules modules;
-
-	@Before
-	public void setUp() {
-		converters = mock(TypeMapperContext.class);
-		resolvers = mock(RequestValueResolvers.class);
-		modules = mock(Modules.class);
-		when(modules.getTypeMapperContext()).thenReturn(converters);
-		when(modules.getRequestValueResolvers()).thenReturn(resolvers);
-	}
-
-	@Test
-	public void test() throws Exception {
-		preparator = new BeanAttributeValueResolver();
-		preparator.setModules(modules);
-		InvocationMetadata metadata = mock(InvocationMetadata.class);
-		when(metadata.getArgumentTypes()).thenReturn(
-				new Class[]{SomeBean.class, String.class});
-		RequestContext context = mock(RequestContext.class);
-		RequestValueResolver resolver = mock(RequestValueResolver.class);
-		when(resolvers.findRequestValueResolver(ParameterValueResolver.class))
-				.thenReturn(resolver);
-		Annotation[] anns = SomeBean.class.getDeclaredField("name")
-				.getAnnotations();
-		when(
-				resolver.resolveValue(context, metadata, "name", String.class,
-						anns)).thenReturn("Name");
-		when(
-				resolver.resolveValue(context, metadata, "birthDay",
-						Date.class, anns)).thenReturn("2013-01-01");
-		when(
-				resolver.resolveValue(context, metadata, "number",
-						Integer.class, anns)).thenReturn("5");
-		Date expectedDate = new Date();
-		when(
-				converters.mapToType(eq(TypeMapper.class), eq("Name"),
-						eq(String.class), isA(String[].class))).thenReturn(
-				"Name");
-		when(
-				converters.mapToType(eq(TypeMapper.class), eq("2013-01-01"),
-						eq(Date.class), isA(String[].class))).thenReturn(
-				expectedDate);
-		when(
-				converters.mapToType(eq(TypeMapper.class), eq("5"),
-						eq(Integer.class), isA(String[].class))).thenReturn(5);
-		Method method = Resource.class.getDeclaredMethod("doSomething",
-				SomeBean.class, String.class);
-		SomeBean actual = (SomeBean) preparator.resolveValue(context, metadata,
-				"", SomeBean.class, method.getAnnotations());
-		assertThat(actual.getName(), is("Name"));
-		assertThat(actual.getBirthDay(), is(expectedDate));
-		assertThat(actual.getNumber(), is(5));
-	}
-
-	@Test
-	public void testWithResolver() throws Exception {
-		preparator = new BeanAttributeValueResolver();
-		preparator.setModules(modules);
-		InvocationMetadata metadata = mock(InvocationMetadata.class);
-		when(metadata.getArgumentTypes()).thenReturn(
-				new Class[]{SomeBean.class, String.class});
-		RequestContext context = mock(RequestContext.class);
-		RequestValueResolver resolver = mock(RequestValueResolver.class);
-		RequestValueResolver beanResolver = mock(RequestValueResolver.class);
-		when(resolvers.findRequestValueResolver(ParameterValueResolver.class))
-				.thenReturn(resolver);
-		when(resolvers.findRequestValueResolver(SomeBeanResolver.class))
-				.thenReturn(beanResolver);
-		SomeBean resolvedBean = new SomeBean();
-		Annotation[] anns = SomeBean.class.getDeclaredField("name")
-				.getAnnotations();
-		when(
-				beanResolver.resolveValue(context, metadata, StringUtils.EMPTY,
-						SomeBean.class, anns)).thenReturn(resolvedBean);
-		when(
-				resolver.resolveValue(context, metadata, "name", String.class,
-						anns)).thenReturn("Name");
-		when(
-				resolver.resolveValue(context, metadata, "birthDay",
-						Date.class, anns)).thenReturn("2013-01-01");
-		when(
-				resolver.resolveValue(context, metadata, "number",
-						Integer.class, anns)).thenReturn("5");
-		Date expectedDate = new Date();
-		when(
-				converters.mapToType(eq(TypeMapper.class), eq("Name"),
-						eq(String.class), isA(String[].class))).thenReturn(
-				"Name");
-		when(
-				converters.mapToType(eq(TypeMapper.class), eq("2013-01-01"),
-						eq(Date.class), isA(String[].class))).thenReturn(
-				expectedDate);
-		when(
-				converters.mapToType(eq(TypeMapper.class), eq("5"),
-						eq(Integer.class), isA(String[].class))).thenReturn(5);
-		Method m = Resource.class.getDeclaredMethod("doAnything",
-				SomeBean.class, String.class);
-		SomeBean actual = (SomeBean) preparator.resolveValue(context, metadata,
-				"", SomeBean.class, m.getAnnotations());
-		assertThat(actual.getName(), is("Name"));
-		assertThat(actual.getBirthDay(), is(expectedDate));
-		assertThat(actual.getNumber(), is(5));
-	}
-
-	public static class Resource {
-
-		public String doSomething(@Bean SomeBean bean, @Param String comment) {
-			return "something!";
-		}
-
-		public String doAnything(
-				@Bean @Resolver(value = SomeBeanResolver.class) SomeBean bean,
-				@Param String comment) {
-			return "something!";
-		}
-	}
-
-	public static class SomeBean {
-
-		@Param
-		private String name;
-		@Param
-		private Date birthDay;
-		@Param
-		private Integer number;
-
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		public Date getBirthDay() {
-			return birthDay;
-		}
-
-		// without mutator.
-		public Integer getNumber() {
-			return number;
-		}
-
-		public void setNumber(Integer number) {
-			this.number = number;
-		}
-	}
-
-	public static class SomeBeanResolver implements RequestValueResolver {
-
-		@Override
-		public Object resolveValue(RequestContext requestContext,
-				InvocationMetadata metadata, String key, Class<?> requiredType,
-				Annotation[] annotations) {
-			// nop.
-			return null;
-		}
-	}
+    private BeanAttributeValueResolver preparator;
+    private TypeMapperContext converters = mock(TypeMapperContext.class);
+    private RequestValueResolvers resolvers = mock(RequestValueResolvers.class);
+    private Modules modules;
+
+    @Before
+    public void setUp() {
+        converters = mock(TypeMapperContext.class);
+        resolvers = mock(RequestValueResolvers.class);
+        modules = mock(Modules.class);
+        when(modules.getTypeMapperContext()).thenReturn(converters);
+        when(modules.getRequestValueResolvers()).thenReturn(resolvers);
+    }
+
+    @Test
+    public void test() throws Exception {
+        preparator = new BeanAttributeValueResolver();
+        preparator.setModules(modules);
+        InvocationMetadata metadata = mock(InvocationMetadata.class);
+        when(metadata.getArgumentTypes()).thenReturn(new Class[] { SomeBean.class, String.class });
+        RequestContext context = mock(RequestContext.class);
+        RequestValueResolver resolver = mock(RequestValueResolver.class);
+        when(resolvers.findRequestValueResolver(ParameterValueResolver.class)).thenReturn(resolver);
+        Annotation[] anns = SomeBean.class.getDeclaredField("name").getAnnotations();
+        when(resolver.resolveValue(context, metadata, "name", String.class, anns)).thenReturn("Name");
+        when(resolver.resolveValue(context, metadata, "birthDay", Date.class, anns)).thenReturn("2013-01-01");
+        when(resolver.resolveValue(context, metadata, "number", Integer.class, anns)).thenReturn("5");
+        Date expectedDate = new Date();
+        when(converters.mapToType(eq(TypeMapper.class), eq("Name"), eq(String.class), isA(String[].class)))
+                .thenReturn("Name");
+        when(converters.mapToType(eq(TypeMapper.class), eq("2013-01-01"), eq(Date.class), isA(String[].class)))
+                .thenReturn(expectedDate);
+        when(converters.mapToType(eq(TypeMapper.class), eq("5"), eq(Integer.class), isA(String[].class))).thenReturn(5);
+        Method method = Resource.class.getDeclaredMethod("doSomething", SomeBean.class, String.class);
+        SomeBean actual = (SomeBean) preparator.resolveValue(context, metadata, "", SomeBean.class,
+                method.getAnnotations());
+        assertThat(actual.getName(), is("Name"));
+        assertThat(actual.getBirthDay(), is(expectedDate));
+        assertThat(actual.getNumber(), is(5));
+    }
+
+    @Test
+    public void testWithResolver() throws Exception {
+        preparator = new BeanAttributeValueResolver();
+        preparator.setModules(modules);
+        InvocationMetadata metadata = mock(InvocationMetadata.class);
+        when(metadata.getArgumentTypes()).thenReturn(new Class[] { SomeBean.class, String.class });
+        RequestContext context = mock(RequestContext.class);
+        RequestValueResolver resolver = mock(RequestValueResolver.class);
+        RequestValueResolver beanResolver = mock(RequestValueResolver.class);
+        when(resolvers.findRequestValueResolver(ParameterValueResolver.class)).thenReturn(resolver);
+        when(resolvers.findRequestValueResolver(SomeBeanResolver.class)).thenReturn(beanResolver);
+        SomeBean resolvedBean = new SomeBean();
+        Annotation[] anns = SomeBean.class.getDeclaredField("name").getAnnotations();
+        when(beanResolver.resolveValue(context, metadata, StringUtils.EMPTY, SomeBean.class, anns))
+                .thenReturn(resolvedBean);
+        when(resolver.resolveValue(context, metadata, "name", String.class, anns)).thenReturn("Name");
+        when(resolver.resolveValue(context, metadata, "birthDay", Date.class, anns)).thenReturn("2013-01-01");
+        when(resolver.resolveValue(context, metadata, "number", Integer.class, anns)).thenReturn("5");
+        Date expectedDate = new Date();
+        when(converters.mapToType(eq(TypeMapper.class), eq("Name"), eq(String.class), isA(String[].class)))
+                .thenReturn("Name");
+        when(converters.mapToType(eq(TypeMapper.class), eq("2013-01-01"), eq(Date.class), isA(String[].class)))
+                .thenReturn(expectedDate);
+        when(converters.mapToType(eq(TypeMapper.class), eq("5"), eq(Integer.class), isA(String[].class))).thenReturn(5);
+        Method m = Resource.class.getDeclaredMethod("doAnything", SomeBean.class, String.class);
+        SomeBean actual = (SomeBean) preparator.resolveValue(context, metadata, "", SomeBean.class, m.getAnnotations());
+        assertThat(actual.getName(), is("Name"));
+        assertThat(actual.getBirthDay(), is(expectedDate));
+        assertThat(actual.getNumber(), is(5));
+    }
+
+    public static class Resource {
+
+        public String doSomething(@Bean SomeBean bean, @Param String comment) {
+            return "something!";
+        }
+
+        public String doAnything(@Bean @Resolver(value = SomeBeanResolver.class) SomeBean bean, @Param String comment) {
+            return "something!";
+        }
+    }
+
+    public static class SomeBean {
+
+        @Param
+        private String name;
+        @Param
+        private Date birthDay;
+        @Param
+        private Integer number;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Date getBirthDay() {
+            return birthDay;
+        }
+
+        // without mutator.
+        public Integer getNumber() {
+            return number;
+        }
+
+        public void setNumber(Integer number) {
+            this.number = number;
+        }
+    }
+
+    public static class SomeBeanResolver implements RequestValueResolver {
+
+        @Override
+        public Object resolveValue(RequestContext requestContext, InvocationMetadata metadata, String key,
+                Class<?> requiredType, Annotation[] annotations) {
+            // nop.
+            return null;
+        }
+    }
 }
diff --git a/src/test/java/org/analogweb/core/BindAttributeArgumentPreparatorTest.java b/src/test/java/org/analogweb/core/BindAttributeArgumentPreparatorTest.java
index 5dc714b..725641e 100644
--- a/src/test/java/org/analogweb/core/BindAttributeArgumentPreparatorTest.java
+++ b/src/test/java/org/analogweb/core/BindAttributeArgumentPreparatorTest.java
@@ -34,240 +34,192 @@
 
 /**
  * {@link BindAttributeArgumentPreparator}に対するテストケースです。
- * 
+ *
  * @author snowgoose
  */
 public class BindAttributeArgumentPreparatorTest {
 
-	private BindAttributeArgumentPreparator preparator;
-	private InvocationMetadata metadata;
-	private InvocationArguments args;
-	private RequestContext context;
-	private TypeMapperContext typeMapper;
-	private RequestValueResolvers handlers;
-
-	@Before
-	public void setUp() {
-		preparator = new BindAttributeArgumentPreparator();
-		metadata = mock(InvocationMetadata.class);
-		args = mock(InvocationArguments.class);
-		context = mock(RequestContext.class);
-		typeMapper = mock(TypeMapperContext.class);
-		handlers = mock(RequestValueResolvers.class);
-	}
-
-	@Test
-	public void testPrepare() {
-		final Class<?>[] argumentTypes = new Class<?>[]{String.class,
-				String.class};
-		final Method method = ReflectionUtils.getMethodQuietly(
-				StubResource.class, "doSomething", argumentTypes);
-		when(metadata.resolveMethod()).thenReturn(method);
-		final Annotation[][] anns = method.getParameterAnnotations();
-		AttributesHandler handler = mock(AttributesHandler.class);
-		when(handlers.findDefaultRequestValueResolver()).thenReturn(handler);
-		when(metadata.getArgumentTypes()).thenReturn(argumentTypes);
-		when(
-				handler.resolveValue(context, metadata, "foo",
-						argumentTypes[0], anns[0])).thenReturn("foo!");
-		when(
-				typeMapper.mapToType(TypeMapper.class, "foo!", String.class,
-						new String[0])).thenReturn("foo!");
-		when(
-				handler.resolveValue(context, metadata, "baa",
-						argumentTypes[1], anns[1])).thenReturn("baa!");
-		when(
-				typeMapper.mapToType(TypeMapper.class, "baa!", String.class,
-						new String[0])).thenReturn("baa!");
-		Object actual = preparator.prepareInvoke(args, metadata, context,
-				typeMapper, handlers);
-		assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
-		verify(args).putInvocationArgument(0, "foo!");
-		verify(args).putInvocationArgument(1, "baa!");
-	}
-
-	@Test
-	public void testPrepareWithNullMethod() {
-		final Class<?>[] argumentTypes = new Class<?>[]{String.class,
-				String.class};
-		AttributesHandler handler = mock(AttributesHandler.class);
-		when(handlers.findDefaultRequestValueResolver()).thenReturn(handler);
-		when(metadata.getArgumentTypes()).thenReturn(argumentTypes);
-		when(metadata.resolveMethod()).thenReturn(null);
-		when(
-				typeMapper.mapToType(TypeMapper.class, "foo!", String.class,
-						new String[0])).thenReturn("foo!");
-		when(
-				typeMapper.mapToType(TypeMapper.class, "baa!", String.class,
-						new String[0])).thenReturn("baa!");
-		Object actual = preparator.prepareInvoke(args, metadata, context,
-				typeMapper, handlers);
-		assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
-	}
-
-	@Test
-	public void testPrepareWithNullArguments() {
-		final Class<?>[] argumentTypes = new Class<?>[]{String.class,
-				String.class};
-		AttributesHandler handler = mock(AttributesHandler.class);
-		when(handlers.findDefaultRequestValueResolver()).thenReturn(handler);
-		when(metadata.getArgumentTypes()).thenReturn(null);
-		final Method method = ReflectionUtils.getMethodQuietly(
-				StubResource.class, "doSomething", argumentTypes);
-		when(metadata.resolveMethod()).thenReturn(method);
-		when(
-				typeMapper.mapToType(TypeMapper.class, "foo!", String.class,
-						new String[0])).thenReturn("foo!");
-		when(
-				typeMapper.mapToType(TypeMapper.class, "baa!", String.class,
-						new String[0])).thenReturn("baa!");
-		Object actual = preparator.prepareInvoke(args, metadata, context,
-				typeMapper, handlers);
-		assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
-	}
-
-	@Test
-	public void testScope() {
-		final Class<?>[] argumentTypes = new Class<?>[]{String.class};
-		final Method method = ReflectionUtils.getMethodQuietly(
-				StubResource.class, "doScope", argumentTypes);
-		final Annotation[][] anns = method.getParameterAnnotations();
-		AttributesHandler handler = mock(AttributesHandler.class);
-		when(handlers.findRequestValueResolver(Foo.class)).thenReturn(handler);
-		when(metadata.getArgumentTypes()).thenReturn(argumentTypes);
-		when(metadata.resolveMethod()).thenReturn(method);
-		when(
-				handler.resolveValue(context, metadata, "baz",
-						argumentTypes[0], anns[0])).thenReturn("foo!");
-		when(
-				typeMapper.mapToType(TypeMapper.class, "foo!", String.class,
-						new String[0])).thenReturn("foo!!");
-		Object actual = preparator.prepareInvoke(args, metadata, context,
-				typeMapper, handlers);
-		assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
-		verify(args).putInvocationArgument(0, "foo!!");
-	}
-
-	@Test
-	public void testInclusionScope() {
-		final Class<?>[] argumentTypes = new Class<?>[]{String.class};
-		final Method method = ReflectionUtils.getMethodQuietly(
-				StubResource.class, "doScopeVariable", argumentTypes);
-		final Annotation[][] anns = method.getParameterAnnotations();
-		AttributesHandler handler = mock(AttributesHandler.class);
-		when(handlers.findRequestValueResolver(Foo.class)).thenReturn(handler);
-		when(metadata.getArgumentTypes()).thenReturn(argumentTypes);
-		when(metadata.resolveMethod()).thenReturn(method);
-		when(
-				handler.resolveValue(context, metadata, "baz",
-						argumentTypes[0], anns[0])).thenReturn("foo!");
-		when(
-				typeMapper.mapToType(TypeMapper.class, "foo!", String.class,
-						new String[0])).thenReturn("foo!!");
-		Object actual = preparator.prepareInvoke(args, metadata, context,
-				typeMapper, handlers);
-		assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
-		verify(args).putInvocationArgument(0, "foo!!");
-	}
-
-	@Test
-	public void testPrepareWithCoveredAnnotation() {
-		final Class<?>[] argumentTypes = new Class<?>[]{String.class};
-		final Method method = ReflectionUtils.getMethodQuietly(
-				StubResource.class, "doWithCustomAnnotation", argumentTypes);
-		final Annotation[][] anns = method.getParameterAnnotations();
-		AttributesHandler handler = mock(AttributesHandler.class);
-		when(handlers.findRequestValueResolver(Baa.class)).thenReturn(handler);
-		when(metadata.getArgumentTypes()).thenReturn(argumentTypes);
-		when(metadata.resolveMethod()).thenReturn(method);
-		when(
-				handler.resolveValue(context, metadata, "foo",
-						argumentTypes[0], anns[0])).thenReturn("boo!");
-		when(
-				typeMapper.mapToType(SomeTypeMapper.class, "boo!",
-						String.class, new String[0])).thenReturn("booz!");
-		Object actual = preparator.prepareInvoke(args, metadata, context,
-				typeMapper, handlers);
-		assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
-		verify(args).putInvocationArgument(0, "booz!");
-	}
-
-	@Test
-	public void testPrepareWithFormat() {
-		final Class<?>[] argumentTypes = new Class<?>[]{BigDecimal.class};
-		final Method method = ReflectionUtils.getMethodQuietly(
-				StubResource.class, "doWithFormat", argumentTypes);
-		final Annotation[][] anns = method.getParameterAnnotations();
-		AttributesHandler handler = mock(AttributesHandler.class);
-		when(handlers.findDefaultRequestValueResolver()).thenReturn(handler);
-		when(metadata.getArgumentTypes()).thenReturn(argumentTypes);
-		when(metadata.resolveMethod()).thenReturn(method);
-		when(
-				handler.resolveValue(context, metadata, "foo",
-						argumentTypes[0], anns[0])).thenReturn("100,000");
-		BigDecimal expected = new BigDecimal(100000L);
-		when(
-				typeMapper.mapToType(TypeMapper.class, "100,000",
-						BigDecimal.class, new String[]{"###,###"})).thenReturn(
-				expected);
-		Object actual = preparator.prepareInvoke(args, metadata, context,
-				typeMapper, handlers);
-		assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
-		verify(args).putInvocationArgument(0, expected);
-	}
-
-	@Route
-	private static final class StubResource {
-
-		@Route
-		public String doSomething(@As("foo") String foo, @As("baa") String baa) {
-			return "do something!";
-		}
-
-		@Route
-		public String doScope(@As("baz") @Resolver(Foo.class) String baz) {
-			return "do scope!";
-		}
-
-		@Route
-		public String doScopeVariable(@SomeScopedValue("baz") String baz) {
-			return "do scope!";
-		}
-
-		@Route
-		public String doWithCustomAnnotation(@As("foo") @Covered String foo) {
-			return "do nothing!";
-		}
-
-		@Route
-		public String doWithFormat(
-				@As("foo") @Formats("###,###") BigDecimal amount) {
-			return "do nothing!";
-		}
-	}
-
-	interface SomeTypeMapper extends TypeMapper {
-	}
-
-	interface Foo extends RequestValueResolver {
-	}
-
-	interface Baa extends RequestValueResolver {
-	}
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.PARAMETER)
-	@Resolver(Baa.class)
-	@Convert(SomeTypeMapper.class)
-	static @interface Covered {
-	}
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.PARAMETER)
-	@Resolver(Foo.class)
-	@Valiables
-	public static @interface SomeScopedValue {
-
-		String value();
-	}
+    private BindAttributeArgumentPreparator preparator;
+    private InvocationMetadata metadata;
+    private InvocationArguments args;
+    private RequestContext context;
+    private TypeMapperContext typeMapper;
+    private RequestValueResolvers handlers;
+
+    @Before
+    public void setUp() {
+        preparator = new BindAttributeArgumentPreparator();
+        metadata = mock(InvocationMetadata.class);
+        args = mock(InvocationArguments.class);
+        context = mock(RequestContext.class);
+        typeMapper = mock(TypeMapperContext.class);
+        handlers = mock(RequestValueResolvers.class);
+    }
+
+    @Test
+    public void testPrepare() {
+        final Class<?>[] argumentTypes = new Class<?>[] { String.class, String.class };
+        final Method method = ReflectionUtils.getMethodQuietly(StubResource.class, "doSomething", argumentTypes);
+        when(metadata.resolveMethod()).thenReturn(method);
+        final Annotation[][] anns = method.getParameterAnnotations();
+        AttributesHandler handler = mock(AttributesHandler.class);
+        when(handlers.findDefaultRequestValueResolver()).thenReturn(handler);
+        when(metadata.getArgumentTypes()).thenReturn(argumentTypes);
+        when(handler.resolveValue(context, metadata, "foo", argumentTypes[0], anns[0])).thenReturn("foo!");
+        when(typeMapper.mapToType(TypeMapper.class, "foo!", String.class, new String[0])).thenReturn("foo!");
+        when(handler.resolveValue(context, metadata, "baa", argumentTypes[1], anns[1])).thenReturn("baa!");
+        when(typeMapper.mapToType(TypeMapper.class, "baa!", String.class, new String[0])).thenReturn("baa!");
+        Object actual = preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
+        assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
+        verify(args).putInvocationArgument(0, "foo!");
+        verify(args).putInvocationArgument(1, "baa!");
+    }
+
+    @Test
+    public void testPrepareWithNullMethod() {
+        final Class<?>[] argumentTypes = new Class<?>[] { String.class, String.class };
+        AttributesHandler handler = mock(AttributesHandler.class);
+        when(handlers.findDefaultRequestValueResolver()).thenReturn(handler);
+        when(metadata.getArgumentTypes()).thenReturn(argumentTypes);
+        when(metadata.resolveMethod()).thenReturn(null);
+        when(typeMapper.mapToType(TypeMapper.class, "foo!", String.class, new String[0])).thenReturn("foo!");
+        when(typeMapper.mapToType(TypeMapper.class, "baa!", String.class, new String[0])).thenReturn("baa!");
+        Object actual = preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
+        assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
+    }
+
+    @Test
+    public void testPrepareWithNullArguments() {
+        final Class<?>[] argumentTypes = new Class<?>[] { String.class, String.class };
+        AttributesHandler handler = mock(AttributesHandler.class);
+        when(handlers.findDefaultRequestValueResolver()).thenReturn(handler);
+        when(metadata.getArgumentTypes()).thenReturn(null);
+        final Method method = ReflectionUtils.getMethodQuietly(StubResource.class, "doSomething", argumentTypes);
+        when(metadata.resolveMethod()).thenReturn(method);
+        when(typeMapper.mapToType(TypeMapper.class, "foo!", String.class, new String[0])).thenReturn("foo!");
+        when(typeMapper.mapToType(TypeMapper.class, "baa!", String.class, new String[0])).thenReturn("baa!");
+        Object actual = preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
+        assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
+    }
+
+    @Test
+    public void testScope() {
+        final Class<?>[] argumentTypes = new Class<?>[] { String.class };
+        final Method method = ReflectionUtils.getMethodQuietly(StubResource.class, "doScope", argumentTypes);
+        final Annotation[][] anns = method.getParameterAnnotations();
+        AttributesHandler handler = mock(AttributesHandler.class);
+        when(handlers.findRequestValueResolver(Foo.class)).thenReturn(handler);
+        when(metadata.getArgumentTypes()).thenReturn(argumentTypes);
+        when(metadata.resolveMethod()).thenReturn(method);
+        when(handler.resolveValue(context, metadata, "baz", argumentTypes[0], anns[0])).thenReturn("foo!");
+        when(typeMapper.mapToType(TypeMapper.class, "foo!", String.class, new String[0])).thenReturn("foo!!");
+        Object actual = preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
+        assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
+        verify(args).putInvocationArgument(0, "foo!!");
+    }
+
+    @Test
+    public void testInclusionScope() {
+        final Class<?>[] argumentTypes = new Class<?>[] { String.class };
+        final Method method = ReflectionUtils.getMethodQuietly(StubResource.class, "doScopeVariable", argumentTypes);
+        final Annotation[][] anns = method.getParameterAnnotations();
+        AttributesHandler handler = mock(AttributesHandler.class);
+        when(handlers.findRequestValueResolver(Foo.class)).thenReturn(handler);
+        when(metadata.getArgumentTypes()).thenReturn(argumentTypes);
+        when(metadata.resolveMethod()).thenReturn(method);
+        when(handler.resolveValue(context, metadata, "baz", argumentTypes[0], anns[0])).thenReturn("foo!");
+        when(typeMapper.mapToType(TypeMapper.class, "foo!", String.class, new String[0])).thenReturn("foo!!");
+        Object actual = preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
+        assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
+        verify(args).putInvocationArgument(0, "foo!!");
+    }
+
+    @Test
+    public void testPrepareWithCoveredAnnotation() {
+        final Class<?>[] argumentTypes = new Class<?>[] { String.class };
+        final Method method = ReflectionUtils.getMethodQuietly(StubResource.class, "doWithCustomAnnotation",
+                argumentTypes);
+        final Annotation[][] anns = method.getParameterAnnotations();
+        AttributesHandler handler = mock(AttributesHandler.class);
+        when(handlers.findRequestValueResolver(Baa.class)).thenReturn(handler);
+        when(metadata.getArgumentTypes()).thenReturn(argumentTypes);
+        when(metadata.resolveMethod()).thenReturn(method);
+        when(handler.resolveValue(context, metadata, "foo", argumentTypes[0], anns[0])).thenReturn("boo!");
+        when(typeMapper.mapToType(SomeTypeMapper.class, "boo!", String.class, new String[0])).thenReturn("booz!");
+        Object actual = preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
+        assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
+        verify(args).putInvocationArgument(0, "booz!");
+    }
+
+    @Test
+    public void testPrepareWithFormat() {
+        final Class<?>[] argumentTypes = new Class<?>[] { BigDecimal.class };
+        final Method method = ReflectionUtils.getMethodQuietly(StubResource.class, "doWithFormat", argumentTypes);
+        final Annotation[][] anns = method.getParameterAnnotations();
+        AttributesHandler handler = mock(AttributesHandler.class);
+        when(handlers.findDefaultRequestValueResolver()).thenReturn(handler);
+        when(metadata.getArgumentTypes()).thenReturn(argumentTypes);
+        when(metadata.resolveMethod()).thenReturn(method);
+        when(handler.resolveValue(context, metadata, "foo", argumentTypes[0], anns[0])).thenReturn("100,000");
+        BigDecimal expected = new BigDecimal(100000L);
+        when(typeMapper.mapToType(TypeMapper.class, "100,000", BigDecimal.class, new String[] { "###,###" }))
+                .thenReturn(expected);
+        Object actual = preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
+        assertSame(actual, ApplicationProcessor.NO_INTERRUPTION);
+        verify(args).putInvocationArgument(0, expected);
+    }
+
+    @Route
+    private static final class StubResource {
+
+        @Route
+        public String doSomething(@As("foo") String foo, @As("baa") String baa) {
+            return "do something!";
+        }
+
+        @Route
+        public String doScope(@As("baz") @Resolver(Foo.class) String baz) {
+            return "do scope!";
+        }
+
+        @Route
+        public String doScopeVariable(@SomeScopedValue("baz") String baz) {
+            return "do scope!";
+        }
+
+        @Route
+        public String doWithCustomAnnotation(@As("foo") @Covered String foo) {
+            return "do nothing!";
+        }
+
+        @Route
+        public String doWithFormat(@As("foo") @Formats("###,###") BigDecimal amount) {
+            return "do nothing!";
+        }
+    }
+
+    interface SomeTypeMapper extends TypeMapper {
+    }
+
+    interface Foo extends RequestValueResolver {
+    }
+
+    interface Baa extends RequestValueResolver {
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.PARAMETER)
+    @Resolver(Baa.class)
+    @Convert(SomeTypeMapper.class)
+    static @interface Covered {
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.PARAMETER)
+    @Resolver(Foo.class)
+    @Valiables
+    public static @interface SomeScopedValue {
+
+        String value();
+    }
 }
diff --git a/src/test/java/org/analogweb/core/ConsumesMediaTypeVerifierTest.java b/src/test/java/org/analogweb/core/ConsumesMediaTypeVerifierTest.java
index 06109fc..10000c4 100644
--- a/src/test/java/org/analogweb/core/ConsumesMediaTypeVerifierTest.java
+++ b/src/test/java/org/analogweb/core/ConsumesMediaTypeVerifierTest.java
@@ -27,121 +27,116 @@
 
 public class ConsumesMediaTypeVerifierTest {
 
-	private ConsumesMediaTypeVerifier verifier;
-	private InvocationArguments args;
-	private InvocationMetadata metadata;
-	private RequestContext context;
-	private TypeMapperContext converters;
-	private RequestValueResolvers handlers;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
-	@Before
-	public void setUp() {
-		verifier = new ConsumesMediaTypeVerifier();
-		args = mock(InvocationArguments.class);
-		metadata = mock(InvocationMetadata.class);
-		context = mock(RequestContext.class);
-		converters = mock(TypeMapperContext.class);
-		handlers = mock(RequestValueResolvers.class);
-	}
-
-	@Test
-	public void testPrepareInvoke() {
-		MediaType requstType = MediaTypes.APPLICATION_ATOM_XML_TYPE;
-		when(context.getRequestMethod()).thenReturn("POST");
-		when(context.getContentType()).thenReturn(requstType);
-		Method method = ReflectionUtils.getMethodQuietly(SomeResource.class,
-				"acceptsAtom", new Class<?>[]{Object.class});
-		when(metadata.resolveMethod()).thenReturn(method);
-		Object actual = verifier.prepareInvoke(args, metadata, context,
-				converters, handlers);
-		assertThat(actual, is(ApplicationProcessor.NO_INTERRUPTION));
-	}
-
-	@Test
-	public void testPrepareInvokeWithGetMethod() {
-		MediaType requstType = MediaTypes.APPLICATION_ATOM_XML_TYPE;
-		when(context.getRequestMethod()).thenReturn("GET");
-		when(context.getContentType()).thenReturn(requstType);
-		Method method = ReflectionUtils.getMethodQuietly(SomeResource.class,
-				"acceptsAtom", new Class<?>[]{Object.class});
-		when(metadata.resolveMethod()).thenReturn(method);
-		Object actual = verifier.prepareInvoke(args, metadata, context,
-				converters, handlers);
-		assertThat(actual, is(ApplicationProcessor.NO_INTERRUPTION));
-	}
-
-	@Test
-	public void testPrepareInvokeInvalidMediaType() {
-		thrown.expect(UnsupportedMediaTypeException.class);
-		MediaType requstType = MediaTypes.APPLICATION_JSON_TYPE;
-		when(context.getRequestMethod()).thenReturn("POST");
-		when(context.getContentType()).thenReturn(requstType);
-		Method method = ReflectionUtils.getMethodQuietly(SomeResource.class,
-				"acceptsAtom", new Class<?>[]{Object.class});
-		when(metadata.resolveMethod()).thenReturn(method);
-		verifier.prepareInvoke(args, metadata, context, converters, handlers);
-	}
-
-	@Test
-	public void testPrepareInvokeDefaultFormats() {
-		MediaType requstType = MediaTypes.APPLICATION_XML_TYPE;
-		when(context.getRequestMethod()).thenReturn("POST");
-		when(context.getContentType()).thenReturn(requstType);
-		SpecificMediaTypeRequestValueResolver handler = mock(SpecificMediaTypeRequestValueResolver.class);
-		when(handlers.findRequestValueResolver(Xml.class)).thenReturn(handler);
-		when(handler.supports(requstType)).thenReturn(true);
-		Method method = ReflectionUtils.getMethodQuietly(SomeResource.class,
-				"acceptsSvg", new Class<?>[]{Object.class});
-		when(metadata.resolveMethod()).thenReturn(method);
-		Object actual = verifier.prepareInvoke(args, metadata, context,
-				converters, handlers);
-		assertThat(actual, is(ApplicationProcessor.NO_INTERRUPTION));
-	}
-
-	@Test
-	public void testPrepareInvokeDefaultFormatsNotSupported() {
-		thrown.expect(UnsupportedMediaTypeException.class);
-		MediaType requstType = MediaTypes.APPLICATION_JSON_TYPE;
-		when(context.getRequestMethod()).thenReturn("POST");
-		when(context.getContentType()).thenReturn(requstType);
-		SpecificMediaTypeRequestValueResolver handler = mock(SpecificMediaTypeRequestValueResolver.class);
-		when(handlers.findRequestValueResolver(Xml.class)).thenReturn(handler);
-		when(handler.supports(requstType)).thenReturn(false);
-		Method method = ReflectionUtils.getMethodQuietly(SomeResource.class,
-				"acceptsSvg", new Class<?>[]{Object.class});
-		when(metadata.resolveMethod()).thenReturn(method);
-		verifier.prepareInvoke(args, metadata, context, converters, handlers);
-	}
-
-	@Test
-	public void testPrepareInvokeNotDefinedFormats() {
-		thrown.expect(UnsupportedMediaTypeException.class);
-		when(context.getRequestMethod()).thenReturn("PUT");
-		Method method = ReflectionUtils.getMethodQuietly(SomeResource.class,
-				"acceptsParameter", new Class<?>[]{String.class});
-		when(metadata.resolveMethod()).thenReturn(method);
-		verifier.prepareInvoke(args, metadata, context, converters, handlers);
-	}
-
-	@Test
-	public void testPrepareInvokeWithoutFormats() {
-		thrown.expect(UnsupportedMediaTypeException.class);
-		when(context.getRequestMethod()).thenReturn("POST");
-		when(context.getContentType()).thenReturn(
-				MediaTypes.APPLICATION_XML_TYPE);
-		SpecificMediaTypeRequestValueResolver handler = mock(SpecificMediaTypeRequestValueResolver.class);
-		when(handler.supports(MediaTypes.APPLICATION_XML_TYPE)).thenReturn(
-				false);
-		when(handlers.findRequestValueResolver(Xml.class)).thenReturn(handler);
-		Method method = ReflectionUtils.getMethodQuietly(SomeResource.class,
-				"acceptsXml", new Class<?>[]{Object.class});
-		when(metadata.resolveMethod()).thenReturn(method);
-		verifier.prepareInvoke(args, metadata, context, converters, handlers);
-	}
-
-	@Test
+    private ConsumesMediaTypeVerifier verifier;
+    private InvocationArguments args;
+    private InvocationMetadata metadata;
+    private RequestContext context;
+    private TypeMapperContext converters;
+    private RequestValueResolvers handlers;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Before
+    public void setUp() {
+        verifier = new ConsumesMediaTypeVerifier();
+        args = mock(InvocationArguments.class);
+        metadata = mock(InvocationMetadata.class);
+        context = mock(RequestContext.class);
+        converters = mock(TypeMapperContext.class);
+        handlers = mock(RequestValueResolvers.class);
+    }
+
+    @Test
+    public void testPrepareInvoke() {
+        MediaType requstType = MediaTypes.APPLICATION_ATOM_XML_TYPE;
+        when(context.getRequestMethod()).thenReturn("POST");
+        when(context.getContentType()).thenReturn(requstType);
+        Method method = ReflectionUtils.getMethodQuietly(SomeResource.class, "acceptsAtom",
+                new Class<?>[] { Object.class });
+        when(metadata.resolveMethod()).thenReturn(method);
+        Object actual = verifier.prepareInvoke(args, metadata, context, converters, handlers);
+        assertThat(actual, is(ApplicationProcessor.NO_INTERRUPTION));
+    }
+
+    @Test
+    public void testPrepareInvokeWithGetMethod() {
+        MediaType requstType = MediaTypes.APPLICATION_ATOM_XML_TYPE;
+        when(context.getRequestMethod()).thenReturn("GET");
+        when(context.getContentType()).thenReturn(requstType);
+        Method method = ReflectionUtils.getMethodQuietly(SomeResource.class, "acceptsAtom",
+                new Class<?>[] { Object.class });
+        when(metadata.resolveMethod()).thenReturn(method);
+        Object actual = verifier.prepareInvoke(args, metadata, context, converters, handlers);
+        assertThat(actual, is(ApplicationProcessor.NO_INTERRUPTION));
+    }
+
+    @Test
+    public void testPrepareInvokeInvalidMediaType() {
+        thrown.expect(UnsupportedMediaTypeException.class);
+        MediaType requstType = MediaTypes.APPLICATION_JSON_TYPE;
+        when(context.getRequestMethod()).thenReturn("POST");
+        when(context.getContentType()).thenReturn(requstType);
+        Method method = ReflectionUtils.getMethodQuietly(SomeResource.class, "acceptsAtom",
+                new Class<?>[] { Object.class });
+        when(metadata.resolveMethod()).thenReturn(method);
+        verifier.prepareInvoke(args, metadata, context, converters, handlers);
+    }
+
+    @Test
+    public void testPrepareInvokeDefaultFormats() {
+        MediaType requstType = MediaTypes.APPLICATION_XML_TYPE;
+        when(context.getRequestMethod()).thenReturn("POST");
+        when(context.getContentType()).thenReturn(requstType);
+        SpecificMediaTypeRequestValueResolver handler = mock(SpecificMediaTypeRequestValueResolver.class);
+        when(handlers.findRequestValueResolver(Xml.class)).thenReturn(handler);
+        when(handler.supports(requstType)).thenReturn(true);
+        Method method = ReflectionUtils.getMethodQuietly(SomeResource.class, "acceptsSvg",
+                new Class<?>[] { Object.class });
+        when(metadata.resolveMethod()).thenReturn(method);
+        Object actual = verifier.prepareInvoke(args, metadata, context, converters, handlers);
+        assertThat(actual, is(ApplicationProcessor.NO_INTERRUPTION));
+    }
+
+    @Test
+    public void testPrepareInvokeDefaultFormatsNotSupported() {
+        thrown.expect(UnsupportedMediaTypeException.class);
+        MediaType requstType = MediaTypes.APPLICATION_JSON_TYPE;
+        when(context.getRequestMethod()).thenReturn("POST");
+        when(context.getContentType()).thenReturn(requstType);
+        SpecificMediaTypeRequestValueResolver handler = mock(SpecificMediaTypeRequestValueResolver.class);
+        when(handlers.findRequestValueResolver(Xml.class)).thenReturn(handler);
+        when(handler.supports(requstType)).thenReturn(false);
+        Method method = ReflectionUtils.getMethodQuietly(SomeResource.class, "acceptsSvg",
+                new Class<?>[] { Object.class });
+        when(metadata.resolveMethod()).thenReturn(method);
+        verifier.prepareInvoke(args, metadata, context, converters, handlers);
+    }
+
+    @Test
+    public void testPrepareInvokeNotDefinedFormats() {
+        thrown.expect(UnsupportedMediaTypeException.class);
+        when(context.getRequestMethod()).thenReturn("PUT");
+        Method method = ReflectionUtils.getMethodQuietly(SomeResource.class, "acceptsParameter",
+                new Class<?>[] { String.class });
+        when(metadata.resolveMethod()).thenReturn(method);
+        verifier.prepareInvoke(args, metadata, context, converters, handlers);
+    }
+
+    @Test
+    public void testPrepareInvokeWithoutFormats() {
+        thrown.expect(UnsupportedMediaTypeException.class);
+        when(context.getRequestMethod()).thenReturn("POST");
+        when(context.getContentType()).thenReturn(MediaTypes.APPLICATION_XML_TYPE);
+        SpecificMediaTypeRequestValueResolver handler = mock(SpecificMediaTypeRequestValueResolver.class);
+        when(handler.supports(MediaTypes.APPLICATION_XML_TYPE)).thenReturn(false);
+        when(handlers.findRequestValueResolver(Xml.class)).thenReturn(handler);
+        Method method = ReflectionUtils.getMethodQuietly(SomeResource.class, "acceptsXml",
+                new Class<?>[] { Object.class });
+        when(metadata.resolveMethod()).thenReturn(method);
+        verifier.prepareInvoke(args, metadata, context, converters, handlers);
+    }
+
+    @Test
 	public void testPrepareInvokeFailureWithoutFormats() {
 		when(context.getContentType()).thenReturn(
 				MediaTypes.APPLICATION_XML_TYPE);
@@ -156,37 +151,37 @@ public void testPrepareInvokeFailureWithoutFormats() {
 		verifier.prepareInvoke(args, metadata, context, converters, handlers);
 	}
 
-	@Test
-	public void testPrecidence() {
-		assertThat(verifier.getPrecedence(), is(1));
-	}
-
-	private static final class SomeResource {
-
-		@RequestFormats(MediaTypes.APPLICATION_ATOM_XML)
-		@Route
-		public String acceptsAtom(@Resolver(Xml.class) @As Object anXml) {
-			return "fake!";
-		}
-
-		@Route
-		public String acceptsXml(@Resolver(Xml.class) @As Object anXml) {
-			return "fake!";
-		}
-
-		@RequestFormats
-		@Route
-		public String acceptsSvg(@Resolver(Xml.class) @As Object anXml) {
-			return "fake!";
-		}
-
-		@RequestFormats
-		@Route
-		public String acceptsParameter(@As("param") String param) {
-			return "fake!";
-		}
-	}
-
-	interface Xml extends RequestValueResolver {
-	}
+    @Test
+    public void testPrecidence() {
+        assertThat(verifier.getPrecedence(), is(1));
+    }
+
+    private static final class SomeResource {
+
+        @RequestFormats(MediaTypes.APPLICATION_ATOM_XML)
+        @Route
+        public String acceptsAtom(@Resolver(Xml.class) @As Object anXml) {
+            return "fake!";
+        }
+
+        @Route
+        public String acceptsXml(@Resolver(Xml.class) @As Object anXml) {
+            return "fake!";
+        }
+
+        @RequestFormats
+        @Route
+        public String acceptsSvg(@Resolver(Xml.class) @As Object anXml) {
+            return "fake!";
+        }
+
+        @RequestFormats
+        @Route
+        public String acceptsParameter(@As("param") String param) {
+            return "fake!";
+        }
+    }
+
+    interface Xml extends RequestValueResolver {
+    }
 }
diff --git a/src/test/java/org/analogweb/core/CookieValueResolverTest.java b/src/test/java/org/analogweb/core/CookieValueResolverTest.java
index 987573d..f6924ac 100644
--- a/src/test/java/org/analogweb/core/CookieValueResolverTest.java
+++ b/src/test/java/org/analogweb/core/CookieValueResolverTest.java
@@ -17,46 +17,44 @@
  */
 public class CookieValueResolverTest {
 
-	private CookieValueResolver resolver;
-	private RequestContext requestContext;
-	private Cookies cookies;
-	private InvocationMetadata metadata;
+    private CookieValueResolver resolver;
+    private RequestContext requestContext;
+    private Cookies cookies;
+    private InvocationMetadata metadata;
 
-	@Before
-	public void setUp() throws Exception {
-		resolver = new CookieValueResolver();
-		requestContext = mock(RequestContext.class);
-		cookies = mock(Cookies.class);
-		metadata = mock(InvocationMetadata.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        resolver = new CookieValueResolver();
+        requestContext = mock(RequestContext.class);
+        cookies = mock(Cookies.class);
+        metadata = mock(InvocationMetadata.class);
+    }
 
-	@Test
-	public void testResolveAttributeValue() {
-		Cookies.Cookie cookie1 = mock(Cookies.Cookie.class);
-		Cookies.Cookie cookie2 = mock(Cookies.Cookie.class);
-		when(cookie1.getValue()).thenReturn("baa");
-		when(cookie2.getValue()).thenReturn("baz");
-		when(requestContext.getCookies()).thenReturn(cookies);
-		when(cookies.getCookie("foo")).thenReturn(cookie1);
-		Object actual = resolver.resolveValue(requestContext, metadata, "foo",
-				null, null);
-		assertThat((String) actual, is("baa"));
-	}
+    @Test
+    public void testResolveAttributeValue() {
+        Cookies.Cookie cookie1 = mock(Cookies.Cookie.class);
+        Cookies.Cookie cookie2 = mock(Cookies.Cookie.class);
+        when(cookie1.getValue()).thenReturn("baa");
+        when(cookie2.getValue()).thenReturn("baz");
+        when(requestContext.getCookies()).thenReturn(cookies);
+        when(cookies.getCookie("foo")).thenReturn(cookie1);
+        Object actual = resolver.resolveValue(requestContext, metadata, "foo", null, null);
+        assertThat((String) actual, is("baa"));
+    }
 
-	@Test
-	public void testResolveAttributeValueSpecifyTypes() {
-		Cookies.Cookie cookie1 = mock(Cookies.Cookie.class);
-		Cookies.Cookie cookie2 = mock(Cookies.Cookie.class);
-		when(cookie1.getValue()).thenReturn("baa");
-		when(cookie2.getValue()).thenReturn("baz");
-		when(requestContext.getCookies()).thenReturn(cookies);
-		when(cookies.getCookie("foo")).thenReturn(cookie1);
-		Object actual = resolver.resolveValue(requestContext, metadata, "foo",
-				Cookies.Cookie.class, null);
-		assertThat(((Cookies.Cookie) actual).getValue(), is("baa"));
-	}
+    @Test
+    public void testResolveAttributeValueSpecifyTypes() {
+        Cookies.Cookie cookie1 = mock(Cookies.Cookie.class);
+        Cookies.Cookie cookie2 = mock(Cookies.Cookie.class);
+        when(cookie1.getValue()).thenReturn("baa");
+        when(cookie2.getValue()).thenReturn("baz");
+        when(requestContext.getCookies()).thenReturn(cookies);
+        when(cookies.getCookie("foo")).thenReturn(cookie1);
+        Object actual = resolver.resolveValue(requestContext, metadata, "foo", Cookies.Cookie.class, null);
+        assertThat(((Cookies.Cookie) actual).getValue(), is("baa"));
+    }
 
-	@Test
+    @Test
 	public void testResolveAttributeValueNotMatchCookie() {
 		when(requestContext.getCookies()).thenReturn(cookies);
 		when(cookies.getCookie("baa")).thenReturn(null);
@@ -65,7 +63,7 @@ public void testResolveAttributeValueNotMatchCookie() {
 		assertNull(actual);
 	}
 
-	@Test
+    @Test
 	public void testResolveAttributeValueCookiesNotAvairable() {
 		when(requestContext.getCookies()).thenReturn(null);
 		Object actual = resolver.resolveValue(requestContext, metadata, "foo",
diff --git a/src/test/java/org/analogweb/core/DefaultApplicationContextResolverTest.java b/src/test/java/org/analogweb/core/DefaultApplicationContextResolverTest.java
index a7f6d67..0ad6650 100644
--- a/src/test/java/org/analogweb/core/DefaultApplicationContextResolverTest.java
+++ b/src/test/java/org/analogweb/core/DefaultApplicationContextResolverTest.java
@@ -12,21 +12,20 @@
 
 public class DefaultApplicationContextResolverTest {
 
-	@Test
-	public void testResolve() {
-		Object value = "baa";
-		ApplicationContext context = DefaultApplicationContext.context("foo",
-				value);
-		assertThat(context.getAttribute(String.class, "foo"), is("baa"));
-		assertThat(context.getAttribute(String.class, "baz"), is(nullValue()));
-	}
+    @Test
+    public void testResolve() {
+        Object value = "baa";
+        ApplicationContext context = DefaultApplicationContext.context("foo", value);
+        assertThat(context.getAttribute(String.class, "foo"), is("baa"));
+        assertThat(context.getAttribute(String.class, "baz"), is(nullValue()));
+    }
 
-	@Test
-	public void testResolveMap() {
-		Object value = "baa";
-		Map<String, ?> map = Maps.newHashMap("foo", value);
-		ApplicationContext context = DefaultApplicationContext.context(map);
-		assertThat(context.getAttribute(String.class, "foo"), is("baa"));
-		assertThat(context.getAttribute(String.class, "baz"), is(nullValue()));
-	}
+    @Test
+    public void testResolveMap() {
+        Object value = "baa";
+        Map<String, ?> map = Maps.newHashMap("foo", value);
+        ApplicationContext context = DefaultApplicationContext.context(map);
+        assertThat(context.getAttribute(String.class, "foo"), is("baa"));
+        assertThat(context.getAttribute(String.class, "baz"), is(nullValue()));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/DefaultApplicationPropertiesTest.java b/src/test/java/org/analogweb/core/DefaultApplicationPropertiesTest.java
index 10d401d..99f6755 100644
--- a/src/test/java/org/analogweb/core/DefaultApplicationPropertiesTest.java
+++ b/src/test/java/org/analogweb/core/DefaultApplicationPropertiesTest.java
@@ -19,73 +19,60 @@
 
 public class DefaultApplicationPropertiesTest {
 
-	private DefaultApplicationProperties properties;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-	@Rule
-	public TemporaryFolder folder = new TemporaryFolder();
+    private DefaultApplicationProperties properties;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
 
-	@Test
-	public void testUsingDefaultCreator() throws IOException {
-		properties = DefaultApplicationProperties.defaultProperties();
-		Collection<String> actualPackageNames = properties
-				.getComponentPackageNames();
-		assertThat(actualPackageNames.size(), is(1));
-		assertThat(actualPackageNames.contains(Application.class.getPackage()
-				.getName()), is(true));
-		assertThat(properties.getTempDir().getPath(), startsWith(new File(
-				SystemProperties.tmpDir() + SystemProperties.fileSeparator()
-						+ Application.class.getCanonicalName()).getPath()));
-	}
+    @Test
+    public void testUsingDefaultCreator() throws IOException {
+        properties = DefaultApplicationProperties.defaultProperties();
+        Collection<String> actualPackageNames = properties.getComponentPackageNames();
+        assertThat(actualPackageNames.size(), is(1));
+        assertThat(actualPackageNames.contains(Application.class.getPackage().getName()), is(true));
+        assertThat(properties.getTempDir().getPath(), startsWith(new File(
+                SystemProperties.tmpDir() + SystemProperties.fileSeparator() + Application.class.getCanonicalName())
+                        .getPath()));
+    }
 
-	@Test
-	public void testUsingArgsCreator() throws IOException {
-		properties = DefaultApplicationProperties.properties(new String[]{
-				"arg1", "arg2=arg3", "analogweb.tmpdir=/foo/baa/baz"});
-		Collection<String> actualPackageNames = properties
-				.getComponentPackageNames();
-		assertThat(actualPackageNames.size(), is(1));
-		assertThat(actualPackageNames.contains(Application.class.getPackage()
-				.getName()), is(true));
-		assertThat(properties.getTempDir().getPath(), is(new File(
-				"/foo/baa/baz").getPath()));
-		assertThat(properties.getProperty("arg1"), is((Object) Boolean.TRUE));
-		assertThat(properties.getStringProperty("arg2"), is("arg3"));
-	}
+    @Test
+    public void testUsingArgsCreator() throws IOException {
+        properties = DefaultApplicationProperties
+                .properties(new String[] { "arg1", "arg2=arg3", "analogweb.tmpdir=/foo/baa/baz" });
+        Collection<String> actualPackageNames = properties.getComponentPackageNames();
+        assertThat(actualPackageNames.size(), is(1));
+        assertThat(actualPackageNames.contains(Application.class.getPackage().getName()), is(true));
+        assertThat(properties.getTempDir().getPath(), is(new File("/foo/baa/baz").getPath()));
+        assertThat(properties.getProperty("arg1"), is((Object) Boolean.TRUE));
+        assertThat(properties.getStringProperty("arg2"), is("arg3"));
+    }
 
-	@Test
-	public void testUsingConfiguredDefaultCreator() throws IOException {
-		File dir = folder.newFolder();
-		String packageNames = "foo.baa,baz.boo";
-		String locale = "en-us";
-		String tempDirectoryPath = dir.getPath();
-		properties = DefaultApplicationProperties.properties(packageNames,
-				tempDirectoryPath, locale);
-		Collection<String> actualPackageNames = properties
-				.getComponentPackageNames();
-		assertThat(actualPackageNames.size(), is(3));
-		assertThat(actualPackageNames.containsAll(Arrays.asList("foo.baa",
-				"baz.boo", "org.analogweb")), is(true));
-		assertThat(
-				properties.getTempDir().getPath(),
-				startsWith(new File(dir.getPath()
-						+ SystemProperties.fileSeparator()
-						+ Application.class.getCanonicalName()).getPath()));
-		assertThat(properties.getDefaultClientLocale(), is(Locale.US));
-	}
+    @Test
+    public void testUsingConfiguredDefaultCreator() throws IOException {
+        File dir = folder.newFolder();
+        String packageNames = "foo.baa,baz.boo";
+        String locale = "en-us";
+        String tempDirectoryPath = dir.getPath();
+        properties = DefaultApplicationProperties.properties(packageNames, tempDirectoryPath, locale);
+        Collection<String> actualPackageNames = properties.getComponentPackageNames();
+        assertThat(actualPackageNames.size(), is(3));
+        assertThat(actualPackageNames.containsAll(Arrays.asList("foo.baa", "baz.boo", "org.analogweb")), is(true));
+        assertThat(properties.getTempDir().getPath(), startsWith(
+                new File(dir.getPath() + SystemProperties.fileSeparator() + Application.class.getCanonicalName())
+                        .getPath()));
+        assertThat(properties.getDefaultClientLocale(), is(Locale.US));
+    }
 
-	@Test
-	public void testUsingConfiguredDefaultCreatorWithEmptyPackageNames()
-			throws IOException {
-		File dir = folder.newFolder();
-		String packageNames = "";
-		String tempDirectoryPath = dir.getPath();
-		String locale = "";
-		properties = DefaultApplicationProperties.properties(packageNames,
-				tempDirectoryPath, locale);
-		assertThat(properties.getComponentPackageNames().size(), is(1));
-		assertThat(properties.getComponentPackageNames().iterator().next(),
-				is("org.analogweb"));
-		assertThat(properties.getDefaultClientLocale(), is(Locale.getDefault()));
-	}
+    @Test
+    public void testUsingConfiguredDefaultCreatorWithEmptyPackageNames() throws IOException {
+        File dir = folder.newFolder();
+        String packageNames = "";
+        String tempDirectoryPath = dir.getPath();
+        String locale = "";
+        properties = DefaultApplicationProperties.properties(packageNames, tempDirectoryPath, locale);
+        assertThat(properties.getComponentPackageNames().size(), is(1));
+        assertThat(properties.getComponentPackageNames().iterator().next(), is("org.analogweb"));
+        assertThat(properties.getDefaultClientLocale(), is(Locale.getDefault()));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/DefaultExceptionHandlerTest.java b/src/test/java/org/analogweb/core/DefaultExceptionHandlerTest.java
index fdfc9c4..2d9c9d7 100644
--- a/src/test/java/org/analogweb/core/DefaultExceptionHandlerTest.java
+++ b/src/test/java/org/analogweb/core/DefaultExceptionHandlerTest.java
@@ -25,80 +25,67 @@
  */
 public class DefaultExceptionHandlerTest {
 
-	private DefaultExceptionHandler handler;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    private DefaultExceptionHandler handler;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Before
-	public void setUp() {
-		handler = new DefaultExceptionHandler();
-		Modules modules = mock(Modules.class);
-		when(modules.getExceptionMappers()).thenReturn(
-				Arrays.<ExceptionMapper> asList(
-						new UnsupportedMediaTypeExceptionMapper(),
-						new InvalidRequestFormatExceptionMapper(),
-						new RequestMethodUnsupportedExceptionMapper()));
-		handler.setModules(modules);
-	}
+    @Before
+    public void setUp() {
+        handler = new DefaultExceptionHandler();
+        Modules modules = mock(Modules.class);
+        when(modules.getExceptionMappers())
+                .thenReturn(Arrays.<ExceptionMapper> asList(new UnsupportedMediaTypeExceptionMapper(),
+                        new InvalidRequestFormatExceptionMapper(), new RequestMethodUnsupportedExceptionMapper()));
+        handler.setModules(modules);
+    }
 
-	@Test
-	public void testHandleThrowableWithApplicationRuntimeException()
-			throws Exception {
-		Object actual = handler.handleException(new SomeException());
-		assertThat((HttpStatus) actual, is(HttpStatus.INTERNAL_SERVER_ERROR));
-	}
+    @Test
+    public void testHandleThrowableWithApplicationRuntimeException() throws Exception {
+        Object actual = handler.handleException(new SomeException());
+        assertThat((HttpStatus) actual, is(HttpStatus.INTERNAL_SERVER_ERROR));
+    }
 
-	@Test
-	public void testHandleThrowableWithRequestPathUnsupportedException()
-			throws Exception {
-		RequestPathMetadata metadata = mock(RequestPathMetadata.class);
-		Object actual = handler
-				.handleException(new RequestMethodUnsupportedException(
-						metadata, Arrays.asList("GET"), "POST"));
-		assertThat((HttpStatus) actual, is(HttpStatus.METHOD_NOT_ALLOWED));
-	}
+    @Test
+    public void testHandleThrowableWithRequestPathUnsupportedException() throws Exception {
+        RequestPathMetadata metadata = mock(RequestPathMetadata.class);
+        Object actual = handler
+                .handleException(new RequestMethodUnsupportedException(metadata, Arrays.asList("GET"), "POST"));
+        assertThat((HttpStatus) actual, is(HttpStatus.METHOD_NOT_ALLOWED));
+    }
 
-	@Test
-	public void testHandleThrowableWithUnsupportedMediaTypeException()
-			throws Exception {
-		RequestPathMetadata metadata = mock(RequestPathMetadata.class);
-		Object actual = handler
-				.handleException(new UnsupportedMediaTypeException(metadata));
-		assertThat((HttpStatus) actual, is(HttpStatus.UNSUPPORTED_MEDIA_TYPE));
-	}
+    @Test
+    public void testHandleThrowableWithUnsupportedMediaTypeException() throws Exception {
+        RequestPathMetadata metadata = mock(RequestPathMetadata.class);
+        Object actual = handler.handleException(new UnsupportedMediaTypeException(metadata));
+        assertThat((HttpStatus) actual, is(HttpStatus.UNSUPPORTED_MEDIA_TYPE));
+    }
 
-	@Test
-	public void testHandleRoutedThrowableWithUnsupportedMediaTypeException()
-			throws Exception {
-		RequestPathMetadata metadata = mock(RequestPathMetadata.class);
-		InvocationMetadata invocationMetadata = mock(InvocationMetadata.class);
-		Object actual = handler.handleException(new InvocationFailureException(
-				new UnsupportedMediaTypeException(metadata),
-				invocationMetadata, new String[0]));
-		assertThat((HttpStatus) actual, is(HttpStatus.UNSUPPORTED_MEDIA_TYPE));
-	}
+    @Test
+    public void testHandleRoutedThrowableWithUnsupportedMediaTypeException() throws Exception {
+        RequestPathMetadata metadata = mock(RequestPathMetadata.class);
+        InvocationMetadata invocationMetadata = mock(InvocationMetadata.class);
+        Object actual = handler.handleException(new InvocationFailureException(
+                new UnsupportedMediaTypeException(metadata), invocationMetadata, new String[0]));
+        assertThat((HttpStatus) actual, is(HttpStatus.UNSUPPORTED_MEDIA_TYPE));
+    }
 
-	@Test
-	public void testHandleRoutedThrowableWithInvalidRequestFormatException()
-			throws Exception {
-		Object actual = handler
-				.handleException(new InvalidRequestFormatException(
-						RequestValueResolver.class));
-		assertThat((HttpStatus) actual, is(HttpStatus.BAD_REQUEST));
-	}
+    @Test
+    public void testHandleRoutedThrowableWithInvalidRequestFormatException() throws Exception {
+        Object actual = handler.handleException(new InvalidRequestFormatException(RequestValueResolver.class));
+        assertThat((HttpStatus) actual, is(HttpStatus.BAD_REQUEST));
+    }
 
-	@Test
-	public void testHandleRouteThrowableWithApplicationRuntimeException()
-			throws Exception {
-		InvocationMetadata metadata = mock(InvocationMetadata.class);
-		Object actual = handler.handleException(new InvocationFailureException(
-				new SomeException(), metadata, new String[0]));
-		assertThat((HttpStatus) actual, is(HttpStatus.INTERNAL_SERVER_ERROR));
-	}
+    @Test
+    public void testHandleRouteThrowableWithApplicationRuntimeException() throws Exception {
+        InvocationMetadata metadata = mock(InvocationMetadata.class);
+        Object actual = handler
+                .handleException(new InvocationFailureException(new SomeException(), metadata, new String[0]));
+        assertThat((HttpStatus) actual, is(HttpStatus.INTERNAL_SERVER_ERROR));
+    }
 
-	public static class SomeException extends ApplicationRuntimeException {
+    public static class SomeException extends ApplicationRuntimeException {
 
-		private static final long serialVersionUID = 1L;
-	}
+        private static final long serialVersionUID = 1L;
+    }
 
 }
diff --git a/src/test/java/org/analogweb/core/DefaultInvocationFactoryTest.java b/src/test/java/org/analogweb/core/DefaultInvocationFactoryTest.java
index 2b08616..20f1c38 100644
--- a/src/test/java/org/analogweb/core/DefaultInvocationFactoryTest.java
+++ b/src/test/java/org/analogweb/core/DefaultInvocationFactoryTest.java
@@ -32,52 +32,47 @@
  */
 public class DefaultInvocationFactoryTest {
 
-	private ContainerAdaptor provider;
-	private InvocationMetadata metadata;
-	private RequestContext context;
-	private ResponseContext response;
-	private TypeMapperContext converters;
-	private List<ApplicationProcessor> processors;
-	private ApplicationProcessor processor;
-	private RequestValueResolvers handlers;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@Before
-	public void setUp() throws Exception {
-		provider = mock(ContainerAdaptor.class);
-		metadata = mock(InvocationMetadata.class);
-		context = mock(RequestContext.class);
-		response = mock(ResponseContext.class);
-		converters = mock(TypeMapperContext.class);
-		processors = new ArrayList<ApplicationProcessor>();
-		processor = mock(ApplicationProcessor.class);
-		processors.add(processor);
-		handlers = mock(RequestValueResolvers.class);
-	}
-
-	@Test
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	public void testCreateViaProvider() {
-		StubResource instance = new StubResource();
-		when(provider.getInstanceOfType(StubResource.class)).thenReturn(
-				instance);
-		when(metadata.getInvocationClass()).thenReturn(
-				(Class) StubResource.class);
-		when(metadata.getMethodName()).thenReturn("doSomething");
-		when(metadata.getArgumentTypes()).thenReturn(
-				new Class<?>[]{String.class});
-		DefaultInvocationFactory factory = new DefaultInvocationFactory();
-		Invocation invocation = factory.createInvocation(provider, metadata,
-				context, response, converters, handlers);
-		assertThat((StubResource) invocation.getInvocationInstance(),
-				is(sameInstance(instance)));
-	}
-
-	@Test
+    private ContainerAdaptor provider;
+    private InvocationMetadata metadata;
+    private RequestContext context;
+    private ResponseContext response;
+    private TypeMapperContext converters;
+    private List<ApplicationProcessor> processors;
+    private ApplicationProcessor processor;
+    private RequestValueResolvers handlers;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        provider = mock(ContainerAdaptor.class);
+        metadata = mock(InvocationMetadata.class);
+        context = mock(RequestContext.class);
+        response = mock(ResponseContext.class);
+        converters = mock(TypeMapperContext.class);
+        processors = new ArrayList<ApplicationProcessor>();
+        processor = mock(ApplicationProcessor.class);
+        processors.add(processor);
+        handlers = mock(RequestValueResolvers.class);
+    }
+
+    @Test
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public void testCreateViaProvider() {
+        StubResource instance = new StubResource();
+        when(provider.getInstanceOfType(StubResource.class)).thenReturn(instance);
+        when(metadata.getInvocationClass()).thenReturn((Class) StubResource.class);
+        when(metadata.getMethodName()).thenReturn("doSomething");
+        when(metadata.getArgumentTypes()).thenReturn(new Class<?>[] { String.class });
+        DefaultInvocationFactory factory = new DefaultInvocationFactory();
+        Invocation invocation = factory.createInvocation(provider, metadata, context, response, converters, handlers);
+        assertThat((StubResource) invocation.getInvocationInstance(), is(sameInstance(instance)));
+    }
+
+    @Test
 	@SuppressWarnings({"unchecked", "rawtypes"})
 	public void testCreateContainerProvidesNullInstance() {
 		when(provider.getInstanceOfType(StubResource.class)).thenReturn(null);
@@ -92,72 +87,68 @@ public void testCreateContainerProvidesNullInstance() {
 		assertThat(invocation.getInvocationInstance(), is(not(nullValue())));
 	}
 
-	@Test
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	public void testCreateUnInstanticatable() {
-		thrown.expect(new NoDescribeMatcher<UnresolvableInvocationException>() {
-
-			@Override
-			public boolean matches(Object arg0) {
-				if (arg0 instanceof UnresolvableInvocationException) {
-					UnresolvableInvocationException ex = (UnresolvableInvocationException) arg0;
-					InvocationMetadata actual = ex.getSourceMetadata();
-					assertThat(actual, is(metadata));
-					return true;
-				}
-				return false;
-			}
-		});
-		when(provider.getInstanceOfType(StubResourceUnInstanticatable.class))
-				.thenReturn(null);
-		when(metadata.getInvocationClass()).thenReturn(
-				(Class) StubResourceUnInstanticatable.class);
-		when(metadata.getMethodName()).thenReturn("doSomething");
-		when(metadata.getArgumentTypes()).thenReturn(
-				new Class<?>[]{String.class});
-		DefaultInvocationFactory factory = new DefaultInvocationFactory();
-		factory.createInvocation(provider, metadata, context, response,
-				converters, handlers);
-	}
-
-	@Route
-	public static class StubResource {
-
-		@Route
-		public String doSomething(@As("foo") String foo) {
-			return foo + " is anything!!";
-		}
-	}
-
-	@Route
-	public static class StubResourceWithConstractor {
-
-		private final String value;
-
-		public StubResourceWithConstractor(@As("baa") String value) {
-			this.value = value;
-		}
-
-		public String getValue() {
-			return this.value;
-		}
-
-		@Route
-		public String doSomething(@As("foo") String foo) {
-			return foo + " is anything!!";
-		}
-	}
-
-	@Route
-	public static class StubResourceUnInstanticatable {
-
-		private StubResourceUnInstanticatable() {
-			// nop.
-		}
-
-		@Route
-		public String doSomething(@As("foo") String foo) {
-			return foo + " is anything!!";
-		}
-	}
+    @Test
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public void testCreateUnInstanticatable() {
+        thrown.expect(new NoDescribeMatcher<UnresolvableInvocationException>() {
+
+            @Override
+            public boolean matches(Object arg0) {
+                if (arg0 instanceof UnresolvableInvocationException) {
+                    UnresolvableInvocationException ex = (UnresolvableInvocationException) arg0;
+                    InvocationMetadata actual = ex.getSourceMetadata();
+                    assertThat(actual, is(metadata));
+                    return true;
+                }
+                return false;
+            }
+        });
+        when(provider.getInstanceOfType(StubResourceUnInstanticatable.class)).thenReturn(null);
+        when(metadata.getInvocationClass()).thenReturn((Class) StubResourceUnInstanticatable.class);
+        when(metadata.getMethodName()).thenReturn("doSomething");
+        when(metadata.getArgumentTypes()).thenReturn(new Class<?>[] { String.class });
+        DefaultInvocationFactory factory = new DefaultInvocationFactory();
+        factory.createInvocation(provider, metadata, context, response, converters, handlers);
+    }
+
+    @Route
+    public static class StubResource {
+
+        @Route
+        public String doSomething(@As("foo") String foo) {
+            return foo + " is anything!!";
+        }
+    }
+
+    @Route
+    public static class StubResourceWithConstractor {
+
+        private final String value;
+
+        public StubResourceWithConstractor(@As("baa") String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        @Route
+        public String doSomething(@As("foo") String foo) {
+            return foo + " is anything!!";
+        }
+    }
+
+    @Route
+    public static class StubResourceUnInstanticatable {
+
+        private StubResourceUnInstanticatable() {
+            // nop.
+        }
+
+        @Route
+        public String doSomething(@As("foo") String foo) {
+            return foo + " is anything!!";
+        }
+    }
 }
diff --git a/src/test/java/org/analogweb/core/DefaultInvocationMetadataFinderTest.java b/src/test/java/org/analogweb/core/DefaultInvocationMetadataFinderTest.java
index 538d6c0..36dcc55 100644
--- a/src/test/java/org/analogweb/core/DefaultInvocationMetadataFinderTest.java
+++ b/src/test/java/org/analogweb/core/DefaultInvocationMetadataFinderTest.java
@@ -16,122 +16,108 @@
 
 public class DefaultInvocationMetadataFinderTest {
 
-	private DefaultInvocationMetadataFinder finder;
-	private RequestContext context;
+    private DefaultInvocationMetadataFinder finder;
+    private RequestContext context;
 
-	@Before
-	public void setUp() throws Exception {
-		finder = new DefaultInvocationMetadataFinder();
-		context = mock(RequestContext.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        finder = new DefaultInvocationMetadataFinder();
+        context = mock(RequestContext.class);
+    }
 
-	@Test
-	public void testGetActionMethodMetadata() {
-		RequestPath requestPath1 = mock(RequestPath.class);
-		RequestPath requestPath2 = mock(RequestPath.class);
-		RequestPath requestPath3 = mock(RequestPath.class);
-		InvocationMetadata metadata1 = mock(InvocationMetadata.class);
-		InvocationMetadata metadata2 = mock(InvocationMetadata.class);
-		InvocationMetadata metadata3 = mock(InvocationMetadata.class);
-		when(metadata1.getDefinedPath()).thenReturn(requestPath1);
-		when(metadata2.getDefinedPath()).thenReturn(requestPath2);
-		when(metadata3.getDefinedPath()).thenReturn(requestPath3);
-		Map<RequestPathMetadata, InvocationMetadata> metadatas = Maps
-				.newEmptyHashMap();
-		metadatas.put(requestPath1, metadata1);
-		metadatas.put(requestPath2, metadata2);
-		metadatas.put(requestPath3, metadata3);
-		metadatas = Collections.unmodifiableMap(metadatas);
-		when(context.getRequestPath()).thenReturn(requestPath1);
-		assertThat(finder.find(metadatas, context), is(metadata1));
-		when(context.getRequestPath()).thenReturn(requestPath2);
-		assertThat(finder.find(metadatas, context), is(metadata2));
-		when(context.getRequestPath()).thenReturn(requestPath3);
-		assertThat(finder.find(metadatas, context), is(metadata3));
-	}
+    @Test
+    public void testGetActionMethodMetadata() {
+        RequestPath requestPath1 = mock(RequestPath.class);
+        RequestPath requestPath2 = mock(RequestPath.class);
+        RequestPath requestPath3 = mock(RequestPath.class);
+        InvocationMetadata metadata1 = mock(InvocationMetadata.class);
+        InvocationMetadata metadata2 = mock(InvocationMetadata.class);
+        InvocationMetadata metadata3 = mock(InvocationMetadata.class);
+        when(metadata1.getDefinedPath()).thenReturn(requestPath1);
+        when(metadata2.getDefinedPath()).thenReturn(requestPath2);
+        when(metadata3.getDefinedPath()).thenReturn(requestPath3);
+        Map<RequestPathMetadata, InvocationMetadata> metadatas = Maps.newEmptyHashMap();
+        metadatas.put(requestPath1, metadata1);
+        metadatas.put(requestPath2, metadata2);
+        metadatas.put(requestPath3, metadata3);
+        metadatas = Collections.unmodifiableMap(metadatas);
+        when(context.getRequestPath()).thenReturn(requestPath1);
+        assertThat(finder.find(metadatas, context), is(metadata1));
+        when(context.getRequestPath()).thenReturn(requestPath2);
+        assertThat(finder.find(metadatas, context), is(metadata2));
+        when(context.getRequestPath()).thenReturn(requestPath3);
+        assertThat(finder.find(metadatas, context), is(metadata3));
+    }
 
-	@Test
-	public void testGetActionMethodMetadataWithNoMatch() {
-		RequestPath requestPath1 = mock(RequestPath.class);
-		RequestPath requestPath2 = mock(RequestPath.class);
-		InvocationMetadata metadata1 = mock(InvocationMetadata.class);
-		when(metadata1.getDefinedPath()).thenReturn(requestPath1);
-		Map<RequestPathMetadata, InvocationMetadata> metadatas = Maps
-				.newEmptyHashMap();
-		metadatas.put(requestPath1, metadata1);
-		metadatas = Collections.unmodifiableMap(metadatas);
-		when(requestPath1.match(requestPath1)).thenReturn(true);
-		when(metadata1.getDefinedPath()).thenReturn(requestPath1);
-		when(context.getRequestPath()).thenReturn(requestPath1);
-		assertThat(finder.find(metadatas, context), is(metadata1));
-		when(context.getRequestPath()).thenReturn(requestPath2);
-		assertNull(finder.find(metadatas, context));
-	}
+    @Test
+    public void testGetActionMethodMetadataWithNoMatch() {
+        RequestPath requestPath1 = mock(RequestPath.class);
+        RequestPath requestPath2 = mock(RequestPath.class);
+        InvocationMetadata metadata1 = mock(InvocationMetadata.class);
+        when(metadata1.getDefinedPath()).thenReturn(requestPath1);
+        Map<RequestPathMetadata, InvocationMetadata> metadatas = Maps.newEmptyHashMap();
+        metadatas.put(requestPath1, metadata1);
+        metadatas = Collections.unmodifiableMap(metadatas);
+        when(requestPath1.match(requestPath1)).thenReturn(true);
+        when(metadata1.getDefinedPath()).thenReturn(requestPath1);
+        when(context.getRequestPath()).thenReturn(requestPath1);
+        assertThat(finder.find(metadatas, context), is(metadata1));
+        when(context.getRequestPath()).thenReturn(requestPath2);
+        assertNull(finder.find(metadatas, context));
+    }
 
-	@Test
-	public void testDisposedGetActionMethodMetadataWithNoMatch() {
-		RequestPath requestPath1 = mock(RequestPath.class);
-		RequestPath requestPath2 = mock(RequestPath.class);
-		InvocationMetadata metadata1 = mock(InvocationMetadata.class);
-		when(metadata1.getDefinedPath()).thenReturn(requestPath1);
-		when(requestPath1.match(requestPath1)).thenReturn(true);
-		Map<RequestPathMetadata, InvocationMetadata> metadatas = Maps
-				.newEmptyHashMap();
-		metadatas = Collections.unmodifiableMap(metadatas);
-		when(context.getRequestPath()).thenReturn(requestPath1);
-		assertNull(finder.find(metadatas, context));
-		when(context.getRequestPath()).thenReturn(requestPath2);
-		assertNull(finder.find(metadatas, context));
-	}
+    @Test
+    public void testDisposedGetActionMethodMetadataWithNoMatch() {
+        RequestPath requestPath1 = mock(RequestPath.class);
+        RequestPath requestPath2 = mock(RequestPath.class);
+        InvocationMetadata metadata1 = mock(InvocationMetadata.class);
+        when(metadata1.getDefinedPath()).thenReturn(requestPath1);
+        when(requestPath1.match(requestPath1)).thenReturn(true);
+        Map<RequestPathMetadata, InvocationMetadata> metadatas = Maps.newEmptyHashMap();
+        metadatas = Collections.unmodifiableMap(metadatas);
+        when(context.getRequestPath()).thenReturn(requestPath1);
+        assertNull(finder.find(metadatas, context));
+        when(context.getRequestPath()).thenReturn(requestPath2);
+        assertNull(finder.find(metadatas, context));
+    }
 
-	@Test
-	public void testDuplicatePath() {
-		InvocationMetadata meta1 = mock(InvocationMetadata.class);
-		InvocationMetadata meta2 = mock(InvocationMetadata.class);
-		RequestPathMetadata path1 = RequestPathDefinition.define("/", "/path",
-				new String[]{"GET"});
-		when(meta1.getDefinedPath()).thenReturn(path1);
-		RequestPathMetadata path2 = RequestPathDefinition.define("/", "/path",
-				new String[]{"POST"});
-		when(meta2.getDefinedPath()).thenReturn(path2);
-		Map<RequestPathMetadata, InvocationMetadata> metadatas = Maps
-				.newEmptyHashMap();
-		metadatas.put(path1, meta1);
-		metadatas.put(path2, meta2);
-		metadatas = Collections.unmodifiableMap(metadatas);
-		RequestPath requestPath1 = new DefaultRequestPath(URI.create("/"),
-				URI.create("/path"), "GET");
-		when(meta2.getDefinedPath()).thenReturn(path2);
-		when(context.getRequestPath()).thenReturn(requestPath1);
-		InvocationMetadata actual = finder.find(metadatas, context);
-		assertThat(((InvocationMetadataFinder.Cacheable) actual).getCachable(),
-				is(meta1));
-		RequestPath requestPath2 = new DefaultRequestPath(URI.create("/"),
-				URI.create("/path"), "POST");
-		when(context.getRequestPath()).thenReturn(requestPath2);
-		actual = finder.find(metadatas, context);
-		assertThat(((InvocationMetadataFinder.Cacheable) actual).getCachable(),
-				is(meta2));
-	}
+    @Test
+    public void testDuplicatePath() {
+        InvocationMetadata meta1 = mock(InvocationMetadata.class);
+        InvocationMetadata meta2 = mock(InvocationMetadata.class);
+        RequestPathMetadata path1 = RequestPathDefinition.define("/", "/path", new String[] { "GET" });
+        when(meta1.getDefinedPath()).thenReturn(path1);
+        RequestPathMetadata path2 = RequestPathDefinition.define("/", "/path", new String[] { "POST" });
+        when(meta2.getDefinedPath()).thenReturn(path2);
+        Map<RequestPathMetadata, InvocationMetadata> metadatas = Maps.newEmptyHashMap();
+        metadatas.put(path1, meta1);
+        metadatas.put(path2, meta2);
+        metadatas = Collections.unmodifiableMap(metadatas);
+        RequestPath requestPath1 = new DefaultRequestPath(URI.create("/"), URI.create("/path"), "GET");
+        when(meta2.getDefinedPath()).thenReturn(path2);
+        when(context.getRequestPath()).thenReturn(requestPath1);
+        InvocationMetadata actual = finder.find(metadatas, context);
+        assertThat(((InvocationMetadataFinder.Cacheable) actual).getCachable(), is(meta1));
+        RequestPath requestPath2 = new DefaultRequestPath(URI.create("/"), URI.create("/path"), "POST");
+        when(context.getRequestPath()).thenReturn(requestPath2);
+        actual = finder.find(metadatas, context);
+        assertThat(((InvocationMetadataFinder.Cacheable) actual).getCachable(), is(meta2));
+    }
 
-	@Test(expected = RequestMethodUnsupportedException.class)
-	public void testDuplicatePathMethodNotFound() {
-		InvocationMetadata meta1 = mock(InvocationMetadata.class);
-		InvocationMetadata meta2 = mock(InvocationMetadata.class);
-		RequestPathMetadata path1 = RequestPathDefinition.define("/", "/path",
-				new String[]{"GET"});
-		when(meta1.getDefinedPath()).thenReturn(path1);
-		RequestPathMetadata path2 = RequestPathDefinition.define("/", "/path",
-				new String[]{"POST"});
-		when(meta2.getDefinedPath()).thenReturn(path2);
-		Map<RequestPathMetadata, InvocationMetadata> metadatas = Maps
-				.newEmptyHashMap();
-		metadatas.put(path1, meta1);
-		metadatas.put(path2, meta2);
-		metadatas = Collections.unmodifiableMap(metadatas);
-		RequestPath requestPath = new DefaultRequestPath(URI.create("/"),
-				URI.create("/path"), "PUT");
-		when(context.getRequestPath()).thenReturn(requestPath);
-		finder.find(metadatas, context);
-	}
+    @Test(expected = RequestMethodUnsupportedException.class)
+    public void testDuplicatePathMethodNotFound() {
+        InvocationMetadata meta1 = mock(InvocationMetadata.class);
+        InvocationMetadata meta2 = mock(InvocationMetadata.class);
+        RequestPathMetadata path1 = RequestPathDefinition.define("/", "/path", new String[] { "GET" });
+        when(meta1.getDefinedPath()).thenReturn(path1);
+        RequestPathMetadata path2 = RequestPathDefinition.define("/", "/path", new String[] { "POST" });
+        when(meta2.getDefinedPath()).thenReturn(path2);
+        Map<RequestPathMetadata, InvocationMetadata> metadatas = Maps.newEmptyHashMap();
+        metadatas.put(path1, meta1);
+        metadatas.put(path2, meta2);
+        metadatas = Collections.unmodifiableMap(metadatas);
+        RequestPath requestPath = new DefaultRequestPath(URI.create("/"), URI.create("/path"), "PUT");
+        when(context.getRequestPath()).thenReturn(requestPath);
+        finder.find(metadatas, context);
+    }
 }
diff --git a/src/test/java/org/analogweb/core/DefaultInvocationTest.java b/src/test/java/org/analogweb/core/DefaultInvocationTest.java
index 5091ed4..67e54fb 100644
--- a/src/test/java/org/analogweb/core/DefaultInvocationTest.java
+++ b/src/test/java/org/analogweb/core/DefaultInvocationTest.java
@@ -20,60 +20,54 @@
  */
 public class DefaultInvocationTest {
 
-	private DefaultInvocation invocation;
-	private InvocationMetadata metadata;
-	private RequestContext context;
-	private ResponseContext response;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    private DefaultInvocation invocation;
+    private InvocationMetadata metadata;
+    private RequestContext context;
+    private ResponseContext response;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Before
-	public void setUp() {
-		metadata = mock(InvocationMetadata.class);
-		context = mock(RequestContext.class);
-		response = mock(ResponseContext.class);
-	}
+    @Before
+    public void setUp() {
+        metadata = mock(InvocationMetadata.class);
+        context = mock(RequestContext.class);
+        response = mock(ResponseContext.class);
+    }
 
-	@Test
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	public void testInvoke() {
-		StubResource instance = new StubResource();
-		when(metadata.getInvocationClass()).thenReturn(
-				(Class) instance.getClass());
-		when(metadata.getMethodName()).thenReturn("doSomething");
-		when(metadata.getArgumentTypes()).thenReturn(
-				new Class<?>[]{String.class});
-		invocation = new DefaultInvocation(instance, metadata, context,
-				response);
-		invocation.putInvocationArgument(0, "foo");
-		Object actual = invocation.invoke();
-		assertThat(actual.toString(), is("foo is something!!"));
-	}
+    @Test
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public void testInvoke() {
+        StubResource instance = new StubResource();
+        when(metadata.getInvocationClass()).thenReturn((Class) instance.getClass());
+        when(metadata.getMethodName()).thenReturn("doSomething");
+        when(metadata.getArgumentTypes()).thenReturn(new Class<?>[] { String.class });
+        invocation = new DefaultInvocation(instance, metadata, context, response);
+        invocation.putInvocationArgument(0, "foo");
+        Object actual = invocation.invoke();
+        assertThat(actual.toString(), is("foo is something!!"));
+    }
 
-	@Route
-	public static class StubResource {
+    @Route
+    public static class StubResource {
 
-		@Route
-		private String doNothing() {
-			return null;
-		}
+        @Route
+        private String doNothing() {
+            return null;
+        }
 
-		@Route
-		public String doSomething(@As("foo") String foo) {
-			return String.format("%s is something!!", foo);
-		}
+        @Route
+        public String doSomething(@As("foo") String foo) {
+            return String.format("%s is something!!", foo);
+        }
 
-		@Route
-		public String doAnything(@As("foo") String foo, String baa,
-				@As("baz") Integer baz) {
-			return String
-					.format("No%s %s with %s is anything!!", baz, foo, baa);
-		}
+        @Route
+        public String doAnything(@As("foo") String foo, String baa, @As("baz") Integer baz) {
+            return String.format("No%s %s with %s is anything!!", baz, foo, baa);
+        }
 
-		@Route
-		public String doSomethingWithException(@As("foo") String foo,
-				@As("baa") Long baa) {
-			throw new NullPointerException("oops!");
-		}
-	}
+        @Route
+        public String doSomethingWithException(@As("foo") String foo, @As("baa") Long baa) {
+            throw new NullPointerException("oops!");
+        }
+    }
 }
diff --git a/src/test/java/org/analogweb/core/DefaultInvokerFactoryTest.java b/src/test/java/org/analogweb/core/DefaultInvokerFactoryTest.java
index c153140..485ea3c 100644
--- a/src/test/java/org/analogweb/core/DefaultInvokerFactoryTest.java
+++ b/src/test/java/org/analogweb/core/DefaultInvokerFactoryTest.java
@@ -13,11 +13,11 @@
 
 public class DefaultInvokerFactoryTest {
 
-	@Test
-	public void test() {
-		List<InvocationInterceptor> interceptors = new ArrayList<InvocationInterceptor>();
-		DefaultInvokerFactory factory = new DefaultInvokerFactory();
-		Invoker invoker = factory.createInvoker(interceptors);
-		assertThat(invoker, is(instanceOf(DefaultInvoker.class)));
-	}
+    @Test
+    public void test() {
+        List<InvocationInterceptor> interceptors = new ArrayList<InvocationInterceptor>();
+        DefaultInvokerFactory factory = new DefaultInvokerFactory();
+        Invoker invoker = factory.createInvoker(interceptors);
+        assertThat(invoker, is(instanceOf(DefaultInvoker.class)));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/DefaultInvokerTest.java b/src/test/java/org/analogweb/core/DefaultInvokerTest.java
index ac8a4f6..91c836c 100644
--- a/src/test/java/org/analogweb/core/DefaultInvokerTest.java
+++ b/src/test/java/org/analogweb/core/DefaultInvokerTest.java
@@ -2,8 +2,8 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -36,95 +36,84 @@
  */
 public class DefaultInvokerTest {
 
-	private InvocationMetadata metadata;
-	private RequestContext request;
-	private ResponseContext response;
-	private Invocation invocation;
-	private RequestValueResolvers handlers;
-	private TypeMapperContext typeMapper;
-	private InvocationArguments args;
-	private List<ApplicationProcessor> processors;
-	private ApplicationProcessor processor;
-	private List<InvocationInterceptor> interceptors;
-	private InvocationInterceptor interceptor;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    private InvocationMetadata metadata;
+    private RequestContext request;
+    private ResponseContext response;
+    private Invocation invocation;
+    private RequestValueResolvers handlers;
+    private TypeMapperContext typeMapper;
+    private InvocationArguments args;
+    private List<ApplicationProcessor> processors;
+    private ApplicationProcessor processor;
+    private List<InvocationInterceptor> interceptors;
+    private InvocationInterceptor interceptor;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Before
-	public void setUp() throws Exception {
-		metadata = mock(InvocationMetadata.class);
-		request = mock(RequestContext.class);
-		response = mock(ResponseContext.class);
-		processors = new ArrayList<ApplicationProcessor>();
-		processor = mock(ApplicationProcessor.class);
-		processors.add(processor);
-		invocation = mock(Invocation.class);
-		handlers = mock(RequestValueResolvers.class);
-		typeMapper = mock(TypeMapperContext.class);
-		args = mock(InvocationArguments.class);
-		processor = mock(ApplicationProcessor.class);
-		processors = Arrays.asList(processor);
-		interceptor = new AbstractInvocationInterceptor();
-		interceptors = Arrays.asList(interceptor);
-	}
+    @Before
+    public void setUp() throws Exception {
+        metadata = mock(InvocationMetadata.class);
+        request = mock(RequestContext.class);
+        response = mock(ResponseContext.class);
+        processors = new ArrayList<ApplicationProcessor>();
+        processor = mock(ApplicationProcessor.class);
+        processors.add(processor);
+        invocation = mock(Invocation.class);
+        handlers = mock(RequestValueResolvers.class);
+        typeMapper = mock(TypeMapperContext.class);
+        args = mock(InvocationArguments.class);
+        processor = mock(ApplicationProcessor.class);
+        processors = Arrays.asList(processor);
+        interceptor = new AbstractInvocationInterceptor();
+        interceptors = Arrays.asList(interceptor);
+    }
 
-	@Test
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	public void testInvoke() {
-		Invoker invoker = new DefaultInvoker(interceptors);
-		Object result = new Object();
-		when(invocation.invoke()).thenReturn(result);
-		when(invocation.getInvocationArguments()).thenReturn(args);
-		List<Object> list = new ArrayList<Object>();
-		list.add("foo");
-		when(args.asList()).thenReturn(list);
-		when(metadata.getInvocationClass()).thenReturn(
-				(Class) StubResource.class);
-		when(metadata.getMethodName()).thenReturn("doSomething");
-		when(metadata.getArgumentTypes()).thenReturn(
-				new Class<?>[]{String.class});
-		when(
-				processor.prepareInvoke(args, metadata, request, typeMapper,
-						handlers)).thenReturn(
-				ApplicationProcessor.NO_INTERRUPTION);
-		doNothing().when(processor).postInvoke("foo is something!!", args,
-				metadata, request, handlers);
-		// delegate to Invocation#invoke only.
-		Object actual = invoker.invoke(invocation, metadata, request, response);
-		assertThat(actual, is(result));
-		verify(invocation).invoke();
-	}
+    @Test
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public void testInvoke() {
+        Invoker invoker = new DefaultInvoker(interceptors);
+        Object result = new Object();
+        when(invocation.invoke()).thenReturn(result);
+        when(invocation.getInvocationArguments()).thenReturn(args);
+        List<Object> list = new ArrayList<Object>();
+        list.add("foo");
+        when(args.asList()).thenReturn(list);
+        when(metadata.getInvocationClass()).thenReturn((Class) StubResource.class);
+        when(metadata.getMethodName()).thenReturn("doSomething");
+        when(metadata.getArgumentTypes()).thenReturn(new Class<?>[] { String.class });
+        when(processor.prepareInvoke(args, metadata, request, typeMapper, handlers))
+                .thenReturn(ApplicationProcessor.NO_INTERRUPTION);
+        doNothing().when(processor).postInvoke("foo is something!!", args, metadata, request, handlers);
+        // delegate to Invocation#invoke only.
+        Object actual = invoker.invoke(invocation, metadata, request, response);
+        assertThat(actual, is(result));
+        verify(invocation).invoke();
+    }
 
-	@Test
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	public void testInvokeWithException() {
-		thrown.expect(IllegalArgumentException.class);
-		Invoker invoker = new DefaultInvoker(interceptors);
-		when(invocation.invoke()).thenThrow(new IllegalArgumentException());
-		when(invocation.getInvocationArguments()).thenReturn(args);
-		when(metadata.getInvocationClass()).thenReturn(
-				(Class) StubResource.class);
-		when(metadata.getMethodName()).thenReturn("doSomething");
-		when(metadata.getArgumentTypes()).thenReturn(
-				new Class<?>[]{String.class});
-		when(args.asList()).thenReturn(Collections.emptyList());
-		when(
-				processor.prepareInvoke(args, metadata, request, typeMapper,
-						handlers)).thenReturn(
-				ApplicationProcessor.NO_INTERRUPTION);
-		when(
-				processor.processException(isA(IllegalArgumentException.class),
-						eq(request), eq(args), eq(metadata))).thenReturn(
-				ApplicationProcessor.NO_INTERRUPTION);
-		invoker.invoke(invocation, metadata, request, response);
-	}
+    @Test
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public void testInvokeWithException() {
+        thrown.expect(IllegalArgumentException.class);
+        Invoker invoker = new DefaultInvoker(interceptors);
+        when(invocation.invoke()).thenThrow(new IllegalArgumentException());
+        when(invocation.getInvocationArguments()).thenReturn(args);
+        when(metadata.getInvocationClass()).thenReturn((Class) StubResource.class);
+        when(metadata.getMethodName()).thenReturn("doSomething");
+        when(metadata.getArgumentTypes()).thenReturn(new Class<?>[] { String.class });
+        when(args.asList()).thenReturn(Collections.emptyList());
+        when(processor.prepareInvoke(args, metadata, request, typeMapper, handlers))
+                .thenReturn(ApplicationProcessor.NO_INTERRUPTION);
+        when(processor.processException(isA(IllegalArgumentException.class), eq(request), eq(args), eq(metadata)))
+                .thenReturn(ApplicationProcessor.NO_INTERRUPTION);
+        invoker.invoke(invocation, metadata, request, response);
+    }
 
-	@Route
-	public static class StubResource {
+    @Route
+    public static class StubResource {
 
-		@Route
-		public String doSomething(@As("foo") String foo) {
-			return String.format("%s is something!!", foo);
-		}
-	}
+        @Route
+        public String doSomething(@As("foo") String foo) {
+            return String.format("%s is something!!", foo);
+        }
+    }
 }
diff --git a/src/test/java/org/analogweb/core/DefaultModulesBuilderTest.java b/src/test/java/org/analogweb/core/DefaultModulesBuilderTest.java
index 9c76c89..3e9d480 100644
--- a/src/test/java/org/analogweb/core/DefaultModulesBuilderTest.java
+++ b/src/test/java/org/analogweb/core/DefaultModulesBuilderTest.java
@@ -4,7 +4,7 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -46,400 +46,374 @@
  */
 public class DefaultModulesBuilderTest {
 
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-	private static final Log log = Logs.getLog(DefaultModulesBuilderTest.class);
-	private DefaultModulesBuilder builder;
-	private ApplicationContext resolver;
-	// relative mocks.
-	private static MockModulesProvidingContainerAdaptor adaptor = new MockModulesProvidingContainerAdaptor();
-	private InvocationMetadataFactory invocationMetadataFactory;
-	private InvokerFactory invokerFactory;
-	@SuppressWarnings("rawtypes")
-	private ContainerAdaptorFactory containerAdaptorFactory;
-	private ContainerAdaptor containerAdaptor;
-	private InvocationFactory invocationFactory;
-	private RenderableResolver directionResolver;
-	private ResponseHandler directiontHandler;
-	private ApplicationProcessor invocationProcessor;
-	private InvocationInterceptor invocationInterceptor;
-	private AttributesHandler attributesHandler;
-	private ExceptionHandler exceptionHandler;
-	private TypeMapperContext typeMapperContext;
-	private TypeMapper typeMapper;
-	private ResponseFormatter directionFormatter;
-
-	@Before
-	public void setUp() {
-		builder = new DefaultModulesBuilder();
-		resolver = mock(ApplicationContext.class);
-		invocationMetadataFactory = mock(InvocationMetadataFactory.class);
-		invokerFactory = mock(InvokerFactory.class);
-		containerAdaptorFactory = mock(ContainerAdaptorFactory.class);
-		containerAdaptor = mock(ContainerAdaptor.class);
-		when(containerAdaptorFactory.createContainerAdaptor(resolver))
-				.thenReturn(containerAdaptor);
-		invocationFactory = mock(InvocationFactory.class);
-		directionResolver = mock(RenderableResolver.class);
-		directiontHandler = mock(ResponseHandler.class);
-		invocationProcessor = mock(ApplicationProcessor.class);
-		invocationInterceptor = mock(InvocationInterceptor.class);
-		attributesHandler = mock(AttributesHandler.class);
-		exceptionHandler = mock(ExceptionHandler.class);
-		typeMapperContext = mock(TypeMapperContext.class);
-		typeMapper = mock(TypeMapper.class);
-		directionFormatter = mock(ResponseFormatter.class);
-		adaptor.register(invocationMetadataFactory.getClass(),
-				invocationMetadataFactory);
-		adaptor.register(invokerFactory.getClass(), invokerFactory);
-		adaptor.register(containerAdaptorFactory.getClass(),
-				containerAdaptorFactory);
-		adaptor.register(invocationFactory.getClass(), invocationFactory);
-		adaptor.register(directionResolver.getClass(), directionResolver);
-		adaptor.register(directiontHandler.getClass(), directiontHandler);
-		adaptor.register(invocationProcessor.getClass(), invocationProcessor);
-		adaptor.register(invocationInterceptor.getClass(),
-				invocationInterceptor);
-		adaptor.register(attributesHandler.getClass(), attributesHandler);
-		adaptor.register(exceptionHandler.getClass(), exceptionHandler);
-		adaptor.register(typeMapperContext.getClass(), typeMapperContext);
-		adaptor.register(typeMapper.getClass(), typeMapper);
-		adaptor.register(directionFormatter.getClass(), directionFormatter);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	public void testBuildModules() {
-		builder.setModulesProviderClass(MockModulesProvidingContainerAdaptorFactory.class);
-		builder.setInvocationFactoryClass(invocationFactory.getClass());
-		builder.setInvocationInstanceProviderClass((Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>>) containerAdaptorFactory
-				.getClass());
-		builder.setInvokerFactoryClass(invokerFactory.getClass());
-		builder.setResponseHandlerClass(directiontHandler.getClass());
-		builder.setRenderableResolverClass(directionResolver.getClass());
-		builder.addApplicationProcessorClass(invocationProcessor.getClass());
-		builder.addInvocationInterceptorClass(invocationInterceptor.getClass());
-		builder.addInvocationMetadataFactoriesClass(invocationMetadataFactory
-				.getClass());
-		builder.addAttributesHandlerClass(attributesHandler.getClass());
-		builder.setExceptionHandlerClass(exceptionHandler.getClass());
-		builder.setTypeMapperContextClass(typeMapperContext.getClass());
-		Renderable mapToResponse = mock(Renderable.class);
-		builder.addResponseFormatterClass(mapToResponse.getClass(),
-				directionFormatter.getClass());
-		Modules modules = builder.buildModules(resolver, adaptor);
-		assertSame(modules.getInvocationMetadataFactories().get(0),
-				invocationMetadataFactory);
-		assertSame(modules.getInvocationInstanceProvider(), containerAdaptor);
-		// same instance.
-		assertSame(modules.getInvocationInstanceProvider(), containerAdaptor);
-		assertSame(modules.getInvocationFactory(), invocationFactory);
-		assertSame(modules.getResponseResolver(), directionResolver);
-		assertSame(modules.getResponseHandler(), directiontHandler);
-		assertSame(modules.getApplicationProcessors().get(0),
-				invocationProcessor);
-		assertSame(modules.getInvocationInterceptors().get(0),
-				invocationInterceptor);
-		assertSame(modules.getExceptionHandler(), exceptionHandler);
-		assertSame(modules.getTypeMapperContext(), typeMapperContext);
-		assertSame(modules.findResponseFormatter(mapToResponse.getClass()),
-				directionFormatter);
-	}
-
-	@Test
-	public void testBuildModulesWithNullContainerAdaptorFactory() {
-		thrown.expect(MissingModulesProviderException.class);
-		builder.setModulesProviderClass(MockNullContainerAdaptorFactory.class);
-		builder.buildModules(resolver, adaptor);
-	}
-
-	@Test
-	public void testModulesNotFound() {
-		thrown.expect(new NoDescribeMatcher<MissingModuleException>() {
-
-			@Override
-			public boolean matches(Object arg0) {
-				if (arg0 instanceof MissingModuleException) {
-					MissingModuleException mm = (MissingModuleException) arg0;
-					assertThat(mm.getRequiredModuleClass().getCanonicalName(),
-							is(InvokerFactory.class.getCanonicalName()));
-					return true;
-				}
-				return false;
-			}
-		});
-		builder.setModulesProviderClass(MockModulesProvidingContainerAdaptorFactory.class);
-		builder.setInvokerFactoryClass(InvokerFactory.class);
-		Modules modules = builder.buildModules(resolver, adaptor);
-		modules.getInvoker();
-	}
-
-	@Test
-	@SuppressWarnings("unchecked")
-	public void testOptionalModuleFound() {
-		ContainerAdaptor defaultAdaptor = mock(ContainerAdaptor.class);
-		Invoker foundInvoker = mock(Invoker.class);
-		InvokerFactory factory = mock(InvokerFactory.class);
-		when(factory.createInvoker(isA(List.class))).thenReturn(foundInvoker);
-		when(defaultAdaptor.getInstanceOfType(InvokerFactory.class))
-				.thenReturn(factory);
-		builder.setInvokerFactoryClass(InvokerFactory.class);
-		builder.setModulesProviderClass(MockModulesProvidingContainerAdaptorFactory.class);
-		Modules modules = builder.buildModules(resolver, defaultAdaptor);
-		adaptor.unregister(Invoker.class);
-		builder.setTypeMapperContextClass(typeMapperContext.getClass());
-		Invoker actual = modules.getInvoker();
-		log.debug(actual.toString());
-		assertThat(actual, is(foundInvoker));
-	}
-
-	@Test
-	public void testOptionalModulesFound() {
-		ContainerAdaptor defaultAdaptor = mock(ContainerAdaptor.class);
-		ApplicationProcessor foundProcessor = mock(ApplicationProcessor.class);
-		List<ApplicationProcessor> processors = Arrays.asList(foundProcessor);
-		when(defaultAdaptor.getInstancesOfType(ApplicationProcessor.class))
-				.thenReturn(processors);
-		builder.addApplicationProcessorClass(ApplicationProcessor.class);
-		builder.setModulesProviderClass(MockModulesProvidingContainerAdaptorFactory.class);
-		Modules modules = builder.buildModules(resolver, defaultAdaptor);
-		adaptor.unregister(ApplicationProcessor.class);
-		List<ApplicationProcessor> actual = modules.getApplicationProcessors();
-		log.debug(actual.toString());
-		assertThat(actual.size(), is(1));
-		assertThat(actual.get(0), is(foundProcessor));
-	}
-
-	@Test
-	public void testOptionalMultiSameTypeModulesFound() {
-		ContainerAdaptor defaultAdaptor = mock(ContainerAdaptor.class);
-		ApplicationProcessor foundProcessor = mock(ApplicationProcessor.class);
-		ApplicationProcessor foundProcessor2 = mock(ApplicationProcessor.class);
-		List<ApplicationProcessor> processors = Arrays.asList(foundProcessor,
-				foundProcessor2);
-		when(defaultAdaptor.getInstancesOfType(ApplicationProcessor.class))
-				.thenReturn(processors);
-		builder.addApplicationProcessorClass(ApplicationProcessor.class);
-		builder.setModulesProviderClass(MockModulesProvidingContainerAdaptorFactory.class);
-		Modules modules = builder.buildModules(resolver, defaultAdaptor);
-		adaptor.unregister(ApplicationProcessor.class);
-		List<ApplicationProcessor> actual = modules.getApplicationProcessors();
-		log.debug(actual.toString());
-		assertThat(actual.size(), is(1));
-		assertThat(actual.get(0), is(foundProcessor));
-	}
-
-	@Test
-	public void testModuleClassUndefined() {
-		thrown.expect(AssertionFailureException.class);
-		builder.setModulesProviderClass(MockModulesProvidingContainerAdaptorFactory.class);
-		Modules modules = builder.buildModules(resolver, adaptor);
-		modules.getInvoker();
-	}
-
-	@Test
-	public void testClearMultipleModules() {
-		builder.addInvocationMetadataFactoriesClass(invocationMetadataFactory
-				.getClass());
-		builder.addApplicationProcessorClass(invocationProcessor.getClass());
-		builder.addAttributesHandlerClass(attributesHandler.getClass());
-		assertThat(builder.getInvocationMetadataFactoryClasses().size(), is(1));
-		assertThat(builder.getApplicationProcessorClasses().size(), is(1));
-		assertThat(builder.getAttributesHandlerClasses().size(), is(1));
-		assertSame(builder, builder.clearInvocationMetadataFactoriesClass());
-		assertTrue(builder.getInvocationMetadataFactoryClasses().isEmpty());
-		assertSame(builder, builder.clearApplicationProcessorClass());
-		assertTrue(builder.getApplicationProcessorClasses().isEmpty());
-		assertSame(builder, builder.clearAttributesHanderClass());
-		assertTrue(builder.getAttributesHandlerClasses().isEmpty());
-	}
-
-	@Test
-	public void testIgnoreModules() {
-		final ContainerAdaptor defaultAdaptor = mock(ContainerAdaptor.class);
-		List<ApplicationProcessor> processors = new ArrayList<ApplicationProcessor>();
-		processors.add(new ProcessorA());
-		processors.add(new ProcessorB());
-		processors.add(new ProcessorC());
-		when(defaultAdaptor.getInstancesOfType(ApplicationProcessor.class))
-				.thenReturn(processors);
-		ca = defaultAdaptor;
-		builder.setModulesProviderClass(MockContainerAdaptorFactory.class);
-		builder.addApplicationProcessorClass(ApplicationProcessor.class);
-		Modules modules = builder.buildModules(resolver, defaultAdaptor);
-		List<ApplicationProcessor> actual = modules.getApplicationProcessors();
-		log.debug(actual.toString());
-		assertThat(actual.size(), is(3));
-		builder.ignore(ProcessorB.class);
-		modules = builder.buildModules(resolver, defaultAdaptor);
-		actual = modules.getApplicationProcessors();
-		log.debug(actual.toString());
-		assertThat(actual.size(), is(1));
-	}
-
-	@Test
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	public void testIgnoreTypesUndefined() {
-		thrown.expect(AssertionFailureException.class);
-		builder.ignore((Class) null);
-	}
-
-	private static ContainerAdaptor ca;
-
-	public static class MockContainerAdaptorFactory
-			implements
-				ContainerAdaptorFactory<ContainerAdaptor> {
-
-		@Override
-		public ContainerAdaptor createContainerAdaptor(
-				ApplicationContext resolver) {
-			return ca;
-		}
-	}
-
-	@Test
-	public void testIgnoreModulesByFilter() {
-		final ContainerAdaptor defaultAdaptor = mock(ContainerAdaptor.class);
-		ProcessorA a = new ProcessorA();
-		final ProcessorB b = new ProcessorB();
-		ProcessorC c = new ProcessorC();
-		List<ApplicationProcessor> processors = new ArrayList<ApplicationProcessor>();
-		processors.add(a);
-		processors.add(b);
-		processors.add(c);
-		when(defaultAdaptor.getInstancesOfType(ApplicationProcessor.class))
-				.thenReturn(processors);
-		ca = defaultAdaptor;
-		builder.setModulesProviderClass(MockContainerAdaptorFactory.class);
-		builder.addApplicationProcessorClass(ApplicationProcessor.class);
-		MultiModule.Filter filter = new MultiModule.Filter() {
-
-			@Override
-			public boolean isAppreciable(MultiModule aMultiModule) {
-				if (aMultiModule == b) {
-					return false;
-				}
-				return true;
-			}
-		};
-		builder.filter(filter);
-		Modules modules = builder.buildModules(resolver, defaultAdaptor);
-		List<ApplicationProcessor> actual = modules.getApplicationProcessors();
-		log.debug(actual.toString());
-		assertThat(actual.size(), is(2));
-	}
-
-	@Test
-	public void testIgnoreModulesByMultiFilter() {
-		final ContainerAdaptor defaultAdaptor = mock(ContainerAdaptor.class);
-		final ProcessorA a = new ProcessorA();
-		ProcessorB b = new ProcessorB();
-		final ProcessorC c = new ProcessorC();
-		List<ApplicationProcessor> processors = new ArrayList<ApplicationProcessor>();
-		processors.add(a);
-		processors.add(b);
-		processors.add(c);
-		when(defaultAdaptor.getInstancesOfType(ApplicationProcessor.class))
-				.thenReturn(processors);
-		ca = defaultAdaptor;
-		builder.setModulesProviderClass(MockContainerAdaptorFactory.class);
-		builder.addApplicationProcessorClass(ApplicationProcessor.class);
-		MultiModule.Filter filtera = new MultiModule.Filter() {
-
-			@Override
-			public boolean isAppreciable(MultiModule aMultiModule) {
-				if (aMultiModule == a) {
-					return false;
-				}
-				return true;
-			}
-		};
-		MultiModule.Filter filterc = new MultiModule.Filter() {
-
-			@Override
-			public boolean isAppreciable(MultiModule aMultiModule) {
-				if (aMultiModule == c) {
-					return false;
-				}
-				return true;
-			}
-		};
-		builder.filter(filtera);
-		builder.filter(filterc);
-		Modules modules = builder.buildModules(resolver, defaultAdaptor);
-		List<ApplicationProcessor> actual = modules.getApplicationProcessors();
-		log.debug(actual.toString());
-		assertThat(actual.size(), is(1));
-		assertThat(actual.get(0), is((ApplicationProcessor) b));
-	}
-
-	private static class ProcessorA extends AbstractApplicationProcessor {
-	}
-
-	private static class ProcessorB extends ProcessorA {
-	}
-
-	private static class ProcessorC extends ProcessorB {
-	}
-
-	public static class MockModulesProvidingContainerAdaptor
-			implements
-				ContainerAdaptor {
-
-		private final Map<Class<Object>, Object> classDefMap = new HashMap<Class<Object>, Object>();
-
-		@Override
-		@SuppressWarnings("unchecked")
-		public <T> T getInstanceOfType(Class<T> type) {
-			return (T) classDefMap.get(type);
-		}
-
-		@Override
-		@SuppressWarnings("unchecked")
-		public <T> List<T> getInstancesOfType(Class<T> type) {
-			T instance = (T) classDefMap.get(type);
-			if (instance != null) {
-				return Arrays.asList(instance);
-			} else {
-				return new ArrayList<T>();
-			}
-		}
-
-		@SuppressWarnings("unchecked")
-		void register(Class<?> clazz, Object instance) {
-			this.classDefMap.put((Class<Object>) clazz, instance);
-		}
-
-		void unregister(Class<?> clazz) {
-			this.classDefMap.remove(clazz);
-		}
-	}
-
-	public static class MockModulesProvidingContainerAdaptorFactory
-			implements
-				ContainerAdaptorFactory<MockModulesProvidingContainerAdaptor> {
-
-		@Override
-		public MockModulesProvidingContainerAdaptor createContainerAdaptor(
-				ApplicationContext resolver) {
-			return adaptor;
-		}
-	}
-
-	public static class MockNullContainerAdaptorFactory
-			implements
-				ContainerAdaptorFactory<MockModulesProvidingContainerAdaptor> {
-
-		@Override
-		public MockModulesProvidingContainerAdaptor createContainerAdaptor(
-				ApplicationContext resolver) {
-			return null;
-		}
-	}
-
-	public interface Foo {
-	}
-
-	public static class FooImpl implements Foo {
-	}
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+    private static final Log log = Logs.getLog(DefaultModulesBuilderTest.class);
+    private DefaultModulesBuilder builder;
+    private ApplicationContext resolver;
+    // relative mocks.
+    private static MockModulesProvidingContainerAdaptor adaptor = new MockModulesProvidingContainerAdaptor();
+    private InvocationMetadataFactory invocationMetadataFactory;
+    private InvokerFactory invokerFactory;
+    @SuppressWarnings("rawtypes")
+    private ContainerAdaptorFactory containerAdaptorFactory;
+    private ContainerAdaptor containerAdaptor;
+    private InvocationFactory invocationFactory;
+    private RenderableResolver directionResolver;
+    private ResponseHandler directiontHandler;
+    private ApplicationProcessor invocationProcessor;
+    private InvocationInterceptor invocationInterceptor;
+    private AttributesHandler attributesHandler;
+    private ExceptionHandler exceptionHandler;
+    private TypeMapperContext typeMapperContext;
+    private TypeMapper typeMapper;
+    private ResponseFormatter directionFormatter;
+
+    @Before
+    public void setUp() {
+        builder = new DefaultModulesBuilder();
+        resolver = mock(ApplicationContext.class);
+        invocationMetadataFactory = mock(InvocationMetadataFactory.class);
+        invokerFactory = mock(InvokerFactory.class);
+        containerAdaptorFactory = mock(ContainerAdaptorFactory.class);
+        containerAdaptor = mock(ContainerAdaptor.class);
+        when(containerAdaptorFactory.createContainerAdaptor(resolver)).thenReturn(containerAdaptor);
+        invocationFactory = mock(InvocationFactory.class);
+        directionResolver = mock(RenderableResolver.class);
+        directiontHandler = mock(ResponseHandler.class);
+        invocationProcessor = mock(ApplicationProcessor.class);
+        invocationInterceptor = mock(InvocationInterceptor.class);
+        attributesHandler = mock(AttributesHandler.class);
+        exceptionHandler = mock(ExceptionHandler.class);
+        typeMapperContext = mock(TypeMapperContext.class);
+        typeMapper = mock(TypeMapper.class);
+        directionFormatter = mock(ResponseFormatter.class);
+        adaptor.register(invocationMetadataFactory.getClass(), invocationMetadataFactory);
+        adaptor.register(invokerFactory.getClass(), invokerFactory);
+        adaptor.register(containerAdaptorFactory.getClass(), containerAdaptorFactory);
+        adaptor.register(invocationFactory.getClass(), invocationFactory);
+        adaptor.register(directionResolver.getClass(), directionResolver);
+        adaptor.register(directiontHandler.getClass(), directiontHandler);
+        adaptor.register(invocationProcessor.getClass(), invocationProcessor);
+        adaptor.register(invocationInterceptor.getClass(), invocationInterceptor);
+        adaptor.register(attributesHandler.getClass(), attributesHandler);
+        adaptor.register(exceptionHandler.getClass(), exceptionHandler);
+        adaptor.register(typeMapperContext.getClass(), typeMapperContext);
+        adaptor.register(typeMapper.getClass(), typeMapper);
+        adaptor.register(directionFormatter.getClass(), directionFormatter);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testBuildModules() {
+        builder.setModulesProviderClass(MockModulesProvidingContainerAdaptorFactory.class);
+        builder.setInvocationFactoryClass(invocationFactory.getClass());
+        builder.setInvocationInstanceProviderClass(
+                (Class<? extends ContainerAdaptorFactory<? extends ContainerAdaptor>>) containerAdaptorFactory
+                        .getClass());
+        builder.setInvokerFactoryClass(invokerFactory.getClass());
+        builder.setResponseHandlerClass(directiontHandler.getClass());
+        builder.setRenderableResolverClass(directionResolver.getClass());
+        builder.addApplicationProcessorClass(invocationProcessor.getClass());
+        builder.addInvocationInterceptorClass(invocationInterceptor.getClass());
+        builder.addInvocationMetadataFactoriesClass(invocationMetadataFactory.getClass());
+        builder.addAttributesHandlerClass(attributesHandler.getClass());
+        builder.setExceptionHandlerClass(exceptionHandler.getClass());
+        builder.setTypeMapperContextClass(typeMapperContext.getClass());
+        Renderable mapToResponse = mock(Renderable.class);
+        builder.addResponseFormatterClass(mapToResponse.getClass(), directionFormatter.getClass());
+        Modules modules = builder.buildModules(resolver, adaptor);
+        assertSame(modules.getInvocationMetadataFactories().get(0), invocationMetadataFactory);
+        assertSame(modules.getInvocationInstanceProvider(), containerAdaptor);
+        // same instance.
+        assertSame(modules.getInvocationInstanceProvider(), containerAdaptor);
+        assertSame(modules.getInvocationFactory(), invocationFactory);
+        assertSame(modules.getResponseResolver(), directionResolver);
+        assertSame(modules.getResponseHandler(), directiontHandler);
+        assertSame(modules.getApplicationProcessors().get(0), invocationProcessor);
+        assertSame(modules.getInvocationInterceptors().get(0), invocationInterceptor);
+        assertSame(modules.getExceptionHandler(), exceptionHandler);
+        assertSame(modules.getTypeMapperContext(), typeMapperContext);
+        assertSame(modules.findResponseFormatter(mapToResponse.getClass()), directionFormatter);
+    }
+
+    @Test
+    public void testBuildModulesWithNullContainerAdaptorFactory() {
+        thrown.expect(MissingModulesProviderException.class);
+        builder.setModulesProviderClass(MockNullContainerAdaptorFactory.class);
+        builder.buildModules(resolver, adaptor);
+    }
+
+    @Test
+    public void testModulesNotFound() {
+        thrown.expect(new NoDescribeMatcher<MissingModuleException>() {
+
+            @Override
+            public boolean matches(Object arg0) {
+                if (arg0 instanceof MissingModuleException) {
+                    MissingModuleException mm = (MissingModuleException) arg0;
+                    assertThat(mm.getRequiredModuleClass().getCanonicalName(),
+                            is(InvokerFactory.class.getCanonicalName()));
+                    return true;
+                }
+                return false;
+            }
+        });
+        builder.setModulesProviderClass(MockModulesProvidingContainerAdaptorFactory.class);
+        builder.setInvokerFactoryClass(InvokerFactory.class);
+        Modules modules = builder.buildModules(resolver, adaptor);
+        modules.getInvoker();
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testOptionalModuleFound() {
+        ContainerAdaptor defaultAdaptor = mock(ContainerAdaptor.class);
+        Invoker foundInvoker = mock(Invoker.class);
+        InvokerFactory factory = mock(InvokerFactory.class);
+        when(factory.createInvoker(isA(List.class))).thenReturn(foundInvoker);
+        when(defaultAdaptor.getInstanceOfType(InvokerFactory.class)).thenReturn(factory);
+        builder.setInvokerFactoryClass(InvokerFactory.class);
+        builder.setModulesProviderClass(MockModulesProvidingContainerAdaptorFactory.class);
+        Modules modules = builder.buildModules(resolver, defaultAdaptor);
+        adaptor.unregister(Invoker.class);
+        builder.setTypeMapperContextClass(typeMapperContext.getClass());
+        Invoker actual = modules.getInvoker();
+        log.debug(actual.toString());
+        assertThat(actual, is(foundInvoker));
+    }
+
+    @Test
+    public void testOptionalModulesFound() {
+        ContainerAdaptor defaultAdaptor = mock(ContainerAdaptor.class);
+        ApplicationProcessor foundProcessor = mock(ApplicationProcessor.class);
+        List<ApplicationProcessor> processors = Arrays.asList(foundProcessor);
+        when(defaultAdaptor.getInstancesOfType(ApplicationProcessor.class)).thenReturn(processors);
+        builder.addApplicationProcessorClass(ApplicationProcessor.class);
+        builder.setModulesProviderClass(MockModulesProvidingContainerAdaptorFactory.class);
+        Modules modules = builder.buildModules(resolver, defaultAdaptor);
+        adaptor.unregister(ApplicationProcessor.class);
+        List<ApplicationProcessor> actual = modules.getApplicationProcessors();
+        log.debug(actual.toString());
+        assertThat(actual.size(), is(1));
+        assertThat(actual.get(0), is(foundProcessor));
+    }
+
+    @Test
+    public void testOptionalMultiSameTypeModulesFound() {
+        ContainerAdaptor defaultAdaptor = mock(ContainerAdaptor.class);
+        ApplicationProcessor foundProcessor = mock(ApplicationProcessor.class);
+        ApplicationProcessor foundProcessor2 = mock(ApplicationProcessor.class);
+        List<ApplicationProcessor> processors = Arrays.asList(foundProcessor, foundProcessor2);
+        when(defaultAdaptor.getInstancesOfType(ApplicationProcessor.class)).thenReturn(processors);
+        builder.addApplicationProcessorClass(ApplicationProcessor.class);
+        builder.setModulesProviderClass(MockModulesProvidingContainerAdaptorFactory.class);
+        Modules modules = builder.buildModules(resolver, defaultAdaptor);
+        adaptor.unregister(ApplicationProcessor.class);
+        List<ApplicationProcessor> actual = modules.getApplicationProcessors();
+        log.debug(actual.toString());
+        assertThat(actual.size(), is(1));
+        assertThat(actual.get(0), is(foundProcessor));
+    }
+
+    @Test
+    public void testModuleClassUndefined() {
+        thrown.expect(AssertionFailureException.class);
+        builder.setModulesProviderClass(MockModulesProvidingContainerAdaptorFactory.class);
+        Modules modules = builder.buildModules(resolver, adaptor);
+        modules.getInvoker();
+    }
+
+    @Test
+    public void testClearMultipleModules() {
+        builder.addInvocationMetadataFactoriesClass(invocationMetadataFactory.getClass());
+        builder.addApplicationProcessorClass(invocationProcessor.getClass());
+        builder.addAttributesHandlerClass(attributesHandler.getClass());
+        assertThat(builder.getInvocationMetadataFactoryClasses().size(), is(1));
+        assertThat(builder.getApplicationProcessorClasses().size(), is(1));
+        assertThat(builder.getAttributesHandlerClasses().size(), is(1));
+        assertSame(builder, builder.clearInvocationMetadataFactoriesClass());
+        assertTrue(builder.getInvocationMetadataFactoryClasses().isEmpty());
+        assertSame(builder, builder.clearApplicationProcessorClass());
+        assertTrue(builder.getApplicationProcessorClasses().isEmpty());
+        assertSame(builder, builder.clearAttributesHanderClass());
+        assertTrue(builder.getAttributesHandlerClasses().isEmpty());
+    }
+
+    @Test
+    public void testIgnoreModules() {
+        final ContainerAdaptor defaultAdaptor = mock(ContainerAdaptor.class);
+        List<ApplicationProcessor> processors = new ArrayList<ApplicationProcessor>();
+        processors.add(new ProcessorA());
+        processors.add(new ProcessorB());
+        processors.add(new ProcessorC());
+        when(defaultAdaptor.getInstancesOfType(ApplicationProcessor.class)).thenReturn(processors);
+        ca = defaultAdaptor;
+        builder.setModulesProviderClass(MockContainerAdaptorFactory.class);
+        builder.addApplicationProcessorClass(ApplicationProcessor.class);
+        Modules modules = builder.buildModules(resolver, defaultAdaptor);
+        List<ApplicationProcessor> actual = modules.getApplicationProcessors();
+        log.debug(actual.toString());
+        assertThat(actual.size(), is(3));
+        builder.ignore(ProcessorB.class);
+        modules = builder.buildModules(resolver, defaultAdaptor);
+        actual = modules.getApplicationProcessors();
+        log.debug(actual.toString());
+        assertThat(actual.size(), is(1));
+    }
+
+    @Test
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public void testIgnoreTypesUndefined() {
+        thrown.expect(AssertionFailureException.class);
+        builder.ignore((Class) null);
+    }
+
+    private static ContainerAdaptor ca;
+
+    public static class MockContainerAdaptorFactory implements ContainerAdaptorFactory<ContainerAdaptor> {
+
+        @Override
+        public ContainerAdaptor createContainerAdaptor(ApplicationContext resolver) {
+            return ca;
+        }
+    }
+
+    @Test
+    public void testIgnoreModulesByFilter() {
+        final ContainerAdaptor defaultAdaptor = mock(ContainerAdaptor.class);
+        ProcessorA a = new ProcessorA();
+        final ProcessorB b = new ProcessorB();
+        ProcessorC c = new ProcessorC();
+        List<ApplicationProcessor> processors = new ArrayList<ApplicationProcessor>();
+        processors.add(a);
+        processors.add(b);
+        processors.add(c);
+        when(defaultAdaptor.getInstancesOfType(ApplicationProcessor.class)).thenReturn(processors);
+        ca = defaultAdaptor;
+        builder.setModulesProviderClass(MockContainerAdaptorFactory.class);
+        builder.addApplicationProcessorClass(ApplicationProcessor.class);
+        MultiModule.Filter filter = new MultiModule.Filter() {
+
+            @Override
+            public boolean isAppreciable(MultiModule aMultiModule) {
+                if (aMultiModule == b) {
+                    return false;
+                }
+                return true;
+            }
+        };
+        builder.filter(filter);
+        Modules modules = builder.buildModules(resolver, defaultAdaptor);
+        List<ApplicationProcessor> actual = modules.getApplicationProcessors();
+        log.debug(actual.toString());
+        assertThat(actual.size(), is(2));
+    }
+
+    @Test
+    public void testIgnoreModulesByMultiFilter() {
+        final ContainerAdaptor defaultAdaptor = mock(ContainerAdaptor.class);
+        final ProcessorA a = new ProcessorA();
+        ProcessorB b = new ProcessorB();
+        final ProcessorC c = new ProcessorC();
+        List<ApplicationProcessor> processors = new ArrayList<ApplicationProcessor>();
+        processors.add(a);
+        processors.add(b);
+        processors.add(c);
+        when(defaultAdaptor.getInstancesOfType(ApplicationProcessor.class)).thenReturn(processors);
+        ca = defaultAdaptor;
+        builder.setModulesProviderClass(MockContainerAdaptorFactory.class);
+        builder.addApplicationProcessorClass(ApplicationProcessor.class);
+        MultiModule.Filter filtera = new MultiModule.Filter() {
+
+            @Override
+            public boolean isAppreciable(MultiModule aMultiModule) {
+                if (aMultiModule == a) {
+                    return false;
+                }
+                return true;
+            }
+        };
+        MultiModule.Filter filterc = new MultiModule.Filter() {
+
+            @Override
+            public boolean isAppreciable(MultiModule aMultiModule) {
+                if (aMultiModule == c) {
+                    return false;
+                }
+                return true;
+            }
+        };
+        builder.filter(filtera);
+        builder.filter(filterc);
+        Modules modules = builder.buildModules(resolver, defaultAdaptor);
+        List<ApplicationProcessor> actual = modules.getApplicationProcessors();
+        log.debug(actual.toString());
+        assertThat(actual.size(), is(1));
+        assertThat(actual.get(0), is((ApplicationProcessor) b));
+    }
+
+    private static class ProcessorA extends AbstractApplicationProcessor {
+    }
+
+    private static class ProcessorB extends ProcessorA {
+    }
+
+    private static class ProcessorC extends ProcessorB {
+    }
+
+    public static class MockModulesProvidingContainerAdaptor implements ContainerAdaptor {
+
+        private final Map<Class<Object>, Object> classDefMap = new HashMap<Class<Object>, Object>();
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public <T> T getInstanceOfType(Class<T> type) {
+            return (T) classDefMap.get(type);
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public <T> List<T> getInstancesOfType(Class<T> type) {
+            T instance = (T) classDefMap.get(type);
+            if (instance != null) {
+                return Arrays.asList(instance);
+            } else {
+                return new ArrayList<T>();
+            }
+        }
+
+        @SuppressWarnings("unchecked")
+        void register(Class<?> clazz, Object instance) {
+            this.classDefMap.put((Class<Object>) clazz, instance);
+        }
+
+        void unregister(Class<?> clazz) {
+            this.classDefMap.remove(clazz);
+        }
+    }
+
+    public static class MockModulesProvidingContainerAdaptorFactory
+            implements ContainerAdaptorFactory<MockModulesProvidingContainerAdaptor> {
+
+        @Override
+        public MockModulesProvidingContainerAdaptor createContainerAdaptor(ApplicationContext resolver) {
+            return adaptor;
+        }
+    }
+
+    public static class MockNullContainerAdaptorFactory
+            implements ContainerAdaptorFactory<MockModulesProvidingContainerAdaptor> {
+
+        @Override
+        public MockModulesProvidingContainerAdaptor createContainerAdaptor(ApplicationContext resolver) {
+            return null;
+        }
+    }
+
+    public interface Foo {
+    }
+
+    public static class FooImpl implements Foo {
+    }
 }
diff --git a/src/test/java/org/analogweb/core/DefaultModulesConfigTest.java b/src/test/java/org/analogweb/core/DefaultModulesConfigTest.java
index 3aae3f0..5526eaf 100644
--- a/src/test/java/org/analogweb/core/DefaultModulesConfigTest.java
+++ b/src/test/java/org/analogweb/core/DefaultModulesConfigTest.java
@@ -26,18 +26,18 @@
  */
 public class DefaultModulesConfigTest {
 
-	private RootModulesConfig config;
-	private ModulesBuilder modulesBuilder;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    private RootModulesConfig config;
+    private ModulesBuilder modulesBuilder;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Before
-	public void setUp() {
-		config = new RootModulesConfig();
-		modulesBuilder = mock(ModulesBuilder.class);
-	}
+    @Before
+    public void setUp() {
+        config = new RootModulesConfig();
+        modulesBuilder = mock(ModulesBuilder.class);
+    }
 
-	@Test
+    @Test
 	public void testPrepare() {
 		when(
 				modulesBuilder
@@ -84,9 +84,9 @@ public void testPrepare() {
 		config.prepare(modulesBuilder);
 	}
 
-	@Test
-	public void testPrepareWithNullBuilder() {
-		thrown.expect(AssertionFailureException.class);
-		config.prepare(null);
-	}
+    @Test
+    public void testPrepareWithNullBuilder() {
+        thrown.expect(AssertionFailureException.class);
+        config.prepare(null);
+    }
 }
diff --git a/src/test/java/org/analogweb/core/DefaultMutableRequestContextTest.java b/src/test/java/org/analogweb/core/DefaultMutableRequestContextTest.java
index 178495e..43e185f 100644
--- a/src/test/java/org/analogweb/core/DefaultMutableRequestContextTest.java
+++ b/src/test/java/org/analogweb/core/DefaultMutableRequestContextTest.java
@@ -13,15 +13,15 @@
 
 public class DefaultMutableRequestContextTest {
 
-	private DefaultMutableRequestContext target;
-	private RequestContext context;
+    private DefaultMutableRequestContext target;
+    private RequestContext context;
 
-	@Before
-	public void setUp() throws Exception {
-		context = mock(RequestContext.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        context = mock(RequestContext.class);
+    }
 
-	@Test
+    @Test
 	public void testNotOverridden() {
 		when(context.getRequestMethod()).thenReturn("GET");
 		RequestPath path = mock(RequestPath.class);
@@ -32,7 +32,7 @@ public void testNotOverridden() {
 		assertThat(actual.getRequestPath(), is(path));
 	}
 
-	@Test
+    @Test
 	public void testOverridden() {
 		when(context.getRequestMethod()).thenReturn("GET");
 		RequestPath path = mock(RequestPath.class);
diff --git a/src/test/java/org/analogweb/core/DefaultRenderableResolverTest.java b/src/test/java/org/analogweb/core/DefaultRenderableResolverTest.java
index cae739a..e84ae40 100644
--- a/src/test/java/org/analogweb/core/DefaultRenderableResolverTest.java
+++ b/src/test/java/org/analogweb/core/DefaultRenderableResolverTest.java
@@ -21,62 +21,57 @@
 
 public class DefaultRenderableResolverTest {
 
-	private DefaultRenderableResolver resolver;
-	private InvocationMetadata metadata;
-	private RequestContext context;
-	private ResponseContext response;
-	private Headers headers;
+    private DefaultRenderableResolver resolver;
+    private InvocationMetadata metadata;
+    private RequestContext context;
+    private ResponseContext response;
+    private Headers headers;
 
-	@Before
-	public void setUp() throws Exception {
-		resolver = new DefaultRenderableResolver();
-		metadata = mock(InvocationMetadata.class);
-		context = mock(RequestContext.class);
-		response = mock(ResponseContext.class);
-		headers = mock(Headers.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        resolver = new DefaultRenderableResolver();
+        metadata = mock(InvocationMetadata.class);
+        context = mock(RequestContext.class);
+        response = mock(ResponseContext.class);
+        headers = mock(Headers.class);
+    }
 
-	@Test
-	public void testResolve() {
-		Renderable invocationResult = mock(Renderable.class);
-		Renderable actual = resolver.resolve(invocationResult, metadata,
-				context, response);
-		assertThat(actual, is(sameInstance(invocationResult)));
-	}
+    @Test
+    public void testResolve() {
+        Renderable invocationResult = mock(Renderable.class);
+        Renderable actual = resolver.resolve(invocationResult, metadata, context, response);
+        assertThat(actual, is(sameInstance(invocationResult)));
+    }
 
-	@Test
-	public void testResolveWithNumber() {
-		Integer invocationResult = 500;
-		HttpStatus actual = (HttpStatus) resolver.resolve(invocationResult,
-				metadata, context, response);
-		assertThat(actual, is(sameInstance(HttpStatus.INTERNAL_SERVER_ERROR)));
-	}
+    @Test
+    public void testResolveWithNumber() {
+        Integer invocationResult = 500;
+        HttpStatus actual = (HttpStatus) resolver.resolve(invocationResult, metadata, context, response);
+        assertThat(actual, is(sameInstance(HttpStatus.INTERNAL_SERVER_ERROR)));
+    }
 
-	@Test
-	public void testResolveWithPrimitiveNumber() {
-		int invocationResult = 500;
-		HttpStatus actual = (HttpStatus) resolver.resolve(invocationResult,
-				metadata, context, response);
-		assertThat(actual, is(sameInstance(HttpStatus.INTERNAL_SERVER_ERROR)));
-	}
+    @Test
+    public void testResolveWithPrimitiveNumber() {
+        int invocationResult = 500;
+        HttpStatus actual = (HttpStatus) resolver.resolve(invocationResult, metadata, context, response);
+        assertThat(actual, is(sameInstance(HttpStatus.INTERNAL_SERVER_ERROR)));
+    }
 
-	@Test
-	public void testResolveWithText() {
-		String invocationResult = "this is simple text.";
-		Text actual = (Text) resolver.resolve(invocationResult, metadata,
-				context, response);
-		assertThat(actual.toString(), is(invocationResult));
-	}
+    @Test
+    public void testResolveWithText() {
+        String invocationResult = "this is simple text.";
+        Text actual = (Text) resolver.resolve(invocationResult, metadata, context, response);
+        assertThat(actual.toString(), is(invocationResult));
+    }
 
-	@Test
-	public void testResolveWithoutResult() {
-		Renderable invocationResult = null;
-		HttpStatus actual = (HttpStatus) resolver.resolve(invocationResult,
-				metadata, context, response);
-		assertThat(actual, is(sameInstance(HttpStatus.NO_CONTENT)));
-	}
+    @Test
+    public void testResolveWithoutResult() {
+        Renderable invocationResult = null;
+        HttpStatus actual = (HttpStatus) resolver.resolve(invocationResult, metadata, context, response);
+        assertThat(actual, is(sameInstance(HttpStatus.NO_CONTENT)));
+    }
 
-	@Test
+    @Test
 	public void testAcceptableResult() {
 		when(context.getRequestHeaders()).thenReturn(headers);
 		when(headers.getValues("Accept")).thenReturn(
diff --git a/src/test/java/org/analogweb/core/DefaultReqestValueResolversTest.java b/src/test/java/org/analogweb/core/DefaultReqestValueResolversTest.java
index 2d348bc..22bb968 100644
--- a/src/test/java/org/analogweb/core/DefaultReqestValueResolversTest.java
+++ b/src/test/java/org/analogweb/core/DefaultReqestValueResolversTest.java
@@ -14,88 +14,77 @@
 
 public class DefaultReqestValueResolversTest {
 
-	private DefaultReqestValueResolvers resolvers;
-
-	@Test
-	public void test() {
-		resolvers = new DefaultReqestValueResolvers(Arrays.asList(new A(),
-				new B(), new C(), new D(), new E(), new F(), new G()));
-		RequestValueResolver a = resolvers.findRequestValueResolver(A.class);
-		RequestValueResolver b = resolvers.findRequestValueResolver(B.class);
-		RequestValueResolver c = resolvers.findRequestValueResolver(C.class);
-		RequestValueResolver d = resolvers.findRequestValueResolver(D.class);
-		RequestValueResolver e = resolvers.findRequestValueResolver(E.class);
-		RequestValueResolver f = resolvers.findRequestValueResolver(F.class);
-		RequestValueResolver g = resolvers.findRequestValueResolver(G.class);
-		assertThat(A.class.getCanonicalName(), is(a.getClass()
-				.getCanonicalName()));
-		assertThat(B.class.getCanonicalName(), is(b.getClass()
-				.getCanonicalName()));
-		assertThat(C.class.getCanonicalName(), is(c.getClass()
-				.getCanonicalName()));
-		assertThat(D.class.getCanonicalName(), is(d.getClass()
-				.getCanonicalName()));
-		assertThat(E.class.getCanonicalName(), is(e.getClass()
-				.getCanonicalName()));
-		assertThat(F.class.getCanonicalName(), is(f.getClass()
-				.getCanonicalName()));
-		assertThat(G.class.getCanonicalName(), is(g.getClass()
-				.getCanonicalName()));
-	}
-
-	class A implements RequestValueResolver {
-
-		@Override
-		public Object resolveValue(RequestContext requestContext,
-				InvocationMetadata metadata, String key, Class<?> requiredType,
-				Annotation[] annotations) {
-			// nop
-			return null;
-		}
-	}
-
-	class B extends A {
-	}
-
-	class C extends B {
-	}
-
-	class D extends B implements AttributesHandler {
-
-		@Override
-		public void putAttributeValue(RequestContext requestContext,
-				String query, Object value) {
-			// nop.
-		}
-
-		@Override
-		public void removeAttribute(RequestContext requestContext, String query) {
-			// nop.
-		}
-	}
-
-	class E implements RequestValueResolver {
-
-		@Override
-		public Object resolveValue(RequestContext requestContext,
-				InvocationMetadata metadata, String key, Class<?> requiredType,
-				Annotation[] annotations) {
-			// nop
-			return null;
-		}
-	}
-
-	class F implements RequestValueResolver {
-
-		@Override
-		public Object resolveValue(RequestContext requestContext,
-				InvocationMetadata metadata, String key, Class<?> requiredType,
-				Annotation[] annotations) {
-			// nop
-			return null;
-		}
-	}
-
-	class G extends F {
-	}
+    private DefaultReqestValueResolvers resolvers;
+
+    @Test
+    public void test() {
+        resolvers = new DefaultReqestValueResolvers(
+                Arrays.asList(new A(), new B(), new C(), new D(), new E(), new F(), new G()));
+        RequestValueResolver a = resolvers.findRequestValueResolver(A.class);
+        RequestValueResolver b = resolvers.findRequestValueResolver(B.class);
+        RequestValueResolver c = resolvers.findRequestValueResolver(C.class);
+        RequestValueResolver d = resolvers.findRequestValueResolver(D.class);
+        RequestValueResolver e = resolvers.findRequestValueResolver(E.class);
+        RequestValueResolver f = resolvers.findRequestValueResolver(F.class);
+        RequestValueResolver g = resolvers.findRequestValueResolver(G.class);
+        assertThat(A.class.getCanonicalName(), is(a.getClass().getCanonicalName()));
+        assertThat(B.class.getCanonicalName(), is(b.getClass().getCanonicalName()));
+        assertThat(C.class.getCanonicalName(), is(c.getClass().getCanonicalName()));
+        assertThat(D.class.getCanonicalName(), is(d.getClass().getCanonicalName()));
+        assertThat(E.class.getCanonicalName(), is(e.getClass().getCanonicalName()));
+        assertThat(F.class.getCanonicalName(), is(f.getClass().getCanonicalName()));
+        assertThat(G.class.getCanonicalName(), is(g.getClass().getCanonicalName()));
+    }
+
+    class A implements RequestValueResolver {
+
+        @Override
+        public Object resolveValue(RequestContext requestContext, InvocationMetadata metadata, String key,
+                Class<?> requiredType, Annotation[] annotations) {
+            // nop
+            return null;
+        }
+    }
+
+    class B extends A {
+    }
+
+    class C extends B {
+    }
+
+    class D extends B implements AttributesHandler {
+
+        @Override
+        public void putAttributeValue(RequestContext requestContext, String query, Object value) {
+            // nop.
+        }
+
+        @Override
+        public void removeAttribute(RequestContext requestContext, String query) {
+            // nop.
+        }
+    }
+
+    class E implements RequestValueResolver {
+
+        @Override
+        public Object resolveValue(RequestContext requestContext, InvocationMetadata metadata, String key,
+                Class<?> requiredType, Annotation[] annotations) {
+            // nop
+            return null;
+        }
+    }
+
+    class F implements RequestValueResolver {
+
+        @Override
+        public Object resolveValue(RequestContext requestContext, InvocationMetadata metadata, String key,
+                Class<?> requiredType, Annotation[] annotations) {
+            // nop
+            return null;
+        }
+    }
+
+    class G extends F {
+    }
 }
diff --git a/src/test/java/org/analogweb/core/DefaultRequestPathTest.java b/src/test/java/org/analogweb/core/DefaultRequestPathTest.java
index 1cd2180..9d3e75d 100644
--- a/src/test/java/org/analogweb/core/DefaultRequestPathTest.java
+++ b/src/test/java/org/analogweb/core/DefaultRequestPathTest.java
@@ -13,63 +13,60 @@
  */
 public class DefaultRequestPathTest {
 
-	@Test
-	public void testGetPath() throws Exception {
-		URI uri = new URI("http://somehost:8080/foo/baa/baz.html");
-		URI baseUri = new URI("http://somehost:8080/foo");
-		DefaultRequestPath actual = new DefaultRequestPath(baseUri, uri, "GET");
-		assertThat(actual.getActualPath(), is("/baa/baz.html"));
-	}
+    @Test
+    public void testGetPath() throws Exception {
+        URI uri = new URI("http://somehost:8080/foo/baa/baz.html");
+        URI baseUri = new URI("http://somehost:8080/foo");
+        DefaultRequestPath actual = new DefaultRequestPath(baseUri, uri, "GET");
+        assertThat(actual.getActualPath(), is("/baa/baz.html"));
+    }
 
-	@Test
-	public void testGetPathOnRootContext() throws Exception {
-		URI uri = new URI("http://somehost:8080/baa/baz");
-		URI baseUri = new URI("http://somehost:8080/");
-		DefaultRequestPath actual = new DefaultRequestPath(baseUri, uri, "GET");
-		assertThat(actual.getActualPath(), is("/baa/baz"));
-	}
+    @Test
+    public void testGetPathOnRootContext() throws Exception {
+        URI uri = new URI("http://somehost:8080/baa/baz");
+        URI baseUri = new URI("http://somehost:8080/");
+        DefaultRequestPath actual = new DefaultRequestPath(baseUri, uri, "GET");
+        assertThat(actual.getActualPath(), is("/baa/baz"));
+    }
 
-	@Test
-	public void testGetPathWithRequestMethod() throws Exception {
-		URI uri = new URI("http://somehost:8080/foo/baa/baz?abc=def");
-		URI baseUri = new URI("http://somehost:8080/foo/");
-		DefaultRequestPath actual = new DefaultRequestPath(baseUri, uri, "GET");
-		assertThat(actual.getActualPath(), is("/baa/baz"));
-		assertThat(actual.getRequestMethod(), is("GET"));
-	}
+    @Test
+    public void testGetPathWithRequestMethod() throws Exception {
+        URI uri = new URI("http://somehost:8080/foo/baa/baz?abc=def");
+        URI baseUri = new URI("http://somehost:8080/foo/");
+        DefaultRequestPath actual = new DefaultRequestPath(baseUri, uri, "GET");
+        assertThat(actual.getActualPath(), is("/baa/baz"));
+        assertThat(actual.getRequestMethod(), is("GET"));
+    }
 
-	@Test
-	public void testGetPathWithoutSuffix() throws Exception {
-		URI uri = new URI("http://somehost:8080/foo/baa/baz?hoge=fuga");
-		URI baseUri = new URI("http://somehost:8080/foo");
-		DefaultRequestPath actual = new DefaultRequestPath(baseUri, uri, "POST");
-		assertThat(actual.getActualPath(), is("/baa/baz"));
-	}
+    @Test
+    public void testGetPathWithoutSuffix() throws Exception {
+        URI uri = new URI("http://somehost:8080/foo/baa/baz?hoge=fuga");
+        URI baseUri = new URI("http://somehost:8080/foo");
+        DefaultRequestPath actual = new DefaultRequestPath(baseUri, uri, "POST");
+        assertThat(actual.getActualPath(), is("/baa/baz"));
+    }
 
-	@Test
-	public void testGetPathContainsJsessionId() throws Exception {
-		URI uri = new URI(
-				"http://somehost:8080/foo/baa;jsessionid=1A26E401D812045AF2D9150891DA01B3");
-		URI baseUri = new URI("http://somehost:8080/foo");
-		DefaultRequestPath actual = new DefaultRequestPath(baseUri, uri, "POST");
-		assertThat(actual.getActualPath(), is("/baa"));
-	}
+    @Test
+    public void testGetPathContainsJsessionId() throws Exception {
+        URI uri = new URI("http://somehost:8080/foo/baa;jsessionid=1A26E401D812045AF2D9150891DA01B3");
+        URI baseUri = new URI("http://somehost:8080/foo");
+        DefaultRequestPath actual = new DefaultRequestPath(baseUri, uri, "POST");
+        assertThat(actual.getActualPath(), is("/baa"));
+    }
 
-	@Test
-	public void testNotPathThrowghWithContextRootPath() throws Exception {
-		URI uri = new URI(
-				"http://somehost:8080/baa;jsessionid=1A26E401D812045AF2D9150891DA01B3");
-		DefaultRequestPath actual = new DefaultRequestPath(null, uri, "Post");
-		assertThat(actual.getActualPath(), is("/baa"));
-	}
+    @Test
+    public void testNotPathThrowghWithContextRootPath() throws Exception {
+        URI uri = new URI("http://somehost:8080/baa;jsessionid=1A26E401D812045AF2D9150891DA01B3");
+        DefaultRequestPath actual = new DefaultRequestPath(null, uri, "Post");
+        assertThat(actual.getActualPath(), is("/baa"));
+    }
 
-	@Test
-	public void testIdentifiedByActualPath() throws Exception {
-		URI uri = new URI(
-				"http://somehost:8080/foo/baa;jsessionid=1A26E401D812045AF2D9150891DA01B3");
-		URI baseUri = new URI("http://somehost:8080/foo");
-		DefaultRequestPath pathA = new DefaultRequestPath(baseUri, uri, "POST");
-		DefaultRequestPath pathB = new DefaultRequestPath(baseUri, uri, "POST");
-		assertTrue(pathA.match(pathB));
-	}
+    @Test
+    public void testIdentifiedByActualPath() throws Exception {
+        URI uri = new URI("http://somehost:8080/foo/baa;jsessionid=1A26E401D812045AF2D9150891DA01B3");
+        URI baseUri = new URI("http://somehost:8080/foo");
+        DefaultRequestPath pathA = new DefaultRequestPath(baseUri, uri, "POST");
+        DefaultRequestPath pathB = new DefaultRequestPath(baseUri, uri, "POST");
+        assertTrue(pathA.match(pathB));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/DefaultResponseEntityTest.java b/src/test/java/org/analogweb/core/DefaultResponseEntityTest.java
index cfb2862..0ce9cd8 100644
--- a/src/test/java/org/analogweb/core/DefaultResponseEntityTest.java
+++ b/src/test/java/org/analogweb/core/DefaultResponseEntityTest.java
@@ -10,11 +10,10 @@
 
 public class DefaultResponseEntityTest {
 
-	@Test
-	public void test() throws IOException {
-		DefaultResponseEntity actual = new DefaultResponseEntity(
-				"ResponseEntity!");
-		assertThat(new String(actual.entity()), is("ResponseEntity!"));
-		assertThat(actual.getContentLength(), is(15L));
-	}
+    @Test
+    public void test() throws IOException {
+        DefaultResponseEntity actual = new DefaultResponseEntity("ResponseEntity!");
+        assertThat(new String(actual.entity()), is("ResponseEntity!"));
+        assertThat(actual.getContentLength(), is(15L));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/DefaultResponseHandlerTest.java b/src/test/java/org/analogweb/core/DefaultResponseHandlerTest.java
index 8bb92b0..93c81d9 100644
--- a/src/test/java/org/analogweb/core/DefaultResponseHandlerTest.java
+++ b/src/test/java/org/analogweb/core/DefaultResponseHandlerTest.java
@@ -18,35 +18,33 @@
 
 public class DefaultResponseHandlerTest {
 
-	private DefaultResponseHandler handler;
-	private RenderableResolver resolver;
-	private InvocationMetadata metadata;
-	private RequestContext context;
-	private ResponseContext response;
-	private ExceptionHandler exceptionHandler;
-	private ResponseFormatterFinder finder;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    private DefaultResponseHandler handler;
+    private RenderableResolver resolver;
+    private InvocationMetadata metadata;
+    private RequestContext context;
+    private ResponseContext response;
+    private ExceptionHandler exceptionHandler;
+    private ResponseFormatterFinder finder;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Before
-	public void setUp() throws Exception {
-		handler = new DefaultResponseHandler();
-		resolver = mock(RenderableResolver.class);
-		metadata = mock(InvocationMetadata.class);
-		context = mock(RequestContext.class);
-		response = mock(ResponseContext.class);
-		exceptionHandler = mock(ExceptionHandler.class);
-		finder = mock(ResponseFormatterFinder.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        handler = new DefaultResponseHandler();
+        resolver = mock(RenderableResolver.class);
+        metadata = mock(InvocationMetadata.class);
+        context = mock(RequestContext.class);
+        response = mock(ResponseContext.class);
+        exceptionHandler = mock(ExceptionHandler.class);
+        finder = mock(ResponseFormatterFinder.class);
+    }
 
-	@Test
-	public void testHandleResult() throws Exception {
-		Renderable result = mock(Renderable.class);
-		when(resolver.resolve(result, metadata, context, response)).thenReturn(
-				result);
-		handler.handleResult(result, metadata, resolver, context, response,
-				exceptionHandler, finder);
-		verify(result).render(context, response);
-	}
+    @Test
+    public void testHandleResult() throws Exception {
+        Renderable result = mock(Renderable.class);
+        when(resolver.resolve(result, metadata, context, response)).thenReturn(result);
+        handler.handleResult(result, metadata, resolver, context, response, exceptionHandler, finder);
+        verify(result).render(context, response);
+    }
 
 }
diff --git a/src/test/java/org/analogweb/core/DefaultResponseTest.java b/src/test/java/org/analogweb/core/DefaultResponseTest.java
index cbf6ad1..2d7296e 100644
--- a/src/test/java/org/analogweb/core/DefaultResponseTest.java
+++ b/src/test/java/org/analogweb/core/DefaultResponseTest.java
@@ -17,41 +17,36 @@
 
 public class DefaultResponseTest {
 
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
-	@Test
-	public void testWriteStringEntity() throws IOException {
-		DefaultResponseEntity expected = new DefaultResponseEntity(
-				"This Is Test Entity.");
-		DefaultResponse writer = new DefaultResponse(expected);
-		assertThat(new String((byte[]) writer.getEntity().entity()),
-				is("This Is Test Entity."));
-		assertThat(writer.getContentLength(), is(20L));
-	}
-
-	@Test
-	public void testWriteStringEntityWithCharset() throws IOException {
-		Charset charset = Charset.forName("UTF-8");
-		DefaultResponseEntity expected = new DefaultResponseEntity("これはテストです。",
-				charset);
-		DefaultResponse writer = new DefaultResponse(expected);
-		assertThat(new String(new String((byte[]) writer.getEntity().entity(),
-				charset)), is("これはテストです。"));
-	}
-
-	@Test
-	public void testWriteStringEntityFailed() throws IOException {
-		thrown.expect(IOException.class);
-		InputStream entity = new InputStream() {
-			@Override
-			public int read() throws IOException {
-				throw new IOException();
-			}
-		};
-		ResponseEntity<ReadableBuffer> writer = new ReadableBufferResponseEntity(
-				DefaultReadableBuffer.readBuffer(entity));
-		writer.entity().to(
-				DefaultWritableBuffer.writeBuffer(new ByteArrayOutputStream()));
-	}
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void testWriteStringEntity() throws IOException {
+        DefaultResponseEntity expected = new DefaultResponseEntity("This Is Test Entity.");
+        DefaultResponse writer = new DefaultResponse(expected);
+        assertThat(new String((byte[]) writer.getEntity().entity()), is("This Is Test Entity."));
+        assertThat(writer.getContentLength(), is(20L));
+    }
+
+    @Test
+    public void testWriteStringEntityWithCharset() throws IOException {
+        Charset charset = Charset.forName("UTF-8");
+        DefaultResponseEntity expected = new DefaultResponseEntity("これはテストです。", charset);
+        DefaultResponse writer = new DefaultResponse(expected);
+        assertThat(new String(new String((byte[]) writer.getEntity().entity(), charset)), is("これはテストです。"));
+    }
+
+    @Test
+    public void testWriteStringEntityFailed() throws IOException {
+        thrown.expect(IOException.class);
+        InputStream entity = new InputStream() {
+            @Override
+            public int read() throws IOException {
+                throw new IOException();
+            }
+        };
+        ResponseEntity<ReadableBuffer> writer = new ReadableBufferResponseEntity(
+                DefaultReadableBuffer.readBuffer(entity));
+        writer.entity().to(DefaultWritableBuffer.writeBuffer(new ByteArrayOutputStream()));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/DefaultRouteRegistryTest.java b/src/test/java/org/analogweb/core/DefaultRouteRegistryTest.java
index 07ed84b..d0fcc47 100644
--- a/src/test/java/org/analogweb/core/DefaultRouteRegistryTest.java
+++ b/src/test/java/org/analogweb/core/DefaultRouteRegistryTest.java
@@ -3,6 +3,8 @@
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -15,129 +17,87 @@
 import org.analogweb.RequestPathMetadata;
 import org.junit.Before;
 import org.junit.Test;
-import static org.mockito.Matchers.anyMapOf;
-import static org.mockito.Matchers.eq;
 
 /**
  * @author snowgoose
  */
 public class DefaultRouteRegistryTest {
 
-	private DefaultRouteRegistry registry;
-	private RequestContext context;
+    private DefaultRouteRegistry registry;
+    private RequestContext context;
 
-	@Before
-	public void setUp() throws Exception {
-		registry = new DefaultRouteRegistry();
-		context = mock(RequestContext.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        registry = new DefaultRouteRegistry();
+        context = mock(RequestContext.class);
+    }
 
-	@Test
-	public void testGetMetadata() {
-		RequestPath requestPath1 = mock(RequestPath.class);
-		RequestPath requestPath2 = mock(RequestPath.class);
-		RequestPath requestPath3 = mock(RequestPath.class);
-		InvocationMetadata metadata1 = mock(InvocationMetadata.class);
-		InvocationMetadata metadata2 = mock(InvocationMetadata.class);
-		InvocationMetadata metadata3 = mock(InvocationMetadata.class);
-		when(metadata1.getDefinedPath()).thenReturn(requestPath1);
-		when(metadata2.getDefinedPath()).thenReturn(requestPath2);
-		when(metadata3.getDefinedPath()).thenReturn(requestPath3);
-		registry.register(metadata1);
-		registry.register(metadata2);
-		registry.register(metadata3);
-		InvocationMetadataFinder finder1 = mock(InvocationMetadataFinder.class);
-		when(
-				finder1.find(
-						anyMapOf(RequestPathMetadata.class,
-								InvocationMetadata.class), eq(context)))
-				.thenReturn(null);
-		InvocationMetadataFinder finder2 = mock(InvocationMetadataFinder.class);
-		when(
-				finder2.find(
-						anyMapOf(RequestPathMetadata.class,
-								InvocationMetadata.class), eq(context)))
-				.thenReturn(metadata2);
-		InvocationMetadataFinder finder3 = mock(InvocationMetadataFinder.class);
-		when(
-				finder3.find(
-						anyMapOf(RequestPathMetadata.class,
-								InvocationMetadata.class), eq(context)))
-				.thenReturn(null);
-		assertThat(
-				registry.findInvocationMetadata(context,
-						Arrays.asList(finder1, finder2, finder3)),
-				is(metadata2));
-	}
+    @Test
+    public void testGetMetadata() {
+        RequestPath requestPath1 = mock(RequestPath.class);
+        RequestPath requestPath2 = mock(RequestPath.class);
+        RequestPath requestPath3 = mock(RequestPath.class);
+        InvocationMetadata metadata1 = mock(InvocationMetadata.class);
+        InvocationMetadata metadata2 = mock(InvocationMetadata.class);
+        InvocationMetadata metadata3 = mock(InvocationMetadata.class);
+        when(metadata1.getDefinedPath()).thenReturn(requestPath1);
+        when(metadata2.getDefinedPath()).thenReturn(requestPath2);
+        when(metadata3.getDefinedPath()).thenReturn(requestPath3);
+        registry.register(metadata1);
+        registry.register(metadata2);
+        registry.register(metadata3);
+        InvocationMetadataFinder finder1 = mock(InvocationMetadataFinder.class);
+        when(finder1.find(anyMap(), eq(context))).thenReturn(null);
+        InvocationMetadataFinder finder2 = mock(InvocationMetadataFinder.class);
+        when(finder2.find(anyMap(), eq(context))).thenReturn(metadata2);
+        InvocationMetadataFinder finder3 = mock(InvocationMetadataFinder.class);
+        when(finder3.find(anyMap(), eq(context))).thenReturn(null);
+        assertThat(registry.findInvocationMetadata(context, Arrays.asList(finder1, finder2, finder3)), is(metadata2));
+    }
 
-	@Test
-	public void testGetNothing() {
-		RequestPath requestPath1 = mock(RequestPath.class);
-		RequestPath requestPath2 = mock(RequestPath.class);
-		RequestPath requestPath3 = mock(RequestPath.class);
-		InvocationMetadata metadata1 = mock(InvocationMetadata.class);
-		InvocationMetadata metadata2 = mock(InvocationMetadata.class);
-		InvocationMetadata metadata3 = mock(InvocationMetadata.class);
-		when(metadata1.getDefinedPath()).thenReturn(requestPath1);
-		when(metadata2.getDefinedPath()).thenReturn(requestPath2);
-		when(metadata3.getDefinedPath()).thenReturn(requestPath3);
-		registry.register(metadata1);
-		registry.register(metadata2);
-		registry.register(metadata3);
-		InvocationMetadataFinder finder1 = mock(InvocationMetadataFinder.class);
-		when(
-				finder1.find(
-						anyMapOf(RequestPathMetadata.class,
-								InvocationMetadata.class), eq(context)))
-				.thenReturn(null);
-		InvocationMetadataFinder finder2 = mock(InvocationMetadataFinder.class);
-		when(
-				finder2.find(
-						anyMapOf(RequestPathMetadata.class,
-								InvocationMetadata.class), eq(context)))
-				.thenReturn(null);
-		InvocationMetadataFinder finder3 = mock(InvocationMetadataFinder.class);
-		when(
-				finder3.find(
-						anyMapOf(RequestPathMetadata.class,
-								InvocationMetadata.class), eq(context)))
-				.thenReturn(null);
-		assertThat(
-				registry.findInvocationMetadata(context,
-						Arrays.asList(finder1, finder2, finder3)),
-				is(nullValue()));
-	}
+    @Test
+    public void testGetNothing() {
+        RequestPath requestPath1 = mock(RequestPath.class);
+        RequestPath requestPath2 = mock(RequestPath.class);
+        RequestPath requestPath3 = mock(RequestPath.class);
+        InvocationMetadata metadata1 = mock(InvocationMetadata.class);
+        InvocationMetadata metadata2 = mock(InvocationMetadata.class);
+        InvocationMetadata metadata3 = mock(InvocationMetadata.class);
+        when(metadata1.getDefinedPath()).thenReturn(requestPath1);
+        when(metadata2.getDefinedPath()).thenReturn(requestPath2);
+        when(metadata3.getDefinedPath()).thenReturn(requestPath3);
+        registry.register(metadata1);
+        registry.register(metadata2);
+        registry.register(metadata3);
+        InvocationMetadataFinder finder1 = mock(InvocationMetadataFinder.class);
+        when(finder1.find(anyMap(), eq(context))).thenReturn(null);
+        InvocationMetadataFinder finder2 = mock(InvocationMetadataFinder.class);
+        when(finder2.find(anyMap(), eq(context))).thenReturn(null);
+        InvocationMetadataFinder finder3 = mock(InvocationMetadataFinder.class);
+        when(finder3.find(anyMap(), eq(context))).thenReturn(null);
+        assertThat(registry.findInvocationMetadata(context, Arrays.asList(finder1, finder2, finder3)), is(nullValue()));
+    }
 
-	@Test
-	public void testGetCacheable() {
-		RequestPath requestPath1 = mock(RequestPath.class);
-		RequestPath requestPath2 = mock(RequestPath.class);
-		RequestPath requestPath3 = mock(RequestPath.class);
-		InvocationMetadata metadata1 = mock(InvocationMetadata.class);
-		InvocationMetadata metadata2 = mock(InvocationMetadata.class);
-		InvocationMetadataFinder.Cacheable metadata3 = mock(InvocationMetadataFinder.Cacheable.class);
-		when(metadata1.getDefinedPath()).thenReturn(requestPath1);
-		when(metadata2.getDefinedPath()).thenReturn(requestPath2);
-		when(metadata3.getDefinedPath()).thenReturn(requestPath3);
-		registry.register(metadata1);
-		registry.register(metadata2);
-		registry.register(metadata3);
-		when(context.getRequestPath()).thenReturn(requestPath3);
-		InvocationMetadataFinder finder2 = mock(InvocationMetadataFinder.class);
-		when(
-				finder2.find(
-						anyMapOf(RequestPathMetadata.class,
-								InvocationMetadata.class), eq(context)))
-				.thenReturn(null);
-		InvocationMetadataFinder finder3 = mock(InvocationMetadataFinder.class);
-		when(
-				finder3.find(
-						anyMapOf(RequestPathMetadata.class,
-								InvocationMetadata.class), eq(context)))
-				.thenReturn(metadata3);
-		when(metadata3.getCachable()).thenReturn(metadata1);
-		assertThat(
-				registry.findInvocationMetadata(context,
-						Arrays.asList(finder2, finder3)), is(metadata1));
-	}
+    @Test
+    public void testGetCacheable() {
+        RequestPath requestPath1 = mock(RequestPath.class);
+        RequestPath requestPath2 = mock(RequestPath.class);
+        RequestPath requestPath3 = mock(RequestPath.class);
+        InvocationMetadata metadata1 = mock(InvocationMetadata.class);
+        InvocationMetadata metadata2 = mock(InvocationMetadata.class);
+        InvocationMetadataFinder.Cacheable metadata3 = mock(InvocationMetadataFinder.Cacheable.class);
+        when(metadata1.getDefinedPath()).thenReturn(requestPath1);
+        when(metadata2.getDefinedPath()).thenReturn(requestPath2);
+        when(metadata3.getDefinedPath()).thenReturn(requestPath3);
+        registry.register(metadata1);
+        registry.register(metadata2);
+        registry.register(metadata3);
+        when(context.getRequestPath()).thenReturn(requestPath3);
+        InvocationMetadataFinder finder2 = mock(InvocationMetadataFinder.class);
+        when(finder2.find(anyMap(), eq(context))).thenReturn(null);
+        InvocationMetadataFinder finder3 = mock(InvocationMetadataFinder.class);
+        when(finder3.find(anyMap(), eq(context))).thenReturn(metadata3);
+        when(metadata3.getCachable()).thenReturn(metadata1);
+        assertThat(registry.findInvocationMetadata(context, Arrays.asList(finder2, finder3)), is(metadata1));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/DefaultTypeMapperContextTest.java b/src/test/java/org/analogweb/core/DefaultTypeMapperContextTest.java
index 330ec93..16a324d 100644
--- a/src/test/java/org/analogweb/core/DefaultTypeMapperContextTest.java
+++ b/src/test/java/org/analogweb/core/DefaultTypeMapperContextTest.java
@@ -23,23 +23,23 @@
  */
 public class DefaultTypeMapperContextTest {
 
-	private DefaultTypeMapperContext context;
-	private TypeMapper typeMapper;
-	private TypeMapper defaultTypeMapper;
-	private ContainerAdaptor containerAdaptor;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
-	@Before
-	public void setUp() throws Exception {
-		containerAdaptor = mock(ContainerAdaptor.class);
-		context = new DefaultTypeMapperContext();
-		context.setModulesContainerAdaptor(containerAdaptor);
-		typeMapper = mock(TypeMapper.class);
-		defaultTypeMapper = mock(TypeMapper.class);
-	}
-
-	@Test
+    private DefaultTypeMapperContext context;
+    private TypeMapper typeMapper;
+    private TypeMapper defaultTypeMapper;
+    private ContainerAdaptor containerAdaptor;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Before
+    public void setUp() throws Exception {
+        containerAdaptor = mock(ContainerAdaptor.class);
+        context = new DefaultTypeMapperContext();
+        context.setModulesContainerAdaptor(containerAdaptor);
+        typeMapper = mock(TypeMapper.class);
+        defaultTypeMapper = mock(TypeMapper.class);
+    }
+
+    @Test
 	@SuppressWarnings("unchecked")
 	public void testMapToType() {
 		String[] formats = new String[]{"yyyy/MM/dd"};
@@ -54,120 +54,105 @@ public void testMapToType() {
 		assertThat(actual, is(now));
 	}
 
-	@Test
-	public void testMapToTypeSameType() {
-		String actual = context.mapToType(null, "2010/08/10", String.class,
-				null);
-		assertThat(actual, is("2010/08/10"));
-	}
-
-	@Test
-	public void testMapToTypeMapperNotFound() {
-		String[] formats = new String[]{"yyyy/MM/dd"};
-		Date now = new Date();
-		// not found.
-		when(containerAdaptor.getInstanceOfType(typeMapper.getClass()))
-				.thenReturn(null);
-		when(defaultTypeMapper.mapToType("2010/08/10", Date.class, formats))
-				.thenReturn(now);
-		context.setDefaultTypeMapper(defaultTypeMapper);
-		Date actual = context.mapToType(typeMapper.getClass(), "2010/08/10",
-				Date.class, formats);
-		assertThat(actual, is(now));
-	}
-
-	@Test
-	public void testMapToTypeMapperWithNullTypeMapper() {
-		String[] formats = new String[]{"yyyy/MM/dd"};
-		Date now = new Date();
-		// not found.
-		when(defaultTypeMapper.mapToType("2010/08/10", Date.class, formats))
-				.thenReturn(now);
-		context.setDefaultTypeMapper(defaultTypeMapper);
-		Date actual = context
-				.mapToType(null, "2010/08/10", Date.class, formats);
-		assertThat(actual, is(now));
-	}
-
-	@Test
-	public void testMapToTypeMapperWithDefaultTypeMapper() {
-		String[] formats = new String[]{"yyyy/MM/dd"};
-		Date now = new Date();
-		// not found.
-		when(defaultTypeMapper.mapToType("2010/08/10", Date.class, formats))
-				.thenReturn(now);
-		context.setDefaultTypeMapper(defaultTypeMapper);
-		Date actual = context.mapToType(TypeMapper.class, "2010/08/10",
-				Date.class, formats);
-		assertThat(actual, is(now));
-	}
-
-	@Test
-	public void testMapToTypeMapperWithNullReqiredType() {
-		thrown.expect(AssertionFailureException.class);
-		String[] formats = new String[]{"yyyy/MM/dd"};
-		context.mapToType(typeMapper.getClass(), "2010/08/10", null, formats);
-	}
-
-	@Test
-	@SuppressWarnings("unchecked")
-	public void testMapToTypeMapperWithCollection() {
-		Object actual = context.mapToType(typeMapper.getClass(),
-				Arrays.asList("foo"), List.class, null);
-		List<String> actualList = (List<String>) actual;
-		assertThat(actualList.get(0), is("foo"));
-	}
-
-	@Test
-	@SuppressWarnings("unchecked")
-	public void testMapToTypeMapperWithSubTypeOfCollection() {
-		Object actual = context.mapToType(typeMapper.getClass(),
-				Arrays.asList(1L, 2L), List.class, null);
-		List<Number> actualList = (List<Number>) actual;
-		assertThat(actualList.get(0).longValue(), is(1L));
-	}
-
-	@Test
-	public void testMapToTypeMapperWithSingleOfCollection() {
-		String actual = context.mapToType(typeMapper.getClass(),
-				Arrays.asList("foo"), String.class, null);
-		assertThat(actual, is("foo"));
-	}
-
-	@Test
-	public void testMapToTypeMapperWithSubTypeSingleOfCollection() {
-		Number actual = context.mapToType(typeMapper.getClass(),
-				Arrays.asList(1L), Number.class, null);
-		assertThat(actual.longValue(), is(1L));
-	}
-
-	@Test
-	public void testMapToTypeMapperWithArray() {
-		String[] actualArray = context.mapToType(typeMapper.getClass(),
-				new String[]{"foo", "baa"}, String[].class, null);
-		assertThat(actualArray[0], is("foo"));
-		assertThat(actualArray[1], is("baa"));
-	}
-
-	@Test
-	public void testMapToTypeMapperWithSingleOfArray() {
-		String actual = context.mapToType(typeMapper.getClass(), new String[]{
-				"foo", "baa"}, String.class, null);
-		assertThat(actual, is("foo"));
-	}
-
-	@Test
-	public void testMapToTypeMapperWithSubTypeOfArray() {
-		Number[] actualArray = context.mapToType(typeMapper.getClass(),
-				new Long[]{1L, 2L}, Number[].class, null);
-		assertThat(actualArray[0].longValue(), is(1L));
-		assertThat(actualArray[1].longValue(), is(2L));
-	}
-
-	@Test
-	public void testMapToTypeMapperWithSingleSubTypeOfArray() {
-		Number actual = context.mapToType(typeMapper.getClass(), new Integer[]{
-				1, 2}, Number.class, null);
-		assertThat(actual.intValue(), is(1));
-	}
+    @Test
+    public void testMapToTypeSameType() {
+        String actual = context.mapToType(null, "2010/08/10", String.class, null);
+        assertThat(actual, is("2010/08/10"));
+    }
+
+    @Test
+    public void testMapToTypeMapperNotFound() {
+        String[] formats = new String[] { "yyyy/MM/dd" };
+        Date now = new Date();
+        // not found.
+        when(containerAdaptor.getInstanceOfType(typeMapper.getClass())).thenReturn(null);
+        when(defaultTypeMapper.mapToType("2010/08/10", Date.class, formats)).thenReturn(now);
+        context.setDefaultTypeMapper(defaultTypeMapper);
+        Date actual = context.mapToType(typeMapper.getClass(), "2010/08/10", Date.class, formats);
+        assertThat(actual, is(now));
+    }
+
+    @Test
+    public void testMapToTypeMapperWithNullTypeMapper() {
+        String[] formats = new String[] { "yyyy/MM/dd" };
+        Date now = new Date();
+        // not found.
+        when(defaultTypeMapper.mapToType("2010/08/10", Date.class, formats)).thenReturn(now);
+        context.setDefaultTypeMapper(defaultTypeMapper);
+        Date actual = context.mapToType(null, "2010/08/10", Date.class, formats);
+        assertThat(actual, is(now));
+    }
+
+    @Test
+    public void testMapToTypeMapperWithDefaultTypeMapper() {
+        String[] formats = new String[] { "yyyy/MM/dd" };
+        Date now = new Date();
+        // not found.
+        when(defaultTypeMapper.mapToType("2010/08/10", Date.class, formats)).thenReturn(now);
+        context.setDefaultTypeMapper(defaultTypeMapper);
+        Date actual = context.mapToType(TypeMapper.class, "2010/08/10", Date.class, formats);
+        assertThat(actual, is(now));
+    }
+
+    @Test
+    public void testMapToTypeMapperWithNullReqiredType() {
+        thrown.expect(AssertionFailureException.class);
+        String[] formats = new String[] { "yyyy/MM/dd" };
+        context.mapToType(typeMapper.getClass(), "2010/08/10", null, formats);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testMapToTypeMapperWithCollection() {
+        Object actual = context.mapToType(typeMapper.getClass(), Arrays.asList("foo"), List.class, null);
+        List<String> actualList = (List<String>) actual;
+        assertThat(actualList.get(0), is("foo"));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testMapToTypeMapperWithSubTypeOfCollection() {
+        Object actual = context.mapToType(typeMapper.getClass(), Arrays.asList(1L, 2L), List.class, null);
+        List<Number> actualList = (List<Number>) actual;
+        assertThat(actualList.get(0).longValue(), is(1L));
+    }
+
+    @Test
+    public void testMapToTypeMapperWithSingleOfCollection() {
+        String actual = context.mapToType(typeMapper.getClass(), Arrays.asList("foo"), String.class, null);
+        assertThat(actual, is("foo"));
+    }
+
+    @Test
+    public void testMapToTypeMapperWithSubTypeSingleOfCollection() {
+        Number actual = context.mapToType(typeMapper.getClass(), Arrays.asList(1L), Number.class, null);
+        assertThat(actual.longValue(), is(1L));
+    }
+
+    @Test
+    public void testMapToTypeMapperWithArray() {
+        String[] actualArray = context.mapToType(typeMapper.getClass(), new String[] { "foo", "baa" }, String[].class,
+                null);
+        assertThat(actualArray[0], is("foo"));
+        assertThat(actualArray[1], is("baa"));
+    }
+
+    @Test
+    public void testMapToTypeMapperWithSingleOfArray() {
+        String actual = context.mapToType(typeMapper.getClass(), new String[] { "foo", "baa" }, String.class, null);
+        assertThat(actual, is("foo"));
+    }
+
+    @Test
+    public void testMapToTypeMapperWithSubTypeOfArray() {
+        Number[] actualArray = context.mapToType(typeMapper.getClass(), new Long[] { 1L, 2L }, Number[].class, null);
+        assertThat(actualArray[0].longValue(), is(1L));
+        assertThat(actualArray[1].longValue(), is(2L));
+    }
+
+    @Test
+    public void testMapToTypeMapperWithSingleSubTypeOfArray() {
+        Number actual = context.mapToType(typeMapper.getClass(), new Integer[] { 1, 2 }, Number.class, null);
+        assertThat(actual.intValue(), is(1));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/FormParametersTest.java b/src/test/java/org/analogweb/core/FormParametersTest.java
index 6166b75..1c86c52 100644
--- a/src/test/java/org/analogweb/core/FormParametersTest.java
+++ b/src/test/java/org/analogweb/core/FormParametersTest.java
@@ -15,80 +15,71 @@
 
 public class FormParametersTest {
 
-	private FormParameters params;
+    private FormParameters params;
 
-	@Test
-	public void testGetValues() throws Exception {
-		URI requestURI = URI.create("http://localhost:80/a?b=c");
-		InputStream body = new ByteArrayInputStream(
-				"foo=baa&hoge=fuga&hoge=hoge%21".getBytes());
-		MediaType contentType = MediaTypes.APPLICATION_FORM_URLENCODED_TYPE;
-		params = new FormParameters(requestURI,
-				DefaultReadableBuffer.readBuffer(body), contentType);
-		List<String> actual = params.getValues("foo");
-		assertThat(actual.size(), is(1));
-		assertThat(actual.get(0), is("baa"));
-		actual = params.getValues("hoge");
-		assertThat(actual.size(), is(2));
-		assertThat(actual.get(0), is("fuga"));
-		assertThat(actual.get(1), is("hoge!"));
-		// not avairable.
-		actual = params.getValues("baz");
-		assertThat(actual.isEmpty(), is(true));
-		actual = params.getValues("b");
-		assertThat(actual.isEmpty(), is(true));
-	}
+    @Test
+    public void testGetValues() throws Exception {
+        URI requestURI = URI.create("http://localhost:80/a?b=c");
+        InputStream body = new ByteArrayInputStream("foo=baa&hoge=fuga&hoge=hoge%21".getBytes());
+        MediaType contentType = MediaTypes.APPLICATION_FORM_URLENCODED_TYPE;
+        params = new FormParameters(requestURI, DefaultReadableBuffer.readBuffer(body), contentType);
+        List<String> actual = params.getValues("foo");
+        assertThat(actual.size(), is(1));
+        assertThat(actual.get(0), is("baa"));
+        actual = params.getValues("hoge");
+        assertThat(actual.size(), is(2));
+        assertThat(actual.get(0), is("fuga"));
+        assertThat(actual.get(1), is("hoge!"));
+        // not avairable.
+        actual = params.getValues("baz");
+        assertThat(actual.isEmpty(), is(true));
+        actual = params.getValues("b");
+        assertThat(actual.isEmpty(), is(true));
+    }
 
-	@Test
-	public void testAsMap() throws Exception {
-		URI requestURI = URI.create("http://localhost:80/a");
-		InputStream body = new ByteArrayInputStream(
-				"%E5%A0%B4%E6%89%80=Tokyo&%E5%90%8D%E5%89%8D=Yukio"
-						.getBytes("UTF-8"));
-		MediaType contentType = MediaTypes
-				.valueOf("application/x-www-form-urlencoded; charset=UTF-8");
-		params = new FormParameters(requestURI,
-				DefaultReadableBuffer.readBuffer(body), contentType);
-		Map<String, String[]> map = params.asMap();
-		String[] actual = map.get("名前");
-		assertThat(actual.length, is(1));
-		assertThat(actual[0], is("Yukio"));
-		actual = map.get("場所");
-		assertThat(actual.length, is(1));
-		assertThat(actual[0], is("Tokyo"));
-		actual = map.get("foo");
-		assertThat(actual, is(nullValue()));
-	}
+    @Test
+    public void testAsMap() throws Exception {
+        URI requestURI = URI.create("http://localhost:80/a");
+        InputStream body = new ByteArrayInputStream(
+                "%E5%A0%B4%E6%89%80=Tokyo&%E5%90%8D%E5%89%8D=Yukio".getBytes("UTF-8"));
+        MediaType contentType = MediaTypes.valueOf("application/x-www-form-urlencoded; charset=UTF-8");
+        params = new FormParameters(requestURI, DefaultReadableBuffer.readBuffer(body), contentType);
+        Map<String, String[]> map = params.asMap();
+        String[] actual = map.get("名前");
+        assertThat(actual.length, is(1));
+        assertThat(actual[0], is("Yukio"));
+        actual = map.get("場所");
+        assertThat(actual.length, is(1));
+        assertThat(actual[0], is("Tokyo"));
+        actual = map.get("foo");
+        assertThat(actual, is(nullValue()));
+    }
 
-	@Test
-	public void testAsMapOtherEncoding() throws Exception {
-		URI requestURI = URI.create("http://localhost:80/a");
-		InputStream body = new ByteArrayInputStream(
-				"%E5%A0%B4%E6%89%80=Tokyo&%E5%90%8D%E5%89%8D=Yukio"
-						.getBytes("UTF-8"));
-		MediaType contentType = MediaTypes
-				.valueOf("application/x-www-form-urlencoded; charset=UTF-8");
-		params = new FormParameters(requestURI,
-				DefaultReadableBuffer.readBuffer(body), contentType);
-		Map<String, String[]> map = params.asMap();
-		String[] actual = map.get("名前");
-		assertThat(actual.length, is(1));
-		assertThat(actual[0], is("Yukio"));
-		actual = map.get("場所");
-		assertThat(actual.length, is(1));
-		assertThat(actual[0], is("Tokyo"));
-		actual = map.get("foo");
-		assertThat(actual, is(nullValue()));
-	}
+    @Test
+    public void testAsMapOtherEncoding() throws Exception {
+        URI requestURI = URI.create("http://localhost:80/a");
+        InputStream body = new ByteArrayInputStream(
+                "%E5%A0%B4%E6%89%80=Tokyo&%E5%90%8D%E5%89%8D=Yukio".getBytes("UTF-8"));
+        MediaType contentType = MediaTypes.valueOf("application/x-www-form-urlencoded; charset=UTF-8");
+        params = new FormParameters(requestURI, DefaultReadableBuffer.readBuffer(body), contentType);
+        Map<String, String[]> map = params.asMap();
+        String[] actual = map.get("名前");
+        assertThat(actual.length, is(1));
+        assertThat(actual[0], is("Yukio"));
+        actual = map.get("場所");
+        assertThat(actual.length, is(1));
+        assertThat(actual[0], is("Tokyo"));
+        actual = map.get("foo");
+        assertThat(actual, is(nullValue()));
+    }
 
-	@Test
-	public void testAsMapIsEmpty() {
-		URI requestURI = URI.create("http://localhost:80/a");
-		InputStream body = new ByteArrayInputStream("".getBytes());
-		MediaType contentType = MediaTypes.valueOf("text/plain");
-		params = new FormParameters(requestURI,
-				DefaultReadableBuffer.readBuffer(body), contentType);
-		Map<String, String[]> actual = params.asMap();
-		assertThat(actual.isEmpty(), is(true));
-	}
+    @Test
+    public void testAsMapIsEmpty() {
+        URI requestURI = URI.create("http://localhost:80/a");
+        InputStream body = new ByteArrayInputStream("".getBytes());
+        MediaType contentType = MediaTypes.valueOf("text/plain");
+        params = new FormParameters(requestURI, DefaultReadableBuffer.readBuffer(body), contentType);
+        Map<String, String[]> actual = params.asMap();
+        assertThat(actual.isEmpty(), is(true));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/HeaderValueResolverTest.java b/src/test/java/org/analogweb/core/HeaderValueResolverTest.java
index 92f4366..f127e66 100644
--- a/src/test/java/org/analogweb/core/HeaderValueResolverTest.java
+++ b/src/test/java/org/analogweb/core/HeaderValueResolverTest.java
@@ -19,20 +19,20 @@
  */
 public class HeaderValueResolverTest {
 
-	private HeaderValueResolver resolver;
-	private RequestContext requestContext;
-	private InvocationMetadata metadata;
-	private Headers headers;
-
-	@Before
-	public void setUp() throws Exception {
-		resolver = new HeaderValueResolver();
-		requestContext = mock(RequestContext.class);
-		metadata = mock(InvocationMetadata.class);
-		headers = mock(Headers.class);
-	}
-
-	@Test
+    private HeaderValueResolver resolver;
+    private RequestContext requestContext;
+    private InvocationMetadata metadata;
+    private Headers headers;
+
+    @Before
+    public void setUp() throws Exception {
+        resolver = new HeaderValueResolver();
+        requestContext = mock(RequestContext.class);
+        metadata = mock(InvocationMetadata.class);
+        headers = mock(Headers.class);
+    }
+
+    @Test
 	public void testResolveAttributeValue() {
 		when(requestContext.getRequestHeaders()).thenReturn(headers);
 		when(headers.getValues("Content-Type")).thenReturn(
@@ -42,7 +42,7 @@ public void testResolveAttributeValue() {
 		assertThat(((String[]) actual)[0], is("text/plain"));
 	}
 
-	@Test
+    @Test
 	public void testResolveAttributeValueNotAvairable() {
 		when(requestContext.getRequestHeaders()).thenReturn(headers);
 		when(headers.getValues("Foo-Type")).thenReturn(null);
@@ -51,10 +51,9 @@ public void testResolveAttributeValueNotAvairable() {
 		assertNull(actual);
 	}
 
-	@Test
-	public void testResolveAttributeValueWithNullName() {
-		Object actual = resolver.resolveValue(requestContext, metadata, null,
-				null, null);
-		assertNull(actual);
-	}
+    @Test
+    public void testResolveAttributeValueWithNullName() {
+        Object actual = resolver.resolveValue(requestContext, metadata, null, null, null);
+        assertNull(actual);
+    }
 }
diff --git a/src/test/java/org/analogweb/core/InvocationChainTest.java b/src/test/java/org/analogweb/core/InvocationChainTest.java
index 0c25c93..f2870e1 100644
--- a/src/test/java/org/analogweb/core/InvocationChainTest.java
+++ b/src/test/java/org/analogweb/core/InvocationChainTest.java
@@ -19,96 +19,90 @@
 
 public class InvocationChainTest {
 
-	private final Log log = Logs.getLog(InvocationChainTest.class);
-	private Invocation root;
-	private InvocationMetadata metadata;
+    private final Log log = Logs.getLog(InvocationChainTest.class);
+    private Invocation root;
+    private InvocationMetadata metadata;
 
-	@Before
-	public void setUp() throws Exception {
-		root = mock(Invocation.class);
-		metadata = mock(InvocationMetadata.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        root = mock(Invocation.class);
+        metadata = mock(InvocationMetadata.class);
+    }
 
-	@Test
-	public void testInvoke() {
-		List<InvocationInterceptor> interceptors = new ArrayList<InvocationInterceptor>();
-		final List<Integer> footprints = new ArrayList<Integer>();
-		interceptors.add(new AbstractInvocationInterceptor() {
+    @Test
+    public void testInvoke() {
+        List<InvocationInterceptor> interceptors = new ArrayList<InvocationInterceptor>();
+        final List<Integer> footprints = new ArrayList<Integer>();
+        interceptors.add(new AbstractInvocationInterceptor() {
 
-			@Override
-			public Object onInvoke(Invocation invocation,
-					InvocationMetadata metadata) {
-				footprints.add(1);
-				Object result = invocation.invoke();
-				footprints.add(2);
-				return result;
-			}
-		});
-		interceptors.add(new AbstractInvocationInterceptor() {
+            @Override
+            public Object onInvoke(Invocation invocation, InvocationMetadata metadata) {
+                footprints.add(1);
+                Object result = invocation.invoke();
+                footprints.add(2);
+                return result;
+            }
+        });
+        interceptors.add(new AbstractInvocationInterceptor() {
 
-			@Override
-			public Object onInvoke(Invocation invocation,
-					InvocationMetadata metadata) {
-				footprints.add(3);
-				Object result = invocation.invoke();
-				footprints.add(4);
-				return result;
-			}
-		});
-		InvocationChain chain = InvocationChain.create(root, metadata,
-				interceptors);
-		Object result = new Object();
-		when(root.invoke()).thenReturn(result);
-		Object actual = chain.invoke();
-		assertThat(actual, is(result));
-		assertThat(footprints.size(), is(4));
-		assertThat(footprints.get(0), is(1));
-		assertThat(footprints.get(1), is(3));
-		assertThat(footprints.get(2), is(4));
-		assertThat(footprints.get(3), is(2));
-	}
+            @Override
+            public Object onInvoke(Invocation invocation, InvocationMetadata metadata) {
+                footprints.add(3);
+                Object result = invocation.invoke();
+                footprints.add(4);
+                return result;
+            }
+        });
+        InvocationChain chain = InvocationChain.create(root, metadata, interceptors);
+        Object result = new Object();
+        when(root.invoke()).thenReturn(result);
+        Object actual = chain.invoke();
+        assertThat(actual, is(result));
+        assertThat(footprints.size(), is(4));
+        assertThat(footprints.get(0), is(1));
+        assertThat(footprints.get(1), is(3));
+        assertThat(footprints.get(2), is(4));
+        assertThat(footprints.get(3), is(2));
+    }
 
-	@Test
-	public void testInvokeWithException() {
-		List<InvocationInterceptor> interceptors = new ArrayList<InvocationInterceptor>();
-		final List<Integer> footprints = new ArrayList<Integer>();
-		interceptors.add(new AbstractInvocationInterceptor() {
+    @Test
+    public void testInvokeWithException() {
+        List<InvocationInterceptor> interceptors = new ArrayList<InvocationInterceptor>();
+        final List<Integer> footprints = new ArrayList<Integer>();
+        interceptors.add(new AbstractInvocationInterceptor() {
 
-			@Override
-			public Object onInvoke(Invocation invocation,
-					InvocationMetadata metadata) {
-				footprints.add(1);
-				Object result = null;
-				try {
-					result = invocation.invoke();
-				} catch (IllegalArgumentException e) {
-					log.debug("Exception!", e);
-				}
-				footprints.add(2);
-				return result;
-			}
-		});
-		interceptors.add(new AbstractInvocationInterceptor() {
+            @Override
+            public Object onInvoke(Invocation invocation, InvocationMetadata metadata) {
+                footprints.add(1);
+                Object result = null;
+                try {
+                    result = invocation.invoke();
+                } catch (IllegalArgumentException e) {
+                    log.debug("Exception!", e);
+                }
+                footprints.add(2);
+                return result;
+            }
+        });
+        interceptors.add(new AbstractInvocationInterceptor() {
 
-			@Override
-			public Object onInvoke(Invocation invocation,
-					InvocationMetadata metadata) {
-				footprints.add(3);
-				Object result = invocation.invoke();
-				footprints.add(4);
-				return result;
-			}
-		});
-		InvocationChain chain = InvocationChain.create(root, metadata,
-				interceptors);
-		Object result = new Object();
-		when(root.invoke()).thenReturn(result);
-		when(root.invoke()).thenThrow(new IllegalArgumentException());
-		Object actual = chain.invoke();
-		assertThat(actual, is(nullValue()));
-		assertThat(footprints.size(), is(3));
-		assertThat(footprints.get(0), is(1));
-		assertThat(footprints.get(1), is(3));
-		assertThat(footprints.get(2), is(2));
-	}
+            @Override
+            public Object onInvoke(Invocation invocation, InvocationMetadata metadata) {
+                footprints.add(3);
+                Object result = invocation.invoke();
+                footprints.add(4);
+                return result;
+            }
+        });
+        InvocationChain chain = InvocationChain.create(root, metadata, interceptors);
+        Object result = new Object();
+        when(root.invoke()).thenReturn(result);
+        when(root.invoke()).thenThrow(new IllegalArgumentException());
+        Object actual = chain.invoke();
+        assertThat(actual, is(nullValue()));
+        assertThat(footprints.size(), is(3));
+        assertThat(footprints.get(0), is(1));
+        assertThat(footprints.get(1), is(3));
+        assertThat(footprints.get(2), is(2));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/MapHeadersTest.java b/src/test/java/org/analogweb/core/MapHeadersTest.java
index 768cfce..5eb0ce8 100644
--- a/src/test/java/org/analogweb/core/MapHeadersTest.java
+++ b/src/test/java/org/analogweb/core/MapHeadersTest.java
@@ -12,55 +12,55 @@
 
 public class MapHeadersTest {
 
-	private MapHeaders headers;
+    private MapHeaders headers;
 
-	@Test
-	public void testGetNames() {
-		HashMap<String, List<String>> source = new HashMap<String, List<String>>();
-		source.put("Content-Type", Arrays.asList("text/html"));
-		source.put("Locale", Arrays.asList("ja_JP"));
-		headers = new MapHeaders(source);
-		List<String> names = headers.getNames();
-		assertThat(names.contains("Content-Type"), is(true));
-		assertThat(names.contains("Locale"), is(true));
-		assertThat(names.contains("Content-Disposition"), is(false));
-	}
+    @Test
+    public void testGetNames() {
+        HashMap<String, List<String>> source = new HashMap<String, List<String>>();
+        source.put("Content-Type", Arrays.asList("text/html"));
+        source.put("Locale", Arrays.asList("ja_JP"));
+        headers = new MapHeaders(source);
+        List<String> names = headers.getNames();
+        assertThat(names.contains("Content-Type"), is(true));
+        assertThat(names.contains("Locale"), is(true));
+        assertThat(names.contains("Content-Disposition"), is(false));
+    }
 
-	@Test
-	public void testContains() {
-		HashMap<String, List<String>> source = new HashMap<String, List<String>>();
-		source.put("Content-Type", Arrays.asList("text/html"));
-		source.put("Locale", Arrays.asList("ja_JP"));
-		headers = new MapHeaders(source);
-		assertThat(headers.contains("Content-Type"), is(true));
-		assertThat(headers.contains("Locale"), is(true));
-		assertThat(headers.contains("Content-Disposition"), is(false));
-	}
+    @Test
+    public void testContains() {
+        HashMap<String, List<String>> source = new HashMap<String, List<String>>();
+        source.put("Content-Type", Arrays.asList("text/html"));
+        source.put("Locale", Arrays.asList("ja_JP"));
+        headers = new MapHeaders(source);
+        assertThat(headers.contains("Content-Type"), is(true));
+        assertThat(headers.contains("Locale"), is(true));
+        assertThat(headers.contains("Content-Disposition"), is(false));
+    }
 
-	@Test
-	public void testGetValues() {
-		HashMap<String, List<String>> source = new HashMap<String, List<String>>();
-		source.put("Content-Type", Arrays.asList("text/html"));
-		source.put("Locale", Arrays.asList("ja_JP"));
-		headers = new MapHeaders(source);
-		assertThat(headers.getValues("Content-Type").get(0), is("text/html"));
-		assertThat(headers.getValues("Locale").get(0), is("ja_JP"));
-	}
+    @Test
+    public void testGetValues() {
+        HashMap<String, List<String>> source = new HashMap<String, List<String>>();
+        source.put("Content-Type", Arrays.asList("text/html"));
+        source.put("Locale", Arrays.asList("ja_JP"));
+        headers = new MapHeaders(source);
+        assertThat(headers.getValues("Content-Type").get(0), is("text/html"));
+        assertThat(headers.getValues("Locale").get(0), is("ja_JP"));
+    }
 
-	@Test
-	public void testPutValue() {
-		HashMap<String, List<String>> source = new HashMap<String, List<String>>();
-		List<String> accept = new ArrayList<String>();
-		accept.add("text/html");
-		source.put("Accept", accept);
-		source.put("Locale", Arrays.asList("ja_JP"));
-		headers = new MapHeaders(source);
-		headers.putValue("Accept", "text/plain");
-		headers.putValue("Cookie", "foo=baa");
-		assertThat(headers.getValues("Accept").get(0), is("text/html"));
-		assertThat(headers.getValues("Accept").get(1), is("text/plain"));
-		assertThat(headers.getValues("Locale").get(0), is("ja_JP"));
-		assertThat(headers.getValues("Cookie").get(0), is("foo=baa"));
-		assertThat(headers.getValues("Hoge").isEmpty(), is(true));
-	}
+    @Test
+    public void testPutValue() {
+        HashMap<String, List<String>> source = new HashMap<String, List<String>>();
+        List<String> accept = new ArrayList<String>();
+        accept.add("text/html");
+        source.put("Accept", accept);
+        source.put("Locale", Arrays.asList("ja_JP"));
+        headers = new MapHeaders(source);
+        headers.putValue("Accept", "text/plain");
+        headers.putValue("Cookie", "foo=baa");
+        assertThat(headers.getValues("Accept").get(0), is("text/html"));
+        assertThat(headers.getValues("Accept").get(1), is("text/plain"));
+        assertThat(headers.getValues("Locale").get(0), is("ja_JP"));
+        assertThat(headers.getValues("Cookie").get(0), is("foo=baa"));
+        assertThat(headers.getValues("Hoge").isEmpty(), is(true));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/MatrixParametersTest.java b/src/test/java/org/analogweb/core/MatrixParametersTest.java
index 8e2acfa..c545d1b 100644
--- a/src/test/java/org/analogweb/core/MatrixParametersTest.java
+++ b/src/test/java/org/analogweb/core/MatrixParametersTest.java
@@ -10,40 +10,37 @@
 
 public class MatrixParametersTest {
 
-	private MatrixParameters params;
-
-	@Test
-	public void test() {
-		URI requestURI = URI
-				.create("http://some.where/thing;paramA=1;paramB=6542");
-		params = new MatrixParameters(requestURI);
-		List<String> actual = params.getValues("paramA");
-		assertThat(actual.size(), is(1));
-		assertThat(actual.get(0), is("1"));
-		actual = params.getValues("paramB");
-		assertThat(actual.size(), is(1));
-		assertThat(actual.get(0), is("6542"));
-	}
-
-	@Test
-	public void testContainsPath() {
-		URI requestURI = URI
-				.create("http://example.com/res/categories;name=foo/objects;name=green/?page=1");
-		params = new MatrixParameters(requestURI);
-		List<String> actual = params.getValues("name");
-		assertThat(actual.size(), is(2));
-		assertThat(actual.get(0), is("foo/objects"));
-		assertThat(actual.get(1), is("green/?page=1"));
-	}
-
-	@Test
-	public void testNoMatrixParameters() {
-		URI requestURI = URI
-				.create("http://some.where/thing?paramA=1&paramB=6542");
-		params = new MatrixParameters(requestURI);
-		List<String> actual = params.getValues("paramA");
-		assertThat(actual.size(), is(0));
-		actual = params.getValues("paramB");
-		assertThat(actual.size(), is(0));
-	}
+    private MatrixParameters params;
+
+    @Test
+    public void test() {
+        URI requestURI = URI.create("http://some.where/thing;paramA=1;paramB=6542");
+        params = new MatrixParameters(requestURI);
+        List<String> actual = params.getValues("paramA");
+        assertThat(actual.size(), is(1));
+        assertThat(actual.get(0), is("1"));
+        actual = params.getValues("paramB");
+        assertThat(actual.size(), is(1));
+        assertThat(actual.get(0), is("6542"));
+    }
+
+    @Test
+    public void testContainsPath() {
+        URI requestURI = URI.create("http://example.com/res/categories;name=foo/objects;name=green/?page=1");
+        params = new MatrixParameters(requestURI);
+        List<String> actual = params.getValues("name");
+        assertThat(actual.size(), is(2));
+        assertThat(actual.get(0), is("foo/objects"));
+        assertThat(actual.get(1), is("green/?page=1"));
+    }
+
+    @Test
+    public void testNoMatrixParameters() {
+        URI requestURI = URI.create("http://some.where/thing?paramA=1&paramB=6542");
+        params = new MatrixParameters(requestURI);
+        List<String> actual = params.getValues("paramA");
+        assertThat(actual.size(), is(0));
+        actual = params.getValues("paramB");
+        assertThat(actual.size(), is(0));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/MediaTypesTest.java b/src/test/java/org/analogweb/core/MediaTypesTest.java
index 1b14f8c..2ba4e2e 100644
--- a/src/test/java/org/analogweb/core/MediaTypesTest.java
+++ b/src/test/java/org/analogweb/core/MediaTypesTest.java
@@ -16,104 +16,104 @@
  */
 public class MediaTypesTest {
 
-	@Test
-	public void testDefaultType() {
-		MediaType actual = MediaTypes.WILDCARD_TYPE;
-		assertThat(actual.getType(), is("*"));
-		assertThat(actual.getSubType(), is("*"));
-		assertThat(actual.getParameters(), is(emptyMap()));
-		assertThat(actual.toString(), is("*/*"));
-	}
+    @Test
+    public void testDefaultType() {
+        MediaType actual = MediaTypes.WILDCARD_TYPE;
+        assertThat(actual.getType(), is("*"));
+        assertThat(actual.getSubType(), is("*"));
+        assertThat(actual.getParameters(), is(emptyMap()));
+        assertThat(actual.toString(), is("*/*"));
+    }
 
-	@Test
-	public void testUsualType() {
-		MediaType actual = MediaTypes.APPLICATION_JSON_TYPE;
-		assertThat(actual.getType(), is("application"));
-		assertThat(actual.getSubType(), is("json"));
-		assertThat(actual.getParameters(), is(emptyMap()));
-		assertThat(actual.toString(), is("application/json"));
-	}
+    @Test
+    public void testUsualType() {
+        MediaType actual = MediaTypes.APPLICATION_JSON_TYPE;
+        assertThat(actual.getType(), is("application"));
+        assertThat(actual.getSubType(), is("json"));
+        assertThat(actual.getParameters(), is(emptyMap()));
+        assertThat(actual.toString(), is("application/json"));
+    }
 
-	@Test
-	public void testValueOf() {
-		MediaType actual = MediaTypes.valueOf("application/json");
-		assertThat(actual.getType(), is("application"));
-		assertThat(actual.getSubType(), is("json"));
-		assertThat(actual.getParameters(), is(emptyMap()));
-	}
+    @Test
+    public void testValueOf() {
+        MediaType actual = MediaTypes.valueOf("application/json");
+        assertThat(actual.getType(), is("application"));
+        assertThat(actual.getSubType(), is("json"));
+        assertThat(actual.getParameters(), is(emptyMap()));
+    }
 
-	@Test
-	public void testValueOfWithQuery() {
-		MediaType actual = MediaTypes.valueOf("text/xml;s=1;q=0.9");
-		assertThat(actual.getType(), is("text"));
-		assertThat(actual.getSubType(), is("xml"));
-		Map<String, String> parameters = actual.getParameters();
-		assertThat(parameters.size(), is(2));
-		assertThat(parameters.get("q"), is("0.9"));
-		assertThat(parameters.get("s"), is("1"));
-		assertThat(actual.toString(), is("text/xml;q=0.9;s=1"));
-		actual = MediaTypes.valueOf("text/xml;t=;q=0.9");
-		assertThat(actual.getType(), is("text"));
-		assertThat(actual.getSubType(), is("xml"));
-		parameters = actual.getParameters();
-		assertThat(parameters.size(), is(2));
-		assertThat(parameters.get("q"), is("0.9"));
-		assertThat(parameters.get("t"), is(""));
-		actual = MediaTypes.valueOf("text/xml;u;q=0.9");
-		assertThat(actual.getType(), is("text"));
-		assertThat(actual.getSubType(), is("xml"));
-		parameters = actual.getParameters();
-		assertThat(parameters.size(), is(1));
-		assertThat(parameters.get("q"), is("0.9"));
-	}
+    @Test
+    public void testValueOfWithQuery() {
+        MediaType actual = MediaTypes.valueOf("text/xml;s=1;q=0.9");
+        assertThat(actual.getType(), is("text"));
+        assertThat(actual.getSubType(), is("xml"));
+        Map<String, String> parameters = actual.getParameters();
+        assertThat(parameters.size(), is(2));
+        assertThat(parameters.get("q"), is("0.9"));
+        assertThat(parameters.get("s"), is("1"));
+        assertThat(actual.toString(), is("text/xml;q=0.9;s=1"));
+        actual = MediaTypes.valueOf("text/xml;t=;q=0.9");
+        assertThat(actual.getType(), is("text"));
+        assertThat(actual.getSubType(), is("xml"));
+        parameters = actual.getParameters();
+        assertThat(parameters.size(), is(2));
+        assertThat(parameters.get("q"), is("0.9"));
+        assertThat(parameters.get("t"), is(""));
+        actual = MediaTypes.valueOf("text/xml;u;q=0.9");
+        assertThat(actual.getType(), is("text"));
+        assertThat(actual.getSubType(), is("xml"));
+        parameters = actual.getParameters();
+        assertThat(parameters.size(), is(1));
+        assertThat(parameters.get("q"), is("0.9"));
+    }
 
-	@Test
-	public void testValueOfWithInvalidType() {
-		MediaType actual = MediaTypes.valueOf("aaa;s=1;q=0.9");
-		assertThat(actual, is(MediaTypes.WILDCARD_TYPE));
-	}
+    @Test
+    public void testValueOfWithInvalidType() {
+        MediaType actual = MediaTypes.valueOf("aaa;s=1;q=0.9");
+        assertThat(actual, is(MediaTypes.WILDCARD_TYPE));
+    }
 
-	@Test
-	public void testValueOfWithoutValue() {
-		MediaType actual = MediaTypes.valueOf(null);
-		assertThat(actual, is(MediaTypes.WILDCARD_TYPE));
-	}
+    @Test
+    public void testValueOfWithoutValue() {
+        MediaType actual = MediaTypes.valueOf(null);
+        assertThat(actual, is(MediaTypes.WILDCARD_TYPE));
+    }
 
-	@Test
-	public void testIsCompatible() {
-		MediaType a = MediaTypes.APPLICATION_JSON_TYPE;
-		MediaType b = MediaTypes.APPLICATION_JSON_TYPE;
-		assertThat(a.isCompatible(b), is(true));
-		a = MediaTypes.valueOf("text/xml; q=0.9");
-		b = MediaTypes.valueOf("text/xml; q=0.8;a=1");
-		assertThat(a.isCompatible(b), is(true));
-		a = MediaTypes.valueOf("application/*");
-		b = MediaTypes.valueOf("application/json");
-		assertThat(a.isCompatible(b), is(true));
-		a = MediaTypes.valueOf("application/json");
-		b = MediaTypes.valueOf("application/*");
-		assertThat(a.isCompatible(b), is(false));
-		a = MediaTypes.APPLICATION_JSON_TYPE;
-		b = MediaTypes.TEXT_XML_TYPE;
-		assertThat(a.isCompatible(b), is(false));
-	}
+    @Test
+    public void testIsCompatible() {
+        MediaType a = MediaTypes.APPLICATION_JSON_TYPE;
+        MediaType b = MediaTypes.APPLICATION_JSON_TYPE;
+        assertThat(a.isCompatible(b), is(true));
+        a = MediaTypes.valueOf("text/xml; q=0.9");
+        b = MediaTypes.valueOf("text/xml; q=0.8;a=1");
+        assertThat(a.isCompatible(b), is(true));
+        a = MediaTypes.valueOf("application/*");
+        b = MediaTypes.valueOf("application/json");
+        assertThat(a.isCompatible(b), is(true));
+        a = MediaTypes.valueOf("application/json");
+        b = MediaTypes.valueOf("application/*");
+        assertThat(a.isCompatible(b), is(false));
+        a = MediaTypes.APPLICATION_JSON_TYPE;
+        b = MediaTypes.TEXT_XML_TYPE;
+        assertThat(a.isCompatible(b), is(false));
+    }
 
-	private Matcher<Map<?, ?>> emptyMap() {
-		return new BaseMatcher<Map<?, ?>>() {
+    private Matcher<Map<?, ?>> emptyMap() {
+        return new BaseMatcher<Map<?, ?>>() {
 
-			@Override
-			public boolean matches(Object item) {
-				if (item instanceof Map) {
-					Map<?, ?> actual = (Map<?, ?>) item;
-					return actual.isEmpty();
-				}
-				return false;
-			}
+            @Override
+            public boolean matches(Object item) {
+                if (item instanceof Map) {
+                    Map<?, ?> actual = (Map<?, ?>) item;
+                    return actual.isEmpty();
+                }
+                return false;
+            }
 
-			@Override
-			public void describeTo(Description description) {
-				// nop
-			}
-		};
-	}
+            @Override
+            public void describeTo(Description description) {
+                // nop
+            }
+        };
+    }
 }
diff --git a/src/test/java/org/analogweb/core/ModulesConfigComparatorTest.java b/src/test/java/org/analogweb/core/ModulesConfigComparatorTest.java
index 25b27cb..05f0f8c 100644
--- a/src/test/java/org/analogweb/core/ModulesConfigComparatorTest.java
+++ b/src/test/java/org/analogweb/core/ModulesConfigComparatorTest.java
@@ -24,86 +24,86 @@
  */
 public class ModulesConfigComparatorTest {
 
-	private ModulesConfigComparator comparator;
-	private RootModulesConfig modulesConfig;
-	private PluginModulesConfig pluginModulesConfig;
-	private UserModulesConfig userModulesConfig;
-	private ModulesConfig otherModulesConfig;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    private ModulesConfigComparator comparator;
+    private RootModulesConfig modulesConfig;
+    private PluginModulesConfig pluginModulesConfig;
+    private UserModulesConfig userModulesConfig;
+    private ModulesConfig otherModulesConfig;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Before
-	public void setUp() throws Exception {
-		comparator = new ModulesConfigComparator();
-		modulesConfig = new RootModulesConfig();
-		pluginModulesConfig = mock(PluginModulesConfig.class);
-		userModulesConfig = mock(UserModulesConfig.class);
-		otherModulesConfig = mock(ModulesConfig.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        comparator = new ModulesConfigComparator();
+        modulesConfig = new RootModulesConfig();
+        pluginModulesConfig = mock(PluginModulesConfig.class);
+        userModulesConfig = mock(UserModulesConfig.class);
+        otherModulesConfig = mock(ModulesConfig.class);
+    }
 
-	@Test
-	public void testCompareModulesConfig() {
-		int actual = comparator.compare(modulesConfig, pluginModulesConfig);
-		assertThat(actual, is(-1));
-		actual = comparator.compare(modulesConfig, modulesConfig);
-		assertThat(actual, is(0));
-		actual = comparator.compare(modulesConfig, userModulesConfig);
-		assertThat(actual, is(-1));
-	}
+    @Test
+    public void testCompareModulesConfig() {
+        int actual = comparator.compare(modulesConfig, pluginModulesConfig);
+        assertThat(actual, is(-1));
+        actual = comparator.compare(modulesConfig, modulesConfig);
+        assertThat(actual, is(0));
+        actual = comparator.compare(modulesConfig, userModulesConfig);
+        assertThat(actual, is(-1));
+    }
 
-	@Test
-	public void testComparePluginModulesConfig() {
-		int actual = comparator.compare(pluginModulesConfig, modulesConfig);
-		assertThat(actual, is(1));
-		actual = comparator.compare(pluginModulesConfig, pluginModulesConfig);
-		assertThat(actual, is(0));
-		actual = comparator.compare(pluginModulesConfig, userModulesConfig);
-		assertThat(actual, is(-1));
-	}
+    @Test
+    public void testComparePluginModulesConfig() {
+        int actual = comparator.compare(pluginModulesConfig, modulesConfig);
+        assertThat(actual, is(1));
+        actual = comparator.compare(pluginModulesConfig, pluginModulesConfig);
+        assertThat(actual, is(0));
+        actual = comparator.compare(pluginModulesConfig, userModulesConfig);
+        assertThat(actual, is(-1));
+    }
 
-	@Test
-	public void testCompareUserModulesConfig() {
-		int actual = comparator.compare(userModulesConfig, modulesConfig);
-		assertThat(actual, is(1));
-		actual = comparator.compare(userModulesConfig, userModulesConfig);
-		assertThat(actual, is(0));
-		actual = comparator.compare(userModulesConfig, pluginModulesConfig);
-		assertThat(actual, is(1));
-	}
+    @Test
+    public void testCompareUserModulesConfig() {
+        int actual = comparator.compare(userModulesConfig, modulesConfig);
+        assertThat(actual, is(1));
+        actual = comparator.compare(userModulesConfig, userModulesConfig);
+        assertThat(actual, is(0));
+        actual = comparator.compare(userModulesConfig, pluginModulesConfig);
+        assertThat(actual, is(1));
+    }
 
-	@Test
-	public void testCompareOtherModulesConfig() {
-		int actual = comparator.compare(otherModulesConfig, modulesConfig);
-		assertThat(actual, is(1));
-		actual = comparator.compare(otherModulesConfig, userModulesConfig);
-		assertThat(actual, is(1));
-		actual = comparator.compare(otherModulesConfig, pluginModulesConfig);
-		assertThat(actual, is(1));
-	}
+    @Test
+    public void testCompareOtherModulesConfig() {
+        int actual = comparator.compare(otherModulesConfig, modulesConfig);
+        assertThat(actual, is(1));
+        actual = comparator.compare(otherModulesConfig, userModulesConfig);
+        assertThat(actual, is(1));
+        actual = comparator.compare(otherModulesConfig, pluginModulesConfig);
+        assertThat(actual, is(1));
+    }
 
-	@Test
-	public void testCompareModulesConfigIsNull() {
-		thrown.expect(AssertionFailureException.class);
-		comparator.compare(userModulesConfig, null);
-	}
+    @Test
+    public void testCompareModulesConfigIsNull() {
+        thrown.expect(AssertionFailureException.class);
+        comparator.compare(userModulesConfig, null);
+    }
 
-	@Test
-	public void testCompareModulesConfigAreNull() {
-		thrown.expect(AssertionFailureException.class);
-		comparator.compare(null, modulesConfig);
-	}
+    @Test
+    public void testCompareModulesConfigAreNull() {
+        thrown.expect(AssertionFailureException.class);
+        comparator.compare(null, modulesConfig);
+    }
 
-	@Test
-	public void testSortModulesConfig() {
-		List<ModulesConfig> configs = new ArrayList<ModulesConfig>();
-		configs.add(userModulesConfig);
-		configs.add(modulesConfig);
-		configs.add(pluginModulesConfig);
-		configs.add(otherModulesConfig);
-		Collections.sort(configs, comparator);
-		assertThat(configs.get(0), is((ModulesConfig) modulesConfig));
-		assertThat(configs.get(1), is((ModulesConfig) pluginModulesConfig));
-		assertThat(configs.get(2), is((ModulesConfig) userModulesConfig));
-		assertThat(configs.get(3), is(otherModulesConfig));
-	}
+    @Test
+    public void testSortModulesConfig() {
+        List<ModulesConfig> configs = new ArrayList<ModulesConfig>();
+        configs.add(userModulesConfig);
+        configs.add(modulesConfig);
+        configs.add(pluginModulesConfig);
+        configs.add(otherModulesConfig);
+        Collections.sort(configs, comparator);
+        assertThat(configs.get(0), is((ModulesConfig) modulesConfig));
+        assertThat(configs.get(1), is((ModulesConfig) pluginModulesConfig));
+        assertThat(configs.get(2), is((ModulesConfig) userModulesConfig));
+        assertThat(configs.get(3), is(otherModulesConfig));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/MultipartParameterResolverTest.java b/src/test/java/org/analogweb/core/MultipartParameterResolverTest.java
index d2c952e..63f3d75 100644
--- a/src/test/java/org/analogweb/core/MultipartParameterResolverTest.java
+++ b/src/test/java/org/analogweb/core/MultipartParameterResolverTest.java
@@ -19,180 +19,114 @@
 
 public class MultipartParameterResolverTest {
 
-	private MultipartParameterResolver resolver = new MultipartParameterResolver();
-	private String content = "-----------------------------287032381131322"
-			+ "\r\n"
-			+ "Content-Disposition: form-data; name=\"datafile1\"; filename=\"r.gif\""
-			+ "\r\n"
-			+ "Content-Type: image/gif"
-			+ "\r\n"
-			+ ""
-			+ "\r\n"
-			+ "GIF87a.............,...........D..;"
-			+ "\r\n"
-			+ "-----------------------------287032381131322"
-			+ "\r\n"
-			+ "Content-Disposition: form-data; name=\"datafile2\"; filename=\"g.gif\""
-			+ "\r\n"
-			+ "Content-Type: image/gif"
-			+ "\r\n"
-			+ ""
-			+ "\r\n"
-			+ "GIF87a.............,...........D..;"
-			+ "\r\n"
-			+ "-----------------------------287032381131322"
-			+ "\r\n"
-			+ "Content-Disposition: form-data; name=\"datafile2\"; filename=\"f.gif\""
-			+ "\r\n"
-			+ "Content-Type: image/gif"
-			+ "\r\n"
-			+ ""
-			+ "\r\n"
-			+ "GIF87a.............,...........D..;"
-			+ "\r\n"
-			+ "-----------------------------287032381131322"
-			+ "\r\n"
-			+ "Content-Disposition: form-data; name=\"field1\""
-			+ "\r\n"
-			+ ""
-			+ "\r\n"
-			+ "$field2"
-			+ "\r\n"
-			+ "-----------------------------287032381131322"
-			+ "\r\n"
-			+ "Content-Disposition: form-data; name=\"field2\""
-			+ "\r\n"
-			+ ""
-			+ "\r\n"
-			+ "$field3"
-			+ "\r\n"
-			+ "-----------------------------287032381131322"
-			+ "\r\n"
-			+ "Content-Disposition: form-data; name=\"field2\""
-			+ "\r\n"
-			+ "Content-Type: text/plain;charset=utf-8"
-			+ "\r\n"
-			+ ""
-			+ "\r\n"
-			+ "ああああ"
-			+ "\r\n"
-			+ "-----------------------------287032381131322"
-			+ "\r\n"
-			+ "Content-Disposition: form-data; name=\"datafile3\"; filename=\"b.gif\""
-			+ "\r\n" + "Content-Type: image/gif" + "\r\n"
-			+ "Content-Transfer-Encoding: binary" + "\r\n" + "" + "\r\n"
-			+ "GIF87a.............,...........D..;" + "\r\n"
-			+ "-----------------------------287032381131322--" + "\r\n";
+    private MultipartParameterResolver resolver = new MultipartParameterResolver();
+    private String content = "-----------------------------287032381131322" + "\r\n"
+            + "Content-Disposition: form-data; name=\"datafile1\"; filename=\"r.gif\"" + "\r\n"
+            + "Content-Type: image/gif" + "\r\n" + "" + "\r\n" + "GIF87a.............,...........D..;" + "\r\n"
+            + "-----------------------------287032381131322" + "\r\n"
+            + "Content-Disposition: form-data; name=\"datafile2\"; filename=\"g.gif\"" + "\r\n"
+            + "Content-Type: image/gif" + "\r\n" + "" + "\r\n" + "GIF87a.............,...........D..;" + "\r\n"
+            + "-----------------------------287032381131322" + "\r\n"
+            + "Content-Disposition: form-data; name=\"datafile2\"; filename=\"f.gif\"" + "\r\n"
+            + "Content-Type: image/gif" + "\r\n" + "" + "\r\n" + "GIF87a.............,...........D..;" + "\r\n"
+            + "-----------------------------287032381131322" + "\r\n"
+            + "Content-Disposition: form-data; name=\"field1\"" + "\r\n" + "" + "\r\n" + "$field2" + "\r\n"
+            + "-----------------------------287032381131322" + "\r\n"
+            + "Content-Disposition: form-data; name=\"field2\"" + "\r\n" + "" + "\r\n" + "$field3" + "\r\n"
+            + "-----------------------------287032381131322" + "\r\n"
+            + "Content-Disposition: form-data; name=\"field2\"" + "\r\n" + "Content-Type: text/plain;charset=utf-8"
+            + "\r\n" + "" + "\r\n" + "ああああ" + "\r\n" + "-----------------------------287032381131322" + "\r\n"
+            + "Content-Disposition: form-data; name=\"datafile3\"; filename=\"b.gif\"" + "\r\n"
+            + "Content-Type: image/gif" + "\r\n" + "Content-Transfer-Encoding: binary" + "\r\n" + "" + "\r\n"
+            + "GIF87a.............,...........D..;" + "\r\n" + "-----------------------------287032381131322--"
+            + "\r\n";
 
-	@Test
-	public void testGetBinary() throws Exception {
-		RequestContext request = mock(RequestContext.class);
-		InvocationMetadata metadata = mock(InvocationMetadata.class);
-		InputStream body = new ByteArrayInputStream(content.getBytes());
-		when(request.getRequestBody()).thenReturn(
-				DefaultReadableBuffer.readBuffer(body));
-		when(request.getContentType())
-				.thenReturn(
-						MediaTypes
-								.valueOf("multipart/form-data; boundary=---------------------------287032381131322"));
-		File actual = (File) resolver.resolveValue(request, metadata,
-				"datafile3", File.class, null);
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		IOUtils.copy(new FileInputStream(actual), out);
-		assertThat(out.toByteArray().length, is(35));
-	}
+    @Test
+    public void testGetBinary() throws Exception {
+        RequestContext request = mock(RequestContext.class);
+        InvocationMetadata metadata = mock(InvocationMetadata.class);
+        InputStream body = new ByteArrayInputStream(content.getBytes());
+        when(request.getRequestBody()).thenReturn(DefaultReadableBuffer.readBuffer(body));
+        when(request.getContentType()).thenReturn(
+                MediaTypes.valueOf("multipart/form-data; boundary=---------------------------287032381131322"));
+        File actual = (File) resolver.resolveValue(request, metadata, "datafile3", File.class, null);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IOUtils.copy(new FileInputStream(actual), out);
+        assertThat(out.toByteArray().length, is(35));
+    }
 
-	@Test
-	public void testGetField() throws Exception {
-		RequestContext request = mock(RequestContext.class);
-		InvocationMetadata metadata = mock(InvocationMetadata.class);
-		InputStream body = new ByteArrayInputStream(content.getBytes());
-		when(request.getRequestBody()).thenReturn(
-				DefaultReadableBuffer.readBuffer(body));
-		when(request.getContentType())
-				.thenReturn(
-						MediaTypes
-								.valueOf("multipart/form-data; boundary=---------------------------287032381131322"));
-		Multipart actual = (Multipart) resolver.resolveValue(request, metadata,
-				"field1", Multipart.class, null);
-		assertThat(actual.getName(), is("field1"));
-		assertThat(actual.getResourceName(), is(nullValue()));
-		assertThat(new String(actual.getBytes()), is("$field2"));
-	}
+    @Test
+    public void testGetField() throws Exception {
+        RequestContext request = mock(RequestContext.class);
+        InvocationMetadata metadata = mock(InvocationMetadata.class);
+        InputStream body = new ByteArrayInputStream(content.getBytes());
+        when(request.getRequestBody()).thenReturn(DefaultReadableBuffer.readBuffer(body));
+        when(request.getContentType()).thenReturn(
+                MediaTypes.valueOf("multipart/form-data; boundary=---------------------------287032381131322"));
+        Multipart actual = (Multipart) resolver.resolveValue(request, metadata, "field1", Multipart.class, null);
+        assertThat(actual.getName(), is("field1"));
+        assertThat(actual.getResourceName(), is(nullValue()));
+        assertThat(new String(actual.getBytes()), is("$field2"));
+    }
 
-	@Test
-	public void testGetFieldAsString() throws Exception {
-		RequestContext request = mock(RequestContext.class);
-		InvocationMetadata metadata = mock(InvocationMetadata.class);
-		InputStream body = new ByteArrayInputStream(content.getBytes());
-		when(request.getRequestBody()).thenReturn(
-				DefaultReadableBuffer.readBuffer(body));
-		when(request.getContentType())
-				.thenReturn(
-						MediaTypes
-								.valueOf("multipart/form-data; boundary=---------------------------287032381131322"));
-		String actual = (String) resolver.resolveValue(request, metadata,
-				"field1", String.class, null);
-		assertThat(actual, is("$field2"));
-	}
+    @Test
+    public void testGetFieldAsString() throws Exception {
+        RequestContext request = mock(RequestContext.class);
+        InvocationMetadata metadata = mock(InvocationMetadata.class);
+        InputStream body = new ByteArrayInputStream(content.getBytes());
+        when(request.getRequestBody()).thenReturn(DefaultReadableBuffer.readBuffer(body));
+        when(request.getContentType()).thenReturn(
+                MediaTypes.valueOf("multipart/form-data; boundary=---------------------------287032381131322"));
+        String actual = (String) resolver.resolveValue(request, metadata, "field1", String.class, null);
+        assertThat(actual, is("$field2"));
+    }
 
-	@Test
-	public void testGetMultiple() throws Exception {
-		RequestContext request = mock(RequestContext.class);
-		InvocationMetadata metadata = mock(InvocationMetadata.class);
-		InputStream body = new ByteArrayInputStream(content.getBytes());
-		when(request.getRequestBody()).thenReturn(
-				DefaultReadableBuffer.readBuffer(body));
-		when(request.getContentType())
-				.thenReturn(
-						MediaTypes
-								.valueOf("multipart/form-data; boundary=---------------------------287032381131322"));
-		Multipart[] actual = (Multipart[]) resolver.resolveValue(request,
-				metadata, "datafile2", Multipart[].class, null);
-		assertThat(actual[0].getName(), is("datafile2"));
-		assertThat(actual[0].getResourceName(), is("g.gif"));
-		assertThat(actual[0].getBytes().length, is(35));
-		assertThat(actual[1].getName(), is("datafile2"));
-		assertThat(actual[1].getResourceName(), is("f.gif"));
-		assertThat(actual[1].getBytes().length, is(35));
-	}
+    @Test
+    public void testGetMultiple() throws Exception {
+        RequestContext request = mock(RequestContext.class);
+        InvocationMetadata metadata = mock(InvocationMetadata.class);
+        InputStream body = new ByteArrayInputStream(content.getBytes());
+        when(request.getRequestBody()).thenReturn(DefaultReadableBuffer.readBuffer(body));
+        when(request.getContentType()).thenReturn(
+                MediaTypes.valueOf("multipart/form-data; boundary=---------------------------287032381131322"));
+        Multipart[] actual = (Multipart[]) resolver.resolveValue(request, metadata, "datafile2", Multipart[].class,
+                null);
+        assertThat(actual[0].getName(), is("datafile2"));
+        assertThat(actual[0].getResourceName(), is("g.gif"));
+        assertThat(actual[0].getBytes().length, is(35));
+        assertThat(actual[1].getName(), is("datafile2"));
+        assertThat(actual[1].getResourceName(), is("f.gif"));
+        assertThat(actual[1].getBytes().length, is(35));
+    }
 
-	@Test
-	public void testGetMultipleField() throws Exception {
-		RequestContext request = mock(RequestContext.class);
-		InvocationMetadata metadata = mock(InvocationMetadata.class);
-		InputStream body = new ByteArrayInputStream(content.getBytes());
-		when(request.getRequestBody()).thenReturn(
-				DefaultReadableBuffer.readBuffer(body));
-		when(request.getContentType())
-				.thenReturn(
-						MediaTypes
-								.valueOf("multipart/form-data; boundary=---------------------------287032381131322"));
-		Multipart[] actual = (Multipart[]) resolver.resolveValue(request,
-				metadata, "field2", Multipart[].class, null);
-		assertThat(actual[0].getName(), is("field2"));
-		assertThat(actual[0].getResourceName(), is(nullValue()));
-		assertThat(new String(actual[0].getBytes()), is("$field3"));
-		assertThat(actual[1].getName(), is("field2"));
-		assertThat(actual[1].getResourceName(), is(nullValue()));
-		assertThat(actual[1].getContentType(), is("text/plain;charset=utf-8"));
-		assertThat(new String(actual[1].getBytes()), is("ああああ"));
-	}
+    @Test
+    public void testGetMultipleField() throws Exception {
+        RequestContext request = mock(RequestContext.class);
+        InvocationMetadata metadata = mock(InvocationMetadata.class);
+        InputStream body = new ByteArrayInputStream(content.getBytes());
+        when(request.getRequestBody()).thenReturn(DefaultReadableBuffer.readBuffer(body));
+        when(request.getContentType()).thenReturn(
+                MediaTypes.valueOf("multipart/form-data; boundary=---------------------------287032381131322"));
+        Multipart[] actual = (Multipart[]) resolver.resolveValue(request, metadata, "field2", Multipart[].class, null);
+        assertThat(actual[0].getName(), is("field2"));
+        assertThat(actual[0].getResourceName(), is(nullValue()));
+        assertThat(new String(actual[0].getBytes()), is("$field3"));
+        assertThat(actual[1].getName(), is("field2"));
+        assertThat(actual[1].getResourceName(), is(nullValue()));
+        assertThat(actual[1].getContentType(), is("text/plain;charset=utf-8"));
+        assertThat(new String(actual[1].getBytes()), is("ああああ"));
+    }
 
-	@Test
-	public void testGetMultipleFieldAsString() throws Exception {
-		RequestContext request = mock(RequestContext.class);
-		InvocationMetadata metadata = mock(InvocationMetadata.class);
-		InputStream body = new ByteArrayInputStream(content.getBytes());
-		when(request.getRequestBody()).thenReturn(
-				DefaultReadableBuffer.readBuffer(body));
-		when(request.getContentType())
-				.thenReturn(
-						MediaTypes
-								.valueOf("multipart/form-data; boundary=---------------------------287032381131322"));
-		String[] actual = (String[]) resolver.resolveValue(request, metadata,
-				"field2", String[].class, null);
-		assertThat(actual[0], is("$field3"));
-		assertThat(actual[1], is("ああああ"));
-	}
+    @Test
+    public void testGetMultipleFieldAsString() throws Exception {
+        RequestContext request = mock(RequestContext.class);
+        InvocationMetadata metadata = mock(InvocationMetadata.class);
+        InputStream body = new ByteArrayInputStream(content.getBytes());
+        when(request.getRequestBody()).thenReturn(DefaultReadableBuffer.readBuffer(body));
+        when(request.getContentType()).thenReturn(
+                MediaTypes.valueOf("multipart/form-data; boundary=---------------------------287032381131322"));
+        String[] actual = (String[]) resolver.resolveValue(request, metadata, "field2", String[].class, null);
+        assertThat(actual[0], is("$field3"));
+        assertThat(actual[1], is("ああああ"));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/ParameterValueResolverTest.java b/src/test/java/org/analogweb/core/ParameterValueResolverTest.java
index 3a99ef8..6ad8dab 100644
--- a/src/test/java/org/analogweb/core/ParameterValueResolverTest.java
+++ b/src/test/java/org/analogweb/core/ParameterValueResolverTest.java
@@ -19,22 +19,22 @@
  */
 public class ParameterValueResolverTest {
 
-	private ParameterValueResolver resolver;
-	private RequestContext requestContext;
-	private InvocationMetadata metadata;
-	private Parameters params;
-	private Parameters matrixParams;
+    private ParameterValueResolver resolver;
+    private RequestContext requestContext;
+    private InvocationMetadata metadata;
+    private Parameters params;
+    private Parameters matrixParams;
 
-	@Before
-	public void setUp() throws Exception {
-		resolver = new ParameterValueResolver();
-		requestContext = mock(RequestContext.class);
-		metadata = mock(InvocationMetadata.class);
-		params = mock(Parameters.class);
-		matrixParams = mock(Parameters.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        resolver = new ParameterValueResolver();
+        requestContext = mock(RequestContext.class);
+        metadata = mock(InvocationMetadata.class);
+        params = mock(Parameters.class);
+        matrixParams = mock(Parameters.class);
+    }
 
-	@Test
+    @Test
 	public void testResolveAttributeValue() {
 		when(requestContext.getQueryParameters()).thenReturn(params);
 		when(params.getValues("foo")).thenReturn(Arrays.asList("baa"));
@@ -43,40 +43,37 @@ public void testResolveAttributeValue() {
 		assertThat(actual.toString(), is("baa"));
 	}
 
-	@Test
-	public void testResolveAttributeValueViaFormParameters() {
-		Parameters empty = mock(Parameters.class);
-		when(requestContext.getQueryParameters()).thenReturn(empty);
-		when(requestContext.getMatrixParameters()).thenReturn(empty);
-		when(requestContext.getFormParameters()).thenReturn(params);
-		when(requestContext.getRequestMethod()).thenReturn("POST");
-		when(params.getValues("foo")).thenReturn(Arrays.asList("baa"));
-		Object actual = resolver.resolveValue(requestContext, metadata, "foo",
-				String.class, null);
-		assertThat(actual.toString(), is("baa"));
-	}
+    @Test
+    public void testResolveAttributeValueViaFormParameters() {
+        Parameters empty = mock(Parameters.class);
+        when(requestContext.getQueryParameters()).thenReturn(empty);
+        when(requestContext.getMatrixParameters()).thenReturn(empty);
+        when(requestContext.getFormParameters()).thenReturn(params);
+        when(requestContext.getRequestMethod()).thenReturn("POST");
+        when(params.getValues("foo")).thenReturn(Arrays.asList("baa"));
+        Object actual = resolver.resolveValue(requestContext, metadata, "foo", String.class, null);
+        assertThat(actual.toString(), is("baa"));
+    }
 
-	@Test
-	public void testNotResolveAttributeValueViaFormParameters() {
-		Parameters empty = mock(Parameters.class);
-		when(requestContext.getQueryParameters()).thenReturn(empty);
-		when(requestContext.getMatrixParameters()).thenReturn(empty);
-		when(requestContext.getFormParameters()).thenReturn(params);
-		when(requestContext.getRequestMethod()).thenReturn("GET");
-		when(params.getValues("foo")).thenReturn(Arrays.asList("baa"));
-		Object actual = resolver.resolveValue(requestContext, metadata, "foo",
-				String.class, null);
-		assertThat(actual, is(nullValue()));
-	}
+    @Test
+    public void testNotResolveAttributeValueViaFormParameters() {
+        Parameters empty = mock(Parameters.class);
+        when(requestContext.getQueryParameters()).thenReturn(empty);
+        when(requestContext.getMatrixParameters()).thenReturn(empty);
+        when(requestContext.getFormParameters()).thenReturn(params);
+        when(requestContext.getRequestMethod()).thenReturn("GET");
+        when(params.getValues("foo")).thenReturn(Arrays.asList("baa"));
+        Object actual = resolver.resolveValue(requestContext, metadata, "foo", String.class, null);
+        assertThat(actual, is(nullValue()));
+    }
 
-	@Test
-	public void testResolveAttributeValueWithNullName() {
-		Object actual = resolver.resolveValue(requestContext, metadata, null,
-				String[].class, null);
-		assertThat(actual, is(nullValue()));
-	}
+    @Test
+    public void testResolveAttributeValueWithNullName() {
+        Object actual = resolver.resolveValue(requestContext, metadata, null, String[].class, null);
+        assertThat(actual, is(nullValue()));
+    }
 
-	@Test
+    @Test
 	public void testResolveAttributeValueOfParameterArray() {
 		when(requestContext.getQueryParameters()).thenReturn(params);
 		when(params.getValues("foo")).thenReturn(Arrays.asList("baa", "baz"));
@@ -87,7 +84,7 @@ public void testResolveAttributeValueOfParameterArray() {
 		assertThat(actualArray[1], is("baz"));
 	}
 
-	@Test
+    @Test
 	public void testResolveAttributeNoParameterValue() {
 		when(requestContext.getQueryParameters()).thenReturn(params);
 		when(requestContext.getMatrixParameters()).thenReturn(params);
@@ -99,7 +96,7 @@ public void testResolveAttributeNoParameterValue() {
 		assertThat(actual, is(nullValue()));
 	}
 
-	@Test
+    @Test
 	public void testResolveAttributeViaMatrixParam() {
 		when(requestContext.getQueryParameters()).thenReturn(params);
 		when(requestContext.getMatrixParameters()).thenReturn(matrixParams);
diff --git a/src/test/java/org/analogweb/core/PathVariableValueResolverTest.java b/src/test/java/org/analogweb/core/PathVariableValueResolverTest.java
index 5d646c6..e39ea54 100644
--- a/src/test/java/org/analogweb/core/PathVariableValueResolverTest.java
+++ b/src/test/java/org/analogweb/core/PathVariableValueResolverTest.java
@@ -18,109 +18,93 @@
  */
 public class PathVariableValueResolverTest {
 
-	private PathVariableValueResolver resolver;
-	private InvocationMetadata metadata;
-	private RequestContext context;
+    private PathVariableValueResolver resolver;
+    private InvocationMetadata metadata;
+    private RequestContext context;
 
-	@Before
-	public void setUp() throws Exception {
-		resolver = new PathVariableValueResolver();
-		metadata = mock(InvocationMetadata.class);
-		context = mock(RequestContext.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        resolver = new PathVariableValueResolver();
+        metadata = mock(InvocationMetadata.class);
+        context = mock(RequestContext.class);
+    }
 
-	@Test
-	public void testResolveAttributeValue() {
-		RequestPath requestedPath = mock(RequestPath.class);
-		when(context.getRequestPath()).thenReturn(requestedPath);
-		when(requestedPath.getActualPath()).thenReturn("/mock/do/any/else");
-		RequestPathMetadata definedPath = mock(RequestPathMetadata.class);
-		when(metadata.getDefinedPath()).thenReturn(definedPath);
-		when(definedPath.getActualPath()).thenReturn(
-				"/mock/do/{something}/else");
-		when(definedPath.match(requestedPath)).thenReturn(true);
-		String actual = (String) resolver.resolveValue(context, metadata,
-				"something", null, null);
-		assertThat(actual, is("any"));
-		actual = (String) resolver.resolveValue(context, metadata, "anything",
-				null, null);
-		assertThat(actual, is(nullValue()));
-	}
+    @Test
+    public void testResolveAttributeValue() {
+        RequestPath requestedPath = mock(RequestPath.class);
+        when(context.getRequestPath()).thenReturn(requestedPath);
+        when(requestedPath.getActualPath()).thenReturn("/mock/do/any/else");
+        RequestPathMetadata definedPath = mock(RequestPathMetadata.class);
+        when(metadata.getDefinedPath()).thenReturn(definedPath);
+        when(definedPath.getActualPath()).thenReturn("/mock/do/{something}/else");
+        when(definedPath.match(requestedPath)).thenReturn(true);
+        String actual = (String) resolver.resolveValue(context, metadata, "something", null, null);
+        assertThat(actual, is("any"));
+        actual = (String) resolver.resolveValue(context, metadata, "anything", null, null);
+        assertThat(actual, is(nullValue()));
+    }
 
-	@Test
-	public void testResolveAttributeValueWithRegexVariable() {
-		RequestPath requestedPath = mock(RequestPath.class);
-		when(context.getRequestPath()).thenReturn(requestedPath);
-		when(requestedPath.getActualPath()).thenReturn("/mock/do/any/e");
-		RequestPathMetadata definedPath = mock(RequestPathMetadata.class);
-		when(metadata.getDefinedPath()).thenReturn(definedPath);
-		when(definedPath.getActualPath()).thenReturn(
-				"/mock/do/{something}/else$<[a-z]>");
-		when(definedPath.match(requestedPath)).thenReturn(true);
-		String actual = (String) resolver.resolveValue(context, metadata,
-				"something", null, null);
-		assertThat(actual, is("any"));
-		actual = (String) resolver.resolveValue(context, metadata, "else",
-				null, null);
-		assertThat(actual, is("e"));
-		actual = (String) resolver.resolveValue(context, metadata, "anything",
-				null, null);
-		assertThat(actual, is(nullValue()));
-	}
+    @Test
+    public void testResolveAttributeValueWithRegexVariable() {
+        RequestPath requestedPath = mock(RequestPath.class);
+        when(context.getRequestPath()).thenReturn(requestedPath);
+        when(requestedPath.getActualPath()).thenReturn("/mock/do/any/e");
+        RequestPathMetadata definedPath = mock(RequestPathMetadata.class);
+        when(metadata.getDefinedPath()).thenReturn(definedPath);
+        when(definedPath.getActualPath()).thenReturn("/mock/do/{something}/else$<[a-z]>");
+        when(definedPath.match(requestedPath)).thenReturn(true);
+        String actual = (String) resolver.resolveValue(context, metadata, "something", null, null);
+        assertThat(actual, is("any"));
+        actual = (String) resolver.resolveValue(context, metadata, "else", null, null);
+        assertThat(actual, is("e"));
+        actual = (String) resolver.resolveValue(context, metadata, "anything", null, null);
+        assertThat(actual, is(nullValue()));
+    }
 
-	@Test
-	public void testResolveRegexVariable() {
-		RequestPath requestedPath = mock(RequestPath.class);
-		when(context.getRequestPath()).thenReturn(requestedPath);
-		when(requestedPath.getActualPath()).thenReturn("/mock/do/any/3");
-		RequestPathMetadata definedPath = mock(RequestPathMetadata.class);
-		when(metadata.getDefinedPath()).thenReturn(definedPath);
-		when(definedPath.getActualPath()).thenReturn(
-				"/mock/do/any/else$<[0-9]>");
-		when(definedPath.match(requestedPath)).thenReturn(true);
-		String actual = (String) resolver.resolveValue(context, metadata,
-				"something", null, null);
-		assertThat(actual, is(nullValue()));
-		actual = (String) resolver.resolveValue(context, metadata, "else",
-				null, null);
-		assertThat(actual, is("3"));
-		actual = (String) resolver.resolveValue(context, metadata, "anything",
-				null, null);
-		assertThat(actual, is(nullValue()));
-	}
+    @Test
+    public void testResolveRegexVariable() {
+        RequestPath requestedPath = mock(RequestPath.class);
+        when(context.getRequestPath()).thenReturn(requestedPath);
+        when(requestedPath.getActualPath()).thenReturn("/mock/do/any/3");
+        RequestPathMetadata definedPath = mock(RequestPathMetadata.class);
+        when(metadata.getDefinedPath()).thenReturn(definedPath);
+        when(definedPath.getActualPath()).thenReturn("/mock/do/any/else$<[0-9]>");
+        when(definedPath.match(requestedPath)).thenReturn(true);
+        String actual = (String) resolver.resolveValue(context, metadata, "something", null, null);
+        assertThat(actual, is(nullValue()));
+        actual = (String) resolver.resolveValue(context, metadata, "else", null, null);
+        assertThat(actual, is("3"));
+        actual = (String) resolver.resolveValue(context, metadata, "anything", null, null);
+        assertThat(actual, is(nullValue()));
+    }
 
-	@Test
-	public void testResolveAttributeValueWithRegexVariableNotMatched() {
-		RequestPath requestedPath = mock(RequestPath.class);
-		when(context.getRequestPath()).thenReturn(requestedPath);
-		when(requestedPath.getActualPath()).thenReturn("/mock/do/any/1");
-		RequestPathMetadata definedPath = mock(RequestPathMetadata.class);
-		when(metadata.getDefinedPath()).thenReturn(definedPath);
-		when(definedPath.getActualPath()).thenReturn(
-				"/mock/do/{something}/else$<[a-z]>");
-		when(definedPath.match(requestedPath)).thenReturn(true);
-		String actual = (String) resolver.resolveValue(context, metadata,
-				"something", null, null);
-		assertThat(actual, is("any"));
-		actual = (String) resolver.resolveValue(context, metadata, "else",
-				null, null);
-		assertThat(actual, is(nullValue()));
-		actual = (String) resolver.resolveValue(context, metadata, "anything",
-				null, null);
-		assertThat(actual, is(nullValue()));
-	}
+    @Test
+    public void testResolveAttributeValueWithRegexVariableNotMatched() {
+        RequestPath requestedPath = mock(RequestPath.class);
+        when(context.getRequestPath()).thenReturn(requestedPath);
+        when(requestedPath.getActualPath()).thenReturn("/mock/do/any/1");
+        RequestPathMetadata definedPath = mock(RequestPathMetadata.class);
+        when(metadata.getDefinedPath()).thenReturn(definedPath);
+        when(definedPath.getActualPath()).thenReturn("/mock/do/{something}/else$<[a-z]>");
+        when(definedPath.match(requestedPath)).thenReturn(true);
+        String actual = (String) resolver.resolveValue(context, metadata, "something", null, null);
+        assertThat(actual, is("any"));
+        actual = (String) resolver.resolveValue(context, metadata, "else", null, null);
+        assertThat(actual, is(nullValue()));
+        actual = (String) resolver.resolveValue(context, metadata, "anything", null, null);
+        assertThat(actual, is(nullValue()));
+    }
 
-	@Test
-	public void testResolveAttributeValueWithoutPlaceHolder() {
-		RequestPath requestedPath = mock(RequestPath.class);
-		when(context.getRequestPath()).thenReturn(requestedPath);
-		when(requestedPath.getActualPath()).thenReturn("/mock/do/any/else");
-		RequestPathMetadata definedPath = mock(RequestPathMetadata.class);
-		when(metadata.getDefinedPath()).thenReturn(definedPath);
-		when(definedPath.getActualPath()).thenReturn("/mock/do/any/else");
-		when(definedPath.match(requestedPath)).thenReturn(true);
-		String actual = (String) resolver.resolveValue(context, metadata,
-				"something", null, null);
-		assertThat(actual, is(nullValue()));
-	}
+    @Test
+    public void testResolveAttributeValueWithoutPlaceHolder() {
+        RequestPath requestedPath = mock(RequestPath.class);
+        when(context.getRequestPath()).thenReturn(requestedPath);
+        when(requestedPath.getActualPath()).thenReturn("/mock/do/any/else");
+        RequestPathMetadata definedPath = mock(RequestPathMetadata.class);
+        when(metadata.getDefinedPath()).thenReturn(definedPath);
+        when(definedPath.getActualPath()).thenReturn("/mock/do/any/else");
+        when(definedPath.match(requestedPath)).thenReturn(true);
+        String actual = (String) resolver.resolveValue(context, metadata, "something", null, null);
+        assertThat(actual, is(nullValue()));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/PrecedenceComparatorTest.java b/src/test/java/org/analogweb/core/PrecedenceComparatorTest.java
index 815c4e3..f1969b8 100644
--- a/src/test/java/org/analogweb/core/PrecedenceComparatorTest.java
+++ b/src/test/java/org/analogweb/core/PrecedenceComparatorTest.java
@@ -15,61 +15,61 @@
 
 public class PrecedenceComparatorTest {
 
-	@Test
-	public void testCompare() {
-		Precedence p1 = mock(Precedence.class);
-		Precedence p2 = mock(Precedence.class);
-		Precedence p3 = mock(ApplicationProcessor.class);
-		Precedence p4 = mock(Precedence.class);
-		Precedence p5 = mock(Precedence.class);
-		when(p1.getPrecedence()).thenReturn(1);
-		when(p2.getPrecedence()).thenReturn(2);
-		when(p3.getPrecedence()).thenReturn(3);
-		when(p4.getPrecedence()).thenReturn(Precedence.LOWEST);
-		when(p5.getPrecedence()).thenReturn(Precedence.HIGHEST);
-		List<? extends Precedence> list = Arrays.asList(p4, p1, p2, p5, p3);
-		Collections.sort(list, new PrecedenceComparator<Precedence>());
-		assertThat(list.get(0), is(p5));
-		assertThat(list.get(1), is(p1));
-		assertThat(list.get(2), is(p2));
-		assertThat(list.get(3), is(p3));
-		assertThat(list.get(4), is(p4));
-	}
+    @Test
+    public void testCompare() {
+        Precedence p1 = mock(Precedence.class);
+        Precedence p2 = mock(Precedence.class);
+        Precedence p3 = mock(ApplicationProcessor.class);
+        Precedence p4 = mock(Precedence.class);
+        Precedence p5 = mock(Precedence.class);
+        when(p1.getPrecedence()).thenReturn(1);
+        when(p2.getPrecedence()).thenReturn(2);
+        when(p3.getPrecedence()).thenReturn(3);
+        when(p4.getPrecedence()).thenReturn(Precedence.LOWEST);
+        when(p5.getPrecedence()).thenReturn(Precedence.HIGHEST);
+        List<? extends Precedence> list = Arrays.asList(p4, p1, p2, p5, p3);
+        Collections.sort(list, new PrecedenceComparator<Precedence>());
+        assertThat(list.get(0), is(p5));
+        assertThat(list.get(1), is(p1));
+        assertThat(list.get(2), is(p2));
+        assertThat(list.get(3), is(p3));
+        assertThat(list.get(4), is(p4));
+    }
 
-	@Test
-	public void testCompareSamePrecidence() {
-		Precedence p1 = mock(Precedence.class);
-		Precedence p2 = mock(Precedence.class);
-		Precedence p3 = mock(Precedence.class);
-		Precedence p4 = mock(Precedence.class);
-		Precedence p5 = mock(Precedence.class);
-		when(p1.getPrecedence()).thenReturn(1);
-		when(p2.getPrecedence()).thenReturn(2);
-		when(p3.getPrecedence()).thenReturn(1);// Same as p1
-		when(p4.getPrecedence()).thenReturn(Precedence.LOWEST);
-		when(p5.getPrecedence()).thenReturn(Precedence.HIGHEST);
-		List<? extends Precedence> list = Arrays.asList(p4, p3, p2, p5, p1);
-		Collections.sort(list, new PrecedenceComparator<Precedence>());
-		assertThat(list.get(0), is(p5));
-		// List order relative.
-		assertThat(list.get(1), is(p3));
-		assertThat(list.get(2), is(p1));
-		assertThat(list.get(3), is(p2));
-		assertThat(list.get(4), is(p4));
-	}
+    @Test
+    public void testCompareSamePrecidence() {
+        Precedence p1 = mock(Precedence.class);
+        Precedence p2 = mock(Precedence.class);
+        Precedence p3 = mock(Precedence.class);
+        Precedence p4 = mock(Precedence.class);
+        Precedence p5 = mock(Precedence.class);
+        when(p1.getPrecedence()).thenReturn(1);
+        when(p2.getPrecedence()).thenReturn(2);
+        when(p3.getPrecedence()).thenReturn(1);// Same as p1
+        when(p4.getPrecedence()).thenReturn(Precedence.LOWEST);
+        when(p5.getPrecedence()).thenReturn(Precedence.HIGHEST);
+        List<? extends Precedence> list = Arrays.asList(p4, p3, p2, p5, p1);
+        Collections.sort(list, new PrecedenceComparator<Precedence>());
+        assertThat(list.get(0), is(p5));
+        // List order relative.
+        assertThat(list.get(1), is(p3));
+        assertThat(list.get(2), is(p1));
+        assertThat(list.get(3), is(p2));
+        assertThat(list.get(4), is(p4));
+    }
 
-	@Test
-	public void testDifferentType() {
-		ApplicationProcessor p1 = mock(ApplicationProcessor.class);
-		ApplicationProcessor p2 = mock(ApplicationProcessor.class);
-		ApplicationProcessor p3 = mock(ApplicationProcessor.class);
-		when(p1.getPrecedence()).thenReturn(1);
-		when(p2.getPrecedence()).thenReturn(2);
-		when(p3.getPrecedence()).thenReturn(3);
-		List<ApplicationProcessor> list = Arrays.asList(p2, p3, p1);
-		Collections.sort(list, new PrecedenceComparator<Precedence>());
-		assertThat(list.get(0), is(p1));
-		assertThat(list.get(1), is(p2));
-		assertThat(list.get(2), is(p3));
-	}
+    @Test
+    public void testDifferentType() {
+        ApplicationProcessor p1 = mock(ApplicationProcessor.class);
+        ApplicationProcessor p2 = mock(ApplicationProcessor.class);
+        ApplicationProcessor p3 = mock(ApplicationProcessor.class);
+        when(p1.getPrecedence()).thenReturn(1);
+        when(p2.getPrecedence()).thenReturn(2);
+        when(p3.getPrecedence()).thenReturn(3);
+        List<ApplicationProcessor> list = Arrays.asList(p2, p3, p1);
+        Collections.sort(list, new PrecedenceComparator<Precedence>());
+        assertThat(list.get(0), is(p1));
+        assertThat(list.get(1), is(p2));
+        assertThat(list.get(2), is(p3));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/QueryParametersTest.java b/src/test/java/org/analogweb/core/QueryParametersTest.java
index 6ea1fab..ca597c8 100644
--- a/src/test/java/org/analogweb/core/QueryParametersTest.java
+++ b/src/test/java/org/analogweb/core/QueryParametersTest.java
@@ -11,45 +11,43 @@
 
 public class QueryParametersTest {
 
-	private QueryParameters params;
-
-	@Test
-	public void testGetValues() {
-		params = new QueryParameters(
-				URI.create("http://localhost:80/a?foo=baa&hoge=fuga&hoge=hoge%21"));
-		List<String> actual = params.getValues("foo");
-		assertThat(actual.size(), is(1));
-		assertThat(actual.get(0), is("baa"));
-		actual = params.getValues("hoge");
-		assertThat(actual.size(), is(2));
-		assertThat(actual.get(0), is("fuga"));
-		assertThat(actual.get(1), is("hoge!"));
-		// not avairable.
-		actual = params.getValues("baz");
-		assertThat(actual.isEmpty(), is(true));
-	}
-
-	@Test
-	public void testAsMap() {
-		params = new QueryParameters(
-				URI.create("http://localhost:80/a?foo=1&baa=2&baz=33&foo=10"));
-		Map<String, String[]> map = params.asMap();
-		String[] actual = map.get("foo");
-		assertThat(actual.length, is(2));
-		assertThat(actual[0], is("1"));
-		assertThat(actual[1], is("10"));
-		actual = map.get("baa");
-		assertThat(actual.length, is(1));
-		assertThat(actual[0], is("2"));
-		actual = map.get("baz");
-		assertThat(actual.length, is(1));
-		assertThat(actual[0], is("33"));
-	}
-
-	@Test
-	public void testAsMapIsEmpty() {
-		params = new QueryParameters(URI.create("http://localhost:80/a"));
-		Map<String, String[]> actual = params.asMap();
-		assertThat(actual.isEmpty(), is(true));
-	}
+    private QueryParameters params;
+
+    @Test
+    public void testGetValues() {
+        params = new QueryParameters(URI.create("http://localhost:80/a?foo=baa&hoge=fuga&hoge=hoge%21"));
+        List<String> actual = params.getValues("foo");
+        assertThat(actual.size(), is(1));
+        assertThat(actual.get(0), is("baa"));
+        actual = params.getValues("hoge");
+        assertThat(actual.size(), is(2));
+        assertThat(actual.get(0), is("fuga"));
+        assertThat(actual.get(1), is("hoge!"));
+        // not avairable.
+        actual = params.getValues("baz");
+        assertThat(actual.isEmpty(), is(true));
+    }
+
+    @Test
+    public void testAsMap() {
+        params = new QueryParameters(URI.create("http://localhost:80/a?foo=1&baa=2&baz=33&foo=10"));
+        Map<String, String[]> map = params.asMap();
+        String[] actual = map.get("foo");
+        assertThat(actual.length, is(2));
+        assertThat(actual[0], is("1"));
+        assertThat(actual[1], is("10"));
+        actual = map.get("baa");
+        assertThat(actual.length, is(1));
+        assertThat(actual[0], is("2"));
+        actual = map.get("baz");
+        assertThat(actual.length, is(1));
+        assertThat(actual[0], is("33"));
+    }
+
+    @Test
+    public void testAsMapIsEmpty() {
+        params = new QueryParameters(URI.create("http://localhost:80/a"));
+        Map<String, String[]> actual = params.asMap();
+        assertThat(actual.isEmpty(), is(true));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/RequestBodyValueResolverTest.java b/src/test/java/org/analogweb/core/RequestBodyValueResolverTest.java
index 313d270..7320c28 100644
--- a/src/test/java/org/analogweb/core/RequestBodyValueResolverTest.java
+++ b/src/test/java/org/analogweb/core/RequestBodyValueResolverTest.java
@@ -20,63 +20,56 @@
 
 public class RequestBodyValueResolverTest {
 
-	private RequestBodyValueResolver resolver;
-	private RequestContext requestContext;
-	private InvocationMetadata metadata;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    private RequestBodyValueResolver resolver;
+    private RequestContext requestContext;
+    private InvocationMetadata metadata;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Before
-	public void setUp() throws Exception {
-		resolver = new RequestBodyValueResolver();
-		requestContext = mock(RequestContext.class);
-		metadata = mock(InvocationMetadata.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        resolver = new RequestBodyValueResolver();
+        requestContext = mock(RequestContext.class);
+        metadata = mock(InvocationMetadata.class);
+    }
 
-	@Test
-	public void testResolveAttributeValue() throws Exception {
-		ReadableBuffer expected = DefaultReadableBuffer.readBuffer(new byte[0]);
-		when(requestContext.getRequestBody()).thenReturn(expected);
-		InputStream actual = (InputStream) resolver.resolveValue(
-				requestContext, metadata, "", InputStream.class, null);
-		assertThat(actual, is(expected.asInputStream()));
-	}
+    @Test
+    public void testResolveAttributeValue() throws Exception {
+        ReadableBuffer expected = DefaultReadableBuffer.readBuffer(new byte[0]);
+        when(requestContext.getRequestBody()).thenReturn(expected);
+        InputStream actual = (InputStream) resolver.resolveValue(requestContext, metadata, "", InputStream.class, null);
+        assertThat(actual, is(expected.asInputStream()));
+    }
 
-	@Test
-	public void testResolveAttributeValueAsString() throws Exception {
-		ReadableBuffer expected = DefaultReadableBuffer.readBuffer("abcde"
-				.getBytes("UTF-8"));
-		when(requestContext.getRequestBody()).thenReturn(expected);
-		String actual = (String) resolver.resolveValue(requestContext,
-				metadata, "", String.class, null);
-		assertThat(actual, is("abcde"));
-	}
+    @Test
+    public void testResolveAttributeValueAsString() throws Exception {
+        ReadableBuffer expected = DefaultReadableBuffer.readBuffer("abcde".getBytes("UTF-8"));
+        when(requestContext.getRequestBody()).thenReturn(expected);
+        String actual = (String) resolver.resolveValue(requestContext, metadata, "", String.class, null);
+        assertThat(actual, is("abcde"));
+    }
 
-	@Test
-	public void testResolveAttributeValueWithoutType() throws Exception {
-		ReadableBuffer expected = DefaultReadableBuffer.readBuffer("abcde"
-				.getBytes("UTF-8"));
-		when(requestContext.getRequestBody()).thenReturn(expected);
-		Object actual = resolver.resolveValue(requestContext, metadata, "",
-				null, null);
-		assertThat(actual, is(nullValue()));
-	}
+    @Test
+    public void testResolveAttributeValueWithoutType() throws Exception {
+        ReadableBuffer expected = DefaultReadableBuffer.readBuffer("abcde".getBytes("UTF-8"));
+        when(requestContext.getRequestBody()).thenReturn(expected);
+        Object actual = resolver.resolveValue(requestContext, metadata, "", null, null);
+        assertThat(actual, is(nullValue()));
+    }
 
-	@Test
-	public void testResolveAttributeValueUnknownType() throws Exception {
-		thrown.expect(UnresolvableValueException.class);
-		ReadableBuffer expected = DefaultReadableBuffer.readBuffer("abcde"
-				.getBytes("UTF-8"));
-		when(requestContext.getRequestBody()).thenReturn(expected);
-		resolver.resolveValue(requestContext, metadata, "", Integer.class, null);
-	}
+    @Test
+    public void testResolveAttributeValueUnknownType() throws Exception {
+        thrown.expect(UnresolvableValueException.class);
+        ReadableBuffer expected = DefaultReadableBuffer.readBuffer("abcde".getBytes("UTF-8"));
+        when(requestContext.getRequestBody()).thenReturn(expected);
+        resolver.resolveValue(requestContext, metadata, "", Integer.class, null);
+    }
 
-	@Test
-	@SuppressWarnings("unchecked")
-	public void testResolveAttributeValueWithException() throws Exception {
-		thrown.expect(ApplicationRuntimeException.class);
-		when(requestContext.getRequestBody()).thenThrow(IOException.class);
-		resolver.resolveValue(requestContext, metadata, "", InputStream.class,
-				null);
-	}
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testResolveAttributeValueWithException() throws Exception {
+        thrown.expect(ApplicationRuntimeException.class);
+        when(requestContext.getRequestBody()).thenThrow(IOException.class);
+        resolver.resolveValue(requestContext, metadata, "", InputStream.class, null);
+    }
 }
diff --git a/src/test/java/org/analogweb/core/RequestContextValueResolverTest.java b/src/test/java/org/analogweb/core/RequestContextValueResolverTest.java
index aee38dc..8cd890a 100644
--- a/src/test/java/org/analogweb/core/RequestContextValueResolverTest.java
+++ b/src/test/java/org/analogweb/core/RequestContextValueResolverTest.java
@@ -20,54 +20,47 @@
 
 public class RequestContextValueResolverTest {
 
-	private RequestContextValueResolver resolver = new RequestContextValueResolver();
-	private RequestContext requestContext;
-	private RequestPath path;
-	private MediaType type;
-	private Headers headers;
-	private Cookies cookies;
-	private InvocationMetadata metadata;
+    private RequestContextValueResolver resolver = new RequestContextValueResolver();
+    private RequestContext requestContext;
+    private RequestPath path;
+    private MediaType type;
+    private Headers headers;
+    private Cookies cookies;
+    private InvocationMetadata metadata;
 
-	@Before
-	public void setUp() throws Exception {
-		requestContext = mock(RequestContext.class);
-		path = mock(RequestPath.class);
-		when(requestContext.getRequestPath()).thenReturn(path);
-		type = mock(MediaType.class);
-		when(requestContext.getContentType()).thenReturn(type);
-		headers = mock(Headers.class);
-		when(requestContext.getRequestHeaders()).thenReturn(headers);
-		cookies = mock(Cookies.class);
-		when(requestContext.getCookies()).thenReturn(cookies);
-		metadata = mock(InvocationMetadata.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        requestContext = mock(RequestContext.class);
+        path = mock(RequestPath.class);
+        when(requestContext.getRequestPath()).thenReturn(path);
+        type = mock(MediaType.class);
+        when(requestContext.getContentType()).thenReturn(type);
+        headers = mock(Headers.class);
+        when(requestContext.getRequestHeaders()).thenReturn(headers);
+        cookies = mock(Cookies.class);
+        when(requestContext.getCookies()).thenReturn(cookies);
+        metadata = mock(InvocationMetadata.class);
+    }
 
-	@Test
-	public void testResolved() {
-		Object actual = resolver.resolveValue(requestContext, metadata, "",
-				RequestPath.class, new Annotation[0]);
-		assertThat((RequestPath) actual, is(path));
-		actual = resolver.resolveValue(requestContext, metadata, "",
-				MediaType.class, new Annotation[0]);
-		assertThat((MediaType) actual, is(type));
-		actual = resolver.resolveValue(requestContext, metadata, "",
-				Headers.class, new Annotation[0]);
-		assertThat((Headers) actual, is(headers));
-		actual = resolver.resolveValue(requestContext, metadata, "",
-				Cookies.class, new Annotation[0]);
-		assertThat((Cookies) actual, is(cookies));
-	}
+    @Test
+    public void testResolved() {
+        Object actual = resolver.resolveValue(requestContext, metadata, "", RequestPath.class, new Annotation[0]);
+        assertThat((RequestPath) actual, is(path));
+        actual = resolver.resolveValue(requestContext, metadata, "", MediaType.class, new Annotation[0]);
+        assertThat((MediaType) actual, is(type));
+        actual = resolver.resolveValue(requestContext, metadata, "", Headers.class, new Annotation[0]);
+        assertThat((Headers) actual, is(headers));
+        actual = resolver.resolveValue(requestContext, metadata, "", Cookies.class, new Annotation[0]);
+        assertThat((Cookies) actual, is(cookies));
+    }
 
-	@Test
-	public void testNotResolved() {
-		Object actual = resolver.resolveValue(requestContext, metadata, "",
-				String.class, new Annotation[0]);
-		assertThat(actual, is(nullValue()));
-		actual = resolver.resolveValue(requestContext, metadata, "",
-				InputStream.class, new Annotation[0]);
-		assertThat(actual, is(nullValue()));
-		actual = resolver.resolveValue(requestContext, metadata, "", null,
-				new Annotation[0]);
-		assertThat(actual, is(nullValue()));
-	}
+    @Test
+    public void testNotResolved() {
+        Object actual = resolver.resolveValue(requestContext, metadata, "", String.class, new Annotation[0]);
+        assertThat(actual, is(nullValue()));
+        actual = resolver.resolveValue(requestContext, metadata, "", InputStream.class, new Annotation[0]);
+        assertThat(actual, is(nullValue()));
+        actual = resolver.resolveValue(requestContext, metadata, "", null, new Annotation[0]);
+        assertThat(actual, is(nullValue()));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/RequestCookiesTest.java b/src/test/java/org/analogweb/core/RequestCookiesTest.java
index db2459c..335a7c6 100644
--- a/src/test/java/org/analogweb/core/RequestCookiesTest.java
+++ b/src/test/java/org/analogweb/core/RequestCookiesTest.java
@@ -10,29 +10,29 @@
 
 public class RequestCookiesTest {
 
-	private RequestCookies cookies;
+    private RequestCookies cookies;
 
-	@Test
-	public void testGetCookie() {
-		cookies = new RequestCookies("foo=baa;SomeID=IDSIDS;isA");
-		Cookies.Cookie actual = cookies.getCookie("foo");
-		assertThat(actual.getValue(), is("baa"));
-		actual = cookies.getCookie("SomeID");
-		assertThat(actual.getValue(), is("IDSIDS"));
-		actual = cookies.getCookie("someID");
-		assertThat(actual, is(nullValue()));
-		actual = cookies.getCookie("isA");
-		assertThat(actual.getValue(), is(StringUtils.EMPTY));
-	}
+    @Test
+    public void testGetCookie() {
+        cookies = new RequestCookies("foo=baa;SomeID=IDSIDS;isA");
+        Cookies.Cookie actual = cookies.getCookie("foo");
+        assertThat(actual.getValue(), is("baa"));
+        actual = cookies.getCookie("SomeID");
+        assertThat(actual.getValue(), is("IDSIDS"));
+        actual = cookies.getCookie("someID");
+        assertThat(actual, is(nullValue()));
+        actual = cookies.getCookie("isA");
+        assertThat(actual.getValue(), is(StringUtils.EMPTY));
+    }
 
-	@Test
-	public void testGetCookieWithEmptyHeader() {
-		cookies = new RequestCookies(null);
-		Cookies.Cookie actual = cookies.getCookie("foo");
-		assertThat(actual, is(nullValue()));
-		actual = cookies.getCookie("SomeID");
-		assertThat(actual, is(nullValue()));
-		actual = cookies.getCookie("someID");
-		assertThat(actual, is(nullValue()));
-	}
+    @Test
+    public void testGetCookieWithEmptyHeader() {
+        cookies = new RequestCookies(null);
+        Cookies.Cookie actual = cookies.getCookie("foo");
+        assertThat(actual, is(nullValue()));
+        actual = cookies.getCookie("SomeID");
+        assertThat(actual, is(nullValue()));
+        actual = cookies.getCookie("someID");
+        assertThat(actual, is(nullValue()));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/RequestPathDefinitionTest.java b/src/test/java/org/analogweb/core/RequestPathDefinitionTest.java
index 8264d2e..3830b4f 100644
--- a/src/test/java/org/analogweb/core/RequestPathDefinitionTest.java
+++ b/src/test/java/org/analogweb/core/RequestPathDefinitionTest.java
@@ -25,266 +25,237 @@
  */
 public class RequestPathDefinitionTest {
 
-	private static final Log log = Logs.getLog(RequestPathDefinitionTest.class);
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    private static final Log log = Logs.getLog(RequestPathDefinitionTest.class);
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Test
-	public void testDefine() {
-		String root = "/foo";
-		String path = "/baa/something";
-		RequestPathDefinition mappedPath = RequestPathDefinition.define(root,
-				path);
-		assertThat(mappedPath.getActualPath(), is("/foo/baa/something"));
-		assertThat(mappedPath.getRequestMethods().get(0), is("GET"));
-		assertThat(mappedPath.getRequestMethods().get(1), is("POST"));
-	}
+    @Test
+    public void testDefine() {
+        String root = "/foo";
+        String path = "/baa/something";
+        RequestPathDefinition mappedPath = RequestPathDefinition.define(root, path);
+        assertThat(mappedPath.getActualPath(), is("/foo/baa/something"));
+        assertThat(mappedPath.getRequestMethods().get(0), is("GET"));
+        assertThat(mappedPath.getRequestMethods().get(1), is("POST"));
+    }
 
-	@Test
-	public void testDefineWithMethod() {
-		String root = "/foo";
-		String path = "/baa/something";
-		String[] requestMethods = {"POST", "GET", "PUT"};
-		RequestPathDefinition mappedPath = RequestPathDefinition.define(root,
-				path, requestMethods);
-		assertThat(mappedPath.getActualPath(), is("/foo/baa/something"));
-		assertThat(mappedPath.getRequestMethods().get(0), is("POST"));
-		assertThat(mappedPath.getRequestMethods().get(1), is("GET"));
-		assertThat(mappedPath.getRequestMethods().get(2), is("PUT"));
-	}
+    @Test
+    public void testDefineWithMethod() {
+        String root = "/foo";
+        String path = "/baa/something";
+        String[] requestMethods = { "POST", "GET", "PUT" };
+        RequestPathDefinition mappedPath = RequestPathDefinition.define(root, path, requestMethods);
+        assertThat(mappedPath.getActualPath(), is("/foo/baa/something"));
+        assertThat(mappedPath.getRequestMethods().get(0), is("POST"));
+        assertThat(mappedPath.getRequestMethods().get(1), is("GET"));
+        assertThat(mappedPath.getRequestMethods().get(2), is("PUT"));
+    }
 
-	@Test
-	public void testDefineWithMethodEquals() {
-		String root = "/foo";
-		String path = "/baa/something";
-		String[] requestMethods = {"POST", "GET"};
-		RequestPathDefinition mappedPath = RequestPathDefinition.define(root,
-				path, requestMethods);
-		RequestPath other = mock(RequestPath.class);
-		when(other.getActualPath()).thenReturn("/foo/baa/something");
-		when(other.getRequestMethod()).thenReturn("POST");
-		assertThat(mappedPath.match(other), is(true));
-	}
+    @Test
+    public void testDefineWithMethodEquals() {
+        String root = "/foo";
+        String path = "/baa/something";
+        String[] requestMethods = { "POST", "GET" };
+        RequestPathDefinition mappedPath = RequestPathDefinition.define(root, path, requestMethods);
+        RequestPath other = mock(RequestPath.class);
+        when(other.getActualPath()).thenReturn("/foo/baa/something");
+        when(other.getRequestMethod()).thenReturn("POST");
+        assertThat(mappedPath.match(other), is(true));
+    }
 
-	@Test
-	public void testDefineWithMethodNotEquals() {
-		thrown.expect(RequestMethodUnsupportedException.class);
-		String root = "/foo";
-		String path = "/baa/something";
-		String[] requestMethods = {"POST", "GET"};
-		RequestPathDefinition mappedPath = RequestPathDefinition.define(root,
-				path, requestMethods);
-		RequestPath other = mock(RequestPath.class);
-		when(other.getActualPath()).thenReturn("/foo/baa/something");
-		when(other.getRequestMethod()).thenReturn("DELETE");
-		mappedPath.match(other);
-	}
+    @Test
+    public void testDefineWithMethodNotEquals() {
+        thrown.expect(RequestMethodUnsupportedException.class);
+        String root = "/foo";
+        String path = "/baa/something";
+        String[] requestMethods = { "POST", "GET" };
+        RequestPathDefinition mappedPath = RequestPathDefinition.define(root, path, requestMethods);
+        RequestPath other = mock(RequestPath.class);
+        when(other.getActualPath()).thenReturn("/foo/baa/something");
+        when(other.getRequestMethod()).thenReturn("DELETE");
+        mappedPath.match(other);
+    }
 
-	@Test
-	public void testDefineWithNullMethod() {
-		String root = "/foo";
-		String path = "/baa/something";
-		String[] requestMethods = null;
-		RequestPathDefinition mappedPath = RequestPathDefinition.define(root,
-				path, requestMethods);
-		assertThat(mappedPath.getActualPath(), is("/foo/baa/something"));
-		assertThat(mappedPath.getRequestMethods().size(), is(2));
-		assertThat(mappedPath.getRequestMethods().get(0), is("GET"));
-		assertThat(mappedPath.getRequestMethods().get(1), is("POST"));
-	}
+    @Test
+    public void testDefineWithNullMethod() {
+        String root = "/foo";
+        String path = "/baa/something";
+        String[] requestMethods = null;
+        RequestPathDefinition mappedPath = RequestPathDefinition.define(root, path, requestMethods);
+        assertThat(mappedPath.getActualPath(), is("/foo/baa/something"));
+        assertThat(mappedPath.getRequestMethods().size(), is(2));
+        assertThat(mappedPath.getRequestMethods().get(0), is("GET"));
+        assertThat(mappedPath.getRequestMethods().get(1), is("POST"));
+    }
 
-	@Test
-	public void testDefineContainsAsterisc() {
-		thrown.expect(new NoDescribeMatcher<InvalidRequestPathException>() {
+    @Test
+    public void testDefineContainsAsterisc() {
+        thrown.expect(new NoDescribeMatcher<InvalidRequestPathException>() {
 
-			@Override
-			public boolean matches(Object arg0) {
-				if (arg0 instanceof InvalidRequestPathException) {
-					InvalidRequestPathException iv = (InvalidRequestPathException) arg0;
-					assertThat(iv.getInvalidRootPath(), is("/foo/*"));
-					assertThat(iv.getInvalidPath(), is("/baa/something"));
-					return true;
-				}
-				return false;
-			}
-		});
-		String root = "/foo/*";
-		String path = "/baa/something";
-		RequestPathDefinition.define(root, path);
-	}
+            @Override
+            public boolean matches(Object arg0) {
+                if (arg0 instanceof InvalidRequestPathException) {
+                    InvalidRequestPathException iv = (InvalidRequestPathException) arg0;
+                    assertThat(iv.getInvalidRootPath(), is("/foo/*"));
+                    assertThat(iv.getInvalidPath(), is("/baa/something"));
+                    return true;
+                }
+                return false;
+            }
+        });
+        String root = "/foo/*";
+        String path = "/baa/something";
+        RequestPathDefinition.define(root, path);
+    }
 
-	@Test
-	public void testDefineWithNoRootSlash() {
-		thrown.expect(InvalidRequestPathException.class);
-		String root = "foo/*";
-		String path = "/baa/something";
-		RequestPathDefinition.define(root, path);
-	}
+    @Test
+    public void testDefineWithNoRootSlash() {
+        thrown.expect(InvalidRequestPathException.class);
+        String root = "foo/*";
+        String path = "/baa/something";
+        RequestPathDefinition.define(root, path);
+    }
 
-	@Test
-	public void testDefineWithNoSubPathSlash() {
-		String root = "foo";
-		String path = "baa/something";
-		RequestPathMetadata mappedPath = RequestPathDefinition.define(root,
-				path);
-		assertThat(mappedPath.getActualPath(), is("/foo/baa/something"));
-	}
+    @Test
+    public void testDefineWithNoSubPathSlash() {
+        String root = "foo";
+        String path = "baa/something";
+        RequestPathMetadata mappedPath = RequestPathDefinition.define(root, path);
+        assertThat(mappedPath.getActualPath(), is("/foo/baa/something"));
+    }
 
-	@Test
-	public void testDefineWithWildCard() {
-		String root = "foo";
-		String path = "baa/*/something";
-		RequestPathMetadata mappedPath = RequestPathDefinition.define(root,
-				path);
-		assertThat(mappedPath.getActualPath(), is("/foo/baa/*/something"));
-	}
+    @Test
+    public void testDefineWithWildCard() {
+        String root = "foo";
+        String path = "baa/*/something";
+        RequestPathMetadata mappedPath = RequestPathDefinition.define(root, path);
+        assertThat(mappedPath.getActualPath(), is("/foo/baa/*/something"));
+    }
 
-	@Test
-	public void testDefineEndsWithWildCard() {
-		String root = "foo";
-		String path = "baa/anything/*";
-		RequestPathMetadata mappedPath = RequestPathDefinition.define(root,
-				path);
-		assertThat(mappedPath.getActualPath(), is("/foo/baa/anything/*"));
-	}
+    @Test
+    public void testDefineEndsWithWildCard() {
+        String root = "foo";
+        String path = "baa/anything/*";
+        RequestPathMetadata mappedPath = RequestPathDefinition.define(root, path);
+        assertThat(mappedPath.getActualPath(), is("/foo/baa/anything/*"));
+    }
 
-	@Test
-	public void testDefineWithNullEditPath() {
-		thrown.expect(InvalidRequestPathException.class);
-		String root = "/foo";
-		String path = null;
-		RequestPathDefinition.define(root, path);
-	}
+    @Test
+    public void testDefineWithNullEditPath() {
+        thrown.expect(InvalidRequestPathException.class);
+        String root = "/foo";
+        String path = null;
+        RequestPathDefinition.define(root, path);
+    }
 
-	@Test
-	public void testDefineWithEmptyEditPath() {
-		thrown.expect(InvalidRequestPathException.class);
-		String root = "/foo";
-		String path = "";
-		RequestPathDefinition.define(root, path);
-	}
+    @Test
+    public void testDefineWithEmptyEditPath() {
+        thrown.expect(InvalidRequestPathException.class);
+        String root = "/foo";
+        String path = "";
+        RequestPathDefinition.define(root, path);
+    }
 
-	@Test
-	public void testDefineWithPlaceHolder() {
-		String root = "/foo";
-		String path = "/baa/{baz}";
-		RequestPathMetadata actual = RequestPathDefinition.define(root, path);
-		assertThat(actual.getActualPath(), is("/foo/baa/{baz}"));
-	}
+    @Test
+    public void testDefineWithPlaceHolder() {
+        String root = "/foo";
+        String path = "/baa/{baz}";
+        RequestPathMetadata actual = RequestPathDefinition.define(root, path);
+        assertThat(actual.getActualPath(), is("/foo/baa/{baz}"));
+    }
 
-	@Test
-	public void testDefineWithManyPlaceHolder() {
-		String root = "/foo";
-		String path = "/baa/{baz}/{hoge}/";
-		RequestPathMetadata actual = RequestPathDefinition.define(root, path);
-		assertThat(actual.getActualPath(), is("/foo/baa/{baz}/{hoge}/"));
-	}
+    @Test
+    public void testDefineWithManyPlaceHolder() {
+        String root = "/foo";
+        String path = "/baa/{baz}/{hoge}/";
+        RequestPathMetadata actual = RequestPathDefinition.define(root, path);
+        assertThat(actual.getActualPath(), is("/foo/baa/{baz}/{hoge}/"));
+    }
 
-	@Test
-	public void testMatchStatically() {
-		assertThat("/foo/baa/something", is(matchFor("/foo/baa/something")));
-		assertThat("/foo/baa/something.html",
-				is(matchFor("/foo/baa/something.html")));
-		assertThat("/foo/baa/something", is(not(matchFor("/foo/something"))));
-		assertThat("/foo/baa/something",
-				is(not(matchFor("/foo/baa/something.html"))));
-		assertThat("/foo/baa/something",
-				is(not(matchFor("/foo/baa/a/something"))));
-		assertThat("/foo/baa/something",
-				is(not(matchFor("/foo/baa/something/a/"))));
-	}
+    @Test
+    public void testMatchStatically() {
+        assertThat("/foo/baa/something", is(matchFor("/foo/baa/something")));
+        assertThat("/foo/baa/something.html", is(matchFor("/foo/baa/something.html")));
+        assertThat("/foo/baa/something", is(not(matchFor("/foo/something"))));
+        assertThat("/foo/baa/something", is(not(matchFor("/foo/baa/something.html"))));
+        assertThat("/foo/baa/something", is(not(matchFor("/foo/baa/a/something"))));
+        assertThat("/foo/baa/something", is(not(matchFor("/foo/baa/something/a/"))));
+    }
 
-	@Test
-	public void testMatchWithWindCard() {
-		assertThat("/foo/baa/*", is(matchFor("/foo/baa/something")));
-		assertThat("/foo/baa/*", is(matchFor("/foo/baa/something/anything")));
-		assertThat("/foo/*/baa", is(matchFor("/foo/something/baa")));
-		assertThat("/foo/*/baa", is(matchFor("/foo/something/anything/baa")));
-		assertThat("/foo/*/baa",
-				is(matchFor("/foo/something/anything/nothing/baa")));
-		assertThat("*/foo/baa/*", is(matchFor("/something/foo/baa/anything")));
-		assertThat("*/foo/*/baa", is(matchFor("/baz/foo/something/baa")));
-		assertThat("*/foo/*/baa", is(matchFor("/baa/baz/foo/something/baa")));
-		assertThat("*.html", is(matchFor("/baa/baz.html")));
-		assertThat("*.html", is(matchFor("/baa/baz/foo.html")));
-		assertThat("*.html", is(matchFor("/baa/baz/foo.html/baa.html")));
-		assertThat("/foo/*.html", is(matchFor("/foo/baa.html")));
-		assertThat("/foo/*.html", is(not(matchFor("/foo/baa"))));
-		assertThat("*.html", is(not(matchFor("/baa/baz"))));
-		assertThat("*.html", is(not(matchFor("/baa/html"))));
-		assertThat("*.html", is(not(matchFor("/baa/baz.htm"))));
-		assertThat("*/foo/*/baa",
-				is(not(matchFor("/baa/baz/foo/something/baa/baz"))));
-		assertThat("/foo/baa/*",
-				is(not(matchFor("/something/foo/baa/anything"))));
-		assertThat("/foo/baa/*",
-				is(not(matchFor("/foo/something/baa/anything"))));
-		assertThat("/foo/baa/*",
-				is(not(matchFor("/something/baa/foo/anything"))));
-		assertThat("/foo/*/baa", is(not(matchFor("/foo/something/baa/baz"))));
-	}
+    @Test
+    public void testMatchWithWindCard() {
+        assertThat("/foo/baa/*", is(matchFor("/foo/baa/something")));
+        assertThat("/foo/baa/*", is(matchFor("/foo/baa/something/anything")));
+        assertThat("/foo/*/baa", is(matchFor("/foo/something/baa")));
+        assertThat("/foo/*/baa", is(matchFor("/foo/something/anything/baa")));
+        assertThat("/foo/*/baa", is(matchFor("/foo/something/anything/nothing/baa")));
+        assertThat("*/foo/baa/*", is(matchFor("/something/foo/baa/anything")));
+        assertThat("*/foo/*/baa", is(matchFor("/baz/foo/something/baa")));
+        assertThat("*/foo/*/baa", is(matchFor("/baa/baz/foo/something/baa")));
+        assertThat("*.html", is(matchFor("/baa/baz.html")));
+        assertThat("*.html", is(matchFor("/baa/baz/foo.html")));
+        assertThat("*.html", is(matchFor("/baa/baz/foo.html/baa.html")));
+        assertThat("/foo/*.html", is(matchFor("/foo/baa.html")));
+        assertThat("/foo/*.html", is(not(matchFor("/foo/baa"))));
+        assertThat("*.html", is(not(matchFor("/baa/baz"))));
+        assertThat("*.html", is(not(matchFor("/baa/html"))));
+        assertThat("*.html", is(not(matchFor("/baa/baz.htm"))));
+        assertThat("*/foo/*/baa", is(not(matchFor("/baa/baz/foo/something/baa/baz"))));
+        assertThat("/foo/baa/*", is(not(matchFor("/something/foo/baa/anything"))));
+        assertThat("/foo/baa/*", is(not(matchFor("/foo/something/baa/anything"))));
+        assertThat("/foo/baa/*", is(not(matchFor("/something/baa/foo/anything"))));
+        assertThat("/foo/*/baa", is(not(matchFor("/foo/something/baa/baz"))));
+    }
 
-	@Test
-	public void testMatchWithPlaceHolder() {
-		assertThat("/foo/baa/{baz}", is(matchFor("/foo/baa/something")));
-		assertThat("/foo/baa/{baz}/{hoge}",
-				is(matchFor("/foo/baa/something/anything")));
-		assertThat("/foo/baa/{baz}/{hoge}/fuga",
-				is(matchFor("/foo/baa/something/anything/fuga")));
-		assertThat("/foo/baa/{baz}",
-				is(not(matchFor("/foo/baa/something/anything"))));
-		assertThat("/foo/baa/{baz}", is(not(matchFor("/foo/baa"))));
-		assertThat("/foo/baa/{baz}/{hoge}",
-				is(not(matchFor("/foo/baa/something/anything/nothing"))));
-		assertThat("/foo/baa/{baz}/{hoge}/fuga",
-				is(not(matchFor("/foo/baa/something/anything/else"))));
-		assertThat("/foo/baa/{baz}/{hoge}/fuga",
-				is(not(matchFor("/foo/baa/something/anything/nothing/fuga"))));
-		assertThat("/foo/baa/{baz", is(not(matchFor("/foo/baa/something"))));
-	}
+    @Test
+    public void testMatchWithPlaceHolder() {
+        assertThat("/foo/baa/{baz}", is(matchFor("/foo/baa/something")));
+        assertThat("/foo/baa/{baz}/{hoge}", is(matchFor("/foo/baa/something/anything")));
+        assertThat("/foo/baa/{baz}/{hoge}/fuga", is(matchFor("/foo/baa/something/anything/fuga")));
+        assertThat("/foo/baa/{baz}", is(not(matchFor("/foo/baa/something/anything"))));
+        assertThat("/foo/baa/{baz}", is(not(matchFor("/foo/baa"))));
+        assertThat("/foo/baa/{baz}/{hoge}", is(not(matchFor("/foo/baa/something/anything/nothing"))));
+        assertThat("/foo/baa/{baz}/{hoge}/fuga", is(not(matchFor("/foo/baa/something/anything/else"))));
+        assertThat("/foo/baa/{baz}/{hoge}/fuga", is(not(matchFor("/foo/baa/something/anything/nothing/fuga"))));
+        assertThat("/foo/baa/{baz", is(not(matchFor("/foo/baa/something"))));
+    }
 
-	@Test
-	public void testMatchWithRegexPlaceHolder() {
-		assertThat("/foo/baa/baz$<[0-9]>", is(matchFor("/foo/baa/1")));
-		assertThat("/foo/baa/{baz}/hoge$<[a-c]>",
-				is(matchFor("/foo/baa/something/a")));
-		assertThat("/foo/baa/baz$<[0-9]>",
-				is(not(matchFor("/foo/baa/something/anything"))));
-		assertThat("/foo/baa/{baz}", is(not(matchFor("/foo/baa"))));
-		assertThat("/foo/baa/{baz}/hoge$<[a-c]>",
-				is(not(matchFor("/foo/baa/something/anything/d"))));
-	}
+    @Test
+    public void testMatchWithRegexPlaceHolder() {
+        assertThat("/foo/baa/baz$<[0-9]>", is(matchFor("/foo/baa/1")));
+        assertThat("/foo/baa/{baz}/hoge$<[a-c]>", is(matchFor("/foo/baa/something/a")));
+        assertThat("/foo/baa/baz$<[0-9]>", is(not(matchFor("/foo/baa/something/anything"))));
+        assertThat("/foo/baa/{baz}", is(not(matchFor("/foo/baa"))));
+        assertThat("/foo/baa/{baz}/hoge$<[a-c]>", is(not(matchFor("/foo/baa/something/anything/d"))));
+    }
 
-	@Test
-	public void testNotMatchWithRequestMethods() {
-		thrown.expect(RequestMethodUnsupportedException.class);
-		String root = "/foo";
-		String path = "/baa/something";
-		RequestPathMetadata actual = RequestPathDefinition.define(root, path,
-				new String[]{"POST", "GET"});
-		RequestPath actualSame = mock(RequestPath.class);
-		when(actualSame.getActualPath()).thenReturn("/foo/baa/something");
-		when(actualSame.getRequestMethod()).thenReturn("PUT");
-		actual.match(actualSame);
-	}
+    @Test
+    public void testNotMatchWithRequestMethods() {
+        thrown.expect(RequestMethodUnsupportedException.class);
+        String root = "/foo";
+        String path = "/baa/something";
+        RequestPathMetadata actual = RequestPathDefinition.define(root, path, new String[] { "POST", "GET" });
+        RequestPath actualSame = mock(RequestPath.class);
+        when(actualSame.getActualPath()).thenReturn("/foo/baa/something");
+        when(actualSame.getRequestMethod()).thenReturn("PUT");
+        actual.match(actualSame);
+    }
 
-	Matcher<String> matchFor(final String requested) {
-		return new TypeSafeMatcher<String>() {
+    Matcher<String> matchFor(final String requested) {
+        return new TypeSafeMatcher<String>() {
 
-			@Override
-			public void describeTo(Description description) {
-			}
+            @Override
+            public void describeTo(Description description) {
+            }
 
-			@Override
-			protected boolean matchesSafely(String item) {
-				RequestPathMetadata definedPath = RequestPathDefinition.define(
-						"", item, new String[]{"GET"});
-				DefaultRequestPath requestedPath = new DefaultRequestPath(
-						URI.create("/"), URI.create(requested), "GET");
-				log.debug(String.format("Compare %s to %s",
-						definedPath.toString(), requestedPath.toString()));
-				return definedPath.match(requestedPath);
-			}
-		};
-	}
+            @Override
+            protected boolean matchesSafely(String item) {
+                RequestPathMetadata definedPath = RequestPathDefinition.define("", item, new String[] { "GET" });
+                DefaultRequestPath requestedPath = new DefaultRequestPath(URI.create("/"), URI.create(requested),
+                        "GET");
+                log.debug(String.format("Compare %s to %s", definedPath.toString(), requestedPath.toString()));
+                return definedPath.match(requestedPath);
+            }
+        };
+    }
 }
diff --git a/src/test/java/org/analogweb/core/ScopedMapArgumentPreparatorTest.java b/src/test/java/org/analogweb/core/ScopedMapArgumentPreparatorTest.java
index eeab5d0..2544117 100644
--- a/src/test/java/org/analogweb/core/ScopedMapArgumentPreparatorTest.java
+++ b/src/test/java/org/analogweb/core/ScopedMapArgumentPreparatorTest.java
@@ -2,8 +2,8 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -31,110 +31,102 @@
 
 /**
  * {@link ScopedMapArgumentPreparator}に対するテストケースです。
- * 
+ *
  * @author snowgoose
  */
 public class ScopedMapArgumentPreparatorTest {
 
-	private ScopedMapArgumentPreparator preparator;
-	private InvocationMetadata metadata;
-	private InvocationArguments args;
-	private RequestContext context;
-	private TypeMapperContext typeMapper;
-	private RequestValueResolvers handlers;
-	private AttributesHandler handler;
-
-	/**
-	 * テストの事前準備を行います。
-	 */
-	@Before
-	public void setUp() {
-		preparator = new ScopedMapArgumentPreparator();
-		metadata = mock(InvocationMetadata.class);
-		args = mock(InvocationArguments.class);
-		context = mock(RequestContext.class);
-		typeMapper = mock(TypeMapperContext.class);
-		handlers = mock(RequestValueResolvers.class);
-		handler = mock(AttributesHandler.class);
-	}
-
-	@Test
-	public void testMapToFirstArgument() {
-		Class<?>[] parameterTypes = new Class[]{Map.class, String.class};
-		Method doSomething = ReflectionUtils.getMethodQuietly(MockAction.class,
-				"doSomething", parameterTypes);
-		when(metadata.getArgumentTypes()).thenReturn(parameterTypes);
-		when(metadata.resolveMethod()).thenReturn(doSomething);
-		preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
-		verify(args).putInvocationArgument(eq(0), isA(ContextExtractor.class));
-	}
-
-	@Test
-	public void testMapToFirstArgumentWithNullMethod() {
-		Class<?>[] parameterTypes = new Class[]{Map.class, String.class};
-		Method doSomething = null;
-		when(metadata.getArgumentTypes()).thenReturn(parameterTypes);
-		when(metadata.resolveMethod()).thenReturn(doSomething);
-		Object actual = preparator.prepareInvoke(args, metadata, context,
-				typeMapper, handlers);
-		assertThat(actual, is(ApplicationProcessor.NO_INTERRUPTION));
-	}
-
-	@Test
-	public void testMapWithNullArgument() {
-		Class<?>[] parameterTypes = new Class[]{Map.class, String.class};
-		Method doSomething = ReflectionUtils.getMethodQuietly(MockAction.class,
-				"doSomething", parameterTypes);
-		when(metadata.getArgumentTypes()).thenReturn(null);
-		when(metadata.resolveMethod()).thenReturn(doSomething);
-		Object actual = preparator.prepareInvoke(args, metadata, context,
-				typeMapper, handlers);
-		assertThat(actual, is(ApplicationProcessor.NO_INTERRUPTION));
-	}
-
-	@Test
-	public void testMapToFirstArgumentNotAssignableFromMap() {
-		Class<?>[] parameterTypes = new Class[]{String.class, String.class};
-		Method doSomething = ReflectionUtils.getMethodQuietly(MockAction.class,
-				"doAnything", parameterTypes);
-		when(metadata.getArgumentTypes()).thenReturn(parameterTypes);
-		when(metadata.resolveMethod()).thenReturn(doSomething);
-		preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
-	}
-
-	@Test
-	public void testMapToFirstArgumentNotEqualsMap() {
-		Class<?>[] parameterTypes = new Class[]{HashMap.class, String.class};
-		Method doSomething = ReflectionUtils.getMethodQuietly(MockAction.class,
-				"doNothing", parameterTypes);
-		when(metadata.getArgumentTypes()).thenReturn(parameterTypes);
-		when(metadata.resolveMethod()).thenReturn(doSomething);
-		preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
-	}
-
-	interface Session extends AttributesHandler {
-	}
-
-	@Test
-	public void testExtractToSpecifiedScopeFirstArgument() {
-		Map<String, Object> scopedMap = new ScopedMapArgumentPreparator.ContextExtractor<Object>(
-				Session.class);
-		BigDecimal amount = new BigDecimal("1000");
-		scopedMap.put("amount", amount);
-		when(handlers.findAttributesHandler(Session.class)).thenReturn(handler);
-		ArrayList<Object> list = new ArrayList<Object>();
-		list.add(scopedMap);
-		when(args.asList()).thenReturn(list);
-		Object invocationResult = new Object();
-		preparator.postInvoke(invocationResult, args, metadata, context,
-				handlers);
-		verify(handler).putAttributeValue(context, "amount", amount);
-	}
-
-	interface Request extends AttributesHandler {
-	}
-
-	@Test
+    private ScopedMapArgumentPreparator preparator;
+    private InvocationMetadata metadata;
+    private InvocationArguments args;
+    private RequestContext context;
+    private TypeMapperContext typeMapper;
+    private RequestValueResolvers handlers;
+    private AttributesHandler handler;
+
+    /**
+     * テストの事前準備を行います。
+     */
+    @Before
+    public void setUp() {
+        preparator = new ScopedMapArgumentPreparator();
+        metadata = mock(InvocationMetadata.class);
+        args = mock(InvocationArguments.class);
+        context = mock(RequestContext.class);
+        typeMapper = mock(TypeMapperContext.class);
+        handlers = mock(RequestValueResolvers.class);
+        handler = mock(AttributesHandler.class);
+    }
+
+    @Test
+    public void testMapToFirstArgument() {
+        Class<?>[] parameterTypes = new Class[] { Map.class, String.class };
+        Method doSomething = ReflectionUtils.getMethodQuietly(MockAction.class, "doSomething", parameterTypes);
+        when(metadata.getArgumentTypes()).thenReturn(parameterTypes);
+        when(metadata.resolveMethod()).thenReturn(doSomething);
+        preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
+        verify(args).putInvocationArgument(eq(0), isA(ContextExtractor.class));
+    }
+
+    @Test
+    public void testMapToFirstArgumentWithNullMethod() {
+        Class<?>[] parameterTypes = new Class[] { Map.class, String.class };
+        Method doSomething = null;
+        when(metadata.getArgumentTypes()).thenReturn(parameterTypes);
+        when(metadata.resolveMethod()).thenReturn(doSomething);
+        Object actual = preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
+        assertThat(actual, is(ApplicationProcessor.NO_INTERRUPTION));
+    }
+
+    @Test
+    public void testMapWithNullArgument() {
+        Class<?>[] parameterTypes = new Class[] { Map.class, String.class };
+        Method doSomething = ReflectionUtils.getMethodQuietly(MockAction.class, "doSomething", parameterTypes);
+        when(metadata.getArgumentTypes()).thenReturn(null);
+        when(metadata.resolveMethod()).thenReturn(doSomething);
+        Object actual = preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
+        assertThat(actual, is(ApplicationProcessor.NO_INTERRUPTION));
+    }
+
+    @Test
+    public void testMapToFirstArgumentNotAssignableFromMap() {
+        Class<?>[] parameterTypes = new Class[] { String.class, String.class };
+        Method doSomething = ReflectionUtils.getMethodQuietly(MockAction.class, "doAnything", parameterTypes);
+        when(metadata.getArgumentTypes()).thenReturn(parameterTypes);
+        when(metadata.resolveMethod()).thenReturn(doSomething);
+        preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
+    }
+
+    @Test
+    public void testMapToFirstArgumentNotEqualsMap() {
+        Class<?>[] parameterTypes = new Class[] { HashMap.class, String.class };
+        Method doSomething = ReflectionUtils.getMethodQuietly(MockAction.class, "doNothing", parameterTypes);
+        when(metadata.getArgumentTypes()).thenReturn(parameterTypes);
+        when(metadata.resolveMethod()).thenReturn(doSomething);
+        preparator.prepareInvoke(args, metadata, context, typeMapper, handlers);
+    }
+
+    interface Session extends AttributesHandler {
+    }
+
+    @Test
+    public void testExtractToSpecifiedScopeFirstArgument() {
+        Map<String, Object> scopedMap = new ScopedMapArgumentPreparator.ContextExtractor<Object>(Session.class);
+        BigDecimal amount = new BigDecimal("1000");
+        scopedMap.put("amount", amount);
+        when(handlers.findAttributesHandler(Session.class)).thenReturn(handler);
+        ArrayList<Object> list = new ArrayList<Object>();
+        list.add(scopedMap);
+        when(args.asList()).thenReturn(list);
+        Object invocationResult = new Object();
+        preparator.postInvoke(invocationResult, args, metadata, context, handlers);
+        verify(handler).putAttributeValue(context, "amount", amount);
+    }
+
+    interface Request extends AttributesHandler {
+    }
+
+    @Test
 	@SuppressWarnings({"unchecked", "rawtypes"})
 	public void testExtractToScopeFirstArgument() {
 		when(metadata.getInvocationClass())
@@ -156,49 +148,41 @@ public void testExtractToScopeFirstArgument() {
 		verify(handler).putAttributeValue(context, "amount", amount);
 	}
 
-	@Test
-	public void testExtractAndRemoveToScopeFirstArgument() {
-		Map<String, Object> scopedMap = new ScopedMapArgumentPreparator.ContextExtractor<Object>(
-				Session.class);
-		scopedMap.remove("amount");
-		when(handlers.findAttributesHandler(Session.class)).thenReturn(handler);
-		ArrayList<Object> list = new ArrayList<Object>();
-		list.add("boobaa");
-		list.add(scopedMap);
-		when(args.asList()).thenReturn(list);
-		Object invocationResult = new Object();
-		preparator.postInvoke(invocationResult, args, metadata, context,
-				handlers);
-		verify(handler).removeAttribute(context, "amount");
-	}
-
-	@Route
-	private static class MockAction {
-
-		@Route
-		public String doSomething(
-				@Attributes(Request.class) Map<String, ?> foo,
-				@As("baa") String baa) {
-			return "do something!";
-		}
-
-		@Route
-		public String doSomethingElse(
-				@Attributes(Session.class) Map<String, Object> session,
-				@As("baa") String baa) {
-			return "do something!";
-		}
-
-		@Route
-		public String doNothing(HashMap<String, ?> foo, @As("baa") String baa) {
-			return "do something!";
-		}
-
-		@Route
-		public String doAnything(
-				@Attributes(AttributesHandler.class) String notMap,
-				@As("baa") String baa) {
-			return "do something!";
-		}
-	}
+    @Test
+    public void testExtractAndRemoveToScopeFirstArgument() {
+        Map<String, Object> scopedMap = new ScopedMapArgumentPreparator.ContextExtractor<Object>(Session.class);
+        scopedMap.remove("amount");
+        when(handlers.findAttributesHandler(Session.class)).thenReturn(handler);
+        ArrayList<Object> list = new ArrayList<Object>();
+        list.add("boobaa");
+        list.add(scopedMap);
+        when(args.asList()).thenReturn(list);
+        Object invocationResult = new Object();
+        preparator.postInvoke(invocationResult, args, metadata, context, handlers);
+        verify(handler).removeAttribute(context, "amount");
+    }
+
+    @Route
+    private static class MockAction {
+
+        @Route
+        public String doSomething(@Attributes(Request.class) Map<String, ?> foo, @As("baa") String baa) {
+            return "do something!";
+        }
+
+        @Route
+        public String doSomethingElse(@Attributes(Session.class) Map<String, Object> session, @As("baa") String baa) {
+            return "do something!";
+        }
+
+        @Route
+        public String doNothing(HashMap<String, ?> foo, @As("baa") String baa) {
+            return "do something!";
+        }
+
+        @Route
+        public String doAnything(@Attributes(AttributesHandler.class) String notMap, @As("baa") String baa) {
+            return "do something!";
+        }
+    }
 }
diff --git a/src/test/java/org/analogweb/core/SingletonInstanceContainerAdaptorFactoryTest.java b/src/test/java/org/analogweb/core/SingletonInstanceContainerAdaptorFactoryTest.java
index 482e054..e8c514e 100644
--- a/src/test/java/org/analogweb/core/SingletonInstanceContainerAdaptorFactoryTest.java
+++ b/src/test/java/org/analogweb/core/SingletonInstanceContainerAdaptorFactoryTest.java
@@ -13,21 +13,19 @@
  */
 public class SingletonInstanceContainerAdaptorFactoryTest {
 
-	private ApplicationContext resolver;
+    private ApplicationContext resolver;
 
-	@Before
-	public void setUp() {
-		resolver = mock(ApplicationContext.class);
-	}
+    @Before
+    public void setUp() {
+        resolver = mock(ApplicationContext.class);
+    }
 
-	@Test
-	public void testCreateContainerAdaptor() {
-		SingletonInstanceContainerAdaptorFactory factory = new SingletonInstanceContainerAdaptorFactory();
-		SingletonInstanceContainerAdaptor adaptor = factory
-				.createContainerAdaptor(resolver);
-		assertNotNull(adaptor);
-		SingletonInstanceContainerAdaptor otherAdaptor = factory
-				.createContainerAdaptor(resolver);
-		assertNotSame(adaptor, otherAdaptor);
-	}
+    @Test
+    public void testCreateContainerAdaptor() {
+        SingletonInstanceContainerAdaptorFactory factory = new SingletonInstanceContainerAdaptorFactory();
+        SingletonInstanceContainerAdaptor adaptor = factory.createContainerAdaptor(resolver);
+        assertNotNull(adaptor);
+        SingletonInstanceContainerAdaptor otherAdaptor = factory.createContainerAdaptor(resolver);
+        assertNotSame(adaptor, otherAdaptor);
+    }
 }
diff --git a/src/test/java/org/analogweb/core/SingletonInstanceContainerAdaptorTest.java b/src/test/java/org/analogweb/core/SingletonInstanceContainerAdaptorTest.java
index 72fc4de..1e1e9f2 100644
--- a/src/test/java/org/analogweb/core/SingletonInstanceContainerAdaptorTest.java
+++ b/src/test/java/org/analogweb/core/SingletonInstanceContainerAdaptorTest.java
@@ -16,74 +16,74 @@
  */
 public class SingletonInstanceContainerAdaptorTest {
 
-	private SingletonInstanceContainerAdaptor adaptor;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@Before
-	public void setUp() throws Exception {
-		adaptor = new SingletonInstanceContainerAdaptor();
-	}
-
-	@Test
-	public void testGetInstance() {
-		thrown.expect(UnsupportedOperationException.class);
-		adaptor.getInstanceOfId("id");
-	}
-
-	@Test
-	public void testGetInstanceOfType() {
-		Component actual = adaptor.getInstanceOfType(Component.class);
-		assertNotNull(actual);
-	}
-
-	@Test
-	public void testGetInstanceOfTypeDoNotInstanticate() {
-		thrown.expect(UnsupportedOperationException.class);
-		adaptor.getInstanceOfType(HasntDefaultConstractorCompoent.class);
-	}
-
-	@Test
-	public void testGetInstanceOfTypeDoNotAccessable() {
-		thrown.expect(UnsupportedOperationException.class);
-		adaptor.getInstanceOfType(DoNotAccessableCompoent.class);
-	}
-
-	@Test
-	public void testGetInstanceOfTypeAlwaysReturnsSameInstance() {
-		Component actual = adaptor.getInstanceOfType(Component.class);
-		assertNotNull(actual);
-		Component twice = adaptor.getInstanceOfType(Component.class);
-		assertSame(actual, twice);
-	}
-
-	@Test
-	public void testGetInstancesOfTypeAlwaysReturnsSameInstance() {
-		List<Component> actual = adaptor.getInstancesOfType(Component.class);
-		assertNotNull(actual.get(0));
-		List<Component> twice = adaptor.getInstancesOfType(Component.class);
-		assertSame(actual.get(0), twice.get(0));
-	}
-
-	public static final class Component {
-	}
-
-	public static final class HasntDefaultConstractorCompoent {
-
-		@SuppressWarnings("unused")
-		private final String foo;
-
-		public HasntDefaultConstractorCompoent(String foo) {
-			this.foo = foo;
-		}
-	}
-
-	private static final class DoNotAccessableCompoent {
-
-		private DoNotAccessableCompoent() {
-		}
-	}
+    private SingletonInstanceContainerAdaptor adaptor;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        adaptor = new SingletonInstanceContainerAdaptor();
+    }
+
+    @Test
+    public void testGetInstance() {
+        thrown.expect(UnsupportedOperationException.class);
+        adaptor.getInstanceOfId("id");
+    }
+
+    @Test
+    public void testGetInstanceOfType() {
+        Component actual = adaptor.getInstanceOfType(Component.class);
+        assertNotNull(actual);
+    }
+
+    @Test
+    public void testGetInstanceOfTypeDoNotInstanticate() {
+        thrown.expect(UnsupportedOperationException.class);
+        adaptor.getInstanceOfType(HasntDefaultConstractorCompoent.class);
+    }
+
+    @Test
+    public void testGetInstanceOfTypeDoNotAccessable() {
+        thrown.expect(UnsupportedOperationException.class);
+        adaptor.getInstanceOfType(DoNotAccessableCompoent.class);
+    }
+
+    @Test
+    public void testGetInstanceOfTypeAlwaysReturnsSameInstance() {
+        Component actual = adaptor.getInstanceOfType(Component.class);
+        assertNotNull(actual);
+        Component twice = adaptor.getInstanceOfType(Component.class);
+        assertSame(actual, twice);
+    }
+
+    @Test
+    public void testGetInstancesOfTypeAlwaysReturnsSameInstance() {
+        List<Component> actual = adaptor.getInstancesOfType(Component.class);
+        assertNotNull(actual.get(0));
+        List<Component> twice = adaptor.getInstancesOfType(Component.class);
+        assertSame(actual.get(0), twice.get(0));
+    }
+
+    public static final class Component {
+    }
+
+    public static final class HasntDefaultConstractorCompoent {
+
+        @SuppressWarnings("unused")
+        private final String foo;
+
+        public HasntDefaultConstractorCompoent(String foo) {
+            this.foo = foo;
+        }
+    }
+
+    private static final class DoNotAccessableCompoent {
+
+        private DoNotAccessableCompoent() {
+        }
+    }
 }
diff --git a/src/test/java/org/analogweb/core/StaticMappingContainerAdaptorFactoryTest.java b/src/test/java/org/analogweb/core/StaticMappingContainerAdaptorFactoryTest.java
index 43a2ea4..9793761 100644
--- a/src/test/java/org/analogweb/core/StaticMappingContainerAdaptorFactoryTest.java
+++ b/src/test/java/org/analogweb/core/StaticMappingContainerAdaptorFactoryTest.java
@@ -12,21 +12,19 @@
  */
 public class StaticMappingContainerAdaptorFactoryTest {
 
-	private StaticMappingContainerAdaptorFactory factory;
-	private ApplicationContext resolver;
+    private StaticMappingContainerAdaptorFactory factory;
+    private ApplicationContext resolver;
 
-	@Before
-	public void setUp() throws Exception {
-		factory = new StaticMappingContainerAdaptorFactory();
-		resolver = mock(ApplicationContext.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        factory = new StaticMappingContainerAdaptorFactory();
+        resolver = mock(ApplicationContext.class);
+    }
 
-	@Test
-	public void testCreateContainerAdaptor() {
-		StaticMappingContainerAdaptor adaptor = factory
-				.createContainerAdaptor(resolver);
-		StaticMappingContainerAdaptor adaptor2 = factory
-				.createContainerAdaptor(resolver);
-		assertSame(adaptor, adaptor2);
-	}
+    @Test
+    public void testCreateContainerAdaptor() {
+        StaticMappingContainerAdaptor adaptor = factory.createContainerAdaptor(resolver);
+        StaticMappingContainerAdaptor adaptor2 = factory.createContainerAdaptor(resolver);
+        assertSame(adaptor, adaptor2);
+    }
 }
diff --git a/src/test/java/org/analogweb/core/StaticMappingContainerAdaptorTest.java b/src/test/java/org/analogweb/core/StaticMappingContainerAdaptorTest.java
index 576a45c..16ff820 100644
--- a/src/test/java/org/analogweb/core/StaticMappingContainerAdaptorTest.java
+++ b/src/test/java/org/analogweb/core/StaticMappingContainerAdaptorTest.java
@@ -25,120 +25,113 @@
  */
 public class StaticMappingContainerAdaptorTest {
 
-	private StaticMappingContainerAdaptor adaptor;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
-	@Before
-	public void setUp() {
-		adaptor = new StaticMappingContainerAdaptor();
-	}
-
-	@Test
-	public void testGetInstanceOfType() {
-		adaptor.register(MockInterface.class, BaaObject.class);
-		MockInterface instance = adaptor.getInstanceOfType(MockInterface.class);
-		assertTrue(instance instanceof BaaObject);
-	}
-
-	@Test
-	public void testGetInstanceOfDuplicateType() {
-		adaptor.register(MockInterface.class, BaaObject.class);
-		adaptor.register(MockInterface.class, FooObject.class);
-		MockInterface instance = adaptor.getInstanceOfType(MockInterface.class);
-		assertTrue(instance instanceof BaaObject
-				|| instance instanceof FooObject);
-	}
-
-	@Test
-	public void testGetInstanceOfTypeWithNoResult() {
-		MockInterface instance = adaptor.getInstanceOfType(MockInterface.class);
-		assertNull(instance);
-	}
-
-	@Test
-	public void testGetInstancesOfType() {
-		adaptor.register(MockInterface.class, FooObject.class);
-		adaptor.register(MockInterface.class, BaaObject.class);
-		List<MockInterface> instance = adaptor
-				.getInstancesOfType(MockInterface.class);
-		assertThat(instance.size(), is(2));
-	}
-
-	@Test
-	public void testGetInstancesOfTypeWithNoResult() {
-		List<MockInterface> instance = adaptor
-				.getInstancesOfType(MockInterface.class);
-		assertTrue(instance.isEmpty());
-	}
-
-	@Test
-	public void testGetInstancesOfConcleteType() {
-		adaptor.register(FooObject.class);
-		adaptor.register(BaaObject.class);
-		List<MockInterface> instance = adaptor
-				.getInstancesOfType(MockInterface.class);
-		assertThat(instance.size(), is(2));
-	}
-
-	@Test
-	public void testGetInstancesOfSupreype() {
-		adaptor.register(BazChildObject.class);
-		adaptor.register(BaaObject.class);
-		List<MockInterface> instance = adaptor
-				.getInstancesOfType(MockInterface.class);
-		assertThat(instance.size(), is(2));
-	}
-
-	@Test
-	public void testRegisterWithNullArg() {
-		thrown.expect(AssertionFailureException.class);
-		adaptor.register(null);
-	}
-
-	@Test
-	public void testGetInstancesWithConcleteClass() {
-		adaptor.register(BazChildObject.class);
-		BazChildObject instance = adaptor
-				.getInstanceOfType(BazChildObject.class);
-		assertNotNull(instance);
-	}
-
-	@Test
-	public void testRegisterWithNullConcleteArg() {
-		thrown.expect(AssertionFailureException.class);
-		adaptor.register(MockInterface.class, null);
-	}
-
-	@Test
-	public void testRegisterWithNullRequiredTypeArg() {
-		thrown.expect(AssertionFailureException.class);
-		adaptor.register(null, FooObject.class);
-	}
-
-	@Test
-	public void testSpecOfAssignableFromClassKey() {
-		AssignableFromClassKey key = AssignableFromClassKey
-				.valueOf(Collection.class);
-		assertTrue(key.equals(AssignableFromClassKey.valueOf(List.class)));
-		assertTrue(key.equals(AssignableFromClassKey.valueOf(Set.class)));
-		assertFalse(key.equals(AssignableFromClassKey.valueOf(Map.class)));
-		assertFalse(key.equals(List.class));
-		assertFalse(key.equals(null));
-	}
-
-	interface MockInterface {
-	}
-
-	public static class FooObject implements MockInterface {
-	}
-
-	public static class BaaObject implements MockInterface {
-	}
-
-	public static abstract class BazObject implements MockInterface {
-	}
-
-	public static class BazChildObject extends BazObject {
-	}
+    private StaticMappingContainerAdaptor adaptor;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Before
+    public void setUp() {
+        adaptor = new StaticMappingContainerAdaptor();
+    }
+
+    @Test
+    public void testGetInstanceOfType() {
+        adaptor.register(MockInterface.class, BaaObject.class);
+        MockInterface instance = adaptor.getInstanceOfType(MockInterface.class);
+        assertTrue(instance instanceof BaaObject);
+    }
+
+    @Test
+    public void testGetInstanceOfDuplicateType() {
+        adaptor.register(MockInterface.class, BaaObject.class);
+        adaptor.register(MockInterface.class, FooObject.class);
+        MockInterface instance = adaptor.getInstanceOfType(MockInterface.class);
+        assertTrue(instance instanceof BaaObject || instance instanceof FooObject);
+    }
+
+    @Test
+    public void testGetInstanceOfTypeWithNoResult() {
+        MockInterface instance = adaptor.getInstanceOfType(MockInterface.class);
+        assertNull(instance);
+    }
+
+    @Test
+    public void testGetInstancesOfType() {
+        adaptor.register(MockInterface.class, FooObject.class);
+        adaptor.register(MockInterface.class, BaaObject.class);
+        List<MockInterface> instance = adaptor.getInstancesOfType(MockInterface.class);
+        assertThat(instance.size(), is(2));
+    }
+
+    @Test
+    public void testGetInstancesOfTypeWithNoResult() {
+        List<MockInterface> instance = adaptor.getInstancesOfType(MockInterface.class);
+        assertTrue(instance.isEmpty());
+    }
+
+    @Test
+    public void testGetInstancesOfConcleteType() {
+        adaptor.register(FooObject.class);
+        adaptor.register(BaaObject.class);
+        List<MockInterface> instance = adaptor.getInstancesOfType(MockInterface.class);
+        assertThat(instance.size(), is(2));
+    }
+
+    @Test
+    public void testGetInstancesOfSupreype() {
+        adaptor.register(BazChildObject.class);
+        adaptor.register(BaaObject.class);
+        List<MockInterface> instance = adaptor.getInstancesOfType(MockInterface.class);
+        assertThat(instance.size(), is(2));
+    }
+
+    @Test
+    public void testRegisterWithNullArg() {
+        thrown.expect(AssertionFailureException.class);
+        adaptor.register(null);
+    }
+
+    @Test
+    public void testGetInstancesWithConcleteClass() {
+        adaptor.register(BazChildObject.class);
+        BazChildObject instance = adaptor.getInstanceOfType(BazChildObject.class);
+        assertNotNull(instance);
+    }
+
+    @Test
+    public void testRegisterWithNullConcleteArg() {
+        thrown.expect(AssertionFailureException.class);
+        adaptor.register(MockInterface.class, null);
+    }
+
+    @Test
+    public void testRegisterWithNullRequiredTypeArg() {
+        thrown.expect(AssertionFailureException.class);
+        adaptor.register(null, FooObject.class);
+    }
+
+    @Test
+    public void testSpecOfAssignableFromClassKey() {
+        AssignableFromClassKey key = AssignableFromClassKey.valueOf(Collection.class);
+        assertTrue(key.equals(AssignableFromClassKey.valueOf(List.class)));
+        assertTrue(key.equals(AssignableFromClassKey.valueOf(Set.class)));
+        assertFalse(key.equals(AssignableFromClassKey.valueOf(Map.class)));
+        assertFalse(key.equals(List.class));
+        assertFalse(key.equals(null));
+    }
+
+    interface MockInterface {
+    }
+
+    public static class FooObject implements MockInterface {
+    }
+
+    public static class BaaObject implements MockInterface {
+    }
+
+    public static abstract class BazObject implements MockInterface {
+    }
+
+    public static class BazChildObject extends BazObject {
+    }
 }
diff --git a/src/test/java/org/analogweb/core/WebApplicationTest.java b/src/test/java/org/analogweb/core/WebApplicationTest.java
index fc9f8af..a37ccf1 100644
--- a/src/test/java/org/analogweb/core/WebApplicationTest.java
+++ b/src/test/java/org/analogweb/core/WebApplicationTest.java
@@ -37,131 +37,122 @@
 
 /**
  * TODO rename test to ApplicationPropertiesTest!
- * 
+ *
  * @author snowgoose
  */
 public class WebApplicationTest {
 
-	private static final Log log = Logs.getLog(WebApplicationTest.class);
-	@Rule
-	public TemporaryFolder folder = new TemporaryFolder();
-	private WebApplication application;
-	private ClassLoader classLoader;
-	private ApplicationContext resolver;
-	private Collection<ClassCollector> collectors;
-	private RequestContext context;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    private static final Log log = Logs.getLog(WebApplicationTest.class);
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+    private WebApplication application;
+    private ClassLoader classLoader;
+    private ApplicationContext resolver;
+    private Collection<ClassCollector> collectors;
+    private RequestContext context;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Before
-	public void setUp() {
-		classLoader = Thread.currentThread().getContextClassLoader();
-		resolver = mock(ApplicationContext.class);
-		context = mock(RequestContext.class);
-		List<ClassCollector> collectors = new ArrayList<ClassCollector>();
-		collectors.add(new JarClassCollector());
-		collectors.add(new FileClassCollector());
-		this.collectors = collectors;
-	}
+    @Before
+    public void setUp() {
+        classLoader = Thread.currentThread().getContextClassLoader();
+        resolver = mock(ApplicationContext.class);
+        context = mock(RequestContext.class);
+        List<ClassCollector> collectors = new ArrayList<ClassCollector>();
+        collectors.add(new JarClassCollector());
+        collectors.add(new FileClassCollector());
+        this.collectors = collectors;
+    }
 
-	@After
-	public void tearDown() {
-		application.dispose();
-	}
+    @After
+    public void tearDown() {
+        application.dispose();
+    }
 
-	@Test
-	public void testInitApplication() throws Exception {
-		ApplicationProperties props = mock(ApplicationProperties.class);
-		when(props.getComponentPackageNames()).thenReturn(
-				Arrays.asList("jp.acme.test.actionsonly"));
-		File tempFolder = folder.newFolder("test");
-		when(props.getTempDir()).thenReturn(tempFolder);
-		application = new WebApplication();
-		application.run(resolver, props, collectors, classLoader);
-		RouteRegistry mapping = application.getRouteRegistry();
-		RequestPath pathAnyThing = mock(RequestPath.class);
-		when(pathAnyThing.getActualPath()).thenReturn("/baa/anything");
-		when(pathAnyThing.getRequestMethod()).thenReturn("POST");
-		when(context.getRequestPath()).thenReturn(pathAnyThing);
-		InvocationMetadata metadataAnyThing = mapping.findInvocationMetadata(
-				context, application.getModules()
-						.getInvocationMetadataFinders());
-		log.debug(metadataAnyThing.toString());
-	}
+    @Test
+    public void testInitApplication() throws Exception {
+        ApplicationProperties props = mock(ApplicationProperties.class);
+        when(props.getComponentPackageNames()).thenReturn(Arrays.asList("jp.acme.test.actionsonly"));
+        File tempFolder = folder.newFolder("test");
+        when(props.getTempDir()).thenReturn(tempFolder);
+        application = new WebApplication();
+        application.run(resolver, props, collectors, classLoader);
+        RouteRegistry mapping = application.getRouteRegistry();
+        RequestPath pathAnyThing = mock(RequestPath.class);
+        when(pathAnyThing.getActualPath()).thenReturn("/baa/anything");
+        when(pathAnyThing.getRequestMethod()).thenReturn("POST");
+        when(context.getRequestPath()).thenReturn(pathAnyThing);
+        InvocationMetadata metadataAnyThing = mapping.findInvocationMetadata(context,
+                application.getModules().getInvocationMetadataFinders());
+        log.debug(metadataAnyThing.toString());
+    }
 
-	@Test
-	public void testInitApplicationWithoutMetadata() throws Exception {
-		ApplicationProperties props = mock(ApplicationProperties.class);
-		// when(props.getApplicationSpecifier()).thenReturn(null);
-		when(props.getComponentPackageNames()).thenReturn(
-				Arrays.asList("jp.acme.test.actionsonly"));
-		File tempFolder = folder.newFolder("test");
-		when(props.getTempDir()).thenReturn(tempFolder);
-		application = new WebApplication();
-		application.run(resolver, props, collectors, classLoader);
-		RouteRegistry mapping = application.getRouteRegistry();
-		RequestPath pathAnyThing = mock(RequestPath.class);
-		when(pathAnyThing.getActualPath()).thenReturn("/baa/anything");
-		when(pathAnyThing.getRequestMethod()).thenReturn("POST");
-		when(context.getRequestPath()).thenReturn(pathAnyThing);
-		InvocationMetadata metadataAnyThing = mapping.findInvocationMetadata(
-				context, application.getModules()
-						.getInvocationMetadataFinders());
-		log.debug(metadataAnyThing.toString());
-	}
+    @Test
+    public void testInitApplicationWithoutMetadata() throws Exception {
+        ApplicationProperties props = mock(ApplicationProperties.class);
+        // when(props.getApplicationSpecifier()).thenReturn(null);
+        when(props.getComponentPackageNames()).thenReturn(Arrays.asList("jp.acme.test.actionsonly"));
+        File tempFolder = folder.newFolder("test");
+        when(props.getTempDir()).thenReturn(tempFolder);
+        application = new WebApplication();
+        application.run(resolver, props, collectors, classLoader);
+        RouteRegistry mapping = application.getRouteRegistry();
+        RequestPath pathAnyThing = mock(RequestPath.class);
+        when(pathAnyThing.getActualPath()).thenReturn("/baa/anything");
+        when(pathAnyThing.getRequestMethod()).thenReturn("POST");
+        when(context.getRequestPath()).thenReturn(pathAnyThing);
+        InvocationMetadata metadataAnyThing = mapping.findInvocationMetadata(context,
+                application.getModules().getInvocationMetadataFinders());
+        log.debug(metadataAnyThing.toString());
+    }
 
-	@Test
-	public void testInitApplicationWithoutRootComponentPackages()
-			throws Exception {
-		ApplicationProperties props = mock(ApplicationProperties.class);
-		when(props.getComponentPackageNames()).thenReturn(null);
-		File tempFolder = folder.newFolder("test");
-		when(props.getTempDir()).thenReturn(tempFolder);
-		application = new WebApplication();
-		application.run(resolver, props, collectors, classLoader);
-	}
+    @Test
+    public void testInitApplicationWithoutRootComponentPackages() throws Exception {
+        ApplicationProperties props = mock(ApplicationProperties.class);
+        when(props.getComponentPackageNames()).thenReturn(null);
+        File tempFolder = folder.newFolder("test");
+        when(props.getTempDir()).thenReturn(tempFolder);
+        application = new WebApplication();
+        application.run(resolver, props, collectors, classLoader);
+    }
 
-	@Test
-	public void testInitApplicationWithAdditionalComponents() throws Exception {
-		ApplicationProperties props = mock(ApplicationProperties.class);
-		when(props.getComponentPackageNames()).thenReturn(
-				Arrays.asList("jp.acme.test.additionalcomponents"));
-		File tempFolder = folder.newFolder("test");
-		when(props.getTempDir()).thenReturn(tempFolder);
-		application = new WebApplication();
-		application.run(resolver, props, collectors, classLoader);
-		Modules modules = application.getModules();
-		final List<ApplicationProcessor> processors = modules
-				.getApplicationProcessors();
-		assertThat(processors,
-				new NoDescribeMatcher<List<ApplicationProcessor>>() {
+    @Test
+    public void testInitApplicationWithAdditionalComponents() throws Exception {
+        ApplicationProperties props = mock(ApplicationProperties.class);
+        when(props.getComponentPackageNames()).thenReturn(Arrays.asList("jp.acme.test.additionalcomponents"));
+        File tempFolder = folder.newFolder("test");
+        when(props.getTempDir()).thenReturn(tempFolder);
+        application = new WebApplication();
+        application.run(resolver, props, collectors, classLoader);
+        Modules modules = application.getModules();
+        final List<ApplicationProcessor> processors = modules.getApplicationProcessors();
+        assertThat(processors, new NoDescribeMatcher<List<ApplicationProcessor>>() {
 
-					@Override
-					@SuppressWarnings("unchecked")
-					public boolean matches(Object arg0) {
-						if (processors.getClass().isInstance(arg0)) {
-							for (ApplicationProcessor processor : (List<ApplicationProcessor>) arg0) {
-								if (processor instanceof StubPreProcessor) {
-									return true;
-								}
-							}
-						}
-						return false;
-					}
-				});
-	}
+            @Override
+            @SuppressWarnings("unchecked")
+            public boolean matches(Object arg0) {
+                if (processors.getClass().isInstance(arg0)) {
+                    for (ApplicationProcessor processor : (List<ApplicationProcessor>) arg0) {
+                        if (processor instanceof StubPreProcessor) {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        });
+    }
 
-	@Test
-	public void testDispose() throws Exception {
-		ApplicationProperties props = mock(ApplicationProperties.class);
-		when(props.getComponentPackageNames()).thenReturn(
-				Arrays.asList("jp.acme.test.actionsonly"));
-		File tempFolder = folder.newFolder("test");
-		when(props.getTempDir()).thenReturn(tempFolder);
-		application = new WebApplication();
-		application.run(resolver, props, collectors, classLoader);
-		application.dispose();
-		assertThat(application.getModules(), is(nullValue()));
-		assertThat(application.getRouteRegistry(), is(nullValue()));
-	}
+    @Test
+    public void testDispose() throws Exception {
+        ApplicationProperties props = mock(ApplicationProperties.class);
+        when(props.getComponentPackageNames()).thenReturn(Arrays.asList("jp.acme.test.actionsonly"));
+        File tempFolder = folder.newFolder("test");
+        when(props.getTempDir()).thenReturn(tempFolder);
+        application = new WebApplication();
+        application.run(resolver, props, collectors, classLoader);
+        application.dispose();
+        assertThat(application.getModules(), is(nullValue()));
+        assertThat(application.getRouteRegistry(), is(nullValue()));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/fake/FakeApplication.java b/src/test/java/org/analogweb/core/fake/FakeApplication.java
index 3b88678..63b56cc 100644
--- a/src/test/java/org/analogweb/core/fake/FakeApplication.java
+++ b/src/test/java/org/analogweb/core/fake/FakeApplication.java
@@ -18,163 +18,147 @@
 
 /**
  * {@link Application} for test stub.
- * 
+ *
  * @author snowgooseyk
  */
 public class FakeApplication {
 
-	private Application app;
-	private final ApplicationContext resolver;
-	private final ApplicationProperties props;
-
-	public static FakeApplication fakeApplication() {
-		return new FakeApplication();
-	}
-
-	public static FakeApplication fakeApplication(ApplicationProperties props) {
-		return new FakeApplication(props);
-	}
-
-	public FakeApplication() {
-		this(DefaultApplicationContext.context(Maps
-				.<String, Object> newEmptyHashMap()));
-	}
-
-	public FakeApplication(ApplicationContext contextResolver) {
-		this(contextResolver, DefaultApplicationProperties.defaultProperties());
-	}
-
-	public FakeApplication(ApplicationProperties props) {
-		this(DefaultApplicationContext.context(Maps
-				.<String, Object> newEmptyHashMap()), props);
-	}
-
-	public FakeApplication(ApplicationContext contextResolver,
-			ApplicationProperties props) {
-		this.resolver = contextResolver;
-		this.props = props;
-	}
-
-	public ResponseResult request(String path, String method) {
-		return request(path, method,
-				DefaultReadableBuffer.readBuffer(new byte[0]));
-	}
-
-	public ResponseResult request(String path, String method, final String body) {
-		return request(path, method,
-				Maps.<String, List<String>> newEmptyHashMap(),
-				DefaultReadableBuffer.readBuffer(body.getBytes()));
-	}
-
-	public ResponseResult request(String path, String method,
-			final ReadableBuffer body) {
-		return request(path, method,
-				Maps.<String, List<String>> newEmptyHashMap(), body);
-	}
-
-	public ResponseResult request(String path, String method,
-			final Map<String, List<String>> headers) {
-		return request(path, method, headers,
-				DefaultReadableBuffer.readBuffer(new byte[0]));
-	}
-
-	public ResponseResult request(String path, final String method,
-			final Map<String, List<String>> headers, final ReadableBuffer body) {
-		RequestPath requestPath = new DefaultRequestPath(URI.create("/"),
-				URI.create(path), method);
-		RequestContext request = new AbstractRequestContext(requestPath,
-				Locale.getDefault()) {
-
-			@Override
-			public Headers getRequestHeaders() {
-				return new MapHeaders(headers);
-			}
-
-			@Override
-			public ReadableBuffer getRequestBody() throws IOException {
-				return body;
-			}
-
-			@Override
-			public String getRequestMethod() {
-				return method;
-			}
-		};
-		final ResponseResult result = new ResponseResult();
-		ResponseContext response = new AbstractResponseContext() {
-
-			@Override
-			public void commit(RequestContext context, Response response) {
-				commitHeadersAndStatus(result, context, response);
-				Headers headers = getResponseHeaders();
-				if (headers instanceof MapHeaders) {
-					result.setResponseHeader(((MapHeaders) headers).toMap());
-				}
-				try {
-					OutputStream out = result.getResponseBody();
-					ResponseEntity entity = response.getEntity();
-					if (entity != null) {
-						Object entityBody = entity.entity();
-						if (entityBody instanceof byte[]) {
-							out.write((byte[]) entityBody);
-						} else if (entityBody instanceof InputStream) {
-							IOUtils.copy((InputStream) entityBody, out);
-						} else if (entityBody instanceof ReadableBuffer) {
-							DefaultWritableBuffer.writeBuffer(out).from(
-									(ReadableBuffer) entityBody);
-						}
-					}
-					result.getResponseBody().flush();
-				} catch (IOException e) {
-					throw new ApplicationRuntimeException(e) {
-
-						private static final long serialVersionUID = 1L;
-					};
-				}
-			}
-
-			private void commitHeadersAndStatus(ResponseResult ex,
-					RequestContext context, Response response) {
-				int status = getStatus();
-				if (status == 204) {
-					ex.add("Content-Length", "0");
-				} else {
-					ex.add("Content-Length",
-							String.valueOf(response.getContentLength()));
-				}
-				ex.setStatus(status);
-			}
-		};
-		if (app == null) {
-			app = new WebApplication();
-			app.run(resolver, props, getClassCollectors(), Thread
-					.currentThread().getContextClassLoader());
-		}
-		try {
-			Response resultCode = app.processRequest(requestPath, request,
-					response);
-			if (resultCode == WebApplication.NOT_FOUND) {
-				result.setStatus(404);
-				return result;
-			}
-			response.commit(request, resultCode);
-		} catch (Exception e) {
-			throw new ApplicationRuntimeException(e) {
-
-				private static final long serialVersionUID = 1L;
-			};
-		}
-		return result;
-	}
-
-	public void shutdown() {
-		app.dispose();
-	}
-
-	protected List<ClassCollector> getClassCollectors() {
-		List<ClassCollector> list = new ArrayList<ClassCollector>();
-		list.add(new JarClassCollector());
-		list.add(new FileClassCollector());
-		return Collections.unmodifiableList(list);
-	}
+    private Application app;
+    private final ApplicationContext resolver;
+    private final ApplicationProperties props;
+
+    public static FakeApplication fakeApplication() {
+        return new FakeApplication();
+    }
+
+    public static FakeApplication fakeApplication(ApplicationProperties props) {
+        return new FakeApplication(props);
+    }
+
+    public FakeApplication() {
+        this(DefaultApplicationContext.context(Maps.<String, Object> newEmptyHashMap()));
+    }
+
+    public FakeApplication(ApplicationContext contextResolver) {
+        this(contextResolver, DefaultApplicationProperties.defaultProperties());
+    }
+
+    public FakeApplication(ApplicationProperties props) {
+        this(DefaultApplicationContext.context(Maps.<String, Object> newEmptyHashMap()), props);
+    }
+
+    public FakeApplication(ApplicationContext contextResolver, ApplicationProperties props) {
+        this.resolver = contextResolver;
+        this.props = props;
+    }
+
+    public ResponseResult request(String path, String method) {
+        return request(path, method, DefaultReadableBuffer.readBuffer(new byte[0]));
+    }
+
+    public ResponseResult request(String path, String method, final String body) {
+        return request(path, method, Maps.<String, List<String>> newEmptyHashMap(),
+                DefaultReadableBuffer.readBuffer(body.getBytes()));
+    }
+
+    public ResponseResult request(String path, String method, final ReadableBuffer body) {
+        return request(path, method, Maps.<String, List<String>> newEmptyHashMap(), body);
+    }
+
+    public ResponseResult request(String path, String method, final Map<String, List<String>> headers) {
+        return request(path, method, headers, DefaultReadableBuffer.readBuffer(new byte[0]));
+    }
+
+    public ResponseResult request(String path, final String method, final Map<String, List<String>> headers,
+            final ReadableBuffer body) {
+        RequestPath requestPath = new DefaultRequestPath(URI.create("/"), URI.create(path), method);
+        RequestContext request = new AbstractRequestContext(requestPath, Locale.getDefault()) {
+
+            @Override
+            public Headers getRequestHeaders() {
+                return new MapHeaders(headers);
+            }
+
+            @Override
+            public ReadableBuffer getRequestBody() throws IOException {
+                return body;
+            }
+
+            @Override
+            public String getRequestMethod() {
+                return method;
+            }
+        };
+        final ResponseResult result = new ResponseResult();
+        ResponseContext response = new AbstractResponseContext() {
+
+            @Override
+            public void commit(RequestContext context, Response response) {
+                commitHeadersAndStatus(result, context, response);
+                Headers headers = getResponseHeaders();
+                if (headers instanceof MapHeaders) {
+                    result.setResponseHeader(((MapHeaders) headers).toMap());
+                }
+                try {
+                    OutputStream out = result.getResponseBody();
+                    ResponseEntity entity = response.getEntity();
+                    if (entity != null) {
+                        Object entityBody = entity.entity();
+                        if (entityBody instanceof byte[]) {
+                            out.write((byte[]) entityBody);
+                        } else if (entityBody instanceof InputStream) {
+                            IOUtils.copy((InputStream) entityBody, out);
+                        } else if (entityBody instanceof ReadableBuffer) {
+                            DefaultWritableBuffer.writeBuffer(out).from((ReadableBuffer) entityBody);
+                        }
+                    }
+                    result.getResponseBody().flush();
+                } catch (IOException e) {
+                    throw new ApplicationRuntimeException(e) {
+
+                        private static final long serialVersionUID = 1L;
+                    };
+                }
+            }
+
+            private void commitHeadersAndStatus(ResponseResult ex, RequestContext context, Response response) {
+                int status = getStatus();
+                if (status == 204) {
+                    ex.add("Content-Length", "0");
+                } else {
+                    ex.add("Content-Length", String.valueOf(response.getContentLength()));
+                }
+                ex.setStatus(status);
+            }
+        };
+        if (app == null) {
+            app = new WebApplication();
+            app.run(resolver, props, getClassCollectors(), Thread.currentThread().getContextClassLoader());
+        }
+        try {
+            Response resultCode = app.processRequest(requestPath, request, response);
+            if (resultCode == WebApplication.NOT_FOUND) {
+                result.setStatus(404);
+                return result;
+            }
+            response.commit(request, resultCode);
+        } catch (Exception e) {
+            throw new ApplicationRuntimeException(e) {
+
+                private static final long serialVersionUID = 1L;
+            };
+        }
+        return result;
+    }
+
+    public void shutdown() {
+        app.dispose();
+    }
+
+    protected List<ClassCollector> getClassCollectors() {
+        List<ClassCollector> list = new ArrayList<ClassCollector>();
+        list.add(new JarClassCollector());
+        list.add(new FileClassCollector());
+        return Collections.unmodifiableList(list);
+    }
 }
diff --git a/src/test/java/org/analogweb/core/fake/ResponseResult.java b/src/test/java/org/analogweb/core/fake/ResponseResult.java
index 88025d5..15b8930 100644
--- a/src/test/java/org/analogweb/core/fake/ResponseResult.java
+++ b/src/test/java/org/analogweb/core/fake/ResponseResult.java
@@ -11,45 +11,45 @@
 
 /**
  * Simulate {@link Application} responses.
- * 
+ *
  * @author snowgooseyk
  */
 public class ResponseResult {
 
-	private int status = 200;
-	private ByteArrayOutputStream responseBody = new ByteArrayOutputStream();
-	private Map<String, List<String>> responseHeader = Maps.newEmptyHashMap();
-
-	public int getStatus() {
-		return status;
-	}
-
-	public void setStatus(int status) {
-		this.status = status;
-	}
-
-	public OutputStream getResponseBody() {
-		return responseBody;
-	}
-
-	public Map<String, List<String>> getResponseHeader() {
-		return responseHeader;
-	}
-
-	public void add(String key, String value) {
-		List<String> l = responseHeader.get(key);
-		if (CollectionUtils.isEmpty(l)) {
-			l = new ArrayList<String>();
-		}
-		l.add(value);
-		responseHeader.put(key, l);
-	}
-
-	public void setResponseHeader(Map<String, List<String>> responseHeader) {
-		this.responseHeader = responseHeader;
-	}
-
-	public String toBody() {
-		return new String(responseBody.toByteArray());
-	}
+    private int status = 200;
+    private ByteArrayOutputStream responseBody = new ByteArrayOutputStream();
+    private Map<String, List<String>> responseHeader = Maps.newEmptyHashMap();
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public OutputStream getResponseBody() {
+        return responseBody;
+    }
+
+    public Map<String, List<String>> getResponseHeader() {
+        return responseHeader;
+    }
+
+    public void add(String key, String value) {
+        List<String> l = responseHeader.get(key);
+        if (CollectionUtils.isEmpty(l)) {
+            l = new ArrayList<String>();
+        }
+        l.add(value);
+        responseHeader.put(key, l);
+    }
+
+    public void setResponseHeader(Map<String, List<String>> responseHeader) {
+        this.responseHeader = responseHeader;
+    }
+
+    public String toBody() {
+        return new String(responseBody.toByteArray());
+    }
 }
diff --git a/src/test/java/org/analogweb/core/response/AcceptableTest.java b/src/test/java/org/analogweb/core/response/AcceptableTest.java
index 420a13f..4be1ebd 100644
--- a/src/test/java/org/analogweb/core/response/AcceptableTest.java
+++ b/src/test/java/org/analogweb/core/response/AcceptableTest.java
@@ -11,9 +11,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.analogweb.Renderable;
 import org.analogweb.Headers;
 import org.analogweb.RequestContext;
@@ -30,172 +27,121 @@
  */
 public class AcceptableTest {
 
-	private RequestContext context;
-	private ResponseContext response;
-	private Headers headers;
-
-	@Before
-	public void setUp() throws Exception {
-		context = mock(RequestContext.class);
-		response = mock(ResponseContext.class);
-		headers = mock(Headers.class);
-	}
-
-	@Test
-	public void testRenderAcceptableXMLWithReplacedFormatter() throws Exception {
-		final Member m = new Member("snowgoose", 34);
-		Acceptable a = Acceptable.as(m);
-		a.map(new Renderable() {
-
-			@Override
-			public Response render(RequestContext context,
-					ResponseContext response) throws IOException,
-					WebApplicationException {
-				return new DefaultResponse(new DefaultResponseEntity(
-						"write with XML"));
-			}
-		}, "text/xml");
-		final String actual = schenarioRender(" text/xml", m, a);
-		assertThat(actual, is("write with XML"));
-	}
-
-	@Test
-	public void testRenderAcceptableSecondXML() throws Exception {
-		final Member m = new Member("snowgoose", 34);
-		final String actual = schenarioRender(
-				" text/x-dvi; q=0.8, application/xml, */*", m);
-		assertThat(actual, is("{\"age\": 34,\"name\": \"snowgoose\"}"));
-	}
-
-	@Test
-	public void testRenderAcceptableXMLWithQuality() throws Exception {
-		final Member m = new Member("snowgoose", 34);
-		final String actual = schenarioRender(
-				" text/x-dvi; q=0.8, text/xml; q=6, */*", m);
-		assertThat(actual, is("{\"age\": 34,\"name\": \"snowgoose\"}"));
-	}
-
-	@Test
-	public void testRenderAcceptableJSON() throws Exception {
-		final Member m = new Member("snowgoose", 34);
-		final String actual = schenarioRender(
-				" application/json, application/xml", m);
-		assertThat(actual, is("{\"age\": 34,\"name\": \"snowgoose\"}"));
-	}
-
-	@Test
-	public void testRenderAcceptableAny() throws Exception {
-		final Member m = new Member("snowgoose", 34);
-		// final String accept = " text/x-dvi,image/png, */*";
-		when(context.getRequestHeaders()).thenReturn(headers);
-		when(headers.getValues("Accept")).thenReturn(
-				Arrays.asList("text/x-dvi", "image/png", "*/*"));
-		// when(request.getHeader("Accept")).thenReturn(accept);
-		// Response writer = new DefaultResponseWriter();
-		// when(response.getResponse()).thenReturn(writer);
-		final Renderable anyResponse = mock(Renderable.class);
-		Acceptable.as(m).mapToAny(anyResponse).render(context, response);
-		verify(anyResponse).render(context, response);
-	}
-
-	@Test
-	public void testRenderSwitAcceptableAny() throws Exception {
-		final Member m = new Member("snowgoose", 34);
-		final String actual = schenarioRender(" text/x-dvi,image/png, */*", m);
-		// mapped json.
-		assertThat(actual, is("{\"age\": 34,\"name\": \"snowgoose\"}"));
-	}
-
-	@Test
-	public void testRenderSwitAcceptableAnyWithReplacedFormatter()
-			throws Exception {
-		final Member m = new Member("snowgoose", 34);
-		Acceptable a = Acceptable.as(m);
-		a.mapToAny(new Renderable() {
-
-			@Override
-			public Response render(RequestContext context,
-					ResponseContext response) throws IOException,
-					WebApplicationException {
-				return new DefaultResponse(new DefaultResponseEntity(
-						"write with ANY"));
-			}
-		});
-		final String actual = schenarioRender(" text/x-dvi,image/png, */*", m,
-				a);
-		// mapped any.
-		assertThat(actual, is("write with ANY"));
-	}
-
-	@Test
-	public void testRenderSwitchedAcceptable() throws Exception {
-		final Member m = new Member("snowgoose", 34);
-		when(context.getRequestHeaders()).thenReturn(headers);
-		when(headers.getValues("Accept")).thenReturn(
-				Arrays.asList("text/x-dvi", "image/png", "application/json"));
-		final Renderable replaceResponse = mock(Renderable.class);
-		Acceptable.as(m).map(replaceResponse, "application/json")
-				.render(context, response);
-		verify(replaceResponse).render(context, response);
-	}
-
-	@Test
-	public void testSelectAcceptableOne() throws Exception {
-		final Member m = new Member("snowgoose", 34);
-		when(context.getRequestHeaders()).thenReturn(headers);
-		when(headers.getValues("Accept")).thenReturn(
-				Arrays.asList("text/html", "text/x-dvi", "image/png",
-						"application/json"));
-		final Renderable jsonResponse = mock(Renderable.class);
-		final Renderable htmlResponse = mock(Renderable.class);
-		Acceptable acceptable = Acceptable.as(m)
-				.map(jsonResponse, "application/json")
-				.map(htmlResponse, "text/html");
-		Renderable actual = acceptable.selectAcceptableOne(context);
-		assertThat(actual, is(htmlResponse));
-	}
-
-	@Test
-	public void testSelectAcceptableNoOne() throws Exception {
-		final Member m = new Member("snowgoose", 34);
-		when(context.getRequestHeaders()).thenReturn(headers);
-		when(headers.getValues("Accept")).thenReturn(
-				Arrays.asList("text/x-dvi", "image/png"));
-		final Renderable jsonResponse = mock(Renderable.class);
-		final Renderable htmlResponse = mock(Renderable.class);
-		Acceptable acceptable = Acceptable.as(m)
-				.map(jsonResponse, "application/json")
-				.map(htmlResponse, "text/html");
-		Renderable actual = acceptable.selectAcceptableOne(context);
-		assertThat(actual, is((Renderable) HttpStatus.NOT_ACCEPTABLE));
-	}
-
-	@Test
-	public void testRenderNotAcceptable() throws Exception {
-		final Member m = new Member("snowgoose", 34);
-		final String actual = schenarioRender(" text/x-dvi,image/png, text/*",
-				m);
-		assertThat(actual, is(""));
-		verify(response).setStatus(406);
-	}
-
-	@Test
-	public void testRenderNotAcceptable2() throws Exception {
-		final Member m = new Member("snowgoose", 34);
-		when(context.getRequestHeaders()).thenReturn(headers);
-		when(headers.getValues("Accept")).thenReturn(
-				Arrays.asList("text/x-dvi", "image/png", "*/*"));
-		final Renderable replaceResponse = mock(Renderable.class);
-		Acceptable.as(m).mapToAny(replaceResponse).render(context, response);
-		verify(replaceResponse).render(context, response);
-	}
-
-	private String schenarioRender(final String accept, final Member m)
-			throws Exception {
-		return schenarioRender(accept, m, Acceptable.as(m));
-	}
-
-	private String schenarioRender(final String accept, final Member m,
+    private RequestContext context;
+    private ResponseContext response;
+    private Headers headers;
+
+    @Before
+    public void setUp() throws Exception {
+        context = mock(RequestContext.class);
+        response = mock(ResponseContext.class);
+        headers = mock(Headers.class);
+    }
+
+    @Test
+    public void testRenderAcceptableJSON() throws Exception {
+        final Member m = new Member("snowgoose", 34);
+        final String actual = schenarioRender(" application/json, application/xml", m);
+        assertThat(actual, is("{\"age\": 34,\"name\": \"snowgoose\"}"));
+    }
+
+    @Test
+    public void testRenderAcceptableAny() throws Exception {
+        final Member m = new Member("snowgoose", 34);
+        // final String accept = " text/x-dvi,image/png, */*";
+        when(context.getRequestHeaders()).thenReturn(headers);
+        when(headers.getValues("Accept")).thenReturn(Arrays.asList("text/x-dvi", "image/png", "*/*"));
+        // when(request.getHeader("Accept")).thenReturn(accept);
+        // Response writer = new DefaultResponseWriter();
+        // when(response.getResponse()).thenReturn(writer);
+        final Renderable anyResponse = mock(Renderable.class);
+        Acceptable.as(m).mapToAny(anyResponse).render(context, response);
+        verify(anyResponse).render(context, response);
+    }
+
+    @Test
+    public void testRenderSwitAcceptableAny() throws Exception {
+        final Member m = new Member("snowgoose", 34);
+        final String actual = schenarioRender(" text/x-dvi,image/png, */*", m);
+        // mapped json.
+        assertThat(actual, is("{\"age\": 34,\"name\": \"snowgoose\"}"));
+    }
+
+    @Test
+    public void testRenderSwitAcceptableAnyWithReplacedFormatter() throws Exception {
+        final Member m = new Member("snowgoose", 34);
+        Acceptable a = Acceptable.as(m);
+        a.mapToAny(new Renderable() {
+
+            @Override
+            public Response render(RequestContext context, ResponseContext response)
+                    throws IOException, WebApplicationException {
+                return new DefaultResponse(new DefaultResponseEntity("write with ANY"));
+            }
+        });
+        final String actual = schenarioRender(" text/x-dvi,image/png, */*", m, a);
+        // mapped any.
+        assertThat(actual, is("write with ANY"));
+    }
+
+    @Test
+    public void testRenderSwitchedAcceptable() throws Exception {
+        final Member m = new Member("snowgoose", 34);
+        when(context.getRequestHeaders()).thenReturn(headers);
+        when(headers.getValues("Accept")).thenReturn(Arrays.asList("text/x-dvi", "image/png", "application/json"));
+        final Renderable replaceResponse = mock(Renderable.class);
+        Acceptable.as(m).map(replaceResponse, "application/json").render(context, response);
+        verify(replaceResponse).render(context, response);
+    }
+
+    @Test
+    public void testSelectAcceptableOne() throws Exception {
+        final Member m = new Member("snowgoose", 34);
+        when(context.getRequestHeaders()).thenReturn(headers);
+        when(headers.getValues("Accept"))
+                .thenReturn(Arrays.asList("text/html", "text/x-dvi", "image/png", "application/json"));
+        final Renderable jsonResponse = mock(Renderable.class);
+        final Renderable htmlResponse = mock(Renderable.class);
+        Acceptable acceptable = Acceptable.as(m).map(jsonResponse, "application/json").map(htmlResponse, "text/html");
+        Renderable actual = acceptable.selectAcceptableOne(context);
+        assertThat(actual, is(htmlResponse));
+    }
+
+    @Test
+    public void testSelectAcceptableNoOne() throws Exception {
+        final Member m = new Member("snowgoose", 34);
+        when(context.getRequestHeaders()).thenReturn(headers);
+        when(headers.getValues("Accept")).thenReturn(Arrays.asList("text/x-dvi", "image/png"));
+        final Renderable jsonResponse = mock(Renderable.class);
+        final Renderable htmlResponse = mock(Renderable.class);
+        Acceptable acceptable = Acceptable.as(m).map(jsonResponse, "application/json").map(htmlResponse, "text/html");
+        Renderable actual = acceptable.selectAcceptableOne(context);
+        assertThat(actual, is((Renderable) HttpStatus.NOT_ACCEPTABLE));
+    }
+
+    @Test
+    public void testRenderNotAcceptable() throws Exception {
+        final Member m = new Member("snowgoose", 34);
+        final String actual = schenarioRender(" text/x-dvi,image/png, text/*", m);
+        assertThat(actual, is(""));
+        verify(response).setStatus(406);
+    }
+
+    @Test
+    public void testRenderNotAcceptable2() throws Exception {
+        final Member m = new Member("snowgoose", 34);
+        when(context.getRequestHeaders()).thenReturn(headers);
+        when(headers.getValues("Accept")).thenReturn(Arrays.asList("text/x-dvi", "image/png", "*/*"));
+        final Renderable replaceResponse = mock(Renderable.class);
+        Acceptable.as(m).mapToAny(replaceResponse).render(context, response);
+        verify(replaceResponse).render(context, response);
+    }
+
+    private String schenarioRender(final String accept, final Member m) throws Exception {
+        return schenarioRender(accept, m, Acceptable.as(m));
+    }
+
+    private String schenarioRender(final String accept, final Member m,
 			final Acceptable a) throws Exception {
 		when(context.getRequestHeaders()).thenReturn(headers);
 		Headers responseHeaders = mock(Headers.class);
@@ -211,45 +157,41 @@ private String schenarioRender(final String accept, final Member m,
 		}
 	}
 
-	@Test
-	public void testComparator() {
-		final List<String> accepts = Arrays.asList(" text/plain",
-				" application/*;level=1", " application/json", " */*",
-				" text/html;q=1", " text/*");
-		Collections.sort(accepts, new Acceptable.AcceptHeaderComparator());
-		assertThat(accepts.size(), is(6));
-		assertThat(accepts.get(0), is(" text/html;q=1"));
-		assertThat(accepts.get(1), is(" text/plain"));
-		assertThat(accepts.get(2), is(" application/json"));
-		assertThat(accepts.get(3), is(" application/*;level=1"));
-		assertThat(accepts.get(4), is(" text/*"));
-		assertThat(accepts.get(5), is(" */*"));
-	}
-
-	@XmlRootElement
-	public static class Member {
-
-		@XmlElement
-		private String name;
-		@XmlElement
-		private int age;
-
-		public Member() {
-			super();
-		}
-
-		public Member(final String name, final int age) {
-			super();
-			this.name = name;
-			this.age = age;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public int getAge() {
-			return age;
-		}
-	}
+    @Test
+    public void testComparator() {
+        final List<String> accepts = Arrays.asList(" text/plain", " application/*;level=1", " application/json", " */*",
+                " text/html;q=1", " text/*");
+        Collections.sort(accepts, new Acceptable.AcceptHeaderComparator());
+        assertThat(accepts.size(), is(6));
+        assertThat(accepts.get(0), is(" text/html;q=1"));
+        assertThat(accepts.get(1), is(" text/plain"));
+        assertThat(accepts.get(2), is(" application/json"));
+        assertThat(accepts.get(3), is(" application/*;level=1"));
+        assertThat(accepts.get(4), is(" text/*"));
+        assertThat(accepts.get(5), is(" */*"));
+    }
+
+    public static class Member {
+
+        private String name;
+        private int age;
+
+        public Member() {
+            super();
+        }
+
+        public Member(final String name, final int age) {
+            super();
+            this.name = name;
+            this.age = age;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public int getAge() {
+            return age;
+        }
+    }
 }
diff --git a/src/test/java/org/analogweb/core/response/DefaultRenderableTest.java b/src/test/java/org/analogweb/core/response/DefaultRenderableTest.java
index 126133f..856418d 100644
--- a/src/test/java/org/analogweb/core/response/DefaultRenderableTest.java
+++ b/src/test/java/org/analogweb/core/response/DefaultRenderableTest.java
@@ -22,56 +22,55 @@
 
 public class DefaultRenderableTest {
 
-	private DefaultRenderable response;
-	private RequestContext requestContext;
-	private ResponseContext responseContext;
+    private DefaultRenderable response;
+    private RequestContext requestContext;
+    private ResponseContext responseContext;
 
-	@Before
-	public void setUp() throws Exception {
-		requestContext = mock(RequestContext.class);
-		responseContext = mock(ResponseContext.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        requestContext = mock(RequestContext.class);
+        responseContext = mock(ResponseContext.class);
+    }
 
-	@Test
-	public void testRenderDefault() throws Exception {
-		response = new DefaultRenderable();
-		response.render(requestContext, responseContext);
-		assertThat(response.getHeaders(), is(emptyMap()));
-		assertThat(response.getResponseEntity(), is(nullValue()));
-		verify(responseContext)
-				.setStatus(HttpStatus.NO_CONTENT.getStatusCode());
-	}
+    @Test
+    public void testRenderDefault() throws Exception {
+        response = new DefaultRenderable();
+        response.render(requestContext, responseContext);
+        assertThat(response.getHeaders(), is(emptyMap()));
+        assertThat(response.getResponseEntity(), is(nullValue()));
+        verify(responseContext).setStatus(HttpStatus.NO_CONTENT.getStatusCode());
+    }
 
-	@Test
-	public void testRenderEntityAndHeaders() throws Exception {
-		response = new DefaultRenderable();
-		ResponseEntity entity = new DefaultResponseEntity("This Is TEST!");
-		response.setResponseEntity(entity);
-		response.addHeader("Content-Type", "text/plain");
-		Headers responseHeaders = mock(Headers.class);
-		when(responseContext.getResponseHeaders()).thenReturn(responseHeaders);
-		response.render(requestContext, responseContext);
-		assertThat(response.getHeaders().size(), is(1));
-		assertThat(response.getHeaders().get("Content-Type"), is("text/plain"));
-		assertThat(response.getResponseEntity(), is(entity));
-		verify(responseHeaders).putValue("Content-Type", "text/plain");
-		verify(responseContext).setStatus(HttpStatus.OK.getStatusCode());
-	}
+    @Test
+    public void testRenderEntityAndHeaders() throws Exception {
+        response = new DefaultRenderable();
+        ResponseEntity entity = new DefaultResponseEntity("This Is TEST!");
+        response.setResponseEntity(entity);
+        response.addHeader("Content-Type", "text/plain");
+        Headers responseHeaders = mock(Headers.class);
+        when(responseContext.getResponseHeaders()).thenReturn(responseHeaders);
+        response.render(requestContext, responseContext);
+        assertThat(response.getHeaders().size(), is(1));
+        assertThat(response.getHeaders().get("Content-Type"), is("text/plain"));
+        assertThat(response.getResponseEntity(), is(entity));
+        verify(responseHeaders).putValue("Content-Type", "text/plain");
+        verify(responseContext).setStatus(HttpStatus.OK.getStatusCode());
+    }
 
-	private Matcher<Object> emptyMap() {
-		return new BaseMatcher<Object>() {
+    private Matcher<Object> emptyMap() {
+        return new BaseMatcher<Object>() {
 
-			@Override
-			public boolean matches(Object item) {
-				if (item instanceof Map && ((Map<?, ?>) item).isEmpty()) {
-					return true;
-				}
-				return false;
-			}
+            @Override
+            public boolean matches(Object item) {
+                if (item instanceof Map && ((Map<?, ?>) item).isEmpty()) {
+                    return true;
+                }
+                return false;
+            }
 
-			@Override
-			public void describeTo(Description description) {
-			}
-		};
-	}
+            @Override
+            public void describeTo(Description description) {
+            }
+        };
+    }
 }
diff --git a/src/test/java/org/analogweb/core/response/HtmlTest.java b/src/test/java/org/analogweb/core/response/HtmlTest.java
index 9a6f30a..dcf25ce 100644
--- a/src/test/java/org/analogweb/core/response/HtmlTest.java
+++ b/src/test/java/org/analogweb/core/response/HtmlTest.java
@@ -12,16 +12,15 @@
 
 public class HtmlTest {
 
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Test
-	public void test() throws Exception {
-		thrown.expect(UnsupportedOperationException.class);
-		Html html = Html
-				.as("pathOfHtmlTemplate", new HashMap<String, Object>());
-		RequestContext context = mock(RequestContext.class);
-		ResponseContext response = mock(ResponseContext.class);
-		html.render(context, response);
-	}
+    @Test
+    public void test() throws Exception {
+        thrown.expect(UnsupportedOperationException.class);
+        Html html = Html.as("pathOfHtmlTemplate", new HashMap<String, Object>());
+        RequestContext context = mock(RequestContext.class);
+        ResponseContext response = mock(ResponseContext.class);
+        html.render(context, response);
+    }
 }
diff --git a/src/test/java/org/analogweb/core/response/HttpStatusTest.java b/src/test/java/org/analogweb/core/response/HttpStatusTest.java
index 6b57a89..ab9db30 100644
--- a/src/test/java/org/analogweb/core/response/HttpStatusTest.java
+++ b/src/test/java/org/analogweb/core/response/HttpStatusTest.java
@@ -22,27 +22,27 @@
 
 public class HttpStatusTest {
 
-	private RequestContext requestContext;
-	private ResponseContext response;
-	private Headers headers;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    private RequestContext requestContext;
+    private ResponseContext response;
+    private Headers headers;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Before
-	public void setUp() throws Exception {
-		requestContext = mock(RequestContext.class);
-		response = mock(ResponseContext.class);
-		headers = mock(Headers.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        requestContext = mock(RequestContext.class);
+        response = mock(ResponseContext.class);
+        headers = mock(Headers.class);
+    }
 
-	@Test
+    @Test
 	public void testRender() throws Exception {
 		when(response.getResponseHeaders()).thenReturn(headers);
 		HttpStatus.OK.render(requestContext, response);
 		verify(response).setStatus(200);
 	}
 
-	@Test
+    @Test
 	public void testRenderWithError() throws Exception {
 		when(response.getResponseHeaders()).thenReturn(headers);
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -53,7 +53,7 @@ public void testRenderWithError() throws Exception {
 		verify(response).setStatus(404);
 	}
 
-	@Test
+    @Test
 	public void testRenderWithHeader() throws Exception {
 		when(response.getResponseHeaders()).thenReturn(headers);
 		HttpStatus.FOUND.withHeader(
@@ -63,7 +63,7 @@ public void testRenderWithHeader() throws Exception {
 		verify(headers).putValue("Location", "http://foo.com/baa");
 	}
 
-	@Test
+    @Test
 	public void testRenderWithPreRenderResponse() throws Exception {
 		when(response.getResponseHeaders()).thenReturn(headers);
 		Renderable direction = mock(Renderable.class);
@@ -72,21 +72,21 @@ public void testRenderWithPreRenderResponse() throws Exception {
 		verify(direction).render(requestContext, response);
 	}
 
-	@Test
-	public void testValueOfNumber() {
-		HttpStatus actual = HttpStatus.valueOf(200);
-		assertThat(actual, is(HttpStatus.OK));
-		actual = HttpStatus.valueOf(404);
-		assertThat(actual, is(HttpStatus.NOT_FOUND));
-		actual = HttpStatus.valueOf(301);
-		assertThat(actual, is(HttpStatus.MOVED_PERMANENTLY));
-		actual = HttpStatus.valueOf(500);
-		assertThat(actual, is(HttpStatus.INTERNAL_SERVER_ERROR));
-	}
+    @Test
+    public void testValueOfNumber() {
+        HttpStatus actual = HttpStatus.valueOf(200);
+        assertThat(actual, is(HttpStatus.OK));
+        actual = HttpStatus.valueOf(404);
+        assertThat(actual, is(HttpStatus.NOT_FOUND));
+        actual = HttpStatus.valueOf(301);
+        assertThat(actual, is(HttpStatus.MOVED_PERMANENTLY));
+        actual = HttpStatus.valueOf(500);
+        assertThat(actual, is(HttpStatus.INTERNAL_SERVER_ERROR));
+    }
 
-	@Test
-	public void testValueOfInvalidStatusNumber() {
-		thrown.expect(IllegalArgumentException.class);
-		HttpStatus.valueOf(9999);
-	}
+    @Test
+    public void testValueOfInvalidStatusNumber() {
+        thrown.expect(IllegalArgumentException.class);
+        HttpStatus.valueOf(9999);
+    }
 }
diff --git a/src/test/java/org/analogweb/core/response/JsonTest.java b/src/test/java/org/analogweb/core/response/JsonTest.java
index bc9a47e..a146b42 100644
--- a/src/test/java/org/analogweb/core/response/JsonTest.java
+++ b/src/test/java/org/analogweb/core/response/JsonTest.java
@@ -27,225 +27,206 @@
 
 public class JsonTest {
 
-	private RequestContext context;
-	private ResponseContext response;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
-	@Before
-	public void setUp() throws Exception {
-		context = mock(RequestContext.class);
-		response = mock(ResponseContext.class);
-	}
-
-	@After
-	public void tearDown() throws Exception {
-		Json.flushCache();
-	}
-
-	@Test
-	public void testSingleObject() throws Exception {
-		String charset = "UTF-8";
-		Date birthDay = new SimpleDateFormat("yyyyMMdd").parse("20110420");
-		Simple bean = new Simple("foo", 33, birthDay);
-		Json json = Json.as(bean);
-		assertThat(json.resolveContentType(), is("application/json; charset="
-				+ charset));
-		assertThat(json.getCharsetAsText(), is(charset));
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = json.render(context, response);
-		byte[] body = (byte[]) r.getEntity().entity();
-		String actual = new String(body, charset);
-		assertThat(actual,
-				is("{\"age\": 33,\"birthDay\": " + birthDay.getTime()
-						+ ",\"name\": \"foo\"}"));
-		verify(headers).putValue("Content-Type",
-				"application/json; charset=UTF-8");
-	}
-
-	@Test
-	public void testPlainJsonString() throws Exception {
-		String charset = "UTF-8";
-		Json json = Json.with("{\"value\": \"foo!\"}");
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = json.render(context, response);
-		byte[] body = (byte[]) r.getEntity().entity();
-		String actual = new String(body, charset);
-		assertThat(actual, is("{\"value\": \"foo!\"}"));
-	}
-
-	@Test
-	public void testList() throws Exception {
-		String charset = "UTF-8";
-		Date birthDay = new SimpleDateFormat("yyyyMMdd").parse("20110420");
-		Date birthDay2 = new SimpleDateFormat("yyyyMMdd").parse("20110712");
-		List<Simple> beans = Arrays.asList(new Simple("foo", 33, birthDay),
-				new Simple("baa", 32, birthDay2));
-		Json json = Json.as(beans);
-		assertThat(json.resolveContentType(), is("application/json; charset="
-				+ charset));
-		assertThat(json.getCharsetAsText(), is(charset));
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = json.render(context, response);
-		byte[] body = (byte[]) r.getEntity().entity();
-		String actual = new String(body, charset);
-		assertThat(actual,
-				is("{[" + "{\"age\": 33,\"birthDay\": " + birthDay.getTime()
-						+ ",\"name\": \"foo\"},"
-						+ "{\"age\": 32,\"birthDay\": " + birthDay2.getTime()
-						+ ",\"name\": \"baa\"}" + "]}"));
-	}
-
-	@Test
-	public void testArray() throws Exception {
-		String charset = "UTF-8";
-		Date birthDay = new SimpleDateFormat("yyyyMMdd").parse("20110420");
-		Date birthDay2 = new SimpleDateFormat("yyyyMMdd").parse("20110712");
-		Simple[] beans = new Simple[]{new Simple("foo", 33, birthDay),
-				new Simple("baa", 32, birthDay2)};
-		Json json = Json.as(beans);
-		assertThat(json.resolveContentType(), is("application/json; charset="
-				+ charset));
-		assertThat(json.getCharsetAsText(), is(charset));
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = json.render(context, response);
-		byte[] body = (byte[]) r.getEntity().entity();
-		String actual = new String(body, charset);
-		assertThat(actual,
-				is("{[" + "{\"age\": 33,\"birthDay\": " + birthDay.getTime()
-						+ ",\"name\": \"foo\"},"
-						+ "{\"age\": 32,\"birthDay\": " + birthDay2.getTime()
-						+ ",\"name\": \"baa\"}" + "]}"));
-	}
-
-	@Test
-	public void testManyList() throws Exception {
-		Date birthDay = new SimpleDateFormat("yyyyMMdd").parse("20110420");
-		Date birthDay2 = new SimpleDateFormat("yyyyMMdd").parse("20100712");
-		Json json = Json.as(new ManyList());
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = json.render(context, response);
-		byte[] body = (byte[]) r.getEntity().entity();
-		String actual = new String(body, "UTF-8");
-		assertThat(actual, is("{\"boo\": true,\"simples\": ["
-				+ "{\"age\": 33,\"birthDay\": " + birthDay.getTime()
-				+ ",\"name\": \"foo\"}," + "{\"age\": 32,\"birthDay\": "
-				+ birthDay2.getTime() + ",\"name\": \"baa\"}" + "]}"));
-	}
-
-	@Test
-	public void testManyArray() throws Exception {
-		Date birthDay = new SimpleDateFormat("yyyyMMdd").parse("20110420");
-		Date birthDay2 = new SimpleDateFormat("yyyyMMdd").parse("20100712");
-		Json jsons = Json.as(new ManyArray());
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = jsons.render(context, response);
-		byte[] body = (byte[]) r.getEntity().entity();
-		String actual = new String(body, "UTF-8");
-		assertThat(actual, is("{\"id\": \"01\",\"simples\": ["
-				+ "{\"age\": 33,\"birthDay\": " + birthDay.getTime()
-				+ ",\"name\": \"foo\"}," + "{\"age\": 32,\"birthDay\": "
-				+ birthDay2.getTime() + ",\"name\": \"baa\"}" + "]}"));
-	}
-
-	@Test
-	public void testContainsNull() throws Exception {
-		String charset = "UTF-8";
-		Simple bean = new Simple("foo", 33, null);
-		Json json = Json.as(bean);
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = json.render(context, response);
-		byte[] body = (byte[]) r.getEntity().entity();
-		String actual = new String(body, charset);
-		assertThat(actual,
-				is("{\"age\": 33,\"birthDay\": null,\"name\": \"foo\"}"));
-	}
-
-	static class Simple implements Serializable {
-
-		private static final long serialVersionUID = 1L;
-		private String name;
-		private Integer age;
-		private Date birthDay;
-
-		Simple(String name, Integer age, Date birthDay) {
-			this.name = name;
-			this.age = age;
-			this.birthDay = birthDay;
-		}
-
-		public String getName() {
-			return this.name;
-		}
-
-		public Integer getAge() {
-			return this.age;
-		}
-
-		public Date getBirthDay() {
-			return this.birthDay;
-		}
-	}
-
-	static class ManyList implements Serializable {
-
-		private static final long serialVersionUID = 1L;
-		private boolean boo;
-		private List<Simple> simples;
-
-		ManyList() {
-			boo = true;
-			simples = new ArrayList<Simple>();
-			try {
-				simples.add(new Simple("foo", 33, new SimpleDateFormat(
-						"yyyyMMdd").parse("20110420")));
-				simples.add(new Simple("baa", 32, new SimpleDateFormat(
-						"yyyyMMdd").parse("20100712")));
-			} catch (ParseException e) {
-				// nop.
-			}
-		}
-
-		public boolean getBoo() {
-			return this.boo;
-		}
-
-		public List<Simple> getSimples() {
-			return this.simples;
-		}
-	}
-
-	static class ManyArray implements Serializable {
-
-		private static final long serialVersionUID = 1L;
-		private String id = "01";
-		private Simple[] simples;
-
-		ManyArray() {
-			simples = new Simple[2];
-			try {
-				simples[0] = new Simple("foo", 33, new SimpleDateFormat(
-						"yyyyMMdd").parse("20110420"));
-				simples[1] = new Simple("baa", 32, new SimpleDateFormat(
-						"yyyyMMdd").parse("20100712"));
-			} catch (ParseException e) {
-				// nop.
-			}
-		}
-
-		public String getId() {
-			return this.id;
-		}
-
-		public Simple[] getSimples() {
-			return this.simples;
-		}
-	}
+    private RequestContext context;
+    private ResponseContext response;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Before
+    public void setUp() throws Exception {
+        context = mock(RequestContext.class);
+        response = mock(ResponseContext.class);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        Json.flushCache();
+    }
+
+    @Test
+    public void testSingleObject() throws Exception {
+        String charset = "UTF-8";
+        Date birthDay = new SimpleDateFormat("yyyyMMdd").parse("20110420");
+        Simple bean = new Simple("foo", 33, birthDay);
+        Json json = Json.as(bean);
+        assertThat(json.resolveContentType(), is("application/json; charset=" + charset));
+        assertThat(json.getCharsetAsText(), is(charset));
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = json.render(context, response);
+        byte[] body = (byte[]) r.getEntity().entity();
+        String actual = new String(body, charset);
+        assertThat(actual, is("{\"age\": 33,\"birthDay\": " + birthDay.getTime() + ",\"name\": \"foo\"}"));
+        verify(headers).putValue("Content-Type", "application/json; charset=UTF-8");
+    }
+
+    @Test
+    public void testPlainJsonString() throws Exception {
+        String charset = "UTF-8";
+        Json json = Json.with("{\"value\": \"foo!\"}");
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = json.render(context, response);
+        byte[] body = (byte[]) r.getEntity().entity();
+        String actual = new String(body, charset);
+        assertThat(actual, is("{\"value\": \"foo!\"}"));
+    }
+
+    @Test
+    public void testList() throws Exception {
+        String charset = "UTF-8";
+        Date birthDay = new SimpleDateFormat("yyyyMMdd").parse("20110420");
+        Date birthDay2 = new SimpleDateFormat("yyyyMMdd").parse("20110712");
+        List<Simple> beans = Arrays.asList(new Simple("foo", 33, birthDay), new Simple("baa", 32, birthDay2));
+        Json json = Json.as(beans);
+        assertThat(json.resolveContentType(), is("application/json; charset=" + charset));
+        assertThat(json.getCharsetAsText(), is(charset));
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = json.render(context, response);
+        byte[] body = (byte[]) r.getEntity().entity();
+        String actual = new String(body, charset);
+        assertThat(actual, is("{[" + "{\"age\": 33,\"birthDay\": " + birthDay.getTime() + ",\"name\": \"foo\"},"
+                + "{\"age\": 32,\"birthDay\": " + birthDay2.getTime() + ",\"name\": \"baa\"}" + "]}"));
+    }
+
+    @Test
+    public void testArray() throws Exception {
+        String charset = "UTF-8";
+        Date birthDay = new SimpleDateFormat("yyyyMMdd").parse("20110420");
+        Date birthDay2 = new SimpleDateFormat("yyyyMMdd").parse("20110712");
+        Simple[] beans = new Simple[] { new Simple("foo", 33, birthDay), new Simple("baa", 32, birthDay2) };
+        Json json = Json.as(beans);
+        assertThat(json.resolveContentType(), is("application/json; charset=" + charset));
+        assertThat(json.getCharsetAsText(), is(charset));
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = json.render(context, response);
+        byte[] body = (byte[]) r.getEntity().entity();
+        String actual = new String(body, charset);
+        assertThat(actual, is("{[" + "{\"age\": 33,\"birthDay\": " + birthDay.getTime() + ",\"name\": \"foo\"},"
+                + "{\"age\": 32,\"birthDay\": " + birthDay2.getTime() + ",\"name\": \"baa\"}" + "]}"));
+    }
+
+    @Test
+    public void testManyList() throws Exception {
+        Date birthDay = new SimpleDateFormat("yyyyMMdd").parse("20110420");
+        Date birthDay2 = new SimpleDateFormat("yyyyMMdd").parse("20100712");
+        Json json = Json.as(new ManyList());
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = json.render(context, response);
+        byte[] body = (byte[]) r.getEntity().entity();
+        String actual = new String(body, "UTF-8");
+        assertThat(actual,
+                is("{\"boo\": true,\"simples\": [" + "{\"age\": 33,\"birthDay\": " + birthDay.getTime()
+                        + ",\"name\": \"foo\"}," + "{\"age\": 32,\"birthDay\": " + birthDay2.getTime()
+                        + ",\"name\": \"baa\"}" + "]}"));
+    }
+
+    @Test
+    public void testManyArray() throws Exception {
+        Date birthDay = new SimpleDateFormat("yyyyMMdd").parse("20110420");
+        Date birthDay2 = new SimpleDateFormat("yyyyMMdd").parse("20100712");
+        Json jsons = Json.as(new ManyArray());
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = jsons.render(context, response);
+        byte[] body = (byte[]) r.getEntity().entity();
+        String actual = new String(body, "UTF-8");
+        assertThat(actual,
+                is("{\"id\": \"01\",\"simples\": [" + "{\"age\": 33,\"birthDay\": " + birthDay.getTime()
+                        + ",\"name\": \"foo\"}," + "{\"age\": 32,\"birthDay\": " + birthDay2.getTime()
+                        + ",\"name\": \"baa\"}" + "]}"));
+    }
+
+    @Test
+    public void testContainsNull() throws Exception {
+        String charset = "UTF-8";
+        Simple bean = new Simple("foo", 33, null);
+        Json json = Json.as(bean);
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = json.render(context, response);
+        byte[] body = (byte[]) r.getEntity().entity();
+        String actual = new String(body, charset);
+        assertThat(actual, is("{\"age\": 33,\"birthDay\": null,\"name\": \"foo\"}"));
+    }
+
+    static class Simple implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+        private String name;
+        private Integer age;
+        private Date birthDay;
+
+        Simple(String name, Integer age, Date birthDay) {
+            this.name = name;
+            this.age = age;
+            this.birthDay = birthDay;
+        }
+
+        public String getName() {
+            return this.name;
+        }
+
+        public Integer getAge() {
+            return this.age;
+        }
+
+        public Date getBirthDay() {
+            return this.birthDay;
+        }
+    }
+
+    static class ManyList implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+        private boolean boo;
+        private List<Simple> simples;
+
+        ManyList() {
+            boo = true;
+            simples = new ArrayList<Simple>();
+            try {
+                simples.add(new Simple("foo", 33, new SimpleDateFormat("yyyyMMdd").parse("20110420")));
+                simples.add(new Simple("baa", 32, new SimpleDateFormat("yyyyMMdd").parse("20100712")));
+            } catch (ParseException e) {
+                // nop.
+            }
+        }
+
+        public boolean getBoo() {
+            return this.boo;
+        }
+
+        public List<Simple> getSimples() {
+            return this.simples;
+        }
+    }
+
+    static class ManyArray implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+        private String id = "01";
+        private Simple[] simples;
+
+        ManyArray() {
+            simples = new Simple[2];
+            try {
+                simples[0] = new Simple("foo", 33, new SimpleDateFormat("yyyyMMdd").parse("20110420"));
+                simples[1] = new Simple("baa", 32, new SimpleDateFormat("yyyyMMdd").parse("20100712"));
+            } catch (ParseException e) {
+                // nop.
+            }
+        }
+
+        public String getId() {
+            return this.id;
+        }
+
+        public Simple[] getSimples() {
+            return this.simples;
+        }
+    }
 }
diff --git a/src/test/java/org/analogweb/core/response/RedirectTest.java b/src/test/java/org/analogweb/core/response/RedirectTest.java
index adecfd6..6d80390 100644
--- a/src/test/java/org/analogweb/core/response/RedirectTest.java
+++ b/src/test/java/org/analogweb/core/response/RedirectTest.java
@@ -24,103 +24,94 @@
  */
 public class RedirectTest {
 
-	private RequestContext context;
-	private ResponseContext response;
-	private Headers responseHeader;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    private RequestContext context;
+    private ResponseContext response;
+    private Headers responseHeader;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@Before
-	public void setUp() throws Exception {
-		context = mock(RequestContext.class);
-		response = mock(ResponseContext.class);
-		responseHeader = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(responseHeader);
-	}
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        context = mock(RequestContext.class);
+        response = mock(ResponseContext.class);
+        responseHeader = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(responseHeader);
+    }
 
-	@Test
-	public void testRender() throws Exception {
-		Redirect.to("/some/foo.rn").render(context, response);
-		verify(response).setStatus(302);
-		verify(responseHeader).putValue("Location", "/some/foo.rn");
-	}
+    @Test
+    public void testRender() throws Exception {
+        Redirect.to("/some/foo.rn").render(context, response);
+        verify(response).setStatus(302);
+        verify(responseHeader).putValue("Location", "/some/foo.rn");
+    }
 
-	@Test
-	public void testRenderWithNotReturnCode() throws Exception {
-		// not redirect response code.
-		Redirect.to("/some/foo.rn").resoposeCode(404).render(context, response);
-		verify(response).setStatus(302);
-		verify(responseHeader).putValue("Location", "/some/foo.rn");
-	}
+    @Test
+    public void testRenderWithNotReturnCode() throws Exception {
+        // not redirect response code.
+        Redirect.to("/some/foo.rn").resoposeCode(404).render(context, response);
+        verify(response).setStatus(302);
+        verify(responseHeader).putValue("Location", "/some/foo.rn");
+    }
 
-	@Test
-	public void testRenderWithNullContext() throws Exception {
-		thrown.expect(AssertionFailureException.class);
-		Redirect.to("/some/foo.rn").render(null, response);
-	}
+    @Test
+    public void testRenderWithNullContext() throws Exception {
+        thrown.expect(AssertionFailureException.class);
+        Redirect.to("/some/foo.rn").render(null, response);
+    }
 
-	@Test
-	public void testRenderWithParameter() throws Exception {
-		Redirect.to("/some/foo.rn").addParameter("foo", "baa")
-				.addParameter("hoge", "fuga").render(context, response);
-		verify(response).setStatus(302);
-		verify(responseHeader).putValue("Location",
-				"/some/foo.rn?foo=baa&hoge=fuga");
-	}
+    @Test
+    public void testRenderWithParameter() throws Exception {
+        Redirect.to("/some/foo.rn").addParameter("foo", "baa").addParameter("hoge", "fuga").render(context, response);
+        verify(response).setStatus(302);
+        verify(responseHeader).putValue("Location", "/some/foo.rn?foo=baa&hoge=fuga");
+    }
 
-	@Test
-	public void testRenderWithScheme() throws Exception {
-		Redirect.to("https://github.com/").addParameter("foo", "baa")
-				.render(context, response);
-		verify(response).setStatus(302);
-		verify(responseHeader).putValue("Location",
-				"https://github.com/?foo=baa");
-	}
+    @Test
+    public void testRenderWithScheme() throws Exception {
+        Redirect.to("https://github.com/").addParameter("foo", "baa").render(context, response);
+        verify(response).setStatus(302);
+        verify(responseHeader).putValue("Location", "https://github.com/?foo=baa");
+    }
 
-	@Test
-	public void testRenderWithParametarizedURLAndParameter() throws Exception {
-		// sort parameter name by natural order.
-		Redirect.to("/some/foo.rn?boo=baz").addParameter("hoge", "fuga")
-				.addParameter("foo", "baa").encodeWith("ISO-8859-1")
-				.render(context, response);
-		verify(response).setStatus(302);
-		verify(responseHeader).putValue("Location",
-				"/some/foo.rn?boo=baz&foo=baa&hoge=fuga");
-	}
+    @Test
+    public void testRenderWithParametarizedURLAndParameter() throws Exception {
+        // sort parameter name by natural order.
+        Redirect.to("/some/foo.rn?boo=baz").addParameter("hoge", "fuga").addParameter("foo", "baa")
+                .encodeWith("ISO-8859-1").render(context, response);
+        verify(response).setStatus(302);
+        verify(responseHeader).putValue("Location", "/some/foo.rn?boo=baz&foo=baa&hoge=fuga");
+    }
 
-	@Test
-	public void testRenderWithEmptyPath() throws Exception {
-		thrown.expect(new NoDescribeMatcher<MissingRequirmentsException>() {
+    @Test
+    public void testRenderWithEmptyPath() throws Exception {
+        thrown.expect(new NoDescribeMatcher<MissingRequirmentsException>() {
 
-			@Override
-			public boolean matches(Object arg0) {
-				if (arg0 instanceof MissingRequirmentsException) {
-					MissingRequirmentsException ex = (MissingRequirmentsException) arg0;
-					assertThat(ex.getRequirment(), is("redirect path"));
-					assertThat(ex.getUnresolvableInvocationResult(),
-							is(nullValue()));
-					return true;
-				}
-				return false;
-			}
-		});
-		Redirect.to(null);
-	}
+            @Override
+            public boolean matches(Object arg0) {
+                if (arg0 instanceof MissingRequirmentsException) {
+                    MissingRequirmentsException ex = (MissingRequirmentsException) arg0;
+                    assertThat(ex.getRequirment(), is("redirect path"));
+                    assertThat(ex.getUnresolvableInvocationResult(), is(nullValue()));
+                    return true;
+                }
+                return false;
+            }
+        });
+        Redirect.to(null);
+    }
 
-	@Test
-	public void testEquals() throws Exception {
-		assertThat(Redirect.to("/foo/bar"), is(Redirect.to("/foo/bar")));
-		assertThat(Redirect.to("/foo/bar"), is(not(Redirect.to("/foo/bar2"))));
-	}
+    @Test
+    public void testEquals() throws Exception {
+        assertThat(Redirect.to("/foo/bar"), is(Redirect.to("/foo/bar")));
+        assertThat(Redirect.to("/foo/bar"), is(not(Redirect.to("/foo/bar2"))));
+    }
 
-	@Test
-	public void testHashCode() throws Exception {
-		assertThat(Redirect.to("/foo/bar").hashCode(),
-				is(Redirect.to("/foo/bar").hashCode()));
-		assertThat(Redirect.to("/foo/bar").hashCode(),
-				is(not(Redirect.to("/foo/bar2").hashCode())));
-	}
+    @Test
+    public void testHashCode() throws Exception {
+        assertThat(Redirect.to("/foo/bar").hashCode(), is(Redirect.to("/foo/bar").hashCode()));
+        assertThat(Redirect.to("/foo/bar").hashCode(), is(not(Redirect.to("/foo/bar2").hashCode())));
+    }
 }
diff --git a/src/test/java/org/analogweb/core/response/RenderableResponsesTest.java b/src/test/java/org/analogweb/core/response/RenderableResponsesTest.java
index 24d3d32..d756276 100644
--- a/src/test/java/org/analogweb/core/response/RenderableResponsesTest.java
+++ b/src/test/java/org/analogweb/core/response/RenderableResponsesTest.java
@@ -19,42 +19,40 @@
 
 public class RenderableResponsesTest {
 
-	private RequestContext request;
-	private ResponseContext response;
-	private Headers responseHeaders;
-
-	@Before
-	public void setUp() {
-		request = mock(RequestContext.class);
-		response = mock(ResponseContext.class);
-		responseHeaders = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(responseHeaders);
-	}
-
-	@Test
-	public void testOk() throws Exception {
-		ResponseEntity entity = mock(ResponseEntity.class);
-		RenderableResponses responses = RenderableResponses.ok(entity);
-		responses.render(request, response);
-		verify(response).setStatus(200);
-	}
-
-	@Test
-	public void testOkWithEntityString() throws Exception {
-		String entity = "foo";
-		Charset cs = Charset.forName("UTF-8");
-		RenderableResponses responses = RenderableResponses.ok(entity, cs);
-		responses.render(request, response);
-		verify(response).setStatus(200);
-	}
-
-	@Test
-	public void testLocates() throws Exception {
-		RenderableResponses responses = RenderableResponses.locates(URI
-				.create("http://example.com/index.html"));
-		responses.render(request, response);
-		verify(responseHeaders).putValue("Location",
-				"http://example.com/index.html");
-		verify(response).setStatus(302);
-	}
+    private RequestContext request;
+    private ResponseContext response;
+    private Headers responseHeaders;
+
+    @Before
+    public void setUp() {
+        request = mock(RequestContext.class);
+        response = mock(ResponseContext.class);
+        responseHeaders = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(responseHeaders);
+    }
+
+    @Test
+    public void testOk() throws Exception {
+        ResponseEntity entity = mock(ResponseEntity.class);
+        RenderableResponses responses = RenderableResponses.ok(entity);
+        responses.render(request, response);
+        verify(response).setStatus(200);
+    }
+
+    @Test
+    public void testOkWithEntityString() throws Exception {
+        String entity = "foo";
+        Charset cs = Charset.forName("UTF-8");
+        RenderableResponses responses = RenderableResponses.ok(entity, cs);
+        responses.render(request, response);
+        verify(response).setStatus(200);
+    }
+
+    @Test
+    public void testLocates() throws Exception {
+        RenderableResponses responses = RenderableResponses.locates(URI.create("http://example.com/index.html"));
+        responses.render(request, response);
+        verify(responseHeaders).putValue("Location", "http://example.com/index.html");
+        verify(response).setStatus(302);
+    }
 }
diff --git a/src/test/java/org/analogweb/core/response/ResourceTest.java b/src/test/java/org/analogweb/core/response/ResourceTest.java
index fed794d..2c8a626 100644
--- a/src/test/java/org/analogweb/core/response/ResourceTest.java
+++ b/src/test/java/org/analogweb/core/response/ResourceTest.java
@@ -28,151 +28,142 @@
 
 public class ResourceTest {
 
-	private RequestContext context;
-	private ResponseContext response;
-	private Headers headers;
-	@Rule
-	public TemporaryFolder folder = new TemporaryFolder();
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
-	@Before
-	public void setUp() throws Exception {
-		context = mock(RequestContext.class);
-		response = mock(ResponseContext.class);
-		headers = mock(Headers.class);
-	}
-
-	@Test
-	public void testDefaultFileResource() throws Exception {
-		File file = folder.newFile("text.log");
-		writeStringTo(file);
-		Resource resource = Resource.as(file).status(204);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = resource.render(context, response);
-		ReadableBuffer b = (ReadableBuffer) r.getEntity().entity();
-		ByteBuffer bf = ByteBuffer.allocate(17);
-		b.read(bf);
-		assertThat(new String(bf.array()), is("this is test log."));
-		verify(headers).putValue("Content-Type", "application/octet-stream");
-		verify(headers).putValue("Content-Disposition",
-				"attachment; filename=text.log");
-	}
-
-	@Test
-	public void testDistinctFileResource() throws Exception {
-		File file = folder.newFile("text.log");
-		writeStringTo(file);
-		Resource resource = Resource.as(file).status(204)
-				.header("Content-Type", "text/plain");
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = resource.render(context, response);
-		ReadableBuffer b = (ReadableBuffer) r.getEntity().entity();
-		ByteBuffer bf = ByteBuffer.allocate(17);
-		b.read(bf);
-		assertThat(new String(bf.array()), is("this is test log."));
-		verify(headers).putValue("Content-Type", "text/plain");
-		verify(headers).putValue("Content-Disposition",
-				"attachment; filename=text.log");
-	}
-
-	@Test
-	public void testNotAvairableFileResource() throws Exception {
-		thrown.expect(ApplicationRuntimeException.class);
-		Resource.as(new File("foo/baa"));
-	}
-
-	@Test
-	public void testFileInlineResource() throws Exception {
-		File file = folder.newFile("text.log");
-		writeStringTo(file);
-		Resource resource = Resource.as(file).inline();
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = resource.render(context, response);
-		ReadableBuffer b = (ReadableBuffer) r.getEntity().entity();
-		ByteBuffer bf = ByteBuffer.allocate(17);
-		b.read(bf);
-		assertThat(new String(bf.array()), is("this is test log."));
-		verify(headers).putValue("Content-Type", "application/octet-stream");
-		verify(headers).putValue("Content-Disposition",
-				"inline; filename=text.log");
-	}
-
-	@Test
-	public void testNullFileResource() throws Exception {
-		thrown.expect(AssertionFailureException.class);
-		Resource.as((File) null);
-	}
-
-	@Test
-	public void testDefaultFilePathResource() throws Exception {
-		File file = folder.newFile("text.log");
-		writeStringTo(file);
-		Resource resource = Resource.asFilePath(file.getPath());
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = resource.render(context, response);
-		ReadableBuffer b = (ReadableBuffer) r.getEntity().entity();
-		ByteBuffer bf = ByteBuffer.allocate(17);
-		b.read(bf);
-		assertThat(new String(bf.array()), is("this is test log."));
-		verify(headers).putValue("Content-Type", "application/octet-stream");
-		verify(headers).putValue("Content-Disposition",
-				"attachment; filename=text.log");
-	}
-
-	@Test
-	public void testNullFilePathResource() throws Exception {
-		thrown.expect(AssertionFailureException.class);
-		Resource.asFilePath((String) null);
-	}
-
-	@Test
-	public void testDefaultStreamResource() throws Exception {
-		File file = folder.newFile("text.log");
-		writeStringTo(file);
-		Resource resource = Resource.as(DefaultReadableBuffer
-				.readBuffer(new FileInputStream(file)));
-		when(response.getResponseHeaders()).thenReturn(headers);
-		final ByteArrayOutputStream out = new ByteArrayOutputStream();
-		Response r = resource.render(context, response);
-		ReadableBuffer b = (ReadableBuffer) r.getEntity().entity();
-		ByteBuffer bf = ByteBuffer.allocate(17);
-		b.read(bf);
-		assertThat(new String(bf.array()), is("this is test log."));
-		verify(headers).putValue("Content-Type", "application/octet-stream");
-		verify(headers).putValue("Content-Disposition", "attachment");
-	}
-
-	@Test
-	public void testDefaultStreamResourceWithoutContentDisposition()
-			throws Exception {
-		File file = folder.newFile("text.log");
-		writeStringTo(file);
-		Resource resource = Resource.as(
-				DefaultReadableBuffer.readBuffer(new FileInputStream(file)))
-				.withoutContentDisposition();
-		when(response.getResponseHeaders()).thenReturn(headers);
-		final ByteArrayOutputStream out = new ByteArrayOutputStream();
-		Response r = resource.render(context, response);
-		ReadableBuffer b = (ReadableBuffer) r.getEntity().entity();
-		ByteBuffer bf = ByteBuffer.allocate(17);
-		b.read(bf);
-		assertThat(new String(bf.array()), is("this is test log."));
-		verify(headers).putValue("Content-Type", "application/octet-stream");
-		verify(headers, noMoreInteractions()).putValue("Content-Disposition",
-				"attachment");
-	}
-
-	@Test
-	public void testNullStreamResource() throws Exception {
-		thrown.expect(AssertionFailureException.class);
-		Resource.as((ReadableBuffer) null);
-	}
-
-	private void writeStringTo(File file) throws IOException {
-		FileOutputStream fileOut = new FileOutputStream(file);
-		fileOut.write("this is test log.".getBytes());
-		fileOut.flush();
-		fileOut.close();
-	}
+    private RequestContext context;
+    private ResponseContext response;
+    private Headers headers;
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Before
+    public void setUp() throws Exception {
+        context = mock(RequestContext.class);
+        response = mock(ResponseContext.class);
+        headers = mock(Headers.class);
+    }
+
+    @Test
+    public void testDefaultFileResource() throws Exception {
+        File file = folder.newFile("text.log");
+        writeStringTo(file);
+        Resource resource = Resource.as(file).status(204);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = resource.render(context, response);
+        ReadableBuffer b = (ReadableBuffer) r.getEntity().entity();
+        ByteBuffer bf = ByteBuffer.allocate(17);
+        b.read(bf);
+        assertThat(new String(bf.array()), is("this is test log."));
+        verify(headers).putValue("Content-Type", "application/octet-stream");
+        verify(headers).putValue("Content-Disposition", "attachment; filename=text.log");
+    }
+
+    @Test
+    public void testDistinctFileResource() throws Exception {
+        File file = folder.newFile("text.log");
+        writeStringTo(file);
+        Resource resource = Resource.as(file).status(204).header("Content-Type", "text/plain");
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = resource.render(context, response);
+        ReadableBuffer b = (ReadableBuffer) r.getEntity().entity();
+        ByteBuffer bf = ByteBuffer.allocate(17);
+        b.read(bf);
+        assertThat(new String(bf.array()), is("this is test log."));
+        verify(headers).putValue("Content-Type", "text/plain");
+        verify(headers).putValue("Content-Disposition", "attachment; filename=text.log");
+    }
+
+    @Test
+    public void testNotAvairableFileResource() throws Exception {
+        thrown.expect(ApplicationRuntimeException.class);
+        Resource.as(new File("foo/baa"));
+    }
+
+    @Test
+    public void testFileInlineResource() throws Exception {
+        File file = folder.newFile("text.log");
+        writeStringTo(file);
+        Resource resource = Resource.as(file).inline();
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = resource.render(context, response);
+        ReadableBuffer b = (ReadableBuffer) r.getEntity().entity();
+        ByteBuffer bf = ByteBuffer.allocate(17);
+        b.read(bf);
+        assertThat(new String(bf.array()), is("this is test log."));
+        verify(headers).putValue("Content-Type", "application/octet-stream");
+        verify(headers).putValue("Content-Disposition", "inline; filename=text.log");
+    }
+
+    @Test
+    public void testNullFileResource() throws Exception {
+        thrown.expect(AssertionFailureException.class);
+        Resource.as((File) null);
+    }
+
+    @Test
+    public void testDefaultFilePathResource() throws Exception {
+        File file = folder.newFile("text.log");
+        writeStringTo(file);
+        Resource resource = Resource.asFilePath(file.getPath());
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = resource.render(context, response);
+        ReadableBuffer b = (ReadableBuffer) r.getEntity().entity();
+        ByteBuffer bf = ByteBuffer.allocate(17);
+        b.read(bf);
+        assertThat(new String(bf.array()), is("this is test log."));
+        verify(headers).putValue("Content-Type", "application/octet-stream");
+        verify(headers).putValue("Content-Disposition", "attachment; filename=text.log");
+    }
+
+    @Test
+    public void testNullFilePathResource() throws Exception {
+        thrown.expect(AssertionFailureException.class);
+        Resource.asFilePath((String) null);
+    }
+
+    @Test
+    public void testDefaultStreamResource() throws Exception {
+        File file = folder.newFile("text.log");
+        writeStringTo(file);
+        Resource resource = Resource.as(DefaultReadableBuffer.readBuffer(new FileInputStream(file)));
+        when(response.getResponseHeaders()).thenReturn(headers);
+        final ByteArrayOutputStream out = new ByteArrayOutputStream();
+        Response r = resource.render(context, response);
+        ReadableBuffer b = (ReadableBuffer) r.getEntity().entity();
+        ByteBuffer bf = ByteBuffer.allocate(17);
+        b.read(bf);
+        assertThat(new String(bf.array()), is("this is test log."));
+        verify(headers).putValue("Content-Type", "application/octet-stream");
+        verify(headers).putValue("Content-Disposition", "attachment");
+    }
+
+    @Test
+    public void testDefaultStreamResourceWithoutContentDisposition() throws Exception {
+        File file = folder.newFile("text.log");
+        writeStringTo(file);
+        Resource resource = Resource.as(DefaultReadableBuffer.readBuffer(new FileInputStream(file)))
+                .withoutContentDisposition();
+        when(response.getResponseHeaders()).thenReturn(headers);
+        final ByteArrayOutputStream out = new ByteArrayOutputStream();
+        Response r = resource.render(context, response);
+        ReadableBuffer b = (ReadableBuffer) r.getEntity().entity();
+        ByteBuffer bf = ByteBuffer.allocate(17);
+        b.read(bf);
+        assertThat(new String(bf.array()), is("this is test log."));
+        verify(headers).putValue("Content-Type", "application/octet-stream");
+        verify(headers, noMoreInteractions()).putValue("Content-Disposition", "attachment");
+    }
+
+    @Test
+    public void testNullStreamResource() throws Exception {
+        thrown.expect(AssertionFailureException.class);
+        Resource.as((ReadableBuffer) null);
+    }
+
+    private void writeStringTo(File file) throws IOException {
+        FileOutputStream fileOut = new FileOutputStream(file);
+        fileOut.write("this is test log.".getBytes());
+        fileOut.flush();
+        fileOut.close();
+    }
 }
diff --git a/src/test/java/org/analogweb/core/response/TextTest.java b/src/test/java/org/analogweb/core/response/TextTest.java
index 7d18361..763ca80 100644
--- a/src/test/java/org/analogweb/core/response/TextTest.java
+++ b/src/test/java/org/analogweb/core/response/TextTest.java
@@ -21,137 +21,122 @@
 
 public class TextTest {
 
-	private RequestContext context;
-	private ResponseContext response;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    private RequestContext context;
+    private ResponseContext response;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Before
-	public void setUp() throws Exception {
-		context = mock(RequestContext.class);
-		response = mock(ResponseContext.class);
-	}
+    @Before
+    public void setUp() throws Exception {
+        context = mock(RequestContext.class);
+        response = mock(ResponseContext.class);
+    }
 
-	@Test
-	public void testDefaultText() throws Exception {
-		final String charset = Charset.defaultCharset().displayName();
-		final String responseText = "this is test!";
-		final Text actual = Text.with(responseText);
-		assertThat(actual.resolveContentType(), is("text/plain; charset="
-				+ charset));
-		assertThat(actual.getCharsetAsText(), is(Charset.defaultCharset()
-				.displayName()));
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = actual.render(context, response);
-		byte[] entity = (byte[]) r.getEntity().entity();
-		assertThat(new String(entity), is(responseText));
-		assertThat(actual.toString(), is(responseText));
-		verify(headers).putValue("Content-Type",
-				"text/plain; charset=" + charset);
-	}
+    @Test
+    public void testDefaultText() throws Exception {
+        final String charset = Charset.defaultCharset().displayName();
+        final String responseText = "this is test!";
+        final Text actual = Text.with(responseText);
+        assertThat(actual.resolveContentType(), is("text/plain; charset=" + charset));
+        assertThat(actual.getCharsetAsText(), is(Charset.defaultCharset().displayName()));
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = actual.render(context, response);
+        byte[] entity = (byte[]) r.getEntity().entity();
+        assertThat(new String(entity), is(responseText));
+        assertThat(actual.toString(), is(responseText));
+        verify(headers).putValue("Content-Type", "text/plain; charset=" + charset);
+    }
 
-	@Test
-	public void testDefaultTextEmptyCharset() throws Exception {
-		final String charset = "";
-		final String responseText = "this is test!";
-		final Text actual = Text.with(responseText).withCharset(charset);
-		assertThat(actual.resolveContentType(), is("text/plain; charset="
-				+ Charset.defaultCharset().displayName()));
-		assertThat(actual.getCharsetAsText(), is(Charset.defaultCharset()
-				.displayName()));
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = actual.render(context, response);
-		byte[] entity = (byte[]) r.getEntity().entity();
-		assertThat(new String(entity), is(responseText));
-		verify(headers)
-				.putValue(
-						"Content-Type",
-						"text/plain; charset="
-								+ Charset.defaultCharset().displayName());
-	}
+    @Test
+    public void testDefaultTextEmptyCharset() throws Exception {
+        final String charset = "";
+        final String responseText = "this is test!";
+        final Text actual = Text.with(responseText).withCharset(charset);
+        assertThat(actual.resolveContentType(), is("text/plain; charset=" + Charset.defaultCharset().displayName()));
+        assertThat(actual.getCharsetAsText(), is(Charset.defaultCharset().displayName()));
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = actual.render(context, response);
+        byte[] entity = (byte[]) r.getEntity().entity();
+        assertThat(new String(entity), is(responseText));
+        verify(headers).putValue("Content-Type", "text/plain; charset=" + Charset.defaultCharset().displayName());
+    }
 
-	@Test
-	public void testDefaultTextWithoutCharset() throws Exception {
-		final String responseText = "this is test!";
-		final Text actual = Text.with(responseText).withoutCharset();
-		assertThat(actual.resolveContentType(), is("text/plain"));
-		assertThat(actual.getCharsetAsText(), is(StringUtils.EMPTY));
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = actual.render(context, response);
-		byte[] entity = (byte[]) r.getEntity().entity();
-		assertThat(new String(entity), is(responseText));
-		verify(headers).putValue("Content-Type", "text/plain");
-	}
+    @Test
+    public void testDefaultTextWithoutCharset() throws Exception {
+        final String responseText = "this is test!";
+        final Text actual = Text.with(responseText).withoutCharset();
+        assertThat(actual.resolveContentType(), is("text/plain"));
+        assertThat(actual.getCharsetAsText(), is(StringUtils.EMPTY));
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = actual.render(context, response);
+        byte[] entity = (byte[]) r.getEntity().entity();
+        assertThat(new String(entity), is(responseText));
+        verify(headers).putValue("Content-Type", "text/plain");
+    }
 
-	@Test
-	public void testXMLText() throws Exception {
-		final String charset = Charset.defaultCharset().displayName();
-		final String responseText = "<root/>";
-		final Text actual = Text.with(responseText).typeAs("text/xml");
-		assertThat(actual.resolveContentType(), is("text/xml; charset="
-				+ charset));
-		assertThat(actual.getCharsetAsText(), is(charset));
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = actual.render(context, response);
-		byte[] entity = (byte[]) r.getEntity().entity();
-		assertThat(new String(entity), is(responseText));
-		verify(headers)
-				.putValue("Content-Type", "text/xml; charset=" + charset);
-	}
+    @Test
+    public void testXMLText() throws Exception {
+        final String charset = Charset.defaultCharset().displayName();
+        final String responseText = "<root/>";
+        final Text actual = Text.with(responseText).typeAs("text/xml");
+        assertThat(actual.resolveContentType(), is("text/xml; charset=" + charset));
+        assertThat(actual.getCharsetAsText(), is(charset));
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = actual.render(context, response);
+        byte[] entity = (byte[]) r.getEntity().entity();
+        assertThat(new String(entity), is(responseText));
+        verify(headers).putValue("Content-Type", "text/xml; charset=" + charset);
+    }
 
-	@Test
-	public void testJSONText() throws Exception {
-		final String charset = "utf-8";
-		final String responseText = "{\"foo\",\"baa\"}";
-		final Text actual = Text.with(responseText).typeAs("application/json")
-				.withCharset(charset);
-		assertThat(actual.resolveContentType(), is("application/json; charset="
-				+ charset));
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = actual.render(context, response);
-		byte[] entity = (byte[]) r.getEntity().entity();
-		assertThat(new String(entity), is(responseText));
-		verify(headers).putValue("Content-Type",
-				"application/json; charset=" + charset);
-	}
+    @Test
+    public void testJSONText() throws Exception {
+        final String charset = "utf-8";
+        final String responseText = "{\"foo\",\"baa\"}";
+        final Text actual = Text.with(responseText).typeAs("application/json").withCharset(charset);
+        assertThat(actual.resolveContentType(), is("application/json; charset=" + charset));
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = actual.render(context, response);
+        byte[] entity = (byte[]) r.getEntity().entity();
+        assertThat(new String(entity), is(responseText));
+        verify(headers).putValue("Content-Type", "application/json; charset=" + charset);
+    }
 
-	@Test
-	public void testMultibyteText() throws Exception {
-		final String responseText = "これはテストです";
-		final Text actual = Text.with(responseText).withCharset("Shift-JIS");
-		assertThat(actual.resolveContentType(),
-				is("text/plain; charset=Shift-JIS"));
-		assertThat(actual.getCharsetAsText(), is("Shift-JIS"));
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = actual.render(context, response);
-		byte[] entity = (byte[]) r.getEntity().entity();
-		assertThat(new String(entity, "Shift-JIS"), is(responseText));
-	}
+    @Test
+    public void testMultibyteText() throws Exception {
+        final String responseText = "これはテストです";
+        final Text actual = Text.with(responseText).withCharset("Shift-JIS");
+        assertThat(actual.resolveContentType(), is("text/plain; charset=Shift-JIS"));
+        assertThat(actual.getCharsetAsText(), is("Shift-JIS"));
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = actual.render(context, response);
+        byte[] entity = (byte[]) r.getEntity().entity();
+        assertThat(new String(entity, "Shift-JIS"), is(responseText));
+    }
 
-	@Test
-	public void testEmptyTextResponse() throws Exception {
-		final String responseText = null;
-		final Text actual = Text.with(responseText);
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		Response r = actual.render(context, response);
-		byte[] entity = (byte[]) r.getEntity().entity();
-		assertThat(new String(entity), is(StringUtils.EMPTY));
-	}
+    @Test
+    public void testEmptyTextResponse() throws Exception {
+        final String responseText = null;
+        final Text actual = Text.with(responseText);
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        Response r = actual.render(context, response);
+        byte[] entity = (byte[]) r.getEntity().entity();
+        assertThat(new String(entity), is(StringUtils.EMPTY));
+    }
 
-	@Test
-	public void testTextResponseWithUnknownCharset() throws Exception {
-		thrown.expect(IllegalCharsetNameException.class);
-		final String responseText = "this is test!";
-		final Text actual = Text.with(responseText).withCharset("*unknown*");
-		Headers headers = mock(Headers.class);
-		when(response.getResponseHeaders()).thenReturn(headers);
-		actual.render(context, response);
-	}
+    @Test
+    public void testTextResponseWithUnknownCharset() throws Exception {
+        thrown.expect(IllegalCharsetNameException.class);
+        final String responseText = "this is test!";
+        final Text actual = Text.with(responseText).withCharset("*unknown*");
+        Headers headers = mock(Headers.class);
+        when(response.getResponseHeaders()).thenReturn(headers);
+        actual.render(context, response);
+    }
 }
diff --git a/src/test/java/org/analogweb/junit/ExceptionCauseMatchers.java b/src/test/java/org/analogweb/junit/ExceptionCauseMatchers.java
index d3126f6..3b26da3 100644
--- a/src/test/java/org/analogweb/junit/ExceptionCauseMatchers.java
+++ b/src/test/java/org/analogweb/junit/ExceptionCauseMatchers.java
@@ -9,79 +9,79 @@
 
 public class ExceptionCauseMatchers {
 
-	public static As as(Class<? extends Throwable> t) {
-		return as(t, Causes.EMPTY);
-	}
-
-	public static As as(Class<? extends Throwable> t, Causes causes) {
-		return new As(t, causes);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static Causes causedBy(Class<? extends Throwable> t) {
-		return causedBy(new Class[]{t});
-	}
-
-	@SuppressWarnings("unchecked")
-	public static Causes causedBy(Class<? extends Throwable>... t) {
-		return new Causes(t);
-	}
-
-	static class As extends BaseMatcher<Throwable> {
-
-		private Causes causes;
-		private Class<? extends Throwable> t;
-
-		As(Class<? extends Throwable> t, Causes causes) {
-			this.t = t;
-			this.causes = causes;
-		}
-
-		@Override
-		public boolean matches(Object item) {
-			if (item instanceof Throwable) {
-				Throwable e = (Throwable) item;
-				if (t.isInstance(e)) {
-					if (causes.causes().isEmpty()) {
-						return true;
-					}
-					Throwable current = e.getCause();
-					for (Class<? extends Throwable> t : causes.causes()) {
-						if (current == null || t.isInstance(current) == false) {
-							this.t = t;
-							return false;
-						}
-						current = current.getCause();
-					}
-					return true;
-				}
-			}
-			return false;
-		}
-
-		@Override
-		public void describeTo(Description description) {
-			description.appendValue(t);
-		}
-	}
-
-	static class Causes {
-
-		@SuppressWarnings("unchecked")
-		static final Causes EMPTY = new Causes();
-		private List<Class<? extends Throwable>> causes;
-
-		@SuppressWarnings("unchecked")
-		Causes(Class<? extends Throwable>... classes) {
-			if (classes != null) {
-				this.causes = Arrays.asList(classes);
-			} else {
-				this.causes = Collections.emptyList();
-			}
-		}
-
-		public List<Class<? extends Throwable>> causes() {
-			return this.causes;
-		}
-	}
+    public static As as(Class<? extends Throwable> t) {
+        return as(t, Causes.EMPTY);
+    }
+
+    public static As as(Class<? extends Throwable> t, Causes causes) {
+        return new As(t, causes);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static Causes causedBy(Class<? extends Throwable> t) {
+        return causedBy(new Class[] { t });
+    }
+
+    @SuppressWarnings("unchecked")
+    public static Causes causedBy(Class<? extends Throwable>... t) {
+        return new Causes(t);
+    }
+
+    static class As extends BaseMatcher<Throwable> {
+
+        private Causes causes;
+        private Class<? extends Throwable> t;
+
+        As(Class<? extends Throwable> t, Causes causes) {
+            this.t = t;
+            this.causes = causes;
+        }
+
+        @Override
+        public boolean matches(Object item) {
+            if (item instanceof Throwable) {
+                Throwable e = (Throwable) item;
+                if (t.isInstance(e)) {
+                    if (causes.causes().isEmpty()) {
+                        return true;
+                    }
+                    Throwable current = e.getCause();
+                    for (Class<? extends Throwable> t : causes.causes()) {
+                        if (current == null || t.isInstance(current) == false) {
+                            this.t = t;
+                            return false;
+                        }
+                        current = current.getCause();
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        @Override
+        public void describeTo(Description description) {
+            description.appendValue(t);
+        }
+    }
+
+    static class Causes {
+
+        @SuppressWarnings("unchecked")
+        static final Causes EMPTY = new Causes();
+        private List<Class<? extends Throwable>> causes;
+
+        @SuppressWarnings("unchecked")
+        Causes(Class<? extends Throwable>... classes) {
+            if (classes != null) {
+                this.causes = Arrays.asList(classes);
+            } else {
+                this.causes = Collections.emptyList();
+            }
+        }
+
+        public List<Class<? extends Throwable>> causes() {
+            return this.causes;
+        }
+    }
 }
diff --git a/src/test/java/org/analogweb/junit/NoDescribeMatcher.java b/src/test/java/org/analogweb/junit/NoDescribeMatcher.java
index 47f6cf8..1934357 100644
--- a/src/test/java/org/analogweb/junit/NoDescribeMatcher.java
+++ b/src/test/java/org/analogweb/junit/NoDescribeMatcher.java
@@ -8,8 +8,8 @@
  */
 public abstract class NoDescribeMatcher<T> extends BaseMatcher<T> {
 
-	@Override
-	public void describeTo(Description arg0) {
-		// nop.
-	}
+    @Override
+    public void describeTo(Description arg0) {
+        // nop.
+    }
 }
diff --git a/src/test/java/org/analogweb/util/AnnotationUtilsTest.java b/src/test/java/org/analogweb/util/AnnotationUtilsTest.java
index 9660f30..d465496 100644
--- a/src/test/java/org/analogweb/util/AnnotationUtilsTest.java
+++ b/src/test/java/org/analogweb/util/AnnotationUtilsTest.java
@@ -22,204 +22,185 @@
  */
 public class AnnotationUtilsTest {
 
-	@Test
-	public void testFindAnnotation() {
-		SomeAnnotation actual = AnnotationUtils.findAnnotation(
-				SomeAnnotation.class, SomeClass.class.getAnnotations());
-		assertNotNull(actual);
-	}
-
-	@Test
-	public void testFindAnnotationInclude() {
-		SomeAnnotation actual = AnnotationUtils.findAnnotation(
-				SomeAnnotation.class, SomeIncludeClass.class.getAnnotations());
-		assertNotNull(actual);
-	}
-
-	@Test
-	public void testFindAnnotationViaType() {
-		SomeAnnotation actual = AnnotationUtils.findAnnotation(
-				SomeAnnotation.class, SomeClass.class);
-		assertNotNull(actual);
-	}
-
-	@Test
-	public void testFindAnnotationViaIncludedClass() {
-		SomeAnnotation actual = AnnotationUtils.findAnnotation(
-				SomeAnnotation.class, SomeIncludeClass.class);
-		assertNotNull(actual);
-	}
-
-	@Test
-	public void testFindAnnotationViaImplementsClass() {
-		SomeAnnotation actual = AnnotationUtils.findAnnotation(
-				SomeAnnotation.class, SomeClassImpl.class);
-		assertNotNull(actual);
-	}
-
-	@Test
-	public void testFindAnnotationNotFound() {
-		SomeAnnotation actual = AnnotationUtils.findAnnotation(
-				SomeAnnotation.class, AnyClass.class.getAnnotations());
-		assertNull(actual);
-	}
-
-	@Test
-	public void testFindAnnotationNotFound2() {
-		AnyAnnotation actual = AnnotationUtils.findAnnotation(
-				AnyAnnotation.class, AnyClass.class.getAnnotations());
-		assertNull(actual);
-	}
-
-	@Test
-	public void testFindAnnotationsViaMethod() throws Exception {
-		Method method = SomeClass.class.getMethod("doSomething");
-		List<SomeAnnotation> actual = AnnotationUtils.findAnnotations(
-				SomeAnnotation.class, method);
-		assertThat(actual.size(), is(1));
-		assertThat(actual.get(0), is(instanceOf(SomeAnnotation.class)));
-	}
-
-	@Test
-	public void testFindAnnotationViaExtendsMethod() throws Exception {
-		Method method = SomeClassExtends.class.getMethod("doSomething");
-		List<SomeAnnotation> actual = AnnotationUtils.findAnnotations(
-				SomeAnnotation.class, method);
-		assertThat(actual.size(), is(1));
-		assertThat(actual.get(0), is(instanceOf(SomeAnnotation.class)));
-	}
-
-	@Test
-	public void testFindAnnotationViaDelegatedMethod() throws Exception {
-		Method method = SomeIncludeClass.class.getMethod("doAnything");
-		List<SomeAnnotation> actual = AnnotationUtils.findAnnotations(
-				SomeAnnotation.class, method);
-		assertThat(actual.size(), is(1));
-		assertThat(actual.get(0), is(instanceOf(SomeAnnotation.class)));
-	}
-
-	@Test
-	public void testFindManyAnnotationViaDelegatedMethod() throws Exception {
-		Method method = ManyIncludeClass.class.getMethod("doAnything");
-		List<SomeAnnotation> actual = AnnotationUtils.findAnnotations(
-				SomeAnnotation.class, method);
-		assertThat(actual.size(), is(2));
-		assertThat(actual.get(0), is(instanceOf(SomeAnnotation.class)));
-	}
-
-	@Test
-	public void testFindInclusiveAnnotationViaDelegatedMethod()
-			throws Exception {
-		Method method = ManyIncludeClass.class.getMethod("doSomething");
-		List<SomeAnnotation> actual = AnnotationUtils.findAnnotations(
-				SomeAnnotation.class, method);
-		assertThat(actual.size(), is(1));
-		assertThat(actual.get(0), is(instanceOf(SomeAnnotation.class)));
-	}
-
-	@Test
-	public void testGetValue() throws Exception {
-		Method method = ManyIncludeClass.class.getMethod("doAnything");
-		List<SomeAnnotation> list = AnnotationUtils.findAnnotations(
-				SomeAnnotation.class, method);
-		String actual = AnnotationUtils.getValue(list.get(1));
-		assertThat(actual, is("hoge"));
-	}
-
-	@Test
-	public void testGetValuesNotAvairableAttribute() throws Exception {
-		Method method = ManyIncludeClass.class.getMethod("doAnything");
-		List<SomeAnnotation> list = AnnotationUtils.findAnnotations(
-				SomeAnnotation.class, method);
-		String actual = AnnotationUtils.getValue(list.get(1), "hoge");
-		assertThat(actual, is(nullValue()));
-	}
-
-	@Test
-	public void testIsDecleared() throws Exception {
-		boolean actual = AnnotationUtils.isDeclared(SomeAnnotation.class,
-				SomeAnnotationInclude.class);
-		assertThat(actual, is(true));
-		actual = AnnotationUtils.isDeclared(SomeAnnotation.class,
-				SomeClass.class);
-		assertThat(actual, is(true));
-		actual = AnnotationUtils.isDeclared(SomeAnnotation.class,
-				SomeAnnotation.class);
-		assertThat(actual, is(false));
-		actual = AnnotationUtils.isDeclared(SomeAnnotation.class,
-				Documented.class);
-		assertThat(actual, is(false));
-		actual = AnnotationUtils.isDeclared(SomeAnnotationInclude.class,
-				SomeClass.class);
-		assertThat(actual, is(false));
-	}
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE, ElementType.METHOD})
-	private @interface SomeAnnotation {
-
-		String value() default "";
-	}
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target({ElementType.TYPE, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
-	@SomeAnnotation
-	private @interface SomeAnnotationInclude {
-	}
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target({ElementType.TYPE, ElementType.METHOD})
-	@SomeAnnotationInclude
-	private @interface SomeAnnotationReInclude {
-	}
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-	private @interface AnyAnnotation {
-	}
-
-	@SomeAnnotation
-	private class SomeClass {
-
-		@SomeAnnotation
-		public void doSomething() {
-			// nop
-		}
-	}
-
-	@SomeAnnotation
-	private interface SomeClassIf {
-	}
-
-	private final class SomeClassImpl implements SomeClassIf {
-	}
-
-	@SomeAnnotationInclude
-	private final class SomeIncludeClass {
-
-		@SomeAnnotationInclude
-		public void doAnything() {
-			// nop
-		}
-	}
-
-	private final class AnyClass {
-	}
-
-	private final class SomeClassExtends extends SomeClass {
-	}
-
-	private final class ManyIncludeClass {
-
-		@SomeAnnotationInclude
-		@SomeAnnotation("hoge")
-		public void doAnything() {
-			// nop
-		}
-
-		@SomeAnnotationReInclude
-		public void doSomething() {
-			// nop
-		}
-	}
+    @Test
+    public void testFindAnnotation() {
+        SomeAnnotation actual = AnnotationUtils.findAnnotation(SomeAnnotation.class, SomeClass.class.getAnnotations());
+        assertNotNull(actual);
+    }
+
+    @Test
+    public void testFindAnnotationInclude() {
+        SomeAnnotation actual = AnnotationUtils.findAnnotation(SomeAnnotation.class,
+                SomeIncludeClass.class.getAnnotations());
+        assertNotNull(actual);
+    }
+
+    @Test
+    public void testFindAnnotationViaType() {
+        SomeAnnotation actual = AnnotationUtils.findAnnotation(SomeAnnotation.class, SomeClass.class);
+        assertNotNull(actual);
+    }
+
+    @Test
+    public void testFindAnnotationViaIncludedClass() {
+        SomeAnnotation actual = AnnotationUtils.findAnnotation(SomeAnnotation.class, SomeIncludeClass.class);
+        assertNotNull(actual);
+    }
+
+    @Test
+    public void testFindAnnotationViaImplementsClass() {
+        SomeAnnotation actual = AnnotationUtils.findAnnotation(SomeAnnotation.class, SomeClassImpl.class);
+        assertNotNull(actual);
+    }
+
+    @Test
+    public void testFindAnnotationNotFound() {
+        SomeAnnotation actual = AnnotationUtils.findAnnotation(SomeAnnotation.class, AnyClass.class.getAnnotations());
+        assertNull(actual);
+    }
+
+    @Test
+    public void testFindAnnotationNotFound2() {
+        AnyAnnotation actual = AnnotationUtils.findAnnotation(AnyAnnotation.class, AnyClass.class.getAnnotations());
+        assertNull(actual);
+    }
+
+    @Test
+    public void testFindAnnotationsViaMethod() throws Exception {
+        Method method = SomeClass.class.getMethod("doSomething");
+        List<SomeAnnotation> actual = AnnotationUtils.findAnnotations(SomeAnnotation.class, method);
+        assertThat(actual.size(), is(1));
+        assertThat(actual.get(0), is(instanceOf(SomeAnnotation.class)));
+    }
+
+    @Test
+    public void testFindAnnotationViaExtendsMethod() throws Exception {
+        Method method = SomeClassExtends.class.getMethod("doSomething");
+        List<SomeAnnotation> actual = AnnotationUtils.findAnnotations(SomeAnnotation.class, method);
+        assertThat(actual.size(), is(1));
+        assertThat(actual.get(0), is(instanceOf(SomeAnnotation.class)));
+    }
+
+    @Test
+    public void testFindAnnotationViaDelegatedMethod() throws Exception {
+        Method method = SomeIncludeClass.class.getMethod("doAnything");
+        List<SomeAnnotation> actual = AnnotationUtils.findAnnotations(SomeAnnotation.class, method);
+        assertThat(actual.size(), is(1));
+        assertThat(actual.get(0), is(instanceOf(SomeAnnotation.class)));
+    }
+
+    @Test
+    public void testFindManyAnnotationViaDelegatedMethod() throws Exception {
+        Method method = ManyIncludeClass.class.getMethod("doAnything");
+        List<SomeAnnotation> actual = AnnotationUtils.findAnnotations(SomeAnnotation.class, method);
+        assertThat(actual.size(), is(2));
+        assertThat(actual.get(0), is(instanceOf(SomeAnnotation.class)));
+    }
+
+    @Test
+    public void testFindInclusiveAnnotationViaDelegatedMethod() throws Exception {
+        Method method = ManyIncludeClass.class.getMethod("doSomething");
+        List<SomeAnnotation> actual = AnnotationUtils.findAnnotations(SomeAnnotation.class, method);
+        assertThat(actual.size(), is(1));
+        assertThat(actual.get(0), is(instanceOf(SomeAnnotation.class)));
+    }
+
+    @Test
+    public void testGetValue() throws Exception {
+        Method method = ManyIncludeClass.class.getMethod("doAnything");
+        List<SomeAnnotation> list = AnnotationUtils.findAnnotations(SomeAnnotation.class, method);
+        String actual = AnnotationUtils.getValue(list.get(1));
+        assertThat(actual, is("hoge"));
+    }
+
+    @Test
+    public void testGetValuesNotAvairableAttribute() throws Exception {
+        Method method = ManyIncludeClass.class.getMethod("doAnything");
+        List<SomeAnnotation> list = AnnotationUtils.findAnnotations(SomeAnnotation.class, method);
+        String actual = AnnotationUtils.getValue(list.get(1), "hoge");
+        assertThat(actual, is(nullValue()));
+    }
+
+    @Test
+    public void testIsDecleared() throws Exception {
+        boolean actual = AnnotationUtils.isDeclared(SomeAnnotation.class, SomeAnnotationInclude.class);
+        assertThat(actual, is(true));
+        actual = AnnotationUtils.isDeclared(SomeAnnotation.class, SomeClass.class);
+        assertThat(actual, is(true));
+        actual = AnnotationUtils.isDeclared(SomeAnnotation.class, SomeAnnotation.class);
+        assertThat(actual, is(false));
+        actual = AnnotationUtils.isDeclared(SomeAnnotation.class, Documented.class);
+        assertThat(actual, is(false));
+        actual = AnnotationUtils.isDeclared(SomeAnnotationInclude.class, SomeClass.class);
+        assertThat(actual, is(false));
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE, ElementType.METHOD })
+    private @interface SomeAnnotation {
+
+        String value() default "";
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.ANNOTATION_TYPE })
+    @SomeAnnotation
+    private @interface SomeAnnotationInclude {
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ ElementType.TYPE, ElementType.METHOD })
+    @SomeAnnotationInclude
+    private @interface SomeAnnotationReInclude {
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE })
+    private @interface AnyAnnotation {
+    }
+
+    @SomeAnnotation
+    private class SomeClass {
+
+        @SomeAnnotation
+        public void doSomething() {
+            // nop
+        }
+    }
+
+    @SomeAnnotation
+    private interface SomeClassIf {
+    }
+
+    private final class SomeClassImpl implements SomeClassIf {
+    }
+
+    @SomeAnnotationInclude
+    private final class SomeIncludeClass {
+
+        @SomeAnnotationInclude
+        public void doAnything() {
+            // nop
+        }
+    }
+
+    private final class AnyClass {
+    }
+
+    private final class SomeClassExtends extends SomeClass {
+    }
+
+    private final class ManyIncludeClass {
+
+        @SomeAnnotationInclude
+        @SomeAnnotation("hoge")
+        public void doAnything() {
+            // nop
+        }
+
+        @SomeAnnotationReInclude
+        public void doSomething() {
+            // nop
+        }
+    }
 }
diff --git a/src/test/java/org/analogweb/util/ApplicationPropertiesHolderTest.java b/src/test/java/org/analogweb/util/ApplicationPropertiesHolderTest.java
index 64d7101..5d7117f 100644
--- a/src/test/java/org/analogweb/util/ApplicationPropertiesHolderTest.java
+++ b/src/test/java/org/analogweb/util/ApplicationPropertiesHolderTest.java
@@ -16,51 +16,50 @@
 
 public class ApplicationPropertiesHolderTest {
 
-	private Application app;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-	@Rule
-	public TemporaryFolder folder = new TemporaryFolder();
+    private Application app;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
 
-	@Before
-	public void setUp() {
-		app = mock(Application.class);
-	}
+    @Before
+    public void setUp() {
+        app = mock(Application.class);
+    }
 
-	@After
-	public void tearDown() {
-		ApplicationPropertiesHolder.dispose(app);
-	}
+    @After
+    public void tearDown() {
+        ApplicationPropertiesHolder.dispose(app);
+    }
 
-	@Test
-	public void testConfigure() {
-		ApplicationProperties config = mock(ApplicationProperties.class);
-		ApplicationProperties actual = ApplicationPropertiesHolder.configure(
-				app, config);
-		assertThat(actual, is(config));
-		assertThat(ApplicationPropertiesHolder.current(), is(config));
-	}
+    @Test
+    public void testConfigure() {
+        ApplicationProperties config = mock(ApplicationProperties.class);
+        ApplicationProperties actual = ApplicationPropertiesHolder.configure(app, config);
+        assertThat(actual, is(config));
+        assertThat(ApplicationPropertiesHolder.current(), is(config));
+    }
 
-	@Test
-	public void testNoConfigure() {
-		thrown.expect(ApplicationConfigurationException.class);
-		ApplicationPropertiesHolder.current();
-	}
+    @Test
+    public void testNoConfigure() {
+        thrown.expect(ApplicationConfigurationException.class);
+        ApplicationPropertiesHolder.current();
+    }
 
-	@Test
-	public void testReConfigure() {
-		thrown.expect(ApplicationConfigurationException.class);
-		ApplicationProperties config = mock(ApplicationProperties.class);
-		ApplicationPropertiesHolder.configure(app, config);
-		ApplicationPropertiesHolder.configure(app, config);
-	}
+    @Test
+    public void testReConfigure() {
+        thrown.expect(ApplicationConfigurationException.class);
+        ApplicationProperties config = mock(ApplicationProperties.class);
+        ApplicationPropertiesHolder.configure(app, config);
+        ApplicationPropertiesHolder.configure(app, config);
+    }
 
-	@Test
-	public void testDisposeAndGet() {
-		thrown.expect(ApplicationConfigurationException.class);
-		ApplicationProperties config = mock(ApplicationProperties.class);
-		ApplicationPropertiesHolder.configure(app, config);
-		ApplicationPropertiesHolder.dispose(app);
-		ApplicationPropertiesHolder.current();
-	}
+    @Test
+    public void testDisposeAndGet() {
+        thrown.expect(ApplicationConfigurationException.class);
+        ApplicationProperties config = mock(ApplicationProperties.class);
+        ApplicationPropertiesHolder.configure(app, config);
+        ApplicationPropertiesHolder.dispose(app);
+        ApplicationPropertiesHolder.current();
+    }
 }
diff --git a/src/test/java/org/analogweb/util/ArrayUtilsTest.java b/src/test/java/org/analogweb/util/ArrayUtilsTest.java
index c9fde36..9593800 100644
--- a/src/test/java/org/analogweb/util/ArrayUtilsTest.java
+++ b/src/test/java/org/analogweb/util/ArrayUtilsTest.java
@@ -15,107 +15,107 @@
  */
 public class ArrayUtilsTest {
 
-	@Test
-	public void testIsNotEmpty() {
-		String[] anArray = new String[]{"a", "b", "c"};
-		assertTrue(ArrayUtils.isNotEmpty(anArray));
-	}
-
-	@Test
-	public void testIsNotEmptyWithEmptyArray() {
-		Object[] anArray = new Object[0];
-		assertFalse(ArrayUtils.isNotEmpty(anArray));
-	}
-
-	@Test
-	public void testIsNotEmptyWithNullArray() {
-		Object[] anArray = null;
-		assertFalse(ArrayUtils.isNotEmpty(anArray));
-	}
-
-	@Test
-	public void testIsEmpty() {
-		String[] anArray = new String[]{"a", "b", "c"};
-		assertFalse(ArrayUtils.isEmpty(anArray));
-	}
-
-	@Test
-	public void testIsEmptyWithEmptyArray() {
-		Object[] anArray = new Object[0];
-		assertTrue(ArrayUtils.isEmpty(anArray));
-	}
-
-	@Test
-	public void testIsEmptyWithNullArray() {
-		Object[] anArray = null;
-		assertTrue(ArrayUtils.isEmpty(anArray));
-	}
-
-	@Test
-	public void testNewArray() {
-		String[] expected = {"a", "b", "c"};
-		String[] actual = ArrayUtils.newArray("a", "b", "c");
-		assertArrayEquals(actual, expected);
-	}
-
-	@Test
-	public void testClone() {
-		String[] expected = {"a", "b", "c"};
-		String[] actual = ArrayUtils.clone(String.class, expected);
-		assertArrayEquals(actual, expected);
-		assertNotSame(expected, actual);
-	}
-
-	@Test
-	public void testCloneArray() {
-		String[] expected = {"a", "b", "c"};
-		String[] actual = ArrayUtils.clone(String.class, expected);
-		assertArrayEquals(actual, expected);
-		assertNotSame(expected, actual);
-	}
-
-	@Test
-	public void testCloneEmpty() {
-		String[] expected = {};
-		String[] actual = ArrayUtils.clone(String.class);
-		assertArrayEquals(actual, expected);
-		assertNotSame(expected, actual);
-	}
-
-	@Test
-	public void testCloneNull() {
-		String[] actual = ArrayUtils.clone(String.class, (String[]) null);
-		assertNull(actual);
-	}
-
-	@Test
-	public void testCloneArrayWithNullType() {
-		String[] expected = {"a", "b", "c"};
-		String[] actual = ArrayUtils.clone(null, expected);
-		assertArrayEquals(actual, expected);
-		assertSame(expected, actual);
-	}
-
-	@Test
-	public void testAddToArray() {
-		String[] expected = {"a", "b", "c", "d"};
-		String[] actual = ArrayUtils.add(String.class, "d", "a", "b", "c");
-		assertArrayEquals(actual, expected);
-	}
-
-	@Test
-	public void testAddMultipleValueToArray() {
-		String[] expected = {"a", "b", "c", "d", "e", "f"};
-		String[] actual = ArrayUtils.add(String.class, "d", "a", "b", "c");
-		actual = ArrayUtils.add(String.class, "e", actual);
-		actual = ArrayUtils.add(String.class, "f", actual);
-		assertArrayEquals(actual, expected);
-	}
-
-	@Test
-	public void testAddNullToArray() {
-		String[] expected = {"a", "b", "c", null};
-		String[] actual = ArrayUtils.add(String.class, null, "a", "b", "c");
-		assertArrayEquals(actual, expected);
-	}
+    @Test
+    public void testIsNotEmpty() {
+        String[] anArray = new String[] { "a", "b", "c" };
+        assertTrue(ArrayUtils.isNotEmpty(anArray));
+    }
+
+    @Test
+    public void testIsNotEmptyWithEmptyArray() {
+        Object[] anArray = new Object[0];
+        assertFalse(ArrayUtils.isNotEmpty(anArray));
+    }
+
+    @Test
+    public void testIsNotEmptyWithNullArray() {
+        Object[] anArray = null;
+        assertFalse(ArrayUtils.isNotEmpty(anArray));
+    }
+
+    @Test
+    public void testIsEmpty() {
+        String[] anArray = new String[] { "a", "b", "c" };
+        assertFalse(ArrayUtils.isEmpty(anArray));
+    }
+
+    @Test
+    public void testIsEmptyWithEmptyArray() {
+        Object[] anArray = new Object[0];
+        assertTrue(ArrayUtils.isEmpty(anArray));
+    }
+
+    @Test
+    public void testIsEmptyWithNullArray() {
+        Object[] anArray = null;
+        assertTrue(ArrayUtils.isEmpty(anArray));
+    }
+
+    @Test
+    public void testNewArray() {
+        String[] expected = { "a", "b", "c" };
+        String[] actual = ArrayUtils.newArray("a", "b", "c");
+        assertArrayEquals(actual, expected);
+    }
+
+    @Test
+    public void testClone() {
+        String[] expected = { "a", "b", "c" };
+        String[] actual = ArrayUtils.clone(String.class, expected);
+        assertArrayEquals(actual, expected);
+        assertNotSame(expected, actual);
+    }
+
+    @Test
+    public void testCloneArray() {
+        String[] expected = { "a", "b", "c" };
+        String[] actual = ArrayUtils.clone(String.class, expected);
+        assertArrayEquals(actual, expected);
+        assertNotSame(expected, actual);
+    }
+
+    @Test
+    public void testCloneEmpty() {
+        String[] expected = {};
+        String[] actual = ArrayUtils.clone(String.class);
+        assertArrayEquals(actual, expected);
+        assertNotSame(expected, actual);
+    }
+
+    @Test
+    public void testCloneNull() {
+        String[] actual = ArrayUtils.clone(String.class, (String[]) null);
+        assertNull(actual);
+    }
+
+    @Test
+    public void testCloneArrayWithNullType() {
+        String[] expected = { "a", "b", "c" };
+        String[] actual = ArrayUtils.clone(null, expected);
+        assertArrayEquals(actual, expected);
+        assertSame(expected, actual);
+    }
+
+    @Test
+    public void testAddToArray() {
+        String[] expected = { "a", "b", "c", "d" };
+        String[] actual = ArrayUtils.add(String.class, "d", "a", "b", "c");
+        assertArrayEquals(actual, expected);
+    }
+
+    @Test
+    public void testAddMultipleValueToArray() {
+        String[] expected = { "a", "b", "c", "d", "e", "f" };
+        String[] actual = ArrayUtils.add(String.class, "d", "a", "b", "c");
+        actual = ArrayUtils.add(String.class, "e", actual);
+        actual = ArrayUtils.add(String.class, "f", actual);
+        assertArrayEquals(actual, expected);
+    }
+
+    @Test
+    public void testAddNullToArray() {
+        String[] expected = { "a", "b", "c", null };
+        String[] actual = ArrayUtils.add(String.class, null, "a", "b", "c");
+        assertArrayEquals(actual, expected);
+    }
 }
diff --git a/src/test/java/org/analogweb/util/AssertionTest.java b/src/test/java/org/analogweb/util/AssertionTest.java
index 314a627..7d473f5 100644
--- a/src/test/java/org/analogweb/util/AssertionTest.java
+++ b/src/test/java/org/analogweb/util/AssertionTest.java
@@ -13,19 +13,19 @@
  */
 public class AssertionTest {
 
-	@Test
-	public void testAssertNotNull() {
-		try {
-			Assertion.notNull(null, "foo");
-			fail("expected exception not occured.");
-		} catch (AssertionFailureException e) {
-			assertThat(e.getRequiredName(), is("foo"));
-		}
-	}
+    @Test
+    public void testAssertNotNull() {
+        try {
+            Assertion.notNull(null, "foo");
+            fail("expected exception not occured.");
+        } catch (AssertionFailureException e) {
+            assertThat(e.getRequiredName(), is("foo"));
+        }
+    }
 
-	@Test
-	public void testAssertNotNullWithArg() {
-		Assertion.notNull("baa", "foo");
-		// nothing to do.
-	}
+    @Test
+    public void testAssertNotNullWithArg() {
+        Assertion.notNull("baa", "foo");
+        // nothing to do.
+    }
 }
diff --git a/src/test/java/org/analogweb/util/ClassUtilsTest.java b/src/test/java/org/analogweb/util/ClassUtilsTest.java
index 91b742e..a482c5d 100644
--- a/src/test/java/org/analogweb/util/ClassUtilsTest.java
+++ b/src/test/java/org/analogweb/util/ClassUtilsTest.java
@@ -14,27 +14,24 @@
  */
 public class ClassUtilsTest {
 
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Test
-	public void testForNameQuietly() {
-		Class<?> actual = ClassUtils.forNameQuietly(ClassUtilsTest.class
-				.getCanonicalName());
-		assertThat(actual.getCanonicalName(), is(this.getClass()
-				.getCanonicalName()));
-	}
+    @Test
+    public void testForNameQuietly() {
+        Class<?> actual = ClassUtils.forNameQuietly(ClassUtilsTest.class.getCanonicalName());
+        assertThat(actual.getCanonicalName(), is(this.getClass().getCanonicalName()));
+    }
 
-	@Test
-	public void testForNameQuietlyNotAviableClass() {
-		Class<?> actual = ClassUtils
-				.forNameQuietly("jp.snowgoose.not.exists.Class");
-		assertNull(actual);
-	}
+    @Test
+    public void testForNameQuietlyNotAviableClass() {
+        Class<?> actual = ClassUtils.forNameQuietly("jp.snowgoose.not.exists.Class");
+        assertNull(actual);
+    }
 
-	@Test
-	public void testForNameQuietlyNullClass() {
-		thrown.expect(NullPointerException.class);
-		ClassUtils.forNameQuietly(null);
-	}
+    @Test
+    public void testForNameQuietlyNullClass() {
+        thrown.expect(NullPointerException.class);
+        ClassUtils.forNameQuietly(null);
+    }
 }
diff --git a/src/test/java/org/analogweb/util/CollectionUtilsTest.java b/src/test/java/org/analogweb/util/CollectionUtilsTest.java
index f4fa5d3..f8151fd 100644
--- a/src/test/java/org/analogweb/util/CollectionUtilsTest.java
+++ b/src/test/java/org/analogweb/util/CollectionUtilsTest.java
@@ -13,32 +13,27 @@
 
 public class CollectionUtilsTest {
 
-	@Test
-	public void testIsEmpty() {
-		assertTrue(CollectionUtils.isEmpty(Collections.emptyList()));
-		assertTrue(CollectionUtils.isEmpty(null));
-		assertFalse(CollectionUtils.isEmpty(Arrays.asList("")));
-		assertFalse(CollectionUtils.isEmpty(Arrays.asList("a", "b")));
-	}
+    @Test
+    public void testIsEmpty() {
+        assertTrue(CollectionUtils.isEmpty(Collections.emptyList()));
+        assertTrue(CollectionUtils.isEmpty(null));
+        assertFalse(CollectionUtils.isEmpty(Arrays.asList("")));
+        assertFalse(CollectionUtils.isEmpty(Arrays.asList("a", "b")));
+    }
 
-	@Test
-	public void testIsNotEmpty() {
-		assertFalse(CollectionUtils.isNotEmpty(Collections.emptyList()));
-		assertFalse(CollectionUtils.isNotEmpty(null));
-		assertTrue(CollectionUtils.isNotEmpty(Arrays.asList("")));
-		assertTrue(CollectionUtils.isNotEmpty(Arrays.asList("a", "b")));
-	}
+    @Test
+    public void testIsNotEmpty() {
+        assertFalse(CollectionUtils.isNotEmpty(Collections.emptyList()));
+        assertFalse(CollectionUtils.isNotEmpty(null));
+        assertTrue(CollectionUtils.isNotEmpty(Arrays.asList("")));
+        assertTrue(CollectionUtils.isNotEmpty(Arrays.asList("a", "b")));
+    }
 
-	@Test
-	public void testIndexOf() {
-		assertThat(CollectionUtils.indexOf(Arrays.asList("a", "b", "c"), 1),
-				is("b"));
-		assertThat(CollectionUtils.indexOf(Arrays.asList("a", "b", "c"), 3),
-				is(nullValue()));
-		assertThat(CollectionUtils.indexOf(Arrays.asList("a", "b", "c"), -1),
-				is(nullValue()));
-		assertThat(
-				CollectionUtils.indexOf(Arrays.asList("a", "b", "c"), 3, "d"),
-				is("d"));
-	}
+    @Test
+    public void testIndexOf() {
+        assertThat(CollectionUtils.indexOf(Arrays.asList("a", "b", "c"), 1), is("b"));
+        assertThat(CollectionUtils.indexOf(Arrays.asList("a", "b", "c"), 3), is(nullValue()));
+        assertThat(CollectionUtils.indexOf(Arrays.asList("a", "b", "c"), -1), is(nullValue()));
+        assertThat(CollectionUtils.indexOf(Arrays.asList("a", "b", "c"), 3, "d"), is("d"));
+    }
 }
diff --git a/src/test/java/org/analogweb/util/CountingOutputStreamTest.java b/src/test/java/org/analogweb/util/CountingOutputStreamTest.java
index 622d41d..0085c5a 100644
--- a/src/test/java/org/analogweb/util/CountingOutputStreamTest.java
+++ b/src/test/java/org/analogweb/util/CountingOutputStreamTest.java
@@ -10,14 +10,14 @@
 
 public class CountingOutputStreamTest {
 
-	@Test
-	@SuppressWarnings("resource")
-	public void test() throws IOException {
-		byte[] bytes = "i ♥ u".getBytes();// 7 bytes.
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		CountingOutputStream actual = new CountingOutputStream(out);
-		actual.write(bytes);
-		assertThat(actual.getCount(), is(7L));
-		assertThat(new String(out.toByteArray()), is(new String(bytes)));
-	}
+    @Test
+    @SuppressWarnings("resource")
+    public void test() throws IOException {
+        byte[] bytes = "i ♥ u".getBytes();// 7 bytes.
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        CountingOutputStream actual = new CountingOutputStream(out);
+        actual.write(bytes);
+        assertThat(actual.getCount(), is(7L));
+        assertThat(new String(out.toByteArray()), is(new String(bytes)));
+    }
 }
diff --git a/src/test/java/org/analogweb/util/FileClassCollectorTest.java b/src/test/java/org/analogweb/util/FileClassCollectorTest.java
index b98665e..98898c2 100644
--- a/src/test/java/org/analogweb/util/FileClassCollectorTest.java
+++ b/src/test/java/org/analogweb/util/FileClassCollectorTest.java
@@ -23,73 +23,63 @@
  */
 public class FileClassCollectorTest {
 
-	private FileClassCollector collector;
-	private static final String PACKAGE_NAME = FileClassCollectorTest.class
-			.getPackage().getName() + ".classcollector";
-	private ClassLoader classLoader;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    private FileClassCollector collector;
+    private static final String PACKAGE_NAME = FileClassCollectorTest.class.getPackage().getName() + ".classcollector";
+    private ClassLoader classLoader;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Before
-	public void setUp() throws Exception {
-		collector = new FileClassCollector();
-		classLoader = Thread.currentThread().getContextClassLoader();
-	}
+    @Before
+    public void setUp() throws Exception {
+        collector = new FileClassCollector();
+        classLoader = Thread.currentThread().getContextClassLoader();
+    }
 
-	@Test
-	public void testCollect() throws Exception {
-		Collection<Class<?>> collectedClasses = collector.collect(PACKAGE_NAME,
-				getPackageURL(PACKAGE_NAME), classLoader);
-		assertContainsInstanceOfTypes(collectedClasses, new Class<?>[]{
-				Foo.class, Baa.class, Baz.class, Boo.class, Bee.class});
-	}
+    @Test
+    public void testCollect() throws Exception {
+        Collection<Class<?>> collectedClasses = collector.collect(PACKAGE_NAME, getPackageURL(PACKAGE_NAME),
+                classLoader);
+        assertContainsInstanceOfTypes(collectedClasses,
+                new Class<?>[] { Foo.class, Baa.class, Baz.class, Boo.class, Bee.class });
+    }
 
-	@Test
-	public void testCollect2() throws Exception {
-		// Unsupported.
-		Collection<Class<?>> collectedClasses = collector.collect(
-				getPackageURL(PACKAGE_NAME), classLoader);
-		assertThat(collectedClasses.isEmpty(), is(true));
-	}
+    @Test
+    public void testCollect2() throws Exception {
+        // Unsupported.
+        Collection<Class<?>> collectedClasses = collector.collect(getPackageURL(PACKAGE_NAME), classLoader);
+        assertThat(collectedClasses.isEmpty(), is(true));
+    }
 
-	@Test
-	public void testCollectWithNullPackageName() throws Exception {
-		Collection<Class<?>> result = collector
-				.collect(null, null, classLoader);
-		assertTrue(result.isEmpty());
-	}
+    @Test
+    public void testCollectWithNullPackageName() throws Exception {
+        Collection<Class<?>> result = collector.collect(null, null, classLoader);
+        assertTrue(result.isEmpty());
+    }
 
-	@Test
-	public void testCollectWithNullResource() throws Exception {
-		Collection<Class<?>> result = collector.collect(PACKAGE_NAME, null,
-				null);
-		assertTrue(result.isEmpty());
-	}
+    @Test
+    public void testCollectWithNullResource() throws Exception {
+        Collection<Class<?>> result = collector.collect(PACKAGE_NAME, null, null);
+        assertTrue(result.isEmpty());
+    }
 
-	@Test
-	public void testCollectWithInvalidPackageName() throws Exception {
-		Collection<Class<?>> result = collector.collect("invalid.package.name",
-				null, classLoader);
-		assertTrue(result.isEmpty());
-	}
+    @Test
+    public void testCollectWithInvalidPackageName() throws Exception {
+        Collection<Class<?>> result = collector.collect("invalid.package.name", null, classLoader);
+        assertTrue(result.isEmpty());
+    }
 
-	private void assertContainsInstanceOfTypes(Collection<?> actual,
-			Class<?>... expectedClasses) {
-		for (Class<?> expected : expectedClasses) {
-			for (Object obj : actual) {
-				if (expected.equals((obj instanceof Class<?>) ? obj : obj
-						.getClass())) {
-					return;
-				}
-			}
-			fail(String.format(
-					"actual collection not contains instance of class %s",
-					expected));
-		}
-	}
+    private void assertContainsInstanceOfTypes(Collection<?> actual, Class<?>... expectedClasses) {
+        for (Class<?> expected : expectedClasses) {
+            for (Object obj : actual) {
+                if (expected.equals((obj instanceof Class<?>) ? obj : obj.getClass())) {
+                    return;
+                }
+            }
+            fail(String.format("actual collection not contains instance of class %s", expected));
+        }
+    }
 
-	private URL getPackageURL(String packageName) {
-		return ResourceUtils.findPackageResources(packageName, classLoader)
-				.get(0);
-	}
+    private URL getPackageURL(String packageName) {
+        return ResourceUtils.findPackageResources(packageName, classLoader).get(0);
+    }
 }
diff --git a/src/test/java/org/analogweb/util/IOUtilsTest.java b/src/test/java/org/analogweb/util/IOUtilsTest.java
index a0f9ebd..e432a22 100644
--- a/src/test/java/org/analogweb/util/IOUtilsTest.java
+++ b/src/test/java/org/analogweb/util/IOUtilsTest.java
@@ -22,89 +22,88 @@
  */
 public class IOUtilsTest {
 
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
-	@Test
-	public void testCloseQuierly() throws IOException {
-		Closeable closeable = mock(Closeable.class);
-		IOUtils.closeQuietly(closeable);
-		verify(closeable).close();
-	}
-
-	@Test
-	public void testCloseQuierlyThrowsException() throws IOException {
-		Closeable closeable = mock(Closeable.class);
-		doThrow(new IOException()).when(closeable).close();
-		IOUtils.closeQuietly(closeable);
-	}
-
-	@Test
-	public void testCloseQuierlyWithoutResource() throws IOException {
-		Closeable closeable = null;
-		IOUtils.closeQuietly(closeable);
-	}
-
-	@Test
-	public void testCopyQuietly() {
-		InputStream in = new ByteArrayInputStream("this is test!".getBytes());
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		assertThat(IOUtils.copyQuietly(in, out), is(13));
-		assertThat(new String(out.toByteArray()), is("this is test!"));
-	}
-
-	@Test
-	public void testCopy() throws Exception {
-		InputStream in = new ByteArrayInputStream("this is test!".getBytes());
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		assertThat(IOUtils.copy(in, out), is(13));
-		assertThat(new String(out.toByteArray()), is("this is test!"));
-	}
-
-	@Test
-	public void testCopyQuietlyOnException() throws Exception {
-		InputStream in = new ByteArrayInputStream("this is test!".getBytes());
-		ByteArrayOutputStream out = new ByteArrayOutputStream() {
-
-			@Override
-			public void flush() throws IOException {
-				write(" with exception!".getBytes());
-				throw new IOException();
-			}
-		};
-		assertThat(IOUtils.copyQuietly(in, out), is(-1));
-		assertThat(new String(out.toByteArray()),
-				is("this is test! with exception!"));
-	}
-
-	@Test
-	public void testCopyOnException() throws Exception {
-		thrown.expect(IOException.class);
-		InputStream in = new ByteArrayInputStream("this is test!".getBytes());
-		ByteArrayOutputStream out = new ByteArrayOutputStream() {
-
-			@Override
-			public void flush() throws IOException {
-				write(" with exception!".getBytes());
-				throw new IOException("exception thrown!");
-			}
-		};
-		IOUtils.copy(in, out);
-	}
-
-	@Test
-	public void testToStringViaReader() throws Exception {
-		String expected = "this is test!";
-		InputStream in = new ByteArrayInputStream(expected.getBytes());
-		String actual = IOUtils.toString(new InputStreamReader(in));
-		assertThat(actual, is(expected));
-	}
-
-	@Test
-	public void testToStringViaStream() throws Exception {
-		String expected = "this is test!";
-		InputStream in = new ByteArrayInputStream(expected.getBytes());
-		String actual = IOUtils.toString(in);
-		assertThat(actual, is(expected));
-	}
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void testCloseQuierly() throws IOException {
+        Closeable closeable = mock(Closeable.class);
+        IOUtils.closeQuietly(closeable);
+        verify(closeable).close();
+    }
+
+    @Test
+    public void testCloseQuierlyThrowsException() throws IOException {
+        Closeable closeable = mock(Closeable.class);
+        doThrow(new IOException()).when(closeable).close();
+        IOUtils.closeQuietly(closeable);
+    }
+
+    @Test
+    public void testCloseQuierlyWithoutResource() throws IOException {
+        Closeable closeable = null;
+        IOUtils.closeQuietly(closeable);
+    }
+
+    @Test
+    public void testCopyQuietly() {
+        InputStream in = new ByteArrayInputStream("this is test!".getBytes());
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        assertThat(IOUtils.copyQuietly(in, out), is(13));
+        assertThat(new String(out.toByteArray()), is("this is test!"));
+    }
+
+    @Test
+    public void testCopy() throws Exception {
+        InputStream in = new ByteArrayInputStream("this is test!".getBytes());
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        assertThat(IOUtils.copy(in, out), is(13));
+        assertThat(new String(out.toByteArray()), is("this is test!"));
+    }
+
+    @Test
+    public void testCopyQuietlyOnException() throws Exception {
+        InputStream in = new ByteArrayInputStream("this is test!".getBytes());
+        ByteArrayOutputStream out = new ByteArrayOutputStream() {
+
+            @Override
+            public void flush() throws IOException {
+                write(" with exception!".getBytes());
+                throw new IOException();
+            }
+        };
+        assertThat(IOUtils.copyQuietly(in, out), is(-1));
+        assertThat(new String(out.toByteArray()), is("this is test! with exception!"));
+    }
+
+    @Test
+    public void testCopyOnException() throws Exception {
+        thrown.expect(IOException.class);
+        InputStream in = new ByteArrayInputStream("this is test!".getBytes());
+        ByteArrayOutputStream out = new ByteArrayOutputStream() {
+
+            @Override
+            public void flush() throws IOException {
+                write(" with exception!".getBytes());
+                throw new IOException("exception thrown!");
+            }
+        };
+        IOUtils.copy(in, out);
+    }
+
+    @Test
+    public void testToStringViaReader() throws Exception {
+        String expected = "this is test!";
+        InputStream in = new ByteArrayInputStream(expected.getBytes());
+        String actual = IOUtils.toString(new InputStreamReader(in));
+        assertThat(actual, is(expected));
+    }
+
+    @Test
+    public void testToStringViaStream() throws Exception {
+        String expected = "this is test!";
+        InputStream in = new ByteArrayInputStream(expected.getBytes());
+        String actual = IOUtils.toString(in);
+        assertThat(actual, is(expected));
+    }
 }
diff --git a/src/test/java/org/analogweb/util/JarClassCollectorTest.java b/src/test/java/org/analogweb/util/JarClassCollectorTest.java
index 8378150..2d4a590 100644
--- a/src/test/java/org/analogweb/util/JarClassCollectorTest.java
+++ b/src/test/java/org/analogweb/util/JarClassCollectorTest.java
@@ -24,147 +24,122 @@
  */
 public class JarClassCollectorTest {
 
-	private static final String PACKAGE_NAME = JarClassCollectorTest.class
-			.getPackage().getName() + ".classcollector";
-	private JarClassCollector collector;
-	private ClassLoader classLoader;
-	private ClassLoader smallClassLoader;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@Before
-	public void setUp() throws Exception {
-		collector = new JarClassCollector();
-		classLoader = Thread.currentThread().getContextClassLoader();
-	}
-
-	@After
-	public void tearDown() throws Exception {
-		classLoader = null;
-		smallClassLoader = null;
-	}
-
-	@Test
-	public void testCollect() throws Exception {
-		final URL resource = Thread
-				.currentThread()
-				.getContextClassLoader()
-				.getResource(
-						getClass().getCanonicalName().replace('.', '/')
-								+ ".jar");
-		smallClassLoader = AccessController
-				.doPrivileged(new PrivilegedAction<ClassLoader>() {
-
-					@Override
-					public ClassLoader run() {
-						return new URLClassLoader(new URL[]{resource});
-					}
-				});
-		Collection<String> scannedClassNames = classNames(collector.collect(
-				"a.b.c",
-				ResourceUtils.findPackageResources("a.b.c", smallClassLoader)
-						.get(0), smallClassLoader));
-		assertThat(scannedClassNames.size(), is(2));
-		assertThat(scannedClassNames.contains("a.b.c.Foo"), is(true));
-		assertThat(scannedClassNames.contains("a.b.c.Foo.FooBaa"), is(true));
-		scannedClassNames = classNames(collector.collect("a.b.d", ResourceUtils
-				.findPackageResources("a.b.d", smallClassLoader).get(0),
-				smallClassLoader));
-		assertThat(scannedClassNames.size(), is(2));
-		assertThat(scannedClassNames.contains("a.b.d.Baa"), is(true));
-		assertThat(scannedClassNames.contains("a.b.d.BaaImpl"), is(true));
-		scannedClassNames = classNames(collector.collect("a.b.e", ResourceUtils
-				.findPackageResources("a.b.e", smallClassLoader).get(0),
-				smallClassLoader));
-		assertThat(scannedClassNames.size(), is(1));
-		assertThat(scannedClassNames.contains("a.b.e.Baz"), is(true));
-	}
-
-	@Test
-	public void testCollectAll() throws Exception {
-		final URL resource = Thread
-				.currentThread()
-				.getContextClassLoader()
-				.getResource(
-						getClass().getCanonicalName().replace('.', '/')
-								+ ".jar");
-		smallClassLoader = AccessController
-				.doPrivileged(new PrivilegedAction<ClassLoader>() {
-
-					@Override
-					public ClassLoader run() {
-						return new URLClassLoader(new URL[]{resource});
-					}
-				});
-		Collection<String> scannedClassNames = classNames(collector.collect(
-				ResourceUtils.findPackageResources("a.b.c", smallClassLoader)
-						.get(0), smallClassLoader));
-		assertThat(scannedClassNames.size(), is(5));
-		assertThat(scannedClassNames.contains("a.b.c.Foo"), is(true));
-		assertThat(scannedClassNames.contains("a.b.c.Foo.FooBaa"), is(true));
-		assertThat(scannedClassNames.contains("a.b.d.Baa"), is(true));
-		assertThat(scannedClassNames.contains("a.b.d.BaaImpl"), is(true));
-		assertThat(scannedClassNames.contains("a.b.e.Baz"), is(true));
-	}
-
-	private Collection<String> classNames(Collection<Class<?>> classes) {
-		List<String> result = new ArrayList<String>();
-		for (Class<?> clazz : classes) {
-			result.add(clazz.getCanonicalName());
-		}
-		return result;
-	}
-
-	@Test
-	public void testCollectWithDirectory() throws Exception {
-		Collection<Class<?>> collectedClasses = collector.collect(PACKAGE_NAME,
-				ResourceUtils.findPackageResources(PACKAGE_NAME, classLoader)
-						.get(0), classLoader);
-		assertThat(collectedClasses.isEmpty(), is(true));
-	}
-
-	@Test
-	public void testCollectWithInvalidPackageName() throws Exception {
-		Collection<Class<?>> collectedClasses = collector.collect(
-				"invalid.package.name", null, classLoader);
-		assertThat(collectedClasses.isEmpty(), is(true));
-	}
-
-	@Test
-	public void testCollectWithNullPackageName() throws Exception {
-		final URL resource = Thread
-				.currentThread()
-				.getContextClassLoader()
-				.getResource(
-						getClass().getCanonicalName().replace('.', '/')
-								+ ".jar");
-		smallClassLoader = AccessController
-				.doPrivileged(new PrivilegedAction<ClassLoader>() {
-
-					@Override
-					public ClassLoader run() {
-						return new URLClassLoader(new URL[]{resource});
-					}
-				});
-		Collection<Class<?>> result = collector.collect(null, ResourceUtils
-				.findPackageResources("a.b.c", smallClassLoader).get(0),
-				smallClassLoader);
-		assertThat(result.size(), is(5));
-	}
-
-	@Test
-	public void testCollectWithNullResourceURL() throws Exception {
-		Collection<Class<?>> result = collector.collect("a.b.c", null,
-				classLoader);
-		assertTrue(result.isEmpty());
-	}
-
-	@Test
-	public void testCollectWithNullClassLoader() throws Exception {
-		thrown.expect(AssertionFailureException.class);
-		collector.collect(PACKAGE_NAME, null, null);
-	}
+    private static final String PACKAGE_NAME = JarClassCollectorTest.class.getPackage().getName() + ".classcollector";
+    private JarClassCollector collector;
+    private ClassLoader classLoader;
+    private ClassLoader smallClassLoader;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    /**
+     * @throws java.lang.Exception
+     */
+    @Before
+    public void setUp() throws Exception {
+        collector = new JarClassCollector();
+        classLoader = Thread.currentThread().getContextClassLoader();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        classLoader = null;
+        smallClassLoader = null;
+    }
+
+    @Test
+    public void testCollect() throws Exception {
+        final URL resource = Thread.currentThread().getContextClassLoader()
+                .getResource(getClass().getCanonicalName().replace('.', '/') + ".jar");
+        smallClassLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+
+            @Override
+            public ClassLoader run() {
+                return new URLClassLoader(new URL[] { resource });
+            }
+        });
+        Collection<String> scannedClassNames = classNames(collector.collect("a.b.c",
+                ResourceUtils.findPackageResources("a.b.c", smallClassLoader).get(0), smallClassLoader));
+        assertThat(scannedClassNames.size(), is(2));
+        assertThat(scannedClassNames.contains("a.b.c.Foo"), is(true));
+        assertThat(scannedClassNames.contains("a.b.c.Foo.FooBaa"), is(true));
+        scannedClassNames = classNames(collector.collect("a.b.d",
+                ResourceUtils.findPackageResources("a.b.d", smallClassLoader).get(0), smallClassLoader));
+        assertThat(scannedClassNames.size(), is(2));
+        assertThat(scannedClassNames.contains("a.b.d.Baa"), is(true));
+        assertThat(scannedClassNames.contains("a.b.d.BaaImpl"), is(true));
+        scannedClassNames = classNames(collector.collect("a.b.e",
+                ResourceUtils.findPackageResources("a.b.e", smallClassLoader).get(0), smallClassLoader));
+        assertThat(scannedClassNames.size(), is(1));
+        assertThat(scannedClassNames.contains("a.b.e.Baz"), is(true));
+    }
+
+    @Test
+    public void testCollectAll() throws Exception {
+        final URL resource = Thread.currentThread().getContextClassLoader()
+                .getResource(getClass().getCanonicalName().replace('.', '/') + ".jar");
+        smallClassLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+
+            @Override
+            public ClassLoader run() {
+                return new URLClassLoader(new URL[] { resource });
+            }
+        });
+        Collection<String> scannedClassNames = classNames(collector
+                .collect(ResourceUtils.findPackageResources("a.b.c", smallClassLoader).get(0), smallClassLoader));
+        assertThat(scannedClassNames.size(), is(5));
+        assertThat(scannedClassNames.contains("a.b.c.Foo"), is(true));
+        assertThat(scannedClassNames.contains("a.b.c.Foo.FooBaa"), is(true));
+        assertThat(scannedClassNames.contains("a.b.d.Baa"), is(true));
+        assertThat(scannedClassNames.contains("a.b.d.BaaImpl"), is(true));
+        assertThat(scannedClassNames.contains("a.b.e.Baz"), is(true));
+    }
+
+    private Collection<String> classNames(Collection<Class<?>> classes) {
+        List<String> result = new ArrayList<String>();
+        for (Class<?> clazz : classes) {
+            result.add(clazz.getCanonicalName());
+        }
+        return result;
+    }
+
+    @Test
+    public void testCollectWithDirectory() throws Exception {
+        Collection<Class<?>> collectedClasses = collector.collect(PACKAGE_NAME,
+                ResourceUtils.findPackageResources(PACKAGE_NAME, classLoader).get(0), classLoader);
+        assertThat(collectedClasses.isEmpty(), is(true));
+    }
+
+    @Test
+    public void testCollectWithInvalidPackageName() throws Exception {
+        Collection<Class<?>> collectedClasses = collector.collect("invalid.package.name", null, classLoader);
+        assertThat(collectedClasses.isEmpty(), is(true));
+    }
+
+    @Test
+    public void testCollectWithNullPackageName() throws Exception {
+        final URL resource = Thread.currentThread().getContextClassLoader()
+                .getResource(getClass().getCanonicalName().replace('.', '/') + ".jar");
+        smallClassLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+
+            @Override
+            public ClassLoader run() {
+                return new URLClassLoader(new URL[] { resource });
+            }
+        });
+        Collection<Class<?>> result = collector.collect(null,
+                ResourceUtils.findPackageResources("a.b.c", smallClassLoader).get(0), smallClassLoader);
+        assertThat(result.size(), is(5));
+    }
+
+    @Test
+    public void testCollectWithNullResourceURL() throws Exception {
+        Collection<Class<?>> result = collector.collect("a.b.c", null, classLoader);
+        assertTrue(result.isEmpty());
+    }
+
+    @Test
+    public void testCollectWithNullClassLoader() throws Exception {
+        thrown.expect(AssertionFailureException.class);
+        collector.collect(PACKAGE_NAME, null, null);
+    }
 }
diff --git a/src/test/java/org/analogweb/util/PropertyResourceBundleMessageResourceTest.java b/src/test/java/org/analogweb/util/PropertyResourceBundleMessageResourceTest.java
index b333157..2f56541 100644
--- a/src/test/java/org/analogweb/util/PropertyResourceBundleMessageResourceTest.java
+++ b/src/test/java/org/analogweb/util/PropertyResourceBundleMessageResourceTest.java
@@ -13,88 +13,86 @@
  */
 public class PropertyResourceBundleMessageResourceTest {
 
-	private PropertyResourceBundleMessageResource resource;
+    private PropertyResourceBundleMessageResource resource;
 
-	@Test
-	public void testGetMessage() {
-		String baseName = getClass().getCanonicalName() + "-1";
-		resource = new PropertyResourceBundleMessageResource(baseName);
-		String actual = resource.getMessage("foo");
-		assertThat(actual, is("baa"));
-	}
+    @Test
+    public void testGetMessage() {
+        String baseName = getClass().getCanonicalName() + "-1";
+        resource = new PropertyResourceBundleMessageResource(baseName);
+        String actual = resource.getMessage("foo");
+        assertThat(actual, is("baa"));
+    }
 
-	@Test
-	public void testGetMessageNotAvairable() {
-		String baseName = getClass().getCanonicalName() + "-1";
-		resource = new PropertyResourceBundleMessageResource(baseName);
-		String actual = resource.getMessage("boo");
-		assertThat(actual, is("boo"));
-	}
+    @Test
+    public void testGetMessageNotAvairable() {
+        String baseName = getClass().getCanonicalName() + "-1";
+        resource = new PropertyResourceBundleMessageResource(baseName);
+        String actual = resource.getMessage("boo");
+        assertThat(actual, is("boo"));
+    }
 
-	@Test
-	public void testGetMessageWithLocale() {
-		Locale defaultLocale = Locale.getDefault();
-		try {
-			Locale.setDefault(Locale.US);
-			String baseName = getClass().getCanonicalName() + "-2";
-			resource = new PropertyResourceBundleMessageResource(baseName);
-			String actual = resource.getMessage("foo", Locale.JAPAN);
-			assertThat(actual, is("ばー"));
-			// missing locale.
-			actual = resource.getMessage("foo", Locale.ENGLISH);
-			assertThat(actual, is("baa"));
-		} finally {
-			Locale.setDefault(defaultLocale);
-		}
-	}
+    @Test
+    public void testGetMessageWithLocale() {
+        Locale defaultLocale = Locale.getDefault();
+        try {
+            Locale.setDefault(Locale.US);
+            String baseName = getClass().getCanonicalName() + "-2";
+            resource = new PropertyResourceBundleMessageResource(baseName);
+            String actual = resource.getMessage("foo", Locale.JAPAN);
+            assertThat(actual, is("ばー"));
+            // missing locale.
+            actual = resource.getMessage("foo", Locale.ENGLISH);
+            assertThat(actual, is("baa"));
+        } finally {
+            Locale.setDefault(defaultLocale);
+        }
+    }
 
-	@Test
-	public void testGetMessageWithFormat() {
-		String baseName = getClass().getCanonicalName() + "-3";
-		resource = new PropertyResourceBundleMessageResource(baseName);
-		String actual = resource.getMessage("foo", "baa", "baz");
-		assertThat(actual, is("baa is baz"));
-	}
+    @Test
+    public void testGetMessageWithFormat() {
+        String baseName = getClass().getCanonicalName() + "-3";
+        resource = new PropertyResourceBundleMessageResource(baseName);
+        String actual = resource.getMessage("foo", "baa", "baz");
+        assertThat(actual, is("baa is baz"));
+    }
 
-	@Test
-	public void testGetMessageWithFormatAndLocale() {
-		Locale defaultLocale = Locale.getDefault();
-		try {
-			Locale.setDefault(Locale.US);
-			String baseName = getClass().getCanonicalName() + "-4";
-			resource = new PropertyResourceBundleMessageResource(baseName);
-			String actual = resource.getMessage("foo", Locale.JAPAN, "baa",
-					"baz");
-			assertThat(actual, is("baa は baz"));
-			// missing locale.
-			actual = resource.getMessage("foo", Locale.ENGLISH, "baa", "baz");
-			assertThat(actual, is("baa is baz"));
-		} finally {
-			Locale.setDefault(defaultLocale);
-		}
-	}
+    @Test
+    public void testGetMessageWithFormatAndLocale() {
+        Locale defaultLocale = Locale.getDefault();
+        try {
+            Locale.setDefault(Locale.US);
+            String baseName = getClass().getCanonicalName() + "-4";
+            resource = new PropertyResourceBundleMessageResource(baseName);
+            String actual = resource.getMessage("foo", Locale.JAPAN, "baa", "baz");
+            assertThat(actual, is("baa は baz"));
+            // missing locale.
+            actual = resource.getMessage("foo", Locale.ENGLISH, "baa", "baz");
+            assertThat(actual, is("baa is baz"));
+        } finally {
+            Locale.setDefault(defaultLocale);
+        }
+    }
 
-	@Test
-	public void testGetMessageResourceContainsMultiByteCharactors() {
-		String baseName = getClass().getCanonicalName() + "-5";
-		resource = new PropertyResourceBundleMessageResource(baseName);
-		String actual = resource.getMessage("foo");
-		assertThat(actual, is("ばー"));
-	}
+    @Test
+    public void testGetMessageResourceContainsMultiByteCharactors() {
+        String baseName = getClass().getCanonicalName() + "-5";
+        resource = new PropertyResourceBundleMessageResource(baseName);
+        String actual = resource.getMessage("foo");
+        assertThat(actual, is("ばー"));
+    }
 
-	@Test
-	public void testGetBulcMessages() {
-		String baseName = getClass().getCanonicalName() + "-1";
-		resource = new PropertyResourceBundleMessageResource(baseName);
-		String actual = null;
-		int i = 0;
-		long start = System.currentTimeMillis();
-		for (i = 0; i < 1000000; i++) {
-			actual = resource.getMessage("foo");
-		}
-		long end = System.currentTimeMillis();
-		System.out.println(String.format("get [%s] messages on [%s] ms.", i,
-				end - start));
-		assertThat(actual, is("baa"));
-	}
+    @Test
+    public void testGetBulcMessages() {
+        String baseName = getClass().getCanonicalName() + "-1";
+        resource = new PropertyResourceBundleMessageResource(baseName);
+        String actual = null;
+        int i = 0;
+        long start = System.currentTimeMillis();
+        for (i = 0; i < 1000000; i++) {
+            actual = resource.getMessage("foo");
+        }
+        long end = System.currentTimeMillis();
+        System.out.println(String.format("get [%s] messages on [%s] ms.", i, end - start));
+        assertThat(actual, is("baa"));
+    }
 }
diff --git a/src/test/java/org/analogweb/util/ReflectionUtilsTest.java b/src/test/java/org/analogweb/util/ReflectionUtilsTest.java
index 949d268..eb43eec 100644
--- a/src/test/java/org/analogweb/util/ReflectionUtilsTest.java
+++ b/src/test/java/org/analogweb/util/ReflectionUtilsTest.java
@@ -22,212 +22,194 @@
 
 /**
  * test case for {@link ReflectionUtils}
- * 
+ *
  * @author snowgoose
  */
 public class ReflectionUtilsTest {
 
-	@Test
-	public void testGetMethodParameterAnnotation() throws Exception {
-		Method doSomething = MockObject.class.getMethod("doSomething",
-				new Class<?>[]{String.class});
-		Foo foo = ReflectionUtils.getMethodParameterAnnotation(doSomething,
-				Foo.class, 0);
-		assertNotNull(foo);
-	}
-
-	@Test
-	public void testGetMethodParameterAnnotationOutOfIndex() throws Exception {
-		Method doSomething = MockObject.class.getMethod("doSomething",
-				new Class<?>[]{String.class});
-		Foo foo = ReflectionUtils.getMethodParameterAnnotation(doSomething,
-				Foo.class, 1);
-		assertNull(foo);
-	}
-
-	@Test
-	public void testGetInstanceQuietly() {
-		MockObject actual = ReflectionUtils
-				.getInstanceQuietly(MockObject.class);
-		assertNotNull(actual);
-	}
-
-	@Test
-	public void testGetInstanceQuietlyWithNotMatchConstractorArgs() {
-		MockObjectWithConstractorArg actual = ReflectionUtils
-				.getInstanceQuietly(MockObjectWithConstractorArg.class);
-		assertNull(actual);
-	}
-
-	@Test
-	public void testGetInstanceQuietlyWithPrivateConstractorArgs() {
-		Object actual = ReflectionUtils.getInstanceQuietly(
-				MockObjectWithConstractorArg.class,
-				MockObjectWithConstractorArg.class.getConstructors()[0], "foo");
-		assertNotNull(actual);
-		actual = ReflectionUtils.getInstanceQuietly(
-				MockObjectWithConstractorArg.class,
-				MockObjectWithConstractorArg.class.getConstructors()[0],
-				(Object) null);
-		assertNotNull(actual);
-		actual = ReflectionUtils.getInstanceQuietly(
-				MockObjectWithConstractorArg.class,
-				MockObjectWithConstractorArg.class.getConstructors()[0],
-				new Date());
-		assertNull(actual);
-		actual = ReflectionUtils.getInstanceQuietly(MockIIObjectAbstract.class,
-				MockIIObjectAbstract.class.getConstructors()[0], new Date());
-		assertNull(actual);
-		actual = ReflectionUtils.getInstanceQuietly(
-				MockObjectWithConstractorArg.class, null, "foo");
-		assertNull(actual);
-	}
-
-	@Test
-	public void testGetInstanceQuietlyWithPrivateConstractor() {
-		MockObjectWithPrivateConstractor actual = ReflectionUtils
-				.getInstanceQuietly(MockObjectWithPrivateConstractor.class);
-		assertNull(actual);
-	}
-
-	@Test
-	public void testFilterClassAsImplementsInterface() {
-		Collection<Class<?>> classes = new ArrayList<Class<?>>();
-		classes.add(MockIIObject.class);
-		classes.add(MockIIObjectExt.class);
-		classes.add(MockObject.class);
-		List<Class<IIMockObject>> result = ReflectionUtils
-				.filterClassAsImplementsInterface(IIMockObject.class, classes);
-		assertThat(result.size(), is(2));
-		assertTrue(result.contains(MockIIObject.class));
-		assertTrue(result.contains(MockIIObjectExt.class));
-	}
-
-	@Test
-	public void testWriteValueToPrivateField() {
-		MockObject obj = new MockObject();
-		ReflectionUtils.writeValueToField("hoge", obj, "fuga");
-		assertThat(obj.hoge, is("fuga"));
-	}
-
-	@Test
-	public void testWriteValueToNotAvailableField() {
-		MockObject obj = new MockObject();
-		ReflectionUtils.writeValueToField("noexists", obj, "fuga");
-		assertNull(obj.hoge);
-	}
-
-	@Test
-	public void testGetValueViaPrivateField() {
-		MockObject obj = new MockObject();
-		obj.hoge = "foo";
-		Object actual = ReflectionUtils.getValueOfField("hoge",
-				Modifier.PRIVATE, obj);
-		assertThat(actual.toString(), is("foo"));
-	}
-
-	@Test
-	public void testGetValueViaNotAvailableField() {
-		MockObject obj = new MockObject();
-		obj.hoge = "foo";
-		Object actual = ReflectionUtils.getValueOfField("noexists",
-				Modifier.PRIVATE, obj);
-		assertNull(actual);
-	}
-
-	@Test
-	public void testGetDeclaredMethodQuietly() {
-		Method doSomething = ReflectionUtils.getMethodQuietly(MockObject.class,
-				"doSomething", new Class[]{String.class});
-		assertNotNull(doSomething);
-	}
-
-	@Test
-	public void testGetDeclaredMethodQuietlyNoSuchMethod() {
-		Method doSomething = ReflectionUtils.getMethodQuietly(MockObject.class,
-				"doAnything", new Class[]{String.class});
-		assertNull(doSomething);
-	}
-
-	@Test
-	public void testFindAllImplementsInterfacesRecursivery() {
-		Set<Class<?>> actual = ReflectionUtils
-				.findAllImplementsInterfacesRecursivery(MockIIObjectExt.class);
-		assertThat(actual.size(), is(2));
-		assertTrue(actual.contains(IMockObject.class));
-		assertTrue(actual.contains(IIMockObject.class));
-	}
-
-	@Test
-	public void testFindAllImplementsInterfacesRecursiveryWithObject() {
-		Set<Class<?>> actual = ReflectionUtils
-				.findAllImplementsInterfacesRecursivery(Object.class);
-		assertTrue(actual.isEmpty());
-	}
-
-	@Test
-	public void testFindAllImplementsInterfacesRecursiveryWithNull() {
-		Set<Class<?>> actual = ReflectionUtils
-				.findAllImplementsInterfacesRecursivery(null);
-		assertTrue(actual.isEmpty());
-	}
-
-	@Test
-	public void testGetCallerClass() {
-		List<Class<?>> actual = new MockObject().getCallerClasses();
-		assertThat(actual.get(0).getCanonicalName(),
-				is("org.analogweb.util.ReflectionUtilsTest.MockObject"));
-	}
-
-	public interface IMockObject {
-	}
-
-	public interface IIMockObject extends IMockObject {
-	}
-
-	public static class MockObject implements IMockObject {
-
-		private String hoge;
-
-		public String doSomething(@Foo String foo) {
-			return "doSomething!" + foo;
-		}
-
-		public String doSomethingWithException(@Foo String foo) {
-			throw new RuntimeException();
-		}
-
-		public List<Class<?>> getCallerClasses() {
-			return ReflectionUtils.getCallerClasses();
-		}
-
-	}
-
-	public static class MockIIObject implements IIMockObject {
-	}
-
-	public static class MockIIObjectExt extends MockIIObject {
-	}
-
-	public static abstract class MockIIObjectAbstract extends MockIIObject {
-	}
-
-	public static class MockObjectWithConstractorArg extends MockObject {
-
-		public MockObjectWithConstractorArg(String boo) {
-			// nop.
-		}
-	}
-
-	public static class MockObjectWithPrivateConstractor extends MockObject {
-
-		private MockObjectWithPrivateConstractor(String boo) {
-			// nop.
-		}
-	}
-
-	@Target({ElementType.PARAMETER, ElementType.METHOD})
-	@Retention(RetentionPolicy.RUNTIME)
-	private static @interface Foo {
-	}
+    @Test
+    public void testGetMethodParameterAnnotation() throws Exception {
+        Method doSomething = MockObject.class.getMethod("doSomething", new Class<?>[] { String.class });
+        Foo foo = ReflectionUtils.getMethodParameterAnnotation(doSomething, Foo.class, 0);
+        assertNotNull(foo);
+    }
+
+    @Test
+    public void testGetMethodParameterAnnotationOutOfIndex() throws Exception {
+        Method doSomething = MockObject.class.getMethod("doSomething", new Class<?>[] { String.class });
+        Foo foo = ReflectionUtils.getMethodParameterAnnotation(doSomething, Foo.class, 1);
+        assertNull(foo);
+    }
+
+    @Test
+    public void testGetInstanceQuietly() {
+        MockObject actual = ReflectionUtils.getInstanceQuietly(MockObject.class);
+        assertNotNull(actual);
+    }
+
+    @Test
+    public void testGetInstanceQuietlyWithNotMatchConstractorArgs() {
+        MockObjectWithConstractorArg actual = ReflectionUtils.getInstanceQuietly(MockObjectWithConstractorArg.class);
+        assertNull(actual);
+    }
+
+    @Test
+    public void testGetInstanceQuietlyWithPrivateConstractorArgs() {
+        Object actual = ReflectionUtils.getInstanceQuietly(MockObjectWithConstractorArg.class,
+                MockObjectWithConstractorArg.class.getConstructors()[0], "foo");
+        assertNotNull(actual);
+        actual = ReflectionUtils.getInstanceQuietly(MockObjectWithConstractorArg.class,
+                MockObjectWithConstractorArg.class.getConstructors()[0], (Object) null);
+        assertNotNull(actual);
+        actual = ReflectionUtils.getInstanceQuietly(MockObjectWithConstractorArg.class,
+                MockObjectWithConstractorArg.class.getConstructors()[0], new Date());
+        assertNull(actual);
+        actual = ReflectionUtils.getInstanceQuietly(MockIIObjectAbstract.class,
+                MockIIObjectAbstract.class.getConstructors()[0], new Date());
+        assertNull(actual);
+        actual = ReflectionUtils.getInstanceQuietly(MockObjectWithConstractorArg.class, null, "foo");
+        assertNull(actual);
+    }
+
+    @Test
+    public void testGetInstanceQuietlyWithPrivateConstractor() {
+        MockObjectWithPrivateConstractor actual = ReflectionUtils
+                .getInstanceQuietly(MockObjectWithPrivateConstractor.class);
+        assertNull(actual);
+    }
+
+    @Test
+    public void testFilterClassAsImplementsInterface() {
+        Collection<Class<?>> classes = new ArrayList<Class<?>>();
+        classes.add(MockIIObject.class);
+        classes.add(MockIIObjectExt.class);
+        classes.add(MockObject.class);
+        List<Class<IIMockObject>> result = ReflectionUtils.filterClassAsImplementsInterface(IIMockObject.class,
+                classes);
+        assertThat(result.size(), is(2));
+        assertTrue(result.contains(MockIIObject.class));
+        assertTrue(result.contains(MockIIObjectExt.class));
+    }
+
+    @Test
+    public void testWriteValueToPrivateField() {
+        MockObject obj = new MockObject();
+        ReflectionUtils.writeValueToField("hoge", obj, "fuga");
+        assertThat(obj.hoge, is("fuga"));
+    }
+
+    @Test
+    public void testWriteValueToNotAvailableField() {
+        MockObject obj = new MockObject();
+        ReflectionUtils.writeValueToField("noexists", obj, "fuga");
+        assertNull(obj.hoge);
+    }
+
+    @Test
+    public void testGetValueViaPrivateField() {
+        MockObject obj = new MockObject();
+        obj.hoge = "foo";
+        Object actual = ReflectionUtils.getValueOfField("hoge", Modifier.PRIVATE, obj);
+        assertThat(actual.toString(), is("foo"));
+    }
+
+    @Test
+    public void testGetValueViaNotAvailableField() {
+        MockObject obj = new MockObject();
+        obj.hoge = "foo";
+        Object actual = ReflectionUtils.getValueOfField("noexists", Modifier.PRIVATE, obj);
+        assertNull(actual);
+    }
+
+    @Test
+    public void testGetDeclaredMethodQuietly() {
+        Method doSomething = ReflectionUtils.getMethodQuietly(MockObject.class, "doSomething",
+                new Class[] { String.class });
+        assertNotNull(doSomething);
+    }
+
+    @Test
+    public void testGetDeclaredMethodQuietlyNoSuchMethod() {
+        Method doSomething = ReflectionUtils.getMethodQuietly(MockObject.class, "doAnything",
+                new Class[] { String.class });
+        assertNull(doSomething);
+    }
+
+    @Test
+    public void testFindAllImplementsInterfacesRecursivery() {
+        Set<Class<?>> actual = ReflectionUtils.findAllImplementsInterfacesRecursivery(MockIIObjectExt.class);
+        assertThat(actual.size(), is(2));
+        assertTrue(actual.contains(IMockObject.class));
+        assertTrue(actual.contains(IIMockObject.class));
+    }
+
+    @Test
+    public void testFindAllImplementsInterfacesRecursiveryWithObject() {
+        Set<Class<?>> actual = ReflectionUtils.findAllImplementsInterfacesRecursivery(Object.class);
+        assertTrue(actual.isEmpty());
+    }
+
+    @Test
+    public void testFindAllImplementsInterfacesRecursiveryWithNull() {
+        Set<Class<?>> actual = ReflectionUtils.findAllImplementsInterfacesRecursivery(null);
+        assertTrue(actual.isEmpty());
+    }
+
+    @Test
+    public void testGetCallerClass() {
+        List<Class<?>> actual = new MockObject().getCallerClasses();
+        assertThat(actual.get(0).getCanonicalName(), is("org.analogweb.util.ReflectionUtilsTest.MockObject"));
+    }
+
+    public interface IMockObject {
+    }
+
+    public interface IIMockObject extends IMockObject {
+    }
+
+    public static class MockObject implements IMockObject {
+
+        private String hoge;
+
+        public String doSomething(@Foo String foo) {
+            return "doSomething!" + foo;
+        }
+
+        public String doSomethingWithException(@Foo String foo) {
+            throw new RuntimeException();
+        }
+
+        public List<Class<?>> getCallerClasses() {
+            return ReflectionUtils.getCallerClasses();
+        }
+
+    }
+
+    public static class MockIIObject implements IIMockObject {
+    }
+
+    public static class MockIIObjectExt extends MockIIObject {
+    }
+
+    public static abstract class MockIIObjectAbstract extends MockIIObject {
+    }
+
+    public static class MockObjectWithConstractorArg extends MockObject {
+
+        public MockObjectWithConstractorArg(String boo) {
+            // nop.
+        }
+    }
+
+    public static class MockObjectWithPrivateConstractor extends MockObject {
+
+        private MockObjectWithPrivateConstractor(String boo) {
+            // nop.
+        }
+    }
+
+    @Target({ ElementType.PARAMETER, ElementType.METHOD })
+    @Retention(RetentionPolicy.RUNTIME)
+    private static @interface Foo {
+    }
 }
diff --git a/src/test/java/org/analogweb/util/ResourceUtilsTest.java b/src/test/java/org/analogweb/util/ResourceUtilsTest.java
index c7d4147..e7567e4 100644
--- a/src/test/java/org/analogweb/util/ResourceUtilsTest.java
+++ b/src/test/java/org/analogweb/util/ResourceUtilsTest.java
@@ -25,100 +25,96 @@
  */
 public class ResourceUtilsTest {
 
-	@Rule
-	public TemporaryFolder folder = new TemporaryFolder();
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
 
-	@Test
-	public void testFindURLViaClassPathResource() throws Exception {
-		URL url = ResourceUtils.findResource(getClass().getCanonicalName()
-				.replace(".", File.separator) + ".class");
-		assertTrue(new File(url.toURI()).isFile());
-	}
+    @Test
+    public void testFindURLViaClassPathResource() throws Exception {
+        URL url = ResourceUtils.findResource(getClass().getCanonicalName().replace(".", File.separator) + ".class");
+        assertTrue(new File(url.toURI()).isFile());
+    }
 
-	@Test
-	public void testFindURLViaFile() throws Exception {
-		File tempFile = folder.newFile("hellow.log");
-		OutputStream out = new FileOutputStream(tempFile);
-		out.write("hello!".getBytes());
-		out.flush();
-		out.close();
-		URL url = ResourceUtils.findResource(tempFile.getCanonicalPath());
-		InputStream in = url.openStream();
-		StringBuilder actual = new StringBuilder();
-		int c;
-		while ((c = in.read()) != -1) {
-			actual.append((char) c);
-		}
-		assertThat(actual.toString(), is("hello!"));
-	}
+    @Test
+    public void testFindURLViaFile() throws Exception {
+        File tempFile = folder.newFile("hellow.log");
+        OutputStream out = new FileOutputStream(tempFile);
+        out.write("hello!".getBytes());
+        out.flush();
+        out.close();
+        URL url = ResourceUtils.findResource(tempFile.getCanonicalPath());
+        InputStream in = url.openStream();
+        StringBuilder actual = new StringBuilder();
+        int c;
+        while ((c = in.read()) != -1) {
+            actual.append((char) c);
+        }
+        assertThat(actual.toString(), is("hello!"));
+    }
 
-	@Test
-	public void testFindURLViaFileIsNotExists() throws Exception {
-		File tempFile = folder.newFile("hellow.log");
-		OutputStream out = new FileOutputStream(tempFile);
-		out.write("hello!".getBytes());
-		out.flush();
-		out.close();
-		URL url = ResourceUtils.findResource(tempFile.getCanonicalPath()
-				+ ".noexists");
-		assertNull(url);
-	}
+    @Test
+    public void testFindURLViaFileIsNotExists() throws Exception {
+        File tempFile = folder.newFile("hellow.log");
+        OutputStream out = new FileOutputStream(tempFile);
+        out.write("hello!".getBytes());
+        out.flush();
+        out.close();
+        URL url = ResourceUtils.findResource(tempFile.getCanonicalPath() + ".noexists");
+        assertNull(url);
+    }
 
-	@Test
-	public void testFindURLNoRootFileResource() throws Exception {
-		File noRootTestFileResource = folder.newFile("noRoot.log");
-		OutputStream out = new FileOutputStream(noRootTestFileResource);
-		out.write("hello!".getBytes());
-		out.flush();
-		out.close();
-		URL url = ResourceUtils.findResource(noRootTestFileResource.getPath());
-		InputStream in = url.openStream();
-		StringBuilder actual = new StringBuilder();
-		int c;
-		while ((c = in.read()) != -1) {
-			actual.append((char) c);
-		}
-		assertThat(actual.toString(), is("hello!"));
-	}
+    @Test
+    public void testFindURLNoRootFileResource() throws Exception {
+        File noRootTestFileResource = folder.newFile("noRoot.log");
+        OutputStream out = new FileOutputStream(noRootTestFileResource);
+        out.write("hello!".getBytes());
+        out.flush();
+        out.close();
+        URL url = ResourceUtils.findResource(noRootTestFileResource.getPath());
+        InputStream in = url.openStream();
+        StringBuilder actual = new StringBuilder();
+        int c;
+        while ((c = in.read()) != -1) {
+            actual.append((char) c);
+        }
+        assertThat(actual.toString(), is("hello!"));
+    }
 
-	@Test
-	public void testFindURLViaHttp() throws Exception {
-		try {
-			HttpURLConnection c = (HttpURLConnection) new URL(
-					"http://example.com/").openConnection();
-			c.setConnectTimeout(3000);
-			assumeThat(c.getResponseCode(), is(200));
-		} catch (Exception e) {
-			assumeNoException(e);
-		}
-		URL url = ResourceUtils.findResource("http://example.com/");
-		assertNotNull(url);
-		InputStream in = url.openStream();
-		StringBuilder actual = new StringBuilder();
-		int c;
-		while ((c = in.read()) != -1) {
-			actual.append((char) c);
-		}
-		assertNotNull(actual.toString());
-	}
+    @Test
+    public void testFindURLViaHttp() throws Exception {
+        try {
+            HttpURLConnection c = (HttpURLConnection) new URL("http://example.com/").openConnection();
+            c.setConnectTimeout(3000);
+            assumeThat(c.getResponseCode(), is(200));
+        } catch (Exception e) {
+            assumeNoException(e);
+        }
+        URL url = ResourceUtils.findResource("http://example.com/");
+        assertNotNull(url);
+        InputStream in = url.openStream();
+        StringBuilder actual = new StringBuilder();
+        int c;
+        while ((c = in.read()) != -1) {
+            actual.append((char) c);
+        }
+        assertNotNull(actual.toString());
+    }
 
-	@Test
-	public void testFindURLInvalidScheme() throws Exception {
-		URL url = ResourceUtils
-				.findResource("invalid://example.com/invalid://root");
-		assertNull(url);
-	}
+    @Test
+    public void testFindURLInvalidScheme() throws Exception {
+        URL url = ResourceUtils.findResource("invalid://example.com/invalid://root");
+        assertNull(url);
+    }
 
-	@Test
-	public void testFindURLArgIsNull() throws Exception {
-		URL actual = ResourceUtils.findResource(null);
-		assertNull(actual);
-	}
+    @Test
+    public void testFindURLArgIsNull() throws Exception {
+        URL actual = ResourceUtils.findResource(null);
+        assertNull(actual);
+    }
 
-	@Test
-	public void findResources() throws Exception {
-		List<URL> found = ResourceUtils.findResources("org/analogweb/core",
-				Thread.currentThread().getContextClassLoader());
-		assertThat(found.size(), is(2));
-	}
+    @Test
+    public void findResources() throws Exception {
+        List<URL> found = ResourceUtils.findResources("org/analogweb/core",
+                Thread.currentThread().getContextClassLoader());
+        assertThat(found.size(), is(2));
+    }
 }
diff --git a/src/test/java/org/analogweb/util/StopWatchTest.java b/src/test/java/org/analogweb/util/StopWatchTest.java
index 7aa9936..ad54a1c 100644
--- a/src/test/java/org/analogweb/util/StopWatchTest.java
+++ b/src/test/java/org/analogweb/util/StopWatchTest.java
@@ -15,18 +15,18 @@
 
 public class StopWatchTest {
 
-	private StopWatch sw;
-	private Ticker ticker;
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
-	@Before
-	public void setUp() {
-		this.ticker = mock(Ticker.class);
-		sw = new StopWatch(ticker);
-	}
-
-	@Test
+    private StopWatch sw;
+    private Ticker ticker;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Before
+    public void setUp() {
+        this.ticker = mock(Ticker.class);
+        sw = new StopWatch(ticker);
+    }
+
+    @Test
 	public void test() throws Exception {
 		when(ticker.now()).thenReturn(nanosec(2), nanosec(3));
 		sw.start();
@@ -34,13 +34,13 @@ public void test() throws Exception {
 		assertThat(actual, is(1L));
 	}
 
-	@Test
-	public void testStopFirst() throws Exception {
-		thrown.expect(IllegalStateException.class);
-		sw.stop();
-	}
+    @Test
+    public void testStopFirst() throws Exception {
+        thrown.expect(IllegalStateException.class);
+        sw.stop();
+    }
 
-	@Test
+    @Test
 	public void testStartTwice() throws Exception {
 		when(ticker.now()).thenReturn(nanosec(2), nanosec(3));
 		sw.start();
@@ -51,7 +51,7 @@ public void testStartTwice() throws Exception {
 		assertThat(actual, is(1L));
 	}
 
-	private long nanosec(long millsec) {
-		return millsec * 1000 * 1000;
-	}
+    private long nanosec(long millsec) {
+        return millsec * 1000 * 1000;
+    }
 }
diff --git a/src/test/java/org/analogweb/util/StringUtilsTest.java b/src/test/java/org/analogweb/util/StringUtilsTest.java
index 9f3b069..d8115fd 100644
--- a/src/test/java/org/analogweb/util/StringUtilsTest.java
+++ b/src/test/java/org/analogweb/util/StringUtilsTest.java
@@ -16,149 +16,142 @@
  */
 public class StringUtilsTest {
 
-	@Test
-	public void testIsEmpty() {
-		assertFalse(StringUtils.isEmpty("test!"));
-		assertFalse(StringUtils.isEmpty("t !"));
-		assertFalse(StringUtils.isEmpty(" test!"));
-		assertTrue(StringUtils.isEmpty(" "));
-		assertTrue(StringUtils.isEmpty(null));
-		assertTrue(StringUtils.isEmpty("     "));
-	}
+    @Test
+    public void testIsEmpty() {
+        assertFalse(StringUtils.isEmpty("test!"));
+        assertFalse(StringUtils.isEmpty("t !"));
+        assertFalse(StringUtils.isEmpty(" test!"));
+        assertTrue(StringUtils.isEmpty(" "));
+        assertTrue(StringUtils.isEmpty(null));
+        assertTrue(StringUtils.isEmpty("     "));
+    }
 
-	@Test
-	public void testIsNotEmpty() {
-		assertTrue(StringUtils.isNotEmpty("test!"));
-		assertTrue(StringUtils.isNotEmpty("t !"));
-		assertTrue(StringUtils.isNotEmpty(" test!"));
-		assertFalse(StringUtils.isNotEmpty(" "));
-		assertFalse(StringUtils.isNotEmpty(null));
-		assertFalse(StringUtils.isNotEmpty("     "));
-	}
+    @Test
+    public void testIsNotEmpty() {
+        assertTrue(StringUtils.isNotEmpty("test!"));
+        assertTrue(StringUtils.isNotEmpty("t !"));
+        assertTrue(StringUtils.isNotEmpty(" test!"));
+        assertFalse(StringUtils.isNotEmpty(" "));
+        assertFalse(StringUtils.isNotEmpty(null));
+        assertFalse(StringUtils.isNotEmpty("     "));
+    }
 
-	@Test
-	public void testSplit() {
-		assertTrue(StringUtils.split(null, '/').isEmpty());
-		assertThat(StringUtils.split("a\tb\nc", null),
-				is(Arrays.asList("a", "b", "c")));
-		assertThat(StringUtils.split("a\tb\n\tc", null),
-				is(Arrays.asList("a", "b", "c")));
-		assertThat(StringUtils.split("a.b.c", '.'),
-				is(Arrays.asList("a", "b", "c")));
-		assertThat(StringUtils.split("a..b.c", '.'),
-				is(Arrays.asList("a", "b", "c")));
-		assertThat(StringUtils.split("a:b:c", '.'), is(Arrays.asList("a:b:c")));
-		assertThat(StringUtils.split("a b c", ' '),
-				is(Arrays.asList("a", "b", "c")));
-	}
+    @Test
+    public void testSplit() {
+        assertTrue(StringUtils.split(null, '/').isEmpty());
+        assertThat(StringUtils.split("a\tb\nc", null), is(Arrays.asList("a", "b", "c")));
+        assertThat(StringUtils.split("a\tb\n\tc", null), is(Arrays.asList("a", "b", "c")));
+        assertThat(StringUtils.split("a.b.c", '.'), is(Arrays.asList("a", "b", "c")));
+        assertThat(StringUtils.split("a..b.c", '.'), is(Arrays.asList("a", "b", "c")));
+        assertThat(StringUtils.split("a:b:c", '.'), is(Arrays.asList("a:b:c")));
+        assertThat(StringUtils.split("a b c", ' '), is(Arrays.asList("a", "b", "c")));
+    }
 
-	@Test
-	public void testPartition() {
-		String target = "request:hoge";
-		List<String> actual = StringUtils.partition(1, ':', target);
-		assertThat(actual.size(), is(2));
-		assertThat(actual.get(0), is("request"));
-		assertThat(actual.get(1), is("hoge"));
-		target = "request";
-		actual = StringUtils.partition(1, ':', target);
-		assertThat(actual.size(), is(2));
-		assertThat(actual.get(0), is("request"));
-		assertNull(actual.get(1));
-		target = "request:hoge:attr";
-		actual = StringUtils.partition(1, ':', target);
-		assertThat(actual.size(), is(2));
-		assertThat(actual.get(0), is("request"));
-		assertThat(actual.get(1), is("hoge:attr"));
-		target = "request:hoge:attr:bar";
-		actual = StringUtils.partition(1, ':', target);
-		assertThat(actual.size(), is(2));
-		assertThat(actual.get(0), is("request"));
-		assertThat(actual.get(1), is("hoge:attr:bar"));
-		target = "request:hoge:attr";
-		actual = StringUtils.partition(2, ':', target);
-		assertThat(actual.size(), is(2));
-		assertThat(actual.get(0), is("request:hoge"));
-		assertThat(actual.get(1), is("attr"));
-	}
+    @Test
+    public void testPartition() {
+        String target = "request:hoge";
+        List<String> actual = StringUtils.partition(1, ':', target);
+        assertThat(actual.size(), is(2));
+        assertThat(actual.get(0), is("request"));
+        assertThat(actual.get(1), is("hoge"));
+        target = "request";
+        actual = StringUtils.partition(1, ':', target);
+        assertThat(actual.size(), is(2));
+        assertThat(actual.get(0), is("request"));
+        assertNull(actual.get(1));
+        target = "request:hoge:attr";
+        actual = StringUtils.partition(1, ':', target);
+        assertThat(actual.size(), is(2));
+        assertThat(actual.get(0), is("request"));
+        assertThat(actual.get(1), is("hoge:attr"));
+        target = "request:hoge:attr:bar";
+        actual = StringUtils.partition(1, ':', target);
+        assertThat(actual.size(), is(2));
+        assertThat(actual.get(0), is("request"));
+        assertThat(actual.get(1), is("hoge:attr:bar"));
+        target = "request:hoge:attr";
+        actual = StringUtils.partition(2, ':', target);
+        assertThat(actual.size(), is(2));
+        assertThat(actual.get(0), is("request:hoge"));
+        assertThat(actual.get(1), is("attr"));
+    }
 
-	@Test
-	public void testSubstring() {
-		String target = "abc";
-		String actual = StringUtils.substring(target, 1);
-		assertThat(actual, is("bc"));
-		actual = StringUtils.substring(target, 2);
-		assertThat(actual, is("c"));
-		actual = StringUtils.substring(target, 3);
-		assertThat(actual, is(""));
-		actual = StringUtils.substring(target, 4);
-		assertNull(actual);
-		actual = StringUtils.substring(target, 0, 1);
-		assertThat(actual, is("a"));
-		actual = StringUtils.substring(target, 0, 2);
-		assertThat(actual, is("ab"));
-		actual = StringUtils.substring(target, 0, 3);
-		assertThat(actual, is("abc"));
-		actual = StringUtils.substring(target, 0, 4);
-		assertThat(actual, is("abc"));
-		actual = StringUtils.substring(target, 1, 1);
-		assertThat(actual, is(""));
-		actual = StringUtils.substring(target, 1, 2);
-		assertThat(actual, is("b"));
-		actual = StringUtils.substring(target, 1, 3);
-		assertThat(actual, is("bc"));
-		actual = StringUtils.substring(target, 1, 4);
-		assertThat(actual, is("bc"));
-		actual = StringUtils.substring(target, 2, 1);
-		assertNull(actual);
-		actual = StringUtils.substring(target, 2, 2);
-		assertThat(actual, is(""));
-		actual = StringUtils.substring(target, 2, 3);
-		assertThat(actual, is("c"));
-		actual = StringUtils.substring(target, 2, 4);
-		assertThat(actual, is("c"));
-	}
+    @Test
+    public void testSubstring() {
+        String target = "abc";
+        String actual = StringUtils.substring(target, 1);
+        assertThat(actual, is("bc"));
+        actual = StringUtils.substring(target, 2);
+        assertThat(actual, is("c"));
+        actual = StringUtils.substring(target, 3);
+        assertThat(actual, is(""));
+        actual = StringUtils.substring(target, 4);
+        assertNull(actual);
+        actual = StringUtils.substring(target, 0, 1);
+        assertThat(actual, is("a"));
+        actual = StringUtils.substring(target, 0, 2);
+        assertThat(actual, is("ab"));
+        actual = StringUtils.substring(target, 0, 3);
+        assertThat(actual, is("abc"));
+        actual = StringUtils.substring(target, 0, 4);
+        assertThat(actual, is("abc"));
+        actual = StringUtils.substring(target, 1, 1);
+        assertThat(actual, is(""));
+        actual = StringUtils.substring(target, 1, 2);
+        assertThat(actual, is("b"));
+        actual = StringUtils.substring(target, 1, 3);
+        assertThat(actual, is("bc"));
+        actual = StringUtils.substring(target, 1, 4);
+        assertThat(actual, is("bc"));
+        actual = StringUtils.substring(target, 2, 1);
+        assertNull(actual);
+        actual = StringUtils.substring(target, 2, 2);
+        assertThat(actual, is(""));
+        actual = StringUtils.substring(target, 2, 3);
+        assertThat(actual, is("c"));
+        actual = StringUtils.substring(target, 2, 4);
+        assertThat(actual, is("c"));
+    }
 
-	@Test
-	public void testSubstringWithEmptyArgs() {
-		String actual = StringUtils.substring(StringUtils.EMPTY, 0);
-		assertThat(actual, is(StringUtils.EMPTY));
-		actual = StringUtils.substring(null, 0);
-		assertNull(actual);
-		actual = StringUtils.substring(null, 0, 1);
-		assertNull(actual);
-		actual = StringUtils.substring(null, 1, 0);
-		assertNull(actual);
-	}
+    @Test
+    public void testSubstringWithEmptyArgs() {
+        String actual = StringUtils.substring(StringUtils.EMPTY, 0);
+        assertThat(actual, is(StringUtils.EMPTY));
+        actual = StringUtils.substring(null, 0);
+        assertNull(actual);
+        actual = StringUtils.substring(null, 0, 1);
+        assertNull(actual);
+        actual = StringUtils.substring(null, 1, 0);
+        assertNull(actual);
+    }
 
-	@Test
-	public void testTrimToEmpty() {
-		assertThat(StringUtils.trimToEmpty("foo "), is("foo"));
-		assertThat(StringUtils.trimToEmpty(" "), is(StringUtils.EMPTY));
-		assertThat(StringUtils.trimToEmpty("           "),
-				is(StringUtils.EMPTY));
-		assertThat(StringUtils.trimToEmpty(" foo"), is("foo"));
-		assertThat(StringUtils.trimToEmpty(" foo "), is("foo"));
-		assertThat(StringUtils.trimToEmpty("          foo            "),
-				is("foo"));
-		assertThat(StringUtils.trimToEmpty(null), is(StringUtils.EMPTY));
-		assertThat(StringUtils.trimToEmpty(""), is(StringUtils.EMPTY));
-	}
+    @Test
+    public void testTrimToEmpty() {
+        assertThat(StringUtils.trimToEmpty("foo "), is("foo"));
+        assertThat(StringUtils.trimToEmpty(" "), is(StringUtils.EMPTY));
+        assertThat(StringUtils.trimToEmpty("           "), is(StringUtils.EMPTY));
+        assertThat(StringUtils.trimToEmpty(" foo"), is("foo"));
+        assertThat(StringUtils.trimToEmpty(" foo "), is("foo"));
+        assertThat(StringUtils.trimToEmpty("          foo            "), is("foo"));
+        assertThat(StringUtils.trimToEmpty(null), is(StringUtils.EMPTY));
+        assertThat(StringUtils.trimToEmpty(""), is(StringUtils.EMPTY));
+    }
 
-	@Test
-	public void testCharAt() {
-		String value = "foo";
-		assertThat(StringUtils.charAt(0, value), is('f'));
-		assertThat(StringUtils.charAt(1, value), is('o'));
-		assertThat(StringUtils.charAt(3, value), is(Character.MIN_VALUE));
-		assertThat(StringUtils.charAt(-1, value), is(Character.MIN_VALUE));
-		assertThat(StringUtils.charAt(0, null), is(Character.MIN_VALUE));
-	}
+    @Test
+    public void testCharAt() {
+        String value = "foo";
+        assertThat(StringUtils.charAt(0, value), is('f'));
+        assertThat(StringUtils.charAt(1, value), is('o'));
+        assertThat(StringUtils.charAt(3, value), is(Character.MIN_VALUE));
+        assertThat(StringUtils.charAt(-1, value), is(Character.MIN_VALUE));
+        assertThat(StringUtils.charAt(0, null), is(Character.MIN_VALUE));
+    }
 
-	@Test
-	public void testJoin() {
-		assertThat(StringUtils.join(',', "a", "b", "c"), is("a,b,c"));
-		assertThat(StringUtils.join(',', "a"), is("a"));
-		assertThat(StringUtils.join(',', "a", "b", "c,"), is("a,b,c,"));
-		assertThat(StringUtils.join(','), is(""));
-	}
+    @Test
+    public void testJoin() {
+        assertThat(StringUtils.join(',', "a", "b", "c"), is("a,b,c"));
+        assertThat(StringUtils.join(',', "a"), is("a"));
+        assertThat(StringUtils.join(',', "a", "b", "c,"), is("a,b,c,"));
+        assertThat(StringUtils.join(','), is(""));
+    }
 }
diff --git a/src/test/java/org/analogweb/util/VersionTest.java b/src/test/java/org/analogweb/util/VersionTest.java
index 2db7727..2add4ec 100644
--- a/src/test/java/org/analogweb/util/VersionTest.java
+++ b/src/test/java/org/analogweb/util/VersionTest.java
@@ -15,69 +15,56 @@
 
 public class VersionTest {
 
-	@Test
-	public void testLoadSingleProperties() {
-		ClassLoader classLoader = new URLClassLoader(new URL[0]) {
+    @Test
+    public void testLoadSingleProperties() {
+        ClassLoader classLoader = new URLClassLoader(new URL[0]) {
 
-			@Override
-			public Enumeration<URL> getResources(String name)
-					throws IOException {
-				return Thread
-						.currentThread()
-						.getContextClassLoader()
-						.getResources(
-								"org/analogweb/util/VersionTest-1.properties");
-			}
-		};
-		List<Version> actual = Version.load(classLoader);
-		assertThat(actual.size(), is(1));
-		assertThat(actual.get(0).getArtifactId(), is("analogweb-core"));
-		assertThat(actual.get(0).getVersion(), is("1.0.0"));
-	}
+            @Override
+            public Enumeration<URL> getResources(String name) throws IOException {
+                return Thread.currentThread().getContextClassLoader()
+                        .getResources("org/analogweb/util/VersionTest-1.properties");
+            }
+        };
+        List<Version> actual = Version.load(classLoader);
+        assertThat(actual.size(), is(1));
+        assertThat(actual.get(0).getArtifactId(), is("analogweb-core"));
+        assertThat(actual.get(0).getVersion(), is("1.0.0"));
+    }
 
-	@Test
-	public void testLoadMultipleProperties() {
-		ClassLoader classLoader = new URLClassLoader(new URL[0]) {
+    @Test
+    public void testLoadMultipleProperties() {
+        ClassLoader classLoader = new URLClassLoader(new URL[0]) {
 
-			@Override
-			public Enumeration<URL> getResources(String name)
-					throws IOException {
-				return Collections
-						.enumeration(Arrays
-								.asList(Thread
-										.currentThread()
-										.getContextClassLoader()
-										.getResource(
-												"org/analogweb/util/VersionTest-1.properties"),
-										Thread.currentThread()
-												.getContextClassLoader()
-												.getResource(
-														"org/analogweb/util/VersionTest-2.properties")));
-			}
-		};
-		List<Version> actual = Version.load(classLoader);
-		assertThat(actual.size(), is(2));
-		// Alphabetical order.
-		assertThat(actual.get(0).getArtifactId(),
-				is("analogweb-another-plugin"));
-		assertThat(actual.get(0).getVersion(), is("1.0.1"));
-	}
+            @Override
+            public Enumeration<URL> getResources(String name) throws IOException {
+                return Collections.enumeration(Arrays.asList(
+                        Thread.currentThread().getContextClassLoader()
+                                .getResource("org/analogweb/util/VersionTest-1.properties"),
+                        Thread.currentThread().getContextClassLoader()
+                                .getResource("org/analogweb/util/VersionTest-2.properties")));
+            }
+        };
+        List<Version> actual = Version.load(classLoader);
+        assertThat(actual.size(), is(2));
+        // Alphabetical order.
+        assertThat(actual.get(0).getArtifactId(), is("analogweb-another-plugin"));
+        assertThat(actual.get(0).getVersion(), is("1.0.1"));
+    }
 
-	@Test
-	public void testLoadUnknownProperties() {
-		ClassLoader classLoader = new URLClassLoader(new URL[0]) {
+    @Test
+    public void testLoadUnknownProperties() {
+        ClassLoader classLoader = new URLClassLoader(new URL[0]) {
 
-			@Override
-			public Enumeration<URL> getResources(String name)
-					throws IOException {
-				List<URL> urls = Collections.emptyList();
-				return Collections.enumeration(urls);
-			}
-		};
-		List<Version> actual = Version.load(classLoader);
-		assertThat(actual.size(), is(1));
-		// Alphabetical order.
-		assertThat(actual.get(0).getArtifactId(), is(""));
-		assertThat(actual.get(0).getVersion(), is("Unknown"));
-	}
+            @Override
+            public Enumeration<URL> getResources(String name) throws IOException {
+                List<URL> urls = Collections.emptyList();
+                return Collections.enumeration(urls);
+            }
+        };
+        List<Version> actual = Version.load(classLoader);
+        assertThat(actual.size(), is(1));
+        // Alphabetical order.
+        assertThat(actual.get(0).getArtifactId(), is(""));
+        assertThat(actual.get(0).getVersion(), is("Unknown"));
+    }
 }
diff --git a/src/test/java/org/analogweb/util/classcollector/Baz.java b/src/test/java/org/analogweb/util/classcollector/Baz.java
index 1788395..b631f74 100644
--- a/src/test/java/org/analogweb/util/classcollector/Baz.java
+++ b/src/test/java/org/analogweb/util/classcollector/Baz.java
@@ -5,6 +5,6 @@
  */
 public class Baz extends Foo {
 
-	public static class Bee {
-	}
+    public static class Bee {
+    }
 }
diff --git a/src/test/java/org/analogweb/util/logging/JulLogConfigTest.java b/src/test/java/org/analogweb/util/logging/JulLogConfigTest.java
index a104934..b41c09b 100644
--- a/src/test/java/org/analogweb/util/logging/JulLogConfigTest.java
+++ b/src/test/java/org/analogweb/util/logging/JulLogConfigTest.java
@@ -14,33 +14,31 @@
 
 public class JulLogConfigTest extends JulLogConfig {
 
-	private JulLogConfig config;
-	private Logger grobalLogger;
-
-	@Before
-	public void setUp() throws Exception {
-		config = new JulLogConfig() {
-		};
-		grobalLogger = Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
-	}
-
-	@After
-	public void tearDown() {
-		LogManager.getLogManager().addLogger(grobalLogger);
-	}
-
-	@Test
-	public void testConfigure() {
-		config.configure(Thread.currentThread().getContextClassLoader());
-		Logger actual = config.createLogger(getClass().getCanonicalName());
-		// assert default configuration.
-		assertThat(actual.getLevel(), is(Level.INFO));
-		assertThat(actual.getHandlers().length, is(1));
-		assertThat(ConsoleHandler.class.isInstance(actual.getHandlers()[0]),
-				is(true));
-		ConsoleHandler handler = (ConsoleHandler) actual.getHandlers()[0];
-		assertThat(handler.getLevel(), is(Level.INFO));
-		assertThat(JulLogFormatter.class.isInstance(handler.getFormatter()),
-				is(true));
-	}
+    private JulLogConfig config;
+    private Logger grobalLogger;
+
+    @Before
+    public void setUp() throws Exception {
+        config = new JulLogConfig() {
+        };
+        grobalLogger = Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
+    }
+
+    @After
+    public void tearDown() {
+        LogManager.getLogManager().addLogger(grobalLogger);
+    }
+
+    @Test
+    public void testConfigure() {
+        config.configure(Thread.currentThread().getContextClassLoader());
+        Logger actual = config.createLogger(getClass().getCanonicalName());
+        // assert default configuration.
+        assertThat(actual.getLevel(), is(Level.INFO));
+        assertThat(actual.getHandlers().length, is(1));
+        assertThat(ConsoleHandler.class.isInstance(actual.getHandlers()[0]), is(true));
+        ConsoleHandler handler = (ConsoleHandler) actual.getHandlers()[0];
+        assertThat(handler.getLevel(), is(Level.INFO));
+        assertThat(JulLogFormatter.class.isInstance(handler.getFormatter()), is(true));
+    }
 }
diff --git a/src/test/java/org/analogweb/util/logging/JulLogFormatterTest.java b/src/test/java/org/analogweb/util/logging/JulLogFormatterTest.java
index 7e1e25b..d85b611 100644
--- a/src/test/java/org/analogweb/util/logging/JulLogFormatterTest.java
+++ b/src/test/java/org/analogweb/util/logging/JulLogFormatterTest.java
@@ -14,24 +14,21 @@
 
 public class JulLogFormatterTest extends JulLogFormatter {
 
-	private JulLogFormatter formatter;
+    private JulLogFormatter formatter;
 
-	@Before
-	public void setUp() throws Exception {
-		formatter = new JulLogFormatter();
-	}
+    @Before
+    public void setUp() throws Exception {
+        formatter = new JulLogFormatter();
+    }
 
-	@Test
-	public void test() throws Exception {
-		Date currentTime = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss")
-				.parse("2012/01/22 10:01:11");
-		LogRecord record = new LogRecord(Level.INFO, "this is test message.");
-		record.setLoggerName("testLogger");
-		record.setMillis(currentTime.getTime());
-		record.setThreadID(10);
-		String actual = formatter.format(record);
-		assertThat(
-				actual,
-				is("2012-01-22 10:01:11.000 testLogger INFO {10} - this is test message.\n"));
-	}
+    @Test
+    public void test() throws Exception {
+        Date currentTime = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss").parse("2012/01/22 10:01:11");
+        LogRecord record = new LogRecord(Level.INFO, "this is test message.");
+        record.setLoggerName("testLogger");
+        record.setMillis(currentTime.getTime());
+        record.setThreadID(10);
+        String actual = formatter.format(record);
+        assertThat(actual, is("2012-01-22 10:01:11.000 testLogger INFO {10} - this is test message.\n"));
+    }
 }
diff --git a/src/test/java/org/analogweb/util/logging/LogsTest.java b/src/test/java/org/analogweb/util/logging/LogsTest.java
index a318178..0381ce5 100644
--- a/src/test/java/org/analogweb/util/logging/LogsTest.java
+++ b/src/test/java/org/analogweb/util/logging/LogsTest.java
@@ -25,822 +25,809 @@
  */
 public class LogsTest {
 
-	private Log log;
-
-	void loadConfig(String logLevel) throws Exception {
-		LogManager manager = LogManager.getLogManager();
-		manager.reset();
-		Properties props = new Properties();
-		props.put("handlers", LogsTest.class.getCanonicalName()
-				+ "$StubHandler," + ConsoleHandler.class.getCanonicalName());
-		props.put(".level", logLevel);
-		props.put(LogsTest.class.getCanonicalName() + "StubHandler.level",
-				logLevel);
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		props.store(out, "");
-		InputStream ins = new ByteArrayInputStream(out.toByteArray());
-		manager.readConfiguration(ins);
-		StubHandler.clearRecord();
-	}
-
-	@After
-	public void tearDown() {
-		LogManager.getLogManager().reset();
-		StubHandler.clearRecord();
-	}
-
-	@Test
-	public void testGetDefaultLogInstance() throws Exception {
-		loadConfig("FINEST");
-		log = Logs.getLog(LogsTest.class);
-		assertTrue(log instanceof JulLog);
-	}
-
-	@Test
-	public void testLevelsLog() throws Exception {
-		loadConfig("FINEST");
-		log = Logs.getLog(LogsTest.class);
-		log.trace(SimpleMarker.valueOf("marker"), "trace message!");
-		LogRecord actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.FINEST));
-		assertThat(actual.getMessage(), is("trace message!"));
-		StubHandler.clearRecord();
-		log.debug(SimpleMarker.valueOf("marker"), "debug message!");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.FINE));
-		assertThat(actual.getMessage(), is("debug message!"));
-		StubHandler.clearRecord();
-		log.info(SimpleMarker.valueOf("marker"), "info message!");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.INFO));
-		assertThat(actual.getMessage(), is("info message!"));
-		StubHandler.clearRecord();
-		log.warn(SimpleMarker.valueOf("marker"), "warn message!");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.WARNING));
-		assertThat(actual.getMessage(), is("warn message!"));
-		StubHandler.clearRecord();
-		log.error(SimpleMarker.valueOf("marker"), "error message!");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.SEVERE));
-		assertThat(actual.getMessage(), is("error message!"));
-	}
-
-	@Test
-	public void testLevelsLogWithArgs() throws Exception {
-		loadConfig("FINEST");
-		log = Logs.getLog(LogsTest.class);
-		log.trace(SimpleMarker.valueOf("marker"), "log message!", "trace");
-		LogRecord actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.FINEST));
-		assertThat(actual.getMessage(), is("log message!"));
-		assertThat(actual.getParameters()[0].toString(), is("trace"));
-		StubHandler.clearRecord();
-		log.debug(SimpleMarker.valueOf("marker"), "log message!", "debug");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.FINE));
-		assertThat(actual.getMessage(), is("log message!"));
-		assertThat(actual.getParameters()[0].toString(), is("debug"));
-		StubHandler.clearRecord();
-		log.info(SimpleMarker.valueOf("marker"), "log message!", "info");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.INFO));
-		assertThat(actual.getMessage(), is("log message!"));
-		assertThat(actual.getParameters()[0].toString(), is("info"));
-		StubHandler.clearRecord();
-		log.warn(SimpleMarker.valueOf("marker"), "log message!", "warn");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.WARNING));
-		assertThat(actual.getMessage(), is("log message!"));
-		assertThat(actual.getParameters()[0].toString(), is("warn"));
-		StubHandler.clearRecord();
-		log.error(SimpleMarker.valueOf("marker"), "log message!", "error");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.SEVERE));
-		assertThat(actual.getMessage(), is("log message!"));
-		assertThat(actual.getParameters()[0].toString(), is("error"));
-	}
-
-	@Test
-	public void testLog() throws Exception {
-		loadConfig("FINEST");
-		log = Logs.getLog(LogsTest.class);
-		log.log("T001");
-		LogRecord actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.FINEST));
-		assertThat(actual.getMessage(), is("T001"));
-		StubHandler.clearRecord();
-		log.log("D001");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.FINE));
-		assertThat(actual.getMessage(), is("D001"));
-		StubHandler.clearRecord();
-		log.log("I001");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.INFO));
-		assertThat(actual.getMessage(), is("I001"));
-		StubHandler.clearRecord();
-		log.log("W001");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.WARNING));
-		assertThat(actual.getMessage(), is("W001"));
-		StubHandler.clearRecord();
-		log.log("E001");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.SEVERE));
-		assertThat(actual.getMessage(), is("E001"));
-	}
-
-	@Test
-	public void testLogUntilWarnDisabled() throws Exception {
-		loadConfig("WARNING");
-		log = Logs.getLog(LogsTest.class);
-		StubHandler.clearRecord();
-		log.log("T001");
-		LogRecord actual = StubHandler.actualRecord();
-		assertNull(actual);
-		StubHandler.clearRecord();
-		log.log("D001");
-		actual = StubHandler.actualRecord();
-		assertNull(actual);
-		StubHandler.clearRecord();
-		log.log("I001");
-		actual = StubHandler.actualRecord();
-		assertNull(actual);
-		StubHandler.clearRecord();
-		log.log("W001");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.WARNING));
-		assertThat(actual.getMessage(), is("W001"));
-		StubHandler.clearRecord();
-		log.log("E001");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.SEVERE));
-		assertThat(actual.getMessage(), is("E001"));
-	}
-
-	@Test
-	public void testLogUntilAllDisabled() throws Exception {
-		loadConfig("OFF");
-		log = Logs.getLog(LogsTest.class);
-		StubHandler.clearRecord();
-		log.log("T001");
-		LogRecord actual = StubHandler.actualRecord();
-		assertNull(actual);
-		StubHandler.clearRecord();
-		log.log("D001");
-		actual = StubHandler.actualRecord();
-		assertNull(actual);
-		StubHandler.clearRecord();
-		log.log("I001");
-		actual = StubHandler.actualRecord();
-		assertNull(actual);
-		StubHandler.clearRecord();
-		log.log("W001");
-		actual = StubHandler.actualRecord();
-		assertNull(actual);
-		StubHandler.clearRecord();
-		log.log("E001");
-		actual = StubHandler.actualRecord();
-		assertNull(actual);
-	}
-
-	@Test
-	public void testLogWithThrowable() throws Exception {
-		Throwable th = new IllegalStateException();
-		loadConfig("FINEST");
-		log = Logs.getLog(LogsTest.class);
-		log.log(SimpleMarker.valueOf("marker"), "T001", th);
-		LogRecord actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.FINEST));
-		assertThat(actual.getMessage(), is("T001"));
-		assertThat(actual.getThrown(), is(th));
-		StubHandler.clearRecord();
-		log.log("D001", th, "debug!");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.FINE));
-		assertThat(actual.getMessage(), is("D001"));
-		assertThat(actual.getThrown(), is(th));
-		StubHandler.clearRecord();
-		log.log("I001", th);
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.INFO));
-		assertThat(actual.getMessage(), is("I001"));
-		assertThat(actual.getThrown(), is(th));
-		StubHandler.clearRecord();
-		log.log(SimpleMarker.valueOf("marker"), "W001", th, "warn!");
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.WARNING));
-		assertThat(actual.getMessage(), is("W001"));
-		assertThat(actual.getThrown(), is(th));
-		StubHandler.clearRecord();
-		log.log(SimpleMarker.valueOf("marker"), "E001", th);
-		actual = StubHandler.actualRecord();
-		assertThat(actual.getLevel(), is(Level.SEVERE));
-		assertThat(actual.getMessage(), is("E001"));
-		assertThat(actual.getThrown(), is(th));
-	}
-
-	@Test
-	public void testDistinctCustomLogger() throws Exception {
-		loadConfig("FINEST");
-		log = Logs.getLog(LogsTest.class.getName(), Thread.currentThread()
-				.getContextClassLoader(), StubLogImpl.class.getName());
-		assertTrue(log instanceof StubLogImpl);
-	}
-
-	@Test
-	public void testNoExistsCustomLogger() throws Exception {
-		loadConfig("FINEST");
-		log = Logs.getLog(LogsTest.class.getName(), Thread.currentThread()
-				.getContextClassLoader(), "not.avairable.logClass");
-		assertTrue(log instanceof JulLog);
-	}
-
-	@Test
-	public void testNoCustomLogger() throws Exception {
-		loadConfig("FINEST");
-		log = Logs.getLog(LogsTest.class.getName(), Thread.currentThread()
-				.getContextClassLoader(), AbstractLog.class.getName());
-		assertTrue(log instanceof JulLog);
-	}
-
-	@Test
-	public void testNoLogCustomLogger() throws Exception {
-		loadConfig("FINEST");
-		log = Logs.getLog(LogsTest.class.getName(), Thread.currentThread()
-				.getContextClassLoader(), LogsTest.class.getName());
-		assertTrue(log instanceof JulLog);
-	}
-
-	@Test
-	public void testNoConstractorCustomLogger() throws Exception {
-		loadConfig("FINEST");
-		log = Logs.getLog(LogsTest.class.getName(), Thread.currentThread()
-				.getContextClassLoader(), NoConstractorLogImpl.class.getName());
-		assertTrue(log instanceof JulLog);
-	}
-
-	@Test
-	public void testNotInstanticatableCustomLogger() throws Exception {
-		loadConfig("FINEST");
-		log = Logs.getLog(LogsTest.class.getName(), Thread.currentThread()
-				.getContextClassLoader(), NoInstanticatableLogImpl.class
-				.getName());
-		assertTrue(log instanceof JulLog);
-	}
-
-	@Test
-	public void testFailInstanticatableCustomLogger() throws Exception {
-		loadConfig("FINEST");
-		log = Logs.getLog(LogsTest.class.getName(), Thread.currentThread()
-				.getContextClassLoader(), FailInstanticatableLogImpl.class
-				.getName());
-		assertTrue(log instanceof JulLog);
-	}
-
-	public static class NoInstanticatableLogImpl extends StubLogImpl {
-
-		public NoInstanticatableLogImpl() {
-			super("", null);
-		}
-	}
-
-	public static class FailInstanticatableLogImpl extends StubLogImpl {
-
-		public FailInstanticatableLogImpl(String name, ClassLoader l) {
-			super(name, l);
-			throw new RuntimeException();
-		}
-	}
-
-	public static class StubLogImpl extends AbstractLog {
-
-		public StubLogImpl(String name, ClassLoader classLoader) {
-			super(name, classLoader);
-		}
-
-		@Override
-		public void trace(String message) {
-			// nop.
-		}
-
-		@Override
-		public void trace(String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void trace(String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void trace(Marker marker, String message) {
-			// nop.
-		}
-
-		@Override
-		public void trace(Marker marker, String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void trace(Marker marker, String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public boolean isTraceEnabled() {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public boolean isTraceEnabled(Marker marker) {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public void debug(String message) {
-			// nop.
-		}
-
-		@Override
-		public void debug(String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void debug(String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void debug(Marker marker, String message) {
-			// nop.
-		}
-
-		@Override
-		public void debug(Marker marker, String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void debug(Marker marker, String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public boolean isDebugEnabled() {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public boolean isDebugEnabled(Marker marker) {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public void info(String message) {
-			// nop.
-		}
-
-		@Override
-		public void info(String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void info(String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void info(Marker marker, String message) {
-			// nop.
-		}
-
-		@Override
-		public void info(Marker marker, String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void info(Marker marker, String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public boolean isInfoEnabled() {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public boolean isInfoEnabled(Marker marker) {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public void warn(String message) {
-			// nop.
-		}
-
-		@Override
-		public void warn(String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void warn(String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void warn(Marker marker, String message) {
-			// nop.
-		}
-
-		@Override
-		public void warn(Marker marker, String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void warn(Marker marker, String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public boolean isWarnEnabled() {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public boolean isWarnEnabled(Marker marker) {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public void error(String message) {
-			// nop.
-		}
-
-		@Override
-		public void error(String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void error(String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void error(Marker marker, String message) {
-			// nop.
-		}
-
-		@Override
-		public void error(Marker marker, String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void error(Marker marker, String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public boolean isErrorEnabled() {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public boolean isErrorEnabled(Marker marker) {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public void log(MessageResource messageResource, String message) {
-			// nop.
-		}
-
-		@Override
-		public void log(MessageResource messageResource, String message,
-				Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void log(MessageResource messageResource, String message,
-				Throwable t, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void log(MessageResource messageResource, Marker marker,
-				String message) {
-			// nop.
-		}
-
-		@Override
-		public void log(MessageResource messageResource, Marker marker,
-				String message, Throwable t, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void log(MessageResource messageResource, Marker marker,
-				String message, Object... args) {
-			// nop.
-		}
-	}
-
-	public static final class StubHandler extends Handler {
-
-		private static LogRecord publishedRecord;
-
-		@Override
-		public void publish(LogRecord record) {
-			publishedRecord = record;
-		}
-
-		@Override
-		public void flush() {
-		}
-
-		@Override
-		public void close() throws SecurityException {
-		}
-
-		static LogRecord actualRecord() {
-			return publishedRecord;
-		}
-
-		static void clearRecord() {
-			publishedRecord = null;
-		}
-	}
-
-	public static final class NoConstractorLogImpl extends AbstractLog {
-
-		public NoConstractorLogImpl() {
-			super(null, null);
-		}
-
-		@Override
-		public void trace(String message) {
-			// nop.
-		}
-
-		@Override
-		public void trace(String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void trace(String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void trace(Marker marker, String message) {
-			// nop.
-		}
-
-		@Override
-		public void trace(Marker marker, String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void trace(Marker marker, String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public boolean isTraceEnabled() {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public boolean isTraceEnabled(Marker marker) {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public void debug(String message) {
-			// nop.
-		}
-
-		@Override
-		public void debug(String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void debug(String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void debug(Marker marker, String message) {
-			// nop.
-		}
-
-		@Override
-		public void debug(Marker marker, String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void debug(Marker marker, String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public boolean isDebugEnabled() {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public boolean isDebugEnabled(Marker marker) {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public void info(String message) {
-			// nop.
-		}
-
-		@Override
-		public void info(String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void info(String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void info(Marker marker, String message) {
-			// nop.
-		}
-
-		@Override
-		public void info(Marker marker, String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void info(Marker marker, String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public boolean isInfoEnabled() {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public boolean isInfoEnabled(Marker marker) {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public void warn(String message) {
-			// nop.
-		}
-
-		@Override
-		public void warn(String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void warn(String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void warn(Marker marker, String message) {
-			// nop.
-		}
-
-		@Override
-		public void warn(Marker marker, String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void warn(Marker marker, String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public boolean isWarnEnabled() {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public boolean isWarnEnabled(Marker marker) {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public void error(String message) {
-			// nop.
-		}
-
-		@Override
-		public void error(String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void error(String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void error(Marker marker, String message) {
-			// nop.
-		}
-
-		@Override
-		public void error(Marker marker, String message, Throwable throwable) {
-			// nop.
-		}
-
-		@Override
-		public void error(Marker marker, String message, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public boolean isErrorEnabled() {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public boolean isErrorEnabled(Marker marker) {
-			// nop.
-			return false;
-		}
-
-		@Override
-		public void log(MessageResource messageResource, String message) {
-			// nop.
-		}
-
-		@Override
-		public void log(MessageResource messageResource, String message,
-				Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void log(MessageResource messageResource, String message,
-				Throwable t, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void log(MessageResource messageResource, Marker marker,
-				String message) {
-			// nop.
-		}
-
-		@Override
-		public void log(MessageResource messageResource, Marker marker,
-				String message, Throwable t, Object... args) {
-			// nop.
-		}
-
-		@Override
-		public void log(MessageResource messageResource, Marker marker,
-				String message, Object... args) {
-			// nop.
-		}
-	}
+    private Log log;
+
+    void loadConfig(String logLevel) throws Exception {
+        LogManager manager = LogManager.getLogManager();
+        manager.reset();
+        Properties props = new Properties();
+        props.put("handlers",
+                LogsTest.class.getCanonicalName() + "$StubHandler," + ConsoleHandler.class.getCanonicalName());
+        props.put(".level", logLevel);
+        props.put(LogsTest.class.getCanonicalName() + "StubHandler.level", logLevel);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        props.store(out, "");
+        InputStream ins = new ByteArrayInputStream(out.toByteArray());
+        manager.readConfiguration(ins);
+        StubHandler.clearRecord();
+    }
+
+    @After
+    public void tearDown() {
+        LogManager.getLogManager().reset();
+        StubHandler.clearRecord();
+    }
+
+    @Test
+    public void testGetDefaultLogInstance() throws Exception {
+        loadConfig("FINEST");
+        log = Logs.getLog(LogsTest.class);
+        assertTrue(log instanceof JulLog);
+    }
+
+    @Test
+    public void testLevelsLog() throws Exception {
+        loadConfig("FINEST");
+        log = Logs.getLog(LogsTest.class);
+        log.trace(SimpleMarker.valueOf("marker"), "trace message!");
+        LogRecord actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.FINEST));
+        assertThat(actual.getMessage(), is("trace message!"));
+        StubHandler.clearRecord();
+        log.debug(SimpleMarker.valueOf("marker"), "debug message!");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.FINE));
+        assertThat(actual.getMessage(), is("debug message!"));
+        StubHandler.clearRecord();
+        log.info(SimpleMarker.valueOf("marker"), "info message!");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.INFO));
+        assertThat(actual.getMessage(), is("info message!"));
+        StubHandler.clearRecord();
+        log.warn(SimpleMarker.valueOf("marker"), "warn message!");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.WARNING));
+        assertThat(actual.getMessage(), is("warn message!"));
+        StubHandler.clearRecord();
+        log.error(SimpleMarker.valueOf("marker"), "error message!");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.SEVERE));
+        assertThat(actual.getMessage(), is("error message!"));
+    }
+
+    @Test
+    public void testLevelsLogWithArgs() throws Exception {
+        loadConfig("FINEST");
+        log = Logs.getLog(LogsTest.class);
+        log.trace(SimpleMarker.valueOf("marker"), "log message!", "trace");
+        LogRecord actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.FINEST));
+        assertThat(actual.getMessage(), is("log message!"));
+        assertThat(actual.getParameters()[0].toString(), is("trace"));
+        StubHandler.clearRecord();
+        log.debug(SimpleMarker.valueOf("marker"), "log message!", "debug");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.FINE));
+        assertThat(actual.getMessage(), is("log message!"));
+        assertThat(actual.getParameters()[0].toString(), is("debug"));
+        StubHandler.clearRecord();
+        log.info(SimpleMarker.valueOf("marker"), "log message!", "info");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.INFO));
+        assertThat(actual.getMessage(), is("log message!"));
+        assertThat(actual.getParameters()[0].toString(), is("info"));
+        StubHandler.clearRecord();
+        log.warn(SimpleMarker.valueOf("marker"), "log message!", "warn");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.WARNING));
+        assertThat(actual.getMessage(), is("log message!"));
+        assertThat(actual.getParameters()[0].toString(), is("warn"));
+        StubHandler.clearRecord();
+        log.error(SimpleMarker.valueOf("marker"), "log message!", "error");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.SEVERE));
+        assertThat(actual.getMessage(), is("log message!"));
+        assertThat(actual.getParameters()[0].toString(), is("error"));
+    }
+
+    @Test
+    public void testLog() throws Exception {
+        loadConfig("FINEST");
+        log = Logs.getLog(LogsTest.class);
+        log.log("T001");
+        LogRecord actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.FINEST));
+        assertThat(actual.getMessage(), is("T001"));
+        StubHandler.clearRecord();
+        log.log("D001");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.FINE));
+        assertThat(actual.getMessage(), is("D001"));
+        StubHandler.clearRecord();
+        log.log("I001");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.INFO));
+        assertThat(actual.getMessage(), is("I001"));
+        StubHandler.clearRecord();
+        log.log("W001");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.WARNING));
+        assertThat(actual.getMessage(), is("W001"));
+        StubHandler.clearRecord();
+        log.log("E001");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.SEVERE));
+        assertThat(actual.getMessage(), is("E001"));
+    }
+
+    @Test
+    public void testLogUntilWarnDisabled() throws Exception {
+        loadConfig("WARNING");
+        log = Logs.getLog(LogsTest.class);
+        StubHandler.clearRecord();
+        log.log("T001");
+        LogRecord actual = StubHandler.actualRecord();
+        assertNull(actual);
+        StubHandler.clearRecord();
+        log.log("D001");
+        actual = StubHandler.actualRecord();
+        assertNull(actual);
+        StubHandler.clearRecord();
+        log.log("I001");
+        actual = StubHandler.actualRecord();
+        assertNull(actual);
+        StubHandler.clearRecord();
+        log.log("W001");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.WARNING));
+        assertThat(actual.getMessage(), is("W001"));
+        StubHandler.clearRecord();
+        log.log("E001");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.SEVERE));
+        assertThat(actual.getMessage(), is("E001"));
+    }
+
+    @Test
+    public void testLogUntilAllDisabled() throws Exception {
+        loadConfig("OFF");
+        log = Logs.getLog(LogsTest.class);
+        StubHandler.clearRecord();
+        log.log("T001");
+        LogRecord actual = StubHandler.actualRecord();
+        assertNull(actual);
+        StubHandler.clearRecord();
+        log.log("D001");
+        actual = StubHandler.actualRecord();
+        assertNull(actual);
+        StubHandler.clearRecord();
+        log.log("I001");
+        actual = StubHandler.actualRecord();
+        assertNull(actual);
+        StubHandler.clearRecord();
+        log.log("W001");
+        actual = StubHandler.actualRecord();
+        assertNull(actual);
+        StubHandler.clearRecord();
+        log.log("E001");
+        actual = StubHandler.actualRecord();
+        assertNull(actual);
+    }
+
+    @Test
+    public void testLogWithThrowable() throws Exception {
+        Throwable th = new IllegalStateException();
+        loadConfig("FINEST");
+        log = Logs.getLog(LogsTest.class);
+        log.log(SimpleMarker.valueOf("marker"), "T001", th);
+        LogRecord actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.FINEST));
+        assertThat(actual.getMessage(), is("T001"));
+        assertThat(actual.getThrown(), is(th));
+        StubHandler.clearRecord();
+        log.log("D001", th, "debug!");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.FINE));
+        assertThat(actual.getMessage(), is("D001"));
+        assertThat(actual.getThrown(), is(th));
+        StubHandler.clearRecord();
+        log.log("I001", th);
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.INFO));
+        assertThat(actual.getMessage(), is("I001"));
+        assertThat(actual.getThrown(), is(th));
+        StubHandler.clearRecord();
+        log.log(SimpleMarker.valueOf("marker"), "W001", th, "warn!");
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.WARNING));
+        assertThat(actual.getMessage(), is("W001"));
+        assertThat(actual.getThrown(), is(th));
+        StubHandler.clearRecord();
+        log.log(SimpleMarker.valueOf("marker"), "E001", th);
+        actual = StubHandler.actualRecord();
+        assertThat(actual.getLevel(), is(Level.SEVERE));
+        assertThat(actual.getMessage(), is("E001"));
+        assertThat(actual.getThrown(), is(th));
+    }
+
+    @Test
+    public void testDistinctCustomLogger() throws Exception {
+        loadConfig("FINEST");
+        log = Logs.getLog(LogsTest.class.getName(), Thread.currentThread().getContextClassLoader(),
+                StubLogImpl.class.getName());
+        assertTrue(log instanceof StubLogImpl);
+    }
+
+    @Test
+    public void testNoExistsCustomLogger() throws Exception {
+        loadConfig("FINEST");
+        log = Logs.getLog(LogsTest.class.getName(), Thread.currentThread().getContextClassLoader(),
+                "not.avairable.logClass");
+        assertTrue(log instanceof JulLog);
+    }
+
+    @Test
+    public void testNoCustomLogger() throws Exception {
+        loadConfig("FINEST");
+        log = Logs.getLog(LogsTest.class.getName(), Thread.currentThread().getContextClassLoader(),
+                AbstractLog.class.getName());
+        assertTrue(log instanceof JulLog);
+    }
+
+    @Test
+    public void testNoLogCustomLogger() throws Exception {
+        loadConfig("FINEST");
+        log = Logs.getLog(LogsTest.class.getName(), Thread.currentThread().getContextClassLoader(),
+                LogsTest.class.getName());
+        assertTrue(log instanceof JulLog);
+    }
+
+    @Test
+    public void testNoConstractorCustomLogger() throws Exception {
+        loadConfig("FINEST");
+        log = Logs.getLog(LogsTest.class.getName(), Thread.currentThread().getContextClassLoader(),
+                NoConstractorLogImpl.class.getName());
+        assertTrue(log instanceof JulLog);
+    }
+
+    @Test
+    public void testNotInstanticatableCustomLogger() throws Exception {
+        loadConfig("FINEST");
+        log = Logs.getLog(LogsTest.class.getName(), Thread.currentThread().getContextClassLoader(),
+                NoInstanticatableLogImpl.class.getName());
+        assertTrue(log instanceof JulLog);
+    }
+
+    @Test
+    public void testFailInstanticatableCustomLogger() throws Exception {
+        loadConfig("FINEST");
+        log = Logs.getLog(LogsTest.class.getName(), Thread.currentThread().getContextClassLoader(),
+                FailInstanticatableLogImpl.class.getName());
+        assertTrue(log instanceof JulLog);
+    }
+
+    public static class NoInstanticatableLogImpl extends StubLogImpl {
+
+        public NoInstanticatableLogImpl() {
+            super("", null);
+        }
+    }
+
+    public static class FailInstanticatableLogImpl extends StubLogImpl {
+
+        public FailInstanticatableLogImpl(String name, ClassLoader l) {
+            super(name, l);
+            throw new RuntimeException();
+        }
+    }
+
+    public static class StubLogImpl extends AbstractLog {
+
+        public StubLogImpl(String name, ClassLoader classLoader) {
+            super(name, classLoader);
+        }
+
+        @Override
+        public void trace(String message) {
+            // nop.
+        }
+
+        @Override
+        public void trace(String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void trace(String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void trace(Marker marker, String message) {
+            // nop.
+        }
+
+        @Override
+        public void trace(Marker marker, String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void trace(Marker marker, String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public boolean isTraceEnabled() {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public boolean isTraceEnabled(Marker marker) {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public void debug(String message) {
+            // nop.
+        }
+
+        @Override
+        public void debug(String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void debug(String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void debug(Marker marker, String message) {
+            // nop.
+        }
+
+        @Override
+        public void debug(Marker marker, String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void debug(Marker marker, String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public boolean isDebugEnabled() {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public boolean isDebugEnabled(Marker marker) {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public void info(String message) {
+            // nop.
+        }
+
+        @Override
+        public void info(String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void info(String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void info(Marker marker, String message) {
+            // nop.
+        }
+
+        @Override
+        public void info(Marker marker, String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void info(Marker marker, String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public boolean isInfoEnabled() {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public boolean isInfoEnabled(Marker marker) {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public void warn(String message) {
+            // nop.
+        }
+
+        @Override
+        public void warn(String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void warn(String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void warn(Marker marker, String message) {
+            // nop.
+        }
+
+        @Override
+        public void warn(Marker marker, String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void warn(Marker marker, String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public boolean isWarnEnabled() {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public boolean isWarnEnabled(Marker marker) {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public void error(String message) {
+            // nop.
+        }
+
+        @Override
+        public void error(String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void error(String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void error(Marker marker, String message) {
+            // nop.
+        }
+
+        @Override
+        public void error(Marker marker, String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void error(Marker marker, String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public boolean isErrorEnabled() {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public boolean isErrorEnabled(Marker marker) {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public void log(MessageResource messageResource, String message) {
+            // nop.
+        }
+
+        @Override
+        public void log(MessageResource messageResource, String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void log(MessageResource messageResource, String message, Throwable t, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void log(MessageResource messageResource, Marker marker, String message) {
+            // nop.
+        }
+
+        @Override
+        public void log(MessageResource messageResource, Marker marker, String message, Throwable t, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void log(MessageResource messageResource, Marker marker, String message, Object... args) {
+            // nop.
+        }
+    }
+
+    public static final class StubHandler extends Handler {
+
+        private static LogRecord publishedRecord;
+
+        @Override
+        public void publish(LogRecord record) {
+            publishedRecord = record;
+        }
+
+        @Override
+        public void flush() {
+        }
+
+        @Override
+        public void close() throws SecurityException {
+        }
+
+        static LogRecord actualRecord() {
+            return publishedRecord;
+        }
+
+        static void clearRecord() {
+            publishedRecord = null;
+        }
+    }
+
+    public static final class NoConstractorLogImpl extends AbstractLog {
+
+        public NoConstractorLogImpl() {
+            super(null, null);
+        }
+
+        @Override
+        public void trace(String message) {
+            // nop.
+        }
+
+        @Override
+        public void trace(String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void trace(String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void trace(Marker marker, String message) {
+            // nop.
+        }
+
+        @Override
+        public void trace(Marker marker, String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void trace(Marker marker, String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public boolean isTraceEnabled() {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public boolean isTraceEnabled(Marker marker) {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public void debug(String message) {
+            // nop.
+        }
+
+        @Override
+        public void debug(String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void debug(String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void debug(Marker marker, String message) {
+            // nop.
+        }
+
+        @Override
+        public void debug(Marker marker, String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void debug(Marker marker, String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public boolean isDebugEnabled() {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public boolean isDebugEnabled(Marker marker) {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public void info(String message) {
+            // nop.
+        }
+
+        @Override
+        public void info(String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void info(String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void info(Marker marker, String message) {
+            // nop.
+        }
+
+        @Override
+        public void info(Marker marker, String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void info(Marker marker, String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public boolean isInfoEnabled() {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public boolean isInfoEnabled(Marker marker) {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public void warn(String message) {
+            // nop.
+        }
+
+        @Override
+        public void warn(String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void warn(String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void warn(Marker marker, String message) {
+            // nop.
+        }
+
+        @Override
+        public void warn(Marker marker, String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void warn(Marker marker, String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public boolean isWarnEnabled() {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public boolean isWarnEnabled(Marker marker) {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public void error(String message) {
+            // nop.
+        }
+
+        @Override
+        public void error(String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void error(String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void error(Marker marker, String message) {
+            // nop.
+        }
+
+        @Override
+        public void error(Marker marker, String message, Throwable throwable) {
+            // nop.
+        }
+
+        @Override
+        public void error(Marker marker, String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public boolean isErrorEnabled() {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public boolean isErrorEnabled(Marker marker) {
+            // nop.
+            return false;
+        }
+
+        @Override
+        public void log(MessageResource messageResource, String message) {
+            // nop.
+        }
+
+        @Override
+        public void log(MessageResource messageResource, String message, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void log(MessageResource messageResource, String message, Throwable t, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void log(MessageResource messageResource, Marker marker, String message) {
+            // nop.
+        }
+
+        @Override
+        public void log(MessageResource messageResource, Marker marker, String message, Throwable t, Object... args) {
+            // nop.
+        }
+
+        @Override
+        public void log(MessageResource messageResource, Marker marker, String message, Object... args) {
+            // nop.
+        }
+    }
 }
diff --git a/src/test/java/org/analogweb/util/logging/MarkersTest.java b/src/test/java/org/analogweb/util/logging/MarkersTest.java
index 86ba41f..16d377b 100644
--- a/src/test/java/org/analogweb/util/logging/MarkersTest.java
+++ b/src/test/java/org/analogweb/util/logging/MarkersTest.java
@@ -12,22 +12,22 @@
 
 public class MarkersTest extends Markers {
 
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-	@Test
-	public void testValueOf() {
-		SimpleMarker foo = SimpleMarker.valueOf("foo");
-		SimpleMarker foo2 = SimpleMarker.valueOf("foo");
-		SimpleMarker baa = SimpleMarker.valueOf("baa");
-		assertThat(foo, is(foo2));
-		assertThat(foo, is(not(baa)));
-		assertFalse(foo.equals("foo"));
-	}
+    @Test
+    public void testValueOf() {
+        SimpleMarker foo = SimpleMarker.valueOf("foo");
+        SimpleMarker foo2 = SimpleMarker.valueOf("foo");
+        SimpleMarker baa = SimpleMarker.valueOf("baa");
+        assertThat(foo, is(foo2));
+        assertThat(foo, is(not(baa)));
+        assertFalse(foo.equals("foo"));
+    }
 
-	@Test
-	public void testWithoutName() {
-		thrown.expect(AssertionFailureException.class);
-		SimpleMarker.valueOf(null);
-	}
+    @Test
+    public void testWithoutName() {
+        thrown.expect(AssertionFailureException.class);
+        SimpleMarker.valueOf(null);
+    }
 }