Adds path parameters serializer

openapi-json-schema-tools · Mar 6, 2024 · ba1eb09 · ba1eb09
1 parent ef5a3c5
commit ba1eb09
Show file tree

Hide file tree

Showing 22 changed files with 156 additions and 118 deletions.
diff --git a/samples/client/petstore/java/.openapi-generator/FILES b/samples/client/petstore/java/.openapi-generator/FILES
@@ -563,6 +563,7 @@ src/main/java/org/openapijsonschematools/client/parameter/Parameter.java
 src/main/java/org/openapijsonschematools/client/parameter/ParameterBase.java
 src/main/java/org/openapijsonschematools/client/parameter/ParameterInType.java
 src/main/java/org/openapijsonschematools/client/parameter/ParameterStyle.java
+src/main/java/org/openapijsonschematools/client/parameter/PathSerializer.java
 src/main/java/org/openapijsonschematools/client/parameter/QuerySerializer.java
 src/main/java/org/openapijsonschematools/client/parameter/SchemaParameter.java
 src/main/java/org/openapijsonschematools/client/paths/anotherfakedummy/patch/RequestBody.java

diff --git a/...tstore/java/src/main/java/org/openapijsonschematools/client/parameter/PathSerializer.java b/...tstore/java/src/main/java/org/openapijsonschematools/client/parameter/PathSerializer.java
@@ -0,0 +1,29 @@
+package org.openapijsonschematools.client.parameter;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.util.AbstractMap;
+import java.util.Map;
+
+public abstract class PathSerializer {
+    private final Map<String, Parameter> parameters;
+
+    protected PathSerializer(Map<String, Parameter> parameters) {
+        this.parameters = parameters;
+    }
+
+    public String serialize(Map<String, ?> inData, String pathWithPlaceholders) {
+        String result = pathWithPlaceholders;
+        for (Map.Entry<String, ?> entry: inData.entrySet()) {
+            String mapKey = entry.getKey();
+            @Nullable Parameter parameter = parameters.get(mapKey);
+            if (parameter == null) {
+                throw new RuntimeException("Invalid state, a parameter must exist for every key");
+            }
+            @Nullable Object value = entry.getValue();
+            AbstractMap.SimpleEntry<String, String> serialized = parameter.serialize(value);
+            result = result.replace("{" + mapKey + "}", serialized.getValue());
+        }
+        return result;
+    }
+}
diff --git a/...ain/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/Parameters.java b/...ain/java/org/openapijsonschematools/client/paths/commonparamsubdir/delete/Parameters.java
@@ -2,6 +2,7 @@
 
 import org.openapijsonschematools.client.paths.commonparamsubdir.delete.parameters.Parameter0;
 import org.openapijsonschematools.client.paths.commonparamsubdir.delete.parameters.Parameter1;
+import org.openapijsonschematools.client.parameter.PathSerializer;
 import org.openapijsonschematools.client.parameter.HeadersSerializer;
 
 import org.openapijsonschematools.client.parameter.Parameter;
