Skip to content
This repository was archived by the owner on Jun 18, 2024. It is now read-only.

Commit edfd438

Browse files
author
Sander Postma
committed
Required changes in Sharepoint clients
1 parent 8b09cc5 commit edfd438

File tree

9 files changed

+541
-325
lines changed

9 files changed

+541
-325
lines changed

‎sdk/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ mavenGroupId = com.microsoft.services
55
## Default artifactId and version can be set here, but they will be overridden
66
## by gradle.properties in each folder.
77
# mavenArtifactId = This is overridden in gradle.properties for each library.
8-
mavenVersion = 1.0.0
8+
mavenVersion = 1.1.0-sphereon
99

1010
nightliesUrl = http://dl.bintray.com/msopentech/Maven

‎sdk/sharepoint-services/src/main/java/com/microsoft/services/sharepoint/DocLibClient.java

+138
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package com.microsoft.services.sharepoint;
77

88
import java.io.UnsupportedEncodingException;
9+
import java.net.URL;
910
import java.util.HashMap;
1011
import java.util.List;
1112
import java.util.Map;
@@ -597,6 +598,138 @@ public void onSuccess(JSONObject json) {
597598
return result;
598599
}
599600

601+
602+
public ListenableFuture<FileSystemItem> getFileSystemItemById(String uniqueId) {
603+
final SettableFuture files = SettableFuture.create();
604+
String getFilesUrl = this.getSiteUrl() + String.format("_api/web/GetFileById(%s)", new Object[]{this.getUrlPath(uniqueId)});
605+
606+
try {
607+
ListenableFuture t = this.executeRequestJson(getFilesUrl, "GET");
608+
Futures.addCallback(t, new FutureCallback<JSONObject>() {
609+
public void onFailure(Throwable t) {
610+
files.setException(t);
611+
}
612+
613+
614+
public void onSuccess(JSONObject json) {
615+
try {
616+
FileSystemItem e = new FileSystemItem();
617+
e.loadFromJson(json);
618+
files.set(e);
619+
} catch (Throwable var3) {
620+
files.setException(var3);
621+
}
622+
623+
}
624+
});
625+
} catch (Throwable var6) {
626+
files.setException(var6);
627+
}
628+
629+
return files;
630+
}
631+
632+
633+
public ListenableFuture<SPListItem> getFileListItemByUrl(URL url) {
634+
if (url == null) {
635+
throw new IllegalArgumentException("url cannot be null");
636+
}
637+
int pos = url.getPath().lastIndexOf("/");
638+
String path = url.getPath().substring(0, pos);
639+
String name = url.getPath().substring(pos+1);
640+
641+
642+
// https://sphereon.sharepoint.com/_api/web/getfolderbyserverrelativeurl('%2FGedeelde%20%20documenten')/files/getbyurl('test%20-%20Copy%20(2).pdf')
643+
final SettableFuture result = SettableFuture.create();
644+
String getUrl = getSiteUrl() + String.format("_api/web/getfolderbyserverrelativeurl('%s')/files/getbyurl('%s')/listItemAllFields ", urlEncode(path), urlEncode(name));
645+
646+
try {
647+
ListenableFuture t = this.executeRequestJson(getUrl, "GET");
648+
Futures.addCallback(t, new FutureCallback<JSONObject>() {
649+
public void onFailure(Throwable t) {
650+
result.setException(t);
651+
}
652+
653+
654+
public void onSuccess(JSONObject json) {
655+
try {
656+
SPListItem e = new SPListItem();
657+
e.loadFromJson(json);
658+
result.set(e);
659+
} catch (Throwable var3) {
660+
result.setException(var3);
661+
}
662+
663+
}
664+
});
665+
} catch (Throwable var6) {
666+
result.setException(var6);
667+
}
668+
return result;
669+
}
670+
671+
672+
673+
public ListenableFuture<byte[]> getFileById(String uniqueId) {
674+
if (isNotEmpty(uniqueId)) {
675+
String getFileUrl = this.getSiteUrl() + String.format("_api/web/GetFileById(%s)/$value", new Object[]{this.getUrlPath(uniqueId)});
676+
return this.executeRequest(getFileUrl, "GET");
677+
} else {
678+
throw new IllegalArgumentException("Path cannot be null or empty");
679+
}
680+
}
681+
682+
683+
public ListenableFuture<Void> checkOutFileById(String uniqueId) {
684+
final SettableFuture result = SettableFuture.create();
685+
if (isNotEmpty(uniqueId)) {
686+
String checkoutFileUrl = this.getSiteUrl() + String.format("_api/web/GetFileById(%s)/checkout()", this.getUrlPath(uniqueId));
687+
ListenableFuture request = this.executeRequestJsonWithDigest(checkoutFileUrl, "POST", new HashMap(), null);
688+
Futures.addCallback(request, new FutureCallback<JSONObject>() {
689+
public void onFailure(Throwable t) {
690+
result.setException(t);
691+
}
692+
693+
694+
public void onSuccess(JSONObject json) {
695+
result.set(null);
696+
}
697+
});
698+
} else {
699+
throw new IllegalArgumentException("File id cannot be null or empty");
700+
}
701+
return result;
702+
}
703+
704+
705+
public ListenableFuture<Void> checkInFileById(String uniqueId, CheckinType checkinType, String comment) {
706+
final SettableFuture result = SettableFuture.create();
707+
if (isNotEmpty(uniqueId)) {
708+
String checkoutFileUrl = this.getSiteUrl() + String.format("_api/web/GetFileById(%s)/checkin(comment='%s',checkintype=%d)",
709+
this.getUrlPath(uniqueId), urlEncode(comment), checkinType.ordinal());
710+
ListenableFuture request = this.executeRequestJsonWithDigest(checkoutFileUrl, "POST", new HashMap(), null);
711+
Futures.addCallback(request, new FutureCallback<JSONObject>() {
712+
public void onFailure(Throwable t) {
713+
result.setException(t);
714+
}
715+
716+
717+
public void onSuccess(JSONObject json) {
718+
result.set(null);
719+
}
720+
});
721+
} else {
722+
throw new IllegalArgumentException("File id cannot be null or empty");
723+
}
724+
return result;
725+
}
726+
727+
728+
private static boolean isNotEmpty(String value) {
729+
return value != null && value.length() > 0;
730+
}
731+
732+
600733
/**
601734
* Returns the URL component for a path
602735
*/
@@ -613,4 +746,9 @@ private String getUrlPath(String path) {
613746
}
614747
return urlPath;
615748
}
749+
750+
751+
public enum CheckinType {
752+
MINOR_CHECKIN, MAJOR_CHECKIN, OVERWRITE_CHECKIN
753+
}
616754
}

