Format only changes

avaje · Jan 26, 2025 · bcfa30c · bcfa30c
1 parent 281d5fa
commit bcfa30c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 35 deletions.
diff --git a/http-generator-client/src/main/java/io/avaje/http/generator/client/ClientProcessor.java b/http-generator-client/src/main/java/io/avaje/http/generator/client/ClientProcessor.java
@@ -35,13 +35,9 @@
 public class ClientProcessor extends AbstractProcessor {
 
   private final ComponentMetaData metaData = new ComponentMetaData();
-
   private final Map<String, ComponentMetaData> privateMetaData = new HashMap<>();
 
-  private boolean useJsonB;
-
   private SimpleComponentWriter componentWriter;
-
   private boolean readModuleInfo;
 
   @Override
@@ -101,13 +97,11 @@ private void writeClient(Element controller) {
       final ControllerReader reader = new ControllerReader((TypeElement) controller);
       reader.read(false);
       try {
-
         var packagePrivate =
-            !controller.getModifiers().contains(Modifier.PUBLIC)
-                && ClientPrism.isPresent(controller);
+          !controller.getModifiers().contains(Modifier.PUBLIC)
+            && ClientPrism.isPresent(controller);
         if (packagePrivate) {
-          var packageName =
-              APContext.elements().getPackageOf(controller).getQualifiedName().toString();
+          var packageName = APContext.elements().getPackageOf(controller).getQualifiedName().toString();
           var meta = privateMetaData.computeIfAbsent(packageName, k -> new ComponentMetaData());
           meta.add(writeClientAdapter(reader, true));
         } else {
@@ -127,19 +121,15 @@ protected String writeClientAdapter(ControllerReader reader, boolean packagePriv
 
   private void writeComponent(boolean processingOver) {
     if (processingOver) {
-
       try {
-
         if (!metaData.all().isEmpty()) {
           ProcessingContext.addClientComponent(metaData.fullName());
-
           componentWriter.init();
           componentWriter.write();
         }
 
         for (var meta : privateMetaData.values()) {
           ProcessingContext.addClientComponent(meta.fullName());
-
           var writer = new SimpleComponentWriter(meta);
           writer.init();
           writer.write();
@@ -156,15 +146,12 @@ void writeMetaInf() throws IOException {
     final FileObject fileObject = createMetaInfWriter(Constants.META_INF_COMPONENT);
     if (fileObject != null) {
       try (var fileWriter = fileObject.openWriter()) {
-
         if (!metaData.all().isEmpty()) {
-
           fileWriter.write(metaData.fullName());
           fileWriter.write("\n");
         }
 
         for (var meta : privateMetaData.values()) {
-
           fileWriter.write(meta.fullName());
           fileWriter.write("\n");
         }

diff --git a/http-generator-client/src/main/java/io/avaje/http/generator/client/ComponentReader.java b/http-generator-client/src/main/java/io/avaje/http/generator/client/ComponentReader.java
@@ -37,41 +37,36 @@ final class ComponentReader {
   }
 
   void read() {
-
     for (String fqn : loadMetaInf()) {
-
       final TypeElement moduleType = typeElement(fqn);
       if (moduleType != null) {
         var adapters =
-            MetaDataPrism.getInstanceOn(moduleType).value().stream()
-                .map(APContext::asTypeElement)
-                .collect(toList());
+          MetaDataPrism.getInstanceOn(moduleType).value().stream()
+            .map(APContext::asTypeElement)
+            .collect(toList());
 
         if (adapters.get(0).getModifiers().contains(Modifier.PUBLIC)) {
           componentMetaData.setFullName(fqn);
           adapters.stream()
-              .map(TypeElement::getQualifiedName)
-              .map(Object::toString)
-              .forEach(componentMetaData::add);
+            .map(TypeElement::getQualifiedName)
+            .map(Object::toString)
+            .forEach(componentMetaData::add);
 
         } else {
-          var packageName =
-              APContext.elements().getPackageOf(moduleType).getQualifiedName().toString();
+          var packageName = APContext.elements().getPackageOf(moduleType).getQualifiedName().toString();
           var meta = privateMetaData.computeIfAbsent(packageName, k -> new ComponentMetaData());
           adapters.stream()
-              .map(TypeElement::getQualifiedName)
-              .map(Object::toString)
-              .forEach(meta::add);
+            .map(TypeElement::getQualifiedName)
+            .map(Object::toString)
+            .forEach(meta::add);
         }
       }
     }
   }
 
   private List<String> loadMetaInf() {
     try {
-      final FileObject fileObject =
-          filer().getResource(StandardLocation.CLASS_OUTPUT, "", Constants.META_INF_COMPONENT);
-
+      final FileObject fileObject = filer().getResource(StandardLocation.CLASS_OUTPUT, "", Constants.META_INF_COMPONENT);
       if (fileObject != null) {
         final List<String> lines = new ArrayList<>();
         final Reader reader = fileObject.openReader(true);

diff --git a/tests/test-client/src/test/java/example/github/pkgprivate/PkgPrivateTest.java b/tests/test-client/src/test/java/example/github/pkgprivate/PkgPrivateTest.java
@@ -16,7 +16,7 @@ class PkgPrivateTest {
 
   @BeforeAll
   static void startServer() {
-    server = Jex.create().get("/private", ctx -> ctx.text("private")).port(0).start();
+    server = Jex.create().get("/private", ctx -> ctx.text("myPrivateResult")).port(0).start();
   }
 
   @AfterAll
@@ -37,8 +37,7 @@ void test_pkg_private() {
     final HttpClient client = HttpClient.builder().baseUrl(url).build();
 
     final var simple = client.create(SimplePkgPrivate.class);
-
     final var result = simple.get();
-    assertThat(result).isNotEmpty();
+    assertThat(result).isEqualTo("myPrivateResult");
   }
 }