Restructured IoC packages.

rapidoid · Nov 28, 2016 · 10c91cb · 10c91cb
1 parent 1e26391
commit 10c91cb
Show file tree

Hide file tree

Showing 29 changed files with 67 additions and 55 deletions.
diff --git 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.Manage
-org.rapidoid.ioc.IoCContextImpl
+org.rapidoid.ioc.Wired
-org.rapidoid.ioc.IoCContextWrapper
-org.rapidoid.ioc.IoCModule
-org.rapidoid.ioc.IoCState
-org.rapidoid.ioc.OptionalJPAUtil
 org.rapidoid.io.FileSearch
 org.rapidoid.io.FileSearchResult
 org.rapidoid.io.IO

diff --git a/...a/org/rapidoid/annotation/Autocreate.java → ...ain/java/org/rapidoid/ioc/Autocreate.java b/...a/org/rapidoid/annotation/Autocreate.java → ...ain/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
@@ -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) {
+	public static List<Class<?>> getTypesToManage(Class<?> clazz) {
-		List<Class<?>> dependencies = U.list();
+		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
@@ -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
@@ -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/.../java/org/rapidoid/annotation/Manage.java → ...rc/main/java/org/rapidoid/ioc/Manage.java b/.../java/org/rapidoid/annotation/Manage.java → ...rc/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/...n/java/org/rapidoid/annotation/Wired.java → ...src/main/java/org/rapidoid/ioc/Wired.java b/...n/java/org/rapidoid/annotation/Wired.java → ...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/...a/org/rapidoid/ioc/IoCContextChanges.java → .../rapidoid/ioc/impl/IoCContextChanges.java b/...a/org/rapidoid/ioc/IoCContextChanges.java → .../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/...java/org/rapidoid/ioc/IoCContextImpl.java → ...org/rapidoid/ioc/impl/IoCContextImpl.java b/...java/org/rapidoid/ioc/IoCContextImpl.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)) {
+		if (U.notEmpty(meta.typesToManage)) {
-			manage(meta.dependencyTypes.toArray());
+			manage(meta.typesToManage.toArray());
 		}
 
 		for (Field field : meta.injectableFields) {

diff --git a/...a/org/rapidoid/ioc/IoCContextWrapper.java → .../rapidoid/ioc/impl/IoCContextWrapper.java b/...a/org/rapidoid/ioc/IoCContextWrapper.java → .../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/...main/java/org/rapidoid/ioc/IoCModule.java → ...java/org/rapidoid/ioc/impl/IoCModule.java b/...main/java/org/rapidoid/ioc/IoCModule.java → ...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/.../main/java/org/rapidoid/ioc/IoCState.java → .../java/org/rapidoid/ioc/impl/IoCState.java b/.../main/java/org/rapidoid/ioc/IoCState.java → .../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/...ava/org/rapidoid/ioc/OptionalJPAUtil.java → ...rg/rapidoid/ioc/impl/OptionalJPAUtil.java b/...ava/org/rapidoid/ioc/OptionalJPAUtil.java → ...rg/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {