Repository: incubator-nifi Updated Branches: refs/heads/NIFI-250 e989215fa -> 3e77e7d32
NIFI-250: - Supporting updated API. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3e77e7d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3e77e7d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3e77e7d3 Branch: refs/heads/NIFI-250 Commit: 3e77e7d32e2c4e39a8247eacb44681a57bc3b618 Parents: e989215 Author: Matt Gilman <[email protected]> Authored: Mon Jan 26 09:29:34 2015 -0500 Committer: Matt Gilman <[email protected]> Committed: Mon Jan 26 09:29:34 2015 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java | 2 +- .../org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3e77e7d3/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.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/api/dto/DtoFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java index d1d6bde..78d8f3d 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java @@ -855,7 +855,7 @@ public final class DtoFactory { sortedProperties.putAll(controllerServiceNode.getProperties()); // get the property order from the controller service - final ControllerService controllerService = controllerServiceNode.getControllerService(); + final ControllerService controllerService = controllerServiceNode.getControllerServiceImplementation(); final Map<PropertyDescriptor, String> orderedProperties = new LinkedHashMap<>(); final List<PropertyDescriptor> descriptors = controllerService.getPropertyDescriptors(); if (descriptors != null && !descriptors.isEmpty()) { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3e77e7d3/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 6feab86..ae24c87 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 @@ -59,7 +59,7 @@ public class StandardControllerServiceDAO extends ComponentDAO implements Contro final Map<String, String> temp = new HashMap<>(); // create the controller service - final ControllerServiceNode controllerService = flowController.createControllerService(controllerServiceDTO.getType(), controllerServiceDTO.getName(), temp); + final ControllerServiceNode controllerService = flowController.createControllerService(controllerServiceDTO.getType(), controllerServiceDTO.getName(), true); return controllerService; }
