Skip to content

add expand json option #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2020
Merged

add expand json option #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Required Embulk version >= 0.9.20
- **columns** target issue attributes. You can generate this configuration by `guess` command (array, required)
- **retry_initial_wait_sec**: Wait seconds for exponential backoff initial value (integer, default: 1)
- **retry_limit**: Try to retry this times (integer, default: 5)
- **expand_json_on_guess** The boolean value is to enable/disable json expanding when `guess`. (boolean, default: true)

## Example

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ configurations {
provided
}

version = "0.2.10"
version = "0.2.11"

sourceCompatibility = 1.8
targetCompatibility = 1.8
Expand Down
15 changes: 10 additions & 5 deletions src/main/java/org/embulk/input/jira/Issue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@ else if (keys.isEmpty() || (json.isJsonArray() && json.getAsJsonArray().size() =
}
}

public synchronized JsonObject getFlatten()
public synchronized JsonObject getFlatten(Boolean expandJsonOnGuess)
{
if (flatten == null) {
flatten = new JsonObject();
manipulatingFlattenJson(json, "");
manipulatingFlattenJson(json, "", expandJsonOnGuess);
}
return flatten;
}

private void manipulatingFlattenJson(JsonElement in, String prefix)
private void manipulatingFlattenJson(JsonElement in, String prefix, boolean expandJsonOnGuess)
{
if (in.isJsonObject()) {
JsonObject obj = in.getAsJsonObject();
Expand All @@ -83,7 +83,12 @@ private void manipulatingFlattenJson(JsonElement in, String prefix)
for (Entry<String, JsonElement> entry : obj.entrySet()) {
String key = entry.getKey();
JsonElement value = entry.getValue();
manipulatingFlattenJson(value, appendPrefix(prefix, key));
if (expandJsonOnGuess) {
manipulatingFlattenJson(value, appendPrefix(prefix, key), expandJsonOnGuess);
}
else {
flatten.add(key, value);
}
}
}
}
Expand All @@ -106,7 +111,7 @@ else if (in.isJsonArray()) {
newObj.get(key).getAsJsonArray().add(elem.getAsJsonObject().get(key));
}
}
manipulatingFlattenJson(newObj, prefix);
manipulatingFlattenJson(newObj, prefix, expandJsonOnGuess);
}
else {
flatten.add(prefix,
Expand Down
14 changes: 9 additions & 5 deletions src/main/java/org/embulk/input/jira/JiraInputPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ public interface PluginTask
@Config("auth_method")
@ConfigDefault("\"basic\"")
public AuthenticateMethod getAuthMethod();

@Config("expand_json_on_guess")
@ConfigDefault("true")
public boolean getExpandJsonOnGuess();
}

@Override
Expand Down Expand Up @@ -160,7 +164,7 @@ public ConfigDiff guess(final ConfigSource config)
if (issues.isEmpty()) {
throw new ConfigException("Could not guess schema due to empty data set");
}
final Buffer sample = Buffer.copyOf(createSamples(issues, getUniqueAttributes(issues)).toString().getBytes());
final Buffer sample = Buffer.copyOf(createSamples(issues, getUniqueAttributes(issues, task.getExpandJsonOnGuess()), task.getExpandJsonOnGuess()).toString().getBytes());
final JsonNode columns = Exec.getInjector().getInstance(GuessExecutor.class)
.guessParserConfig(sample, Exec.newConfigSource(), createGuessConfig())
.get(JsonNode.class, "columns");
Expand All @@ -174,22 +178,22 @@ private ConfigSource createGuessConfig()
.set("guess_sample_buffer_bytes", GUESS_BUFFER_SIZE);
}

