Skip to content

Commit 6a05eb2

Browse files
author
Karl Rieb
committed
spec: Update to latest API specs.
1 parent 44306f4 commit 6a05eb2

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

ChangeLog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
- Updated to latest API specs.
12

23
---------------------------------------------
34
2.0-beta-6 (2016-02-22)

generator/java.babelg.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,10 @@ def java_builder_class_with_inheritance(self):
864864
class_name = self.java_builder_class
865865
request_style = self.request_style
866866
response_type = self.response.java_type()
867-
exc_type = self.error.java_exception_class
867+
if self.has_error:
868+
exc_type = self.error.java_exception_class
869+
else:
870+
exc_type = JavaClass(self._ctx, 'com.dropbox.core.DbxException')
868871

869872
if request_style == 'upload':
870873
return '%s extends %s<%s,%s>' % (
@@ -1272,7 +1275,7 @@ def java_builder_field(self):
12721275

12731276
@property
12741277
def java_exception_class(self):
1275-
assert not self.is_primitive, "primitive data types cannot have exception classes"
1278+
assert not self.is_primitive, "primitive data types cannot have exception classes: %r" % self
12761279
return self._as_java_class(classname(self.babel_name + '_exception'))
12771280

12781281
def java_type(self, boxed=True, generics=True):
@@ -1924,6 +1927,8 @@ def add_imports_for_route_builder(self, route):
19241927
self.add_imports_for_field(field)
19251928
if route.has_error:
19261929
self._ctx.add_imports(route.error.java_exception_class)
1930+
else:
1931+
self._ctx.add_imports('com.dropbox.core.DbxApiException')
19271932

19281933
def add_imports_for_route_uploader(self, route):
19291934
self._ctx.add_imports(

src/test/java/com/dropbox/core/v2/DbxClientV2Test.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ public void testRetrySuccess() throws DbxException, IOException {
7272
FileMetadata expected = new FileMetadata(
7373
"bar.txt",
7474
"/foo/bar.txt",
75+
"/foo/bar.txt",
76+
"id:1HkLjqifwMAAAAAAAAAAAQ",
7577
new Date(1456169040985L),
7678
new Date(1456169040985L),
7779
"2e0c38735597",
@@ -161,6 +163,8 @@ public void testRetryDownload() throws DbxException, IOException {
161163
FileMetadata expectedMetadata = new FileMetadata(
162164
"download_me.txt",
163165
"/download_me.txt",
166+
"/download_me.txt",
167+
"id:KLavC4viCDAAAAAAAAAAAQ",
164168
new Date(1456169692501L),
165169
new Date(1456169692501L),
166170
"341438735597",
@@ -201,6 +205,8 @@ public void testRetrySuccessWithBackoff() throws DbxException, IOException {
201205
FileMetadata expected = new FileMetadata(
202206
"banana.png",
203207
"/banana.png",
208+
"/banana.png",
209+
"id:eRsVsAya9YAAAAAAAAAAAQ",
204210
new Date(1456173312172L),
205211
new Date(1456173312172L),
206212
"89df885732c38",

0 commit comments

Comments
 (0)