#57 - Refactor remove unused code (from internal DContextEntry etc)

avaje · Oct 28, 2020 · f1d3864 · f1d3864
1 parent c5b168b
commit f1d3864
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 76 deletions.
diff --git a/inject-test/src/test/java/io/avaje/inject/core/DContextEntryTest.java b/inject-test/src/test/java/io/avaje/inject/core/DContextEntryTest.java
@@ -16,8 +16,7 @@ public void get_when_onePrimary() {
     entry.add(DContextEntryBean.of("N", null, BeanEntry.NORMAL));
     entry.add(DContextEntryBean.of("S", null, BeanEntry.SECONDARY));
 
-    Object bean = entry.get(null);
-    assertEquals(bean, "P");
+    assertEquals(entry.candidate(null).getBean(), "P");
   }
 
   @Test
@@ -28,7 +27,7 @@ public void get_when_twoPrimary() {
       entry.add(DContextEntryBean.of("N", null, BeanEntry.NORMAL));
       entry.add(DContextEntryBean.of("S", null, BeanEntry.PRIMARY));
 
-      entry.get(null);
+      entry.candidate(null);
     });
   }
 
@@ -39,8 +38,7 @@ public void get_when_oneNormal() {
     entry.add(DContextEntryBean.of("N", null, BeanEntry.NORMAL));
     entry.add(DContextEntryBean.of("S", null, BeanEntry.SECONDARY));
 
-    Object bean = entry.get(null);
-    assertEquals(bean, "N");
+    assertEquals(entry.candidate(null).getBean(), "N");
   }
 
 
@@ -52,8 +50,7 @@ public void get_when_oneNormal2() {
     entry.add(DContextEntryBean.of("S1", null, BeanEntry.SECONDARY));
     entry.add(DContextEntryBean.of("S2", null, BeanEntry.SECONDARY));
 
-    Object bean = entry.get(null);
-    assertEquals(bean, "N");
+    assertEquals(entry.candidate(null).getBean(), "N");
   }
 
   @Test
@@ -63,7 +60,7 @@ public void get_when_multiSecondaryOnly() {
       entry.add(DContextEntryBean.of("S1", null, BeanEntry.SECONDARY));
       entry.add(DContextEntryBean.of("S2", null, BeanEntry.SECONDARY));
 
-      entry.get(null);
+      entry.candidate(null);
     });
   }
 
@@ -75,8 +72,7 @@ public void get_when_multiSecondary_butNamed() {
     entry.add(DContextEntryBean.of("S1", "a", BeanEntry.SECONDARY));
     entry.add(DContextEntryBean.of("S2", "b", BeanEntry.SECONDARY));
 
-    Object bean = entry.get("b");
-    assertEquals(bean, "S2");
+    assertEquals(entry.candidate("b").getBean(), "S2");
   }
 
   @Test
@@ -86,8 +82,7 @@ public void get_when_multiSecondary_butNamed2() {
     entry.add(DContextEntryBean.of("S1", null, BeanEntry.SECONDARY));
     entry.add(DContextEntryBean.of("S2", "b", BeanEntry.SECONDARY));
 
-    Object bean = entry.get("b");
-    assertEquals(bean, "S2");
+    assertEquals(entry.candidate("b").getBean(), "S2");
   }
 
   @Test
@@ -97,7 +92,6 @@ public void get_when_secondary_butNamed() {
     entry.add(DContextEntryBean.of("S1", null, BeanEntry.PRIMARY));
     entry.add(DContextEntryBean.of("S2", "b", BeanEntry.SECONDARY));
 
-    Object bean = entry.get("b");
-    assertEquals(bean, "S2");
+    assertEquals(entry.candidate("b").getBean(), "S2");
   }
 }
diff --git a/inject/src/main/java/io/avaje/inject/core/DBeanMap.java b/inject/src/main/java/io/avaje/inject/core/DBeanMap.java
@@ -69,21 +69,6 @@ void registerWith(int flag, String canonicalName, Object bean, String name, Clas
     }
   }
 
