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 f647a87 GEODE-7620: Updates CMake to properly include macOS SDK.
(#565)
f647a87 is described below
commit f647a87beea17156b0d52d27c39f70c625617948
Author: Jacob Barrett <[email protected]>
AuthorDate: Mon Feb 10 09:52:39 2020 -0800
GEODE-7620: Updates CMake to properly include macOS SDK. (#565)
* Upgrades 3rd party dependencies.
* Fixes Boost on MSVC
* clang-tidy cleanup
* Ignore clang-analyzer-optin.cplusplus.VirtualCall in integration/framework
---
CMakeLists.txt | 4 +-
cppcache/CMakeLists.txt | 9 +----
cppcache/include/geode/internal/geode_base.hpp | 4 +-
cppcache/integration/framework/.clang-tidy | 3 +-
cppcache/integration/framework/CMakeLists.txt | 15 +-------
cppcache/integration/test/CMakeLists.txt | 7 ----
cppcache/src/VersionedCacheableObjectPartList.hpp | 2 -
dependencies/ACE/CMakeLists.txt | 8 ++--
dependencies/boost/CMakeLists.txt | 44 ++++++++++++++--------
dependencies/boost/patches | 16 --------
dependencies/gtest/CMakeLists.txt | 4 +-
dependencies/sqlite/CMakeLists.txt | 4 +-
tests/cpp/security/CredentialGenerator.hpp | 8 ++--
tests/cpp/security/DummyCredentialGenerator.hpp | 23 ++++++-----
tests/cpp/security/DummyCredentialGenerator2.hpp | 28 +++++++-------
tests/cpp/security/DummyCredentialGenerator3.hpp | 28 +++++++-------
tests/cpp/security/LdapUserCredentialGenerator.hpp | 13 +++----
tests/cpp/security/NoopCredentialGenerator.hpp | 5 +--
tests/cpp/security/PkcsCredentialGenerator.hpp | 8 ++--
19 files changed, 101 insertions(+), 132 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf9c5e4..9d2c301 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,6 @@ include(ClangFormat)
include(ApacheGeodeExportHeader)
if(CMAKE_GENERATOR MATCHES Win64*)
-
if ((CMAKE_GENERATOR MATCHES "Visual Studio") AND (CMAKE_GENERATOR_TOOLSET
STREQUAL ""))
message(FATAL_ERROR "GEODE expects that a user must provide -Thost=x64 if
you are using a"
" 64-bit toolset, otherwise you may get a linker error when DLLs
are larger"
@@ -39,6 +38,9 @@ if(CMAKE_GENERATOR MATCHES Win64*)
" to Visual Studio using the 32-bit toolset by default.")
endif()
endif()
+if(APPLE AND NOT DEFINED ENV{MACOSX_DEPLOYMENT_TARGET} AND NOT DEFINED
ENV{SDKROOT})
+ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14)
+endif()
get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY
GENERATOR_IS_MULTI_CONFIG)
if(NOT CMAKE_BUILD_TYPE AND NOT GENERATOR_IS_MULTI_CONFIG)
diff --git a/cppcache/CMakeLists.txt b/cppcache/CMakeLists.txt
index 86304d6..6564bcf 100644
--- a/cppcache/CMakeLists.txt
+++ b/cppcache/CMakeLists.txt
@@ -70,10 +70,6 @@ set(SOURCES_ALL ${SOURCES} ${PRIVATE_HEADERS}
${PUBLIC_HEADERS} ${CONFIGURE_IN_F
add_library(_apache-geode INTERFACE)
-target_compile_definitions(_apache-geode INTERFACE
- BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED
-)
-
if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
target_link_libraries(_apache-geode INTERFACE
demangle
@@ -83,10 +79,6 @@ elseif (WIN32)
target_link_libraries(_apache-geode INTERFACE
Dbghelp
)
- target_compile_definitions(_apache-geode INTERFACE
- # Required for Boost.WinAPI
- _WIN32_WINNT=0x06020000
- )
endif()
target_link_libraries(_apache-geode INTERFACE
@@ -94,6 +86,7 @@ target_link_libraries(_apache-geode INTERFACE
Boost::boost
Boost::filesystem
Boost::thread
+ Boost::stacktrace
XercesC::XercesC
)
diff --git a/cppcache/include/geode/internal/geode_base.hpp
b/cppcache/include/geode/internal/geode_base.hpp
index 1e222c9..26bf265 100644
--- a/cppcache/include/geode/internal/geode_base.hpp
+++ b/cppcache/include/geode/internal/geode_base.hpp
@@ -44,14 +44,14 @@
/** Allocates x and throws OutOfMemoryException if it fails */
#define _GEODE_NEW(v, stmt) \
- { \
+ do { \
try { \
v = new stmt; \
} catch (const std::bad_alloc &) { \
throw apache::geode::client::OutOfMemoryException( \
"Out of Memory while executing \"" #v " = new " #stmt ";\""); \
} \
- }
+ } while (0)
/** Deletes x only if it exists */
#define _GEODE_SAFE_DELETE(x) \
diff --git a/cppcache/integration/framework/.clang-tidy
b/cppcache/integration/framework/.clang-tidy
index 1c4ed27..7346c59 100644
--- a/cppcache/integration/framework/.clang-tidy
+++ b/cppcache/integration/framework/.clang-tidy
@@ -1,5 +1,5 @@
---
-Checks:
'-*,clang-diagnostic-*,clang-analyzer-*,-clang-analyzer-alpha*,google-*,-google-readability-todo,-google-runtime-references,-google-default-arguments,-clang-analyzer-unix.cstring.NullArg'
+Checks:
'-*,clang-diagnostic-*,clang-analyzer-*,-clang-analyzer-alpha*,google-*,-google-readability-todo,-google-runtime-references,-google-default-arguments,-clang-analyzer-unix.cstring.NullArg,-clang-analyzer-optin.cplusplus.VirtualCall'
WarningsAsErrors: '*'
HeaderFilterRegex: '.*'
FormatStyle: file
@@ -12,3 +12,4 @@ FormatStyle: file
# TODO - Fix these checks
# google-default-arguments
# clang-analyzer-unix.cstring.NullArg - Generates errors in Boost, how do we
ignore?
+# clang-analyzer-optin.cplusplus.VirtualCall - Boost.Process
diff --git a/cppcache/integration/framework/CMakeLists.txt
b/cppcache/integration/framework/CMakeLists.txt
index 61fb4a1..5c7476b 100644
--- a/cppcache/integration/framework/CMakeLists.txt
+++ b/cppcache/integration/framework/CMakeLists.txt
@@ -33,11 +33,6 @@ add_library(integration-framework STATIC
add_dependencies(integration-framework javaobject)
-target_compile_definitions(integration-framework
- PUBLIC
- BOOST_ASIO_HAS_MOVE
-)
-
target_include_directories(integration-framework
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/..
@@ -54,15 +49,9 @@ target_link_libraries(integration-framework
Boost::system
Boost::log
Boost::filesystem
+ Boost::process
+ Boost::asio
PRIVATE
_WarningsAsError
internal
)
-
-if(WIN32)
- target_compile_definitions(integration-framework
- PUBLIC
- # Required for Boost.WinAPI
- _WIN32_WINNT=0x06020000
- )
-endif()
diff --git a/cppcache/integration/test/CMakeLists.txt
b/cppcache/integration/test/CMakeLists.txt
index c2d77d3..23f819c 100644
--- a/cppcache/integration/test/CMakeLists.txt
+++ b/cppcache/integration/test/CMakeLists.txt
@@ -45,7 +45,6 @@ add_executable(cpp-integration-test
target_compile_definitions(cpp-integration-test
PUBLIC
- BOOST_ASIO_HAS_MOVE
GTEST_ELLIPSIS_NEEDS_POD_
)
@@ -76,12 +75,6 @@ target_link_libraries(cpp-integration-test
add_dependencies(cpp-integration-test cryptoImpl)
if(WIN32)
- target_compile_definitions(cpp-integration-test
- PUBLIC
- # Required for Boost.WinAPI
- _WIN32_WINNT=0x06020000
- )
-
foreach (_target apache-geode testobject cryptoImpl)
add_custom_command(TARGET cpp-integration-test POST_BUILD COMMAND
${CMAKE_COMMAND} -E copy_if_different
"$<TARGET_FILE:${_target}>"
diff --git a/cppcache/src/VersionedCacheableObjectPartList.hpp
b/cppcache/src/VersionedCacheableObjectPartList.hpp
index 6406278..82fcf08 100644
--- a/cppcache/src/VersionedCacheableObjectPartList.hpp
+++ b/cppcache/src/VersionedCacheableObjectPartList.hpp
@@ -101,7 +101,6 @@ class VersionedCacheableObjectPartList : public
CacheableObjectPartList {
m_endpointMemId = 0;
m_versionTags.resize(totalMapSize);
this->m_hasKeys = false;
- ;
}
VersionedCacheableObjectPartList(ThinClientRegion* region, uint16_t dsmemId,
@@ -113,7 +112,6 @@ class VersionedCacheableObjectPartList : public
CacheableObjectPartList {
m_serializeValues = false;
m_hasTags = false;
this->m_hasKeys = false;
- ;
}
VersionedCacheableObjectPartList(
diff --git a/dependencies/ACE/CMakeLists.txt b/dependencies/ACE/CMakeLists.txt
index 4d0ebca..217f20c 100644
--- a/dependencies/ACE/CMakeLists.txt
+++ b/dependencies/ACE/CMakeLists.txt
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-project( ACE VERSION 6.5.5 LANGUAGES NONE )
+project( ACE VERSION 6.5.7 LANGUAGES NONE )
-set( SHA256 dc70f1422e5d880b7d2cb59483873acfe6918bb1456c7e36e8b510d9e7769f3b )
+set( SHA256 b966eaa82281c17a9c869609e6a1cdc617aa13e1123a8fce5bde93cb266d1fea )
if ("SunOS" STREQUAL ${CMAKE_SYSTEM_NAME})
set( ACE_PLATFORM sunos5_sunc++ )
@@ -30,8 +30,8 @@ elseif ("Linux" STREQUAL ${CMAKE_SYSTEM_NAME} )
## TODO fix visibility problem with g++
set( _MAKE_ARGS ${_MAKE_ARGS} no_hidden_visibility=1 )
elseif ("Darwin" STREQUAL ${CMAKE_SYSTEM_NAME} )
- set( ACE_PLATFORM macosx_sierra )
- set( ACE_CONFIG macosx-sierra )
+ set( ACE_PLATFORM macosx )
+ set( ACE_CONFIG macosx )
elseif ("Windows" STREQUAL ${CMAKE_SYSTEM_NAME} )
set( ACE_PLATFORM win32-msvc )
set( ACE_CONFIG win32 )
diff --git a/dependencies/boost/CMakeLists.txt
b/dependencies/boost/CMakeLists.txt
index afe54a9..c3673b8 100644
--- a/dependencies/boost/CMakeLists.txt
+++ b/dependencies/boost/CMakeLists.txt
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-project( boost VERSION 1.68.0 LANGUAGES NONE )
+project( boost VERSION 1.72.0 LANGUAGES NONE )
-set( SHA256 da3411ea45622579d419bfda66f45cd0f8c32a181d84adfa936f5688388995cf )
+set( SHA256 c66e88d5786f2ca4dbebb14e06b566fb642a1a6947ad8cc9091f9f445134143f )
set(_B2_FLAGS
-d0
@@ -77,19 +77,6 @@ ExternalProject_Get_Property( ${EXTERN} SOURCE_DIR )
ExternalProject_Get_Property( ${EXTERN} INSTALL_DIR )
set(INSTALL_DIR "${INSTALL_DIR}/$<CONFIG>")
-if (NOT WIN32)
-# https://github.com/boostorg/process/issues/51
- set( PATCH_FILE ${CMAKE_CURRENT_SOURCE_DIR}/patches)
- ExternalProject_Add_Step( ${EXTERN} patches
- ALWAYS 0
- DEPENDEES download
- DEPENDERS patch
- DEPENDS ${PATCH_FILE}
- BYPRODUCTS ${SOURCE_DIR}/boost/process/detail/posix/is_running.hpp
- COMMAND ${Patch_EXECUTABLE} -u -N -p1 < ${PATCH_FILE}
- )
-endif()
-
function(ADD_BOOST_LIBRARY)
set(options)
set(oneValueArgs)
@@ -98,7 +85,7 @@ function(ADD_BOOST_LIBRARY)
set(args_NAME ${ARGV0})
- if (NOT DEFINED args_LIBRARIES OR args_LIBRARIES STREQUAL "")
+ if (NOT DEFINED args_LIBRARIES)
set(args_LIBRARIES ${args_NAME})
endif()
@@ -137,3 +124,28 @@ add_boost_library(filesystem DEPENDENCIES Boost::system
Boost::boost)
add_boost_library(log DEPENDENCIES Boost::thread Boost::filesystem
Boost::boost)
add_boost_library(log_setup DEPENDENCIES Boost::log)
add_boost_library(chrono DEPENDENCIES Boost::chrono)
+add_boost_library(stacktrace LIBRARIES "" DEPENDENCIES Boost::boost)
+add_boost_library(asio LIBRARIES "" DEPENDENCIES Boost::boost)
+add_boost_library(process LIBRARIES "" DEPENDENCIES Boost::system)
+
+target_compile_definitions(boost_stacktrace INTERFACE
+ BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED
+)
+
+target_compile_definitions(boost_asio INTERFACE
+ BOOST_ASIO_HAS_MOVE
+)
+
+if(WIN32)
+ target_compile_definitions(boost INTERFACE
+ # Required for Boost.WinAPI
+ _WIN32_WINNT=0x06020000
+ )
+endif()
+
+if(MSVC)
+ target_compile_options(boost_process INTERFACE
+ /wd4267
+ /wd4244
+ )
+endif()
diff --git a/dependencies/boost/patches b/dependencies/boost/patches
deleted file mode 100644
index 21bef7f..0000000
--- a/dependencies/boost/patches
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/boost/process/detail/posix/is_running.hpp
-+++ b/src/boost/process/detail/posix/is_running.hpp
-@@ -16,8 +16,11 @@ namespace boost { namespace process { namespace detail {
namespace posix {
- // Use the "stopped" state (WIFSTOPPED) to indicate "not terminated".
- // This bit arrangement of status codes is not guaranteed by POSIX, but
(according to comments in
- // the glibc <bits/waitstatus.h> header) is the same across systems in
practice.
--constexpr int still_active = 0x7F;
--static_assert(!WIFEXITED(still_active) && !WIFSIGNALED(still_active),
"Internal Error");
-+constexpr int still_active = 0x017f;
-+static_assert(WIFSTOPPED(still_active), "Expected still_active to indicate
WIFSTOPPED");
-+static_assert(!WIFEXITED(still_active), "Expected still_active to not
indicate WIFEXITED");
-+static_assert(!WIFSIGNALED(still_active), "Expected still_active to not
indicate WIFSIGNALED");
-+static_assert(!WIFCONTINUED(still_active), "Expected still_active to not
indicate WIFCONTINUED");
-
- inline bool is_running(int code)
- {
diff --git a/dependencies/gtest/CMakeLists.txt
b/dependencies/gtest/CMakeLists.txt
index 4d5c10a..4cca1e7 100644
--- a/dependencies/gtest/CMakeLists.txt
+++ b/dependencies/gtest/CMakeLists.txt
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-project( gtest VERSION 1.8.1 LANGUAGES NONE )
+project( gtest VERSION 1.10.0 LANGUAGES NONE )
-set( SHA256 927827c183d01734cc5cfef85e0ff3f5a92ffe6188e0d18e909c5efebf28a0c7 )
+set( SHA256 94c634d499558a76fa649edb13721dce6e98fb1e7018dfaeba3cd7a083945e91 )
include(ExternalProject)
ExternalProject_Add( ${PROJECT_NAME}-extern
diff --git a/dependencies/sqlite/CMakeLists.txt
b/dependencies/sqlite/CMakeLists.txt
index 5f4442e..8f23c71 100644
--- a/dependencies/sqlite/CMakeLists.txt
+++ b/dependencies/sqlite/CMakeLists.txt
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-project( sqlite VERSION 3280000 LANGUAGES NONE )
+project( sqlite VERSION 3300100 LANGUAGES NONE )
-set( SHA256 d02fc4e95cfef672b45052e221617a050b7f2e20103661cda88387349a9b1327 )
+set( SHA256 adf051d4c10781ea5cfabbbc4a2577b6ceca68590d23b58b8260a8e24cc5f081 )
set( EXTERN ${PROJECT_NAME}-extern )
diff --git a/tests/cpp/security/CredentialGenerator.hpp
b/tests/cpp/security/CredentialGenerator.hpp
index ea1232e..d324bda 100644
--- a/tests/cpp/security/CredentialGenerator.hpp
+++ b/tests/cpp/security/CredentialGenerator.hpp
@@ -234,11 +234,11 @@ class CredentialGenerator {
virtual void getAllowedCredentialsForOps(opCodeList& opCodes,
std::shared_ptr<Properties>& p,
- stringList* regionNames = nullptr);
+ stringList* regionNames);
- virtual void getDisallowedCredentialsForOps(
- opCodeList& opCodes, std::shared_ptr<Properties>& p,
- stringList* regionNames = nullptr);
+ virtual void getDisallowedCredentialsForOps(opCodeList& opCodes,
+ std::shared_ptr<Properties>& p,
+ stringList* regionNames);
static registeredClassMap& getRegisterdSchemes() {
if (generators().size() == 0) {
diff --git a/tests/cpp/security/DummyCredentialGenerator.hpp
b/tests/cpp/security/DummyCredentialGenerator.hpp
index 0d59c18..9d06ecf 100644
--- a/tests/cpp/security/DummyCredentialGenerator.hpp
+++ b/tests/cpp/security/DummyCredentialGenerator.hpp
@@ -36,7 +36,7 @@ class DummyCredentialGenerator : public CredentialGenerator {
;
};
- std::string getInitArgs(std::string workingDir, bool userMode) {
+ std::string getInitArgs(std::string workingDir, bool userMode) override {
std::string additionalArgs;
char* buildDir = ACE_OS::getenv("BUILDDIR");
if (buildDir && workingDir.length() == 0) {
@@ -56,21 +56,24 @@ class DummyCredentialGenerator : public CredentialGenerator
{
return additionalArgs;
}
- std::string getClientAuthInitLoaderFactory() {
+ std::string getClientAuthInitLoaderFactory() override {
return "createUserPasswordAuthInitInstance";
}
- std::string getClientAuthInitLoaderLibrary() { return "securityImpl"; }
- std::string getClientAuthenticator() {
+ std::string getClientAuthInitLoaderLibrary() override {
+ return "securityImpl";
+ }
+
+ std::string getClientAuthenticator() override {
return "javaobject.DummyAuthenticator.create";
}
- std::string getClientAuthorizer() {
+ std::string getClientAuthorizer() override {
return "javaobject.XmlAuthorization.create";
}
- std::string getClientDummyAuthorizer() {
+ std::string getClientDummyAuthorizer() override {
return "javaobject.DummyAuthorization.create";
}
- void getValidCredentials(std::shared_ptr<Properties>& p) {
+ void getValidCredentials(std::shared_ptr<Properties>& p) override {
p->insert("security-username", "user1");
p->insert("security-password", "user1");
FWKDEBUG("inserted valid security-username "
@@ -78,7 +81,7 @@ class DummyCredentialGenerator : public CredentialGenerator {
<< p->find("security-password")->value().c_str());
}
- void getInvalidCredentials(std::shared_ptr<Properties>& p) {
+ void getInvalidCredentials(std::shared_ptr<Properties>& p) override {
p->insert("security-username", "1user");
p->insert("security-password", "user1");
FWKDEBUG("inserted invalid security-username "
@@ -88,14 +91,14 @@ class DummyCredentialGenerator : public CredentialGenerator
{
void getAllowedCredentialsForOps(opCodeList& opCodes,
std::shared_ptr<Properties>& p,
- stringList* regionNames = nullptr) {
+ stringList* regionNames) override {
XmlAuthzCredentialGenerator authz(id());
authz.getAllowedCredentials(opCodes, p, regionNames);
}
void getDisallowedCredentialsForOps(opCodeList& opCodes,
std::shared_ptr<Properties>& p,
- stringList* regionNames = nullptr) {
+ stringList* regionNames) override {
XmlAuthzCredentialGenerator authz(id());
authz.getDisallowedCredentials(opCodes, p, regionNames);
}
diff --git a/tests/cpp/security/DummyCredentialGenerator2.hpp
b/tests/cpp/security/DummyCredentialGenerator2.hpp
index 4ebbc2a..afe33cb 100644
--- a/tests/cpp/security/DummyCredentialGenerator2.hpp
+++ b/tests/cpp/security/DummyCredentialGenerator2.hpp
@@ -31,12 +31,9 @@ namespace security {
class DummyCredentialGenerator2 : public CredentialGenerator {
public:
- DummyCredentialGenerator2() : CredentialGenerator(ID_DUMMY2, "DUMMY2") {
- ;
- ;
- };
+ DummyCredentialGenerator2() : CredentialGenerator(ID_DUMMY2, "DUMMY2") {}
- std::string getInitArgs(std::string workingDir, bool userMode) {
+ std::string getInitArgs(std::string workingDir, bool userMode) override {
std::string additionalArgs;
char* buildDir = ACE_OS::getenv("BUILDDIR");
if (buildDir && workingDir.length() == 0) {
@@ -55,21 +52,24 @@ class DummyCredentialGenerator2 : public
CredentialGenerator {
return additionalArgs;
}
- std::string getClientAuthInitLoaderFactory() {
+ std::string getClientAuthInitLoaderFactory() override {
return "createUserPasswordAuthInitInstance";
}
- std::string getClientAuthInitLoaderLibrary() { return "securityImpl"; }
- std::string getClientAuthenticator() {
+ std::string getClientAuthInitLoaderLibrary() override {
+ return "securityImpl";
+ }
+
+ std::string getClientAuthenticator() override {
return "javaobject.DummyAuthenticator.create";
}
- std::string getClientAuthorizer() {
+ std::string getClientAuthorizer() override {
return "javaobject.DummyAuthorization2.create";
}
- std::string getClientDummyAuthorizer() {
+ std::string getClientDummyAuthorizer() override {
return "javaobject.DummyAuthorization.create";
}
- void getValidCredentials(std::shared_ptr<Properties>& p) {
+ void getValidCredentials(std::shared_ptr<Properties>& p) override {
p->insert("security-username", "user1");
p->insert("security-password", "user1");
FWKDEBUG("inserted valid security-username "
@@ -77,7 +77,7 @@ class DummyCredentialGenerator2 : public CredentialGenerator {
<< p->find("security-password")->value().c_str());
}
- void getInvalidCredentials(std::shared_ptr<Properties>& p) {
+ void getInvalidCredentials(std::shared_ptr<Properties>& p) override {
p->insert("security-username", "1user");
p->insert("security-password", "user1");
FWKDEBUG("inserted invalid security-username "
@@ -87,14 +87,14 @@ class DummyCredentialGenerator2 : public
CredentialGenerator {
void getAllowedCredentialsForOps(opCodeList& opCodes,
std::shared_ptr<Properties>& p,
- stringList* regionNames = nullptr) {
+ stringList* regionNames) override {
XmlAuthzCredentialGenerator authz(id());
authz.getAllowedCredentials(opCodes, p, regionNames);
}
void getDisallowedCredentialsForOps(opCodeList& opCodes,
std::shared_ptr<Properties>& p,
- stringList* regionNames = nullptr) {
+ stringList* regionNames) override {
XmlAuthzCredentialGenerator authz(id());
authz.getDisallowedCredentials(opCodes, p, regionNames);
}
diff --git a/tests/cpp/security/DummyCredentialGenerator3.hpp
b/tests/cpp/security/DummyCredentialGenerator3.hpp
index b5847d1..6e448de 100644
--- a/tests/cpp/security/DummyCredentialGenerator3.hpp
+++ b/tests/cpp/security/DummyCredentialGenerator3.hpp
@@ -31,12 +31,9 @@ namespace security {
class DummyCredentialGenerator3 : public CredentialGenerator {
public:
- DummyCredentialGenerator3() : CredentialGenerator(ID_DUMMY3, "DUMMY3") {
- ;
- ;
- };
+ DummyCredentialGenerator3() : CredentialGenerator(ID_DUMMY3, "DUMMY3") {}
- std::string getInitArgs(std::string workingDir, bool userMode) {
+ std::string getInitArgs(std::string workingDir, bool userMode) override {
std::string additionalArgs;
char* buildDir = ACE_OS::getenv("BUILDDIR");
if (buildDir && workingDir.length() == 0) {
@@ -55,21 +52,24 @@ class DummyCredentialGenerator3 : public
CredentialGenerator {
return additionalArgs;
}
- std::string getClientAuthInitLoaderFactory() {
+ std::string getClientAuthInitLoaderFactory() override {
return "createUserPasswordAuthInitInstance";
}
- std::string getClientAuthInitLoaderLibrary() { return "securityImpl"; }
- std::string getClientAuthenticator() {
+ std::string getClientAuthInitLoaderLibrary() override {
+ return "securityImpl";
+ }
+
+ std::string getClientAuthenticator() override {
return "javaobject.DummyAuthenticator.create";
}
- std::string getClientAuthorizer() {
+ std::string getClientAuthorizer() override {
return "javaobject.DummyAuthorization3.create";
}
- std::string getClientDummyAuthorizer() {
+ std::string getClientDummyAuthorizer() override {
return "javaobject.DummyAuthorization.create";
}
- void getValidCredentials(std::shared_ptr<Properties>& p) {
+ void getValidCredentials(std::shared_ptr<Properties>& p) override {
p->insert("security-username", "user1");
p->insert("security-password", "user1");
FWKDEBUG("inserted valid security-username "
@@ -77,7 +77,7 @@ class DummyCredentialGenerator3 : public CredentialGenerator {
<< p->find("security-password")->value().c_str());
}
- void getInvalidCredentials(std::shared_ptr<Properties>& p) {
+ void getInvalidCredentials(std::shared_ptr<Properties>& p) override {
p->insert("security-username", "1user");
p->insert("security-password", "user1");
FWKDEBUG("inserted invalid security-username "
@@ -87,14 +87,14 @@ class DummyCredentialGenerator3 : public
CredentialGenerator {
void getAllowedCredentialsForOps(opCodeList& opCodes,
std::shared_ptr<Properties>& p,
- stringList* regionNames = nullptr) {
+ stringList* regionNames) override {
XmlAuthzCredentialGenerator authz(id());
authz.getAllowedCredentials(opCodes, p, regionNames);
}
void getDisallowedCredentialsForOps(opCodeList& opCodes,
std::shared_ptr<Properties>& p,
- stringList* regionNames = nullptr) {
+ stringList* regionNames) override {
XmlAuthzCredentialGenerator authz(id());
authz.getDisallowedCredentials(opCodes, p, regionNames);
}
diff --git a/tests/cpp/security/LdapUserCredentialGenerator.hpp
b/tests/cpp/security/LdapUserCredentialGenerator.hpp
index fd795b6..97d8430 100644
--- a/tests/cpp/security/LdapUserCredentialGenerator.hpp
+++ b/tests/cpp/security/LdapUserCredentialGenerator.hpp
@@ -34,10 +34,7 @@ namespace security {
class LdapUserCredentialGenerator : public CredentialGenerator {
public:
- LdapUserCredentialGenerator() : CredentialGenerator(ID_LDAP, "LDAP") {
- ;
- ;
- };
+ LdapUserCredentialGenerator() : CredentialGenerator(ID_LDAP, "LDAP") {}
std::string getInitArgs(std::string workingDir, bool) override {
std::string additionalArgs;
@@ -102,14 +99,14 @@ class LdapUserCredentialGenerator : public
CredentialGenerator {
void getAllowedCredentialsForOps(opCodeList& opCodes,
std::shared_ptr<Properties>& p,
- stringList* regionNames = nullptr) override
{
+ stringList* regionNames) override {
XmlAuthzCredentialGenerator authz(id());
authz.getAllowedCredentials(opCodes, p, regionNames);
}
- void getDisallowedCredentialsForOps(
- opCodeList& opCodes, std::shared_ptr<Properties>& p,
- stringList* regionNames = nullptr) override {
+ void getDisallowedCredentialsForOps(opCodeList& opCodes,
+ std::shared_ptr<Properties>& p,
+ stringList* regionNames) override {
XmlAuthzCredentialGenerator authz(id());
authz.getDisallowedCredentials(opCodes, p, regionNames);
}
diff --git a/tests/cpp/security/NoopCredentialGenerator.hpp
b/tests/cpp/security/NoopCredentialGenerator.hpp
index 6459d95..59e50cf 100644
--- a/tests/cpp/security/NoopCredentialGenerator.hpp
+++ b/tests/cpp/security/NoopCredentialGenerator.hpp
@@ -30,10 +30,7 @@ namespace security {
class NoopCredentialGenerator : public CredentialGenerator {
public:
- NoopCredentialGenerator() : CredentialGenerator(ID_NOOP, "NOOP") {
- ;
- ;
- };
+ NoopCredentialGenerator() : CredentialGenerator(ID_NOOP, "NOOP") {}
std::string getInitArgs(std::string workingDir, bool) override {
std::string additionalArgs;
diff --git a/tests/cpp/security/PkcsCredentialGenerator.hpp
b/tests/cpp/security/PkcsCredentialGenerator.hpp
index efb3717..5c87c4f 100644
--- a/tests/cpp/security/PkcsCredentialGenerator.hpp
+++ b/tests/cpp/security/PkcsCredentialGenerator.hpp
@@ -135,16 +135,16 @@ class PKCSCredentialGenerator : public
CredentialGenerator {
void getAllowedCredentialsForOps(opCodeList& opCodes,
std::shared_ptr<Properties>& p,
- stringList* regionNames = nullptr) override
{
+ stringList* regionNames) override {
XmlAuthzCredentialGenerator authz(id());
authz.getAllowedCredentials(opCodes, p, regionNames);
const char* username = p->find("security-alias")->value().c_str();
insertKeyStorePath(p, username);
}
- void getDisallowedCredentialsForOps(
- opCodeList& opCodes, std::shared_ptr<Properties>& p,
- stringList* regionNames = nullptr) override {
+ void getDisallowedCredentialsForOps(opCodeList& opCodes,
+ std::shared_ptr<Properties>& p,
+ stringList* regionNames) override {
XmlAuthzCredentialGenerator authz(id());
authz.getDisallowedCredentials(opCodes, p, regionNames);
const char* username = p->find("security-alias")->value().c_str();
