Extracted out new modules: Inject, JPA and Render.

rapidoid · Apr 20, 2016 · 56139cd · 56139cd
1 parent a797f82
commit 56139cd
Show file tree

Hide file tree

Showing 110 changed files with 521 additions and 144 deletions.
diff --git a/pom.xml b/pom.xml
@@ -82,6 +82,9 @@
 		<module>rapidoid-commons</module>
 		<module>rapidoid-test-commons</module>
 		<module>rapidoid-buffer</module>
+		<module>rapidoid-jpa</module>
+		<module>rapidoid-inject</module>
+		<module>rapidoid-render</module>
 		<module>rapidoid-net</module>
 		<module>rapidoid-http-fast</module>
 		<module>rapidoid-http-client</module>

diff --git a/rapidoid-commons/pom.xml b/rapidoid-commons/pom.xml
@@ -59,12 +59,6 @@
 			<version>${validation-api.version}</version>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${spring.version}</version>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>javax.inject</groupId>
 			<artifactId>javax.inject</artifactId>

diff --git a/rapidoid-commons/src/main/java/org/rapidoid/ctx/Ctxs.java b/rapidoid-commons/src/main/java/org/rapidoid/ctx/Ctxs.java
@@ -4,7 +4,6 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.commons.Coll;
-import org.rapidoid.jpa.JPAPersisterProvider;
 import org.rapidoid.log.Log;
 import org.rapidoid.u.U;
 
