Skip to content

GitLab

Commit 4fca5c71 authored by legoc's avatar legoc
Browse files

Starting EventStreamSocket refactoring

parent 8884d262
Hide whitespace changes
Inline Side-by-side
cameo-api/src/main/java/fr/ill/ics/cameo/base/EventStreamSocket.java
View file @ 4fca5c71
......@@ -17,158 +17,32 @@ package fr.ill.ics.cameo.base;
import org.json.simple.JSONObject;
import org.json.simple.parser.ParseException;
import fr.ill.ics.cameo.Zmq;
import fr.ill.ics.cameo.messages.JSON;
import fr.ill.ics.cameo.messages.Messages;
import fr.ill.ics.cameo.base.impl.EventStreamSocketImpl;
import fr.ill.ics.cameo.base.impl.zmq.EventStreamSocketZmq;
public class EventStreamSocket {
private Server server;
private Zmq.Socket socket;
private Zmq.Socket cancelSocket;
private boolean canceled = false;
private EventStreamSocketImpl impl;
public EventStreamSocket(Server server, Zmq.Socket subscriber, Zmq.Socket cancelPublisher) {
super();
this.server = server;
this.socket = subscriber;
this.cancelSocket = cancelPublisher;
//TODO Replace with factory.
this.impl = new EventStreamSocketZmq(server, subscriber, cancelPublisher);
}
public Event receive() {
String message = this.socket.recvStr();
Event event = null;
// We can receive messages from the status publisher located in the server
// as well as messages from the cancel publisher located in the same process.
if (message.equals(Messages.Event.STATUS)) {
byte[] statusMessage = this.socket.recv();
try {
// Get the JSON object.
JSONObject jsonObject = server.parse(statusMessage);
int id = JSON.getInt(jsonObject, Messages.StatusEvent.ID);
String name = JSON.getString(jsonObject, Messages.StatusEvent.NAME);
int state = JSON.getInt(jsonObject, Messages.StatusEvent.APPLICATION_STATE);
int pastStates = JSON.getInt(jsonObject, Messages.StatusEvent.PAST_APPLICATION_STATES);
if (jsonObject.containsKey(Messages.StatusEvent.EXIT_CODE)) {
int exitCode = JSON.getInt(jsonObject, Messages.StatusEvent.EXIT_CODE);
event = new StatusEvent(id, name, state, pastStates, exitCode);
}
else {
event = new StatusEvent(id, name, state, pastStates);
}
}
catch (ParseException e) {
throw new UnexpectedException("Cannot parse response");
}
}
else if (message.equals(Messages.Event.RESULT)) {
byte[] resultMessage = this.socket.recv();
try {
// Get the JSON object.
JSONObject jsonObject = server.parse(resultMessage);
int id = JSON.getInt(jsonObject, Messages.ResultEvent.ID);
String name = JSON.getString(jsonObject, Messages.ResultEvent.NAME);
// Get the next message to get the data.
byte[] data = this.socket.recv();
event = new ResultEvent(id, name, data);
}
catch (ParseException e) {
throw new UnexpectedException("Cannot parse response");
}
}
else if (message.equals(Messages.Event.PUBLISHER)) {
byte[] publisherMessage = this.socket.recv();
try {
// Get the JSON object.
JSONObject jsonObject = server.parse(publisherMessage);
int id = JSON.getInt(jsonObject, Messages.PublisherEvent.ID);
String name = JSON.getString(jsonObject, Messages.PublisherEvent.NAME);
String publisherName = JSON.getString(jsonObject, Messages.PublisherEvent.PUBLISHER_NAME);
event = new PublisherEvent(id, name, publisherName);
}
catch (ParseException e) {
throw new UnexpectedException("Cannot parse response");
}
}
else if (message.equals(Messages.Event.PORT)) {
byte[] portMessage = this.socket.recv();
try {
// Get the JSON object.
JSONObject jsonObject = server.parse(portMessage);
int id = JSON.getInt(jsonObject, Messages.PortEvent.ID);
String name = JSON.getString(jsonObject, Messages.PortEvent.NAME);
String portName = JSON.getString(jsonObject, Messages.PortEvent.PORT_NAME);
event = new PortEvent(id, name, portName);
}
catch (ParseException e) {
throw new UnexpectedException("Cannot parse response");
}
}
else if (message.equals(Messages.Event.KEYVALUE)) {
byte[] keyValueMessage = this.socket.recv();
try {
// Get the JSON object.
JSONObject jsonObject = server.parse(keyValueMessage);
int id = JSON.getInt(jsonObject, Messages.KeyEvent.ID);
String name = JSON.getString(jsonObject, Messages.KeyEvent.NAME);
long status = JSON.getLong(jsonObject, Messages.KeyEvent.STATUS);
String key = JSON.getString(jsonObject, Messages.KeyEvent.KEY);
String value = JSON.getString(jsonObject, Messages.KeyEvent.VALUE);
if (status == Messages.STORE_KEY_VALUE) {
event = new KeyEvent(id, name, KeyEvent.Status.STORED, key, value);
}
else {
event = new KeyEvent(id, name, KeyEvent.Status.REMOVED, key, value);
}
}
catch (ParseException e) {
throw new UnexpectedException("Cannot parse response");
}
}
else if (message.equals(Messages.Event.CANCEL)) {
canceled = true;
return null;
}
return event;
return impl.receive();
}
public boolean isCanceled() {
return canceled;
return impl.isCanceled();
}
public void cancel() {
cancelSocket.sendMore(Messages.Event.CANCEL);
cancelSocket.send(Messages.Event.CANCEL);
impl.cancel();
}
public void destroy() {
server.destroySocket(socket);
impl.destroy();
}
}
\ No newline at end of file
cameo-api/src/main/java/fr/ill/ics/cameo/base/Server.java
View file @ 4fca5c71
......@@ -159,11 +159,7 @@ public class Server {
public void destroySocket(Socket socket) {
context.destroySocket(socket);
}
public JSONObject parse(Zmq.Msg reply) throws ParseException {
return parser.parse(Messages.parseString(reply.getFirstData()));
}
public JSONObject parse(byte[] data) throws ParseException {
return parser.parse(Messages.parseString(data));
}
......
cameo-api/src/main/java/fr/ill/ics/cameo/base/impl/EventStreamSocketImpl.java 0 → 100644
View file @ 4fca5c71
package fr.ill.ics.cameo.base.impl;
import fr.ill.ics.cameo.base.Event;
public interface EventStreamSocketImpl {
Event receive();
boolean isCanceled();
void cancel();
void destroy();
}
cameo-api/src/main/java/fr/ill/ics/cameo/base/impl/ServerImpl.java 0 → 100644
View file @ 4fca5c71
package fr.ill.ics.cameo.base.impl;
public interface ServerImpl {
}
cameo-api/src/main/java/fr/ill/ics/cameo/base/impl/zmq/EventStreamSocketZmq.java 0 → 100644
View file @ 4fca5c71
package fr.ill.ics.cameo.base.impl.zmq;
/*
* Copyright 2015 Institut Laue-Langevin
*
* Licensed under the EUPL, Version 1.1 only (the "License");
* You may not use this work except in compliance with the Licence.
* You may obtain a copy of the Licence at:
*
* http://joinup.ec.europa.eu/software/page/eupl
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*/
import org.json.simple.JSONObject;
import org.json.simple.parser.ParseException;
import fr.ill.ics.cameo.Zmq;
import fr.ill.ics.cameo.base.Event;
import fr.ill.ics.cameo.base.KeyEvent;
import fr.ill.ics.cameo.base.PortEvent;
import fr.ill.ics.cameo.base.PublisherEvent;
import fr.ill.ics.cameo.base.ResultEvent;
import fr.ill.ics.cameo.base.Server;
import fr.ill.ics.cameo.base.StatusEvent;
import fr.ill.ics.cameo.base.UnexpectedException;
import fr.ill.ics.cameo.base.impl.EventStreamSocketImpl;
import fr.ill.ics.cameo.messages.JSON;
import fr.ill.ics.cameo.messages.Messages;
public class EventStreamSocketZmq implements EventStreamSocketImpl {
private Server server;
private Zmq.Socket socket;
private Zmq.Socket cancelSocket;
private boolean canceled = false;
public EventStreamSocketZmq(Server server, Zmq.Socket subscriber, Zmq.Socket cancelPublisher) {
super();
this.server = server;
this.socket = subscriber;
this.cancelSocket = cancelPublisher;
}
public Event receive() {
String message = this.socket.recvStr();
Event event = null;
// We can receive messages from the status publisher located in the server
// as well as messages from the cancel publisher located in the same process.
if (message.equals(Messages.Event.STATUS)) {
byte[] statusMessage = this.socket.recv();
try {
// Get the JSON object.
JSONObject jsonObject = server.parse(statusMessage);
int id = JSON.getInt(jsonObject, Messages.StatusEvent.ID);
String name = JSON.getString(jsonObject, Messages.StatusEvent.NAME);
int state = JSON.getInt(jsonObject, Messages.StatusEvent.APPLICATION_STATE);
int pastStates = JSON.getInt(jsonObject, Messages.StatusEvent.PAST_APPLICATION_STATES);
if (jsonObject.containsKey(Messages.StatusEvent.EXIT_CODE)) {
int exitCode = JSON.getInt(jsonObject, Messages.StatusEvent.EXIT_CODE);
event = new StatusEvent(id, name, state, pastStates, exitCode);
}
else {
event = new StatusEvent(id, name, state, pastStates);
}
}
catch (ParseException e) {
throw new UnexpectedException("Cannot parse response");
}
}
else if (message.equals(Messages.Event.RESULT)) {
byte[] resultMessage = this.socket.recv();
try {
// Get the JSON object.
JSONObject jsonObject = server.parse(resultMessage);
int id = JSON.getInt(jsonObject, Messages.ResultEvent.ID);
String name = JSON.getString(jsonObject, Messages.ResultEvent.NAME);
// Get the next message to get the data.
byte[] data = this.socket.recv();
event = new ResultEvent(id, name, data);
}
catch (ParseException e) {
throw new UnexpectedException("Cannot parse response");
}
}
else if (message.equals(Messages.Event.PUBLISHER)) {
byte[] publisherMessage = this.socket.recv();
try {
// Get the JSON object.
JSONObject jsonObject = server.parse(publisherMessage);
int id = JSON.getInt(jsonObject, Messages.PublisherEvent.ID);
String name = JSON.getString(jsonObject, Messages.PublisherEvent.NAME);
String publisherName = JSON.getString(jsonObject, Messages.PublisherEvent.PUBLISHER_NAME);
event = new PublisherEvent(id, name, publisherName);
}
catch (ParseException e) {
throw new UnexpectedException("Cannot parse response");
}
}
else if (message.equals(Messages.Event.PORT)) {
byte[] portMessage = this.socket.recv();
try {
// Get the JSON object.
JSONObject jsonObject = server.parse(portMessage);
int id = JSON.getInt(jsonObject, Messages.PortEvent.ID);
String name = JSON.getString(jsonObject, Messages.PortEvent.NAME);
String portName = JSON.getString(jsonObject, Messages.PortEvent.PORT_NAME);
event = new PortEvent(id, name, portName);
}
catch (ParseException e) {
throw new UnexpectedException("Cannot parse response");
}
}
else if (message.equals(Messages.Event.KEYVALUE)) {
byte[] keyValueMessage = this.socket.recv();
try {
// Get the JSON object.
JSONObject jsonObject = server.parse(keyValueMessage);
int id = JSON.getInt(jsonObject, Messages.KeyEvent.ID);
String name = JSON.getString(jsonObject, Messages.KeyEvent.NAME);
long status = JSON.getLong(jsonObject, Messages.KeyEvent.STATUS);
String key = JSON.getString(jsonObject, Messages.KeyEvent.KEY);
String value = JSON.getString(jsonObject, Messages.KeyEvent.VALUE);
if (status == Messages.STORE_KEY_VALUE) {
event = new KeyEvent(id, name, KeyEvent.Status.STORED, key, value);
}
else {
event = new KeyEvent(id, name, KeyEvent.Status.REMOVED, key, value);
}
}
catch (ParseException e) {
throw new UnexpectedException("Cannot parse response");
}
}
else if (message.equals(Messages.Event.CANCEL)) {
canceled = true;
return null;
}
return event;
}
public boolean isCanceled() {
return canceled;
}
public void cancel() {
cancelSocket.sendMore(Messages.Event.CANCEL);
cancelSocket.send(Messages.Event.CANCEL);
}
public void destroy() {
server.destroySocket(socket);
}
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment