#100 - Tidy internal register methods

Author: rbygrave

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

@@ -42,19 +42,7 @@ private void addSuppliedBean(SuppliedBean supplied) {
     }
   }
 
-  void registerPrimary(Object bean) {
-    registerWith(PRIMARY, bean);
-  }
-
-  void registerSecondary(Object bean) {
-    registerWith(SECONDARY, bean);
-  }
-
-  void register(Object bean) {
-    registerWith(NORMAL, bean);
-  }
-
-  void registerWith(int flag, Object bean) {
+  void register(int flag, Object bean) {
     DContextEntryBean entryBean = DContextEntryBean.of(bean, nextBean.name, flag);
     for (Class<?> type : nextBean.types) {
       beans.computeIfAbsent(type.getCanonicalName(), s -> new DContextEntry()).add(entryBean);

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

@@ -175,31 +175,25 @@ public <T> T enrich(T bean, Class<?>[] types) {
 
   @Override
   public <T> T register(T bean) {
-    if (parent != null) {
-      // enrichment only exist on top level builder
-      bean = parent.enrich(bean, beanMap.types());
-    }
-    beanMap.register(bean);
-    return bean;
+    return register(BeanEntry.NORMAL, bean);
   }
 
   @Override
   public <T> T registerPrimary(T bean) {
-    if (parent != null) {
-      // enrichment only exist on top level builder
-      bean = parent.enrich(bean, beanMap.types());
-    }
-    beanMap.registerPrimary(bean);
-    return bean;
+    return register(BeanEntry.PRIMARY, bean);
   }
 
   @Override
   public <T> T registerSecondary(T bean) {
+    return register(BeanEntry.SECONDARY, bean);
+  }
+
+  private <T> T register(int flag, T bean) {
     if (parent != null) {
       // enrichment only exist on top level builder
       bean = parent.enrich(bean, beanMap.types());
     }
-    beanMap.registerSecondary(bean);
+    beanMap.register(flag, bean);
     return bean;
   }