Merge pull request #1889 from OpenRefine/issue1882

Update Butterfly to 1.0.2.

extensions/wikidata/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperation.java

@@ -74,28 +74,6 @@ public class PerformWikibaseEditsOperation extends EngineDependentOperation {
         Validate.notEmpty(summary, "An edit summary must be provided.");
         this.summary = summary;
     }
-    
-    /* The constructor above should be enough for deserialization,
-     * but for some unknown reason it can fail in certain cases
-     * (might be due to caching deserializers across threads?)
-     * 
-     * So we sadly add a default constructor and a setter below.
-     * 
-     * TODO delete the default constructor and setter, make summary final
-     */
-    public PerformWikibaseEditsOperation() {
-    	super(null);
-    }
-    
-    @JsonProperty("engineConfig")
-    public void setEngineConfig(EngineConfig config) {
-    	this._engineConfig = config;
-    }
-    
-    @JsonProperty("summary")
-    public void setSummary(String summary) {
-    	this.summary = summary;
-    }
 
     @Override
     protected String getBriefDescription(Project project) {

extensions/wikidata/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperation.java

@@ -45,30 +45,14 @@ public class SaveWikibaseSchemaOperation extends AbstractOperation {
     @JsonIgnore
     final public static String operationDescription = "Save Wikibase schema";
     @JsonProperty("schema")
-    protected WikibaseSchema _schema;
+    final protected WikibaseSchema _schema;
 
     @JsonCreator
     public SaveWikibaseSchemaOperation(
     		@JsonProperty("schema")
     		WikibaseSchema schema) {
         this._schema = schema;
-    }
+
-    
-    /* The constructor above should be enough for deserialization,
-     * but for some unknown reason it can fail in certain cases
-     * (might be due to caching deserializers across threads?)
-     * 
-     * So we sadly add a default constructor and a setter below.
-     * 
-     * TODO delete the default constructor and setter, make schema final
-     */
-    public SaveWikibaseSchemaOperation() {
-    	
-    }
-    
-    @JsonProperty("schema")
-    public void setSchema(WikibaseSchema schema) {
-    	this._schema = schema;
     }
 
     @Override

main/pom.xml

@@ -155,11 +155,11 @@
                 <id>install-butterfly</id>
                 <phase>process-resources</phase>
                 <configuration>
-                    <file>${basedir}/lib-local/butterfly-1.0.1.jar</file>
+                    <file>${basedir}/lib-local/butterfly-1.0.2.jar</file>
                     <repositoryLayout>default</repositoryLayout>
                     <groupId>edu.mit.simile</groupId>
                     <artifactId>butterfly</artifactId>
-                    <version>1.0.1</version>
+                    <version>1.0.2</version>
                     <packaging>jar</packaging>
                     <generatePom>true</generatePom>
                 </configuration>
@@ -268,7 +268,7 @@
     <dependency>
       <groupId>edu.mit.simile</groupId>
       <artifactId>butterfly</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>org.mozilla</groupId>