jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/349128 )
Change subject: Make all logging use slf4j since this is what Blazegraph is using. ...................................................................... Make all logging use slf4j since this is what Blazegraph is using. Also fix some style warnings. Change-Id: I345fddc126ed054ed9ebc00b3266184747a9ee41 --- M blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/inline/literal/AbstractMultiTypeExtension.java M blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/inline/uri/WikibaseStyleStatementInlineUriHandler.java M blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/EmptyLabelServiceOptimizer.java M blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java M blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java 5 files changed, 16 insertions(+), 16 deletions(-) Approvals: Smalyshev: Looks good to me, approved jenkins-bot: Verified diff --git a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/inline/literal/AbstractMultiTypeExtension.java b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/inline/literal/AbstractMultiTypeExtension.java index eaf51f4..018e5e9 100644 --- a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/inline/literal/AbstractMultiTypeExtension.java +++ b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/inline/literal/AbstractMultiTypeExtension.java @@ -9,10 +9,11 @@ import java.util.Map; import java.util.Set; -import org.apache.log4j.Logger; import org.openrdf.model.Literal; import org.openrdf.model.URI; import org.openrdf.model.Value; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.bigdata.rdf.internal.IDatatypeURIResolver; import com.bigdata.rdf.internal.IExtension; @@ -32,7 +33,7 @@ * roughly by Blazegraph - lots of rawtypes */ public abstract class AbstractMultiTypeExtension<V extends BigdataValue> implements IExtension<V> { - private static final Logger log = Logger.getLogger(WikibaseDateExtension.class); + private static final Logger log = LoggerFactory.getLogger(WikibaseDateExtension.class); /** * IV to type map as resolved against resolver provided on construction. diff --git a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/inline/uri/WikibaseStyleStatementInlineUriHandler.java b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/inline/uri/WikibaseStyleStatementInlineUriHandler.java index 1c158a4..1c1c027 100644 --- a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/inline/uri/WikibaseStyleStatementInlineUriHandler.java +++ b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/inline/uri/WikibaseStyleStatementInlineUriHandler.java @@ -4,7 +4,8 @@ import java.util.Locale; import java.util.UUID; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.bigdata.rdf.internal.InlineURIHandler; import com.bigdata.rdf.internal.impl.literal.AbstractLiteralIV; @@ -29,7 +30,7 @@ * @deprecated */ public class WikibaseStyleStatementInlineUriHandler extends InlineURIHandler { - private static final Logger log = Logger.getLogger(WikibaseStyleStatementInlineUriHandler.class); + private static final Logger log = LoggerFactory.getLogger(WikibaseStyleStatementInlineUriHandler.class); public WikibaseStyleStatementInlineUriHandler(String namespace) { super(namespace); @@ -99,7 +100,7 @@ i = i.shiftLeft(Long.SIZE).or(unsigned(u.getLeastSignificantBits())); return new XSDIntegerIV(i); } catch (IllegalArgumentException e) { - Logger.getLogger(WikibaseStyleStatementInlineUriHandler.class).warn("tmp", e); + log.warn("tmp", e); return null; } } diff --git a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/EmptyLabelServiceOptimizer.java b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/EmptyLabelServiceOptimizer.java index 44cb389..e5922bd 100644 --- a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/EmptyLabelServiceOptimizer.java +++ b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/EmptyLabelServiceOptimizer.java @@ -2,11 +2,12 @@ import java.util.List; -import org.apache.log4j.Logger; import org.openrdf.model.URI; import org.openrdf.model.impl.URIImpl; import org.openrdf.model.vocabulary.RDFS; import org.openrdf.model.vocabulary.SKOS; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.wikidata.query.rdf.common.uri.Ontology; import org.wikidata.query.rdf.common.uri.SchemaDotOrg; @@ -36,7 +37,7 @@ */ @SuppressWarnings("rawtypes") public class EmptyLabelServiceOptimizer extends AbstractJoinGroupOptimizer { - private static final Logger log = Logger.getLogger(EmptyLabelServiceOptimizer.class); + private static final Logger log = LoggerFactory.getLogger(EmptyLabelServiceOptimizer.class); /** * Schema.org's description property as a URI. diff --git a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java index df0be2e..50c4ec8 100644 --- a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java +++ b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java @@ -6,7 +6,6 @@ import java.util.Locale; import java.util.Map; -import org.apache.log4j.Logger; import org.openrdf.model.Literal; import org.openrdf.model.URI; import org.openrdf.model.Value; @@ -84,9 +83,6 @@ * form by inspecting the query's projection. */ public class LabelService extends AbstractServiceFactory { - private static final Logger log = Logger - .getLogger(LabelService.class); - /** * Options configuring this service as a native Blazegraph service. */ @@ -218,7 +214,7 @@ /** * Build with all the right stuff resolved. */ - public LabelServiceCall(ResolutionContext context, List<Resolution> resolutions) { + LabelServiceCall(ResolutionContext context, List<Resolution> resolutions) { this.context = context; this.resolutions = resolutions; } @@ -250,7 +246,7 @@ */ private int i; - public Chunk(IBindingSet[] bindingSets) { + Chunk(IBindingSet[] bindingSets) { this.bindingSets = bindingSets; } @@ -385,7 +381,7 @@ */ private IV rdfsLabelIv; - public ResolutionContext(AbstractTripleStore tripleStore, Map<String, Integer> languageFallbacks) { + ResolutionContext(AbstractTripleStore tripleStore, Map<String, Integer> languageFallbacks) { this.tripleStore = tripleStore; this.languageFallbacks = languageFallbacks; lexiconRelation = tripleStore.getLexiconRelation(); diff --git a/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java b/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java index dd3bd1c..b8328b3 100644 --- a/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java +++ b/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java @@ -8,11 +8,12 @@ import java.util.Locale; -import org.apache.log4j.Logger; import org.junit.Test; import org.openrdf.model.impl.LiteralImpl; import org.openrdf.query.QueryEvaluationException; import org.openrdf.query.TupleQueryResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.wikidata.query.rdf.blazegraph.AbstractRandomizedBlazegraphTestBase; import org.wikidata.query.rdf.common.uri.Ontology; import org.wikidata.query.rdf.common.uri.RDFS; @@ -20,7 +21,7 @@ import org.wikidata.query.rdf.common.uri.SchemaDotOrg; public class LabelServiceUnitTest extends AbstractRandomizedBlazegraphTestBase { - private static final Logger log = Logger.getLogger(LabelServiceUnitTest.class); + private static final Logger log = LoggerFactory.getLogger(LabelServiceUnitTest.class); @Test public void labelOverConstant() throws QueryEvaluationException { -- To view, visit https://gerrit.wikimedia.org/r/349128 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I345fddc126ed054ed9ebc00b3266184747a9ee41 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Smalyshev <smalys...@wikimedia.org> Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org> Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits