#55 Http client not generated with @singleton

Author: rbygrave

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

@@ -76,7 +76,7 @@ private void writeImported(String fullName) {
   private void writeClient(Element controller) {
     if (controller instanceof TypeElement) {
       ControllerReader reader = new ControllerReader((TypeElement) controller, ctx);
-      reader.read();
+      reader.read(false);
       try {
         writeClientAdapter(ctx, reader);
       } catch (Throwable e) {

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

@@ -16,11 +16,12 @@ class ClientWriter extends BaseControllerWriter {
 
   private static final String HTTP_CLIENT_CONTEXT = "io.avaje.http.client.HttpClientContext";
   private static final String AT_GENERATED = "@Generated(\"avaje-http-client-generator\")";
+  private static final String SUFFIX = "$HttpClient";
 
   private final List<ClientMethodWriter> methodList = new ArrayList<>();
 
   ClientWriter(ControllerReader reader, ProcessingContext ctx) throws IOException {
-    super(reader, ctx, "$httpclient");
+    super(reader, ctx, SUFFIX);
     reader.addImportType(HTTP_CLIENT_CONTEXT);
     readMethods();
   }
@@ -57,12 +58,11 @@ private void writeMethods() {
 
   private void writeClassStart() {
     writer.append(AT_GENERATED).eol();
-    writer.append("@Singleton").eol();
-    writer.append("public class %s$httpclient implements %s {", shortName, shortName).eol().eol();
+    writer.append("public class %s%s implements %s {", shortName, SUFFIX, shortName).eol().eol();
 
     writer.append("  private final HttpClientContext clientContext;").eol().eol();
 
-    writer.append("  public %s$httpclient(HttpClientContext ctx) {", shortName).eol();
+    writer.append("  public %s%s(HttpClientContext ctx) {", shortName, SUFFIX).eol();
     writer.append("    this.clientContext = ctx;").eol();
     writer.append("  }").eol().eol();
   }

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

@@ -88,7 +88,7 @@ private void writeOpenAPI() {
   private void writeControllerAdapter(Element controller) {
     if (controller instanceof TypeElement) {
       ControllerReader reader = new ControllerReader((TypeElement) controller, ctx);
-      reader.read();
+      reader.read(true);
       try {
         writeControllerAdapter(ctx, reader);
       } catch (Throwable e) {

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

@@ -65,13 +65,18 @@ public ControllerReader(TypeElement beanType, ProcessingContext ctx) {
       docHidden = initDocHidden();
     }
     includeValidator = initIncludeValidator();
-    importTypes.add(Constants.SINGLETON);
+    this.produces = initProduces();
+  }
+
+  protected void addImports(boolean withSingleton) {
     importTypes.add(Constants.IMPORT_HTTP_API);
     importTypes.add(beanType.getQualifiedName().toString());
     if (includeValidator) {
       importTypes.add(Constants.VALIDATOR);
     }
-    this.produces = initProduces();
+    if (withSingleton) {
+      importTypes.add(Constants.SINGLETON);
+    }
   }
 
   private List<Element> initInterfaces() {
@@ -160,7 +165,8 @@ boolean isRequestScoped() {
     return requestScope;
   }
 
-  public void read() {
+  public void read(boolean withSingleton) {
+    addImports(withSingleton);
     if (!roles.isEmpty()) {
       ctx.platform().controllerRoles(roles, this);
     }

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

@@ -69,6 +69,11 @@ public class MethodReader {
     }
   }
 
+  @Override
+  public String toString() {
+    return element.toString();
+  }
+
   private void initWebMethodViaAnnotation() {
     Form form = findAnnotation(Form.class);
     if (form != null) {

tests/test-client/pom.xml

@@ -16,12 +16,12 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-http-generator-client</artifactId>
-      <version>1.4-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>io.avaje</groupId>-->
+<!--      <artifactId>avaje-http-generator-client</artifactId>-->
+<!--      <version>1.4-SNAPSHOT</version>-->
+<!--      <scope>provided</scope>-->
+<!--    </dependency>-->
 
     <dependency>
       <groupId>org.avaje.composite</groupId>
@@ -89,4 +89,22 @@
 
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>io.avaje</groupId>
+              <artifactId>avaje-http-generator-client</artifactId>
+              <version>1.4-SNAPSHOT</version>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

tests/test-client/src/main/java/org/example/Simple.java

@@ -3,7 +3,6 @@
 
 import io.avaje.http.api.*;
 
-import javax.validation.Valid;
 import java.net.URL;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
@@ -42,7 +41,6 @@ class Id {
     public long id;
   }
 
-  @Valid
   class MyForm {
 
     String name;

tests/test-client/src/test/java/org/example/SimpleTest.java

@@ -2,16 +2,18 @@
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.avaje.http.client.HttpApiProvider;
 import io.avaje.http.client.HttpClientContext;
 import io.avaje.http.client.JacksonBodyAdapter;
 import io.avaje.http.client.RequestLogger;
+import org.example.httpclient.GitHubUsers$HttpClient;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class SimpleTest {
+public class SimpleTest {
 
   @Test
   void listRepos() {
@@ -34,4 +36,16 @@ void listRepos() {
     assertThat(repos).hasSizeGreaterThan(5);
   }
 
+  public static class AP implements HttpApiProvider<GitHubUsers> {
+
+    @Override
+    public Class<GitHubUsers> type() {
+      return GitHubUsers.class;
+    }
+
+    @Override
+    public GitHubUsers provide(HttpClientContext client) {
+      return new GitHubUsers$HttpClient(client);
+    }
+  }
 }

tests/test-client/src/test/resources/META-INF/services/io.avaje.http.client.HttpApiProvider

@@ -0,0 +1 @@
+org.example.SimpleTest$AP