Cleanups & fixes

src/main/java/org/weakref/jmx/MBeanExporter.java

@@ -47,11 +47,6 @@ public class MBeanExporter
     private final ObjectNameGenerator objectNameGenerator;
     private final Map<ObjectName, ManagedClass> exportedManagedClasses = new ConcurrentHashMap<>();
 
-    MBeanExporter()
-    {
-        this(ManagementFactory.getPlatformMBeanServer());
-    }
-
     public MBeanExporter(MBeanServer server)
     {
         this(server, Optional.empty());

src/main/java/org/weakref/jmx/guice/MBeanModule.java

@@ -16,8 +16,6 @@
 package org.weakref.jmx.guice;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Binder;
-import com.google.inject.Key;
 import com.google.inject.Scopes;
 import com.google.inject.TypeLiteral;
 import org.weakref.jmx.MBeanExporter;
@@ -26,72 +24,18 @@
 import static com.google.inject.multibindings.Multibinder.newSetBinder;
 import static com.google.inject.multibindings.OptionalBinder.newOptionalBinder;
 
-public class MBeanModule
+public final class MBeanModule
         extends AbstractModule
 {
-    private ExportBuilder builder;
-
     @Override
-    protected final void configure()
+    protected void configure()
     {
-        builder = newExporter(binder());
-
         bind(GuiceMBeanExporter.class).asEagerSingleton();
         bind(MBeanExporter.class).in(Scopes.SINGLETON);
 
         newOptionalBinder(binder(), ObjectNameGenerator.class);
+        newSetBinder(binder(), new TypeLiteral<Mapping>() {});
         newSetBinder(binder(), new TypeLiteral<SetMapping<?>>() {});
         newSetBinder(binder(), new TypeLiteral<MapMapping<?, ?>>() {});
-
-        configureMBeans();
-    }
-
-    /**
-     * To be overridden by subclasses. E.g.,
-     *
-     * protected void configureMBeans() {
-     *    export(ManagedObject.class).as("test:name=X");
-     *    export(ManagedObject.class).annotatedWith(SomeAnnotation.class).as("test:name=Y");
-     * }
-     *
-     * When ExportBuilder is used, a raw MBeanModule can be imported to trigger the
-     * registration of exported mbeans:
-     *
-     * <pre>
-     * {@code
-     * Injector injector = Guice.createInjector(new MBeanModule(),
-     *      new AbstractModule() {
-     *          @Override
-     *          protected void configure() {
-     *              ExportBuilder builder = MBeanModule.newExporter();
-     *              builder.export(AnotherManagedObject.class).as("test:name="Z");
-     *          }
-     *      });
-     * }
-     * </pre>
-     *
-     *  @deprecated subclassing no longer supported. Use ExportBinder instead
-     */
-    @Deprecated
-    protected void configureMBeans() {
-    }
-
-    @Deprecated
-    protected NamedBindingBuilder export(Key<?> key)
-    {
-        return builder.export(key);
     }
-
-    @Deprecated
-    protected AnnotatedExportBuilder export(Class<?> clazz)
-    {
-        return builder.export(clazz);
-    }
-
-    @Deprecated
-    public static ExportBuilder newExporter(Binder binder)
-    {
-    	return new ExportBuilder(newSetBinder(binder, Mapping.class));
-    }
-
 }

src/test/java/org/weakref/jmx/guice/TestMBeanModule.java

@@ -23,6 +23,7 @@
 import com.google.inject.multibindings.Multibinder;
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import org.weakref.jmx.MBeanExporter;
 import org.weakref.jmx.ObjectNameBuilder;
 import org.weakref.jmx.ObjectNameGenerator;
 import org.weakref.jmx.SimpleObject;
@@ -268,6 +269,19 @@ protected void configure()
         server.unregisterMBean(objectName2);
     }
 
+    @Test
+    public void testNothingExported()
+    {
+        Injector injector = Guice.createInjector(
+                new MBeanModule(),
+                binder -> {
+                    binder.requireExplicitBindings();
+                    binder.disableCircularProxies();
+                    binder.bind(MBeanServer.class).toInstance(ManagementFactory.getPlatformMBeanServer());
+                });
+        injector.getInstance(MBeanExporter.class);
+    }
+
     @Test
     public void testSet()
             throws Exception