Skip to content

Commit

Permalink
[*] merge latest changes
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-karpovich committed Dec 3, 2024
1 parent 9bcc9db commit 27b9ec6
Show file tree
Hide file tree
Showing 934 changed files with 29,049 additions and 7,516 deletions.
19 changes: 15 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ configure(javaProjects) {

imports {
mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.5'
mavenBom 'io.netty:netty-bom:4.1.109.Final'
}

dependencies {
Expand All @@ -128,13 +129,14 @@ configure(javaProjects) {
dependency "org.finos.timebase-ce:timebase-api:${timebaseVersion}"
dependency "org.finos.timebase-ce:timebase-pub:${timebaseVersion}"
dependency "org.finos.timebase-ce:timebase-aerondirect:${timebaseVersion}"
dependency "org.finos.timebase-ce:timebase-qql:${timebaseVersion}"

dependency "com.epam.deltix:timebase-lang:${commonsVersion}"
dependency "com.epam.deltix:timebase-util:${commonsVersion}"
dependency "com.epam.deltix:timebase-messages:${commonsVersion}"
dependency "com.epam.deltix:timebase-collections:${commonsVersion}"

dependency 'com.epam.deltix:dfp:0.12.5'
dependency 'com.epam.deltix:dfp:1.0.3'
dependency "com.epam.deltix:containers:3.1.2"
dependency 'com.epam.deltix:hd-date-time:0.2.11'
dependency 'com.epam.deltix:thread-affinity:1.0.4'
Expand All @@ -148,7 +150,7 @@ configure(javaProjects) {
}

dependency 'org.modelmapper:modelmapper:2.3.2'
dependency 'com.epam.deltix:orderbook-core:1.0.18'
dependency 'com.epam.deltix:orderbook-core:1.0.20'
// ----

//dependency 'deltix:deltix-spring-api-keys:0.1.4'
Expand All @@ -167,7 +169,7 @@ configure(javaProjects) {

dependency 'commons-logging:commons-logging:1.2'
dependency 'commons-cli:commons-cli:1.4'
dependency 'commons-codec:commons-codec:1.13'
dependency 'commons-codec:commons-codec:1.14'
dependency 'commons-io:commons-io:2.7'

dependency 'com.google.guava:guava:32.0.1-jre'
Expand All @@ -189,13 +191,17 @@ configure(javaProjects) {
entry 'jackson-module-parameter-names'
}

dependency 'com.azure:azure-security-keyvault-secrets:4.8.4'
dependency 'net.java.dev.jna:jna-platform:5.6.0' // azure sdk requires jna 5.6.0
dependency 'com.microsoft.azure:msal4j:1.15.1'

dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.5'
dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.5'

dependency 'io.micrometer:micrometer-registry-prometheus:1.9.1'
dependency 'io.micrometer:micrometer-core:1.9.1'

dependencySet(group: 'org.springframework', version: '5.3.28') {
dependencySet(group: 'org.springframework', version: '5.3.33') {
entry 'spring-beans'
entry 'spring-jcl'
entry 'spring-core'
Expand All @@ -210,6 +216,8 @@ configure(javaProjects) {
entry 'spring-websocket'
}

//dependency 'org.springframework.boot:spring-boot-starter-test:2.7.1'

dependencySet(group: 'org.springframework.boot', version: '2.7.18') {
entry 'spring-boot'
entry 'spring-boot-autoconfigure'
Expand Down Expand Up @@ -247,6 +255,7 @@ configure(javaProjects) {
dependency 'org.testcontainers:junit-jupiter:1.16.2'

dependency 'javax.annotation:javax.annotation-api:1.3.2'
dependency 'org.jetbrains:annotations:20.1.0'

dependency 'org.reflections:reflections:0.9.11'
dependency 'org.asynchttpclient:async-http-client:2.10.4'
Expand All @@ -261,6 +270,8 @@ configure(javaProjects) {

dependency 'org.apache.bcel:bcel:6.6.0'

dependency 'org.reactivestreams:reactive-streams:1.0.4'

dependencySet(group: 'io.netty', version: '4.1.94.Final') {
entry 'netty-codec'
entry 'netty-codec-http'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Mon Jul 19 08:25:17 UTC 2021
version=1.2.1-SNAPSHOT
systemProp.file.encoding=utf-8
timebaseVersion=6.1.23
timebaseVersion=6.2.7
commonsVersion=6.0.64
group=com.epam.deltix
docker.dockerCommonPath=epam/
5 changes: 5 additions & 0 deletions java/computations-api/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
dependencies {
api 'com.epam.deltix:dfp'
api 'com.epam.deltix:containers'

api "org.finos.timebase-ce:timebase-pub"
api "org.finos.timebase-ce:timebase-api"
api "com.epam.deltix:timebase-messages"
Expand All @@ -10,7 +11,11 @@ dependencies {

implementation 'org.reflections:reflections'
implementation 'com.google.guava:guava'
implementation 'org.apache.commons:commons-lang3'

testImplementation "junit:junit"
testImplementation 'com.epam.deltix:timebase-messages'

api 'com.fasterxml.jackson.core:jackson-annotations'
api 'com.google.code.findbugs:jsr305'
}

This file was deleted.

2 changes: 2 additions & 0 deletions java/ws-messages/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ dependencies {
implementation 'com.epam.deltix:timebase-messages'
implementation 'com.epam.deltix:dfp'
implementation "com.epam.deltix:containers"

api "org.finos.timebase-ce:timebase-pub"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
package com.epam.deltix.tbwg.messages;

import com.epam.deltix.dfp.Decimal;
import com.epam.deltix.timebase.messages.InstrumentMessage;
import com.epam.deltix.timebase.messages.*;

@SchemaElement(
name = "deltix.tbwg.messages.TradePoint"
)
public class TradePoint extends InstrumentMessage {

public static final String CLASS_NAME = TradePoint.class.getName();

@Decimal
protected long size = TypeConstants.DECIMAL_NULL;
@Decimal
protected long price = TypeConstants.DECIMAL_NULL;

@Decimal
@SchemaElement(
title = "Size"
)
@SchemaType(
encoding = "DECIMAL64",
dataType = SchemaDataType.FLOAT
)
public long getSize() {
return size;
}

public void setSize(long size) {
this.size = size;
}

@Decimal
@SchemaElement(
title = "Price"
)
@SchemaType(
encoding = "DECIMAL64",
dataType = SchemaDataType.FLOAT
)
public long getPrice() {
return price;
}

public void setPrice(long price) {
this.price = price;
}


@Override
protected TradePoint createInstance() {
return new TradePoint();
}

@Override
public TradePoint clone() {
TradePoint t = createInstance();
t.copyFrom(this);
return t;
}

@Override
public InstrumentMessage copyFrom(RecordInfo source) {
super.copyFrom(source);
if (source instanceof TradePoint) {
final TradePoint obj = (TradePoint) source;
size = obj.size;
price = obj.price;
}
return this;
}
}
Loading

0 comments on commit 27b9ec6

Please sign in to comment.