querySubscriptions(Message message)
throws EdexException {
- ISubscribeRunner runner = SubscribeRunner
- .getInstance(SUBSCRIBE_OPERATION);
- runner.initialize(message);
+ SubscribeQueryRunner runner = new SubscribeQueryRunner(message);
runner.execute();
- return runner.getResults();
+ return runner.getDirectResults();
}
/**
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/services/SubscribeManager.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/services/SubscriptionRequestHandler.java
similarity index 55%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/services/SubscribeManager.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/services/SubscriptionRequestHandler.java
index b789968209..e085663e88 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/services/SubscribeManager.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/services/SubscriptionRequestHandler.java
@@ -22,21 +22,18 @@ package com.raytheon.uf.edex.plugin.text.subscription.services;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
+import com.raytheon.uf.common.dataplugin.text.request.SubscriptionRequest;
import com.raytheon.uf.common.message.Header;
import com.raytheon.uf.common.message.Message;
import com.raytheon.uf.common.message.Property;
-import com.raytheon.uf.common.serialization.SerializationUtil;
+import com.raytheon.uf.common.serialization.comm.IRequestHandler;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.edex.plugin.text.subscription.runners.ISubscribeRunner;
import com.raytheon.uf.edex.plugin.text.subscription.runners.SubscribeRunner;
-import com.raytheon.uf.edex.plugin.text.subscription.util.Tools;
/**
- * The main class of the Subscription Manager. Receives and processes
- * subscription requests from a client. Returns a response based on the result
- * of processing the request.
+ * Thrift handler for text subscription requests
*
*
*
@@ -44,45 +41,43 @@ import com.raytheon.uf.edex.plugin.text.subscription.util.Tools;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
- * 15Dec2008 1709 MW Fegan Initial Creation. Replaces SubscribeSrv.
- * May 22, 2014 2536 bclement moved from autobldsrv to edex.plugin.text
+ * Sep 5, 2014 2926 bclement Initial creation, replaced SubscribeManager
*
*
*
- * @author mfegan
+ * @author bclement
* @version 1.0
*/
+public class SubscriptionRequestHandler implements
+ IRequestHandler {
+
+ private static final IUFStatusHandler logger = UFStatus
+ .getHandler(SubscriptionRequestHandler.class);
-public class SubscribeManager {
- private transient Log logger = LogFactory.getLog(getClass());
/**
- * Constructor.
+ *
*/
- public SubscribeManager() {
- super();
+ public SubscriptionRequestHandler() {
}
- /**
- * Processes the subscription request.
- *
- * @param requestXML XML containing the request
- *
- * @return the response to the request
+
+ /* (non-Javadoc)
+ * @see com.raytheon.uf.common.serialization.comm.IRequestHandler#handleRequest(com.raytheon.uf.common.serialization.comm.IServerRequest)
*/
- public Message processRequest(String requestXML) {
+ @Override
+ public Object handleRequest(SubscriptionRequest request) throws Exception {
String msg = "";
- logger.debug("Processing request: " + requestXML);
List results = null;
try {
- Message xml = parseMessage(requestXML);
- String oper = xml.getHeader().getProperty("operation");
+ Message requestMsg = request.getMessage();
+ String oper = requestMsg.getHeader().getProperty("operation");
ISubscribeRunner runner = SubscribeRunner.getInstance(oper);
if (null == runner) {
msg = "Unable to get subscription runner for " + oper;
logger.warn(msg);
results = new ArrayList();
- results.add(new Property("STDERR",msg));
+ results.add(new Property("STDERR", msg));
} else {
- runner.initialize(xml);
+ runner.initialize(requestMsg);
runner.execute();
results = runner.getResults();
}
@@ -90,44 +85,28 @@ public class SubscribeManager {
msg = "Unable to process message. " + e.toString();
logger.error(msg, e);
results = new ArrayList();
- results.add(new Property("STDERR",msg));
+ results.add(new Property("STDERR", msg));
}
Message xmlMsg = createMessage(results);
return xmlMsg;
}
+
/**
* Creates a Message object containing the results of the the execution.
*
- * @param result the result to convert to a message
+ * @param result
+ * the result to convert to a message
*
* @return message object containing the result
*/
private final Message createMessage(List result) {
Message msg = new Message();
Header h = new Header();
- h.setProperties(result.toArray(new Property[] {} ));
-
+ h.setProperties(result.toArray(new Property[] {}));
+
msg.setHeader(h);
return msg;
}
- /**
- *
- * @param message
- * @return
- * @throws Exception
- */
- private final Message parseMessage(String message) throws Exception {
- Object m = SerializationUtil.unmarshalFromXml(message);
- if (m instanceof Message) {
- for (Property property : ((Message) m).getHeader().getProperties()) {
- if (!"script".equalsIgnoreCase(property.getName())) {
- property.setValue(Tools.hexToAscii(property.getValue()));
- }
- }
- return (Message)m;
- }
- return null;
- }
}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/SubscribeAction.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/SubscribeAction.java
index 9306d5a09a..6ef19961a4 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/SubscribeAction.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/SubscribeAction.java
@@ -24,6 +24,7 @@ import java.util.Map;
import com.raytheon.uf.common.message.Message;
import com.raytheon.uf.edex.plugin.text.subscription.runners.ASubscribeRunner;
+import com.raytheon.uf.edex.plugin.text.subscription.runners.ISubscribeRunner;
import com.raytheon.uf.edex.plugin.text.subscription.runners.SubscribeAddRunner;
import com.raytheon.uf.edex.plugin.text.subscription.runners.SubscribeDeleteRunner;
import com.raytheon.uf.edex.plugin.text.subscription.runners.SubscribeQueryRunner;
@@ -45,6 +46,7 @@ import com.raytheon.uf.edex.plugin.text.subscription.runners.SubscribeUpdateRunn
* 14Nov2008 1709 MW Fegan Initial creation.
* May 22, 2014 2536 bclement moved from autobldsrv to edex.plugin.text
* removed hard coded class names
+ * Sep 05, 2014 2926 bclement switched map from class names to class objects
*
*
*
@@ -67,17 +69,18 @@ public enum SubscribeAction {
put("query",ACTION_QUERY);
}
};
+
/**
- * A mapping of SubscribeAction objects to implementation class names.
+ * A mapping of SubscribeAction objects to implementation class
*/
- private static final Map runners = new HashMap() {
+ private static final Map> runners = new HashMap>() {
private static final long serialVersionUID = 1L;
{
- put(ACTION_ADD, SubscribeAddRunner.class.getName());
- put(ACTION_READ, SubscribeReadRunner.class.getName());
- put(ACTION_DELETE, SubscribeDeleteRunner.class.getName());
- put(ACTION_UPDATE, SubscribeUpdateRunner.class.getName());
- put(ACTION_QUERY, SubscribeQueryRunner.class.getName());
+ put(ACTION_ADD, SubscribeAddRunner.class);
+ put(ACTION_READ, SubscribeReadRunner.class);
+ put(ACTION_DELETE, SubscribeDeleteRunner.class);
+ put(ACTION_UPDATE, SubscribeUpdateRunner.class);
+ put(ACTION_QUERY, SubscribeQueryRunner.class);
}
};
/**
@@ -97,7 +100,7 @@ public enum SubscribeAction {
/**
* Returns the class name of the runner associated with the action.
*/
- public final String getRunner() {
+ public final Class getRunner() {
return runners.get(this);
}
}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/Tools.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/Tools.java
index ce26ab817c..52a8dc64aa 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/Tools.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/Tools.java
@@ -20,10 +20,9 @@
package com.raytheon.uf.edex.plugin.text.subscription.util;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
-import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
-
import com.raytheon.uf.common.message.Property;
/**
@@ -38,6 +37,7 @@ import com.raytheon.uf.common.message.Property;
* 14Nov2008 1709 MW Fegan Initial creation.
* 14Sep2010 3944 cjeanbap Trim the newline char from value.
* May 22, 2014 2536 bclement moved from autobldsrv to edex.plugin.text
+ * Sep 05, 2014 2926 bclement removed hex utilities
*
*
*
@@ -53,6 +53,7 @@ public final class Tools {
private Tools() {
super();
}
+
/**
*
* @param properties
@@ -78,12 +79,4 @@ public final class Tools {
return retVal;
}
- public static final String AsciiToHex(String string) {
- return new HexBinaryAdapter().marshal(string.getBytes());
- }
-
- public static final String hexToAscii(String hexString) {
- byte[] b = new HexBinaryAdapter().unmarshal(hexString);
- return new String(b);
- }
}
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/subscription/SubscriptionManager.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/subscription/SubscriptionManager.py
index 4736382d30..78896be429 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/subscription/SubscriptionManager.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/subscription/SubscriptionManager.py
@@ -23,11 +23,15 @@ import types
import lib.CommandLine as CL
import lib.InputOutput as IO
-import lib.CommHandler as CH
import lib.Message as MSG
import lib.Util as util
import conf.SMConfig as config
+import collections
+
+from ufpy import ThriftClient
+from dynamicserialize.dstypes.com.raytheon.uf.common.message import Message, Header, Property
+from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.text.request import SubscriptionRequest
##############################################################################
# Class providing a command line interface to the EDEX Subscription Service
# (SubscribeSrv) end-point. The package design, is to allow this class to run
@@ -267,16 +271,13 @@ class SubscriptionManager:
# 1: indicates the execution was unsuccessful
def __processRequest(self):
msg = self.__createMessage()
- service = config.endpoint.get('subscribe')
- connection=str(os.getenv("DEFAULT_HOST", "localhost") + ":" + os.getenv("DEFAULT_PORT", "9581"))
- ch = CH.CommHandler(connection, service)
- ch.process(msg)
-
- if not ch.isGoodStatus():
- util.reportHTTPResponse(ch.formatResponse())
-
- retVal = self.__processResponse(ch.getContents())
-
+ host = os.getenv("DEFAULT_HOST", "localhost")
+ port = os.getenv("DEFAULT_PORT", "9581")
+ tClient = ThriftClient.ThriftClient(host, port)
+ req = SubscriptionRequest()
+ req.setMessage(msg)
+ resp = tClient.sendRequest(req)
+ retVal = self.__processResponse(resp)
return retVal
# Processes the request and reports the results. Data is
@@ -288,14 +289,12 @@ class SubscriptionManager:
# return:
# 0 if the message contained valid results, 0 otherwise
def __processResponse(self,msg):
- psr = MSG.Message(False)
- psr.parse(msg)
status = 0
io = IO.InputOutput()
# process the return message
- for prop in psr.getProperties():
- name = prop['name']
- value = prop['value']
+ for prop in msg.getHeader().getProperties():
+ name = prop.getName()
+ value = prop.getValue()
if name == 'STDERR':
parts = value.split(':',2)
if parts[0] == 'ERROR':
@@ -312,24 +311,23 @@ class SubscriptionManager:
# return:
# the request message
def __createMessage(self):
- msg = MSG.Message(True)
- msg.initializeMessage(False)
+ multimap = collections.defaultdict(list)
for key in self.commands:
if key == 'mode':
pass
elif key == 'substitution':
dict = util.convListToDict(self.commands.get(key))
for sub in dict:
- msg.addProperty(name='substitution',value=str(sub)+":"+str(dict.get(sub)))
+ multimap['substitution'].append(str(sub)+":"+str(dict.get(sub)))
elif key == 'update':
dict = util.convListToDict(self.commands.get(key))
for sub in dict:
- msg.addProperty(name='update',value=str(sub)+":"+str(dict.get(sub)))
+ multimap['update'].append(str(sub)+":"+str(dict.get(sub)))
else:
- msg.addProperty(name=key,value=self.commands.get(key))
+ multimap[key].append(self.commands.get(key))
if self.__hasScript():
- msg.addProperty(name='script',value=self.script)
- return msg.getXML()
+ multimap['script'].append(self.script)
+ return Message(header=Header(multimap=multimap))
# main class method. Performs the subscription update request.
#
@@ -361,4 +359,4 @@ class SubscriptionManager:
if __name__ == "__main__":
ue = SubscriptionManager()
status = ue.execute()
- exit(status)
\ No newline at end of file
+ exit(status)
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
index 2c3b901e78..00922d8092 100644
--- a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
@@ -26,7 +26,8 @@ __all__ = [
'grid',
'level',
'message',
- 'radar'
+ 'radar',
+ 'text'
]
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/__init__.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/__init__.py
index 51492cf956..b9f43d824f 100644
--- a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/__init__.py
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/__init__.py
@@ -21,7 +21,8 @@
# File auto-generated by PythonFileGenerator
__all__ = [
- 'dbsrv'
+ 'dbsrv',
+ 'request'
]
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/request/SubscriptionRequest.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/request/SubscriptionRequest.py
new file mode 100644
index 0000000000..237472774c
--- /dev/null
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/request/SubscriptionRequest.py
@@ -0,0 +1,39 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+#
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+#
+# Contractor Name: Raytheon Company
+# Contractor Address: 6825 Pine Street, Suite 340
+# Mail Stop B8
+# Omaha, NE 68106
+# 402.291.0100
+#
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+# File auto-generated against equivalent DynamicSerialize Java class
+#
+# SOFTWARE HISTORY
+#
+# Date Ticket# Engineer Description
+# ------------ ---------- ----------- --------------------------
+# Sep 05, 2014 bclement Generated
+
+class SubscriptionRequest(object):
+
+ def __init__(self):
+ self.message = None
+
+ def getMessage(self):
+ return self.message
+
+ def setMessage(self, message):
+ self.message = message
+
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/request/__init__.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/request/__init__.py
new file mode 100644
index 0000000000..b09a6894e3
--- /dev/null
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/request/__init__.py
@@ -0,0 +1,28 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+#
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+#
+# Contractor Name: Raytheon Company
+# Contractor Address: 6825 Pine Street, Suite 340
+# Mail Stop B8
+# Omaha, NE 68106
+# 402.291.0100
+#
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+# File auto-generated by PythonFileGenerator
+
+__all__ = [
+ 'SubscriptionRequest'
+ ]
+
+from SubscriptionRequest import SubscriptionRequest
+