Ubuntu One Files Java library

Merge lp://staging/~karni/ubuntuone-files-java-library/delta-support into lp://staging/ubuntuone-files-java-library/0.x

  1. delta-support
  2. Merge into trunk0.x
Proposed by Michał Karnicki
Status: Merged
Approved by: Chad Miller
Approved revision: 50
Merged at revision: 50
Proposed branch: lp://staging/~karni/ubuntuone-files-java-library/delta-support
Merge into: lp://staging/ubuntuone-files-java-library/0.x
Diff against target: 915 lines (+541/-33)
13 files modified
main/src/com/ubuntuone/api/files/U1FileAPI.java (+57/-22)
main/src/com/ubuntuone/api/files/json/U1DeltaJson.java (+64/-0)
main/src/com/ubuntuone/api/files/json/U1NodeJson.java (+2/-1)
main/src/com/ubuntuone/api/files/json/U1VolumeJson.java (+20/-1)
main/src/com/ubuntuone/api/files/model/U1Volume.java (+9/-1)
project.properties (+1/-1)
test/src/com/ubuntuone/api/files/CreateVolumeTest.java (+1/-1)
test/src/com/ubuntuone/api/files/GetUserTest.java (+1/-1)
test/src/com/ubuntuone/api/files/GetVolumeDeltaTest.java (+291/-0)
test/src/com/ubuntuone/api/files/GetVolumesTest.java (+1/-1)
test/src/com/ubuntuone/api/files/json/U1DeltaJsonTest.java (+66/-0)
test/src/com/ubuntuone/api/files/json/U1VolumeJsonTest.java (+3/-3)
test/src/com/ubuntuone/api/files/util/U1VolumeBuilder.java (+25/-1)
To merge this branch: bzr merge lp://staging/~karni/ubuntuone-files-java-library/delta-support
Reviewer Review Type Date Requested Status
Chad Miller (community) Approve
Review via email: mp+99075@code.staging.launchpad.net

Description of the change

This branch adds delta support.

To post a comment you must log in.
Revision history for this message
Chad Miller (cmiller) wrote :

54 + callback.onFinish();

This is in the finally block, so you'll call it twice on out-of-error. Maybe also check that it's called only once here, as in all other tests.

595 + atLeast(1).of(nodeCallback).onFinish();
596 + inSequence(requestSequence);

242 + if ("from_generation".equals(jp.getCurrentName())) {
243 + // Ignore.
244 + } else

Do you need this?

review: Needs Fixing
lp://staging/~karni/ubuntuone-files-java-library/delta-support updated
50. By Michał Karnicki

Applied review fixes. Removed unnecessary call backs. Removed ignored code.

Revision history for this message
Michał Karnicki (karni) wrote :

Fixed!

Revision history for this message
Chad Miller (cmiller) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: