Skip to content

Commit c1f65b2

Browse files
adamdebreceniadamdebreceni
committed
MINIFICPP-2840 - More refactor
1 parent a74b7d1 commit c1f65b2

5 files changed

Lines changed: 73 additions & 77 deletions

File tree

‎extensions/rocksdb-repos/tests/ProvenanceTests.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ TEST_CASE("Test Provenance record serialization", "[Testprovenance::ProvenanceEv
5252
record1->setEventDuration(sample);
5353

5454
testRepository->storeElement(record1);
55-
auto record2 = std::make_shared<provenance::ProvenanceEventRecordImpl>();
55+
auto record2 = provenance::ProvenanceEventRecord::create();
5656
record2->setEventId(eventId);
5757
REQUIRE(record2->loadFromRepository(testRepository) == true);
5858
REQUIRE(record2->getEventId() == record1->getEventId());
@@ -77,7 +77,7 @@ TEST_CASE("Test Flowfile record added to provenance", "[TestFlowAndProv1]") {
7777
record1->setEventDuration(sample);
7878

7979
testRepository->storeElement(record1);
80-
auto record2 = std::make_shared<provenance::ProvenanceEventRecordImpl>();
80+
auto record2 = provenance::ProvenanceEventRecord::create();
8181
record2->setEventId(eventId);
8282
REQUIRE(record2->loadFromRepository(testRepository) == true);
8383
REQUIRE(record1->getChildrenUuids().size() == 1);
@@ -101,7 +101,7 @@ TEST_CASE("Test Provenance record serialization Volatile", "[Testprovenance::Pro
101101
record1->setEventDuration(sample);
102102

103103
testRepository->storeElement(record1);
104-
auto record2 = std::make_shared<provenance::ProvenanceEventRecordImpl>();
104+
auto record2 = provenance::ProvenanceEventRecord::create();
105105
record2->setEventId(eventId);
106106
REQUIRE(record2->loadFromRepository(testRepository) == true);
107107
REQUIRE(record2->getEventId() == record1->getEventId());
@@ -127,7 +127,7 @@ TEST_CASE("Test Flowfile record added to provenance using Volatile Repo", "[Test
127127
record1->setEventDuration(sample);
128128

129129
testRepository->storeElement(record1);
130-
auto record2 = std::make_shared<provenance::ProvenanceEventRecordImpl>();
130+
auto record2 = provenance::ProvenanceEventRecord::create();
131131
record2->setEventId(eventId);
132132
REQUIRE(record2->loadFromRepository(testRepository) == true);
133133
REQUIRE(record1->getChildrenUuids().size() == 1);
@@ -151,7 +151,7 @@ TEST_CASE("Test Provenance record serialization NoOp", "[Testprovenance::Provena
151151
record1->setEventDuration(sample);
152152

153153
REQUIRE(testRepository->storeElement(record1));
154-
auto record2 = std::make_shared<provenance::ProvenanceEventRecordImpl>();
154+
auto record2 = provenance::ProvenanceEventRecord::create();
155155
record2->setEventId(eventId);
156156
REQUIRE(record2->loadFromRepository(testRepository) == false);
157157
}

‎extensions/standard-processors/tests/unit/ProcessorTests.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -444,18 +444,18 @@ TEST_CASE("Test Find file", "[getfileCreate3]") {
444444
REQUIRE(2 == repo->getRepoMap().size());
445445

446446
for (auto entry : repo->getRepoMap()) {
447-
minifi::provenance::ProvenanceEventRecordImpl newRecord;
447+
auto newRecord = minifi::provenance::ProvenanceEventRecordImpl::create();
448448
minifi::io::BufferStream stream(std::as_bytes(std::span(entry.second)));
449-
newRecord.deserialize(stream);
449+
newRecord->deserialize(stream);
450450

451451
bool found = false;
452452
for (const auto& provRec : records) {
453-
if (provRec->getEventId() == newRecord.getEventId()) {
454-
REQUIRE(provRec->getEventId() == newRecord.getEventId());
455-
REQUIRE(provRec->getComponentId() == newRecord.getComponentId());
456-
REQUIRE(provRec->getComponentType() == newRecord.getComponentType());
457-
REQUIRE(provRec->getDetails() == newRecord.getDetails());
458-
REQUIRE(provRec->getEventDuration() == newRecord.getEventDuration());
453+
if (provRec->getEventId() == newRecord->getEventId()) {
454+
REQUIRE(provRec->getEventId() == newRecord->getEventId());
455+
REQUIRE(provRec->getComponentId() == newRecord->getComponentId());
456+
REQUIRE(provRec->getComponentType() == newRecord->getComponentType());
457+
REQUIRE(provRec->getDetails() == newRecord->getDetails());
458+
REQUIRE(provRec->getEventDuration() == newRecord->getEventDuration());
459459
found = true;
460460
break;
461461
}

‎libminifi/include/provenance/Provenance.h‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ class ProvenanceEventRecordImpl : public core::SerializableComponentImpl, public
4545
public:
4646
static const char *ProvenanceEventTypeStr[REPLAY + 1];
4747

48-
ProvenanceEventRecordImpl(ProvenanceEventType event, std::string componentId, std::string componentType);
48+
ProvenanceEventRecordImpl(ProvenanceEventType event, utils::Identifier component_id, std::string component_type);
4949

50-
ProvenanceEventRecordImpl()
51-
: core::SerializableComponentImpl(core::className<ProvenanceEventRecord>()) {
52-
event_time_ = std::chrono::system_clock::now();
53-
}
50+
ProvenanceEventRecordImpl(const ProvenanceEventRecordImpl&) = delete;
51+
ProvenanceEventRecordImpl(ProvenanceEventRecordImpl&&) = delete;
52+
ProvenanceEventRecordImpl& operator=(const ProvenanceEventRecordImpl&) = delete;
53+
ProvenanceEventRecordImpl& operator=(ProvenanceEventRecordImpl&&) = delete;
5454

5555
~ProvenanceEventRecordImpl() override = default;
5656

@@ -245,20 +245,22 @@ class ProvenanceEventRecordImpl : public core::SerializableComponentImpl, public
245245
std::string alternate_identifier_uri_;
246246

247247
private:
248-
ProvenanceEventRecordImpl(const ProvenanceEventRecordImpl &parent);
249-
ProvenanceEventRecordImpl &operator=(const ProvenanceEventRecordImpl &parent);
250248
static std::shared_ptr<core::logging::Logger> logger_;
251249
static std::shared_ptr<utils::IdGenerator> id_generator_;
252250
};
253251

254252
class ProvenanceReporterImpl : public virtual ProvenanceReporter {
255253
public:
256-
ProvenanceReporterImpl(std::shared_ptr<core::Repository> repo, std::string componentId, std::string componentType)
257-
: logger_(core::logging::LoggerFactory<ProvenanceReporter>::getLogger()) {
258-
component_id_ = componentId;
259-
component_type_ = componentType;
260-
repo_ = repo;
261-
}
254+
ProvenanceReporterImpl(std::shared_ptr<core::Repository> repo, utils::Identifier component_id, std::string component_type)
255+
: component_id_(component_id),
256+
component_type_(std::move(component_type)),
257+
logger_(core::logging::LoggerFactory<ProvenanceReporter>::getLogger()),
258+
repo_(std::move(repo)) {}
259+
260+
ProvenanceReporterImpl(const ProvenanceReporterImpl&) = delete;
261+
ProvenanceReporterImpl(ProvenanceReporterImpl&&) = delete;
262+
ProvenanceReporterImpl& operator=(const ProvenanceReporterImpl&) = delete;
263+
ProvenanceReporterImpl& operator=(ProvenanceReporterImpl&&) = delete;
262264

263265
~ProvenanceReporterImpl() override {
264266
clear();
@@ -273,12 +275,10 @@ class ProvenanceReporterImpl : public virtual ProvenanceReporter {
273275
}
274276

275277
void remove(const std::shared_ptr<ProvenanceEventRecord> &event) override {
276-
if (events_.find(event) != events_.end()) {
277-
events_.erase(event);
278-
}
278+
events_.erase(event);
279279
}
280280

281-
void clear() override {
281+
void clear() final {
282282
events_.clear();
283283
}
284284

@@ -308,16 +308,13 @@ class ProvenanceReporterImpl : public virtual ProvenanceReporter {
308308
return event;
309309
}
310310

311-
std::string component_id_;
311+
utils::Identifier component_id_;
312312
std::string component_type_;
313313

314314
private:
315315
std::shared_ptr<core::logging::Logger> logger_;
316316
std::set<std::shared_ptr<ProvenanceEventRecord>> events_;
317317
std::shared_ptr<core::Repository> repo_;
318-
319-
ProvenanceReporterImpl(const ProvenanceReporterImpl &parent);
320-
ProvenanceReporterImpl &operator=(const ProvenanceReporterImpl &parent);
321318
};
322319

323320
} // namespace org::apache::nifi::minifi::provenance

‎libminifi/src/core/ProcessSession.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ProcessSessionImpl::ProcessSessionImpl(std::shared_ptr<ProcessContext> processCo
6969
stateManager_(process_context_->getStateManager()) {
7070
logger_->log_trace("ProcessSession created for {}", process_context_->getProcessor().getName());
7171
auto repo = process_context_->getProvenanceRepository();
72-
provenance_report_ = std::make_shared<provenance::ProvenanceReporterImpl>(repo, process_context_->getProcessor().getUUIDStr(), process_context_->getProcessor().getName());
72+
provenance_report_ = std::make_shared<provenance::ProvenanceReporterImpl>(repo, process_context_->getProcessor().getUUID(), process_context_->getProcessor().getName());
7373
content_session_ = process_context_->getContentRepository()->createSession();
7474

7575
if (stateManager_ && !stateManager_->beginTransaction()) {

0 commit comments

Comments
 (0)