Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-10 03:55:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-6334 - fix custom validate error in PutBigqueryBatch

Browse Source 
This closes #3589.

Signed-off-by: Koji Kawamura <ijokarumawak@apache.org>
This commit is contained in:
Pierre Villard 2019-07-18 15:48:39 +02:00 committed by Koji Kawamura
parent 2b0b96e59e
commit 630c651226
No known key found for this signature in database
GPG Key ID: 36136B0EC89E4758
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/AbstractBigQueryProcessor.java
View File

@ -35,6 +35,7 @@ import org.apache.nifi.processors.gcp.ProxyAwareTransportFactory;
import org.apache.nifi.proxy.ProxyConfiguration; import org.apache.nifi.proxy.ProxyConfiguration;
import org.apache.nifi.util.StringUtils; import org.apache.nifi.util.StringUtils;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@ -135,7 +136,7 @@ public abstract class AbstractBigQueryProcessor extends AbstractGCPProcessor<Big
@Override @Override
protected final Collection<ValidationResult> customValidate(ValidationContext validationContext) { protected final Collection<ValidationResult> customValidate(ValidationContext validationContext) {
final Collection<ValidationResult> results = super.customValidate(validationContext); final Collection<ValidationResult> results = new ArrayList<ValidationResult>(super.customValidate(validationContext));
ProxyConfiguration.validateProxySpec(validationContext, results, ProxyAwareTransportFactory.PROXY_SPECS); ProxyConfiguration.validateProxySpec(validationContext, results, ProxyAwareTransportFactory.PROXY_SPECS);
final boolean projectId = validationContext.getProperty(PROJECT_ID).isSet(); final boolean projectId = validationContext.getProperty(PROJECT_ID).isSet();

11
nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/PutBigQueryBatchTest.java
View File

@ -125,7 +125,6 @@ public class PutBigQueryBatchTest extends AbstractBQTest {
runner.assertAllFlowFilesTransferred(PutBigQueryBatch.REL_SUCCESS); runner.assertAllFlowFilesTransferred(PutBigQueryBatch.REL_SUCCESS);
} }
@Test @Test
public void testFailedLoad() throws Exception { public void testFailedLoad() throws Exception {
when(table.exists()).thenReturn(Boolean.TRUE); when(table.exists()).thenReturn(Boolean.TRUE);
@ -150,4 +149,14 @@ public class PutBigQueryBatchTest extends AbstractBQTest {
runner.assertAllFlowFilesTransferred(PutBigQueryBatch.REL_FAILURE); runner.assertAllFlowFilesTransferred(PutBigQueryBatch.REL_FAILURE);
} }
@Test
public void testMandatoryProjectId() throws Exception {
final TestRunner runner = buildNewRunner(getProcessor());
addRequiredPropertiesToRunner(runner);
runner.assertValid();
runner.removeProperty(PutBigQueryBatch.PROJECT_ID);
runner.assertNotValid();
}
} }