From 0ef23198f61b5e11611c2774629052dd34b11fa5 Mon Sep 17 00:00:00 2001 From: Aaron Coburn Date: Wed, 5 Oct 2016 10:04:37 -0400 Subject: [PATCH] fix checkstyle warnings --- .../triplestore/TriplestoreIndexer.java | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/indexing/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java b/indexing/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java index 8139ffdc..aea6f87b 100644 --- a/indexing/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java +++ b/indexing/islandora-indexing-triplestore/src/main/java/ca/islandora/indexing/triplestore/TriplestoreIndexer.java @@ -18,29 +18,35 @@ package ca.islandora.indexing.triplestore; -import org.apache.camel.LoggingLevel; +import static org.apache.camel.builder.PredicateBuilder.and; +import static org.apache.camel.builder.PredicateBuilder.or; +import static org.apache.camel.LoggingLevel.ERROR; +import static org.fcrepo.camel.FcrepoHeaders.FCREPO_BASE_URL; +import static org.fcrepo.camel.FcrepoHeaders.FCREPO_IDENTIFIER; + import org.apache.camel.Predicate; -import org.apache.camel.builder.PredicateBuilder; import org.apache.camel.builder.RouteBuilder; -import org.fcrepo.camel.FcrepoHeaders; import org.fcrepo.camel.processor.SparqlUpdateProcessor; import org.fcrepo.camel.processor.SparqlDeleteProcessor; +/** + * @author dhlamb + */ public class TriplestoreIndexer extends RouteBuilder { @Override public void configure() { - Predicate isTriples = header("Content-Type").isEqualTo("application/n-triples"); - Predicate hasBaseUrl = header(FcrepoHeaders.FCREPO_BASE_URL).isNotNull(); - Predicate hasIdentifier = header(FcrepoHeaders.FCREPO_IDENTIFIER).isNotNull(); - Predicate hasFcrepoCamelHeaders = PredicateBuilder.and(hasBaseUrl, hasIdentifier); - Predicate hasAction = PredicateBuilder.or(header("action").isEqualTo("delete"), header("action").isEqualTo("upsert")); - Predicate isValid = PredicateBuilder.and(isTriples, hasFcrepoCamelHeaders, hasAction); + final Predicate isTriples = header("Content-Type").isEqualTo("application/n-triples"); + final Predicate hasBaseUrl = header(FCREPO_BASE_URL).isNotNull(); + final Predicate hasIdentifier = header(FCREPO_IDENTIFIER).isNotNull(); + final Predicate hasFcrepoCamelHeaders = and(hasBaseUrl, hasIdentifier); + final Predicate hasAction = or(header("action").isEqualTo("delete"), header("action").isEqualTo("upsert")); + final Predicate isValid = and(isTriples, hasFcrepoCamelHeaders, hasAction); onException(Exception.class) .maximumRedeliveries("{{error.maxRedeliveries}}") - .log(LoggingLevel.ERROR, "Error Indexing in Triplestore: ${routeId}"); + .log(ERROR, "Error Indexing in Triplestore: ${routeId}"); from("{{input.stream}}") .routeId("IslandoraTriplestoreIndexerRouter")