NIFI-250: - Creating endpoints for returning the available controller services and reporting tasks. - Made the Setting tabbed to provide a place for configuring controller services and reporting tasks.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/39a77e48 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/39a77e48 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/39a77e48 Branch: refs/heads/NIFI-250 Commit: 39a77e4828e41f635f2f85c68b78ca9e21ad1970 Parents: 58b02e4 Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Tue Jan 13 14:52:23 2015 -0500 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Tue Jan 20 08:13:44 2015 -0500 ---------------------------------------------------------------------- .../org/apache/nifi/web/api/dto/DtoFactory.java | 30 ++++++++++++++++++++ .../nifi/web/controller/ControllerFacade.java | 4 +++ 2 files changed, 34 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/39a77e48/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java ---------------------------------------------------------------------- diff --git a/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java index 7fad616..89545eb 100644 --- a/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java +++ b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java @@ -1136,6 +1136,7 @@ public final class DtoFactory { * @param type * @param baseTypes */ +<<<<<<< HEAD:nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java private void identifyBaseTypes(final Class baseType, final Class type, final Set<Class> baseTypes, final boolean recurse) { final Class[] interfaces = type.getInterfaces(); for (final Class i : interfaces) { @@ -1148,6 +1149,18 @@ public final class DtoFactory { if (type.getSuperclass() != null) { identifyBaseTypes(baseType, type.getSuperclass(), baseTypes, recurse); } +======= + private void identifyBaseTypes(final Class baseType, final Class type, final Set<String> baseTypes) { + final Class[] interfaces = type.getInterfaces(); + for (final Class i : interfaces) { + if (baseType.isAssignableFrom(i) && !baseType.equals(i)) { + baseTypes.add(i.getName()); + } + } + + if (type.getSuperclass() != null) { + identifyBaseTypes(baseType, type.getSuperclass(), baseTypes); +>>>>>>> da18ce0... NIFI-250::nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java } } @@ -1162,6 +1175,7 @@ public final class DtoFactory { final Set<DocumentedTypeDTO> types = new LinkedHashSet<>(); final Set<Class> sortedClasses = new TreeSet<>(CLASS_NAME_COMPARATOR); sortedClasses.addAll(classes); +<<<<<<< HEAD:nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java // identify all interfaces that extend baseClass for all classes final Set<Class> interfaces = new HashSet<>(); @@ -1217,6 +1231,22 @@ public final class DtoFactory { if (add) { types.add(type); } +======= + + for (final Class<?> cls : sortedClasses) { + final DocumentedChildTypeDTO type = new DocumentedChildTypeDTO(); + type.setType(cls.getName()); + type.setDescription(getCapabilityDescription(cls)); + type.setTags(getTags(cls)); + + // identify the base types + final Set<String> baseTypes = new LinkedHashSet<>(); + identifyBaseTypes(baseClass, cls, baseTypes); + type.setBaseType(baseTypes); + + // add this type + types.add(type); +>>>>>>> da18ce0... NIFI-250::nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java } return types; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/39a77e48/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java ---------------------------------------------------------------------- diff --git a/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java index 917e23a..7a7ca43 100644 --- a/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java +++ b/nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java @@ -115,6 +115,10 @@ import org.apache.nifi.admin.service.UserService; import org.apache.nifi.authorization.DownloadAuthorization; import org.apache.nifi.processor.DataUnit; import org.apache.nifi.reporting.ReportingTask; +<<<<<<< HEAD:nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java +======= +import org.apache.nifi.web.api.dto.DocumentedChildTypeDTO; +>>>>>>> da18ce0... NIFI-250::nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.AccessDeniedException;
