You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/02/03 18:24:27 UTC
[1/2] incubator-nifi git commit: NIFI-268: Change Assert.fail to
logger.warn if using deprecated annotation for processors. This will be
cahnged to Assert.fail in 0.1.0 but should not happen for version 0.0.2
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 10714efbd -> 7724dadf0
NIFI-268: Change Assert.fail to logger.warn if using deprecated annotation for processors. This will be cahnged to Assert.fail in 0.1.0 but should not happen for version 0.0.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3b399d75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3b399d75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3b399d75
Branch: refs/heads/develop
Commit: 3b399d75044ba2bc52d6876e7fe295f85b9a1264
Parents: 10714ef
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Feb 3 12:09:42 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Feb 3 12:09:42 2015 -0500
----------------------------------------------------------------------
.../org/apache/nifi/util/StandardProcessorTestRunner.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3b399d75/nifi/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
index 63d1c9f..f3fd3e8 100644
--- a/nifi/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
+++ b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
@@ -66,6 +66,8 @@ import org.apache.nifi.processor.Relationship;
import org.apache.nifi.provenance.ProvenanceReporter;
import org.apache.nifi.reporting.InitializationException;
import org.junit.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class StandardProcessorTestRunner implements TestRunner {
@@ -80,6 +82,7 @@ public class StandardProcessorTestRunner implements TestRunner {
private int numThreads = 1;
private final AtomicInteger invocations = new AtomicInteger(0);
+ private static final Logger logger = LoggerFactory.getLogger(StandardProcessorTestRunner.class);
private static final Set<Class<? extends Annotation>> deprecatedTypeAnnotations = new HashSet<>();
private static final Set<Class<? extends Annotation>> deprecatedMethodAnnotations = new HashSet<>();
@@ -134,14 +137,14 @@ public class StandardProcessorTestRunner implements TestRunner {
private static void detectDeprecatedAnnotations(final Processor processor) {
for ( final Class<? extends Annotation> annotationClass : deprecatedTypeAnnotations ) {
if ( processor.getClass().isAnnotationPresent(annotationClass) ) {
- Assert.fail("Processor is using deprecated Annotation " + annotationClass.getCanonicalName());
+ logger.warn("Processor is using deprecated Annotation " + annotationClass.getCanonicalName());
}
}
for ( final Class<? extends Annotation> annotationClass : deprecatedMethodAnnotations ) {
for ( final Method method : processor.getClass().getMethods() ) {
if ( method.isAnnotationPresent(annotationClass) ) {
- Assert.fail("Processor is using deprecated Annotation " + annotationClass.getCanonicalName() + " for method " + method);
+ logger.warn("Processor is using deprecated Annotation " + annotationClass.getCanonicalName() + " for method " + method);
}
}
}
[2/2] incubator-nifi git commit: NIFI-268: Fixed unit tests
Posted by ma...@apache.org.
NIFI-268: Fixed unit tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/7724dadf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/7724dadf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/7724dadf
Branch: refs/heads/develop
Commit: 7724dadf0d4a268181a59c649b3600186e892bdd
Parents: 3b399d7
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Feb 3 12:20:09 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Feb 3 12:20:09 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/nifi/util/TestStandardProcessorTestRunner.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7724dadf/nifi/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java b/nifi/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
index 37bcf23..a561982 100644
--- a/nifi/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
+++ b/nifi/nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
@@ -20,8 +20,10 @@ import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
+import org.junit.Ignore;
import org.junit.Test;
+@Ignore("This should not be enabled until we actually fail processor unit tests for using deprecated methods, which should happen in 0.1.0")
public class TestStandardProcessorTestRunner {
@Test(expected=AssertionError.class)