ParamConverters cleanup

Signed-off-by: jansupol <jan.supol@oracle.com>
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/inject/ParamConverterConfigurator.java b/core-common/src/main/java/org/glassfish/jersey/internal/inject/ParamConverterConfigurator.java
index c5eff7f..bbd6441 100644
--- a/core-common/src/main/java/org/glassfish/jersey/internal/inject/ParamConverterConfigurator.java
+++ b/core-common/src/main/java/org/glassfish/jersey/internal/inject/ParamConverterConfigurator.java
@@ -31,8 +31,8 @@
 
     @Override
     public void init(InjectionManager injectionManager, BootstrapBag bootstrapBag) {
-        InstanceBinding<ParamConverters.AggregatedProvider> aggregatedConverters =
-                Bindings.service(new ParamConverters.AggregatedProvider(injectionManager))
+        final ClassBinding<ParamConverters.AggregatedProvider> aggregatedConverters =
+                Bindings.service(ParamConverters.AggregatedProvider.class)
                     .to(ParamConverterProvider.class);
         injectionManager.register(aggregatedConverters);
     }
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/inject/ParamConverters.java b/core-common/src/main/java/org/glassfish/jersey/internal/inject/ParamConverters.java
index 144189b..8fdfca9 100644
--- a/core-common/src/main/java/org/glassfish/jersey/internal/inject/ParamConverters.java
+++ b/core-common/src/main/java/org/glassfish/jersey/internal/inject/ParamConverters.java
@@ -264,7 +264,6 @@
         // Delegates to this provider when the type of Optional is extracted.
         private final InjectionManager manager;
 
-        @Inject
         public OptionalCustomProvider(InjectionManager manager) {
             this.manager = manager;
         }
@@ -405,6 +404,7 @@
         /**
          * Create new aggregated {@link ParamConverterProvider param converter provider}.
          */
+        @Inject
         public AggregatedProvider(InjectionManager manager) {
             this.providers = new ParamConverterProvider[] {
                     // ordering is important (e.g. Date provider must be executed before String Constructor