private SortedSet<String> getUniqueAttributes(final List<Issue> issues)
private SortedSet<String> getUniqueAttributes(final List<Issue> issues, final boolean expandJsonOnGuess)
{
final SortedSet<String> uniqueAttributes = new TreeSet<>();
for (final Issue issue : issues) {
for (final Entry<String, JsonElement> entry : issue.getFlatten().entrySet()) {
for (final Entry<String, JsonElement> entry : issue.getFlatten(expandJsonOnGuess).entrySet()) {
uniqueAttributes.add(entry.getKey());
}
}
return uniqueAttributes;
}

private JsonArray createSamples(final List<Issue> issues, final Set<String> uniqueAttributes)
private JsonArray createSamples(final List<Issue> issues, final Set<String> uniqueAttributes, final boolean expandJsonOnGuess)
{
final JsonArray samples = new JsonArray();
for (final Issue issue : issues) {
final JsonObject flatten = issue.getFlatten();
final JsonObject flatten = issue.getFlatten(expandJsonOnGuess);
final JsonObject unified = new JsonObject();
for (final String key : uniqueAttributes) {
JsonElement value = flatten.get(key);
Expand Down
18 changes: 9 additions & 9 deletions src/test/java/org/embulk/input/jira/IssueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void test_toRecord_simple()
String testName = "simple";
Issue issue = new Issue(flattenData.get(testName).getAsJsonObject());
JsonObject expected = flattenExpected.get(testName).getAsJsonObject();
assertEquals(expected, issue.getFlatten());
assertEquals(expected, issue.getFlatten(true));
}

@Test
Expand All @@ -40,7 +40,7 @@ public void test_toRecord_twoLevels()
String testName = "twoLevels";
Issue issue = new Issue(flattenData.get(testName).getAsJsonObject());
JsonObject expected = flattenExpected.get(testName).getAsJsonObject();
assertEquals(expected, issue.getFlatten());
assertEquals(expected, issue.getFlatten(true));
}

@Test
Expand All @@ -49,7 +49,7 @@ public void test_toRecord_threeLevels()
String testName = "threeLevels";
Issue issue = new Issue(flattenData.get(testName).getAsJsonObject());
JsonObject expected = flattenExpected.get(testName).getAsJsonObject();
assertEquals(expected, issue.getFlatten());
assertEquals(expected, issue.getFlatten(true));
}

@Test
Expand All @@ -58,7 +58,7 @@ public void test_toRecord_threeLevelsWithoutKeys()
String testName = "threeLevelsWithoutKeys";
Issue issue = new Issue(flattenData.get(testName).getAsJsonObject());
JsonObject expected = flattenExpected.get(testName).getAsJsonObject();
assertEquals(expected, issue.getFlatten());
assertEquals(expected, issue.getFlatten(true));
}

@Test
Expand All @@ -67,7 +67,7 @@ public void test_toRecord_threeLevelsWithKeys()
String testName = "threeLevelsWithKeys";
Issue issue = new Issue(flattenData.get(testName).getAsJsonObject());
JsonObject expected = flattenExpected.get(testName).getAsJsonObject();
assertEquals(expected, issue.getFlatten());
assertEquals(expected, issue.getFlatten(true));
}

@Test
Expand All @@ -76,7 +76,7 @@ public void test_toRecord_threeLevelsWithNullKeys()
String testName = "threeLevelsWithNullKeys";
Issue issue = new Issue(flattenData.get(testName).getAsJsonObject());
JsonObject expected = flattenExpected.get(testName).getAsJsonObject();
assertEquals(expected, issue.getFlatten());
assertEquals(expected, issue.getFlatten(true));
}

@Test
Expand All @@ -85,7 +85,7 @@ public void test_toRecord_arrayWithAllJsonObjectWithSameKeysAndEmptyObject()
String testName = "arrayWithAllJsonObjectWithSameKeysAndEmptyObject";
Issue issue = new Issue(flattenData.get(testName).getAsJsonObject());
JsonObject expected = flattenExpected.get(testName).getAsJsonObject();
assertEquals(expected, issue.getFlatten());
assertEquals(expected, issue.getFlatten(true));
}

@Test
Expand All @@ -94,7 +94,7 @@ public void test_toRecord_arrayWithAllJsonObjectWithSameKeysAndNotEmptyObject()
String testName = "arrayWithAllJsonObjectWithSameKeysAndNotEmptyObject";
Issue issue = new Issue(flattenData.get(testName).getAsJsonObject());
JsonObject expected = flattenExpected.get(testName).getAsJsonObject();
assertEquals(expected, issue.getFlatten());
assertEquals(expected, issue.getFlatten(true));
}

@Test
Expand All @@ -103,7 +103,7 @@ public void test_toRecord_arrayWithAllJsonObjectWithoutSameKeys()
String testName = "arrayWithAllJsonObjectWithoutSameKeys";
Issue issue = new Issue(flattenData.get(testName).getAsJsonObject());
JsonObject expected = flattenExpected.get(testName).getAsJsonObject();
assertEquals(expected, issue.getFlatten());
assertEquals(expected, issue.getFlatten(true));
}

@Test
Expand Down