Merge pull request #29 from IBMStreams/develop

Develop

Author: joergboe

CHANGELOG.md

@@ -28,3 +28,11 @@
 * New sample: HTTPXMLView
 * Simplified sample RequestProcessTuple
 * Removed puzzeling RequestProcessTuple Json Sample
+
+## v4.1.0
+* Enhancement in operator HTTPTupleInjection: Flexible partition query
+* Enhancement in operator HTTPTupleInjection: new parameter 'partitionBy'
+* Enhancement in Servlet Operator: new Parameter 'host'
+* Enhancement in operator HTTPTupleInjection: insert the default values
+* Correction in operator HTTPTupleInjection: selection of partition fails if attribute has type boolean
+

com.ibm.streamsx.inetserver/com.ibm.streamsx.inet/namespace-info.spl

@@ -25,8 +25,9 @@
  * This allows operators to expose streams through the same webserver
  * without having to be connected in the SPL graph.
  * 
- * Operators which are using a shared jetty instance must have the same parameter values for parameters
+ * Operators which are using a shared jetty instance must have the **same parameter values for parameters**
  * * `port`
+ * * `host`
  * * `certificateAlias`
  * * `keyStore`
  * * `keyStorePassword`

com.ibm.streamsx.inetserver/impl/java/src/com/ibm/streamsx/inet/rest/engine/ServletEngine.java

@@ -95,16 +95,21 @@ public class ServletEngine implements ServletEngineMBean, MBeanRegistration {
 	public static final String METRIC_NAME_PORT = "serverPort";
 
 	public static ServletEngineMBean getServletEngine(OperatorContext operatorContext) throws Exception {
+
 		int portNumber = DEFAULT_PORT;
 		if (operatorContext.getParameterNames().contains("port"))
 			portNumber = Integer.valueOf(operatorContext.getParameterValues("port").get(0));
 
+		String host = null;
+		if (operatorContext.getParameterNames().contains("host"))
+			host = operatorContext.getParameterValues("host").get(0);
+
 		MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
 		final ObjectName jetty = new ObjectName("com.ibm.streamsx.inet.rest:type=jetty,port=" + portNumber);
 		synchronized (syncMe) {
 			if (!mbs.isRegistered(jetty)) {
 				try {
-					mbs.registerMBean(new ServletEngine(jetty, operatorContext, portNumber), jetty);
+					mbs.registerMBean(new ServletEngine(jetty, operatorContext, portNumber, host), jetty);
 				} catch (InstanceAlreadyExistsException infe) {
 				}
 			}
@@ -127,7 +132,7 @@ public static ServletEngineMBean getServletEngine(OperatorContext operatorContex
 	private final Map<String, ServletContextHandler> staticContexts = Collections.synchronizedMap(new HashMap<String, ServletContextHandler>());
 	private final List<ExposedPort> exposedPorts = Collections.synchronizedList(new ArrayList<ExposedPort>());
 
-	private ServletEngine(ObjectName myObjectName, OperatorContext operatorContext, int portNumber) throws Exception {
+	private ServletEngine(ObjectName myObjectName, OperatorContext operatorContext, int portNumber, String host) throws Exception {
 		this.myObjectName = myObjectName;
 		this.startingOperatorContext = operatorContext;
 		final ThreadPoolExecutor tpe = newContextThreadPoolExecutor(operatorContext);
@@ -164,9 +169,9 @@ public void join() throws InterruptedException {
 		handlers = new ContextHandlerCollection();
 
 		if (operatorContext.getParameterNames().contains(SSL_CERT_ALIAS_PARAM))
-			setHTTPSConnector(operatorContext, server, portNumber);
+			setHTTPSConnector(operatorContext, server, portNumber, host);
 		else
-			setHTTPConnector(operatorContext, server, portNumber);
+			setHTTPConnector(operatorContext, server, portNumber, host);
 		operatorContext.getMetrics().getCustomMetric(METRIC_NAME_HTTPS).setValue(isSSL ? 1 : 0);
 
 		ServletContextHandler portsIntro = new ServletContextHandler(server, "/ports", ServletContextHandler.SESSIONS);
@@ -187,18 +192,20 @@ public void join() throws InterruptedException {
 	/**
 	 * Setup an HTTP connector.
 	 */
-	private void setHTTPConnector(OperatorContext operatorContext, Server server, int portNumber) {
+	private void setHTTPConnector(OperatorContext operatorContext, Server server, int portNumber, String host) {
 		HttpConfiguration http_config = new HttpConfiguration();
 		ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory(http_config));
 		connector.setPort(portNumber);
+		if (host != null)
+			connector.setHost(host);
 		connector.setIdleTimeout(IDLE_TIMEOUT);
 		server.addConnector(connector);
 	}
 
 	/**
 	 * Setup an HTTPS connector.
 	 */
-	private void setHTTPSConnector(OperatorContext operatorContext, Server server, int httpsPort) {
+	private void setHTTPSConnector(OperatorContext operatorContext, Server server, int httpsPort, String host) {
 		SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
 		//Key Store is required
 		String keyStorePath = operatorContext.getParameterValues(SSL_KEYSTORE_PARAM).get(0);
@@ -250,6 +257,8 @@ private void setHTTPSConnector(OperatorContext operatorContext, Server server, i
 				new HttpConnectionFactory(https_config));
 
 		connector.setPort(httpsPort);
+		if (host != null)
+			connector.setHost(host);
 		connector.setIdleTimeout(IDLE_TIMEOUT);
 		server.addConnector(connector); 
 

com.ibm.streamsx.inetserver/impl/java/src/com/ibm/streamsx/inet/rest/ops/ServletOperator.java

@@ -70,6 +70,10 @@ public void shutdown() throws Exception {
 	@Parameter(optional=true, description="Port number for the embedded Jetty HTTP server, default: \\\"" + ServletEngine.DEFAULT_PORT + "\\\". "
 			+ "If the port is set to 0, the jetty server uses a free tcp port, and the metric `serverPort` delivers the actual value.")
 	public void setPort(int port) {}
+	@Parameter(optional=true, description="You can configure a host either as a host name or IP address to identify a "
+			+ "specific network interface on which to listen. If not set, or set to the value of 0.0.0.0, the integrated "
+			+ "jetty server listens on all local interfaces.")
+	public void setHost(String host) {}
 	@Parameter(optional=true, description=CONTEXT_DESC)
 	public void setContext(String context) {}
 	@Parameter(optional=true, description=CRB_DESC)

com.ibm.streamsx.inetserver/info.xml

@@ -14,7 +14,7 @@ This toolkit separates its functionality into a number of namespaces:
 * [namespace:com.ibm.streamsx.inet.wsserver|com.ibm.streamsx.inet.wsserver]: Operators that embed a (jetty) WebSocket server to expose streaming data as WebSocket messages.
 
     </description>
-    <version>4.0.0</version>
+    <version>4.1.0</version>
     <requiredProductVersion>4.0.1.0</requiredProductVersion>
   </identity>
   <dependencies/>