Skip to content
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.

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

Resource pools api #822

Closed
wants to merge 43 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
cbdb22d
Added serialization to resourcepoolutils.
fireboy1919 Mar 15, 2016
ffd092b
Added pool persistance.
fireboy1919 Mar 15, 2016
84cabe2
Added test.
fireboy1919 Mar 16, 2016
ffce0d9
Fixed merge conflict.
fireboy1919 Mar 17, 2016
187e45e
Merge remote-tracking branch 'apache/master' into persist_pool
fireboy1919 Mar 17, 2016
f1f0d91
Changed resource pool utils so that it will work anywhere.
fireboy1919 Mar 28, 2016
a19c48e
Removed unnecessary serialization.
fireboy1919 Mar 28, 2016
8fa84a8
Added explicit save to the serializer.
fireboy1919 Mar 28, 2016
1f2d2ec
Added vfs resource pool.
fireboy1919 Mar 21, 2016
5ab2962
Added pluggable resource pool.
fireboy1919 Apr 5, 2016
47e0ee5
Added missing rename.
fireboy1919 Apr 6, 2016
3c0e0c2
Added an API to access resource pools.
fireboy1919 Apr 6, 2016
cb4c167
Added a constructor to DistributedResourcePools to fix tests.
fireboy1919 Apr 6, 2016
cf658e3
Switched to java 7 method for java.util.properties.
fireboy1919 Apr 6, 2016
cb5519a
Removed the need for resource pools during tests.
fireboy1919 Apr 6, 2016
c0cd60d
Adding missing license file.
fireboy1919 Apr 6, 2016
f3fb719
Set mock interpreter to register properly.
fireboy1919 Apr 11, 2016
85a48c1
Merge branch 'pool_pluggable' into resource_pools_api
fireboy1919 Apr 11, 2016
8e2fe6a
Fixed typo and addressed issues with resource pool connector.
fireboy1919 Apr 11, 2016
e422d07
Removed requirement for spark dependency from abstract test rest api.
fireboy1919 Apr 12, 2016
1c8c53c
Fixed error with the JSON response.
fireboy1919 Apr 12, 2016
43fa7b9
Added serialization to resourcepoolutils.
fireboy1919 Mar 15, 2016
5de5756
Added pool persistance.
fireboy1919 Mar 15, 2016
e633c44
Added test.
fireboy1919 Mar 16, 2016
71609fa
Changed resource pool utils so that it will work anywhere.
fireboy1919 Mar 28, 2016
6a22e3b
Removed unnecessary serialization.
fireboy1919 Mar 28, 2016
17fed3d
Added explicit save to the serializer.
fireboy1919 Mar 28, 2016
067da37
Added vfs resource pool.
fireboy1919 Mar 21, 2016
0cfeb33
Added pluggable resource pool.
fireboy1919 Apr 5, 2016
52cf1be
Added missing rename.
fireboy1919 Apr 6, 2016
a1b0bbd
Added a constructor to DistributedResourcePools to fix tests.
fireboy1919 Apr 6, 2016
f241272
Switched to java 7 method for java.util.properties.
fireboy1919 Apr 6, 2016
3ed89b0
Removed the need for resource pools during tests.
fireboy1919 Apr 6, 2016
0fa4b32
Adding missing license file.
fireboy1919 Apr 6, 2016
69d11d3
Set mock interpreter to register properly.
fireboy1919 Apr 11, 2016
df46376
Switched interpreter to use default configuration.
fireboy1919 Apr 15, 2016
1c29288
Merge remote-tracking branch 'apache/master' into pool_pluggable_rebase
fireboy1919 Apr 18, 2016
bbeacac
Fixed missing comma.
fireboy1919 Apr 18, 2016
da75ca3
Merge branch 'pool_pluggable_rebase' into resource_pools_api
fireboy1919 Apr 18, 2016
8fef1ca
Added if-modified-by header support to notebookrestapi.
fireboy1919 Apr 18, 2016
3993c0d
Added fixes to tests
fireboy1919 Apr 19, 2016
075170a
Merge branch 'pool_pluggable_rebase' into resource_pools_api
fireboy1919 Apr 20, 2016
462cde8
Fixes a style error.
fireboy1919 Apr 20, 2016
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
Added explicit save to the serializer.
  • Loading branch information
fireboy1919 committed Mar 28, 2016
commit 8fa84a832200351465793f83aafe8d1c0c3c3573
Original file line number Diff line number Diff line change
@@ -38,7 +38,12 @@ public ResourceSerializer() {
public JsonElement serialize(Resource src, Type typeOfSrc, JsonSerializationContext context) {
// This is straightforward at the moment.
Gson gson = new Gson();
return gson.toJsonTree(src);
JsonElement elem = gson.toJsonTree(src);
JsonObject obj = elem.getAsJsonObject();
if (src.isSerializable()) {
obj.add("r", gson.toJsonTree(src.get()));
}
return obj;
}

@Override