From 17c87a9f007d44c416d2463bf322cd9a7c00bb36 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 4 Mar 2023 00:08:10 +1300
Subject: [PATCH] Version 1.28

---
 http-api/pom.xml                              |   2 +-
 http-client-gson-adapter/pom.xml              |   6 +-
 http-client/pom.xml                           |   4 +-
 http-generator-client/pom.xml                 |   2 +-
 http-generator-core/pom.xml                   |   4 +-
 http-generator-helidon/pom.xml                |   2 +-
 http-generator-javalin/pom.xml                |   2 +-
 http-generator-jex/pom.xml                    |   2 +-
 http-generator-nima/pom.xml                   |   2 +-
 pom.xml                                       |   2 +-
 tests/pom.xml                                 |   2 +-
 .../src/main/resources/public/openapi.json    | 214 +++++++++++++++++-
 .../src/main/resources/public/openapi.json    | 136 +++++++++++
 tests/test-nima-jsonb/.factorypath            |   2 +-
 14 files changed, 363 insertions(+), 19 deletions(-)

diff --git a/http-api/pom.xml b/http-api/pom.xml
index adfc4ee2d..b7408637e 100644
--- a/http-api/pom.xml
+++ b/http-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>1.28-SNAPSHOT</version>
+    <version>1.28</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/http-client-gson-adapter/pom.xml b/http-client-gson-adapter/pom.xml
index 8efb1705b..a5ebf2654 100644
--- a/http-client-gson-adapter/pom.xml
+++ b/http-client-gson-adapter/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>1.28-SNAPSHOT</version>
+    <version>1.28</version>
     <relativePath>..</relativePath>
   </parent>
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-http-client-gson</artifactId>
-  <version>1.28-SNAPSHOT</version>
+  <version>1.28</version>
 
   <dependencies>
 
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>1.28-SNAPSHOT</version>
+      <version>1.28</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/http-client/pom.xml b/http-client/pom.xml
index 1eb33af63..99cad40d5 100644
--- a/http-client/pom.xml
+++ b/http-client/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>1.28-SNAPSHOT</version>
+    <version>1.28</version>
     <relativePath>..</relativePath>
   </parent>
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-http-client</artifactId>
-  <version>1.28-SNAPSHOT</version>
+  <version>1.28</version>
 
   <scm>
     <developerConnection>scm:git:git@github.com:avaje/avaje-http-client.git</developerConnection>
diff --git a/http-generator-client/pom.xml b/http-generator-client/pom.xml
index d8bfbc625..d2c933e14 100644
--- a/http-generator-client/pom.xml
+++ b/http-generator-client/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>1.28-SNAPSHOT</version>
+    <version>1.28</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/http-generator-core/pom.xml b/http-generator-core/pom.xml
index a70846ee2..5acc1f248 100644
--- a/http-generator-core/pom.xml
+++ b/http-generator-core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>1.28-SNAPSHOT</version>
+    <version>1.28</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>1.28-SNAPSHOT</version>
+      <version>1.28</version>
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
diff --git a/http-generator-helidon/pom.xml b/http-generator-helidon/pom.xml
index b77263ce2..bd319967e 100644
--- a/http-generator-helidon/pom.xml
+++ b/http-generator-helidon/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>1.28-SNAPSHOT</version>
+    <version>1.28</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/http-generator-javalin/pom.xml b/http-generator-javalin/pom.xml
index 071841f35..d15e160cd 100644
--- a/http-generator-javalin/pom.xml
+++ b/http-generator-javalin/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>1.28-SNAPSHOT</version>
+    <version>1.28</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/http-generator-jex/pom.xml b/http-generator-jex/pom.xml
index e27fd40ad..696a459f2 100644
--- a/http-generator-jex/pom.xml
+++ b/http-generator-jex/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>1.28-SNAPSHOT</version>
+    <version>1.28</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/http-generator-nima/pom.xml b/http-generator-nima/pom.xml
index f0eb2734e..e387eb591 100644
--- a/http-generator-nima/pom.xml
+++ b/http-generator-nima/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>avaje-http-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>1.28-SNAPSHOT</version>
+    <version>1.28</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 8aec62826..ee9c54f5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-http-parent</artifactId>
-  <version>1.28-SNAPSHOT</version>
+  <version>1.28</version>
   <packaging>pom</packaging>
 
   <scm>
diff --git a/tests/pom.xml b/tests/pom.xml
index 0700bacb5..d5ecff33d 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -20,7 +20,7 @@
     <jackson.version>2.14.1</jackson.version>
     <jex.version>2.5</jex.version>
     <avaje-inject.version>8.12-RC3</avaje-inject.version>
