s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix terms serialization

Browse Source
This commit is contained in:
Antonin Delpeuch 2018-01-04 01:31:43 +01:00
parent 497505eef1
commit 9a3093b045
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/wikidata/src/org/openrefine/wikidata/schema/WbLanguageExpr.java
View File

@ -2,6 +2,17 @@ package org.openrefine.wikidata.schema;
import org.openrefine.wikidata.utils.JacksonJsonizable; import org.openrefine.wikidata.utils.JacksonJsonizable;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
@JsonTypeInfo(use=JsonTypeInfo.Id.NAME,
include=JsonTypeInfo.As.PROPERTY,
property="type")
@JsonSubTypes({
@Type(value = WbLanguageConstant.class, name = "wblanguageconstant"),
@Type(value = WbLanguageVariable.class, name = "wblanguagevariable")
})
public abstract class WbLanguageExpr extends JacksonJsonizable { public abstract class WbLanguageExpr extends JacksonJsonizable {
/** /**
* Evaluates the language expression to a Wikimedia language code * Evaluates the language expression to a Wikimedia language code

3
extensions/wikidata/src/org/openrefine/wikidata/schema/WbNameDescExpr.java
View File

@ -20,7 +20,7 @@ public class WbNameDescExpr extends JacksonJsonizable {
@JsonCreator @JsonCreator
public WbNameDescExpr( public WbNameDescExpr(
@JsonProperty("type") NameDescrType type, @JsonProperty("name_type") NameDescrType type,
@JsonProperty("value") WbMonolingualExpr value) { @JsonProperty("value") WbMonolingualExpr value) {
this.type = type; this.type = type;
this.value = value; this.value = value;
@ -45,6 +45,7 @@ public class WbNameDescExpr extends JacksonJsonizable {
} }
} }
@JsonProperty("name_type")
public NameDescrType getType() { public NameDescrType getType() {
return type; return type;
} }

3
extensions/wikidata/src/org/openrefine/wikidata/schema/WbValueExpr.java
View File

@ -23,7 +23,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
@Type(value = WbLanguageConstant.class, name = "wblanguageconstant"), @Type(value = WbLanguageConstant.class, name = "wblanguageconstant"),
@Type(value = WbLanguageVariable.class, name = "wblanguagevariable"), @Type(value = WbLanguageVariable.class, name = "wblanguagevariable"),
@Type(value = WbDateConstant.class, name = "wbdateconstant"), @Type(value = WbDateConstant.class, name = "wbdateconstant"),
@Type(value = WbDateVariable.class, name = "wbdatevariable") , @Type(value = WbDateVariable.class, name = "wbdatevariable"),
@Type(value = WbMonolingualExpr.class, name = "wbmonolingualexpr"),
}) })
public abstract class WbValueExpr extends JacksonJsonizable { public abstract class WbValueExpr extends JacksonJsonizable {
/* An expression that represents a Wikibase value, /* An expression that represents a Wikibase value,