You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bb...@apache.org on 2022/02/07 16:16:11 UTC
[geode-native] branch develop updated: GEODE-9323: Remove ACE from tests/cpp projects (#811)
This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 52c05ef GEODE-9323: Remove ACE from tests/cpp projects (#811)
52c05ef is described below
commit 52c05ef1d06c60db733350c4b2c3b8f7bda11d99
Author: Mario Salazar de Torres <ma...@est.tech>
AuthorDate: Mon Feb 7 17:16:05 2022 +0100
GEODE-9323: Remove ACE from tests/cpp projects (#811)
* GEODE-9323: Remove ACE from tests/cpp projects
- Removed all ACE references from tests/cpp projects.
- Also moved SerializationRegistry inline functions to the
source file in order to solve compilation.
* GEODE-9323: Empty commit to trigger CI
---
cppcache/src/ExpiryTask.hpp | 2 +-
cppcache/src/SerializationRegistry.cpp | 146 ++++++++++++++++++-
cppcache/src/SerializationRegistry.hpp | 161 ++++-----------------
tests/cpp/fwklib/CMakeLists.txt | 1 -
tests/cpp/security/CMakeLists.txt | 1 -
tests/cpp/security/CredentialGenerator.cpp | 10 ++
tests/cpp/security/CredentialGenerator.hpp | 10 +-
tests/cpp/security/DummyCredentialGenerator.cpp | 22 +--
tests/cpp/security/DummyCredentialGenerator2.cpp | 14 ++
tests/cpp/security/DummyCredentialGenerator2.hpp | 19 +--
tests/cpp/security/DummyCredentialGenerator3.cpp | 14 ++
tests/cpp/security/DummyCredentialGenerator3.hpp | 19 +--
tests/cpp/security/LdapUserCredentialGenerator.cpp | 30 ++++
tests/cpp/security/LdapUserCredentialGenerator.hpp | 31 +---
tests/cpp/security/NoopCredentialGenerator.hpp | 12 +-
tests/cpp/security/PkcsCredentialGenerator.cpp | 44 ++++--
tests/cpp/security/PkcsCredentialGenerator.hpp | 18 +--
tests/cpp/testobject/DeltaTestImpl.cpp | 11 +-
tests/cpp/testobject/DeltaTestImpl.hpp | 12 +-
19 files changed, 295 insertions(+), 282 deletions(-)
diff --git a/cppcache/src/ExpiryTask.hpp b/cppcache/src/ExpiryTask.hpp
index 0b893ea..0a6a11c 100644
--- a/cppcache/src/ExpiryTask.hpp
+++ b/cppcache/src/ExpiryTask.hpp
@@ -74,7 +74,7 @@ class ExpiryTask : public std::enable_shared_from_this<ExpiryTask> {
/**
* Returns an ID which represents an invalid task
*/
- static constexpr id_t invalid() { return std::numeric_limits<id_t>::max(); }
+ static constexpr id_t invalid() { return (std::numeric_limits<id_t>::max)(); }
protected:
using timer_t = boost::asio::steady_timer;
diff --git a/cppcache/src/SerializationRegistry.cpp b/cppcache/src/SerializationRegistry.cpp
index 661435b..ef9ba77 100644
--- a/cppcache/src/SerializationRegistry.cpp
+++ b/cppcache/src/SerializationRegistry.cpp
@@ -17,8 +17,7 @@
#include "SerializationRegistry.hpp"
-#include <functional>
-#include <mutex>
+#include <limits>
#include <geode/CacheableBuiltins.hpp>
#include <geode/CacheableDate.hpp>
@@ -140,6 +139,148 @@ void TheTypeMap::setup() {
bindDataSerializableFixedId(GatewaySenderEventCallbackArgument::create);
}
+void SerializationRegistry::serialize(const std::shared_ptr<Serializable>& obj,
+ DataOutput& output, bool isDelta) const {
+ if (obj == nullptr) {
+ output.write(static_cast<int8_t>(DSCode::NullObj));
+ } else if (auto&& pdxSerializable =
+ std::dynamic_pointer_cast<PdxSerializable>(obj)) {
+ serialize(pdxSerializable, output);
+ } else if (const auto&& dataSerializableFixedId =
+ std::dynamic_pointer_cast<DataSerializableFixedId>(obj)) {
+ serialize(dataSerializableFixedId, output);
+ } else if (const auto&& dataSerializablePrimitive =
+ std::dynamic_pointer_cast<DataSerializablePrimitive>(obj)) {
+ serialize(dataSerializablePrimitive, output);
+ } else if (const auto&& dataSerializable =
+ std::dynamic_pointer_cast<DataSerializable>(obj)) {
+ dataSerializableHandler_->serialize(dataSerializable, output, isDelta);
+ } else if (const auto&& dataSerializableInternal =
+ std::dynamic_pointer_cast<DataSerializableInternal>(obj)) {
+ serialize(dataSerializableInternal, output);
+ } else {
+ throw UnsupportedOperationException(
+ "SerializationRegistry::serialize: Serialization type not "
+ "implemented.");
+ }
+}
+
+void SerializationRegistry::setPdxTypeHandler(PdxTypeHandler* handler) {
+ pdxTypeHandler_ = std::unique_ptr<PdxTypeHandler>(handler);
+}
+void SerializationRegistry::setDataSerializableHandler(
+ DataSerializableHandler* handler) {
+ dataSerializableHandler_ = std::unique_ptr<DataSerializableHandler>(handler);
+}
+
+TypeFactoryMethod SerializationRegistry::getDataSerializableCreationMethod(
+ int32_t objectId) {
+ TypeFactoryMethod createType;
+ theTypeMap_.findDataSerializable(objectId, createType);
+ return createType;
+}
+
+int32_t SerializationRegistry::getIdForDataSerializableType(
+ std::type_index objectType) const {
+ auto&& typeIterator = theTypeMap_.typeToClassId_.find(objectType);
+ return typeIterator->second;
+}
+
+DSCode SerializationRegistry::getSerializableDataDsCode(int32_t classId) {
+ if (classId <= std::numeric_limits<int8_t>::max() &&
+ classId >= std::numeric_limits<int8_t>::min()) {
+ return DSCode::CacheableUserData;
+ } else if (classId <= std::numeric_limits<int16_t>::max() &&
+ classId >= std::numeric_limits<int16_t>::min()) {
+ return DSCode::CacheableUserData2;
+ } else {
+ return DSCode::CacheableUserData4;
+ }
+}
+
+void SerializationRegistry::serializeWithoutHeader(
+ const std::shared_ptr<Serializable>& obj, DataOutput& output) const {
+ if (const auto&& pdxSerializable =
+ std::dynamic_pointer_cast<PdxSerializable>(obj)) {
+ serializeWithoutHeader(pdxSerializable, output);
+ } else if (const auto&& dataSerializableFixedId =
+ std::dynamic_pointer_cast<DataSerializableFixedId>(obj)) {
+ serializeWithoutHeader(dataSerializableFixedId, output);
+ } else if (const auto&& dataSerializablePrimitive =
+ std::dynamic_pointer_cast<DataSerializablePrimitive>(obj)) {
+ serializeWithoutHeader(dataSerializablePrimitive, output);
+ } else if (const auto&& dataSerializable =
+ std::dynamic_pointer_cast<DataSerializable>(obj)) {
+ serializeWithoutHeader(dataSerializable, output);
+ } else if (const auto&& dataSerializableInternal =
+ std::dynamic_pointer_cast<DataSerializableInternal>(obj)) {
+ serializeWithoutHeader(dataSerializableInternal, output);
+ } else {
+ throw UnsupportedOperationException(
+ "SerializationRegistry::serializeWithoutHeader: Serialization type "
+ "not implemented.");
+ }
+}
+
+void SerializationRegistry::serialize(
+ const std::shared_ptr<DataSerializableFixedId>& obj,
+ DataOutput& output) const {
+ auto id = static_cast<int32_t>(obj->getDSFID());
+ if (id <= std::numeric_limits<int8_t>::max() &&
+ id >= std::numeric_limits<int8_t>::min()) {
+ output.write(static_cast<int8_t>(DSCode::FixedIDByte));
+ output.write(static_cast<int8_t>(id));
+ } else if (id <= std::numeric_limits<int16_t>::max() &&
+ id >= std::numeric_limits<int16_t>::min()) {
+ output.write(static_cast<int8_t>(DSCode::FixedIDShort));
+ output.writeInt(static_cast<int16_t>(id));
+ } else {
+ output.write(static_cast<int8_t>(DSCode::FixedIDInt));
+ output.writeInt(static_cast<int32_t>(id));
+ }
+
+ serializeWithoutHeader(obj, output);
+}
+
+void SerializationRegistry::serializeWithoutHeader(
+ const std::shared_ptr<DataSerializableFixedId>& obj,
+ DataOutput& output) const {
+ obj->toData(output);
+}
+
+void SerializationRegistry::serialize(
+ const std::shared_ptr<DataSerializablePrimitive>& obj,
+ DataOutput& output) const {
+ auto id = obj->getDsCode();
+ output.write(static_cast<int8_t>(id));
+
+ serializeWithoutHeader(obj, output);
+}
+
+void SerializationRegistry::serializeWithoutHeader(
+ const std::shared_ptr<DataSerializablePrimitive>& obj,
+ DataOutput& output) const {
+ obj->toData(output);
+}
+
+void SerializationRegistry::serialize(
+ const std::shared_ptr<PdxSerializable>& obj, DataOutput& output) const {
+ output.write(static_cast<int8_t>(DSCode::PDX));
+ serializeWithoutHeader(obj, output);
+}
+
+void SerializationRegistry::serialize(
+ const std::shared_ptr<DataSerializableInternal>& obj,
+ DataOutput& output) const {
+ serializeWithoutHeader(obj, output);
+}
+
+void SerializationRegistry::serializeWithoutHeader(
+ const std::shared_ptr<DataSerializableInternal>& obj,
+ DataOutput& output) const {
+ obj->toData(output);
+}
+
/** This starts at reading the typeid.. assumes the length has been read. */
std::shared_ptr<Serializable> SerializationRegistry::deserialize(
DataInput& input, int8_t typeId) const {
@@ -428,6 +569,7 @@ int32_t SerializationRegistry::GetEnumValue(
return static_cast<ThinClientPoolDM*>(pool.get())->GetEnumValue(enumInfo);
}
+
std::shared_ptr<Serializable> SerializationRegistry::GetEnum(
std::shared_ptr<Pool> pool, int32_t val) const {
if (pool == nullptr) {
diff --git a/cppcache/src/SerializationRegistry.hpp b/cppcache/src/SerializationRegistry.hpp
index c5c67c4..081b324 100644
--- a/cppcache/src/SerializationRegistry.hpp
+++ b/cppcache/src/SerializationRegistry.hpp
@@ -174,55 +174,11 @@ class APACHE_GEODE_EXPORT SerializationRegistry {
* then write whatever the object's toData requires. The length at the
* front is backfilled after the serialization.
*/
- inline void serialize(const std::shared_ptr<Serializable>& obj,
- DataOutput& output, bool isDelta = false) const {
- if (obj == nullptr) {
- output.write(static_cast<int8_t>(DSCode::NullObj));
- } else if (auto&& pdxSerializable =
- std::dynamic_pointer_cast<PdxSerializable>(obj)) {
- serialize(pdxSerializable, output);
- } else if (const auto&& dataSerializableFixedId =
- std::dynamic_pointer_cast<DataSerializableFixedId>(obj)) {
- serialize(dataSerializableFixedId, output);
- } else if (const auto&& dataSerializablePrimitive =
- std::dynamic_pointer_cast<DataSerializablePrimitive>(obj)) {
- serialize(dataSerializablePrimitive, output);
- } else if (const auto&& dataSerializable =
- std::dynamic_pointer_cast<DataSerializable>(obj)) {
- dataSerializableHandler_->serialize(dataSerializable, output, isDelta);
- } else if (const auto&& dataSerializableInternal =
- std::dynamic_pointer_cast<DataSerializableInternal>(obj)) {
- serialize(dataSerializableInternal, output);
- } else {
- throw UnsupportedOperationException(
- "SerializationRegistry::serialize: Serialization type not "
- "implemented.");
- }
- }
+ void serialize(const std::shared_ptr<Serializable>& obj, DataOutput& output,
+ bool isDelta = false) const;
- inline void serializeWithoutHeader(const std::shared_ptr<Serializable>& obj,
- DataOutput& output) const {
- if (const auto&& pdxSerializable =
- std::dynamic_pointer_cast<PdxSerializable>(obj)) {
- serializeWithoutHeader(pdxSerializable, output);
- } else if (const auto&& dataSerializableFixedId =
- std::dynamic_pointer_cast<DataSerializableFixedId>(obj)) {
- serializeWithoutHeader(dataSerializableFixedId, output);
- } else if (const auto&& dataSerializablePrimitive =
- std::dynamic_pointer_cast<DataSerializablePrimitive>(obj)) {
- serializeWithoutHeader(dataSerializablePrimitive, output);
- } else if (const auto&& dataSerializable =
- std::dynamic_pointer_cast<DataSerializable>(obj)) {
- serializeWithoutHeader(dataSerializable, output);
- } else if (const auto&& dataSerializableInternal =
- std::dynamic_pointer_cast<DataSerializableInternal>(obj)) {
- serializeWithoutHeader(dataSerializableInternal, output);
- } else {
- throw UnsupportedOperationException(
- "SerializationRegistry::serializeWithoutHeader: Serialization type "
- "not implemented.");
- }
- }
+ void serializeWithoutHeader(const std::shared_ptr<Serializable>& obj,
+ DataOutput& output) const;
/**
* Read the length, typeid, and run the objs fromData. Returns the New
@@ -265,110 +221,55 @@ class APACHE_GEODE_EXPORT SerializationRegistry {
std::shared_ptr<PdxSerializable> getPdxSerializableType(
const std::string& className) const;
- void setPdxTypeHandler(PdxTypeHandler* handler) {
- this->pdxTypeHandler_ = std::unique_ptr<PdxTypeHandler>(handler);
- }
- void setDataSerializableHandler(DataSerializableHandler* handler) {
- this->dataSerializableHandler_ =
- std::unique_ptr<DataSerializableHandler>(handler);
- }
+ void setPdxTypeHandler(PdxTypeHandler* handler);
- TypeFactoryMethod getDataSerializableCreationMethod(int32_t objectId) {
- TypeFactoryMethod createType;
- theTypeMap_.findDataSerializable(objectId, createType);
- return createType;
- }
+ void setDataSerializableHandler(DataSerializableHandler* handler);
- int32_t getIdForDataSerializableType(std::type_index objectType) const {
- auto&& typeIterator = theTypeMap_.typeToClassId_.find(objectType);
- auto&& id = typeIterator->second;
- return id;
- }
+ TypeFactoryMethod getDataSerializableCreationMethod(int32_t objectId);
- private:
- std::unique_ptr<PdxTypeHandler> pdxTypeHandler_;
- std::shared_ptr<PdxSerializer> pdxSerializer_;
- std::unique_ptr<DataSerializableHandler> dataSerializableHandler_;
- TheTypeMap theTypeMap_;
+ int32_t getIdForDataSerializableType(std::type_index objectType) const;
+ static DSCode getSerializableDataDsCode(int32_t classId);
+
+ private:
std::shared_ptr<Serializable> deserializeDataSerializableFixedId(
DataInput& input, DSCode dsCode) const;
- inline void serialize(const std::shared_ptr<DataSerializableFixedId>& obj,
- DataOutput& output) const {
- auto id = static_cast<int32_t>(obj->getDSFID());
- if (id <= std::numeric_limits<int8_t>::max() &&
- id >= std::numeric_limits<int8_t>::min()) {
- output.write(static_cast<int8_t>(DSCode::FixedIDByte));
- output.write(static_cast<int8_t>(id));
- } else if (id <= std::numeric_limits<int16_t>::max() &&
- id >= std::numeric_limits<int16_t>::min()) {
- output.write(static_cast<int8_t>(DSCode::FixedIDShort));
- output.writeInt(static_cast<int16_t>(id));
- } else {
- output.write(static_cast<int8_t>(DSCode::FixedIDInt));
- output.writeInt(static_cast<int32_t>(id));
- }
-
- serializeWithoutHeader(obj, output);
- }
+ void serialize(const std::shared_ptr<DataSerializableFixedId>& obj,
+ DataOutput& output) const;
- inline void serializeWithoutHeader(
+ void serializeWithoutHeader(
const std::shared_ptr<DataSerializableFixedId>& obj,
- DataOutput& output) const {
- obj->toData(output);
- }
+ DataOutput& output) const;
- inline void serialize(const std::shared_ptr<DataSerializablePrimitive>& obj,
- DataOutput& output) const {
- auto id = obj->getDsCode();
- output.write(static_cast<int8_t>(id));
+ void serialize(const std::shared_ptr<DataSerializablePrimitive>& obj,
+ DataOutput& output) const;
- serializeWithoutHeader(obj, output);
- }
-
- inline void serializeWithoutHeader(
+ void serializeWithoutHeader(
const std::shared_ptr<DataSerializablePrimitive>& obj,
- DataOutput& output) const {
- obj->toData(output);
- }
+ DataOutput& output) const;
- inline void serialize(const std::shared_ptr<PdxSerializable>& obj,
- DataOutput& output) const {
- output.write(static_cast<int8_t>(DSCode::PDX));
- serializeWithoutHeader(obj, output);
- }
+ void serialize(const std::shared_ptr<PdxSerializable>& obj,
+ DataOutput& output) const;
void serializeWithoutHeader(const std::shared_ptr<PdxSerializable>& obj,
DataOutput& output) const;
- inline void serialize(const std::shared_ptr<DataSerializableInternal>& obj,
- DataOutput& output) const {
- serializeWithoutHeader(obj, output);
- }
+ void serialize(const std::shared_ptr<DataSerializableInternal>& obj,
+ DataOutput& output) const;
- inline void serializeWithoutHeader(
+ void serializeWithoutHeader(
const std::shared_ptr<DataSerializableInternal>& obj,
- DataOutput& output) const {
- obj->toData(output);
- }
-
- public:
- static inline DSCode getSerializableDataDsCode(int32_t classId) {
- if (classId <= std::numeric_limits<int8_t>::max() &&
- classId >= std::numeric_limits<int8_t>::min()) {
- return DSCode::CacheableUserData;
- } else if (classId <= std::numeric_limits<int16_t>::max() &&
- classId >= std::numeric_limits<int16_t>::min()) {
- return DSCode::CacheableUserData2;
- } else {
- return DSCode::CacheableUserData4;
- }
- }
+ DataOutput& output) const;
- private:
void deserialize(DataInput& input,
const std::shared_ptr<Serializable>& obj) const;
+
+ private:
+ std::unique_ptr<PdxTypeHandler> pdxTypeHandler_;
+ std::shared_ptr<PdxSerializer> pdxSerializer_;
+ std::unique_ptr<DataSerializableHandler> dataSerializableHandler_;
+ TheTypeMap theTypeMap_;
};
} // namespace client
diff --git a/tests/cpp/fwklib/CMakeLists.txt b/tests/cpp/fwklib/CMakeLists.txt
index 49acf69..3136e6d 100644
--- a/tests/cpp/fwklib/CMakeLists.txt
+++ b/tests/cpp/fwklib/CMakeLists.txt
@@ -42,7 +42,6 @@ target_link_libraries(framework
PUBLIC
apache-geode
PRIVATE
- ACE::ACE
Boost::boost
internal
_WarningsAsError
diff --git a/tests/cpp/security/CMakeLists.txt b/tests/cpp/security/CMakeLists.txt
index 938bf9e..cd5c0db 100644
--- a/tests/cpp/security/CMakeLists.txt
+++ b/tests/cpp/security/CMakeLists.txt
@@ -52,7 +52,6 @@ target_link_libraries(security
OpenSSL::Crypto
OpenSSL::SSL
PRIVATE
- ACE::ACE
Boost::boost
Boost::log
_WarningsAsError
diff --git a/tests/cpp/security/CredentialGenerator.cpp b/tests/cpp/security/CredentialGenerator.cpp
index 9fd07c4..a5ff5f3 100644
--- a/tests/cpp/security/CredentialGenerator.cpp
+++ b/tests/cpp/security/CredentialGenerator.cpp
@@ -37,6 +37,7 @@
#include "LdapUserCredentialGenerator.hpp"
#include "NoopCredentialGenerator.hpp"
#include "PkcsCredentialGenerator.hpp"
+#include "Utils.hpp"
namespace apache {
namespace geode {
@@ -95,6 +96,15 @@ void CredentialGenerator::getAuthInit(std::shared_ptr<Properties>& prop) {
}
}
+std::string CredentialGenerator::getPublickeyfile() {
+ auto path = Utils::getEnv("TESTSRC");
+ if (path.empty()) {
+ path = Utils::getEnv("BUILDDIR") + "/framework/data";
+ }
+
+ return path + "/keystore/publickeyfile";
+}
+
std::string CredentialGenerator::getServerCmdParams(std::string securityParams,
std::string workingDir,
bool userMode) {
diff --git a/tests/cpp/security/CredentialGenerator.hpp b/tests/cpp/security/CredentialGenerator.hpp
index bf9661a..e221920 100644
--- a/tests/cpp/security/CredentialGenerator.hpp
+++ b/tests/cpp/security/CredentialGenerator.hpp
@@ -34,8 +34,6 @@
#include <map>
-#include <ace/OS.h>
-
#include <geode/Properties.hpp>
#include "typedefs.hpp"
@@ -136,13 +134,7 @@ class CredentialGenerator {
void getAuthInit(std::shared_ptr<Properties>& prop);
- std::string getPublickeyfile() {
- auto path =
- ACE_OS::getenv("TESTSRC")
- ? std::string(ACE_OS::getenv("TESTSRC"))
- : std::string(ACE_OS::getenv("BUILDDIR")) + "/framework/data";
- return path + "/keystore/publickeyfile";
- }
+ std::string getPublickeyfile();
std::string getServerCmdParams(std::string securityParams,
std::string workingDir = "",
diff --git a/tests/cpp/security/DummyCredentialGenerator.cpp b/tests/cpp/security/DummyCredentialGenerator.cpp
index 28cd052..703acd2 100644
--- a/tests/cpp/security/DummyCredentialGenerator.cpp
+++ b/tests/cpp/security/DummyCredentialGenerator.cpp
@@ -31,6 +31,8 @@
#include <boost/log/trivial.hpp>
+#include "Utils.hpp"
+
namespace apache {
namespace geode {
namespace client {
@@ -39,25 +41,17 @@ namespace security {
std::string DummyCredentialGenerator::getInitArgs(std::string workingDir,
bool userMode) {
- std::string additionalArgs;
- char* buildDir = ACE_OS::getenv("BUILDDIR");
- if (buildDir && workingDir.length() == 0) {
- workingDir = std::string(buildDir);
- workingDir += std::string("/framework/xml/Security/");
+ auto buildDir = Utils::getEnv("BUILDDIR");
+ if (!buildDir.empty() && workingDir.empty()) {
+ workingDir = buildDir + "/framework/xml/Security/";
}
BOOST_LOG_TRIVIAL(info) << "Inside dummy Credentials usermode is "
<< userMode;
- if (userMode) {
- additionalArgs = std::string(" --J=-Dgemfire.security-authz-xml-uri=") +
- std::string(workingDir) + std::string("authz-dummyMU.xml");
- } else {
- additionalArgs = std::string(" --J=-Dgemfire.security-authz-xml-uri=") +
- std::string(workingDir) + std::string("authz-dummy.xml");
- }
-
- return additionalArgs;
+ std::string result = " --J=-Dgemfire.security-authz-xml-uri=" + workingDir;
+ result += (userMode ? "authz-dummyMU.xml" : "authz-dummy.xml");
+ return result;
}
void DummyCredentialGenerator::getValidCredentials(
diff --git a/tests/cpp/security/DummyCredentialGenerator2.cpp b/tests/cpp/security/DummyCredentialGenerator2.cpp
index eb3046d..5c2969f 100644
--- a/tests/cpp/security/DummyCredentialGenerator2.cpp
+++ b/tests/cpp/security/DummyCredentialGenerator2.cpp
@@ -31,12 +31,26 @@
#include <boost/log/trivial.hpp>
+#include "Utils.hpp"
+
namespace apache {
namespace geode {
namespace client {
namespace testframework {
namespace security {
+std::string DummyCredentialGenerator2::getInitArgs(std::string workingDir,
+ bool userMode) {
+ auto buildDir = Utils::getEnv("BUILDDIR");
+ if (!buildDir.empty() && workingDir.empty()) {
+ workingDir = buildDir + "/framework/xml/Security/";
+ }
+
+ auto result = " --J=-Dgemfire.security-authz-xml-uri=" + workingDir;
+ result += (userMode ? "authz-dummyMU.xml" : "authz-dummy.xml");
+ return result;
+}
+
void DummyCredentialGenerator2::getInvalidCredentials(
std::shared_ptr<Properties>& p) {
p->insert("security-username", "1user");
diff --git a/tests/cpp/security/DummyCredentialGenerator2.hpp b/tests/cpp/security/DummyCredentialGenerator2.hpp
index f91eb3b..f7d742d 100644
--- a/tests/cpp/security/DummyCredentialGenerator2.hpp
+++ b/tests/cpp/security/DummyCredentialGenerator2.hpp
@@ -33,24 +33,7 @@ class DummyCredentialGenerator2 : public CredentialGenerator {
public:
DummyCredentialGenerator2() : CredentialGenerator(ID_DUMMY2, "DUMMY2") {}
- std::string getInitArgs(std::string workingDir, bool userMode) override {
- std::string additionalArgs;
- char* buildDir = ACE_OS::getenv("BUILDDIR");
- if (buildDir && workingDir.length() == 0) {
- workingDir = std::string(buildDir);
- workingDir += std::string("/framework/xml/Security/");
- }
- if (userMode) {
- additionalArgs = std::string(" --J=-Dgemfire.security-authz-xml-uri=") +
- std::string(workingDir) +
- std::string("authz-dummyMU.xml");
- } else {
- additionalArgs = std::string(" --J=-Dgemfire.security-authz-xml-uri=") +
- std::string(workingDir) + std::string("authz-dummy.xml");
- }
-
- return additionalArgs;
- }
+ std::string getInitArgs(std::string workingDir, bool userMode) override;
std::string getClientAuthInitLoaderFactory() override {
return "createUserPasswordAuthInitInstance";
diff --git a/tests/cpp/security/DummyCredentialGenerator3.cpp b/tests/cpp/security/DummyCredentialGenerator3.cpp
index a732ed0..2386f23 100644
--- a/tests/cpp/security/DummyCredentialGenerator3.cpp
+++ b/tests/cpp/security/DummyCredentialGenerator3.cpp
@@ -31,11 +31,25 @@
#include <boost/log/trivial.hpp>
+#include "Utils.hpp"
+
namespace apache {
namespace geode {
namespace client {
namespace testframework {
namespace security {
+std::string DummyCredentialGenerator3::getInitArgs(std::string workingDir,
+ bool userMode) {
+ auto buildDir = Utils::getEnv("BUILDDIR");
+ if (!buildDir.empty() && workingDir.empty()) {
+ workingDir = buildDir + "/framework/xml/Security/";
+ }
+
+ auto result = " --J=-Dgemfire.security-authz-xml-uri=" + workingDir;
+ result += (userMode ? "authz-dummyMU.xml" : "authz-dummy.xml");
+ return result;
+}
+
void DummyCredentialGenerator3::getValidCredentials(
std::shared_ptr<Properties>& p) {
p->insert("security-username", "user1");
diff --git a/tests/cpp/security/DummyCredentialGenerator3.hpp b/tests/cpp/security/DummyCredentialGenerator3.hpp
index c5c2194..728a85a 100644
--- a/tests/cpp/security/DummyCredentialGenerator3.hpp
+++ b/tests/cpp/security/DummyCredentialGenerator3.hpp
@@ -33,24 +33,7 @@ class DummyCredentialGenerator3 : public CredentialGenerator {
public:
DummyCredentialGenerator3() : CredentialGenerator(ID_DUMMY3, "DUMMY3") {}
- std::string getInitArgs(std::string workingDir, bool userMode) override {
- std::string additionalArgs;
- char* buildDir = ACE_OS::getenv("BUILDDIR");
- if (buildDir && workingDir.length() == 0) {
- workingDir = std::string(buildDir);
- workingDir += std::string("/framework/xml/Security/");
- }
- if (userMode) {
- additionalArgs = std::string(" --J=-Dgemfire.security-authz-xml-uri=") +
- std::string(workingDir) +
- std::string("authz-dummyMU.xml");
- } else {
- additionalArgs = std::string(" --J=-Dgemfire.security-authz-xml-uri=") +
- std::string(workingDir) + std::string("authz-dummy.xml");
- }
-
- return additionalArgs;
- }
+ std::string getInitArgs(std::string workingDir, bool userMode) override;
std::string getClientAuthInitLoaderFactory() override {
return "createUserPasswordAuthInitInstance";
diff --git a/tests/cpp/security/LdapUserCredentialGenerator.cpp b/tests/cpp/security/LdapUserCredentialGenerator.cpp
index 6df00e0..d4cf0c1 100644
--- a/tests/cpp/security/LdapUserCredentialGenerator.cpp
+++ b/tests/cpp/security/LdapUserCredentialGenerator.cpp
@@ -31,11 +31,41 @@
#include <boost/log/trivial.hpp>
+#include "Utils.hpp"
+
namespace apache {
namespace geode {
namespace client {
namespace testframework {
namespace security {
+
+std::string LdapUserCredentialGenerator::getInitArgs(std::string workingDir,
+ bool) {
+ auto buildDir = Utils::getEnv("BUILDDIR");
+ if (!buildDir.empty() && workingDir.empty()) {
+ workingDir = buildDir + "/framework/xml/Security/";
+ }
+
+ std::string result =
+ " --J=-Dgemfire.security-authz-xml-uri=" + workingDir + "authz-ldap.xml";
+
+ auto ldapSrv = Utils::getEnv("LDAP_SERVER");
+ result += " --J=-Dgemfire.security-ldap-server=" +
+ (ldapSrv.empty() ? "ldap" : ldapSrv);
+
+ auto ldapRoot = Utils::getEnv("LDAP_BASEDN");
+ result += " --J=\\\"-Dgemfire.security-ldap-basedn=";
+ result +=
+ ldapRoot.empty() ? "ou=ldapTesting,dc=ldap,dc=apache,dc=org" : ldapRoot;
+ result += "\\\"";
+
+ auto ldapSSL = Utils::getEnv("LDAP_USESSL");
+ result += " --J=-Dgemfire.security-ldap-usessl=";
+ result += (ldapSSL.empty() ? "false" : ldapSSL);
+
+ return result;
+}
+
void LdapUserCredentialGenerator::getValidCredentials(
std::shared_ptr<Properties>& p) {
p->insert("security-username", "geode1");
diff --git a/tests/cpp/security/LdapUserCredentialGenerator.hpp b/tests/cpp/security/LdapUserCredentialGenerator.hpp
index a486e4a..2cebb47 100644
--- a/tests/cpp/security/LdapUserCredentialGenerator.hpp
+++ b/tests/cpp/security/LdapUserCredentialGenerator.hpp
@@ -20,8 +20,6 @@
* limitations under the License.
*/
-#include <ace/ACE.h>
-#include <ace/OS.h>
#include "CredentialGenerator.hpp"
#include "XmlAuthzCredentialGenerator.hpp"
@@ -36,34 +34,7 @@ class LdapUserCredentialGenerator : public CredentialGenerator {
public:
LdapUserCredentialGenerator() : CredentialGenerator(ID_LDAP, "LDAP") {}
- std::string getInitArgs(std::string workingDir, bool) override {
- std::string additionalArgs;
- char* buildDir = ACE_OS::getenv("BUILDDIR");
- if (buildDir != nullptr && workingDir.length() == 0) {
- workingDir = std::string(buildDir);
- workingDir += std::string("/framework/xml/Security/");
- }
-
- additionalArgs = std::string(" --J=-Dgemfire.security-authz-xml-uri=") +
- std::string(workingDir) + std::string("authz-ldap.xml");
-
- char* ldapSrv = ACE_OS::getenv("LDAP_SERVER");
- additionalArgs += std::string(" --J=-Dgemfire.security-ldap-server=") +
- (ldapSrv != nullptr ? ldapSrv : "ldap");
-
- char* ldapRoot = ACE_OS::getenv("LDAP_BASEDN");
- additionalArgs +=
- std::string(" --J=\\\"-Dgemfire.security-ldap-basedn=") +
- (ldapRoot != nullptr ? ldapRoot
- : "ou=ldapTesting,dc=ldap,dc=apache,dc=org") +
- "\\\"";
-
- char* ldapSSL = ACE_OS::getenv("LDAP_USESSL");
- additionalArgs += std::string(" --J=-Dgemfire.security-ldap-usessl=") +
- (ldapSSL != nullptr ? ldapSSL : "false");
-
- return additionalArgs;
- }
+ std::string getInitArgs(std::string workingDir, bool) override;
std::string getClientAuthInitLoaderFactory() override {
return "createUserPasswordAuthInitInstance";
diff --git a/tests/cpp/security/NoopCredentialGenerator.hpp b/tests/cpp/security/NoopCredentialGenerator.hpp
index 59e50cf..db13b6f 100644
--- a/tests/cpp/security/NoopCredentialGenerator.hpp
+++ b/tests/cpp/security/NoopCredentialGenerator.hpp
@@ -32,16 +32,8 @@ class NoopCredentialGenerator : public CredentialGenerator {
public:
NoopCredentialGenerator() : CredentialGenerator(ID_NOOP, "NOOP") {}
- std::string getInitArgs(std::string workingDir, bool) override {
- std::string additionalArgs;
- char* buildDir = ACE_OS::getenv("BUILDDIR");
- if (buildDir && workingDir.length() == 0) {
- workingDir = std::string(buildDir);
- workingDir += std::string("/framework/xml/Security/");
- }
- additionalArgs = " ";
-
- return additionalArgs;
+ std::string getInitArgs(std::string, bool) override {
+ return " ";
}
std::string getClientAuthInitLoaderFactory() override {
diff --git a/tests/cpp/security/PkcsCredentialGenerator.cpp b/tests/cpp/security/PkcsCredentialGenerator.cpp
index 1207bd4..3c64e61 100644
--- a/tests/cpp/security/PkcsCredentialGenerator.cpp
+++ b/tests/cpp/security/PkcsCredentialGenerator.cpp
@@ -31,6 +31,8 @@
#include <boost/log/trivial.hpp>
+#include "Utils.hpp"
+
namespace apache {
namespace geode {
namespace client {
@@ -38,25 +40,18 @@ namespace testframework {
namespace security {
std::string PKCSCredentialGenerator::getInitArgs(std::string workingDir, bool) {
BOOST_LOG_TRIVIAL(info) << "Inside PKCS credentials";
- std::string additionalArgs;
- char* buildDir = ACE_OS::getenv("BUILDDIR");
+ auto buildDir = Utils::getEnv("BUILDDIR");
- if (buildDir && workingDir.length() == 0) {
- workingDir = std::string(buildDir);
- workingDir += std::string("/framework/xml/Security/");
+ if (!buildDir.empty() && workingDir.empty()) {
+ workingDir = buildDir + "/framework/xml/Security/";
}
- if (buildDir && workingDir.length() == 0) {
- workingDir = std::string(buildDir);
- workingDir += std::string("/framework/xml/Security/");
+ auto xmlUri = Utils::getEnv("AUTHZ_XML_URI");
+ if (xmlUri.empty()) {
+ xmlUri = "authz-pkcs.xml";
}
- char* authzXmlUri = ACE_OS::getenv("AUTHZ_XML_URI");
- additionalArgs = std::string(" --J=-Dgemfire.security-authz-xml-uri=") +
- std::string(workingDir) +
- std::string(authzXmlUri ? authzXmlUri : "authz-pkcs.xml");
-
- return additionalArgs;
+ return " --J=-Dgemfire.security-authz-xml-uri=" + workingDir + xmlUri;
}
void PKCSCredentialGenerator::getValidCredentials(
@@ -73,6 +68,27 @@ void PKCSCredentialGenerator::getInvalidCredentials(
<< p->find("security-username")->value();
}
+void PKCSCredentialGenerator::insertKeyStorePath(std::shared_ptr<Properties>& p,
+ const std::string& username) {
+ auto path = Utils::getEnv("TESTSRC");
+ if (path.empty()) {
+ path = Utils::getEnv("BUILDDIR") + "/framework/data";
+ }
+
+ path += "/keystore/";
+ path += username;
+ path += ".keystore";
+ p->insert(KEYSTORE_FILE_PATH, path);
+}
+
+void PKCSCredentialGenerator::setPKCSProperties(std::shared_ptr<Properties>& p,
+ const std::string& username) {
+ p->insert(SECURITY_USERNAME, "geode");
+ p->insert(KEYSTORE_ALIAS, username);
+ p->insert(KEYSTORE_PASSWORD, "geode");
+ insertKeyStorePath(p, username);
+}
+
} // namespace security
} // namespace testframework
} // namespace client
diff --git a/tests/cpp/security/PkcsCredentialGenerator.hpp b/tests/cpp/security/PkcsCredentialGenerator.hpp
index 53f6e26..031e880 100644
--- a/tests/cpp/security/PkcsCredentialGenerator.hpp
+++ b/tests/cpp/security/PkcsCredentialGenerator.hpp
@@ -30,9 +30,6 @@ const char KEYSTORE_FILE_PATH[] = "security-keystorepath";
const char KEYSTORE_ALIAS[] = "security-alias";
const char KEYSTORE_PASSWORD[] = "security-keystorepass";
-#include <ace/ACE.h>
-#include <ace/OS.h>
-
namespace apache {
namespace geode {
namespace client {
@@ -69,21 +66,10 @@ class PKCSCredentialGenerator : public CredentialGenerator {
}
void insertKeyStorePath(std::shared_ptr<Properties>& p,
- const std::string& username) {
- auto path =
- ACE_OS::getenv("TESTSRC")
- ? std::string(ACE_OS::getenv("TESTSRC"))
- : std::string(ACE_OS::getenv("BUILDDIR")) + "/framework/data";
- p->insert(KEYSTORE_FILE_PATH, path + "/keystore/" + username + ".keystore");
- }
+ const std::string& username);
void setPKCSProperties(std::shared_ptr<Properties>& p,
- const std::string& username) {
- p->insert(SECURITY_USERNAME, "geode");
- p->insert(KEYSTORE_ALIAS, username);
- p->insert(KEYSTORE_PASSWORD, "geode");
- insertKeyStorePath(p, username);
- }
+ const std::string& username);
void getValidCredentials(std::shared_ptr<Properties>& p) override;
diff --git a/tests/cpp/testobject/DeltaTestImpl.cpp b/tests/cpp/testobject/DeltaTestImpl.cpp
index db2301c..a919486 100644
--- a/tests/cpp/testobject/DeltaTestImpl.cpp
+++ b/tests/cpp/testobject/DeltaTestImpl.cpp
@@ -81,10 +81,7 @@ void DeltaTestImpl::toData(DataOutput& output) const {
}
void DeltaTestImpl::toDelta(DataOutput& output) const {
- {
- std::lock_guard<decltype(mutex_)> guard{mutex_};
- toDeltaCounter++;
- }
+ ++toDeltaCounter;
output.write(deltaBits);
if ((deltaBits & INT_MASK) == INT_MASK) {
@@ -105,11 +102,7 @@ void DeltaTestImpl::toDelta(DataOutput& output) const {
}
void DeltaTestImpl::fromDelta(DataInput& input) {
- {
- std::lock_guard<decltype(mutex_)> guard{mutex_};
- fromDeltaCounter++;
- }
-
+ ++fromDeltaCounter;
deltaBits = input.read();
if ((deltaBits & INT_MASK) == INT_MASK) {
diff --git a/tests/cpp/testobject/DeltaTestImpl.hpp b/tests/cpp/testobject/DeltaTestImpl.hpp
index 918a28b..e6d861c 100644
--- a/tests/cpp/testobject/DeltaTestImpl.hpp
+++ b/tests/cpp/testobject/DeltaTestImpl.hpp
@@ -20,12 +20,7 @@
#ifndef GEODE_TESTOBJECT_DELTATESTIMPL_H_
#define GEODE_TESTOBJECT_DELTATESTIMPL_H_
-#include <mutex>
-
-#include <ace/ACE.h>
-#include <ace/Condition_T.h>
-#include <ace/OS.h>
-#include <ace/Task.h>
+#include <atomic>
#include <geode/DataSerializable.hpp>
#include <geode/Delta.hpp>
@@ -60,9 +55,8 @@ class TESTOBJECT_EXPORT DeltaTestImpl : public DataSerializable, public Delta {
bool m_hasDelta;
uint8_t deltaBits;
- mutable int64_t toDeltaCounter;
- int64_t fromDeltaCounter;
- mutable std::recursive_mutex mutex_;
+ mutable std::atomic<int64_t> toDeltaCounter;
+ std::atomic<int64_t> fromDeltaCounter;
public:
DeltaTestImpl();