[sre] Add startWithourAgent() function to the SRE bootstrap utility c…

…lass.

Signed-off-by: Stéphane Galland <galland@arakhne.org>

main/apiplugins/io.sarl.core/src/io/sarl/core/bootstrap.sarl

@@ -24,6 +24,7 @@ import java.lang.ref.SoftReference
 import java.util.ServiceLoader
 import java.util.UUID
 import io.sarl.lang.core.Agent
+import io.sarl.lang.core.AgentContext
 
 /**
  * Represents an access point to the SARL run-time environment (SRE).
@@ -39,6 +40,15 @@ import io.sarl.lang.core.Agent
  */
 interface SREBootstrap {
 
+	/**
+	 * Start the SRE without an agent.
+	 This function prepare the default context.
+	 *
+	 * @return the context that is created by the bootstrap. If {@code null} there is no context created.
+	 * @since 0.7
+	 */
+	def startWithoutAgent : AgentContext
+
 	/**
 	 * Launch the SRE and the first agent in the kernel.
 	 *
@@ -185,6 +195,10 @@ final class SRE {
 		package new {
 		}
 
+		override startWithoutAgent : AgentContext {
+			null
+		}
+
 		override startAgent(agentCls : Class<? extends Agent>, params : Object*) : UUID {
 			throw new UnsupportedOperationException
 		}

sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/Boot.java

@@ -909,13 +909,7 @@ public static Kernel startJanusWithModule(Module startupModule, Class<? extends
 		// Set the boot agent classname
 		System.setProperty(JanusConfig.BOOT_AGENT, agentCls.getName());
 		// Get the start-up injection module
-		assert startupModule != null : "No platform injection module"; //$NON-NLS-1$
-		final Kernel k = Kernel.create(startupModule);
-		// Force the bootstrap to reference the created kernel.
-		final SREBootstrap bootstrap = SRE.getBootstrap();
-		if (bootstrap instanceof Bootstrap) {
-			((Bootstrap) bootstrap).setKernel(k);
-		}
+		final Kernel k = startWithoutAgent(startupModule);
 		final Logger logger = k.getLogger();
 		if (logger != null) {
 			logger.info(MessageFormat.format(Messages.Boot_22, agentCls.getName()));
@@ -929,6 +923,42 @@ public static Kernel startJanusWithModule(Module startupModule, Class<? extends
 		return k;
 	}
 
+	/**
+	 * Start the SRE without an agent. This function prepare the default context.
+	 *
+	 * @param startupModule - the injection module to use for initializing the platform.
+	 * @return the context that is created by the bootstrap. If {@code null} there is no context created.
+	 * @since 2.0.7.0
+	 */
+	public static Kernel startWithoutAgent(Module startupModule) {
+		assert startupModule != null : "No platform injection module"; //$NON-NLS-1$
+		final Kernel k = Kernel.create(startupModule);
+		// Force the bootstrap to reference the created kernel.
+		final SREBootstrap bootstrap = SRE.getBootstrap();
+		if (bootstrap instanceof Bootstrap) {
+			((Bootstrap) bootstrap).setKernel(k);
+		}
+		return k;
+	}
+
+	/**
+	 * Start the SRE without an agent. This function prepare the default context.
+	 *
+	 * @return the context that is created by the bootstrap. If {@code null} there is no context created.
+	 * @since 2.0.7.0
+	 */
+	public static Kernel startWithoutAgent() {
+		final Class<? extends Module> startupModule = JanusConfig.getSystemPropertyAsClass(Module.class,
+				JanusConfig.INJECTION_MODULE_NAME,
+				JanusConfig.INJECTION_MODULE_NAME_VALUE);
+		assert startupModule != null : "No platform injection module"; //$NON-NLS-1$
+		try {
+			return startWithoutAgent(startupModule.newInstance());
+		} catch (Exception exception) {
+			throw new IllegalStateException(exception);
+		}
+	}
+
 	/**
 	 * Replies the tool for exiting the application.
 	 *

sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/Bootstrap.java

@@ -29,6 +29,7 @@
 
 import io.sarl.core.SREBootstrap;
 import io.sarl.lang.core.Agent;
+import io.sarl.lang.core.AgentContext;
 
 /**
  * Represents an access point to the SARL run-time environment (SRE).
@@ -86,4 +87,16 @@ public UUID getBootAgentIdentifier() {
 		return Boot.getBootAgentIdentifier();
 	}
 
+	@Override
+	public AgentContext startWithoutAgent() {
+		Kernel kern = this.kernel;
+		if (kern == null) {
+			synchronized (this) {
+				this.kernel = Boot.startWithoutAgent();
+				kern = this.kernel;
+			}
+		}
+		return kern.getJanusContext();
+	}
+
 }

sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/kernel/Kernel.java

@@ -221,6 +221,18 @@ void setJanusContext(@io.janusproject.kernel.annotations.Kernel AgentContext jan
 		this.janusContext = janusContext;
 	}
 
+	/**
+	 * Replies the Janus context of the kernel.
+	 *
+	 * @return the Janus root context. It must be never <code>null</code>.
+	 * @since 2.0.7.0
+	 */
+	@Inject
+	public AgentContext getJanusContext() {
+		assert this.janusContext != null;
+		return this.janusContext;
+	}
+
 	/**
 	 * Listener on platform events.
 	 *

tests/io.sarl.core.tests/src/test/java/io/sarl/core/tests/SREBootstrapMock.java

@@ -24,6 +24,7 @@
 
 import io.sarl.core.SREBootstrap;
 import io.sarl.lang.core.Agent;
+import io.sarl.lang.core.AgentContext;
 
 /**
  * @author $Author: sgalland$
@@ -48,4 +49,9 @@ public UUID getBootAgentIdentifier() {
 		throw new IllegalStateException();
 	}
 
+	@Override
+	public AgentContext startWithoutAgent() {
+		throw new IllegalStateException();
+	}
+
 }