From 9dd355a4c50171317b63a9477639c0795fc3b07b Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 21 Aug 2018 14:50:43 -0400
Subject: [PATCH] All tests pass

---
 .idea/libraries/Dart_Packages.xml             |   4 +-
 ...ware_via_metadata_in_routing_test_dart.xml |   9 +
 .../encoding_in_streaming_test_dart.xml       |   9 +
 .../metadata_in_hooked_test_dart.xml          |   9 +
 ...ml => tests_in_framework__PRODUCTION_.xml} |   2 +-
 .idea/workspace.xml                           | 830 ++++++++----------
 CHANGELOG.md                                  |  10 +-
 README.md                                     |  69 +-
 example/handle_error.dart                     |   3 +-
 lib/src/core/hooked_service.dart              |  15 +-
 lib/src/core/response_context.dart            |  25 +-
 lib/src/core/server.dart                      |  31 +-
 lib/src/core/service.dart                     |  27 +-
 lib/src/core/typed_service.dart               |   1 +
 lib/src/http/angel_http.dart                  |   8 +-
 lib/src/http/controller.dart                  |  13 +-
 lib/src/http/http_response_context.dart       |  86 +-
 lib/src/util.dart                             |   3 +-
 test/common.dart                              |   7 +
 test/encoders_buffer_test.dart                |  12 +-
 test/parameter_meta_test.dart                 |   5 +-
 test/precontained_test.dart                   |   4 +-
 test/routing_test.dart                        |   2 +-
 test/serialize_test.dart                      |   4 +-
 test/server_test.dart                         |   2 +-
 test/streaming_test.dart                      |  36 +-
 test/view_generator_test.dart                 |   3 +-
 27 files changed, 640 insertions(+), 589 deletions(-)
 create mode 100644 .idea/runConfigurations/Middleware_via_metadata_in_routing_test_dart.xml
 create mode 100644 .idea/runConfigurations/encoding_in_streaming_test_dart.xml
 create mode 100644 .idea/runConfigurations/metadata_in_hooked_test_dart.xml
 rename .idea/runConfigurations/{All_Tests__PRODUCTION_2.xml => tests_in_framework__PRODUCTION_.xml} (66%)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index b8dfae30..088c8509 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -12,7 +12,7 @@
         <entry key="angel_container">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.8/lib" />
             </list>
           </value>
         </entry>
@@ -454,7 +454,7 @@
     </properties>
     <CLASSES>
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.7/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.8/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-3.0.0/lib" />
diff --git a/.idea/runConfigurations/Middleware_via_metadata_in_routing_test_dart.xml b/.idea/runConfigurations/Middleware_via_metadata_in_routing_test_dart.xml
new file mode 100644
index 00000000..41e6ad8d
--- /dev/null
+++ b/.idea/runConfigurations/Middleware_via_metadata_in_routing_test_dart.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Middleware via metadata in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="Middleware via metadata" />
+    <option name="testRunnerOptions" value="-j 4" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/encoding_in_streaming_test_dart.xml b/.idea/runConfigurations/encoding_in_streaming_test_dart.xml
new file mode 100644
index 00000000..f3885511
--- /dev/null
+++ b/.idea/runConfigurations/encoding_in_streaming_test_dart.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="encoding in streaming_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/streaming_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="encoding" />
+    <option name="testRunnerOptions" value="-j 4" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/metadata_in_hooked_test_dart.xml b/.idea/runConfigurations/metadata_in_hooked_test_dart.xml
new file mode 100644
index 00000000..618cdc73
--- /dev/null
+++ b/.idea/runConfigurations/metadata_in_hooked_test_dart.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="metadata in hooked_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/hooked_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="metadata" />
+    <option name="testRunnerOptions" value="-j 4" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml b/.idea/runConfigurations/tests_in_framework__PRODUCTION_.xml
similarity index 66%
rename from .idea/runConfigurations/All_Tests__PRODUCTION_2.xml
rename to .idea/runConfigurations/tests_in_framework__PRODUCTION_.xml
index 27a10c9c..263eac1e 100644
--- a/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml
+++ b/.idea/runConfigurations/tests_in_framework__PRODUCTION_.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All Tests (PRODUCTION)" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
+  <configuration default="false" name="tests in framework (PRODUCTION)" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
     <option name="envs">
       <entry key="ANGEL_ENV" value="production" />
     </option>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7de0fedd..ecb94876 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,14 +2,27 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/Middleware_via_metadata_in_routing_test_dart.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/encoding_in_streaming_test_dart.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/metadata_in_hooked_test_dart.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/util.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/common.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/common.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/precontained_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/precontained_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/view_generator_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/view_generator_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -32,83 +45,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="35" column="7" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
-              <folding>
-                <element signature="e#0#46#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="86">
-              <caret line="86" column="8" selection-start-line="86" selection-start-column="8" selection-end-line="86" selection-end-column="8" />
-              <folding>
-                <element signature="e#40#60#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="util.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="96">
-              <caret line="6" column="27" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="556">
-                <caret line="66" column="26" selection-start-line="66" selection-start-column="26" selection-end-line="66" selection-end-column="26" />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="112">
-              <caret line="7" column="20" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="20" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="25">
-              <caret line="85" column="36" selection-start-line="85" selection-start-column="36" selection-end-line="85" selection-end-column="36" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="64">
-              <caret line="4" column="2" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="2" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="accepts_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="261">
-              <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
+            <state relative-caret-position="126">
+              <caret line="326" column="36" lean-forward="true" selection-start-line="326" selection-start-column="36" selection-end-line="326" selection-end-column="36" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -116,25 +57,43 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="347">
-              <caret line="355" column="11" lean-forward="true" selection-start-line="355" selection-start-column="11" selection-end-line="355" selection-end-column="11" />
+            <state relative-caret-position="150">
+              <caret line="24" column="41" lean-forward="true" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="297">
+              <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="streaming_test.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="172">
+              <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
               <folding>
-                <element signature="e#38#58#0" expanded="true" />
+                <element signature="e#0#20#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="66">
-              <caret line="244" column="53" selection-start-line="244" selection-start-column="53" selection-end-line="244" selection-end-column="53" />
+            <state relative-caret-position="129">
+              <caret line="154" column="49" selection-start-line="154" selection-start-column="49" selection-end-line="154" selection-end-column="49" />
               <folding>
