MINIFICPP-1299 Fix duplicate header guards
MINIFICPP-1299 Rename CoapIntegrationBase
Rename one of the versions of CoapIntegrationBase to HTTPIntegrationBase.
MINIFICPP-1299 Remove the noop Expression class
This seems to be garbage left over from before the implementation of the real Expression class.
Signed-off-by: Arpad Boda <aboda@apache.org>
This closes #842
diff --git a/extensions/coap/tests/CoapIntegrationBase.h b/extensions/coap/tests/CoapIntegrationBase.h
index ae9a430..ceefc6d 100644
--- a/extensions/coap/tests/CoapIntegrationBase.h
+++ b/extensions/coap/tests/CoapIntegrationBase.h
@@ -15,8 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef LIBMINIFI_TEST_INTEGRATION_HTTPINTEGRATIONBASE_H_
-#define LIBMINIFI_TEST_INTEGRATION_HTTPINTEGRATIONBASE_H_
+#ifndef EXTENSIONS_COAP_TESTS_COAPINTEGRATIONBASE_H
+#define EXTENSIONS_COAP_TESTS_COAPINTEGRATIONBASE_H
#include "../tests/TestServer.h"
#include "CivetServer.h"
@@ -111,4 +111,4 @@
}
}
-#endif /* LIBMINIFI_TEST_INTEGRATION_HTTPINTEGRATIONBASE_H_ */
+#endif // EXTENSIONS_COAP_TESTS_COAPINTEGRATIONBASE_H
diff --git a/extensions/expression-language/impl/expression/Expression.h b/extensions/expression-language/impl/expression/Expression.h
index 47b71d3..c8cb03e 100644
--- a/extensions/expression-language/impl/expression/Expression.h
+++ b/extensions/expression-language/impl/expression/Expression.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef NIFI_MINIFI_CPP_EXPRESSION_H
-#define NIFI_MINIFI_CPP_EXPRESSION_H
+#ifndef EXTENSIONS_EXPRESSIONLANGUAGE_IMPL_EXPRESSION_H
+#define EXTENSIONS_EXPRESSIONLANGUAGE_IMPL_EXPRESSION_H
#define EXPRESSION_LANGUAGE_USE_REGEX
@@ -201,4 +201,4 @@
} /* namespace apache */
} /* namespace org */
-#endif //NIFI_MINIFI_CPP_EXPRESSION_H
+#endif // EXTENSIONS_EXPRESSIONLANGUAGE_IMPL_EXPRESSION_H
diff --git a/extensions/expression-language/noop/CMakeLists.txt b/extensions/expression-language/noop/CMakeLists.txt
deleted file mode 100644
index 7ef550e..0000000
--- a/extensions/expression-language/noop/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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.
-#
-
-message(STATUS "Expression language is disabled; using NoOp implementation")
-file(GLOB SOURCES "*.cpp")
-include_directories(../../../libminifi/include ../../../libminifi/include/core ../../../thirdparty/)
-add_library(minifi-expression-language-extensions STATIC ${SOURCES})
-set_property(TARGET minifi-expression-language-extensions PROPERTY POSITION_INDEPENDENT_CODE ON)
\ No newline at end of file
diff --git a/extensions/expression-language/noop/ProcessContextExprNoOp.cpp b/extensions/expression-language/noop/ProcessContextExprNoOp.cpp
deleted file mode 100644
index 0063c41..0000000
--- a/extensions/expression-language/noop/ProcessContextExprNoOp.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * 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.
- */
-
-#include <core/ProcessContext.h>
-
-namespace org {
-namespace apache {
-namespace nifi {
-namespace minifi {
-namespace core {
-
-bool ProcessContext::getProperty(const Property &property, std::string &value,
- const std::shared_ptr<FlowFile> &flow_file) {
- return getProperty(property.getName(), value);
-}
-
-bool ProcessContext::getDynamicProperty(const Property &property, std::string &value,
- const std::shared_ptr<FlowFile> &flow_file) {
- return getDynamicProperty(property.getName(), value);
-}
-
-} /* namespace core */
-} /* namespace minifi */
-} /* namespace nifi */
-} /* namespace apache */
-} /* namespace org */
diff --git a/extensions/expression-language/noop/expression/Expression.h b/extensions/expression-language/noop/expression/Expression.h
deleted file mode 100644
index 0716d35..0000000
--- a/extensions/expression-language/noop/expression/Expression.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * 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.
- */
-
-#ifndef NIFI_MINIFI_CPP_EXPRESSION_H
-#define NIFI_MINIFI_CPP_EXPRESSION_H
-
-#include <core/FlowFile.h>
-#include <core/VariableRegistry.h>
-#include <Value.h>
-
-namespace org {
-namespace apache {
-namespace nifi {
-namespace minifi {
-namespace expression {
-
-typedef struct {
- std::weak_ptr<core::FlowFile> flow_file;
- std::shared_ptr<core::VariableRegistry> registry_;
-} Parameters;
-
-/**
- * A minimal definition of an Expression with a NoOp implementation.
- */
-class Expression {
- public:
- explicit Expression(std::string, std::function<std::string(const Parameters &)>);
-};
-
-} /* namespace expression */
-} /* namespace minifi */
-} /* namespace nifi */
-} /* namespace apache */
-} /* namespace org */
-
-#endif //NIFI_MINIFI_CPP_EXPRESSION_H
diff --git a/extensions/gps/GetGPSLoader.h b/extensions/gps/GetGPSLoader.h
index 532b1f9..efbcb71 100644
--- a/extensions/gps/GetGPSLoader.h
+++ b/extensions/gps/GetGPSLoader.h
@@ -15,8 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef EXTENSIONS_ROCKSDBLOADER_H
-#define EXTENSIONS_ROCKSDBLOADER_H
+#ifndef EXTENSIONS_GPS_GETGPSLOADER_H
+#define EXTENSIONS_GPS_GETGPSLOADER_H
#include "GetGPS.h"
#include "core/ClassLoader.h"
@@ -62,4 +62,4 @@
extern "C" {
DLL_EXPORT void *createGPSFactory(void);
}
-#endif /* EXTENSIONS_ROCKSDBLOADER_H */
+#endif // EXTENSIONS_GPS_GETGPSLOADER_H
diff --git a/extensions/http-curl/tests/C2NullConfiguration.cpp b/extensions/http-curl/tests/C2NullConfiguration.cpp
index b698c45..07ebeae 100644
--- a/extensions/http-curl/tests/C2NullConfiguration.cpp
+++ b/extensions/http-curl/tests/C2NullConfiguration.cpp
@@ -31,8 +31,8 @@
#include "processors/LogAttribute.h"
#include "HTTPIntegrationBase.h"
-class VerifyC2Server : public CoapIntegrationBase {
- public:
+class VerifyC2Server : public HTTPIntegrationBase {
+public:
explicit VerifyC2Server(bool isSecure)
: isSecure(isSecure) {
char format[] = "/tmp/ssth.XXXXXX";
diff --git a/extensions/http-curl/tests/C2VerifyServeResults.cpp b/extensions/http-curl/tests/C2VerifyServeResults.cpp
index 6304a9d..2f9f36a 100644
--- a/extensions/http-curl/tests/C2VerifyServeResults.cpp
+++ b/extensions/http-curl/tests/C2VerifyServeResults.cpp
@@ -27,8 +27,8 @@
#include "TestServer.h"
#include "HTTPIntegrationBase.h"
-class VerifyC2Server : public CoapIntegrationBase {
- public:
+class VerifyC2Server : public HTTPIntegrationBase {
+public:
explicit VerifyC2Server() {
char format[] = "/tmp/ssth.XXXXXX";
dir = testController.createTempDirectory(format);
diff --git a/extensions/http-curl/tests/HTTPIntegrationBase.h b/extensions/http-curl/tests/HTTPIntegrationBase.h
index 326b50e..c8bbb69 100644
--- a/extensions/http-curl/tests/HTTPIntegrationBase.h
+++ b/extensions/http-curl/tests/HTTPIntegrationBase.h
@@ -15,8 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef LIBMINIFI_TEST_INTEGRATION_HTTPINTEGRATIONBASE_H_
-#define LIBMINIFI_TEST_INTEGRATION_HTTPINTEGRATIONBASE_H_
+#ifndef EXTENSIONS_HTTPCURL_TESTS_HTTPINTEGRATIONBASE_H
+#define EXTENSIONS_HTTPCURL_TESTS_HTTPINTEGRATIONBASE_H
#include "CivetServer.h"
#include "integration/IntegrationBase.h"
@@ -35,14 +35,14 @@
return 0;
}
-class CoapIntegrationBase : public IntegrationBase {
- public:
- explicit CoapIntegrationBase(uint64_t waitTime = DEFAULT_WAITTIME_MSECS)
+class HTTPIntegrationBase : public IntegrationBase {
+public:
+ explicit HTTPIntegrationBase(uint64_t waitTime = DEFAULT_WAITTIME_MSECS)
: IntegrationBase(waitTime),
server(nullptr) {
}
- void setUrl(const std::string& url, ServerAwareHandler *handler);
+ void setUrl(const std::string &url, ServerAwareHandler *handler);
void shutdownBeforeFlowController() override {
server.reset();
@@ -66,7 +66,7 @@
std::unique_ptr<TestServer> server;
};
-void CoapIntegrationBase::setUrl(const std::string& url, ServerAwareHandler *handler) {
+void HTTPIntegrationBase::setUrl(const std::string &url, ServerAwareHandler *handler) {
parse_http_components(url, port, scheme, path);
CivetCallbacks callback{};
if (server) {
@@ -96,8 +96,8 @@
configuration->set("nifi.c2.rest.url.ack", c2_url);
}
-class VerifyC2Base : public CoapIntegrationBase {
- public:
+class VerifyC2Base : public HTTPIntegrationBase {
+public:
void testSetup() override {
LogTestController::getInstance().setDebug<utils::HTTPClient>();
LogTestController::getInstance().setDebug<LogTestController>();
@@ -133,10 +133,10 @@
}
};
-class VerifyC2Update : public CoapIntegrationBase {
- public:
+class VerifyC2Update : public HTTPIntegrationBase {
+public:
explicit VerifyC2Update(uint64_t waitTime)
- : CoapIntegrationBase(waitTime) {
+ : HTTPIntegrationBase(waitTime) {
}
void testSetup() override {
@@ -206,4 +206,4 @@
VerifyC2Update::cleanup();
}
};
-#endif /* LIBMINIFI_TEST_INTEGRATION_HTTPINTEGRATIONBASE_H_ */
+#endif // EXTENSIONS_HTTPCURL_TESTS_HTTPINTEGRATIONBASE_H
diff --git a/extensions/http-curl/tests/HTTPSiteToSiteTests.cpp b/extensions/http-curl/tests/HTTPSiteToSiteTests.cpp
index 26dbc18..febef4f 100644
--- a/extensions/http-curl/tests/HTTPSiteToSiteTests.cpp
+++ b/extensions/http-curl/tests/HTTPSiteToSiteTests.cpp
@@ -34,10 +34,10 @@
#include "HTTPHandlers.h"
#include "client/HTTPStream.h"
-class SiteToSiteTestHarness : public CoapIntegrationBase {
- public:
+class SiteToSiteTestHarness : public HTTPIntegrationBase {
+public:
explicit SiteToSiteTestHarness(bool isSecure, std::chrono::milliseconds waitTime = std::chrono::milliseconds{2000})
- : CoapIntegrationBase(waitTime.count()), isSecure(isSecure) {
+ : HTTPIntegrationBase(waitTime.count()), isSecure(isSecure) {
char format[] = "/tmp/ssth.XXXXXX";
dir = testController.createTempDirectory(format);
}
diff --git a/extensions/http-curl/tests/HttpPostIntegrationTest.cpp b/extensions/http-curl/tests/HttpPostIntegrationTest.cpp
index 7cb7d78..71c2957 100644
--- a/extensions/http-curl/tests/HttpPostIntegrationTest.cpp
+++ b/extensions/http-curl/tests/HttpPostIntegrationTest.cpp
@@ -29,8 +29,8 @@
#include "FlowController.h"
#include "HTTPIntegrationBase.h"
-class HttpTestHarness : public CoapIntegrationBase {
- public:
+class HttpTestHarness : public HTTPIntegrationBase {
+public:
HttpTestHarness() {
char format[] = "/tmp/ssth.XXXXXX";
dir = testController.createTempDirectory(format);
diff --git a/extensions/http-curl/tests/SiteToSiteRestTest.cpp b/extensions/http-curl/tests/SiteToSiteRestTest.cpp
index af23dfc..2c58b9b 100644
--- a/extensions/http-curl/tests/SiteToSiteRestTest.cpp
+++ b/extensions/http-curl/tests/SiteToSiteRestTest.cpp
@@ -59,8 +59,8 @@
bool isSecure;
};
-class SiteToSiteTestHarness : public CoapIntegrationBase {
- public:
+class SiteToSiteTestHarness : public HTTPIntegrationBase {
+public:
explicit SiteToSiteTestHarness(bool isSecure)
: isSecure(isSecure) {
char format[] = "/tmp/ssth.XXXXXX";
diff --git a/extensions/http-curl/tests/TimeoutHTTPSiteToSiteTests.cpp b/extensions/http-curl/tests/TimeoutHTTPSiteToSiteTests.cpp
index 8b7f70d..f723793 100644
--- a/extensions/http-curl/tests/TimeoutHTTPSiteToSiteTests.cpp
+++ b/extensions/http-curl/tests/TimeoutHTTPSiteToSiteTests.cpp
@@ -35,10 +35,10 @@
#include "HTTPHandlers.h"
#include "client/HTTPStream.h"
-class SiteToSiteTestHarness : public CoapIntegrationBase {
+class SiteToSiteTestHarness : public HTTPIntegrationBase {
public:
explicit SiteToSiteTestHarness(bool isSecure, std::chrono::milliseconds waitTime = std::chrono::milliseconds{1000})
- : CoapIntegrationBase(waitTime.count()), isSecure(isSecure) {
+ : HTTPIntegrationBase(waitTime.count()), isSecure(isSecure) {
char format[] = "/tmp/ssth.XXXXXX";
dir = testController.createTempDirectory(format);
}
diff --git a/extensions/http-curl/tests/VerifyInvokeHTTPTest.cpp b/extensions/http-curl/tests/VerifyInvokeHTTPTest.cpp
index a6c193b..74e5324 100644
--- a/extensions/http-curl/tests/VerifyInvokeHTTPTest.cpp
+++ b/extensions/http-curl/tests/VerifyInvokeHTTPTest.cpp
@@ -27,10 +27,10 @@
#include "CivetServer.h"
#include "HTTPIntegrationBase.h"
-class VerifyInvokeHTTP : public CoapIntegrationBase {
+class VerifyInvokeHTTP : public HTTPIntegrationBase {
public:
VerifyInvokeHTTP()
- : CoapIntegrationBase(6000) {
+ : HTTPIntegrationBase(6000) {
}
void testSetup() override {
diff --git a/extensions/rocksdb-repos/RocksDBLoader.h b/extensions/rocksdb-repos/RocksDBLoader.h
index 2d3f4df..c2efc0d 100644
--- a/extensions/rocksdb-repos/RocksDBLoader.h
+++ b/extensions/rocksdb-repos/RocksDBLoader.h
@@ -15,8 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef EXTENSIONS_ROCKSDBLOADER_H
-#define EXTENSIONS_ROCKSDBLOADER_H
+#ifndef EXTENSIONS_ROCKSDBREPOS_ROCKSDBLOADER_H
+#define EXTENSIONS_ROCKSDBREPOS_ROCKSDBLOADER_H
#include "DatabaseContentRepository.h"
#include "FlowFileRepository.h"
@@ -80,4 +80,4 @@
extern "C" {
DLL_EXPORT void *createRocksDBFactory(void);
}
-#endif /* EXTENSIONS_ROCKSDBLOADER_H */
+#endif // EXTENSIONS_ROCKSDBREPOS_ROCKSDBLOADER_H
diff --git a/extensions/sensors/SensorLoader.h b/extensions/sensors/SensorLoader.h
index 981d126..0263cb0 100644
--- a/extensions/sensors/SensorLoader.h
+++ b/extensions/sensors/SensorLoader.h
@@ -15,8 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef EXTENSIONS_ROCKSDBLOADER_H
-#define EXTENSIONS_ROCKSDBLOADER_H
+#ifndef EXTENSIONS_SENSORS_SENSORLOADER_H
+#define EXTENSIONS_SENSORS_SENSORLOADER_H
#include "core/ClassLoader.h"
#include "GetEnvironmentalSensors.h"
@@ -66,4 +66,4 @@
extern "C" {
DLL_EXPORT void *createSensorFactory(void);
}
-#endif /* EXTENSIONS_ROCKSDBLOADER_H */
+#endif // EXTENSIONS_SENSORS_SENSORLOADER_H
