Revert "Support parameterMap() in AbstractSerializableError"

This reverts commit dbe9d33.

Author: Pritham Marupaka

build.gradle

@@ -58,7 +58,6 @@ allprojects {
     group 'com.palantir.conjure.java'
 
     repositories {
-        mavenLocal()
         mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
     }
 

conjure-java-core/src/integrationInput/java/exceptionthrowingdialogueinterfaces/com/palantir/another/ConjureErrors.java

@@ -230,9 +230,13 @@ private static List<TypeSpec> generateSerializableErrors(List<ErrorDefinition> e
                 .toList();
     }
 
-    private static MethodSpec createAbstractSerializableErrorConstructor(
-            ErrorDefinition errorDefinition, ClassName parametersClassName) {
-        MethodSpec.Builder constructor = MethodSpec.constructorBuilder()
+    private static TypeSpec generateSerializableError(ErrorDefinition errorDefinition) {
+        String serializableErrorClassName = errorDefinition.getErrorName().getName() + "SerializableError";
+        String parameterClassNameString = ErrorGenerationUtils.errorParametersClassName(errorDefinition);
+        ClassName parametersClassName = ClassName.get("", parameterClassNameString);
+
+        // Create constructor
+        MethodSpec constructor = MethodSpec.constructorBuilder()
                 .addAnnotation(AnnotationSpec.builder(JsonCreator.class)
                         .addMember("mode", "$T.$L", JsonCreator.Mode.class, JsonCreator.Mode.PROPERTIES)
                         .build())
@@ -258,32 +262,9 @@ private static MethodSpec createAbstractSerializableErrorConstructor(
                         .addAnnotation(AnnotationSpec.builder(JsonProperty.class)
                                 .addMember("value", "$S", "parameters")
                                 .build())
-                        .build());
-
-        CodeBlock.Builder body = CodeBlock.builder()
-                .add("super(errorCode, errorName, errorInstanceId, parameters, $T.ofEntries(", Map.class);
-        List<CodeBlock> args = new ArrayList<>();
-        for (FieldDefinition field : errorDefinition.getSafeArgs()) {
-            String fieldName = field.getFieldName().get();
-            args.add(CodeBlock.of("$T.entry($S, parameters.$L())", Map.class, fieldName, fieldName));
-        }
-        for (FieldDefinition field : errorDefinition.getUnsafeArgs()) {
-            String fieldName = field.getFieldName().get();
-            args.add(CodeBlock.of("$T.entry($S, parameters.$L())", Map.class, fieldName, fieldName));
-        }
-        body.add(CodeBlock.join(args, ", "));
-        body.add("))");
-        constructor.addStatement(body.build());
-        return constructor.build();
-    }
-
-    private static TypeSpec generateSerializableError(ErrorDefinition errorDefinition) {
-        String serializableErrorClassName = errorDefinition.getErrorName().getName() + "SerializableError";
-        String parameterClassNameString = ErrorGenerationUtils.errorParametersClassName(errorDefinition);
-        ClassName parametersClassName = ClassName.get("", parameterClassNameString);
-
-        // Create constructor
-        MethodSpec constructor = createAbstractSerializableErrorConstructor(errorDefinition, parametersClassName);
+                        .build())
+                .addStatement("super(errorCode, errorName, errorInstanceId, parameters)")
+                .build();
 
         // Create the toSerializableError method
         MethodSpec.Builder toSerializableErrorBuilder = MethodSpec.methodBuilder("toSerializableError")

conjure-java-core/src/integrationInput/java/exceptionthrowingdialogueinterfaces/com/palantir/product/ConjureErrors.java

@@ -28,7 +28,6 @@
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import com.palantir.conjure.java.api.errors.RemoteException;
 import com.palantir.conjure.java.api.errors.SerializableError;
-import com.palantir.conjure.java.api.errors.SerializableErrorProvider;
 import com.palantir.conjure.java.client.jaxrs.JaxRsClient;
 import com.palantir.conjure.java.lib.SafeLong;
 import com.palantir.conjure.java.okhttp.HostMetricsRegistry;
@@ -45,7 +44,6 @@
 import dialogue.com.palantir.product.SimpleEnum;
 import dialogue.com.palantir.product.StringAliasExample;
 import exceptionthrowingdialogueinterfaces.com.palantir.product.ConjureErrors.ErrorWithComplexArgsException;
-import exceptionthrowingdialogueinterfaces.com.palantir.product.ObjectReference;
 import io.undertow.Handlers;
 import io.undertow.Undertow;
 import io.undertow.UndertowOptions;
@@ -606,17 +604,6 @@ public void testStringParametersDoNotChangeWhenUsingJsonAndJavaString() {
                 assertThat(exception.error().parameters().optionalExample().getOptionalString())
                         .contains("optional-value");
             });
-            // Assert that we are able to extract the rich parameter types from a RemoteException without having to
-            // match on each error type.
-            assertThat(e).isInstanceOfSatisfying(SerializableErrorProvider.class, errorProvider -> {
-                assertThat(errorProvider.error().parameterMap())
-                        .containsEntry(
-                                "objectReference",
-                                ObjectReference.builder()
-                                        .name("reference-object")
-                                        .value(999)
-                                        .build());
-            });
         }
 
         // Assert that the two maps contain the same keys and values, except for the `primitiveExample` and `anyExample`

