From 10c91cb5e423369c19e475c3539f8f93c63195ab Mon Sep 17 00:00:00 2001
From: nmihajlovski <nikolce.mihajlovski@gmail.com>
Date: Mon, 28 Nov 2016 15:54:12 +0100
Subject: [PATCH] Restructured IoC packages.

---
 .../src/main/resources/rapidoid-classes.txt    | 18 +++++++++---------
 .../java/org/rapidoid/ioc}/Autocreate.java     |  7 +++++--
 .../java/org/rapidoid/ioc/ClassMetadata.java   | 18 ++++++++----------
 .../src/main/java/org/rapidoid/ioc/IoC.java    |  2 ++
 .../main/java/org/rapidoid/ioc/IoCContext.java |  1 +
 .../main/java/org/rapidoid/ioc}/Manage.java    |  7 +++++--
 .../src/main/java/org/rapidoid/ioc}/Wired.java |  7 +++++--
 .../ioc/{ => impl}/IoCContextChanges.java      |  2 +-
 .../ioc/{ => impl}/IoCContextImpl.java         | 11 +++++------
 .../ioc/{ => impl}/IoCContextWrapper.java      |  6 ++++--
 .../org/rapidoid/ioc/{ => impl}/IoCModule.java |  3 ++-
 .../org/rapidoid/ioc/{ => impl}/IoCState.java  |  2 +-
 .../ioc/{ => impl}/OptionalJPAUtil.java        |  2 +-
 .../src/test/java/org/rapidoid/ioc/Bar.java    |  1 -
 .../test/java/org/rapidoid/ioc/app/App.java    |  4 ++--
 .../java/org/rapidoid/ioc/app/BookDao.java     |  2 +-
 .../java/org/rapidoid/ioc/app/BookService.java |  2 +-
 .../rapidoid/ioc/app/PersonServiceImpl.java    |  2 +-
 .../ioc/basic/AutowireDependenciesTest.java    |  4 ++--
 .../test/java/org/rapidoid/ioc/basic/Foo.java  |  2 +-
 .../org/rapidoid/ioc/basic/MyCallable.java     |  2 +-
 .../rapidoid/ioc/basic/TestAutowireTest.java   |  2 +-
 .../java/org/rapidoid/ioc/db/Database.java     |  2 +-
 .../test/java/org/rapidoid/ioc/db/Relat.java   |  2 +-
 .../test/java/org/rapidoid/ioc/db/Table.java   |  2 +-
 .../ioc/mandatory/MandatoryInjectionTest.java  |  2 +-
 .../org/rapidoid/ioc/profiles/BazWrapper.java  |  2 +-
 .../test/java/demo/rapidoid/reload/Abc.java    |  2 +-
 .../org/rapidoid/jpa/JPAInjectionTest.java     |  3 ++-
 29 files changed, 67 insertions(+), 55 deletions(-)
 rename {rapidoid-commons/src/main/java/org/rapidoid/annotation => rapidoid-inject/src/main/java/org/rapidoid/ioc}/Autocreate.java (88%)
 rename {rapidoid-commons/src/main/java/org/rapidoid/annotation => rapidoid-inject/src/main/java/org/rapidoid/ioc}/Manage.java (89%)
 rename {rapidoid-commons/src/main/java/org/rapidoid/annotation => rapidoid-inject/src/main/java/org/rapidoid/ioc}/Wired.java (88%)
 rename rapidoid-inject/src/main/java/org/rapidoid/ioc/{ => impl}/IoCContextChanges.java (97%)
 rename rapidoid-inject/src/main/java/org/rapidoid/ioc/{ => impl}/IoCContextImpl.java (98%)
 rename rapidoid-inject/src/main/java/org/rapidoid/ioc/{ => impl}/IoCContextWrapper.java (96%)
 rename rapidoid-inject/src/main/java/org/rapidoid/ioc/{ => impl}/IoCModule.java (95%)
 rename rapidoid-inject/src/main/java/org/rapidoid/ioc/{ => impl}/IoCState.java (98%)
 rename rapidoid-inject/src/main/java/org/rapidoid/ioc/{ => impl}/OptionalJPAUtil.java (97%)

