diff --git a/3d_party/ctest_junit_convert/conv.xsl b/3d_party/ctest_junit_convert/conv.xsl
index 2b149343c299b3bf9b0a5ab81f3b55218bd439e3..f02d345cf7eecfa8944711e9e6923173df771060 100644
--- a/3d_party/ctest_junit_convert/conv.xsl
+++ b/3d_party/ctest_junit_convert/conv.xsl
@@ -2,7 +2,7 @@
<xsl:output method="xml" indent="yes"/>
<xsl:template match="/Site">
- <testsuite name="hidrai2 tests">
+ <testsuite name="asapo tests">
<xsl:variable name="BuildName"><xsl:value-of select="@BuildName"/></xsl:variable>
<xsl:variable name="BuildStamp"><xsl:value-of select="@BuildStamp"/></xsl:variable>
<xsl:variable name="Name"><xsl:value-of select="@Name"/></xsl:variable>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e50c24502162da1734ccc05caa5da3eae86716a7..85845171aa3c62edf1c2610b405e968cfc3a8d6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8)
-project(HIDRA2)
+project(ASAPO)
set(CMAKE_CXX_STANDARD 11)
IF(WIN32)
set(CMAKE_CXX_FLAGS_DEBUG "/MTd")
@@ -11,21 +11,22 @@ ENDIF(WIN32)
#TODO: Better way then GLOBAL PROPERTY
IF(WIN32)
find_package(Threads REQUIRED)
- SET_PROPERTY(GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} wsock32 ws2_32)
+ SET_PROPERTY(GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} wsock32 ws2_32)
ELSEIF(UNIX)
- SET_PROPERTY(GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES Threads::Threads)
+ SET_PROPERTY(GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES Threads::Threads)
ENDIF(WIN32)
option(BUILD_TESTS "Uses googletest to build tests" OFF)
option(BUILD_INTEGRATION_TESTS "Include integration tests (CMAKE >3.7 is needed)" OFF)
option(BUILD_DOCS "Uses doxygen to build the documentaion" OFF)
option(BUILD_BROKER "Build broker" OFF)
+
option(BUILD_WORKER_TOOLS "Build worker tools" OFF)
option(BUILD_EXAMPLES "Build examples" OFF)
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules/)
-set (HIDRA2_CXX_COMMON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/common/cpp/include)
+set (ASAPO_CXX_COMMON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/common/cpp/include)
find_package (Threads)
diff --git a/CMakeModules/check_test.sh b/CMakeModules/check_test.sh
index ff6f8c5bfebcbe0e1be718368182ab3b7a95aaa1..676c57357618b57f5e6e54e485bc942f16a132c0 100755
--- a/CMakeModules/check_test.sh
+++ b/CMakeModules/check_test.sh
@@ -4,7 +4,7 @@ set -e
TARGET=$1
BINARY_DIR=$2
-HIDRA2_MINIMUM_COVERAGE=$3
+ASAPO_MINIMUM_COVERAGE=$3
make ${TARGET}
@@ -12,12 +12,12 @@ coverage=`cat ${BINARY_DIR}/${TARGET}.txt`
if [ -z "$coverage" ]; then
coverage=0
fi
-if (( coverage < HIDRA2_MINIMUM_COVERAGE )); then
+if (( coverage < ASAPO_MINIMUM_COVERAGE )); then
exec >&2
echo
echo "*****"
echo
- echo ${TARGET} coverage is ${coverage}% - less than required ${HIDRA2_MINIMUM_COVERAGE}%
+ echo ${TARGET} coverage is ${coverage}% - less than required ${ASAPO_MINIMUM_COVERAGE}%
echo
echo "*****"
echo
diff --git a/CMakeModules/coverage_go.sh b/CMakeModules/coverage_go.sh
index 52f7ab3c97a68eb427a283d82245428eb6019ba9..6a92bc97054fbd267fa9a6618ec2954931778d1f 100755
--- a/CMakeModules/coverage_go.sh
+++ b/CMakeModules/coverage_go.sh
@@ -1,7 +1,7 @@
#!/bin/bash
OUT_DIR=$1
-HIDRA2_MINIMUM_COVERAGE=$2
+ASAPO_MINIMUM_COVERAGE=$2
export GOPATH=$GOPATH:$3
@@ -22,12 +22,12 @@ coverage=`go tool cover -func=$OUT_DIR/coverage-all.out | grep total | cut -d ")
#firefox ./coverage.html &
go tool cover -html=$OUT_DIR/coverage-all.out -o ${OUT_DIR}/coverage.html
rm -rf ${OUT_DIR}/coverage-all.out ${OUT_DIR}/coverage.out
-if (( coverage < HIDRA2_MINIMUM_COVERAGE )); then
+if (( coverage < ASAPO_MINIMUM_COVERAGE )); then
exec >&2
echo
echo "*****"
echo
- echo coverage is ${coverage}% - less than required ${HIDRA2_MINIMUM_COVERAGE}%
+ echo coverage is ${coverage}% - less than required ${ASAPO_MINIMUM_COVERAGE}%
echo
echo "*****"
echo
diff --git a/CMakeModules/testing_cpp.cmake b/CMakeModules/testing_cpp.cmake
index 1eb817ad1a5acee7ae379f6c1dbb558364dad235..fef27b861e43332fee4e58de211273e6b317ee0f 100644
--- a/CMakeModules/testing_cpp.cmake
+++ b/CMakeModules/testing_cpp.cmake
@@ -3,7 +3,7 @@ if (BUILD_TESTS OR BUILD_INTEGRATION_TESTS OR BUILD_EXAMPLES)
endif ()
if (BUILD_TESTS)
- set(HIDRA2_MINIMUM_COVERAGE 70)
+ set(ASAPO_MINIMUM_COVERAGE 70)
find_package(Threads)
find_program(MEMORYCHECK_COMMAND valgrind)
set(MEMORYCHECK_COMMAND_OPTIONS
@@ -37,9 +37,9 @@ function(add_plain_unit_test target test_source_files linktarget)
ENDIF (WIN32 AND ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
target_link_libraries(test-${target} ${GTEST_LIBS} ${CMAKE_THREAD_LIBS_INIT})
- GET_PROPERTY(HIDRA2_COMMON_IO_LIBRARIES GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES)
- message(STATUS "HIDRA2_COMMON_IO_LIBRARIES: '${HIDRA2_COMMON_IO_LIBRARIES}'")
- target_link_libraries(test-${target} ${HIDRA2_COMMON_IO_LIBRARIES})
+ GET_PROPERTY(ASAPO_COMMON_IO_LIBRARIES GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES)
+ message(STATUS "ASAPO_COMMON_IO_LIBRARIES: '${ASAPO_COMMON_IO_LIBRARIES}'")
+ target_link_libraries(test-${target} ${ASAPO_COMMON_IO_LIBRARIES})
if (NOT ${test_libraries} STREQUAL "")
target_link_libraries(test-${target} ${test_libraries})
@@ -81,9 +81,9 @@ function(gtest target test_source_files linktarget)
ENDIF (WIN32 AND ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
target_link_libraries(test-${target} ${GTEST_LIBS} ${CMAKE_THREAD_LIBS_INIT})
- GET_PROPERTY(HIDRA2_COMMON_IO_LIBRARIES GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES)
- message(STATUS "HIDRA2_COMMON_IO_LIBRARIES: '${HIDRA2_COMMON_IO_LIBRARIES}'")
- target_link_libraries(test-${target} ${HIDRA2_COMMON_IO_LIBRARIES})
+ GET_PROPERTY(ASAPO_COMMON_IO_LIBRARIES GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES)
+ message(STATUS "ASAPO_COMMON_IO_LIBRARIES: '${ASAPO_COMMON_IO_LIBRARIES}'")
+ target_link_libraries(test-${target} ${ASAPO_COMMON_IO_LIBRARIES})
if (NOT ${test_libraries} STREQUAL "")
target_link_libraries(test-${target} ${test_libraries})
@@ -101,7 +101,7 @@ function(gtest target test_source_files linktarget)
SETUP_TARGET_FOR_COVERAGE(NAME coverage-${target} EXECUTABLE test-${target} ${target})
add_test(NAME coveragetest-${target}
COMMAND ${CMAKE_MODULE_PATH}/check_test.sh
- coverage-${target} ${CMAKE_BINARY_DIR} ${HIDRA2_MINIMUM_COVERAGE})
+ coverage-${target} ${CMAKE_BINARY_DIR} ${ASAPO_MINIMUM_COVERAGE})
set_tests_properties(coveragetest-${target} PROPERTIES LABELS "coverage;all")
SET_TESTS_PROPERTIES(coveragetest-${target} PROPERTIES DEPENDS test-${target})
set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} PARENT_SCOPE)
diff --git a/CMakeModules/testing_go.cmake b/CMakeModules/testing_go.cmake
index 56d7c168803185e6fd58055ddb028a264ab4d7cd..45af50ce4cf3e9c49b04276a482c4dff4a444fb4 100644
--- a/CMakeModules/testing_go.cmake
+++ b/CMakeModules/testing_go.cmake
@@ -3,7 +3,7 @@ if (BUILD_TESTS)
endif ()
if (BUILD_TESTS)
- set(HIDRA2_MINIMUM_COVERAGE 80)
+ set(ASAPO_MINIMUM_COVERAGE 80)
find_program(MEMORYCHECK_COMMAND valgrind)
set(MEMORYCHECK_COMMAND_OPTIONS
"--trace-children=yes --leak-check=full --error-exitcode=1 --suppressions=${CMAKE_SOURCE_DIR}/tests/valgrind.suppressions")
@@ -22,7 +22,7 @@ function(gotest target test_source_files)
if (CMAKE_COMPILER_IS_GNUCXX)
add_test(NAME coveragetest-${target}
COMMAND ${CMAKE_MODULE_PATH}/coverage_go.sh
- ${CMAKE_CURRENT_BINARY_DIR} ${HIDRA2_MINIMUM_COVERAGE} ${gopath}
+ ${CMAKE_CURRENT_BINARY_DIR} ${ASAPO_MINIMUM_COVERAGE} ${gopath}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
set_tests_properties(coveragetest-${target} PROPERTIES LABELS "coverage;all")
endif()
diff --git a/README.md b/README.md
index 680a681206b2457a68668700aff3b29dae75f735..6ce92cb59f5b0aa55b949a53cfc89f4256d2c6c2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# hidra2
+# asapo
# C++ Projects
diff --git a/broker/CMakeLists.txt b/broker/CMakeLists.txt
index 6ba55360368b03d630f9a56fb2ffba493a229555..4b464e6d1498b6727d7cf57ee0e1e274e136dc9a 100644
--- a/broker/CMakeLists.txt
+++ b/broker/CMakeLists.txt
@@ -1,4 +1,4 @@
-set (TARGET_NAME hidra2-broker)
+set (TARGET_NAME asapo-broker)
if (NOT "$ENV{GOPATH}" STREQUAL "")
set(GOPATH $ENV{GOPATH})
@@ -20,15 +20,15 @@ ENDIF()
include(testing_go)
-add_custom_target(hidra2-broker ALL
+add_custom_target(asapo-broker ALL
COMMAND ${CMAKE_COMMAND} -E env GOPATH=${gopath}
- go build ${GO_OPTS} -o ${exe_name} hidra2_broker/main
+ go build ${GO_OPTS} -o ${exe_name} asapo_broker/main
VERBATIM)
define_property(TARGET PROPERTY EXENAME
BRIEF_DOCS <executable name>
FULL_DOCS <full-doc>)
-set_target_properties(hidra2-broker PROPERTIES EXENAME ${CMAKE_CURRENT_BINARY_DIR}/${exe_name})
+set_target_properties(asapo-broker PROPERTIES EXENAME ${CMAKE_CURRENT_BINARY_DIR}/${exe_name})
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${exe_name} DESTINATION bin)
diff --git a/broker/src/hidra2_broker/database/database.go b/broker/src/asapo_broker/database/database.go
similarity index 100%
rename from broker/src/hidra2_broker/database/database.go
rename to broker/src/asapo_broker/database/database.go
diff --git a/broker/src/hidra2_broker/database/database_test.go b/broker/src/asapo_broker/database/database_test.go
similarity index 100%
rename from broker/src/hidra2_broker/database/database_test.go
rename to broker/src/asapo_broker/database/database_test.go
diff --git a/broker/src/hidra2_broker/database/mock_database.go b/broker/src/asapo_broker/database/mock_database.go
similarity index 100%
rename from broker/src/hidra2_broker/database/mock_database.go
rename to broker/src/asapo_broker/database/mock_database.go
diff --git a/broker/src/hidra2_broker/database/mongodb.go b/broker/src/asapo_broker/database/mongodb.go
similarity index 99%
rename from broker/src/hidra2_broker/database/mongodb.go
rename to broker/src/asapo_broker/database/mongodb.go
index bc24d52a61c19c681b214fa24d71435115da21df..43213baf03226baa05d3b933175c1de7139b7051 100644
--- a/broker/src/hidra2_broker/database/mongodb.go
+++ b/broker/src/asapo_broker/database/mongodb.go
@@ -6,7 +6,7 @@ import (
"errors"
"gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
- "hidra2_broker/utils"
+ "asapo_broker/utils"
"sync"
"time"
)
diff --git a/broker/src/hidra2_broker/database/mongodb_test.go b/broker/src/asapo_broker/database/mongodb_test.go
similarity index 99%
rename from broker/src/hidra2_broker/database/mongodb_test.go
rename to broker/src/asapo_broker/database/mongodb_test.go
index dcad1b703ec343180a9c672ef49578548ee266e2..a8b788ed2bbfa8c7921e7382e65fecd74a44121f 100644
--- a/broker/src/hidra2_broker/database/mongodb_test.go
+++ b/broker/src/asapo_broker/database/mongodb_test.go
@@ -5,7 +5,7 @@ package database
import (
"encoding/json"
"github.com/stretchr/testify/assert"
- "hidra2_broker/utils"
+ "asapo_broker/utils"
"sync"
"testing"
)
diff --git a/broker/src/hidra2_broker/logger/logger.go b/broker/src/asapo_broker/logger/logger.go
similarity index 100%
rename from broker/src/hidra2_broker/logger/logger.go
rename to broker/src/asapo_broker/logger/logger.go
diff --git a/broker/src/hidra2_broker/logger/logrus_logger.go b/broker/src/asapo_broker/logger/logrus_logger.go
similarity index 100%
rename from broker/src/hidra2_broker/logger/logrus_logger.go
rename to broker/src/asapo_broker/logger/logrus_logger.go
diff --git a/broker/src/hidra2_broker/logger/mock_logger.go b/broker/src/asapo_broker/logger/mock_logger.go
similarity index 100%
rename from broker/src/hidra2_broker/logger/mock_logger.go
rename to broker/src/asapo_broker/logger/mock_logger.go
diff --git a/broker/src/hidra2_broker/main/broker.go b/broker/src/asapo_broker/main/broker.go
similarity index 88%
rename from broker/src/hidra2_broker/main/broker.go
rename to broker/src/asapo_broker/main/broker.go
index 8153c2c5c772f4170f64ee6074ada228181989b9..b4bb3779f05f7c8074f726a9b3937c26abfc08cd 100644
--- a/broker/src/hidra2_broker/main/broker.go
+++ b/broker/src/asapo_broker/main/broker.go
@@ -4,9 +4,9 @@ package main
import (
"flag"
- "hidra2_broker/database"
- log "hidra2_broker/logger"
- "hidra2_broker/server"
+ "asapo_broker/database"
+ log "asapo_broker/logger"
+ "asapo_broker/server"
"os"
)
diff --git a/broker/src/hidra2_broker/server/get_next.go b/broker/src/asapo_broker/server/get_next.go
similarity index 94%
rename from broker/src/hidra2_broker/server/get_next.go
rename to broker/src/asapo_broker/server/get_next.go
index 2b8196bdcc1fa3ed867cbdf8670dc7774c1eca6d..8e4eede203c96314b59df566eb1d335f4f126873 100644
--- a/broker/src/hidra2_broker/server/get_next.go
+++ b/broker/src/asapo_broker/server/get_next.go
@@ -2,9 +2,9 @@ package server
import (
"github.com/gorilla/mux"
- "hidra2_broker/database"
- "hidra2_broker/logger"
- "hidra2_broker/utils"
+ "asapo_broker/database"
+ "asapo_broker/logger"
+ "asapo_broker/utils"
"net/http"
)
diff --git a/broker/src/hidra2_broker/server/get_next_test.go b/broker/src/asapo_broker/server/get_next_test.go
similarity index 97%
rename from broker/src/hidra2_broker/server/get_next_test.go
rename to broker/src/asapo_broker/server/get_next_test.go
index e3ebacd459928405cf5ce5dabd389d7a61d92711..97f88e55651086f5a58b1d655ef0977bd143001b 100644
--- a/broker/src/hidra2_broker/server/get_next_test.go
+++ b/broker/src/asapo_broker/server/get_next_test.go
@@ -5,9 +5,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite"
- "hidra2_broker/database"
- "hidra2_broker/logger"
- "hidra2_broker/utils"
+ "asapo_broker/database"
+ "asapo_broker/logger"
+ "asapo_broker/utils"
"net/http"
"net/http/httptest"
"strings"
diff --git a/broker/src/hidra2_broker/server/listroutes.go b/broker/src/asapo_broker/server/listroutes.go
similarity index 86%
rename from broker/src/hidra2_broker/server/listroutes.go
rename to broker/src/asapo_broker/server/listroutes.go
index b9b48ee7efe99ac4251028191f9ab052601c7e05..36d8f80a1fc8f7c23230a58e788f02ea2dfba7c1 100644
--- a/broker/src/hidra2_broker/server/listroutes.go
+++ b/broker/src/asapo_broker/server/listroutes.go
@@ -1,7 +1,7 @@
package server
import (
- "hidra2_broker/utils"
+ "asapo_broker/utils"
)
var listRoutes = utils.Routes{
diff --git a/broker/src/hidra2_broker/server/server.go b/broker/src/asapo_broker/server/server.go
similarity index 94%
rename from broker/src/hidra2_broker/server/server.go
rename to broker/src/asapo_broker/server/server.go
index fe7dd226678e789318dcda1eb88af0f32db54509..d1073b6322c865046e8a447f00c98b14e16471ec 100644
--- a/broker/src/hidra2_broker/server/server.go
+++ b/broker/src/asapo_broker/server/server.go
@@ -1,7 +1,7 @@
package server
import (
- "hidra2_broker/database"
+ "asapo_broker/database"
)
var db database.Agent
diff --git a/broker/src/hidra2_broker/server/server_nottested.go b/broker/src/asapo_broker/server/server_nottested.go
similarity index 95%
rename from broker/src/hidra2_broker/server/server_nottested.go
rename to broker/src/asapo_broker/server/server_nottested.go
index 8444fbf28a1e7718d9a3af35f30179ccd2500498..7c050275a3d806a998709f780646f2760d8eebcb 100644
--- a/broker/src/hidra2_broker/server/server_nottested.go
+++ b/broker/src/asapo_broker/server/server_nottested.go
@@ -4,8 +4,8 @@ package server
import (
"errors"
- log "hidra2_broker/logger"
- "hidra2_broker/utils"
+ log "asapo_broker/logger"
+ "asapo_broker/utils"
"net/http"
"strconv"
)
diff --git a/broker/src/hidra2_broker/server/server_test.go b/broker/src/asapo_broker/server/server_test.go
similarity index 96%
rename from broker/src/hidra2_broker/server/server_test.go
rename to broker/src/asapo_broker/server/server_test.go
index 08cea63fc559d926ce90f4377c28d5635daec455..4a8ae87db086a1bbb8423ece8b62040e5d3288c0 100644
--- a/broker/src/hidra2_broker/server/server_test.go
+++ b/broker/src/asapo_broker/server/server_test.go
@@ -4,8 +4,8 @@ import (
"errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "hidra2_broker/database"
- "hidra2_broker/logger"
+ "asapo_broker/database"
+ "asapo_broker/logger"
"testing"
)
diff --git a/broker/src/hidra2_broker/server/statistics.go b/broker/src/asapo_broker/server/statistics.go
similarity index 97%
rename from broker/src/hidra2_broker/server/statistics.go
rename to broker/src/asapo_broker/server/statistics.go
index 7347a79298b90298c0d2acfc4ddf6dd222d1a778..7cad4056cea3c0a02f93f13c9b3c22b8b29f342e 100644
--- a/broker/src/hidra2_broker/server/statistics.go
+++ b/broker/src/asapo_broker/server/statistics.go
@@ -2,7 +2,7 @@ package server
import (
"fmt"
- log "hidra2_broker/logger"
+ log "asapo_broker/logger"
"sync"
"time"
)
diff --git a/broker/src/hidra2_broker/server/statistics_test.go b/broker/src/asapo_broker/server/statistics_test.go
similarity index 100%
rename from broker/src/hidra2_broker/server/statistics_test.go
rename to broker/src/asapo_broker/server/statistics_test.go
diff --git a/broker/src/hidra2_broker/server/statistics_writers.go b/broker/src/asapo_broker/server/statistics_writers.go
similarity index 100%
rename from broker/src/hidra2_broker/server/statistics_writers.go
rename to broker/src/asapo_broker/server/statistics_writers.go
diff --git a/broker/src/hidra2_broker/utils/helpers.go b/broker/src/asapo_broker/utils/helpers.go
similarity index 100%
rename from broker/src/hidra2_broker/utils/helpers.go
rename to broker/src/asapo_broker/utils/helpers.go
diff --git a/broker/src/hidra2_broker/utils/routes.go b/broker/src/asapo_broker/utils/routes.go
similarity index 100%
rename from broker/src/hidra2_broker/utils/routes.go
rename to broker/src/asapo_broker/utils/routes.go
diff --git a/broker/src/hidra2_broker/utils/status_codes.go b/broker/src/asapo_broker/utils/status_codes.go
similarity index 100%
rename from broker/src/hidra2_broker/utils/status_codes.go
rename to broker/src/asapo_broker/utils/status_codes.go
diff --git a/common/cpp/CMakeLists.txt b/common/cpp/CMakeLists.txt
index c8fb609a2735b0b16140be399e6c6ff0aed3257f..6f1350d101ddf101d72672d30c0a3b7ffa0e2f0b 100644
--- a/common/cpp/CMakeLists.txt
+++ b/common/cpp/CMakeLists.txt
@@ -15,8 +15,8 @@ if(BUILD_MONGODB_CLIENTLIB)
add_subdirectory(src/database)
endif()
-install(DIRECTORY ${HIDRA2_CXX_COMMON_INCLUDE_DIR}/common
+install(DIRECTORY ${ASAPO_CXX_COMMON_INCLUDE_DIR}/common
DESTINATION ${CMAKE_INSTALL_PREFIX}/include )
-install(DIRECTORY ${HIDRA2_CXX_COMMON_INCLUDE_DIR}/logger
+install(DIRECTORY ${ASAPO_CXX_COMMON_INCLUDE_DIR}/logger
DESTINATION ${CMAKE_INSTALL_PREFIX}/include )
diff --git a/common/cpp/include/common/data_structs.h b/common/cpp/include/common/data_structs.h
index 39708ba7568ffa304e9d06640a615c17a95ac0b6..39aa50292227f58c7f7e4fc641993b6de1c33fc6 100644
--- a/common/cpp/include/common/data_structs.h
+++ b/common/cpp/include/common/data_structs.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_FILE_INFO_H
-#define HIDRA2_FILE_INFO_H
+#ifndef ASAPO_FILE_INFO_H
+#define ASAPO_FILE_INFO_H
#include <cinttypes>
#include <chrono>
@@ -7,7 +7,7 @@
#include <vector>
#include <string>
-namespace hidra2 {
+namespace asapo {
class FileInfo {
public:
@@ -33,4 +33,4 @@ using FileData = std::unique_ptr<uint8_t[]>;
using FileInfos = std::vector<FileInfo>;
}
-#endif //HIDRA2_FILE_INFO_H
+#endif //ASAPO_FILE_INFO_H
diff --git a/common/cpp/include/common/error.h b/common/cpp/include/common/error.h
index e4602afd5a948194d8d7eb2214a6c40d69945c15..efef43d16a6b7887e9347a98db407b5bb17f82d9 100644
--- a/common/cpp/include/common/error.h
+++ b/common/cpp/include/common/error.h
@@ -1,11 +1,11 @@
-#ifndef HIDRA2_ERROR_H
-#define HIDRA2_ERROR_H
+#ifndef ASAPO_ERROR_H
+#define ASAPO_ERROR_H
#include <string>
#include <memory>
#include <utility>
-namespace hidra2 {
+namespace asapo {
enum class ErrorType {
kUnknownError,
@@ -155,4 +155,4 @@ auto const kEndOfFile = SimpleErrorTemplate {
}
}
-#endif //HIDRA2_ERROR_H
+#endif //ASAPO_ERROR_H
diff --git a/common/cpp/include/common/io_error.h b/common/cpp/include/common/io_error.h
index 40c9d4dd7e2c62ad73531d0a4aa18ebbbdeff2d0..f7cfc46df6448791ebb7f3ba9ff12dc8970afbce 100644
--- a/common/cpp/include/common/io_error.h
+++ b/common/cpp/include/common/io_error.h
@@ -1,9 +1,9 @@
-#ifndef HIDRA2_SYSTEM__IO_ERROR_H
-#define HIDRA2_SYSTEM__IO_ERROR_H
+#ifndef ASAPO_SYSTEM__IO_ERROR_H
+#define ASAPO_SYSTEM__IO_ERROR_H
#include "common/error.h"
-namespace hidra2 {
+namespace asapo {
enum class IOErrorType {
@@ -139,4 +139,4 @@ auto const kAddressNotValid = IOErrorTemplate {
}
-#endif //HIDRA2_SYSTEM__IO_ERROR_H
+#endif //ASAPO_SYSTEM__IO_ERROR_H
diff --git a/common/cpp/include/common/networking.h b/common/cpp/include/common/networking.h
index 1e2c806e4072449e4c3a42503ad6cf4824077cc8..6d73f9f6a7728e30c939bd7aba93650a2244e0ad 100644
--- a/common/cpp/include/common/networking.h
+++ b/common/cpp/include/common/networking.h
@@ -1,9 +1,9 @@
-#ifndef HIDRA2_COMMON__NETWORKING_H
-#define HIDRA2_COMMON__NETWORKING_H
+#ifndef ASAPO_COMMON__NETWORKING_H
+#define ASAPO_COMMON__NETWORKING_H
#include <cstdint>
-namespace hidra2 {
+namespace asapo {
typedef uint64_t NetworkRequestId;
@@ -51,4 +51,4 @@ struct SendDataResponse : GenericNetworkResponse {
}
-#endif //HIDRA2_COMMON__NETWORKING_H
+#endif //ASAPO_COMMON__NETWORKING_H
diff --git a/common/cpp/include/database/database.h b/common/cpp/include/database/database.h
index 1b8751307d41a88f2adab079fbd19f19856ea172..267ab387bb13cdadad74082cb66497317f0d42f7 100644
--- a/common/cpp/include/database/database.h
+++ b/common/cpp/include/database/database.h
@@ -1,12 +1,12 @@
-#ifndef HIDRA2_DATABASE_H
-#define HIDRA2_DATABASE_H
+#ifndef ASAPO_DATABASE_H
+#define ASAPO_DATABASE_H
#include <string>
#include "common/data_structs.h"
#include "common/error.h"
-namespace hidra2 {
+namespace asapo {
namespace DBError {
auto const KUnknownError = "Inknown error";
@@ -39,4 +39,4 @@ class DatabaseFactory {
}
-#endif //HIDRA2_DATABASE_H
+#endif //ASAPO_DATABASE_H
diff --git a/common/cpp/include/http_client/http_client.h b/common/cpp/include/http_client/http_client.h
index fe913b582a20492cd88cbff019eda75c1822a96c..9b9f5444b3e34a38fcedfe89a5d854c2bac1966e 100644
--- a/common/cpp/include/http_client/http_client.h
+++ b/common/cpp/include/http_client/http_client.h
@@ -1,9 +1,9 @@
-#ifndef HIDRA2_HTTP_CLIENT_H
-#define HIDRA2_HTTP_CLIENT_H
+#ifndef ASAPO_HTTP_CLIENT_H
+#define ASAPO_HTTP_CLIENT_H
#include "common/error.h"
-namespace hidra2 {
+namespace asapo {
enum class HttpCode;
@@ -84,4 +84,4 @@ enum class HttpCode : int {
}
-#endif //HIDRA2_HTTP_CLIENT_H
+#endif //ASAPO_HTTP_CLIENT_H
diff --git a/common/cpp/include/http_client/http_error.h b/common/cpp/include/http_client/http_error.h
index 8ac563f57018cab3f33d6fde634e8f0e37376742..e0746ad1c79a2cc35763de12b9c0efbe459f921e 100644
--- a/common/cpp/include/http_client/http_error.h
+++ b/common/cpp/include/http_client/http_error.h
@@ -1,10 +1,10 @@
-#ifndef HIDRA2_HTTP_ERROR_H
-#define HIDRA2_HTTP_ERROR_H
+#ifndef ASAPO_HTTP_ERROR_H
+#define ASAPO_HTTP_ERROR_H
#include "common/error.h"
#include "http_client.h"
-namespace hidra2 {
+namespace asapo {
class HttpError: public SimpleError {
public:
@@ -19,4 +19,4 @@ class HttpError: public SimpleError {
}
-#endif //HIDRA2_HTTP_ERROR_H
+#endif //ASAPO_HTTP_ERROR_H
diff --git a/common/cpp/include/io/io.h b/common/cpp/include/io/io.h
index 61e03685cff91788b68b8225e2e7ff7ab33a6004..6e4e55f98262159c31cd0e18e72c0319d4e34a89 100644
--- a/common/cpp/include/io/io.h
+++ b/common/cpp/include/io/io.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_SYSTEM__IO_H
-#define HIDRA2_SYSTEM__IO_H
+#ifndef ASAPO_SYSTEM__IO_H
+#define ASAPO_SYSTEM__IO_H
#include <cinttypes>
@@ -11,7 +11,7 @@
#include "common/data_structs.h"
#include "common/io_error.h"
-namespace hidra2 {
+namespace asapo {
//Need to be "enum" since multiple flags are allowed
enum FileOpenMode {
@@ -103,4 +103,4 @@ class IO {
}
-#endif //HIDRA2_SYSTEM__IO_H
+#endif //ASAPO_SYSTEM__IO_H
diff --git a/common/cpp/include/io/io_factory.h b/common/cpp/include/io/io_factory.h
index 4dd614beecaa05e1fcbf51cfbdbabfb6f881e495..0763a9ab063d6d12929a45a0c987022306acf084 100644
--- a/common/cpp/include/io/io_factory.h
+++ b/common/cpp/include/io/io_factory.h
@@ -1,12 +1,12 @@
-#ifndef HIDRA2_IO_FACTORY_H
-#define HIDRA2_IO_FACTORY_H
+#ifndef ASAPO_IO_FACTORY_H
+#define ASAPO_IO_FACTORY_H
#include "io.h"
-namespace hidra2 {
+namespace asapo {
IO* GenerateDefaultIO();
}
-#endif //HIDRA2_IO_FACTORY_H
\ No newline at end of file
+#endif //ASAPO_IO_FACTORY_H
\ No newline at end of file
diff --git a/common/cpp/include/json_parser/json_parser.h b/common/cpp/include/json_parser/json_parser.h
index 231df49fd713664d6fd306195ff78641ed269fea..737814ad7b2c7dc53f77ad2ce331709419a1d711 100644
--- a/common/cpp/include/json_parser/json_parser.h
+++ b/common/cpp/include/json_parser/json_parser.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_JSON_PARSER_H
-#define HIDRA2_JSON_PARSER_H
+#ifndef ASAPO_JSON_PARSER_H
+#define ASAPO_JSON_PARSER_H
#include <string>
#include <memory>
@@ -9,7 +9,7 @@
#include "common/error.h"
#include "io/io.h"
-namespace hidra2 {
+namespace asapo {
class RapidJson;
@@ -52,4 +52,4 @@ class JsonFileParser : public JsonParser {
-#endif //HIDRA2_JSON_PARSER_H
+#endif //ASAPO_JSON_PARSER_H
diff --git a/common/cpp/include/logger/logger.h b/common/cpp/include/logger/logger.h
index 4cb60f02f5db575c67eddece39a037d12fbdda58..4657c9874e262a7e0a2ce7bb09ae63726a5e6151 100644
--- a/common/cpp/include/logger/logger.h
+++ b/common/cpp/include/logger/logger.h
@@ -1,12 +1,12 @@
-#ifndef HIDRA2_LOGGER_H
-#define HIDRA2_LOGGER_H
+#ifndef ASAPO_LOGGER_H
+#define ASAPO_LOGGER_H
#include <memory>
#include <string>
#include "common/error.h"
-namespace hidra2 {
+namespace asapo {
enum class LogLevel {
None,
@@ -38,4 +38,4 @@ LogLevel StringToLogLevel(const std::string& name, Error* err);
}
-#endif //HIDRA2_LOGGER_H
+#endif //ASAPO_LOGGER_H
diff --git a/common/cpp/include/unittests/MockDatabase.h b/common/cpp/include/unittests/MockDatabase.h
index b1bb10efc1915a9707f7b30fa85585673fc72f37..43bd422c9c3349e878a47a64423bd2cf0efe45ca 100644
--- a/common/cpp/include/unittests/MockDatabase.h
+++ b/common/cpp/include/unittests/MockDatabase.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_MOCKDATABASE_H
-#define HIDRA2_MOCKDATABASE_H
+#ifndef ASAPO_MOCKDATABASE_H
+#define ASAPO_MOCKDATABASE_H
#include <gmock/gmock.h>
#include <gtest/gtest.h>
@@ -7,7 +7,7 @@
#include "database/database.h"
#include "common/error.h"
-namespace hidra2 {
+namespace asapo {
class MockDatabase : public Database {
public:
@@ -34,4 +34,4 @@ class MockDatabase : public Database {
}
-#endif //HIDRA2_MOCKDATABASE_H
+#endif //ASAPO_MOCKDATABASE_H
diff --git a/common/cpp/include/unittests/MockHttpClient.h b/common/cpp/include/unittests/MockHttpClient.h
index a497c396e4a03ab2b52f26a39f701dce2c14c9fd..dbb346f22ec297e5aab7a5b24039949bb628fac3 100644
--- a/common/cpp/include/unittests/MockHttpClient.h
+++ b/common/cpp/include/unittests/MockHttpClient.h
@@ -1,12 +1,12 @@
-#ifndef HIDRA2_MOCKHTTPCLIENT_H
-#define HIDRA2_MOCKHTTPCLIENT_H
+#ifndef ASAPO_MOCKHTTPCLIENT_H
+#define ASAPO_MOCKHTTPCLIENT_H
#include <gtest/gtest.h>
#include <gmock/gmock.h>
#include "http_client/http_client.h"
-namespace hidra2 {
+namespace asapo {
class MockHttpClient : public HttpClient {
public:
@@ -32,4 +32,4 @@ class MockHttpClient : public HttpClient {
}
-#endif //HIDRA2_MOCKHTTPCLIENT_H
+#endif //ASAPO_MOCKHTTPCLIENT_H
diff --git a/common/cpp/include/unittests/MockIO.h b/common/cpp/include/unittests/MockIO.h
index 5da606c100fc57e9bc9c23ff310b09f52d71ef90..803ce86909b1996ae889089a1faf2a2083b77247 100644
--- a/common/cpp/include/unittests/MockIO.h
+++ b/common/cpp/include/unittests/MockIO.h
@@ -1,11 +1,11 @@
-#ifndef HIDRA2_COMMON__MOCKIO_H
-#define HIDRA2_COMMON__MOCKIO_H
+#ifndef ASAPO_COMMON__MOCKIO_H
+#define ASAPO_COMMON__MOCKIO_H
#include <gtest/gtest.h>
#include <gmock/gmock.h>
#include "io/io.h"
-namespace hidra2 {
+namespace asapo {
class MockIO : public IO {
public:
std::unique_ptr<std::thread> NewThread(std::function<void()> function) const override {
@@ -157,7 +157,7 @@ class MockIO : public IO {
}
MOCK_CONST_METHOD4(Write_t, size_t(FileDescriptor fd, const void* buf, size_t length, ErrorInterface** err));
- void CreateNewDirectory(const std::string& directory_name, hidra2::Error* err) const override {
+ void CreateNewDirectory(const std::string& directory_name, asapo::Error* err) const override {
ErrorInterface* error = nullptr;
CreateNewDirectory_t(directory_name, &error);
err->reset(error);
@@ -208,4 +208,4 @@ class MockIO : public IO {
}
-#endif //HIDRA2_COMMON__MOCKIO_H
+#endif //ASAPO_COMMON__MOCKIO_H
diff --git a/common/cpp/include/unittests/MockLogger.h b/common/cpp/include/unittests/MockLogger.h
index cc7ac8a1997b3308e0df26bf43318b489819503e..aa8f900dd8a217da2bc53db5bf6b71d8ed081232 100644
--- a/common/cpp/include/unittests/MockLogger.h
+++ b/common/cpp/include/unittests/MockLogger.h
@@ -1,12 +1,12 @@
-#ifndef HIDRA2_MOCKLOGGER_H
-#define HIDRA2_MOCKLOGGER_H
+#ifndef ASAPO_MOCKLOGGER_H
+#define ASAPO_MOCKLOGGER_H
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include "logger/logger.h"
-namespace hidra2 {
+namespace asapo {
class MockLogger : public AbstractLogger {
public:
@@ -21,4 +21,4 @@ class MockLogger : public AbstractLogger {
}
-#endif //HIDRA2_MOCKLOGGER_H
+#endif //ASAPO_MOCKLOGGER_H
diff --git a/common/cpp/src/common/CMakeLists.txt b/common/cpp/src/common/CMakeLists.txt
index 40873cfcf7dba8ba3fd88b3246a20a05687b2fcb..5a22d46dc262c06116f083de5cd4a337d0c23e10 100644
--- a/common/cpp/src/common/CMakeLists.txt
+++ b/common/cpp/src/common/CMakeLists.txt
@@ -3,5 +3,5 @@ set(TARGET_NAME common)
set(TEST_SOURCE_FILES ../../unittests/common/test_error.cpp)
set(TEST_LIBRARIES "${TARGET_NAME};system_io")
-include_directories(${HIDRA2_CXX_COMMON_INCLUDE_DIR})
+include_directories(${ASAPO_CXX_COMMON_INCLUDE_DIR})
add_plain_unit_test(${TARGET_NAME} "${TEST_SOURCE_FILES}" "${TEST_LIBRARIES}")
diff --git a/common/cpp/src/data_structs/CMakeLists.txt b/common/cpp/src/data_structs/CMakeLists.txt
index 86b316db98692b1ddc71d89af0fb40e0b2660a15..f337349b857a69299d43e70b93df203d41d39de1 100644
--- a/common/cpp/src/data_structs/CMakeLists.txt
+++ b/common/cpp/src/data_structs/CMakeLists.txt
@@ -8,7 +8,7 @@ set(SOURCE_FILES
################################
add_library(${TARGET_NAME} OBJECT ${SOURCE_FILES})
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR}
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/3d_party/rapidjson/include)
################################
@@ -17,6 +17,6 @@ target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR
set(TEST_SOURCE_FILES ../../unittests/data_structs/test_data_structs.cpp)
set(TEST_LIBRARIES "${TARGET_NAME};json_parser;system_io")
-include_directories(${HIDRA2_CXX_COMMON_INCLUDE_DIR})
+include_directories(${ASAPO_CXX_COMMON_INCLUDE_DIR})
gtest(${TARGET_NAME} "${TEST_SOURCE_FILES}" "${TEST_LIBRARIES}")
diff --git a/common/cpp/src/data_structs/data_structs.cpp b/common/cpp/src/data_structs/data_structs.cpp
index 5887f4e6994e66f0356f2464c99fcd9798a8b235..52846d05b4f7da31863c63b787f5d6b4c82b252e 100644
--- a/common/cpp/src/data_structs/data_structs.cpp
+++ b/common/cpp/src/data_structs/data_structs.cpp
@@ -2,7 +2,7 @@
#include "json_parser/json_parser.h"
-namespace hidra2 {
+namespace asapo {
std::string FileInfo::Json() const {
diff --git a/common/cpp/src/database/CMakeLists.txt b/common/cpp/src/database/CMakeLists.txt
index d7771802e4250dc60e1a4923cf824b75848ebb55..5467be48c86fca1899439167f56620cc824d487c 100644
--- a/common/cpp/src/database/CMakeLists.txt
+++ b/common/cpp/src/database/CMakeLists.txt
@@ -13,7 +13,7 @@ message ("-- mongoc libraries \"${MONGOC_STATIC_LIBRARIES}\"")
add_library(${TARGET_NAME} STATIC ${SOURCE_FILES} $<TARGET_OBJECTS:data_structs> $<TARGET_OBJECTS:json_parser> $<TARGET_OBJECTS:system_io>)
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR}
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR}
PUBLIC "${MONGOC_STATIC_INCLUDE_DIRS}")
target_link_libraries (${TARGET_NAME} PRIVATE "${MONGOC_STATIC_LIBRARIES}")
target_compile_definitions (${TARGET_NAME} PRIVATE "${MONGOC_STATIC_DEFINITIONS}")
diff --git a/common/cpp/src/database/database.cpp b/common/cpp/src/database/database.cpp
index f30575e0fbf1bdbd5585bde64550ce86ded8e865..c207779a58fa4b2b9441ced6f77bd7121e7406d3 100644
--- a/common/cpp/src/database/database.cpp
+++ b/common/cpp/src/database/database.cpp
@@ -1,7 +1,7 @@
#include "database/database.h"
#include "mongodb_client.h"
-namespace hidra2 {
+namespace asapo {
std::unique_ptr<Database> DatabaseFactory::Create(Error* err) const noexcept {
std::unique_ptr<Database> p = nullptr;
diff --git a/common/cpp/src/database/mongodb_client.cpp b/common/cpp/src/database/mongodb_client.cpp
index f9d22d084c44a029b46f0d03d10e29030ee90104..6acdca6d9ec8df9d46f87ecc919fd214344e7efb 100644
--- a/common/cpp/src/database/mongodb_client.cpp
+++ b/common/cpp/src/database/mongodb_client.cpp
@@ -1,9 +1,9 @@
#include "mongodb_client.h"
-namespace hidra2 {
+namespace asapo {
using std::string;
-using hidra2::Database;
+using asapo::Database;
MongoDbInstance::MongoDbInstance() {
mongoc_init ();
@@ -78,7 +78,7 @@ Error MongoDBClient::Connect(const string& address, const string& database_name,
}
string MongoDBClient::DBAddress(const string& address) const {
- return "mongodb://" + address + "/?appname=hidra2";
+ return "mongodb://" + address + "/?appname=asapo";
}
void MongoDBClient::CleanUp() {
diff --git a/common/cpp/src/database/mongodb_client.h b/common/cpp/src/database/mongodb_client.h
index b9c4bc31dcb91bfd5b9adb9621f1a6ce32ea34cc..7d9d38c08bbd10e84d4b5b6c1649fb95bfb4f017 100644
--- a/common/cpp/src/database/mongodb_client.h
+++ b/common/cpp/src/database/mongodb_client.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_MONGO_DATABASE_H
-#define HIDRA2_MONGO_DATABASE_H
+#ifndef ASAPO_MONGO_DATABASE_H
+#define ASAPO_MONGO_DATABASE_H
#include "mongoc.h"
@@ -7,7 +7,7 @@
#include "database/database.h"
-namespace hidra2 {
+namespace asapo {
// An attempt to automize mongoc_init/mongoc_cleanup.
// One has to be carefull with cleanup order - since it is called after main exits
@@ -56,4 +56,4 @@ class MongoDBClient final : public Database {
}
-#endif //HIDRA2_MONGO_DATABASE_H
+#endif //ASAPO_MONGO_DATABASE_H
diff --git a/common/cpp/src/http_client/CMakeLists.txt b/common/cpp/src/http_client/CMakeLists.txt
index 0ba039896384d0e7953c1eae51029b223101f692..bae54a5d735ceef0f4792df590ede2d9e94f2d34 100644
--- a/common/cpp/src/http_client/CMakeLists.txt
+++ b/common/cpp/src/http_client/CMakeLists.txt
@@ -11,6 +11,6 @@ add_library(${TARGET_NAME} OBJECT ${SOURCE_FILES})
IF(WIN32)
target_compile_definitions(${TARGET_NAME} PUBLIC -DCURL_STATICLIB)
ENDIF()
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
diff --git a/common/cpp/src/http_client/curl_http_client.cpp b/common/cpp/src/http_client/curl_http_client.cpp
index 752e4a58ea4daf163a5270cb0bafaa5af3e0ff32..d104b3f062803decc9ac7203bacdab8624afeb3a 100644
--- a/common/cpp/src/http_client/curl_http_client.cpp
+++ b/common/cpp/src/http_client/curl_http_client.cpp
@@ -2,7 +2,7 @@
#include <cstring>
-namespace hidra2 {
+namespace asapo {
// use CurlHttpClientInstance and static variable to init curl on program start end cleanup on exit
class CurlHttpClientInstance {
diff --git a/common/cpp/src/http_client/curl_http_client.h b/common/cpp/src/http_client/curl_http_client.h
index aab0b740c686af8a7a91e42bdd31b3060f69e812..a31b1f7584c2651ec6ac29b2d518b56457b9a87d 100644
--- a/common/cpp/src/http_client/curl_http_client.h
+++ b/common/cpp/src/http_client/curl_http_client.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_CURL_HTTP_CLIENT_H
-#define HIDRA2_CURL_HTTP_CLIENT_H
+#ifndef ASAPO_CURL_HTTP_CLIENT_H
+#define ASAPO_CURL_HTTP_CLIENT_H
#include <string>
#include <mutex>
@@ -7,7 +7,7 @@
#include "http_client/http_client.h"
#include "curl/curl.h"
-namespace hidra2 {
+namespace asapo {
class CurlHttpClient final : public HttpClient {
public:
@@ -26,4 +26,4 @@ class CurlHttpClient final : public HttpClient {
}
-#endif //HIDRA2_CURL_HTTP_CLIENT_H
+#endif //ASAPO_CURL_HTTP_CLIENT_H
diff --git a/common/cpp/src/http_client/http_client_factory.cpp b/common/cpp/src/http_client/http_client_factory.cpp
index ca47048078026360c960b8b365238e84f7b1298a..d470c27878f369ceecf366c960899065b9f8c371 100644
--- a/common/cpp/src/http_client/http_client_factory.cpp
+++ b/common/cpp/src/http_client/http_client_factory.cpp
@@ -1,6 +1,6 @@
#include "curl_http_client.h"
-namespace hidra2 {
+namespace asapo {
std::unique_ptr<HttpClient> DefaultHttpClient() {
return std::unique_ptr<HttpClient> {new CurlHttpClient};
diff --git a/common/cpp/src/json_parser/CMakeLists.txt b/common/cpp/src/json_parser/CMakeLists.txt
index 0e5d8330ea10b15a801b1080c8e746237d36e901..eddf5735d2efa5be900c33392fbafed3b5111c4c 100644
--- a/common/cpp/src/json_parser/CMakeLists.txt
+++ b/common/cpp/src/json_parser/CMakeLists.txt
@@ -8,7 +8,7 @@ set(SOURCE_FILES
################################
add_library(${TARGET_NAME} OBJECT ${SOURCE_FILES})
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR}
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/3d_party/rapidjson/include)
################################
@@ -19,5 +19,5 @@ target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR
set(TEST_SOURCE_FILES ../../unittests/json_parser/test_json_parser.cpp)
set(TEST_LIBRARIES "${TARGET_NAME};system_io")
-include_directories(${HIDRA2_CXX_COMMON_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/3d_party/rapidjson/include)
+include_directories(${ASAPO_CXX_COMMON_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/3d_party/rapidjson/include)
gtest(${TARGET_NAME} "${TEST_SOURCE_FILES}" "${TEST_LIBRARIES}")
diff --git a/common/cpp/src/json_parser/json_parser.cpp b/common/cpp/src/json_parser/json_parser.cpp
index 03de7dd24d25f90f9ac85585dee3974f5d536fd5..41d9dee99ccf8f0fbd1c0b5fc3295e568221e5d5 100644
--- a/common/cpp/src/json_parser/json_parser.cpp
+++ b/common/cpp/src/json_parser/json_parser.cpp
@@ -2,7 +2,7 @@
#include "rapid_json.h"
#include "io/io_factory.h"
-namespace hidra2 {
+namespace asapo {
JsonParser::~JsonParser() {
diff --git a/common/cpp/src/json_parser/rapid_json.cpp b/common/cpp/src/json_parser/rapid_json.cpp
index e63474f99e6c92dc39e124f6b32b2f593650312d..cf47a597c5bd54015523a1d6ecdf13e1236bb1f4 100644
--- a/common/cpp/src/json_parser/rapid_json.cpp
+++ b/common/cpp/src/json_parser/rapid_json.cpp
@@ -3,7 +3,7 @@
using namespace rapidjson;
-namespace hidra2 {
+namespace asapo {
RapidJson::RapidJson(const std::string& json, const std::unique_ptr<IO>* io): io__{io}, json_{json} {
@@ -36,7 +36,7 @@ Error RapidJson::LazyInitialize()const noexcept {
return nullptr;
}
-hidra2::Error CheckValueType(const std::string& name, ValueType type, const Value* val) {
+asapo::Error CheckValueType(const std::string& name, ValueType type, const Value* val) {
bool res = false;
switch (type) {
case ValueType::kObject:
@@ -63,7 +63,7 @@ hidra2::Error CheckValueType(const std::string& name, ValueType type, const Valu
}
-hidra2::Error RapidJson::GetValuePointer(const std::string& name, ValueType type, Value** val)const noexcept {
+asapo::Error RapidJson::GetValuePointer(const std::string& name, ValueType type, Value** val)const noexcept {
if (Error err = LazyInitialize()) {
return err;
}
diff --git a/common/cpp/src/json_parser/rapid_json.h b/common/cpp/src/json_parser/rapid_json.h
index f0369ba1430d1c9b8afff0ff8e95df5e39999e88..bb23bd730c9295c3b3ed55a282ebb0df3b4d11f3 100644
--- a/common/cpp/src/json_parser/rapid_json.h
+++ b/common/cpp/src/json_parser/rapid_json.h
@@ -1,12 +1,12 @@
-#ifndef HIDRA2_RAPID_JSON_H
-#define HIDRA2_RAPID_JSON_H
+#ifndef ASAPO_RAPID_JSON_H
+#define ASAPO_RAPID_JSON_H
#include "rapidjson/document.h"
#include "common/error.h"
#include "io/io.h"
-namespace hidra2 {
+namespace asapo {
enum class ValueType {
kUint64,
@@ -35,8 +35,8 @@ class RapidJson {
Error LazyInitialize() const noexcept;
Error embedded_error_ = nullptr;
- hidra2::Error GetValuePointer(const std::string& name, ValueType type, rapidjson::Value** val)const noexcept;
+ asapo::Error GetValuePointer(const std::string& name, ValueType type, rapidjson::Value** val)const noexcept;
};
}
-#endif //HIDRA2_RAPID_JSON_H
+#endif //ASAPO_RAPID_JSON_H
diff --git a/common/cpp/src/logger/CMakeLists.txt b/common/cpp/src/logger/CMakeLists.txt
index 65ed7c9c5355f2a281cd36081dd72ae96a5f72e3..4db51b27f4eca2b48154bb31ba54ece84fec2292 100644
--- a/common/cpp/src/logger/CMakeLists.txt
+++ b/common/cpp/src/logger/CMakeLists.txt
@@ -8,7 +8,7 @@ set(SOURCE_FILES
add_library(${TARGET_NAME} OBJECT ${SOURCE_FILES})
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR}
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/3d_party/spd_log/include)
################################
@@ -22,5 +22,5 @@ set(TEST_SOURCE_FILES ../../unittests/logger/test_logger.cpp
link_libraries(${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
set(TEST_LIBRARIES "${TARGET_NAME};curl_http_client")
-include_directories(${HIDRA2_CXX_COMMON_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/3d_party/spd_log/include)
+include_directories(${ASAPO_CXX_COMMON_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/3d_party/spd_log/include)
gtest(${TARGET_NAME} "${TEST_SOURCE_FILES}" "${TEST_LIBRARIES}")
diff --git a/common/cpp/src/logger/fluentd_sink.cpp b/common/cpp/src/logger/fluentd_sink.cpp
index 92c81bd56117a329b508fc04422f429b0ef6883a..419a9d4a9566b41660fb955928c99f3f4c997878 100644
--- a/common/cpp/src/logger/fluentd_sink.cpp
+++ b/common/cpp/src/logger/fluentd_sink.cpp
@@ -2,7 +2,7 @@
#include <iostream>
-namespace hidra2 {
+namespace asapo {
void FluentdSink::_sink_it(const spdlog::details::log_msg& msg) {
std::string log_str = msg.formatted.str();
diff --git a/common/cpp/src/logger/fluentd_sink.h b/common/cpp/src/logger/fluentd_sink.h
index 2f11aa4aad88ad1df8292809a5f7c5e557b8ddfc..c15d44c6961831709230d734b22222ceaa6b763c 100644
--- a/common/cpp/src/logger/fluentd_sink.h
+++ b/common/cpp/src/logger/fluentd_sink.h
@@ -1,12 +1,12 @@
-#ifndef HIDRA2_FLUENTD_SINK_H
-#define HIDRA2_FLUENTD_SINK_H
+#ifndef ASAPO_FLUENTD_SINK_H
+#define ASAPO_FLUENTD_SINK_H
#include "spdlog/spdlog.h"
#include "spdlog/sinks/sink.h"
#include "spdlog/sinks/base_sink.h"
#include "http_client/http_client.h"
-namespace hidra2 {
+namespace asapo {
class FluentdSink : public spdlog::sinks::base_sink<std::mutex> {
public:
@@ -22,4 +22,4 @@ class FluentdSink : public spdlog::sinks::base_sink<std::mutex> {
}
-#endif //HIDRA2_FLUENTD_SINK_H
+#endif //ASAPO_FLUENTD_SINK_H
diff --git a/common/cpp/src/logger/logger_factory.cpp b/common/cpp/src/logger/logger_factory.cpp
index b42271d3f098ce55f7b3bdcfba7bd4955754c665..d5fbf0f1724f1a15e837e436b289985956465629 100644
--- a/common/cpp/src/logger/logger_factory.cpp
+++ b/common/cpp/src/logger/logger_factory.cpp
@@ -1,6 +1,6 @@
#include "spd_logger.h"
-namespace hidra2 {
+namespace asapo {
Logger CreateLogger(std::string name, bool console, bool centralized_log, const std::string& endpoint_uri) {
auto logger = new SpdLogger{name, endpoint_uri};
diff --git a/common/cpp/src/logger/spd_logger.cpp b/common/cpp/src/logger/spd_logger.cpp
index 885547740e699060f5752b3b2004a0b606a80327..51b6053a9a578d376000b83d578e884e5f9ebc1c 100644
--- a/common/cpp/src/logger/spd_logger.cpp
+++ b/common/cpp/src/logger/spd_logger.cpp
@@ -2,7 +2,7 @@
#include "fluentd_sink.h"
-namespace hidra2 {
+namespace asapo {
void SpdLogger::SetLogLevel(LogLevel level) {
if (log__) {
diff --git a/common/cpp/src/logger/spd_logger.h b/common/cpp/src/logger/spd_logger.h
index ae79abf2a694259f7554ab5941c8ed69d06b20b4..8309bc4911a9aa44f365446b47ed6c2d365907aa 100644
--- a/common/cpp/src/logger/spd_logger.h
+++ b/common/cpp/src/logger/spd_logger.h
@@ -1,10 +1,10 @@
-#ifndef HIDRA2_SPDLOGGER_H
-#define HIDRA2_SPDLOGGER_H
+#ifndef ASAPO_SPDLOGGER_H
+#define ASAPO_SPDLOGGER_H
#include "logger/logger.h"
#include "spdlog/spdlog.h"
-namespace hidra2 {
+namespace asapo {
class SpdLogger : public AbstractLogger {
public:
@@ -28,4 +28,4 @@ class SpdLogger : public AbstractLogger {
};
}
-#endif //HIDRA2_SPDLOGGER_H
+#endif //ASAPO_SPDLOGGER_H
diff --git a/common/cpp/src/system_io/CMakeLists.txt b/common/cpp/src/system_io/CMakeLists.txt
index 274e3b7f7a9e17b3fe0c738d825b7ca7b1e44994..60519c9350eed0f0e76254a6bdf82fcc301adc45 100644
--- a/common/cpp/src/system_io/CMakeLists.txt
+++ b/common/cpp/src/system_io/CMakeLists.txt
@@ -13,6 +13,6 @@ ENDIF(WIN32)
# Library
################################
add_library(${TARGET_NAME} OBJECT ${SOURCE_FILES})
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR})
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
diff --git a/common/cpp/src/system_io/io_factory.cpp b/common/cpp/src/system_io/io_factory.cpp
index de5e48a5d0a2e5dc345f47974e7a96adc36a8903..9488a63a534c489b4ab2cc7e1f07328ccf3480c5 100644
--- a/common/cpp/src/system_io/io_factory.cpp
+++ b/common/cpp/src/system_io/io_factory.cpp
@@ -2,7 +2,7 @@
#include "system_io.h"
-namespace hidra2 {
+namespace asapo {
IO* GenerateDefaultIO() {
return new SystemIO;
diff --git a/common/cpp/src/system_io/system_io.cpp b/common/cpp/src/system_io/system_io.cpp
index 1315a8eb613e98f34a5a7e1ff27acabe33474327..e8096c3256e23753588d629e0a545670535b3b56 100644
--- a/common/cpp/src/system_io/system_io.cpp
+++ b/common/cpp/src/system_io/system_io.cpp
@@ -21,7 +21,7 @@
#include "system_io.h"
-namespace hidra2 {
+namespace asapo {
const int SystemIO::kNetBufferSize = 1024 * 1024; //* 1024 ; //MiByte
@@ -114,7 +114,7 @@ FileInfos SystemIO::FilesInFolder(const std::string& folder, Error* err) const {
return files;
}
-void hidra2::SystemIO::CreateNewDirectory(const std::string& directory_name, Error* err) const {
+void asapo::SystemIO::CreateNewDirectory(const std::string& directory_name, Error* err) const {
if(_mkdir(directory_name.c_str()) == -1) {
*err = GetLastError();
} else {
@@ -183,7 +183,7 @@ void SystemIO::Skip(SocketDescriptor socket_fd, size_t length, Error* err) const
}
}
-hidra2::FileDescriptor hidra2::SystemIO::CreateAndConnectIPTCPSocket(const std::string& address,
+asapo::FileDescriptor asapo::SystemIO::CreateAndConnectIPTCPSocket(const std::string& address,
Error* err) const {
*err = nullptr;
@@ -267,7 +267,7 @@ std::unique_ptr<sockaddr_in> SystemIO::BuildSockaddrIn(const std::string& addres
return socket_address;
}
-void hidra2::SystemIO::InetConnect(SocketDescriptor socket_fd, const std::string& address, Error* err) const {
+void asapo::SystemIO::InetConnect(SocketDescriptor socket_fd, const std::string& address, Error* err) const {
auto socket_address = BuildSockaddrIn(address, err);
if(*err != nullptr) {
return;
@@ -321,9 +321,9 @@ Error* err) const {
peer_fd));
}
-hidra2::FileDescriptor hidra2::SystemIO::Open(const std::string& filename,
- int open_flags,
- Error* err) const {
+asapo::FileDescriptor asapo::SystemIO::Open(const std::string& filename,
+ int open_flags,
+ Error* err) const {
int flags = FileOpenModeToPosixFileOpenMode(open_flags);
FileDescriptor fd = _open(filename.c_str(), flags);
if(fd == -1) {
@@ -335,7 +335,7 @@ hidra2::FileDescriptor hidra2::SystemIO::Open(const std::string& filename,
return fd;
}
-void hidra2::SystemIO::CloseSocket(SocketDescriptor fd, Error* err) const {
+void asapo::SystemIO::CloseSocket(SocketDescriptor fd, Error* err) const {
if(err) {
*err = nullptr;
}
@@ -344,7 +344,7 @@ void hidra2::SystemIO::CloseSocket(SocketDescriptor fd, Error* err) const {
}
}
-void hidra2::SystemIO::Close(FileDescriptor fd, Error* err) const {
+void asapo::SystemIO::Close(FileDescriptor fd, Error* err) const {
if(err) {
*err = nullptr;
}
@@ -353,7 +353,7 @@ void hidra2::SystemIO::Close(FileDescriptor fd, Error* err) const {
}
}
-short hidra2::SystemIO::AddressFamilyToPosixFamily(AddressFamilies address_family) const {
+short asapo::SystemIO::AddressFamilyToPosixFamily(AddressFamilies address_family) const {
switch (address_family) {
case AddressFamilies::INET:
return AF_INET;
@@ -361,7 +361,7 @@ short hidra2::SystemIO::AddressFamilyToPosixFamily(AddressFamilies address_famil
return -1;
}
-int hidra2::SystemIO::SocketTypeToPosixType(SocketTypes socket_type) const {
+int asapo::SystemIO::SocketTypeToPosixType(SocketTypes socket_type) const {
switch (socket_type) {
case SocketTypes::STREAM:
return SOCK_STREAM;
@@ -369,7 +369,7 @@ int hidra2::SystemIO::SocketTypeToPosixType(SocketTypes socket_type) const {
return -1;
}
-int hidra2::SystemIO::SocketProtocolToPosixProtocol(SocketProtocols socket_protocol) const {
+int asapo::SystemIO::SocketProtocolToPosixProtocol(SocketProtocols socket_protocol) const {
switch (socket_protocol) {
case SocketProtocols::IP:
return IPPROTO_IP;
@@ -412,8 +412,8 @@ SocketDescriptor SystemIO::CreateSocket(AddressFamilies address_family,
return socket_fd;
}
-void hidra2::SystemIO::InetBind(SocketDescriptor socket_fd, const std::string& address,
- Error* err) const {
+void asapo::SystemIO::InetBind(SocketDescriptor socket_fd, const std::string& address,
+ Error* err) const {
*err = nullptr;
int family = AddressFamilyToPosixFamily(AddressFamilies::INET);
@@ -432,7 +432,7 @@ void hidra2::SystemIO::InetBind(SocketDescriptor socket_fd, const std::string& a
}
}
-void hidra2::SystemIO::Listen(SocketDescriptor socket_fd, int backlog, Error* err) const {
+void asapo::SystemIO::Listen(SocketDescriptor socket_fd, int backlog, Error* err) const {
*err = nullptr;
if (_listen(socket_fd, backlog) == -1) {
@@ -462,8 +462,8 @@ SocketDescriptor SystemIO::CreateAndBindIPTCPSocketListener(const std::string& a
return listener_fd;
}
-size_t hidra2::SystemIO::ReceiveWithTimeout(SocketDescriptor socket_fd, void* buf, size_t length, long timeout_in_usec,
- Error* err) const {
+size_t asapo::SystemIO::ReceiveWithTimeout(SocketDescriptor socket_fd, void* buf, size_t length, long timeout_in_usec,
+ Error* err) const {
*err = nullptr;
fd_set read_fds;
@@ -487,19 +487,19 @@ size_t hidra2::SystemIO::ReceiveWithTimeout(SocketDescriptor socket_fd, void* bu
}
-size_t hidra2::SystemIO::Read(FileDescriptor fd, void* buf, size_t length, Error* err) const {
+size_t asapo::SystemIO::Read(FileDescriptor fd, void* buf, size_t length, Error* err) const {
return Transfer(_read, fd, buf, length, err);
}
-size_t hidra2::SystemIO::Write(FileDescriptor fd, const void* buf, size_t length, Error* err) const {
+size_t asapo::SystemIO::Write(FileDescriptor fd, const void* buf, size_t length, Error* err) const {
return Transfer(_write, fd, buf, length, err);
}
-size_t hidra2::SystemIO::Receive(SocketDescriptor socket_fd, void* buf, size_t length, Error* err) const {
+size_t asapo::SystemIO::Receive(SocketDescriptor socket_fd, void* buf, size_t length, Error* err) const {
return Transfer(_recv, socket_fd, buf, length, err);
}
-size_t hidra2::SystemIO::Send(SocketDescriptor socket_fd, const void* buf, size_t length, Error* err) const {
+size_t asapo::SystemIO::Send(SocketDescriptor socket_fd, const void* buf, size_t length, Error* err) const {
return Transfer(_send, socket_fd, buf, length, err);
}
diff --git a/common/cpp/src/system_io/system_io.h b/common/cpp/src/system_io/system_io.h
index 5fb98136244570c99fa71e4ec23728eddd68c222..ce033ff31ac4abd79468652f21bf79f5b116e473 100644
--- a/common/cpp/src/system_io/system_io.h
+++ b/common/cpp/src/system_io/system_io.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_SYSTEM__SYSTEM_IO_H
-#define HIDRA2_SYSTEM__SYSTEM_IO_H
+#ifndef ASAPO_SYSTEM__SYSTEM_IO_H
+#define ASAPO_SYSTEM__SYSTEM_IO_H
#include "../../include/io/io.h"
@@ -15,7 +15,7 @@ typedef SSIZE_T ssize_t;
#include "../../../../../../../../usr/include/netinet/in.h"
#endif
-namespace hidra2 {
+namespace asapo {
class SystemIO final : public IO {
private:
@@ -108,4 +108,4 @@ class SystemIO final : public IO {
};
}
-#endif //HIDRA2_SYSTEM__SYSTEM_IO_H
+#endif //ASAPO_SYSTEM__SYSTEM_IO_H
diff --git a/common/cpp/src/system_io/system_io_linux.cpp b/common/cpp/src/system_io/system_io_linux.cpp
index c84e2f1e93e49dbc45fa632cef0c86216b90cbce..d5c2eefc62177d7e3b74faf11922c703e2b1d820 100644
--- a/common/cpp/src/system_io/system_io_linux.cpp
+++ b/common/cpp/src/system_io/system_io_linux.cpp
@@ -18,7 +18,7 @@ using std::string;
using std::vector;
using std::chrono::system_clock;
-namespace hidra2 {
+namespace asapo {
/**
* \defgroup SYSTEM_IO_LINUX_PRIVATE
@@ -127,7 +127,7 @@ FileInfo GetFileInfo(const string& name, Error* err) {
}
FileInfo SystemIO::GetFileInfo(const string& name, Error* err) const {
- return ::hidra2::GetFileInfo(name, err);
+ return ::asapo::GetFileInfo(name, err);
}
void ProcessFileEntity(const struct dirent* entity, const std::string& path,
@@ -194,15 +194,15 @@ FileDescriptor SystemIO::_open(const char* filename, int posix_open_flags) const
return ::open(filename, posix_open_flags, S_IWUSR | S_IRWXU);
}
-bool SystemIO::_close(hidra2::FileDescriptor fd) const {
+bool SystemIO::_close(asapo::FileDescriptor fd) const {
return ::close(fd) == 0;
}
-ssize_t SystemIO::_read(hidra2::FileDescriptor fd, void* buffer, size_t length) {
+ssize_t SystemIO::_read(asapo::FileDescriptor fd, void* buffer, size_t length) {
return ::read(fd, buffer, length);
}
-ssize_t SystemIO::_write(hidra2::FileDescriptor fd, const void* buffer, size_t length) {
+ssize_t SystemIO::_write(asapo::FileDescriptor fd, const void* buffer, size_t length) {
return ::write(fd, buffer, length);
}
diff --git a/common/cpp/src/system_io/system_io_windows.cpp b/common/cpp/src/system_io/system_io_windows.cpp
index 880d42d0f634ca5c0f9066df44ee8939004392af..64842edc73f26ffa3c393d87124a5db24842836f 100644
--- a/common/cpp/src/system_io/system_io_windows.cpp
+++ b/common/cpp/src/system_io/system_io_windows.cpp
@@ -14,7 +14,7 @@ using std::string;
using std::vector;
using std::chrono::system_clock;
-namespace hidra2 {
+namespace asapo {
Error IOErrorFromGetLastError() {
DWORD last_error = GetLastError();
@@ -184,7 +184,7 @@ void SystemIO::CollectFileInformationRecursively(const std::string& path,
}
-void hidra2::SystemIO::ApplyNetworkOptions(SocketDescriptor socket_fd, Error* err) const {
+void asapo::SystemIO::ApplyNetworkOptions(SocketDescriptor socket_fd, Error* err) const {
//TODO: Seeing issues when using these settings - need further investigation
//Event if NonBlockingIO is set, it seems that _recv is a blocking call :/
/*
diff --git a/common/cpp/unittests/common/test_error.cpp b/common/cpp/unittests/common/test_error.cpp
index 9055fb3ef7b6b9f8914bba43f45e3e39938ba052..99c74ceff5a4e93afc76ce52b21c6ac025329ebb 100644
--- a/common/cpp/unittests/common/test_error.cpp
+++ b/common/cpp/unittests/common/test_error.cpp
@@ -2,25 +2,25 @@
#include <common/error.h>
#include "gtest/gtest.h"
-using hidra2::Error;
+using asapo::Error;
using ::testing::Eq;
using ::testing::Ne;
namespace {
TEST(ErrorTemplate, GenerateNoNullptr) {
- Error error = hidra2::ErrorTemplates::kEndOfFile.Generate();
+ Error error = asapo::ErrorTemplates::kEndOfFile.Generate();
ASSERT_THAT(error, Ne(nullptr));
}
TEST(ErrorTemplate, EqCheck) {
- Error error = hidra2::ErrorTemplates::kEndOfFile.Generate();
- ASSERT_TRUE(hidra2::ErrorTemplates::kEndOfFile == error);
+ Error error = asapo::ErrorTemplates::kEndOfFile.Generate();
+ ASSERT_TRUE(asapo::ErrorTemplates::kEndOfFile == error);
}
TEST(ErrorTemplate, NeCheck) {
- Error error = hidra2::ErrorTemplates::kEndOfFile.Generate();
- ASSERT_FALSE(hidra2::ErrorTemplates::kMemoryAllocationError == error);
+ Error error = asapo::ErrorTemplates::kEndOfFile.Generate();
+ ASSERT_FALSE(asapo::ErrorTemplates::kMemoryAllocationError == error);
}
}
diff --git a/common/cpp/unittests/data_structs/test_data_structs.cpp b/common/cpp/unittests/data_structs/test_data_structs.cpp
index 60c24c5bf214d42f8ab75256a37a844a2d554352..01d282ae7a20d4b46cee8ee307ce27244c470250 100644
--- a/common/cpp/unittests/data_structs/test_data_structs.cpp
+++ b/common/cpp/unittests/data_structs/test_data_structs.cpp
@@ -5,7 +5,7 @@
#include <chrono>
-using hidra2::FileInfo;
+using asapo::FileInfo;
using ::testing::AtLeast;
using ::testing::Eq;
diff --git a/common/cpp/unittests/json_parser/test_json_parser.cpp b/common/cpp/unittests/json_parser/test_json_parser.cpp
index 90ef15799972e9e560e7a7022346cf8101f41ba8..e884cb43c4563e3fe7fa4ca12bf73dce8b156581 100644
--- a/common/cpp/unittests/json_parser/test_json_parser.cpp
+++ b/common/cpp/unittests/json_parser/test_json_parser.cpp
@@ -20,11 +20,11 @@ using ::testing::SetArgPointee;
using ::testing::HasSubstr;
using ::testing::ElementsAre;
-using hidra2::JsonFileParser;
-using hidra2::JsonStringParser;
-using hidra2::RapidJson;
-using hidra2::MockIO;
-using hidra2::IO;
+using asapo::JsonFileParser;
+using asapo::JsonStringParser;
+using asapo::RapidJson;
+using asapo::MockIO;
+using asapo::IO;
namespace {
@@ -242,12 +242,12 @@ TEST_F(ParseFileTests, CannotReadFile) {
std::string json = R"({"_id":2})";
EXPECT_CALL(mock_io, ReadFileToString_t("filename", _)).
- WillOnce(DoAll(testing::SetArgPointee<1>(hidra2::IOErrorTemplates::kFileNotFound.Generate().release()),
+ WillOnce(DoAll(testing::SetArgPointee<1>(asapo::IOErrorTemplates::kFileNotFound.Generate().release()),
testing::Return("")));
uint64_t id;
auto err = parser.GetUInt64("_id", &id);
- ASSERT_THAT(err->Explain(), HasSubstr(hidra2::IOErrorTemplates::kFileNotFound.Generate()->Explain()));
+ ASSERT_THAT(err->Explain(), HasSubstr(asapo::IOErrorTemplates::kFileNotFound.Generate()->Explain()));
}
diff --git a/common/cpp/unittests/logger/test_fluentd_sink.cpp b/common/cpp/unittests/logger/test_fluentd_sink.cpp
index 7c305dc6d3df96bccafbf490081352e236dffd33..2b043c64d508b63664d5bac098f4b4292e44089c 100644
--- a/common/cpp/unittests/logger/test_fluentd_sink.cpp
+++ b/common/cpp/unittests/logger/test_fluentd_sink.cpp
@@ -19,8 +19,8 @@ using ::testing::SetArgPointee;
using ::testing::HasSubstr;
using ::testing::ElementsAre;
using ::testing::ElementsAre;
-using hidra2::MockHttpClient;
-using hidra2::FluentdSink;
+using asapo::MockHttpClient;
+using asapo::FluentdSink;
namespace {
@@ -32,7 +32,7 @@ class FluentdSinkTests : public Test {
spdlog::details::log_msg msg;
std::unique_ptr<spdlog::logger> logger;
void SetUp() override {
- sink->httpclient__ = std::unique_ptr<hidra2::HttpClient> {&mock_http_client};
+ sink->httpclient__ = std::unique_ptr<asapo::HttpClient> {&mock_http_client};
logger.reset(new spdlog::logger("mylogger", sink));
}
void TearDown() override {
diff --git a/common/cpp/unittests/logger/test_logger.cpp b/common/cpp/unittests/logger/test_logger.cpp
index 71253227b7cf7e47a260957578e7196941c6189f..7db8dcbe002dfc8f6bbb9a36baa533b7f3c4d281 100644
--- a/common/cpp/unittests/logger/test_logger.cpp
+++ b/common/cpp/unittests/logger/test_logger.cpp
@@ -15,13 +15,13 @@ using ::testing::SetArgPointee;
using ::testing::HasSubstr;
using ::testing::ElementsAre;
-using hidra2::LogLevel;
+using asapo::LogLevel;
namespace {
void CheckConvert(const std::string& str, LogLevel level) {
- hidra2::Error err;
- auto loglev = hidra2::StringToLogLevel(str, &err);
+ asapo::Error err;
+ auto loglev = asapo::StringToLogLevel(str, &err);
ASSERT_THAT(err, Eq(nullptr));
ASSERT_THAT(loglev, Eq(level));
}
@@ -36,21 +36,21 @@ TEST(StringToLogLevel, ConvertOK) {
TEST(StringToLogLevel, ConvertError) {
- hidra2::Error err;
- auto loglev = hidra2::StringToLogLevel("wrong", &err);
+ asapo::Error err;
+ auto loglev = asapo::StringToLogLevel("wrong", &err);
ASSERT_THAT(err, Ne(nullptr));
- ASSERT_THAT(loglev, Eq(hidra2::LogLevel::None));
+ ASSERT_THAT(loglev, Eq(asapo::LogLevel::None));
}
TEST(DefaultLogger, BinLogger) {
- auto logger = hidra2::CreateDefaultLoggerBin("test");
- ASSERT_THAT(dynamic_cast<hidra2::SpdLogger*>(logger.get()), Ne(nullptr));
+ auto logger = asapo::CreateDefaultLoggerBin("test");
+ ASSERT_THAT(dynamic_cast<asapo::SpdLogger*>(logger.get()), Ne(nullptr));
}
TEST(DefaultLogger, ApiLogger) {
- auto logger = hidra2::CreateDefaultLoggerApi("test", "endpoint");
- ASSERT_THAT(dynamic_cast<hidra2::SpdLogger*>(logger.get()), Ne(nullptr));
+ auto logger = asapo::CreateDefaultLoggerApi("test", "endpoint");
+ ASSERT_THAT(dynamic_cast<asapo::SpdLogger*>(logger.get()), Ne(nullptr));
}
class MockSink : public spdlog::sinks::base_sink<std::mutex> {
@@ -66,7 +66,7 @@ class LoggerTests : public Test {
public:
std::shared_ptr<MockSink> mock_sink{new MockSink{"test_url"}};
std::unique_ptr<spdlog::logger> log;
- hidra2::SpdLogger logger{"test", "test_uri"};
+ asapo::SpdLogger logger{"test", "test_uri"};
spdlog::details::log_msg msg;
std::string test_string{"Hello"};
void SetUp() override {
diff --git a/examples/producer/dummy-data-producer/CMakeLists.txt b/examples/producer/dummy-data-producer/CMakeLists.txt
index 27851c5910a02919caf96222df6df338548eab74..ec7207b6a94f7317c205c22eadbe497a7f837779 100644
--- a/examples/producer/dummy-data-producer/CMakeLists.txt
+++ b/examples/producer/dummy-data-producer/CMakeLists.txt
@@ -7,8 +7,8 @@ add_executable(${TARGET_NAME} ${SOURCE_FILES})
target_include_directories(${TARGET_NAME} PUBLIC include ${CMAKE_SOURCE_DIR}/common/cpp/include)
#Add all necessary common libraries
-GET_PROPERTY(HIDRA2_COMMON_IO_LIBRARIES GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES)
-target_link_libraries(${TARGET_NAME} ${HIDRA2_COMMON_IO_LIBRARIES})
+GET_PROPERTY(ASAPO_COMMON_IO_LIBRARIES GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES)
+target_link_libraries(${TARGET_NAME} ${ASAPO_COMMON_IO_LIBRARIES})
target_link_libraries(${TARGET_NAME} producer-api)
set_target_properties(${TARGET_NAME} PROPERTIES LINKER_LANGUAGE CXX)
diff --git a/examples/producer/dummy-data-producer/dummy_data_producer.cpp b/examples/producer/dummy-data-producer/dummy_data_producer.cpp
index dd1e4cf48bd77ed8f1b437a63931adc9b599cb7c..d73fa38c6c2eaea39e96632c14febad26185d0fe 100644
--- a/examples/producer/dummy-data-producer/dummy_data_producer.cpp
+++ b/examples/producer/dummy-data-producer/dummy_data_producer.cpp
@@ -3,7 +3,7 @@
#include <vector>
#include <tuple>
-#include "hidra2_producer.h"
+#include "asapo_producer.h"
using std::chrono::high_resolution_clock;
@@ -24,7 +24,7 @@ ArgumentTuple ProcessCommandArguments(int argc, char* argv[]) {
}
}
-bool SendDummyData(hidra2::Producer* producer, size_t number_of_byte, uint64_t iterations) {
+bool SendDummyData(asapo::Producer* producer, size_t number_of_byte, uint64_t iterations) {
auto buffer = std::unique_ptr<uint8_t>(new uint8_t[number_of_byte]);
for(uint64_t i = 0; i < iterations; i++) {
@@ -54,7 +54,7 @@ int main (int argc, char* argv[]) {
<< "iterations: " << iterations << std::endl
<< std::endl;
- auto producer = hidra2::Producer::Create();
+ auto producer = asapo::Producer::Create();
auto err = producer->ConnectToReceiver(receiver_address);
if(err) {
std::cerr << "Failed to connect to receiver. ProducerError: " << err << std::endl;
diff --git a/examples/worker/getnext_broker/CMakeLists.txt b/examples/worker/getnext_broker/CMakeLists.txt
index 3d9f18bf791f441a4ef658b93b92c92c705c8cab..b8be1ad68eb16bd8e6527f84f749ba781364d9b0 100644
--- a/examples/worker/getnext_broker/CMakeLists.txt
+++ b/examples/worker/getnext_broker/CMakeLists.txt
@@ -2,7 +2,7 @@ set(TARGET_NAME getnext_broker)
set(SOURCE_FILES getnext_broker.cpp)
add_executable(${TARGET_NAME} ${SOURCE_FILES})
-target_link_libraries(${TARGET_NAME} hidra2-worker)
+target_link_libraries(${TARGET_NAME} asapo-worker)
#use expression generator to get rid of VS adding Debug/Release folders
set_target_properties(${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
@@ -10,12 +10,12 @@ set_target_properties(${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
)
get_target_property(VAR ${TARGET_NAME} RUNTIME_OUTPUT_DIRECTORY)
-add_dependencies(${TARGET_NAME} hidra2-broker)
+add_dependencies(${TARGET_NAME} asapo-broker)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/broker_settings.json settings.json COPYONLY)
-add_script_test("${TARGET_NAME}" "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME} $<TARGET_PROPERTY:hidra2-broker,EXENAME>")
+add_script_test("${TARGET_NAME}" "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME} $<TARGET_PROPERTY:asapo-broker,EXENAME>")
set (dir examples/worker/${TARGET_NAME})
install(TARGETS ${TARGET_NAME} DESTINATION "${dir}")
diff --git a/examples/worker/getnext_broker/CMakeLists_separate.in b/examples/worker/getnext_broker/CMakeLists_separate.in
index 551ade7519deb9c7e4f7f50aeac03861c21facd3..5bcf1c56fc63ba39f0968b4d6f2e4e67279927b6 100644
--- a/examples/worker/getnext_broker/CMakeLists_separate.in
+++ b/examples/worker/getnext_broker/CMakeLists_separate.in
@@ -31,4 +31,4 @@ link_directories(@CMAKE_INSTALL_PREFIX@/lib)
add_executable(${TARGET_NAME} ${SOURCE_FILES})
target_include_directories(${TARGET_NAME} PUBLIC @CMAKE_INSTALL_PREFIX@/include ${CURL_INCLUDE_DIRS})
-target_link_libraries(${TARGET_NAME} hidra2-worker ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(${TARGET_NAME} asapo-worker ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
diff --git a/examples/worker/getnext_broker/Makefile.in b/examples/worker/getnext_broker/Makefile.in
index bc4ee332cca39816a0f8894800156df35bdbfc5f..ae61c2ed41f2448088fbda0b24b71bd6ba5e7bd6 100644
--- a/examples/worker/getnext_broker/Makefile.in
+++ b/examples/worker/getnext_broker/Makefile.in
@@ -3,7 +3,7 @@ PROGRAM=@TARGET_NAME@
CXX=g++
CXXFLAGS=-std=c++11
LDFLAGS=-pthread -static-libgcc -static-libstdc++
-LIBS=-L @CMAKE_INSTALL_PREFIX@/lib -lhidra2-worker -L ${LIBCURL_DIR}/lib -lcurl
+LIBS=-L @CMAKE_INSTALL_PREFIX@/lib -lasapo-worker -L ${LIBCURL_DIR}/lib -lcurl
INCLUDE=-I @CMAKE_INSTALL_PREFIX@/include -I ${LIBCURL_DIR}/include
RM=rm -f
diff --git a/examples/worker/getnext_broker/getnext_broker.cpp b/examples/worker/getnext_broker/getnext_broker.cpp
index 726c6410281ea2d4c8a685744c71b9be64d46b83..2422d106797d30a31f8b70fc02d30ee37610cd9f 100644
--- a/examples/worker/getnext_broker/getnext_broker.cpp
+++ b/examples/worker/getnext_broker/getnext_broker.cpp
@@ -7,10 +7,10 @@
#include <iomanip>
#include <numeric>
-#include "hidra2_worker.h"
+#include "asapo_worker.h"
using std::chrono::high_resolution_clock;
-using hidra2::Error;
+using asapo::Error;
void WaitThreads(std::vector<std::thread>* threads) {
for (auto& thread : *threads) {
@@ -20,7 +20,7 @@ void WaitThreads(std::vector<std::thread>* threads) {
int ProcessError(const Error& err) {
if (err == nullptr) return 0;
- if (err->GetErrorType() != hidra2::ErrorType::kEndOfFile) {
+ if (err->GetErrorType() != asapo::ErrorType::kEndOfFile) {
std::cout << err->Explain() << std::endl;
return 1;
}
@@ -30,9 +30,9 @@ int ProcessError(const Error& err) {
std::vector<std::thread> StartThreads(const std::string& server, const std::string& run_name, int nthreads,
std::vector<int>* nfiles, std::vector<int>* errors) {
auto exec_next = [server, run_name, nfiles, errors](int i) {
- hidra2::FileInfo fi;
+ asapo::FileInfo fi;
Error err;
- auto broker = hidra2::DataBrokerFactory::CreateServerBroker(server, run_name, &err);
+ auto broker = asapo::DataBrokerFactory::CreateServerBroker(server, run_name, &err);
broker->SetTimeout(1000);
while ((err = broker->GetNext(&fi, nullptr)) == nullptr) {
(*nfiles)[i] ++;
@@ -48,7 +48,7 @@ std::vector<std::thread> StartThreads(const std::string& server, const std::stri
}
int ReadAllData(const std::string& server, const std::string& run_name, int nthreads, uint64_t* duration_ms) {
- hidra2::FileInfo fi;
+ asapo::FileInfo fi;
high_resolution_clock::time_point t1 = high_resolution_clock::now();
std::vector<int>nfiles(nthreads, 0);
diff --git a/examples/worker/process_folder/CMakeLists.txt b/examples/worker/process_folder/CMakeLists.txt
index ea20503288ce7e01cc57dd3ff121905981d6703d..db51972d2d3dfa5d1079fb93927aef6bb8f7520f 100644
--- a/examples/worker/process_folder/CMakeLists.txt
+++ b/examples/worker/process_folder/CMakeLists.txt
@@ -4,10 +4,10 @@ set(SOURCE_FILES process_folder.cpp)
add_executable(${TARGET_NAME} ${SOURCE_FILES})
#Add all necessary common libraries
-GET_PROPERTY(HIDRA2_COMMON_IO_LIBRARIES GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES)
-target_link_libraries(${TARGET_NAME} ${HIDRA2_COMMON_IO_LIBRARIES})
+GET_PROPERTY(ASAPO_COMMON_IO_LIBRARIES GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES)
+target_link_libraries(${TARGET_NAME} ${ASAPO_COMMON_IO_LIBRARIES})
-target_link_libraries(${TARGET_NAME} hidra2-worker)
+target_link_libraries(${TARGET_NAME} asapo-worker)
set_target_properties(${TARGET_NAME} PROPERTIES LINKER_LANGUAGE CXX)
#use expression generator to get rid of VS adding Debug/Release folders
set_target_properties(${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
diff --git a/examples/worker/process_folder/CMakeLists_separate.in b/examples/worker/process_folder/CMakeLists_separate.in
index cd02b336cd9078cf6b87178126ed26e324e72179..a250ea32fa680b894ecd3651ad2a82e741afba14 100644
--- a/examples/worker/process_folder/CMakeLists_separate.in
+++ b/examples/worker/process_folder/CMakeLists_separate.in
@@ -18,5 +18,5 @@ link_directories(@CMAKE_INSTALL_PREFIX@/lib)
add_executable(${TARGET_NAME} ${SOURCE_FILES})
target_include_directories(${TARGET_NAME} PUBLIC @CMAKE_INSTALL_PREFIX@/include)
-target_link_libraries(${TARGET_NAME} hidra2-worker ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(${TARGET_NAME} asapo-worker ${CMAKE_THREAD_LIBS_INIT})
diff --git a/examples/worker/process_folder/Makefile.in b/examples/worker/process_folder/Makefile.in
index f71764db49ab3cc4bd173c4ee86945d084aadf72..5f7b7a258757cbad3b17264b5eec2532250911a2 100644
--- a/examples/worker/process_folder/Makefile.in
+++ b/examples/worker/process_folder/Makefile.in
@@ -3,7 +3,7 @@ PROGRAM=worker_processfolder
CXX=g++
CXXFLAGS=-std=c++11
LDFLAGS=-pthread -static-libgcc -static-libstdc++
-LIBS=-L @CMAKE_INSTALL_PREFIX@/lib -lhidra2-worker
+LIBS=-L @CMAKE_INSTALL_PREFIX@/lib -lasapo-worker
INCLUDE=@CMAKE_INSTALL_PREFIX@/include
RM=rm -f
diff --git a/examples/worker/process_folder/process_folder.cpp b/examples/worker/process_folder/process_folder.cpp
index f85f7257385f15b092f5598ee7e4e84daa5b95d6..2e8f7da92f92f6410573c31c22a0f9787a074b1f 100644
--- a/examples/worker/process_folder/process_folder.cpp
+++ b/examples/worker/process_folder/process_folder.cpp
@@ -6,10 +6,10 @@
#include <chrono>
#include <iomanip>
-#include "hidra2_worker.h"
+#include "asapo_worker.h"
using std::chrono::high_resolution_clock;
-using hidra2::Error;
+using asapo::Error;
struct Statistics {
std::chrono::milliseconds duration_scan;
@@ -26,9 +26,9 @@ std::string ProcessCommandArguments(int argc, char* argv[]) {
return argv[1];
}
-std::unique_ptr<hidra2::DataBroker> CreateBroker(const std::string& folder) {
+std::unique_ptr<asapo::DataBroker> CreateBroker(const std::string& folder) {
Error err;
- auto broker = hidra2::DataBrokerFactory::CreateFolderBroker(folder, &err);
+ auto broker = asapo::DataBrokerFactory::CreateFolderBroker(folder, &err);
if (err != nullptr) {
std::cout << "Cannot create broker" << std::endl;
exit(EXIT_FAILURE);
@@ -37,7 +37,7 @@ std::unique_ptr<hidra2::DataBroker> CreateBroker(const std::string& folder) {
return broker;
}
-void ConnectToBrocker(std::unique_ptr<hidra2::DataBroker>* broker, Statistics* statistics) {
+void ConnectToBrocker(std::unique_ptr<asapo::DataBroker>* broker, Statistics* statistics) {
high_resolution_clock::time_point t1 = high_resolution_clock::now();
Error err = (*broker)->Connect();
if (err != nullptr) {
@@ -48,10 +48,10 @@ void ConnectToBrocker(std::unique_ptr<hidra2::DataBroker>* broker, Statistics* s
statistics->duration_scan = std::chrono::duration_cast<std::chrono::milliseconds>( t2 - t1 );
}
-void ReadAllData(std::unique_ptr<hidra2::DataBroker>* broker, Statistics* statistics) {
+void ReadAllData(std::unique_ptr<asapo::DataBroker>* broker, Statistics* statistics) {
Error err;
- hidra2::FileInfo file_info;
- hidra2::FileData file_data;
+ asapo::FileInfo file_info;
+ asapo::FileData file_data;
high_resolution_clock::time_point t1 = high_resolution_clock::now();
int nfiles = 0;
@@ -60,7 +60,7 @@ void ReadAllData(std::unique_ptr<hidra2::DataBroker>* broker, Statistics* statis
nfiles++;
size += file_info.size;
}
- if (err->GetErrorType() != hidra2::ErrorType::kEndOfFile) {
+ if (err->GetErrorType() != asapo::ErrorType::kEndOfFile) {
std::cout << err->Explain() << std::endl;
exit(EXIT_FAILURE);
}
diff --git a/producer/api/CMakeLists.txt b/producer/api/CMakeLists.txt
index 806daaf9f93be198ba3638069bbfc0390306d064..58b7b518268acc7f798eed765be6a908642fa4e5 100644
--- a/producer/api/CMakeLists.txt
+++ b/producer/api/CMakeLists.txt
@@ -11,7 +11,7 @@ set(SOURCE_FILES
################################
add_library(${TARGET_NAME} STATIC ${SOURCE_FILES} $<TARGET_OBJECTS:system_io> $<TARGET_OBJECTS:logger>
$<TARGET_OBJECTS:curl_http_client> )
-target_include_directories(${TARGET_NAME} PUBLIC include ${HIDRA2_CXX_COMMON_INCLUDE_DIR})
+target_include_directories(${TARGET_NAME} PUBLIC include ${ASAPO_CXX_COMMON_INCLUDE_DIR})
target_link_libraries(${TARGET_NAME} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
################################
diff --git a/producer/api/include/asapo_producer.h b/producer/api/include/asapo_producer.h
new file mode 100644
index 0000000000000000000000000000000000000000..84309f32bc72456d26342c0d50b7798a9a7a46e9
--- /dev/null
+++ b/producer/api/include/asapo_producer.h
@@ -0,0 +1,8 @@
+#ifndef ASAPO_ASAPO_PRODUCER_H
+#define ASAPO_ASAPO_PRODUCER_H
+
+#include "common/io_error.h"
+#include "producer/producer.h"
+
+
+#endif //ASAPO_ASAPO_PRODUCER_H
diff --git a/producer/api/include/hidra2_producer.h b/producer/api/include/hidra2_producer.h
deleted file mode 100644
index 7cb5d2431367beccc455cecbc333c804414ac66c..0000000000000000000000000000000000000000
--- a/producer/api/include/hidra2_producer.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef HIDRA2_HIDRA2_PRODUCER_H
-#define HIDRA2_HIDRA2_PRODUCER_H
-
-#include "common/io_error.h"
-#include "producer/producer.h"
-
-
-#endif //HIDRA2_HIDRA2_PRODUCER_H
diff --git a/producer/api/include/producer/producer.h b/producer/api/include/producer/producer.h
index 0ff7a2629ad2d4a61619194d2fb000a1ffc3045e..192e9f2f2f98a504022fdd43775558298ed101a6 100644
--- a/producer/api/include/producer/producer.h
+++ b/producer/api/include/producer/producer.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_PRODUCER__PRODUCER_H
-#define HIDRA2_PRODUCER__PRODUCER_H
+#ifndef ASAPO_PRODUCER__PRODUCER_H
+#define ASAPO_PRODUCER__PRODUCER_H
#include <memory>
#include <string>
@@ -7,7 +7,7 @@
#include "producer_error.h"
#include "logger/logger.h"
-namespace hidra2 {
+namespace asapo {
enum class ProducerStatus {
kDisconnected,
@@ -57,4 +57,4 @@ class Producer {
};
}
-#endif //HIDRA2_PRODUCER__PRODUCER_H
+#endif //ASAPO_PRODUCER__PRODUCER_H
diff --git a/producer/api/include/producer/producer_error.h b/producer/api/include/producer/producer_error.h
index cdcf69a742ad54dd6d248f654e56953ce6faf701..720b5cf4db9365a536259470fbb93ce4ec8a5ff0 100644
--- a/producer/api/include/producer/producer_error.h
+++ b/producer/api/include/producer/producer_error.h
@@ -1,9 +1,9 @@
-#ifndef HIDRA2_PRODUCER_ERROR_H
-#define HIDRA2_PRODUCER_ERROR_H
+#ifndef ASAPO_PRODUCER_ERROR_H
+#define ASAPO_PRODUCER_ERROR_H
#include "common/error.h"
-namespace hidra2 {
+namespace asapo {
enum class ProducerErrorType {
kAlreadyConnected,
@@ -75,4 +75,4 @@ auto const kUnknownServerError = ProducerErrorTemplate {
};
}
-#endif //HIDRA2_PRODUCER_ERROR_H
+#endif //ASAPO_PRODUCER_ERROR_H
diff --git a/producer/api/src/producer.cpp b/producer/api/src/producer.cpp
index 25add6276cc3bf432fc4a8a07069e112890b384a..c69f21e149e01bc31ad4e755354d779c21008b1a 100644
--- a/producer/api/src/producer.cpp
+++ b/producer/api/src/producer.cpp
@@ -1,6 +1,6 @@
#include "producer/producer.h"
#include "producer_impl.h"
-std::unique_ptr<hidra2::Producer> hidra2::Producer::Create() {
- return std::unique_ptr<hidra2::Producer>(new ProducerImpl());
+std::unique_ptr<asapo::Producer> asapo::Producer::Create() {
+ return std::unique_ptr<asapo::Producer>(new ProducerImpl());
}
diff --git a/producer/api/src/producer_impl.cpp b/producer/api/src/producer_impl.cpp
index b7bd9ecb099763658445cfff1e24383a2a4c93c9..6e8a5acb8827ebe8ec0a82a79425cd14c624f2f6 100644
--- a/producer/api/src/producer_impl.cpp
+++ b/producer/api/src/producer_impl.cpp
@@ -4,7 +4,7 @@
#include "producer_impl.h"
#include "io/io_factory.h"
-namespace hidra2 {
+namespace asapo {
const uint32_t ProducerImpl::kVersion = 1;
const size_t ProducerImpl::kMaxChunkSize = size_t(1024) * size_t(1024) * size_t(1024) * size_t(2); //2GiByte
diff --git a/producer/api/src/producer_impl.h b/producer/api/src/producer_impl.h
index 755dfbbbfdc28398cf8984bdb13bce447138bda4..5710d8dd561b5688465b221d57fe8b88490c2348 100644
--- a/producer/api/src/producer_impl.h
+++ b/producer/api/src/producer_impl.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_PRODUCER__PRODUCER_IMPL_H
-#define HIDRA2_PRODUCER__PRODUCER_IMPL_H
+#ifndef ASAPO_PRODUCER__PRODUCER_IMPL_H
+#define ASAPO_PRODUCER__PRODUCER_IMPL_H
#include <string>
#include <common/networking.h>
@@ -7,7 +7,7 @@
#include "producer/producer.h"
#include "logger/logger.h"
-namespace hidra2 {
+namespace asapo {
class ProducerImpl : public Producer {
private:
static const uint32_t kVersion;
@@ -42,4 +42,4 @@ class ProducerImpl : public Producer {
};
}
-#endif //HIDRA2_PRODUCER__PRODUCER_IMPL_H
+#endif //ASAPO_PRODUCER__PRODUCER_IMPL_H
diff --git a/producer/api/unittests/test_producer.cpp b/producer/api/unittests/test_producer.cpp
index 91b1f691a6a541cef3da6f69a694c87353574b20..80072d7c1441f932deb8e12a1c280f0f7dca8c06 100644
--- a/producer/api/unittests/test_producer.cpp
+++ b/producer/api/unittests/test_producer.cpp
@@ -8,8 +8,8 @@ using ::testing::Ne;
namespace {
TEST(CreateProducer, PointerIsNotNullptr) {
- std::unique_ptr<hidra2::Producer> producer = hidra2::Producer::Create();
- ASSERT_THAT(dynamic_cast<hidra2::ProducerImpl*>(producer.get()), Ne(nullptr));
+ std::unique_ptr<asapo::Producer> producer = asapo::Producer::Create();
+ ASSERT_THAT(dynamic_cast<asapo::ProducerImpl*>(producer.get()), Ne(nullptr));
ASSERT_THAT(producer.get(), Ne(nullptr));
}
diff --git a/producer/api/unittests/test_producer_impl.cpp b/producer/api/unittests/test_producer_impl.cpp
index 242e5d6755f33fdb48c8dfc5a62fa43321e6b05f..0376a3f3d0f781db729986cbe4e8953be79cd971 100644
--- a/producer/api/unittests/test_producer_impl.cpp
+++ b/producer/api/unittests/test_producer_impl.cpp
@@ -22,14 +22,14 @@ using ::testing::InSequence;
using ::testing::HasSubstr;
TEST(get_version, VersionAboveZero) {
- hidra2::ProducerImpl producer;
+ asapo::ProducerImpl producer;
EXPECT_GE(producer.GetVersion(), 0);
}
TEST(Producer, Logger) {
- hidra2::ProducerImpl producer;
- ASSERT_THAT(dynamic_cast<hidra2::AbstractLogger*>(producer.log__.get()), Ne(nullptr));
+ asapo::ProducerImpl producer;
+ ASSERT_THAT(dynamic_cast<asapo::AbstractLogger*>(producer.log__.get()), Ne(nullptr));
}
/**
@@ -38,11 +38,11 @@ TEST(Producer, Logger) {
class ProducerImpl : public testing::Test {
public:
- hidra2::ProducerImpl producer;
- testing::NiceMock<hidra2::MockIO> mock_io;
- testing::NiceMock<hidra2::MockLogger> mock_logger;
+ asapo::ProducerImpl producer;
+ testing::NiceMock<asapo::MockIO> mock_io;
+ testing::NiceMock<asapo::MockLogger> mock_logger;
- hidra2::FileDescriptor expected_fd = 83942;
+ asapo::FileDescriptor expected_fd = 83942;
uint64_t expected_file_id = 4224;
std::string expected_address = "127.0.0.1:9090";
uint64_t expected_request_id = 0;
@@ -50,15 +50,15 @@ class ProducerImpl : public testing::Test {
void* expected_file_pointer = (void*)0xC00FE;
void SetUp() override {
- producer.io__ = std::unique_ptr<hidra2::IO> {&mock_io};
- producer.log__ = hidra2::Logger {&mock_logger};
+ producer.io__ = std::unique_ptr<asapo::IO> {&mock_io};
+ producer.log__ = asapo::Logger {&mock_logger};
}
void TearDown() override {
producer.io__.release();
producer.log__.release();
}
- void ConnectToReceiver_DONE(hidra2::FileDescriptor expected_fd = 1) {
+ void ConnectToReceiver_DONE(asapo::FileDescriptor expected_fd = 1) {
EXPECT_CALL(mock_io, CreateAndConnectIPTCPSocket_t(expected_address, _))
.Times(1)
.WillOnce(
@@ -80,8 +80,8 @@ class ProducerImpl : public testing::Test {
};
TEST_F(ProducerImpl, get_status__disconnected) {
- hidra2::ProducerStatus status = producer.GetStatus();
- ASSERT_THAT(status, Eq(hidra2::ProducerStatus::kDisconnected));
+ asapo::ProducerStatus status = producer.GetStatus();
+ ASSERT_THAT(status, Eq(asapo::ProducerStatus::kDisconnected));
}
@@ -90,7 +90,7 @@ TEST_F(ProducerImpl, ConnectToReceiver__CreateAndConnectIPTCPSocket_error) {
.Times(1)
.WillOnce(
DoAll(
- testing::SetArgPointee<1>(hidra2::IOErrorTemplates::kInvalidAddressFormat.Generate().release()),
+ testing::SetArgPointee<1>(asapo::IOErrorTemplates::kInvalidAddressFormat.Generate().release()),
Return(-1)
));
@@ -99,8 +99,8 @@ TEST_F(ProducerImpl, ConnectToReceiver__CreateAndConnectIPTCPSocket_error) {
auto error = producer.ConnectToReceiver(expected_address);
auto status = producer.GetStatus();
- ASSERT_THAT(error, Eq(hidra2::IOErrorTemplates::kInvalidAddressFormat));
- ASSERT_THAT(status, Eq(hidra2::ProducerStatus::kDisconnected));
+ ASSERT_THAT(error, Eq(asapo::IOErrorTemplates::kInvalidAddressFormat));
+ ASSERT_THAT(status, Eq(asapo::ProducerStatus::kDisconnected));
}
TEST_F(ProducerImpl, ConnectToReceiver) {
@@ -119,7 +119,7 @@ TEST_F(ProducerImpl, ConnectToReceiver) {
auto status = producer.GetStatus();
ASSERT_THAT(error, Eq(nullptr));
- ASSERT_THAT(status, Eq(hidra2::ProducerStatus::kConnected));
+ ASSERT_THAT(status, Eq(asapo::ProducerStatus::kConnected));
}
TEST_F(ProducerImpl, ConnectToReceiver__already_connected) {
@@ -129,7 +129,7 @@ TEST_F(ProducerImpl, ConnectToReceiver__already_connected) {
auto error = producer.ConnectToReceiver(expected_address);
- ASSERT_THAT(error, Eq(hidra2::ProducerErrorTemplates::kAlreadyConnected));
+ ASSERT_THAT(error, Eq(asapo::ProducerErrorTemplates::kAlreadyConnected));
}
/**
@@ -138,23 +138,23 @@ TEST_F(ProducerImpl, ConnectToReceiver__already_connected) {
MATCHER_P3(M_CheckSendDataRequest, request_id, file_id, file_size,
"Checks if a valid GenericNetworkRequestHeader was Send") {
- return ((hidra2::GenericNetworkRequestHeader*)arg)->op_code == hidra2::kNetOpcodeSendData
- && ((hidra2::GenericNetworkRequestHeader*)arg)->request_id == request_id
- && ((hidra2::GenericNetworkRequestHeader*)arg)->data_id == file_id
- && ((hidra2::GenericNetworkRequestHeader*)arg)->data_size == file_size;
+ return ((asapo::GenericNetworkRequestHeader*)arg)->op_code == asapo::kNetOpcodeSendData
+ && ((asapo::GenericNetworkRequestHeader*)arg)->request_id == request_id
+ && ((asapo::GenericNetworkRequestHeader*)arg)->data_id == file_id
+ && ((asapo::GenericNetworkRequestHeader*)arg)->data_size == file_size;
}
ACTION_P2(A_WriteSendDataResponse, error_code, request_id) {
- ((hidra2::SendDataResponse*)arg1)->op_code = hidra2::kNetOpcodeSendData;
- ((hidra2::SendDataResponse*)arg1)->error_code = error_code;
- ((hidra2::SendDataResponse*)arg1)->request_id = request_id;
+ ((asapo::SendDataResponse*)arg1)->op_code = asapo::kNetOpcodeSendData;
+ ((asapo::SendDataResponse*)arg1)->error_code = error_code;
+ ((asapo::SendDataResponse*)arg1)->request_id = request_id;
}
TEST_F(ProducerImpl, Send__connection_not_ready) {
auto error = producer.Send(expected_file_id, nullptr, 1);
- ASSERT_THAT(error, Eq(hidra2::ProducerErrorTemplates::kConnectionNotReady));
+ ASSERT_THAT(error, Eq(asapo::ProducerErrorTemplates::kConnectionNotReady));
}
TEST_F(ProducerImpl, Send__file_too_large) {
@@ -164,7 +164,7 @@ TEST_F(ProducerImpl, Send__file_too_large) {
auto error = producer.Send(expected_file_id, nullptr,
size_t(1024) * size_t(1024) * size_t(1024) * size_t(3));
- ASSERT_THAT(error, Eq(hidra2::ProducerErrorTemplates::kFileTooLarge));
+ ASSERT_THAT(error, Eq(asapo::ProducerErrorTemplates::kFileTooLarge));
}
TEST_F(ProducerImpl, Send__sendDataRequest_error) {
@@ -174,17 +174,17 @@ TEST_F(ProducerImpl, Send__sendDataRequest_error) {
EXPECT_CALL(mock_io, Send_t(expected_fd, M_CheckSendDataRequest(expected_request_id, expected_file_id,
expected_file_size),
- sizeof(hidra2::GenericNetworkRequestHeader), _))
+ sizeof(asapo::GenericNetworkRequestHeader), _))
.Times(1)
.WillOnce(
DoAll(
- testing::SetArgPointee<3>(hidra2::IOErrorTemplates::kBadFileNumber.Generate().release()),
+ testing::SetArgPointee<3>(asapo::IOErrorTemplates::kBadFileNumber.Generate().release()),
Return(-1)
));
auto error = producer.Send(expected_file_id, nullptr, expected_file_size);
- ASSERT_THAT(error, Eq(hidra2::IOErrorTemplates::kBadFileNumber));
+ ASSERT_THAT(error, Eq(asapo::IOErrorTemplates::kBadFileNumber));
}
TEST_F(ProducerImpl, Send__sendData_error) {
@@ -197,7 +197,7 @@ TEST_F(ProducerImpl, Send__sendData_error) {
.Times(1)
.WillOnce(
DoAll(
- testing::SetArgPointee<3>(hidra2::IOErrorTemplates::kBadFileNumber.Generate().release()),
+ testing::SetArgPointee<3>(asapo::IOErrorTemplates::kBadFileNumber.Generate().release()),
Return(-1)
));
@@ -205,7 +205,7 @@ TEST_F(ProducerImpl, Send__sendData_error) {
auto error = producer.Send(expected_file_id, expected_file_pointer, expected_file_size);
- ASSERT_THAT(error, Eq(hidra2::IOErrorTemplates::kBadFileNumber));
+ ASSERT_THAT(error, Eq(asapo::IOErrorTemplates::kBadFileNumber));
}
@@ -215,11 +215,11 @@ TEST_F(ProducerImpl, Send__Receive_error) {
ConnectToReceiver_DONE(expected_fd);
Send_DONE(2);
- EXPECT_CALL(mock_io, Receive_t(expected_fd, _, sizeof(hidra2::SendDataResponse), _))
+ EXPECT_CALL(mock_io, Receive_t(expected_fd, _, sizeof(asapo::SendDataResponse), _))
.Times(1)
.WillOnce(
DoAll(
- testing::SetArgPointee<3>(hidra2::IOErrorTemplates::kBadFileNumber.Generate().release()),
+ testing::SetArgPointee<3>(asapo::IOErrorTemplates::kBadFileNumber.Generate().release()),
testing::Return(-1)
));
@@ -227,7 +227,7 @@ TEST_F(ProducerImpl, Send__Receive_error) {
auto error = producer.Send(expected_file_id, expected_file_pointer, expected_file_size);
- ASSERT_THAT(error, Eq(hidra2::IOErrorTemplates::kBadFileNumber));
+ ASSERT_THAT(error, Eq(asapo::IOErrorTemplates::kBadFileNumber));
}
TEST_F(ProducerImpl, Send__Receive_server_error) {
@@ -237,18 +237,18 @@ TEST_F(ProducerImpl, Send__Receive_server_error) {
Send_DONE(2);
- EXPECT_CALL(mock_io, Receive_t(_, _, sizeof(hidra2::SendDataResponse), _))
+ EXPECT_CALL(mock_io, Receive_t(_, _, sizeof(asapo::SendDataResponse), _))
.Times(1)
.WillOnce(
DoAll(
testing::SetArgPointee<3>(nullptr),
- A_WriteSendDataResponse(hidra2::kNetErrorAllocateStorageFailed, expected_request_id),
+ A_WriteSendDataResponse(asapo::kNetErrorAllocateStorageFailed, expected_request_id),
testing::ReturnArg<2>()
));
auto error = producer.Send(expected_file_id, expected_file_pointer, expected_file_size);
- ASSERT_THAT(error, Eq(hidra2::ProducerErrorTemplates::kUnknownServerError));
+ ASSERT_THAT(error, Eq(asapo::ProducerErrorTemplates::kUnknownServerError));
}
TEST_F(ProducerImpl, Send__Receive_server_error_id_already_in_use) {
@@ -258,18 +258,18 @@ TEST_F(ProducerImpl, Send__Receive_server_error_id_already_in_use) {
Send_DONE(2);
- EXPECT_CALL(mock_io, Receive_t(_, _, sizeof(hidra2::SendDataResponse), _))
+ EXPECT_CALL(mock_io, Receive_t(_, _, sizeof(asapo::SendDataResponse), _))
.Times(1)
.WillOnce(
DoAll(
testing::SetArgPointee<3>(nullptr),
- A_WriteSendDataResponse(hidra2::kNetErrorFileIdAlreadyInUse, expected_request_id),
+ A_WriteSendDataResponse(asapo::kNetErrorFileIdAlreadyInUse, expected_request_id),
testing::ReturnArg<2>()
));
auto error = producer.Send(expected_file_id, expected_file_pointer, expected_file_size);
- ASSERT_THAT(error, Eq(hidra2::ProducerErrorTemplates::kFileIdAlreadyInUse));
+ ASSERT_THAT(error, Eq(asapo::ProducerErrorTemplates::kFileIdAlreadyInUse));
}
TEST_F(ProducerImpl, Send) {
@@ -279,12 +279,12 @@ TEST_F(ProducerImpl, Send) {
Send_DONE(2);
- EXPECT_CALL(mock_io, Receive_t(_, _, sizeof(hidra2::SendDataResponse), _))
+ EXPECT_CALL(mock_io, Receive_t(_, _, sizeof(asapo::SendDataResponse), _))
.Times(1)
.WillOnce(
DoAll(
testing::SetArgPointee<3>(nullptr),
- A_WriteSendDataResponse(hidra2::kNetErrorNoError, expected_request_id),
+ A_WriteSendDataResponse(asapo::kNetErrorNoError, expected_request_id),
testing::ReturnArg<2>()
));
@@ -314,9 +314,9 @@ TEST_F(ProducerImpl, EnableRemoteLog) {
TEST_F(ProducerImpl, SetLogLevel) {
- EXPECT_CALL(mock_logger, SetLogLevel(hidra2::LogLevel::Warning));
+ EXPECT_CALL(mock_logger, SetLogLevel(asapo::LogLevel::Warning));
- producer.SetLogLevel(hidra2::LogLevel::Warning);
+ producer.SetLogLevel(asapo::LogLevel::Warning);
}
diff --git a/receiver/CMakeLists.txt b/receiver/CMakeLists.txt
index cb9c6267f324ef9b05ea365abca6f66b26177a3a..33b5e7bf4381ac4203da297f05f442db845df661 100644
--- a/receiver/CMakeLists.txt
+++ b/receiver/CMakeLists.txt
@@ -20,7 +20,7 @@ set(SOURCE_FILES
add_library(${TARGET_NAME} STATIC ${SOURCE_FILES} $<TARGET_OBJECTS:system_io> $<TARGET_OBJECTS:curl_http_client>
$<TARGET_OBJECTS:json_parser> $<TARGET_OBJECTS:logger>)
set_target_properties(${TARGET_NAME} PROPERTIES LINKER_LANGUAGE CXX)
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} database)
diff --git a/receiver/src/connection.cpp b/receiver/src/connection.cpp
index d74affd2ba6e3f52bd1eec093f313b0c3c3a70a3..b86a1f0ef061eff086234090366cf776f7e050ab 100644
--- a/receiver/src/connection.cpp
+++ b/receiver/src/connection.cpp
@@ -6,7 +6,7 @@
#include "receiver_logger.h"
-namespace hidra2 {
+namespace asapo {
size_t Connection::kRequestHandlerMaxBufferSize;
std::atomic<uint32_t> Connection::kNetworkProducerPeerImplGlobalCounter(0);
diff --git a/receiver/src/connection.h b/receiver/src/connection.h
index 3fbc728d1d59e5182c99288c0b1cb9d77b8e306b..11fdf1eff9fa62bb754f97df9851bd41e14a2d1e 100644
--- a/receiver/src/connection.h
+++ b/receiver/src/connection.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_NetworkProducerPeerImpl_H
-#define HIDRA2_NetworkProducerPeerImpl_H
+#ifndef ASAPO_NetworkProducerPeerImpl_H
+#define ASAPO_NetworkProducerPeerImpl_H
#include "connection.h"
@@ -17,7 +17,7 @@
#include "statistics.h"
#include "logger/logger.h"
-namespace hidra2 {
+namespace asapo {
class Connection {
public:
@@ -48,4 +48,4 @@ class Connection {
}
-#endif //HIDRA2_NetworkProducerPeerImpl_H
+#endif //ASAPO_NetworkProducerPeerImpl_H
diff --git a/receiver/src/main.cpp b/receiver/src/main.cpp
index 258d81d569ec2a69448fcfb5c3eee55dc07e4ae9..f40dc1e2f606b2c2063398f8cdb06ebf0da7006f 100644
--- a/receiver/src/main.cpp
+++ b/receiver/src/main.cpp
@@ -6,32 +6,32 @@
#include "receiver_logger.h"
-hidra2::Error ReadConfigFile(int argc, char* argv[]) {
+asapo::Error ReadConfigFile(int argc, char* argv[]) {
if (argc != 2) {
std::cerr << "Usage: " << argv[0] << " <config file>" << std::endl;
exit(EXIT_FAILURE);
}
- hidra2::ReceiverConfigFactory factory;
+ asapo::ReceiverConfigFactory factory;
return factory.SetConfigFromFile(argv[1]);
}
int main (int argc, char* argv[]) {
auto err = ReadConfigFile(argc, argv);
- const auto& logger = hidra2::GetDefaultReceiverLogger();
+ const auto& logger = asapo::GetDefaultReceiverLogger();
if (err) {
logger->Error("cannot read config file: " + err->Explain());
return 1;
}
- auto config = hidra2::GetReceiverConfig();
+ auto config = asapo::GetReceiverConfig();
logger->SetLogLevel(config->log_level);
static const std::string address = "0.0.0.0:" + std::to_string(config->listen_port);
- auto* receiver = new hidra2::Receiver();
+ auto* receiver = new asapo::Receiver();
logger->Info("listening on " + address);
receiver->Listen(address, &err);
diff --git a/receiver/src/receiver.cpp b/receiver/src/receiver.cpp
index 54f79db8749c795310eaf1ce6efc7a5c6a8a6394..8d2c1b1d0ddd1f8d67cbadff66603e5a08ddae79 100644
--- a/receiver/src/receiver.cpp
+++ b/receiver/src/receiver.cpp
@@ -5,7 +5,7 @@
#include "connection.h"
#include <io/io_factory.h>
-namespace hidra2 {
+namespace asapo {
const int Receiver::kMaxUnacceptedConnectionsBacklog = 5;
diff --git a/receiver/src/receiver.h b/receiver/src/receiver.h
index 55a94678a5176426f90bad27b5ddfe20c7a44bac..c7435ce68aba8fa561e7a1df8086a75b40ca8149 100644
--- a/receiver/src/receiver.h
+++ b/receiver/src/receiver.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_RECEIVER_H
-#define HIDRA2_RECEIVER_H
+#ifndef ASAPO_RECEIVER_H
+#define ASAPO_RECEIVER_H
#include <string>
#include <thread>
@@ -9,7 +9,7 @@
#include "connection.h"
#include "receiver_logger.h"
-namespace hidra2 {
+namespace asapo {
class Receiver {
private:
@@ -30,4 +30,4 @@ class Receiver {
}
-#endif //HIDRA2_RECEIVER_H
+#endif //ASAPO_RECEIVER_H
diff --git a/receiver/src/receiver_config.cpp b/receiver/src/receiver_config.cpp
index fc81efa6333d493ab4fa2d5864dcac72cd11f902..4dbae3f095e1a335239c6dfcd9e4632c3c99c935 100644
--- a/receiver/src/receiver_config.cpp
+++ b/receiver/src/receiver_config.cpp
@@ -3,7 +3,7 @@
#include "io/io_factory.h"
#include "json_parser/json_parser.h"
-namespace hidra2 {
+namespace asapo {
ReceiverConfig config;
diff --git a/receiver/src/receiver_config.h b/receiver/src/receiver_config.h
index 8a1653607ea3e2968701652bb12ee7eb3b49ecc8..a4f8b44403d7179d671d17f3d55defa4bd5a8674 100644
--- a/receiver/src/receiver_config.h
+++ b/receiver/src/receiver_config.h
@@ -1,11 +1,11 @@
-#ifndef HIDRA2_RECEIVER_CONFIG_H
-#define HIDRA2_RECEIVER_CONFIG_H
+#ifndef ASAPO_RECEIVER_CONFIG_H
+#define ASAPO_RECEIVER_CONFIG_H
#include "io/io.h"
#include "common/error.h"
#include "logger/logger.h"
-namespace hidra2 {
+namespace asapo {
struct ReceiverConfig {
std::string monitor_db_uri;
@@ -23,4 +23,4 @@ const ReceiverConfig* GetReceiverConfig();
}
-#endif //HIDRA2_RECEIVER_CONFIG_H
+#endif //ASAPO_RECEIVER_CONFIG_H
diff --git a/receiver/src/receiver_config_factory.h b/receiver/src/receiver_config_factory.h
index ea4087e85c6d906d75244f6b76ee9dc4cd77c738..92b8e2859f6c2d67cac861edf5e20d61727cd326 100644
--- a/receiver/src/receiver_config_factory.h
+++ b/receiver/src/receiver_config_factory.h
@@ -1,10 +1,10 @@
-#ifndef HIDRA2_RECEIVER_CONFIG_FACTORY__H
-#define HIDRA2_RECEIVER_CONFIG_FACTORY__H
+#ifndef ASAPO_RECEIVER_CONFIG_FACTORY__H
+#define ASAPO_RECEIVER_CONFIG_FACTORY__H
#include "io/io.h"
#include "common/error.h"
-namespace hidra2 {
+namespace asapo {
class ReceiverConfigFactory {
public:
@@ -17,4 +17,4 @@ class ReceiverConfigFactory {
}
-#endif //HIDRA2_RECEIVER_CONFIG_FACTORY__H
+#endif //ASAPO_RECEIVER_CONFIG_FACTORY__H
diff --git a/receiver/src/receiver_error.h b/receiver/src/receiver_error.h
index 42eb039d8e5720e23a98dfded74973b788233235..a83f2bf090a7ae22b14f0f9dad54e92f9ed49bca 100644
--- a/receiver/src/receiver_error.h
+++ b/receiver/src/receiver_error.h
@@ -1,9 +1,9 @@
-#ifndef HIDRA2_RECEIVER_ERROR_H
-#define HIDRA2_RECEIVER_ERROR_H
+#ifndef ASAPO_RECEIVER_ERROR_H
+#define ASAPO_RECEIVER_ERROR_H
#include "common/error.h"
-namespace hidra2 {
+namespace asapo {
enum class ReceiverErrorType {
kInvalidOpCode,
@@ -59,4 +59,4 @@ auto const kBadRequest = ReceiverErrorTemplate {
};
}
-#endif //HIDRA2_RECEIVER_ERROR_H
+#endif //ASAPO_RECEIVER_ERROR_H
diff --git a/receiver/src/receiver_logger.cpp b/receiver/src/receiver_logger.cpp
index b8b6ff788ca4320927f7fac390e864c4580ab9d5..1f297a68073f4d0863a9be0a1f0f69af149cafcd 100644
--- a/receiver/src/receiver_logger.cpp
+++ b/receiver/src/receiver_logger.cpp
@@ -1,10 +1,10 @@
#include "receiver_logger.h"
-namespace hidra2 {
+namespace asapo {
AbstractLogger* GetDefaultReceiverLogger() {
- static Logger logger = hidra2::CreateDefaultLoggerBin("receiver");
+ static Logger logger = asapo::CreateDefaultLoggerBin("receiver");
return logger.get();
}
diff --git a/receiver/src/receiver_logger.h b/receiver/src/receiver_logger.h
index 9eb7982bb40d21c2e3bf87c8609d2f0a3f453cd8..66e8dd1a6a90f2905da65bc3a0af0d986f444bc7 100644
--- a/receiver/src/receiver_logger.h
+++ b/receiver/src/receiver_logger.h
@@ -1,9 +1,9 @@
-#ifndef HIDRA2_RECEIVER_LOGGER_H
-#define HIDRA2_RECEIVER_LOGGER_H
+#ifndef ASAPO_RECEIVER_LOGGER_H
+#define ASAPO_RECEIVER_LOGGER_H
#include "logger/logger.h"
-namespace hidra2 {
+namespace asapo {
AbstractLogger* GetDefaultReceiverLogger();
@@ -11,4 +11,4 @@ AbstractLogger* GetDefaultReceiverLogger();
}
-#endif //HIDRA2_RECEIVER_LOGGER_H
+#endif //ASAPO_RECEIVER_LOGGER_H
diff --git a/receiver/src/request.cpp b/receiver/src/request.cpp
index 30862496da685bada5aff6ad2e456bc284e9adcb..3db277350cea069989a54cf768931c348a503d72 100644
--- a/receiver/src/request.cpp
+++ b/receiver/src/request.cpp
@@ -2,7 +2,7 @@
#include "io/io_factory.h"
#include "receiver_config.h"
-namespace hidra2 {
+namespace asapo {
Request::Request(const GenericNetworkRequestHeader& header,
SocketDescriptor socket_fd) : io__{GenerateDefaultIO()}, request_header_(header), socket_fd_{socket_fd} {
diff --git a/receiver/src/request.h b/receiver/src/request.h
index 5b297b83d2b5a67290495148bea62051d834e025..a8fca67689ff37590fa52d0a7b6b831e4dffbf80 100644
--- a/receiver/src/request.h
+++ b/receiver/src/request.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_REQUEST_H
-#define HIDRA2_REQUEST_H
+#ifndef ASAPO_REQUEST_H
+#define ASAPO_REQUEST_H
#include "receiver_error.h"
#include "common/networking.h"
@@ -9,7 +9,7 @@
#include "request_handler_db_write.h"
#include "statistics.h"
-namespace hidra2 {
+namespace asapo {
using RequestHandlerList = std::vector<const RequestHandler*>;
@@ -46,5 +46,5 @@ class RequestFactory {
}
-#endif //HIDRA2_REQUEST_H
+#endif //ASAPO_REQUEST_H
diff --git a/receiver/src/request_handler.h b/receiver/src/request_handler.h
index 179171dfe63fb594437c16b5e2801560ad0aca91..b4a0dc1f39724047876847dbcbe5f8cc7e5d8002 100644
--- a/receiver/src/request_handler.h
+++ b/receiver/src/request_handler.h
@@ -1,10 +1,10 @@
-#ifndef HIDRA2_REQUEST_HANDLER_H
-#define HIDRA2_REQUEST_HANDLER_H
+#ifndef ASAPO_REQUEST_HANDLER_H
+#define ASAPO_REQUEST_HANDLER_H
#include "receiver_error.h"
#include "statistics.h"
-namespace hidra2 {
+namespace asapo {
class Request;
@@ -18,4 +18,4 @@ class RequestHandler {
}
-#endif //HIDRA2_REQUEST_HANDLER_H
+#endif //ASAPO_REQUEST_HANDLER_H
diff --git a/receiver/src/request_handler_db_write.cpp b/receiver/src/request_handler_db_write.cpp
index 3b85b3770826690007aac971fd2fdefd8015703c..9461205a9144e785cf7edb07764effedcc2a0f7c 100644
--- a/receiver/src/request_handler_db_write.cpp
+++ b/receiver/src/request_handler_db_write.cpp
@@ -3,7 +3,7 @@
#include "receiver_config.h"
#include "receiver_logger.h"
-namespace hidra2 {
+namespace asapo {
Error RequestHandlerDbWrite::ProcessRequest(const Request& request) const {
if (Error err = ConnectToDbIfNeeded() ) {
diff --git a/receiver/src/request_handler_db_write.h b/receiver/src/request_handler_db_write.h
index 5faf2485222aea52618139b8dfc37826926ff144..8fbd671dcdef29dd62aed51bda16e19657330b39 100644
--- a/receiver/src/request_handler_db_write.h
+++ b/receiver/src/request_handler_db_write.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_REQUEST_HANDLER_DB_WRITE_H
-#define HIDRA2_REQUEST_HANDLER_DB_WRITE_H
+#ifndef ASAPO_REQUEST_HANDLER_DB_WRITE_H
+#define ASAPO_REQUEST_HANDLER_DB_WRITE_H
#include "request_handler.h"
#include "database/database.h"
@@ -7,7 +7,7 @@
#include "io/io.h"
-namespace hidra2 {
+namespace asapo {
class RequestHandlerDbWrite final: public RequestHandler {
public:
@@ -23,4 +23,4 @@ class RequestHandlerDbWrite final: public RequestHandler {
}
-#endif //HIDRA2_REQUEST_HANDLER_DB_WRITE_H
+#endif //ASAPO_REQUEST_HANDLER_DB_WRITE_H
diff --git a/receiver/src/request_handler_file_write.cpp b/receiver/src/request_handler_file_write.cpp
index 83e7a1905bf8def410e430787bd8c2bc2a3c3a1a..f27a62d0336623d2ca476f038d5c11cddab3eb64 100644
--- a/receiver/src/request_handler_file_write.cpp
+++ b/receiver/src/request_handler_file_write.cpp
@@ -3,7 +3,7 @@
#include "request.h"
#include "receiver_logger.h"
-namespace hidra2 {
+namespace asapo {
Error RequestHandlerFileWrite::ProcessRequest(const Request& request) const {
auto fsize = request.GetDataSize();
diff --git a/receiver/src/request_handler_file_write.h b/receiver/src/request_handler_file_write.h
index 99d25b4efa5d3b7e41def81cc13dea520a3e76ca..95756f6881d8d3d17e05bea9ba5ac9923c652bb5 100644
--- a/receiver/src/request_handler_file_write.h
+++ b/receiver/src/request_handler_file_write.h
@@ -1,12 +1,12 @@
-#ifndef HIDRA2_REQUEST_HANDLER_FILE_WRITE_H
-#define HIDRA2_REQUEST_HANDLER_FILE_WRITE_H
+#ifndef ASAPO_REQUEST_HANDLER_FILE_WRITE_H
+#define ASAPO_REQUEST_HANDLER_FILE_WRITE_H
#include "request_handler.h"
#include "logger/logger.h"
#include "io/io.h"
-namespace hidra2 {
+namespace asapo {
const uint64_t kMaxFileSize = uint64_t(1024) * 1024 * 1024 * 2; //2GB
@@ -21,4 +21,4 @@ class RequestHandlerFileWrite final: public RequestHandler {
}
-#endif //HIDRA2_REQUEST_HANDLER_FILE_WRITE_H
+#endif //ASAPO_REQUEST_HANDLER_FILE_WRITE_H
diff --git a/receiver/src/statistics.cpp b/receiver/src/statistics.cpp
index fa806eb46bb702d55c95b4ff690411a8c6b248b8..3f072331578c3ed093eaf37d8c920c3a0f6e3df8 100644
--- a/receiver/src/statistics.cpp
+++ b/receiver/src/statistics.cpp
@@ -4,7 +4,7 @@
using std::chrono::high_resolution_clock;
-namespace hidra2 {
+namespace asapo {
void Statistics::SendIfNeeded() noexcept {
if (GetTotalElapsedMs() > write_interval_) {
diff --git a/receiver/src/statistics.h b/receiver/src/statistics.h
index de374ed981a2dc9236cbeec7ae792770b32b6ffb..1f78754460e7f4fc78be920ca479166706332bba 100644
--- a/receiver/src/statistics.h
+++ b/receiver/src/statistics.h
@@ -1,12 +1,12 @@
-#ifndef HIDRA2_STATISTICS_H
-#define HIDRA2_STATISTICS_H
+#ifndef ASAPO_STATISTICS_H
+#define ASAPO_STATISTICS_H
#include <chrono>
#include <memory>
#include "statistics_sender.h"
-namespace hidra2 {
+namespace asapo {
static const auto kNStatisticEntities = 3;
enum StatisticEntity : int {
@@ -53,4 +53,4 @@ class Statistics {
}
-#endif //HIDRA2_STATISTICS_H
+#endif //ASAPO_STATISTICS_H
diff --git a/receiver/src/statistics_sender.h b/receiver/src/statistics_sender.h
index 2cf12b272a7b70bcfbaebadb493db5a47972cb29..364bb469bfc8a71300b8b04809b7582b336986d9 100644
--- a/receiver/src/statistics_sender.h
+++ b/receiver/src/statistics_sender.h
@@ -1,9 +1,9 @@
-#ifndef HIDRA2_STATISTICS_SENDER_H
-#define HIDRA2_STATISTICS_SENDER_H
+#ifndef ASAPO_STATISTICS_SENDER_H
+#define ASAPO_STATISTICS_SENDER_H
#include <cstdint>
-namespace hidra2 {
+namespace asapo {
struct StatisticsToSend;
@@ -15,4 +15,4 @@ class StatisticsSender {
}
-#endif //HIDRA2_STATISTICS_SENDER_H
+#endif //ASAPO_STATISTICS_SENDER_H
diff --git a/receiver/src/statistics_sender_influx_db.cpp b/receiver/src/statistics_sender_influx_db.cpp
index 3e8530f4aa0d15c3321660a6d30975aa88ad9f26..476729904cefd41cf73702edb6e98e9dfb780ee4 100644
--- a/receiver/src/statistics_sender_influx_db.cpp
+++ b/receiver/src/statistics_sender_influx_db.cpp
@@ -6,7 +6,7 @@
#include "receiver_config.h"
#include "receiver_logger.h"
-namespace hidra2 {
+namespace asapo {
template<typename ... Args>
std::string string_format( const std::string& format, Args ... args ) {
diff --git a/receiver/src/statistics_sender_influx_db.h b/receiver/src/statistics_sender_influx_db.h
index 61cdad751e82c3a1160700924ba824d06205dc26..909dadd56f1095c633997c696584b8973da9677f 100644
--- a/receiver/src/statistics_sender_influx_db.h
+++ b/receiver/src/statistics_sender_influx_db.h
@@ -1,11 +1,11 @@
-#ifndef HIDRA2_STATISTICS_SENDER_INFLUX_DB_H
-#define HIDRA2_STATISTICS_SENDER_INFLUX_DB_H
+#ifndef ASAPO_STATISTICS_SENDER_INFLUX_DB_H
+#define ASAPO_STATISTICS_SENDER_INFLUX_DB_H
#include "http_client/http_client.h"
#include "statistics_sender.h"
#include "logger/logger.h"
-namespace hidra2 {
+namespace asapo {
class StatisticsSenderInfluxDb : public StatisticsSender {
public:
@@ -20,4 +20,4 @@ class StatisticsSenderInfluxDb : public StatisticsSender {
}
-#endif //HIDRA2_STATISTICS_SENDER_INFLUX_DB_H
+#endif //ASAPO_STATISTICS_SENDER_INFLUX_DB_H
diff --git a/receiver/unittests/mock_receiver_config.cpp b/receiver/unittests/mock_receiver_config.cpp
index 14b665d076ab0bfcb8b7be04db38e633a75c11cc..45b0185962979d1c6edf4a4d83c7dd6ad60827d7 100644
--- a/receiver/unittests/mock_receiver_config.cpp
+++ b/receiver/unittests/mock_receiver_config.cpp
@@ -8,7 +8,7 @@
using testing::_;
-namespace hidra2 {
+namespace asapo {
Error SetReceiverConfig (const ReceiverConfig& config) {
MockIO mock_io;
diff --git a/receiver/unittests/mock_receiver_config.h b/receiver/unittests/mock_receiver_config.h
index 9a724668cf0286d448bb9fb0129bd0ee18e1af12..6d856c3b85418ce7fbb57be359c8ebef0a8b4047 100644
--- a/receiver/unittests/mock_receiver_config.h
+++ b/receiver/unittests/mock_receiver_config.h
@@ -1,10 +1,10 @@
-#ifndef HIDRA2_MOCK_RECEIVER_CONFIG_H
-#define HIDRA2_MOCK_RECEIVER_CONFIG_H
+#ifndef ASAPO_MOCK_RECEIVER_CONFIG_H
+#define ASAPO_MOCK_RECEIVER_CONFIG_H
#include "../src/receiver_config.h"
-namespace hidra2 {
+namespace asapo {
Error SetReceiverConfig (const ReceiverConfig& config);
diff --git a/receiver/unittests/mock_statistics.h b/receiver/unittests/mock_statistics.h
index dc4077a72ff9f683a106df5368c1de03da4c4f9c..f639caa0433fb57f23e900c7daafb443494cd998 100644
--- a/receiver/unittests/mock_statistics.h
+++ b/receiver/unittests/mock_statistics.h
@@ -1,14 +1,14 @@
-#ifndef HIDRA2_MOCK_STATISTICS_H
-#define HIDRA2_MOCK_STATISTICS_H
+#ifndef ASAPO_MOCK_STATISTICS_H
+#define ASAPO_MOCK_STATISTICS_H
#include <gtest/gtest.h>
#include <gmock/gmock.h>
#include "../src/statistics.h"
-namespace hidra2 {
+namespace asapo {
-class MockStatistics : public hidra2::Statistics {
+class MockStatistics : public asapo::Statistics {
public:
void SendIfNeeded() noexcept override {
SendIfNeeded_t();
@@ -21,7 +21,7 @@ class MockStatistics : public hidra2::Statistics {
void IncreaseRequestCounter() noexcept override {
IncreaseRequestCounter_t();
}
- void StartTimer(const hidra2::StatisticEntity& entity) noexcept override {
+ void StartTimer(const asapo::StatisticEntity& entity) noexcept override {
StartTimer_t(entity);
}
void IncreaseRequestDataVolume(uint64_t transferred_data_volume) noexcept override {
@@ -38,10 +38,10 @@ class MockStatistics : public hidra2::Statistics {
MOCK_METHOD1(IncreaseRequestDataVolume_t, void (uint64_t
transferred_data_volume));
MOCK_METHOD1(StartTimer_t, void(
- const hidra2::StatisticEntity& entity));
+ const asapo::StatisticEntity& entity));
};
}
-#endif //HIDRA2_MOCK_STATISTICS_H
+#endif //ASAPO_MOCK_STATISTICS_H
diff --git a/receiver/unittests/test_config.cpp b/receiver/unittests/test_config.cpp
index cfcec334baf27cd48aaee83ff5312efbdf08655c..f44fe078932b3df317b5851a8b5ca18d5524e6a8 100644
--- a/receiver/unittests/test_config.cpp
+++ b/receiver/unittests/test_config.cpp
@@ -20,14 +20,14 @@ using ::testing::SaveArg;
using ::testing::SaveArgPointee;
using ::testing::InSequence;
using ::testing::SetArgPointee;
-using ::hidra2::Error;
-using ::hidra2::ErrorInterface;
-using ::hidra2::FileDescriptor;
-using ::hidra2::SocketDescriptor;
-using ::hidra2::MockIO;
+using ::asapo::Error;
+using ::asapo::ErrorInterface;
+using ::asapo::FileDescriptor;
+using ::asapo::SocketDescriptor;
+using ::asapo::MockIO;
-using ::hidra2::ReceiverConfigFactory;
-using hidra2::GetReceiverConfig;
+using ::asapo::ReceiverConfigFactory;
+using asapo::GetReceiverConfig;
namespace {
@@ -37,7 +37,7 @@ class ConfigTests : public Test {
MockIO mock_io;
ReceiverConfigFactory config_factory;
void SetUp() override {
- config_factory.io__ = std::unique_ptr<hidra2::IO> {&mock_io};
+ config_factory.io__ = std::unique_ptr<asapo::IO> {&mock_io};
}
void TearDown() override {
config_factory.io__.release();
@@ -48,7 +48,7 @@ class ConfigTests : public Test {
TEST_F(ConfigTests, ReadSettings) {
- hidra2::ReceiverConfig test_config;
+ asapo::ReceiverConfig test_config;
test_config.listen_port = 4200;
test_config.monitor_db_name = "db_test";
test_config.monitor_db_uri = "localhost:8086";
@@ -56,9 +56,9 @@ TEST_F(ConfigTests, ReadSettings) {
test_config.write_to_db = true;
test_config.broker_db_uri = "localhost:27017";
test_config.broker_db_name = "test";
- test_config.log_level = hidra2::LogLevel::Error;
+ test_config.log_level = asapo::LogLevel::Error;
- auto err = hidra2::SetReceiverConfig(test_config);
+ auto err = asapo::SetReceiverConfig(test_config);
auto config = GetReceiverConfig();
@@ -70,7 +70,7 @@ TEST_F(ConfigTests, ReadSettings) {
ASSERT_THAT(config->listen_port, Eq(4200));
ASSERT_THAT(config->write_to_disk, Eq(true));
ASSERT_THAT(config->write_to_db, Eq(true));
- ASSERT_THAT(config->log_level, Eq(hidra2::LogLevel::Error));
+ ASSERT_THAT(config->log_level, Eq(asapo::LogLevel::Error));
}
diff --git a/receiver/unittests/test_connection.cpp b/receiver/unittests/test_connection.cpp
index d585fa862e9ac0fb200949a3e1527d17a5f12ea9..630ca07b3407af4c23ed07652076b989e0e9ca14 100644
--- a/receiver/unittests/test_connection.cpp
+++ b/receiver/unittests/test_connection.cpp
@@ -26,31 +26,31 @@ using ::testing::HasSubstr;
using ::testing::SetArgPointee;
using ::testing::AllOf;
-using hidra2::Error;
-using hidra2::ErrorInterface;
-using hidra2::FileDescriptor;
-using hidra2::SocketDescriptor;
-using hidra2::GenericNetworkRequestHeader;
-using hidra2::SendDataResponse;
-using hidra2::GenericNetworkRequestHeader;
-using hidra2::GenericNetworkResponse;
-using hidra2::Opcode;
-using hidra2::Connection;
-using hidra2::MockIO;
-using hidra2::MockLogger;
-using hidra2::Request;
-using hidra2::Statistics;
-using hidra2::StatisticEntity;
-using hidra2::MockStatistics;
+using asapo::Error;
+using asapo::ErrorInterface;
+using asapo::FileDescriptor;
+using asapo::SocketDescriptor;
+using asapo::GenericNetworkRequestHeader;
+using asapo::SendDataResponse;
+using asapo::GenericNetworkRequestHeader;
+using asapo::GenericNetworkResponse;
+using asapo::Opcode;
+using asapo::Connection;
+using asapo::MockIO;
+using asapo::MockLogger;
+using asapo::Request;
+using asapo::Statistics;
+using asapo::StatisticEntity;
+using asapo::MockStatistics;
namespace {
TEST(Connection, Constructor) {
Connection connection{0, "some_address"};
- ASSERT_THAT(dynamic_cast<hidra2::Statistics*>(connection.statistics__.get()), Ne(nullptr));
- ASSERT_THAT(dynamic_cast<hidra2::IO*>(connection.io__.get()), Ne(nullptr));
- ASSERT_THAT(dynamic_cast<hidra2::RequestFactory*>(connection.request_factory__.get()), Ne(nullptr));
- ASSERT_THAT(dynamic_cast<const hidra2::AbstractLogger*>(connection.log__), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<asapo::Statistics*>(connection.statistics__.get()), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<asapo::IO*>(connection.io__.get()), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<asapo::RequestFactory*>(connection.request_factory__.get()), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<const asapo::AbstractLogger*>(connection.log__), Ne(nullptr));
}
@@ -65,7 +65,7 @@ class MockRequest: public Request {
};
-class MockRequestFactory: public hidra2::RequestFactory {
+class MockRequestFactory: public asapo::RequestFactory {
public:
std::unique_ptr<Request> GenerateRequest(const GenericNetworkRequestHeader& request_header,
SocketDescriptor socket_fd,
@@ -89,12 +89,12 @@ class ConnectionTests : public Test {
MockIO mock_io;
MockRequestFactory mock_factory;
NiceMock<MockStatistics> mock_statictics;
- NiceMock<hidra2::MockLogger> mock_logger;
+ NiceMock<asapo::MockLogger> mock_logger;
void SetUp() override {
- connection.io__ = std::unique_ptr<hidra2::IO> {&mock_io};
- connection.statistics__ = std::unique_ptr<hidra2::Statistics> {&mock_statictics};
- connection.request_factory__ = std::unique_ptr<hidra2::RequestFactory> {&mock_factory};
+ connection.io__ = std::unique_ptr<asapo::IO> {&mock_io};
+ connection.statistics__ = std::unique_ptr<asapo::Statistics> {&mock_statictics};
+ connection.request_factory__ = std::unique_ptr<asapo::RequestFactory> {&mock_factory};
connection.log__ = &mock_logger;
ON_CALL(mock_io, ReceiveWithTimeout_t(_, _, _, _, _)).
@@ -117,10 +117,10 @@ TEST_F(ConnectionTests, ErrorWaitForNewRequest) {
EXPECT_CALL(mock_io, ReceiveWithTimeout_t(_, _, _, _, _)).Times(2).
WillOnce(
- DoAll(SetArgPointee<4>(new hidra2::IOError("", hidra2::IOErrorType::kTimeout)),
+ DoAll(SetArgPointee<4>(new asapo::IOError("", asapo::IOErrorType::kTimeout)),
Return(0)))
.WillOnce(
- DoAll(SetArgPointee<4>(new hidra2::IOError("", hidra2::IOErrorType::kUnknownIOError)),
+ DoAll(SetArgPointee<4>(new asapo::IOError("", asapo::IOErrorType::kUnknownIOError)),
Return(0))
);
@@ -148,7 +148,7 @@ TEST_F(ConnectionTests, CallsHandleRequest) {
);
EXPECT_CALL(*request, Handle_t()).WillOnce(
- Return(new hidra2::SimpleError{""})
+ Return(new asapo::SimpleError{""})
);
EXPECT_CALL(mock_logger, Debug(AllOf(HasSubstr("processing request"), HasSubstr(connected_uri))));
@@ -158,7 +158,7 @@ TEST_F(ConnectionTests, CallsHandleRequest) {
EXPECT_CALL(mock_io, Send_t(_, _, _, _)).WillOnce(
- DoAll(SetArgPointee<3>(new hidra2::IOError("Test Send Error", hidra2::IOErrorType::kUnknownIOError)),
+ DoAll(SetArgPointee<3>(new asapo::IOError("Test Send Error", asapo::IOErrorType::kUnknownIOError)),
Return(0)
));
@@ -181,19 +181,19 @@ TEST_F(ConnectionTests, SendsErrorToProducer) {
);
EXPECT_CALL(*request, Handle_t()).WillOnce(
- Return(new hidra2::SimpleError{""})
+ Return(new asapo::SimpleError{""})
);
GenericNetworkResponse response;
EXPECT_CALL(mock_io, Send_t(_, _, sizeof(GenericNetworkResponse), _)).WillOnce(
- DoAll(SetArgPointee<3>(new hidra2::IOError("Test Send Error", hidra2::IOErrorType::kUnknownIOError)),
+ DoAll(SetArgPointee<3>(new asapo::IOError("Test Send Error", asapo::IOErrorType::kUnknownIOError)),
SaveArg1ToGenericNetworkResponse(&response),
Return(0)
));
connection.Listen();
- ASSERT_THAT(response.error_code, Eq(hidra2::NetworkErrorCode::kNetErrorInternalServerError));
+ ASSERT_THAT(response.error_code, Eq(asapo::NetworkErrorCode::kNetErrorInternalServerError));
}
@@ -202,7 +202,7 @@ void MockExitCycle(const MockIO& mock_io, MockStatistics& mock_statictics) {
EXPECT_CALL(mock_io, ReceiveWithTimeout_t(_, _, _, _, _))
.WillOnce(
- DoAll(SetArgPointee<4>(new hidra2::IOError("", hidra2::IOErrorType::kUnknownIOError)),
+ DoAll(SetArgPointee<4>(new asapo::IOError("", asapo::IOErrorType::kUnknownIOError)),
Return(0))
);
}
@@ -240,8 +240,8 @@ TEST_F(ConnectionTests, FillsStatistics) {
EXPECT_CALL(mock_statictics, IncreaseRequestCounter_t());
- EXPECT_CALL(mock_statictics, IncreaseRequestDataVolume_t(1 + sizeof(hidra2::GenericNetworkRequestHeader) +
- sizeof(hidra2::GenericNetworkResponse)));
+ EXPECT_CALL(mock_statictics, IncreaseRequestDataVolume_t(1 + sizeof(asapo::GenericNetworkRequestHeader) +
+ sizeof(asapo::GenericNetworkResponse)));
EXPECT_CALL(mock_statictics, SendIfNeeded_t());
diff --git a/receiver/unittests/test_receiver.cpp b/receiver/unittests/test_receiver.cpp
index 707bfaacb7f2e9c7fd9bb34ecde203e581481376..47b42e7464d2b435dacbe7ce253d4596b4ef85a5 100644
--- a/receiver/unittests/test_receiver.cpp
+++ b/receiver/unittests/test_receiver.cpp
@@ -18,38 +18,38 @@ using ::testing::Ne;
using ::testing::Mock;
using ::testing::InSequence;
using ::testing::HasSubstr;
-using ::hidra2::Error;
-using ::hidra2::FileDescriptor;
-using ::hidra2::ErrorInterface;
-using ::hidra2::Connection;
-using ::hidra2::SocketDescriptor;
+using ::asapo::Error;
+using ::asapo::FileDescriptor;
+using ::asapo::ErrorInterface;
+using ::asapo::Connection;
+using ::asapo::SocketDescriptor;
namespace {
TEST(Receiver, Constructor) {
- hidra2::Receiver receiver;
- ASSERT_THAT(dynamic_cast<const hidra2::AbstractLogger*>(receiver.log__), Ne(nullptr));
- ASSERT_THAT(dynamic_cast<hidra2::IO*>(receiver.io__.get()), Ne(nullptr));
+ asapo::Receiver receiver;
+ ASSERT_THAT(dynamic_cast<const asapo::AbstractLogger*>(receiver.log__), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<asapo::IO*>(receiver.io__.get()), Ne(nullptr));
}
class StartListenerFixture : public testing::Test {
public:
- const hidra2::SocketDescriptor expected_socket_descriptor = 20;
- const hidra2::SocketDescriptor expected_socket_descriptor_client = 23;
+ const asapo::SocketDescriptor expected_socket_descriptor = 20;
+ const asapo::SocketDescriptor expected_socket_descriptor_client = 23;
const std::string expected_address = "somehost:13579";
const uint64_t expected_file_id = 314322;
const uint64_t expected_file_size = 784387;
const FileDescriptor expected_fd = 12643;
Error err;
- ::testing::NiceMock<hidra2::MockLogger> mock_logger;
- ::testing::NiceMock<hidra2::MockIO> mock_io;
- hidra2::Receiver receiver;
+ ::testing::NiceMock<asapo::MockLogger> mock_logger;
+ ::testing::NiceMock<asapo::MockIO> mock_io;
+ asapo::Receiver receiver;
void SetUp() override {
err = nullptr;
- receiver.io__ = std::unique_ptr<hidra2::IO> {&mock_io};
+ receiver.io__ = std::unique_ptr<asapo::IO> {&mock_io};
receiver.log__ = &mock_logger;
}
void TearDown() override {
@@ -62,7 +62,7 @@ class StartListenerFixture : public testing::Test {
TEST_F(StartListenerFixture, CreateAndBindIPTCPSocketListenerError) {
EXPECT_CALL(mock_io, CreateAndBindIPTCPSocketListener_t(expected_address, receiver.kMaxUnacceptedConnectionsBacklog, _))
.WillOnce(DoAll(
- SetArgPointee<2>(hidra2::IOErrorTemplates::kUnknownIOError.Generate().release()),
+ SetArgPointee<2>(asapo::IOErrorTemplates::kUnknownIOError.Generate().release()),
Return(0)
));
@@ -71,14 +71,14 @@ TEST_F(StartListenerFixture, CreateAndBindIPTCPSocketListenerError) {
receiver.Listen(expected_address, &err, true);
- ASSERT_THAT(err, Eq(hidra2::IOErrorTemplates::kUnknownIOError));
+ ASSERT_THAT(err, Eq(asapo::IOErrorTemplates::kUnknownIOError));
}
TEST_F(StartListenerFixture, InetAcceptConnectionError) {
EXPECT_CALL(mock_io, InetAcceptConnection_t(_, _))
.WillOnce(DoAll(
- SetArgPointee<1>(hidra2::IOErrorTemplates::kUnknownIOError.Generate().release()),
+ SetArgPointee<1>(asapo::IOErrorTemplates::kUnknownIOError.Generate().release()),
Return(new std::tuple<std::string, SocketDescriptor>(expected_address, expected_socket_descriptor_client))
));
@@ -86,7 +86,7 @@ TEST_F(StartListenerFixture, InetAcceptConnectionError) {
receiver.Listen(expected_address, &err, true);
- ASSERT_THAT(err, Eq(hidra2::IOErrorTemplates::kUnknownIOError));
+ ASSERT_THAT(err, Eq(asapo::IOErrorTemplates::kUnknownIOError));
}
TEST_F(StartListenerFixture, Ok) {
diff --git a/receiver/unittests/test_request.cpp b/receiver/unittests/test_request.cpp
index 9a213b69bf16a9be2d3ab81055e220105191d574..a22fec1ed520b2b4d15c616616b47e78deb7589e 100644
--- a/receiver/unittests/test_request.cpp
+++ b/receiver/unittests/test_request.cpp
@@ -24,29 +24,29 @@ using ::testing::Mock;
using ::testing::NiceMock;
using ::testing::InSequence;
using ::testing::SetArgPointee;
-using ::hidra2::Error;
-using ::hidra2::ErrorInterface;
-using ::hidra2::FileDescriptor;
-using ::hidra2::SocketDescriptor;
-using ::hidra2::GenericNetworkRequestHeader;
-using ::hidra2::SendDataResponse;
-using ::hidra2::GenericNetworkRequestHeader;
-using ::hidra2::GenericNetworkResponse;
-using ::hidra2::Opcode;
-using ::hidra2::Connection;
-using ::hidra2::MockIO;
-using hidra2::Request;
-using hidra2::MockStatistics;
-
-using hidra2::StatisticEntity;
-
-using hidra2::ReceiverConfig;
-using hidra2::SetReceiverConfig;
-using hidra2::RequestFactory;
+using ::asapo::Error;
+using ::asapo::ErrorInterface;
+using ::asapo::FileDescriptor;
+using ::asapo::SocketDescriptor;
+using ::asapo::GenericNetworkRequestHeader;
+using ::asapo::SendDataResponse;
+using ::asapo::GenericNetworkRequestHeader;
+using ::asapo::GenericNetworkResponse;
+using ::asapo::Opcode;
+using ::asapo::Connection;
+using ::asapo::MockIO;
+using asapo::Request;
+using asapo::MockStatistics;
+
+using asapo::StatisticEntity;
+
+using asapo::ReceiverConfig;
+using asapo::SetReceiverConfig;
+using asapo::RequestFactory;
namespace {
-class MockReqestHandler : public hidra2::RequestHandler {
+class MockReqestHandler : public asapo::RequestHandler {
public:
Error ProcessRequest(const Request& request) const override {
return Error{ProcessRequest_t(request)};
@@ -64,19 +64,19 @@ class MockReqestHandler : public hidra2::RequestHandler {
class RequestTests : public Test {
public:
GenericNetworkRequestHeader generic_request_header;
- hidra2::SocketDescriptor socket_fd_{1};
+ asapo::SocketDescriptor socket_fd_{1};
uint64_t data_size_ {100};
uint64_t data_id_{15};
std::unique_ptr<Request> request;
NiceMock<MockIO> mock_io;
NiceMock<MockStatistics> mock_statistics;
- std::unique_ptr<hidra2::Statistics> stat;
+ std::unique_ptr<asapo::Statistics> stat;
void SetUp() override {
- stat = std::unique_ptr<hidra2::Statistics> {&mock_statistics};
+ stat = std::unique_ptr<asapo::Statistics> {&mock_statistics};
generic_request_header.data_size = data_size_;
generic_request_header.data_id = data_id_;
request.reset(new Request{generic_request_header, socket_fd_});
- request->io__ = std::unique_ptr<hidra2::IO> {&mock_io};
+ request->io__ = std::unique_ptr<asapo::IO> {&mock_io};
ON_CALL(mock_io, Receive_t(socket_fd_, _, data_size_, _)).WillByDefault(
DoAll(SetArgPointee<3>(nullptr),
Return(0)
@@ -93,7 +93,7 @@ TEST_F(RequestTests, HandleDoesNotReceiveEmptyData) {
generic_request_header.data_size = 0;
request->io__.release();
request.reset(new Request{generic_request_header, socket_fd_});
- request->io__ = std::unique_ptr<hidra2::IO> {&mock_io};;
+ request->io__ = std::unique_ptr<asapo::IO> {&mock_io};;
EXPECT_CALL(mock_io, Receive_t(_, _, _, _)).Times(0);
@@ -104,19 +104,19 @@ TEST_F(RequestTests, HandleDoesNotReceiveEmptyData) {
TEST_F(RequestTests, HandleReturnsErrorOnDataReceive) {
EXPECT_CALL(mock_io, Receive_t(socket_fd_, _, data_size_, _)).WillOnce(
- DoAll(SetArgPointee<3>(new hidra2::IOError("Test Read Error", hidra2::IOErrorType::kReadError)),
+ DoAll(SetArgPointee<3>(new asapo::IOError("Test Read Error", asapo::IOErrorType::kReadError)),
Return(0)
));
auto err = request->Handle(&stat);
- ASSERT_THAT(err, Eq(hidra2::IOErrorTemplates::kReadError));
+ ASSERT_THAT(err, Eq(asapo::IOErrorTemplates::kReadError));
}
TEST_F(RequestTests, HandleMeasuresTimeOnDataReceive) {
- EXPECT_CALL(mock_statistics, StartTimer_t(hidra2::StatisticEntity::kNetwork));
+ EXPECT_CALL(mock_statistics, StartTimer_t(asapo::StatisticEntity::kNetwork));
EXPECT_CALL(mock_io, Receive_t(socket_fd_, _, data_size_, _)).WillOnce(
DoAll(SetArgPointee<3>(nullptr),
@@ -135,25 +135,25 @@ TEST_F(RequestTests, HandleProcessesRequests) {
MockReqestHandler mock_request_handler;
- EXPECT_CALL(mock_statistics, StartTimer_t(hidra2::StatisticEntity::kNetwork));
+ EXPECT_CALL(mock_statistics, StartTimer_t(asapo::StatisticEntity::kNetwork));
EXPECT_CALL(mock_request_handler, ProcessRequest_t(_)).WillOnce(
Return(nullptr)
).WillOnce(
- Return(new hidra2::IOError("Test Send Error", hidra2::IOErrorType::kUnknownIOError))
+ Return(new asapo::IOError("Test Send Error", asapo::IOErrorType::kUnknownIOError))
);;
request->AddHandler(&mock_request_handler);
request->AddHandler(&mock_request_handler);
- EXPECT_CALL(mock_statistics, StartTimer_t(hidra2::StatisticEntity::kDisk)).Times(2);
+ EXPECT_CALL(mock_statistics, StartTimer_t(asapo::StatisticEntity::kDisk)).Times(2);
EXPECT_CALL(mock_statistics, StopTimer_t()).Times(2);
auto err = request->Handle(&stat);
- ASSERT_THAT(err, Eq(hidra2::IOErrorTemplates::kUnknownIOError));
+ ASSERT_THAT(err, Eq(asapo::IOErrorTemplates::kUnknownIOError));
}
TEST_F(RequestTests, DataIsNullAtInit) {
diff --git a/receiver/unittests/test_request_factory.cpp b/receiver/unittests/test_request_factory.cpp
index ec8b93855ee7104b04ed8b526f282b2806f7deb5..5b2bc53bd919ec110287d36d13998784adea5f12 100644
--- a/receiver/unittests/test_request_factory.cpp
+++ b/receiver/unittests/test_request_factory.cpp
@@ -27,21 +27,21 @@ using ::testing::Mock;
using ::testing::NiceMock;
using ::testing::InSequence;
using ::testing::SetArgPointee;
-using ::hidra2::Error;
-using ::hidra2::ErrorInterface;
-using ::hidra2::GenericNetworkRequestHeader;
-using ::hidra2::GenericNetworkResponse;
-using ::hidra2::Opcode;
-using ::hidra2::Connection;
-using ::hidra2::MockIO;
-using hidra2::Request;
-using hidra2::MockStatistics;
-
-using hidra2::StatisticEntity;
-
-using hidra2::ReceiverConfig;
-using hidra2::SetReceiverConfig;
-using hidra2::RequestFactory;
+using ::asapo::Error;
+using ::asapo::ErrorInterface;
+using ::asapo::GenericNetworkRequestHeader;
+using ::asapo::GenericNetworkResponse;
+using ::asapo::Opcode;
+using ::asapo::Connection;
+using ::asapo::MockIO;
+using asapo::Request;
+using asapo::MockStatistics;
+
+using asapo::StatisticEntity;
+
+using asapo::ReceiverConfig;
+using asapo::SetReceiverConfig;
+using asapo::RequestFactory;
namespace {
@@ -54,7 +54,7 @@ class FactoryTests : public Test {
ReceiverConfig config;
void SetUp() override {
- generic_request_header.op_code = hidra2::Opcode::kNetOpcodeSendData;
+ generic_request_header.op_code = asapo::Opcode::kNetOpcodeSendData;
config.write_to_disk = true;
config.write_to_db = true;
SetReceiverConfig(config);
@@ -64,20 +64,20 @@ class FactoryTests : public Test {
};
TEST_F(FactoryTests, ErrorOnWrongCode) {
- generic_request_header.op_code = hidra2::Opcode::kNetOpcodeUnknownOp;
+ generic_request_header.op_code = asapo::Opcode::kNetOpcodeUnknownOp;
auto request = factory.GenerateRequest(generic_request_header, 1, &err);
ASSERT_THAT(err, Ne(nullptr));
}
TEST_F(FactoryTests, ReturnsDataRequestOnkNetOpcodeSendDataCode) {
- generic_request_header.op_code = hidra2::Opcode::kNetOpcodeSendData;
+ generic_request_header.op_code = asapo::Opcode::kNetOpcodeSendData;
auto request = factory.GenerateRequest(generic_request_header, 1, &err);
ASSERT_THAT(err, Eq(nullptr));
- ASSERT_THAT(dynamic_cast<hidra2::Request*>(request.get()), Ne(nullptr));
- ASSERT_THAT(dynamic_cast<const hidra2::RequestHandlerFileWrite*>(request->GetListHandlers()[0]), Ne(nullptr));
- ASSERT_THAT(dynamic_cast<const hidra2::RequestHandlerDbWrite*>(request->GetListHandlers().back()), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<asapo::Request*>(request.get()), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<const asapo::RequestHandlerFileWrite*>(request->GetListHandlers()[0]), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<const asapo::RequestHandlerDbWrite*>(request->GetListHandlers().back()), Ne(nullptr));
}
TEST_F(FactoryTests, DoNotAddDiskWriterIfNotWanted) {
@@ -88,7 +88,7 @@ TEST_F(FactoryTests, DoNotAddDiskWriterIfNotWanted) {
auto request = factory.GenerateRequest(generic_request_header, 1, &err);
ASSERT_THAT(err, Eq(nullptr));
ASSERT_THAT(request->GetListHandlers().size(), Eq(1));
- ASSERT_THAT(dynamic_cast<const hidra2::RequestHandlerDbWrite*>(request->GetListHandlers().back()), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<const asapo::RequestHandlerDbWrite*>(request->GetListHandlers().back()), Ne(nullptr));
}
TEST_F(FactoryTests, DoNotAddDbWriterIfNotWanted) {
@@ -99,7 +99,7 @@ TEST_F(FactoryTests, DoNotAddDbWriterIfNotWanted) {
auto request = factory.GenerateRequest(generic_request_header, 1, &err);
ASSERT_THAT(err, Eq(nullptr));
ASSERT_THAT(request->GetListHandlers().size(), Eq(1));
- ASSERT_THAT(dynamic_cast<const hidra2::RequestHandlerFileWrite*>(request->GetListHandlers()[0]), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<const asapo::RequestHandlerFileWrite*>(request->GetListHandlers()[0]), Ne(nullptr));
}
diff --git a/receiver/unittests/test_request_handler_db_writer.cpp b/receiver/unittests/test_request_handler_db_writer.cpp
index fe17995228afcb438768df7e2cecf6d13b06c39e..c4fce648c7e8fc5d185911fbc8e65bf6b6303d39 100644
--- a/receiver/unittests/test_request_handler_db_writer.cpp
+++ b/receiver/unittests/test_request_handler_db_writer.cpp
@@ -15,7 +15,7 @@
#include "common/data_structs.h"
-using hidra2::FileInfo;
+using asapo::FileInfo;
using ::testing::Test;
using ::testing::Return;
using ::testing::ReturnRef;
@@ -33,19 +33,19 @@ using ::testing::AllOf;
using ::testing::HasSubstr;
-using ::hidra2::Error;
-using ::hidra2::ErrorInterface;
-using ::hidra2::FileDescriptor;
-using ::hidra2::SocketDescriptor;
-using ::hidra2::MockIO;
-using hidra2::Request;
-using hidra2::RequestHandlerDbWrite;
-using ::hidra2::GenericNetworkRequestHeader;
+using ::asapo::Error;
+using ::asapo::ErrorInterface;
+using ::asapo::FileDescriptor;
+using ::asapo::SocketDescriptor;
+using ::asapo::MockIO;
+using asapo::Request;
+using asapo::RequestHandlerDbWrite;
+using ::asapo::GenericNetworkRequestHeader;
-using hidra2::MockDatabase;
-using hidra2::RequestFactory;
-using hidra2::SetReceiverConfig;
-using hidra2::ReceiverConfig;
+using asapo::MockDatabase;
+using asapo::RequestFactory;
+using asapo::SetReceiverConfig;
+using asapo::ReceiverConfig;
namespace {
@@ -58,7 +58,7 @@ class MockRequest: public Request {
MOCK_CONST_METHOD0(GetFileName, std::string());
MOCK_CONST_METHOD0(GetDataSize, uint64_t());
MOCK_CONST_METHOD0(GetDataID, uint64_t());
- MOCK_CONST_METHOD0(GetData, const hidra2::FileData & ());
+ MOCK_CONST_METHOD0(GetData, const asapo::FileData & ());
};
class DbWriterHandlerTests : public Test {
@@ -67,12 +67,12 @@ class DbWriterHandlerTests : public Test {
NiceMock<MockIO> mock_io;
std::unique_ptr<NiceMock<MockRequest>> mock_request;
NiceMock<MockDatabase> mock_db;
- NiceMock<hidra2::MockLogger> mock_logger;
+ NiceMock<asapo::MockLogger> mock_logger;
ReceiverConfig config;
void SetUp() override {
GenericNetworkRequestHeader request_header;
request_header.data_id = 2;
- handler.db_client__ = std::unique_ptr<hidra2::Database> {&mock_db};
+ handler.db_client__ = std::unique_ptr<asapo::Database> {&mock_db};
handler.log__ = &mock_logger;
mock_request.reset(new NiceMock<MockRequest> {request_header, 1});
}
@@ -83,15 +83,15 @@ class DbWriterHandlerTests : public Test {
TEST(DBWritewr, Constructor) {
RequestHandlerDbWrite handler;
- ASSERT_THAT(dynamic_cast<hidra2::MongoDBClient*>(handler.db_client__.get()), Ne(nullptr));
- ASSERT_THAT(dynamic_cast<const hidra2::AbstractLogger*>(handler.log__), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<asapo::MongoDBClient*>(handler.db_client__.get()), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<const asapo::AbstractLogger*>(handler.log__), Ne(nullptr));
}
TEST_F(DbWriterHandlerTests, CheckStatisticEntity) {
auto entity = handler.GetStatisticEntity();
- ASSERT_THAT(entity, Eq(hidra2::StatisticEntity::kDatabase));
+ ASSERT_THAT(entity, Eq(asapo::StatisticEntity::kDatabase));
}
@@ -100,7 +100,7 @@ TEST_F(DbWriterHandlerTests, ProcessRequestCallsConnectDbWhenNotConnected) {
config.broker_db_uri = "127.0.0.1:27017";
SetReceiverConfig(config);
- EXPECT_CALL(mock_db, Connect_t("127.0.0.1:27017", "test", hidra2::kDBCollectionName)).
+ EXPECT_CALL(mock_db, Connect_t("127.0.0.1:27017", "test", asapo::kDBCollectionName)).
WillOnce(testing::Return(nullptr));
auto err = handler.ProcessRequest(*mock_request);
@@ -109,8 +109,8 @@ TEST_F(DbWriterHandlerTests, ProcessRequestCallsConnectDbWhenNotConnected) {
TEST_F(DbWriterHandlerTests, ProcessRequestReturnsErrorWhenCannotConnect) {
- EXPECT_CALL(mock_db, Connect_t(_, _, hidra2::kDBCollectionName)).
- WillOnce(testing::Return(new hidra2::SimpleError("")));
+ EXPECT_CALL(mock_db, Connect_t(_, _, asapo::kDBCollectionName)).
+ WillOnce(testing::Return(new asapo::SimpleError("")));
auto err = handler.ProcessRequest(*mock_request);
@@ -121,7 +121,7 @@ TEST_F(DbWriterHandlerTests, ProcessRequestReturnsErrorWhenCannotConnect) {
TEST_F(DbWriterHandlerTests, ProcessRequestDoesNotCallConnectSecondTime) {
- EXPECT_CALL(mock_db, Connect_t(_, _, hidra2::kDBCollectionName)).
+ EXPECT_CALL(mock_db, Connect_t(_, _, asapo::kDBCollectionName)).
WillOnce(testing::Return(nullptr));
handler.ProcessRequest(*mock_request);
@@ -143,7 +143,7 @@ TEST_F(DbWriterHandlerTests, CallsInsert) {
config.broker_db_uri = "127.0.0.1:27017";
SetReceiverConfig(config);
- EXPECT_CALL(mock_db, Connect_t(config.broker_db_uri, config.broker_db_name, hidra2::kDBCollectionName)).
+ EXPECT_CALL(mock_db, Connect_t(config.broker_db_uri, config.broker_db_name, asapo::kDBCollectionName)).
WillOnce(testing::Return(nullptr));
std::string expected_file_name = "2.bin";
@@ -173,7 +173,7 @@ TEST_F(DbWriterHandlerTests, CallsInsert) {
EXPECT_CALL(mock_logger, Debug(AllOf(HasSubstr("insert record"),
HasSubstr(config.broker_db_uri),
HasSubstr(config.broker_db_name),
- HasSubstr(hidra2::kDBCollectionName)
+ HasSubstr(asapo::kDBCollectionName)
)
)
);
diff --git a/receiver/unittests/test_request_handler_file_write.cpp b/receiver/unittests/test_request_handler_file_write.cpp
index 41ee22dcfb760c32e39fe1f5db1f1e844bdd73f6..f9747ffeee3169a3fe25cda45e68feaa4b3e29dc 100644
--- a/receiver/unittests/test_request_handler_file_write.cpp
+++ b/receiver/unittests/test_request_handler_file_write.cpp
@@ -28,21 +28,21 @@ using ::testing::AllOf;
using ::testing::HasSubstr;
-using ::hidra2::Error;
-using ::hidra2::ErrorInterface;
-using ::hidra2::FileDescriptor;
-using ::hidra2::SocketDescriptor;
-using ::hidra2::MockIO;
-using hidra2::Request;
-using hidra2::RequestHandlerFileWrite;
-using ::hidra2::GenericNetworkRequestHeader;
+using ::asapo::Error;
+using ::asapo::ErrorInterface;
+using ::asapo::FileDescriptor;
+using ::asapo::SocketDescriptor;
+using ::asapo::MockIO;
+using asapo::Request;
+using asapo::RequestHandlerFileWrite;
+using ::asapo::GenericNetworkRequestHeader;
namespace {
TEST(FileWrite, Constructor) {
RequestHandlerFileWrite handler;
- ASSERT_THAT(dynamic_cast<hidra2::IO*>(handler.io__.get()), Ne(nullptr));
- ASSERT_THAT(dynamic_cast<const hidra2::AbstractLogger*>(handler.log__), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<asapo::IO*>(handler.io__.get()), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<const asapo::AbstractLogger*>(handler.log__), Ne(nullptr));
}
@@ -53,7 +53,7 @@ class MockRequest: public Request {
MOCK_CONST_METHOD0(GetFileName, std::string());
MOCK_CONST_METHOD0(GetDataSize, uint64_t());
- MOCK_CONST_METHOD0(GetData, const hidra2::FileData & ());
+ MOCK_CONST_METHOD0(GetData, const asapo::FileData & ());
};
class FileWriteHandlerTests : public Test {
@@ -61,7 +61,7 @@ class FileWriteHandlerTests : public Test {
RequestHandlerFileWrite handler;
NiceMock<MockIO> mock_io;
std::unique_ptr<MockRequest> mock_request;
- NiceMock<hidra2::MockLogger> mock_logger;
+ NiceMock<asapo::MockLogger> mock_logger;
std::string expected_file_name = "2.bin";
uint64_t expected_file_size = 10;
void MockRequestData();
@@ -69,7 +69,7 @@ class FileWriteHandlerTests : public Test {
GenericNetworkRequestHeader request_header;
request_header.data_id = 2;
mock_request.reset(new MockRequest{request_header, 1});
- handler.io__ = std::unique_ptr<hidra2::IO> {&mock_io};
+ handler.io__ = std::unique_ptr<asapo::IO> {&mock_io};
handler.log__ = &mock_logger;
}
void TearDown() override {
@@ -80,7 +80,7 @@ class FileWriteHandlerTests : public Test {
TEST_F(FileWriteHandlerTests, CheckStatisticEntity) {
auto entity = handler.GetStatisticEntity();
- ASSERT_THAT(entity, Eq(hidra2::StatisticEntity::kDisk));
+ ASSERT_THAT(entity, Eq(asapo::StatisticEntity::kDisk));
}
@@ -91,17 +91,17 @@ TEST_F(FileWriteHandlerTests, ErrorWhenZeroFileSize) {
auto err = handler.ProcessRequest(*mock_request);
- ASSERT_THAT(err, Eq(hidra2::ReceiverErrorTemplates::kBadRequest));
+ ASSERT_THAT(err, Eq(asapo::ReceiverErrorTemplates::kBadRequest));
}
TEST_F(FileWriteHandlerTests, ErrorWhenTooBigFileSize) {
EXPECT_CALL(*mock_request, GetDataSize())
- .WillOnce(Return(hidra2::kMaxFileSize + 1))
+ .WillOnce(Return(asapo::kMaxFileSize + 1))
;
auto err = handler.ProcessRequest(*mock_request);
- ASSERT_THAT(err, Eq(hidra2::ReceiverErrorTemplates::kBadRequest));
+ ASSERT_THAT(err, Eq(asapo::ReceiverErrorTemplates::kBadRequest));
}
void FileWriteHandlerTests::MockRequestData() {
@@ -109,7 +109,7 @@ void FileWriteHandlerTests::MockRequestData() {
.WillOnce(Return(expected_file_size))
;
- hidra2::FileData data;
+ asapo::FileData data;
EXPECT_CALL(*mock_request, GetData())
.WillOnce(ReturnRef(data))
;
@@ -125,12 +125,12 @@ TEST_F(FileWriteHandlerTests, CallsWriteFile) {
EXPECT_CALL(mock_io, WriteDataToFile_t("files/" + expected_file_name, _, expected_file_size))
.WillOnce(
- Return(hidra2::IOErrorTemplates::kUnknownIOError.Generate().release())
+ Return(asapo::IOErrorTemplates::kUnknownIOError.Generate().release())
);
auto err = handler.ProcessRequest(*mock_request);
- ASSERT_THAT(err, Eq(hidra2::IOErrorTemplates::kUnknownIOError));
+ ASSERT_THAT(err, Eq(asapo::IOErrorTemplates::kUnknownIOError));
}
diff --git a/receiver/unittests/test_statistics.cpp b/receiver/unittests/test_statistics.cpp
index 13115b7b7eb2b9d47f1ab9b5524453ebf18f42d3..01959339eef6dc832e477f1bf9afb65db4e21b21 100644
--- a/receiver/unittests/test_statistics.cpp
+++ b/receiver/unittests/test_statistics.cpp
@@ -15,11 +15,11 @@ using ::testing::Ne;
using ::testing::Ref;
using ::testing::_;
-using hidra2::Statistics;
-using hidra2::StatisticEntity;
-using hidra2::StatisticsSender;
-using hidra2::StatisticsSenderInfluxDb;
-using hidra2::StatisticsToSend;
+using asapo::Statistics;
+using asapo::StatisticEntity;
+using asapo::StatisticsSender;
+using asapo::StatisticsSenderInfluxDb;
+using asapo::StatisticsToSend;
@@ -28,7 +28,7 @@ namespace {
TEST(StatisticTestsConstructor, Constructor) {
Statistics statistics;
- ASSERT_THAT(dynamic_cast<hidra2::StatisticsSenderInfluxDb*>(statistics.statistics_sender__.get()), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<asapo::StatisticsSenderInfluxDb*>(statistics.statistics_sender__.get()), Ne(nullptr));
}
@@ -60,7 +60,7 @@ ACTION_P(SaveArg1ToSendStat, value) {
value->n_requests = resp.n_requests;
value->data_volume = resp.data_volume;
value->elapsed_ms = resp.elapsed_ms;
- for (int i = 0; i < hidra2::kNStatisticEntities; i++) {
+ for (int i = 0; i < asapo::kNStatisticEntities; i++) {
value->entity_shares[i] = resp.entity_shares[i];
}
@@ -73,7 +73,7 @@ StatisticsToSend StatisticTests::ExtractStat() {
stat.elapsed_ms = 0;
stat.n_requests = 0;
stat.data_volume = 0;
- for (int i = 0; i < hidra2::kNStatisticEntities; i++) {
+ for (int i = 0; i < asapo::kNStatisticEntities; i++) {
stat.entity_shares[i] = 0.0;
}
@@ -196,7 +196,7 @@ TEST_F(StatisticTests, StatisticsSend) {
stat.elapsed_ms = 0;
stat.n_requests = 0;
stat.data_volume = 0;
- for (int i = 0; i < hidra2::kNStatisticEntities; i++) {
+ for (int i = 0; i < asapo::kNStatisticEntities; i++) {
stat.entity_shares[i] = 0.0;
}
diff --git a/receiver/unittests/test_statistics_sender_influx_db.cpp b/receiver/unittests/test_statistics_sender_influx_db.cpp
index 9041947450528c9f67520e5df3533e115dc581a1..6408099ceb964e362f4c9d9c8d3f7db029d0a8ca 100644
--- a/receiver/unittests/test_statistics_sender_influx_db.cpp
+++ b/receiver/unittests/test_statistics_sender_influx_db.cpp
@@ -31,18 +31,18 @@ using ::testing::SaveArgPointee;
using ::testing::InSequence;
using ::testing::SetArgPointee;
-using hidra2::StatisticsSenderInfluxDb;
-using hidra2::MockHttpClient;
-using hidra2::StatisticsToSend;
-using hidra2::ReceiverConfig;
-using hidra2::SetReceiverConfig;
+using asapo::StatisticsSenderInfluxDb;
+using asapo::MockHttpClient;
+using asapo::StatisticsToSend;
+using asapo::ReceiverConfig;
+using asapo::SetReceiverConfig;
namespace {
TEST(SenderInfluxDb, Constructor) {
StatisticsSenderInfluxDb sender;
- ASSERT_THAT(dynamic_cast<hidra2::CurlHttpClient*>(sender.httpclient__.get()), Ne(nullptr));
- ASSERT_THAT(dynamic_cast<const hidra2::AbstractLogger*>(sender.log__), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<asapo::CurlHttpClient*>(sender.httpclient__.get()), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<const asapo::AbstractLogger*>(sender.log__), Ne(nullptr));
}
@@ -50,15 +50,15 @@ class SenderInfluxDbTests : public Test {
public:
StatisticsSenderInfluxDb sender;
MockHttpClient mock_http_client;
- NiceMock<hidra2::MockLogger> mock_logger;
+ NiceMock<asapo::MockLogger> mock_logger;
StatisticsToSend statistics;
ReceiverConfig config;
void SetUp() override {
statistics.n_requests = 4;
- statistics.entity_shares[hidra2::StatisticEntity::kDisk] = 0.6;
- statistics.entity_shares[hidra2::StatisticEntity::kNetwork] = 0.3;
- statistics.entity_shares[hidra2::StatisticEntity::kDatabase] = 0.1;
+ statistics.entity_shares[asapo::StatisticEntity::kDisk] = 0.6;
+ statistics.entity_shares[asapo::StatisticEntity::kNetwork] = 0.3;
+ statistics.entity_shares[asapo::StatisticEntity::kDatabase] = 0.1;
statistics.elapsed_ms = 100;
statistics.data_volume = 1000;
@@ -80,7 +80,7 @@ TEST_F(SenderInfluxDbTests, SendStatisticsCallsPost) {
"n_requests=4,db_share=0.1000,network_share=0.3000,disk_share=0.6000";
EXPECT_CALL(mock_http_client, Post_t("test_uri/write?db=test_name", expect_string, _, _)).
WillOnce(
- DoAll(SetArgPointee<3>(new hidra2::IOError("Test Read Error", hidra2::IOErrorType::kReadError)),
+ DoAll(SetArgPointee<3>(new asapo::IOError("Test Read Error", asapo::IOErrorType::kReadError)),
Return("")
));
@@ -93,7 +93,7 @@ TEST_F(SenderInfluxDbTests, SendStatisticsCallsPost) {
TEST_F(SenderInfluxDbTests, LogErrorWithWrongResponceSendStatistics) {
EXPECT_CALL(mock_http_client, Post_t(_, _, _, _)).
WillOnce(
- DoAll(SetArgPointee<2>(hidra2::HttpCode::BadRequest), SetArgPointee<3>(nullptr), Return("error response")
+ DoAll(SetArgPointee<2>(asapo::HttpCode::BadRequest), SetArgPointee<3>(nullptr), Return("error response")
));
EXPECT_CALL(mock_logger, Error(AllOf(HasSubstr("sending statistics"), HasSubstr("error response"))));
@@ -105,7 +105,7 @@ TEST_F(SenderInfluxDbTests, LogErrorWithWrongResponceSendStatistics) {
TEST_F(SenderInfluxDbTests, LogDebugSendStatistics) {
EXPECT_CALL(mock_http_client, Post_t(_, _, _, _)).
WillOnce(
- DoAll(SetArgPointee<3>(nullptr), SetArgPointee<2>(hidra2::HttpCode::OK), Return("error response")
+ DoAll(SetArgPointee<3>(nullptr), SetArgPointee<2>(asapo::HttpCode::OK), Return("error response")
));
EXPECT_CALL(mock_logger, Debug(AllOf(HasSubstr("sending statistics"),
diff --git a/tests/automatic/broker/check_monitoring/CMakeLists.txt b/tests/automatic/broker/check_monitoring/CMakeLists.txt
index 19c68e39b9dc264e6ef541df207ad418a27af8f7..03487791a2e087c07daac36f97aa6d8752084cfd 100644
--- a/tests/automatic/broker/check_monitoring/CMakeLists.txt
+++ b/tests/automatic/broker/check_monitoring/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(TARGET_NAME hidra2-broker)
+set(TARGET_NAME asapo-broker)
################################
# Testing
diff --git a/tests/automatic/broker/get_next/CMakeLists.txt b/tests/automatic/broker/get_next/CMakeLists.txt
index 8b5f3b6f02b77436f882d1aecebf94026cc8222a..2f661335f06a60ccc400fe0dba03cc9bb2fd5b52 100644
--- a/tests/automatic/broker/get_next/CMakeLists.txt
+++ b/tests/automatic/broker/get_next/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(TARGET_NAME hidra2-broker)
+set(TARGET_NAME asapo-broker)
################################
# Testing
diff --git a/tests/automatic/broker/read_config/CMakeLists.txt b/tests/automatic/broker/read_config/CMakeLists.txt
index 76f6467cfd21c94965a03b39d446a95e53d2ac4c..75c1658dd770ecd4950e8f87f35ef49c3bf5bf19 100644
--- a/tests/automatic/broker/read_config/CMakeLists.txt
+++ b/tests/automatic/broker/read_config/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(TARGET_NAME hidra2-broker)
+set(TARGET_NAME asapo-broker)
################################
# Testing
diff --git a/tests/automatic/common/cpp/CMakeLists.txt b/tests/automatic/common/cpp/CMakeLists.txt
index 520d0153db6a34e18e9aeaf68448af3dfe6c0b5e..e01bd7c0969c093174eed27a254e0cda628a7b40 100644
--- a/tests/automatic/common/cpp/CMakeLists.txt
+++ b/tests/automatic/common/cpp/CMakeLists.txt
@@ -10,5 +10,5 @@ target_include_directories(${TARGET_NAME} PUBLIC include)
set_target_properties(${TARGET_NAME} PROPERTIES LINKER_LANGUAGE CXX)
#Add all necessary common libraries
-GET_PROPERTY(HIDRA2_COMMON_IO_LIBRARIES GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES)
-target_link_libraries(${TARGET_NAME} ${HIDRA2_COMMON_IO_LIBRARIES})
+GET_PROPERTY(ASAPO_COMMON_IO_LIBRARIES GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES)
+target_link_libraries(${TARGET_NAME} ${ASAPO_COMMON_IO_LIBRARIES})
diff --git a/tests/automatic/common/cpp/include/testing.h b/tests/automatic/common/cpp/include/testing.h
index ce505d1099a3eb89f322514019a9c29279685a2c..55c6ffe32aaf44528646877975202e8834ce9158 100644
--- a/tests/automatic/common/cpp/include/testing.h
+++ b/tests/automatic/common/cpp/include/testing.h
@@ -1,9 +1,9 @@
-#ifndef HIDRA2_TESTING_H
-#define HIDRA2_TESTING_H
+#ifndef ASAPO_TESTING_H
+#define ASAPO_TESTING_H
#include <string>
-namespace hidra2 {
+namespace asapo {
void M_AssertEq(const std::string& expected, const std::string& got);
void M_AssertEq(int expected, int got);
@@ -13,4 +13,4 @@ void M_AssertContains(const std::string& whole, const std::string& sub);
}
-#endif //HIDRA2_TESTING_H
+#endif //ASAPO_TESTING_H
diff --git a/tests/automatic/common/cpp/src/testing.cpp b/tests/automatic/common/cpp/src/testing.cpp
index 3d1a8e7e566c088cd16a3932b15ef5834ee1e430..d3b9f97c6c2be8d70aada626c92fda5457d75c71 100644
--- a/tests/automatic/common/cpp/src/testing.cpp
+++ b/tests/automatic/common/cpp/src/testing.cpp
@@ -3,7 +3,7 @@
#include <iostream>
#include <algorithm>
-namespace hidra2 {
+namespace asapo {
template<typename T>
void T_AssertEq(const T& expected, const T& got) {
diff --git a/tests/automatic/curl_http_client/curl_http_client_command/CMakeLists.txt b/tests/automatic/curl_http_client/curl_http_client_command/CMakeLists.txt
index 3738e79d412d78df63f830582bb415c40510d043..384973e8a4b964388508d1b328f45bc82784c6de 100644
--- a/tests/automatic/curl_http_client/curl_http_client_command/CMakeLists.txt
+++ b/tests/automatic/curl_http_client/curl_http_client_command/CMakeLists.txt
@@ -6,7 +6,7 @@ set(SOURCE_FILES curl_httpclient_command.cpp)
# Executable and link
################################
add_executable(${TARGET_NAME} ${SOURCE_FILES})
-target_link_libraries(${TARGET_NAME} test_common hidra2-worker)
+target_link_libraries(${TARGET_NAME} test_common asapo-worker)
#set_target_properties(${TARGET_NAME} PROPERTIES LINKER_LANGUAGE CXX)
#if (CMAKE_COMPILER_IS_GNUCXX)
diff --git a/tests/automatic/curl_http_client/curl_http_client_command/curl_httpclient_command.cpp b/tests/automatic/curl_http_client/curl_http_client_command/curl_httpclient_command.cpp
index f049bc15573a7e502e53719fa4128944c3848a87..a7cc5bd384dbe41127a562a5aed53f86ec5515ce 100644
--- a/tests/automatic/curl_http_client/curl_http_client_command/curl_httpclient_command.cpp
+++ b/tests/automatic/curl_http_client/curl_http_client_command/curl_httpclient_command.cpp
@@ -4,8 +4,8 @@
#include "testing.h"
#include "../../../worker/api/cpp/src/server_data_broker.h"
-using hidra2::M_AssertEq;
-using hidra2::M_AssertContains;
+using asapo::M_AssertEq;
+using asapo::M_AssertContains;
struct Args {
std::string command;
@@ -31,11 +31,11 @@ int main(int argc, char* argv[]) {
auto args = GetArgs(argc, argv);
- hidra2::Error err;
- auto broker = hidra2::DataBrokerFactory::CreateServerBroker(args.uri, "", &err);
- auto server_broker = static_cast<hidra2::ServerDataBroker*>(broker.get());
+ asapo::Error err;
+ auto broker = asapo::DataBrokerFactory::CreateServerBroker(args.uri, "", &err);
+ auto server_broker = static_cast<asapo::ServerDataBroker*>(broker.get());
- hidra2::HttpCode code;
+ asapo::HttpCode code;
std::string response;
if (args.command == "GET") {
response = server_broker->httpclient__->Get(args.uri, &code, &err);
diff --git a/tests/automatic/full_chain/simple_chain/CMakeLists.txt b/tests/automatic/full_chain/simple_chain/CMakeLists.txt
index 5198c49bb2d94837f017ad38a644c6bf9059ae17..0fb21c69ec31121c8dd570340c3ef690487cc73f 100644
--- a/tests/automatic/full_chain/simple_chain/CMakeLists.txt
+++ b/tests/automatic/full_chain/simple_chain/CMakeLists.txt
@@ -6,4 +6,4 @@ set(TARGET_NAME full_chain_simple_chain)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/receiver.json receiver.json COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/broker_settings.json broker.json COPYONLY)
-add_script_test("${TARGET_NAME}" "$<TARGET_FILE:dummy-data-producer> $<TARGET_FILE:receiver-bin> $<TARGET_PROPERTY:hidra2-broker,EXENAME> $<TARGET_FILE:getnext_broker>" nomem)
+add_script_test("${TARGET_NAME}" "$<TARGET_FILE:dummy-data-producer> $<TARGET_FILE:receiver-bin> $<TARGET_PROPERTY:asapo-broker,EXENAME> $<TARGET_FILE:getnext_broker>" nomem)
diff --git a/tests/automatic/json_parser/parse_config_file/CMakeLists.txt b/tests/automatic/json_parser/parse_config_file/CMakeLists.txt
index 51aff5e133cfb1f40e45fb3febfba181aa3ff28d..10872462b4280234addbc9d7c48367b0d4b4d0f1 100644
--- a/tests/automatic/json_parser/parse_config_file/CMakeLists.txt
+++ b/tests/automatic/json_parser/parse_config_file/CMakeLists.txt
@@ -6,8 +6,8 @@ set(SOURCE_FILES parse_config_file.cpp)
# Executable and link
################################
add_executable(${TARGET_NAME} ${SOURCE_FILES})
-target_link_libraries(${TARGET_NAME} test_common hidra2-worker)
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR})
+target_link_libraries(${TARGET_NAME} test_common asapo-worker)
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
################################
# Testing
diff --git a/tests/automatic/json_parser/parse_config_file/parse_config_file.cpp b/tests/automatic/json_parser/parse_config_file/parse_config_file.cpp
index 4fb391b756cf2b45059808fc330a9e3100ca496c..0733caddec79f57ad2b7f78519f5f60ac85c4953 100644
--- a/tests/automatic/json_parser/parse_config_file/parse_config_file.cpp
+++ b/tests/automatic/json_parser/parse_config_file/parse_config_file.cpp
@@ -6,10 +6,10 @@
#include "testing.h"
-using hidra2::M_AssertEq;
+using asapo::M_AssertEq;
-using namespace hidra2;
+using namespace asapo;
struct Settings {
uint64_t port;
@@ -40,7 +40,7 @@ void AssertSettings(const Settings& settings) {
Settings Parse(const std::string& fname, Error* err) {
- hidra2::JsonFileParser parser(fname);
+ asapo::JsonFileParser parser(fname);
Settings settings;
diff --git a/tests/automatic/mongo_db/connect/CMakeLists.txt b/tests/automatic/mongo_db/connect/CMakeLists.txt
index 8e8190485551c69f89aab9e84e940f4b966a5e7c..03b196bd3074c14d4d80eb1000eeef923b62d4a6 100644
--- a/tests/automatic/mongo_db/connect/CMakeLists.txt
+++ b/tests/automatic/mongo_db/connect/CMakeLists.txt
@@ -7,7 +7,7 @@ set(SOURCE_FILES connect_mongodb.cpp)
################################
add_executable(${TARGET_NAME} ${SOURCE_FILES})
target_link_libraries(${TARGET_NAME} test_common database)
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR})
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
################################
# Testing
diff --git a/tests/automatic/mongo_db/connect/connect_mongodb.cpp b/tests/automatic/mongo_db/connect/connect_mongodb.cpp
index c39bdd15f90188daf27a127d8116656cb396d3cf..e16f4f5c85d8ada24d96f51c569db745f3a79b3b 100644
--- a/tests/automatic/mongo_db/connect/connect_mongodb.cpp
+++ b/tests/automatic/mongo_db/connect/connect_mongodb.cpp
@@ -5,8 +5,8 @@
#include "testing.h"
-using hidra2::M_AssertContains;
-using hidra2::Error;
+using asapo::M_AssertContains;
+using asapo::Error;
void Assert(const Error& error, const std::string& expect) {
std::string result;
@@ -37,14 +37,14 @@ Args GetArgs(int argc, char* argv[]) {
int main(int argc, char* argv[]) {
auto args = GetArgs(argc, argv);
- hidra2::MongoDBClient db;
+ asapo::MongoDBClient db;
auto err = db.Connect(args.address, args.database_name, args.collection_name);
Assert(err, args.keyword);
if (err == nullptr) {
err = db.Connect(args.address, args.database_name, args.collection_name);
- Assert(err, hidra2::DBError::kAlreadyConnected);
+ Assert(err, asapo::DBError::kAlreadyConnected);
}
return 0;
}
diff --git a/tests/automatic/mongo_db/insert/CMakeLists.txt b/tests/automatic/mongo_db/insert/CMakeLists.txt
index 0bff4ed1e9176611b77fc8e64b7bdce4bd14eb84..ed386c91e1331dc62c12843c6db8bbb4a17162ac 100644
--- a/tests/automatic/mongo_db/insert/CMakeLists.txt
+++ b/tests/automatic/mongo_db/insert/CMakeLists.txt
@@ -7,7 +7,7 @@ set(SOURCE_FILES insert_mongodb.cpp)
################################
add_executable(${TARGET_NAME} ${SOURCE_FILES})
target_link_libraries(${TARGET_NAME} test_common database)
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR})
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
################################
# Testing
diff --git a/tests/automatic/mongo_db/insert/insert_mongodb.cpp b/tests/automatic/mongo_db/insert/insert_mongodb.cpp
index 8aa7bd2559ce42f6edb11e0fa80d5aaf35d64466..67cbc520c0adebce55309b84516c747f7a9bfa1a 100644
--- a/tests/automatic/mongo_db/insert/insert_mongodb.cpp
+++ b/tests/automatic/mongo_db/insert/insert_mongodb.cpp
@@ -5,8 +5,8 @@
#include "testing.h"
-using hidra2::M_AssertContains;
-using hidra2::Error;
+using asapo::M_AssertContains;
+using asapo::Error;
void Assert(const Error& error, const std::string& expect) {
@@ -35,9 +35,9 @@ Args GetArgs(int argc, char* argv[]) {
int main(int argc, char* argv[]) {
auto args = GetArgs(argc, argv);
- hidra2::MongoDBClient db;
+ asapo::MongoDBClient db;
- hidra2::FileInfo fi;
+ asapo::FileInfo fi;
fi.size = 100;
fi.name = "relpath/1";
fi.id = args.file_id;
diff --git a/tests/automatic/spd_logger/console/CMakeLists.txt b/tests/automatic/spd_logger/console/CMakeLists.txt
index 6926abb08aea5ad59c6a4abd08af37cbe91d9eb3..fa35faabf13c3ef6bf36738361f598cf9f87458d 100644
--- a/tests/automatic/spd_logger/console/CMakeLists.txt
+++ b/tests/automatic/spd_logger/console/CMakeLists.txt
@@ -7,7 +7,7 @@ set(SOURCE_FILES spd_logger_console.cpp)
################################
add_executable(${TARGET_NAME} ${SOURCE_FILES} $<TARGET_OBJECTS:logger> $<TARGET_OBJECTS:curl_http_client>)
target_link_libraries(${TARGET_NAME} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR})
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
################################
diff --git a/tests/automatic/spd_logger/console/spd_logger_console.cpp b/tests/automatic/spd_logger/console/spd_logger_console.cpp
index 4bded1997cdf0fbe4d71d9e034811fadc651c6be..6b557098810ba29dd1945623b212299582da4f67 100644
--- a/tests/automatic/spd_logger/console/spd_logger_console.cpp
+++ b/tests/automatic/spd_logger/console/spd_logger_console.cpp
@@ -3,7 +3,7 @@
#include "logger/logger.h"
-using namespace hidra2;
+using namespace asapo;
int main(int argc, char* argv[]) {
diff --git a/tests/automatic/spd_logger/fluentd/CMakeLists.txt b/tests/automatic/spd_logger/fluentd/CMakeLists.txt
index b5fd469244e4efc6958cd8eb957851a71074c346..e4a0513d0549af6e95c07b412ab4c145596c842f 100644
--- a/tests/automatic/spd_logger/fluentd/CMakeLists.txt
+++ b/tests/automatic/spd_logger/fluentd/CMakeLists.txt
@@ -6,7 +6,7 @@ set(SOURCE_FILES spd_logger_fluentd.cpp)
# Executable and link
################################
add_executable(${TARGET_NAME} ${SOURCE_FILES} $<TARGET_OBJECTS:logger> $<TARGET_OBJECTS:curl_http_client>)
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR})
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
target_link_libraries(${TARGET_NAME} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
################################
diff --git a/tests/automatic/spd_logger/fluentd/spd_logger_fluentd.cpp b/tests/automatic/spd_logger/fluentd/spd_logger_fluentd.cpp
index 5207c6d6abba2c74c74e2655d81b85fd6d907842..580188bbd4bba3745006dd09a8795b7936eff1bd 100644
--- a/tests/automatic/spd_logger/fluentd/spd_logger_fluentd.cpp
+++ b/tests/automatic/spd_logger/fluentd/spd_logger_fluentd.cpp
@@ -3,7 +3,7 @@
#include "logger/logger.h"
-using namespace hidra2;
+using namespace asapo;
int main(int argc, char* argv[]) {
diff --git a/tests/automatic/system_io/ip_tcp_network/CMakeLists.txt b/tests/automatic/system_io/ip_tcp_network/CMakeLists.txt
index cbe323ad4a425bdbbc7431e1c22198616034098d..9222a3606bba3f4b4f28d8e9df608efcfaabd0de 100644
--- a/tests/automatic/system_io/ip_tcp_network/CMakeLists.txt
+++ b/tests/automatic/system_io/ip_tcp_network/CMakeLists.txt
@@ -6,7 +6,7 @@ set(SOURCE_FILES ip_tcp_network.cpp)
################################
add_executable(${TARGET_NAME} ${SOURCE_FILES} $<TARGET_OBJECTS:system_io> )
target_link_libraries(${TARGET_NAME} test_common)
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR})
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
set_target_properties(${TARGET_NAME} PROPERTIES LINKER_LANGUAGE CXX)
################################
diff --git a/tests/automatic/system_io/ip_tcp_network/ip_tcp_network.cpp b/tests/automatic/system_io/ip_tcp_network/ip_tcp_network.cpp
index a38a459eb1d69e128f3e2a9ee0067f7bcc0e9e94..8c304bcfd7bf0542c729ac6cd54f618178082be0 100644
--- a/tests/automatic/system_io/ip_tcp_network/ip_tcp_network.cpp
+++ b/tests/automatic/system_io/ip_tcp_network/ip_tcp_network.cpp
@@ -6,17 +6,17 @@
#include "testing.h"
-using hidra2::Error;
-using hidra2::ErrorType;
-using hidra2::AddressFamilies;
-using hidra2::SocketTypes;
-using hidra2::SocketProtocols;
-using hidra2::FileDescriptor;
-using hidra2::M_AssertEq;
+using asapo::Error;
+using asapo::ErrorType;
+using asapo::AddressFamilies;
+using asapo::SocketTypes;
+using asapo::SocketProtocols;
+using asapo::FileDescriptor;
+using asapo::M_AssertEq;
using namespace std::chrono;
-static const std::unique_ptr<hidra2::IO> io(hidra2::GenerateDefaultIO());
+static const std::unique_ptr<asapo::IO> io(asapo::GenerateDefaultIO());
static const std::string kListenAddress = "127.0.0.1:60123";
static std::promise<void> kThreadStarted;
static const int kNumberOfChecks = 2;
@@ -59,10 +59,10 @@ std::unique_ptr<std::thread> CreateEchoServerThread() {
uint64_t need_to_receive_size;
io->ReceiveWithTimeout(client_fd, &need_to_receive_size, sizeof(uint64_t), 100, &err);
if(err != nullptr) {
- if (hidra2::IOErrorTemplates::kTimeout == err) {
+ if (asapo::IOErrorTemplates::kTimeout == err) {
continue;
}
- if (hidra2::ErrorTemplates::kEndOfFile == err) {
+ if (asapo::ErrorTemplates::kEndOfFile == err) {
break;
}
}
@@ -96,7 +96,7 @@ void CheckNormal(int times, size_t size) {
std::cout << "[CLIENT] ReceiveWithTimeout" << std::endl;
io->ReceiveWithTimeout(socket, nullptr, 1, 1000 * 100/*100ms*/, &err);
- if (hidra2::IOErrorTemplates::kTimeout != err) {
+ if (asapo::IOErrorTemplates::kTimeout != err) {
ExitIfErrIsNotOk(&err, 202);
}
@@ -146,19 +146,19 @@ int main(int argc, char* argv[]) {
Error err;
std::cout << "[META] Check if connection is refused if server is not running" << std::endl;
io->CreateAndConnectIPTCPSocket(kListenAddress, &err);
- if(hidra2::IOErrorTemplates::kConnectionRefused != err) {
+ if(asapo::IOErrorTemplates::kConnectionRefused != err) {
ExitIfErrIsNotOk(&err, 301);
}
std::cout << "[META] Check invalid address format - Missing port" << std::endl;
io->CreateAndConnectIPTCPSocket("localhost", &err);
- if(hidra2::IOErrorTemplates::kInvalidAddressFormat != err) {
+ if(asapo::IOErrorTemplates::kInvalidAddressFormat != err) {
ExitIfErrIsNotOk(&err, 302);
}
std::cout << "[META] Check unknown host" << std::endl;
io->CreateAndConnectIPTCPSocket("some-host-that-might-not-exists.aa:1234", &err);
- if(hidra2::IOErrorTemplates::kUnableToResolveHostname != err) {
+ if(asapo::IOErrorTemplates::kUnableToResolveHostname != err) {
ExitIfErrIsNotOk(&err, 303);
}
@@ -175,7 +175,7 @@ int main(int argc, char* argv[]) {
std::cout << "[META] Check if connection is refused after server is closed" << std::endl;
io->CreateAndConnectIPTCPSocket(kListenAddress, &err);
- if(hidra2::IOErrorTemplates::kConnectionRefused != err) {
+ if(asapo::IOErrorTemplates::kConnectionRefused != err) {
ExitIfErrIsNotOk(&err, 304);
}
diff --git a/tests/automatic/system_io/read_file_content/read_file_content.cpp b/tests/automatic/system_io/read_file_content/read_file_content.cpp
index a8dc00ed101e71c29634fd36bfcc265d28836c4f..ec5fdae9a0f04d2808b29be2f1d4c1722d99816d 100644
--- a/tests/automatic/system_io/read_file_content/read_file_content.cpp
+++ b/tests/automatic/system_io/read_file_content/read_file_content.cpp
@@ -11,8 +11,8 @@ int main(int argc, char* argv[]) {
}
std::string expect{argv[2]};
- hidra2::Error err;
- auto io = std::unique_ptr<hidra2::IO> {hidra2::GenerateDefaultIO()};
+ asapo::Error err;
+ auto io = std::unique_ptr<asapo::IO> {asapo::GenerateDefaultIO()};
auto data = io->GetDataFromFile(argv[1], expect.size(), &err);
@@ -25,6 +25,6 @@ int main(int argc, char* argv[]) {
result = err->Explain();
}
- hidra2::M_AssertContains(result, expect);
+ asapo::M_AssertContains(result, expect);
return 0;
}
diff --git a/tests/automatic/system_io/read_folder_content/CMakeLists.txt b/tests/automatic/system_io/read_folder_content/CMakeLists.txt
index 318db28cd3fbcb9702fd532427321134c6820dbe..eb323e8c33fa0fd2340f0c5a9fc35e3487b65bd6 100644
--- a/tests/automatic/system_io/read_folder_content/CMakeLists.txt
+++ b/tests/automatic/system_io/read_folder_content/CMakeLists.txt
@@ -9,10 +9,10 @@ add_executable(${TARGET_NAME} ${SOURCE_FILES} $<TARGET_OBJECTS:system_io>)
target_link_libraries(${TARGET_NAME} test_common)
#Add all necessary common libraries
-GET_PROPERTY(HIDRA2_COMMON_IO_LIBRARIES GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES)
-target_link_libraries(${TARGET_NAME} ${HIDRA2_COMMON_IO_LIBRARIES})
+GET_PROPERTY(ASAPO_COMMON_IO_LIBRARIES GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES)
+target_link_libraries(${TARGET_NAME} ${ASAPO_COMMON_IO_LIBRARIES})
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR})
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
set_target_properties(${TARGET_NAME} PROPERTIES LINKER_LANGUAGE CXX)
################################
diff --git a/tests/automatic/system_io/read_folder_content/read_folder_content.cpp b/tests/automatic/system_io/read_folder_content/read_folder_content.cpp
index 11ce72c2525f6b48e2a6b31ee613d81723b8c7d3..dea3ca1a992dd27574787ae19ad66d8826accd05 100644
--- a/tests/automatic/system_io/read_folder_content/read_folder_content.cpp
+++ b/tests/automatic/system_io/read_folder_content/read_folder_content.cpp
@@ -3,12 +3,12 @@
#include "io/io_factory.h"
#include "testing.h"
-using hidra2::IO;
-using hidra2::Error;
+using asapo::IO;
+using asapo::Error;
-using hidra2::M_AssertEq;
-using hidra2::M_AssertContains;
+using asapo::M_AssertEq;
+using asapo::M_AssertContains;
int main(int argc, char* argv[]) {
if (argc != 3) {
@@ -18,7 +18,7 @@ int main(int argc, char* argv[]) {
std::string expect{argv[2]};
Error err;
- auto io = std::unique_ptr<IO> {hidra2::GenerateDefaultIO() };
+ auto io = std::unique_ptr<IO> {asapo::GenerateDefaultIO() };
auto files = io->FilesInFolder(argv[1], &err);
std::string result{};
diff --git a/tests/automatic/system_io/read_string_from_file/CMakeLists.txt b/tests/automatic/system_io/read_string_from_file/CMakeLists.txt
index 4703d99bbabd7857f803ecd9debb6ce27d0360b0..6e133cc602f6a196810afaa09aab4d406505b896 100644
--- a/tests/automatic/system_io/read_string_from_file/CMakeLists.txt
+++ b/tests/automatic/system_io/read_string_from_file/CMakeLists.txt
@@ -7,7 +7,7 @@ set(SOURCE_FILES read_string_from_file.cpp)
################################
add_executable(${TARGET_NAME} ${SOURCE_FILES} $<TARGET_OBJECTS:system_io> )
target_link_libraries(${TARGET_NAME} test_common)
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR})
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
set_target_properties(${TARGET_NAME} PROPERTIES LINKER_LANGUAGE CXX)
################################
diff --git a/tests/automatic/system_io/read_string_from_file/read_string_from_file.cpp b/tests/automatic/system_io/read_string_from_file/read_string_from_file.cpp
index 3248c67e5eeb2eeee7648fb06f9d9625dbe05891..9c12ac41761f8323411ef628e063853282437362 100644
--- a/tests/automatic/system_io/read_string_from_file/read_string_from_file.cpp
+++ b/tests/automatic/system_io/read_string_from_file/read_string_from_file.cpp
@@ -10,8 +10,8 @@ int main(int argc, char* argv[]) {
}
std::string expect{argv[2]};
- hidra2::Error err;
- auto io = std::unique_ptr<hidra2::IO> {hidra2::GenerateDefaultIO()};
+ asapo::Error err;
+ auto io = std::unique_ptr<asapo::IO> {asapo::GenerateDefaultIO()};
auto str = io->ReadFileToString(argv[1], &err);
std::string result;
@@ -22,6 +22,6 @@ int main(int argc, char* argv[]) {
result = err->Explain();
}
- hidra2::M_AssertContains(result, expect);
+ asapo::M_AssertContains(result, expect);
return 0;
}
diff --git a/tests/automatic/system_io/resolve_hostname_to_ip/CMakeLists.txt b/tests/automatic/system_io/resolve_hostname_to_ip/CMakeLists.txt
index 7bc06ca1db15e1ba4234b02d01538c5132d1474b..7433c4bef8f6223f1a2842ac4635fe529a65ef58 100644
--- a/tests/automatic/system_io/resolve_hostname_to_ip/CMakeLists.txt
+++ b/tests/automatic/system_io/resolve_hostname_to_ip/CMakeLists.txt
@@ -6,7 +6,7 @@ set(SOURCE_FILES resolve_hostname_to_ip.cpp)
################################
add_executable(${TARGET_NAME} ${SOURCE_FILES} $<TARGET_OBJECTS:system_io> )
target_link_libraries(${TARGET_NAME} test_common)
-target_include_directories(${TARGET_NAME} PUBLIC ${HIDRA2_CXX_COMMON_INCLUDE_DIR})
+target_include_directories(${TARGET_NAME} PUBLIC ${ASAPO_CXX_COMMON_INCLUDE_DIR})
set_target_properties(${TARGET_NAME} PROPERTIES LINKER_LANGUAGE CXX)
################################
diff --git a/tests/automatic/system_io/resolve_hostname_to_ip/resolve_hostname_to_ip.cpp b/tests/automatic/system_io/resolve_hostname_to_ip/resolve_hostname_to_ip.cpp
index a5a3757821a80e3b442df46d7315987fd980b06f..71c5984a307c0aa09fe31e9ae37bad965a51de3e 100644
--- a/tests/automatic/system_io/resolve_hostname_to_ip/resolve_hostname_to_ip.cpp
+++ b/tests/automatic/system_io/resolve_hostname_to_ip/resolve_hostname_to_ip.cpp
@@ -3,21 +3,21 @@
#include "testing.h"
-using hidra2::Error;
-using hidra2::ErrorType;
+using asapo::Error;
+using asapo::ErrorType;
-using hidra2::M_AssertEq;
-using hidra2::M_AssertTrue;
+using asapo::M_AssertEq;
+using asapo::M_AssertTrue;
void Check(const std::string& expected_ip_address, const std::string& hostname) {
std::cout << "Checking: " << hostname << std::endl;
Error err;
- auto io = std::unique_ptr<hidra2::IO> {hidra2::GenerateDefaultIO()};
+ auto io = std::unique_ptr<asapo::IO> {asapo::GenerateDefaultIO()};
std::string ip_address = io->ResolveHostnameToIp(hostname, &err);
M_AssertEq(expected_ip_address, ip_address);
if(expected_ip_address.empty()) {
- M_AssertTrue(err != nullptr && hidra2::IOErrorTemplates::kUnableToResolveHostname == err);
+ M_AssertTrue(err != nullptr && asapo::IOErrorTemplates::kUnableToResolveHostname == err);
return;
}
M_AssertTrue(err == nullptr);
diff --git a/tests/automatic/system_io/write_data_to_file/write_data_to_file.cpp b/tests/automatic/system_io/write_data_to_file/write_data_to_file.cpp
index 3abfd66d2b90537fcfe8f189918e2a23cdae02b3..09b866ca5d980a9dd3dca3cf096116f42c424736 100644
--- a/tests/automatic/system_io/write_data_to_file/write_data_to_file.cpp
+++ b/tests/automatic/system_io/write_data_to_file/write_data_to_file.cpp
@@ -3,9 +3,9 @@
#include "testing.h"
-using hidra2::IO;
-using hidra2::Error;
-using hidra2::FileData;
+using asapo::IO;
+using asapo::Error;
+using asapo::FileData;
struct Params {
@@ -35,7 +35,7 @@ void AssertGoodResult(const std::unique_ptr<IO>& io, const Error& err, const Fil
}
Error read_err;
auto read_data = io->GetDataFromFile(params.fname, params.length, &read_err);
- hidra2::M_AssertContains(std::string(read_data.get(), read_data.get() + params.length), "123");
+ asapo::M_AssertContains(std::string(read_data.get(), read_data.get() + params.length), "123");
}
void AssertBadResult(const Error& err, const Params& params) {
@@ -43,14 +43,14 @@ void AssertBadResult(const Error& err, const Params& params) {
std::cerr << "Should be error" << std::endl;
exit(EXIT_FAILURE);
}
- hidra2::M_AssertContains(err->Explain(), params.message);
+ asapo::M_AssertContains(err->Explain(), params.message);
}
int main(int argc, char* argv[]) {
auto params = GetParams(argc, argv);
- auto io = std::unique_ptr<hidra2::IO> {hidra2::GenerateDefaultIO()};
+ auto io = std::unique_ptr<asapo::IO> {asapo::GenerateDefaultIO()};
FileData data{new uint8_t[params.length]{'1', '2', '3'}};
auto err = io->WriteDataToFile(params.fname, data, params.length);
diff --git a/tests/automatic/worker/connect_multithread/CMakeLists.txt b/tests/automatic/worker/connect_multithread/CMakeLists.txt
index 64224018bc011daf620bca4a96fcc5730004d9b4..bdc974e10b7c45b0eb303b5b242057c80ff3d9d3 100644
--- a/tests/automatic/worker/connect_multithread/CMakeLists.txt
+++ b/tests/automatic/worker/connect_multithread/CMakeLists.txt
@@ -6,7 +6,7 @@ set(SOURCE_FILES content_multithread.cpp)
# Executable and link
################################
add_executable(${TARGET_NAME} ${SOURCE_FILES})
-target_link_libraries(${TARGET_NAME} test_common hidra2-worker ${HIDRA2_COMMON_IO_LIBRARIES})
+target_link_libraries(${TARGET_NAME} test_common asapo-worker ${ASAPO_COMMON_IO_LIBRARIES})
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS_DEBUG "--coverage")
endif()
diff --git a/tests/automatic/worker/connect_multithread/content_multithread.cpp b/tests/automatic/worker/connect_multithread/content_multithread.cpp
index ef63c6222171a60911a3c2464a68505fecad9a49..2ba33899824ea2af5f99a1d1b7f481d3206d8b6b 100644
--- a/tests/automatic/worker/connect_multithread/content_multithread.cpp
+++ b/tests/automatic/worker/connect_multithread/content_multithread.cpp
@@ -5,9 +5,9 @@
#include "worker/data_broker.h"
#include "testing.h"
-using hidra2::M_AssertEq;
+using asapo::M_AssertEq;
-void Assert(std::vector<hidra2::Error>& errors, int nthreads) {
+void Assert(std::vector<asapo::Error>& errors, int nthreads) {
int count_ok = (int) std::count(std::begin(errors),
std::end(errors),
nullptr);
@@ -15,7 +15,7 @@ void Assert(std::vector<hidra2::Error>& errors, int nthreads) {
int count_already_connected = 0;
for (auto& error : errors) {
if (!error) continue;
- if (error->Explain().find(hidra2::WorkerErrorMessage::kSourceAlreadyConnected) != std::string::npos)
+ if (error->Explain().find(asapo::WorkerErrorMessage::kSourceAlreadyConnected) != std::string::npos)
count_already_connected++;
}
@@ -42,10 +42,10 @@ int main(int argc, char* argv[]) {
auto args = GetArgs(argc, argv);
- hidra2::Error err;
- auto broker = hidra2::DataBrokerFactory::CreateFolderBroker(args.folder, &err);
+ asapo::Error err;
+ auto broker = asapo::DataBrokerFactory::CreateFolderBroker(args.folder, &err);
- std::vector<hidra2::Error>errors(args.nthreads);
+ std::vector<asapo::Error>errors(args.nthreads);
std::vector<std::thread> threads;
for (int i = 0; i < args.nthreads; i++) {
diff --git a/tests/automatic/worker/next_multithread_broker/CMakeLists.txt b/tests/automatic/worker/next_multithread_broker/CMakeLists.txt
index 9c22693a5cbb40f0778ce0ff145ef428fc3e1d8f..28525645e8c1e08f24251df35bbff7c2562b9f91 100644
--- a/tests/automatic/worker/next_multithread_broker/CMakeLists.txt
+++ b/tests/automatic/worker/next_multithread_broker/CMakeLists.txt
@@ -6,12 +6,12 @@ set(SOURCE_FILES next_multithread_broker.cpp)
# Executable and link
################################
add_executable(${TARGET_NAME} ${SOURCE_FILES})
-target_link_libraries(${TARGET_NAME} test_common hidra2-worker)
+target_link_libraries(${TARGET_NAME} test_common asapo-worker)
################################
# Testing
################################
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/broker_settings.json settings.json COPYONLY)
-add_script_test("${TARGET_NAME}" "$<TARGET_FILE:${TARGET_NAME}> $<TARGET_PROPERTY:hidra2-broker,EXENAME>"
+add_script_test("${TARGET_NAME}" "$<TARGET_FILE:${TARGET_NAME}> $<TARGET_PROPERTY:asapo-broker,EXENAME>"
)
diff --git a/tests/automatic/worker/next_multithread_broker/next_multithread_broker.cpp b/tests/automatic/worker/next_multithread_broker/next_multithread_broker.cpp
index 9640d60989e13ebd9cb6447b375306e882139c1e..5f8321ec4a58fc5fcc9319377a34cf98033e67bb 100644
--- a/tests/automatic/worker/next_multithread_broker/next_multithread_broker.cpp
+++ b/tests/automatic/worker/next_multithread_broker/next_multithread_broker.cpp
@@ -5,10 +5,10 @@
#include "worker/data_broker.h"
#include "testing.h"
-using hidra2::M_AssertEq;
-using hidra2::M_AssertTrue;
+using asapo::M_AssertEq;
+using asapo::M_AssertTrue;
-void Assert(std::vector<hidra2::FileInfos> file_infos, int nthreads, int nfiles) {
+void Assert(std::vector<asapo::FileInfos> file_infos, int nthreads, int nfiles) {
std::vector<std::string> expect, result;
for (int i = 1; i <= nfiles; i++) {
expect.push_back(std::to_string(i));
@@ -45,12 +45,12 @@ Args GetArgs(int argc, char* argv[]) {
}
void GetAllFromBroker(const Args& args) {
- hidra2::Error err;
- auto broker = hidra2::DataBrokerFactory::CreateServerBroker(args.server, args.run_name, &err);
+ asapo::Error err;
+ auto broker = asapo::DataBrokerFactory::CreateServerBroker(args.server, args.run_name, &err);
- std::vector<hidra2::FileInfos>file_infos(args.nthreads);
+ std::vector<asapo::FileInfos>file_infos(args.nthreads);
auto exec_next = [&](int i) {
- hidra2::FileInfo fi;
+ asapo::FileInfo fi;
while ((err = broker->GetNext(&fi, nullptr)) == nullptr) {
file_infos[i].emplace_back(fi);
}
diff --git a/tests/automatic/worker/next_multithread_folder/CMakeLists.txt b/tests/automatic/worker/next_multithread_folder/CMakeLists.txt
index b0920c971f868faacd93ed7fbd60e630651f87c4..949b8c48c151837404d89b1b38f19f038c21cc0f 100644
--- a/tests/automatic/worker/next_multithread_folder/CMakeLists.txt
+++ b/tests/automatic/worker/next_multithread_folder/CMakeLists.txt
@@ -8,10 +8,10 @@ set(SOURCE_FILES next_multithread_folder.cpp)
add_executable(${TARGET_NAME} ${SOURCE_FILES})
#Add all necessary common libraries
-GET_PROPERTY(HIDRA2_COMMON_IO_LIBRARIES GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES)
-target_link_libraries(${TARGET_NAME} ${HIDRA2_COMMON_IO_LIBRARIES})
+GET_PROPERTY(ASAPO_COMMON_IO_LIBRARIES GLOBAL PROPERTY ASAPO_COMMON_IO_LIBRARIES)
+target_link_libraries(${TARGET_NAME} ${ASAPO_COMMON_IO_LIBRARIES})
-target_link_libraries(${TARGET_NAME} test_common hidra2-worker)
+target_link_libraries(${TARGET_NAME} test_common asapo-worker)
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS_DEBUG "--coverage")
endif()
diff --git a/tests/automatic/worker/next_multithread_folder/next_multithread_folder.cpp b/tests/automatic/worker/next_multithread_folder/next_multithread_folder.cpp
index 8deb766666a72a787c440821e2fb6b7d5051cdc9..9c7fb9634e8ce90e4f8f07d811943d0131ba0a8f 100644
--- a/tests/automatic/worker/next_multithread_folder/next_multithread_folder.cpp
+++ b/tests/automatic/worker/next_multithread_folder/next_multithread_folder.cpp
@@ -5,10 +5,10 @@
#include "worker/data_broker.h"
#include "testing.h"
-using hidra2::M_AssertEq;
-using hidra2::M_AssertTrue;
+using asapo::M_AssertEq;
+using asapo::M_AssertTrue;
-void Assert(std::vector<hidra2::FileInfo> file_infos, int nthreads) {
+void Assert(std::vector<asapo::FileInfo> file_infos, int nthreads) {
int nfiles = (int) file_infos.size();
M_AssertEq(nthreads, nfiles);
@@ -39,11 +39,11 @@ Args GetArgs(int argc, char* argv[]) {
}
void GetAllFromBroker(const Args& args) {
- hidra2::Error err;
- auto broker = hidra2::DataBrokerFactory::CreateFolderBroker(args.folder, &err);
+ asapo::Error err;
+ auto broker = asapo::DataBrokerFactory::CreateFolderBroker(args.folder, &err);
broker->Connect();
- std::vector<hidra2::FileInfo>file_infos(args.nthreads);
+ std::vector<asapo::FileInfo>file_infos(args.nthreads);
auto exec_next = [&](int i) {
broker->GetNext(&file_infos[i], nullptr);
};
diff --git a/tests/manual/performance_broker/test.sh b/tests/manual/performance_broker/test.sh
index cf81d2ffd2c7f122c18c84afa9e7df8e7385f1f9..e0b083c3d7e973cd6b1782ecd107b20eea0abb4e 100755
--- a/tests/manual/performance_broker/test.sh
+++ b/tests/manual/performance_broker/test.sh
@@ -40,8 +40,8 @@ ssh ${worker_node} mkdir ${worker_dir}
scp settings_tmp.json ${service_node}:${service_dir}/settings.json
rm settings_tmp.json
-scp ../../../cmake-build-release/broker/hidra2-broker ${service_node}:${service_dir}
-ssh ${service_node} "bash -c 'cd ${service_dir}; nohup ./hidra2-broker -config settings.json &> ${service_dir}/broker.log &'"
+scp ../../../cmake-build-release/broker/asapo-broker ${service_node}:${service_dir}
+ssh ${service_node} "bash -c 'cd ${service_dir}; nohup ./asapo-broker -config settings.json &> ${service_dir}/broker.log &'"
sleep 0.3
scp ../../../cmake-build-release/worker/tools/folder_to_db/folder2db ${worker_node}:${worker_dir}
ssh ${worker_node} ${worker_dir}/folder2db -n ${nthreads} ${dir} ${run_name} ${service_node}
@@ -53,6 +53,6 @@ ssh ${worker_node} ${worker_dir}/getnext_broker ${service_node}:5005 ${run_name}
-ssh ${service_node} killall hidra2-broker
+ssh ${service_node} killall asapo-broker
ssh ${service_node} docker rm -f mongo
#ssh ${service_node} docker rm -f influxdb
diff --git a/tests/manual/performance_full_chain_simple/test.sh b/tests/manual/performance_full_chain_simple/test.sh
index 8846a9972286f54427517b458fa542ce0eaa909e..4cece2b86f0e04b0cd4a0191eb8f5e8f53ccf68f 100755
--- a/tests/manual/performance_full_chain_simple/test.sh
+++ b/tests/manual/performance_full_chain_simple/test.sh
@@ -9,7 +9,7 @@ Cleanup() {
set +e
ssh ${receiver_node} rm -f ${receiver_dir}/files/*
ssh ${receiver_node} killall receiver
-ssh ${broker_node} killall hidra2-broker
+ssh ${broker_node} killall asapo-broker
ssh ${broker_node} docker rm -f -v mongo
}
@@ -68,7 +68,7 @@ cat broker.json |
from_entries" > settings_tmp.json
scp settings_tmp.json ${broker_node}:${broker_dir}/broker.json
rm settings_tmp.json
-scp ../../../cmake-build-release/broker/hidra2-broker ${broker_node}:${broker_dir}
+scp ../../../cmake-build-release/broker/asapo-broker ${broker_node}:${broker_dir}
#worker_setup
@@ -89,7 +89,7 @@ ssh ${receiver_node} "bash -c 'cd ${receiver_dir}; nohup ./receiver settings.jso
sleep 0.3
#broker_start
-ssh ${broker_node} "bash -c 'cd ${broker_dir}; nohup ./hidra2-broker -config broker.json &> ${log_dir}/log.broker &'"
+ssh ${broker_node} "bash -c 'cd ${broker_dir}; nohup ./asapo-broker -config broker.json &> ${log_dir}/log.broker &'"
sleep 0.3
#producer_start
diff --git a/worker/api/cpp/CMakeLists.txt b/worker/api/cpp/CMakeLists.txt
index 8d67c6fe9dee2b05fac32cabe28c445856fef25b..4f07c048bed2d6ad389a92f853b518ec59c2248c 100644
--- a/worker/api/cpp/CMakeLists.txt
+++ b/worker/api/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(TARGET_NAME hidra2-worker)
+set(TARGET_NAME asapo-worker)
set(SOURCE_FILES
src/data_broker.cpp
@@ -13,7 +13,7 @@ set(SOURCE_FILES
add_library(${TARGET_NAME} STATIC ${SOURCE_FILES} $<TARGET_OBJECTS:system_io>
$<TARGET_OBJECTS:json_parser> $<TARGET_OBJECTS:data_structs> $<TARGET_OBJECTS:curl_http_client> )
-target_include_directories(${TARGET_NAME} PUBLIC include ${HIDRA2_CXX_COMMON_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
+target_include_directories(${TARGET_NAME} PUBLIC include ${ASAPO_CXX_COMMON_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
diff --git a/worker/api/cpp/include/asapo_worker.h b/worker/api/cpp/include/asapo_worker.h
new file mode 100644
index 0000000000000000000000000000000000000000..d07b021b3fa39687022e3a4514613fa31f538636
--- /dev/null
+++ b/worker/api/cpp/include/asapo_worker.h
@@ -0,0 +1,6 @@
+#ifndef ASAPO_ASAPO_WORKER_H
+#define ASAPO_ASAPO_WORKER_H
+
+#include "worker/data_broker.h"
+
+#endif //ASAPO_ASAPO_WORKER_H
diff --git a/worker/api/cpp/include/hidra2_worker.h b/worker/api/cpp/include/hidra2_worker.h
deleted file mode 100644
index f919a549668b32a8eb0f6be728394f91d7007a0b..0000000000000000000000000000000000000000
--- a/worker/api/cpp/include/hidra2_worker.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef HIDRA2_HIDRA2_WORKER_H
-#define HIDRA2_HIDRA2_WORKER_H
-
-#include "worker/data_broker.h"
-
-#endif //HIDRA2_HIDRA2_WORKER_H
diff --git a/worker/api/cpp/include/worker/data_broker.h b/worker/api/cpp/include/worker/data_broker.h
index a7baaa2a4da104025d5a0c895ae854e99c86361d..ed9e356cad549ed78c8df753d404e91c2a3c5aa7 100644
--- a/worker/api/cpp/include/worker/data_broker.h
+++ b/worker/api/cpp/include/worker/data_broker.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_DATASOURCE_H
-#define HIDRA2_DATASOURCE_H
+#ifndef ASAPO_DATASOURCE_H
+#define ASAPO_DATASOURCE_H
#include <memory>
#include <string>
@@ -7,7 +7,7 @@
#include "common/data_structs.h"
#include "common/error.h"
-namespace hidra2 {
+namespace asapo {
namespace WorkerErrorMessage {
@@ -53,4 +53,4 @@ class DataBrokerFactory {
};
}
-#endif //HIDRA2_DATASOURCE_H
+#endif //ASAPO_DATASOURCE_H
diff --git a/worker/api/cpp/src/data_broker.cpp b/worker/api/cpp/src/data_broker.cpp
index 409799e2b08b41a1fc04799d44b496373b2d7145..624e60ed55261d7856e45ed772ef64f5b5c1e78e 100644
--- a/worker/api/cpp/src/data_broker.cpp
+++ b/worker/api/cpp/src/data_broker.cpp
@@ -3,7 +3,7 @@
#include "server_data_broker.h"
-namespace hidra2 {
+namespace asapo {
template <typename Broker, typename ...Args>
std::unique_ptr<DataBroker> Create(const std::string& source_name,
diff --git a/worker/api/cpp/src/folder_data_broker.cpp b/worker/api/cpp/src/folder_data_broker.cpp
index f15b3d6a260a80c8c14e3de635046c1654af077a..3ead031d921dab4d3d76c5f8ac08fd54c64f5931 100644
--- a/worker/api/cpp/src/folder_data_broker.cpp
+++ b/worker/api/cpp/src/folder_data_broker.cpp
@@ -2,7 +2,7 @@
#include "io/io_factory.h"
-namespace hidra2 {
+namespace asapo {
FolderDataBroker::FolderDataBroker(const std::string& source_name) :
io__{GenerateDefaultIO()}, base_path_{source_name}, is_connected_{false},
diff --git a/worker/api/cpp/src/folder_data_broker.h b/worker/api/cpp/src/folder_data_broker.h
index 15bc208fda4d7a73f944440ae3d06b0ba71a8799..fb554d5135a6a96a48460d93161624b7dc774dff 100644
--- a/worker/api/cpp/src/folder_data_broker.h
+++ b/worker/api/cpp/src/folder_data_broker.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_FOLDERDATABROKER_H
-#define HIDRA2_FOLDERDATABROKER_H
+#ifndef ASAPO_FOLDERDATABROKER_H
+#define ASAPO_FOLDERDATABROKER_H
#include "worker/data_broker.h"
@@ -8,16 +8,16 @@
#include "io/io.h"
-namespace hidra2 {
+namespace asapo {
-class FolderDataBroker final : public hidra2::DataBroker {
+class FolderDataBroker final : public asapo::DataBroker {
public:
explicit FolderDataBroker(const std::string& source_name);
Error Connect() override;
Error GetNext(FileInfo* info, FileData* data) override;
void SetTimeout(uint64_t timeout_ms) override {}; // to timeout in this case
- std::unique_ptr<hidra2::IO> io__; // modified in testings to mock system calls,otherwise do not touch
+ std::unique_ptr<asapo::IO> io__; // modified in testings to mock system calls,otherwise do not touch
private:
std::string base_path_;
bool is_connected_;
@@ -29,5 +29,5 @@ class FolderDataBroker final : public hidra2::DataBroker {
}
-#endif //HIDRA2_FOLDERDATABROKER_H
+#endif //ASAPO_FOLDERDATABROKER_H
diff --git a/worker/api/cpp/src/server_data_broker.cpp b/worker/api/cpp/src/server_data_broker.cpp
index 2ef08a29e64c6c619531c328979dbd1657cdde2c..e00a2daa8a2e7650b701fa0b1c23d1c66a7dc8ef 100644
--- a/worker/api/cpp/src/server_data_broker.cpp
+++ b/worker/api/cpp/src/server_data_broker.cpp
@@ -9,7 +9,7 @@
using std::chrono::high_resolution_clock;
-namespace hidra2 {
+namespace asapo {
Error HttpCodeToWorkerError(const HttpCode& code) {
const char* message;
@@ -66,7 +66,7 @@ Error ServerDataBroker::GetFileInfoFromServer(FileInfo* info, const std::string&
err = HttpCodeToWorkerError(code);
if (err == nullptr) break;
- if (err->GetErrorType() != hidra2::ErrorType::kEndOfFile) {
+ if (err->GetErrorType() != asapo::ErrorType::kEndOfFile) {
err->Append(response);
// return err;
}
diff --git a/worker/api/cpp/src/server_data_broker.h b/worker/api/cpp/src/server_data_broker.h
index 94a818b071a718fee57b20f51da4f806f2edaeb6..36d277deb0cc7660b9ef1d259da4626223b8ec28 100644
--- a/worker/api/cpp/src/server_data_broker.h
+++ b/worker/api/cpp/src/server_data_broker.h
@@ -1,16 +1,16 @@
-#ifndef HIDRA2_SERVER_DATA_BROKER_H
-#define HIDRA2_SERVER_DATA_BROKER_H
+#ifndef ASAPO_SERVER_DATA_BROKER_H
+#define ASAPO_SERVER_DATA_BROKER_H
#include "worker/data_broker.h"
#include "io/io.h"
#include "http_client/http_client.h"
-namespace hidra2 {
+namespace asapo {
Error HttpCodeToWorkerError(const HttpCode& code);
-class ServerDataBroker final : public hidra2::DataBroker {
+class ServerDataBroker final : public asapo::DataBroker {
public:
explicit ServerDataBroker(const std::string& server_uri, const std::string& source_name);
Error Connect() override;
@@ -27,4 +27,4 @@ class ServerDataBroker final : public hidra2::DataBroker {
}
-#endif //HIDRA2_SERVER_DATA_BROKER_H
+#endif //ASAPO_SERVER_DATA_BROKER_H
diff --git a/worker/api/cpp/unittests/test_folder_broker.cpp b/worker/api/cpp/unittests/test_folder_broker.cpp
index 796183e246a718452536652f071b8507e9a7ee06..cff1809cd88c30c6a0681d2d6480e747f9bcbc20 100644
--- a/worker/api/cpp/unittests/test_folder_broker.cpp
+++ b/worker/api/cpp/unittests/test_folder_broker.cpp
@@ -7,16 +7,16 @@
#include "../../../../common/cpp/src/system_io/system_io.h"
#include "../src/folder_data_broker.h"
-using hidra2::DataBrokerFactory;
-using hidra2::DataBroker;
-using hidra2::FolderDataBroker;
-using hidra2::IO;
-using hidra2::FileInfos;
-using hidra2::FileInfo;
-using hidra2::FileData;
-using hidra2::Error;
-using hidra2::TextError;
-using hidra2::SimpleError;
+using asapo::DataBrokerFactory;
+using asapo::DataBroker;
+using asapo::FolderDataBroker;
+using asapo::IO;
+using asapo::FileInfos;
+using asapo::FileInfo;
+using asapo::FileData;
+using asapo::Error;
+using asapo::TextError;
+using asapo::SimpleError;
using ::testing::AtLeast;
using ::testing::Eq;
@@ -30,11 +30,11 @@ namespace {
TEST(FolderDataBroker, SetCorrectIO) {
auto data_broker = new FolderDataBroker("test");
- ASSERT_THAT(dynamic_cast<hidra2::SystemIO*>(data_broker->io__.get()), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<asapo::SystemIO*>(data_broker->io__.get()), Ne(nullptr));
delete data_broker;
}
-class FakeIO: public hidra2::MockIO {
+class FakeIO: public asapo::MockIO {
public:
virtual std::string ReadFileToString(const std::string& fname, Error* err) const noexcept override {
@@ -59,7 +59,7 @@ class FakeIO: public hidra2::MockIO {
class IOFolderNotFound: public FakeIO {
public:
FileInfos FilesInFolder(const std::string& folder, Error* err) const override {
- *err = hidra2::IOErrorTemplates::kFileNotFound.Generate();
+ *err = asapo::IOErrorTemplates::kFileNotFound.Generate();
return {};
}
};
@@ -67,7 +67,7 @@ class IOFolderNotFound: public FakeIO {
class IOFolderUnknownError: public FakeIO {
public:
FileInfos FilesInFolder(const std::string& folder, Error* err) const override {
- *err = hidra2::IOErrorTemplates::kUnknownIOError.Generate();
+ *err = asapo::IOErrorTemplates::kUnknownIOError.Generate();
return {};
}
};
@@ -83,7 +83,7 @@ class IOEmptyFolder: public FakeIO {
class IOCannotOpenFile: public FakeIO {
public:
FileData GetDataFromFile(const std::string& fname, uint64_t fsize, Error* err) const noexcept override {
- *err = hidra2::IOErrorTemplates::kPermissionDenied.Generate();
+ *err = asapo::IOErrorTemplates::kPermissionDenied.Generate();
return {};
};
};
@@ -112,7 +112,7 @@ TEST_F(FolderDataBrokerTests, CannotConnectTwice) {
auto return_code = data_broker->Connect();
- ASSERT_THAT(return_code->Explain(), Eq(hidra2::WorkerErrorMessage::kSourceAlreadyConnected));
+ ASSERT_THAT(return_code->Explain(), Eq(asapo::WorkerErrorMessage::kSourceAlreadyConnected));
}
@@ -121,7 +121,7 @@ TEST_F(FolderDataBrokerTests, CannotConnectWhenNoFolder) {
auto return_code = data_broker->Connect();
- ASSERT_THAT(return_code->Explain(), Eq(hidra2::IOErrorTemplates::kFileNotFound.Generate()->Explain()));
+ ASSERT_THAT(return_code->Explain(), Eq(asapo::IOErrorTemplates::kFileNotFound.Generate()->Explain()));
}
TEST_F(FolderDataBrokerTests, ConnectReturnsUnknownIOError) {
@@ -129,13 +129,13 @@ TEST_F(FolderDataBrokerTests, ConnectReturnsUnknownIOError) {
auto return_code = data_broker->Connect();
- ASSERT_THAT(return_code->Explain(), Eq(hidra2::IOErrorTemplates::kUnknownIOError.Generate()->Explain()));
+ ASSERT_THAT(return_code->Explain(), Eq(asapo::IOErrorTemplates::kUnknownIOError.Generate()->Explain()));
}
TEST_F(FolderDataBrokerTests, GetNextWithoutConnectReturnsError) {
auto err = data_broker->GetNext(nullptr, nullptr);
- ASSERT_THAT(err->Explain(), Eq(hidra2::WorkerErrorMessage::kSourceNotConnected));
+ ASSERT_THAT(err->Explain(), Eq(asapo::WorkerErrorMessage::kSourceNotConnected));
}
TEST_F(FolderDataBrokerTests, GetNextWithNullPointersReturnsError) {
@@ -143,7 +143,7 @@ TEST_F(FolderDataBrokerTests, GetNextWithNullPointersReturnsError) {
auto err = data_broker->GetNext(nullptr, nullptr);
- ASSERT_THAT(err->Explain(), Eq(hidra2::WorkerErrorMessage::kWrongInput));
+ ASSERT_THAT(err->Explain(), Eq(asapo::WorkerErrorMessage::kWrongInput));
}
TEST_F(FolderDataBrokerTests, GetNextReturnsFileInfo) {
@@ -175,9 +175,9 @@ TEST_F(FolderDataBrokerTests, GetNextFromEmptyFolderReturnsError) {
FileInfo fi;
auto err = data_broker->GetNext(&fi, nullptr);
- ASSERT_TRUE(hidra2::ErrorTemplates::kEndOfFile == err);
+ ASSERT_TRUE(asapo::ErrorTemplates::kEndOfFile == err);
- ASSERT_THAT(err->Explain(), Eq(hidra2::WorkerErrorMessage::kNoData));
+ ASSERT_THAT(err->Explain(), Eq(asapo::WorkerErrorMessage::kNoData));
}
TEST_F(FolderDataBrokerTests, GetNextReturnsErrorWhenFilePermissionsDenied) {
@@ -187,7 +187,7 @@ TEST_F(FolderDataBrokerTests, GetNextReturnsErrorWhenFilePermissionsDenied) {
FileData data;
auto err = data_broker->GetNext(&fi, &data);
- ASSERT_THAT(err->Explain(), Eq(hidra2::IOErrorTemplates::kPermissionDenied.Generate()->Explain()));
+ ASSERT_THAT(err->Explain(), Eq(asapo::IOErrorTemplates::kPermissionDenied.Generate()->Explain()));
}
@@ -230,22 +230,22 @@ TEST_F(GetDataFromFileTests, GetNextReturnsDataAndInfo) {
TEST_F(GetDataFromFileTests, GetNextReturnsErrorWhenCannotReadData) {
EXPECT_CALL(mock, GetDataFromFile_t(_, _, _)).
- WillOnce(DoAll(testing::SetArgPointee<2>(hidra2::IOErrorTemplates::kReadError.Generate().release()),
+ WillOnce(DoAll(testing::SetArgPointee<2>(asapo::IOErrorTemplates::kReadError.Generate().release()),
testing::Return(nullptr)));
auto err = data_broker->GetNext(&fi, &data);
- ASSERT_THAT(err->Explain(), Eq(hidra2::IOErrorTemplates::kReadError.Generate()->Explain()));
+ ASSERT_THAT(err->Explain(), Eq(asapo::IOErrorTemplates::kReadError.Generate()->Explain()));
}
TEST_F(GetDataFromFileTests, GetNextReturnsErrorWhenCannotAllocateData) {
EXPECT_CALL(mock, GetDataFromFile_t(_, _, _)).
- WillOnce(DoAll(testing::SetArgPointee<2>(hidra2::ErrorTemplates::kMemoryAllocationError.Generate().release()),
+ WillOnce(DoAll(testing::SetArgPointee<2>(asapo::ErrorTemplates::kMemoryAllocationError.Generate().release()),
testing::Return(nullptr)));
auto err = data_broker->GetNext(&fi, &data);
- ASSERT_THAT(err->Explain(), Eq(hidra2::ErrorTemplates::kMemoryAllocationError.Generate()->Explain()));
+ ASSERT_THAT(err->Explain(), Eq(asapo::ErrorTemplates::kMemoryAllocationError.Generate()->Explain()));
}
diff --git a/worker/api/cpp/unittests/test_server_broker.cpp b/worker/api/cpp/unittests/test_server_broker.cpp
index a72f47cc42c72cc17df89c47caa9dba79ebfee6e..2424eb9cd9ad48f5d85a2557413cef1b6966ceab 100644
--- a/worker/api/cpp/unittests/test_server_broker.cpp
+++ b/worker/api/cpp/unittests/test_server_broker.cpp
@@ -10,17 +10,17 @@
#include "unittests/MockHttpClient.h"
#include "http_client/http_error.h"
-using hidra2::DataBrokerFactory;
-using hidra2::DataBroker;
-using hidra2::ServerDataBroker;
-using hidra2::IO;
-using hidra2::FileInfo;
-using hidra2::FileData;
-using hidra2::MockIO;
-using hidra2::MockHttpClient;
-using hidra2::HttpCode;
-using hidra2::HttpError;
-using hidra2::SimpleError;
+using asapo::DataBrokerFactory;
+using asapo::DataBroker;
+using asapo::ServerDataBroker;
+using asapo::IO;
+using asapo::FileInfo;
+using asapo::FileData;
+using asapo::MockIO;
+using asapo::MockHttpClient;
+using asapo::HttpCode;
+using asapo::HttpError;
+using asapo::SimpleError;
using ::testing::AtLeast;
using ::testing::Eq;
@@ -38,12 +38,12 @@ namespace {
TEST(FolderDataBroker, SetCorrectIo) {
auto data_broker = std::unique_ptr<ServerDataBroker> {new ServerDataBroker("test", "dbname")};
- ASSERT_THAT(dynamic_cast<hidra2::SystemIO*>(data_broker->io__.get()), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<asapo::SystemIO*>(data_broker->io__.get()), Ne(nullptr));
}
TEST(FolderDataBroker, SetCorrectHttpClient) {
auto data_broker = std::unique_ptr<ServerDataBroker> {new ServerDataBroker("test", "dbname")};
- ASSERT_THAT(dynamic_cast<hidra2::CurlHttpClient*>(data_broker->httpclient__.get()), Ne(nullptr));
+ ASSERT_THAT(dynamic_cast<asapo::CurlHttpClient*>(data_broker->httpclient__.get()), Ne(nullptr));
}
@@ -57,7 +57,7 @@ class ServerDataBrokerTests : public Test {
void SetUp() override {
data_broker = std::unique_ptr<ServerDataBroker> {new ServerDataBroker("test", "dbname")};
data_broker->io__ = std::unique_ptr<IO> {&mock_io};
- data_broker->httpclient__ = std::unique_ptr<hidra2::HttpClient> {&mock_http_client};
+ data_broker->httpclient__ = std::unique_ptr<asapo::HttpClient> {&mock_http_client};
}
void TearDown() override {
data_broker->io__.release();
@@ -80,7 +80,7 @@ TEST_F(ServerDataBrokerTests, CanConnect) {
TEST_F(ServerDataBrokerTests, GetNextReturnsErrorOnWrongInput) {
auto return_code = data_broker->GetNext(nullptr, nullptr);
- ASSERT_THAT(return_code->Explain(), Eq(hidra2::WorkerErrorMessage::kWrongInput));
+ ASSERT_THAT(return_code->Explain(), Eq(asapo::WorkerErrorMessage::kWrongInput));
}
@@ -100,8 +100,8 @@ TEST_F(ServerDataBrokerTests, GetNextReturnsErrorFromHttpClient) {
auto err = data_broker->GetNext(&info, nullptr);
- ASSERT_THAT(err->Explain(), HasSubstr(hidra2::WorkerErrorMessage::kSourceNotFound));
- ASSERT_THAT(err->GetErrorType(), hidra2::ErrorType::kHttpError);
+ ASSERT_THAT(err->Explain(), HasSubstr(asapo::WorkerErrorMessage::kSourceNotFound));
+ ASSERT_THAT(err->GetErrorType(), asapo::ErrorType::kHttpError);
ASSERT_THAT(dynamic_cast<HttpError*>(err.get())->GetCode(), Eq(HttpCode::NotFound));
}
@@ -113,8 +113,8 @@ TEST_F(ServerDataBrokerTests, GetNextReturnsEOFFromHttpClient) {
auto err = data_broker->GetNext(&info, nullptr);
- ASSERT_THAT(err->Explain(), HasSubstr(hidra2::WorkerErrorMessage::kNoData));
- ASSERT_THAT(err->GetErrorType(), hidra2::ErrorType::kEndOfFile);
+ ASSERT_THAT(err->Explain(), HasSubstr(asapo::WorkerErrorMessage::kNoData));
+ ASSERT_THAT(err->GetErrorType(), asapo::ErrorType::kEndOfFile);
}
TEST_F(ServerDataBrokerTests, GetNextReturnsEOFFromHttpClientUntilTimeout) {
@@ -126,8 +126,8 @@ TEST_F(ServerDataBrokerTests, GetNextReturnsEOFFromHttpClientUntilTimeout) {
data_broker->SetTimeout(100);
auto err = data_broker->GetNext(&info, nullptr);
- ASSERT_THAT(err->Explain(), HasSubstr(hidra2::WorkerErrorMessage::kNoData));
- ASSERT_THAT(err->GetErrorType(), hidra2::ErrorType::kEndOfFile);
+ ASSERT_THAT(err->Explain(), HasSubstr(asapo::WorkerErrorMessage::kNoData));
+ ASSERT_THAT(err->GetErrorType(), asapo::ErrorType::kEndOfFile);
}
@@ -162,7 +162,7 @@ TEST_F(ServerDataBrokerTests, GetNextReturnsParseError) {
MockGet("error_response");
auto err = data_broker->GetNext(&info, nullptr);
- ASSERT_THAT(err->Explain(), Eq(hidra2::WorkerErrorMessage::kErrorReadingSource));
+ ASSERT_THAT(err->Explain(), Eq(asapo::WorkerErrorMessage::kErrorReadingSource));
}
@@ -180,7 +180,7 @@ TEST_F(ServerDataBrokerTests, GetNextCallsReadFromFile) {
MockGet(json);
EXPECT_CALL(mock_io, GetDataFromFile_t("name", 100, _)).
- WillOnce(DoAll(SetArgPointee<2>(new hidra2::SimpleError{"s"}), testing::Return(nullptr)));
+ WillOnce(DoAll(SetArgPointee<2>(new asapo::SimpleError{"s"}), testing::Return(nullptr)));
FileData data;
data_broker->GetNext(&info, &data);
diff --git a/worker/api/cpp/unittests/test_worker_api.cpp b/worker/api/cpp/unittests/test_worker_api.cpp
index d555b769f40164cd982161861777f29fbd6ac73b..4b36ea3941e6366b95a9e409ed45eefd37c1c6d0 100644
--- a/worker/api/cpp/unittests/test_worker_api.cpp
+++ b/worker/api/cpp/unittests/test_worker_api.cpp
@@ -5,12 +5,12 @@
#include "../src/server_data_broker.h"
#include "common/error.h"
-using hidra2::DataBrokerFactory;
-using hidra2::DataBroker;
-using hidra2::FolderDataBroker;
-using hidra2::ServerDataBroker;
+using asapo::DataBrokerFactory;
+using asapo::DataBroker;
+using asapo::FolderDataBroker;
+using asapo::ServerDataBroker;
-using hidra2::Error;
+using asapo::Error;
using ::testing::Eq;
using ::testing::Ne;
using ::testing::Test;
@@ -22,7 +22,7 @@ class DataBrokerFactoryTests : public Test {
public:
Error error;
void SetUp() override {
- error.reset(new hidra2::SimpleError("SomeErrorToBeOverwritten"));
+ error.reset(new asapo::SimpleError("SomeErrorToBeOverwritten"));
}
};
diff --git a/worker/tools/folder_to_db/src/folder_db_importer.cpp b/worker/tools/folder_to_db/src/folder_db_importer.cpp
index 1bc002c7e1dda0e3502b97527fb314e7795cc531..0116d8a5a79c77155965db0193479540f1e779ff 100644
--- a/worker/tools/folder_to_db/src/folder_db_importer.cpp
+++ b/worker/tools/folder_to_db/src/folder_db_importer.cpp
@@ -7,24 +7,24 @@
#include "database/database.h"
-namespace hidra2 {
+namespace asapo {
using std::chrono::high_resolution_clock;
FolderToDbImporter::FolderToDbImporter() :
- io__{GenerateDefaultIO()}, db_factory__{new hidra2::DatabaseFactory} {
+ io__{GenerateDefaultIO()}, db_factory__{new asapo::DatabaseFactory} {
}
-Error FolderToDbImporter::ConnectToDb(const std::unique_ptr<hidra2::Database>& db) const {
+Error FolderToDbImporter::ConnectToDb(const std::unique_ptr<asapo::Database>& db) const {
return db->Connect(db_uri_, db_name_, kDBCollectionName);
}
-Error FolderToDbImporter::ImportSingleFile(const std::unique_ptr<hidra2::Database>& db,
+Error FolderToDbImporter::ImportSingleFile(const std::unique_ptr<asapo::Database>& db,
const FileInfo& file) const {
return db->Insert(file, ignore_duplicates_);
}
-Error FolderToDbImporter::ImportFilelistChunk(const std::unique_ptr<hidra2::Database>& db,
+Error FolderToDbImporter::ImportFilelistChunk(const std::unique_ptr<asapo::Database>& db,
const FileInfos& file_list, uint64_t begin, uint64_t end) const {
for (auto i = begin; i < end; i++) {
auto err = ImportSingleFile(db, file_list[i]);
@@ -50,7 +50,7 @@ Error FolderToDbImporter::PerformParallelTask(const FileInfos& file_list, uint64
return ImportFilelistChunk(db, file_list, begin, end);
}
-std::unique_ptr<hidra2::Database> FolderToDbImporter::CreateDbClient(Error* err) const {
+std::unique_ptr<asapo::Database> FolderToDbImporter::CreateDbClient(Error* err) const {
return db_factory__->Create(err);
}
diff --git a/worker/tools/folder_to_db/src/folder_db_importer.h b/worker/tools/folder_to_db/src/folder_db_importer.h
index 619d8d2646e6aca866b4553c67198c3f20887e99..45e778dd55a2268ff3eac58cf617f4c2585f73b0 100644
--- a/worker/tools/folder_to_db/src/folder_db_importer.h
+++ b/worker/tools/folder_to_db/src/folder_db_importer.h
@@ -1,5 +1,5 @@
-#ifndef HIDRA2_FOLDERDBCONVERTER_H
-#define HIDRA2_FOLDERDBCONVERTER_H
+#ifndef ASAPO_FOLDERDBCONVERTER_H
+#define ASAPO_FOLDERDBCONVERTER_H
#include <iostream>
#include <chrono>
@@ -9,7 +9,7 @@
#include "io/io.h"
#include "database/database.h"
#include "common/error.h"
-namespace hidra2 {
+namespace asapo {
namespace FolderToDbImportError {
@@ -46,8 +46,8 @@ class FolderToDbImporter {
unsigned int SetNParallelTasks(unsigned int ntasks, bool async = true);
void IgnoreDuplicates(bool ignore_duplicates = true);
- std::unique_ptr<hidra2::IO> io__; // modified in testings to mock system calls,otherwise do not touch
- std::unique_ptr<hidra2::DatabaseFactory>
+ std::unique_ptr<asapo::IO> io__; // modified in testings to mock system calls,otherwise do not touch
+ std::unique_ptr<asapo::DatabaseFactory>
db_factory__; // modified in testings to mock system calls,otherwise do not touch
private:
@@ -56,14 +56,14 @@ class FolderToDbImporter {
bool async_{true};
mutable std::string db_uri_ ;
mutable std::string db_name_;
- Error ConnectToDb(const std::unique_ptr<hidra2::Database>& db) const;
+ Error ConnectToDb(const std::unique_ptr<asapo::Database>& db) const;
FileInfos GetFilesInFolder(const std::string& folder, Error* err) const;
Error ImportFilelist(const FileInfos& file_list) const;
Error PerformParallelTask(const FileInfos& file_list, uint64_t begin,
uint64_t end) const;
- Error ImportSingleFile(const std::unique_ptr<hidra2::Database>& db,
+ Error ImportSingleFile(const std::unique_ptr<asapo::Database>& db,
const FileInfo& file) const;
- Error ImportFilelistChunk(const std::unique_ptr<hidra2::Database>& db,
+ Error ImportFilelistChunk(const std::unique_ptr<asapo::Database>& db,
const FileInfos& file_list, uint64_t begin, uint64_t end) const;
std::unique_ptr<Database> CreateDbClient(Error* err) const;
@@ -74,4 +74,4 @@ class FolderToDbImporter {
}
-#endif //HIDRA2_FOLDERDBCONVERTER_H
+#endif //ASAPO_FOLDERDBCONVERTER_H
diff --git a/worker/tools/folder_to_db/src/main.cpp b/worker/tools/folder_to_db/src/main.cpp
index c0440577a6bc89fdf233765de6aaca20c455b672..7d131ff3a95b8c4bd2e806d1a6b88df61ad5a814 100644
--- a/worker/tools/folder_to_db/src/main.cpp
+++ b/worker/tools/folder_to_db/src/main.cpp
@@ -75,11 +75,11 @@ ConvertParameters ProcessCommandArguments(int argc, char* argv[]) {
int main(int argc, char* argv[]) {
auto import_params = ProcessCommandArguments(argc, argv);
- hidra2::FolderToDbImporter importer;
+ asapo::FolderToDbImporter importer;
importer.SetNParallelTasks(import_params.ntasks);
importer.IgnoreDuplicates(import_params.ignore_duplicates);
- hidra2::FolderImportStatistics statistics;
+ asapo::FolderImportStatistics statistics;
auto err = importer.Convert(import_params.uri, import_params.folder, import_params.db_name,
&statistics);
diff --git a/worker/tools/folder_to_db/unittests/test_folder_to_db.cpp b/worker/tools/folder_to_db/unittests/test_folder_to_db.cpp
index 5746bce28e8ac7b1e2aba9199e1eefe8e85f690c..3eab5452d84e3c5382f3dba4e3849e9fb663ddff 100644
--- a/worker/tools/folder_to_db/unittests/test_folder_to_db.cpp
+++ b/worker/tools/folder_to_db/unittests/test_folder_to_db.cpp
@@ -27,7 +27,7 @@ using ::testing::NiceMock;
using ::testing::Ref;
using ::testing::Return;
-using namespace hidra2;
+using namespace asapo;
namespace {
@@ -85,7 +85,7 @@ class MockDatabaseFactory : public DatabaseFactory {
class FakeDatabaseFactory : public DatabaseFactory {
std::unique_ptr<Database> Create(Error* err) const noexcept override {
- *err = hidra2::TextError(hidra2::DBError::kMemoryError);
+ *err = asapo::TextError(asapo::DBError::kMemoryError);
return {};
}
};
@@ -133,7 +133,7 @@ class FolderDBConverterTests : public Test {
TEST_F(FolderDBConverterTests, ErrorWhenCannotConnect) {
EXPECT_CALL(*(mock_dbf->db[0]), Connect_t(uri, db_name, kDBCollectionName)).
- WillOnce(testing::Return(new SimpleError(hidra2::DBError::kConnectionError)));
+ WillOnce(testing::Return(new SimpleError(asapo::DBError::kConnectionError)));
auto error = converter.Convert(uri, folder, db_name);
ASSERT_THAT(error, Ne(nullptr));
@@ -142,11 +142,11 @@ TEST_F(FolderDBConverterTests, ErrorWhenCannotConnect) {
TEST_F(FolderDBConverterTests, ErrorWhenCannotCreateDbParallel) {
int nparallel = 3;
EXPECT_CALL(*(mock_dbf->db[0]), Connect_t(uri, _, _)).
- WillOnce(testing::Return(new SimpleError(hidra2::DBError::kConnectionError)));
+ WillOnce(testing::Return(new SimpleError(asapo::DBError::kConnectionError)));
EXPECT_CALL(*(mock_dbf->db[1]), Connect_t(uri, _, _)).
- WillOnce(testing::Return(new SimpleError(hidra2::DBError::kConnectionError)));
+ WillOnce(testing::Return(new SimpleError(asapo::DBError::kConnectionError)));
EXPECT_CALL(*(mock_dbf->db[2]), Connect_t(uri, _, _)).
- WillOnce(testing::Return(new SimpleError(hidra2::DBError::kConnectionError)));
+ WillOnce(testing::Return(new SimpleError(asapo::DBError::kConnectionError)));
converter.SetNParallelTasks(nparallel);
auto error = converter.Convert(uri, folder, db_name);
@@ -163,7 +163,7 @@ TEST_F(FolderDBConverterTests, ErrorWhenCannotGetFileList) {
EXPECT_CALL(mock_io, FilesInFolder_t(folder, _)).
- WillOnce(DoAll(testing::SetArgPointee<1>(new hidra2::SimpleError("err")),
+ WillOnce(DoAll(testing::SetArgPointee<1>(new asapo::SimpleError("err")),
testing::Return(FileInfos {})));
auto error = converter.Convert(uri, folder, db_name);
@@ -184,7 +184,7 @@ TEST_F(FolderDBConverterTests, PassesIgnoreDuplicates) {
TEST_F(FolderDBConverterTests, ErrorWhenCannotImportFileListToDb) {
EXPECT_CALL(*(mock_dbf->db[0]), Insert_t(_, _)).
- WillOnce(testing::Return(new SimpleError(hidra2::DBError::kInsertError)));
+ WillOnce(testing::Return(new SimpleError(asapo::DBError::kInsertError)));
auto error = converter.Convert(uri, folder, db_name);
ASSERT_THAT(error, Ne(nullptr));
@@ -245,7 +245,7 @@ TEST_F(FolderDBConverterTests, ComputesStatistics) {
Times(file_infos.size()).
WillRepeatedly(testing::Return(nullptr));
- hidra2::FolderImportStatistics statistics;
+ asapo::FolderImportStatistics statistics;
auto error = converter.Convert(uri, folder, db_name, &statistics);
ASSERT_THAT(error, Eq(nullptr));