[break] Consistently resolve binary aliases in service endpoints

conjure-java-core/src/main/java/com/palantir/conjure/java/services/JerseyServiceGenerator.java

@@ -23,8 +23,7 @@
 import com.google.common.collect.Lists;
 import com.palantir.conjure.java.ConjureAnnotations;
 import com.palantir.conjure.java.FeatureFlags;
-import com.palantir.conjure.java.types.JerseyMethodTypeClassNameVisitor;
-import com.palantir.conjure.java.types.JerseyReturnTypeClassNameVisitor;
+import com.palantir.conjure.java.types.BinaryResolvingClassNameVisitor;
 import com.palantir.conjure.java.types.TypeMapper;
 import com.palantir.conjure.spec.ArgumentDefinition;
 import com.palantir.conjure.spec.AuthType;
@@ -53,6 +52,7 @@
 import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.ParameterSpec;
 import com.squareup.javapoet.TypeSpec;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -65,9 +65,12 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import javax.lang.model.element.Modifier;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
 import org.apache.commons.lang3.StringUtils;
 
 public final class JerseyServiceGenerator implements ServiceGenerator {
+
     private static final ClassName NOT_NULL = ClassName.get("javax.validation.constraints", "NotNull");
 
     private final Set<FeatureFlags> experimentalFeatures;
@@ -82,11 +85,15 @@ public JerseyServiceGenerator(Set<FeatureFlags> experimentalFeatures) {
 
     @Override
     public Set<JavaFile> generate(ConjureDefinition conjureDefinition) {
+        Class<?> binaryReturnType = experimentalFeatures.contains(FeatureFlags.JerseyBinaryAsResponse)
+                ? Response.class
+                : StreamingOutput.class;
         TypeMapper returnTypeMapper = new TypeMapper(
                 conjureDefinition.getTypes(),
-                types -> new JerseyReturnTypeClassNameVisitor(types, experimentalFeatures));
+                BinaryResolvingClassNameVisitor.createFactory(binaryReturnType));
         TypeMapper methodTypeMapper = new TypeMapper(
-                conjureDefinition.getTypes(), JerseyMethodTypeClassNameVisitor::new);
+                conjureDefinition.getTypes(),
+                BinaryResolvingClassNameVisitor.createFactory(InputStream.class));
         return conjureDefinition.getServices().stream()
                 .map(serviceDef -> generateService(serviceDef, returnTypeMapper, methodTypeMapper))
                 .collect(Collectors.toSet());

conjure-java-core/src/main/java/com/palantir/conjure/java/services/Retrofit2ServiceGenerator.java

@@ -23,8 +23,7 @@
 import com.google.common.collect.Lists;
 import com.palantir.conjure.java.ConjureAnnotations;
 import com.palantir.conjure.java.FeatureFlags;
-import com.palantir.conjure.java.types.Retrofit2MethodTypeClassNameVisitor;
-import com.palantir.conjure.java.types.Retrofit2ReturnTypeClassNameVisitor;
+import com.palantir.conjure.java.types.BinaryResolvingClassNameVisitor;
 import com.palantir.conjure.java.types.TypeMapper;
 import com.palantir.conjure.spec.ArgumentDefinition;
 import com.palantir.conjure.spec.ArgumentName;
@@ -69,6 +68,7 @@ public final class Retrofit2ServiceGenerator implements ServiceGenerator {
     private static final ClassName CALL_TYPE = ClassName.get("retrofit2", "Call");
     private static final String AUTH_HEADER_NAME = "Authorization";
 
+    private static final ClassName BINARY_METHOD_TYPE = ClassName.get("okhttp3", "RequestBody");
     private static final ClassName BINARY_RETURN_TYPE = ClassName.get("okhttp3", "ResponseBody");
 
     private static final Logger log = LoggerFactory.getLogger(Retrofit2ServiceGenerator.class);
@@ -85,10 +85,12 @@ public Retrofit2ServiceGenerator(Set<FeatureFlags> experimentalFeatures) {
 
     @Override
     public Set<JavaFile> generate(ConjureDefinition conjureDefinition) {
-        TypeMapper returnTypeMapper =
-                new TypeMapper(conjureDefinition.getTypes(), Retrofit2ReturnTypeClassNameVisitor::new);
-        TypeMapper methodTypeMapper =
-                new TypeMapper(conjureDefinition.getTypes(), Retrofit2MethodTypeClassNameVisitor::new);
+        TypeMapper returnTypeMapper = new TypeMapper(
+                conjureDefinition.getTypes(),
+                BinaryResolvingClassNameVisitor.createFactory(BINARY_RETURN_TYPE));
+        TypeMapper methodTypeMapper = new TypeMapper(
+                conjureDefinition.getTypes(),
+                BinaryResolvingClassNameVisitor.createFactory(BINARY_METHOD_TYPE));
         return conjureDefinition.getServices().stream()
                 .map(serviceDef -> generateService(serviceDef, returnTypeMapper, methodTypeMapper))
                 .collect(Collectors.toSet());

conjure-java-core/src/main/java/com/palantir/conjure/java/types/Retrofit2ReturnTypeClassNameVisitor.java → conjure-java-core/src/main/java/com/palantir/conjure/java/types/BinaryResolvingClassNameVisitor.java

@@ -16,13 +16,13 @@
 
 package com.palantir.conjure.java.types;
 
-import com.palantir.conjure.java.util.BinaryReturnTypeResolver;
 import com.palantir.conjure.spec.ExternalReference;
 import com.palantir.conjure.spec.ListType;
 import com.palantir.conjure.spec.MapType;
 import com.palantir.conjure.spec.OptionalType;
 import com.palantir.conjure.spec.PrimitiveType;
 import com.palantir.conjure.spec.SetType;
+import com.palantir.conjure.spec.Type;
 import com.palantir.conjure.spec.TypeDefinition;
 import com.palantir.conjure.visitor.TypeDefinitionVisitor;
 import com.squareup.javapoet.ClassName;
@@ -32,17 +32,26 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-public final class Retrofit2ReturnTypeClassNameVisitor implements ClassNameVisitor {
-
-    private static final ClassName RESPONSE_BODY_TYPE = ClassName.get("okhttp3", "ResponseBody");
+public final class BinaryResolvingClassNameVisitor implements ClassNameVisitor {
 
     private final DefaultClassNameVisitor delegate;
     private final Map<com.palantir.conjure.spec.TypeName, TypeDefinition> types;
+    private final ClassName binaryClassName;
+
+    public static Factory createFactory(Class<?> binaryClass) {
+        return createFactory(ClassName.get(binaryClass));
+    }
+
+    public static Factory createFactory(ClassName binaryClassName) {
+        return types -> new BinaryResolvingClassNameVisitor(types, binaryClassName);
+    }
 
-    public Retrofit2ReturnTypeClassNameVisitor(List<TypeDefinition> types) {
-        this.types = types.stream().collect(
-                Collectors.toMap(t -> t.accept(TypeDefinitionVisitor.TYPE_NAME), Function.identity()));
+    private BinaryResolvingClassNameVisitor(List<TypeDefinition> types, ClassName binaryClassName) {
         this.delegate = new DefaultClassNameVisitor(types);
+        this.types = types.stream().collect(Collectors.toMap(
+                t -> t.accept(TypeDefinitionVisitor.TYPE_NAME),
+                Function.identity()));
+        this.binaryClassName = binaryClassName;
     }
 
     @Override
@@ -63,15 +72,28 @@ public TypeName visitOptional(OptionalType type) {
     @Override
     public TypeName visitPrimitive(PrimitiveType type) {
         if (type.get() == PrimitiveType.Value.BINARY) {
-            return RESPONSE_BODY_TYPE;
+            return binaryClassName;
         } else {
             return delegate.visitPrimitive(type);
         }
     }
 
     @Override
     public TypeName visitReference(com.palantir.conjure.spec.TypeName type) {
-        return BinaryReturnTypeResolver.resolveReturnReferenceType(types, type, RESPONSE_BODY_TYPE);
+        if (!types.containsKey(type)) {
+            throw new IllegalStateException("Unknown LocalReferenceType type: " + type);
+        }
+
+        TypeDefinition def = types.get(type);
+        if (def.accept(TypeDefinitionVisitor.IS_ALIAS)) {
+            Type aliasType = def.accept(TypeDefinitionVisitor.ALIAS).getAlias();
+            TypeName aliasClassName = aliasType.accept(this);
+            if (aliasClassName.equals(binaryClassName)) {
+                return binaryClassName;
+            }
+        }
+
+        return delegate.visitReference(type);
     }
 
     @Override
@@ -83,5 +105,4 @@ public TypeName visitExternal(ExternalReference type) {
     public TypeName visitSet(SetType type) {
         return delegate.visitSet(type);
     }
-
 }