@@ -11,16 +12,14 @@
 
 public class Parameters {
 
-    public static class PathParametersSerializer {
-        Map<String, Parameter> parameters;
-
+    public static class PathParametersSerializer extends PathSerializer {
         public PathParametersSerializer() {
-            parameters = Map.ofEntries(
-                new AbstractMap.SimpleEntry<>("subDir", new Parameter1.Parameter11())
+            super(
+                Map.ofEntries(
+                    new AbstractMap.SimpleEntry<>("subDir", new Parameter1.Parameter11())
+                )
             );
         }
-
-        // deserialize PathParameters
     }
 
     public static class HeaderParametersSerializer extends HeadersSerializer {

diff --git a/...c/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/Parameters.java b/...c/main/java/org/openapijsonschematools/client/paths/commonparamsubdir/get/Parameters.java
@@ -11,16 +11,14 @@
 
 public class Parameters {
 
-    public static class PathParametersSerializer {
-        Map<String, Parameter> parameters;
-
+    public static class PathParametersSerializer extends PathSerializer {
         public PathParametersSerializer() {
-            parameters = Map.ofEntries(
-                new AbstractMap.SimpleEntry<>("subDir", new RouteParameter0.RouteParameter01())
+            super(
+                Map.ofEntries(
+                    new AbstractMap.SimpleEntry<>("subDir", new RouteParameter0.RouteParameter01())
+                )
             );
         }
-
-        // deserialize PathParameters
     }
 
     public static class QueryParametersSerializer extends QuerySerializer {

diff --git a/.../main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/Parameters.java b/.../main/java/org/openapijsonschematools/client/paths/commonparamsubdir/post/Parameters.java
@@ -2,6 +2,7 @@
 
 import org.openapijsonschematools.client.paths.commonparamsubdir.parameters.RouteParameter0;
 import org.openapijsonschematools.client.paths.commonparamsubdir.post.parameters.Parameter0;
+import org.openapijsonschematools.client.parameter.PathSerializer;
 import org.openapijsonschematools.client.parameter.HeadersSerializer;
 
 import org.openapijsonschematools.client.parameter.Parameter;
@@ -11,16 +12,14 @@
 
 public class Parameters {
 
-    public static class PathParametersSerializer {
-        Map<String, Parameter> parameters;
-
+    public static class PathParametersSerializer extends PathSerializer {
         public PathParametersSerializer() {
-            parameters = Map.ofEntries(
-                new AbstractMap.SimpleEntry<>("subDir", new RouteParameter0.RouteParameter01())
+            super(
+                Map.ofEntries(
+                    new AbstractMap.SimpleEntry<>("subDir", new RouteParameter0.RouteParameter01())
+                )
             );
         }
-
-        // deserialize PathParameters
     }
 
     public static class HeaderParametersSerializer extends HeadersSerializer {

diff --git a/...re/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/Parameters.java b/...re/java/src/main/java/org/openapijsonschematools/client/paths/fake/delete/Parameters.java
@@ -6,6 +6,7 @@
 import org.openapijsonschematools.client.paths.fake.delete.parameters.Parameter3;
 import org.openapijsonschematools.client.paths.fake.delete.parameters.Parameter4;
 import org.openapijsonschematools.client.paths.fake.delete.parameters.Parameter5;
+import org.openapijsonschematools.client.parameter.PathSerializer;
 import org.openapijsonschematools.client.parameter.HeadersSerializer;
 import org.openapijsonschematools.client.parameter.QuerySerializer;
 

diff --git a/...store/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/Parameters.java b/...store/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/Parameters.java
@@ -6,6 +6,7 @@
 import org.openapijsonschematools.client.paths.fake.get.parameters.Parameter3;
 import org.openapijsonschematools.client.paths.fake.get.parameters.Parameter4;
 import org.openapijsonschematools.client.paths.fake.get.parameters.Parameter5;
+import org.openapijsonschematools.client.parameter.PathSerializer;
 import org.openapijsonschematools.client.parameter.HeadersSerializer;
 import org.openapijsonschematools.client.parameter.QuerySerializer;
 

diff --git a/...in/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/Parameters.java b/...in/java/org/openapijsonschematools/client/paths/fakedeletecoffeeid/delete/Parameters.java
@@ -9,15 +9,13 @@
 
 public class Parameters {
 
-    public static class PathParametersSerializer {
-        Map<String, Parameter> parameters;
-
+    public static class PathParametersSerializer extends PathSerializer {
         public PathParametersSerializer() {
-            parameters = Map.ofEntries(
-                new AbstractMap.SimpleEntry<>("id", new Parameter0.Parameter01())
+            super(
+                Map.ofEntries(
+                    new AbstractMap.SimpleEntry<>("id", new Parameter0.Parameter01())
+                )
             );
         }
-
-        // deserialize PathParameters
     }
 }
diff --git a/...enapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/Parameters.java b/...enapijsonschematools/client/paths/fakeparametercollisions1ababselfab/post/Parameters.java
@@ -19,6 +19,7 @@
 import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.Parameter16;
 import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.Parameter17;
 import org.openapijsonschematools.client.paths.fakeparametercollisions1ababselfab.post.parameters.Parameter18;
+import org.openapijsonschematools.client.parameter.PathSerializer;
 import org.openapijsonschematools.client.parameter.HeadersSerializer;
 import org.openapijsonschematools.client.parameter.QuerySerializer;
 import org.openapijsonschematools.client.parameter.CookieSerializer;
@@ -30,20 +31,18 @@
 
 public class Parameters {
 
-    public static class PathParametersSerializer {
-        Map<String, Parameter> parameters;
-
+    public static class PathParametersSerializer extends PathSerializer {
         public PathParametersSerializer() {
-            parameters = Map.ofEntries(
-                new AbstractMap.SimpleEntry<>("1", new Parameter9.Parameter91()),
-                new AbstractMap.SimpleEntry<>("aB", new Parameter10.Parameter101()),
-                new AbstractMap.SimpleEntry<>("Ab", new Parameter11.Parameter111()),
-                new AbstractMap.SimpleEntry<>("self", new Parameter12.Parameter121()),
-                new AbstractMap.SimpleEntry<>("A-B", new Parameter13.Parameter131())
+            super(
+                Map.ofEntries(
+                    new AbstractMap.SimpleEntry<>("1", new Parameter9.Parameter91()),
+                    new AbstractMap.SimpleEntry<>("aB", new Parameter10.Parameter101()),
+                    new AbstractMap.SimpleEntry<>("Ab", new Parameter11.Parameter111()),
+                    new AbstractMap.SimpleEntry<>("self", new Parameter12.Parameter121()),
+                    new AbstractMap.SimpleEntry<>("A-B", new Parameter13.Parameter131())
+                )
             );
         }
-
-        // deserialize PathParameters
     }
 
     public static class QueryParametersSerializer extends QuerySerializer {

diff --git a/...apijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/Parameters.java b/...apijsonschematools/client/paths/fakepetiduploadimagewithrequiredfile/post/Parameters.java
@@ -9,15 +9,13 @@
 
 public class Parameters {
 
-    public static class PathParametersSerializer {
-        Map<String, Parameter> parameters;
-
+    public static class PathParametersSerializer extends PathSerializer {
         public PathParametersSerializer() {
-            parameters = Map.ofEntries(
-                new AbstractMap.SimpleEntry<>("petId", new Parameter0.Parameter01())
+            super(
+                Map.ofEntries(
+                    new AbstractMap.SimpleEntry<>("petId", new Parameter0.Parameter01())
+                )
             );
         }
-
-        // deserialize PathParameters
     }
 }
diff --git a/...ava/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/Parameters.java b/...ava/src/main/java/org/openapijsonschematools/client/paths/petpetid/delete/Parameters.java
@@ -2,6 +2,7 @@
 
 import org.openapijsonschematools.client.paths.petpetid.delete.parameters.Parameter0;
 import org.openapijsonschematools.client.paths.petpetid.delete.parameters.Parameter1;
+import org.openapijsonschematools.client.parameter.PathSerializer;
 import org.openapijsonschematools.client.parameter.HeadersSerializer;
 
 import org.openapijsonschematools.client.parameter.Parameter;
@@ -11,16 +12,14 @@
 
 public class Parameters {
 
-    public static class PathParametersSerializer {
-        Map<String, Parameter> parameters;
-
+    public static class PathParametersSerializer extends PathSerializer {
         public PathParametersSerializer() {
-            parameters = Map.ofEntries(
-                new AbstractMap.SimpleEntry<>("petId", new Parameter1.Parameter11())
+            super(
+                Map.ofEntries(
+                    new AbstractMap.SimpleEntry<>("petId", new Parameter1.Parameter11())
+                )
             );
         }
-
-        // deserialize PathParameters
     }
 
     public static class HeaderParametersSerializer extends HeadersSerializer {

diff --git a/...e/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/Parameters.java b/...e/java/src/main/java/org/openapijsonschematools/client/paths/petpetid/get/Parameters.java
@@ -9,15 +9,13 @@
 
 public class Parameters {
 
-    public static class PathParametersSerializer {
-        Map<String, Parameter> parameters;
-
+    public static class PathParametersSerializer extends PathSerializer {
         public PathParametersSerializer() {
-            parameters = Map.ofEntries(
-                new AbstractMap.SimpleEntry<>("petId", new Parameter0.Parameter01())
+            super(
+                Map.ofEntries(
+                    new AbstractMap.SimpleEntry<>("petId", new Parameter0.Parameter01())
+                )
             );
         }
-
-        // deserialize PathParameters
     }
 }
diff --git a/.../java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/Parameters.java b/.../java/src/main/java/org/openapijsonschematools/client/paths/petpetid/post/Parameters.java
@@ -9,15 +9,13 @@
 
 public class Parameters {
 
-    public static class PathParametersSerializer {
-        Map<String, Parameter> parameters;
-
+    public static class PathParametersSerializer extends PathSerializer {
         public PathParametersSerializer() {
-            parameters = Map.ofEntries(
-                new AbstractMap.SimpleEntry<>("petId", new Parameter0.Parameter01())
+            super(
+                Map.ofEntries(
+                    new AbstractMap.SimpleEntry<>("petId", new Parameter0.Parameter01())
+                )
             );
         }
-
-        // deserialize PathParameters
     }
 }
diff --git a/...ain/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/Parameters.java b/...ain/java/org/openapijsonschematools/client/paths/petpetiduploadimage/post/Parameters.java
@@ -9,15 +9,13 @@
 
 public class Parameters {
 
-    public static class PathParametersSerializer {
-        Map<String, Parameter> parameters;
-
+    public static class PathParametersSerializer extends PathSerializer {
         public PathParametersSerializer() {
-            parameters = Map.ofEntries(
-                new AbstractMap.SimpleEntry<>("petId", new Parameter0.Parameter01())
+            super(
+                Map.ofEntries(
+                    new AbstractMap.SimpleEntry<>("petId", new Parameter0.Parameter01())
+                )
             );
         }
-
-        // deserialize PathParameters
     }
 }
diff --git a/...ain/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/Parameters.java b/...ain/java/org/openapijsonschematools/client/paths/storeorderorderid/delete/Parameters.java
@@ -9,15 +9,13 @@
 
 public class Parameters {
 
-    public static class PathParametersSerializer {
-        Map<String, Parameter> parameters;
-
+    public static class PathParametersSerializer extends PathSerializer {
         public PathParametersSerializer() {
-            parameters = Map.ofEntries(
-                new AbstractMap.SimpleEntry<>("order_id", new Parameter0.Parameter01())
+            super(
+                Map.ofEntries(
+                    new AbstractMap.SimpleEntry<>("order_id", new Parameter0.Parameter01())
+                )
             );
         }
-
-        // deserialize PathParameters
     }
 }
diff --git a/...c/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/Parameters.java b/...c/main/java/org/openapijsonschematools/client/paths/storeorderorderid/get/Parameters.java
@@ -9,15 +9,13 @@
 
 public class Parameters {
 
-    public static class PathParametersSerializer {
-        Map<String, Parameter> parameters;
-
+    public static class PathParametersSerializer extends PathSerializer {
         public PathParametersSerializer() {
-            parameters = Map.ofEntries(
-                new AbstractMap.SimpleEntry<>("order_id", new Parameter0.Parameter01())
+            super(
+                Map.ofEntries(
+                    new AbstractMap.SimpleEntry<>("order_id", new Parameter0.Parameter01())
+                )
             );
         }
-
-        // deserialize PathParameters
     }
 }
diff --git a/...src/main/java/org/openapijsonschematools/client/paths/userusername/delete/Parameters.java b/...src/main/java/org/openapijsonschematools/client/paths/userusername/delete/Parameters.java
@@ -9,15 +9,13 @@
 
 public class Parameters {
 
-    public static class PathParametersSerializer {
-        Map<String, Parameter> parameters;
-
+    public static class PathParametersSerializer extends PathSerializer {
         public PathParametersSerializer() {
-            parameters = Map.ofEntries(
-                new AbstractMap.SimpleEntry<>("", new Parameter0.Parameter01())
+            super(
+                Map.ofEntries(
+                    new AbstractMap.SimpleEntry<>("", new Parameter0.Parameter01())
+                )
             );
         }
-
-        // deserialize PathParameters
     }
 }
diff --git a/...va/src/main/java/org/openapijsonschematools/client/paths/userusername/get/Parameters.java b/...va/src/main/java/org/openapijsonschematools/client/paths/userusername/get/Parameters.java
@@ -9,15 +9,13 @@
 
 public class Parameters {
 
-    public static class PathParametersSerializer {
-        Map<String, Parameter> parameters;
-
+    public static class PathParametersSerializer extends PathSerializer {
         public PathParametersSerializer() {
-            parameters = Map.ofEntries(
-                new AbstractMap.SimpleEntry<>("", new Parameter0.Parameter01())
+            super(
+                Map.ofEntries(
+                    new AbstractMap.SimpleEntry<>("", new Parameter0.Parameter01())
+                )
             );
         }
-
-        // deserialize PathParameters
     }
 }