Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-959 Fixing incorrect evaluation for getting the collection and adding a unit test to prevent regression

This commit is contained in:
Bryan Bende 2015-09-15 17:10:35 -04:00
parent 5764e89293
commit 8615941c89
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
View File

@ -161,7 +161,7 @@ public class PutSolrContentStream extends SolrProcessor {
final ObjectHolder<Exception> connectionError = new ObjectHolder<>(null);
final boolean isSolrCloud = SOLR_TYPE_CLOUD.equals(context.getProperty(SOLR_TYPE).getValue());
final String collection = context.getProperty(COLLECTION_PARAM_NAME).evaluateAttributeExpressions(flowFile).getValue();
final String collection = context.getProperty(COLLECTION).evaluateAttributeExpressions(flowFile).getValue();
final Long commitWithin = context.getProperty(COMMIT_WITHIN).evaluateAttributeExpressions(flowFile).asLong();
final MultiMapSolrParams requestParams = new MultiMapSolrParams(getRequestParams(context, flowFile));

54
nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/test/java/org/apache/nifi/processors/solr/TestPutSolrContentStream.java
View File

@ -28,6 +28,7 @@ import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.util.NamedList;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
@ -37,6 +38,8 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
@ -229,6 +232,27 @@ public class TestPutSolrContentStream {
Assert.assertEquals(0, qResponse.getResults().getNumFound());
}
@Test
public void testCollectionExpressionLanguage() throws IOException, SolrServerException {
final String collection = "collection1";
final CollectionVerifyingProcessor proc = new CollectionVerifyingProcessor(collection);
final TestRunner runner = TestRunners.newTestRunner(proc);
runner.setProperty(PutSolrContentStream.SOLR_TYPE, PutSolrContentStream.SOLR_TYPE_CLOUD.getValue());
runner.setProperty(PutSolrContentStream.SOLR_LOCATION, "localhost:9983");
runner.setProperty(PutSolrContentStream.COLLECTION, "${solr.collection}");
final Map<String,String> attributes = new HashMap<>();
attributes.put("solr.collection", collection);
try (FileInputStream fileIn = new FileInputStream(CUSTOM_JSON_SINGLE_DOC_FILE)) {
runner.enqueue(fileIn, attributes);
runner.run();
runner.assertAllFlowFilesTransferred(PutSolrContentStream.REL_SUCCESS, 1);
}
}
@Test
public void testSolrServerExceptionShouldRouteToFailure() throws IOException, SolrServerException {
final Throwable throwable = new SolrServerException("Invalid Document");
@ -329,6 +353,36 @@ public class TestPutSolrContentStream {
runner.assertValid();
}
// Override the createSolrClient method to inject a custom SolrClient.
private class CollectionVerifyingProcessor extends PutSolrContentStream {
private SolrClient mockSolrClient;
private final String expectedCollection;
public CollectionVerifyingProcessor(final String expectedCollection) {
this.expectedCollection = expectedCollection;
}
@Override
protected SolrClient createSolrClient(ProcessContext context) {
mockSolrClient = new SolrClient() {
@Override
public NamedList<Object> request(SolrRequest solrRequest, String s) throws SolrServerException, IOException {
Assert.assertEquals(expectedCollection, solrRequest.getParams().get(PutSolrContentStream.COLLECTION_PARAM_NAME));
return new NamedList<>();
}
@Override
public void shutdown() {
}
};
return mockSolrClient;
}
}
// Override the createSolrClient method to inject a Mock.
private class ExceptionThrowingProcessor extends PutSolrContentStream {