-                <element signature="e#48#68#0" expanded="true" />
+                <element signature="e#0#20#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -152,28 +111,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>parse</find>
-      <find>io</find>
-      <find>io.</find>
-      <find>lazyP</find>
-      <find>storeO</find>
-      <find>origina</find>
-      <find>originalBuffer</find>
-      <find>lazyQue</find>
-      <find>singleton(</find>
-      <find>preI</find>
-      <find>);</find>
-      <find>RequestContext req</find>
-      <find>req.inject</find>
-      <find>injections</find>
-      <find>injecti</find>
-      <find>debug</find>
-      <find>handle(</find>
-      <find>lock</find>
-      <find>add(</find>
-      <find>close(</find>
-      <find>end()</find>
-      <find>stop</find>
       <find>sto</find>
       <find>sopw</find>
       <find>stopw</find>
@@ -181,7 +118,29 @@
       <find>handleRe</find>
       <find>get container</find>
       <find>Parameter</find>
+      <find>log</find>
       <find>mirrors</find>
+      <find>dart:mirror</find>
+      <find>dart:io</find>
+      <find>_Par</find>
+      <find>waterfall</find>
+      <find>wtf</find>
+      <find>errorHan</find>
+      <find>nested</find>
+      <find>_parent =</find>
+      <find>headers['content</find>
+      <find>skip</find>
+      <find>Provi</find>
+      <find>contentTy</find>
+      <find>abc</find>
+      <find>/chained</find>
+      <find>flatten</find>
+      <find>sendRe</find>
+      <find>enableB</find>
+      <find>Hooks</find>
+      <find>Middleware</find>
+      <find>/meta</find>
+      <find>complet</find>
     </findStrings>
     <replaceStrings>
       <replace>FutureOr</replace>
@@ -237,13 +196,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/example/hm.dart" />
         <option value="$PROJECT_DIR$/test/hm.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/find_one_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
-        <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/example/templating.dart" />
@@ -258,36 +215,38 @@
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
         <option value="$PROJECT_DIR$/example/view.dart" />
-        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
-        <option value="$PROJECT_DIR$/test/serialize_test.dart" />
-        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
-        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
-        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.3/lib/src/mirrors/reflector.dart" />
-        <option value="$PROJECT_DIR$/lib/src/util.dart" />
-        <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
+        <option value="$PROJECT_DIR$/test/common.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
+        <option value="$PROJECT_DIR$/test/serialize_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
+        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/util.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
+        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
       </list>
     </option>
   </component>
@@ -307,7 +266,7 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="80" />
+    <option name="x" value="94" />
     <option name="y" value="23" />
     <option name="width" value="1342" />
     <option name="height" value="784" />
@@ -321,8 +280,6 @@
     </navigator>
     <panes>
       <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-      <pane id="ProjectPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -330,11 +287,6 @@
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="example" type="cbb8eebc:String" user="example" />
-            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -346,13 +298,6 @@
               <item name="lib" type="cbb8eebc:String" user="lib" />
               <item name="src" type="cbb8eebc:String" user="src" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="core" type="cbb8eebc:String" user="core" />
-            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -360,11 +305,6 @@
               <item name="src" type="cbb8eebc:String" user="src" />
               <item name="http" type="cbb8eebc:String" user="http" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="performance/hello" type="cbb8eebc:String" user="performance/hello" />
-            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -374,6 +314,8 @@
           <select />
         </subPane>
       </pane>
+      <pane id="ProjectPane" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -418,7 +360,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.main.dart">
+  <component name="RunManager" selected="Dart Test.tests in framework (PRODUCTION)">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -573,7 +515,8 @@
       <item itemvalue="Dart Command Line App.view.dart" />
       <item itemvalue="Dart Command Line App.handle_error.dart" />
       <item itemvalue="Dart Command Line App.json.dart" />
-      <item itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item itemvalue="Dart Test.tests in framework" />
+      <item itemvalue="Dart Test.tests in framework (PRODUCTION)" />
       <item itemvalue="Dart Test.Can serialize function result as JSON in routing_test.dart" />
       <item itemvalue="Dart Test.Match routes, even with query params in routing_test.dart" />
       <item itemvalue="Dart Test.listen before and after in hooked_test.dart" />
@@ -609,17 +552,14 @@
       <item itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
       <item itemvalue="Dart Test.All Tests" />
       <item itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
-      <item itemvalue="Dart Test.tests in framework" />
       <item itemvalue="Dart Test.encoding in encoders_buffer_test.dart" />
+      <item itemvalue="Dart Test.encoding in streaming_test.dart" />
       <item itemvalue="Dart Test.handleAngelHttpException in server_test.dart" />
       <item itemvalue="Dart Test.can fetch data in services_test.dart" />
       <item itemvalue="Dart Test.tests in find_one_test.dart" />
+      <item itemvalue="Dart Test.metadata in hooked_test.dart" />
+      <item itemvalue="Dart Test.Middleware via metadata in routing_test.dart" />
     </list>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Dart Command Line App.json.dart" />
-      </list>
-    </recent_temporary>
   </component>
   <component name="SvnConfiguration">
     <configuration />
@@ -718,21 +658,9 @@
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
       <workItem from="1534547885788" duration="9908000" />
-      <workItem from="1534793956753" duration="14213000" />
-    </task>
-    <task id="LOCAL-00110" summary="Switch to MediaType">
-      <created>1534692805087</created>
-      <option name="number" value="00110" />
-      <option name="presentableId" value="LOCAL-00110" />
-      <option name="project" value="LOCAL" />
-      <updated>1534692805087</updated>
-    </task>
-    <task id="LOCAL-00111" summary="Change signature of ResponseContext.jsonp">
-      <created>1534693249779</created>
-      <option name="number" value="00111" />
-      <option name="presentableId" value="LOCAL-00111" />
-      <option name="project" value="LOCAL" />
-      <updated>1534693249779</updated>
+      <workItem from="1534793956753" duration="15012000" />
+      <workItem from="1534863259966" duration="198000" />
+      <workItem from="1534873119036" duration="4086000" />
     </task>
     <task id="LOCAL-00112" summary="Changed view engine to use `Map&lt;String, dynamic&gt;`">
       <created>1534693360366</created>
@@ -1063,43 +991,57 @@
       <option name="project" value="LOCAL" />
       <updated>1534819472503</updated>
     </task>
-    <option name="localTasksCounter" value="159" />
+    <task id="LOCAL-00159" summary="Default to const EmptyReflector()">
+      <created>1534861361523</created>
+      <option name="number" value="00159" />
+      <option name="presentableId" value="LOCAL-00159" />
+      <option name="project" value="LOCAL" />
+      <updated>1534861361524</updated>
+    </task>
+    <task id="LOCAL-00160" summary="dart:mirrors is completely gone from Angel">
+      <created>1534861733989</created>
+      <option name="number" value="00160" />
+      <option name="presentableId" value="LOCAL-00160" />
+      <option name="project" value="LOCAL" />
+      <updated>1534861733990</updated>
+    </task>
+    <option name="localTasksCounter" value="161" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 16m 10s.xml">
-      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_framework - 2018.08.21 at 14h 36m 43s.xml">
+      <configuration name="tests in framework" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 17m 32s.xml">
-      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_framework - 2018.08.21 at 14h 38m 02s.xml">
+      <configuration name="tests in framework" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 17m 58s.xml">
-      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="encoding_in_encoders_buffer_test_dart - 2018.08.21 at 14h 39m 23s.xml">
+      <configuration name="encoding in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 18m 03s.xml">
-      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_framework - 2018.08.21 at 14h 40m 24s.xml">
+      <configuration name="tests in framework" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 18m 30s.xml">
-      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2018.08.21 at 14h 40m 35s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_find_one_test_dart - 2018.08.19 at 11h 22m 50s.xml">
-      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="encoding_in_streaming_test_dart - 2018.08.21 at 14h 41m 04s.xml">
+      <configuration name="encoding in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2018.08.20 at 22h 14m 22s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="encoding_in_streaming_test_dart - 2018.08.21 at 14h 45m 12s.xml">
+      <configuration name="encoding in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_accepts_test_dart - 2018.08.20 at 22h 44m 02s.xml">
-      <configuration name="tests in accepts_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="encoding_in_streaming_test_dart - 2018.08.21 at 14h 45m 57s.xml">
+      <configuration name="encoding in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_anonymous_service_test_dart - 2018.08.20 at 22h 44m 10s.xml">
-      <configuration name="tests in anonymous_service_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="encoding_in_streaming_test_dart - 2018.08.21 at 14h 46m 49s.xml">
+      <configuration name="encoding in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Controller_Tests - 2018.08.20 at 22h 44m 19s.xml">
-      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_framework - 2018.08.21 at 14h 47m 22s.xml">
+      <configuration name="tests in framework" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="186420000" />
+    <option name="totallyTimeSpent" value="191503000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1111,8 +1053,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="80" y="23" width="1342" height="784" extended-state="0" />
-    <editor active="true" />
+    <frame x="94" y="23" width="1342" height="784" extended-state="0" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Tool Output" order="7" />
@@ -1130,14 +1071,13 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4964476" visible="true" weight="0.3973799" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" weight="0.27846155" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.28615385" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1150,6 +1090,7 @@
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Data View" order="4" />
     </layout>
@@ -1162,8 +1103,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Completely remove ResponseContext.io" />
-    <MESSAGE value="Rename HTTP request+response impl, drop the &quot;impl&quot;" />
     <MESSAGE value="Make lazy parsing the default" />
     <MESSAGE value="Rename body parsing methods" />
     <MESSAGE value="Update query parsing" />
@@ -1187,7 +1126,9 @@
     <MESSAGE value="Remove ResponseContext.dispose" />
     <MESSAGE value="Remove releaseCOrrespondingRequest" />
     <MESSAGE value="ioc uses executeHandler" />
-    <option name="LAST_COMMIT_MESSAGE" value="ioc uses executeHandler" />
+    <MESSAGE value="Default to const EmptyReflector()" />
+    <MESSAGE value="dart:mirrors is completely gone from Angel" />
+    <option name="LAST_COMMIT_MESSAGE" value="dart:mirrors is completely gone from Angel" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1195,111 +1136,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="17" column="26" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-268">
-          <caret line="30" column="29" lean-forward="true" selection-start-line="30" selection-start-column="29" selection-end-line="30" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-667">
-          <caret line="48" column="8" selection-start-line="48" selection-start-column="8" selection-end-line="48" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="28" column="28" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="15" column="50" selection-start-line="15" selection-start-column="50" selection-end-line="15" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="24" column="40" lean-forward="true" selection-start-line="24" selection-start-column="40" selection-end-line="24" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="9" column="54" lean-forward="true" selection-start-line="9" selection-start-column="54" selection-end-line="9" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.2/lib/src/tuple.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="59" column="11" selection-start-line="59" selection-start-column="11" selection-end-line="59" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/src/utils.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="181">
-          <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/src/media_type.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="45" column="11" selection-start-line="45" selection-start-column="11" selection-end-line="45" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/opt/dart/libexec/lib/collection/list.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="217" column="21" selection-start-line="217" selection-start-column="21" selection-end-line="217" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-3.0.0/lib/src/symlink_route.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/2.0.0/libexec/lib/async/zone.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="859">
-          <caret line="445" column="7" selection-start-line="445" selection-start-column="7" selection-end-line="445" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/opt/dart/libexec/lib/async/future_impl.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="128" column="17" selection-start-line="128" selection-start-column="17" selection-end-line="128" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/opt/dart/libexec/lib/async/zone.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="129">
@@ -1318,9 +1154,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="48">
           <caret line="3" column="14" lean-forward="true" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1346,16 +1179,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="54" column="34" lean-forward="true" selection-start-line="54" selection-start-column="34" selection-end-line="54" selection-end-column="34" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/json.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-282">
@@ -1363,13 +1186,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1384,60 +1200,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-42">
-          <caret line="153" column="46" selection-start-line="153" selection-start-column="46" selection-end-line="153" selection-end-column="46" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="181" column="45" selection-start-line="181" selection-start-column="45" selection-end-line="181" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="326">
-          <caret line="99" column="68" selection-start-line="99" selection-start-column="68" selection-end-line="99" selection-end-column="68" />
-          <folding>
-            <element signature="e#46#66#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="100" column="75" selection-start-line="100" selection-start-column="75" selection-end-line="100" selection-end-column="75" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="263">
-          <caret line="49" column="29" selection-start-line="49" selection-start-column="29" selection-end-line="49" selection-end-column="29" />
-          <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="19" column="18" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.2/lib/src/mirrors/reflector.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="220">
@@ -1480,23 +1242,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="35" column="7" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="4" column="2" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.5/lib/src/reflector.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="430">
@@ -1504,40 +1249,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="25">
-          <caret line="85" column="36" selection-start-line="85" selection-start-column="36" selection-end-line="85" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="244" column="53" selection-start-line="244" selection-start-column="53" selection-end-line="244" selection-end-column="53" />
-          <folding>
-            <element signature="e#48#68#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="109">
           <caret line="100" column="45" lean-forward="true" selection-start-line="100" selection-start-column="45" selection-end-line="100" selection-end-column="45" />
-          <folding>
-            <element signature="e#42#62#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="261">
-          <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1548,50 +1263,283 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="7" column="20" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="20" />
+        <state relative-caret-position="1152">
+          <caret line="72" column="30" selection-start-line="72" selection-start-column="30" selection-end-line="72" selection-end-column="30" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
+    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="6" column="27" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" />
+        <state relative-caret-position="150">
+          <caret line="41" column="67" lean-forward="true" selection-start-line="41" selection-start-column="67" selection-end-line="41" selection-end-column="67" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/extension_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="256">
+          <caret line="16" column="33" lean-forward="true" selection-start-line="16" selection-start-column="33" selection-end-line="16" selection-end-column="33" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-602">
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/find_one_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="239">
+          <caret line="15" column="62" lean-forward="true" selection-start-line="15" selection-start-column="62" selection-end-line="15" selection-end-column="62" />
+          <folding>
+            <element signature="e#0#17#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="4" column="34" selection-start-line="4" selection-start-column="34" selection-end-line="4" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#1#55#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/2.0.0/libexec/lib/_http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="145">
+          <caret line="1010" column="57" lean-forward="true" selection-start-line="1010" selection-start-column="57" selection-end-line="1010" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="24" selection-start-line="24" selection-end-line="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="70">
+          <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="193">
+          <caret line="25" column="22" lean-forward="true" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="163">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="86">
-          <caret line="86" column="8" selection-start-line="86" selection-start-column="8" selection-end-line="86" selection-end-column="8" />
+        <state relative-caret-position="266">
+          <caret line="86" column="66" lean-forward="true" selection-start-line="86" selection-start-column="66" selection-end-line="86" selection-end-column="66" />
           <folding>
             <element signature="e#40#60#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="347">
-          <caret line="355" column="11" lean-forward="true" selection-start-line="355" selection-start-column="11" selection-end-line="355" selection-end-column="11" />
+        <state relative-caret-position="114">
+          <caret line="35" column="53" selection-start-line="35" selection-start-column="53" selection-end-line="35" selection-end-column="53" />
           <folding>
-            <element signature="e#38#58#0" expanded="true" />
+            <element signature="e#39#59#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="134">
+          <caret line="17" column="38" selection-start-line="17" selection-start-column="38" selection-end-line="17" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="29">
+          <caret line="136" column="17" selection-start-line="136" selection-start-column="17" selection-end-line="136" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="556">
-            <caret line="66" column="26" selection-start-line="66" selection-start-column="26" selection-end-line="66" selection-end-column="26" />
+          <first_editor relative-caret-position="460">
+            <caret line="63" column="26" lean-forward="true" selection-start-line="63" selection-start-column="26" selection-end-line="63" selection-end-column="26" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="16">
+          <caret line="16" column="8" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="528">
+          <caret line="34" column="3" lean-forward="true" selection-start-line="34" selection-start-column="3" selection-end-line="34" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="65">
+          <caret line="100" column="32" selection-start-line="100" selection-start-column="32" selection-end-line="100" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="68" lean-forward="true" selection-start-line="68" selection-end-line="69" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="89" column="23" selection-start-line="89" selection-start-column="23" selection-end-line="89" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="309" column="12" selection-start-line="309" selection-start-column="12" selection-end-line="309" selection-end-column="12" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="89" column="11" selection-start-line="89" selection-start-column="11" selection-end-line="89" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="181">
+          <caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="249" column="26" selection-start-line="249" selection-start-column="26" selection-end-line="249" selection-end-column="26" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="154" column="49" selection-start-line="154" selection-start-column="49" selection-end-line="154" selection-end-column="49" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="24" column="41" lean-forward="true" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="326" column="36" lean-forward="true" selection-start-line="326" selection-start-column="36" selection-end-line="326" selection-end-column="36" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="297">
+          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="172">
+          <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26d2c047..362f4082 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,6 @@
 * Changed view engine to use `Map<String, dynamic>`.
 * Remove dependency on `package:json_god` by default.
 * Remove dependency on `package:dart2_constant`.
-* Remove `contentType` argument in `ResponseContext.serialize`.
 * Moved `lib/hooks.dart` into `package:angel_hooks`.
 * Moved `TypedService` into `package:angel_typed_service`.
 * Completely removed the `AngelBase` class.
@@ -47,8 +46,6 @@ type-safe manner.
 * Removed `RequestContext.properties`.
 * Removed the defunct `debug` property where it still existed.
 * `Routable.use` now only accepts a `Service`.
-* The above change removes the concept of "nested apps," which are messy to maintain, and
-not very elegant.
 * Removed `Angel.createZoneForRequest`.
 * Removed `Angel.defaultZoneCreator`.
 * Added all flags to the `Angel` constructor, ex. `Angel.eagerParseBodies`.
@@ -64,4 +61,9 @@ as in many cases it is unnecessary and slows down response time.
 * Removed the now-obsolete `ResponseContext.releaseCorrespondingRequest`.
 * `preInject` now takes a `Reflector` as its second argument.
 * `Angel.reflector` defaults to `const EmptyReflector()`, disabling
-reflection out-of-the-box.
\ No newline at end of file
+reflection out-of-the-box.
+* Removed `Angel.injectEncoders`.
+* Added `Providers.toJson`.
+* Moved `Providers.graphql` to `Providers.graphQL`.
+* `Angel.optimizeForProduction` no longer calls `preInject`,
+as it does not need to.
\ No newline at end of file
diff --git a/README.md b/README.md
index a287997c..9c4cec80 100644
--- a/README.md
+++ b/README.md
@@ -9,38 +9,53 @@ This is the core of the [Angel](https://github.com/angel-dart/angel) framework.
 To build real-world applications, please see the [homepage](https://angel-dart.github.io).
 
 ```dart
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 
 main() async {
-  var app = new Angel(reflector: MirrorsReflector());
+    var app = new Angel(reflector: MirrorsReflector());
 
-  // Index route. Returns JSON.
-  app.get('/', () => 'Welcome to Angel!');
-
-  // Accepts a URL like /greet/foo or /greet/bob.
-  app.get('/greet/:name', (String name) => 'Hello, $name!');
-
-  // Pattern matching - only call this handler if the query value of `name` equals 'emoji'.
-  app.get('/greet', (@Query('name', match: 'emoji') String name) => '😇🔥🔥🔥');
-
-  // Handle any other query value of `name`.
-  app.get('/greet', (@Query('name') String name) => 'Hello, $name!');
-
-  // Simple fallback to throw a 404 on unknown paths.
-  app.use((RequestContext req) async {
-    throw new AngelHttpException.notFound(
-      message: 'Unknown path: "${req.uri.path}"',
+    // Index route. Returns JSON.
+    app.get('/', (req, res) => res.write('Welcome to Angel!'));
+  
+    // Accepts a URL like /greet/foo or /greet/bob.
+    app.get(
+      '/greet/:name',
+      (req, res) {
+        var name = req.params['name'];
+        res
+          ..write('Hello, $name!')
+          ..close();
+      },
     );
-  });
+    
+    // Pattern matching - only call this handler if the query value of `name` equals 'emoji'.
+    app.get(
+      '/greet',
+      ioc((@Query('name', match: 'emoji') String name) => '😇🔥🔥🔥'),
+    );
+    
+    // Handle any other query value of `name`.
+    app.get(
+      '/greet',
+      ioc((@Query('name') String name) => 'Hello, $name!'),
+    );
+    
+    // Simple fallback to throw a 404 on unknown paths.
+    app.fallback((req, res) {
+      throw new AngelHttpException.notFound(
+        message: 'Unknown path: "${req.uri.path}"',
+      );
+    });
 
-  var http = new AngelHttp(app);
-  var server = await http.startServer('127.0.0.1', 3000);
-  var url = 'http://${server.address.address}:${server.port}';
-  print('Listening at $url');
-  print('Visit these pages to see Angel in action:');
-  print('* $url/greet/bob');
-  print('* $url/greet/?name=emoji');
-  print('* $url/greet/?name=jack');
-  print('* $url/nonexistent_page');
+    var http = new AngelHttp(app);
+    var server = await http.startServer('127.0.0.1', 3000);
+    var url = 'http://${server.address.address}:${server.port}';
+    print('Listening at $url');
+    print('Visit these pages to see Angel in action:');
+    print('* $url/greet/bob');
+    print('* $url/greet/?name=emoji');
+    print('* $url/greet/?name=jack');
+    print('* $url/nonexistent_page');
 }
 ```
diff --git a/example/handle_error.dart b/example/handle_error.dart
index 1fa5d1bb..2e7fab11 100644
--- a/example/handle_error.dart
+++ b/example/handle_error.dart
@@ -9,7 +9,8 @@ main() async {
     ..logger = (new Logger('angel')..onRecord.listen(print))
     ..encoders.addAll({'gzip': gzip.encoder});
 
-  app.fallback((req, res) => new Future.error('Throwing just because I feel like!'));
+  app.fallback(
+      (req, res) => new Future.error('Throwing just because I feel like!'));
 
   var http = new AngelHttp(app);
   var server = await http.startServer('127.0.0.1', 3000);
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 7ef14e78..d9c6a147 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -121,13 +121,14 @@ class HookedService extends Service {
     applyListeners(inner.remove, afterRemoved, true);
   }
 
-  List<RequestHandler> get bootstrappers => new List<RequestHandler>.from(super.bootstrappers)
-    ..add((RequestContext req, ResponseContext res) {
-      req.serviceParams
-        ..['__requestctx'] = req
-        ..['__responsectx'] = res;
-      return true;
-    });
+  List<RequestHandler> get bootstrappers =>
+      new List<RequestHandler>.from(super.bootstrappers)
+        ..add((RequestContext req, ResponseContext res) {
+          req.serviceParams
+            ..['__requestctx'] = req
+            ..['__responsectx'] = res;
+          return true;
+        });
 
   void addRoutes([Service s]) {
     super.addRoutes(s ?? inner);
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 214637b7..aa821151 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -103,7 +103,7 @@ abstract class ResponseContext<RawResponse>
 
     headers["Content-Disposition"] =
         'attachment; filename="${filename ?? file.path}"';
-    headers['content-type'] = lookupMimeType(file.path);
+    contentType = MediaType.parse(lookupMimeType(file.path));
     headers['content-length'] = file.lengthSync().toString();
 
     if (!isBuffered) {
@@ -150,7 +150,7 @@ abstract class ResponseContext<RawResponse>
         new Map<String, dynamic>.from(renderParams)
           ..addAll(data ?? <String, dynamic>{}))).then((content) {
       write(content);
-      headers['content-type'] = 'text/html';
+      contentType = new MediaType('text', 'html');
       close();
     });
   }
@@ -241,8 +241,11 @@ abstract class ResponseContext<RawResponse>
       throw new Exception(
           "Controller '${split[0]}' does not contain any action named '${split[1]}'");
 
-    final head =
-        controller.findExpose(app.container.reflector).path.toString().replaceAll(_straySlashes, '');
+    final head = controller
+        .findExpose(app.container.reflector)
+        .path
+        .toString()
+        .replaceAll(_straySlashes, '');
     final tail = matched
         .makeUri(params.keys.fold<Map<String, dynamic>>({}, (out, k) {
           return out..[k.toString()] = params[k];
@@ -256,14 +259,15 @@ abstract class ResponseContext<RawResponse>
   void sendFile(File file) {
     if (!isOpen) throw closed();
 
-    headers['content-type'] = lookupMimeType(file.path);
+    contentType = MediaType.parse(lookupMimeType(file.path));
     buffer.add(file.readAsBytesSync());
     close();
   }
 
   /// Serializes data to the response.
-  bool serialize(value) {
+  bool serialize(value, {MediaType contentType}) {
     if (!isOpen) throw closed();
+    this.contentType = contentType ?? new MediaType('application', 'json');
     var text = serializer(value);
     if (text.isEmpty) return true;
     write(text);
@@ -274,12 +278,12 @@ abstract class ResponseContext<RawResponse>
   /// Streams a file to this response.
   Future streamFile(File file) {
     if (!isOpen) throw closed();
-    headers['content-type'] = lookupMimeType(file.path);
+    contentType = MediaType.parse(lookupMimeType(file.path));
     return file.openRead().pipe(this);
   }
 
   /// Configure the response to write to an intermediate response buffer, rather than to the stream directly.
-  void enableBuffer();
+  void useBuffer();
 
   /// Adds a stream directly the underlying response.
   ///
@@ -304,10 +308,7 @@ abstract class ResponseContext<RawResponse>
     else if (!isBuffered) {
       add(encoding.encode(value.toString()));
     } else {
-      if (value is List<int>)
-        buffer.add(value);
-      else
-        buffer.add(encoding.encode(value.toString()));
+      buffer.add(encoding.encode(value.toString()));
     }
   }
 
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 912179d4..700a3285 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -9,6 +9,7 @@ import 'package:angel_container/angel_container.dart';
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
+import 'package:http_parser/http_parser.dart';
 import 'package:logging/logging.dart';
 import 'package:tuple/tuple.dart';
 
@@ -135,7 +136,7 @@ class Angel extends Routable {
       return;
     }
 
-    res.headers['content-type'] = 'text/html';
+    res.contentType = new MediaType('text', 'html', {'charset': 'utf8'});
     res.statusCode = e.statusCode;
     res.write("<!DOCTYPE html><html><head><title>${e.message}</title>");
     res.write("</head><body><h1>${e.message}</h1><ul>");
@@ -170,6 +171,12 @@ class Angel extends Routable {
       logger?.warning(
           'This route will be ignored, and no requests will ever reach it.');
     }
+
+    if (router is Angel) {
+      router._parent = this;
+      _children.add(router);
+    }
+
     return super.mount(path.toString(), router);
   }
 
@@ -238,11 +245,6 @@ class Angel extends Routable {
     }
   }
 
-  /// Shortcuts for adding converters to transform the response buffer/stream of any request.
-  void injectEncoders(Map<String, Converter<List<int>, List<int>>> encoders) {
-    this.encoders.addAll(encoders);
-  }
-
   Future getHandlerResult(handler, RequestContext req, ResponseContext res) {
     if (handler is RequestHandler) {
       var result = handler(req, res);
@@ -296,24 +298,7 @@ class Angel extends Routable {
   void optimizeForProduction({bool force: false}) {
     if (isProduction == true || force == true) {
       _isProduction = true;
-      _add(v) {
-        if (v is Function && !_preContained.containsKey(v)) {
-          _preContained[v] = preInject(v, container.reflector);
-        }
-      }
-
-      void _walk(Router router) {
-        router.middleware.forEach(_add);
-        router.routes.forEach((r) {
-          r.handlers.forEach(_add);
-          if (r is SymlinkRoute) _walk(r.router);
-        });
-      }
-
       _flattened ??= flatten(this);
-
-      _walk(_flattened);
-
       logger?.config('Angel is running in production mode.');
     }
   }
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index e157da8f..d243b18c 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -33,11 +33,15 @@ class Providers {
   static const Providers websocket = Providers(viaWebsocket);
 
   /// Represents a request parsed from GraphQL.
-  static const Providers graphql = Providers(viaGraphQL);
+  static const Providers graphQL = Providers(viaGraphQL);
 
   @override
   bool operator ==(other) => other is Providers && other.via == via;
 
+  Map<String, String> toJson() {
+    return {'via': via};
+  }
+
   @override
   String toString() {
     return 'via:$via';
@@ -154,11 +158,13 @@ class Service extends Routable {
     var handlers = new List<RequestHandler>.from(handlerss);
 
     // Add global middleware if declared on the instance itself
-    Middleware before = getAnnotation(service, Middleware, app.container.reflector);
+    Middleware before =
+        getAnnotation(service, Middleware, app.container.reflector);
 
     if (before != null) handlers.addAll(before.handlers);
 
-    Middleware indexMiddleware = getAnnotation(service.index, Middleware, app.container.reflector);
+    Middleware indexMiddleware =
+        getAnnotation(service.index, Middleware, app.container.reflector);
     get('/', (req, res) {
       return req.parseQuery().then((query) {
         return this.index(mergeMap([
@@ -172,7 +178,8 @@ class Service extends Routable {
           ..addAll(handlers)
           ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
-    Middleware createMiddleware = getAnnotation(service.create, Middleware, app.container.reflector);
+    Middleware createMiddleware =
+        getAnnotation(service.create, Middleware, app.container.reflector);
     post('/', (req, ResponseContext res) {
       return req.parseQuery().then((query) {
         return req.parseBody().then((body) {
@@ -196,7 +203,8 @@ class Service extends Routable {
           ..addAll(
               (createMiddleware == null) ? [] : createMiddleware.handlers));
 
-    Middleware readMiddleware = getAnnotation(service.read, Middleware, app.container.reflector);
+    Middleware readMiddleware =
+        getAnnotation(service.read, Middleware, app.container.reflector);
 
     get('/:id', (req, res) {
       return req.parseQuery().then((query) {
@@ -213,7 +221,8 @@ class Service extends Routable {
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
 
-    Middleware modifyMiddleware = getAnnotation(service.modify, Middleware, app.container.reflector);
+    Middleware modifyMiddleware =
+        getAnnotation(service.modify, Middleware, app.container.reflector);
     patch(
         '/:id',
         (req, res) => req.parseBody().then((body) {
@@ -233,7 +242,8 @@ class Service extends Routable {
           ..addAll(
               (modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
 
-    Middleware updateMiddleware = getAnnotation(service.update, Middleware, app.container.reflector);
+    Middleware updateMiddleware =
+        getAnnotation(service.update, Middleware, app.container.reflector);
     post(
         '/:id',
         (req, res) => req.parseBody().then((body) {
@@ -271,7 +281,8 @@ class Service extends Routable {
           ..addAll(
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
 
-    Middleware removeMiddleware = getAnnotation(service.remove, Middleware, app.container.reflector);
+    Middleware removeMiddleware =
+        getAnnotation(service.remove, Middleware, app.container.reflector);
     delete('/', (req, res) {
       return req.parseQuery().then((query) {
         return this.remove(
diff --git a/lib/src/core/typed_service.dart b/lib/src/core/typed_service.dart
index e69de29b..8b137891 100644
--- a/lib/src/core/typed_service.dart
+++ b/lib/src/core/typed_service.dart
@@ -0,0 +1 @@
+
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 0dfedcbc..5623d6fe 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -147,11 +147,13 @@ class AngelHttp {
             if (handler == null) break;
 
             if (runPipeline == null)
-              runPipeline = () => Future.sync(() => handler(req, res));
+              runPipeline = () =>
+                  Future.sync(() => app.executeHandler(handler, req, res));
             else {
               var current = runPipeline;
-              runPipeline = () => current().then((result) =>
-                  !res.isOpen ? new Future.value(result) : handler(req, res));
+              runPipeline = () => current().then((result) => !res.isOpen
+                  ? new Future.value(result)
+                  : app.executeHandler(handler, req, res));
             }
           }
 
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 6920e939..4d6f71a4 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -45,9 +45,8 @@ class Controller {
     var routable = new Routable();
     app.mount(exposeDecl.path, routable);
     var typeMirror = app.container.reflector.reflectType(this.runtimeType);
-    String name = exposeDecl.as?.isNotEmpty == true
-        ? exposeDecl.as
-        : typeMirror.name;
+    String name =
+        exposeDecl.as?.isNotEmpty == true ? exposeDecl.as : typeMirror.name;
 
     app.controllers[name] = this;
 
@@ -85,9 +84,8 @@ class Controller {
         var middleware = <RequestHandler>[]
           ..addAll(handlers)
           ..addAll(exposeDecl.middleware);
-        String name = exposeDecl.as?.isNotEmpty == true
-            ? exposeDecl.as
-            : methodName;
+        String name =
+            exposeDecl.as?.isNotEmpty == true ? exposeDecl.as : methodName;
 
         // Check if normal
         var method = decl.function;
@@ -120,7 +118,8 @@ class Controller {
   void configureRoutes(Routable routable) {}
 
   /// Finds the [Expose] declaration for this class.
-  Expose findExpose(Reflector reflector) => reflector.reflectClass(runtimeType)
+  Expose findExpose(Reflector reflector) => reflector
+      .reflectClass(runtimeType)
       .annotations
       .map((m) => m.reflectee)
       .firstWhere((r) => r is Expose, orElse: () => null) as Expose;
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index c2e263c5..44e5ec9f 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -42,10 +42,26 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
   }
 
   @override
-  void enableBuffer() {
+  void useBuffer() {
     _buffer = new LockableBytesBuilder();
   }
 
+  Iterable<String> __allowedEncodings;
+
+  Iterable<String> get _allowedEncodings {
+    return __allowedEncodings ??= correspondingRequest.headers
+        .value('accept-encoding')
+        ?.split(',')
+        ?.map((s) => s.trim())
+        ?.where((s) => s.isNotEmpty)
+        ?.map((str) {
+      // Ignore quality specifications in accept-encoding
+      // ex. gzip;q=0.8
+      if (!str.contains(';')) return str;
+      return str.split(';')[0];
+    });
+  }
+
   bool _openStream() {
     if (!_streamInitialized) {
       // If this is the first stream added to this response,
@@ -54,6 +70,31 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
         ..statusCode = statusCode
         ..cookies.addAll(cookies);
       headers.forEach(rawResponse.headers.set);
+      rawResponse.headers.contentType = new ContentType(
+          contentType.type, contentType.subtype,
+          charset: contentType.parameters['charset'],
+          parameters: contentType.parameters);
+
+      if (encoders.isNotEmpty && correspondingRequest != null) {
+        if (_allowedEncodings != null) {
+          for (var encodingName in _allowedEncodings) {
+            Converter<List<int>, List<int>> encoder;
+            String key = encodingName;
+
+            if (encoders.containsKey(encodingName))
+              encoder = encoders[encodingName];
+            else if (encodingName == '*') {
+              encoder = encoders[key = encoders.keys.first];
+            }
+
+            if (encoder != null) {
+              rawResponse.headers.set('content-encoding', key);
+              break;
+            }
+          }
+        }
+      }
+
       //_isClosed = true;
       return _streamInitialized = true;
     }
@@ -64,25 +105,13 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
   @override
   Future addStream(Stream<List<int>> stream) {
     if (_isClosed && isBuffered) throw ResponseContext.closed();
-    var firstStream = _openStream();
+    _openStream();
 
     Stream<List<int>> output = stream;
 
     if (encoders.isNotEmpty && correspondingRequest != null) {
-      var allowedEncodings = correspondingRequest.headers
-          .value('accept-encoding')
-          ?.split(',')
-          ?.map((s) => s.trim())
-          ?.where((s) => s.isNotEmpty)
-          ?.map((str) {
-        // Ignore quality specifications in accept-encoding
-        // ex. gzip;q=0.8
-        if (!str.contains(';')) return str;
-        return str.split(';')[0];
-      });
-
-      if (allowedEncodings != null) {
-        for (var encodingName in allowedEncodings) {
+      if (_allowedEncodings != null) {
+        for (var encodingName in _allowedEncodings) {
           Converter<List<int>, List<int>> encoder;
           String key = encodingName;
 
@@ -93,10 +122,6 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
           }
 
           if (encoder != null) {
-            if (firstStream) {
-              rawResponse.headers.set('content-encoding', key);
-            }
-
             output = encoders[key].bind(output);
             break;
           }
@@ -113,6 +138,27 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
       throw ResponseContext.closed();
     else if (!isBuffered) {
       _openStream();
+
+      if (encoders.isNotEmpty && correspondingRequest != null) {
+        if (_allowedEncodings != null) {
+          for (var encodingName in _allowedEncodings) {
+            Converter<List<int>, List<int>> encoder;
+            String key = encodingName;
+
+            if (encoders.containsKey(encodingName))
+              encoder = encoders[encodingName];
+            else if (encodingName == '*') {
+              encoder = encoders[key = encoders.keys.first];
+            }
+
+            if (encoder != null) {
+              data = encoders[key].convert(data);
+              break;
+            }
+          }
+        }
+      }
+
       rawResponse.add(data);
     } else
       buffer.add(data);
diff --git a/lib/src/util.dart b/lib/src/util.dart
index 077551c2..e3537a22 100644
--- a/lib/src/util.dart
+++ b/lib/src/util.dart
@@ -4,10 +4,11 @@ final RegExp straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 matchingAnnotation(List<ReflectedInstance> metadata, Type T) {
   for (ReflectedInstance metaDatum in metadata) {
-    if (metaDatum.type == T) {
+    if (metaDatum.type.reflectedType == T) {
       return metaDatum.reflectee;
     }
   }
+
   return null;
 }
 
diff --git a/test/common.dart b/test/common.dart
index 1c0b4a3b..0e028dcb 100644
--- a/test/common.dart
+++ b/test/common.dart
@@ -8,6 +8,13 @@ class Todo extends Model {
   String over;
 
   Todo({String this.text, String this.over});
+
+  Map<String, dynamic> toJson() {
+    return {
+      'text': text,
+      'over': over,
+    };
+  }
 }
 
 class BookService extends Service {
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index 05d7070e..66732c7a 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -1,9 +1,10 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io' show BytesBuilder;
+import 'dart:io';
+
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'dart:convert';
-import 'dart:io';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
@@ -19,7 +20,7 @@ main() {
 
   setUp(() {
     app = new Angel(reflector: MirrorsReflector());
-    app.injectEncoders(
+    app.encoders.addAll(
       {
         'deflate': zlib.encoder,
         'gzip': gzip.encoder,
@@ -27,7 +28,9 @@ main() {
     );
 
     app.get('/hello', (req, res) {
-      res.write('Hello, world!');
+      res
+        ..useBuffer()
+        ..write('Hello, world!');
     });
   });
 
@@ -63,6 +66,7 @@ void encodingTests(Angel getApp()) {
       await http.handleRequest(rq);
 
       var body = await getBody(rs);
+      print(rs.headers);
       expect(rs.headers.value('content-encoding'), 'deflate');
       expect(body, zlib.encode(utf8.encode('Hello, world!')));
     });
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 2a767f56..e4a6ea4f 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -18,10 +18,7 @@ Future printResponse(MockHttpResponse rs) {
 }
 
 void main() {
-  group('parameter_meta', parameterMetaTests,
-      skip: !Platform.version.contains('2.0.0')
-          ? null
-          : 'Blocked on https://github.com/dart-lang/sdk/issues/33774');
+  group('parameter_meta', parameterMetaTests);
 }
 
 parameterMetaTests() {
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index 3488ab8d..22d38e79 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -12,7 +12,7 @@ main() {
       ..get('/foo', ioc(echoAppFoo));
     app.optimizeForProduction(force: true);
     print(app.preContained);
-    expect(app.preContained, contains(echoAppFoo));
+    expect(app.preContained.keys, contains(echoAppFoo));
 
     var rq = new MockHttpRequest('GET', new Uri(path: '/foo'));
     rq.close();
@@ -20,7 +20,7 @@ main() {
     var rs = rq.response;
     var body = await rs.transform(utf8.decoder).join();
     expect(body, json.encode('bar'));
-  });
+  }, skip: 'Angel no longer has to preinject functions');
 }
 
 echoAppFoo(String foo) => foo;
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 3edb1f46..b841fd10 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -99,7 +99,7 @@ main() {
     }
 
     app.chain([write('a')]).chain([write('b'), write('c')]).get(
-        '/chained', (req, res) => false);
+        '/chained', (req, res) => res.close());
 
     app.fallback((req, res) => 'MJ');
 
diff --git a/test/serialize_test.dart b/test/serialize_test.dart
index c8776e4d..a800dc05 100644
--- a/test/serialize_test.dart
+++ b/test/serialize_test.dart
@@ -16,8 +16,8 @@ main() {
     app = new Angel(reflector: MirrorsReflector())
       ..get('/foo', ioc(() => {'hello': 'world'}))
       ..get('/bar', (req, res) async {
-        res.contentType = new MediaType('text', 'html');
-        await res.serialize({'hello': 'world'});
+        await res.serialize({'hello': 'world'},
+            contentType: new MediaType('text', 'html'));
       });
     client = new http.Client();
 
diff --git a/test/server_test.dart b/test/server_test.dart
index b27c0d42..a084f2aa 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -145,7 +145,7 @@ main() {
       });
 
       test('end response', () async {
-        var handler = (req, res) => res.end();
+        var handler = (req, ResponseContext res) => res.close();
         expect(await app.executeHandler(handler, req, res), isFalse);
       });
     });
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index c45bf663..471c2283 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -17,7 +17,7 @@ main() {
 
   setUp(() {
     app = new Angel(reflector: MirrorsReflector());
-    http = new AngelHttp(app);
+    http = new AngelHttp(app, useZone: true);
 
     app.logger = new Logger('streaming_test')
       ..onRecord.listen((rec) {
@@ -25,15 +25,16 @@ main() {
         if (rec.stackTrace != null) print(rec.stackTrace);
       });
 
-    app.injectEncoders(
+    app.encoders.addAll(
       {
         'deflate': zlib.encoder,
         'gzip': gzip.encoder,
       },
     );
 
-    app.get('/hello', (req,  res) {
-      new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]).pipe(res);
+    app.get('/hello', (req, res) {
+      return new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
+          .pipe(res);
     });
 
     app.get('/write', (req, res) async {
@@ -56,13 +57,12 @@ main() {
       await new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
           .pipe(res);
 
-      try {
-        await new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
-            .pipe(res);
-        throw new Exception('Should throw on rewrite...');
-      } on StateError {
-        // Yay!!!
-      }
+      var f = new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
+          .pipe(res)
+          .then((_) => false)
+          .catchError((_) => true);
+
+      expect(f, completion(true));
     });
 
     app.get('/error', (req, res) => res.addError(new StateError('wtf')));
@@ -86,12 +86,16 @@ main() {
   test('multiple addStream', () => _expectHelloBye('/multiple'));
 
   test('cannot write after close', () async {
-    var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'))..close();
-    await http.handleRequest(rq);
-    var body = await rq.response.transform(utf8.decoder).join();
+    try {
+      var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'))..close();
+      await http.handleRequest(rq);
+      var body = await rq.response.transform(utf8.decoder).join();
 
-    if (rq.response.statusCode != 32)
-      throw 'overwrite should throw error; response: $body';
+      if (rq.response.statusCode != 32)
+        throw 'overwrite should throw error; response: $body';
+    } on StateError {
+      // Success
+    }
   });
 
   test('res => addError', () async {
diff --git a/test/view_generator_test.dart b/test/view_generator_test.dart
index 0b304061..177fb63f 100644
--- a/test/view_generator_test.dart
+++ b/test/view_generator_test.dart
@@ -1,10 +1,9 @@
-import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:test/test.dart';
 
 main() {
   test('default view generator', () async {
-    var app = new Angel(reflector: MirrorsReflector());
+    var app = new Angel();
     var view = await app.viewGenerator('foo', {'bar': 'baz'});
     expect(view, contains('No view engine'));
   });