Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/381410 )
Change subject: fix spotbugs warnings on common module
......................................................................
fix spotbugs warnings on common module
Change-Id: If396d11cfd496df147dba591e956c0605a5d2903
---
M common/src/main/java/org/wikidata/query/rdf/common/WikibaseDate.java
M common/src/main/java/org/wikidata/query/rdf/common/WikibasePoint.java
M common/src/main/java/org/wikidata/query/rdf/common/uri/WikibaseUris.java
3 files changed, 17 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/10/381410/1
diff --git
a/common/src/main/java/org/wikidata/query/rdf/common/WikibaseDate.java
b/common/src/main/java/org/wikidata/query/rdf/common/WikibaseDate.java
index 036801b..29984e5 100644
--- a/common/src/main/java/org/wikidata/query/rdf/common/WikibaseDate.java
+++ b/common/src/main/java/org/wikidata/query/rdf/common/WikibaseDate.java
@@ -19,6 +19,7 @@
* Handles wikidata dates. Note that this ignores leap seconds. This isn't ok
* but its what joda time does so it where we're starting.
*/
+@SuppressFBWarnings(value = "PL_PARALLEL_LISTS", justification = "might make
sense to fix, but low priority")
public class WikibaseDate {
// private static final transient Logger log =
LoggerFactory.getLogger(WikibaseDate.class);
@@ -304,8 +305,7 @@
result = prime * result + minute;
result = prime * result + month;
result = prime * result + second;
- result = prime * result + (int) (year ^ (year >>> 32));
- return result;
+ return prime * result + (int) (year ^ (year >>> 32));
}
@Override
diff --git
a/common/src/main/java/org/wikidata/query/rdf/common/WikibasePoint.java
b/common/src/main/java/org/wikidata/query/rdf/common/WikibasePoint.java
index ef3dfde..038288f 100644
--- a/common/src/main/java/org/wikidata/query/rdf/common/WikibasePoint.java
+++ b/common/src/main/java/org/wikidata/query/rdf/common/WikibasePoint.java
@@ -2,6 +2,8 @@
import java.util.Locale;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Representation of a coordinate point in Wikibase.
*/
@@ -123,6 +125,7 @@
* @param globe
* @param order
*/
+ @SuppressFBWarnings(value = "CLI_CONSTANT_LIST_INDEX", justification =
"array used as a pair")
public WikibasePoint(String[] components, String globe, CoordinateOrder
order) {
if (order == CoordinateOrder.LAT_LONG) {
latitude = components[0];
@@ -159,23 +162,23 @@
* @return String representation.
*/
public String toOrder(CoordinateOrder order) {
- final StringBuffer buf = new StringBuffer();
+ final StringBuilder buf = new StringBuilder();
if (globe != null) {
- buf.append("<");
+ buf.append('<');
buf.append(globe);
buf.append("> ");
}
buf.append("Point(");
if (order == CoordinateOrder.LAT_LONG) {
buf.append(latitude);
- buf.append(" ");
+ buf.append(' ');
buf.append(longitude);
} else {
buf.append(longitude);
- buf.append(" ");
+ buf.append(' ');
buf.append(latitude);
}
- buf.append(")");
+ buf.append(')');
return buf.toString();
}
}
diff --git
a/common/src/main/java/org/wikidata/query/rdf/common/uri/WikibaseUris.java
b/common/src/main/java/org/wikidata/query/rdf/common/uri/WikibaseUris.java
index 68dc6b2..096697f 100644
--- a/common/src/main/java/org/wikidata/query/rdf/common/uri/WikibaseUris.java
+++ b/common/src/main/java/org/wikidata/query/rdf/common/uri/WikibaseUris.java
@@ -1,5 +1,7 @@
package org.wikidata.query.rdf.common.uri;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Uris wikibase uses that are relative to the wikibase instance.
*/
@@ -110,11 +112,6 @@
*/
private final String root;
/**
- * The root of the wikibase uris with https prefix -
- * https://www.wikidata.org for Wikidata.
- */
- private final String rootHttps;
- /**
* Uri prefix wikibase uses to describe exports. The Munge process removes
* uris with this prefix.
*/
@@ -157,7 +154,7 @@
*/
public WikibaseUris(String host) {
root = "http://"; + host;
- rootHttps = "https://"; + host;
+ String rootHttps = "https://"; + host;
entityData = root + "/wiki/Special:EntityData/";
entityDataHttps = rootHttps + "/wiki/Special:EntityData/";
entity = root + "/entity/";
@@ -170,6 +167,7 @@
/**
* Add the prefixes for all related uris.
*/
+ @SuppressFBWarnings(value = "CBX_CUSTOM_BUILT_XML", justification = "false
positive - not actually XML")
public StringBuilder prefixes(StringBuilder query) {
query.append("PREFIX wdata: <").append(entityData).append(">\n");
query.append("PREFIX wd: <").append(entity).append(">\n");
@@ -252,9 +250,10 @@
*/
public static WikibaseUris getURISystem() {
if (uriSystem == null) {
- if (System.getProperty(WIKIBASE_HOST_PROPERTY) != null) {
+ String wikibaseHostProperty =
System.getProperty(WIKIBASE_HOST_PROPERTY);
+ if (wikibaseHostProperty != null) {
uriSystem = new WikibaseUris(
- System.getProperty(WIKIBASE_HOST_PROPERTY));
+ wikibaseHostProperty);
} else {
uriSystem = WIKIDATA;
}
--
To view, visit https://gerrit.wikimedia.org/r/381410
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If396d11cfd496df147dba591e956c0605a5d2903
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
