Merge branch 'master' of https://github.com/Wikidata/Wikidata-Toolkit …

…into serialization-of-constraints
Wikidata · Aug 5, 2016 · 3b84b10 · 3b84b10
2 parents fdc19ca + 2971604
commit 3b84b10
Show file tree

Hide file tree

Showing 41 changed files with 1,132 additions and 102 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -4,7 +4,14 @@ Wikidata Toolkit Release Notes
 Version 0.7.0
 -------------
 
+New features:
+* Add a new client action "sqid" that analyses dumps to create the statistics
+  JSON files that are the basis for the SQID Wikidata Browser that is found at
+  https://tools.wmflabs.org/sqid/
+
 Bug fixes:
+* Fix JavaDoc errors to enable build using Java 8 (with doclint)
+* Make JSON parser more tolerant towards unknown keys; avoids breaking on recent API changes
 * Update Wikimedia dump location to https so that dump downloads work again
 
 Version 0.6.0

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.wikidata.wdtk</groupId>
 	<artifactId>wdtk-parent</artifactId>
-	<version>0.7.0-SNAPSHOT</version>
+	<version>0.8.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Wikidata Toolkit</name>

diff --git a/wdtk-client/pom.xml b/wdtk-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.wikidata.wdtk</groupId>
 		<artifactId>wdtk-parent</artifactId>
-		<version>0.7.0-SNAPSHOT</version>
+		<version>0.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>wdtk-client</artifactId>

diff --git a/wdtk-client/src/main/java/org/wikidata/wdtk/client/Client.java b/wdtk-client/src/main/java/org/wikidata/wdtk/client/Client.java
@@ -70,8 +70,6 @@ public class Client {
 	 *
 	 * @param args
 	 *            command line arguments to configure the conversion
-	 * @throws ParseException
-	 * @throws IOException
 	 */
 	public Client(DumpProcessingController dumpProcessingController,
 			String args[]) {

diff --git a/wdtk-client/src/main/java/org/wikidata/wdtk/client/ClientConfiguration.java b/wdtk-client/src/main/java/org/wikidata/wdtk/client/ClientConfiguration.java
@@ -182,10 +182,11 @@ public class ClientConfiguration {
 	 */
 	public static final String OPTION_LOCAL_DUMPFILE = "input";
 
-	static final Map<String, Class<? extends DumpProcessingOutputAction>> KNOWN_ACTIONS = new HashMap<>();
+	static final Map<String, Class<? extends DumpProcessingAction>> KNOWN_ACTIONS = new HashMap<>();
 	static {
 		KNOWN_ACTIONS.put("rdf", RdfSerializationAction.class);
 		KNOWN_ACTIONS.put("json", JsonSerializationAction.class);
+		KNOWN_ACTIONS.put("sqid", SchemaUsageAnalyzer.class);
 	}
 
 	/**
@@ -704,7 +705,7 @@ private DumpProcessingAction makeDumpProcessingAction(String name) {
 		}
 
 		try {
-			Constructor<? extends DumpProcessingOutputAction> constructor = KNOWN_ACTIONS
+			Constructor<? extends DumpProcessingAction> constructor = KNOWN_ACTIONS
 					.get(name).getConstructor();
 			return constructor.newInstance();
 		} catch (NoSuchMethodException | SecurityException

diff --git a/wdtk-client/src/main/java/org/wikidata/wdtk/client/JsonSerializationAction.java b/wdtk-client/src/main/java/org/wikidata/wdtk/client/JsonSerializationAction.java
@@ -30,9 +30,9 @@
 /**
  * This class represents an action of generating a JSON dump from data. It has
  * no specific options.
- * 
+ *
  * @author Markus Kroetzsch
- * 
+ *
  */
 public class JsonSerializationAction extends DumpProcessingOutputAction {
 
@@ -55,8 +55,6 @@ public class JsonSerializationAction extends DumpProcessingOutputAction {
 
 	/**
 	 * Constructor. See {@link DumpProcessingOutputAction} for more details.
-	 * 
-	 * @param conversionProperties
 	 */
 	public JsonSerializationAction() {
 		this.outputDestination = DEFAULT_FILE_NAME;