diff --git a/rapidoid-commons/src/main/resources/rapidoid-classes.txt b/rapidoid-commons/src/main/resources/rapidoid-classes.txt
index fe99285617..ef75f82908 100644
--- a/rapidoid-commons/src/main/resources/rapidoid-classes.txt
+++ b/rapidoid-commons/src/main/resources/rapidoid-classes.txt
@@ -7,13 +7,11 @@ org.rapidoid.activity.RapidoidThread
 org.rapidoid.activity.RapidoidThreadFactory
 org.rapidoid.activity.RapidoidThreadLocals
 org.rapidoid.annotation.Authors
-org.rapidoid.annotation.Autocreate
 org.rapidoid.annotation.Composite
 org.rapidoid.annotation.Contributors
 org.rapidoid.annotation.Controller
 org.rapidoid.annotation.Cookie
 org.rapidoid.annotation.DELETE
-org.rapidoid.annotation.Dependencies
 org.rapidoid.annotation.Desc
 org.rapidoid.annotation.DontReload
 org.rapidoid.annotation.GET
@@ -42,7 +40,6 @@ org.rapidoid.annotation.TRACE
 org.rapidoid.annotation.Transaction
 org.rapidoid.annotation.TransactionMode
 org.rapidoid.annotation.Valid
-org.rapidoid.annotation.Wired
 org.rapidoid.AuthBootstrap
 org.rapidoid.beany.AnnotatedPropertyFilter
 org.rapidoid.beany.BeanProp
@@ -444,17 +441,20 @@ org.rapidoid.integrate.Integrate
 org.rapidoid.integrate.JMustacheViewResolver
 org.rapidoid.integrate.MustacheJavaViewResolver
 org.rapidoid.integrate.SpringIntegrator
+org.rapidoid.ioc.Autocreate
 org.rapidoid.ioc.BeanProvider
 org.rapidoid.ioc.Beans
 org.rapidoid.ioc.ClassMetadata
+org.rapidoid.ioc.impl.IoCContextChanges
+org.rapidoid.ioc.impl.IoCContextImpl
+org.rapidoid.ioc.impl.IoCContextWrapper
+org.rapidoid.ioc.impl.IoCModule
+org.rapidoid.ioc.impl.IoCState
+org.rapidoid.ioc.impl.OptionalJPAUtil
 org.rapidoid.ioc.IoC
 org.rapidoid.ioc.IoCContext
