This is an automated email from the ASF dual-hosted git repository.
phrocker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new 293b982 MINIFICPP-17: Move processors to standard-processors in
preparation for future changes.
293b982 is described below
commit 293b982801f6475647a67dddd021325690bec4eb
Author: Marc Parisi <[email protected]>
AuthorDate: Wed Apr 17 16:10:06 2019 -0400
MINIFICPP-17: Move processors to standard-processors in preparation for
future changes.
This closes #538.
Approved on GH By @arpadboda.
MINIFICPP-17: Fix linter error
MINIFICPP-17: Update per comments
Signed-off-by: Marc Parisi <[email protected]>
---
CMakeLists.txt | 3 +
cmake/BuildTests.cmake | 24 ++++---
extensions/coap/tests/CMakeLists.txt | 7 +-
extensions/http-curl/tests/CMakeLists.txt | 10 +--
.../standard-processors}/CMakeLists.txt | 34 +++++-----
.../processors/AppendHostInfo.cpp | 2 +-
.../processors/AppendHostInfo.h | 0
.../processors/ExecuteProcess.cpp | 2 +-
.../processors/ExecuteProcess.h | 0
.../processors/ExtractText.cpp | 2 +-
.../standard-processors}/processors/ExtractText.h | 0
.../processors/GenerateFlowFile.cpp | 2 +-
.../processors/GenerateFlowFile.h | 0
.../standard-processors}/processors/GetFile.cpp | 2 +-
.../standard-processors}/processors/GetFile.h | 2 +-
.../standard-processors}/processors/GetTCP.cpp | 2 +-
.../standard-processors}/processors/GetTCP.h | 0
.../processors/HashContent.cpp | 2 +-
.../standard-processors}/processors/HashContent.h | 0
.../processors/ListenSyslog.cpp | 2 +-
.../standard-processors}/processors/ListenSyslog.h | 0
.../processors/LogAttribute.cpp | 2 +-
.../standard-processors}/processors/LogAttribute.h | 0
.../standard-processors}/processors/PutFile.cpp | 2 +-
.../standard-processors}/processors/PutFile.h | 0
.../processors/RouteOnAttribute.cpp | 2 +-
.../processors/RouteOnAttribute.h | 0
.../standard-processors}/processors/TailFile.cpp | 2 +-
.../standard-processors}/processors/TailFile.h | 0
.../processors/UpdateAttribute.cpp | 2 +-
.../processors/UpdateAttribute.h | 0
.../standard-processors/tests/CMakeLists.txt | 75 ++++++++++++++++++++++
.../tests}/integration/SecureSocketGetTCPTest.cpp | 6 +-
.../tests}/integration/TailFileCronTest.cpp | 4 +-
.../tests}/integration/TailFileTest.cpp | 4 +-
.../tests}/integration/TestExecuteProcess.cpp | 4 +-
.../tests}/unit/ClassLoaderTests.cpp | 2 +-
.../tests}/unit/ControllerServiceTests.cpp | 10 +--
.../tests}/unit/ExtractTextTests.cpp | 8 +--
.../tests}/unit/GetFileTests.cpp | 6 +-
.../tests}/unit/GetTCPTests.cpp | 8 +--
.../tests}/unit/HashContentTest.cpp | 8 +--
.../tests}/unit/ManifestTests.cpp | 6 +-
.../tests}/unit/ProcessorTests.cpp | 8 +--
.../tests}/unit/PutFileTests.cpp | 4 +-
.../tests}/unit/SchedulingAgentTests.cpp | 6 +-
.../tests}/unit/TailFileTests.cpp | 10 +--
.../tests}/unit/UpdateAttributeTests.cpp | 8 +--
.../tests}/unit/YamlConfigurationTests.cpp | 2 +-
libminifi/include/processors/ProcessorUtils.h | 55 ++++++++++++++++
libminifi/src/core/FlowConfiguration.cpp | 48 ++------------
libminifi/src/core/yaml/YamlConfiguration.cpp | 2 +-
.../processors/ProcessorUtils.cpp} | 28 ++++----
libminifi/test/archive-tests/CMakeLists.txt | 5 +-
libminifi/test/bustache-tests/CMakeLists.txt | 5 +-
libminifi/test/civetweb-tests/CMakeLists.txt | 5 +-
libminifi/test/civetweb-tests/CivetwebTests.cpp | 6 +-
.../test/expression-language-tests/CMakeLists.txt | 12 ++--
libminifi/test/gps-tests/CMakeLists.txt | 5 +-
libminifi/test/script-tests/CMakeLists.txt | 8 ++-
libminifi/test/sqlite-tests/CMakeLists.txt | 6 +-
nanofi/CMakeLists.txt | 13 ++--
nanofi/src/api/nanofi.cpp | 7 +-
63 files changed, 309 insertions(+), 181 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4fcaf3..890ab07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -472,6 +472,9 @@ if (WIN32 OR NOT USE_SYSTEM_ZLIB)
add_dependencies(minifi zlib-external)
endif(WIN32 OR NOT USE_SYSTEM_ZLIB)
+createExtension(STANDARD-PROCESSORS "STANDARD PROCESSORS" "Provides standard
processors" "extensions/standard-processors"
"extensions/standard-processors/tests/")
+
+
#### EXTENSIONS
if ((DISABLE_CURL STREQUAL "OFF" OR NOT DISABLE_CURL) AND NOT DISABLE_CIVET)
createExtension(HTTP-CURL "HTTP CURL" "This enables RESTProtocol,
InvokeHTTP, and the HTTPClient for Site to Site" "extensions/http-curl"
"extensions/http-curl/tests/")
diff --git a/cmake/BuildTests.cmake b/cmake/BuildTests.cmake
index 7063e65..591516d 100644
--- a/cmake/BuildTests.cmake
+++ b/cmake/BuildTests.cmake
@@ -135,9 +135,25 @@ FOREACH(testfile ${NANOFI_UNIT_TESTS})
get_filename_component(testfilename "${testfile}" NAME_WE)
add_executable("${testfilename}" "${NANOFI_TEST_DIR}/${testfile}")
target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/nanofi/include")
+ target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors/")
+ target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors/")
target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/libminifi/test")
appendIncludes("${testfilename}")
target_link_libraries(${testfilename} ${CMAKE_THREAD_LIBS_INIT}
${CATCH_MAIN_LIB} nanofi)
+
+ if (APPLE)
+ # minifi-standard-processors
+ target_link_libraries (${testfilename} -Wl,-all_load
minifi-standard-processors nanofi)
+ elseif(NOT WIN32)
+ target_link_libraries (${testfilename} -Wl,--whole-archive
minifi-standard-processors -Wl,--no-whole-archive)
+ else()
+ set(WIN32_ARCHIVES "${WIN32_ARCHIVES}
/WHOLEARCHIVE:minifi-standard-processors")
+ endif ()
+
+ if(WIN32)
+ set_target_properties($Ptestfilename{ PROPERTIES LINK_FLAGS
"${WIN32_ARCHIVES}")
+ endif()
+
MATH(EXPR UNIT_TEST_COUNT "${UNIT_TEST_COUNT}+1")
add_test(NAME "${testfilename}" COMMAND "${testfilename}"
WORKING_DIRECTORY ${TEST_DIR})
ENDFOREACH()
@@ -157,11 +173,3 @@ foreach(EXTENSION ${extensions})
add_subdirectory(${EXTENSION})
endforeach()
-add_test(NAME TestExecuteProcess COMMAND TestExecuteProcess )
-
-add_test(NAME SecureSocketGetTCPTest COMMAND SecureSocketGetTCPTest
"${TEST_RESOURCES}/TestGetTCPSecure.yml" "${TEST_RESOURCES}/")
-
-add_test(NAME TailFileTest COMMAND TailFileTest
"${TEST_RESOURCES}/TestTailFile.yml" "${TEST_RESOURCES}/")
-
-add_test(NAME TailFileCronTest COMMAND TailFileCronTest
"${TEST_RESOURCES}/TestTailFileCron.yml" "${TEST_RESOURCES}/")
-
diff --git a/extensions/coap/tests/CMakeLists.txt
b/extensions/coap/tests/CMakeLists.txt
index 94ac5b1..130284c 100644
--- a/extensions/coap/tests/CMakeLists.txt
+++ b/extensions/coap/tests/CMakeLists.txt
@@ -28,6 +28,7 @@ FOREACH(testfile ${CURL_INTEGRATION_TESTS})
add_executable("${testfilename}" "${testfile}")
target_include_directories(${testfilename} BEFORE PRIVATE
${COAP_INCLUDE_DIRS})
target_include_directories(${testfilename} BEFORE PRIVATE
${CURL_INCLUDE_DIRS})
+ target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors")
target_include_directories(${testfilename} BEFORE PRIVATE
"${CIVET_THIRDPARTY_ROOT}/include")
target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/libminifi/test/")
target_include_directories(${testfilename} BEFORE PRIVATE "../")
@@ -44,9 +45,9 @@ FOREACH(testfile ${CURL_INTEGRATION_TESTS})
target_include_directories(${testfilename} BEFORE PRIVATE ./include)
createTests("${testfilename}")
if (APPLE)
- target_link_libraries ("${testfilename}" -Wl,-all_load ${ZLIB_LIBRARY}
${OPENSSL_LIBRARIES} minifi-http-curl minifi-coap minifi-civet-extensions)
+ target_link_libraries ("${testfilename}" -Wl,-all_load ${ZLIB_LIBRARY}
${OPENSSL_LIBRARIES} minifi-http-curl minifi-coap minifi-civet-extensions
minifi-standard-processors)
else ()
- target_link_libraries ("${testfilename}" -Wl,--whole-archive
${ZLIB_LIBRARY} ${OPENSSL_LIBRARIES} minifi-http-curl minifi-coap
minifi-civet-extensions -Wl,--no-whole-archive)
+ target_link_libraries ("${testfilename}" -Wl,--whole-archive
${ZLIB_LIBRARY} ${OPENSSL_LIBRARIES} minifi-http-curl minifi-coap
minifi-civet-extensions minifi-standard-processors -Wl,--no-whole-archive)
endif()
MATH(EXPR CURL_INT_TEST_COUNT "${CURL_INT_TEST_COUNT}+1")
ENDFOREACH()
@@ -56,4 +57,4 @@ message("-- Finished building ${CURL_INT_TEST_COUNT} CoAP
integration test file(
add_test(NAME CoapC2VerifyHeartbeat COMMAND CoapC2VerifyHeartbeat
"${TEST_RESOURCES}/CoapC2VerifyServe.yml" "${TEST_RESOURCES}/"
"http://localhost:9888/geturl";)
else()
message("-- CoAP tests rely on minifi-http-curl, so they will not be built...")
-endif()
\ No newline at end of file
+endif()
diff --git a/extensions/http-curl/tests/CMakeLists.txt
b/extensions/http-curl/tests/CMakeLists.txt
index fd66412..620b8e8 100644
--- a/extensions/http-curl/tests/CMakeLists.txt
+++ b/extensions/http-curl/tests/CMakeLists.txt
@@ -28,6 +28,7 @@ FOREACH(testfile ${CURL_UNIT_TESTS})
target_include_directories(${testfilename} BEFORE PRIVATE
${CURL_INCLUDE_DIRS})
target_include_directories(${testfilename} BEFORE PRIVATE
"${CIVET_THIRDPARTY_ROOT}")
target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors/")
target_include_directories(${testfilename} BEFORE PRIVATE "../")
target_include_directories(${testfilename} BEFORE PRIVATE "../client/")
target_include_directories(${testfilename} BEFORE PRIVATE
"../processors/")
@@ -38,9 +39,9 @@ FOREACH(testfile ${CURL_UNIT_TESTS})
createTests("${testfilename}")
target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
if (APPLE)
- target_link_libraries ("${testfilename}" -Wl,-all_load ${ZLIB_LIBRARY}
${OPENSSL_LIBRARIES} minifi-http-curl minifi-civet-extensions)
+ target_link_libraries ("${testfilename}" -Wl,-all_load ${ZLIB_LIBRARY}
${OPENSSL_LIBRARIES} minifi-http-curl minifi-civet-extensions
minifi-standard-processors)
else ()
- target_link_libraries ("${testfilename}" -Wl,--whole-archive
${ZLIB_LIBRARY} ${OPENSSL_LIBRARIES} minifi-http-curl minifi-civet-extensions
-Wl,--no-whole-archive)
+ target_link_libraries ("${testfilename}" -Wl,--whole-archive
${ZLIB_LIBRARY} ${OPENSSL_LIBRARIES} minifi-http-curl minifi-civet-extensions
minifi-standard-processors -Wl,--no-whole-archive)
endif()
MATH(EXPR CURL_INT_TEST_COUNT "${CURL_INT_TEST_COUNT}+1")
ENDFOREACH()
@@ -51,6 +52,7 @@ FOREACH(testfile ${CURL_INTEGRATION_TESTS})
target_include_directories(${testfilename} BEFORE PRIVATE
${CURL_INCLUDE_DIRS})
target_include_directories(${testfilename} BEFORE PRIVATE
"${CIVET_THIRDPARTY_ROOT}/include")
target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors/")
target_include_directories(${testfilename} BEFORE PRIVATE "../")
target_include_directories(${testfilename} BEFORE PRIVATE "../client/")
target_include_directories(${testfilename} BEFORE PRIVATE
"../processors/")
@@ -59,9 +61,9 @@ FOREACH(testfile ${CURL_INTEGRATION_TESTS})
target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/civetweb/")
target_include_directories(${testfilename} BEFORE PRIVATE ./include)
if (APPLE)
- target_link_libraries ("${testfilename}" -Wl,-all_load ${ZLIB_LIBRARY}
${OPENSSL_LIBRARIES} minifi-http-curl minifi-civet-extensions)
+ target_link_libraries ("${testfilename}" -Wl,-all_load ${ZLIB_LIBRARY}
${OPENSSL_LIBRARIES} minifi-http-curl minifi-civet-extensions
minifi-standard-processors)
else ()
- target_link_libraries ("${testfilename}" -Wl,--whole-archive
${ZLIB_LIBRARY} ${OPENSSL_LIBRARIES} minifi-http-curl minifi-civet-extensions
-Wl,--no-whole-archive)
+ target_link_libraries ("${testfilename}" -Wl,--whole-archive
${ZLIB_LIBRARY} ${OPENSSL_LIBRARIES} minifi-http-curl minifi-civet-extensions
minifi-standard-processors -Wl,--no-whole-archive)
endif()
createTests("${testfilename}")
MATH(EXPR CURL_INT_TEST_COUNT "${CURL_INT_TEST_COUNT}+1")
diff --git a/libminifi/test/gps-tests/CMakeLists.txt
b/extensions/standard-processors/CMakeLists.txt
similarity index 50%
copy from libminifi/test/gps-tests/CMakeLists.txt
copy to extensions/standard-processors/CMakeLists.txt
index 25da504..dcba19a 100644
--- a/libminifi/test/gps-tests/CMakeLists.txt
+++ b/extensions/standard-processors/CMakeLists.txt
@@ -17,19 +17,21 @@
# under the License.
#
-file(GLOB GPS_INTEGRATION_TESTS "*.cpp")
-SET(GPS_TEST_COUNT 0)
-FOREACH(testfile ${GPS_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/gps/")
- createTests("${testfilename}")
- if (APPLE)
- target_link_libraries (${testfilename} -Wl,-all_load minifi-gps)
- else ()
- target_link_libraries (${testfilename} -Wl,--whole-archive
minifi-gps -Wl,--no-whole-archive)
- endif ()
- MATH(EXPR GPS_TEST_COUNT "${GPS_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}"
WORKING_DIRECTORY ${TEST_DIR})
-ENDFOREACH()
-message("-- Finished building ${GPS_TEST_COUNT} GPS related test file(s)...")
+
+include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
+
+file(GLOB SOURCES "processors/*.cpp" )
+
+add_library(minifi-standard-processors STATIC ${SOURCES})
+set_property(TARGET minifi-standard-processors PROPERTY
POSITION_INDEPENDENT_CODE ON)
+if(THREADS_HAVE_PTHREAD_ARG)
+ target_compile_options(PUBLIC minifi-standard-processors "-pthread")
+endif()
+if(CMAKE_THREAD_LIBS_INIT)
+ target_link_libraries(minifi-standard-processors "${CMAKE_THREAD_LIBS_INIT}")
+endif()
+
+
+
+SET (STANDARD-PROCESSORS minifi-standard-processors PARENT_SCOPE)
+register_extension(minifi-standard-processors)
diff --git a/libminifi/src/processors/AppendHostInfo.cpp
b/extensions/standard-processors/processors/AppendHostInfo.cpp
similarity index 98%
rename from libminifi/src/processors/AppendHostInfo.cpp
rename to extensions/standard-processors/processors/AppendHostInfo.cpp
index 8769de2..0966f09 100644
--- a/libminifi/src/processors/AppendHostInfo.cpp
+++ b/extensions/standard-processors/processors/AppendHostInfo.cpp
@@ -17,7 +17,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "processors/AppendHostInfo.h"
+#include "AppendHostInfo.h"
#define __USE_POSIX
#include <limits.h>
#include <string.h>
diff --git a/libminifi/include/processors/AppendHostInfo.h
b/extensions/standard-processors/processors/AppendHostInfo.h
similarity index 100%
rename from libminifi/include/processors/AppendHostInfo.h
rename to extensions/standard-processors/processors/AppendHostInfo.h
diff --git a/libminifi/src/processors/ExecuteProcess.cpp
b/extensions/standard-processors/processors/ExecuteProcess.cpp
similarity index 99%
rename from libminifi/src/processors/ExecuteProcess.cpp
rename to extensions/standard-processors/processors/ExecuteProcess.cpp
index 3b0e075..5c72ffb 100644
--- a/libminifi/src/processors/ExecuteProcess.cpp
+++ b/extensions/standard-processors/processors/ExecuteProcess.cpp
@@ -17,7 +17,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "processors/ExecuteProcess.h"
+#include "ExecuteProcess.h"
#include <cstring>
#include <memory>
#include <string>
diff --git a/libminifi/include/processors/ExecuteProcess.h
b/extensions/standard-processors/processors/ExecuteProcess.h
similarity index 100%
rename from libminifi/include/processors/ExecuteProcess.h
rename to extensions/standard-processors/processors/ExecuteProcess.h
diff --git a/libminifi/src/processors/ExtractText.cpp
b/extensions/standard-processors/processors/ExtractText.cpp
similarity index 99%
rename from libminifi/src/processors/ExtractText.cpp
rename to extensions/standard-processors/processors/ExtractText.cpp
index d1a5c0d..7d2bf89 100644
--- a/libminifi/src/processors/ExtractText.cpp
+++ b/extensions/standard-processors/processors/ExtractText.cpp
@@ -26,7 +26,7 @@
#include <iostream>
#include <sstream>
-#include "processors/ExtractText.h"
+#include "ExtractText.h"
#include "core/ProcessContext.h"
#include "core/ProcessSession.h"
#include "core/FlowFile.h"
diff --git a/libminifi/include/processors/ExtractText.h
b/extensions/standard-processors/processors/ExtractText.h
similarity index 100%
rename from libminifi/include/processors/ExtractText.h
rename to extensions/standard-processors/processors/ExtractText.h
diff --git a/libminifi/src/processors/GenerateFlowFile.cpp
b/extensions/standard-processors/processors/GenerateFlowFile.cpp
similarity index 99%
rename from libminifi/src/processors/GenerateFlowFile.cpp
rename to extensions/standard-processors/processors/GenerateFlowFile.cpp
index a1b62ec..8a2e03b 100644
--- a/libminifi/src/processors/GenerateFlowFile.cpp
+++ b/extensions/standard-processors/processors/GenerateFlowFile.cpp
@@ -17,7 +17,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "processors/GenerateFlowFile.h"
+#include "GenerateFlowFile.h"
#include <time.h>
#include <vector>
#include <queue>
diff --git a/libminifi/include/processors/GenerateFlowFile.h
b/extensions/standard-processors/processors/GenerateFlowFile.h
similarity index 100%
rename from libminifi/include/processors/GenerateFlowFile.h
rename to extensions/standard-processors/processors/GenerateFlowFile.h
diff --git a/libminifi/src/processors/GetFile.cpp
b/extensions/standard-processors/processors/GetFile.cpp
similarity index 99%
rename from libminifi/src/processors/GetFile.cpp
rename to extensions/standard-processors/processors/GetFile.cpp
index 8d8feeb..b50d6fc 100644
--- a/libminifi/src/processors/GetFile.cpp
+++ b/extensions/standard-processors/processors/GetFile.cpp
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "processors/GetFile.h"
+#include "GetFile.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <time.h>
diff --git a/libminifi/include/processors/GetFile.h
b/extensions/standard-processors/processors/GetFile.h
similarity index 99%
rename from libminifi/include/processors/GetFile.h
rename to extensions/standard-processors/processors/GetFile.h
index 38f0251..8328820 100644
--- a/libminifi/include/processors/GetFile.h
+++ b/extensions/standard-processors/processors/GetFile.h
@@ -20,7 +20,7 @@
#include <atomic>
-#include "../core/state/nodes/MetricsBase.h"
+#include "core/state/nodes/MetricsBase.h"
#include "FlowFileRecord.h"
#include "core/Processor.h"
#include "core/ProcessSession.h"
diff --git a/libminifi/src/processors/GetTCP.cpp
b/extensions/standard-processors/processors/GetTCP.cpp
similarity index 99%
rename from libminifi/src/processors/GetTCP.cpp
rename to extensions/standard-processors/processors/GetTCP.cpp
index 026a291..11c99af 100644
--- a/libminifi/src/processors/GetTCP.cpp
+++ b/extensions/standard-processors/processors/GetTCP.cpp
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "processors/GetTCP.h"
+#include "GetTCP.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <time.h>
diff --git a/libminifi/include/processors/GetTCP.h
b/extensions/standard-processors/processors/GetTCP.h
similarity index 100%
rename from libminifi/include/processors/GetTCP.h
rename to extensions/standard-processors/processors/GetTCP.h
diff --git a/libminifi/src/processors/HashContent.cpp
b/extensions/standard-processors/processors/HashContent.cpp
similarity index 99%
rename from libminifi/src/processors/HashContent.cpp
rename to extensions/standard-processors/processors/HashContent.cpp
index b8c2587..5f85e5c 100644
--- a/libminifi/src/processors/HashContent.cpp
+++ b/extensions/standard-processors/processors/HashContent.cpp
@@ -24,7 +24,7 @@
#include <iostream>
#include <memory>
#include <string>
-#include "processors/HashContent.h"
+#include "HashContent.h"
#include "core/ProcessContext.h"
#include "core/ProcessSession.h"
#include "core/FlowFile.h"
diff --git a/libminifi/include/processors/HashContent.h
b/extensions/standard-processors/processors/HashContent.h
similarity index 100%
rename from libminifi/include/processors/HashContent.h
rename to extensions/standard-processors/processors/HashContent.h
diff --git a/libminifi/src/processors/ListenSyslog.cpp
b/extensions/standard-processors/processors/ListenSyslog.cpp
similarity index 99%
rename from libminifi/src/processors/ListenSyslog.cpp
rename to extensions/standard-processors/processors/ListenSyslog.cpp
index a3b332d..17cc094 100644
--- a/libminifi/src/processors/ListenSyslog.cpp
+++ b/extensions/standard-processors/processors/ListenSyslog.cpp
@@ -17,7 +17,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "processors/ListenSyslog.h"
+#include "ListenSyslog.h"
#include <stdio.h>
#include <memory>
#include <string>
diff --git a/libminifi/include/processors/ListenSyslog.h
b/extensions/standard-processors/processors/ListenSyslog.h
similarity index 100%
rename from libminifi/include/processors/ListenSyslog.h
rename to extensions/standard-processors/processors/ListenSyslog.h
diff --git a/libminifi/src/processors/LogAttribute.cpp
b/extensions/standard-processors/processors/LogAttribute.cpp
similarity index 99%
rename from libminifi/src/processors/LogAttribute.cpp
rename to extensions/standard-processors/processors/LogAttribute.cpp
index ee94ece..678d12c 100644
--- a/libminifi/src/processors/LogAttribute.cpp
+++ b/extensions/standard-processors/processors/LogAttribute.cpp
@@ -17,7 +17,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "processors/LogAttribute.h"
+#include "LogAttribute.h"
#include <time.h>
#include <string.h>
#include <memory>
diff --git a/libminifi/include/processors/LogAttribute.h
b/extensions/standard-processors/processors/LogAttribute.h
similarity index 100%
rename from libminifi/include/processors/LogAttribute.h
rename to extensions/standard-processors/processors/LogAttribute.h
diff --git a/libminifi/src/processors/PutFile.cpp
b/extensions/standard-processors/processors/PutFile.cpp
similarity index 99%
rename from libminifi/src/processors/PutFile.cpp
rename to extensions/standard-processors/processors/PutFile.cpp
index 72ec850..acd0442 100644
--- a/libminifi/src/processors/PutFile.cpp
+++ b/extensions/standard-processors/processors/PutFile.cpp
@@ -18,7 +18,7 @@
* limitations under the License.
*/
-#include "processors/PutFile.h"
+#include "PutFile.h"
#include "utils/file/FileUtils.h"
#include <sys/stat.h>
#include <uuid/uuid.h>
diff --git a/libminifi/include/processors/PutFile.h
b/extensions/standard-processors/processors/PutFile.h
similarity index 100%
rename from libminifi/include/processors/PutFile.h
rename to extensions/standard-processors/processors/PutFile.h
diff --git a/libminifi/src/processors/RouteOnAttribute.cpp
b/extensions/standard-processors/processors/RouteOnAttribute.cpp
similarity index 98%
rename from libminifi/src/processors/RouteOnAttribute.cpp
rename to extensions/standard-processors/processors/RouteOnAttribute.cpp
index ad63bcd..7df8924 100644
--- a/libminifi/src/processors/RouteOnAttribute.cpp
+++ b/extensions/standard-processors/processors/RouteOnAttribute.cpp
@@ -18,7 +18,7 @@
* limitations under the License.
*/
-#include "processors/RouteOnAttribute.h"
+#include "RouteOnAttribute.h"
#include <memory>
#include <string>
diff --git a/libminifi/include/processors/RouteOnAttribute.h
b/extensions/standard-processors/processors/RouteOnAttribute.h
similarity index 100%
rename from libminifi/include/processors/RouteOnAttribute.h
rename to extensions/standard-processors/processors/RouteOnAttribute.h
diff --git a/libminifi/src/processors/TailFile.cpp
b/extensions/standard-processors/processors/TailFile.cpp
similarity index 99%
rename from libminifi/src/processors/TailFile.cpp
rename to extensions/standard-processors/processors/TailFile.cpp
index bfbf21e..71314b5 100644
--- a/libminifi/src/processors/TailFile.cpp
+++ b/extensions/standard-processors/processors/TailFile.cpp
@@ -38,7 +38,7 @@
#include <iostream>
#include "utils/TimeUtil.h"
#include "utils/StringUtils.h"
-#include "processors/TailFile.h"
+#include "TailFile.h"
#include "core/ProcessContext.h"
#include "core/ProcessSession.h"
diff --git a/libminifi/include/processors/TailFile.h
b/extensions/standard-processors/processors/TailFile.h
similarity index 100%
rename from libminifi/include/processors/TailFile.h
rename to extensions/standard-processors/processors/TailFile.h
diff --git a/libminifi/src/processors/UpdateAttribute.cpp
b/extensions/standard-processors/processors/UpdateAttribute.cpp
similarity index 98%
rename from libminifi/src/processors/UpdateAttribute.cpp
rename to extensions/standard-processors/processors/UpdateAttribute.cpp
index 80b0215..66743d7 100644
--- a/libminifi/src/processors/UpdateAttribute.cpp
+++ b/extensions/standard-processors/processors/UpdateAttribute.cpp
@@ -18,7 +18,7 @@
* limitations under the License.
*/
-#include "processors/UpdateAttribute.h"
+#include "UpdateAttribute.h"
#include <memory>
#include <string>
diff --git a/libminifi/include/processors/UpdateAttribute.h
b/extensions/standard-processors/processors/UpdateAttribute.h
similarity index 100%
rename from libminifi/include/processors/UpdateAttribute.h
rename to extensions/standard-processors/processors/UpdateAttribute.h
diff --git a/extensions/standard-processors/tests/CMakeLists.txt
b/extensions/standard-processors/tests/CMakeLists.txt
new file mode 100644
index 0000000..ba685b2
--- /dev/null
+++ b/extensions/standard-processors/tests/CMakeLists.txt
@@ -0,0 +1,75 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+
+file(GLOB PROCESSOR_UNIT_TESTS "unit/*.cpp")
+file(GLOB PROCESSOR_INTEGRATION_TESTS "integration/*.cpp")
+
+SET(PROCESSOR_INT_TEST_COUNT 0)
+
+FOREACH(testfile ${PROCESSOR_UNIT_TESTS})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE
${PROCESSOR_INCLUDE_DIRS})
+ target_include_directories(${testfilename} BEFORE PRIVATE
"${CIVET_THIRDPARTY_ROOT}")
+ target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../")
+ target_include_directories(${testfilename} BEFORE PRIVATE
"../processors")
+ target_include_directories(${testfilename} BEFORE PRIVATE ./include)
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
+ if (APPLE)
+ target_link_libraries ("${testfilename}" -Wl,-all_load ${ZLIB_LIBRARY}
${OPENSSL_LIBRARIES} minifi-standard-processors minifi-civet-extensions)
+ else ()
+ target_link_libraries ("${testfilename}" -Wl,--whole-archive
${ZLIB_LIBRARY} ${OPENSSL_LIBRARIES} minifi-standard-processors
minifi-civet-extensions -Wl,--no-whole-archive)
+ endif()
+ MATH(EXPR PROCESSOR_INT_TEST_COUNT "${PROCESSOR_INT_TEST_COUNT}+1")
+ENDFOREACH()
+
+
+
+SET(INT_TEST_COUNT 0)
+FOREACH(testfile ${PROCESSOR_INTEGRATION_TESTS})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE
${PROCESSOR_INCLUDE_DIRS})
+ target_include_directories(${testfilename} BEFORE PRIVATE
"${CIVET_THIRDPARTY_ROOT}")
+ target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../")
+ target_include_directories(${testfilename} BEFORE PRIVATE
"../processors")
+ target_include_directories(${testfilename} BEFORE PRIVATE ./include)
+ createTests("${testfilename}")
+ if (APPLE)
+ target_link_libraries ("${testfilename}" -Wl,-all_load ${ZLIB_LIBRARY}
${OPENSSL_LIBRARIES} minifi-standard-processors minifi-civet-extensions)
+ else ()
+ target_link_libraries ("${testfilename}" -Wl,--whole-archive
${ZLIB_LIBRARY} ${OPENSSL_LIBRARIES} minifi-standard-processors
minifi-civet-extensions -Wl,--no-whole-archive)
+ endif()
+ MATH(EXPR INT_TEST_COUNT "${INT_TEST_COUNT}+1")
+ENDFOREACH()
+message("-- Finished building ${INT_TEST_COUNT} integration test file(s)...")
+
+
+add_test(NAME TestExecuteProcess COMMAND TestExecuteProcess )
+
+add_test(NAME SecureSocketGetTCPTest COMMAND SecureSocketGetTCPTest
"${TEST_RESOURCES}/TestGetTCPSecure.yml" "${TEST_RESOURCES}/")
+
+add_test(NAME TailFileTest COMMAND TailFileTest
"${TEST_RESOURCES}/TestTailFile.yml" "${TEST_RESOURCES}/")
+
+add_test(NAME TailFileCronTest COMMAND TailFileCronTest
"${TEST_RESOURCES}/TestTailFileCron.yml" "${TEST_RESOURCES}/")
+
diff --git a/libminifi/test/integration/SecureSocketGetTCPTest.cpp
b/extensions/standard-processors/tests/integration/SecureSocketGetTCPTest.cpp
similarity index 98%
rename from libminifi/test/integration/SecureSocketGetTCPTest.cpp
rename to
extensions/standard-processors/tests/integration/SecureSocketGetTCPTest.cpp
index c12cc1d..aefcf55 100644
--- a/libminifi/test/integration/SecureSocketGetTCPTest.cpp
+++
b/extensions/standard-processors/tests/integration/SecureSocketGetTCPTest.cpp
@@ -31,7 +31,7 @@
#include <sstream>
#include "HTTPClient.h"
#include "processors/GetTCP.h"
-#include "../TestBase.h"
+#include "TestBase.h"
#include "utils/StringUtils.h"
#include "core/Core.h"
#include "core/logging/Logger.h"
@@ -39,13 +39,13 @@
#include "core/yaml/YamlConfiguration.h"
#include "FlowController.h"
#include "properties/Configure.h"
-#include "../unit/ProvenanceTestHelper.h"
+#include "unit/ProvenanceTestHelper.h"
#include "io/StreamFactory.h"
#include "RemoteProcessorGroupPort.h"
#include "core/ConfigurableComponent.h"
#include "controllers/SSLContextService.h"
#include "c2/C2Agent.h"
-#include "IntegrationBase.h"
+#include "integration/IntegrationBase.h"
#include "processors/LogAttribute.h"
#include "io/tls/TLSSocket.h"
#include "io/tls/TLSServerSocket.h"
diff --git a/libminifi/test/integration/TailFileCronTest.cpp
b/extensions/standard-processors/tests/integration/TailFileCronTest.cpp
similarity index 98%
rename from libminifi/test/integration/TailFileCronTest.cpp
rename to extensions/standard-processors/tests/integration/TailFileCronTest.cpp
index b3c2f31..3432070 100644
--- a/libminifi/test/integration/TailFileCronTest.cpp
+++ b/extensions/standard-processors/tests/integration/TailFileCronTest.cpp
@@ -36,11 +36,11 @@
#include "core/yaml/YamlConfiguration.h"
#include "FlowController.h"
#include "properties/Configure.h"
-#include "../TestBase.h"
+#include "TestBase.h"
#include "processors/TailFile.h"
#include "processors/LogAttribute.h"
#include "state/ProcessorController.h"
-#include "IntegrationBase.h"
+#include "integration/IntegrationBase.h"
class TailFileTestHarness : public IntegrationBase {
public:
diff --git a/libminifi/test/integration/TailFileTest.cpp
b/extensions/standard-processors/tests/integration/TailFileTest.cpp
similarity index 98%
rename from libminifi/test/integration/TailFileTest.cpp
rename to extensions/standard-processors/tests/integration/TailFileTest.cpp
index b3c2f31..3432070 100644
--- a/libminifi/test/integration/TailFileTest.cpp
+++ b/extensions/standard-processors/tests/integration/TailFileTest.cpp
@@ -36,11 +36,11 @@
#include "core/yaml/YamlConfiguration.h"
#include "FlowController.h"
#include "properties/Configure.h"
-#include "../TestBase.h"
+#include "TestBase.h"
#include "processors/TailFile.h"
#include "processors/LogAttribute.h"
#include "state/ProcessorController.h"
-#include "IntegrationBase.h"
+#include "integration/IntegrationBase.h"
class TailFileTestHarness : public IntegrationBase {
public:
diff --git a/libminifi/test/integration/TestExecuteProcess.cpp
b/extensions/standard-processors/tests/integration/TestExecuteProcess.cpp
similarity index 98%
rename from libminifi/test/integration/TestExecuteProcess.cpp
rename to
extensions/standard-processors/tests/integration/TestExecuteProcess.cpp
index b68a83c..7c5e458 100644
--- a/libminifi/test/integration/TestExecuteProcess.cpp
+++ b/extensions/standard-processors/tests/integration/TestExecuteProcess.cpp
@@ -29,7 +29,7 @@
#include <vector>
#include <fstream>
#include "core/repository/VolatileContentRepository.h"
-#include "../unit/ProvenanceTestHelper.h"
+#include "unit/ProvenanceTestHelper.h"
#include "FlowController.h"
#include "processors/GetFile.h"
#include "core/Core.h"
@@ -41,7 +41,7 @@
#include "core/ProcessContext.h"
#include "core/ProcessSession.h"
#include "core/ProcessorNode.h"
-#include "../TestBase.h"
+#include "TestBase.h"
int main(int argc, char **argv) {
TestController testController;
diff --git a/libminifi/test/unit/ClassLoaderTests.cpp
b/extensions/standard-processors/tests/unit/ClassLoaderTests.cpp
similarity index 98%
rename from libminifi/test/unit/ClassLoaderTests.cpp
rename to extensions/standard-processors/tests/unit/ClassLoaderTests.cpp
index ec3a470..fdc0b26 100644
--- a/libminifi/test/unit/ClassLoaderTests.cpp
+++ b/extensions/standard-processors/tests/unit/ClassLoaderTests.cpp
@@ -16,7 +16,7 @@
* limitations under the License.
*/
#include <uuid/uuid.h>
-#include "../TestBase.h"
+#include "TestBase.h"
#include "io/ClientSocket.h"
#include "core/Processor.h"
#include "core/ClassLoader.h"
diff --git a/libminifi/test/unit/ControllerServiceTests.cpp
b/extensions/standard-processors/tests/unit/ControllerServiceTests.cpp
similarity index 94%
rename from libminifi/test/unit/ControllerServiceTests.cpp
rename to extensions/standard-processors/tests/unit/ControllerServiceTests.cpp
index 2d609d6..fc53aa3 100644
--- a/libminifi/test/unit/ControllerServiceTests.cpp
+++ b/extensions/standard-processors/tests/unit/ControllerServiceTests.cpp
@@ -20,14 +20,14 @@
#include <string>
#include <fstream>
#include "FlowController.h"
-#include "../TestBase.h"
+#include "TestBase.h"
#include "properties/Configure.h"
-#include "processors/GetFile.h"
+#include "GetFile.h"
#include "core/Core.h"
#include "Exception.h"
-#include "../../include/core/FlowFile.h"
-#include "../unit/MockClasses.h"
-#include "../unit/ProvenanceTestHelper.h"
+#include "core/FlowFile.h"
+#include "unit/MockClasses.h"
+#include "unit/ProvenanceTestHelper.h"
#include "core/yaml/YamlConfiguration.h"
#include "core/Processor.h"
#include "core/controller/ControllerServiceMap.h"
diff --git a/libminifi/test/unit/ExtractTextTests.cpp
b/extensions/standard-processors/tests/unit/ExtractTextTests.cpp
similarity index 98%
rename from libminifi/test/unit/ExtractTextTests.cpp
rename to extensions/standard-processors/tests/unit/ExtractTextTests.cpp
index fd5604e..db804e5 100644
--- a/libminifi/test/unit/ExtractTextTests.cpp
+++ b/extensions/standard-processors/tests/unit/ExtractTextTests.cpp
@@ -25,7 +25,7 @@
#include <set>
#include <iostream>
-#include "../TestBase.h"
+#include "TestBase.h"
#include "core/Core.h"
#include "core/FlowFile.h"
@@ -34,9 +34,9 @@
#include "core/ProcessSession.h"
#include "core/ProcessorNode.h"
-#include "processors/GetFile.h"
-#include "processors/ExtractText.h"
-#include "processors/LogAttribute.h"
+#include "GetFile.h"
+#include "ExtractText.h"
+#include "LogAttribute.h"
const char* TEST_TEXT = "Test text\n";
const char* REGEX_TEST_TEXT = "Speed limit 130 | Speed limit 80";
diff --git a/libminifi/test/unit/GetFileTests.cpp
b/extensions/standard-processors/tests/unit/GetFileTests.cpp
similarity index 96%
rename from libminifi/test/unit/GetFileTests.cpp
rename to extensions/standard-processors/tests/unit/GetFileTests.cpp
index 1960c70..7289034 100644
--- a/libminifi/test/unit/GetFileTests.cpp
+++ b/extensions/standard-processors/tests/unit/GetFileTests.cpp
@@ -23,9 +23,9 @@
#include <fstream>
-#include "../TestBase.h"
-#include "processors/LogAttribute.h"
-#include "processors/GetFile.h"
+#include "TestBase.h"
+#include "LogAttribute.h"
+#include "GetFile.h"
TEST_CASE("GetFile: FIFO", "[getFileFifo]") { // NOLINT
TestController testController;
diff --git a/libminifi/test/unit/GetTCPTests.cpp
b/extensions/standard-processors/tests/unit/GetTCPTests.cpp
similarity index 99%
rename from libminifi/test/unit/GetTCPTests.cpp
rename to extensions/standard-processors/tests/unit/GetTCPTests.cpp
index c9f8718..a5d9962 100644
--- a/libminifi/test/unit/GetTCPTests.cpp
+++ b/extensions/standard-processors/tests/unit/GetTCPTests.cpp
@@ -22,11 +22,11 @@
#include <vector>
#include <set>
#include <fstream>
-#include "../unit/ProvenanceTestHelper.h"
-#include "../TestBase.h"
+#include "unit/ProvenanceTestHelper.h"
+#include "TestBase.h"
#include "Scheduling.h"
-#include "processors/LogAttribute.h"
-#include "processors/GetTCP.h"
+#include "LogAttribute.h"
+#include "GetTCP.h"
#include "core/Core.h"
#include "core/FlowFile.h"
#include "core/Processor.h"
diff --git a/libminifi/test/unit/HashContentTest.cpp
b/extensions/standard-processors/tests/unit/HashContentTest.cpp
similarity index 97%
rename from libminifi/test/unit/HashContentTest.cpp
rename to extensions/standard-processors/tests/unit/HashContentTest.cpp
index e7fba41..8cdac33 100644
--- a/libminifi/test/unit/HashContentTest.cpp
+++ b/extensions/standard-processors/tests/unit/HashContentTest.cpp
@@ -27,7 +27,7 @@
#include <set>
#include <iostream>
-#include "../TestBase.h"
+#include "TestBase.h"
#include "core/Core.h"
#include "core/FlowFile.h"
@@ -36,9 +36,9 @@
#include "core/ProcessSession.h"
#include "core/ProcessorNode.h"
-#include "processors/GetFile.h"
-#include "processors/HashContent.h"
-#include "processors/LogAttribute.h"
+#include "GetFile.h"
+#include "HashContent.h"
+#include "LogAttribute.h"
const char* TEST_TEXT = "Test text";
const char* TEST_FILE = "test_file.txt";
diff --git a/libminifi/test/unit/ManifestTests.cpp
b/extensions/standard-processors/tests/unit/ManifestTests.cpp
similarity index 97%
rename from libminifi/test/unit/ManifestTests.cpp
rename to extensions/standard-processors/tests/unit/ManifestTests.cpp
index 130966f..962c869 100644
--- a/libminifi/test/unit/ManifestTests.cpp
+++ b/extensions/standard-processors/tests/unit/ManifestTests.cpp
@@ -18,9 +18,9 @@
#include <memory>
-#include "../../include/core/Processor.h"
-#include "../../include/core/state/nodes/AgentInformation.h"
-#include "../TestBase.h"
+#include "core/Processor.h"
+#include "core/state/nodes/AgentInformation.h"
+#include "TestBase.h"
#include "io/ClientSocket.h"
#include "core/Processor.h"
#include "core/ClassLoader.h"
diff --git a/libminifi/test/unit/ProcessorTests.cpp
b/extensions/standard-processors/tests/unit/ProcessorTests.cpp
similarity index 99%
rename from libminifi/test/unit/ProcessorTests.cpp
rename to extensions/standard-processors/tests/unit/ProcessorTests.cpp
index 592013c..a319178 100644
--- a/libminifi/test/unit/ProcessorTests.cpp
+++ b/extensions/standard-processors/tests/unit/ProcessorTests.cpp
@@ -23,10 +23,10 @@
#include <set>
#include <fstream>
-#include "../TestBase.h"
-#include "processors/LogAttribute.h"
-#include "processors/GetFile.h"
-#include "../unit/ProvenanceTestHelper.h"
+#include "TestBase.h"
+#include "LogAttribute.h"
+#include "GetFile.h"
+#include "unit/ProvenanceTestHelper.h"
#include "core/Core.h"
#include "core/FlowFile.h"
#include "core/Processor.h"
diff --git a/libminifi/test/unit/PutFileTests.cpp
b/extensions/standard-processors/tests/unit/PutFileTests.cpp
similarity index 99%
rename from libminifi/test/unit/PutFileTests.cpp
rename to extensions/standard-processors/tests/unit/PutFileTests.cpp
index 467ce14..cc34f4b 100644
--- a/libminifi/test/unit/PutFileTests.cpp
+++ b/extensions/standard-processors/tests/unit/PutFileTests.cpp
@@ -26,11 +26,11 @@
#include "utils/file/FileUtils.h"
-#include "../TestBase.h"
+#include "TestBase.h"
#include "processors/LogAttribute.h"
#include "processors/GetFile.h"
#include "processors/PutFile.h"
-#include "../unit/ProvenanceTestHelper.h"
+#include "unit/ProvenanceTestHelper.h"
#include "core/Core.h"
#include "core/FlowFile.h"
#include "core/Processor.h"
diff --git a/libminifi/test/unit/SchedulingAgentTests.cpp
b/extensions/standard-processors/tests/unit/SchedulingAgentTests.cpp
similarity index 93%
copy from libminifi/test/unit/SchedulingAgentTests.cpp
copy to extensions/standard-processors/tests/unit/SchedulingAgentTests.cpp
index 8604069..dfd848a 100644
--- a/libminifi/test/unit/SchedulingAgentTests.cpp
+++ b/extensions/standard-processors/tests/unit/SchedulingAgentTests.cpp
@@ -21,9 +21,9 @@
#include <vector>
#include "io/CRCStream.h"
#include "io/DataStream.h"
-#include "../TestBase.h"
-#include "processors/GetFile.h"
-#include "processors/LogAttribute.h"
+#include "TestBase.h"
+#include "GetFile.h"
+#include "LogAttribute.h"
#include "SchedulingAgent.h"
#include "TimerDrivenSchedulingAgent.h"
diff --git a/libminifi/test/unit/TailFileTests.cpp
b/extensions/standard-processors/tests/unit/TailFileTests.cpp
similarity index 98%
rename from libminifi/test/unit/TailFileTests.cpp
rename to extensions/standard-processors/tests/unit/TailFileTests.cpp
index b6241ce..d23622f 100644
--- a/libminifi/test/unit/TailFileTests.cpp
+++ b/extensions/standard-processors/tests/unit/TailFileTests.cpp
@@ -24,16 +24,16 @@
#include <string>
#include <set>
#include "FlowController.h"
-#include "../TestBase.h"
+#include "TestBase.h"
#include "core/Core.h"
-#include "../../include/core/FlowFile.h"
-#include "../unit/ProvenanceTestHelper.h"
+#include "core/FlowFile.h"
+#include "unit/ProvenanceTestHelper.h"
#include "core/Processor.h"
#include "core/ProcessContext.h"
#include "core/ProcessSession.h"
#include "core/ProcessorNode.h"
-#include "processors/TailFile.h"
-#include "processors/LogAttribute.h"
+#include "TailFile.h"
+#include "LogAttribute.h"
#include <iostream>
static const char *NEWLINE_FILE = ""
diff --git a/libminifi/test/unit/UpdateAttributeTests.cpp
b/extensions/standard-processors/tests/unit/UpdateAttributeTests.cpp
similarity index 93%
rename from libminifi/test/unit/UpdateAttributeTests.cpp
rename to extensions/standard-processors/tests/unit/UpdateAttributeTests.cpp
index fe68515..a14a65c 100644
--- a/libminifi/test/unit/UpdateAttributeTests.cpp
+++ b/extensions/standard-processors/tests/unit/UpdateAttributeTests.cpp
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "../TestBase.h"
+#include "TestBase.h"
#include <memory>
-#include "processors/LogAttribute.h"
-#include "processors/UpdateAttribute.h"
-#include "processors/GenerateFlowFile.h"
+#include "LogAttribute.h"
+#include "UpdateAttribute.h"
+#include "GenerateFlowFile.h"
TEST_CASE("UpdateAttributeTest", "[updateAttributeTest]") {
TestController testController;
diff --git a/libminifi/test/unit/YamlConfigurationTests.cpp
b/extensions/standard-processors/tests/unit/YamlConfigurationTests.cpp
similarity index 99%
rename from libminifi/test/unit/YamlConfigurationTests.cpp
rename to extensions/standard-processors/tests/unit/YamlConfigurationTests.cpp
index ca4c0ae..f358d7b 100644
--- a/libminifi/test/unit/YamlConfigurationTests.cpp
+++ b/extensions/standard-processors/tests/unit/YamlConfigurationTests.cpp
@@ -21,7 +21,7 @@
#include "core/repository/VolatileContentRepository.h"
#include <core/RepositoryFactory.h>
#include "core/yaml/YamlConfiguration.h"
-#include "../TestBase.h"
+#include "TestBase.h"
TEST_CASE("Test YAML Config Processing", "[YamlConfiguration]") {
TestController test_controller;
diff --git a/libminifi/include/processors/ProcessorUtils.h
b/libminifi/include/processors/ProcessorUtils.h
new file mode 100644
index 0000000..d6ad3e3
--- /dev/null
+++ b/libminifi/include/processors/ProcessorUtils.h
@@ -0,0 +1,55 @@
+#include <string>
+#include <memory>
+#include <vector>
+#include <core/ConfigurableComponent.h>
+#include <core/Processor.h>
+
+namespace org {
+namespace apache {
+namespace nifi {
+namespace minifi {
+namespace processors {
+
+class ProcessorUtils {
+ public:
+ /**
+ * Instantiates and configures a processor
+ * @param class_short_name short name of the class
+ * @param canonicalName full class name ( canonical name )
+ * @param uuid uuid object for the processor
+ * @param stream_factory stream factory to be set onto the processor
+ */
+ static inline std::shared_ptr<core::Processor> createProcessor(const
std::string &class_short_name, const std::string &canonicalName,
utils::Identifier &uuid,
+ const
std::shared_ptr<minifi::io::StreamFactory> &stream_factory) {
+ auto ptr =
core::ClassLoader::getDefaultClassLoader().instantiate(class_short_name, uuid);
+ if (ptr == nullptr) {
+ ptr =
core::ClassLoader::getDefaultClassLoader().instantiate("ExecuteJavaClass",
uuid);
+ if (ptr != nullptr) {
+ std::shared_ptr<core::Processor> processor =
std::static_pointer_cast<core::Processor>(ptr);
+ processor->initialize();
+ processor->setProperty("NiFi Processor", canonicalName);
+ processor->setStreamFactory(stream_factory);
+ return processor;
+ }
+ }
+ if (nullptr == ptr) {
+ return nullptr;
+ }
+ auto returnPtr = std::static_pointer_cast<core::Processor>(ptr);
+
+ returnPtr->initialize();
+
+ returnPtr->setStreamFactory(stream_factory);
+
+ return returnPtr;
+
+ }
+ private:
+ ProcessorUtils();
+};
+
+} /* namespace processors */
+} /* namespace minifi */
+} /* namespace nifi */
+} /* namespace apache */
+} /* namespace org */
diff --git a/libminifi/src/core/FlowConfiguration.cpp
b/libminifi/src/core/FlowConfiguration.cpp
index ec1348d..1842c21 100644
--- a/libminifi/src/core/FlowConfiguration.cpp
+++ b/libminifi/src/core/FlowConfiguration.cpp
@@ -22,6 +22,7 @@
#include <string>
#include "core/ClassLoader.h"
#include "utils/StringUtils.h"
+#include "processors/ProcessorUtils.h"
namespace org {
namespace apache {
@@ -38,62 +39,27 @@ FlowConfiguration::~FlowConfiguration() {
}
std::shared_ptr<core::Processor>
FlowConfiguration::createProcessor(std::string name, utils::Identifier & uuid) {
- auto ptr = core::ClassLoader::getDefaultClassLoader().instantiate(name,
uuid);
- if (ptr == nullptr) {
- ptr =
core::ClassLoader::getDefaultClassLoader().instantiate("ExecuteJavaClass",
uuid);
- if (ptr != nullptr) {
- std::shared_ptr<core::Processor> processor =
std::static_pointer_cast<core::Processor>(ptr);
- processor->initialize();
- processor->setProperty("NiFi Processor", name);
- processor->setStreamFactory(stream_factory_);
- return processor;
- }
- }
- if (nullptr == ptr) {
+ auto processor = minifi::processors::ProcessorUtils::createProcessor(name,
name, uuid, stream_factory_);
+ if (nullptr == processor) {
logger_->log_error("No Processor defined for %s", name);
return nullptr;
}
- std::shared_ptr<core::Processor> processor =
std::static_pointer_cast<core::Processor>(ptr);
-
- // initialize the processor
- processor->initialize();
-
- processor->setStreamFactory(stream_factory_);
return processor;
}
std::shared_ptr<core::Processor> FlowConfiguration::createProcessor(const
std::string &name, const std::string &fullname, utils::Identifier & uuid) {
- auto ptr = core::ClassLoader::getDefaultClassLoader().instantiate(name,
uuid);
- if (ptr == nullptr) {
- ptr =
core::ClassLoader::getDefaultClassLoader().instantiate("ExecuteJavaClass",
uuid);
- if (ptr != nullptr) {
- std::shared_ptr<core::Processor> processor =
std::static_pointer_cast<core::Processor>(ptr);
- processor->initialize();
- processor->setProperty("NiFi Processor", fullname);
- processor->setStreamFactory(stream_factory_);
- return processor;
- }
- }
- if (nullptr == ptr) {
- logger_->log_error("No Processor defined for %s", name);
+ auto processor = minifi::processors::ProcessorUtils::createProcessor(name,
fullname, uuid, stream_factory_);
+ if (nullptr == processor) {
+ logger_->log_error("No Processor defined for %s", fullname);
return nullptr;
}
- std::shared_ptr<core::Processor> processor =
std::static_pointer_cast<core::Processor>(ptr);
-
- // initialize the processor
- processor->initialize();
-
- processor->setStreamFactory(stream_factory_);
return processor;
}
std::shared_ptr<core::Processor>
FlowConfiguration::createProvenanceReportTask() {
- std::shared_ptr<core::Processor> processor = nullptr;
-
- processor =
std::make_shared<org::apache::nifi::minifi::core::reporting::SiteToSiteProvenanceReportingTask>(stream_factory_,
this->configuration_);
+ std::shared_ptr<core::Processor> processor =
std::make_shared<org::apache::nifi::minifi::core::reporting::SiteToSiteProvenanceReportingTask>(stream_factory_,
this->configuration_);
// initialize the processor
processor->initialize();
-
return processor;
}
diff --git a/libminifi/src/core/yaml/YamlConfiguration.cpp
b/libminifi/src/core/yaml/YamlConfiguration.cpp
index cc4fc3d..0cd2851 100644
--- a/libminifi/src/core/yaml/YamlConfiguration.cpp
+++ b/libminifi/src/core/yaml/YamlConfiguration.cpp
@@ -661,7 +661,7 @@ void YamlConfiguration::parseConnectionYaml(YAML::Node
*connectionsNode, core::P
std::string expiration = connectionNode["flowfile
expiration"].as<std::string>();
TimeUnit unit;
if (core::Property::StringToTime(expiration, expirationDuration,
unit) && core::Property::ConvertTimeUnitToMS(expirationDuration, unit,
expirationDuration)) {
- logger_->log_debug("parseConnection: flowfile expiration => [%s]",
expirationDuration);
+ logger_->log_debug("parseConnection: flowfile expiration => [%d]",
expirationDuration);
connection->setFlowExpirationDuration(expirationDuration);
}
}
diff --git a/libminifi/test/unit/SchedulingAgentTests.cpp
b/libminifi/src/processors/ProcessorUtils.cpp
similarity index 60%
rename from libminifi/test/unit/SchedulingAgentTests.cpp
rename to libminifi/src/processors/ProcessorUtils.cpp
index 8604069..83150bb 100644
--- a/libminifi/test/unit/SchedulingAgentTests.cpp
+++ b/libminifi/src/processors/ProcessorUtils.cpp
@@ -1,4 +1,5 @@
/**
+ * TailFile class implementation
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,20 +17,19 @@
* limitations under the License.
*/
-#include <memory>
-#include <string>
-#include <vector>
-#include "io/CRCStream.h"
-#include "io/DataStream.h"
-#include "../TestBase.h"
-#include "processors/GetFile.h"
-#include "processors/LogAttribute.h"
-#include "SchedulingAgent.h"
-#include "TimerDrivenSchedulingAgent.h"
+#include "processors/ProcessorUtils.h"
+namespace org {
+namespace apache {
+namespace nifi {
+namespace minifi {
+namespace processors {
-TEST_CASE("TestTDAgent", "[test1]") {
- std::shared_ptr<core::Processor> procA =
std::make_shared<minifi::processors::GetFile>("getFile");
- std::shared_ptr<core::Processor> procB =
std::make_shared<minifi::processors::LogAttribute>("logAttribute");
- // agent.run()
+ProcessorUtils::ProcessorUtils() {
}
+
+} /* namespace processors */
+} /* namespace minifi */
+} /* namespace nifi */
+} /* namespace apache */
+} /* namespace org */
diff --git a/libminifi/test/archive-tests/CMakeLists.txt
b/libminifi/test/archive-tests/CMakeLists.txt
index ca8810e..63b76ea 100644
--- a/libminifi/test/archive-tests/CMakeLists.txt
+++ b/libminifi/test/archive-tests/CMakeLists.txt
@@ -24,11 +24,12 @@ FOREACH(testfile ${ARCHIVE_INTEGRATION_TESTS})
get_filename_component(testfilename "${testfile}" NAME_WE)
add_executable("${testfilename}" "${testfile}"
"${TEST_DIR}/archive-tests/util/ArchiveTests.cpp")
target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/libarchive")
+ target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors")
target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/thirdparty/libarchive-3.3.2/libarchive")
if (APPLE)
- target_link_libraries (${testfilename} ${ZLIB_LIBRARIES}
-Wl,-all_load minifi-archive-extensions)
+ target_link_libraries (${testfilename} ${ZLIB_LIBRARIES}
-Wl,-all_load minifi-archive-extensions minifi-standard-processors)
else ()
- target_link_libraries (${testfilename} ${ZLIB_LIBRARIES}
-Wl,--whole-archive minifi-archive-extensions -Wl,--no-whole-archive)
+ target_link_libraries (${testfilename} ${ZLIB_LIBRARIES}
-Wl,--whole-archive minifi-archive-extensions minifi-standard-processors
-Wl,--no-whole-archive)
endif ()
createTests("${testfilename}")
target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
diff --git a/libminifi/test/bustache-tests/CMakeLists.txt
b/libminifi/test/bustache-tests/CMakeLists.txt
index e63790a..a7c2cfa 100644
--- a/libminifi/test/bustache-tests/CMakeLists.txt
+++ b/libminifi/test/bustache-tests/CMakeLists.txt
@@ -24,12 +24,13 @@ FOREACH(testfile ${BUSTACHE_INTEGRATION_TESTS})
get_filename_component(testfilename "${testfile}" NAME_WE)
add_executable("${testfilename}" "${testfile}")
target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/bustache")
+ target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors")
target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/thirdparty/bustache/include")
if (APPLE)
- target_link_libraries (${testfilename} -Wl,-all_load
minifi-bustache-extensions)
+ target_link_libraries (${testfilename} -Wl,-all_load
minifi-bustache-extensions minifi-standard-processors)
else ()
- target_link_libraries (${testfilename} -Wl,--whole-archive
minifi-bustache-extensions -Wl,--no-whole-archive)
+ target_link_libraries (${testfilename} -Wl,--whole-archive
minifi-bustache-extensions minifi-standard-processors -Wl,--no-whole-archive)
endif ()
createTests("${testfilename}")
diff --git a/libminifi/test/civetweb-tests/CMakeLists.txt
b/libminifi/test/civetweb-tests/CMakeLists.txt
index bb2c866..3b77db5 100644
--- a/libminifi/test/civetweb-tests/CMakeLists.txt
+++ b/libminifi/test/civetweb-tests/CMakeLists.txt
@@ -24,12 +24,13 @@ FOREACH(testfile ${CIVETWEB_INTEGRATION_TESTS})
get_filename_component(testfilename "${testfile}" NAME_WE)
add_executable("${testfilename}" "${testfile}")
target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/civetweb")
+ target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors")
target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/thirdparty/civetweb-1.10/include")
if (APPLE)
- target_link_libraries (${testfilename} -Wl,-all_load ${ZLIB_LIBRARIES}
${OPENSSL_LIBRARIES} minifi-civet-extensions minifi-http-curl)
+ target_link_libraries (${testfilename} -Wl,-all_load ${ZLIB_LIBRARIES}
${OPENSSL_LIBRARIES} minifi-civet-extensions minifi-http-curl
minifi-standard-processors)
else ()
- target_link_libraries (${testfilename} -Wl,--whole-archive
${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} minifi-civet-extensions minifi-http-curl
-Wl,--no-whole-archive)
+ target_link_libraries (${testfilename} -Wl,--whole-archive
${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} minifi-civet-extensions minifi-http-curl
minifi-standard-processors -Wl,--no-whole-archive)
endif ()
createTests("${testfilename}")
diff --git a/libminifi/test/civetweb-tests/CivetwebTests.cpp
b/libminifi/test/civetweb-tests/CivetwebTests.cpp
index 8971e64..7018150 100644
--- a/libminifi/test/civetweb-tests/CivetwebTests.cpp
+++ b/libminifi/test/civetweb-tests/CivetwebTests.cpp
@@ -22,9 +22,9 @@
#include <memory>
#include <set>
#include <iostream>
-#include <GenerateFlowFile.h>
-#include <UpdateAttribute.h>
-#include <LogAttribute.h>
+#include <processors/GenerateFlowFile.h>
+#include <processors/UpdateAttribute.h>
+#include <processors/LogAttribute.h>
#include <processors/ListenHTTP.h>
#include "../TestBase.h"
diff --git a/libminifi/test/expression-language-tests/CMakeLists.txt
b/libminifi/test/expression-language-tests/CMakeLists.txt
index 890931d..320a1e4 100644
--- a/libminifi/test/expression-language-tests/CMakeLists.txt
+++ b/libminifi/test/expression-language-tests/CMakeLists.txt
@@ -25,13 +25,15 @@ SET(EXTENSIONS_TEST_COUNT 0)
FOREACH(testfile ${EXPRESSION_LANGUAGE_TESTS})
get_filename_component(testfilename "${testfile}" NAME_WE)
add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/expression-language")
createTests("${testfilename}")
target_link_libraries(${testfilename} ${CATCH_MAIN_LIB})
if (APPLE)
- target_link_libraries ("${testfilename}" -Wl,-all_load
minifi-expression-language-extensions )
+ target_link_libraries ("${testfilename}" -Wl,-all_load
minifi-expression-language-extensions minifi-standard-processors)
else ()
- target_link_libraries ("${testfilename}" -Wl,--whole-archive
minifi-expression-language-extensions -Wl,--no-whole-archive)
+ target_link_libraries ("${testfilename}" -Wl,--whole-archive
minifi-expression-language-extensions minifi-standard-processors
-Wl,--no-whole-archive)
endif()
MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
add_test(NAME "${testfilename}" COMMAND "${testfilename}"
WORKING_DIRECTORY ${TEST_DIR})
@@ -47,12 +49,14 @@ SET(INT_EXTENSIONS_TEST_COUNT 0)
FOREACH(testfile ${INT_EXPRESSION_LANGUAGE_TESTS})
get_filename_component(testfilename "${testfile}" NAME_WE)
add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/expression-language")
createTests("${testfilename}")
if (APPLE)
- target_link_libraries ("${testfilename}" -Wl,-all_load
minifi-expression-language-extensions )
+ target_link_libraries ("${testfilename}" -Wl,-all_load
minifi-expression-language-extensions minifi-standard-processors)
else ()
- target_link_libraries ("${testfilename}" -Wl,--whole-archive
minifi-expression-language-extensions -Wl,--no-whole-archive)
+ target_link_libraries ("${testfilename}" -Wl,--whole-archive
minifi-expression-language-extensions minifi-standard-processors
-Wl,--no-whole-archive)
endif()
MATH(EXPR EXTENSIONS_TEST_COUNT "${INT_EXTENSIONS_TEST_COUNT}+1")
ENDFOREACH()
diff --git a/libminifi/test/gps-tests/CMakeLists.txt
b/libminifi/test/gps-tests/CMakeLists.txt
index 25da504..fdb9af0 100644
--- a/libminifi/test/gps-tests/CMakeLists.txt
+++ b/libminifi/test/gps-tests/CMakeLists.txt
@@ -22,12 +22,13 @@ SET(GPS_TEST_COUNT 0)
FOREACH(testfile ${GPS_INTEGRATION_TESTS})
get_filename_component(testfilename "${testfile}" NAME_WE)
add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors")
target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/gps/")
createTests("${testfilename}")
if (APPLE)
- target_link_libraries (${testfilename} -Wl,-all_load minifi-gps)
+ target_link_libraries (${testfilename} -Wl,-all_load minifi-gps
minifi-standard-processors)
else ()
- target_link_libraries (${testfilename} -Wl,--whole-archive
minifi-gps -Wl,--no-whole-archive)
+ target_link_libraries (${testfilename} -Wl,--whole-archive
minifi-gps minifi-standard-processors -Wl,--no-whole-archive)
endif ()
MATH(EXPR GPS_TEST_COUNT "${GPS_TEST_COUNT}+1")
add_test(NAME "${testfilename}" COMMAND "${testfilename}"
WORKING_DIRECTORY ${TEST_DIR})
diff --git a/libminifi/test/script-tests/CMakeLists.txt
b/libminifi/test/script-tests/CMakeLists.txt
index f46783f..b2311ed 100644
--- a/libminifi/test/script-tests/CMakeLists.txt
+++ b/libminifi/test/script-tests/CMakeLists.txt
@@ -31,13 +31,14 @@ FOREACH(testfile ${EXECUTESCRIPT_PYTHON_INTEGRATION_TESTS})
get_filename_component(testfilename "${testfile}" NAME_WE)
add_executable("${testfilename}" "${testfile}")
target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/script")
+ target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors")
target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/script/python")
target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/thirdparty/pybind11/include")
add_definitions(-DPYTHON_SUPPORT)
if (APPLE)
- target_link_libraries ("${testfilename}" -Wl,-all_load
${ZLIB_LIBRARIES} minifi-script-extensions )
+ target_link_libraries ("${testfilename}" -Wl,-all_load
${ZLIB_LIBRARIES} minifi-script-extensions minifi-standard-processors )
else ()
- target_link_libraries ("${testfilename}" -Wl,--whole-archive
${ZLIB_LIBRARIES} minifi-script-extensions -Wl,--no-whole-archive)
+ target_link_libraries ("${testfilename}" -Wl,--whole-archive
${ZLIB_LIBRARIES} minifi-script-extensions minifi-standard-processors
-Wl,--no-whole-archive)
endif()
createTests("${testfilename}")
MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
@@ -48,13 +49,14 @@ FOREACH(testfile ${EXECUTESCRIPT_LUA_INTEGRATION_TESTS})
get_filename_component(testfilename "${testfile}" NAME_WE)
add_executable("${testfilename}" "${testfile}")
target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/script")
+ target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors")
target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/script/lua")
target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/thirdparty/sol2-2.17.5")
add_definitions(-DLUA_SUPPORT)
if (APPLE)
target_link_libraries ("${testfilename}" -Wl,-all_load
${ZLIB_LIBRARIES} minifi-script-extensions )
else ()
- target_link_libraries ("${testfilename}" -Wl,--whole-archive
${ZLIB_LIBRARIES} minifi-script-extensions -Wl,--no-whole-archive)
+ target_link_libraries ("${testfilename}" -Wl,--whole-archive
${ZLIB_LIBRARIES} minifi-script-extensions minifi-standard-processors
-Wl,--no-whole-archive)
endif()
createTests("${testfilename}")
MATH(EXPR EXTENSIONS_TEST_COUNT "${EXTENSIONS_TEST_COUNT}+1")
diff --git a/libminifi/test/sqlite-tests/CMakeLists.txt
b/libminifi/test/sqlite-tests/CMakeLists.txt
index f1d9470..c039101 100644
--- a/libminifi/test/sqlite-tests/CMakeLists.txt
+++ b/libminifi/test/sqlite-tests/CMakeLists.txt
@@ -22,13 +22,15 @@ SET(SQLITE-EXTENSIONS_TEST_COUNT 0)
FOREACH(testfile ${SQLITE_INTEGRATION_TESTS})
get_filename_component(testfilename "${testfile}" NAME_WE)
add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/extensions/sqlite")
target_include_directories(${testfilename} PRIVATE BEFORE
"${CMAKE_SOURCE_DIR}/thirdparty/sqlite")
if (APPLE)
- target_link_libraries (${testfilename} -Wl,-all_load
minifi-sqlite-extensions)
+ target_link_libraries (${testfilename} -Wl,-all_load
minifi-sqlite-extensions minifi-standard-processors)
else ()
- target_link_libraries (${testfilename} -Wl,--whole-archive
minifi-sqlite-extensions -Wl,--no-whole-archive)
+ target_link_libraries (${testfilename} -Wl,--whole-archive
minifi-sqlite-extensions minifi-standard-processors -Wl,--no-whole-archive)
endif ()
createTests("${testfilename}")
diff --git a/nanofi/CMakeLists.txt b/nanofi/CMakeLists.txt
index 059ab55..c3279c2 100644
--- a/nanofi/CMakeLists.txt
+++ b/nanofi/CMakeLists.txt
@@ -62,14 +62,17 @@ endif()
add_library(nanofi STATIC ${NANOFI_SOURCES})
if (APPLE)
- target_link_libraries (nanofi -Wl,-all_load core-minifi minifi)
+ target_link_libraries (nanofi -Wl,-all_load core-minifi minifi
minifi-standard-processors)
elseif(NOT WIN32)
- target_link_libraries (nanofi -Wl,--whole-archive core-minifi minifi
-Wl,--no-whole-archive)
+ target_link_libraries (nanofi -Wl,--whole-archive core-minifi minifi
minifi-standard-processors -Wl,--no-whole-archive)
else()
set(WIN32_ARCHIVES "${WIN32_ARCHIVES} /WHOLEARCHIVE:core-minifi")
set(WIN32_ARCHIVES "${WIN32_ARCHIVES} /WHOLEARCHIVE:minifi")
+ set(WIN32_ARCHIVES "${WIN32_ARCHIVES}
/WHOLEARCHIVE:minifi-standard-processors")
endif ()
+add_dependencies(nanofi minifi-standard-processors)
+
if(WIN32)
set_target_properties(nanofi PROPERTIES LINK_FLAGS "${WIN32_ARCHIVES}")
endif()
@@ -79,14 +82,16 @@ if (ENABLE_PYTHON AND NOT STATIC_BUILD)
add_library(nanofi-shared SHARED ${NANOFI_SOURCES})
if (APPLE)
- target_link_libraries (nanofi-shared -Wl,-all_load core-minifi-shared
minifi-shared)
+ target_link_libraries (nanofi-shared -Wl,-all_load core-minifi-shared
minifi-shared minifi-standard-processors)
elseif(NOT WIN32)
- target_link_libraries (nanofi-shared -Wl,--whole-archive
core-minifi-shared minifi-shared -Wl,--no-whole-archive)
+ target_link_libraries (nanofi-shared -Wl,--whole-archive
core-minifi-shared minifi-shared minifi-standard-processors
-Wl,--no-whole-archive)
else()
set(WIN32_ARCHIVES "${WIN32_ARCHIVES} /WHOLEARCHIVE:core-minifi-shared")
set(WIN32_ARCHIVES "${WIN32_ARCHIVES} /WHOLEARCHIVE:minifi-shared")
+ set(WIN32_ARCHIVES "${WIN32_ARCHIVES}
/WHOLEARCHIVE:minifi-standard-processors")
endif ()
+add_dependencies(nanofi-shared minifi-standard-processors)
if(WIN32)
set_target_properties(nanofi-shared PROPERTIES LINK_FLAGS
"${WIN32_ARCHIVES}")
diff --git a/nanofi/src/api/nanofi.cpp b/nanofi/src/api/nanofi.cpp
index 71bb50b..6b9fa8e 100644
--- a/nanofi/src/api/nanofi.cpp
+++ b/nanofi/src/api/nanofi.cpp
@@ -29,7 +29,6 @@
#include "cxx/Plan.h"
#include "cxx/CallbackProcessor.h"
#include "ResourceClaim.h"
-#include "processors/GetFile.h"
#include "core/logging/LoggerConfiguration.h"
#include "utils/StringUtils.h"
#include "io/DataStream.h"
@@ -480,9 +479,9 @@ flow * create_getfile(nifi_instance * instance, flow *
parent_flow, GetFileConfi
// automatically adds it with success
auto getFile = new_flow->addProcessor(first_processor, first_processor);
- new_flow->setProperty(getFile, processors::GetFile::Directory.getName(),
c->directory);
- new_flow->setProperty(getFile,
processors::GetFile::KeepSourceFile.getName(), c->keep_source ? "true" :
"false");
- new_flow->setProperty(getFile, processors::GetFile::Recurse.getName(),
c->recurse ? "true" : "false");
+ new_flow->setProperty(getFile, "Input Directory", c->directory);
+ new_flow->setProperty(getFile, "Keep Source File ", c->keep_source ? "true"
: "false");
+ new_flow->setProperty(getFile, "Recurse Subdirectories", c->recurse ? "true"
: "false");
return new_flow;
}