-    <avaje-http-version>1.28-SNAPSHOT</avaje-http-version>
+    <avaje-http-version>1.28</avaje-http-version>
   </properties>
 
   <modules>
diff --git a/tests/test-javalin-jsonb/src/main/resources/public/openapi.json b/tests/test-javalin-jsonb/src/main/resources/public/openapi.json
index f56485ba9..02e11d26e 100644
--- a/tests/test-javalin-jsonb/src/main/resources/public/openapi.json
+++ b/tests/test-javalin-jsonb/src/main/resources/public/openapi.json
@@ -1,18 +1,18 @@
 {
 	"openapi" : "3.0.1",
 	"info" : {
-		"title" : "Example service",
+		"title" : "Example service showing off the Path extension method of controller",
 		"description" : "Example Javalin controllers with Java and Maven",
 		"version" : ""
 	},
 	"tags" : [
 		{
 			"name" : "tag1",
-			"description" : "it's somethin"
+			"description" : "this is added to openapi tags"
 		},
 		{
 			"name" : "tag1",
-			"description" : "this is added to openapi tags"
+			"description" : "it's somethin"
 		}
 	],
 	"paths" : {
@@ -1139,6 +1139,184 @@
 				}
 			}
 		},
+		"/test/enumForm" : {
+			"get" : {
+				"tags" : [
+					
+				],
+				"summary" : "",
+				"description" : "",
+				"requestBody" : {
+					"content" : {
+						"application/x-www-form-urlencoded" : {
+							"schema" : {
+								"type" : "object",
+								"properties" : {
+									"s" : {
+										"type" : "string"
+									},
+									"type" : {
+										"$ref" : "#/components/schemas/ServerType"
+									}
+								}
+							}
+						}
+					},
+					"required" : true
+				},
+				"responses" : {
+					"200" : {
+						"description" : "",
+						"content" : {
+							"application/json" : {
+								"schema" : {
+									"type" : "string"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"/test/enumFormParam" : {
+			"get" : {
+				"tags" : [
+					
+				],
+				"summary" : "",
+				"description" : "",
+				"requestBody" : {
+					"content" : {
+						"application/x-www-form-urlencoded" : {
+							"schema" : {
+								"type" : "object",
+								"properties" : {
+									"s" : {
+										"type" : "string"
+									},
+									"type" : {
+										"$ref" : "#/components/schemas/ServerType"
+									}
+								}
+							}
+						}
+					},
+					"required" : true
+				},
+				"responses" : {
+					"200" : {
+						"description" : "",
+						"content" : {
+							"application/json" : {
+								"schema" : {
+									"type" : "string"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"/test/enumQuery" : {
+			"get" : {
+				"tags" : [
+					
+				],
+				"summary" : "",
+				"description" : "",
+				"parameters" : [
+					{
+						"name" : "type",
+						"in" : "query",
+						"schema" : {
+							"$ref" : "#/components/schemas/ServerType"
+						}
+					}
+				],
+				"responses" : {
+					"200" : {
+						"description" : "",
+						"content" : {
+							"application/json" : {
+								"schema" : {
+									"type" : "string"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"/test/enumQuery2" : {
+			"get" : {
+				"tags" : [
+					
+				],
+				"summary" : "",
+				"description" : "",
+				"parameters" : [
+					{
+						"name" : "type",
+						"in" : "query",
+						"schema" : {
+							"type" : "array",
+							"items" : {
+								"$ref" : "#/components/schemas/ServerType"
+							}
+						}
+					}
+				],
+				"responses" : {
+					"200" : {
+						"description" : "",
+						"content" : {
+							"application/json" : {
+								"schema" : {
+									"type" : "string"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"/test/enumQueryImplied" : {
+			"post" : {
+				"tags" : [
+					
+				],
+				"summary" : "",
+				"description" : "",
+				"parameters" : [
+					{
+						"name" : "s",
+						"in" : "query",
+						"schema" : {
+							"type" : "string"
+						}
+					},
+					{
+						"name" : "type",
+						"in" : "query",
+						"schema" : {
+							"$ref" : "#/components/schemas/ServerType"
+						}
+					}
+				],
+				"responses" : {
+					"201" : {
+						"description" : "",
+						"content" : {
+							"application/json" : {
+								"schema" : {
+									"type" : "string"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
 		"/test/form" : {
 			"post" : {
 				"tags" : [
@@ -1309,6 +1487,27 @@
 				}
 			}
 		},
+		"/test/mapTest" : {
+			"get" : {
+				"tags" : [
+					
+				],
+				"summary" : "",
+				"description" : "",
+				"responses" : {
+					"200" : {
+						"description" : "",
+						"content" : {
+							"application/json" : {
+								"schema" : {
+									"type" : "string"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
 		"/test/person" : {
 			"post" : {
 				"tags" : [
@@ -1619,6 +1818,12 @@
 						"maxLength" : 100,
 						"type" : "string",
 						"format" : "email"
+					},
+					"addresses" : {
+						"type" : "array",
+						"items" : {
+							"type" : "string"
+						}
 					}
 				}
 			},
@@ -1698,6 +1903,9 @@
 					}
 				}
 			},
+			"ServerType" : {
+				"type" : "object"
+			},
 			"byte" : {
 				"type" : "object"
 			}
diff --git a/tests/test-jex/src/main/resources/public/openapi.json b/tests/test-jex/src/main/resources/public/openapi.json
index fb4378388..8dc579692 100644
--- a/tests/test-jex/src/main/resources/public/openapi.json
+++ b/tests/test-jex/src/main/resources/public/openapi.json
@@ -178,6 +178,139 @@
 				}
 			}
 		},
+		"/test/enumQuery" : {
+			"get" : {
+				"tags" : [
+					
+				],
+				"summary" : "",
+				"description" : "",
+				"parameters" : [
+					{
+						"name" : "type",
+						"in" : "query",
+						"schema" : {
+							"$ref" : "#/components/schemas/ServerType"
+						}
+					}
+				],
+				"responses" : {
+					"200" : {
+						"description" : "",
+						"content" : {
+							"application/json" : {
+								"schema" : {
+									"type" : "string"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"/test/enumQuery2" : {
+			"get" : {
+				"tags" : [
+					
+				],
+				"summary" : "",
+				"description" : "",
+				"parameters" : [
+					{
+						"name" : "type",
+						"in" : "query",
+						"schema" : {
+							"type" : "array",
+							"items" : {
+								"$ref" : "#/components/schemas/ServerType"
+							}
+						}
+					}
+				],
+				"responses" : {
+					"200" : {
+						"description" : "",
+						"content" : {
+							"application/json" : {
+								"schema" : {
+									"type" : "string"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"/test/enumQueryImplied" : {
+			"post" : {
+				"tags" : [
+					
+				],
+				"summary" : "",
+				"description" : "",
+				"parameters" : [
+					{
+						"name" : "s",
+						"in" : "query",
+						"schema" : {
+							"type" : "string"
+						}
+					},
+					{
+						"name" : "type",
+						"in" : "query",
+						"schema" : {
+							"$ref" : "#/components/schemas/ServerType"
+						}
+					}
+				],
+				"responses" : {
+					"201" : {
+						"description" : "",
+						"content" : {
+							"application/json" : {
+								"schema" : {
+									"type" : "string"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"/test/paramMulti" : {
+			"get" : {
+				"tags" : [
+					
+				],
+				"summary" : "",
+				"description" : "",
+				"parameters" : [
+					{
+						"name" : "strings",
+						"in" : "query",
+						"schema" : {
+							"type" : "array",
+							"items" : {
+								"type" : "string"
+							}
+						}
+					}
+				],
+				"responses" : {
+					"200" : {
+						"description" : "",
+						"content" : {
+							"application/json" : {
+								"schema" : {
+									"type" : "string"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
 		"/withDefault/{name}" : {
 			"get" : {
 				"tags" : [
@@ -232,6 +365,9 @@
 						"nullable" : false
 					}
 				}
+			},
+			"ServerType" : {
+				"type" : "object"
 			}
 		}
 	}
diff --git a/tests/test-nima-jsonb/.factorypath b/tests/test-nima-jsonb/.factorypath
index 741f86c2a..6729750e9 100644
--- a/tests/test-nima-jsonb/.factorypath
+++ b/tests/test-nima-jsonb/.factorypath
@@ -1,7 +1,7 @@
 <factorypath>
     <factorypathentry kind="VARJAR" id="M2_REPO/jakarta/inject/jakarta.inject-api/2.0.0/jakarta.inject-api-2.0.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/io/avaje/avaje-http-api/1.28-SNAPSHOT/avaje-http-api-1.28-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/avaje/avaje-http-api/1.28/avaje-http-api-1.28.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.13.3/jackson-databind-2.13.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.13.3/jackson-annotations-2.13.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.13.3/jackson-core-2.13.3.jar" enabled="true" runInBatchMode="false"/>