Rollback of: "Fix handling of Kotlin object Producer modules so that @JvmStatic isn't required"

PiperOrigin-RevId: 644122947

Author: Chang-Eric

java/dagger/internal/codegen/writing/ProducerFactoryGenerator.java

@@ -314,34 +314,25 @@ private MethodSpec callProducesMethod(ProductionBinding binding, FactoryFields f
       methodBuilder.addAnnotation(AnnotationSpecs.suppressWarnings(UNCHECKED));
     }
 
-    CodeBlock moduleCodeBlock;
-    if (factoryFields.moduleField.isPresent()) {
-      moduleCodeBlock = CodeBlock.of(factoryFields.moduleField.get().name);
-    } else if (binding.contributingModule().isPresent()
-        && binding.contributingModule().get().isKotlinObject()) {
-      moduleCodeBlock = CodeBlock.of(
-          "$T.INSTANCE", binding.bindingTypeElement().get().getClassName());
-    } else {
-      moduleCodeBlock = CodeBlock.of("$T", binding.bindingTypeElement().get().getClassName());
-    }
-
-    CodeBlock factoryMethodCall =
+    CodeBlock moduleCodeBlock =
         CodeBlock.of(
             "$L.$L($L)",
-            moduleCodeBlock,
+            factoryFields.moduleField.isPresent()
+                ? factoryFields.moduleField.get().name
+                : CodeBlock.of("$T", binding.bindingTypeElement().get().getClassName()),
             getSimpleName(binding.bindingElement().get()),
             makeParametersCodeBlock(parameterCodeBlocks.build()));
 
     switch (binding.productionKind().get()) {
       case IMMEDIATE:
         methodBuilder.addStatement(
-            "return $T.<$T>immediateFuture($L)", FUTURES, contributedTypeName, factoryMethodCall);
+            "return $T.<$T>immediateFuture($L)", FUTURES, contributedTypeName, moduleCodeBlock);
         break;
       case FUTURE:
-        methodBuilder.addStatement("return $L", factoryMethodCall);
+        methodBuilder.addStatement("return $L", moduleCodeBlock);
         break;
       case SET_OF_FUTURE:
-        methodBuilder.addStatement("return $T.allAsSet($L)", PRODUCERS, factoryMethodCall);
+        methodBuilder.addStatement("return $T.allAsSet($L)", PRODUCERS, moduleCodeBlock);
         break;
     }
     return methodBuilder.build();