Skip to content

Commit aae2fed

Browse files
mathiasbosmanmathiasbosman
committed
Use constants where possible
1 parent 994f435 commit aae2fed

5 files changed

Lines changed: 54 additions & 53 deletions

File tree

‎src/main/java/org/aarboard/nextcloud/api/config/ConfigConnector.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public List<String> getAppConfigApps(){
4444
}
4545

4646
private CompletableFuture<AppConfigAppsAnswer> getAppConfigAppsAsync(){
47-
return connectorCommon.executeGet(CONFIG_PART + "apps", Collections.emptyList(),
47+
return connectorCommon.executeGet(CONFIG_PART, Collections.emptyList(),
4848
XMLAnswerParser.getInstance(AppConfigAppsAnswer.class));
4949
}
5050

@@ -54,7 +54,7 @@ public List<String> getAppConfigAppKeys(String appConfigApp){
5454
}
5555

5656
private CompletableFuture<AppConfigAppsAnswer> getAppConfigAppsAsync(String appConfigApp){
57-
return connectorCommon.executeGet(CONFIG_PART + "apps/" + appConfigApp,
57+
return connectorCommon.executeGet(CONFIG_PART + "/" + appConfigApp,
5858
Collections.emptyList(), XMLAnswerParser.getInstance(AppConfigAppsAnswer.class));
5959
}
6060

@@ -72,7 +72,7 @@ public String getAppConfigAppKeyValue(String appConfigAppKeyPath){
7272

7373
private CompletableFuture<AppConfigAppKeyValueAnswer> getAppConfigAppsKeyAsync(
7474
String appConfigAppKeyPath){
75-
return connectorCommon.executeGet(CONFIG_PART + "apps/" + appConfigAppKeyPath,
75+
return connectorCommon.executeGet(CONFIG_PART + "/" + appConfigAppKeyPath,
7676
Collections.emptyList(), XMLAnswerParser.getInstance(AppConfigAppKeyValueAnswer.class));
7777
}
7878

@@ -91,7 +91,7 @@ public CompletableFuture<AppConfigAppKeyValueAnswer> setAppConfigAppKeyValueAsyn
9191
String appConfigAppKeyPath, Object value){
9292
List<NameValuePair> postParams = new LinkedList<>();
9393
postParams.add(new BasicNameValuePair("value", value.toString()));
94-
return connectorCommon.executePost(CONFIG_PART + "apps/" + appConfigAppKeyPath, postParams,
94+
return connectorCommon.executePost(CONFIG_PART + "/" + appConfigAppKeyPath, postParams,
9595
XMLAnswerParser.getInstance(AppConfigAppKeyValueAnswer.class));
9696
}
9797

‎src/main/java/org/aarboard/nextcloud/api/provisioning/ProvisionConnector.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,13 @@
3636
*/
3737
public class ProvisionConnector
3838
{
39-
private final static String ROOT_PART= "ocs/v1.php/cloud/";
40-
private final static String USER_PART= ROOT_PART+"user";
41-
private final static String USERS_PART= ROOT_PART+"users";
42-
private final static String GROUPS_PART= ROOT_PART+"groups";
39+
4340
private static final String ROOT_PART= "ocs/v1.php/cloud/";
4441
private static final String USER_PART= ROOT_PART+"user";
4542
private static final String USERS_PART= ROOT_PART+"users";
4643
private static final String GROUPS_PART= ROOT_PART+"groups";
44+
public static final String GROUPID_KEY = "groupid";
45+
public static final String SUBADMINS_PART = "/subadmins";
4746

4847
private final ConnectorCommon connectorCommon;
4948

@@ -330,7 +329,7 @@ public boolean addUserToGroup(String userId, String groupId) {
330329
*/
331330
public CompletableFuture<JsonVoidAnswer> addUserToGroupAsync(String userId, String groupId) {
332331
List<NameValuePair> queryParams = new LinkedList<>();
333-
queryParams.add(new BasicNameValuePair("groupid", groupId));
332+
queryParams.add(new BasicNameValuePair(GROUPID_KEY, groupId));
334333
return connectorCommon.executePost(USERS_PART + "/" + userId + "/groups", queryParams, JsonAnswerParser.getInstance(JsonVoidAnswer.class));
335334
}
336335

@@ -354,7 +353,7 @@ public boolean removeUserFromGroup(String userId, String groupId) {
354353
*/
355354
public CompletableFuture<JsonVoidAnswer> removeUserFromGroupAsync(String userId, String groupId) {
356355
List<NameValuePair> queryParams = new LinkedList<>();
357-
queryParams.add(new BasicNameValuePair("groupid", groupId));
356+
queryParams.add(new BasicNameValuePair(GROUPID_KEY, groupId));
358357
return connectorCommon.executeDelete(USERS_PART, userId + "/groups", queryParams, JsonAnswerParser.getInstance(JsonVoidAnswer.class));
359358
}
360359

@@ -375,7 +374,7 @@ public List<String> getSubadminGroupsOfUser(String userId) {
375374
* @return a CompletableFuture containing the result of the operation
376375
*/
377376
public CompletableFuture<JsonListAnswer> getSubadminGroupsOfUserAsync(String userId) {
378-
return connectorCommon.executeGet(USERS_PART + "/" + userId + "/subadmins", null, JsonAnswerParser.getInstance(JsonListAnswer.class));
377+
return connectorCommon.executeGet(USERS_PART + "/" + userId + SUBADMINS_PART, null, JsonAnswerParser.getInstance(JsonListAnswer.class));
379378
}
380379

381380
/**
@@ -398,8 +397,8 @@ public boolean promoteToSubadmin(String userId, String groupId) {
398397
*/
399398
public CompletableFuture<JsonVoidAnswer> promoteToSubadminAsync(String userId, String groupId) {
400399
List<NameValuePair> queryParams = new LinkedList<>();
401-
queryParams.add(new BasicNameValuePair("groupid", groupId));
402-
return connectorCommon.executePost(USERS_PART + "/" + userId + "/subadmins", queryParams, JsonAnswerParser.getInstance(JsonVoidAnswer.class));
400+
queryParams.add(new BasicNameValuePair(GROUPID_KEY, groupId));
401+
return connectorCommon.executePost(USERS_PART + "/" + userId + SUBADMINS_PART, queryParams, JsonAnswerParser.getInstance(JsonVoidAnswer.class));
403402
}
404403

405404
/**
@@ -422,8 +421,8 @@ public boolean demoteSubadmin(String userId, String groupId) {
422421
*/
423422
public CompletableFuture<JsonVoidAnswer> demoteSubadminAsync(String userId, String groupId) {
424423
List<NameValuePair> queryParams = new LinkedList<>();
425-
queryParams.add(new BasicNameValuePair("groupid", groupId));
426-
return connectorCommon.executeDelete(USERS_PART, userId + "/subadmins", queryParams, JsonAnswerParser.getInstance(JsonVoidAnswer.class));
424+
queryParams.add(new BasicNameValuePair(GROUPID_KEY, groupId));
425+
return connectorCommon.executeDelete(USERS_PART, userId + SUBADMINS_PART, queryParams, JsonAnswerParser.getInstance(JsonVoidAnswer.class));
427426
}
428427

429428
/**
@@ -503,7 +502,7 @@ public List<String> getSubadminsOfGroup(String groupId) {
503502
* @return a CompletableFuture containing the result of the operation
504503
*/
505504
public CompletableFuture<JsonListAnswer> getSubadminsOfGroupAsync(String groupId) {
506-
return connectorCommon.executeGet(GROUPS_PART + "/" + groupId + "/subadmins", null, JsonAnswerParser.getInstance(JsonListAnswer.class));
505+
return connectorCommon.executeGet(GROUPS_PART + "/" + groupId + SUBADMINS_PART, null, JsonAnswerParser.getInstance(JsonListAnswer.class));
507506
}
508507

509508
/**
@@ -524,7 +523,7 @@ public boolean createGroup(String groupId) {
524523
*/
525524
public CompletableFuture<JsonVoidAnswer> createGroupAsync(String groupId) {
526525
List<NameValuePair> postParams= new LinkedList<>();
527-
postParams.add(new BasicNameValuePair("groupid", groupId));
526+
postParams.add(new BasicNameValuePair(GROUPID_KEY, groupId));
528527
return connectorCommon.executePost(GROUPS_PART, postParams, JsonAnswerParser.getInstance(JsonVoidAnswer.class));
529528
}
530529

‎src/main/java/org/aarboard/nextcloud/api/webdav/AWebdavHandler.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public abstract class AWebdavHandler
4545
{
4646

4747
private static final Logger LOG = LoggerFactory.getLogger(AWebdavHandler.class);
48+
private static final String ERROR_CLOSING = "error in closing sardine connector";
4849

4950
public static final int FILE_BUFFER_SIZE= 4096;
5051
public static final String WEB_DAV_BASE_PATH = "remote.php/webdav/";
@@ -106,7 +107,7 @@ private void resolveNextcloudServerVersion()
106107
}
107108
catch (IOException ex)
108109
{
109-
LOG.warn("error in closing sardine connector", ex);
110+
LOG.warn(ERROR_CLOSING, ex);
110111
}
111112
}
112113

@@ -211,7 +212,7 @@ public boolean pathExists(String remotePath)
211212
}
212213
catch (IOException ex)
213214
{
214-
LOG.warn("error in closing sardine connector", ex);
215+
LOG.warn(ERROR_CLOSING, ex);
215216
}
216217
}
217218
}
@@ -242,7 +243,7 @@ public void deletePath(String remotePath)
242243
}
243244
catch (IOException ex)
244245
{
245-
LOG.warn("error in closing sardine connector", ex);
246+
LOG.warn(ERROR_CLOSING, ex);
246247
}
247248
}
248249
}
@@ -273,7 +274,7 @@ public void renamePath(String oldPath, String newPath, boolean overwriteExisting
273274
}
274275
catch (IOException ex)
275276
{
276-
LOG.warn("error in closing sardine connector", ex);
277+
LOG.warn(ERROR_CLOSING, ex);
277278
}
278279
}
279280
}