‎sdk/sharepoint-services/src/main/java/com/microsoft/services/sharepoint/FileSystemItem.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ Map<String, Object> getValues() {
3939
*
4040
* @return the id
4141
*/
42-
public int getId() {
43-
return (Integer) getData("Id");
42+
public String getId() {
43+
return getData("Id").toString();
4444
}
4545

4646
/**

‎sdk/sharepoint-services/src/main/java/com/microsoft/services/sharepoint/ListClient.java

+70-10
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
package com.microsoft.services.sharepoint;
77

88
import java.io.UnsupportedEncodingException;
9-
import java.util.ArrayList;
10-
import java.util.HashMap;
11-
import java.util.List;
12-
import java.util.Map;
9+
import java.util.*;
1310

1411
import org.json.JSONArray;
1512
import org.json.JSONException;
@@ -145,6 +142,68 @@ public void onSuccess(JSONObject json) {
145142
return result;
146143
}
147144

145+
/**
146+
* Gets the list.
147+
*
148+
* @param listId the list name
149+
* @return the list
150+
*/
151+
public ListenableFuture<SPList> getList(UUID listId) {
152+
final SettableFuture<SPList> result = SettableFuture.create();
153+
String getListUrl = getSiteUrl() + "_api/web/lists(guid'%s')";
154+
getListUrl = String.format(getListUrl, listId.toString());
155+
ListenableFuture<JSONObject> request = executeRequestJson(getListUrl, "GET");
156+
157+
Futures.addCallback(request, new FutureCallback<JSONObject>() {
158+
@Override
159+
public void onFailure(Throwable t) {
160+
result.setException(t);
161+
}
162+
163+
@Override
164+
public void onSuccess(JSONObject json) {
165+
SPList list = new SPList();
166+
list.loadFromJson(json, true);
167+
result.set(list);
168+
}
169+
});
170+
171+
return result;
172+
}
173+
174+
/**
175+
* Gets the list items.
176+
*
177+
* @param listId the list name
178+
* @param query the query
179+
* @return the list items
180+
*/
181+
public ListenableFuture<List<SPListItem>> getListItems(UUID listId, Query query) {
182+
final SettableFuture<List<SPListItem>> result = SettableFuture.create();
183+
184+
String listNamePart = String.format("_api/web/lists(guid'%s')/Items?", listId);
185+
String getListUrl = getSiteUrl() + listNamePart + generateODataQueryString(query);
186+
ListenableFuture<JSONObject> request = executeRequestJson(getListUrl, "GET");
187+
188+
Futures.addCallback(request, new FutureCallback<JSONObject>() {
189+
@Override
190+
public void onFailure(Throwable t) {
191+
result.setException(t);
192+
}
193+
194+
@Override
195+
public void onSuccess(JSONObject json) {
196+
try {
197+
result.set(SPListItem.listFromJson(json));
198+
} catch (JSONException e) {
199+
log(e);
200+
}
201+
}
202+
});
203+
204+
return result;
205+
}
206+
148207
/**
149208
* Gets the list fields.
150209
*
@@ -242,8 +301,8 @@ public void onSuccess(JSONObject json) {
242301
public ListenableFuture<Void> updateListItem(final SPListItem listItem, final SPList list) {
243302
final SettableFuture<Void> result = SettableFuture.create();
244303

245-
String getListUrl = getSiteUrl() + "_api/web/lists/GetByTitle('%s')/items(" + listItem.getId() + ")";
246-
getListUrl = String.format(getListUrl, urlEncode(list.getTitle()));
304+
String getListUrl = getSiteUrl() + "_api/web/lists(guid'%s')/items(" + listItem.getId() + ")";
305+
getListUrl = String.format(getListUrl, list.getData("Id").toString());
247306

248307
try {
249308
JSONObject payload = new JSONObject();
@@ -288,18 +347,19 @@ public void onSuccess(JSONObject json) {
288347
return result;
289348
}
290349

350+
291351
/**
292352
* Delete list item.
293353
*
294-
* @param listItem the list item
354+
* @param listIdthe list item
295355
* @param listName the list name
296356
* @return the office future
297357
*/
298-
public ListenableFuture<Void> deleteListItem(final SPListItem listItem, final String listName) {
358+
public ListenableFuture<Void> deleteListItem(final SPListItem listItem, final UUID listId) {
299359
final SettableFuture<Void> result = SettableFuture.create();
300360

301-
String getListUrl = getSiteUrl() + "_api/web/lists/GetByTitle('%s')/items(" + listItem.getId() + ")";
302-
getListUrl = String.format(getListUrl, urlEncode(listName));
361+
String getListUrl = getSiteUrl() + "_api/web/lists(guid'%s')/items(" + listItem.getId() + ")";
362+
getListUrl = String.format(getListUrl, listId);
303363

304364
try {
305365
Map<String, String> headers = new HashMap<String, String>();

‎sdk/sharepoint-services/src/main/java/com/microsoft/services/sharepoint/OfficeClient.java

+15-6
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@ protected Credentials getCredentials() {
111111
return mCredentials;
112112
}
113113

114+
115+
public void updateCredentials(Credentials credentials) {
116+
this.mCredentials = credentials;
117+
}
118+
119+
114120
/**
115121
* Generate o data query string.
116122
*
@@ -164,7 +170,9 @@ protected ListenableFuture<byte[]> executeRequest(String url, String method, Map
164170

165171
if (headers != null) {
166172
for (String key : headers.keySet()) {
167-
request.addHeader(key, headers.get(key));
173+
Object value = headers.get(key);
174+
if(value != null)
175+
request.addHeader(key, "" + value);
168176
}
169177
}
170178

@@ -197,6 +205,7 @@ public void onSuccess(Response response) {
197205
}
198206
} catch (IOException e) {
199207
log(e);
208+
result.setException(e);
200209
}
201210
}
202211
});
@@ -246,10 +255,9 @@ public void onSuccess(byte[] b) {
246255
JSONObject json = new JSONObject(string);
247256
result.set(json);
248257
}
249-
} catch (UnsupportedEncodingException e) {
250-
e.printStackTrace();
251-
} catch (JSONException e) {
252-
e.printStackTrace();
258+
} catch (Throwable t) {
259+
t.printStackTrace();
260+
result.setException(t);
253261
}
254262
}
255263
});
@@ -287,8 +295,9 @@ public void onSuccess(JSONObject json) {
287295
try {
288296
discoveryInfo = DiscoveryInformation.listFromJson(json, DiscoveryInformation.class);
289297
result.set(discoveryInfo);
290-
} catch (JSONException e) {
298+
} catch (Throwable e) {
291299
log(e.getMessage(), LogLevel.Critical);
300+
result.setException(e);
292301
}
293302
}
294303
});

‎sdk/sharepoint-services/src/main/java/com/microsoft/services/sharepoint/OfficeEntity.java

+12
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
package com.microsoft.services.sharepoint;
77

88
import java.util.ArrayList;
9+
import java.util.Arrays;
10+
import java.util.Collection;
911
import java.util.List;
1012

1113
import org.json.JSONArray;
@@ -124,6 +126,16 @@ public Object getData(String field) {
124126
}
125127
}
126128

129+
130+
public Collection<String> getKeyNames() throws JSONException {
131+
JSONObject innerJson = mJsonData;
132+
if (mJsonData.has("d")) {
133+
innerJson = mJsonData.getJSONObject("d");
134+
}
135+
return Arrays.asList(JSONObject.getNames(innerJson));
136+
}
137+
138+
127139
@Override
128140
public String toString() {
129141
if (mJsonData != null) {

0 commit comments

Comments
 (0)