You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/05/17 14:33:56 UTC
[6/7] nifi git commit: NIFI-1554: - Introducing ControllerService and
ReportingTask authorization and revision. - Removing the revision where
appropriate. NIFI-1883 - Restoring referencing components automatically. -
This closes #448
http://git-wip-us.apache.org/repos/asf/nifi/blob/8bb56fca/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
index ace31a3..2961ab3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
@@ -16,30 +16,6 @@
*/
package org.apache.nifi.web;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import javax.ws.rs.WebApplicationException;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.action.Action;
import org.apache.nifi.action.Component;
@@ -192,6 +168,28 @@ import org.apache.nifi.web.util.SnippetUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.ws.rs.WebApplicationException;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
/**
* Implementation of NiFiServiceFacade that performs revision checking.
*/
@@ -959,29 +957,15 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
}
@Override
- public ConfigurationSnapshot<Void> clearProcessorState(final Revision revision, final String processorId) {
- return clearComponentState(revision, () -> processorDAO.clearState(processorId));
+ public void clearProcessorState(final String processorId) {
+ clearComponentState(processorId, () -> processorDAO.clearState(processorId));
}
- private ConfigurationSnapshot<Void> clearComponentState(final Revision revision, final Runnable clearState) {
- final RevisionClaim claim = new StandardRevisionClaim(revision);
- final String modifier = NiFiUserUtils.getNiFiUserName();
- try {
- final RevisionUpdate<Void> component = revisionManager.updateRevision(claim, modifier, new UpdateRevisionTask<Void>() {
- @Override
- public RevisionUpdate<Void> update() {
- // clear the state for the specified component
- clearState.run();
-
- final FlowModification lastMod = new FlowModification(incrementRevision(revision), modifier);
- return new StandardRevisionUpdate<Void>(null, lastMod);
- }
- });
-
- return new ConfigurationSnapshot<>(component.getLastModification().getRevision().getVersion(), component.getComponent());
- } catch (ExpiredRevisionClaimException e) {
- throw new InvalidRevisionException("Unable to clear component state", e);
- }
+ private void clearComponentState(final String componentId, final Runnable clearState) {
+ revisionManager.get(componentId, rev -> {
+ clearState.run();
+ return null;
+ });
}
@Override
@@ -995,8 +979,8 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
}
@Override
- public ConfigurationSnapshot<Void> clearControllerServiceState(final Revision revision, final String controllerServiceId) {
- return clearComponentState(revision, () -> controllerServiceDAO.clearState(controllerServiceId));
+ public void clearControllerServiceState(final String controllerServiceId) {
+ clearComponentState(controllerServiceId, () -> controllerServiceDAO.clearState(controllerServiceId));
}
@Override
@@ -1010,8 +994,8 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
}
@Override
- public ConfigurationSnapshot<Void> clearReportingTaskState(final Revision revision, final String reportingTaskId) {
- return clearComponentState(revision, () -> reportingTaskDAO.clearState(reportingTaskId));
+ public void clearReportingTaskState(final String reportingTaskId) {
+ clearComponentState(reportingTaskId, () -> reportingTaskDAO.clearState(reportingTaskId));
}
@Override
@@ -1283,23 +1267,20 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
}
final String groupId = componentDto.getParentGroupId();
- return revisionManager.get(groupId, new ReadOnlyRevisionCallback<RevisionUpdate<D>>() {
- @Override
- public RevisionUpdate<D> withRevision(final Revision revision) {
- // ensure access to process group
- final ProcessGroup parent = processGroupDAO.getProcessGroup(groupId);
- parent.authorize(authorizer, RequestAction.WRITE);
+ return revisionManager.get(groupId, rev -> {
+ // ensure access to process group
+ final ProcessGroup parent = processGroupDAO.getProcessGroup(groupId);
+ parent.authorize(authorizer, RequestAction.WRITE);
- // add the component
- final C component = daoCreation.get();
+ // add the component
+ final C component = daoCreation.get();
- // save the flow
- controllerFacade.save();
+ // save the flow
+ controllerFacade.save();
- final D dto = dtoCreation.apply(component);
- final FlowModification lastMod = new FlowModification(new Revision(0L, revision.getClientId(), componentDto.getId()), modifier);
- return new StandardRevisionUpdate<D>(dto, lastMod);
- }
+ final D dto = dtoCreation.apply(component);
+ final FlowModification lastMod = new FlowModification(new Revision(0L, rev.getClientId(), componentDto.getId()), modifier);
+ return new StandardRevisionUpdate<D>(dto, lastMod);
});
}
@@ -1678,123 +1659,151 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
}
@Override
- public ControllerServiceEntity createControllerService(final Revision revision, final String groupId, final ControllerServiceDTO controllerServiceDTO) {
- // TODO: Instead of "root" we need the ID of the Process Group that the Controller Service is being created in.
- // Right now, though, they are not scoped to a particular group.
- return revisionManager.get("root", new ReadOnlyRevisionCallback<RevisionUpdate<ControllerServiceEntity>>() {
- @Override
- public RevisionUpdate<ControllerServiceEntity> withRevision(final Revision revision) {
- // ensure id is set
- if (StringUtils.isBlank(controllerServiceDTO.getId())) {
- controllerServiceDTO.setId(UUID.randomUUID().toString());
- }
-
+ public ControllerServiceEntity createControllerService(final String groupId, final ControllerServiceDTO controllerServiceDTO) {
+ final RevisionUpdate<ControllerServiceDTO> snapshot = createComponent(
+ controllerServiceDTO,
+ () -> {
// create the controller service
final ControllerServiceNode controllerService = controllerServiceDAO.createControllerService(controllerServiceDTO);
+ // TODO - this logic should be part of the controllerServiceDAO
final ProcessGroup group = processGroupDAO.getProcessGroup(groupId);
- group.authorize(authorizer, RequestAction.WRITE);
group.addControllerService(controllerService);
+ return controllerService;
+ },
+ controllerService -> dtoFactory.createControllerServiceDto(controllerService));
- // save the update
- controllerFacade.save();
-
- final Revision updatedRevision = new Revision(0L, revision.getClientId(), controllerService.getIdentifier());
- final FlowModification lastMod = new FlowModification(updatedRevision, NiFiUserUtils.getNiFiUserName());
- final RevisionDTO updatedRevisionDto = dtoFactory.createRevisionDTO(lastMod);
- final ControllerServiceDTO updatedDto = dtoFactory.createControllerServiceDto(controllerService);
-
- // TODO: When ControllerServiceNode implements Authorizable, we need to update the access policy.
- final AccessPolicyDTO accessPolicy = allAccess();
- final ControllerServiceEntity entity = entityFactory.createControllerServiceEntity(updatedDto, updatedRevisionDto, accessPolicy);
- final RevisionUpdate<ControllerServiceEntity> update = new StandardRevisionUpdate<>(entity, lastMod);
- return update;
- }
- }).getComponent();
+ final ControllerServiceNode controllerService = controllerServiceDAO.getControllerService(controllerServiceDTO.getId());
+ final AccessPolicyDTO accessPolicy = dtoFactory.createAccessPolicyDto(controllerService);
+ return entityFactory.createControllerServiceEntity(snapshot.getComponent(), dtoFactory.createRevisionDTO(snapshot.getLastModification()), accessPolicy);
}
@Override
public UpdateResult<ControllerServiceEntity> updateControllerService(final Revision revision, final ControllerServiceDTO controllerServiceDTO) {
// if controller service does not exist, then create new controller service
if (controllerServiceDAO.hasControllerService(controllerServiceDTO.getId()) == false) {
- return new UpdateResult<>(createControllerService(revision, controllerServiceDTO.getParentGroupId(), controllerServiceDTO), true);
+ return new UpdateResult<>(createControllerService(controllerServiceDTO.getParentGroupId(), controllerServiceDTO), true);
}
- final String modifier = NiFiUserUtils.getNiFiUserName();
- final RevisionUpdate<ControllerServiceEntity> update = revisionManager.updateRevision(new StandardRevisionClaim(revision), modifier,
- new UpdateRevisionTask<ControllerServiceEntity>() {
- @Override
- public RevisionUpdate<ControllerServiceEntity> update() {
- final ControllerServiceNode controllerService = controllerServiceDAO.updateControllerService(controllerServiceDTO);
-
- // save the update
- controllerFacade.save();
-
- final Revision updatedRevision = incrementRevision(revision);
- final ControllerServiceDTO controllerServiceDto = dtoFactory.createControllerServiceDto(controllerService);
- final FlowModification lastMod = new FlowModification(updatedRevision, modifier);
- final RevisionDTO updatedRevisionDto = dtoFactory.createRevisionDTO(lastMod);
-
- // TODO: When ControllerServiceNode implements Authorizable, we need to update the access policy.
- final AccessPolicyDTO accessPolicy = allAccess();
- final ControllerServiceEntity entity = entityFactory.createControllerServiceEntity(controllerServiceDto, updatedRevisionDto, accessPolicy);
- final RevisionUpdate<ControllerServiceEntity> update = new StandardRevisionUpdate<>(entity, lastMod);
- return update;
- }
- });
+ // get the component, ensure we have access to it, and perform the update request
+ final ControllerServiceNode controllerService = controllerServiceDAO.getControllerService(controllerServiceDTO.getId());
+ final RevisionUpdate<ControllerServiceDTO> snapshot = updateComponent(revision,
+ controllerService,
+ () -> controllerServiceDAO.updateControllerService(controllerServiceDTO),
+ cs -> dtoFactory.createControllerServiceDto(cs));
- return new UpdateResult<>(update.getComponent(), false);
+ final AccessPolicyDTO accessPolicy = dtoFactory.createAccessPolicyDto(controllerService);
+ return new UpdateResult<>(entityFactory.createControllerServiceEntity(snapshot.getComponent(), dtoFactory.createRevisionDTO(snapshot.getLastModification()), accessPolicy), false);
}
@Override
public ControllerServiceReferencingComponentsEntity updateControllerServiceReferencingComponents(
- final Revision revision, final String controllerServiceId, final ScheduledState scheduledState, final ControllerServiceState controllerServiceState) {
-
- // Get a set of all component ID's that are referencing the controller service, because we will need.
- // to lock on those components. We do not need a Read Lock here from the Revision Manager because
- // we already have a claim on the controller service.
- final Set<Revision> referencingRevisions = controllerServiceDAO.getControllerService(controllerServiceId).getReferences().getReferencingComponents().stream()
- .map(component -> revisionManager.getRevision(component.getIdentifier()))
- .collect(Collectors.toSet());
-
- // TODO: Need to figure out how to handle this. We need the Revision Claim to encapsulate the controller service
- // as well as all of the referencing components. One option is for the verifyCanUpdateControllerServiceReferencingComponents()
- // to obtain these claims and return to client. Another option is to just not obtain a claim on them and have an override
- // to the revisionManager.updateRevision() method that allows us to specify a RevisionClaim and a Set<String> that contains
- // additional component ID's that must be claimed before the operation can proceed.
- revisionManager.requestClaim(referencingRevisions);
- final Set<Revision> requiredRevisions = new HashSet<>(referencingRevisions);
- requiredRevisions.add(revision);
- final RevisionClaim claim = new StandardRevisionClaim(requiredRevisions);
+ final Map<String, Revision> referenceRevisions, final String controllerServiceId, final ScheduledState scheduledState, final ControllerServiceState controllerServiceState) {
+
+ final RevisionClaim claim = new StandardRevisionClaim(referenceRevisions.values());
final String modifier = NiFiUserUtils.getNiFiUserName();
final RevisionUpdate<ControllerServiceReferencingComponentsEntity> update = revisionManager.updateRevision(claim, modifier,
- new UpdateRevisionTask<ControllerServiceReferencingComponentsEntity>() {
- @Override
- public RevisionUpdate<ControllerServiceReferencingComponentsEntity> update() {
- final Set<ConfiguredComponent> updated = controllerServiceDAO.updateControllerServiceReferencingComponents(controllerServiceId, scheduledState, controllerServiceState);
- final ControllerServiceReference reference = controllerServiceDAO.getControllerService(controllerServiceId).getReferences();
+ new UpdateRevisionTask<ControllerServiceReferencingComponentsEntity>() {
+ @Override
+ public RevisionUpdate<ControllerServiceReferencingComponentsEntity> update() {
+ final ControllerServiceNode controllerService = controllerServiceDAO.getControllerService(controllerServiceId);
+ final ControllerServiceReference reference = controllerService.getReferences();
+ for (final ConfiguredComponent component : reference.getReferencingComponents()) {
+ if (component instanceof Authorizable) {
+ // ensure we can write the referencing components
+ ((Authorizable) component).authorize(authorizer, RequestAction.WRITE);
+ }
+ }
+
+ final Set<ConfiguredComponent> updated = controllerServiceDAO.updateControllerServiceReferencingComponents(controllerServiceId, scheduledState, controllerServiceState);
+ final ControllerServiceReference updatedReference = controllerServiceDAO.getControllerService(controllerServiceId).getReferences();
+
+ final Map<String, Revision> updatedRevisions = new HashMap<>();
+ for (final Revision refRevision : referenceRevisions.values()) {
+ updatedRevisions.put(refRevision.getComponentId(), refRevision);
+ }
- final Map<String, Revision> updatedRevisions = new HashMap<>();
- for (final Revision refRevision : referencingRevisions) {
- updatedRevisions.put(refRevision.getComponentId(), refRevision);
+ for (final ConfiguredComponent component : updated) {
+ final Revision currentRevision = revisionManager.getRevision(component.getIdentifier());
+ final Revision updatedRevision = incrementRevision(currentRevision);
+ updatedRevisions.put(component.getIdentifier(), updatedRevision);
}
- for (final ConfiguredComponent component : updated) {
- final Revision currentRevision = revisionManager.getRevision(component.getIdentifier());
- final Revision updatedRevision = incrementRevision(currentRevision);
- updatedRevisions.put(component.getIdentifier(), updatedRevision);
+ final ControllerServiceReferencingComponentsEntity entity = createControllerServiceReferencingComponentsEntity(updatedReference, updatedRevisions);
+ return new StandardRevisionUpdate<>(entity, null, new HashSet<>(updatedRevisions.values()));
+ }
+ });
+
+ return update.getComponent();
+ }
+
+ /**
+ * Finds the identifiers for all components referencing a ControllerService.
+ *
+ * @param reference ControllerServiceReference
+ * @param referencingIds Collection of identifiers
+ * @param visited ControllerServices we've already visited
+ */
+ private void findControllerServiceReferencingComponentIdentifiers(final ControllerServiceReference reference, final Set<String> referencingIds, final Set<ControllerServiceNode> visited) {
+ for (final ConfiguredComponent component : reference.getReferencingComponents()) {
+ referencingIds.add(component.getIdentifier());
+
+ // if this is a ControllerService consider it's referencing components
+ if (component instanceof ControllerServiceNode) {
+ final ControllerServiceNode node = (ControllerServiceNode) component;
+ if (!visited.contains(node)) {
+ findControllerServiceReferencingComponentIdentifiers(node.getReferences(), referencingIds, visited);
}
+ visited.add(node);
+ }
+ }
+ }
- final ControllerServiceReferencingComponentsEntity entity = createControllerServiceReferencingComponentsEntity(reference, updatedRevisions);
- return new StandardRevisionUpdate<>(entity, null, new HashSet<>(updatedRevisions.values()));
+ /**
+ * Creates entities for components referencing a ControllerService using their current revision.
+ *
+ * @param reference ControllerServiceReference
+ * @return The entity
+ */
+ private ControllerServiceReferencingComponentsEntity createControllerServiceReferencingComponentsEntity(final ControllerServiceReference reference) {
+ final Set<String> referencingIds = new HashSet<>();
+ final Set<ControllerServiceNode> visited = new HashSet<>();
+ visited.add(reference.getReferencedComponent());
+ findControllerServiceReferencingComponentIdentifiers(reference, referencingIds, visited);
+
+ return revisionManager.get(referencingIds, () -> {
+ final Map<String, Revision> referencingRevisions = new HashMap<>();
+ for (final ConfiguredComponent component : reference.getReferencingComponents()) {
+ referencingRevisions.put(component.getIdentifier(), revisionManager.getRevision(component.getIdentifier()));
}
+ return createControllerServiceReferencingComponentsEntity(reference, referencingRevisions);
});
+ }
- return update.getComponent();
+ /**
+ * Creates entities for components referencing a ControllerService using the specified revisions.
+ *
+ * @param reference ControllerServiceReference
+ * @param revisions The revisions
+ * @return The entity
+ */
+ private ControllerServiceReferencingComponentsEntity createControllerServiceReferencingComponentsEntity(
+ final ControllerServiceReference reference, final Map<String, Revision> revisions) {
+ return createControllerServiceReferencingComponentsEntity(reference, revisions, new HashSet<>());
}
- private ControllerServiceReferencingComponentsEntity createControllerServiceReferencingComponentsEntity(final ControllerServiceReference reference, final Map<String, Revision> revisions) {
+ /**
+ * Creates entities for compnents referencing a ControllerServcie using the specified revisions.
+ *
+ * @param reference ControllerServiceReference
+ * @param revisions The revisions
+ * @param visited Which services we've already considered (in case of cycle)
+ * @return The entity
+ */
+ private ControllerServiceReferencingComponentsEntity createControllerServiceReferencingComponentsEntity(
+ final ControllerServiceReference reference, final Map<String, Revision> revisions, final Set<ControllerServiceNode> visited) {
+
final String modifier = NiFiUserUtils.getNiFiUserName();
final Set<ConfiguredComponent> referencingComponents = reference.getReferencingComponents();
@@ -1809,68 +1818,67 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
final FlowModification flowMod = new FlowModification(revision, modifier);
final RevisionDTO revisionDto = dtoFactory.createRevisionDTO(flowMod);
final ControllerServiceReferencingComponentDTO dto = dtoFactory.createControllerServiceReferencingComponentDTO(refComponent);
+
+ if (refComponent instanceof ControllerServiceNode) {
+ final ControllerServiceNode node = (ControllerServiceNode) refComponent;
+
+ // indicate if we've hit a cycle
+ dto.setReferenceCycle(visited.contains(node));
+
+ // if we haven't encountered this service before include it's referencing components
+ if (!dto.getReferenceCycle()) {
+ final ControllerServiceReferencingComponentsEntity references = createControllerServiceReferencingComponentsEntity(node.getReferences(), revisions, visited);
+ dto.setReferencingComponents(references.getControllerServiceReferencingComponents());
+ }
+
+ // mark node as visited
+ visited.add(node);
+ }
+
componentEntities.add(entityFactory.createControllerServiceReferencingComponentEntity(dto, revisionDto, accessPolicy));
}
final ControllerServiceReferencingComponentsEntity entity = new ControllerServiceReferencingComponentsEntity();
entity.setControllerServiceReferencingComponents(componentEntities);
-
return entity;
}
-
@Override
public ControllerServiceEntity deleteControllerService(final Revision revision, final String controllerServiceId) {
- final RevisionClaim claim = new StandardRevisionClaim(revision);
- final String modifier = NiFiUserUtils.getNiFiUserName();
- return revisionManager.updateRevision(claim, modifier, new UpdateRevisionTask<ControllerServiceEntity>() {
- @Override
- public RevisionUpdate<ControllerServiceEntity> update() {
- // TODO: Verify authorizations once ControllerServiceNode implements Authorizable
- // ensure access to the component
-
- final ControllerServiceNode controllerServiceNode = controllerServiceDAO.getControllerService(controllerServiceId);
- final ControllerServiceDTO dto = dtoFactory.createControllerServiceDto(controllerServiceNode);
-
- // delete the controller service
- controllerServiceDAO.deleteControllerService(controllerServiceId);
-
- // save the update
- controllerFacade.save();
+ final ControllerServiceNode controllerService = controllerServiceDAO.getControllerService(controllerServiceId);
+ final ControllerServiceDTO snapshot = deleteComponent(
+ revision,
+ controllerService,
+ () -> controllerServiceDAO.deleteControllerService(controllerServiceId),
+ dtoFactory.createControllerServiceDto(controllerService));
- final ControllerServiceEntity entity = entityFactory.createControllerServiceEntity(dto, null, null);
- return new StandardRevisionUpdate<>(entity, null);
- }
- }).getComponent();
+ return entityFactory.createControllerServiceEntity(snapshot, null, null);
}
@Override
- public ReportingTaskEntity createReportingTask(final Revision revision, final ReportingTaskDTO reportingTaskDTO) {
- // TODO: replace "root" with the ID of the process group once the reporting tasks are scoped by group
- return revisionManager.get("root", new ReadOnlyRevisionCallback<ReportingTaskEntity>() {
- @Override
- public ReportingTaskEntity withRevision(Revision revision) {
- // ensure id is set
- if (StringUtils.isBlank(reportingTaskDTO.getId())) {
- reportingTaskDTO.setId(UUID.randomUUID().toString());
- }
+ public ReportingTaskEntity createReportingTask(final ReportingTaskDTO reportingTaskDTO) {
+ final String modifier = NiFiUserUtils.getNiFiUserName();
- // create the reporting
- final ReportingTaskNode reportingTask = reportingTaskDAO.createReportingTask(reportingTaskDTO);
+ // ensure id is set
+ if (StringUtils.isBlank(reportingTaskDTO.getId())) {
+ reportingTaskDTO.setId(UUID.randomUUID().toString());
+ }
- // save the update
- if (properties.isClusterManager()) {
- clusterManager.saveReportingTasks();
- } else {
- controllerFacade.save();
- }
+ return revisionManager.get(controllerFacade.getInstanceId(), rev -> {
+ // ensure access to the controller
+ controllerFacade.authorize(authorizer, RequestAction.WRITE);
- final ReportingTaskDTO dto = dtoFactory.createReportingTaskDto(reportingTask);
- final RevisionDTO updatedRevision = new RevisionDTO();
- final AccessPolicyDTO accessPolicy = allAccess(); // TODO: Fix this once ReportingTask extends Authorizable
- return entityFactory.createReportingTaskEntity(dto, updatedRevision, accessPolicy);
- }
+ // create the reporting task
+ final ReportingTaskNode reportingTask = reportingTaskDAO.createReportingTask(reportingTaskDTO);
+
+ // save the update
+ controllerFacade.save();
+
+ final ReportingTaskDTO dto = dtoFactory.createReportingTaskDto(reportingTask);
+ final FlowModification lastMod = new FlowModification(new Revision(0L, rev.getClientId(), dto.getId()), modifier);
+ final AccessPolicyDTO accessPolicy = dtoFactory.createAccessPolicyDto(reportingTask);
+ return entityFactory.createReportingTaskEntity(dto, dtoFactory.createRevisionDTO(lastMod), accessPolicy);
});
}
@@ -1878,57 +1886,30 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
public UpdateResult<ReportingTaskEntity> updateReportingTask(final Revision revision, final ReportingTaskDTO reportingTaskDTO) {
// if reporting task does not exist, then create new reporting task
if (reportingTaskDAO.hasReportingTask(reportingTaskDTO.getId()) == false) {
- return new UpdateResult<>(createReportingTask(revision, reportingTaskDTO), true);
+ return new UpdateResult<>(createReportingTask(reportingTaskDTO), true);
}
- final String modifier = NiFiUserUtils.getNiFiUserName();
- final RevisionUpdate<ReportingTaskEntity> update = revisionManager.updateRevision(new StandardRevisionClaim(revision), modifier, new UpdateRevisionTask<ReportingTaskEntity>() {
- @Override
- public RevisionUpdate<ReportingTaskEntity> update() {
- final ReportingTaskNode reportingTask = reportingTaskDAO.updateReportingTask(reportingTaskDTO);
-
- // save the update
- if (properties.isClusterManager()) {
- clusterManager.saveReportingTasks();
- } else {
- controllerFacade.save();
- }
-
- final ReportingTaskDTO dto = dtoFactory.createReportingTaskDto(reportingTask);
- final RevisionDTO updatedRevision = new RevisionDTO();
- final AccessPolicyDTO accessPolicy = allAccess(); // TODO: Remove this once Reporting Task extends Authorizable
- final ReportingTaskEntity entity = entityFactory.createReportingTaskEntity(dto, updatedRevision, accessPolicy);
- final FlowModification lastMod = new FlowModification(incrementRevision(revision), modifier);
- return new StandardRevisionUpdate<>(entity, lastMod);
- }
- });
+ // get the component, ensure we have access to it, and perform the update request
+ final ReportingTaskNode reportingTask = reportingTaskDAO.getReportingTask(reportingTaskDTO.getId());
+ final RevisionUpdate<ReportingTaskDTO> snapshot = updateComponent(revision,
+ reportingTask,
+ () -> reportingTaskDAO.updateReportingTask(reportingTaskDTO),
+ rt -> dtoFactory.createReportingTaskDto(rt));
- final ReportingTaskEntity entity = update.getComponent();
- return new UpdateResult<>(entity, false);
+ final AccessPolicyDTO accessPolicy = dtoFactory.createAccessPolicyDto(reportingTask);
+ return new UpdateResult<>(entityFactory.createReportingTaskEntity(snapshot.getComponent(), dtoFactory.createRevisionDTO(snapshot.getLastModification()), accessPolicy), false);
}
@Override
public ReportingTaskEntity deleteReportingTask(final Revision revision, final String reportingTaskId) {
- // TODO: replace "root" with the ID of the process group once the reporting tasks are scoped by group
- return revisionManager.get("root", new ReadOnlyRevisionCallback<ReportingTaskEntity>() {
- @Override
- public ReportingTaskEntity withRevision(final Revision revision) {
- final ReportingTaskNode reportingTaskNode = reportingTaskDAO.getReportingTask(reportingTaskId);
-
- // delete the reporting task
- reportingTaskDAO.deleteReportingTask(reportingTaskId);
-
- // save the update
- if (properties.isClusterManager()) {
- clusterManager.saveReportingTasks();
- } else {
- controllerFacade.save();
- }
+ final ReportingTaskNode reportingTask = reportingTaskDAO.getReportingTask(reportingTaskId);
+ final ReportingTaskDTO snapshot = deleteComponent(
+ revision,
+ reportingTask,
+ () -> reportingTaskDAO.deleteReportingTask(reportingTaskId),
+ dtoFactory.createReportingTaskDto(reportingTask));
- final ReportingTaskDTO dto = dtoFactory.createReportingTaskDto(reportingTaskNode);
- return entityFactory.createReportingTaskEntity(dto, null, null);
- }
- });
+ return entityFactory.createReportingTaskEntity(snapshot, null, null);
}
@Override
@@ -2682,6 +2663,9 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
.flatMap(remoteGroup -> remoteGroup.getOutputPorts().stream())
.map(remoteOutputPort -> remoteOutputPort.getIdentifier())
.forEach(id -> identifiers.add(id));
+ processGroup.getControllerServices(false).stream()
+ .map(controllerService -> controllerService.getIdentifier())
+ .forEach(id -> identifiers.add(id));
// read lock on every component being accessed in the dto conversion
return revisionManager.get(identifiers,
@@ -2708,24 +2692,45 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
}
@Override
- public Set<ControllerServiceDTO> getControllerServices(String groupId) {
- final Set<ControllerServiceDTO> controllerServiceDtos = new LinkedHashSet<>();
- final Set<ControllerServiceNode> serviceNodes = getGroup(groupId).getControllerServices(true);
+ public Set<ControllerServiceEntity> getControllerServices(String groupId) {
+ // TODO - move this logic into the ControllerServiceDAO
+ final ProcessGroup group = processGroupDAO.getProcessGroup(groupId);
+ final Set<ControllerServiceNode> serviceNodes = group.getControllerServices(true);
final Set<String> serviceIds = serviceNodes.stream().map(service -> service.getIdentifier()).collect(Collectors.toSet());
- revisionManager.get(serviceIds, () -> {
- for (ControllerServiceNode controllerService : serviceNodes) {
- controllerServiceDtos.add(dtoFactory.createControllerServiceDto(controllerService));
- }
- return null;
- });
+ return revisionManager.get(serviceIds, () -> {
+ return serviceNodes.stream()
+ .map(serviceNode -> {
+ final ControllerServiceDTO dto = dtoFactory.createControllerServiceDto(serviceNode);
- return controllerServiceDtos;
+ final ControllerServiceReference ref = serviceNode.getReferences();
+ final ControllerServiceReferencingComponentsEntity referencingComponentsEntity = createControllerServiceReferencingComponentsEntity(ref);
+ dto.setReferencingComponents(referencingComponentsEntity.getControllerServiceReferencingComponents());
+
+ final RevisionDTO revision = dtoFactory.createRevisionDTO(revisionManager.getRevision(serviceNode.getIdentifier()));
+ final AccessPolicyDTO accessPolicy = dtoFactory.createAccessPolicyDto(serviceNode);
+ return entityFactory.createControllerServiceEntity(dto, revision, accessPolicy);
+ })
+ .collect(Collectors.toSet());
+ });
}
@Override
- public ControllerServiceDTO getControllerService(String controllerServiceId) {
- return revisionManager.get(controllerServiceId, rev -> dtoFactory.createControllerServiceDto(controllerServiceDAO.getControllerService(controllerServiceId)));
+ public ControllerServiceEntity getControllerService(String controllerServiceId) {
+ return revisionManager.get(controllerServiceId, rev -> {
+ final ControllerServiceNode controllerService = controllerServiceDAO.getControllerService(controllerServiceId);
+ controllerService.authorize(authorizer, RequestAction.READ);
+
+ final RevisionDTO revision = dtoFactory.createRevisionDTO(rev);
+ final AccessPolicyDTO accessPolicy = dtoFactory.createAccessPolicyDto(controllerService);
+ final ControllerServiceDTO dto = dtoFactory.createControllerServiceDto(controllerService);
+
+ final ControllerServiceReference ref = controllerService.getReferences();
+ final ControllerServiceReferencingComponentsEntity referencingComponentsEntity = createControllerServiceReferencingComponentsEntity(ref);
+ dto.setReferencingComponents(referencingComponentsEntity.getControllerServiceReferencingComponents());
+
+ return entityFactory.createControllerServiceEntity(dto, revision, accessPolicy);
+ });
}
@Override
@@ -2748,26 +2753,36 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
return revisionManager.get(controllerServiceId, rev -> {
final ControllerServiceNode service = controllerServiceDAO.getControllerService(controllerServiceId);
final ControllerServiceReference ref = service.getReferences();
- return createControllerServiceReferencingComponentsEntity(ref, Collections.emptyMap());
+ return createControllerServiceReferencingComponentsEntity(ref);
});
}
@Override
- public Set<ReportingTaskDTO> getReportingTasks() {
+ public Set<ReportingTaskEntity> getReportingTasks() {
final Set<ReportingTaskNode> reportingTasks = reportingTaskDAO.getReportingTasks();
final Set<String> ids = reportingTasks.stream().map(task -> task.getIdentifier()).collect(Collectors.toSet());
+
return revisionManager.get(ids, () -> {
- final Set<ReportingTaskDTO> reportingTaskDtos = new LinkedHashSet<>();
- for (ReportingTaskNode reportingTask : reportingTasks) {
- reportingTaskDtos.add(dtoFactory.createReportingTaskDto(reportingTask));
- }
- return reportingTaskDtos;
+ return reportingTasks.stream()
+ .map(reportingTask -> {
+ final RevisionDTO revision = dtoFactory.createRevisionDTO(revisionManager.getRevision(reportingTask.getIdentifier()));
+ final AccessPolicyDTO accessPolicy = dtoFactory.createAccessPolicyDto(reportingTask);
+ return entityFactory.createReportingTaskEntity(dtoFactory.createReportingTaskDto(reportingTask), revision, accessPolicy);
+ })
+ .collect(Collectors.toSet());
});
}
@Override
- public ReportingTaskDTO getReportingTask(String reportingTaskId) {
- return revisionManager.get(reportingTaskId, rev -> dtoFactory.createReportingTaskDto(reportingTaskDAO.getReportingTask(reportingTaskId)));
+ public ReportingTaskEntity getReportingTask(String reportingTaskId) {
+ return revisionManager.get(reportingTaskId, rev -> {
+ final ReportingTaskNode reportingTask = reportingTaskDAO.getReportingTask(reportingTaskId);
+ reportingTask.authorize(authorizer, RequestAction.READ);
+
+ final RevisionDTO revision = dtoFactory.createRevisionDTO(rev);
+ final AccessPolicyDTO accessPolicy = dtoFactory.createAccessPolicyDto(reportingTask);
+ return entityFactory.createReportingTaskEntity(dtoFactory.createReportingTaskDto(reportingTask), revision, accessPolicy);
+ });
}
@Override
http://git-wip-us.apache.org/repos/asf/nifi/blob/8bb56fca/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java
index acef302..6d06244 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java
@@ -25,6 +25,7 @@ import org.apache.nifi.action.Operation;
import org.apache.nifi.action.component.details.FlowChangeExtensionDetails;
import org.apache.nifi.action.details.FlowChangeConfigureDetails;
import org.apache.nifi.admin.service.AuditService;
+import org.apache.nifi.authorization.user.NiFiUser;
import org.apache.nifi.authorization.user.NiFiUserDetails;
import org.apache.nifi.authorization.user.NiFiUserUtils;
import org.apache.nifi.cluster.manager.NodeResponse;
@@ -32,7 +33,6 @@ import org.apache.nifi.cluster.manager.impl.WebClusterManager;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.controller.ControllerServiceLookup;
import org.apache.nifi.controller.reporting.ReportingTaskProvider;
-import org.apache.nifi.authorization.user.NiFiUser;
import org.apache.nifi.util.NiFiProperties;
import org.apache.nifi.web.api.dto.ControllerServiceDTO;
import org.apache.nifi.web.api.dto.ProcessorConfigDTO;
@@ -404,7 +404,7 @@ public class StandardNiFiWebConfigurationContext implements NiFiWebConfiguration
// if the lookup has the service that means we are either a node or
// the ncm and the service is available there only
if (controllerServiceLookup.getControllerService(id) != null) {
- controllerService = serviceFacade.getControllerService(id);
+ controllerService = serviceFacade.getControllerService(id).getComponent();
} else {
// if this is a standalone instance the service should have been found above... there should
// no cluster to replicate the request to
@@ -435,7 +435,7 @@ public class StandardNiFiWebConfigurationContext implements NiFiWebConfiguration
if (entity == null) {
entity = nodeResponse.getClientResponse().getEntity(ControllerServiceEntity.class);
}
- controllerService = entity.getControllerService();
+ controllerService = entity.getComponent();
}
// return the controller service info
@@ -454,7 +454,7 @@ public class StandardNiFiWebConfigurationContext implements NiFiWebConfiguration
controllerServiceDto.setAnnotationData(annotationData);
final UpdateResult<ControllerServiceEntity> updateResult = serviceFacade.updateControllerService(revision, controllerServiceDto);
- controllerService = updateResult.getResult().getControllerService();
+ controllerService = updateResult.getResult().getComponent();
} else {
// if this is a standalone instance the service should have been found above... there should
// no cluster to replicate the request to
@@ -488,7 +488,7 @@ public class StandardNiFiWebConfigurationContext implements NiFiWebConfiguration
// create the controller service dto
ControllerServiceDTO controllerServiceDto = new ControllerServiceDTO();
- controllerServiceEntity.setControllerService(controllerServiceDto);
+ controllerServiceEntity.setComponent(controllerServiceDto);
controllerServiceDto.setId(id);
controllerServiceDto.setAnnotationData(annotationData);
@@ -507,7 +507,7 @@ public class StandardNiFiWebConfigurationContext implements NiFiWebConfiguration
if (entity == null) {
entity = nodeResponse.getClientResponse().getEntity(ControllerServiceEntity.class);
}
- controllerService = entity.getControllerService();
+ controllerService = entity.getComponent();
}
// return the controller service info
@@ -539,7 +539,7 @@ public class StandardNiFiWebConfigurationContext implements NiFiWebConfiguration
// if the provider has the service that means we are either a node or
// the ncm and the service is available there only
if (reportingTaskProvider.getReportingTaskNode(id) != null) {
- reportingTask = serviceFacade.getReportingTask(id);
+ reportingTask = serviceFacade.getReportingTask(id).getComponent();
} else {
// if this is a standalone instance the task should have been found above... there should
// no cluster to replicate the request to
@@ -570,7 +570,7 @@ public class StandardNiFiWebConfigurationContext implements NiFiWebConfiguration
if (entity == null) {
entity = nodeResponse.getClientResponse().getEntity(ReportingTaskEntity.class);
}
- reportingTask = entity.getReportingTask();
+ reportingTask = entity.getComponent();
}
// return the reporting task info
@@ -589,7 +589,7 @@ public class StandardNiFiWebConfigurationContext implements NiFiWebConfiguration
reportingTaskDto.setAnnotationData(annotationData);
final UpdateResult<ReportingTaskEntity> updateResult = serviceFacade.updateReportingTask(revision, reportingTaskDto);
- reportingTask = updateResult.getResult().getReportingTask();
+ reportingTask = updateResult.getResult().getComponent();
} else {
// if this is a standalone instance the task should have been found above... there should
// no cluster to replicate the request to
@@ -623,7 +623,7 @@ public class StandardNiFiWebConfigurationContext implements NiFiWebConfiguration
// create the reporting task dto
ReportingTaskDTO reportingTaskDto = new ReportingTaskDTO();
- reportingTaskEntity.setReportingTask(reportingTaskDto);
+ reportingTaskEntity.setComponent(reportingTaskDto);
reportingTaskDto.setId(id);
reportingTaskDto.setAnnotationData(annotationData);
@@ -642,7 +642,7 @@ public class StandardNiFiWebConfigurationContext implements NiFiWebConfiguration
if (entity == null) {
entity = nodeResponse.getClientResponse().getEntity(ReportingTaskEntity.class);
}
- reportingTask = entity.getReportingTask();
+ reportingTask = entity.getComponent();
}
// return the processor info
http://git-wip-us.apache.org/repos/asf/nifi/blob/8bb56fca/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java
index 22ebf29..d03e07d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java
@@ -18,7 +18,6 @@ package org.apache.nifi.web.api;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiParam;
import com.wordnik.swagger.annotations.ApiResponse;
import com.wordnik.swagger.annotations.ApiResponses;
import io.jsonwebtoken.JwtException;
@@ -37,10 +36,8 @@ import org.apache.nifi.util.FormatUtils;
import org.apache.nifi.util.NiFiProperties;
import org.apache.nifi.web.api.dto.AccessConfigurationDTO;
import org.apache.nifi.web.api.dto.AccessStatusDTO;
-import org.apache.nifi.web.api.dto.RevisionDTO;
import org.apache.nifi.web.api.entity.AccessConfigurationEntity;
import org.apache.nifi.web.api.entity.AccessStatusEntity;
-import org.apache.nifi.web.api.request.ClientIdParameter;
import org.apache.nifi.web.security.InvalidAuthenticationException;
import org.apache.nifi.web.security.ProxiedEntitiesUtils;
import org.apache.nifi.web.security.UntrustedProxyException;
@@ -62,13 +59,11 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -104,7 +99,6 @@ public class AccessResource extends ApplicationResource {
* Retrieves the access configuration for this NiFi.
*
* @param httpServletRequest the servlet request
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
* @return A accessConfigurationEntity
*/
@GET
@@ -115,13 +109,7 @@ public class AccessResource extends ApplicationResource {
value = "Retrieves the access configuration for this NiFi",
response = AccessConfigurationEntity.class
)
- public Response getLoginConfig(
- @Context HttpServletRequest httpServletRequest,
- @ApiParam(
- value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
- required = false
- )
- @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ public Response getLoginConfig(@Context HttpServletRequest httpServletRequest) {
final AccessConfigurationDTO accessConfiguration = new AccessConfigurationDTO();
@@ -129,13 +117,8 @@ public class AccessResource extends ApplicationResource {
accessConfiguration.setSupportsLogin(loginIdentityProvider != null && httpServletRequest.isSecure());
accessConfiguration.setSupportsAnonymous(false);
- // create the revision
- final RevisionDTO revision = new RevisionDTO();
- revision.setClientId(clientId.getClientId());
-
// create the response entity
final AccessConfigurationEntity entity = new AccessConfigurationEntity();
- entity.setRevision(revision);
entity.setConfig(accessConfiguration);
// generate the response
@@ -146,7 +129,6 @@ public class AccessResource extends ApplicationResource {
* Gets the status the client's access.
*
* @param httpServletRequest the servlet request
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
* @return A accessStatusEntity
*/
@GET
@@ -166,13 +148,7 @@ public class AccessResource extends ApplicationResource {
@ApiResponse(code = 500, message = "Unable to determine access status because an unexpected error occurred.")
}
)
- public Response getAccessStatus(
- @Context HttpServletRequest httpServletRequest,
- @ApiParam(
- value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
- required = false
- )
- @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ public Response getAccessStatus(@Context HttpServletRequest httpServletRequest) {
// only consider user specific access over https
if (!httpServletRequest.isSecure()) {
@@ -253,13 +229,8 @@ public class AccessResource extends ApplicationResource {
throw new AdministrationException(ase.getMessage(), ase);
}
- // create the revision
- final RevisionDTO revision = new RevisionDTO();
- revision.setClientId(clientId.getClientId());
-
// create the entity
final AccessStatusEntity entity = new AccessStatusEntity();
- entity.setRevision(revision);
entity.setAccessStatus(accessStatus);
return generateOkResponse(entity).build();
http://git-wip-us.apache.org/repos/asf/nifi/blob/8bb56fca/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
index 12283e7..e946117 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java
@@ -16,26 +16,10 @@
*/
package org.apache.nifi.web.api;
-import java.io.Serializable;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.CacheControl;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriBuilderException;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.core.HttpContext;
+import com.sun.jersey.api.representation.Form;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
+import com.sun.jersey.server.impl.model.method.dispatch.FormDispatchProvider;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -51,7 +35,6 @@ import org.apache.nifi.util.NiFiProperties;
import org.apache.nifi.web.Revision;
import org.apache.nifi.web.api.dto.RevisionDTO;
import org.apache.nifi.web.api.entity.ComponentEntity;
-import org.apache.nifi.web.api.entity.Entity;
import org.apache.nifi.web.api.request.ClientIdParameter;
import org.apache.nifi.web.security.jwt.JwtAuthenticationFilter;
import org.apache.nifi.web.util.WebUtils;
@@ -60,10 +43,24 @@ import org.slf4j.LoggerFactory;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
-import com.sun.jersey.api.core.HttpContext;
-import com.sun.jersey.api.representation.Form;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
-import com.sun.jersey.server.impl.model.method.dispatch.FormDispatchProvider;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriBuilderException;
+import javax.ws.rs.core.UriInfo;
+import java.io.Serializable;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
/**
* Base class for controllers.
@@ -342,19 +339,6 @@ public abstract class ApplicationResource {
return params;
}
- /**
- * Used when replicating requests to ensure the client id is the same on each node.
- *
- * @param entity entity
- * @return entity with the client id set
- */
- protected Entity updateClientId(final Entity entity) {
- if (entity != null && entity.getRevision() != null && StringUtils.isBlank(entity.getRevision().getClientId())) {
- entity.getRevision().setClientId(new ClientIdParameter().getClientId());
- }
- return entity;
- }
-
protected Map<String, String> getHeaders() {
return getHeaders(new HashMap<String, String>());
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/8bb56fca/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java
index 1dce576..470557f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java
@@ -30,11 +30,9 @@ import org.apache.nifi.web.IllegalClusterResourceRequestException;
import org.apache.nifi.web.NiFiServiceFacade;
import org.apache.nifi.web.api.dto.ClusterDTO;
import org.apache.nifi.web.api.dto.NodeDTO;
-import org.apache.nifi.web.api.dto.RevisionDTO;
import org.apache.nifi.web.api.dto.search.NodeSearchResultDTO;
import org.apache.nifi.web.api.entity.ClusterEntity;
import org.apache.nifi.web.api.entity.ClusterSearchResultsEntity;
-import org.apache.nifi.web.api.request.ClientIdParameter;
import javax.ws.rs.Consumes;
import javax.ws.rs.DefaultValue;
@@ -97,7 +95,6 @@ public class ClusterResource extends ApplicationResource {
/**
* Gets the contents of this NiFi cluster. This includes all nodes and their status.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
* @return A clusterEntity
*/
@GET
@@ -122,25 +119,15 @@ public class ClusterResource extends ApplicationResource {
@ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
}
)
- public Response getCluster(
- @ApiParam(
- value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
- required = false
- )
- @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ public Response getCluster() {
if (properties.isClusterManager()) {
final ClusterDTO dto = serviceFacade.getCluster();
- // create the revision
- RevisionDTO revision = new RevisionDTO();
- revision.setClientId(clientId.getClientId());
-
// create entity
final ClusterEntity entity = new ClusterEntity();
entity.setCluster(dto);
- entity.setRevision(revision);
// generate the response
return generateOkResponse(entity).build();
http://git-wip-us.apache.org/repos/asf/nifi/blob/8bb56fca/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
index 224dda7..3c9887a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
@@ -266,7 +266,7 @@ public class ConnectionResource extends ApplicationResource {
headersToOverride.put("content-type", MediaType.APPLICATION_JSON);
// replicate the request
- return clusterManager.applyRequest(HttpMethod.PUT, getAbsolutePath(), updateClientId(connectionEntity), getHeaders(headersToOverride)).getResponse();
+ return clusterManager.applyRequest(HttpMethod.PUT, getAbsolutePath(), connectionEntity, getHeaders(headersToOverride)).getResponse();
}
// handle expects request
http://git-wip-us.apache.org/repos/asf/nifi/blob/8bb56fca/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
index ded6c39..d3912ed 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
@@ -24,6 +24,7 @@ import com.wordnik.swagger.annotations.ApiResponse;
import com.wordnik.swagger.annotations.ApiResponses;
import com.wordnik.swagger.annotations.Authorization;
import org.apache.commons.lang3.StringUtils;
+import org.apache.nifi.authorization.user.NiFiUser;
import org.apache.nifi.authorization.user.NiFiUserUtils;
import org.apache.nifi.cluster.context.ClusterContext;
import org.apache.nifi.cluster.context.ClusterContextThreadLocal;
@@ -32,7 +33,6 @@ import org.apache.nifi.cluster.manager.exception.UnknownNodeException;
import org.apache.nifi.cluster.manager.impl.WebClusterManager;
import org.apache.nifi.cluster.node.Node;
import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.authorization.user.NiFiUser;
import org.apache.nifi.util.NiFiProperties;
import org.apache.nifi.web.ConfigurationSnapshot;
import org.apache.nifi.web.NiFiServiceFacade;
@@ -40,7 +40,6 @@ import org.apache.nifi.web.Revision;
import org.apache.nifi.web.api.dto.ControllerConfigurationDTO;
import org.apache.nifi.web.api.dto.CounterDTO;
import org.apache.nifi.web.api.dto.CountersDTO;
-import org.apache.nifi.web.api.dto.ReportingTaskDTO;
import org.apache.nifi.web.api.dto.RevisionDTO;
import org.apache.nifi.web.api.entity.AuthorityEntity;
import org.apache.nifi.web.api.entity.ControllerConfigurationEntity;
@@ -51,12 +50,10 @@ import org.apache.nifi.web.api.entity.ProcessGroupEntity;
import org.apache.nifi.web.api.entity.ReportingTaskEntity;
import org.apache.nifi.web.api.entity.ReportingTasksEntity;
import org.apache.nifi.web.api.request.ClientIdParameter;
-import org.apache.nifi.web.util.Availability;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.Consumes;
import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.HttpMethod;
import javax.ws.rs.POST;
@@ -153,7 +150,6 @@ public class ControllerResource extends ApplicationResource {
/**
* Retrieves the counters report for this NiFi.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
* @return A countersEntity.
*/
@GET
@@ -180,11 +176,6 @@ public class ControllerResource extends ApplicationResource {
)
public Response getCounters(
@ApiParam(
- value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
- required = false
- )
- @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
- @ApiParam(
value = "Whether or not to include the breakdown per node. Optional, defaults to false",
required = false
)
@@ -230,13 +221,8 @@ public class ControllerResource extends ApplicationResource {
final CountersDTO countersReport = serviceFacade.getCounters();
- // create the revision
- final RevisionDTO revision = new RevisionDTO();
- revision.setClientId(clientId.getClientId());
-
// create the response entity
final CountersEntity entity = new CountersEntity();
- entity.setRevision(revision);
entity.setCounters(countersReport);
// generate the response
@@ -247,7 +233,6 @@ public class ControllerResource extends ApplicationResource {
* Update the specified counter. This will reset the counter value to 0.
*
* @param httpServletRequest request
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
* @param id The id of the counter.
* @return A counterEntity.
*/
@@ -274,11 +259,6 @@ public class ControllerResource extends ApplicationResource {
)
public Response updateCounter(
@Context HttpServletRequest httpServletRequest,
- @ApiParam(
- value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
- required = false
- )
- @FormParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
@PathParam("id") String id) {
// replicate if cluster manager
@@ -295,13 +275,8 @@ public class ControllerResource extends ApplicationResource {
// reset the specified counter
final CounterDTO counter = serviceFacade.updateCounter(id);
- // create the revision
- final RevisionDTO revision = new RevisionDTO();
- revision.setClientId(clientId.getClientId());
-
// create the response entity
final CounterEntity entity = new CounterEntity();
- entity.setRevision(revision);
entity.setCounter(counter);
// generate the response
@@ -311,7 +286,6 @@ public class ControllerResource extends ApplicationResource {
/**
* Retrieves the configuration for this NiFi.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
* @return A controllerConfigurationEntity.
*/
@GET
@@ -337,12 +311,7 @@ public class ControllerResource extends ApplicationResource {
@ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
}
)
- public Response getControllerConfig(
- @ApiParam(
- value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
- required = false
- )
- @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ public Response getControllerConfig() {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -351,13 +320,8 @@ public class ControllerResource extends ApplicationResource {
final ControllerConfigurationDTO controllerConfig = serviceFacade.getControllerConfiguration();
- // create the revision
- final RevisionDTO revision = new RevisionDTO();
- revision.setClientId(clientId.getClientId());
-
// create the response entity
final ControllerConfigurationEntity entity = new ControllerConfigurationEntity();
- entity.setRevision(revision);
entity.setConfig(controllerConfig);
// generate the response
@@ -408,7 +372,7 @@ public class ControllerResource extends ApplicationResource {
// replicate if cluster manager
if (properties.isClusterManager()) {
- return clusterManager.applyRequest(HttpMethod.PUT, getAbsolutePath(), updateClientId(configEntity), getHeaders()).getResponse();
+ return clusterManager.applyRequest(HttpMethod.PUT, getAbsolutePath(), configEntity, getHeaders()).getResponse();
}
final RevisionDTO revisionDto = configEntity.getRevision();
@@ -441,7 +405,6 @@ public class ControllerResource extends ApplicationResource {
/**x
* Retrieves the user details, including the authorities, about the user making the request.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
* @return A authoritiesEntity.
*/
@GET
@@ -469,12 +432,7 @@ public class ControllerResource extends ApplicationResource {
@ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
}
)
- public Response getAuthorities(
- @ApiParam(
- value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
- required = false
- )
- @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ public Response getAuthorities() {
// note that the cluster manager will handle this request directly
final NiFiUser user = NiFiUserUtils.getNiFiUser();
@@ -482,13 +440,8 @@ public class ControllerResource extends ApplicationResource {
throw new WebApplicationException(new Throwable("Unable to access details for current user."));
}
- // create the revision
- final RevisionDTO revision = new RevisionDTO();
- revision.setClientId(clientId.getClientId());
-
// create the response entity
AuthorityEntity entity = new AuthorityEntity();
- entity.setRevision(revision);
entity.setUserId(user.getIdentity());
entity.setAuthorities(new HashSet<>(Arrays.asList("ROLE_MONITOR", "ROLE_DFM", "ROLE_ADMIN", "ROLE_PROXY", "ROLE_NIFI", "ROLE_PROVENANCE")));
@@ -504,16 +457,13 @@ public class ControllerResource extends ApplicationResource {
* Creates a new Reporting Task.
*
* @param httpServletRequest request
- * @param availability Whether the reporting task is available on the NCM
- * only (ncm) or on the nodes only (node). If this instance is not clustered
- * all tasks should use the node availability.
* @param reportingTaskEntity A reportingTaskEntity.
* @return A reportingTaskEntity.
*/
@POST
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- @Path("reporting-tasks/{availability}")
+ @Path("reporting-tasks")
// TODO - @PreAuthorize("hasRole('ROLE_DFM')")
@ApiOperation(
value = "Creates a new reporting task",
@@ -533,36 +483,24 @@ public class ControllerResource extends ApplicationResource {
public Response createReportingTask(
@Context HttpServletRequest httpServletRequest,
@ApiParam(
- value = "Whether the reporting task is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
- allowableValues = "NCM, NODE",
- required = true
- )
- @PathParam("availability") String availability,
- @ApiParam(
value = "The reporting task configuration details.",
required = true
) ReportingTaskEntity reportingTaskEntity) {
- final Availability avail = reportingTaskResource.parseAvailability(availability);
-
- if (reportingTaskEntity == null || reportingTaskEntity.getReportingTask() == null) {
+ if (reportingTaskEntity == null || reportingTaskEntity.getComponent() == null) {
throw new IllegalArgumentException("Reporting task details must be specified.");
}
- if (reportingTaskEntity.getRevision() == null) {
- throw new IllegalArgumentException("Revision must be specified.");
- }
-
- if (reportingTaskEntity.getReportingTask().getId() != null) {
+ if (reportingTaskEntity.getComponent().getId() != null) {
throw new IllegalArgumentException("Reporting task ID cannot be specified.");
}
- if (StringUtils.isBlank(reportingTaskEntity.getReportingTask().getType())) {
+ if (StringUtils.isBlank(reportingTaskEntity.getComponent().getType())) {
throw new IllegalArgumentException("The type of reporting task to create must be specified.");
}
if (properties.isClusterManager()) {
- return clusterManager.applyRequest(HttpMethod.POST, getAbsolutePath(), updateClientId(reportingTaskEntity), getHeaders()).getResponse();
+ return clusterManager.applyRequest(HttpMethod.POST, getAbsolutePath(), reportingTaskEntity, getHeaders()).getResponse();
}
// handle expects request (usually from the cluster manager)
@@ -574,19 +512,17 @@ public class ControllerResource extends ApplicationResource {
// set the processor id as appropriate
final ClusterContext clusterContext = ClusterContextThreadLocal.getContext();
if (clusterContext != null) {
- reportingTaskEntity.getReportingTask().setId(UUID.nameUUIDFromBytes(clusterContext.getIdGenerationSeed().getBytes(StandardCharsets.UTF_8)).toString());
+ reportingTaskEntity.getComponent().setId(UUID.nameUUIDFromBytes(clusterContext.getIdGenerationSeed().getBytes(StandardCharsets.UTF_8)).toString());
} else {
- reportingTaskEntity.getReportingTask().setId(UUID.randomUUID().toString());
+ reportingTaskEntity.getComponent().setId(UUID.randomUUID().toString());
}
// create the reporting task and generate the json
- final Revision revision = getRevision(reportingTaskEntity.getRevision(), reportingTaskEntity.getReportingTask().getId());
- final ReportingTaskEntity entity = serviceFacade.createReportingTask(revision, reportingTaskEntity.getReportingTask());
-
- reportingTaskResource.populateRemainingReportingTaskContent(availability, entity.getReportingTask());
+ final ReportingTaskEntity entity = serviceFacade.createReportingTask(reportingTaskEntity.getComponent());
+ reportingTaskResource.populateRemainingReportingTaskEntityContent(entity);
// build the response
- return clusterContext(generateCreatedResponse(URI.create(entity.getReportingTask().getUri()), entity)).build();
+ return clusterContext(generateCreatedResponse(URI.create(entity.getComponent().getUri()), entity)).build();
}
/**
@@ -595,15 +531,12 @@ public class ControllerResource extends ApplicationResource {
* @param clientId Optional client id. If the client id is not specified, a
* new one will be generated. This value (whether specified or generated) is
* included in the response.
- * @param availability Whether the reporting task is available on the NCM
- * only (ncm) or on the nodes only (node). If this instance is not clustered
- * all tasks should use the node availability.
* @return A reportingTasksEntity.
*/
@GET
@Consumes(MediaType.WILDCARD)
@Produces(MediaType.APPLICATION_JSON)
- @Path("reporting-tasks/{availability}")
+ @Path("reporting-tasks")
// TODO - @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
@ApiOperation(
value = "Gets all reporting tasks",
@@ -627,31 +560,19 @@ public class ControllerResource extends ApplicationResource {
value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
required = false
)
- @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
- @ApiParam(
- value = "Whether the reporting task is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
- allowableValues = "NCM, NODE",
- required = true
- )
- @PathParam("availability") String availability) {
-
- final Availability avail = reportingTaskResource.parseAvailability(availability);
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
- if (properties.isClusterManager() && Availability.NODE.equals(avail)) {
+ if (properties.isClusterManager()) {
return clusterManager.applyRequest(HttpMethod.GET, getAbsolutePath(), getRequestParameters(true), getHeaders()).getResponse();
}
// get all the reporting tasks
- final Set<ReportingTaskDTO> reportingTasks = reportingTaskResource.populateRemainingReportingTasksContent(availability, serviceFacade.getReportingTasks());
-
- // create the revision
- final RevisionDTO revision = new RevisionDTO();
- revision.setClientId(clientId.getClientId());
+ final Set<ReportingTaskEntity> reportingTasks = serviceFacade.getReportingTasks();
+ reportingTaskResource.populateRemainingReportingTaskEntitiesContent(reportingTasks);
- // create the response entity
+ // create the response entity
final ReportingTasksEntity entity = new ReportingTasksEntity();
- entity.setRevision(revision);
entity.setReportingTasks(reportingTasks);
// generate the response