s434730/RandomSec
3
0
Fork 0

Issue 524 - shorten __anonymous__ names for JSON importer

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@2432 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Tom Morris 2012-01-26 22:38:25 +00:00
parent 254d4468cc
commit fdac0c30cf
3 changed files with 19 additions and 12 deletions
main
src/com/google/refine/importers
JsonImporter.java
tests/server/src/com/google/refine/tests/importers
JsonImporterTests.javaXmlImportUtilitiesTests.java

12
main/src/com/google/refine/importers/JsonImporter.java
View File

@ -62,6 +62,8 @@ import com.google.refine.util.JSONUtilities;
public class JsonImporter extends TreeImportingParserBase { public class JsonImporter extends TreeImportingParserBase {
static final Logger logger = LoggerFactory.getLogger(JsonImporter.class); static final Logger logger = LoggerFactory.getLogger(JsonImporter.class);
public final static String ANONYMOUS = "_";
public JsonImporter() { public JsonImporter() {
super(false); super(false);
} }
@ -258,13 +260,18 @@ public class JsonImporter extends TreeImportingParserBase {
public String getFieldName() throws TreeReaderException { public String getFieldName() throws TreeReaderException {
try { try {
String text = parser.getCurrentName(); String text = parser.getCurrentName();
/*
* If current token is a JsonToken.FIELD_NAME, this will be the
* same as what getText() returns; for field values it will be
* preceding field name; and for others (array values,
* root-level values) null.
*/
//The following is a workaround for inconsistent Jackson JsonParser //The following is a workaround for inconsistent Jackson JsonParser
if(text == null){ if(text == null){
if(this.lastTokenWasAFieldNameAndCurrentTokenIsANewEntity) { if(this.lastTokenWasAFieldNameAndCurrentTokenIsANewEntity) {
text = this.lastFieldName; text = this.lastFieldName;
} else { } else {
text = "__anonymous__"; text = ANONYMOUS;
} }
} }
//end of workaround //end of workaround
@ -308,7 +315,6 @@ public class JsonImporter extends TreeImportingParserBase {
throw new TreeReaderException(e); throw new TreeReaderException(e);
} }
// TODO just return null here?
if(next == null) { if(next == null) {
throw new TreeReaderException("No more Json Tokens in stream"); throw new TreeReaderException("No more Json Tokens in stream");
} }

14
main/tests/server/src/com/google/refine/tests/importers/JsonImporterTests.java
View File

@ -142,7 +142,7 @@ public class JsonImporterTests extends ImporterTest {
log(project); log(project);
assertProjectCreated(project, 5, 6); assertProjectCreated(project, 5, 6);
Assert.assertEquals( project.columnModel.getColumnByCellIndex(4).getName(), "__anonymous__ - genre"); Assert.assertEquals( project.columnModel.getColumnByCellIndex(4).getName(), JsonImporter.ANONYMOUS + " - genre");
Row row0 = project.rows.get(0); Row row0 = project.rows.get(0);
Assert.assertNotNull(row0); Assert.assertNotNull(row0);
@ -174,9 +174,9 @@ public class JsonImporterTests extends ImporterTest {
JSONObject options = SUT.createParserUIInitializationData( JSONObject options = SUT.createParserUIInitializationData(
job, new LinkedList<JSONObject>(), "text/json"); job, new LinkedList<JSONObject>(), "text/json");
JSONArray path = new JSONArray(); JSONArray path = new JSONArray();
JSONUtilities.append(path, "__anonymous__"); JSONUtilities.append(path, JsonImporter.ANONYMOUS);
JSONUtilities.append(path, "result"); JSONUtilities.append(path, "result");
JSONUtilities.append(path, "__anonymous__"); JSONUtilities.append(path, JsonImporter.ANONYMOUS);
JSONUtilities.safePut(options, "recordPath", path); JSONUtilities.safePut(options, "recordPath", path);
RunTest(mqlOutput, options); RunTest(mqlOutput, options);
@ -283,11 +283,11 @@ public class JsonImporterTests extends ImporterTest {
} }
if(i == 4){ if(i == 4){
Assert.assertEquals(token, Token.StartEntity); Assert.assertEquals(token, Token.StartEntity);
Assert.assertEquals(parser.getFieldName(), "__anonymous__"); Assert.assertEquals(parser.getFieldName(), JsonImporter.ANONYMOUS);
} }
if(i == 6){ if(i == 6){
Assert.assertEquals(token, Token.StartEntity); Assert.assertEquals(token, Token.StartEntity);
Assert.assertEquals(parser.getFieldName(), "__anonymous__"); Assert.assertEquals(parser.getFieldName(), JsonImporter.ANONYMOUS);
} }
} }
}catch(Exception e){ }catch(Exception e){
@ -334,8 +334,8 @@ public class JsonImporterTests extends ImporterTest {
job, new LinkedList<JSONObject>(), "text/json"); job, new LinkedList<JSONObject>(), "text/json");
JSONArray path = new JSONArray(); JSONArray path = new JSONArray();
JSONUtilities.append(path, "__anonymous__"); JSONUtilities.append(path, JsonImporter.ANONYMOUS);
JSONUtilities.append(path, "__anonymous__"); JSONUtilities.append(path, JsonImporter.ANONYMOUS);
JSONUtilities.safePut(options, "recordPath", path); JSONUtilities.safePut(options, "recordPath", path);
return options; return options;

5
main/tests/server/src/com/google/refine/tests/importers/XmlImportUtilitiesTests.java
View File

@ -49,6 +49,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeTest; import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.refine.importers.JsonImporter;
import com.google.refine.importers.JsonImporter.JSONTreeReader; import com.google.refine.importers.JsonImporter.JSONTreeReader;
import com.google.refine.importers.XmlImporter.XmlParser; import com.google.refine.importers.XmlImporter.XmlParser;
import com.google.refine.importers.tree.ImportColumn; import com.google.refine.importers.tree.ImportColumn;
@ -199,8 +200,8 @@ public class XmlImportUtilitiesTests extends RefineTest {
new JSONTreeReader(new InputStreamReader(inputStream))); new JSONTreeReader(new InputStreamReader(inputStream)));
Assert.assertNotNull(path); Assert.assertNotNull(path);
Assert.assertEquals(path.length, 2); Assert.assertEquals(path.length, 2);
Assert.assertEquals(path[0], "__anonymous__"); Assert.assertEquals(path[0], JsonImporter.ANONYMOUS);
Assert.assertEquals(path[1], "__anonymous__"); Assert.assertEquals(path[1], JsonImporter.ANONYMOUS);
} }
@Test @Test