Refactor move @factory etc annotations into main package

rbygrave · rbygrave · commit 74bcdc35c44a · 2020-07-23T16:43:36.000+12:00
diff --git a/dinject-generator/src/main/java/io/dinject/generator/BeanReader.java b/dinject-generator/src/main/java/io/dinject/generator/BeanReader.java
@@ -1,8 +1,8 @@
 package io.dinject.generator;
 
-import io.dinject.annotation.Bean;
-import io.dinject.annotation.Primary;
-import io.dinject.annotation.Secondary;
+import io.dinject.Bean;
+import io.dinject.Primary;
+import io.dinject.Secondary;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
diff --git a/dinject-generator/src/main/java/io/dinject/generator/Constants.java b/dinject-generator/src/main/java/io/dinject/generator/Constants.java
@@ -18,8 +18,8 @@ class Constants {
   static final String BEAN_LIFECYCLE = "io.dinject.core.BeanLifecycle";
   static final String BUILDER = "io.dinject.core.Builder";
 
-  static final String IMPORT_CONTEXTMODULE = "import io.dinject.annotation.ContextModule;";
-  static final String IMPORT_DEPENDENCYMETA = "import io.dinject.annotation.DependencyMeta;";
+  static final String IMPORT_CONTEXTMODULE = "import io.dinject.ContextModule;";
+  static final String IMPORT_DEPENDENCYMETA = "import io.dinject.core.DependencyMeta;";
   static final String IMPORT_BEANCONTEXT = "import io.dinject.BeanContext;";
   static final String IMPORT_BEANCONTEXTFACTORY = "import io.dinject.core.BeanContextFactory;";
   static final String IMPORT_BUILDERFACTORY = "import io.dinject.core.BuilderFactory;";
diff --git a/dinject-generator/src/main/java/io/dinject/generator/IncludeAnnotations.java b/dinject-generator/src/main/java/io/dinject/generator/IncludeAnnotations.java
@@ -1,8 +1,8 @@
 package io.dinject.generator;
 
-import io.dinject.annotation.Factory;
-import io.dinject.annotation.Primary;
-import io.dinject.annotation.Secondary;
+import io.dinject.Factory;
+import io.dinject.Primary;
+import io.dinject.Secondary;
 
 import javax.inject.Named;
 import javax.inject.Singleton;
diff --git a/dinject-generator/src/main/java/io/dinject/generator/MetaData.java b/dinject-generator/src/main/java/io/dinject/generator/MetaData.java
@@ -1,6 +1,6 @@
 package io.dinject.generator;
 
-import io.dinject.annotation.DependencyMeta;
+import io.dinject.core.DependencyMeta;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/dinject-generator/src/main/java/io/dinject/generator/MethodReader.java b/dinject-generator/src/main/java/io/dinject/generator/MethodReader.java
@@ -1,6 +1,6 @@
 package io.dinject.generator;
 
-import io.dinject.annotation.Bean;
+import io.dinject.Bean;
 
 import javax.inject.Named;
 import javax.lang.model.element.Element;
diff --git a/dinject-generator/src/main/java/io/dinject/generator/Processor.java b/dinject-generator/src/main/java/io/dinject/generator/Processor.java
@@ -1,8 +1,8 @@
 package io.dinject.generator;
 
-import io.dinject.annotation.ContextModule;
-import io.dinject.annotation.Factory;
-import io.dinject.annotation.DependencyMeta;
+import io.dinject.ContextModule;
+import io.dinject.Factory;
+import io.dinject.core.DependencyMeta;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.FilerException;
diff --git a/dinject-generator/src/test/java/io/dinject/generator/IncludeAnnotationsTest.java b/dinject-generator/src/test/java/io/dinject/generator/IncludeAnnotationsTest.java
@@ -1,8 +1,8 @@
 package io.dinject.generator;
 
-import io.dinject.annotation.Factory;
-import io.dinject.annotation.Primary;
-import io.dinject.annotation.Secondary;
+import io.dinject.Factory;
+import io.dinject.Primary;
+import io.dinject.Secondary;
 import org.junit.Test;
 
 import javax.inject.Named;
diff --git a/dinject-test/src/test/java/org/example/coffee/factory/Configuration.java b/dinject-test/src/test/java/org/example/coffee/factory/Configuration.java
@@ -1,7 +1,7 @@
 package org.example.coffee.factory;
 
-import io.dinject.annotation.Bean;
-import io.dinject.annotation.Factory;
+import io.dinject.Bean;
+import io.dinject.Factory;
 import org.example.coffee.CoffeeMaker;
 
 import javax.annotation.PostConstruct;
diff --git a/dinject-test/src/test/java/org/example/coffee/factory/MyFactory.java b/dinject-test/src/test/java/org/example/coffee/factory/MyFactory.java
@@ -1,7 +1,7 @@
 package org.example.coffee.factory;
 
-import io.dinject.annotation.Bean;
-import io.dinject.annotation.Factory;
+import io.dinject.Bean;
+import io.dinject.Factory;
 import org.example.coffee.factory.other.Something;
 
 import javax.inject.Named;
diff --git a/dinject-test/src/test/java/org/example/coffee/factory/SomeImplBean.java b/dinject-test/src/test/java/org/example/coffee/factory/SomeImplBean.java
@@ -1,6 +1,6 @@
 package org.example.coffee.factory;
 
-import io.dinject.annotation.Secondary;
+import io.dinject.Secondary;
 import org.example.coffee.factory.other.Something;
 
 import javax.inject.Singleton;
diff --git a/dinject-test/src/test/java/org/example/coffee/primary/PrimePEmailer.java b/dinject-test/src/test/java/org/example/coffee/primary/PrimePEmailer.java
@@ -1,6 +1,6 @@
 package org.example.coffee.primary;
 
-import io.dinject.annotation.Primary;
+import io.dinject.Primary;
 
 import javax.inject.Singleton;
 
diff --git a/dinject-test/src/test/java/org/example/coffee/secondary/DefaultSEmailer.java b/dinject-test/src/test/java/org/example/coffee/secondary/DefaultSEmailer.java
@@ -1,6 +1,6 @@
 package org.example.coffee.secondary;
 
-import io.dinject.annotation.Secondary;
+import io.dinject.Secondary;
 
 import javax.inject.Singleton;
 
diff --git a/dinject-test/src/test/java/org/example/coffee/secondary/WidgetSecondary.java b/dinject-test/src/test/java/org/example/coffee/secondary/WidgetSecondary.java
@@ -1,6 +1,6 @@
 package org.example.coffee.secondary;
 
-import io.dinject.annotation.Secondary;
+import io.dinject.Secondary;
 
 import javax.inject.Singleton;
 
diff --git a/dinject/src/main/java/io/dinject/Bean.java b/dinject/src/main/java/io/dinject/Bean.java
@@ -1,4 +1,4 @@
-package io.dinject.annotation;
+package io.dinject;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/dinject/src/main/java/io/dinject/BeanContext.java b/dinject/src/main/java/io/dinject/BeanContext.java
@@ -1,7 +1,5 @@
 package io.dinject;
 
-import io.dinject.annotation.ContextModule;
-
 import java.io.Closeable;
 import java.util.List;
 
diff --git a/dinject/src/main/java/io/dinject/ContextModule.java b/dinject/src/main/java/io/dinject/ContextModule.java
@@ -1,4 +1,4 @@
-package io.dinject.annotation;
+package io.dinject;
 
 /**
  * Used to explicitly name a bean context and optionally specify if it depends on other bean contexts.
diff --git a/dinject/src/main/java/io/dinject/Factory.java b/dinject/src/main/java/io/dinject/Factory.java
@@ -1,4 +1,4 @@
-package io.dinject.annotation;
+package io.dinject;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/dinject/src/main/java/io/dinject/Primary.java b/dinject/src/main/java/io/dinject/Primary.java
@@ -1,4 +1,4 @@
-package io.dinject.annotation;
+package io.dinject;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/dinject/src/main/java/io/dinject/Secondary.java b/dinject/src/main/java/io/dinject/Secondary.java
@@ -1,4 +1,4 @@
-package io.dinject.annotation;
+package io.dinject;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/dinject/src/main/java/io/dinject/annotation/package-info.java b/dinject/src/main/java/io/dinject/annotation/package-info.java
diff --git a/dinject/src/main/java/io/dinject/core/DependencyMeta.java b/dinject/src/main/java/io/dinject/core/DependencyMeta.java
@@ -1,4 +1,4 @@
-package io.dinject.annotation;
+package io.dinject.core;
 
 /**
  * Hold bean dependency meta data intended for internal use by code generation (Java annotation processing).