-org.rapidoid.ioc.IoCContextChanges
-org.rapidoid.ioc.IoCContextImpl
-org.rapidoid.ioc.IoCContextWrapper
-org.rapidoid.ioc.IoCModule
-org.rapidoid.ioc.IoCState
-org.rapidoid.ioc.OptionalJPAUtil
+org.rapidoid.ioc.Manage
+org.rapidoid.ioc.Wired
 org.rapidoid.io.FileSearch
 org.rapidoid.io.FileSearchResult
 org.rapidoid.io.IO
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Autocreate.java b/rapidoid-inject/src/main/java/org/rapidoid/ioc/Autocreate.java
similarity index 88%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Autocreate.java
rename to rapidoid-inject/src/main/java/org/rapidoid/ioc/Autocreate.java
index cbbeed91aa..53320da1e6 100644
--- a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Autocreate.java
+++ b/rapidoid-inject/src/main/java/org/rapidoid/ioc/Autocreate.java
@@ -1,4 +1,7 @@
-package org.rapidoid.annotation;
+package org.rapidoid.ioc;
+
+import org.rapidoid.annotation.Authors;
+import org.rapidoid.annotation.Since;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -8,7 +11,7 @@
 
 /*
  * #%L
- * rapidoid-commons
+ * rapidoid-inject
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%
diff --git a/rapidoid-inject/src/main/java/org/rapidoid/ioc/ClassMetadata.java b/rapidoid-inject/src/main/java/org/rapidoid/ioc/ClassMetadata.java
index 02cf1219f8..76be313820 100644
--- a/rapidoid-inject/src/main/java/org/rapidoid/ioc/ClassMetadata.java
+++ b/rapidoid-inject/src/main/java/org/rapidoid/ioc/ClassMetadata.java
@@ -2,9 +2,7 @@
 
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Manage;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.annotation.Wired;
 import org.rapidoid.beany.Metadata;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.u.U;
@@ -41,28 +39,28 @@
 @Since("5.1.0")
 public class ClassMetadata extends RapidoidThing {
 
-	final Class<?> clazz;
+	public final Class<?> clazz;
 
-	final List<Field> injectableFields;
+	public final List<Field> injectableFields;
 
-	final List<Class<?>> dependencyTypes;
+	public final List<Class<?>> typesToManage;
 
 	public ClassMetadata(Class<?> clazz) {
 		this.clazz = clazz;
 		this.injectableFields = Collections.synchronizedList(getInjectableFields(clazz));
-		this.dependencyTypes = Collections.synchronizedList(getDependencyTypes(clazz));
+		this.typesToManage = Collections.synchronizedList(getTypesToManage(clazz));
 	}
 
-	private List<Class<?>> getDependencyTypes(Class<?> clazz) {
-		List<Class<?>> dependencies = U.list();
+	public static List<Class<?>> getTypesToManage(Class<?> clazz) {
+		List<Class<?>> types = U.list();
 
 		Manage depAnn = Metadata.getAnnotationRecursive(clazz, Manage.class);
 
 		if (depAnn != null) {
-			Collections.addAll(dependencies, depAnn.value());
+			Collections.addAll(types, depAnn.value());
 		}
 
-		return dependencies;
+		return types;
 	}
 
 	public static List<Field> getInjectableFields(Class<?> clazz) {
diff --git a/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoC.java b/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoC.java
index bed544c0ff..ce1ef65630 100644
--- a/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoC.java
+++ b/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoC.java
@@ -3,6 +3,8 @@
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.ioc.impl.IoCContextImpl;
+import org.rapidoid.ioc.impl.IoCContextWrapper;
 
 import java.util.Map;
 
diff --git a/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCContext.java b/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCContext.java
index ecbc59ab67..8bba0aa1ad 100644
--- a/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCContext.java
+++ b/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCContext.java
@@ -2,6 +2,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.ioc.impl.IoCContextChanges;
 import org.rapidoid.lambda.Mapper;
 
 import java.util.List;
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Manage.java b/rapidoid-inject/src/main/java/org/rapidoid/ioc/Manage.java
similarity index 89%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Manage.java
rename to rapidoid-inject/src/main/java/org/rapidoid/ioc/Manage.java
index fcdd751c81..8d35db2cb5 100644
--- a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Manage.java
+++ b/rapidoid-inject/src/main/java/org/rapidoid/ioc/Manage.java
@@ -1,4 +1,7 @@
-package org.rapidoid.annotation;
+package org.rapidoid.ioc;
+
+import org.rapidoid.annotation.Authors;
+import org.rapidoid.annotation.Since;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -9,7 +12,7 @@
 
 /*
  * #%L
- * rapidoid-commons
+ * rapidoid-inject
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Wired.java b/rapidoid-inject/src/main/java/org/rapidoid/ioc/Wired.java
similarity index 88%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Wired.java
rename to rapidoid-inject/src/main/java/org/rapidoid/ioc/Wired.java
index 85ab4706a1..5accc429a9 100644
--- a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Wired.java
+++ b/rapidoid-inject/src/main/java/org/rapidoid/ioc/Wired.java
@@ -1,4 +1,7 @@
-package org.rapidoid.annotation;
+package org.rapidoid.ioc;
+
+import org.rapidoid.annotation.Authors;
+import org.rapidoid.annotation.Since;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -8,7 +11,7 @@
 
 /*
  * #%L
- * rapidoid-commons
+ * rapidoid-inject
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%
diff --git a/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCContextChanges.java b/rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCContextChanges.java
similarity index 97%
rename from rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCContextChanges.java
rename to rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCContextChanges.java
index 9fe4840673..a5d58c331f 100644
--- a/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCContextChanges.java
+++ b/rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCContextChanges.java
@@ -1,4 +1,4 @@
-package org.rapidoid.ioc;
+package org.rapidoid.ioc.impl;
 
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;
diff --git a/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCContextImpl.java b/rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCContextImpl.java
similarity index 98%
rename from rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCContextImpl.java
rename to rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCContextImpl.java
index 60bb65c26e..e14af9d6d9 100644
--- a/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCContextImpl.java
+++ b/rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCContextImpl.java
@@ -1,15 +1,14 @@
-package org.rapidoid.ioc;
+package org.rapidoid.ioc.impl;
 
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Autocreate;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.annotation.Wired;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.collection.Coll;
 import org.rapidoid.commons.Deep;
 import org.rapidoid.config.Conf;
 import org.rapidoid.config.Config;
+import org.rapidoid.ioc.*;
 import org.rapidoid.lambda.Lmbd;
 import org.rapidoid.lambda.Mapper;
 import org.rapidoid.log.Log;
@@ -48,7 +47,7 @@
 @Since("5.1.0")
 public class IoCContextImpl extends RapidoidThing implements IoCContext {
 
-	IoCContextImpl() {
+	public IoCContextImpl() {
 	}
 
 	private volatile String name;
@@ -331,8 +330,8 @@ private boolean autowire(Object target, Map<String, Object> properties, Mapper<S
 		boolean autowired = false;
 		ClassMetadata meta = meta(target.getClass());
 
-		if (U.notEmpty(meta.dependencyTypes)) {
-			manage(meta.dependencyTypes.toArray());
+		if (U.notEmpty(meta.typesToManage)) {
+			manage(meta.typesToManage.toArray());
 		}
 
 		for (Field field : meta.injectableFields) {
diff --git a/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCContextWrapper.java b/rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCContextWrapper.java
similarity index 96%
rename from rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCContextWrapper.java
rename to rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCContextWrapper.java
index fc7de55298..8b22611574 100644
--- a/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCContextWrapper.java
+++ b/rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCContextWrapper.java
@@ -1,8 +1,10 @@
-package org.rapidoid.ioc;
+package org.rapidoid.ioc.impl;
 
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.ioc.BeanProvider;
+import org.rapidoid.ioc.IoCContext;
 import org.rapidoid.lambda.Mapper;
 
 import java.util.List;
@@ -34,7 +36,7 @@ public class IoCContextWrapper extends RapidoidThing implements IoCContext {
 
 	private final IoCContextImpl context;
 
-	IoCContextWrapper(IoCContextImpl context) {
+	public IoCContextWrapper(IoCContextImpl context) {
 		this.context = context;
 		context.wrapper(this);
 	}
diff --git a/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCModule.java b/rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCModule.java
similarity index 95%
rename from rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCModule.java
rename to rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCModule.java
index 02af8098b8..baf8dd0eff 100644
--- a/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCModule.java
+++ b/rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCModule.java
@@ -1,4 +1,4 @@
-package org.rapidoid.ioc;
+package org.rapidoid.ioc.impl;
 
 /*
  * #%L
@@ -24,6 +24,7 @@
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.ioc.IoC;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.3.0")
diff --git a/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCState.java b/rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCState.java
similarity index 98%
rename from rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCState.java
rename to rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCState.java
index 5fc4f4a386..5d725a6b52 100644
--- a/rapidoid-inject/src/main/java/org/rapidoid/ioc/IoCState.java
+++ b/rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/IoCState.java
@@ -1,4 +1,4 @@
-package org.rapidoid.ioc;
+package org.rapidoid.ioc.impl;
 
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;
diff --git a/rapidoid-inject/src/main/java/org/rapidoid/ioc/OptionalJPAUtil.java b/rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/OptionalJPAUtil.java
similarity index 97%
rename from rapidoid-inject/src/main/java/org/rapidoid/ioc/OptionalJPAUtil.java
rename to rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/OptionalJPAUtil.java
index 5694e9bdcf..10b2974911 100644
--- a/rapidoid-inject/src/main/java/org/rapidoid/ioc/OptionalJPAUtil.java
+++ b/rapidoid-inject/src/main/java/org/rapidoid/ioc/impl/OptionalJPAUtil.java
@@ -1,4 +1,4 @@
-package org.rapidoid.ioc;
+package org.rapidoid.ioc.impl;
 
 /*
  * #%L
diff --git a/rapidoid-inject/src/test/java/org/rapidoid/ioc/Bar.java b/rapidoid-inject/src/test/java/org/rapidoid/ioc/Bar.java
index cc8487bb15..b35847ce2a 100644
--- a/rapidoid-inject/src/test/java/org/rapidoid/ioc/Bar.java
+++ b/rapidoid-inject/src/test/java/org/rapidoid/ioc/Bar.java
@@ -21,7 +21,6 @@
  */
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Wired;
 import org.rapidoid.annotation.Since;
 
 import java.util.concurrent.Callable;
