Merge branch 'develop' of github.com:palantir/conjure-java into pm/client-errors-result-type

Author: Pritham Marupaka

build.gradle

@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.palantir.baseline:gradle-baseline-java:6.3.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:6.4.0'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:5.51.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.31.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'

changelog/8.35.0/pr-2421.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: 'remove bounds check on input ''long'' values into ''alias: double'''
+  links:
+  - https://github.com/palantir/conjure-java/pull/2421

changelog/8.36.0/pr-2423.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Add flag to exclude generation of async Dialogue interfaces
+  links:
+  - https://github.com/palantir/conjure-java/pull/2423

conjure-java-core/src/integrationInput/java/com/palantir/product/AliasedDouble.java

@@ -169,6 +169,15 @@ default boolean externalFallbackTypes() {
         return false;
     }
 
+    /**
+     * Java 24's loom support removes the need for async interfaces. When set to true, only Dialogue interfaces for
+     * blocking clients will be generated. The Dialogue async interfaces will not be generated.
+     */
+    @Value.Default
+    default boolean excludeDialogueAsyncInterfaces() {
+        return false;
+    }
+
     Optional<String> packagePrefix();
 
     Optional<String> apiVersion();

conjure-java-core/src/integrationInput/java/com/palantir/product/DoubleAliasExample.java

@@ -24,6 +24,7 @@
 import com.palantir.conjure.java.types.TypeMapper;
 import com.palantir.conjure.java.util.TypeFunctions;
 import com.palantir.conjure.spec.ConjureDefinition;
+import com.palantir.conjure.spec.ServiceDefinition;
 import com.palantir.conjure.spec.TypeDefinition;
 import com.palantir.conjure.spec.TypeName;
 import com.palantir.dialogue.BinaryRequestBody;
@@ -32,6 +33,8 @@
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
 
@@ -84,14 +87,30 @@ public Stream<JavaFile> generate(ConjureDefinition conjureDefinition) {
                 StaticFactoryMethodType.BLOCKING);
 
         return conjureDefinition.getServices().stream()
-                .flatMap(serviceDef -> !serviceDef.getEndpoints().isEmpty()
-                        ? Stream.of(
-                                endpoints.endpointsClass(serviceDef),
-                                resultTypeGenerator.generateEndpointResultTypes(serviceDef),
-                                interfaceGenerator.generateBlocking(serviceDef, blockingGenerator),
-                                interfaceGenerator.generateAsync(serviceDef, asyncGenerator))
-                        : Stream.of(
-                                interfaceGenerator.generateBlocking(serviceDef, blockingGenerator),
-                                interfaceGenerator.generateAsync(serviceDef, asyncGenerator)));
+                .flatMap(serviceDef -> generateFilesForService(
+                        options.excludeDialogueAsyncInterfaces(),
+                        serviceDef,
+                        endpoints,
+                        interfaceGenerator,
+                        blockingGenerator,
+                        asyncGenerator));
+    }
+
+    private static Stream<JavaFile> generateFilesForService(
+            boolean excludeDialogueAsyncInterfaces,
+            ServiceDefinition serviceDef,
+            DialogueEndpointsGenerator endpointsGenerator,
+            DialogueInterfaceGenerator interfaceGenerator,
+            StaticFactoryMethodGenerator blockingGenerator,
+            StaticFactoryMethodGenerator asyncGenerator) {
+        List<JavaFile> files = new ArrayList<>(/* initialCapacity= */ 3);
+        if (!serviceDef.getEndpoints().isEmpty()) {
+            files.add(endpointsGenerator.endpointsClass(serviceDef));
+        }
+        files.add(interfaceGenerator.generateBlocking(serviceDef, blockingGenerator));
+        if (!excludeDialogueAsyncInterfaces) {
+            files.add(interfaceGenerator.generateAsync(serviceDef, asyncGenerator));
+        }
+        return files.stream();
     }
 }

conjure-java-core/src/integrationInput/java/com/palantir/product/SafeDoubleAliasExample.java

@@ -20,7 +20,6 @@
 import com.google.common.collect.ImmutableList;
 import com.palantir.conjure.java.ConjureAnnotations;
 import com.palantir.conjure.java.Options;
-import com.palantir.conjure.java.lib.SafeLong;
 import com.palantir.conjure.java.util.Javadoc;
 import com.palantir.conjure.java.util.Packages;
 import com.palantir.conjure.java.util.Primitives;
