Upgrade ccapi from 5.31.2 -> 5.45.1

This commit is contained in:
John Colvin committed 2023-04-24 15:15:51 +00:00
1 parent a1b923c826
commit f21c6594c0
98 files changed
+9664 -2200

No files matched your search

+11 -3
View File
@@ -33,6 +33,7 @@ class Subscription CCAPI_FINAL {
this->optionMap[CCAPI_CONFLATE_INTERVAL_MILLISECONDS] = CCAPI_CONFLATE_INTERVAL_MILLISECONDS_DEFAULT;
this->optionMap[CCAPI_CONFLATE_GRACE_PERIOD_MILLISECONDS] = CCAPI_CONFLATE_GRACE_PERIOD_MILLISECONDS_DEFAULT;
this->optionMap[CCAPI_MARKET_DEPTH_RETURN_UPDATE] = CCAPI_MARKET_DEPTH_RETURN_UPDATE_DEFAULT;
this->optionMap[CCAPI_FETCH_MARKET_DEPTH_INITIAL_SNAPSHOT_DELAY_MILLISECONDS] = CCAPI_FETCH_MARKET_DEPTH_INITIAL_SNAPSHOT_DELAY_MILLISECONDS_DEFAULT;
for (const auto& option : optionList) {
auto optionKeyValue = UtilString::split(option, "=");
this->optionMap[optionKeyValue.at(0)] = optionKeyValue.at(1);
@@ -59,15 +60,16 @@ class Subscription CCAPI_FINAL {
for (const auto& x : credential) {
shortCredential.insert(std::make_pair(x.first, UtilString::firstNCharacter(x.second, CCAPI_CREDENTIAL_DISPLAY_LENGTH)));
}
std::string output = "Subscription [exchange = " + exchange + ", instrument = " + instrument + ", field = " + field +
", optionMap = " + ccapi::toString(optionMap) + ", correlationId = " + correlationId +
", credential = " + ccapi::toString(shortCredential) + ", serviceName = " + serviceName +
std::string output = "Subscription [exchange = " + exchange + ", marginType = " + marginType + ", instrumentType = " + instrumentType +
", instrument = " + instrument + ", field = " + field + ", optionMap = " + ccapi::toString(optionMap) +
", correlationId = " + correlationId + ", credential = " + ccapi::toString(shortCredential) + ", serviceName = " + serviceName +
", timeSent = " + UtilTime::getISOTimestamp(timeSent) + "]";
return output;
}
const std::string& getCorrelationId() const { return correlationId; }
const std::string& getExchange() const { return exchange; }
const std::string& getInstrument() const { return instrument; }
const std::string& getInstrumentType() const { return instrumentType; }
const std::string& getField() const { return field; }
const std::string& getRawOptions() const { return rawOptions; }
const std::map<std::string, std::string>& getOptionMap() const { return optionMap; }
@@ -93,11 +95,15 @@ class Subscription CCAPI_FINAL {
}
return output;
}
const std::string getSerializedCredential() const { return ::ccapi::toString(this->credential); }
// 'getTimeSent' only works in C++. For other languages, please use 'getTimeSentISO'.
TimePoint getTimeSent() const { return timeSent; }
std::string getTimeSentISO() const { return UtilTime::getISOTimestamp(timeSent); }
std::pair<long long, long long> getTimeSentPair() const { return UtilTime::divide(timeSent); }
const std::string& getMarginType() const { return marginType; }
void setTimeSent(TimePoint timeSent) { this->timeSent = timeSent; }
void setInstrumentType(const std::string& instrumentType) { this->instrumentType = instrumentType; }
void setMarginType(const std::string& marginType) { this->marginType = marginType; }
enum class Status {
UNKNOWN,
SUBSCRIBING,
@@ -133,6 +139,8 @@ class Subscription CCAPI_FINAL {
private:
#endif
std::string exchange;
std::string marginType;
std::string instrumentType;
std::string instrument;
std::string field;
std::string rawOptions;