Minor tweaks wrt #2432

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java

@@ -768,6 +768,24 @@ public Version version() {
     public ObjectMapper registerModule(Module module)
     {
         _assertNotNull("module", module);
+        // Let's ensure we have access to name and version information, 
+        // even if we do not have immediate use for either. This way we know
+        // that they will be available from beginning
+        String name = module.getModuleName();
+        if (name == null) {
+            throw new IllegalArgumentException("Module without defined name");
+        }
+        Version version = module.version();
+        if (version == null) {
+            throw new IllegalArgumentException("Module without defined version");
+        }
+
+        // [databind#2432]: Modules may depend on other modules; if so, register those first
+        for (Module dep : module.getDependencies()) {
+            registerModule(dep);
+        }
+
+        // then module itself
         if (isEnabled(MapperFeature.IGNORE_DUPLICATE_MODULE_REGISTRATIONS)) {
             Object typeId = module.getTypeId();
             if (typeId != null) {
@@ -782,24 +800,6 @@ public ObjectMapper registerModule(Module module)
                 }
             }
         }
-        
-        /* Let's ensure we have access to name and version information, 
-         * even if we do not have immediate use for either. This way we know
-         * that they will be available from beginning
-         */
-        String name = module.getModuleName();
-        if (name == null) {
-            throw new IllegalArgumentException("Module without defined name");
-        }
-        Version version = module.version();
-        if (version == null) {
-            throw new IllegalArgumentException("Module without defined version");
-        }
-
-        // [databind#2432]: Modules may depend on other modules; if so, register those first
-        for (Module dep : module.getDependencies()) {
-            registerModule(dep);
-        }
 
         // And then call registration
         module.setupModule(new Module.SetupContext()

src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java

@@ -412,8 +412,9 @@ public void testDataInputViaMapper() throws Exception
         assertNotNull(n);
     }
 
+    @SuppressWarnings("serial")
     public void testRegisterDependentModules() {
-        ObjectMapper objectMapper = new ObjectMapper();
+        ObjectMapper objectMapper = newJsonMapper();
 
         final SimpleModule secondModule = new SimpleModule() {
             @Override
@@ -437,14 +438,14 @@ public Iterable<? extends Module> getDependencies() {
 
             @Override
             public Object getTypeId() {
-                return "first";
+                return "main";
             }
         };
 
         objectMapper.registerModule(firstModule);
 
         assertEquals(
-            new HashSet<>(Arrays.asList("first", "second", "third")),
+            new HashSet<>(Arrays.asList("second", "third", "main")),
             objectMapper.getRegisteredModuleIds()
         );
     }