You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by pvillard31 <gi...@git.apache.org> on 2017/01/05 22:15:42 UTC
[GitHub] nifi pull request #1400: NIFI-957 Added the possibility to use DefaultSchedu...
GitHub user pvillard31 opened a pull request:
https://github.com/apache/nifi/pull/1400
NIFI-957 Added the possibility to use DefaultSchedule annotation in r\u2026
\u2026eporting tasks
Thank you for submitting a contribution to Apache NiFi.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [X] Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
- [X] Does your PR title start with NIFI-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
- [X] Has your PR been rebased against the latest commit within the target branch (typically master)?
- [X] Is your initial contribution a single, squashed commit?
### For code changes:
- [X] Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi folder?
- [X] Have you written or updated unit tests to verify your changes?
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-assembly?
- [ ] If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-assembly?
- [ ] If adding new Properties, have you added .displayName in addition to .name (programmatic access) for each of the new properties?
### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in which it is rendered?
### Note:
Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/pvillard31/nifi NIFI-957
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/nifi/pull/1400.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1400
----
commit 5e86eaccfddf0fad412cde7b3bbc4318d42c1432
Author: Pierre Villard <pi...@gmail.com>
Date: 2017-01-05T22:14:37Z
NIFI-957 Added the possibility to use DefaultSchedule annotation in reporting tasks
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi pull request #1400: NIFI-957 Added the possibility to use DefaultSchedu...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/nifi/pull/1400
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi pull request #1400: NIFI-957 Added the possibility to use DefaultSchedu...
Posted by pvillard31 <gi...@git.apache.org>.
Github user pvillard31 commented on a diff in the pull request:
https://github.com/apache/nifi/pull/1400#discussion_r98362729
--- Diff: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java ---
@@ -72,6 +77,27 @@ public AbstractReportingTaskNode(final ReportingTask reportingTask, final String
this.reportingTask = reportingTask;
this.processScheduler = processScheduler;
this.serviceLookup = controllerServiceProvider;
+
+ final Class<?> reportingClass = reportingTask.getClass();
+
+ try {
+ if (reportingClass.isAnnotationPresent(DefaultSchedule.class)) {
+ DefaultSchedule dsc = reportingClass.getAnnotation(DefaultSchedule.class);
+ try {
+ this.setSchedulingStrategy(dsc.strategy());
+ } catch (Throwable ex) {
+ LOG.error(String.format("Error while setting scheduling strategy from DefaultSchedule annotation: %s", ex.getMessage()), ex);
+ }
+ try {
+ this.setSchedulingPeriod(dsc.period());
+ } catch (Throwable ex) {
+ this.setSchedulingStrategy(SchedulingStrategy.TIMER_DRIVEN);
+ LOG.error(String.format("Error while setting scheduling period from DefaultSchedule annotation: %s", ex.getMessage()), ex);
+ }
+ }
+ } catch (Throwable ex) {
+ LOG.error(String.format("Error while setting default schedule from DefaultSchedule annotation: %s",ex.getMessage()),ex);
--- End diff --
Correct, removed unnecessary try/catch.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #1400: NIFI-957 Added the possibility to use DefaultSchedule anno...
Posted by pvillard31 <gi...@git.apache.org>.
Github user pvillard31 commented on the issue:
https://github.com/apache/nifi/pull/1400
Hey @olegz, thanks for reviewing this PR. I addressed your comments, let me know if there is something else.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi pull request #1400: NIFI-957 Added the possibility to use DefaultSchedu...
Posted by olegz <gi...@git.apache.org>.
Github user olegz commented on a diff in the pull request:
https://github.com/apache/nifi/pull/1400#discussion_r98356528
--- Diff: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java ---
@@ -72,6 +77,27 @@ public AbstractReportingTaskNode(final ReportingTask reportingTask, final String
this.reportingTask = reportingTask;
this.processScheduler = processScheduler;
this.serviceLookup = controllerServiceProvider;
+
+ final Class<?> reportingClass = reportingTask.getClass();
+
+ try {
+ if (reportingClass.isAnnotationPresent(DefaultSchedule.class)) {
+ DefaultSchedule dsc = reportingClass.getAnnotation(DefaultSchedule.class);
--- End diff --
I am wondering if we should instead use Spring's AnnotationUtils and its discovery operations there. Basically the question is if you *only* looking for annotation in the specific class _reportingTask.getClass()_, then the above is OK i guess, but I am afraid that if impl of the ReportingTask has a more complex hierarchy and annotated operation is in some super class, then the above will not work. WDYT?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi pull request #1400: NIFI-957 Added the possibility to use DefaultSchedu...
Posted by olegz <gi...@git.apache.org>.
Github user olegz commented on a diff in the pull request:
https://github.com/apache/nifi/pull/1400#discussion_r98356568
--- Diff: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java ---
@@ -72,6 +77,27 @@ public AbstractReportingTaskNode(final ReportingTask reportingTask, final String
this.reportingTask = reportingTask;
this.processScheduler = processScheduler;
this.serviceLookup = controllerServiceProvider;
+
+ final Class<?> reportingClass = reportingTask.getClass();
+
+ try {
+ if (reportingClass.isAnnotationPresent(DefaultSchedule.class)) {
+ DefaultSchedule dsc = reportingClass.getAnnotation(DefaultSchedule.class);
+ try {
+ this.setSchedulingStrategy(dsc.strategy());
+ } catch (Throwable ex) {
+ LOG.error(String.format("Error while setting scheduling strategy from DefaultSchedule annotation: %s", ex.getMessage()), ex);
+ }
+ try {
+ this.setSchedulingPeriod(dsc.period());
+ } catch (Throwable ex) {
+ this.setSchedulingStrategy(SchedulingStrategy.TIMER_DRIVEN);
+ LOG.error(String.format("Error while setting scheduling period from DefaultSchedule annotation: %s", ex.getMessage()), ex);
+ }
+ }
+ } catch (Throwable ex) {
+ LOG.error(String.format("Error while setting default schedule from DefaultSchedule annotation: %s",ex.getMessage()),ex);
--- End diff --
Wondering based on the code above and internal try/catch is it even possible to get here?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #1400: NIFI-957 Added the possibility to use DefaultSchedule anno...
Posted by olegz <gi...@git.apache.org>.
Github user olegz commented on the issue:
https://github.com/apache/nifi/pull/1400
Reviewing. . .
@pvillard31 could you please address the merge conflict, looks trivial
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi pull request #1400: NIFI-957 Added the possibility to use DefaultSchedu...
Posted by pvillard31 <gi...@git.apache.org>.
Github user pvillard31 commented on a diff in the pull request:
https://github.com/apache/nifi/pull/1400#discussion_r98362714
--- Diff: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java ---
@@ -72,6 +77,27 @@ public AbstractReportingTaskNode(final ReportingTask reportingTask, final String
this.reportingTask = reportingTask;
this.processScheduler = processScheduler;
this.serviceLookup = controllerServiceProvider;
+
+ final Class<?> reportingClass = reportingTask.getClass();
+
+ try {
+ if (reportingClass.isAnnotationPresent(DefaultSchedule.class)) {
+ DefaultSchedule dsc = reportingClass.getAnnotation(DefaultSchedule.class);
--- End diff --
You're right, I updated the PR.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---