Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-03-01 06:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-7517 Fixing unit test, checkstyle issue, and duplicate property

Browse Source 
This closes #4324.
This commit is contained in:
Bryan Bende 2020-07-22 14:16:32 -04:00
parent 43c6ecd3eb
commit 2c45a80ef4
No known key found for this signature in database
GPG Key ID: A0DDA9ED50711C39
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java
View File

@ -33,8 +33,6 @@ import org.apache.nifi.controller.label.Label;
import org.apache.nifi.controller.queue.FlowFileQueue;
import org.apache.nifi.controller.service.ControllerServiceNode;
import org.apache.nifi.controller.service.ControllerServiceProvider;
import org.apache.nifi.groups.FlowFileConcurrency;
import org.apache.nifi.groups.FlowFileOutboundPolicy;
import org.apache.nifi.groups.ProcessGroup;
import org.apache.nifi.groups.RemoteProcessGroup;
import org.apache.nifi.nar.ExtensionManager;

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapperTest.java
View File

@ -40,6 +40,8 @@ import org.apache.nifi.controller.queue.LoadBalanceCompression;
import org.apache.nifi.controller.queue.LoadBalanceStrategy;
import org.apache.nifi.controller.service.ControllerServiceNode;
import org.apache.nifi.controller.service.ControllerServiceProvider;
import org.apache.nifi.groups.FlowFileConcurrency;
import org.apache.nifi.groups.FlowFileOutboundPolicy;
import org.apache.nifi.groups.ProcessGroup;
import org.apache.nifi.groups.RemoteProcessGroup;
import org.apache.nifi.logging.LogLevel;
@ -337,6 +339,8 @@ public class NiFiRegistryFlowMapperTest {
final ParameterContext parameterContext = mock(ParameterContext.class);
when(processGroup.getParameterContext()).thenReturn(parameterContext);
when(parameterContext.getName()).thenReturn("context"+(counter++));
when(processGroup.getFlowFileConcurrency()).thenReturn(FlowFileConcurrency.UNBOUNDED);
when(processGroup.getFlowFileOutboundPolicy()).thenReturn(FlowFileOutboundPolicy.STREAM_WHEN_AVAILABLE);
// prep funnels
final Set<Funnel> funnels = Sets.newHashSet();
@ -566,6 +570,8 @@ public class NiFiRegistryFlowMapperTest {
assertEquals(processGroup.getComments(), versionedProcessGroup.getComments());
assertEquals(processGroup.getPosition().getX(), versionedProcessGroup.getPosition().getX(), 0);
assertEquals(processGroup.getPosition().getY(), versionedProcessGroup.getPosition().getY(), 0);
assertEquals(processGroup.getFlowFileConcurrency().name(), versionedProcessGroup.getFlowFileConcurrency());
assertEquals(processGroup.getFlowFileOutboundPolicy().name(), versionedProcessGroup.getFlowFileOutboundPolicy());
final String expectedParameterContextName =
(processGroup.getParameterContext() != null ? processGroup.getParameterContext().getName() : null);

1
pom.xml
View File

@ -92,7 +92,6 @@
<jetty.version>9.4.26.v20200117</jetty.version>
<jackson.version>2.9.10</jackson.version>
<jackson-databind.version>2.9.10.5</jackson-databind.version>
<jackson-databind.version>2.9.10.4</jackson-databind.version>
<nifi.registry.version>0.7.0</nifi.registry.version>
<nifi.groovy.version>2.5.4</nifi.groovy.version>
<surefire.version>2.22.2</surefire.version>