Repository: incubator-nifi Updated Branches: refs/heads/NIFI-250 e8294f29e -> 2dccb5b4d
NIFI-250: - Adding better handling when a request is interpreted as a request to create a processor/controller service/reporting task and the type is not specified. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2dccb5b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2dccb5b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2dccb5b4 Branch: refs/heads/NIFI-250 Commit: 2dccb5b4d98a194a7cee307b2252962eebdb67b1 Parents: e8294f2 Author: Matt Gilman <[email protected]> Authored: Wed Mar 25 09:28:55 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Wed Mar 25 09:28:55 2015 -0400 ---------------------------------------------------------------------- .../apache/nifi/web/dao/impl/StandardControllerServiceDAO.java | 5 +++++ .../java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java | 5 +++++ .../org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java | 5 +++++ 3 files changed, 15 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2dccb5b4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java index 676c203..f12f690 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java @@ -61,6 +61,11 @@ public class StandardControllerServiceDAO extends ComponentDAO implements Contro */ @Override public ControllerServiceNode createControllerService(final ControllerServiceDTO controllerServiceDTO) { + // ensure the type is specified + if (controllerServiceDTO.getType() == null) { + throw new IllegalArgumentException("The controller service type must be specified."); + } + // create the controller service final ControllerServiceNode controllerService = serviceProvider.createControllerService(controllerServiceDTO.getType(), controllerServiceDTO.getId(), true); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2dccb5b4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java index 633f8e2..0c587fe 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java @@ -99,6 +99,11 @@ public class StandardProcessorDAO extends ComponentDAO implements ProcessorDAO { if (processorDTO.getParentGroupId() != null && !flowController.areGroupsSame(groupId, processorDTO.getParentGroupId())) { throw new IllegalArgumentException("Cannot specify a different Parent Group ID than the Group to which the Processor is being added."); } + + // ensure the type is specified + if (processorDTO.getType() == null) { + throw new IllegalArgumentException("The processor type must be specified."); + } // get the group to add the processor to ProcessGroup group = locateProcessGroup(flowController, groupId); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2dccb5b4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java index 41434d3..1252924 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java @@ -69,6 +69,11 @@ public class StandardReportingTaskDAO extends ComponentDAO implements ReportingT */ @Override public ReportingTaskNode createReportingTask(final ReportingTaskDTO reportingTaskDTO) { + // ensure the type is specified + if (reportingTaskDTO.getType() == null) { + throw new IllegalArgumentException("The reporting task type must be specified."); + } + try { // create the reporting task final ReportingTaskNode reportingTask = reportingTaskProvider.createReportingTask(reportingTaskDTO.getType(), reportingTaskDTO.getId(), true);