@@ -148,8 +147,7 @@ public static JavaFile generateAliasType(
 
         if (isAliasOfDouble(typeDef)) {
             CodeBlock longCastCodeBlock = CodeBlock.builder()
-                    .addStatement("long safeValue = $T.of(value).longValue()", SafeLong.class)
-                    .addStatement("return new $T((double) safeValue)", thisClass)
+                    .addStatement("return new $T((double) value)", thisClass)
                     .build();
 
             CodeBlock intCastCodeBlock = CodeBlock.builder()

conjure-java-core/src/integrationInput/java/test/prefix/com/palantir/product/DoubleAliasExample.java

@@ -31,6 +31,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.Locale;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.api.parallel.Execution;
@@ -98,11 +99,27 @@ public void generateEteServices() throws IOException {
         validateGeneratorOutput(files, Paths.get("src/integrationInput/java/com/palantir/product"));
     }
 
+    @Test
+    public void testServiceGeneration_excludeDialogueAsyncInterfaces() {
+        List<Path> files = getGeneratedFilesForDef(
+                "example-service",
+                Options.builder().excludeDialogueAsyncInterfaces(true).build());
+        List<String> fileNames =
+                files.stream().map(Path::getFileName).map(Path::toString).toList();
+        assertThat(fileNames).noneMatch(name -> name.toLowerCase(Locale.ROOT).contains("async"));
+    }
+
     private void testServiceGeneration(String conjureFile) throws IOException {
+        validateGeneratorOutput(
+                getGeneratedFilesForDef(conjureFile, Options.empty()),
+                Paths.get("src/test/resources/test/api"),
+                ".dialogue");
+    }
+
+    private List<Path> getGeneratedFilesForDef(String conjureFile, Options options) {
         ConjureDefinition def = Conjure.parse(ImmutableList.of(new File("src/test/resources/" + conjureFile + ".yml")));
-        List<Path> files = new GenerationCoordinator(
-                        MoreExecutors.directExecutor(), ImmutableSet.of(new DialogueServiceGenerator(Options.empty())))
+        return new GenerationCoordinator(
+                        MoreExecutors.directExecutor(), ImmutableSet.of(new DialogueServiceGenerator(options)))
                 .emit(def, folder);
-        validateGeneratorOutput(files, Paths.get("src/test/resources/test/api"), ".dialogue");
     }
 }

conjure-java-core/src/integrationInput/java/test/prefix/com/palantir/product/SafeDoubleAliasExample.java

@@ -46,6 +46,8 @@ The recommended way to use conjure-java is via a build tool like [gradle-conjure
                      legacy 'javax' packages.
         --externalFallbackTypes
                      Java external type imports are generated using their fallback type.
+        --excludeDialogueAsyncInterfaces
+                     Exclude the generation of asynchronous interfaces for Dialogue clients.
 
 ### Known Tag Values
 

conjure-java-core/src/main/java/com/palantir/conjure/java/Options.java

@@ -1,15 +1,15 @@
 # Run ./gradlew writeVersionsLocks to regenerate this file
 com.atlassian.commonmark:commonmark:0.12.1 (1 constraints: 36052a3b)
-com.fasterxml.jackson.core:jackson-annotations:2.18.1 (24 constraints: 62955f13)
-com.fasterxml.jackson.core:jackson-core:2.18.1 (22 constraints: 25c18302)
-com.fasterxml.jackson.core:jackson-databind:2.18.1 (35 constraints: 039ba327)
-com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.1 (4 constraints: e9653c50)
-com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.1 (1 constraints: 811ca2a4)
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.1 (3 constraints: 3f25a610)
-com.fasterxml.jackson.datatype:jackson-datatype-guava:2.18.1 (3 constraints: f839a026)
-com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.1 (4 constraints: 303f5392)
-com.fasterxml.jackson.datatype:jackson-datatype-joda:2.18.1 (2 constraints: 322b47b0)
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1 (2 constraints: 322b47b0)
+com.fasterxml.jackson.core:jackson-annotations:2.18.2 (24 constraints: 6695c722)
+com.fasterxml.jackson.core:jackson-core:2.18.2 (22 constraints: 31c1bf29)
+com.fasterxml.jackson.core:jackson-databind:2.18.2 (35 constraints: 0f9bef6e)
+com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2 (4 constraints: ea651651)
+com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2 (1 constraints: 811ca2a4)
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2 (3 constraints: 3f25a610)
+com.fasterxml.jackson.datatype:jackson-datatype-guava:2.18.2 (3 constraints: f839a026)
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.2 (4 constraints: 303f5392)
+com.fasterxml.jackson.datatype:jackson-datatype-joda:2.18.2 (2 constraints: 322b47b0)
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2 (2 constraints: 322b47b0)
 com.github.ben-manes.caffeine:caffeine:3.1.8 (10 constraints: 63b008f3)
 com.google.auto:auto-common:1.2.2 (2 constraints: 1d175731)
 com.google.code.findbugs:jsr305:3.0.2 (35 constraints: b94940f6)
@@ -94,12 +94,12 @@ ch.qos.logback:logback-access:1.2.11 (1 constraints: e31129f4)
 ch.qos.logback:logback-classic:1.2.11 (6 constraints: de520609)
 ch.qos.logback:logback-core:1.2.11 (5 constraints: f74abe3c)
 com.fasterxml:classmate:1.5.1 (3 constraints: 8530e55a)
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.18.1 (2 constraints: e12e5d6a)
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider:2.18.1 (1 constraints: 43197fbb)
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.18.1 (3 constraints: 5a22f1f5)
-com.fasterxml.jackson.module:jackson-module-afterburner:2.18.1 (1 constraints: b20e5a5e)
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.18.1 (2 constraints: e12e5d6a)
-com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.1 (1 constraints: b20e5a5e)
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.18.2 (2 constraints: e32ea06a)
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider:2.18.2 (1 constraints: 43197fbb)
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.18.2 (3 constraints: 5a22f1f5)
+com.fasterxml.jackson.module:jackson-module-afterburner:2.18.2 (1 constraints: b20e5a5e)
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.18.2 (2 constraints: e32ea06a)
+com.fasterxml.jackson.module:jackson-module-parameter-names:2.18.2 (1 constraints: b20e5a5e)
 com.google.auto.value:auto-value:1.10 (1 constraints: e711f8e8)
 com.google.auto.value:auto-value-annotations:1.8.1 (1 constraints: 620a29b9)
 com.google.testing.compile:compile-testing:0.21.0 (1 constraints: 35052a3b)

conjure-java-core/src/main/java/com/palantir/conjure/java/services/dialogue/DialogueServiceGenerator.java

@@ -1,6 +1,6 @@
 ch.qos.logback:* = 1.2.11
 com.atlassian.commonmark:* = 0.12.1
-com.fasterxml.jackson.core:jackson-databind = 2.18.1
+com.fasterxml.jackson.core:jackson-databind = 2.18.2
 com.google.auto:auto-common = 1.2.2
 com.google.code.findbugs:jsr305 = 3.0.2
 com.google.guava:guava = 33.1.0-jre