@@ -50,10 +50,11 @@ public Response getShare(String share) {
5050 return wrapExceptions (
5151 () ->
5252 optionalToNotFound (shareService .getShare (share ),
53- s -> {
53+ foundShare ->
54+ shareToForbidden (foundShare , s -> {
5455 var resultShare = new Share ().name (s .name ()).id (s .id ());
5556 return Response .ok (resultShare ).build ();
56- }),
57+ })) ,
5758 exceptionToResponse );
5859 }
5960
@@ -107,28 +108,31 @@ public Response getTableVersion(
107108 String share , String schema , String table , String startingTimestampStr ) {
108109
109110 return wrapExceptions (
110- () -> {
111+ () ->
112+ optionalToNotFound (shareService .getShare (share ), foundShare -> shareToForbidden (foundShare , s -> {
111113 var startingTimestamp = parseTimestamp (startingTimestampStr );
112114 return optionalToNotFound (
113115 deltaSharesService .getTableVersion (share , schema , table , startingTimestamp ),
114116 t -> Response .ok ().header (DELTA_TABLE_VERSION_HEADER , t ).build ());
115- },
117+ })) ,
116118 exceptionToResponse );
117119 }
118120
119121 @ Override
120122 public Response listALLTables (String share , Integer maxResults , String pageToken ) {
121123 return wrapExceptions (
122- () -> optionalToNotFound (
123- deltaSharesService .listTablesOfShare (
124- share , parseToken (pageToken ), Optional .ofNullable (maxResults )),
125- c -> Response .ok (c .getToken ()
126- .map (t -> new ListTablesResponse ()
127- .items (mapList (c .getContent (), DeltaMappers ::table2api ))
128- .nextPageToken (tokenEncoder .encodePageToken (t )))
129- .orElse (new ListTablesResponse ()
130- .items (mapList (c .getContent (), DeltaMappers ::table2api ))))
131- .build ()),
124+ () ->
125+ optionalToNotFound (shareService .getShare (share ), foundShare -> shareToForbidden (foundShare , s ->
126+ optionalToNotFound (
127+ deltaSharesService .listTablesOfShare (
128+ share , parseToken (pageToken ), Optional .ofNullable (maxResults )),
129+ c -> Response .ok (c .getToken ()
130+ .map (t -> new ListTablesResponse ()
131+ .items (mapList (c .getContent (), DeltaMappers ::table2api ))
132+ .nextPageToken (tokenEncoder .encodePageToken (t )))
133+ .orElse (new ListTablesResponse ()
134+ .items (mapList (c .getContent (), DeltaMappers ::table2api ))))
135+ .build ()))),
132136 exceptionToResponse );
133137 }
134138
0 commit comments