Refactor move annotations into annotation package

Author: rbygrave

annotations/src/main/java/io/dinject/Bean.java renamed to annotations/src/main/java/io/dinject/annotation/Bean.java

@@ -1,4 +1,4 @@
-package io.dinject;
+package io.dinject.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

annotations/src/main/java/io/dinject/ContextModule.java renamed to annotations/src/main/java/io/dinject/annotation/ContextModule.java

@@ -1,4 +1,4 @@
-package io.dinject;
+package io.dinject.annotation;
 
 /**
  * Used to explicitly name a bean context and optionally specify if it depends on other bean contexts.

annotations/src/main/java/io/dinject/core/DependencyMeta.java renamed to annotations/src/main/java/io/dinject/annotation/DependencyMeta.java

@@ -1,4 +1,4 @@
-package io.dinject.core;
+package io.dinject.annotation;
 
 /**
  * Hold bean dependency meta data intended for internal use by code generation (Java annotation processing).

annotations/src/main/java/io/dinject/Factory.java renamed to annotations/src/main/java/io/dinject/annotation/Factory.java

@@ -1,4 +1,4 @@
-package io.dinject;
+package io.dinject.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

annotations/src/main/java/io/dinject/Primary.java renamed to annotations/src/main/java/io/dinject/annotation/Primary.java

@@ -1,4 +1,4 @@
-package io.dinject;
+package io.dinject.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

annotations/src/main/java/io/dinject/Secondary.java renamed to annotations/src/main/java/io/dinject/annotation/Secondary.java

@@ -1,4 +1,4 @@
-package io.dinject;
+package io.dinject.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

core/pom.xml

@@ -57,7 +57,7 @@
     <dependency>
       <groupId>io.dinject</groupId>
       <artifactId>dinject-generator</artifactId>
-      <version>1.19</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 

core/src/main/java/io/dinject/BeanContext.java

@@ -1,5 +1,7 @@
 package io.dinject;
 
+import io.dinject.annotation.ContextModule;
+
 import java.io.Closeable;
 import java.util.List;
 

core/src/test/java/org/example/coffee/factory/Configuration.java

@@ -1,7 +1,7 @@
 package org.example.coffee.factory;
 
-import io.dinject.Bean;
-import io.dinject.Factory;
+import io.dinject.annotation.Bean;
+import io.dinject.annotation.Factory;
 import org.example.coffee.CoffeeMaker;
 
 import javax.annotation.PostConstruct;

core/src/test/java/org/example/coffee/factory/MyFactory.java

@@ -1,7 +1,7 @@
 package org.example.coffee.factory;
 
-import io.dinject.Bean;
-import io.dinject.Factory;
+import io.dinject.annotation.Bean;
+import io.dinject.annotation.Factory;
 import org.example.coffee.factory.other.Something;
 
 import javax.inject.Named;

core/src/test/java/org/example/coffee/factory/SomeImplBean.java

@@ -1,6 +1,6 @@
 package org.example.coffee.factory;
 
-import io.dinject.Secondary;
+import io.dinject.annotation.Secondary;
 import org.example.coffee.factory.other.Something;
 
 import javax.inject.Singleton;

core/src/test/java/org/example/coffee/primary/OtherPEmailer.java

@@ -1,7 +1,5 @@
 package org.example.coffee.primary;
 
-import io.dinject.Secondary;
-
 import javax.inject.Singleton;
 
 //@Secondary

core/src/test/java/org/example/coffee/primary/PrimePEmailer.java

@@ -1,6 +1,6 @@
 package org.example.coffee.primary;
 
-import io.dinject.Primary;
+import io.dinject.annotation.Primary;
 
 import javax.inject.Singleton;
 

core/src/test/java/org/example/coffee/secondary/DefaultSEmailer.java

@@ -1,6 +1,6 @@
 package org.example.coffee.secondary;
 
-import io.dinject.Secondary;
+import io.dinject.annotation.Secondary;
 
 import javax.inject.Singleton;
 

core/src/test/java/org/example/coffee/secondary/WidgetSecondary.java

@@ -1,6 +1,6 @@
 package org.example.coffee.secondary;
 
-import io.dinject.Secondary;
+import io.dinject.annotation.Secondary;
 
 import javax.inject.Singleton;
 

generator/src/main/java/io/dinject/generator/BeanReader.java

@@ -1,8 +1,8 @@
 package io.dinject.generator;
 
-import io.dinject.Bean;
-import io.dinject.Primary;
-import io.dinject.Secondary;
+import io.dinject.annotation.Bean;
+import io.dinject.annotation.Primary;
+import io.dinject.annotation.Secondary;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;

generator/src/main/java/io/dinject/generator/Constants.java

@@ -18,12 +18,12 @@ 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_BEANCONTEXT = "import io.dinject.BeanContext;";
-  static final String IMPORT_CONTEXTMODULE = "import io.dinject.ContextModule;";
   static final String IMPORT_BEANCONTEXTFACTORY = "import io.dinject.core.BeanContextFactory;";
   static final String IMPORT_BUILDERFACTORY = "import io.dinject.core.BuilderFactory;";
   static final String IMPORT_BUILDER = "import io.dinject.core.Builder;";
-  static final String IMPORT_DEPENDENCYMETA = "import io.dinject.core.DependencyMeta;";
 
   static boolean isBeanLifecycle(String type) {
     return BEAN_LIFECYCLE.equals(type);

generator/src/main/java/io/dinject/generator/IncludeAnnotations.java

@@ -1,8 +1,8 @@
 package io.dinject.generator;
 
-import io.dinject.Factory;
-import io.dinject.Primary;
-import io.dinject.Secondary;
+import io.dinject.annotation.Factory;
+import io.dinject.annotation.Primary;
+import io.dinject.annotation.Secondary;
 
 import javax.inject.Named;
 import javax.inject.Singleton;

generator/src/main/java/io/dinject/generator/MetaData.java

@@ -1,6 +1,6 @@
 package io.dinject.generator;
 
-import io.dinject.core.DependencyMeta;
+import io.dinject.annotation.DependencyMeta;
 
 import java.util.ArrayList;
 import java.util.Arrays;

generator/src/main/java/io/dinject/generator/MethodReader.java

@@ -1,6 +1,6 @@
 package io.dinject.generator;
 
-import io.dinject.Bean;
+import io.dinject.annotation.Bean;
 
 import javax.inject.Named;
 import javax.lang.model.element.Element;

generator/src/main/java/io/dinject/generator/Processor.java

@@ -1,8 +1,8 @@
 package io.dinject.generator;
 
-import io.dinject.ContextModule;
-import io.dinject.Factory;
-import io.dinject.core.DependencyMeta;
+import io.dinject.annotation.ContextModule;
+import io.dinject.annotation.Factory;
+import io.dinject.annotation.DependencyMeta;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.FilerException;

generator/src/main/java/io/dinject/generator/SimpleFactoryWriter.java

@@ -90,10 +90,10 @@ private void writePackage() {
     }
     writer.append(Constants.IMPORT_BEANCONTEXT).eol();
     writer.append(Constants.IMPORT_CONTEXTMODULE).eol();
+    writer.append(Constants.IMPORT_DEPENDENCYMETA).eol().eol();
     writer.append(Constants.IMPORT_BEANCONTEXTFACTORY).eol();
-    writer.append(Constants.IMPORT_BUILDERFACTORY).eol();
     writer.append(Constants.IMPORT_BUILDER).eol();
-    writer.append(Constants.IMPORT_DEPENDENCYMETA).eol().eol();
+    writer.append(Constants.IMPORT_BUILDERFACTORY).eol();
 
     for (String type : ordering.getImportTypes()) {
       if (Util.notVoid(type)) {

generator/src/test/java/io/dinject/generator/IncludeAnnotationsTest.java

@@ -1,8 +1,8 @@
 package io.dinject.generator;
 
-import io.dinject.Factory;
-import io.dinject.Primary;
-import io.dinject.Secondary;
+import io.dinject.annotation.Factory;
+import io.dinject.annotation.Primary;
+import io.dinject.annotation.Secondary;
 import org.junit.Test;
 
 import javax.inject.Named;