Merge branch 'master' into SentryMan-patch-1

Author: SentryMan

http-generator-client/src/main/java/io/avaje/http/generator/client/ClientMethodWriter.java

@@ -9,6 +9,7 @@
 
 import static java.util.stream.Collectors.toMap;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -35,8 +36,10 @@ class ClientMethodWriter {
   private final Optional<RequestTimeoutPrism> timeout;
   private final boolean useConfig;
   private final Map<String, String> segmentPropertyMap;
+  private final Set<String> propertyConstants;
 
-  ClientMethodWriter(MethodReader method, Append writer, boolean useJsonb) {
+  ClientMethodWriter(
+      MethodReader method, Append writer, boolean useJsonb, Set<String> propertyConstants) {
     this.method = method;
     this.writer = writer;
     this.webMethod = method.webMethod();
@@ -45,9 +48,11 @@ class ClientMethodWriter {
     this.timeout = method.timeout();
     this.useConfig = ProcessingContext.typeElement("io.avaje.config.Config") != null;
 
-    this.segmentPropertyMap = method.pathSegments().segments().stream()
-      .filter(Segment::isProperty)
-      .collect(toMap(Segment::name, s -> Util.sanitizeName(s.name()).toUpperCase()));
+    this.segmentPropertyMap =
+        method.pathSegments().segments().stream()
+            .filter(Segment::isProperty)
+            .collect(toMap(Segment::name, s -> Util.sanitizeName(s.name()).toUpperCase()));
+    this.propertyConstants = propertyConstants;
   }
 
   void addImportTypes(ControllerReader reader) {
@@ -76,6 +81,11 @@ private void methodStart(Append writer) {
 
     segmentPropertyMap.forEach(
         (k, v) -> {
+
+          if (!propertyConstants.add(v)) {
+            return;
+          }
+
           writer.append("  private static final String %s = ", v);
           final String getProperty = useConfig ? "Config.get(" : "System.getProperty(";
           writer.append(getProperty).append("\"%s\");", k).eol();

http-generator-client/src/main/java/io/avaje/http/generator/client/ClientWriter.java

@@ -3,11 +3,12 @@
 import io.avaje.http.generator.core.BaseControllerWriter;
 import io.avaje.http.generator.core.ControllerReader;
 import io.avaje.http.generator.core.MethodReader;
-import io.avaje.http.generator.core.ProcessingContext;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Write Http client adapter.
@@ -21,6 +22,8 @@ class ClientWriter extends BaseControllerWriter {
 
   private final List<ClientMethodWriter> methodList = new ArrayList<>();
   private final boolean useJsonb;
+  private final Set<String> propertyConstants = new HashSet<>();
+
 
   ClientWriter(ControllerReader reader, boolean useJsonB) throws IOException {
     super(reader, SUFFIX);
@@ -39,7 +42,7 @@ protected String initPackageName(String originName) {
   private void readMethods() {
     for (final MethodReader method : reader.methods()) {
       if (method.isWebMethod()) {
-        final var methodWriter = new ClientMethodWriter(method, writer, useJsonb);
+        final var methodWriter = new ClientMethodWriter(method, writer, useJsonb, propertyConstants);
         methodWriter.addImportTypes(reader);
         methodList.add(methodWriter);
       }

http-generator-client/src/test/java/io/avaje/http/generator/client/clients/TitanFall.java

@@ -7,5 +7,9 @@
 public interface TitanFall {
 
   @Get("/${titan}/${drop.point}")
-  Titan titanfall();
+  Titan titanFall();
+
+
+  @Get("/${titan}/copium")
+  Titan titanFall3();
 }

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

@@ -9,6 +9,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.stream.Stream;
 
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
@@ -249,6 +250,7 @@ private <T> void populateObjectSchema(TypeMirror objectType, Schema<T> objectSch
       Schema<?> propSchema = toSchema(field.asType());
       if (isNotNullable(field)) {
         propSchema.setNullable(Boolean.FALSE);
+        objectSchema.addRequiredItem(field.getSimpleName().toString());
       }
       setDescription(field, propSchema);
       setLengthMinMax(field, propSchema);
@@ -296,7 +298,10 @@ private void setLengthMinMax(Element element, Schema<?> propSchema) {
 
   private boolean isNotNullable(Element element) {
     return element.getAnnotationMirrors().stream()
-        .anyMatch(m -> m.toString().contains("@") && m.toString().contains("NotNull"));
+      .anyMatch(m -> m.toString().contains("@") &&
+        Stream.of("NotNull", "NotEmpty", "NotBlank")
+          .anyMatch(annotation -> m.toString().contains(annotation))
+      );
   }
 
   /**