#26 - Change the generated code to use Jsonb.GeneratedComponent

Author: rbygrave

jsonb-generator/src/main/java/io/avaje/jsonb/generator/Constants.java

@@ -2,8 +2,7 @@
 
 class Constants {
 
-  //static final String AT_GENERATED = "@Generated(\"io.avaje.inject.generator\")";
-  static final String META_INF_COMPONENT = "META-INF/services/io.avaje.jsonb.Jsonb$Component";
+  static final String META_INF_COMPONENT = "META-INF/services/io.avaje.jsonb.Jsonb$GeneratedComponent";
   static final String JSONB_WILD = "io.avaje.jsonb.*";
   static final String JSONB_SPI = "io.avaje.jsonb.spi.*";
   static final String JSONB = "io.avaje.jsonb.Jsonb";

jsonb-generator/src/main/java/io/avaje/jsonb/generator/SimpleComponentWriter.java

@@ -88,7 +88,7 @@ private void writeClassStart() {
     }
     writer.append("})").eol();
 
-    writer.append("public class %s implements Jsonb.Component {", shortName).eol().eol();
+    writer.append("public class %s implements Jsonb.GeneratedComponent {", shortName).eol().eol();
   }
 
 

jsonb-jackson/src/main/java9/module-info.java

@@ -6,5 +6,5 @@
 
   exports io.avaje.jsonb.jackson;
 
-  provides io.avaje.jsonb.spi.IOAdapterFactory with io.avaje.jsonb.jackson.JacksonFactory;
+  provides io.avaje.jsonb.spi.AdapterFactory with io.avaje.jsonb.jackson.JacksonAdapterFactory;
 }

jsonb-jackson/src/test/java/org/example/MyComponent.java

@@ -6,7 +6,7 @@
 
 @Generated
 @MetaData({CustomerJsonAdapter.class, ContactJsonAdapter.class})
-public class MyComponent implements Jsonb.Component {
+public class MyComponent implements Jsonb.GeneratedComponent {
 
   @Override
   public void register(Jsonb.Builder builder) {

jsonb/src/main/java/io/avaje/jsonb/Jsonb.java

@@ -425,7 +425,7 @@ interface AdapterBuilder {
    * Components register JsonAdapters Jsonb.Builder
    */
   @FunctionalInterface
-  interface Component extends JsonbComponent {
+  interface GeneratedComponent extends JsonbComponent {
 
     /**
      * Register JsonAdapters with the Builder.

jsonb/src/main/java/io/avaje/jsonb/core/DJsonb.java

@@ -271,7 +271,7 @@ private void registerComponents() {
       for (JsonbComponent next : ServiceLoader.load(JsonbComponent.class)) {
         next.register(this);
       }
-      for (Component next : ServiceLoader.load(Component.class)) {
+      for (GeneratedComponent next : ServiceLoader.load(GeneratedComponent.class)) {
         next.register(this);
       }
     }

jsonb/src/main/java9/module-info.java

@@ -6,6 +6,7 @@
 
   uses io.avaje.jsonb.spi.AdapterFactory;
   uses io.avaje.jsonb.spi.Bootstrap;
-  uses io.avaje.jsonb.Jsonb.Component;
+  uses io.avaje.jsonb.JsonbComponent;
+  uses io.avaje.jsonb.Jsonb.GeneratedComponent;
 
 }