-  /**
-   * Return the bean instance given the class and name.
-   */
-  @SuppressWarnings("unchecked")
-  <T> T getBean(Class<T> type, String name) {
-    DContextEntry entry = beans.get(type.getCanonicalName());
-    if (entry != null) {
-      T bean = (T) entry.get(name);
-      if (bean != null) {
-        return bean;
-      }
-    }
-    return null;
-  }
-
   <T> BeanEntry<T> candidate(Class<T> type, String name) {
     DContextEntry entry = beans.get(type.getCanonicalName());
     if (entry != null) {

diff --git a/inject/src/main/java/io/avaje/inject/core/DContextEntry.java b/inject/src/main/java/io/avaje/inject/core/DContextEntry.java
@@ -29,23 +29,6 @@ <T> BeanEntry<T> candidate(String name) {
     return matcher.candidate();
   }
 
-  /**
-   * Get a single bean given the name.
-   */
-  Object get(String name) {
-    if (entries.isEmpty()) {
-      return null;
-    }
-    if (entries.size() == 1) {
-      DContextEntryBean entry = entries.get(0);
-      return entry.getIfMatchWithDefault(name);
-    }
-
-    EntryMatcher matcher = new EntryMatcher(name);
-    matcher.match(entries);
-    return matcher.getBean();
-  }
-
   /**
    * Add all the managed beans to the given list.
    */
@@ -121,14 +104,6 @@ private void checkMatch(DContextEntryBean entry) {
       throw new IllegalStateException("Expecting only 1 bean match but have multiple matching beans " + match.getBean() + " and " + entry.getBean());
     }
 
-    Object getBean() {
-      if (match == null) {
-        return null;
-      }
-      checkSecondary();
-      return match.getBean();
-    }
-
     BeanEntry candidate() {
       if (match == null) {
         return null;

diff --git a/inject/src/main/java/io/avaje/inject/core/DContextEntryBean.java b/inject/src/main/java/io/avaje/inject/core/DContextEntryBean.java
@@ -50,14 +50,6 @@ Object getBean() {
     return obtainInstance();
   }
 
-  Object getIfMatchWithDefault(String name) {
-    if (name == null || Objects.equals(this.name, name)) {
-      return obtainInstance();
-    } else {
-      return null;
-    }
-  }
-
   boolean isPrimary() {
     return flag == BeanEntry.PRIMARY;
   }

diff --git a/inject/src/test/java/io/avaje/inject/core/DContextEntryTest.java b/inject/src/test/java/io/avaje/inject/core/DContextEntryTest.java
@@ -16,8 +16,7 @@ public void get_when_onePrimary() {
     entry.add(DContextEntryBean.of("N", null, BeanEntry.NORMAL));
     entry.add(DContextEntryBean.of("S", null, BeanEntry.SECONDARY));
 
-    Object bean = entry.get(null);
-    assertEquals(bean, "P");
+    assertEquals(entry.candidate(null).getBean(), "P");
   }
 
   @Test
@@ -28,7 +27,7 @@ public void get_when_twoPrimary() {
       entry.add(DContextEntryBean.of("N", null, BeanEntry.NORMAL));
       entry.add(DContextEntryBean.of("S", null, BeanEntry.PRIMARY));
 
-      entry.get(null);
+      entry.candidate(null);
     });
   }
 
@@ -39,8 +38,7 @@ public void get_when_oneNormal() {
     entry.add(DContextEntryBean.of("N", null, BeanEntry.NORMAL));
     entry.add(DContextEntryBean.of("S", null, BeanEntry.SECONDARY));
 
-    Object bean = entry.get(null);
-    assertEquals(bean, "N");
+    assertEquals(entry.candidate(null).getBean(), "N");
   }
 
 
@@ -52,8 +50,7 @@ public void get_when_oneNormal2() {
     entry.add(DContextEntryBean.of("S1", null, BeanEntry.SECONDARY));
     entry.add(DContextEntryBean.of("S2", null, BeanEntry.SECONDARY));
 
-    Object bean = entry.get(null);
-    assertEquals(bean, "N");
+    assertEquals(entry.candidate(null).getBean(), "N");
   }
 
   @Test
@@ -64,7 +61,7 @@ public void get_when_multiSecondaryOnly() {
       entry.add(DContextEntryBean.of("S1", null, BeanEntry.SECONDARY));
       entry.add(DContextEntryBean.of("S2", null, BeanEntry.SECONDARY));
 
-      entry.get(null);
+      entry.candidate(null);
     });
   }
 
@@ -76,8 +73,7 @@ public void get_when_multiSecondary_butNamed() {
     entry.add(DContextEntryBean.of("S1", "a", BeanEntry.SECONDARY));
     entry.add(DContextEntryBean.of("S2", "b", BeanEntry.SECONDARY));
 
-    Object bean = entry.get("b");
-    assertEquals(bean, "S2");
+    assertEquals(entry.candidate("b").getBean(), "S2");
   }
 
   @Test
@@ -87,8 +83,7 @@ public void get_when_multiSecondary_butNamed2() {
     entry.add(DContextEntryBean.of("S1", null, BeanEntry.SECONDARY));
     entry.add(DContextEntryBean.of("S2", "b", BeanEntry.SECONDARY));
 
-    Object bean = entry.get("b");
-    assertEquals(bean, "S2");
+    assertEquals(entry.candidate("b").getBean(), "S2");
   }
 
   @Test
@@ -98,7 +93,6 @@ public void get_when_secondary_butNamed() {
     entry.add(DContextEntryBean.of("S1", null, BeanEntry.PRIMARY));
     entry.add(DContextEntryBean.of("S2", "b", BeanEntry.SECONDARY));
 
-    Object bean = entry.get("b");
-    assertEquals(bean, "S2");
+    assertEquals(entry.candidate("b").getBean(), "S2");
   }
 }