turcsanyip commented on code in PR #8954:
URL: https://github.com/apache/nifi/pull/8954#discussion_r1640035334
##########
nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java:
##########
@@ -395,6 +399,153 @@ public void deleteReportingTasks() throws
NiFiClientException, IOException {
}
}
+ public FlowAnalysisRuleEntity createFlowAnalysisRule(final String type)
throws NiFiClientException, IOException {
+ return
createFlowAnalysisRule(NiFiSystemIT.TEST_FLOW_ANALYSIS_RULE_PACKAGE + "." +
type, getTestBundle());
+ }
+
+ public FlowAnalysisRuleEntity createFlowAnalysisRule(final String type,
final BundleDTO bundle) throws NiFiClientException, IOException {
+ final FlowAnalysisRuleDTO dto = new FlowAnalysisRuleDTO();
+ dto.setBundle(bundle);
+ dto.setType(type);
+
+ final FlowAnalysisRuleEntity entity = new FlowAnalysisRuleEntity();
+ entity.setComponent(dto);
+ entity.setRevision(createNewRevision());
+ entity.setDisconnectedNodeAcknowledged(true);
+
+ final FlowAnalysisRuleEntity rlowAnalysisRule =
nifiClient.getControllerClient().createFlowAnalysisRule(entity);
+ logger.info("Created Flow Analysis Rule [type={}, id={}] for Test
[{}]", simpleName(type), rlowAnalysisRule.getId(), testName);
+
+ return rlowAnalysisRule;
+ }
+
+ public FlowAnalysisRuleEntity updateFlowAnalysisRuleProperties(final
FlowAnalysisRuleEntity currentEntity, final Map<String, String> properties)
throws NiFiClientException, IOException {
+ final FlowAnalysisRuleDTO taskDto = new FlowAnalysisRuleDTO();
Review Comment:
Copy-paste error:
```suggestion
final FlowAnalysisRuleDTO ruleDto = new FlowAnalysisRuleDTO();
```
##########
nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java:
##########
@@ -395,6 +399,153 @@ public void deleteReportingTasks() throws
NiFiClientException, IOException {
}
}
+ public FlowAnalysisRuleEntity createFlowAnalysisRule(final String type)
throws NiFiClientException, IOException {
+ return
createFlowAnalysisRule(NiFiSystemIT.TEST_FLOW_ANALYSIS_RULE_PACKAGE + "." +
type, getTestBundle());
+ }
+
+ public FlowAnalysisRuleEntity createFlowAnalysisRule(final String type,
final BundleDTO bundle) throws NiFiClientException, IOException {
+ final FlowAnalysisRuleDTO dto = new FlowAnalysisRuleDTO();
+ dto.setBundle(bundle);
+ dto.setType(type);
+
+ final FlowAnalysisRuleEntity entity = new FlowAnalysisRuleEntity();
+ entity.setComponent(dto);
+ entity.setRevision(createNewRevision());
+ entity.setDisconnectedNodeAcknowledged(true);
+
+ final FlowAnalysisRuleEntity rlowAnalysisRule =
nifiClient.getControllerClient().createFlowAnalysisRule(entity);
+ logger.info("Created Flow Analysis Rule [type={}, id={}] for Test
[{}]", simpleName(type), rlowAnalysisRule.getId(), testName);
+
+ return rlowAnalysisRule;
+ }
+
+ public FlowAnalysisRuleEntity updateFlowAnalysisRuleProperties(final
FlowAnalysisRuleEntity currentEntity, final Map<String, String> properties)
throws NiFiClientException, IOException {
+ final FlowAnalysisRuleDTO taskDto = new FlowAnalysisRuleDTO();
+ taskDto.setProperties(properties);
+ taskDto.setId(currentEntity.getId());
+
+ final FlowAnalysisRuleEntity updatedEntity = new
FlowAnalysisRuleEntity();
+ updatedEntity.setRevision(currentEntity.getRevision());
+ updatedEntity.setComponent(taskDto);
+ updatedEntity.setId(currentEntity.getId());
+ updatedEntity.setDisconnectedNodeAcknowledged(true);
+
+ return
nifiClient.getControllerClient().updateFlowAnalysisRule(updatedEntity);
+
+ }
+
+ public FlowAnalysisRuleEntity enableFlowAnalysisRule(final
FlowAnalysisRuleEntity entity) throws NiFiClientException, IOException {
+ final FlowAnalysisRuleRunStatusEntity runStatusEntity = new
FlowAnalysisRuleRunStatusEntity();
+ runStatusEntity.setState("ENABLED");
+ runStatusEntity.setRevision(entity.getRevision());
+ runStatusEntity.setDisconnectedNodeAcknowledged(true);
+
+ return
nifiClient.getControllerClient().activateFlowAnalysisRule(entity.getId(),
runStatusEntity);
+ }
+
+ public FlowAnalysisRuleEntity disableFlowAnalysisRule(final
FlowAnalysisRuleEntity entity) throws NiFiClientException, IOException {
+ final FlowAnalysisRuleRunStatusEntity runStatusEntity = new
FlowAnalysisRuleRunStatusEntity();
+ runStatusEntity.setState("DISABLED");
+ runStatusEntity.setRevision(entity.getRevision());
+ runStatusEntity.setDisconnectedNodeAcknowledged(true);
+
+ return
nifiClient.getControllerClient().activateFlowAnalysisRule(entity.getId(),
runStatusEntity);
+ }
+
+ public void disableFlowAnalysisRues() throws NiFiClientException,
IOException {
+ final FlowAnalysisRulesEntity rules =
nifiClient.getControllerClient().getFlowAnalysisRules();
+
+ Collection<String> toBeDisabledRuleIds = new ArrayList<>();
+ for (final FlowAnalysisRuleEntity rule : rules.getFlowAnalysisRules())
{
+ disableFlowAnalysisRule(rule);
+ toBeDisabledRuleIds.add(rule.getId());
+ }
+
+ waitForFlowAnalysisRuleState("DISABLED", toBeDisabledRuleIds);
+ }
+
+ public void deleteFlowAnalysisRules() throws NiFiClientException,
IOException {
+ final FlowAnalysisRulesEntity tasksEntity =
nifiClient.getControllerClient().getFlowAnalysisRules();
Review Comment:
Copy-paste error:
```suggestion
final FlowAnalysisRulesEntity rulesEntity =
nifiClient.getControllerClient().getFlowAnalysisRules();
```
##########
nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java:
##########
@@ -395,6 +399,153 @@ public void deleteReportingTasks() throws
NiFiClientException, IOException {
}
}
+ public FlowAnalysisRuleEntity createFlowAnalysisRule(final String type)
throws NiFiClientException, IOException {
+ return
createFlowAnalysisRule(NiFiSystemIT.TEST_FLOW_ANALYSIS_RULE_PACKAGE + "." +
type, getTestBundle());
+ }
+
+ public FlowAnalysisRuleEntity createFlowAnalysisRule(final String type,
final BundleDTO bundle) throws NiFiClientException, IOException {
+ final FlowAnalysisRuleDTO dto = new FlowAnalysisRuleDTO();
+ dto.setBundle(bundle);
+ dto.setType(type);
+
+ final FlowAnalysisRuleEntity entity = new FlowAnalysisRuleEntity();
+ entity.setComponent(dto);
+ entity.setRevision(createNewRevision());
+ entity.setDisconnectedNodeAcknowledged(true);
+
+ final FlowAnalysisRuleEntity rlowAnalysisRule =
nifiClient.getControllerClient().createFlowAnalysisRule(entity);
+ logger.info("Created Flow Analysis Rule [type={}, id={}] for Test
[{}]", simpleName(type), rlowAnalysisRule.getId(), testName);
+
+ return rlowAnalysisRule;
+ }
+
+ public FlowAnalysisRuleEntity updateFlowAnalysisRuleProperties(final
FlowAnalysisRuleEntity currentEntity, final Map<String, String> properties)
throws NiFiClientException, IOException {
+ final FlowAnalysisRuleDTO taskDto = new FlowAnalysisRuleDTO();
+ taskDto.setProperties(properties);
+ taskDto.setId(currentEntity.getId());
+
+ final FlowAnalysisRuleEntity updatedEntity = new
FlowAnalysisRuleEntity();
+ updatedEntity.setRevision(currentEntity.getRevision());
+ updatedEntity.setComponent(taskDto);
+ updatedEntity.setId(currentEntity.getId());
+ updatedEntity.setDisconnectedNodeAcknowledged(true);
+
+ return
nifiClient.getControllerClient().updateFlowAnalysisRule(updatedEntity);
+
+ }
+
+ public FlowAnalysisRuleEntity enableFlowAnalysisRule(final
FlowAnalysisRuleEntity entity) throws NiFiClientException, IOException {
+ final FlowAnalysisRuleRunStatusEntity runStatusEntity = new
FlowAnalysisRuleRunStatusEntity();
+ runStatusEntity.setState("ENABLED");
+ runStatusEntity.setRevision(entity.getRevision());
+ runStatusEntity.setDisconnectedNodeAcknowledged(true);
+
+ return
nifiClient.getControllerClient().activateFlowAnalysisRule(entity.getId(),
runStatusEntity);
+ }
+
+ public FlowAnalysisRuleEntity disableFlowAnalysisRule(final
FlowAnalysisRuleEntity entity) throws NiFiClientException, IOException {
+ final FlowAnalysisRuleRunStatusEntity runStatusEntity = new
FlowAnalysisRuleRunStatusEntity();
+ runStatusEntity.setState("DISABLED");
+ runStatusEntity.setRevision(entity.getRevision());
+ runStatusEntity.setDisconnectedNodeAcknowledged(true);
+
+ return
nifiClient.getControllerClient().activateFlowAnalysisRule(entity.getId(),
runStatusEntity);
+ }
+
+ public void disableFlowAnalysisRues() throws NiFiClientException,
IOException {
+ final FlowAnalysisRulesEntity rules =
nifiClient.getControllerClient().getFlowAnalysisRules();
+
+ Collection<String> toBeDisabledRuleIds = new ArrayList<>();
+ for (final FlowAnalysisRuleEntity rule : rules.getFlowAnalysisRules())
{
+ disableFlowAnalysisRule(rule);
+ toBeDisabledRuleIds.add(rule.getId());
+ }
+
+ waitForFlowAnalysisRuleState("DISABLED", toBeDisabledRuleIds);
+ }
+
+ public void deleteFlowAnalysisRules() throws NiFiClientException,
IOException {
+ final FlowAnalysisRulesEntity tasksEntity =
nifiClient.getControllerClient().getFlowAnalysisRules();
+ for (final FlowAnalysisRuleEntity taskEntity :
tasksEntity.getFlowAnalysisRules()) {
+ taskEntity.setDisconnectedNodeAcknowledged(true);
+
nifiClient.getControllerClient().deleteFlowAnalysisRule(taskEntity);
+ }
+ }
+
+ public void waitForFlowAnalysisRulesDisabled(final String...
ruleIdsOfInterest) throws NiFiClientException, IOException {
+ waitForFlowAnalysisRuleState("DISABLED",
Arrays.asList(ruleIdsOfInterest));
+ }
+
+ public void waitForFlowAnalysisRulesEnabled(final String...
ruleIdsOfInterest) throws NiFiClientException, IOException {
+ waitForFlowAnalysisRuleState("ENABLED",
Arrays.asList(ruleIdsOfInterest));
+ }
+
+ public void waitForFlowAnalysisRulesEnabled(final List<String>
ruleIdsOfInterest) throws NiFiClientException, IOException {
+ waitForFlowAnalysisRuleState("ENABLED", ruleIdsOfInterest);
+ }
+
+ public void waitForFlowAnalysisRuleState(final String desiredState, final
Collection<String> ruleIdsOfInterest) throws NiFiClientException, IOException {
+ final long maxTimestamp = System.currentTimeMillis() +
TimeUnit.MINUTES.toMillis(2L);
+
+ while (System.currentTimeMillis() < maxTimestamp) {
+ final List<FlowAnalysisRuleEntity> nonDisabledRules =
getFlowAnalysisRulesNotInState(desiredState, ruleIdsOfInterest);
Review Comment:
` nonDisabledRules` has a wrong name because `desiredState` can be `ENABLED`
or `DISABLED`.
Maybe `nonDesiredStateRules`?
##########
nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java:
##########
@@ -395,6 +399,153 @@ public void deleteReportingTasks() throws
NiFiClientException, IOException {
}
}
+ public FlowAnalysisRuleEntity createFlowAnalysisRule(final String type)
throws NiFiClientException, IOException {
+ return
createFlowAnalysisRule(NiFiSystemIT.TEST_FLOW_ANALYSIS_RULE_PACKAGE + "." +
type, getTestBundle());
+ }
+
+ public FlowAnalysisRuleEntity createFlowAnalysisRule(final String type,
final BundleDTO bundle) throws NiFiClientException, IOException {
+ final FlowAnalysisRuleDTO dto = new FlowAnalysisRuleDTO();
+ dto.setBundle(bundle);
+ dto.setType(type);
+
+ final FlowAnalysisRuleEntity entity = new FlowAnalysisRuleEntity();
+ entity.setComponent(dto);
+ entity.setRevision(createNewRevision());
+ entity.setDisconnectedNodeAcknowledged(true);
+
+ final FlowAnalysisRuleEntity rlowAnalysisRule =
nifiClient.getControllerClient().createFlowAnalysisRule(entity);
+ logger.info("Created Flow Analysis Rule [type={}, id={}] for Test
[{}]", simpleName(type), rlowAnalysisRule.getId(), testName);
+
+ return rlowAnalysisRule;
+ }
+
+ public FlowAnalysisRuleEntity updateFlowAnalysisRuleProperties(final
FlowAnalysisRuleEntity currentEntity, final Map<String, String> properties)
throws NiFiClientException, IOException {
+ final FlowAnalysisRuleDTO taskDto = new FlowAnalysisRuleDTO();
+ taskDto.setProperties(properties);
+ taskDto.setId(currentEntity.getId());
+
+ final FlowAnalysisRuleEntity updatedEntity = new
FlowAnalysisRuleEntity();
+ updatedEntity.setRevision(currentEntity.getRevision());
+ updatedEntity.setComponent(taskDto);
+ updatedEntity.setId(currentEntity.getId());
+ updatedEntity.setDisconnectedNodeAcknowledged(true);
+
+ return
nifiClient.getControllerClient().updateFlowAnalysisRule(updatedEntity);
+
+ }
+
+ public FlowAnalysisRuleEntity enableFlowAnalysisRule(final
FlowAnalysisRuleEntity entity) throws NiFiClientException, IOException {
+ final FlowAnalysisRuleRunStatusEntity runStatusEntity = new
FlowAnalysisRuleRunStatusEntity();
+ runStatusEntity.setState("ENABLED");
+ runStatusEntity.setRevision(entity.getRevision());
+ runStatusEntity.setDisconnectedNodeAcknowledged(true);
+
+ return
nifiClient.getControllerClient().activateFlowAnalysisRule(entity.getId(),
runStatusEntity);
+ }
+
+ public FlowAnalysisRuleEntity disableFlowAnalysisRule(final
FlowAnalysisRuleEntity entity) throws NiFiClientException, IOException {
+ final FlowAnalysisRuleRunStatusEntity runStatusEntity = new
FlowAnalysisRuleRunStatusEntity();
+ runStatusEntity.setState("DISABLED");
+ runStatusEntity.setRevision(entity.getRevision());
+ runStatusEntity.setDisconnectedNodeAcknowledged(true);
+
+ return
nifiClient.getControllerClient().activateFlowAnalysisRule(entity.getId(),
runStatusEntity);
+ }
+
+ public void disableFlowAnalysisRues() throws NiFiClientException,
IOException {
+ final FlowAnalysisRulesEntity rules =
nifiClient.getControllerClient().getFlowAnalysisRules();
+
+ Collection<String> toBeDisabledRuleIds = new ArrayList<>();
+ for (final FlowAnalysisRuleEntity rule : rules.getFlowAnalysisRules())
{
+ disableFlowAnalysisRule(rule);
+ toBeDisabledRuleIds.add(rule.getId());
+ }
+
+ waitForFlowAnalysisRuleState("DISABLED", toBeDisabledRuleIds);
+ }
+
+ public void deleteFlowAnalysisRules() throws NiFiClientException,
IOException {
+ final FlowAnalysisRulesEntity tasksEntity =
nifiClient.getControllerClient().getFlowAnalysisRules();
+ for (final FlowAnalysisRuleEntity taskEntity :
tasksEntity.getFlowAnalysisRules()) {
+ taskEntity.setDisconnectedNodeAcknowledged(true);
+
nifiClient.getControllerClient().deleteFlowAnalysisRule(taskEntity);
+ }
+ }
+
+ public void waitForFlowAnalysisRulesDisabled(final String...
ruleIdsOfInterest) throws NiFiClientException, IOException {
+ waitForFlowAnalysisRuleState("DISABLED",
Arrays.asList(ruleIdsOfInterest));
+ }
+
+ public void waitForFlowAnalysisRulesEnabled(final String...
ruleIdsOfInterest) throws NiFiClientException, IOException {
+ waitForFlowAnalysisRuleState("ENABLED",
Arrays.asList(ruleIdsOfInterest));
+ }
+
+ public void waitForFlowAnalysisRulesEnabled(final List<String>
ruleIdsOfInterest) throws NiFiClientException, IOException {
+ waitForFlowAnalysisRuleState("ENABLED", ruleIdsOfInterest);
+ }
Review Comment:
These methods seem to be unused.
##########
nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java:
##########
@@ -395,6 +399,153 @@ public void deleteReportingTasks() throws
NiFiClientException, IOException {
}
}
+ public FlowAnalysisRuleEntity createFlowAnalysisRule(final String type)
throws NiFiClientException, IOException {
+ return
createFlowAnalysisRule(NiFiSystemIT.TEST_FLOW_ANALYSIS_RULE_PACKAGE + "." +
type, getTestBundle());
+ }
+
+ public FlowAnalysisRuleEntity createFlowAnalysisRule(final String type,
final BundleDTO bundle) throws NiFiClientException, IOException {
+ final FlowAnalysisRuleDTO dto = new FlowAnalysisRuleDTO();
+ dto.setBundle(bundle);
+ dto.setType(type);
+
+ final FlowAnalysisRuleEntity entity = new FlowAnalysisRuleEntity();
+ entity.setComponent(dto);
+ entity.setRevision(createNewRevision());
+ entity.setDisconnectedNodeAcknowledged(true);
+
+ final FlowAnalysisRuleEntity rlowAnalysisRule =
nifiClient.getControllerClient().createFlowAnalysisRule(entity);
Review Comment:
Typo:
```suggestion
final FlowAnalysisRuleEntity flowAnalysisRule =
nifiClient.getControllerClient().createFlowAnalysisRule(entity);
```
##########
nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java:
##########
@@ -395,6 +399,153 @@ public void deleteReportingTasks() throws
NiFiClientException, IOException {
}
}
+ public FlowAnalysisRuleEntity createFlowAnalysisRule(final String type)
throws NiFiClientException, IOException {
+ return
createFlowAnalysisRule(NiFiSystemIT.TEST_FLOW_ANALYSIS_RULE_PACKAGE + "." +
type, getTestBundle());
+ }
+
+ public FlowAnalysisRuleEntity createFlowAnalysisRule(final String type,
final BundleDTO bundle) throws NiFiClientException, IOException {
+ final FlowAnalysisRuleDTO dto = new FlowAnalysisRuleDTO();
+ dto.setBundle(bundle);
+ dto.setType(type);
+
+ final FlowAnalysisRuleEntity entity = new FlowAnalysisRuleEntity();
+ entity.setComponent(dto);
+ entity.setRevision(createNewRevision());
+ entity.setDisconnectedNodeAcknowledged(true);
+
+ final FlowAnalysisRuleEntity rlowAnalysisRule =
nifiClient.getControllerClient().createFlowAnalysisRule(entity);
+ logger.info("Created Flow Analysis Rule [type={}, id={}] for Test
[{}]", simpleName(type), rlowAnalysisRule.getId(), testName);
+
+ return rlowAnalysisRule;
+ }
+
+ public FlowAnalysisRuleEntity updateFlowAnalysisRuleProperties(final
FlowAnalysisRuleEntity currentEntity, final Map<String, String> properties)
throws NiFiClientException, IOException {
+ final FlowAnalysisRuleDTO taskDto = new FlowAnalysisRuleDTO();
+ taskDto.setProperties(properties);
+ taskDto.setId(currentEntity.getId());
+
+ final FlowAnalysisRuleEntity updatedEntity = new
FlowAnalysisRuleEntity();
+ updatedEntity.setRevision(currentEntity.getRevision());
+ updatedEntity.setComponent(taskDto);
+ updatedEntity.setId(currentEntity.getId());
+ updatedEntity.setDisconnectedNodeAcknowledged(true);
+
+ return
nifiClient.getControllerClient().updateFlowAnalysisRule(updatedEntity);
+
+ }
+
+ public FlowAnalysisRuleEntity enableFlowAnalysisRule(final
FlowAnalysisRuleEntity entity) throws NiFiClientException, IOException {
+ final FlowAnalysisRuleRunStatusEntity runStatusEntity = new
FlowAnalysisRuleRunStatusEntity();
+ runStatusEntity.setState("ENABLED");
+ runStatusEntity.setRevision(entity.getRevision());
+ runStatusEntity.setDisconnectedNodeAcknowledged(true);
+
+ return
nifiClient.getControllerClient().activateFlowAnalysisRule(entity.getId(),
runStatusEntity);
+ }
+
+ public FlowAnalysisRuleEntity disableFlowAnalysisRule(final
FlowAnalysisRuleEntity entity) throws NiFiClientException, IOException {
+ final FlowAnalysisRuleRunStatusEntity runStatusEntity = new
FlowAnalysisRuleRunStatusEntity();
+ runStatusEntity.setState("DISABLED");
+ runStatusEntity.setRevision(entity.getRevision());
+ runStatusEntity.setDisconnectedNodeAcknowledged(true);
+
+ return
nifiClient.getControllerClient().activateFlowAnalysisRule(entity.getId(),
runStatusEntity);
+ }
+
+ public void disableFlowAnalysisRues() throws NiFiClientException,
IOException {
Review Comment:
Typo:
```suggestion
public void disableFlowAnalysisRules() throws NiFiClientException,
IOException {
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
