Merge pull request #451 from Wikidata/small-cleanups

Code cleanup
Wikidata · Oct 21, 2019 · e05fc92 · e05fc92
2 parents eb50180 + 74ff61e
commit e05fc92
Show file tree

Hide file tree

Showing 105 changed files with 482 additions and 721 deletions.
diff --git a/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/helpers/EntityDocumentBuilder.java b/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/helpers/EntityDocumentBuilder.java
@@ -198,14 +198,8 @@ public T withAlias(String text, String languageCode) {
 	 * @return builder object to continue construction
 	 */
 	public T withStatement(Statement statement) {
-		PropertyIdValue pid = statement.getMainSnak()
-				.getPropertyId();
-		ArrayList<Statement> pidStatements = this.statements.get(pid);
-		if (pidStatements == null) {
-			pidStatements = new ArrayList<Statement>();
-			this.statements.put(pid, pidStatements);
-		}
-
+		PropertyIdValue pid = statement.getMainSnak().getPropertyId();
+		ArrayList<Statement> pidStatements = this.statements.computeIfAbsent(pid, k -> new ArrayList<>());
 		pidStatements.add(statement);
 		return getThis();
 	}

diff --git a/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/helpers/Equality.java b/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/helpers/Equality.java
@@ -22,6 +22,8 @@
 
 import org.wikidata.wdtk.datamodel.interfaces.*;
 
+import java.util.Objects;
+
 /**
  * Static class for checking the equality of arbitrary data objects using only
  * their interfaces. This can be used to implement the equals() method of
@@ -226,15 +228,11 @@ public static boolean equalsQuantityValue(QuantityValue o1, Object o2) {
 		}
 		QuantityValue other = (QuantityValue) o2;
 		return o1.getNumericValue().equals(other.getNumericValue())
-				&& equalsNullable(o1.getLowerBound(), other.getLowerBound())
-				&& equalsNullable(o1.getUpperBound(), other.getUpperBound())
+				&& Objects.equals(o1.getLowerBound(), other.getLowerBound())
+				&& Objects.equals(o1.getUpperBound(), other.getUpperBound())
 				&& o1.getUnit().equals(other.getUnit());
 	}
 
-	private static boolean equalsNullable(Object o1, Object o2) {
-		return o1 == null ? o2 == null : o1.equals(o2);
-	}
-
 	/**
 	 * Returns true if the parameters are two {@link ValueSnak} objects with
 	 * exactly the same data. It does not matter if they are different

diff --git a/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/helpers/ReferenceBuilder.java b/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/helpers/ReferenceBuilder.java
@@ -136,12 +136,7 @@ protected List<SnakGroup> getSnakGroups() {
 	 * @return
 	 */
 	protected ArrayList<Snak> getSnakList(PropertyIdValue propertyIdValue) {
-		ArrayList<Snak> result = this.snaks.get(propertyIdValue);
-		if (result == null) {
-			result = new ArrayList<Snak>();
-			this.snaks.put(propertyIdValue, result);
-		}
-		return result;
+		return this.snaks.computeIfAbsent(propertyIdValue, k -> new ArrayList<>());
 	}
 
 }
