Remove extra API to consider later

- Remove added API for BeanScope, reconsider later
- Remove all unused associated code from that
- Tidy formatting

Author: rbygrave

blackbox-test-inject/src/main/java/org/example/myapp/generic/GenericFactory.java

@@ -8,13 +8,11 @@ public class GenericFactory {
 
   @Bean
   Generic<Integer> one() {
-
     return new Generic<>() {};
   }
 
   @Bean
   Stringy two() {
-
     return new Stringy() {};
   }
 

blackbox-test-inject/src/test/java/org/example/myapp/generic/GenericFactoryTest.java

@@ -16,5 +16,6 @@ class GenericFactoryTest {
   @Test
   void test() {
     assertThat(intymcintface).isNotNull();
+    assertThat(stringy).isNotNull();
   }
 }

inject-test/src/test/java/io/avaje/inject/test/MetaReaderTest.java

@@ -16,9 +16,11 @@
 
 class MetaReaderTest {
 
-  @Mock Pump pump;
+  @Mock
+  Pump pump;
 
-  @Mock Grinder grinder;
+  @Mock
+  Grinder grinder;
 
   static @Mock AMusher musher;
 
@@ -44,13 +46,14 @@ void checkMetaReader_with_plugin() {
 
   static class HelloBean {
 
-    @Inject HttpClient client;
+    @Inject
+    HttpClient client;
   }
 
 
   static class MyPlugin implements Plugin {
 
-  public boolean forType(Type type) {
+    public boolean forType(Type type) {
       return HttpClient.class.equals(type);
     }
 

inject/src/main/java/io/avaje/inject/BeanScope.java

@@ -1,6 +1,5 @@
 package io.avaje.inject;
 
-import io.avaje.inject.spi.Types;
 import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;
 
@@ -140,48 +139,14 @@ static BeanScopeBuilder builder() {
    */
   <T> T get(Class<T> type, @Nullable String name);
 
-  /**
-   * Return a single bean given its type and generic components.
-   *
-   * <pre>{@code
-   * Map<String, CoffeeMaker> coffeeMaker = beanScope.get(Map.class, String.class, CoffeeMaker.class);
-   *
-   * }</pre>
-   *
-   * @param base the base generic type
-   * @param type component types of the generic type
-   * @throws java.util.NoSuchElementException When no matching bean is found
-   */
-  default <T> T get(Type base, Type... types) {
-    return get(null, base, types);
-  }
-
-  /**
-   * Return a single bean given it's name, type, and generic components.
-   *
-   * <pre>{@code
-   * Heater heater = beanScope.get("electric", Set.class,  );
-   * heater.heat();
-   *
-   * }</pre>
-   *
-   * @param type an interface or bean type
-   * @param name the name qualifier of a specific bean
-   * @throws java.util.NoSuchElementException When no matching bean is found
-   */
-  default <T> T get(@Nullable String name, Type type, Type... types) {
-
-    return get(Types.parameterizedType(type, types), name);
-  }
-
   /**
    * Return a single bean given the full generic type.
    *
    * @param type The generic type
    * @throws java.util.NoSuchElementException When no matching bean is found
    */
   default <T> T get(Type type) {
-    return get(type, (String) null);
+    return get(type, null);
   }
 
   /**

inject/src/main/java/io/avaje/inject/DBeanScopeBuilder.java

@@ -197,8 +197,7 @@ private <D> BeanScopeBuilder.ForTesting spy(Class<D> type, @Nullable String name
     return this;
   }
 
-  private <D> BeanScopeBuilder.ForTesting spy(
-      Type type, @Nullable String name, @Nullable Consumer<D> consumer) {
+  private <D> BeanScopeBuilder.ForTesting spy(Type type, @Nullable String name, @Nullable Consumer<D> consumer) {
     enrichBeans.add(new EnrichBean<>(type, name, consumer));
     return this;
   }