Fix nits

palantir · Dec 12, 2023 · 5999d2c · 5999d2c
1 parent 7781366
commit 5999d2c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/...src/main/java/com/palantir/dialogue/annotations/processor/data/ArgumentTypesResolver.java b/...src/main/java/com/palantir/dialogue/annotations/processor/data/ArgumentTypesResolver.java
@@ -97,9 +97,7 @@ private Optional<ArgumentType> getPrimitiveType(TypeMirror typeMirror) {
 
     private Optional<ArgumentType> getListType(TypeMirror typeMirror) {
         TypeName typeName = TypeName.get(typeMirror);
-        Optional<TypeMirror> innerTypeMirror = context.getGenericInnerType(List.class, typeMirror);
-
-        return innerTypeMirror
+        return context.getGenericInnerType(List.class, typeMirror)
                 .flatMap(this::getListInnerType)
                 .map(argumentType -> ArgumentTypes.list(
                         typeName,

diff --git a/.../com/palantir/dialogue/annotations/processor/generate/ServiceImplementationGenerator.java b/.../com/palantir/dialogue/annotations/processor/generate/ServiceImplementationGenerator.java
@@ -281,10 +281,16 @@ private CodeBlock generatePlainSerializer(
             Optional<ParameterEncoderType> maybeParameterEncoderType) {
         return type.match(new ArgumentType.Cases<>() {
             @Override
-            public CodeBlock primitive(TypeName _typeName, String _parameterSerializerMethodName) {
+            public CodeBlock primitive(TypeName _typeName, String parameterSerializerMethodName) {
                 return maybeParameterEncoderType.map(this::parameterEncoderType).orElseGet(() -> {
                     return CodeBlock.of(
-                            "$L.$L($S, $L);", REQUEST, singleValueMethod, key, generateSerializerCall(argName, type));
+                            "$L.$L($S, $L.$L($L));",
+                            REQUEST,
+                            singleValueMethod,
+                            key,
+                            PARAMETER_SERIALIZER,
+                            parameterSerializerMethodName,
+                            argName);
                 });
             }
 
@@ -307,10 +313,16 @@ public CodeBlock list(TypeName _typeName, ListType listType) {
             }
 
             @Override
-            public CodeBlock alias(TypeName _typeName, String _parameterSerializerMethodName) {
+            public CodeBlock alias(TypeName _typeName, String parameterSerializerMethodName) {
                 return maybeParameterEncoderType.map(this::parameterEncoderType).orElseGet(() -> {
                     return CodeBlock.of(
-                            "$L.$L($S, $L);", REQUEST, singleValueMethod, key, generateSerializerCall(argName, type));
+                            "$L.$L($S, $L.$L($L.get()));",
+                            REQUEST,
+                            singleValueMethod,
+                            key,
+                            PARAMETER_SERIALIZER,
+                            parameterSerializerMethodName,
+                            argName);
                 });
             }