Removed the Hibernate module (moved components to Commons and Quick m…

…odules).

pom.xml

@@ -65,7 +65,6 @@
 		<module>rapidoid-html</module>
 		<module>rapidoid-gui</module>
 		<module>rapidoid-oauth</module>
-		<module>rapidoid-hibernate</module>
 		<module>rapidoid-web</module>
 		<module>rapidoid-quick</module>
 		<module>rapidoid-watch</module>

rapidoid-commons/pom.xml

@@ -39,20 +39,29 @@
 			<version>2.6.0</version>
 		</dependency>
 
+		<!-- OPTIONAL -->
+
 		<dependency>
 			<groupId>com.mchange</groupId>
 			<artifactId>c3p0</artifactId>
 			<version>0.9.2.1</version>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<version>4.3.10.Final</version>
+			<optional>true</optional>
+		</dependency>
+
+		<!-- TEST -->
 
 		<dependency>
 			<groupId>org.rapidoid</groupId>
 			<artifactId>rapidoid-test-commons</artifactId>
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>

rapidoid-hibernate/src/main/java/org/rapidoid/dao/DAO.java → rapidoid-commons/src/main/java/org/rapidoid/jpa/DAO.java

@@ -1,14 +1,13 @@
-package org.rapidoid.dao;
+package org.rapidoid.jpa;
 