diff --git a/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/App.java b/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/App.java
index 10cd58cade..db5cb825a9 100644
--- a/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/App.java
+++ b/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/App.java
@@ -21,9 +21,9 @@
  */
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Autocreate;
+import org.rapidoid.ioc.Autocreate;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.annotation.Wired;
+import org.rapidoid.ioc.Wired;
 import org.rapidoid.ioc.Logger;
 
 import javax.annotation.PostConstruct;
diff --git a/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/BookDao.java b/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/BookDao.java
index 59f89f0486..1741432e9f 100644
--- a/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/BookDao.java
+++ b/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/BookDao.java
@@ -21,7 +21,7 @@
  */
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Wired;
+import org.rapidoid.ioc.Wired;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.ioc.Logger;
 
diff --git a/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/BookService.java b/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/BookService.java
index d5c29ecca8..88ff2098b6 100644
--- a/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/BookService.java
+++ b/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/BookService.java
@@ -21,7 +21,7 @@
  */
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Wired;
+import org.rapidoid.ioc.Wired;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.ioc.Logger;
 
diff --git a/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/PersonServiceImpl.java b/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/PersonServiceImpl.java
index c31ab6b02e..696153301d 100644
--- a/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/PersonServiceImpl.java
+++ b/rapidoid-inject/src/test/java/org/rapidoid/ioc/app/PersonServiceImpl.java
@@ -21,7 +21,7 @@
  */
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Wired;
+import org.rapidoid.ioc.Wired;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.ioc.Logger;
 