diff --git a/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/helpers/StatementBuilder.java b/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/helpers/StatementBuilder.java
@@ -279,12 +279,7 @@ protected List<SnakGroup> getQualifierGroups() {
 	 * @return
 	 */
 	protected ArrayList<Snak> getQualifierList(PropertyIdValue propertyIdValue) {
-		ArrayList<Snak> result = this.qualifiers.get(propertyIdValue);
-		if (result == null) {
-			result = new ArrayList<Snak>();
-			this.qualifiers.put(propertyIdValue, result);
-		}
-		return result;
+		return this.qualifiers.computeIfAbsent(propertyIdValue, k -> new ArrayList<>());
 	}
 
 	/**

diff --git a/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/helpers/ToString.java b/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/helpers/ToString.java
@@ -1,7 +1,5 @@
 package org.wikidata.wdtk.datamodel.helpers;
 
-import org.wikidata.wdtk.datamodel.implementation.UnsupportedEntityIdValueImpl;
-
 /*
  * #%L
  * Wikidata Toolkit Data Model
@@ -558,7 +556,6 @@ public static String toString(SenseDocument o) {
 	 */
 	public static String toString(MediaInfoDocument o) {
 		StringBuilder sb = new StringBuilder();
-		boolean first;
 		sb.append("==MediaInfoDocument ").append(o.getEntityId().getIri());
 		sb.append(" (r").append(o.getRevisionId()).append(") ");
 		sb.append("==");

diff --git a/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/DatatypeIdImpl.java b/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/DatatypeIdImpl.java
@@ -26,7 +26,6 @@
 import org.wikidata.wdtk.datamodel.helpers.Hash;
 import org.wikidata.wdtk.datamodel.helpers.ToString;
 import org.wikidata.wdtk.datamodel.interfaces.DatatypeIdValue;
-import org.wikidata.wdtk.datamodel.interfaces.ValueVisitor;
 
 
 import java.util.regex.Matcher;

diff --git a/...atamodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/EntityDocumentImpl.java b/...atamodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/EntityDocumentImpl.java
@@ -26,7 +26,6 @@
 import org.apache.commons.lang3.Validate;
 import org.wikidata.wdtk.datamodel.interfaces.EntityDocument;
 import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue;
-import org.wikidata.wdtk.datamodel.interfaces.MediaInfoDocument;
 
 /**
  * Abstract Jackson implementation of {@link EntityDocument}. Like all Jackson

diff --git a/...amodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/PropertyDocumentImpl.java b/...amodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/PropertyDocumentImpl.java
@@ -1,8 +1,5 @@
 package org.wikidata.wdtk.datamodel.implementation;
 
-import java.util.List;
-import java.util.Map;
-
 /*
  * #%L
  * Wikidata Toolkit Data Model
@@ -28,17 +25,12 @@
 import org.wikidata.wdtk.datamodel.helpers.Hash;
 import org.wikidata.wdtk.datamodel.helpers.ToString;
 import org.wikidata.wdtk.datamodel.interfaces.*;
-import org.wikidata.wdtk.datamodel.helpers.Datamodel;
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.lang3.Validate;
-import org.wikidata.wdtk.datamodel.helpers.Equality;
-import org.wikidata.wdtk.datamodel.helpers.Hash;
-import org.wikidata.wdtk.datamodel.helpers.ToString;
 
 import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.annotation.JsonCreator;

diff --git a/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/SitesImpl.java b/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/SitesImpl.java
@@ -57,7 +57,7 @@ public class SitesImpl implements Sites {
 	 * @author Markus Kroetzsch
 	 *
 	 */
-	class SiteInformation {
+	static class SiteInformation {
 		final String siteKey;
 		final String group;
 		final String languageCode;
@@ -88,13 +88,11 @@ class SiteInformation {
 
 			int iFileName = filePath.indexOf("$1");
 			this.filePathPre = filePath.substring(0, iFileName);
-			this.filePathPost = filePath.substring(iFileName + 2,
-					filePath.length());
+			this.filePathPost = filePath.substring(iFileName + 2);
 
 			int iPageName = pagePath.indexOf("$1");
 			this.pagePathPre = pagePath.substring(0, iPageName);
-			this.pagePathPost = pagePath.substring(iPageName + 2,
-					pagePath.length());
+			this.pagePathPost = pagePath.substring(iPageName + 2);
 		}
 
 		/**
@@ -157,7 +155,7 @@ String addProtocolPrefix(String urlPrefix) {
 		}
 	}
 
-	final HashMap<String, SiteInformation> sites = new HashMap<String, SiteInformation>();
+	final HashMap<String, SiteInformation> sites = new HashMap<>();
 
 	@Override
 	public void setSiteInformation(String siteKey, String group,

diff --git a/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/SnakImpl.java b/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/SnakImpl.java
@@ -22,13 +22,10 @@
  * #L%
  */
 
-import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.interfaces.PropertyIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.Snak;
 import org.wikidata.wdtk.datamodel.interfaces.Value;
 
-import com.fasterxml.jackson.annotation.JacksonInject;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -43,7 +40,7 @@
  * @author Antonin Delpeuch
  *
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "snaktype")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "snaktype")
 @JsonSubTypes({
 		@Type(value = NoValueSnakImpl.class, name = SnakImpl.JSON_SNAK_TYPE_NOVALUE),
 		@Type(value = SomeValueSnakImpl.class, name = SnakImpl.JSON_SNAK_TYPE_SOMEVALUE),

diff --git a/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/StringValueImpl.java b/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/StringValueImpl.java
@@ -11,7 +11,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.JsonDeserializer.None;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 /*
@@ -42,7 +41,7 @@
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonDeserialize(using = None.class)
+@JsonDeserialize()
 public class StringValueImpl extends ValueImpl implements StringValue {
 
 	private final String value;

diff --git a/...src/main/java/org/wikidata/wdtk/datamodel/implementation/TermedStatementDocumentImpl.java b/...src/main/java/org/wikidata/wdtk/datamodel/implementation/TermedStatementDocumentImpl.java
@@ -43,7 +43,7 @@
  *
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 @JsonSubTypes({ //TODO: drop in future release
 		@Type(value = ItemDocumentImpl.class, name = EntityDocumentImpl.JSON_TYPE_ITEM),
 		@Type(value = PropertyDocumentImpl.class, name = EntityDocumentImpl.JSON_TYPE_PROPERTY),

diff --git a/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/TimeValueImpl.java b/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/TimeValueImpl.java
@@ -87,7 +87,6 @@ public class TimeValueImpl extends ValueImpl implements TimeValue {
 	 * @param timezoneOffset
 	 *            offset in minutes that should be applied when displaying this
 	 *            time
-	 * @return a {@link TimeValue} corresponding to the input
 	 */
 	public TimeValueImpl(long year, byte month, byte day, byte hour, byte minute,
 			byte second, byte precision, int beforeTolerance,

diff --git a/...rc/main/java/org/wikidata/wdtk/datamodel/implementation/UnsupportedEntityIdValueImpl.java b/...rc/main/java/org/wikidata/wdtk/datamodel/implementation/UnsupportedEntityIdValueImpl.java
@@ -40,7 +40,6 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.JsonDeserializer.None;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 /**
@@ -53,7 +52,7 @@
  * 
  * @author Antonin Delpeuch
  */
-@JsonDeserialize(using = None.class)
+@JsonDeserialize()
 public class UnsupportedEntityIdValueImpl extends ValueImpl implements UnsupportedEntityIdValue {
 
 	private final JacksonIdValue value;

diff --git a/...amodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/UnsupportedValueImpl.java b/...amodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/UnsupportedValueImpl.java
@@ -31,7 +31,6 @@
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.JsonDeserializer.None;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
@@ -46,7 +45,7 @@
  * @author Antonin Delpeuch
  *
  */
-@JsonDeserialize(using = None.class)
+@JsonDeserialize()
 public class UnsupportedValueImpl extends ValueImpl implements UnsupportedValue {
 
 	private final String typeString;
@@ -106,7 +105,7 @@ public int hashCode() {
 	 */
 	@Override
 	public boolean equals(Object other) {
-		if (other == null || !(other instanceof UnsupportedValueImpl)) {
+		if (!(other instanceof UnsupportedValueImpl)) {
 			return false;
 		}
 		UnsupportedValueImpl otherValue = (UnsupportedValueImpl) other;

diff --git a/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/ValueImpl.java b/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/implementation/ValueImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import org.wikidata.wdtk.datamodel.interfaces.MediaInfoIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.Value;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

diff --git a/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/interfaces/FormIdValue.java b/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/interfaces/FormIdValue.java
@@ -1,8 +1,5 @@
 package org.wikidata.wdtk.datamodel.interfaces;
 
-import org.wikidata.wdtk.datamodel.helpers.Equality;
-import org.wikidata.wdtk.datamodel.helpers.Hash;
-
 /*
  * #%L
  * Wikidata Toolkit Data Model

diff --git a/...amodel/src/main/java/org/wikidata/wdtk/datamodel/interfaces/LabeledStatementDocument.java b/...amodel/src/main/java/org/wikidata/wdtk/datamodel/interfaces/LabeledStatementDocument.java
@@ -20,7 +20,6 @@
  * #L%
  */
 
-import java.util.List;
 import java.util.Set;
 
 /**

diff --git a/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/interfaces/TimeValue.java b/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/interfaces/TimeValue.java
@@ -286,7 +286,7 @@ public interface TimeValue extends Value {
 	 * This conversion can fail if not enough information is available
 	 * (for example, we need at least day precision to convert from Julian to Gregorian).
 	 *
-	 * @return a TimeValue that uses the Gregorian calendar, or {@ref Optional::empty} if the conversion failed.
+	 * @return a TimeValue that uses the Gregorian calendar, or {@link Optional#empty} if the conversion failed.
 	 */
 	Optional<TimeValue> toGregorian();
 

diff --git a/...amodel/src/main/java/org/wikidata/wdtk/datamodel/interfaces/UnsupportedEntityIdValue.java b/...amodel/src/main/java/org/wikidata/wdtk/datamodel/interfaces/UnsupportedEntityIdValue.java
@@ -34,5 +34,5 @@ public interface UnsupportedEntityIdValue extends EntityIdValue {
 	/**
 	 * The type of entity as represented in the JSON serialization.
 	 */
-	public String getEntityTypeJsonString();
+	String getEntityTypeJsonString();
 }
diff --git a/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/interfaces/UnsupportedValue.java b/wdtk-datamodel/src/main/java/org/wikidata/wdtk/datamodel/interfaces/UnsupportedValue.java
@@ -39,5 +39,5 @@ public interface UnsupportedValue extends Value {
 	 * @return
 	 * 		the value of "type" in the JSON representation of this value.
 	 */
-	public String getTypeJsonString();
+	String getTypeJsonString();
 }
diff --git a/...atamodel/src/main/java/org/wikidata/wdtk/datamodel/interfaces/WikimediaLanguageCodes.java b/...atamodel/src/main/java/org/wikidata/wdtk/datamodel/interfaces/WikimediaLanguageCodes.java
@@ -616,10 +616,6 @@ public static String getLanguageCode(String wikimediaLanguageCode) {
 	 * 			the preferred language code corresponding to the original language code
 	 */
 	public static String fixLanguageCodeIfDeprecated(String wikimediaLanguageCode) {
-		if (DEPRECATED_LANGUAGE_CODES.containsKey(wikimediaLanguageCode)) {
-			return DEPRECATED_LANGUAGE_CODES.get(wikimediaLanguageCode);
-		} else {
-			return wikimediaLanguageCode;
-		}
+		return DEPRECATED_LANGUAGE_CODES.getOrDefault(wikimediaLanguageCode, wikimediaLanguageCode);
 	}
 }
diff --git a/wdtk-datamodel/src/test/java/org/wikidata/wdtk/datamodel/helpers/DatamodelConverterTest.java b/wdtk-datamodel/src/test/java/org/wikidata/wdtk/datamodel/helpers/DatamodelConverterTest.java
@@ -40,7 +40,7 @@
  */
 public class DatamodelConverterTest {
 
-	class BrokenItemIdValue implements ItemIdValue {
+	static class BrokenItemIdValue implements ItemIdValue {
 
 		@Override
 		public String getEntityType() {

diff --git a/wdtk-datamodel/src/test/java/org/wikidata/wdtk/datamodel/helpers/FilterCopyTest.java b/wdtk-datamodel/src/test/java/org/wikidata/wdtk/datamodel/helpers/FilterCopyTest.java
@@ -33,7 +33,6 @@
 
 import org.junit.Test;
 import org.wikidata.wdtk.datamodel.implementation.DataObjectFactoryImpl;
-import org.wikidata.wdtk.datamodel.interfaces.Claim;
 import org.wikidata.wdtk.datamodel.interfaces.ItemDocument;
 import org.wikidata.wdtk.datamodel.interfaces.MonolingualTextValue;
 import org.wikidata.wdtk.datamodel.interfaces.PropertyIdValue;

diff --git a/...amodel/src/test/java/org/wikidata/wdtk/datamodel/helpers/PropertyDocumentBuilderTest.java b/...amodel/src/test/java/org/wikidata/wdtk/datamodel/helpers/PropertyDocumentBuilderTest.java
@@ -22,7 +22,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.Arrays;
 import java.util.Collections;
 
 import org.junit.Test;

diff --git a/wdtk-datamodel/src/test/java/org/wikidata/wdtk/datamodel/helpers/StatementDocumentTest.java b/wdtk-datamodel/src/test/java/org/wikidata/wdtk/datamodel/helpers/StatementDocumentTest.java
@@ -20,16 +20,14 @@
  * #L%
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import org.junit.Test;
 import org.wikidata.wdtk.datamodel.interfaces.ItemDocument;
 import org.wikidata.wdtk.datamodel.interfaces.ItemIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.PropertyIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.Statement;
 
+import static org.junit.Assert.*;
+
 public class StatementDocumentTest {
 	private static ItemIdValue Q1 = Datamodel.makeWikidataItemIdValue("Q1");
 	private static ItemIdValue Q2 = Datamodel.makeWikidataItemIdValue("Q2");
@@ -50,15 +48,15 @@ public void testFindStatement() {
 
 		assertTrue(id.hasStatement(P1));
 		assertTrue(id.hasStatement("P1"));
-		assertEquals(null, id.findStatement(P1));
-		assertEquals(null, id.findStatement("P1"));
+		assertNull(id.findStatement(P1));
+		assertNull(id.findStatement("P1"));
 		assertTrue(id.hasStatement(P2));
 		assertTrue(id.hasStatement("P2"));
 		assertEquals(s3, id.findStatement(P2));
 		assertEquals(s3, id.findStatement("P2"));
 		assertFalse(id.hasStatement(P3));
 		assertFalse(id.hasStatement("P3"));
-		assertEquals(null, id.findStatement(P3));
-		assertEquals(null, id.findStatement("P3"));
+		assertNull(id.findStatement(P3));
+		assertNull(id.findStatement("P3"));
 	}
 }
diff --git a/...l/src/test/java/org/wikidata/wdtk/datamodel/implementation/DataObjectFactoryImplTest.java b/...l/src/test/java/org/wikidata/wdtk/datamodel/implementation/DataObjectFactoryImplTest.java
@@ -24,10 +24,8 @@
 
 import java.math.BigDecimal;
 import java.util.Collections;
-import java.util.List;
 
 import org.junit.Test;
-import org.wikidata.wdtk.datamodel.helpers.DatamodelConverterTest.ValueType;
 import org.wikidata.wdtk.datamodel.interfaces.*;
 
 public class DataObjectFactoryImplTest {