[JPMS] Renaming of bootstrap contract

Author: gunnarmorling

java9/spec-modularity-patterns/acme-fieldreader-impl/src/main/java/acme/fieldreader/impl/AcmeBootstrapDelegate.java

@@ -0,0 +1,12 @@
+package acme.fieldreader.impl;
+
+import fieldreader.spec.FieldValueReader;
+import fieldreader.spec.bootstrap.FieldReaderProvider;
+
+public class AcmeFieldReaderProvider implements FieldReaderProvider {
+
+    @Override
+    public FieldValueReader provideFieldValueReader(PackageOpener opener) {
+        return new FieldValueReaderImpl( opener );
+    }
+}

java9/spec-modularity-patterns/acme-fieldreader-impl/src/main/java/acme/fieldreader/impl/AcmeFieldReaderProvider.java

@@ -4,7 +4,7 @@
 import java.lang.invoke.MethodHandles.Lookup;
 
 import fieldreader.spec.FieldValueReader;
-import fieldreader.spec.bootstrap.BootstrapDelegate.PackageOpener;
+import fieldreader.spec.bootstrap.FieldReaderProvider.PackageOpener;
 
 public class FieldValueReaderImpl implements FieldValueReader {
 

java9/spec-modularity-patterns/acme-fieldreader-impl/src/main/java/acme/fieldreader/impl/FieldValueReaderImpl.java

@@ -1,4 +1,4 @@
 module acme.fieldreader.impl {
     requires fieldreader.spec;
-    provides fieldreader.spec.bootstrap.BootstrapDelegate with acme.fieldreader.impl.AcmeBootstrapDelegate;
+    provides fieldreader.spec.bootstrap.FieldReaderProvider with acme.fieldreader.impl.AcmeFieldReaderProvider;
 }

java9/spec-modularity-patterns/acme-fieldreader-impl/src/main/java/module-info.java

@@ -2,22 +2,22 @@
 
 import java.util.ServiceLoader;
 
-import fieldreader.spec.bootstrap.BootstrapDelegate;
-import fieldreader.spec.bootstrap.BootstrapDelegate.PackageOpener;
+import fieldreader.spec.bootstrap.FieldReaderProvider;
+import fieldreader.spec.bootstrap.FieldReaderProvider.PackageOpener;
 
 public class FieldReaderApi {
 
     private static final PackageOpener PACKAGE_OPENER = new PackageOpenerImpl();
 
     public static FieldValueReader getFieldValueReader() {
-        ServiceLoader<BootstrapDelegate> loader = ServiceLoader.load( BootstrapDelegate.class );
+        ServiceLoader<FieldReaderProvider> loader = ServiceLoader.load( FieldReaderProvider.class );
 
         return loader.findFirst()
-                .orElseThrow( () -> new IllegalStateException( "No provider of " + BootstrapDelegate.class.getName() + " available" ) )
-                .getFieldValueReader( PACKAGE_OPENER );
+                .orElseThrow( () -> new IllegalStateException( "No provider of " + FieldReaderProvider.class.getName() + " available" ) )
+                .provideFieldValueReader( PACKAGE_OPENER );
     }
 
-    private static class PackageOpenerImpl implements BootstrapDelegate.PackageOpener {
+    private static class PackageOpenerImpl implements FieldReaderProvider.PackageOpener {
 
         @Override
         public void openPackageIfNeeded(Module targetModule, String targetPackage, Module specImplModule) {

java9/spec-modularity-patterns/fieldreader-spec/src/main/java/fieldreader/spec/FieldReaderApi.java

@@ -1,5 +1,8 @@
 package fieldreader.spec;
 
+/**
+ * Retrieves the value of the specified (private) field from the given object.
+ */
 public interface FieldValueReader {
 
     public Object getFieldValue(Object o, String fieldName);

java9/spec-modularity-patterns/fieldreader-spec/src/main/java/fieldreader/spec/FieldValueReader.java

@@ -2,9 +2,12 @@
 
 import fieldreader.spec.FieldValueReader;
 
-public interface BootstrapDelegate {
+/**
+ * Contract between the field reader API bootstrap mechanism and spec implementations.
+ */
+public interface FieldReaderProvider {
 
-    FieldValueReader getFieldValueReader(PackageOpener opener);
+    FieldValueReader provideFieldValueReader(PackageOpener opener);
 
     public interface PackageOpener {
         void openPackageIfNeeded(Module targetModule, String targetPackage, Module specImplModule);

java9/spec-modularity-patterns/fieldreader-spec/src/main/java/fieldreader/spec/bootstrap/BootstrapDelegate.java renamed to java9/spec-modularity-patterns/fieldreader-spec/src/main/java/fieldreader/spec/bootstrap/FieldReaderProvider.java

@@ -1,5 +1,5 @@
 module fieldreader.spec {
     exports fieldreader.spec;
     exports fieldreader.spec.bootstrap;
-    uses fieldreader.spec.bootstrap.BootstrapDelegate;
+    uses fieldreader.spec.bootstrap.FieldReaderProvider;
 }