From 75595db7df826fb23869255e6677e1a98d2b0f9b Mon Sep 17 00:00:00 2001 From: john Date: Thu, 21 Sep 2023 12:54:22 +1000 Subject: [PATCH] Refactoring_21/09/2023_1 Cleaned up Kafka Topology Cleaned up Market Data output from matching engine Wrapped up Marketdata into Sender to encapsulate binary message, Topic and Key in one object. --- administrator/version.properties | 4 +- .../matching/AlignmentFIXEngineExchange.java | 3 +- .../AlignmentFIXEngineKafkaConsumer.java | 1 + .../AlignmentFIXEngineKafkaProducer.java | 2 +- .../AlignmentFIXToBinaryProcessor.java | 3 +- .../matching/AlignmentInstanceWrapper.java | 31 ++- .../matching/AlignmentOrderBook.java | 11 +- .../AlignmentOrderBookKafkaConsumer.java | 10 +- .../AlignmentOrderBookKafkaProducer.java | 32 ++- .../matching/AlignmentQueueNonSequenced.java | 1 + .../matching/AlignmentQueueSequenced.java | 1 + exchange/version.properties | 4 +- fixclient/version.properties | 4 +- .../multicast/MulticastInstanceWrapper.java | 37 ++- .../MulticastServerKafkaListener.java | 15 +- multicastserver/version.properties | 4 +- .../library/AlignmentExecutionReport.java | 245 ++++++++++++------ .../library/AlignmentLogEncapsulation.java | 13 +- .../library/AlignmentMatch.java | 12 +- .../library/AlignmentOrder.java | 14 +- .../AlignmentPersistenceToFileClient.java | 32 +-- .../AlignmentPersistenceToFileServer.java | 4 +- .../library}/AlignmentUEH.java | 4 +- .../library/constants/Constants.java | 92 +++---- .../constants/KafkaMessageTopology.java | 27 ++ ...y.java => ExecutionReportDestination.java} | 23 +- .../library/enumerations/OrderBookSide.java | 27 +- .../enumerations/OrderDistributionModel.java | 25 -- ...istenceRecordType.java => RecordType.java} | 4 +- .../InterfaceCustomLoggerMessage.java | 1 + .../interfaces/InterfaceExecutionReport.java | 8 +- .../InterfaceOperationEventInner.java | 6 +- .../library/interfaces/InterfaceOrder.java | 3 +- sharedlibrary/version.properties | 4 +- 34 files changed, 442 insertions(+), 265 deletions(-) rename {exchange/src/main/java/com/alignmentsystems/matching => sharedlibrary/src/main/java/com/alignmentsystems/library}/AlignmentUEH.java (90%) create mode 100644 sharedlibrary/src/main/java/com/alignmentsystems/library/constants/KafkaMessageTopology.java rename sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/{EventStatusCategory.java => ExecutionReportDestination.java} (51%) delete mode 100644 sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/OrderDistributionModel.java rename sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/{PersistenceRecordType.java => RecordType.java} (89%) diff --git a/administrator/version.properties b/administrator/version.properties index 0ec80cd..d0e4c60 100644 --- a/administrator/version.properties +++ b/administrator/version.properties @@ -1,2 +1,2 @@ -#Wed Sep 20 23:33:32 AEST 2023 -VERSION_BUILD=786 +#Thu Sep 21 12:39:55 AEST 2023 +VERSION_BUILD=802 diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineExchange.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineExchange.java index d71135d..61af1d9 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineExchange.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineExchange.java @@ -29,6 +29,7 @@ import com.alignmentsystems.library.AlignmentLogEncapsulation; import com.alignmentsystems.library.AlignmentOrder; import com.alignmentsystems.library.AlignmentPersistenceToFileClient; +import com.alignmentsystems.library.AlignmentUEH; import com.alignmentsystems.library.constants.Constants; import com.alignmentsystems.library.enumerations.Encodings; import com.alignmentsystems.library.enumerations.InstanceType; @@ -329,7 +330,7 @@ public void onMessage(com.alignmentsystems.fix44.NewOrderSingle message, Session try { debugger.debug("Sending order to Kafka..."); - AlignmentKafkaSender sender = ao.getBytesAsSBEInSender(); + AlignmentKafkaSender sender = ao.getBytesForMemberAsSBEInSender(); this.send(sender); log.infoFIXSession(sb.toString(), sessionID, MessageDirection.RECEIVED, METHOD, diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaConsumer.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaConsumer.java index ee31d21..2fa9060 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaConsumer.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaConsumer.java @@ -24,6 +24,7 @@ import com.alignmentsystems.library.AlignmentFunctions; import com.alignmentsystems.library.AlignmentLogEncapsulation; import com.alignmentsystems.library.AlignmentPersistenceToFileClient; +import com.alignmentsystems.library.AlignmentUEH; import com.alignmentsystems.library.enumerations.InstanceType; import com.alignmentsystems.library.interfaces.InterfaceKafkaAbstractSimple; import com.alignmentsystems.library.interfaces.InterfaceKafkaMessageHandler; diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaProducer.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaProducer.java index 8ccd0af..7017359 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaProducer.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaProducer.java @@ -21,10 +21,10 @@ import com.alignmentsystems.library.AlignmentKafkaSender; import com.alignmentsystems.library.AlignmentLogEncapsulation; import com.alignmentsystems.library.AlignmentPersistenceToFileClient; +import com.alignmentsystems.library.AlignmentUEH; import com.alignmentsystems.library.enumerations.InstanceType; import com.alignmentsystems.library.interfaces.InterfaceKafkaProducer; import com.alignmentsystems.library.interfaces.InterfaceOrderSender; -import com.alignmentsystems.matching.AlignmentUEH; public class AlignmentFIXEngineKafkaProducer implements InterfaceKafkaProducer, Runnable , InterfaceOrderSender { public final static String CLASSNAME = AlignmentFIXEngineKafkaProducer.class.getSimpleName(); diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXToBinaryProcessor.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXToBinaryProcessor.java index 5c8ab51..17b5a98 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXToBinaryProcessor.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXToBinaryProcessor.java @@ -11,6 +11,7 @@ import com.alignmentsystems.library.AlignmentKafkaSender; import com.alignmentsystems.library.AlignmentFunctions; import com.alignmentsystems.library.AlignmentLogEncapsulation; +import com.alignmentsystems.library.AlignmentUEH; import com.alignmentsystems.library.constants.Constants; import com.alignmentsystems.library.enumerations.InstanceType; import com.alignmentsystems.library.interfaces.InterfaceFIXToBinaryProcessor; @@ -80,7 +81,7 @@ public void run() { if (inSeq != null) { - AlignmentKafkaSender sender = inSeq.getBytesAsSBEInSender(); + AlignmentKafkaSender sender = inSeq.getBytesForMemberAsSBEInSender(); this.send(sender.getTopic(), sender.getKey(), sender.getBinaryMessage()); sender = null; } diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentInstanceWrapper.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentInstanceWrapper.java index 2e379a5..b8c91c4 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentInstanceWrapper.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentInstanceWrapper.java @@ -18,7 +18,10 @@ import com.alignmentsystems.library.AlignmentFunctions; import com.alignmentsystems.library.AlignmentLogEncapsulation; import com.alignmentsystems.library.AlignmentPersistenceToFileClient; +import com.alignmentsystems.library.AlignmentUEH; +import com.alignmentsystems.library.constants.Constants; import com.alignmentsystems.library.constants.FailureConditionConstants; +import com.alignmentsystems.library.constants.KafkaMessageTopology; import com.alignmentsystems.library.enumerations.InstanceType; import com.alignmentsystems.library.interfaces.InterfaceInstanceWrapper; @@ -132,11 +135,12 @@ private Boolean initialiseOrderBook(InstanceType instanceType) { private Boolean initialiseFIXMessagingInfrastructure(InstanceType instanceType) { final String METHOD = "initialiseFIXMessagingInfrastructure"; + final String ID = CLASSNAME + Constants.FULLSTOP + METHOD; AlignmentPersistenceToFileClient debugger = new AlignmentPersistenceToFileClient(); try { debugger.initialise(this.getClass().getClassLoader() , InstanceType.FIXMESSAGINGINFRA.getProperties()); - debugger.info(CLASSNAME + "." + METHOD); + debugger.info(ID); } catch (IllegalThreadStateException | IOException e) { log.error(e.getMessage(), e); return false; @@ -161,13 +165,13 @@ private Boolean initialiseFIXMessagingInfrastructure(InstanceType instanceType) if (names.isEmpty()) { // case: if no topic found. - log.error("No Topics Found"); + log.error(ID + ":No Topics Found"); return false; } } catch (Exception e){ // Kafka is not available - log.error("Kafka is not available".toUpperCase()); + log.error(ID + ":Kafka is not available".toUpperCase()); log.error(e.getMessage() , e); System.err.println(e.getMessage()); System.exit(FailureConditionConstants.KAFKA_NOT_RUNNING); @@ -234,7 +238,7 @@ private Boolean initialiseFIXMessagingInfrastructure(InstanceType instanceType) try { - debugger.debug("Start threads"); + debugger.debug(ID + ":Start threads..."); Thread.currentThread().setName(instanceType.type ); threadFixToBinaryProcessor.start(); @@ -251,7 +255,7 @@ private Boolean initialiseFIXMessagingInfrastructure(InstanceType instanceType) AlignmentFIXEngineExchange engineExchange = new AlignmentFIXEngineExchange(); try { - debugger.debug("Initialise FIX engine"); + debugger.debug(ID + ":Initialise FIX engine"); engineExchange.initialise(log , debugger , instanceType ); engines.add(engineExchange); } catch (FileNotFoundException | NullPointerException e) { @@ -262,16 +266,16 @@ private Boolean initialiseFIXMessagingInfrastructure(InstanceType instanceType) final String[] acceptors = { InstanceType.EXCHANGEFIXACCEPTOR.getProperties() }; - debugger.debug("get" + acceptors[0]); + debugger.debug(ID + ":Get" + acceptors[0]); Acceptor exchange = null; try { - debugger.debug("Request start FIX engine"); + debugger.debug(ID + ":Request start FIX engine"); exchange = getExchangeEnvironment(acceptors[0], engineExchange); exchange.start(); - debugger.debug("Requested start FIX engine"); + debugger.debug(ID + ":Requested start FIX engine"); } catch (NullPointerException | RuntimeError | ConfigError e) { log.error(e.getMessage(), e); System.err.println(e.getMessage()); @@ -279,7 +283,7 @@ private Boolean initialiseFIXMessagingInfrastructure(InstanceType instanceType) } - debugger.debug("Request list threads"); + debugger.debug(ID + ":Request list threads"); Set threadSet = Thread.getAllStackTraces().keySet(); @@ -288,13 +292,12 @@ private Boolean initialiseFIXMessagingInfrastructure(InstanceType instanceType) AlignmentFunctions.threadStatusCheck(namesIterator.next(), debugger); } - final List messagesToBeReceivedByFIXEngine = List.of("fill","ack","rej"); - + try { - debugger.debug("Start KafkaConsumer"); - fixEngineKafkaConsumer.runAlways(messagesToBeReceivedByFIXEngine, engineExchange); - debugger.debug("Started KafkaConsumer"); + debugger.debug(ID + ":Start KafkaConsumer"); + fixEngineKafkaConsumer.runAlways(KafkaMessageTopology.MESSAGESTOBERECEIVEDBYEXCHANGEFIXENGINEFROMMATCHINGENGINE, engineExchange); + debugger.debug(ID + ":Started KafkaConsumer"); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBook.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBook.java index b36ad78..1277205 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBook.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBook.java @@ -102,13 +102,11 @@ public String getThisOrderBookSymbol() { @NotYetImplemented private boolean cancelOrder(InterfaceOrder nos) { - // TODO Auto-generated method stub return false; } @NotYetImplemented private boolean cancelOrder(String orderId) { - // TODO Auto-generated method stub return false; } @@ -203,6 +201,8 @@ private void runMatch() { case BUY: tradedPrice = Math.min(topOfBuyBookPrice, topOfSellBookPrice); break; + default: + break; } OffsetDateTime executionTimestamp = OffsetDateTime.now(Constants.HERE); @@ -255,15 +255,11 @@ private void runMatch() { @NotYetImplemented @Override public void upsertTopOfBook(InterfaceOrder nos) { - // TODO Auto-generated method stub - } @NotYetImplemented @Override public void updateLevelsOfDepth() { - // TODO Auto-generated method stub - } @Override @@ -321,7 +317,6 @@ public int getOrderCountBySide(OrderBookSide orderBookSide) { @Override @NotYetImplemented public List getOrderBookVisualisation() { - // TODO Auto-generated method stub return null; } @@ -343,7 +338,6 @@ public void matchHappened(InterfaceMatch match) { @Override public void processMessage(String topicName, ConsumerRecord message) throws Exception { - // TODO Auto-generated method stub InterfaceOrder io = new AlignmentOrder(); io.getAlignmentOrderFromBuffer(message.value()); @@ -390,6 +384,7 @@ private static InterfaceExecutionReport getExecutionReportAcknowledgementForOrd null , nos.getClOrdID() , nos.getOrderId() + , null , nos.getSender() , nos.getTarget() , null diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaConsumer.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaConsumer.java index d4811d5..32382a1 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaConsumer.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaConsumer.java @@ -53,11 +53,10 @@ public AlignmentOrderBookKafkaConsumer() throws Exception { public boolean initialise(AlignmentLogEncapsulation log, AlignmentPersistenceToFileClient debugger) throws FileNotFoundException , NullPointerException{ final String METHOD = "initialise"; - this.log = log; this.debugger = debugger; - log.info(CLASSNAME + "." + METHOD); + this.debugger.info(CLASSNAME + "." + METHOD); try { @@ -69,6 +68,7 @@ public boolean initialise(AlignmentLogEncapsulation log, AlignmentPersistenceToF return Boolean.TRUE; } + public void setKafkaConsumer(KafkaConsumer kafkaConsumer) { this.kafkaConsumer = kafkaConsumer; } @@ -186,8 +186,6 @@ public void runAlways(List topicNames, InterfaceKafkaMessageHandler call // Ignore exception if closing if (!closed.get()) throw e; - } - + } } - -} +} \ No newline at end of file diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaProducer.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaProducer.java index 10d8ba0..9d12f18 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaProducer.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaProducer.java @@ -23,6 +23,8 @@ import com.alignmentsystems.library.AlignmentFunctions; import com.alignmentsystems.library.AlignmentLogEncapsulation; import com.alignmentsystems.library.AlignmentPersistenceToFileClient; +import com.alignmentsystems.library.AlignmentUEH; +import com.alignmentsystems.library.constants.KafkaMessageTopology; import com.alignmentsystems.library.enumerations.InstanceType; import com.alignmentsystems.library.enumerations.OperationEventType; import com.alignmentsystems.library.interfaces.InterfaceAddedOrderToOrderBook; @@ -33,6 +35,7 @@ import com.alignmentsystems.library.interfaces.InterfaceOrderBookEvents; public class AlignmentOrderBookKafkaProducer implements InterfaceKafkaProducer, InterfaceMatchEvent, InterfaceAddedOrderToOrderBook, InterfaceOrderBookEvents, Runnable { + public final static String CLASSNAME = AlignmentOrderBookKafkaProducer.class.getSimpleName(); private KafkaProducer kafkaProducerB = null; private AlignmentLogEncapsulation log = null; private AlignmentPersistenceToFileClient debugger = null; @@ -90,43 +93,49 @@ public void run() { public void matchHappened(InterfaceMatch match) { @SuppressWarnings("unused") final String methodName = "matchHappened"; - final String TOPIC = "FILL"; log.infoMatchingEvent(OperationEventType.MATCHEVENT, match); - AlignmentKafkaSender senderBuy = match.getBuyReport().getSenderForTopic(TOPIC); - AlignmentKafkaSender senderSell = match.getSellReport().getSenderForTopic(TOPIC); - + AlignmentKafkaSender senderBuy = match.getBuyReport().getMemberExecRptAsSBEInSender(); + AlignmentKafkaSender senderSell = match.getSellReport().getMemberExecRptAsSBEInSender(); + AlignmentKafkaSender marketDataOut = match.getMarketDataBytesAsSBEInSender(); + this.send(senderBuy.getTopic() , senderBuy.getKey(), senderBuy.getBinaryMessage()); this.send(senderSell.getTopic() , senderSell.getKey(), senderSell.getBinaryMessage()); + this.send(marketDataOut.getTopic(), marketDataOut.getKey(), marketDataOut.getBinaryMessage()); + + } @Override public void addedOrderToOrderBook(InterfaceExecutionReport er) { @SuppressWarnings("unused") final String methodName = "addedOrderToOrderBook"; - final String TOPIC = "ACK"; - //log.infoMatchingEvent(OperationEventType.NEWORDEREVENT, er); - AlignmentKafkaSender senderAck= er.getSenderForTopic(TOPIC); + log.infoMatchingEvent(OperationEventType.NEWORDEREVENT, er); + AlignmentKafkaSender senderAck= er.getMemberExecRptAsSBEInSender(); this.send(senderAck.getTopic(), senderAck.getKey(), senderAck.getBinaryMessage()); } @Override - public boolean initialise(AlignmentLogEncapsulation log, AlignmentPersistenceToFileClient debugger) - throws FileNotFoundException, NullPointerException { + public boolean initialise(AlignmentLogEncapsulation log, AlignmentPersistenceToFileClient debugger) throws FileNotFoundException, NullPointerException { + final String METHOD = "initialise"; + this.log = log; this.debugger = debugger; + AlignmentUEH ueh = new AlignmentUEH(this.debugger); + Thread.setDefaultUncaughtExceptionHandler(ueh); - + + debugger.info(CLASSNAME + "." + METHOD); if (this.kafkaProducerB == null) { Properties props; try { - props = AlignmentFunctions.getProperties(AlignmentFIXToBinaryProcessor.class.getClassLoader(), InstanceType.KAFKA.getProperties()); + props = AlignmentFunctions.getProperties(AlignmentOrderBookKafkaProducer.class.getClassLoader(), InstanceType.KAFKA.getProperties()); } catch (FileNotFoundException | NullPointerException e) { this.log.error(e.getMessage() , e); throw e; @@ -134,6 +143,5 @@ public boolean initialise(AlignmentLogEncapsulation log, AlignmentPersistenceToF this.kafkaProducerB = new KafkaProducer<>(props); } return true; - } } \ No newline at end of file diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueNonSequenced.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueNonSequenced.java index 1af5425..b35f207 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueNonSequenced.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueNonSequenced.java @@ -15,6 +15,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import com.alignmentsystems.library.AlignmentLogEncapsulation; +import com.alignmentsystems.library.AlignmentUEH; import com.alignmentsystems.library.constants.Constants; import com.alignmentsystems.library.interfaces.InterfaceOrder; import com.alignmentsystems.library.interfaces.InterfaceQueueNonSequenced; diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueSequenced.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueSequenced.java index a0271f2..1a289ae 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueSequenced.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueSequenced.java @@ -16,6 +16,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicBoolean; +import com.alignmentsystems.library.AlignmentUEH; import com.alignmentsystems.library.constants.Constants; import com.alignmentsystems.library.interfaces.InterfaceOrder; import com.alignmentsystems.library.interfaces.InterfaceQueueSequencedDeduplicated; diff --git a/exchange/version.properties b/exchange/version.properties index 68ad657..065380d 100644 --- a/exchange/version.properties +++ b/exchange/version.properties @@ -1,2 +1,2 @@ -#Wed Sep 20 23:33:32 AEST 2023 -VERSION_BUILD=784 +#Thu Sep 21 12:39:56 AEST 2023 +VERSION_BUILD=800 diff --git a/fixclient/version.properties b/fixclient/version.properties index 0ec80cd..22b4c21 100644 --- a/fixclient/version.properties +++ b/fixclient/version.properties @@ -1,2 +1,2 @@ -#Wed Sep 20 23:33:32 AEST 2023 -VERSION_BUILD=786 +#Thu Sep 21 12:39:56 AEST 2023 +VERSION_BUILD=802 diff --git a/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastInstanceWrapper.java b/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastInstanceWrapper.java index 7d03f9f..9c54b47 100644 --- a/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastInstanceWrapper.java +++ b/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastInstanceWrapper.java @@ -10,10 +10,16 @@ * Description : *****************************************************************************/ +import java.io.IOException; + import com.alignmentsystems.library.AlignmentFunctions; import com.alignmentsystems.library.AlignmentLogEncapsulation; +import com.alignmentsystems.library.AlignmentPersistenceToFileClient; +import com.alignmentsystems.library.constants.Constants; +import com.alignmentsystems.library.constants.KafkaMessageTopology; import com.alignmentsystems.library.enumerations.InstanceType; import com.alignmentsystems.library.interfaces.InterfaceInstanceWrapper; +import com.alignmentsystems.matching.AlignmentInstanceWrapper; /** * @author John Greenan * @@ -21,25 +27,46 @@ public class MulticastInstanceWrapper implements InterfaceInstanceWrapper{ private final String CLASSNAME = this.getClass().getSimpleName(); private InstanceType instanceType ; - private final static String MARKETDATATOPIC = "MDOUT"; private AlignmentLogEncapsulation log = new AlignmentLogEncapsulation(this.getClass()); @Override public boolean initialise(InstanceType instanceType) { - + final String METHOD = "initialise"; + final String ID = CLASSNAME + Constants.FULLSTOP + METHOD; this.instanceType = instanceType; + + + + AlignmentPersistenceToFileClient debugger = new AlignmentPersistenceToFileClient(); + + + try { + debugger.initialise(MulticastInstanceWrapper.class.getClassLoader(), InstanceType.ORDERBOOK.getProperties()); + debugger.info("Working..."); + } catch (IllegalThreadStateException | IOException e) { + log.error(e.getMessage(), e); + return false; + } + + + + Boolean returnValue = Boolean.FALSE; StringBuilder sb = new StringBuilder(); sb - .append(CLASSNAME) + .append(ID) .append(" Started instance=") .append(this.instanceType.type) .append(" Started version=") - .append(AlignmentFunctions.getVersion(this.getClass())); + .append(AlignmentFunctions.getVersion(this.getClass())) + .append(" listening to=") + .append(KafkaMessageTopology.MESSAGETOBERECEIVEDBYMULTICASTSERVERFROMMATCHINGENGINE) + ; log.info(sb.toString()); + MulticastServerKafkaListener mmkl = null; try { @@ -56,7 +83,7 @@ public boolean initialise(InstanceType instanceType) { Thread multiCastServerThread = new Thread(null , multicast, MulticastServer.CLASSNAME); try { - mmkl.runAlways(MARKETDATATOPIC, multicast); + mmkl.runAlways(KafkaMessageTopology.MESSAGETOBERECEIVEDBYMULTICASTSERVERFROMMATCHINGENGINE , multicast); } catch (Exception e) { log.error(e.getMessage() , e); return false; diff --git a/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastServerKafkaListener.java b/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastServerKafkaListener.java index 4f5a263..a90c403 100644 --- a/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastServerKafkaListener.java +++ b/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastServerKafkaListener.java @@ -27,6 +27,7 @@ import com.alignmentsystems.library.enumerations.InstanceType; import com.alignmentsystems.library.interfaces.InterfaceKafkaAbstractSimple; import com.alignmentsystems.library.interfaces.InterfaceKafkaMessageHandler; +import com.alignmentsystems.library.AlignmentUEH; /** * @author John Greenan @@ -90,9 +91,9 @@ public void runAlways(String topicName, InterfaceKafkaMessageHandler callback) t @Override public void runAlways(List topicNames , InterfaceKafkaMessageHandler callback) throws Exception { - Properties props; + try { - props = AlignmentFunctions.getProperties(MulticastServerKafkaListener.class.getClassLoader() , InstanceType.KAFKA.getProperties()); + this.props = AlignmentFunctions.getProperties(MulticastServerKafkaListener.class.getClassLoader() , InstanceType.KAFKA.getProperties()); } catch (FileNotFoundException | NullPointerException e) { //log.error(e.getMessage() , e); throw e; @@ -123,11 +124,17 @@ public void runAlways(List topicNames , InterfaceKafkaMessageHandler cal @Override - public boolean initialise(AlignmentLogEncapsulation log, AlignmentPersistenceToFileClient debugger) - throws FileNotFoundException, NullPointerException { + public boolean initialise(AlignmentLogEncapsulation log, AlignmentPersistenceToFileClient debugger) throws FileNotFoundException, NullPointerException { + final String METHOD = "initialise"; this.log = log; this.debugger = debugger; + debugger.info(CLASSNAME + "." + METHOD); + + AlignmentUEH ueh = new AlignmentUEH(this.debugger); + + Thread.setDefaultUncaughtExceptionHandler(ueh); + try { this.props = AlignmentFunctions.getProperties(MulticastServerKafkaListener.class.getClassLoader(), InstanceType.KAFKA.getProperties()); } catch (FileNotFoundException |NullPointerException e) { diff --git a/multicastserver/version.properties b/multicastserver/version.properties index 44e46bf..22b4c21 100644 --- a/multicastserver/version.properties +++ b/multicastserver/version.properties @@ -1,2 +1,2 @@ -#Wed Sep 20 23:33:33 AEST 2023 -VERSION_BUILD=786 +#Thu Sep 21 12:39:56 AEST 2023 +VERSION_BUILD=802 diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentExecutionReport.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentExecutionReport.java index 0cb477f..7f4ecd7 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentExecutionReport.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentExecutionReport.java @@ -15,8 +15,6 @@ import java.time.DateTimeException; import java.time.Instant; import java.time.OffsetDateTime; -import java.util.ArrayList; -import java.util.List; import java.util.UUID; import com.alignmentsystems.fix44.ExecutionReport; @@ -34,12 +32,22 @@ import com.alignmentsystems.fix44.field.TargetCompID; import com.alignmentsystems.fix44.field.TimeInForce; import com.alignmentsystems.library.constants.Constants; +import com.alignmentsystems.library.constants.KafkaMessageTopology; import com.alignmentsystems.library.enumerations.Encodings; +import com.alignmentsystems.library.enumerations.ExecutionReportDestination; import com.alignmentsystems.library.interfaces.InterfaceExecutionReport; + + + + +/** + * @author John Greenan + * + */ public class AlignmentExecutionReport implements InterfaceExecutionReport { public final static Short EXCHANGEMESSAGETYPE = AlignmentDataMapper.EXCHANGEMESSAGETYPEMAPPEDFROMEXECUTIONREPORT; - + private UUID execID = null; private String buySenderId = null; private String buyTargetId = null; @@ -53,16 +61,18 @@ public class AlignmentExecutionReport implements InterfaceExecutionReport { private Long averagePrice = null; private UUID clOrdID = null; private UUID orderID = null; + private UUID marketDataID = null; private Short ordStatus = null; private Short execType = null; private Short sideCode = null; - - + + @Override public void setExecutionReport( UUID execID , UUID clOrdID , UUID orderID + , UUID marketDataID , String buySenderId , String buyTargetId , String sellSenderId @@ -80,6 +90,7 @@ public void setExecutionReport( this.execID = execID; this.clOrdID = clOrdID; this.orderID = orderID; + this.marketDataID = marketDataID; this.buySenderId = buySenderId; this.buyTargetId = buyTargetId; this.sellSenderId = sellSenderId; @@ -100,6 +111,12 @@ public UUID getExecID() { return this.execID; } + @Override + public UUID getMarketDataID() { + return this.marketDataID; + } + + @Override public String getBuySenderId() { return this.buySenderId; @@ -176,91 +193,171 @@ public Short getSideCode() { } - - - - - @Override - public byte[] getBytesAsSBE() { + + + + +/** + * + * @param destination + * @return + */ + private byte[] getBytesAsSBE(ExecutionReportDestination destination) { byte[] returnValue = null; ByteBuffer buf = null; final Encodings encoding = Encodings.FIXSBELITTLEENDIAN; - final Short msgType = AlignmentDataMapper.EXCHANGEMESSAGETYPEMAPPEDFROMEXECUTIONREPORT; - - final List ls = new ArrayList(); - try { - final int bufferLength = - Short.BYTES //messageType - + - Long.BYTES * 2//ExecID - + - Long.BYTES * 2//ClOrdID - + - Long.BYTES * 2//OrderID - + - Short.BYTES //ExecType - + - Short.BYTES//Side - + - Long.BYTES //LeavesQty - + - Long.BYTES //CumQty - + - Long.BYTES //AvgPx - + - Long.BYTES //ExecPrice - + - Long.BYTES //ExecQty - + - Long.BYTES //this.ts getEpochSecond - + - Integer.BYTES // this.ts getNano() - - ; - buf = ByteBuffer.allocate(bufferLength).order(encoding.getByteOrder()); - - buf.putShort(AlignmentExecutionReport.EXCHANGEMESSAGETYPE); - buf.putLong(this.execID.getLeastSignificantBits()); - buf.putLong(this.execID.getMostSignificantBits()); - buf.putLong(this.clOrdID.getLeastSignificantBits()); - buf.putLong(this.clOrdID.getMostSignificantBits()); - buf.putLong(this.orderID.getLeastSignificantBits()); - buf.putLong(this.orderID.getMostSignificantBits()); - buf.putShort(this.execType); - buf.putShort(this.ordStatus); - buf.putShort(this.sideCode); - buf.putLong(this.leavesQuantity); - buf.putLong(this.cumQuantity); - buf.putLong(this.averagePrice); - buf.putLong(this.executionPrice); - buf.putLong(this.executionQuantity); - buf.putLong(this.timestamp.toInstant().getEpochSecond()); - buf.putInt(this.timestamp.toInstant().getNano()); - - buf.flip(); - } catch (Exception e) { - //this.log.error(e.getMessage() , e); - throw e; + + if(destination==ExecutionReportDestination.MEMBER) { + final Short msgType = AlignmentDataMapper.EXCHANGEMESSAGETYPEMAPPEDFROMEXECUTIONREPORT; + try { + final int bufferLength = + Short.BYTES //messageType + + + Long.BYTES * 2//ExecID + + + Long.BYTES * 2//ClOrdID + + + Long.BYTES * 2//OrderID + + + Short.BYTES //ExecType + + + Short.BYTES//Side + + + Long.BYTES //LeavesQty + + + Long.BYTES //CumQty + + + Long.BYTES //AvgPx + + + Long.BYTES //ExecPrice + + + Long.BYTES //ExecQty + + + Long.BYTES //this.ts getEpochSecond + + + Integer.BYTES // this.ts getNano() + + ; + buf = ByteBuffer.allocate(bufferLength).order(encoding.getByteOrder()); + + buf.putShort(AlignmentExecutionReport.EXCHANGEMESSAGETYPE); + buf.putLong(this.execID.getLeastSignificantBits()); + buf.putLong(this.execID.getMostSignificantBits()); + buf.putLong(this.clOrdID.getLeastSignificantBits()); + buf.putLong(this.clOrdID.getMostSignificantBits()); + buf.putLong(this.orderID.getLeastSignificantBits()); + buf.putLong(this.orderID.getMostSignificantBits()); + buf.putShort(this.execType); + buf.putShort(this.ordStatus); + buf.putShort(this.sideCode); + buf.putLong(this.leavesQuantity); + buf.putLong(this.cumQuantity); + buf.putLong(this.averagePrice); + buf.putLong(this.executionPrice); + buf.putLong(this.executionQuantity); + buf.putLong(this.timestamp.toInstant().getEpochSecond()); + buf.putInt(this.timestamp.toInstant().getNano()); + + buf.flip(); + } catch (Exception e) { + //this.log.error(e.getMessage() , e); + throw e; + } + + + + }else if(destination==ExecutionReportDestination.MARKETDATA){ + try { + final int bufferLength = + Short.BYTES //messageType + + + Long.BYTES * 2//marketDataID + + //+ + //Long.BYTES * 2//ExecID + //+ + //Long.BYTES * 2//ClOrdID + //+ + //Long.BYTES * 2//OrderID + + + Short.BYTES //ExecType + + + Short.BYTES//Side + //+ + //Long.BYTES //LeavesQty + //+ + //Long.BYTES //CumQty + //+ + //Long.BYTES //AvgPx + + + Long.BYTES //ExecPrice + + + Long.BYTES //ExecQty + + + Long.BYTES //this.ts getEpochSecond + + + Integer.BYTES // this.ts getNano() + ; + + buf = ByteBuffer.allocate(bufferLength).order(encoding.getByteOrder()); + + buf.putShort(AlignmentExecutionReport.EXCHANGEMESSAGETYPE); + buf.putLong(this.marketDataID.getLeastSignificantBits()); + buf.putLong(this.marketDataID.getMostSignificantBits()); + + //buf.putLong(this.execID.getLeastSignificantBits()); + //buf.putLong(this.execID.getMostSignificantBits()); + //buf.putLong(this.clOrdID.getLeastSignificantBits()); + //buf.putLong(this.clOrdID.getMostSignificantBits()); + //buf.putLong(this.orderID.getLeastSignificantBits()); + //buf.putLong(this.orderID.getMostSignificantBits()); + buf.putShort(this.execType); + //buf.putShort(this.ordStatus); + buf.putShort(this.sideCode); + //buf.putLong(this.leavesQuantity); + //buf.putLong(this.cumQuantity); + //buf.putLong(this.averagePrice); + buf.putLong(this.executionPrice); + buf.putLong(this.executionQuantity); + buf.putLong(this.timestamp.toInstant().getEpochSecond()); + buf.putInt(this.timestamp.toInstant().getNano()); + + buf.flip(); + } catch (Exception e) { + //this.log.error(e.getMessage() , e); + throw e; + } } + returnValue=buf.array(); + return returnValue; } @Override - public AlignmentKafkaSender getSender() { - final String TOPIC = "DEFAULT"; + public AlignmentKafkaSender getMarketDataBytesAsSBEInSender() { + //What do we do here? Simply put, this is a way for the market data to be generated. + //that means that there is NO sender or Target on the message + AlignmentKafkaSender sender = new AlignmentKafkaSender(); + sender.initialise(this.getBytesAsSBE(ExecutionReportDestination.MARKETDATA), KafkaMessageTopology.MESSAGE_FILL, this.execID.toString()); + return sender; + } + + + @Override + public AlignmentKafkaSender getMemberExecRptAsSBEInSender() { AlignmentKafkaSender sender = new AlignmentKafkaSender(); - sender.initialise(this.getBytesAsSBE(), TOPIC, this.execID.toString()); + sender.initialise(this.getBytesAsSBE(ExecutionReportDestination.MEMBER), KafkaMessageTopology.MESSAGE_FILL, this.execID.toString()); return sender; } @Override - public AlignmentKafkaSender getSenderForTopic(String topic) { + public AlignmentKafkaSender getMemberExecRptForTopicAsSBEInSender(String topic) { AlignmentKafkaSender sender = new AlignmentKafkaSender(); - sender.initialise(this.getBytesAsSBE(), topic, this.execID.toString()); + sender.initialise(this.getBytesAsSBE(ExecutionReportDestination.MEMBER), topic, this.execID.toString()); return sender; } @@ -319,7 +416,7 @@ public ExecutionReport getFIXExecutionReport(ByteBuffer bb, short msgType) { public ExecutionReport getFIXExecutionReportAckFromOrderBuffer(ByteBuffer bb, short msgType) { AlignmentOrder ao = new AlignmentOrder(); ao.getAlignmentOrderFromBuffer(bb.array(), msgType); - + final Double leaves = 0d; final Double cum = 0d; final Double avg = 0d; @@ -345,4 +442,6 @@ public ExecutionReport getFIXExecutionReportAckFromOrderBuffer(ByteBuffer bb, sh return er; } + + } \ No newline at end of file diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentLogEncapsulation.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentLogEncapsulation.java index 2c6dbc7..76d7aaa 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentLogEncapsulation.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentLogEncapsulation.java @@ -25,6 +25,7 @@ import com.alignmentsystems.library.enumerations.MessageDirection; import com.alignmentsystems.library.enumerations.OperationEventType; import com.alignmentsystems.library.interfaces.InterfaceCustomLoggerMessage; +import com.alignmentsystems.library.interfaces.InterfaceExecutionReport; import com.alignmentsystems.library.interfaces.InterfaceMatch; import quickfix.SessionID; @@ -235,7 +236,17 @@ public void infoMatchingEvent(OperationEventType operationEventType, InterfaceMa innerLog.info(sb.toString()); } + @Override + public void infoMatchingEvent(OperationEventType operationEventType, InterfaceExecutionReport er) { + StringBuilder sb = new StringBuilder() + .append(AlignmentFunctions.wrapNameSquareBrackets(operationEventType.value)) + .append(Constants.TAB) + .append(er.toString()) + ; + innerLog.info(sb.toString()); + } + @Override public String getName() { @@ -544,6 +555,4 @@ public void error(Marker marker, String format, Object... arguments) { public void error(Marker marker, String msg, Throwable t) { innerLog.error(marker, msg, t); } - - } \ No newline at end of file diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentMatch.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentMatch.java index 30e0135..95620fb 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentMatch.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentMatch.java @@ -300,7 +300,8 @@ public AlignmentExecutionReport getBuyReport() { buy.setExecutionReport( this.buyExecId , this.buyClOrdId - , this.buyOrderId + , this.buyOrderId + , this.marketDataId , this.buySenderId , this.buyTargetId , this.sellSenderId @@ -325,7 +326,8 @@ public AlignmentExecutionReport getSellReport() { sell.setExecutionReport( this.buyExecId , this.sellClOrdId - , this.sellOrderId + , this.sellOrderId + , this.marketDataId , this.sellSenderId , this.sellTargetId , this.sellSenderId @@ -415,12 +417,8 @@ public AlignmentKafkaSender getMarketDataBytesAsSBEInSender() { } - - - @Override public UUID getMarketDataId() { - // TODO Auto-generated method stub - return null; + return this.marketDataId; } } \ No newline at end of file diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentOrder.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentOrder.java index 16b8cb3..fa2efc9 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentOrder.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentOrder.java @@ -263,10 +263,16 @@ public Long getLeavesQty() { return this.leavesQty; } - + @Override - public AlignmentKafkaSender getBytesAsSBEInSender() { + public AlignmentKafkaSender getBytesForMarketDataAsSBEInSender() { + // TODO Auto-generated method stub + return null; + } + @Override + public AlignmentKafkaSender getBytesForMemberAsSBEInSender() { + ByteBuffer buf = null; final String receivedSymbol = this.symbol; final String orderId = this.orderId.toString(); @@ -409,4 +415,8 @@ public InterfaceOrder getAlignmentOrderFromBuffer(byte[] message) { final short msgType = bb.getShort(); // buf.putShort(messageType return getAlignmentOrderFromBuffer(bb.array(), msgType); } + + + + } \ No newline at end of file diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentPersistenceToFileClient.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentPersistenceToFileClient.java index 6854810..7dc01e7 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentPersistenceToFileClient.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentPersistenceToFileClient.java @@ -17,7 +17,7 @@ import com.alignmentsystems.library.annotations.Experimental; import com.alignmentsystems.library.constants.Constants; -import com.alignmentsystems.library.enumerations.PersistenceRecordType; +import com.alignmentsystems.library.enumerations.RecordType; import com.alignmentsystems.library.exceptions.LogMessageIsNull; import com.alignmentsystems.library.interfaces.InterfacePersistenceClient; import com.alignmentsystems.library.interfaces.InterfacePersistenceServer; @@ -217,7 +217,7 @@ private Boolean logExecute(String toLog) { * @return Did this get logged? */ private Boolean infoPrivate(String toLog) { - return logExecute(new StringBuilder().append(PersistenceRecordType.INFO.recordType).append(toLog).toString()); + return logExecute(new StringBuilder().append(RecordType.INFO.recordType).append(toLog).toString()); } @@ -227,7 +227,7 @@ public Boolean info(String toLog) throws LogMessageIsNull { return false; }else { cleanLogMessage(toLog); - return logExecute(new StringBuilder().append(PersistenceRecordType.INFO.recordType).append(toLog).toString()); + return logExecute(new StringBuilder().append(RecordType.INFO.recordType).append(toLog).toString()); } } @@ -240,7 +240,7 @@ public Boolean info(String toLog) throws LogMessageIsNull { * @param logMessageType An enumeration of the message type - Error, Log, Debug * @return Boolean Did the write happen? */ - private Boolean messageSession(String toLog, String methodName, PersistenceRecordType recordType) { + private Boolean messageSession(String toLog, String methodName, RecordType recordType) { if (this.isShuttingDown.get()) { return false; }else { @@ -265,7 +265,7 @@ public Boolean infoSession(String toLog, String methodName) throws LogMessageIsN return false; }else { cleanLogMessage(toLog); - return messageSession(toLog, methodName, PersistenceRecordType.INFO); + return messageSession(toLog, methodName, RecordType.INFO); } } @@ -276,7 +276,7 @@ public Boolean debugSession(String toLog, String methodName)throws LogMessageIsN return false; }else { cleanLogMessage(toLog); - return messageSession(toLog, methodName, PersistenceRecordType.DEBUG); + return messageSession(toLog, methodName, RecordType.DEBUG); } } @@ -287,7 +287,7 @@ public Boolean errorSession(String toLog, String methodName) throws LogMessageIs return false; }else { cleanLogMessage(toLog); - return messageSession(toLog, methodName, PersistenceRecordType.ERROR); + return messageSession(toLog, methodName, RecordType.ERROR); } } @@ -297,7 +297,7 @@ public Boolean error(String toLog) throws LogMessageIsNull { return false; }else { cleanLogMessage(toLog); - return logExecute(new StringBuilder().append( PersistenceRecordType.ERROR.recordType).append(toLog).toString()); + return logExecute(new StringBuilder().append( RecordType.ERROR.recordType).append(toLog).toString()); } } @@ -314,9 +314,9 @@ public Boolean error(String toLog, Throwable t) throws LogMessageIsNull{ return false; }else { cleanLogMessage(toLog); - logExecute(new StringBuilder().append(PersistenceRecordType.ERROR.recordType).append(Constants.BLOCKER).toString()); + logExecute(new StringBuilder().append(RecordType.ERROR.recordType).append(Constants.BLOCKER).toString()); - final String blocker = new StringBuilder().append(PersistenceRecordType.ERROR.recordType).append(toLog).toString(); + final String blocker = new StringBuilder().append(RecordType.ERROR.recordType).append(toLog).toString(); returnValue = logExecute(blocker ); if (!returnValue) { @@ -326,7 +326,7 @@ public Boolean error(String toLog, Throwable t) throws LogMessageIsNull{ StackTraceElement[] stackTrace = t.getStackTrace(); for (StackTraceElement element : stackTrace) { - returnValue = logExecute(new StringBuilder().append(PersistenceRecordType.ERROR.recordType).append(element.toString()).toString()); + returnValue = logExecute(new StringBuilder().append(RecordType.ERROR.recordType).append(element.toString()).toString()); } returnValue = logExecute(blocker ); } @@ -347,9 +347,9 @@ public Boolean errorSession(String toLog, String methodName, Throwable t) throws return false; }else { cleanLogMessage(toLog); - logExecute(PersistenceRecordType.ERROR.recordType + AlignmentFunctions.wrapNameBrackets(methodName) + Constants.BLOCKER); + logExecute(RecordType.ERROR.recordType + AlignmentFunctions.wrapNameBrackets(methodName) + Constants.BLOCKER); - returnValue = logExecute(PersistenceRecordType.ERROR.recordType + AlignmentFunctions.wrapNameBrackets(methodName) + toLog); + returnValue = logExecute(RecordType.ERROR.recordType + AlignmentFunctions.wrapNameBrackets(methodName) + toLog); if (!returnValue) { return returnValue; @@ -357,10 +357,10 @@ public Boolean errorSession(String toLog, String methodName, Throwable t) throws StackTraceElement[] stackTrace = t.getStackTrace(); for (StackTraceElement element : stackTrace) { - returnValue = logExecute(PersistenceRecordType.ERROR.recordType + element.toString()); + returnValue = logExecute(RecordType.ERROR.recordType + element.toString()); if (!returnValue) {return returnValue;} } - logExecute(PersistenceRecordType.ERROR.recordType + Constants.BLOCKER); + logExecute(RecordType.ERROR.recordType + Constants.BLOCKER); return returnValue; } @@ -373,7 +373,7 @@ public Boolean debug(String toLog) throws LogMessageIsNull{ return false; }else { cleanLogMessage(toLog); - return logExecute(PersistenceRecordType.DEBUG.recordType + toLog); + return logExecute(RecordType.DEBUG.recordType + toLog); } } diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentPersistenceToFileServer.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentPersistenceToFileServer.java index 4994d40..7cd18ca 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentPersistenceToFileServer.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentPersistenceToFileServer.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import com.alignmentsystems.library.constants.Constants; -import com.alignmentsystems.library.enumerations.PersistenceRecordType; +import com.alignmentsystems.library.enumerations.RecordType; import com.alignmentsystems.library.enumerations.TimestampUsage; import com.alignmentsystems.library.interfaces.InterfacePersistenceServer; @@ -111,7 +111,7 @@ private void runOnce() { } try { StringBuilder sb = new StringBuilder(); - sb.append(PersistenceRecordType.INFO.recordType) + sb.append(RecordType.INFO.recordType) .append(CLASSNAME) .append(" for ") .append(cleanedTag) diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentUEH.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentUEH.java similarity index 90% rename from exchange/src/main/java/com/alignmentsystems/matching/AlignmentUEH.java rename to sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentUEH.java index 41e8c33..23bf033 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentUEH.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/AlignmentUEH.java @@ -1,4 +1,4 @@ -package com.alignmentsystems.matching; +package com.alignmentsystems.library; /****************************************************************************** * * Author : John Greenan @@ -10,8 +10,6 @@ * Description : *****************************************************************************/ -import com.alignmentsystems.library.AlignmentPersistenceToFileClient; - public class AlignmentUEH implements Thread.UncaughtExceptionHandler{ protected final static String CLASSNAME = AlignmentUEH.class.getSimpleName().toString(); diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/constants/Constants.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/constants/Constants.java index 3b9bfba..0d4ee37 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/constants/Constants.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/constants/Constants.java @@ -13,55 +13,59 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.time.ZoneOffset; +import java.util.Locale; /** * @author John Greenan * */ public class Constants { - public final static String EQUALS = "=".intern(); - public final static String BLOCKER = Constants.EQUALS.repeat(100).intern(); - public final static Long REAPER_SLEEP = 200L; - - public final static String COMMANDDELIMITER="-D"; - - - public final static String SQUAREBRACKETOPEN = "[".intern(); - public final static String SQUAREBRACKETCLOSE = "]".intern(); - - public final static String BRACKETOPEN = "(".intern(); - - public final static String BRACKETCLOSE = ")".intern(); - - public final static String LEADER = "=====>".intern(); - public final static String TRAILER = "<=====".intern(); - - public final static String DOTPROPERTIES = ".properties".intern(); - - public final static int NANOSLEEP = 100; + + public final static String EQUALS = "=".intern(); + public final static String BLOCKER = Constants.EQUALS.repeat(100).intern(); + public final static Long REAPER_SLEEP = 200L; - public final static String LINESEPARATORSTRING = "line.separator".intern(); - public final static String LINESEPARATOR = System.getProperty(LINESEPARATORSTRING); - public final static byte[] LINESEPARATORBYTES = LINESEPARATOR.getBytes(); - public final static ZoneOffset HERE = ZoneOffset.UTC; - public final static Charset CHARSET = StandardCharsets.UTF_8; - - public final static char TAB = (char)9; - - public static final char cEXCLAMATION = 0x21; - public static final String EXCLAMATION = String.valueOf(cEXCLAMATION).intern(); - public static final char cSEMICOLON = 0x3B; - public static final char cCOLON = 0x3A; - public static final char cUNDERSCORE = 0x5F; - public static final char cDASH = 0x2D; - public static final String COLON = String.valueOf(cCOLON).intern(); - public static final String SEMICOLON = String.valueOf(cSEMICOLON).intern(); - public static final String UNDERSCORE = String.valueOf(cUNDERSCORE).intern(); - public static final String DASH = String.valueOf(cDASH).intern(); - public static final String LETTER_T = "T".intern(); - public static final String EMPTYSTRING = "".intern(); - public static final String SPACE = " ".intern(); - public static final String LETTER_Z = "Z".intern(); - public static final String FULLSTOP = ".".intern(); - } \ No newline at end of file + public final static String COMMANDDELIMITER="-D"; + + + public final static String SQUAREBRACKETOPEN = "[".intern(); + public final static String SQUAREBRACKETCLOSE = "]".intern(); + + public final static String BRACKETOPEN = "(".intern(); + + public final static String BRACKETCLOSE = ")".intern(); + + + public final static String LEADER = "=====>".intern(); + public final static String TRAILER = "<=====".intern(); + + public final static String DOTPROPERTIES = ".properties".intern(); + + public final static int NANOSLEEP = 100; + + public final static String LINESEPARATORSTRING = "line.separator".intern(); + public final static String LINESEPARATOR = System.getProperty(LINESEPARATORSTRING); + public final static byte[] LINESEPARATORBYTES = LINESEPARATOR.getBytes(); + public final static ZoneOffset HERE = ZoneOffset.UTC; + public final static Charset CHARSET = StandardCharsets.UTF_8; + public final static Locale LOCALE = Locale.UK; + + public final static char TAB = (char)9; + + public static final char cEXCLAMATION = 0x21; + public static final String EXCLAMATION = String.valueOf(cEXCLAMATION).intern(); + public static final char cSEMICOLON = 0x3B; + public static final char cCOLON = 0x3A; + public static final char cUNDERSCORE = 0x5F; + public static final char cDASH = 0x2D; + public static final String COLON = String.valueOf(cCOLON).intern(); + public static final String SEMICOLON = String.valueOf(cSEMICOLON).intern(); + public static final String UNDERSCORE = String.valueOf(cUNDERSCORE).intern(); + public static final String DASH = String.valueOf(cDASH).intern(); + public static final String LETTER_T = "T".intern(); + public static final String EMPTYSTRING = "".intern(); + public static final String SPACE = " ".intern(); + public static final String LETTER_Z = "Z".intern(); + public static final String FULLSTOP = ".".intern(); +} \ No newline at end of file diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/constants/KafkaMessageTopology.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/constants/KafkaMessageTopology.java new file mode 100644 index 0000000..7f45da5 --- /dev/null +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/constants/KafkaMessageTopology.java @@ -0,0 +1,27 @@ +package com.alignmentsystems.library.constants; +/****************************************************************************** + * + * Author : John Greenan + * Contact : sales@alignment-systems.com + * Date : 21st September 2023 + * Copyright : Alignment Systems Ltd 2023 + * Project : Alignment Matching Toy + * Artefact : KafkaMessageTopology + * Description : + *****************************************************************************/ + +import java.util.List; + +/** + * @author John Greenan + * Note - Kafka Topic Names are all represented in UPPER CASE using the UK locale. + */ +public class KafkaMessageTopology { + public final static String MESSAGE_FILL = "fill".toUpperCase(Constants.LOCALE); + public final static String MESSAGE_ACK = "ack".toUpperCase(Constants.LOCALE); + public final static String MESSAGE_REJ = "rej".toUpperCase(Constants.LOCALE); + + public final static List MESSAGESTOBERECEIVEDBYEXCHANGEFIXENGINEFROMMATCHINGENGINE = List.of(MESSAGE_FILL , MESSAGE_ACK , MESSAGE_REJ); + public final static String MESSAGETOBERECEIVEDBYMULTICASTSERVERFROMMATCHINGENGINE = "mdOUT".toUpperCase(Constants.LOCALE); + +} diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/EventStatusCategory.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/ExecutionReportDestination.java similarity index 51% rename from sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/EventStatusCategory.java rename to sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/ExecutionReportDestination.java index f99535d..b4167d0 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/EventStatusCategory.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/ExecutionReportDestination.java @@ -3,25 +3,14 @@ * * Author : John Greenan * Contact : sales@alignment-systems.com - * Date : 24th August 2023 + * Date : 21st September 2023 * Copyright : Alignment Systems Ltd 2023 * Project : Alignment Matching Toy - * Artefact : EventStatusCategory + * Artefact : ExecutionReportDestination * Description : *****************************************************************************/ -/** - * @author John Greenan - * - */ -public enum EventStatusCategory { - - INFO ("[INFO]"), - ERROR("[ERROR]"), - DEBUG("[DEBUG]"); - public final String messageType; - - EventStatusCategory(String messageType){ - this.messageType = messageType; - } - } \ No newline at end of file +public enum ExecutionReportDestination { + MARKETDATA, + MEMBER +} diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/OrderBookSide.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/OrderBookSide.java index f3d3bcd..b22774e 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/OrderBookSide.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/OrderBookSide.java @@ -25,19 +25,31 @@ public enum OrderBookSide { public char sideCharValue; - + /** + * + * @param sideReadableValue + * @param sideCharValue + */ OrderBookSide(String sideReadableValue, char sideCharValue){ this.sideReadableValue = sideReadableValue; this.sideCharValue = sideCharValue; } + /** + * + * @return + */ public String getSideFIXStringValue() { return String.valueOf(sideCharValue); } - + /** + * + * @param sideCode + * @return + */ public static char getCharForString(String sideCode) { char retVal = OrderBookSide.ERROR.sideCharValue; for (OrderBookSide obs : OrderBookSide.values()) { @@ -51,7 +63,11 @@ public static char getCharForString(String sideCode) { } - + /** + * + * @param sideCode + * @return + */ public static OrderBookSide getEnumForString(String sideCode) { OrderBookSide retVal = OrderBookSide.ERROR; for (OrderBookSide obs : OrderBookSide.values()) { @@ -64,6 +80,11 @@ public static OrderBookSide getEnumForString(String sideCode) { return retVal; } + /** + * + * @param sideID + * @return + */ public static OrderBookSide getEnumForID(char sideID) { OrderBookSide retVal = OrderBookSide.ERROR; for (OrderBookSide obs : OrderBookSide.values()) { diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/OrderDistributionModel.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/OrderDistributionModel.java deleted file mode 100644 index 8dd3f91..0000000 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/OrderDistributionModel.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.alignmentsystems.library.enumerations; -/****************************************************************************** - * - * Author : John Greenan - * Contact : sales@alignment-systems.com - * Date : 8th September 2023 - * Copyright : Alignment Systems Ltd 2023 - * Project : Alignment Matching Toy - * Artefact : OrderDistributionModel - * Description : - *****************************************************************************/ - -/** - * @author John Greenan - * - */ -public enum OrderDistributionModel { - CONCURRENTLINKEDQUEUE("concurrentlinkedqueue") , - KAFKA("kafka"); - - public final String distributionModel; - OrderDistributionModel(String distributionModel){ - this.distributionModel = distributionModel; - } - } \ No newline at end of file diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/PersistenceRecordType.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/RecordType.java similarity index 89% rename from sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/PersistenceRecordType.java rename to sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/RecordType.java index d37a8ee..f08605a 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/PersistenceRecordType.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/enumerations/RecordType.java @@ -14,13 +14,13 @@ * @author John Greenan * */ -public enum PersistenceRecordType { +public enum RecordType { INFO ("[INFO] "), ERROR("[ERROR] "), DEBUG("[DEBUG] "); public final String recordType; - PersistenceRecordType(String recordType){ + RecordType(String recordType){ this.recordType = recordType; } diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceCustomLoggerMessage.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceCustomLoggerMessage.java index 4624d6a..46e711a 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceCustomLoggerMessage.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceCustomLoggerMessage.java @@ -27,6 +27,7 @@ public interface InterfaceCustomLoggerMessage { public void errorFIXSession(String msg, SessionID sessionId, String methodName, String className, InstanceType instanceType); public void errorFIXSession(String msg, SessionID sessionId, MessageDirection direction, String methodName, String className, InstanceType instanceType); public void infoMatchingEvent(OperationEventType operationEventType, InterfaceMatch match); + public void infoMatchingEvent(OperationEventType operationEventType, InterfaceExecutionReport er); public void infoOrderBookStatus(List buyList, List sellList); public void infoSpecificProperties(String listName, List propertiesList); public void showSystemProperties(); diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceExecutionReport.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceExecutionReport.java index 0e78d60..79383c9 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceExecutionReport.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceExecutionReport.java @@ -46,6 +46,7 @@ public void setExecutionReport( UUID execID , UUID clOrdID , UUID orderID + , UUID marketDataID , String buySenderId , String buyTargetId , String sellSenderId @@ -68,6 +69,7 @@ public void setExecutionReport( public UUID getClOrdID(); public UUID getOrderID(); public UUID getExecID(); + public UUID getMarketDataID(); public String getBuySenderId(); public String getBuyTargetId(); public String getSellSenderId(); @@ -81,9 +83,9 @@ public void setExecutionReport( public Short getOrdStatus(); public Short getExecType(); public Short getSideCode(); - public abstract byte[] getBytesAsSBE(); - public abstract AlignmentKafkaSender getSender(); - public abstract AlignmentKafkaSender getSenderForTopic(String topic); + public abstract AlignmentKafkaSender getMarketDataBytesAsSBEInSender(); + public abstract AlignmentKafkaSender getMemberExecRptAsSBEInSender(); + public abstract AlignmentKafkaSender getMemberExecRptForTopicAsSBEInSender(String topic); public abstract ExecutionReport getFIXExecutionReport(ByteBuffer bb , short msgType); public abstract ExecutionReport getFIXExecutionReportAckFromOrderBuffer(ByteBuffer bb , short msgType); } \ No newline at end of file diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceOperationEventInner.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceOperationEventInner.java index 4cfacc4..0e4a87f 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceOperationEventInner.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceOperationEventInner.java @@ -10,8 +10,8 @@ * Description : *****************************************************************************/ -import com.alignmentsystems.library.enumerations.EventStatusCategory; import com.alignmentsystems.library.enumerations.OperationEventType; +import com.alignmentsystems.library.enumerations.RecordType; /** * @author John Greenan * @@ -21,6 +21,6 @@ public interface InterfaceOperationEventInner { public String getEventMethodName(); public OperationEventType getOperationEventType(); public void setOperationEventType(OperationEventType operationEventType); - public EventStatusCategory getEventStatusCategory(); - public void setEventStatusCategory(EventStatusCategory eventStatusCategory); + public RecordType getRecordType(); + public void setEventStatusCategory(RecordType recordType); } diff --git a/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceOrder.java b/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceOrder.java index a4171c7..ae31868 100644 --- a/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceOrder.java +++ b/sharedlibrary/src/main/java/com/alignmentsystems/library/interfaces/InterfaceOrder.java @@ -54,7 +54,8 @@ public void setNewOrderSingle( public long getCumQty(); public long getAvgPx(); public Long getLeavesQty(); - public AlignmentKafkaSender getBytesAsSBEInSender(); + public AlignmentKafkaSender getBytesForMemberAsSBEInSender(); + public AlignmentKafkaSender getBytesForMarketDataAsSBEInSender(); public InterfaceOrder getAlignmentOrderFromBuffer(byte[] message, short msgType); public InterfaceOrder getAlignmentOrderFromBuffer(byte[] message); diff --git a/sharedlibrary/version.properties b/sharedlibrary/version.properties index a0e8241..065380d 100644 --- a/sharedlibrary/version.properties +++ b/sharedlibrary/version.properties @@ -1,2 +1,2 @@ -#Wed Sep 20 23:33:33 AEST 2023 -VERSION_BUILD=784 +#Thu Sep 21 12:39:56 AEST 2023 +VERSION_BUILD=800