@@ -34,7 +33,7 @@ public class Ctxs extends RapidoidThing {
 
 	private static final ThreadLocal<Ctx> CTXS = new ThreadLocal<Ctx>();
 
-	private static volatile PersisterProvider persisterProvider = new JPAPersisterProvider();
+	private static volatile PersisterProvider persisterProvider;
 
 	private Ctxs() {
 	}

diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Msc.java b/rapidoid-commons/src/main/java/org/rapidoid/util/Msc.java
@@ -737,6 +737,10 @@ public static boolean hasJPA() {
 		return Cls.exists("javax.persistence.Entity");
 	}
 
+	public static boolean hasRapidoidJPA() {
+		return Cls.exists("org.rapidoid.jpa.JPA");
+	}
+
 	public static boolean hasInject() {
 		return Cls.exists("javax.inject.Inject");
 	}

diff --git a/rapidoid-commons/src/main/resources/rapidoid-classes.txt b/rapidoid-commons/src/main/resources/rapidoid-classes.txt
@@ -355,6 +355,7 @@ org.rapidoid.insight.PercentMeasure
 org.rapidoid.insight.StatsMeasure
 org.rapidoid.integrate.Integrate
 org.rapidoid.integrate.MustacheViewRenderer
+org.rapidoid.integrate.SpringIntegrator
 org.rapidoid.ioc.BeanProvider
 org.rapidoid.ioc.ClassMetadata
 org.rapidoid.ioc.IoC
@@ -363,6 +364,7 @@ org.rapidoid.ioc.IoCContextChanges
 org.rapidoid.ioc.IoCContextImpl
 org.rapidoid.ioc.IoCContextWrapper
 org.rapidoid.ioc.IoCState
+org.rapidoid.ioc.OptionalJPAUtil
 org.rapidoid.io.CustomizableClassLoader
 org.rapidoid.io.IO
 org.rapidoid.io.Res
@@ -469,6 +471,9 @@ org.rapidoid.pool.SynchronizedArrayPool
 org.rapidoid.pool.SynchronizedPool
 org.rapidoid.pool.ThreadSafeArrayPool
 org.rapidoid.RapidoidThing
+org.rapidoid.reload.ClassReloader
+org.rapidoid.reload.OptionalJPAUtil
+org.rapidoid.reload.Reload
 org.rapidoid.render.Getter
 org.rapidoid.render.RapidoidTemplate
 org.rapidoid.render.Render
@@ -523,7 +528,6 @@ org.rapidoid.sql.NoConnectionPool
 org.rapidoid.test.TestCommons
 org.rapidoid.util.AbstractMapImpl
 org.rapidoid.util.Bufs
-org.rapidoid.util.ClassReloader
 org.rapidoid.util.CommonWords
 org.rapidoid.util.Constants
 org.rapidoid.util.D
@@ -532,15 +536,13 @@ org.rapidoid.util.MapEntry
 org.rapidoid.util.Msc
 org.rapidoid.util.NullOutputStream
 org.rapidoid.util.RapidoidProcess
-org.rapidoid.util.Reload
 org.rapidoid.util.Resetable
 org.rapidoid.util.Role
 org.rapidoid.util.RuntimeInfo
 org.rapidoid.util.SimpleHashTable
 org.rapidoid.util.SimpleList
 org.rapidoid.util.SimpleMap
 org.rapidoid.util.SimplePersisterProvider
-org.rapidoid.util.SpringIntegrator
 org.rapidoid.util.SuccessException
 org.rapidoid.util.Usage
 org.rapidoid.u.U

diff --git a/rapidoid-commons/src/test/java/org/rapidoid/cls/ClsTest.java b/rapidoid-commons/src/test/java/org/rapidoid/cls/ClsTest.java
@@ -4,10 +4,6 @@
 import org.rapidoid.annotation.*;
 import org.rapidoid.commons.Dates;
 import org.rapidoid.http.HttpVerb;
-import org.rapidoid.ioc.Logger;
-import org.rapidoid.ioc.db.Database;
-import org.rapidoid.ioc.db.Table;
-import org.rapidoid.ioc.db.Transactor;
 import org.rapidoid.test.AbstractCommonsTest;
 import org.rapidoid.test.TestCommons;
 import org.rapidoid.u.U;
@@ -44,10 +40,6 @@ public class ClsTest extends AbstractCommonsTest {
 	@Test
 	public void testIsBeanType() {
 		isTrue(Cls.isBeanType(Foo.class));
-		isTrue(Cls.isBeanType(Logger.class));
-		isTrue(Cls.isBeanType(Database.class));
-		isTrue(Cls.isBeanType(Table.class));
-		isTrue(Cls.isBeanType(Transactor.class));
 
 		isFalse(Cls.isBeanType(Object.class));
 		isFalse(Cls.isBeanType(HttpVerb.class));
@@ -60,10 +52,6 @@ public void testIsBeanType() {
 	@Test
 	public void testIsRapidoidClass() {
 		isFalse(Cls.isRapidoidClass(Foo.class));
-		isFalse(Cls.isRapidoidClass(Logger.class));
-		isFalse(Cls.isRapidoidClass(Database.class));
-		isFalse(Cls.isRapidoidClass(Table.class));
-		isFalse(Cls.isRapidoidClass(Transactor.class));
 		isFalse(Cls.isRapidoidClass(Object.class));
 		isFalse(Cls.isRapidoidClass(Runnable.class));
 		isFalse(Cls.isRapidoidClass(ArrayList.class));

diff --git a/rapidoid-commons/src/test/java/org/rapidoid/test/AbstractCommonsTest.java b/rapidoid-commons/src/test/java/org/rapidoid/test/AbstractCommonsTest.java
@@ -25,7 +25,6 @@
 import org.rapidoid.config.Conf;
 import org.rapidoid.data.JSON;
 import org.rapidoid.io.Res;
-import org.rapidoid.ioc.IoC;
 import org.rapidoid.log.Log;
 import org.rapidoid.log.LogLevel;
 
@@ -37,7 +36,6 @@ public void openContext() {
 		Conf.reset();
 		Conf.setPath(getTestName());
 		Log.setLogLevel(LogLevel.INFO);
-		IoC.defaultContext().reset();
 		Env.profiles().clear();
 		Env.profiles().add("default");
 	}
@@ -46,21 +44,4 @@ protected void verify(String name, Object actual) {
 		super.verifyCase(name, JSON.prettify(actual), name);
 	}
 
-	protected void verifyIoC() {
-		verify("ioc", IoC.defaultContext().info());
-	}
-
-	protected void verifyIoC(String name) {
-		verify(name, IoC.defaultContext().info());
-	}
-
-	protected void noIocBean(Class<?> clazz) {
-		try {
-			IoC.singleton(clazz);
-			fail("Expected IoC exception for class: " + clazz);
-		} catch (RuntimeException e) {
-			// ok
-		}
-	}
-
 }
diff --git a/rapidoid-http-fast/pom.xml b/rapidoid-http-fast/pom.xml
@@ -17,6 +17,21 @@
 			<artifactId>rapidoid-net</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.rapidoid</groupId>
+			<artifactId>rapidoid-render</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.rapidoid</groupId>
+			<artifactId>rapidoid-jpa</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.rapidoid</groupId>
+			<artifactId>rapidoid-inject</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpasyncclient</artifactId>

diff --git a/rapidoid-http-server/src/main/java/org/rapidoid/setup/Setup.java b/rapidoid-http-server/src/main/java/org/rapidoid/setup/Setup.java
@@ -10,6 +10,7 @@
 import org.rapidoid.config.Conf;
 import org.rapidoid.config.Config;
 import org.rapidoid.config.RapidoidInitializer;
+import org.rapidoid.ctx.Ctxs;
 import org.rapidoid.data.JSON;
 import org.rapidoid.http.*;
 import org.rapidoid.http.customize.Customization;
@@ -22,15 +23,16 @@
 import org.rapidoid.ioc.IoCContext;
 import org.rapidoid.job.Jobs;
 import org.rapidoid.jpa.JPA;
+import org.rapidoid.jpa.JPAPersisterProvider;
 import org.rapidoid.lambda.NParamLambda;
 import org.rapidoid.log.Log;
 import org.rapidoid.net.Server;
+import org.rapidoid.reload.Reload;
 import org.rapidoid.scan.ClasspathUtil;
 import org.rapidoid.security.Roles;
 import org.rapidoid.u.U;
 import org.rapidoid.util.Constants;
 import org.rapidoid.util.Msc;
-import org.rapidoid.util.Reload;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -75,6 +77,10 @@ public void run() {
 				JSON.warmup();
 			}
 		});
+
+		if (Ctxs.getPersisterProvider() == null) {
+			Ctxs.setPersisterProvider(new JPAPersisterProvider());
+		}
 	}
 
 	private static volatile String mainClassName;

diff --git a/rapidoid-inject/pom.xml b/rapidoid-inject/pom.xml
@@ -0,0 +1,50 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.rapidoid</groupId>
+		<artifactId>rapidoid</artifactId>
+		<version>5.1.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>rapidoid-inject</artifactId>
+	<packaging>jar</packaging>
+	<description>Rapidoid Inject</description>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.rapidoid</groupId>
+			<artifactId>rapidoid-commons</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<!-- OPTIONAL -->
+
+		<dependency>
+			<groupId>org.rapidoid</groupId>
+			<artifactId>rapidoid-jpa</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.inject</groupId>
+			<artifactId>javax.inject</artifactId>
+			<version>1</version>
+			<optional>true</optional>
+		</dependency>
+
+		<!-- TEST -->
+
+		<dependency>
+			<groupId>org.rapidoid</groupId>
+			<artifactId>rapidoid-test-commons</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+</project>
diff --git a/...n/java/org/rapidoid/ioc/BeanProvider.java → ...n/java/org/rapidoid/ioc/BeanProvider.java b/...n/java/org/rapidoid/ioc/BeanProvider.java → ...n/java/org/rapidoid/ioc/BeanProvider.java
@@ -2,7 +2,7 @@
 
 /*
  * #%L
- * rapidoid-commons
+ * rapidoid-inject
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%

diff --git a/.../java/org/rapidoid/ioc/ClassMetadata.java → .../java/org/rapidoid/ioc/ClassMetadata.java b/.../java/org/rapidoid/ioc/ClassMetadata.java → .../java/org/rapidoid/ioc/ClassMetadata.java
@@ -11,7 +11,7 @@
 
 /*
  * #%L
- * rapidoid-commons
+ * rapidoid-inject
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%

diff --git a/...s/src/main/java/org/rapidoid/ioc/IoC.java → ...t/src/main/java/org/rapidoid/ioc/IoC.java b/...s/src/main/java/org/rapidoid/ioc/IoC.java → ...t/src/main/java/org/rapidoid/ioc/IoC.java
@@ -8,7 +8,7 @@
 
 /*
  * #%L
- * rapidoid-commons
+ * rapidoid-inject
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%

diff --git a/...ain/java/org/rapidoid/ioc/IoCContext.java → ...ain/java/org/rapidoid/ioc/IoCContext.java b/...ain/java/org/rapidoid/ioc/IoCContext.java → ...ain/java/org/rapidoid/ioc/IoCContext.java
@@ -9,7 +9,7 @@
 
 /*
  * #%L
- * rapidoid-commons
+ * rapidoid-inject
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%

diff --git a/...a/org/rapidoid/ioc/IoCContextChanges.java → ...a/org/rapidoid/ioc/IoCContextChanges.java b/...a/org/rapidoid/ioc/IoCContextChanges.java → ...a/org/rapidoid/ioc/IoCContextChanges.java
@@ -8,7 +8,7 @@
 
 /*
  * #%L
- * rapidoid-commons
+ * rapidoid-inject
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%

diff --git a/...java/org/rapidoid/ioc/IoCContextImpl.java → ...java/org/rapidoid/ioc/IoCContextImpl.java b/...java/org/rapidoid/ioc/IoCContextImpl.java → ...java/org/rapidoid/ioc/IoCContextImpl.java
@@ -8,16 +8,12 @@
 import org.rapidoid.commons.Env;
 import org.rapidoid.config.Conf;
 import org.rapidoid.config.Config;
-import org.rapidoid.jpa.SharedContextAwareEntityManagerProxy;
-import org.rapidoid.jpa.SharedEntityManagerFactoryProxy;
 import org.rapidoid.lambda.Lmbd;
 import org.rapidoid.lambda.Mapper;
 import org.rapidoid.log.Log;
 import org.rapidoid.u.U;
 import org.rapidoid.util.Msc;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Iterator;
@@ -27,7 +23,7 @@
 
 /*
  * #%L
- * rapidoid-commons
+ * rapidoid-inject
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%
@@ -272,16 +268,18 @@ private boolean isClass(Object obj) {
 
 	private Object provideSpecialInstance(Class<?> type, String name) {
 
+		String cls = type.getName();
+
 		if (type.equals(IoCContext.class)) {
 			return U.or(wrapper, this);
 		}
 
-		if (type.equals(EntityManagerFactory.class)) {
+		if (cls.equals("javax.persistence.EntityManager") && Msc.hasRapidoidJPA()) {
-			return SharedEntityManagerFactoryProxy.INSTANCE;
+			return OptionalJPAUtil.getSharedContextAwareEntityManagerProxy();
 		}
 
-		if (type.equals(EntityManager.class)) {
+		if (cls.equals("javax.persistence.EntityManagerFactory") && Msc.hasRapidoidJPA()) {
-			return SharedContextAwareEntityManagerProxy.INSTANCE;
+			return OptionalJPAUtil.getSharedEntityManagerFactoryProxy();
 		}
 
 		return null;

diff --git a/...a/org/rapidoid/ioc/IoCContextWrapper.java → ...a/org/rapidoid/ioc/IoCContextWrapper.java b/...a/org/rapidoid/ioc/IoCContextWrapper.java → ...a/org/rapidoid/ioc/IoCContextWrapper.java
@@ -10,7 +10,7 @@
 
 /*
  * #%L
- * rapidoid-commons
+ * rapidoid-inject
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%

diff --git a/.../main/java/org/rapidoid/ioc/IoCState.java → .../main/java/org/rapidoid/ioc/IoCState.java b/.../main/java/org/rapidoid/ioc/IoCState.java → .../main/java/org/rapidoid/ioc/IoCState.java
@@ -13,7 +13,7 @@
 
 /*
  * #%L
- * rapidoid-commons
+ * rapidoid-inject
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%