diff --git a/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/AutowireDependenciesTest.java b/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/AutowireDependenciesTest.java
index 9262828da7..a2bf013af1 100644
--- a/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/AutowireDependenciesTest.java
+++ b/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/AutowireDependenciesTest.java
@@ -22,9 +22,9 @@
 
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Manage;
+import org.rapidoid.ioc.Manage;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.annotation.Wired;
+import org.rapidoid.ioc.Wired;
 import org.rapidoid.test.RapidoidTest;
 
 import javax.inject.Inject;
diff --git a/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/Foo.java b/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/Foo.java
index 48cadef79f..fe81559e0d 100644
--- a/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/Foo.java
+++ b/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/Foo.java
@@ -21,7 +21,7 @@
  */
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Wired;
+import org.rapidoid.ioc.Wired;
 import org.rapidoid.annotation.Since;
 
 import java.util.concurrent.Callable;
diff --git a/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/MyCallable.java b/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/MyCallable.java
index 696703252e..672996ad97 100644
--- a/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/MyCallable.java
+++ b/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/MyCallable.java
@@ -21,7 +21,7 @@
  */
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Wired;
+import org.rapidoid.ioc.Wired;
 import org.rapidoid.annotation.Since;
 
 import java.util.concurrent.Callable;
diff --git a/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/TestAutowireTest.java b/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/TestAutowireTest.java
index 80ad39a8bd..c403dcc1ee 100644
--- a/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/TestAutowireTest.java
+++ b/rapidoid-inject/src/test/java/org/rapidoid/ioc/basic/TestAutowireTest.java
@@ -23,7 +23,7 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.annotation.Wired;
+import org.rapidoid.ioc.Wired;
 import org.rapidoid.test.RapidoidTest;
 
 import javax.inject.Inject;
diff --git a/rapidoid-inject/src/test/java/org/rapidoid/ioc/db/Database.java b/rapidoid-inject/src/test/java/org/rapidoid/ioc/db/Database.java
index 990adf1c70..dac0116f88 100644
--- a/rapidoid-inject/src/test/java/org/rapidoid/ioc/db/Database.java
+++ b/rapidoid-inject/src/test/java/org/rapidoid/ioc/db/Database.java
@@ -21,7 +21,7 @@
  */
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Wired;
+import org.rapidoid.ioc.Wired;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.ioc.IoC;
 
