Skip to content

Commit

Permalink
Refactor util/json/JsonParse to use JSON-B instead of GSON. IQSS#6810
Browse files Browse the repository at this point in the history
  • Loading branch information
poikilotherm committed Oct 24, 2020
1 parent d45c649 commit d3ef947
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package edu.harvard.iq.dataverse.util.json;

import com.google.gson.Gson;
import edu.harvard.iq.dataverse.ControlledVocabularyValue;
import edu.harvard.iq.dataverse.DataFile;
import edu.harvard.iq.dataverse.DataFileCategory;
Expand Down Expand Up @@ -40,6 +39,8 @@
import java.util.stream.Collectors;
import javax.json.*;
import javax.json.JsonValue.ValueType;
import javax.json.bind.Jsonb;
import javax.json.bind.JsonbBuilder;

/**
* Parses JSON objects into domain objects.
Expand Down Expand Up @@ -527,8 +528,7 @@ private DatasetField remapGeographicCoverage(CompoundVocabularyException ex) thr
FieldDTO geoCoverageDTO = FieldDTO.createMultipleCompoundFieldDTO(DatasetFieldConstant.geographicCoverage, geoCoverageList);

// convert DTO to datasetField so we can back valid values.
Gson gson = new Gson();
String jsonString = gson.toJson(geoCoverageDTO);
String jsonString = JsonbBuilder.create().toJson(geoCoverageDTO);
JsonReader jsonReader = Json.createReader(new StringReader(jsonString));
JsonObject obj = jsonReader.readObject();
DatasetField geoCoverageField = parseField(obj);
Expand Down

0 comments on commit d3ef947

Please sign in to comment.