[orient, session, factory] autoinitialize the transaction/session fro…

…m the configuration if requested
sleroy · Dec 9, 2014 · c38fd0d · c38fd0d
1 parent 8357246
commit c38fd0d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/...rc/main/java/org/springframework/orientdb/session/impl/AbstractOrientDatabaseFactory.java b/...rc/main/java/org/springframework/orientdb/session/impl/AbstractOrientDatabaseFactory.java
@@ -55,7 +55,7 @@ public TDatabase db() {
 
 	/*
 	 * (non-Javadoc)
-	 *
+	 * 
 	 * @see
 	 * org.springframework.orm.orient.AbstractOrientDatabaseFactory#openDatabase
 	 * ()
@@ -79,6 +79,10 @@ public void init(final DatabaseConfiguration _configuration) {
 		this.createDatabase(createdDB, _configuration);
 		LOGGER.debug("Creation of the connexion pool {} ", _configuration.getUrl());
 		this.createPool(_configuration);
+		if (_configuration.isAutoInitializeCurrentThreadTransaction()) {
+			LOGGER.warn("Autoinitialize the database for the current thread");
+			this.getOrCreateDatabaseSession();
+		}
 	}
 
 	public void setPool(final ODatabaseDocumentPool pool) {
@@ -114,9 +118,9 @@ private final void createDatabase(final ODatabase _database, final DatabaseConfi
 	 */
 	private final void createPool(final DatabaseConfiguration _configuration) {
 		LOGGER.debug("Configuration of the connexion pool min={}, max={}", _configuration.getMinPoolSize(),
-				_configuration.getMaxPoolSize());
+		        _configuration.getMaxPoolSize());
 		this.pool = new ODatabaseDocumentPool(_configuration.getUrl(), _configuration.getUsername(),
-				_configuration.getPassword());
+		        _configuration.getPassword());
 
 	}
 

diff --git a/...nector/src/main/java/org/springframework/orientdb/session/impl/DatabaseConfiguration.java b/...nector/src/main/java/org/springframework/orientdb/session/impl/DatabaseConfiguration.java
@@ -17,10 +17,10 @@ public class DatabaseConfiguration {
 	private String	            url;
 
 	/** Default minimum pool size. */
-	public static final int	    DEFAULT_MIN_POOL_SIZE	= 1;
+	public static final int	    DEFAULT_MIN_POOL_SIZE	               = 1;
 
 	/** Default maximum pool size. */
-	public static final int	    DEFAULT_MAX_POOL_SIZE	= 20;
+	public static final int	    DEFAULT_MAX_POOL_SIZE	               = 20;
 
 	/** The username. */
 	private String	            username;
@@ -29,12 +29,14 @@ public class DatabaseConfiguration {
 	private String	            password;
 
 	/** The min pool size. */
-	private int	                minPoolSize	          = DEFAULT_MIN_POOL_SIZE;
+	private int	                minPoolSize	                           = DEFAULT_MIN_POOL_SIZE;
 
 	/** The max pool size. */
-	private int	                maxPoolSize	          = DEFAULT_MAX_POOL_SIZE;
+	private int	                maxPoolSize	                           = DEFAULT_MAX_POOL_SIZE;
 
-	private Map<String, Object>	extraConfiguration	  = Collections.emptyMap();
+	private boolean	            autoInitializeCurrentThreadTransaction	= false;
+
+	private Map<String, Object>	extraConfiguration	                   = Collections.emptyMap();
 
 	public DatabaseConfiguration() {
 		super();
@@ -64,6 +66,14 @@ public String getUsername() {
 		return this.username;
 	}
 
+	public boolean isAutoInitializeCurrentThreadTransaction() {
+		return this.autoInitializeCurrentThreadTransaction;
+	}
+
+	public void setAutoInitializeCurrentThreadTransaction(final boolean _autoInitializeCurrentThreadTransaction) {
+		this.autoInitializeCurrentThreadTransaction = _autoInitializeCurrentThreadTransaction;
+	}
+
 	public void setExtraConfiguration(final Map<String, Object> _extraConfiguration) {
 		this.extraConfiguration = _extraConfiguration;
 	}
@@ -91,6 +101,6 @@ public void setUsername(final String _username) {
 	@Override
 	public String toString() {
 		return "DatabaseConfiguration [url=" + this.url + ", username=" + this.username + ", minPoolSize="
-				+ this.minPoolSize + ", maxPoolSize=" + this.maxPoolSize + "]";
+		        + this.minPoolSize + ", maxPoolSize=" + this.maxPoolSize + "]";
 	}
 }
diff --git a/...or/src/main/java/org/springframework/orientdb/session/impl/TestDatabaseConfiguration.java b/...or/src/main/java/org/springframework/orientdb/session/impl/TestDatabaseConfiguration.java
@@ -14,6 +14,7 @@ public class TestDatabaseConfiguration extends MemoryDatabaseConfiguration {
 
 	public TestDatabaseConfiguration() {
 		super("database" + Long.toString(new Date().getTime()) + new Random().nextInt());
+		this.setAutoInitializeCurrentThreadTransaction(true);
 	}
 
 }