-import org.rapidoid.plugins.db.hibernate.JPA;
 import org.rapidoid.u.U;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
 /*
  * #%L
- * rapidoid-hibernate
+ * rapidoid-commons
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%

rapidoid-hibernate/src/main/java/org/rapidoid/plugins/db/hibernate/JPA.java → rapidoid-commons/src/main/java/org/rapidoid/jpa/JPA.java

@@ -1,4 +1,4 @@
-package org.rapidoid.plugins.db.hibernate;
+package org.rapidoid.jpa;
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
@@ -10,7 +10,7 @@
 
 /*
  * #%L
- * rapidoid-hibernate
+ * rapidoid-commons
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%
@@ -64,6 +64,10 @@ public static void transaction(Runnable action, boolean readonly) {
 		with(em()).transaction(action, readonly);
 	}
 
+	public static void transaction(Runnable tx, boolean readonly, Callback<Void> callback) {
+		with(em()).transaction(tx, readonly, callback);
+	}
+
 	public static <E> List<E> getAll(Class<E> clazz, List<String> ids) {
 		return with(em()).getAll(clazz, ids);
 	}
@@ -88,10 +92,6 @@ public static Object insert(Object entity) {
 		return with(em()).insert(entity);
 	}
 
-	public static void transaction(Runnable tx, boolean readonly, Callback<Void> callback) {
-		with(em()).transaction(tx, readonly, callback);
-	}
-
 	public static <E> List<E> getAll(Class<E> clazz, int pageNumber, int pageSize) {
 		return with(em()).getAll(clazz, pageNumber, pageSize);
 	}

rapidoid-hibernate/src/main/java/org/rapidoid/plugins/db/hibernate/JPAUtil.java → rapidoid-commons/src/main/java/org/rapidoid/jpa/JPAUtil.java

@@ -1,4 +1,4 @@
-package org.rapidoid.plugins.db.hibernate;
+package org.rapidoid.jpa;
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
@@ -26,7 +26,7 @@
 
 /*
  * #%L
- * rapidoid-hibernate
+ * rapidoid-commons
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%

rapidoid-quick/src/main/java/org/rapidoid/quick/QuickJPA.java → rapidoid-commons/src/main/java/org/rapidoid/jpa/QuickJPA.java

@@ -1,8 +1,8 @@
-package org.rapidoid.quick;
+package org.rapidoid.jpa;
 
 /*
  * #%L
- * rapidoid-quick
+ * rapidoid-commons
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%
@@ -27,6 +27,8 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.config.Conf;
+import org.rapidoid.ctx.Ctx;
+import org.rapidoid.ctx.Ctxs;
 import org.rapidoid.ctx.PersisterProvider;
 import org.rapidoid.io.IO;
 import org.rapidoid.scan.Scan;
@@ -42,33 +44,33 @@
 @Since("3.0.0")
 public class QuickJPA implements PersisterProvider {
 
-	private final Object[] args;
+	private final String path;
 
-	@SuppressWarnings("deprecation")
-	private static org.hibernate.ejb.HibernateEntityManagerFactory emFactory;
+	private final Class<?>[] entities;
 
-	public QuickJPA(Object... args) {
-		this.args = args;
+	public QuickJPA(String path, Class<?>... entities) {
+		this.path = path;
+		this.entities = entities;
 	}
 
 	@SuppressWarnings("deprecation")
-	private static synchronized org.hibernate.ejb.HibernateEntityManagerFactory emFactory(Object[] args) {
+	private org.hibernate.ejb.HibernateEntityManagerFactory emFactory;
+
+	@SuppressWarnings("deprecation")
+	private synchronized org.hibernate.ejb.HibernateEntityManagerFactory emFactory() {
 
 		if (emFactory == null) {
 
 			org.hibernate.cfg.AnnotationConfiguration cfg = new org.hibernate.cfg.AnnotationConfiguration();
 
-			List<Class<?>> entityTypes = Scan.annotated(Entity.class).loadAll();
+			List<Class<?>> entityTypes = Scan.annotated(Entity.class).in(path).loadAll();
 			for (Class<?> entityType : entityTypes) {
 				cfg.addAnnotatedClass(entityType);
 			}
 
-			for (Object arg : args) {
-				if (arg instanceof Class<?>) {
-					Class<?> entityType = (Class<?>) arg;
-					if (!entityTypes.contains(entityType)) {
-						cfg.addAnnotatedClass(entityType);
-					}
+			for (Class<?> entityType : entities) {
+				if (!entityTypes.contains(entityType)) {
+					cfg.addAnnotatedClass(entityType);
 				}
 			}
 
@@ -112,7 +114,7 @@ public static Properties hibernateProperties() {
 	@SuppressWarnings("unchecked")
 	@Override
 	public <P> P openPersister() {
-		return (P) emFactory(args).createEntityManager();
+		return (P) emFactory().createEntityManager();
 	}
 
 	@Override
@@ -121,4 +123,9 @@ public void closePersister(Object persister) {
 		em.close();
 	}
 
+	public static void bootstrap(String path, Class<?>... entities) {
+		Ctx ctx = Ctxs.open("jpa");
+		Ctxs.setPersisterProvider(new QuickJPA(path, entities));
+	}
+
 }

rapidoid-commons/src/main/java/org/rapidoid/util/UTILS.java

@@ -39,6 +39,7 @@
 import org.rapidoid.lambda.F2;
 import org.rapidoid.lambda.Lmbd;
 import org.rapidoid.lambda.Mapper;
+import org.rapidoid.log.Log;
 import org.rapidoid.u.U;
 
 import java.io.*;
@@ -318,6 +319,7 @@ public static void connect(String address, int port, F2<Void, BufferedReader, Da
 			}
 		}
 	}
+
 	public static short bytesToShort(String s) {
 		ByteBuffer buf = Bufs.buf(s);
 		U.must(buf.limit() == 2);
@@ -839,4 +841,39 @@ public static boolean withWatchModule() {
 		return Cls.getClassIfExists("org.rapidoid.io.watch.Watch") != null;
 	}
 
+	public static void terminate(final int afterSeconds) {
+		Log.warn("Terminating application in " + afterSeconds + " seconds...");
+		new Thread() {
+			@Override
+			public void run() {
+				U.sleep(afterSeconds * 1000);
+				terminate();
+			}
+		}.start();
+	}
+
+	public static void terminateIfIdleFor(final int idleSeconds) {
+		Log.warn("Will terminate if idle for " + idleSeconds + " seconds...");
+
+		new Thread(new Runnable() {
+			@Override
+			public void run() {
+				while (!Thread.interrupted()) {
+					U.sleep(500);
+					long lastUsed = Usage.getLastAppUsedOn();
+					long idleSec = (U.time() - lastUsed) / 1000;
+					if (idleSec >= idleSeconds) {
+						Usage.touchLastAppUsedOn();
+						terminate();
+					}
+				}
+			}
+		}).start();
+	}
+
+	public static void terminate() {
+		Log.warn("Terminating application.");
+		System.exit(0);
+	}
+
 }

rapidoid-quick/pom.xml

@@ -17,11 +17,6 @@
 			<artifactId>rapidoid-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.rapidoid</groupId>
-			<artifactId>rapidoid-hibernate</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
@@ -53,12 +48,6 @@
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<version>1.4.187</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>