Skip to content

Commit 163fe93

Browse files
LayoricLayoric
committed
Rename FileUpload to UploadFile to match other ServiceStack libraries.
1 parent 1434bc9 commit 163fe93

File tree

15 files changed

+82
-88
lines changed

15 files changed

+82
-88
lines changed

‎README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ for updates, or [StackOverflow](http://stackoverflow.com/questions/ask) or the [
55

66
This repository contains the source for ServiceStack plugins for the leading Android Studio, IntelliJ and Eclipse Java IDE's providing Java developers a highly productive development experience for consuming Typed ServiceStack Services by leveraging [Add ServiceStack Reference](https://github.com/ServiceStack/ServiceStack/wiki/Add-ServiceStack-Reference) directly within their IDE!
77

8+
### v1.1.5 Changes
9+
10+
- Rename FileUpload to `UploadFile` to match other ServiceStack libraries
11+
812
### v1.1.4 Changes
913

1014
Added new ServiceClient APIs:

‎src/AndroidClient/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'maven-publish'
44
apply plugin: 'signing'
55

66
// Define the version and group for the Maven package
7-
version = "1.1.4"
7+
version = "1.1.5"
88
group = "net.servicestack"
99

1010
if (project.hasProperty('versionSuffix')) {

‎src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidServiceClient.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import net.servicestack.client.JsonServiceClient;
1818
import net.servicestack.client.Utils;
1919
import net.servicestack.cookies.SerializableCookieStore;
20-
import net.servicestack.client.FileUpload;
20+
import net.servicestack.client.UploadFile;
2121

2222
import java.lang.reflect.Type;
2323
import java.net.CookieHandler;
@@ -911,29 +911,29 @@ public void deleteAsync(String path, AsyncSuccess<byte[]> success) {
911911
}
912912

913913
@Override
914-
public <T> void postFileWithRequestAsync(IReturn<T> request, FileUpload file, final AsyncResult<T> asyncResult) {
915-
this.<T>postFilesWithRequestAsync(this.apiUrl(request), request, new FileUpload[]{file}, request.getResponseType(), asyncResult);
914+
public <T> void postFileWithRequestAsync(IReturn<T> request, UploadFile file, final AsyncResult<T> asyncResult) {
915+
this.<T>postFilesWithRequestAsync(this.apiUrl(request), request, new UploadFile[]{file}, request.getResponseType(), asyncResult);
916916
}
917917
@Override
918-
public <T> void postFileWithRequestAsync(Object request, FileUpload file, Object responseType, final AsyncResult<T> asyncResult) {
919-
this.<T>postFilesWithRequestAsync(this.apiUrl(request), request, new FileUpload[]{file}, responseType, asyncResult);
918+
public <T> void postFileWithRequestAsync(Object request, UploadFile file, Object responseType, final AsyncResult<T> asyncResult) {
919+
this.<T>postFilesWithRequestAsync(this.apiUrl(request), request, new UploadFile[]{file}, responseType, asyncResult);
920920
}
921921
@Override
922-
public <T> void postFileWithRequestAsync(String path, Object request, FileUpload file, Object responseType, final AsyncResult<T> asyncResult) {
923-
this.<T>postFilesWithRequestAsync(path, request, new FileUpload[]{file}, responseType, asyncResult);
922+
public <T> void postFileWithRequestAsync(String path, Object request, UploadFile file, Object responseType, final AsyncResult<T> asyncResult) {
923+
this.<T>postFilesWithRequestAsync(path, request, new UploadFile[]{file}, responseType, asyncResult);
924924
}
925925

926926
@Override
927-
public <T> void postFilesWithRequestAsync(IReturn<T> request, FileUpload[] files, final AsyncResult<T> asyncResult) {
927+
public <T> void postFilesWithRequestAsync(IReturn<T> request, UploadFile[] files, final AsyncResult<T> asyncResult) {
928928
this.<T>postFilesWithRequestAsync(this.apiUrl(request), request, files, request.getResponseType(), asyncResult);
929929
}
930930
@Override
931-
public <T> void postFilesWithRequestAsync(Object request, FileUpload[] files, Object responseType, final AsyncResult<T> asyncResult) {
931+
public <T> void postFilesWithRequestAsync(Object request, UploadFile[] files, Object responseType, final AsyncResult<T> asyncResult) {
932932
this.<T>postFilesWithRequestAsync(this.apiUrl(request), request, files, responseType, asyncResult);
933933
}
934934

935935
@Override
936-
public <T> void postFilesWithRequestAsync(String path, Object request, FileUpload[] files, Object responseType, final AsyncResult<T> asyncResult) {
936+
public <T> void postFilesWithRequestAsync(String path, Object request, UploadFile[] files, Object responseType, final AsyncResult<T> asyncResult) {
937937
final AndroidServiceClient client = this;
938938
execTask(new AsyncTask<String, Void, T>() {
939939
@Override

‎src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncServiceClient.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package net.servicestack.client;
55

66
import java.lang.reflect.Type;
7-
import java.net.HttpURLConnection;
87
import java.util.Map;
98

109
public interface AsyncServiceClient {
@@ -79,11 +78,11 @@ public interface AsyncServiceClient {
7978
void deleteAsync(String path, final AsyncResult<byte[]> asyncResult);
8079
void deleteAsync(String path, final AsyncSuccess<byte[]> success);
8180

82-
<T> void postFileWithRequestAsync(IReturn<T> request, FileUpload file, final AsyncResult<T> asyncResult);
83-
<T> void postFileWithRequestAsync(Object request, FileUpload file, Object responseType, final AsyncResult<T> asyncResult);
84-
<T> void postFileWithRequestAsync(String path, Object request, FileUpload file, Object responseType, final AsyncResult<T> asyncResult);
81+
<T> void postFileWithRequestAsync(IReturn<T> request, UploadFile file, final AsyncResult<T> asyncResult);
82+
<T> void postFileWithRequestAsync(Object request, UploadFile file, Object responseType, final AsyncResult<T> asyncResult);
83+
<T> void postFileWithRequestAsync(String path, Object request, UploadFile file, Object responseType, final AsyncResult<T> asyncResult);
8584

86-
<T> void postFilesWithRequestAsync(IReturn<T> request, FileUpload[] files, final AsyncResult<T> asyncResult);
87-
<T> void postFilesWithRequestAsync(Object request, FileUpload[] files, Object responseType, final AsyncResult<T> asyncResult);
88-
<T> void postFilesWithRequestAsync(String path, Object request, FileUpload[] files, Object responseType, final AsyncResult<T> asyncResult);
85+
<T> void postFilesWithRequestAsync(IReturn<T> request, UploadFile[] files, final AsyncResult<T> asyncResult);
86+
<T> void postFilesWithRequestAsync(Object request, UploadFile[] files, Object responseType, final AsyncResult<T> asyncResult);
87+
<T> void postFilesWithRequestAsync(String path, Object request, UploadFile[] files, Object responseType, final AsyncResult<T> asyncResult);
8988
}

‎src/AndroidClient/android/src/main/java/net/servicestack/client/JsonServiceClient.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.net.URLEncoder;
2222
import java.nio.charset.Charset;
2323
import java.nio.charset.StandardCharsets;
24-
import java.nio.file.Paths;
2524
import java.util.Date;
2625
import java.util.List;
2726
import java.util.Map;
@@ -685,31 +684,31 @@ public void clearCookies() {
685684

686685
// Convenience method for single file upload
687686
@Override
688-
public <TResponse> TResponse postFileWithRequest(IReturn<TResponse> request, FileUpload file) {
689-
return postFilesWithRequest(this.apiUrl(request), request, new FileUpload[]{file}, request.getResponseType());
687+
public <TResponse> TResponse postFileWithRequest(IReturn<TResponse> request, UploadFile file) {
688+
return postFilesWithRequest(this.apiUrl(request), request, new UploadFile[]{file}, request.getResponseType());
690689
}
691690
@Override
692-
public <TResponse> TResponse postFileWithRequest(Object request, FileUpload file, Object responseType) {
693-
return postFilesWithRequest(this.apiUrl(request), request, new FileUpload[]{file}, responseType);
691+
public <TResponse> TResponse postFileWithRequest(Object request, UploadFile file, Object responseType) {
692+
return postFilesWithRequest(this.apiUrl(request), request, new UploadFile[]{file}, responseType);
694693
}
695694
@Override
696-
public <TResponse> TResponse postFileWithRequest(String path, Object request, FileUpload file, Object responseType) {
697-
return postFilesWithRequest(path, request, new FileUpload[]{file}, responseType);
695+
public <TResponse> TResponse postFileWithRequest(String path, Object request, UploadFile file, Object responseType) {
696+
return postFilesWithRequest(path, request, new UploadFile[]{file}, responseType);
698697
}
699698

700699
@Override
701-
public <TResponse> TResponse postFilesWithRequest(IReturn<TResponse> request, FileUpload[] files) {
700+
public <TResponse> TResponse postFilesWithRequest(IReturn<TResponse> request, UploadFile[] files) {
702701
return this.postFilesWithRequest(this.apiUrl(request), request, files, request.getResponseType());
703702
}
704703
@Override
705-
public <TResponse> TResponse postFilesWithRequest(Object request, FileUpload[] files, Object responseType) {
704+
public <TResponse> TResponse postFilesWithRequest(Object request, UploadFile[] files, Object responseType) {
706705
return this.postFilesWithRequest(this.apiUrl(request), request, files, responseType);
707706
}
708707

709708
private static final String BOUNDARY = "---" + UUID.randomUUID().toString() + "---";
710709

711710
@Override
712-
public <TResponse> TResponse postFilesWithRequest(String path, Object request, FileUpload[] files, Object responseType) {
711+
public <TResponse> TResponse postFilesWithRequest(String path, Object request, UploadFile[] files, Object responseType) {
713712
try {
714713
// Prepare multipart data
715714
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -724,7 +723,7 @@ public <TResponse> TResponse postFilesWithRequest(String path, Object request, F
724723
}
725724

726725
// Add files
727-
for (FileUpload file : files) {
726+
for (UploadFile file : files) {
728727
writeMultipartFile(dos, file);
729728
}
730729

@@ -751,13 +750,13 @@ private void writeMultipartField(DataOutputStream dos, String fieldName, String
751750
dos.writeBytes(value + "\r\n");
752751
}
753752

754-
private void writeMultipartFile(DataOutputStream dos, FileUpload file) throws IOException {
753+
private void writeMultipartFile(DataOutputStream dos, UploadFile file) throws IOException {
755754
dos.writeBytes("--" + BOUNDARY + "\r\n");
756755
dos.writeBytes("Content-Disposition: form-data; name=\"" + file.getFieldName() +
757756
"\"; filename=\"" + file.getFileName() + "\"\r\n");
758757
dos.writeBytes("Content-Type: " + file.getContentType() + "\r\n");
759758
dos.writeBytes("\r\n");
760-
dos.write(file.getFileBytes());
759+
dos.write(file.getContents());
761760
dos.writeBytes("\r\n");
762761
}
763762
}

‎src/AndroidClient/android/src/main/java/net/servicestack/client/ServiceClient.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ public interface ServiceClient {
6161
String getTokenCookie();
6262
String getRefreshTokenCookie();
6363

64-
<TResponse> TResponse postFileWithRequest(IReturn<TResponse> request, FileUpload file);
65-
<TResponse> TResponse postFileWithRequest(Object request, FileUpload file, Object responseType);
66-
<TResponse> TResponse postFileWithRequest(String path, Object request, FileUpload file, Object responseType);
64+
<TResponse> TResponse postFileWithRequest(IReturn<TResponse> request, UploadFile file);
65+
<TResponse> TResponse postFileWithRequest(Object request, UploadFile file, Object responseType);
66+
<TResponse> TResponse postFileWithRequest(String path, Object request, UploadFile file, Object responseType);
6767

68-
<TResponse> TResponse postFilesWithRequest(IReturn<TResponse> request, FileUpload[] files);
69-
<TResponse> TResponse postFilesWithRequest(Object request, FileUpload[] files, Object responseType);
70-
<TResponse> TResponse postFilesWithRequest(String path, Object request, FileUpload[] files, Object responseType);
68+
<TResponse> TResponse postFilesWithRequest(IReturn<TResponse> request, UploadFile[] files);
69+
<TResponse> TResponse postFilesWithRequest(Object request, UploadFile[] files, Object responseType);
70+
<TResponse> TResponse postFilesWithRequest(String path, Object request, UploadFile[] files, Object responseType);
7171
}

‎src/AndroidClient/android/src/main/java/net/servicestack/client/FileUpload.java renamed to ‎src/AndroidClient/android/src/main/java/net/servicestack/client/UploadFile.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package net.servicestack.client;
22

3-
public class FileUpload {
3+
public class UploadFile {
44
private String fieldName;
55
private String fileName;
66
private String contentType;
7-
private byte[] fileBytes;
7+
private byte[] contents;
88

9-
public FileUpload(String fieldName, String fileName, String contentType, byte[] fileBytes) {
9+
public UploadFile(String fieldName, String fileName, String contentType, byte[] contents) {
1010
this.fieldName = fieldName;
1111
this.fileName = fileName;
1212
this.contentType = contentType != null ? contentType : "application/octet-stream";
13-
this.fileBytes = fileBytes;
13+
this.contents = contents;
1414
}
1515

1616
public String getFieldName() { return fieldName != null ? fieldName : "upload"; }
1717
public String getFileName() { return fileName; }
1818
public String getContentType() { return contentType; }
19-
public byte[] getFileBytes() { return fileBytes; }
19+
public byte[] getContents() { return contents; }
2020
}

‎src/AndroidClient/client/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'maven-publish'
44
apply plugin: 'signing'
55

66
// Define the version and group for the Maven package
7-
version = "1.1.4"
7+
version = "1.1.5"
88
group = "net.servicestack"
99

1010
if (project.hasProperty('versionSuffix')) {

‎src/AndroidClient/client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>net.servicestack</groupId>
66
<artifactId>client</artifactId>
7-
<version>1.1.4</version>
7+
<version>1.1.5</version>
88
<name>ServiceStack.Client</name>
99
<description>A client library to call your ServiceStack webservices.</description>
1010
<url>https://github.com/ServiceStack/ServiceStack.Java</url>

‎src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncServiceClient.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package net.servicestack.client;
55

66
import java.lang.reflect.Type;
7-
import java.net.HttpURLConnection;
87
import java.util.Map;
98

109
public interface AsyncServiceClient {
@@ -79,11 +78,11 @@ public interface AsyncServiceClient {
7978
void deleteAsync(String path, final AsyncResult<byte[]> asyncResult);
8079
void deleteAsync(String path, final AsyncSuccess<byte[]> success);
8180

82-
<T> void postFileWithRequestAsync(IReturn<T> request, FileUpload file, final AsyncResult<T> asyncResult);
83-
<T> void postFileWithRequestAsync(Object request, FileUpload file, Object responseType, final AsyncResult<T> asyncResult);
84-
<T> void postFileWithRequestAsync(String path, Object request, FileUpload file, Object responseType, final AsyncResult<T> asyncResult);
81+
<T> void postFileWithRequestAsync(IReturn<T> request, UploadFile file, final AsyncResult<T> asyncResult);
82+
<T> void postFileWithRequestAsync(Object request, UploadFile file, Object responseType, final AsyncResult<T> asyncResult);
83+
<T> void postFileWithRequestAsync(String path, Object request, UploadFile file, Object responseType, final AsyncResult<T> asyncResult);
8584

86-
<T> void postFilesWithRequestAsync(IReturn<T> request, FileUpload[] files, final AsyncResult<T> asyncResult);
87-
<T> void postFilesWithRequestAsync(Object request, FileUpload[] files, Object responseType, final AsyncResult<T> asyncResult);
88-
<T> void postFilesWithRequestAsync(String path, Object request, FileUpload[] files, Object responseType, final AsyncResult<T> asyncResult);
85+
<T> void postFilesWithRequestAsync(IReturn<T> request, UploadFile[] files, final AsyncResult<T> asyncResult);
86+
<T> void postFilesWithRequestAsync(Object request, UploadFile[] files, Object responseType, final AsyncResult<T> asyncResult);
87+
<T> void postFilesWithRequestAsync(String path, Object request, UploadFile[] files, Object responseType, final AsyncResult<T> asyncResult);
8988
}

‎src/AndroidClient/client/src/main/java/net/servicestack/client/JsonServiceClient.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.net.URLEncoder;
2222
import java.nio.charset.Charset;
2323
import java.nio.charset.StandardCharsets;
24-
import java.nio.file.Paths;
2524
import java.util.Date;
2625
import java.util.List;
2726
import java.util.Map;
@@ -685,31 +684,31 @@ public void clearCookies() {
685684

686685
// Convenience method for single file upload
687686
@Override
688-
public <TResponse> TResponse postFileWithRequest(IReturn<TResponse> request, FileUpload file) {
689-
return postFilesWithRequest(this.apiUrl(request), request, new FileUpload[]{file}, request.getResponseType());
687+
public <TResponse> TResponse postFileWithRequest(IReturn<TResponse> request, UploadFile file) {
688+
return postFilesWithRequest(this.apiUrl(request), request, new UploadFile[]{file}, request.getResponseType());
690689
}
691690
@Override
692-
public <TResponse> TResponse postFileWithRequest(Object request, FileUpload file, Object responseType) {
693-
return postFilesWithRequest(this.apiUrl(request), request, new FileUpload[]{file}, responseType);
691+
public <TResponse> TResponse postFileWithRequest(Object request, UploadFile file, Object responseType) {
692+
return postFilesWithRequest(this.apiUrl(request), request, new UploadFile[]{file}, responseType);
694693
}
695694
@Override
696-
public <TResponse> TResponse postFileWithRequest(String path, Object request, FileUpload file, Object responseType) {
697-
return postFilesWithRequest(path, request, new FileUpload[]{file}, responseType);
695+
public <TResponse> TResponse postFileWithRequest(String path, Object request, UploadFile file, Object responseType) {
696+
return postFilesWithRequest(path, request, new UploadFile[]{file}, responseType);
698697
}
699698

700699
@Override
701-
public <TResponse> TResponse postFilesWithRequest(IReturn<TResponse> request, FileUpload[] files) {
700+
public <TResponse> TResponse postFilesWithRequest(IReturn<TResponse> request, UploadFile[] files) {
702701
return this.postFilesWithRequest(this.apiUrl(request), request, files, request.getResponseType());
703702
}
704703
@Override
705-
public <TResponse> TResponse postFilesWithRequest(Object request, FileUpload[] files, Object responseType) {
704+
public <TResponse> TResponse postFilesWithRequest(Object request, UploadFile[] files, Object responseType) {
706705
return this.postFilesWithRequest(this.apiUrl(request), request, files, responseType);
707706
}
708707

709708
private static final String BOUNDARY = "---" + UUID.randomUUID().toString() + "---";
710709

711710
@Override
712-
public <TResponse> TResponse postFilesWithRequest(String path, Object request, FileUpload[] files, Object responseType) {
711+
public <TResponse> TResponse postFilesWithRequest(String path, Object request, UploadFile[] files, Object responseType) {
713712
try {
714713
// Prepare multipart data
715714
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -724,7 +723,7 @@ public <TResponse> TResponse postFilesWithRequest(String path, Object request, F
724723
}
725724

726725
// Add files
727-
for (FileUpload file : files) {
726+
for (UploadFile file : files) {
728727
writeMultipartFile(dos, file);
729728
}
730729

@@ -751,13 +750,13 @@ private void writeMultipartField(DataOutputStream dos, String fieldName, String
751750
dos.writeBytes(value + "\r\n");
752751
}
753752

754-
private void writeMultipartFile(DataOutputStream dos, FileUpload file) throws IOException {
753+
private void writeMultipartFile(DataOutputStream dos, UploadFile file) throws IOException {
755754
dos.writeBytes("--" + BOUNDARY + "\r\n");
756755
dos.writeBytes("Content-Disposition: form-data; name=\"" + file.getFieldName() +
757756
"\"; filename=\"" + file.getFileName() + "\"\r\n");
758757
dos.writeBytes("Content-Type: " + file.getContentType() + "\r\n");
759758
dos.writeBytes("\r\n");
760-
dos.write(file.getFileBytes());
759+
dos.write(file.getContents());
761760
dos.writeBytes("\r\n");
762761
}
763762
}

‎src/AndroidClient/client/src/main/java/net/servicestack/client/ServiceClient.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ public interface ServiceClient {
6161
String getTokenCookie();
6262
String getRefreshTokenCookie();
6363

64-
<TResponse> TResponse postFileWithRequest(IReturn<TResponse> request, FileUpload file);
65-
<TResponse> TResponse postFileWithRequest(Object request, FileUpload file, Object responseType);
66-
<TResponse> TResponse postFileWithRequest(String path, Object request, FileUpload file, Object responseType);
64+
<TResponse> TResponse postFileWithRequest(IReturn<TResponse> request, UploadFile file);
65+
<TResponse> TResponse postFileWithRequest(Object request, UploadFile file, Object responseType);
66+
<TResponse> TResponse postFileWithRequest(String path, Object request, UploadFile file, Object responseType);
6767

68-
<TResponse> TResponse postFilesWithRequest(IReturn<TResponse> request, FileUpload[] files);
69-
<TResponse> TResponse postFilesWithRequest(Object request, FileUpload[] files, Object responseType);
70-
<TResponse> TResponse postFilesWithRequest(String path, Object request, FileUpload[] files, Object responseType);
68+
<TResponse> TResponse postFilesWithRequest(IReturn<TResponse> request, UploadFile[] files);
69+
<TResponse> TResponse postFilesWithRequest(Object request, UploadFile[] files, Object responseType);
70+
<TResponse> TResponse postFilesWithRequest(String path, Object request, UploadFile[] files, Object responseType);
7171
}

0 commit comments

Comments
 (0)