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

Revert "Accept empty string for the limit in a reconciliation config"

Browse Source 
This reverts commit 8c8b091adc.
This commit is contained in:
Antonin Delpeuch 2018-03-04 22:41:44 +00:00
parent 8c8b091adc
commit 75900138dd
2 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/src/com/google/refine/model/recon/StandardReconConfig.java
View File

@ -112,12 +112,7 @@ public class StandardReconConfig extends ReconConfig {
JSONObject t = obj.has("type") && !obj.isNull("type") ? obj.getJSONObject("type") : null;
int limit;
try {
limit = obj.has("limit") && !obj.isNull("limit") ? obj.getInt("limit") : 0;
} catch(JSONException e) {
limit = 0;
}
int limit = obj.has("limit") && !obj.isNull("limit") ? obj.getInt("limit") : 0;
return new StandardReconConfig(
obj.getString("service"),

33
main/tests/server/src/com/google/refine/tests/model/ReconTests.java
View File

@ -53,7 +53,7 @@ public class ReconTests extends RefineTest {
* @throws Exception
*/
@Test
public void limitJSONKeyAsIntTest() throws Exception {
public void limitJSONKeyTest() throws Exception {
JSONObject obj = new JSONObject(
" {\n" +
" \"mode\": \"standard-service\",\n" +
@ -74,35 +74,4 @@ public class ReconTests extends RefineTest {
// Assert the object is created
Assert.assertTrue(config != null);
}
/**
* Regression for issue #1526:
* the UI used to send an empty limit as an empty string, which
* failed to be parsed by the backend.
* @throws Exception
*/
@Test
public void limitJSONKeyAsEmptyStringTest() throws Exception {
JSONObject obj = new JSONObject(
" {\n" +
" \"mode\": \"standard-service\",\n" +
" \"service\": \"https://tools.wmflabs.org/openrefine-wikidata/en/api\",\n" +
" \"identifierSpace\": \"http://www.wikidata.org/entity/\",\n" +
" \"schemaSpace\": \"http://www.wikidata.org/prop/direct/\",\n" +
" \"type\": {\n" +
" \"id\": \"Q13442814\",\n" +
" \"name\": \"scientific article\"\n" +
" },\n" +
" \"autoMatch\": true,\n" +
" \"columnDetails\": [],\n" +
" \"limit\": \"\"\n" +
" }");
ReconConfig config = StandardReconConfig.reconstruct(obj);
// Assert the object is created
Assert.assertTrue(config != null);
}
}