Merge pull request #219 from avaje/feature/format-tidy

Format, javadoc, remove duplicate code

Author: rbygrave

http-client/src/main/java/io/avaje/http/client/DHttpApi.java

@@ -29,11 +29,9 @@ void init() {
     for (final HttpApiProvider apiProvider : ServiceLoader.load(HttpApiProvider.class)) {
       addProvider(apiProvider);
     }
-
     for (final GeneratedComponent apiProvider : ServiceLoader.load(GeneratedComponent.class)) {
       apiProvider.register(providerMap);
     }
-
     log.log(DEBUG, "providers for {0}", providerMap.keySet());
   }
 

http-client/src/main/java/io/avaje/http/client/HttpClient.java

@@ -363,6 +363,9 @@ interface Metrics extends HttpClientContext.Metrics {
   @FunctionalInterface
   interface GeneratedComponent {
 
+    /**
+     * Register the HttpApiProviders to the given providerMap.
+     */
     void register(Map<Class<?>, HttpApiProvider<?>> providerMap);
   }
 }

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

@@ -67,13 +67,11 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         round.getElementsAnnotatedWith(typeElement(ClientPrism.PRISM_TYPE))) {
       writeClient(controller);
     }
-    for (final var importedElement :
-        round.getElementsAnnotatedWith(typeElement(ImportPrism.PRISM_TYPE))) {
+    for (final var importedElement : round.getElementsAnnotatedWith(typeElement(ImportPrism.PRISM_TYPE))) {
       writeForImported(importedElement);
     }
 
     writeComponent(round.processingOver());
-
     setPlatform(platform);
     return false;
   }

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

@@ -31,7 +31,6 @@ void setFullName(String fullName) {
 
   String fullName() {
     if (fullName == null) {
-
       String topPackage = TopPackage.of(generatedClients);
       if (!topPackage.endsWith(".httpclient")) {
         topPackage += ".httpclient";
@@ -59,13 +58,11 @@ Collection<String> allImports() {
     return packageImports;
   }
 
-  public static String removeLast(String s, String search) {
-    final int pos = s.lastIndexOf(search);
-
+  public static String removeLast(String className, String search) {
+    final int pos = className.lastIndexOf(search);
     if (pos > -1) {
-      return s.substring(0, pos) + s.substring(pos + search.length());
+      return className.substring(0, pos) + className.substring(pos + search.length());
     }
-
-    return s;
+    return className;
   }
 }

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

@@ -30,11 +30,9 @@ final class SimpleComponentWriter {
   }
 
   void init() throws IOException {
-
     if (fullName == null) {
       this.fullName = metaData.fullName();
     }
-
     if (fileObject == null) {
       fileObject = createWriter(metaData.fullName());
     }
@@ -65,12 +63,9 @@ private void writeRegister() {
     writer.append("  public void register(Map<Class<?>, HttpApiProvider<?>> providerMap) {").eol();
 
     for (final String clientFullName : metaData.all()) {
-
       final String clientShortName = Util.shortName(clientFullName);
-      final var clientInterface = removeLast(clientShortName, "HttpClient");
-      writer
-          .append("    providerMap.put(%s.class, %s::new);", clientInterface, clientShortName)
-          .eol();
+      final var clientInterface = ComponentMetaData.removeLast(clientShortName, "HttpClient");
+      writer.append("    providerMap.put(%s.class, %s::new);", clientInterface, clientShortName).eol();
     }
     writer.append("  }").eol().eol();
   }
@@ -82,15 +77,11 @@ private void writeClassEnd() {
   private void writeClassStart() {
     final String shortName = Util.shortName(fullName);
     writer.append(AT_GENERATED).eol();
-
     writer.append("@MetaData({");
     final List<String> all = metaData.all();
     writeMetaDataEntry(all);
     writer.append("})").eol();
-    writer
-        .append("public class %s implements HttpClient.GeneratedComponent {", shortName)
-        .eol()
-        .eol();
+    writer.append("public class %s implements HttpClient.GeneratedComponent {", shortName).eol().eol();
   }
 
   private void writeMetaDataEntry(List<String> entries) {
@@ -117,19 +108,9 @@ private void writeImports() {
     writer.eol();
   }
 
-  public static String removeLast(String s, String search) {
-    final int pos = s.lastIndexOf(search);
-
-    if (pos > -1) {
-      return s.substring(0, pos) + s.substring(pos + search.length());
-    }
-
-    return s;
-  }
-
   private void writePackage() {
     final String packageName = TopPackage.packageOf(fullName);
-    if (packageName != null && !packageName.isEmpty()) {
+    if (!packageName.isEmpty()) {
       writer.append("package %s;", packageName).eol().eol();
     }
   }