Refactor tidy internals only after #189, no effective change

Author: rbygrave

inject/src/main/java/io/avaje/inject/spi/DBuilder.java

@@ -225,22 +225,26 @@ public <T> T get(Class<T> cls) {
   public <T> T get(Class<T> cls, String name) {
     T bean = getMaybe(cls, name);
     if (bean == null) {
-      String msg = "Injecting null for " + cls.getName();
-      if (name != null) {
-        msg += " name:" + name;
-      }
-      List<T> beanList = list(cls);
-      msg += " when creating " + injectTarget + " - potential beans to inject: " + beanList;
-      if (!beanList.isEmpty()) {
-        msg += ". Check @Named or Qualifier being used";
-      }
-      msg += ". Check for missing module? [ missing beanScopeBuilder.withModules() ]";
-      msg += ". If it is expected to be externally provided, missing beanScopeBuilder.withBean() ?";
-      throw new IllegalStateException(msg);
+      throw new IllegalStateException(errorInjectingNull(cls, name));
     }
     return bean;
   }
 
+  private <T> String errorInjectingNull(Class<T> cls, String name) {
+    String msg = "Injecting null for " + cls.getName();
+    if (name != null) {
+      msg += " name:" + name;
+    }
+    List<T> beanList = list(cls);
+    msg += " when creating " + injectTarget + " - potential beans to inject: " + beanList;
+    if (!beanList.isEmpty()) {
+      msg += ". Check @Named or Qualifier being used";
+    }
+    msg += ". Check for missing module? [ missing beanScopeBuilder.withModules() ]";
+    msg += ". If it is expected to be externally provided, missing beanScopeBuilder.withBean() ?";
+    return msg;
+  }
+
   private void runInjectors() {
     runningPostConstruct = true;
     for (Consumer<Builder> injector : injectors) {

inject/src/main/java/io/avaje/inject/spi/DContextEntry.java

@@ -36,7 +36,7 @@ Provider<?> provider(String name) {
 
   Object get(String name) {
     if (entries.size() == 1) {
-      return entries.get(0).getBean();
+      return entries.get(0).bean();
     }
     return new EntryMatcher(name).match(entries);
   }
@@ -47,7 +47,7 @@ Object get(String name) {
   List<Object> all() {
     List<Object> list = new ArrayList<>(entries.size());
     for (DContextEntryBean entry : entries) {
-      list.add(entry.getBean());
+      list.add(entry.bean());
     }
     return list;
   }
@@ -64,7 +64,7 @@ boolean isSupplied(String qualifierName) {
     return false;
   }
 
-  static class EntryMatcher {
+  static final class EntryMatcher {
 
     private final String name;
     private final boolean impliedName;
@@ -88,7 +88,7 @@ private Provider<?> provider(List<DContextEntryBean> entries) {
 
     private Object match(List<DContextEntryBean> entries) {
       DContextEntryBean match = findMatch(entries);
-      return match == null ? null : match.getBean();
+      return match == null ? null : match.bean();
     }
 
     private DContextEntryBean findMatch(List<DContextEntryBean> entries) {
@@ -100,9 +100,7 @@ private DContextEntryBean findMatch(List<DContextEntryBean> entries) {
       if (match == null && impliedName) {
         // search again as if the implied name wasn't there, name = null
         for (DContextEntryBean entry : entries) {
-          if (entry.isNameMatch(null)) {
-            checkMatch(entry);
-          }
+          checkMatch(entry);
         }
       }
       return candidate();
@@ -128,7 +126,7 @@ private void checkMatch(DContextEntryBean entry) {
       }
       if (match.isPrimary()) {
         if (entry.isPrimary()) {
-          throw new IllegalStateException("Expecting only 1 bean match but have multiple primary beans " + match.getBean() + " and " + entry.getBean());
+          throw new IllegalStateException("Expecting only 1 bean match but have multiple primary beans " + match.bean() + " and " + entry.bean());
         }
         // leave as is, current primary wins
         return;
@@ -152,8 +150,8 @@ private void checkMatch(DContextEntryBean entry) {
         match = entry;
         return;
       }
-      throw new IllegalStateException("Expecting only 1 bean match but have multiple matching beans " + match.getBean()
-        + " and " + entry.getBean() + ". Maybe need a rebuild is required after adding a @Named qualifier?");
+      throw new IllegalStateException("Expecting only 1 bean match but have multiple matching beans " + match.bean()
+        + " and " + entry.bean() + ". Maybe need a rebuild is required after adding a @Named qualifier?");
     }
 
     private DContextEntryBean candidate() {
@@ -166,7 +164,7 @@ private DContextEntryBean candidate() {
 
     private void checkSecondary() {
       if (match.isSecondary() && ignoredSecondaryMatch != null) {
-        throw new IllegalStateException("Expecting only 1 bean match but have multiple secondary beans " + match.getBean() + " and " + ignoredSecondaryMatch.getBean());
+        throw new IllegalStateException("Expecting only 1 bean match but have multiple secondary beans " + match.bean() + " and " + ignoredSecondaryMatch.bean());
       }
     }
 

inject/src/main/java/io/avaje/inject/spi/DContextEntryBean.java

@@ -49,7 +49,7 @@ public final String toString() {
   }
 
   final DEntry entry() {
-    return new DEntry(name, flag, getBean());
+    return new DEntry(name, flag, bean());
   }
 
   /**
@@ -66,12 +66,12 @@ final boolean isNameEqual(String qualifierName) {
     return Objects.equals(qualifierName, name);
   }
 
-  Object getBean() {
+  Object bean() {
     return source;
   }
 
   Provider<?> provider() {
-    return this::getBean;
+    return this::bean;
   }
 
   final boolean isPrimary() {
@@ -108,7 +108,7 @@ Provider<?> provider() {
     }
 
     @Override
-    Object getBean() {
+    Object bean() {
       return provider.get();
     }
   }