diff --git a/rapidoid-inject/src/test/java/org/rapidoid/ioc/db/Relat.java b/rapidoid-inject/src/test/java/org/rapidoid/ioc/db/Relat.java
index 9877aa0023..30a1b93ab2 100644
--- a/rapidoid-inject/src/test/java/org/rapidoid/ioc/db/Relat.java
+++ b/rapidoid-inject/src/test/java/org/rapidoid/ioc/db/Relat.java
@@ -21,7 +21,7 @@
  */
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Wired;
+import org.rapidoid.ioc.Wired;
 import org.rapidoid.annotation.Since;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-inject/src/test/java/org/rapidoid/ioc/db/Table.java b/rapidoid-inject/src/test/java/org/rapidoid/ioc/db/Table.java
index 1d314ff16a..c7c2c776b9 100644
--- a/rapidoid-inject/src/test/java/org/rapidoid/ioc/db/Table.java
+++ b/rapidoid-inject/src/test/java/org/rapidoid/ioc/db/Table.java
@@ -21,7 +21,7 @@
  */
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Wired;
+import org.rapidoid.ioc.Wired;
 import org.rapidoid.annotation.Since;
 
 @Authors("Nikolche Mihajlovski")
diff --git a/rapidoid-inject/src/test/java/org/rapidoid/ioc/mandatory/MandatoryInjectionTest.java b/rapidoid-inject/src/test/java/org/rapidoid/ioc/mandatory/MandatoryInjectionTest.java
index d6390a59e7..9b8bcffa53 100644
--- a/rapidoid-inject/src/test/java/org/rapidoid/ioc/mandatory/MandatoryInjectionTest.java
+++ b/rapidoid-inject/src/test/java/org/rapidoid/ioc/mandatory/MandatoryInjectionTest.java
@@ -22,7 +22,7 @@
 
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Wired;
+import org.rapidoid.ioc.Wired;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.ioc.AbstractInjectTest;
 import org.rapidoid.ioc.IoC;
diff --git a/rapidoid-inject/src/test/java/org/rapidoid/ioc/profiles/BazWrapper.java b/rapidoid-inject/src/test/java/org/rapidoid/ioc/profiles/BazWrapper.java
index e839a8b743..59bfafd908 100644
--- a/rapidoid-inject/src/test/java/org/rapidoid/ioc/profiles/BazWrapper.java
+++ b/rapidoid-inject/src/test/java/org/rapidoid/ioc/profiles/BazWrapper.java
@@ -21,7 +21,7 @@
  */
 
 import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Wired;
+import org.rapidoid.ioc.Wired;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.u.U;
 
diff --git a/rapidoid-integration-tests/src/test/java/demo/rapidoid/reload/Abc.java b/rapidoid-integration-tests/src/test/java/demo/rapidoid/reload/Abc.java
index 79bf02df85..8043ee5105 100644
--- a/rapidoid-integration-tests/src/test/java/demo/rapidoid/reload/Abc.java
+++ b/rapidoid-integration-tests/src/test/java/demo/rapidoid/reload/Abc.java
@@ -22,7 +22,7 @@
 
 import org.rapidoid.annotation.Controller;
 import org.rapidoid.annotation.GET;
-import org.rapidoid.annotation.Wired;
+import org.rapidoid.ioc.Wired;
 
 @Controller
 public class Abc {
diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/jpa/JPAInjectionTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/jpa/JPAInjectionTest.java
index 4851acdd8f..28dd575ecb 100644
--- a/rapidoid-integration-tests/src/test/java/org/rapidoid/jpa/JPAInjectionTest.java
+++ b/rapidoid-integration-tests/src/test/java/org/rapidoid/jpa/JPAInjectionTest.java
@@ -6,7 +6,8 @@
 import org.rapidoid.http.IsolatedIntegrationTest;
 import org.rapidoid.http.Req;
 import org.rapidoid.ioc.IoCContext;
-import org.rapidoid.ioc.IoCContextWrapper;
+import org.rapidoid.ioc.impl.IoCContextWrapper;
+import org.rapidoid.ioc.Wired;
 import org.rapidoid.setup.App;
 import org.rapidoid.u.U;