conjure-java-core/src/integrationInput/java/exceptionthrowingdialogueinterfaces/com/palantir/product/ConjureJavaErrors.java

@@ -44,11 +44,11 @@ com.palantir.conjure:conjure-api-objects:4.50.0 (3 constraints: 9327531f)
 
 com.palantir.conjure:conjure-generator-common:4.50.0 (2 constraints: fd13a782)
 
-com.palantir.conjure.java.api:errors:2.65.0-11-g8b3f9d9 (8 constraints: 039bdd89)
+com.palantir.conjure.java.api:errors:2.65.0 (8 constraints: ab947e7e)
 
-com.palantir.conjure.java.api:service-config:2.65.0-11-g8b3f9d9 (6 constraints: 6a699e9b)
+com.palantir.conjure.java.api:service-config:2.65.0 (6 constraints: 3e66cdda)
 
-com.palantir.conjure.java.api:ssl-config:2.65.0-11-g8b3f9d9 (5 constraints: 11566470)
+com.palantir.conjure.java.api:ssl-config:2.65.0 (5 constraints: b94f282f)
 
 com.palantir.conjure.java.runtime:client-config:8.24.0 (6 constraints: ae6b4e29)
 
@@ -100,7 +100,7 @@ com.palantir.safethreadlocalrandom:safe-thread-local-random:0.3.0 (1 constraints
 
 com.palantir.syntactic-paths:syntactic-paths:0.9.0 (2 constraints: 9d137b61)
 
-com.palantir.tokens:auth-tokens:3.19.0 (5 constraints: 755407aa)
+com.palantir.tokens:auth-tokens:3.19.0 (5 constraints: 745459a9)
 
 com.palantir.tracing:tracing:6.28.0 (8 constraints: 897ed41e)
 
@@ -114,7 +114,7 @@ com.palantir.tritium:tritium-caffeine:0.105.0 (1 constraints: e11007cf)
 
 com.palantir.tritium:tritium-core:0.105.0 (1 constraints: 6e10a6b2)
 
-com.palantir.tritium:tritium-ids:0.109.0 (1 constraints: fd0f95a6)
+com.palantir.tritium:tritium-ids:0.104.0 (1 constraints: f80f86a6)
 
 com.palantir.tritium:tritium-metrics:0.105.0 (6 constraints: 74681b1e)
 
@@ -238,7 +238,7 @@ com.netflix.feign:feign-jackson:8.18.0 (1 constraints: c718909e)
 
 com.palantir.conjure:conjure-core:4.50.0 (1 constraints: 3b054b3b)
 
-com.palantir.conjure.java.api:test-utils:2.65.0-11-g8b3f9d9 (1 constraints: 6b084b8d)
+com.palantir.conjure.java.api:test-utils:2.65.0 (1 constraints: 3f05523b)
 
 com.palantir.conjure.java.runtime:conjure-java-annotations:8.24.0 (1 constraints: c418889e)
 

conjure-java-core/src/main/java/com/palantir/conjure/java/types/ErrorGenerator.java

@@ -6,7 +6,7 @@ com.google.code.findbugs:jsr305 = 3.0.2
 com.google.guava:guava = 33.5.0-jre
 com.google.testing.compile:compile-testing = 0.23.0
 com.palantir.common:streams = 2.4.0
-com.palantir.conjure.java.api:* = 2.65.0-11-g8b3f9d9
+com.palantir.conjure.java.api:* = 2.65.0
 com.palantir.conjure.java.runtime:* = 8.24.0
 com.palantir.conjure.verification:* = 0.19.0
 com.palantir.conjure:* = 4.50.0