Merge remote-tracking branch 'upstream/master' into serializer

Author: SentryMan

http-generator-core/pom.xml

@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-prisms</artifactId>
-      <version>1.3</version>
+      <version>1.4</version>
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-models</artifactId>
-      <version>${swagger.version}</version>      
+      <version>${swagger.version}</version>
       <exclusions>
         <exclusion>
           <groupId>com.fasterxml.jackson.core</groupId>
@@ -63,9 +63,9 @@
     </dependency>
 
     <dependency>
-      <groupId>jakarta.inject</groupId>
-      <artifactId>jakarta.inject-api</artifactId>
-      <version>2.0.1</version>
+      <groupId>io.swagger.core.v3</groupId>
+      <artifactId>swagger-annotations</artifactId>
+      <version>${swagger.version}</version>
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
@@ -83,7 +83,7 @@
             <path>
               <groupId>io.avaje</groupId>
               <artifactId>avaje-prisms</artifactId>
-              <version>1.3</version>
+              <version>1.4</version>
             </path>
           </annotationProcessorPaths>
         </configuration>

http-generator-core/src/main/java/io/avaje/http/generator/core/ControllerReader.java

@@ -107,7 +107,7 @@ private List<Element> initInterfaces() {
       final Element ifaceElement = ctx.asElement(anInterface);
       final var controller = ControllerPrism.getInstanceOn(ifaceElement);
       if (controller != null && !controller.value().isBlank()
-          || PathPrism.getInstanceOn(ifaceElement) != null) {
+          || PathPrism.isPresent(ifaceElement)) {
         interfaces.add(ifaceElement);
       }
     }

http-generator-core/src/main/java/io/avaje/http/generator/core/ElementReader.java

@@ -62,8 +62,7 @@ private boolean useValidation() {
     }
     final var elementType = ctx.typeElement(rawType);
     return elementType != null
-        && (ValidPrism.getInstanceOn(elementType) != null
-            || JavaxValidPrism.getInstanceOn(elementType) != null);
+        && (ValidPrism.isPresent(elementType) || JavaxValidPrism.isPresent(elementType));
   }
 
   private void readAnnotations(Element element, ParamType defaultType) {

http-generator-core/src/main/java/io/avaje/http/generator/core/JavaxInjectPrism.java

@@ -232,8 +232,7 @@ private <T> void populateObjectSchema(TypeMirror objectType, Schema<T> objectSch
   }
 
   private void setFormatFromValidation(Element element, Schema<?> propSchema) {
-    if (EmailPrism.getOptionalOn(element).isPresent()
-        || JavaxEmailPrism.getOptionalOn(element).isPresent()) {
+    if (EmailPrism.isPresent(element) || JavaxEmailPrism.isPresent(element)) {
       propSchema.setFormat("email");
     }
   }
@@ -311,7 +310,7 @@ private boolean ignoreField(VariableElement field) {
   }
 
   private boolean isHiddenField(VariableElement field) {
-    if (HiddenPrism.getOptionalOn(field).isPresent()) {
+    if (HiddenPrism.isPresent(field)) {
       return true;
     }
     for (AnnotationMirror annotationMirror : field.getAnnotationMirrors()) {

http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/SchemaDocBuilder.java

@@ -16,7 +16,6 @@
 @GeneratePrism(value = io.avaje.http.api.Post.class, publicAccess = true)
 @GeneratePrism(value = io.avaje.http.api.Produces.class, publicAccess = true)
 @GeneratePrism(value = io.avaje.http.api.Put.class, publicAccess = true)
-@GeneratePrism(value = jakarta.inject.Inject.class)
 @GeneratePrism(value = io.swagger.v3.oas.annotations.OpenAPIDefinition.class, publicAccess = true)
 @GeneratePrism(value = io.swagger.v3.oas.annotations.tags.Tag.class, publicAccess = true)
 @GeneratePrism(value = io.swagger.v3.oas.annotations.tags.Tags.class, publicAccess = true)

http-generator-core/src/main/java/io/avaje/http/generator/core/package-info.java

@@ -13,6 +13,5 @@
   requires static transitive io.swagger.v3.oas.models;
   requires static transitive io.swagger.v3.oas.annotations;
   requires static transitive java.validation;
-  requires static transitive jakarta.inject;
   requires static transitive jakarta.validation;
 }