Add test

palantir · Oct 20, 2023 · 4610af8 · 4610af8
1 parent 7834d8f
commit 4610af8
Show file tree

Hide file tree

Showing 10 changed files with 179 additions and 0 deletions.
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/DialogueEteEndpoints.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/DialogueEteEndpoints.java
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/EteService.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/EteService.java
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/EteServiceAsync.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/EteServiceAsync.java
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/EteServiceBlocking.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/EteServiceBlocking.java
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/EteServiceEndpoints.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/EteServiceEndpoints.java
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/EteServiceRetrofit.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/EteServiceRetrofit.java
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/UndertowEteService.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/UndertowEteService.java
diff --git a/conjure-java-core/src/test/java/com/palantir/conjure/java/EteResource.java b/conjure-java-core/src/test/java/com/palantir/conjure/java/EteResource.java
@@ -104,6 +104,11 @@ public long externalLongPath(AuthHeader _authHeader, long param) {
         return param;
     }
 
+    @Override
+    public String pathParamRegex(AuthHeader authHeader, String paramOne, String paramTwo, String paramThree) {
+        return paramOne + "," + paramTwo + "," + paramThree;
+    }
+
     @Override
     public Optional<Long> optionalExternalLongQuery(AuthHeader _authHeader, Optional<Long> param) {
         return param;

diff --git a/conjure-java-core/src/test/java/com/palantir/conjure/java/UndertowServiceEteTest.java b/conjure-java-core/src/test/java/com/palantir/conjure/java/UndertowServiceEteTest.java
@@ -428,6 +428,12 @@ public void testSpaceInPathParam() {
                 .isEqualTo(expected);
     }
 
+    @Test
+    public void testRegexPath() {
+        assertThat(client.pathParamRegex(AuthHeader.valueOf("bearer"), "foo", "bar", "baz"))
+                .isEqualTo("foo,bar,baz");
+    }
+
     @Test
     public void testBinaryOptionalEmptyResponse() {
         Optional<ResponseBody> response =

diff --git a/conjure-java-core/src/test/resources/ete-service.yml b/conjure-java-core/src/test/resources/ete-service.yml
@@ -111,6 +111,18 @@ services:
           param: Long
         returns: Long
 
+      # The Conjure spec technically supports path params regexes even though they are unused
+      pathParamRegex:
+        http: GET /path/{paramOne}/{paramTwo:.+}/{paramThree:.*}
+        args:
+          paramOne:
+            type: string
+          paramTwo:
+            type: string
+          paramThree:
+            type: string
+        returns: string
+
       optionalExternalLongQuery:
         http: GET /optionalExternalLong
         args: