Skip to content

Fix iterable maps JSON serialization #550

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 4 commits into from
Jan 3, 2019
Merged

Fix iterable maps JSON serialization #550

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
485286e
Add common generator tests for the iterable map and normal map
chingor13 Dec 28, 2018
0238d31
Make json serialization treat maps as maps, always.
mikekap Apr 15, 2018
25ac07e
Fix compilation on Java 7
chingor13 Dec 28, 2018
372a38b
only add one map entry to prevent ordering test failure
chingor13 Dec 28, 2018
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
Prev Previous commit
Next Next commit
Fix compilation on Java 7
  • Loading branch information
@chingor13
chingor13 committed Dec 28, 2018
commit 25ac07eb2c6414e00fdb3f7f608cee946165a72d
2 changes: 1 addition & 1 deletion ...-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public abstract class AbstractJsonGeneratorTest extends TestCase {

class IterableMap extends HashMap<String, String> implements Iterable<Map.Entry<String, String>> {
@Override
public Iterator<Entry<String, String>> iterator() {
public Iterator<Map.Entry<String, String>> iterator() {
return entrySet().iterator();
}
}
Expand Down