dialogue: FooServiceBlocking instead of BlockingFooService (#790)

The generated dialogue interfaces for a conjure FooService are now `FooServiceBlocking` and `FooServiceAsync` instead of `BlockingFooService` and `AsyncFooService`.

Author: iamdanfox

changelog/@unreleased/pr-790.v2.yml

@@ -0,0 +1,7 @@
+type: fix
+fix:
+  description: The generated dialogue interfaces for a conjure FooService are now
+    `FooServiceBlocking` and `FooServiceAsync` instead of `BlockingFooService` and
+    `AsyncFooService`.
+  links:
+  - https://github.com/palantir/conjure-java/pull/790

conjure-java-client-verifier/src/test/java/com/palantir/conjure/java/compliance/AutoDeserializeTest.java

@@ -19,7 +19,7 @@
 import com.palantir.conjure.java.api.errors.RemoteException;
 import com.palantir.conjure.java.com.palantir.conjure.verification.server.AutoDeserializeConfirmService;
 import com.palantir.conjure.java.com.palantir.conjure.verification.server.AutoDeserializeService;
-import com.palantir.conjure.java.com.palantir.conjure.verification.server.BlockingAutoDeserializeService;
+import com.palantir.conjure.java.com.palantir.conjure.verification.server.AutoDeserializeServiceBlocking;
 import com.palantir.conjure.java.com.palantir.conjure.verification.server.EndpointName;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -43,7 +43,7 @@ public class AutoDeserializeTest {
 
     private static final Logger log = LoggerFactory.getLogger(AutoDeserializeTest.class);
     private static final AutoDeserializeService jerseyTestService = VerificationClients.autoDeserializeService(server);
-    private static final BlockingAutoDeserializeService dialogueTestService =
+    private static final AutoDeserializeServiceBlocking dialogueTestService =
             VerificationClients.dialogueAutoDeserializeService(server);
     private static final AutoDeserializeConfirmService confirmService = VerificationClients.confirmService(server);
 

conjure-java-client-verifier/src/test/java/com/palantir/conjure/java/compliance/VerificationClients.java

@@ -20,13 +20,13 @@
 import com.palantir.conjure.java.client.jaxrs.JaxRsClient;
 import com.palantir.conjure.java.com.palantir.conjure.verification.server.AutoDeserializeConfirmService;
 import com.palantir.conjure.java.com.palantir.conjure.verification.server.AutoDeserializeService;
-import com.palantir.conjure.java.com.palantir.conjure.verification.server.BlockingAutoDeserializeService;
-import com.palantir.conjure.java.com.palantir.conjure.verification.server.BlockingSingleHeaderService;
-import com.palantir.conjure.java.com.palantir.conjure.verification.server.BlockingSinglePathParamService;
-import com.palantir.conjure.java.com.palantir.conjure.verification.server.BlockingSingleQueryParamService;
+import com.palantir.conjure.java.com.palantir.conjure.verification.server.AutoDeserializeServiceBlocking;
 import com.palantir.conjure.java.com.palantir.conjure.verification.server.SingleHeaderService;
+import com.palantir.conjure.java.com.palantir.conjure.verification.server.SingleHeaderServiceBlocking;
 import com.palantir.conjure.java.com.palantir.conjure.verification.server.SinglePathParamService;
+import com.palantir.conjure.java.com.palantir.conjure.verification.server.SinglePathParamServiceBlocking;
 import com.palantir.conjure.java.com.palantir.conjure.verification.server.SingleQueryParamService;
+import com.palantir.conjure.java.com.palantir.conjure.verification.server.SingleQueryParamServiceBlocking;
 import com.palantir.conjure.java.dialogue.serde.DefaultConjureRuntime;
 import com.palantir.conjure.java.okhttp.HostMetricsRegistry;
 import com.palantir.dialogue.JavaChannels;
@@ -46,8 +46,8 @@ public static AutoDeserializeService autoDeserializeService(VerificationServerRu
                 server.getClientConfiguration());
     }
 
-    public static BlockingAutoDeserializeService dialogueAutoDeserializeService(VerificationServerRule server) {
-        return BlockingAutoDeserializeService.of(
+    public static AutoDeserializeServiceBlocking dialogueAutoDeserializeService(VerificationServerRule server) {
+        return AutoDeserializeServiceBlocking.of(
                 JavaChannels.create(server.getClientConfiguration(), getUserAgent(), new DefaultTaggedMetricRegistry()),
                 DEFAULT_CONJURE_RUNTIME);
     }
@@ -68,8 +68,8 @@ public static SinglePathParamService singlePathParamService(VerificationServerRu
                 server.getClientConfiguration());
     }
 
-    public static BlockingSinglePathParamService dialogueSinglePathParamService(VerificationServerRule server) {
-        return BlockingSinglePathParamService.of(
+    public static SinglePathParamServiceBlocking dialogueSinglePathParamService(VerificationServerRule server) {
+        return SinglePathParamServiceBlocking.of(
                 JavaChannels.create(server.getClientConfiguration(), getUserAgent(), new DefaultTaggedMetricRegistry()),
                 DEFAULT_CONJURE_RUNTIME);
     }
@@ -79,8 +79,8 @@ public static SingleHeaderService singleHeaderService(VerificationServerRule ser
                 SingleHeaderService.class, getUserAgent(), new HostMetricsRegistry(), server.getClientConfiguration());
     }
 
-    public static BlockingSingleHeaderService dialogueSingleHeaderService(VerificationServerRule server) {
-        return BlockingSingleHeaderService.of(
+    public static SingleHeaderServiceBlocking dialogueSingleHeaderService(VerificationServerRule server) {
+        return SingleHeaderServiceBlocking.of(
                 JavaChannels.create(server.getClientConfiguration(), getUserAgent(), new DefaultTaggedMetricRegistry()),
                 DEFAULT_CONJURE_RUNTIME);
     }
@@ -97,8 +97,8 @@ private static UserAgent getUserAgent() {
         return UserAgent.of(UserAgent.Agent.of("test", "develop"));
     }
 
-    public static BlockingSingleQueryParamService dialogueSingleQueryParamService(VerificationServerRule server) {
-        return BlockingSingleQueryParamService.of(
+    public static SingleQueryParamServiceBlocking dialogueSingleQueryParamService(VerificationServerRule server) {
+        return SingleQueryParamServiceBlocking.of(
                 JavaChannels.create(server.getClientConfiguration(), getUserAgent(), new DefaultTaggedMetricRegistry()),
                 DEFAULT_CONJURE_RUNTIME);
     }

…antir/product/AsyncEmptyPathService.java …antir/product/EmptyPathServiceAsync.javaconjure-java-core/src/integrationInput/java/com/palantir/product/AsyncEmptyPathService.java renamed to conjure-java-core/src/integrationInput/java/com/palantir/product/EmptyPathServiceAsync.java conjure-java-core/src/integrationInput/java/com/palantir/product/AsyncEmptyPathService.java renamed to conjure-java-core/src/integrationInput/java/com/palantir/product/EmptyPathServiceAsync.java

@@ -26,24 +26,20 @@ private Names() {}
 
     public static ClassName endpointsClassName(ServiceDefinition def, Options options) {
         String simpleName = "Dialogue" + def.getServiceName().getName().replaceAll("Service$", "") + "Endpoints";
-        return ClassName.get(
-                Packages.getPrefixedPackage(def.getServiceName().getPackage(), options.packagePrefix()), simpleName);
-    }
-
-    public static ClassName publicClassName(ServiceDefinition def, Options options) {
-        return serviceClassName("Dialogue", def, options);
+        return maybeRelocate(def, options, simpleName);
     }
 
     public static ClassName blockingClassName(ServiceDefinition def, Options options) {
-        return serviceClassName("Blocking", def, options);
+        String simpleName = def.getServiceName().getName() + "Blocking";
+        return maybeRelocate(def, options, simpleName);
     }
 
     public static ClassName asyncClassName(ServiceDefinition def, Options options) {
-        return serviceClassName("Async", def, options);
+        String simpleName = def.getServiceName().getName() + "Async";
+        return maybeRelocate(def, options, simpleName);
     }
 
-    private static ClassName serviceClassName(String prefix, ServiceDefinition def, Options options) {
-        String simpleName = prefix + def.getServiceName().getName();
+    private static ClassName maybeRelocate(ServiceDefinition def, Options options, String simpleName) {
         return ClassName.get(
                 Packages.getPrefixedPackage(def.getServiceName().getPackage(), options.packagePrefix()), simpleName);
     }