‎src/main/java/org/aarboard/nextcloud/api/webdav/Files.java‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.github.sardine.DavResource;
55
import com.github.sardine.Sardine;
66
import java.io.File;
7-
import java.io.FileOutputStream;
87
import java.io.OutputStream;
98
import java.io.IOException;
109
import java.io.InputStream;
@@ -25,7 +24,11 @@
2524
*
2625
*/
2726
public class Files extends AWebdavHandler{
27+
2828
private static final Logger LOG = LoggerFactory.getLogger(Files.class);
29+
private static final String ERROR_SHUTDOWN = "Error in sardine shutdown";
30+
public static final String URI_NS_OWNCLOUD = "http://owncloud.org/ns";
31+
public static final String URI_NS_DAV = "DAV:";
2932

3033
public Files(ServerConfig serverConfig) {
3134
super(serverConfig);
@@ -66,7 +69,7 @@ public void uploadFile(File localSource, String remotePath) {
6669
}
6770
catch(Exception ex2)
6871
{
69-
LOG.warn("Error in sardine shutdown", ex2);
72+
LOG.warn(ERROR_SHUTDOWN, ex2);
7073
}
7174
}
7275
}
@@ -109,7 +112,7 @@ public void uploadFile(InputStream inputStream, String remotePath, boolean conti
109112
}
110113
catch(Exception ex2)
111114
{
112-
LOG.warn("Error in sardine shutdown", ex2);
115+
LOG.warn(ERROR_SHUTDOWN, ex2);
113116
}
114117
}
115118
}
@@ -189,9 +192,8 @@ public boolean downloadFile(String remotePath, String downloadDirPath) throws IO
189192
* @param remotePath Remotepath where the file is saved in the nextcloud
190193
* server
191194
* @return InputStream
192-
* @throws IOException In case of IO errors
193195
*/
194-
public InputStream downloadFile(String remotePath) throws IOException {
196+
public InputStream downloadFile(String remotePath) {
195197
String path = buildWebdavPath(remotePath);
196198
Sardine sardine = buildAuthSardine();
197199

@@ -211,7 +213,7 @@ public InputStream downloadFile(String remotePath) throws IOException {
211213
}
212214
catch(Exception ex2)
213215
{
214-
LOG.warn("Error in sardine shutdown", ex2);
216+
LOG.warn(ERROR_SHUTDOWN, ex2);
215217
}
216218
}
217219
return in;
@@ -225,9 +227,8 @@ public InputStream downloadFile(String remotePath) throws IOException {
225227
* @param allProperties Return all properties, not only base properties
226228
* <a href="https://docs.nextcloud.com/server/latest/developer_manual/client_apis/WebDAV/basic.html#requesting-properties">...</a>
227229
* @return InputStream
228-
* @throws IOException In case of IO errors
229230
*/
230-
public ResourceProperties getProperties(String remotePath, boolean allProperties) throws IOException {
231+
public ResourceProperties getProperties(String remotePath, boolean allProperties) {
231232
String path = buildWebdavPath(remotePath);
232233
Sardine sardine = buildAuthSardine();
233234

@@ -236,25 +237,25 @@ public ResourceProperties getProperties(String remotePath, boolean allProperties
236237
Set<QName> props= new HashSet<>();
237238
if (allProperties)
238239
{
239-
props.add(new QName("DAV:", "getlastmodified", "d"));
240-
props.add(new QName("DAV:", "getetag", "d"));
241-
props.add(new QName("DAV:", "getcontenttype", "d"));
242-
props.add(new QName("DAV:", "resourcetype", "d"));
243-
props.add(new QName("DAV:", "getcontentlength", "d"));
244-
props.add(new QName("DAV:", "displayname", "d"));
245-
props.add(new QName("http://owncloud.org/ns", "id", "oc"));
246-
props.add(new QName("http://owncloud.org/ns", "fileid", "oc"));
247-
props.add(new QName("http://owncloud.org/ns", "favorite", "oc"));
248-
props.add(new QName("http://owncloud.org/ns", "comments-href", "oc"));
249-
props.add(new QName("http://owncloud.org/ns", "comments-count", "oc"));
250-
props.add(new QName("http://owncloud.org/ns", "comments-unread", "oc"));
251-
props.add(new QName("http://owncloud.org/ns", "owner-id", "oc"));
252-
props.add(new QName("http://owncloud.org/ns", "owner-display-name", "oc"));
253-
props.add(new QName("http://owncloud.org/ns", "share-types", "oc"));
254-
props.add(new QName("http://owncloud.org/ns", "checksums", "oc"));
240+
props.add(new QName(URI_NS_DAV, "getlastmodified", "d"));
241+
props.add(new QName(URI_NS_DAV, "getetag", "d"));
242+
props.add(new QName(URI_NS_DAV, "getcontenttype", "d"));
243+
props.add(new QName(URI_NS_DAV, "resourcetype", "d"));
244+
props.add(new QName(URI_NS_DAV, "getcontentlength", "d"));
245+
props.add(new QName(URI_NS_DAV, "displayname", "d"));
246+
props.add(new QName(URI_NS_OWNCLOUD, "id", "oc"));
247+
props.add(new QName(URI_NS_OWNCLOUD, "fileid", "oc"));
248+
props.add(new QName(URI_NS_OWNCLOUD, "favorite", "oc"));
249+
props.add(new QName(URI_NS_OWNCLOUD, "comments-href", "oc"));
250+
props.add(new QName(URI_NS_OWNCLOUD, "comments-count", "oc"));
251+
props.add(new QName(URI_NS_OWNCLOUD, "comments-unread", "oc"));
252+
props.add(new QName(URI_NS_OWNCLOUD, "owner-id", "oc"));
253+
props.add(new QName(URI_NS_OWNCLOUD, "owner-display-name", "oc"));
254+
props.add(new QName(URI_NS_OWNCLOUD, "share-types", "oc"));
255+
props.add(new QName(URI_NS_OWNCLOUD, "checksums", "oc"));
255256
props.add(new QName("http://nextcloud.org/ns", "has-preview", "nc"));
256-
props.add(new QName("http://owncloud.org/ns", "permissions", "oc"));
257-
props.add(new QName("http://owncloud.org/ns", "size", "oc"));
257+
props.add(new QName(URI_NS_OWNCLOUD, "permissions", "oc"));
258+
props.add(new QName(URI_NS_OWNCLOUD, "size", "oc"));
258259
}
259260
List<DavResource> resources= sardine.propfind(path, 0, props);
260261
if (resources != null && resources.size() == 1)
@@ -303,7 +304,7 @@ public ResourceProperties getProperties(String remotePath, boolean allProperties
303304
}
304305
catch(Exception ex2)
305306
{
306-
LOG.warn("Error in sardine shutdown", ex2);
307+
LOG.warn(ERROR_SHUTDOWN, ex2);
307308
}
308309
}
309310
}

‎src/main/java/org/aarboard/nextcloud/api/webdav/Folders.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.github.sardine.DavResource;
2121
import com.github.sardine.Sardine;
2222
import java.io.File;
23-
import java.io.FileOutputStream;
2423
import java.io.InputStream;
2524
import java.io.OutputStream;
2625
import java.io.IOException;
@@ -39,6 +38,7 @@
3938
public class Folders extends AWebdavHandler{
4039

4140
private static final Logger LOG = LoggerFactory.getLogger(Folders.class);
41+
public static final String ERROR_SARDINE_CLOSING = "error in closing sardine connector";
4242

4343
public Folders(ServerConfig serverConfig) {
4444
super(serverConfig);
@@ -116,7 +116,7 @@ public List<String> listFolderContent(String remotePath, int depth, boolean excl
116116
}
117117
catch (IOException ex)
118118
{
119-
LOG.warn("error in closing sardine connector", ex);
119+
LOG.warn(ERROR_SARDINE_CLOSING, ex);
120120
}
121121
}
122122
for (DavResource res : resources)
@@ -180,7 +180,7 @@ public void createFolder(String remotePath)
180180
}
181181
catch (IOException ex)
182182
{
183-
LOG.warn("error in closing sardine connector", ex);
183+
LOG.warn(ERROR_SARDINE_CLOSING, ex);
184184
}
185185
}
186186
}
@@ -220,7 +220,7 @@ public void downloadFolder(String remotePath, String rootDownloadDirPath) throws
220220
String newDownloadDir = rootDownloadDirPath + "/" + folderName;
221221
File nefile1 = new File(newDownloadDir);
222222
if(!nefile1.exists()) {
223-
LOG.info("Creating new download directory: "+newDownloadDir);
223+
LOG.info("Creating new download directory: {}", newDownloadDir);
224224
nefile1.mkdir();
225225
}
226226

@@ -280,7 +280,7 @@ public void downloadFolder(String remotePath, String rootDownloadDirPath) throws
280280
}
281281
catch (IOException ex)
282282
{
283-
LOG.warn("error in closing sardine connector", ex);
283+
LOG.warn(ERROR_SARDINE_CLOSING, ex);
284284
}
285285
}
286286
}

0 commit comments

Comments
 (0)