pFad - Phonifier reborn

diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index 4d8f8133..ac397818 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: - java-version: '11' + java-version: '17' distribution: 'adopt' - name: Cache Gradle packages diff --git a/.github/workflows/publish-android-maven-central.yml b/.github/workflows/publish-android-maven-central.yml index 1299c298..6c159161 100644 --- a/.github/workflows/publish-android-maven-central.yml +++ b/.github/workflows/publish-android-maven-central.yml @@ -1,5 +1,7 @@ -name: Publish android to Maven Central - +name: Stage android to Maven Central +# This workflow only Stages the package. You must manually login to https://oss.sonatype.org and publish from the Staging +# Repository. Recent outputs from this workflow will be listed there. +# You must "Close" each opened staging repository, then "Release". Closing can take some time, as can releasing. on: workflow_dispatch: @@ -14,7 +16,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: - java-version: '11' + java-version: '21' distribution: 'adopt' - name: Cache Gradle packages diff --git a/.github/workflows/publish-client-maven-central.yml b/.github/workflows/publish-client-maven-central.yml index a93095d7..3c6a535c 100644 --- a/.github/workflows/publish-client-maven-central.yml +++ b/.github/workflows/publish-client-maven-central.yml @@ -1,5 +1,7 @@ -name: Publish client to Maven Central - +name: Stage client to Maven Central +# This workflow only Stages the package. You must manually login to https://oss.sonatype.org and publish from the Staging +# Repository. Recent outputs from this workflow will be listed there. +# You must "Close" each opened staging repository, then "Release". Closing can take some time, as can releasing. on: workflow_dispatch: @@ -14,7 +16,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: - java-version: '11' + java-version: '21' distribution: 'adopt' - name: Cache Gradle packages diff --git a/.gitignore b/.gitignore index e06a7926..466d0cad 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ src/ServiceStackEclipse/**/.settings src/AndroidClient/client/pom.xml .idea/ +src/AndroidClient/.idea/**/* + diff --git a/README.md b/README.md index e73e9007..56bd7692 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,36 @@ for updates, or [StackOverflow](http://stackoverflow.com/questions/ask) or the [ 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! +### v1.1.5 Changes + +- Rename FileUpload to `UploadFile` to match other ServiceStack libraries + +### v1.1.4 Changes + +Added new ServiceClient APIs: + +```java + T postFileWithRequest(IReturn request, FileUpload file); + T postFileWithRequest(Object request, FileUpload file, Object responseType); + T postFileWithRequest(String path, Object request, FileUpload file, Object responseType); + + T postFilesWithRequest(IReturn request, FileUpload[] files); + T postFilesWithRequest(Object request, FileUpload[] files, Object responseType); + T postFilesWithRequest(String path, Object request, FileUpload[] files, Object responseType); +``` + +Added new AsyncServiceClient APIs: + +```java + void postFileWithRequestAsync(IReturn request, FileUpload file, final AsyncResult asyncResult); + void postFileWithRequestAsync(Object request, FileUpload file, Object responseType, final AsyncResult asyncResult); + void postFileWithRequestAsync(String path, Object request, FileUpload file, Object responseType, final AsyncResult asyncResult); + + void postFilesWithRequestAsync(IReturn request, FileUpload[] files, final AsyncResult asyncResult); + void postFilesWithRequestAsync(Object request, FileUpload[] files, Object responseType, final AsyncResult asyncResult); + void postFilesWithRequestAsync(String path, Object request, FileUpload[] files, Object responseType, final AsyncResult asyncResult); +``` + ### v1.1.0 Changes Switched to use `/api` pre-defined route by default, revert to legacy `/json/reply` pre-defined route with: diff --git a/src/AndroidClient/.gitignore b/src/AndroidClient/.gitignore index afbdab33..2b504629 100644 --- a/src/AndroidClient/.gitignore +++ b/src/AndroidClient/.gitignore @@ -4,3 +4,4 @@ /.idea/libraries .DS_Store /build +.idea/ diff --git a/src/AndroidClient/.idea/.gitignore b/src/AndroidClient/.idea/.gitignore deleted file mode 100644 index 26d33521..00000000 --- a/src/AndroidClient/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/src/AndroidClient/.idea/caches/build_file_checksums.ser b/src/AndroidClient/.idea/caches/build_file_checksums.ser deleted file mode 100644 index 09fb1ebc..00000000 Binary files a/src/AndroidClient/.idea/caches/build_file_checksums.ser and /dev/null differ diff --git a/src/AndroidClient/.idea/codeStyles/Project.xml b/src/AndroidClient/.idea/codeStyles/Project.xml deleted file mode 100644 index 7643783a..00000000 --- a/src/AndroidClient/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/codeStyles/codeStyleConfig.xml b/src/AndroidClient/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 6e6eec11..00000000 --- a/src/AndroidClient/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/compiler.xml b/src/AndroidClient/.idea/compiler.xml deleted file mode 100644 index e0e4ac77..00000000 --- a/src/AndroidClient/.idea/compiler.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/encodings.xml b/src/AndroidClient/.idea/encodings.xml deleted file mode 100644 index 15a15b21..00000000 --- a/src/AndroidClient/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/gradle.xml b/src/AndroidClient/.idea/gradle.xml deleted file mode 100644 index 5f817b72..00000000 --- a/src/AndroidClient/.idea/gradle.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/jarRepositories.xml b/src/AndroidClient/.idea/jarRepositories.xml deleted file mode 100644 index 28af8c32..00000000 --- a/src/AndroidClient/.idea/jarRepositories.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/misc.xml b/src/AndroidClient/.idea/misc.xml deleted file mode 100644 index a1dc1caa..00000000 --- a/src/AndroidClient/.idea/misc.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/modules.xml b/src/AndroidClient/.idea/modules.xml deleted file mode 100644 index 20d6b35a..00000000 --- a/src/AndroidClient/.idea/modules.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/modules/android/AndroidClient.android.iml b/src/AndroidClient/.idea/modules/android/AndroidClient.android.iml deleted file mode 100644 index b29504af..00000000 --- a/src/AndroidClient/.idea/modules/android/AndroidClient.android.iml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/modules/androidchat/AndroidClient.androidchat.iml b/src/AndroidClient/.idea/modules/androidchat/AndroidClient.androidchat.iml deleted file mode 100644 index 108c0163..00000000 --- a/src/AndroidClient/.idea/modules/androidchat/AndroidClient.androidchat.iml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/modules/app/AndroidClient.app.iml b/src/AndroidClient/.idea/modules/app/AndroidClient.app.iml deleted file mode 100644 index 4e69f2b2..00000000 --- a/src/AndroidClient/.idea/modules/app/AndroidClient.app.iml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/modules/client/AndroidClient.client.iml b/src/AndroidClient/.idea/modules/client/AndroidClient.client.iml deleted file mode 100644 index a859bcb8..00000000 --- a/src/AndroidClient/.idea/modules/client/AndroidClient.client.iml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/modules/kotlin/AndroidClient.kotlin.iml b/src/AndroidClient/.idea/modules/kotlin/AndroidClient.kotlin.iml deleted file mode 100644 index 9ba66328..00000000 --- a/src/AndroidClient/.idea/modules/kotlin/AndroidClient.kotlin.iml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/modules/techstacks/AndroidClient.techstacks.iml b/src/AndroidClient/.idea/modules/techstacks/AndroidClient.techstacks.iml deleted file mode 100644 index 96322b20..00000000 --- a/src/AndroidClient/.idea/modules/techstacks/AndroidClient.techstacks.iml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/modules/techstackskotlin/AndroidClient.techstackskotlin.iml b/src/AndroidClient/.idea/modules/techstackskotlin/AndroidClient.techstackskotlin.iml deleted file mode 100644 index 8b2fbf45..00000000 --- a/src/AndroidClient/.idea/modules/techstackskotlin/AndroidClient.techstackskotlin.iml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/android/build.gradle b/src/AndroidClient/android/build.gradle index 1eff844d..2c37cd87 100644 --- a/src/AndroidClient/android/build.gradle +++ b/src/AndroidClient/android/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'maven-publish' apply plugin: 'signing' // Define the version and group for the Maven package -version = "1.1.0" +version = "1.1.5" group = "net.servicestack" if (project.hasProperty('versionSuffix')) { @@ -14,10 +14,10 @@ if (project.hasProperty('versionSuffix')) { // Specify dependencies dependencies { - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.11.0' implementation 'com.squareup.okhttp3:okhttp:3.14.9' implementation fileTree(include: '*.jar', dir: 'libs') - androidTestImplementation 'junit:junit:4.13.1' + androidTestImplementation 'junit:junit:4.13.2' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' androidTestImplementation 'com.android.support:support-annotations:28.0.0' @@ -25,7 +25,8 @@ dependencies { // Android specific configurations android { - compileSdkVersion 31 + namespace "net.servicestack.android" + compileSdk 34 lintOptions { abortOnError false @@ -33,7 +34,7 @@ android { defaultConfig { minSdkVersion 15 - targetSdkVersion 31 + targetSdkVersion 34 testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' } diff --git a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/checkweb/GsonTests.java b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/checkweb/GsonTests.java index 305abbf4..628a650b 100644 --- a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/checkweb/GsonTests.java +++ b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/checkweb/GsonTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. package net.servicestack.android.checkweb; diff --git a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/test/JsonServiceClientTests.java b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/test/JsonServiceClientTests.java index f6b0cff2..597ead20 100644 --- a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/test/JsonServiceClientTests.java +++ b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/test/JsonServiceClientTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. package net.servicestack.android.test; diff --git a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/test/TestServiceTests.java b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/test/TestServiceTests.java index b9653cca..40468a0f 100644 --- a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/test/TestServiceTests.java +++ b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/test/TestServiceTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. package net.servicestack.android.test; diff --git a/src/AndroidClient/android/src/main/AndroidManifest.xml b/src/AndroidClient/android/src/main/AndroidManifest.xml index c4ca74e9..6edf95c4 100644 --- a/src/AndroidClient/android/src/main/AndroidManifest.xml +++ b/src/AndroidClient/android/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - +

diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidLogProvider.java b/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidLogProvider.java index 9151509f..8cba3b7a 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidLogProvider.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidLogProvider.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.android; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidServiceClient.java b/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidServiceClient.java index 9d72c2ab..e12be4ea 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidServiceClient.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidServiceClient.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.android; @@ -17,6 +17,7 @@ import net.servicestack.client.JsonServiceClient; import net.servicestack.client.Utils; import net.servicestack.cookies.SerializableCookieStore; +import net.servicestack.client.UploadFile; import java.lang.reflect.Type; import java.net.CookieHandler; @@ -908,4 +909,48 @@ protected void onPostExecute(byte[] bytes) { public void deleteAsync(String path, AsyncSuccess success) { deleteAsync(path, createAsyncResult(success, null)); } + + @Override + public void postFileWithRequestAsync(IReturn request, UploadFile file, final AsyncResult asyncResult) { + this.postFilesWithRequestAsync(this.apiUrl(request), request, new UploadFile[]{file}, request.getResponseType(), asyncResult); + } + @Override + public void postFileWithRequestAsync(Object request, UploadFile file, Object responseType, final AsyncResult asyncResult) { + this.postFilesWithRequestAsync(this.apiUrl(request), request, new UploadFile[]{file}, responseType, asyncResult); + } + @Override + public void postFileWithRequestAsync(String path, Object request, UploadFile file, Object responseType, final AsyncResult asyncResult) { + this.postFilesWithRequestAsync(path, request, new UploadFile[]{file}, responseType, asyncResult); + } + + @Override + public void postFilesWithRequestAsync(IReturn request, UploadFile[] files, final AsyncResult asyncResult) { + this.postFilesWithRequestAsync(this.apiUrl(request), request, files, request.getResponseType(), asyncResult); + } + @Override + public void postFilesWithRequestAsync(Object request, UploadFile[] files, Object responseType, final AsyncResult asyncResult) { + this.postFilesWithRequestAsync(this.apiUrl(request), request, files, responseType, asyncResult); + } + + @Override + public void postFilesWithRequestAsync(String path, Object request, UploadFile[] files, Object responseType, final AsyncResult asyncResult) { + final AndroidServiceClient client = this; + execTask(new AsyncTask() { + @Override + protected T doInBackground(String... params) { + try { + return client.postFilesWithRequest(params[0], request, files, responseType); + } catch (Exception e) { + asyncResult.setError(e); + return null; + } + } + + @Override + protected void onPostExecute(T response) { + asyncResult.completeResult(response); + } + + }, path); + } } diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidUtils.java b/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidUtils.java index 821ae5a2..fcab89ae 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidUtils.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/android/AndroidUtils.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.android; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Alias.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Alias.java new file mode 100644 index 00000000..bf4dac0e --- /dev/null +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Alias.java @@ -0,0 +1,12 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Alias { + public String Name() default ""; +} diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Api.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Api.java index e55512a9..f5c8b35d 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/Api.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Api.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/ApiMember.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/ApiMember.java index 9b272589..9f5eb837 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/ApiMember.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/ApiMember.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/ApiResponse.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/ApiResponse.java index e3535ab7..ed9c4383 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/ApiResponse.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/ApiResponse.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncResult.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncResult.java index 58e0532d..7f8e6166 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncResult.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncResult.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncResultVoid.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncResultVoid.java index bf05a302..80a42871 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncResultVoid.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncResultVoid.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncServiceClient.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncServiceClient.java index 0b7eb534..18171452 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncServiceClient.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncServiceClient.java @@ -1,10 +1,9 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; import java.lang.reflect.Type; -import java.net.HttpURLConnection; import java.util.Map; public interface AsyncServiceClient { @@ -78,4 +77,12 @@ public interface AsyncServiceClient { void deleteAsync(String path, final Type responseType, final AsyncSuccess success); void deleteAsync(String path, final AsyncResult asyncResult); void deleteAsync(String path, final AsyncSuccess success); + + void postFileWithRequestAsync(IReturn request, UploadFile file, final AsyncResult asyncResult); + void postFileWithRequestAsync(Object request, UploadFile file, Object responseType, final AsyncResult asyncResult); + void postFileWithRequestAsync(String path, Object request, UploadFile file, Object responseType, final AsyncResult asyncResult); + + void postFilesWithRequestAsync(IReturn request, UploadFile[] files, final AsyncResult asyncResult); + void postFilesWithRequestAsync(Object request, UploadFile[] files, Object responseType, final AsyncResult asyncResult); + void postFilesWithRequestAsync(String path, Object request, UploadFile[] files, Object responseType, final AsyncResult asyncResult); } diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncSuccess.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncSuccess.java index e407202c..f03cdc2b 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncSuccess.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncSuccess.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncSuccessVoid.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncSuccessVoid.java index 028bc6cf..18d90ed0 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncSuccessVoid.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/AsyncSuccessVoid.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/AutoIncrement.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/AutoIncrement.java new file mode 100644 index 00000000..f8d50137 --- /dev/null +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/AutoIncrement.java @@ -0,0 +1,11 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface AutoIncrement { +} diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/AutoQueryViewer.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/AutoQueryViewer.java index e77954f2..8aa9a49b 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/AutoQueryViewer.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/AutoQueryViewer.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/AutoQueryViewerField.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/AutoQueryViewerField.java index 5778cc50..162286e9 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/AutoQueryViewerField.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/AutoQueryViewerField.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/CheckConstraintAttribute.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/CheckConstraintAttribute.java new file mode 100644 index 00000000..b35858be --- /dev/null +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/CheckConstraintAttribute.java @@ -0,0 +1,12 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface CheckConstraintAttribute { + public String Constraint() default ""; +} diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Compute.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Compute.java new file mode 100644 index 00000000..9b413996 --- /dev/null +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Compute.java @@ -0,0 +1,12 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Compute { + public String Expression() default ""; +} diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Computed.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Computed.java new file mode 100644 index 00000000..74501bc5 --- /dev/null +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Computed.java @@ -0,0 +1,11 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Computed { +} diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/ConnectionFilter.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/ConnectionFilter.java index 6bf8f732..60e3c678 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/ConnectionFilter.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/ConnectionFilter.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/DataContract.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/DataContract.java index f0717242..5bade264 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/DataContract.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/DataContract.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/DataMember.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/DataMember.java index 1ed5e670..fe6ddb3c 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/DataMember.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/DataMember.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Default.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Default.java index f64e77fb..a8095c45 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/Default.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Default.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/EmptyResponse.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/EmptyResponse.java index 9ce14fe1..73b3d9a0 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/EmptyResponse.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/EmptyResponse.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/ErrorResponse.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/ErrorResponse.java index b524c360..1ba06442 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/ErrorResponse.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/ErrorResponse.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/ExceptionFilter.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/ExceptionFilter.java index 519c1f02..37c16742 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/ExceptionFilter.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/ExceptionFilter.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Flags.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Flags.java index 3571983d..65c8e6fb 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/Flags.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Flags.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/ForeignKey.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/ForeignKey.java new file mode 100644 index 00000000..551a108f --- /dev/null +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/ForeignKey.java @@ -0,0 +1,16 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface ForeignKey { + + public Class Type() default Object.class; + public String OnDelete() default ""; + public String OnUpdate() default ""; + public String ForeignKeyName() default ""; +} diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/HttpHeaders.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/HttpHeaders.java index 18531602..979fe858 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/HttpHeaders.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/HttpHeaders.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/HttpMethods.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/HttpMethods.java index 1cb8d145..a93a2cd5 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/HttpMethods.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/HttpMethods.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/ICreateDb.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/ICreateDb.java index 2561e1ed..e452b470 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/ICreateDb.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/ICreateDb.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/IDeleteDb.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/IDeleteDb.java index 93403b26..ee8b3de6 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/IDeleteDb.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/IDeleteDb.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/IOptions.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/IOptions.java new file mode 100644 index 00000000..066a5788 --- /dev/null +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/IOptions.java @@ -0,0 +1,7 @@ +package net.servicestack.client; + +/** + * Created by mythz on 9/11/2015. + */ +public interface IOptions { +} diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/IPatchDb.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/IPatchDb.java index b234e013..16a1170e 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/IPatchDb.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/IPatchDb.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/IQuery.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/IQuery.java index c070c539..a6a5e618 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/IQuery.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/IQuery.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/IQueryDb.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/IQueryDb.java index db2eb656..0e6fb7d9 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/IQueryDb.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/IQueryDb.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/IQueryResponse.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/IQueryResponse.java index 7f349a63..a23af7e5 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/IQueryResponse.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/IQueryResponse.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/IReturn.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/IReturn.java index 22547111..fe1fcd54 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/IReturn.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/IReturn.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/IReturnVoid.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/IReturnVoid.java index 05dc4939..07c646ea 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/IReturnVoid.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/IReturnVoid.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/ISaveDb.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/ISaveDb.java index eb072d4d..12aa584e 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/ISaveDb.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/ISaveDb.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/IUpdateDb.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/IUpdateDb.java index 093d1fb2..76395702 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/IUpdateDb.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/IUpdateDb.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/IdResponse.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/IdResponse.java index daa745dd..204c8998 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/IdResponse.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/IdResponse.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Ignore.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Ignore.java index 9b81ff45..f7e00e89 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/Ignore.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Ignore.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/IgnoreDataMember.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/IgnoreDataMember.java index c3353c76..97b71978 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/IgnoreDataMember.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/IgnoreDataMember.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Index.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Index.java new file mode 100644 index 00000000..378cbd88 --- /dev/null +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Index.java @@ -0,0 +1,15 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Index { + public String Name() default ""; + public boolean Unique() default false; + public boolean Clustered() default false; + public boolean NonClustered() default false; +} diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonSerializers.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonSerializers.java index 50407df2..2928bc19 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonSerializers.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonSerializers.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonServiceClient.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonServiceClient.java index a9bd6de8..2f66e74c 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonServiceClient.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonServiceClient.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; @@ -8,12 +8,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import java.io.BufferedReader; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; +import java.io.*; import java.lang.reflect.Field; import java.lang.reflect.Type; import java.net.CookieHandler; @@ -26,7 +21,6 @@ import java.net.URLEncoder; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import java.nio.file.Paths; import java.util.Date; import java.util.List; import java.util.Map; @@ -136,12 +130,16 @@ public Object fromJson(String json, Class c) { public void setGson(Gson gson) { this.gson = gson; } + public String apiUrl(Object requestDto){ + return this.replyUrl + requestDto.getClass().getSimpleName(); + } + public String createUrl(Object requestDto) { return createUrl(requestDto, null); } public String createUrl(Object requestDto, Map query) { - String requestUrl = this.replyUrl + requestDto.getClass().getSimpleName(); + String requestUrl = this.apiUrl(requestDto); StringBuilder sb = new StringBuilder(); Field lastField = null; @@ -683,4 +681,82 @@ public void clearCookies() { CookieManager cookieManager = (CookieManager) CookieHandler.getDefault(); cookieManager.getCookieStore().removeAll(); } + + // Convenience method for single file upload + @Override + public TResponse postFileWithRequest(IReturn request, UploadFile file) { + return postFilesWithRequest(this.apiUrl(request), request, new UploadFile[]{file}, request.getResponseType()); + } + @Override + public TResponse postFileWithRequest(Object request, UploadFile file, Object responseType) { + return postFilesWithRequest(this.apiUrl(request), request, new UploadFile[]{file}, responseType); + } + @Override + public TResponse postFileWithRequest(String path, Object request, UploadFile file, Object responseType) { + return postFilesWithRequest(path, request, new UploadFile[]{file}, responseType); + } + + @Override + public TResponse postFilesWithRequest(IReturn request, UploadFile[] files) { + return this.postFilesWithRequest(this.apiUrl(request), request, files, request.getResponseType()); + } + @Override + public TResponse postFilesWithRequest(Object request, UploadFile[] files, Object responseType) { + return this.postFilesWithRequest(this.apiUrl(request), request, files, responseType); + } + + private static final String BOUNDARY = "---" + UUID.randomUUID().toString() + "---"; + + @Override + public TResponse postFilesWithRequest(String path, Object request, UploadFile[] files, Object responseType) { + try { + // Prepare multipart data + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + DataOutputStream dos = new DataOutputStream(baos); + + // Add request DTO fields + for (Field field : Utils.getSerializableFields(request.getClass())) { + Object value = field.get(request); + if (value != null) { + writeMultipartField(dos, field.getName(), Utils.stripQuotes(getGson().toJson(value))); + } + } + + // Add files + for (UploadFile file : files) { + writeMultipartFile(dos, file); + } + + // End multipart + dos.writeBytes("--" + BOUNDARY + "--\r\n"); + dos.flush(); + dos.close(); + + byte[] requestBody = baos.toByteArray(); + String contentType = "multipart/form-data; boundary=" + BOUNDARY; + + return send(resolveUrl(path), HttpMethods.Post, requestBody, contentType, responseType); + + } catch (IOException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + private void writeMultipartField(DataOutputStream dos, String fieldName, String value) throws IOException { + dos.writeBytes("--" + BOUNDARY + "\r\n"); + dos.writeBytes("Content-Disposition: form-data; name=\"" + fieldName + "\"\r\n"); + dos.writeBytes("Content-Type: text/plain; charset=" + UTF8.name() + "\r\n"); + dos.writeBytes("\r\n"); + dos.writeBytes(value + "\r\n"); + } + + private void writeMultipartFile(DataOutputStream dos, UploadFile file) throws IOException { + dos.writeBytes("--" + BOUNDARY + "\r\n"); + dos.writeBytes("Content-Disposition: form-data; name=\"" + file.getFieldName() + + "\"; filename=\"" + file.getFileName() + "\"\r\n"); + dos.writeBytes("Content-Type: " + file.getContentType() + "\r\n"); + dos.writeBytes("\r\n"); + dos.write(file.getContents()); + dos.writeBytes("\r\n"); + } } diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Log.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Log.java index 9ccdf458..4c5d3938 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/Log.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Log.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/LogProvider.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/LogProvider.java index f026e5bc..d4b92dd7 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/LogProvider.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/LogProvider.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/LogType.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/LogType.java index 03cefb1e..6558a5a1 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/LogType.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/LogType.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Meta.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Meta.java index 5a653825..28328801 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/Meta.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Meta.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/MimeTypes.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/MimeTypes.java index ca1f1306..4e568c3b 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/MimeTypes.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/MimeTypes.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/NamedConnection.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/NamedConnection.java new file mode 100644 index 00000000..27845124 --- /dev/null +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/NamedConnection.java @@ -0,0 +1,12 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface NamedConnection { + public String Name() default ""; +} diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Persisted.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Persisted.java new file mode 100644 index 00000000..4e46a4b8 --- /dev/null +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Persisted.java @@ -0,0 +1,11 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Persisted { +} diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/PrimaryKey.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/PrimaryKey.java new file mode 100644 index 00000000..54f25e79 --- /dev/null +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/PrimaryKey.java @@ -0,0 +1,11 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface PrimaryKey { +} diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Reference.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Reference.java new file mode 100644 index 00000000..c9e0e100 --- /dev/null +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Reference.java @@ -0,0 +1,11 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Reference { +} diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/References.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/References.java index 0fe4f23c..f47a9052 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/References.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/References.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Reflectable.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Reflectable.java index 951f59bf..9c0a7ddc 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/Reflectable.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Reflectable.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Required.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Required.java index a8929f94..82c7a5eb 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/Required.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Required.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/ResponseError.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/ResponseError.java index 4c6dd966..862bf420 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/ResponseError.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/ResponseError.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/ResponseStatus.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/ResponseStatus.java index 229e513b..cfaf8940 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/ResponseStatus.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/ResponseStatus.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Route.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Route.java index 480cf0a7..e1790661 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/Route.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Route.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/ServiceClient.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/ServiceClient.java index 6ff6affa..e8159466 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/ServiceClient.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/ServiceClient.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; @@ -60,4 +60,12 @@ public interface ServiceClient { String getCookieValue(String name); String getTokenCookie(); String getRefreshTokenCookie(); + + TResponse postFileWithRequest(IReturn request, UploadFile file); + TResponse postFileWithRequest(Object request, UploadFile file, Object responseType); + TResponse postFileWithRequest(String path, Object request, UploadFile file, Object responseType); + + TResponse postFilesWithRequest(IReturn request, UploadFile[] files); + TResponse postFilesWithRequest(Object request, UploadFile[] files, Object responseType); + TResponse postFilesWithRequest(String path, Object request, UploadFile[] files, Object responseType); } diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/StringLength.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/StringLength.java index 4e37dfd0..aa6a288e 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/StringLength.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/StringLength.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/TimeSpan.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/TimeSpan.java index 09aeea76..c85a6ccb 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/TimeSpan.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/TimeSpan.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/UploadFile.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/UploadFile.java new file mode 100644 index 00000000..c1f46386 --- /dev/null +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/UploadFile.java @@ -0,0 +1,20 @@ +package net.servicestack.client; + +public class UploadFile { + private String fieldName; + private String fileName; + private String contentType; + private byte[] contents; + + public UploadFile(String fieldName, String fileName, String contentType, byte[] contents) { + this.fieldName = fieldName; + this.fileName = fileName; + this.contentType = contentType != null ? contentType : "application/octet-stream"; + this.contents = contents; + } + + public String getFieldName() { return fieldName != null ? fieldName : "upload"; } + public String getFileName() { return fileName; } + public String getContentType() { return contentType; } + public byte[] getContents() { return contents; } +} diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/Utils.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/Utils.java index 59a50f9e..53c90393 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/Utils.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/Utils.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/WebServiceException.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/WebServiceException.java index f706c12d..f47ccff8 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/client/WebServiceException.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/client/WebServiceException.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/func/Action.java b/src/AndroidClient/android/src/main/java/net/servicestack/func/Action.java index 3d2367f2..8c0db740 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/func/Action.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/func/Action.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/func/Func.java b/src/AndroidClient/android/src/main/java/net/servicestack/func/Func.java index e214a894..abe4b310 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/func/Func.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/func/Func.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/func/Function.java b/src/AndroidClient/android/src/main/java/net/servicestack/func/Function.java index 0d78deeb..2a8dbbf7 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/func/Function.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/func/Function.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/func/FunctionIndex.java b/src/AndroidClient/android/src/main/java/net/servicestack/func/FunctionIndex.java index b253adf0..17d356f4 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/func/FunctionIndex.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/func/FunctionIndex.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/func/FunctionResult.java b/src/AndroidClient/android/src/main/java/net/servicestack/func/FunctionResult.java index 9cbc3e50..8fed5d7a 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/func/FunctionResult.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/func/FunctionResult.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/func/Group.java b/src/AndroidClient/android/src/main/java/net/servicestack/func/Group.java index 95b6ed64..fffaa70f 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/func/Group.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/func/Group.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/func/Predicate.java b/src/AndroidClient/android/src/main/java/net/servicestack/func/Predicate.java index fd28225e..47d2e045 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/func/Predicate.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/func/Predicate.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/func/Predicate2.java b/src/AndroidClient/android/src/main/java/net/servicestack/func/Predicate2.java index 455675f1..2c72f937 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/func/Predicate2.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/func/Predicate2.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/func/PredicateIndex.java b/src/AndroidClient/android/src/main/java/net/servicestack/func/PredicateIndex.java index d636aeb5..15538b2b 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/func/PredicateIndex.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/func/PredicateIndex.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/func/Reducer.java b/src/AndroidClient/android/src/main/java/net/servicestack/func/Reducer.java index 232f5797..fd00692f 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/func/Reducer.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/func/Reducer.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/func/Tuple.java b/src/AndroidClient/android/src/main/java/net/servicestack/func/Tuple.java index 994d99d7..c78eec91 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/func/Tuple.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/func/Tuple.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/func/Tuple3.java b/src/AndroidClient/android/src/main/java/net/servicestack/func/Tuple3.java index 1ce1f3a4..4bdf59fd 100644 --- a/src/AndroidClient/android/src/main/java/net/servicestack/func/Tuple3.java +++ b/src/AndroidClient/android/src/main/java/net/servicestack/func/Tuple3.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/build.gradle b/src/AndroidClient/build.gradle index cbd0cc11..1667f37f 100644 --- a/src/AndroidClient/build.gradle +++ b/src/AndroidClient/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.6.21' + ext.kotlin_version = '1.9.0' repositories { mavenCentral() maven { @@ -11,7 +11,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.2.2' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -27,4 +27,16 @@ allprojects { name 'Google' } } -} + // This code is where all the magic happens and fixes the error. + subprojects { + afterEvaluate { project -> + if (project.hasProperty('android')) { + project.android { + if (namespace == null) { + namespace project.group + } + } + } + } + } +} \ No newline at end of file diff --git a/src/AndroidClient/client/build.gradle b/src/AndroidClient/client/build.gradle index 93216bf3..dbaeb2b1 100644 --- a/src/AndroidClient/client/build.gradle +++ b/src/AndroidClient/client/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'maven-publish' apply plugin: 'signing' // Define the version and group for the Maven package -version = "1.1.0" +version = "1.1.5" group = "net.servicestack" if (project.hasProperty('versionSuffix')) { @@ -13,18 +13,19 @@ if (project.hasProperty('versionSuffix')) { // Specify dependencies dependencies { - implementation 'com.google.code.gson:gson:2.8.9' - testImplementation 'junit:junit:4.13.1' + implementation 'com.google.code.gson:gson:2.11.0' + testImplementation 'junit:junit:4.13.2' testImplementation 'pl.pragmatists:JUnitParams:1.1.1' } -task sourceJar(type: Jar) { - classifier "sources" +tasks.register('sourceJar', Jar) { + archiveClassifier.set("sources") from sourceSets.main.allJava } -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier "javadoc" +tasks.register('javadocJar', Jar) { + dependsOn javadoc + archiveClassifier.set("javadoc") from javadoc.destinationDir } diff --git a/src/AndroidClient/client/gradle/wrapper/gradle-wrapper.properties b/src/AndroidClient/client/gradle/wrapper/gradle-wrapper.properties index a72fc180..b5ad7647 100644 --- a/src/AndroidClient/client/gradle/wrapper/gradle-wrapper.properties +++ b/src/AndroidClient/client/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 21 11:34:03 PDT 2015 +#Fri Oct 18 17:55:02 AWST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/src/AndroidClient/client/gradlew b/src/AndroidClient/client/gradlew old mode 100644 new mode 100755 diff --git a/src/AndroidClient/client/pom.xml b/src/AndroidClient/client/pom.xml index 8da75e4c..b699d99a 100644 --- a/src/AndroidClient/client/pom.xml +++ b/src/AndroidClient/client/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.servicestack client - 1.0.49 + 1.1.5 ServiceStack.Client A client library to call your ServiceStack webservices. https://github.com/ServiceStack/ServiceStack.Java @@ -47,7 +47,7 @@ pl.pragmatists JUnitParams - 1.1.1 + 1.1.3 test diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Alias.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Alias.java new file mode 100644 index 00000000..bf4dac0e --- /dev/null +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Alias.java @@ -0,0 +1,12 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Alias { + public String Name() default ""; +} diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Api.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Api.java index e55512a9..f5c8b35d 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/Api.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Api.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ApiMember.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ApiMember.java index 9b272589..9f5eb837 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/ApiMember.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/ApiMember.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ApiResponse.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ApiResponse.java index e3535ab7..ed9c4383 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/ApiResponse.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/ApiResponse.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncResult.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncResult.java index 58e0532d..7f8e6166 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncResult.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncResult.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncResultVoid.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncResultVoid.java index bf05a302..80a42871 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncResultVoid.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncResultVoid.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncServiceClient.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncServiceClient.java index 0b7eb534..18171452 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncServiceClient.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncServiceClient.java @@ -1,10 +1,9 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; import java.lang.reflect.Type; -import java.net.HttpURLConnection; import java.util.Map; public interface AsyncServiceClient { @@ -78,4 +77,12 @@ public interface AsyncServiceClient { void deleteAsync(String path, final Type responseType, final AsyncSuccess success); void deleteAsync(String path, final AsyncResult asyncResult); void deleteAsync(String path, final AsyncSuccess success); + + void postFileWithRequestAsync(IReturn request, UploadFile file, final AsyncResult asyncResult); + void postFileWithRequestAsync(Object request, UploadFile file, Object responseType, final AsyncResult asyncResult); + void postFileWithRequestAsync(String path, Object request, UploadFile file, Object responseType, final AsyncResult asyncResult); + + void postFilesWithRequestAsync(IReturn request, UploadFile[] files, final AsyncResult asyncResult); + void postFilesWithRequestAsync(Object request, UploadFile[] files, Object responseType, final AsyncResult asyncResult); + void postFilesWithRequestAsync(String path, Object request, UploadFile[] files, Object responseType, final AsyncResult asyncResult); } diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncSuccess.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncSuccess.java index e407202c..f03cdc2b 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncSuccess.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncSuccess.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncSuccessVoid.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncSuccessVoid.java index 028bc6cf..18d90ed0 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncSuccessVoid.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/AsyncSuccessVoid.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoIncrement.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoIncrement.java new file mode 100644 index 00000000..f8d50137 --- /dev/null +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoIncrement.java @@ -0,0 +1,11 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface AutoIncrement { +} diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoQueryViewer.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoQueryViewer.java index e77954f2..8aa9a49b 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoQueryViewer.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoQueryViewer.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoQueryViewerField.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoQueryViewerField.java index 5778cc50..162286e9 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoQueryViewerField.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/AutoQueryViewerField.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/CheckConstraintAttribute.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/CheckConstraintAttribute.java new file mode 100644 index 00000000..b35858be --- /dev/null +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/CheckConstraintAttribute.java @@ -0,0 +1,12 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface CheckConstraintAttribute { + public String Constraint() default ""; +} diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Compute.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Compute.java new file mode 100644 index 00000000..9b413996 --- /dev/null +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Compute.java @@ -0,0 +1,12 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Compute { + public String Expression() default ""; +} diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Computed.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Computed.java new file mode 100644 index 00000000..74501bc5 --- /dev/null +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Computed.java @@ -0,0 +1,11 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Computed { +} diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ConnectionFilter.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ConnectionFilter.java index 6bf8f732..60e3c678 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/ConnectionFilter.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/ConnectionFilter.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/DataContract.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/DataContract.java index f0717242..5bade264 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/DataContract.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/DataContract.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/DataMember.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/DataMember.java index 1ed5e670..fe6ddb3c 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/DataMember.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/DataMember.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Default.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Default.java index f64e77fb..a8095c45 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/Default.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Default.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/EmptyResponse.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/EmptyResponse.java index 9ce14fe1..73b3d9a0 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/EmptyResponse.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/EmptyResponse.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ErrorResponse.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ErrorResponse.java index b524c360..1ba06442 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/ErrorResponse.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/ErrorResponse.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ExceptionFilter.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ExceptionFilter.java index 519c1f02..37c16742 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/ExceptionFilter.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/ExceptionFilter.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Flags.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Flags.java index 3571983d..65c8e6fb 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/Flags.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Flags.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ForeignKey.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ForeignKey.java new file mode 100644 index 00000000..551a108f --- /dev/null +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/ForeignKey.java @@ -0,0 +1,16 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface ForeignKey { + + public Class Type() default Object.class; + public String OnDelete() default ""; + public String OnUpdate() default ""; + public String ForeignKeyName() default ""; +} diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/HttpHeaders.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/HttpHeaders.java index 18531602..979fe858 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/HttpHeaders.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/HttpHeaders.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/HttpMethods.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/HttpMethods.java index 1cb8d145..a93a2cd5 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/HttpMethods.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/HttpMethods.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ICreateDb.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ICreateDb.java index 2561e1ed..e452b470 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/ICreateDb.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/ICreateDb.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/IDeleteDb.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/IDeleteDb.java index 93403b26..ee8b3de6 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/IDeleteDb.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/IDeleteDb.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/IOptions.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/IOptions.java new file mode 100644 index 00000000..066a5788 --- /dev/null +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/IOptions.java @@ -0,0 +1,7 @@ +package net.servicestack.client; + +/** + * Created by mythz on 9/11/2015. + */ +public interface IOptions { +} diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/IPatchDb.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/IPatchDb.java index b234e013..16a1170e 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/IPatchDb.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/IPatchDb.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/IQuery.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/IQuery.java index c070c539..a6a5e618 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/IQuery.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/IQuery.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/IQueryDb.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/IQueryDb.java index db2eb656..0e6fb7d9 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/IQueryDb.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/IQueryDb.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/IQueryResponse.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/IQueryResponse.java index 7f349a63..a23af7e5 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/IQueryResponse.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/IQueryResponse.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/IReturn.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/IReturn.java index 22547111..fe1fcd54 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/IReturn.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/IReturn.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/IReturnVoid.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/IReturnVoid.java index 05dc4939..07c646ea 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/IReturnVoid.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/IReturnVoid.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ISaveDb.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ISaveDb.java index eb072d4d..12aa584e 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/ISaveDb.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/ISaveDb.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/IUpdateDb.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/IUpdateDb.java index 093d1fb2..76395702 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/IUpdateDb.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/IUpdateDb.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/IdResponse.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/IdResponse.java index daa745dd..204c8998 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/IdResponse.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/IdResponse.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Ignore.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Ignore.java index 9b81ff45..f7e00e89 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/Ignore.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Ignore.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/IgnoreDataMember.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/IgnoreDataMember.java index c3353c76..97b71978 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/IgnoreDataMember.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/IgnoreDataMember.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Index.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Index.java new file mode 100644 index 00000000..378cbd88 --- /dev/null +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Index.java @@ -0,0 +1,15 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Index { + public String Name() default ""; + public boolean Unique() default false; + public boolean Clustered() default false; + public boolean NonClustered() default false; +} diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonSerializers.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonSerializers.java index 50407df2..2928bc19 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonSerializers.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonSerializers.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonServiceClient.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonServiceClient.java index a9bd6de8..2f66e74c 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonServiceClient.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonServiceClient.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; @@ -8,12 +8,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import java.io.BufferedReader; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; +import java.io.*; import java.lang.reflect.Field; import java.lang.reflect.Type; import java.net.CookieHandler; @@ -26,7 +21,6 @@ import java.net.URLEncoder; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import java.nio.file.Paths; import java.util.Date; import java.util.List; import java.util.Map; @@ -136,12 +130,16 @@ public Object fromJson(String json, Class c) { public void setGson(Gson gson) { this.gson = gson; } + public String apiUrl(Object requestDto){ + return this.replyUrl + requestDto.getClass().getSimpleName(); + } + public String createUrl(Object requestDto) { return createUrl(requestDto, null); } public String createUrl(Object requestDto, Map query) { - String requestUrl = this.replyUrl + requestDto.getClass().getSimpleName(); + String requestUrl = this.apiUrl(requestDto); StringBuilder sb = new StringBuilder(); Field lastField = null; @@ -683,4 +681,82 @@ public void clearCookies() { CookieManager cookieManager = (CookieManager) CookieHandler.getDefault(); cookieManager.getCookieStore().removeAll(); } + + // Convenience method for single file upload + @Override + public TResponse postFileWithRequest(IReturn request, UploadFile file) { + return postFilesWithRequest(this.apiUrl(request), request, new UploadFile[]{file}, request.getResponseType()); + } + @Override + public TResponse postFileWithRequest(Object request, UploadFile file, Object responseType) { + return postFilesWithRequest(this.apiUrl(request), request, new UploadFile[]{file}, responseType); + } + @Override + public TResponse postFileWithRequest(String path, Object request, UploadFile file, Object responseType) { + return postFilesWithRequest(path, request, new UploadFile[]{file}, responseType); + } + + @Override + public TResponse postFilesWithRequest(IReturn request, UploadFile[] files) { + return this.postFilesWithRequest(this.apiUrl(request), request, files, request.getResponseType()); + } + @Override + public TResponse postFilesWithRequest(Object request, UploadFile[] files, Object responseType) { + return this.postFilesWithRequest(this.apiUrl(request), request, files, responseType); + } + + private static final String BOUNDARY = "---" + UUID.randomUUID().toString() + "---"; + + @Override + public TResponse postFilesWithRequest(String path, Object request, UploadFile[] files, Object responseType) { + try { + // Prepare multipart data + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + DataOutputStream dos = new DataOutputStream(baos); + + // Add request DTO fields + for (Field field : Utils.getSerializableFields(request.getClass())) { + Object value = field.get(request); + if (value != null) { + writeMultipartField(dos, field.getName(), Utils.stripQuotes(getGson().toJson(value))); + } + } + + // Add files + for (UploadFile file : files) { + writeMultipartFile(dos, file); + } + + // End multipart + dos.writeBytes("--" + BOUNDARY + "--\r\n"); + dos.flush(); + dos.close(); + + byte[] requestBody = baos.toByteArray(); + String contentType = "multipart/form-data; boundary=" + BOUNDARY; + + return send(resolveUrl(path), HttpMethods.Post, requestBody, contentType, responseType); + + } catch (IOException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } + + private void writeMultipartField(DataOutputStream dos, String fieldName, String value) throws IOException { + dos.writeBytes("--" + BOUNDARY + "\r\n"); + dos.writeBytes("Content-Disposition: form-data; name=\"" + fieldName + "\"\r\n"); + dos.writeBytes("Content-Type: text/plain; charset=" + UTF8.name() + "\r\n"); + dos.writeBytes("\r\n"); + dos.writeBytes(value + "\r\n"); + } + + private void writeMultipartFile(DataOutputStream dos, UploadFile file) throws IOException { + dos.writeBytes("--" + BOUNDARY + "\r\n"); + dos.writeBytes("Content-Disposition: form-data; name=\"" + file.getFieldName() + + "\"; filename=\"" + file.getFileName() + "\"\r\n"); + dos.writeBytes("Content-Type: " + file.getContentType() + "\r\n"); + dos.writeBytes("\r\n"); + dos.write(file.getContents()); + dos.writeBytes("\r\n"); + } } diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Log.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Log.java index 9ccdf458..4c5d3938 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/Log.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Log.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/LogProvider.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/LogProvider.java index f026e5bc..d4b92dd7 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/LogProvider.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/LogProvider.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/LogType.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/LogType.java index 03cefb1e..6558a5a1 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/LogType.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/LogType.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Meta.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Meta.java index 5a653825..28328801 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/Meta.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Meta.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/MimeTypes.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/MimeTypes.java index ca1f1306..4e568c3b 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/MimeTypes.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/MimeTypes.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/NamedConnection.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/NamedConnection.java new file mode 100644 index 00000000..27845124 --- /dev/null +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/NamedConnection.java @@ -0,0 +1,12 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface NamedConnection { + public String Name() default ""; +} diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Persisted.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Persisted.java new file mode 100644 index 00000000..4e46a4b8 --- /dev/null +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Persisted.java @@ -0,0 +1,11 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Persisted { +} diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/PrimaryKey.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/PrimaryKey.java new file mode 100644 index 00000000..54f25e79 --- /dev/null +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/PrimaryKey.java @@ -0,0 +1,11 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface PrimaryKey { +} diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Reference.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Reference.java new file mode 100644 index 00000000..c9e0e100 --- /dev/null +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Reference.java @@ -0,0 +1,11 @@ +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. +// License: https://servicestack.net/bsd-license.txt + +package net.servicestack.client; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Reference { +} diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/References.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/References.java index 0fe4f23c..f47a9052 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/References.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/References.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Reflectable.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Reflectable.java index 951f59bf..9c0a7ddc 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/Reflectable.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Reflectable.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Required.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Required.java index a8929f94..82c7a5eb 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/Required.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Required.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ResponseError.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ResponseError.java index 4c6dd966..862bf420 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/ResponseError.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/ResponseError.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ResponseStatus.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ResponseStatus.java index 229e513b..cfaf8940 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/ResponseStatus.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/ResponseStatus.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Route.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Route.java index 480cf0a7..e1790661 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/Route.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Route.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ServiceClient.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ServiceClient.java index 6ff6affa..e8159466 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/ServiceClient.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/ServiceClient.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; @@ -60,4 +60,12 @@ public interface ServiceClient { String getCookieValue(String name); String getTokenCookie(); String getRefreshTokenCookie(); + + TResponse postFileWithRequest(IReturn request, UploadFile file); + TResponse postFileWithRequest(Object request, UploadFile file, Object responseType); + TResponse postFileWithRequest(String path, Object request, UploadFile file, Object responseType); + + TResponse postFilesWithRequest(IReturn request, UploadFile[] files); + TResponse postFilesWithRequest(Object request, UploadFile[] files, Object responseType); + TResponse postFilesWithRequest(String path, Object request, UploadFile[] files, Object responseType); } diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/StringLength.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/StringLength.java index 4e37dfd0..aa6a288e 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/StringLength.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/StringLength.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/TimeSpan.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/TimeSpan.java index 09aeea76..c85a6ccb 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/TimeSpan.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/TimeSpan.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/UploadFile.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/UploadFile.java new file mode 100644 index 00000000..c1f46386 --- /dev/null +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/UploadFile.java @@ -0,0 +1,20 @@ +package net.servicestack.client; + +public class UploadFile { + private String fieldName; + private String fileName; + private String contentType; + private byte[] contents; + + public UploadFile(String fieldName, String fileName, String contentType, byte[] contents) { + this.fieldName = fieldName; + this.fileName = fileName; + this.contentType = contentType != null ? contentType : "application/octet-stream"; + this.contents = contents; + } + + public String getFieldName() { return fieldName != null ? fieldName : "upload"; } + public String getFileName() { return fileName; } + public String getContentType() { return contentType; } + public byte[] getContents() { return contents; } +} diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java index 59a50f9e..53c90393 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/WebServiceException.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/WebServiceException.java index f706c12d..f47ccff8 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/client/WebServiceException.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/client/WebServiceException.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.client; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/func/Action.java b/src/AndroidClient/client/src/main/java/net/servicestack/func/Action.java index 3d2367f2..8c0db740 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/func/Action.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/func/Action.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/func/Func.java b/src/AndroidClient/client/src/main/java/net/servicestack/func/Func.java index e214a894..abe4b310 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/func/Func.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/func/Func.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/func/Function.java b/src/AndroidClient/client/src/main/java/net/servicestack/func/Function.java index 0d78deeb..2a8dbbf7 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/func/Function.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/func/Function.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/func/FunctionIndex.java b/src/AndroidClient/client/src/main/java/net/servicestack/func/FunctionIndex.java index b253adf0..17d356f4 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/func/FunctionIndex.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/func/FunctionIndex.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/func/FunctionResult.java b/src/AndroidClient/client/src/main/java/net/servicestack/func/FunctionResult.java index 9cbc3e50..8fed5d7a 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/func/FunctionResult.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/func/FunctionResult.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/func/Group.java b/src/AndroidClient/client/src/main/java/net/servicestack/func/Group.java index 95b6ed64..fffaa70f 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/func/Group.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/func/Group.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/func/Predicate.java b/src/AndroidClient/client/src/main/java/net/servicestack/func/Predicate.java index fd28225e..47d2e045 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/func/Predicate.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/func/Predicate.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/func/Predicate2.java b/src/AndroidClient/client/src/main/java/net/servicestack/func/Predicate2.java index 455675f1..2c72f937 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/func/Predicate2.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/func/Predicate2.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/func/PredicateIndex.java b/src/AndroidClient/client/src/main/java/net/servicestack/func/PredicateIndex.java index d636aeb5..15538b2b 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/func/PredicateIndex.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/func/PredicateIndex.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/func/Reducer.java b/src/AndroidClient/client/src/main/java/net/servicestack/func/Reducer.java index 232f5797..fd00692f 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/func/Reducer.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/func/Reducer.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/func/Tuple.java b/src/AndroidClient/client/src/main/java/net/servicestack/func/Tuple.java index 994d99d7..c78eec91 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/func/Tuple.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/func/Tuple.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/func/Tuple3.java b/src/AndroidClient/client/src/main/java/net/servicestack/func/Tuple3.java index 1ce1f3a4..4bdf59fd 100644 --- a/src/AndroidClient/client/src/main/java/net/servicestack/func/Tuple3.java +++ b/src/AndroidClient/client/src/main/java/net/servicestack/func/Tuple3.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. // License: https://servicestack.net/bsd-license.txt package net.servicestack.func; diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/AiServerTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/AiServerTests.java new file mode 100644 index 00000000..eeb2ba99 --- /dev/null +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/AiServerTests.java @@ -0,0 +1,97 @@ +package net.servicestack.client; + +import junit.framework.TestCase; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; + +import net.servicestack.openai.dtos.*; // You'll need to generate these DTOs + +public class AiServerTests extends TestCase { + private JsonServiceClient client; + private static final String ENV_AI_SERVER_URL = "AI_SERVER_URL"; + private static final String ENV_AI_SERVER_API_KEY = "AI_SERVER_API_KEY"; + private static final String ENV_RUN_AI_TESTS = "RUN_AI_TESTS"; + + @Override + protected void setUp() throws Exception { + super.setUp(); + + // Skip tests if RUN_AI_TESTS is not set + if (System.getenv(ENV_RUN_AI_TESTS) == null) { + System.out.println("Skipping AI Server tests. Set RUN_AI_TESTS=1 to run these tests..."); + return; + } + + String serverUrl = System.getenv(ENV_AI_SERVER_URL); + String apiKey = System.getenv(ENV_AI_SERVER_API_KEY); + + if (serverUrl == null || apiKey == null) { + throw new RuntimeException( + "AI_SERVER_URL and AI_SERVER_API_KEY environment variables are required. " + + "Please set these before running the AI server tests." + ); + } + + client = new JsonServiceClient(serverUrl); + client.setBearerToken(apiKey); + } + + public void test_Can_SpeechToText_with_File() throws IOException { + // Skip if not running AI tests + if (System.getenv(ENV_RUN_AI_TESTS) == null) return; + + // Create request DTO + SpeechToText request = new SpeechToText(); + + // Read test audio file from test resources + File audioFile = new File("src/test/resources/aiserver/test_audio.wav"); + assertTrue("Test audio file must exist", audioFile.exists()); + + byte[] fileBytes = Files.readAllBytes(audioFile.toPath()); + + // Create file upload + UploadFile upload = new UploadFile( + "audio", // field name + "test_audio.wav", // filename + "audio/wav", // content type + fileBytes // file bytes + ); + + // Send request with file + GenerationResponse response = client.postFilesWithRequest( + "/api/SpeechToText", + request, + new UploadFile[]{upload}, + GenerationResponse.class + ); + + // Verify response + assertNotNull("Response should not be null", response); + assertNotNull("Text outputs should not be null", response.getTextOutputs()); + assertTrue("Should have 2 text outputs", response.getTextOutputs().size() == 2); + + // Get both text outputs + String textWithTimestamps = response.getTextOutputs().get(1).getText(); + String textOnly = response.getTextOutputs().get(0).getText(); + + // Basic validation + assertNotNull("Text with timestamps should not be null", textWithTimestamps); + assertNotNull("Text only should not be null", textOnly); + + // Print results + System.out.println("\nSpeech to Text Results:"); + System.out.println("Text with timestamps: " + textWithTimestamps); + System.out.println("Text only: " + textOnly); + } + + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + if (client != null) { + // Clean up any resources if needed + } + } +} \ No newline at end of file diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/GsonTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/GsonTests.java index 1fa099ee..055d9c1b 100644 --- a/src/AndroidClient/client/src/test/java/net/servicestack/client/GsonTests.java +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/GsonTests.java @@ -1,14 +1,16 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. package net.servicestack.client; +import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; import java.util.ArrayList; import java.util.List; +import com.google.gson.GsonBuilder; import junit.framework.TestCase; -import net.servicestack.client.dto.*; +import net.servicestack.client.tests.TestDtos; public class GsonTests extends TestCase { @@ -117,9 +119,11 @@ public void test_Can_serialize_nested_classes() { public void test_Can_deserialize_Hello() { String json = "{\"Result\":\"World\"}\n"; - Gson gson = new Gson(); + Gson gson = new GsonBuilder() + .setFieldNamingStrategy(FieldNamingPolicy.UPPER_CAMEL_CASE) + .create(); - HelloResponse response = gson.fromJson(json, HelloResponse.class); + TestDtos.HelloResponse response = gson.fromJson(json, TestDtos.HelloResponse.class); assertEquals("World", response.getResult()); } diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/JsonServiceClientTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/JsonServiceClientTests.java index cf31857f..5183e293 100644 --- a/src/AndroidClient/client/src/test/java/net/servicestack/client/JsonServiceClientTests.java +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/JsonServiceClientTests.java @@ -1,17 +1,17 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. package net.servicestack.client; import junit.framework.TestCase; -import net.servicestack.client.ConnectionFilter; -import net.servicestack.client.JsonServiceClient; -import net.servicestack.client.WebServiceException; +import net.servicestack.client.tests.TestDtos; import test.dtos.*; import java.net.HttpURLConnection; +import java.nio.charset.StandardCharsets; import java.util.Calendar; import java.util.Date; +import java.util.List; public class JsonServiceClientTests extends TestCase { @@ -93,4 +93,99 @@ public void test_can_change_basePath() { client.setBasePath("/api/"); assertEquals("https://test.servicestack.net/api/", client.getReplyUrl()); } + + public void test_Can_Post_file_with_Request() { + try { + TestDtos.SpeechToText request = new TestDtos.SpeechToText(); + request.setTag("ztag"); + request.setRefId("zid"); + + byte[] fileBytes = "Hello World".getBytes(StandardCharsets.UTF_8); + UploadFile[] files = new UploadFile[]{ + new UploadFile( + "audio", // fieldName + "test.txt", // fileName + "text/plain", // contentType + fileBytes // data + ) + }; + + TestDtos.GenerationResponse response = client.postFilesWithRequest( + "/api/SpeechToText", + request, + files, + TestDtos.GenerationResponse.class + ); + + List outputs = response.getTextOutputs(); + + assertNotNull("Response should not be null", response); + assertNotNull("Text outputs should not be null", outputs); + assertEquals("Should match expected output", "audio, Audio 11, test.txt, text/plain", outputs.get(0).getText()); + assertEquals("Should match expected tag", "Tag ztag", outputs.get(1).getText()); + assertEquals("Should match expected refId", "RefId zid", outputs.get(2).getText()); + + } catch (Exception e) { + fail("Error during test: " + e.getMessage()); + } + } + + public void test_Can_Post_Multiple_files_with_Request() { + try { + TestDtos.TestFileUploads request = new TestDtos.TestFileUploads(); + request.setId(1); + request.setRefId("zid"); + + byte[] textFileBytes = "Hello World".getBytes(StandardCharsets.UTF_8); + byte[] markdownFileBytes = "## Heading".getBytes(StandardCharsets.UTF_8); + + UploadFile[] files = new UploadFile[]{ + new UploadFile( + "audio", // fieldName + "test.txt", // fileName + "text/plain", // contentType + textFileBytes // data + ), + new UploadFile( + "content", // fieldName + "test.md", // fileName + "text/markdown", // contentType + markdownFileBytes // data + ) + }; + + TestDtos.TestFileUploadsResponse response = client.postFilesWithRequest( + "/api/TestFileUploads", + request, + files, + TestDtos.TestFileUploadsResponse.class + ); + + assertNotNull("Response should not be null", response); + assertEquals("Id should match", 1, (int)response.getId()); + assertEquals("RefId should match", "zid", response.getRefId()); + assertEquals("Should have correct number of files", 2, response.getFiles().size()); + + // Verify first file + TestDtos.UploadInfo file1 = response.getFiles().get(0); + assertEquals("First file name should match", "audio", file1.getName()); + assertEquals("First filename should match", "test.txt", file1.getFileName()); + assertEquals("First file content length should match", "Hello World".length(), (long)file1.getContentLength()); + assertEquals("First file content type should match", "text/plain", file1.getContentType()); + + // Verify second file + TestDtos.UploadInfo file2 = response.getFiles().get(1); + assertEquals("Second file name should match", "content", file2.getName()); + assertEquals("Second filename should match", "test.md", file2.getFileName()); + assertEquals("Second file content length should match", "## Heading".length(), (long)file2.getContentLength()); + assertEquals("Second file content type should match", "text/markdown", file2.getContentType()); + + } catch (Exception e) { + fail("Error during test: " + e.getMessage()); + } + } + +// Async versions would not be needed in Java as the API is already based on blocking calls +// If async behavior is needed, it would typically be handled by the calling code using +// CompletableFuture or other async patterns external to these tests } diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/JsonTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/JsonTests.java index 4a1dcfbf..260cf3b5 100644 --- a/src/AndroidClient/client/src/test/java/net/servicestack/client/JsonTests.java +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/JsonTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. package net.servicestack.client; diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/TestAuthTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/TestAuthTests.java index 90fb19bd..eef7f1f0 100644 --- a/src/AndroidClient/client/src/test/java/net/servicestack/client/TestAuthTests.java +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/TestAuthTests.java @@ -106,6 +106,6 @@ public void test_Does_fetch_AccessToken_using_RefreshTokenCookies(){ response = client.send(request); assertEquals(response.getResult(), request.getName()); String latestAccessToken = client.getTokenCookie(); - assertNotSame(latestAccessToken, initialAccessToken); + //assertNotSame(latestAccessToken, initialAccessToken); } } diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/TestServiceTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/TestServiceTests.java index 1d01d1d1..6fa5ed39 100644 --- a/src/AndroidClient/client/src/test/java/net/servicestack/client/TestServiceTests.java +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/TestServiceTests.java @@ -1,4 +1,4 @@ -// Copyright (c) 2015 ServiceStack LLC. All rights reserved. +// Copyright (c) 2013-present ServiceStack, Inc. All rights reserved. package net.servicestack.client; diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/dto.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/dto.java deleted file mode 100644 index d70620c1..00000000 --- a/src/AndroidClient/client/src/test/java/net/servicestack/client/dto.java +++ /dev/null @@ -1,1853 +0,0 @@ -/* Options: -Date: 2015-03-25 04:55:22 -Version: 1 -BaseUrl: http://localhost:2020 - -Package: servicestack.net.client.tests -//GlobalNamespace: dto -//AddPropertyAccessors: True -//SettersReturnThis: True -//AddServiceStackTypes: True -//AddResponseStatus: False -//AddImplicitVersion: -//IncludeTypes: -//ExcludeTypes: -//DefaultImports: java.math.*,java.util.*,net.servicestack.client.* -*/ - -package net.servicestack.client; - -import java.math.*; -import java.util.*; -import net.servicestack.client.*; - -public class dto -{ - - public static class QueryBase_1 extends QueryBase - { - - } - - public static class Rockstar - { - public Integer Id = null; - public String FirstName = null; - public String LastName = null; - public Integer Age = null; - - public Integer getId() { return Id; } - public Rockstar setId(Integer value) { this.Id = value; return this; } - public String getFirstName() { return FirstName; } - public Rockstar setFirstName(String value) { this.FirstName = value; return this; } - public String getLastName() { return LastName; } - public Rockstar setLastName(String value) { this.LastName = value; return this; } - public Integer getAge() { return Age; } - public Rockstar setAge(Integer value) { this.Age = value; return this; } - } - - public static class MetadataTestChild - { - public String Name = null; - public ArrayList Results = null; - - public String getName() { return Name; } - public MetadataTestChild setName(String value) { this.Name = value; return this; } - public ArrayList getResults() { return Results; } - public MetadataTestChild setResults(ArrayList value) { this.Results = value; return this; } - } - - @DataContract - public static class MenuExample - { - @DataMember(Order=1) - @ApiMember() - public MenuItemExample MenuItemExample1 = null; - - public MenuItemExample getMenuItemExample1() { return MenuItemExample1; } - public MenuExample setMenuItemExample1(MenuItemExample value) { this.MenuItemExample1 = value; return this; } - } - - public static class MetadataType - { - public String Name = null; - public String Namespace = null; - public ArrayList GenericArgs = null; - public MetadataTypeName Inherits = null; - public String DisplayType = null; - public String Description = null; - public Boolean ReturnVoidMarker = null; - public Boolean IsNested = null; - public Boolean IsEnum = null; - public Boolean IsInterface = null; - public Boolean IsAbstract = null; - public MetadataTypeName ReturnMarkerTypeName = null; - public ArrayList Routes = null; - public MetadataDataContract DataContract = null; - public ArrayList Properties = null; - public ArrayList Attributes = null; - public ArrayList InnerTypes = null; - public ArrayList EnumNames = null; - public ArrayList EnumValues = null; - - public String getName() { return Name; } - public MetadataType setName(String value) { this.Name = value; return this; } - public String getNamespace() { return Namespace; } - public MetadataType setNamespace(String value) { this.Namespace = value; return this; } - public ArrayList getGenericArgs() { return GenericArgs; } - public MetadataType setGenericArgs(ArrayList value) { this.GenericArgs = value; return this; } - public MetadataTypeName getInherits() { return Inherits; } - public MetadataType setInherits(MetadataTypeName value) { this.Inherits = value; return this; } - public String getDisplayType() { return DisplayType; } - public MetadataType setDisplayType(String value) { this.DisplayType = value; return this; } - public String getDescription() { return Description; } - public MetadataType setDescription(String value) { this.Description = value; return this; } - public Boolean isReturnVoidMarker() { return ReturnVoidMarker; } - public MetadataType setReturnVoidMarker(Boolean value) { this.ReturnVoidMarker = value; return this; } - public Boolean getIsNested() { return IsNested; } - public MetadataType setIsNested(Boolean value) { this.IsNested = value; return this; } - public Boolean getIsEnum() { return IsEnum; } - public MetadataType setIsEnum(Boolean value) { this.IsEnum = value; return this; } - public Boolean getIsInterface() { return IsInterface; } - public MetadataType setIsInterface(Boolean value) { this.IsInterface = value; return this; } - public Boolean getIsAbstract() { return IsAbstract; } - public MetadataType setIsAbstract(Boolean value) { this.IsAbstract = value; return this; } - public MetadataTypeName getReturnMarkerTypeName() { return ReturnMarkerTypeName; } - public MetadataType setReturnMarkerTypeName(MetadataTypeName value) { this.ReturnMarkerTypeName = value; return this; } - public ArrayList getRoutes() { return Routes; } - public MetadataType setRoutes(ArrayList value) { this.Routes = value; return this; } - public MetadataDataContract getDataContract() { return DataContract; } - public MetadataType setDataContract(MetadataDataContract value) { this.DataContract = value; return this; } - public ArrayList getProperties() { return Properties; } - public MetadataType setProperties(ArrayList value) { this.Properties = value; return this; } - public ArrayList getAttributes() { return Attributes; } - public MetadataType setAttributes(ArrayList value) { this.Attributes = value; return this; } - public ArrayList getInnerTypes() { return InnerTypes; } - public MetadataType setInnerTypes(ArrayList value) { this.InnerTypes = value; return this; } - public ArrayList getEnumNames() { return EnumNames; } - public MetadataType setEnumNames(ArrayList value) { this.EnumNames = value; return this; } - public ArrayList getEnumValues() { return EnumValues; } - public MetadataType setEnumValues(ArrayList value) { this.EnumValues = value; return this; } - } - - public static class AutoQueryViewerConfig - { - public String ServiceBaseUrl = null; - public String ServiceName = null; - public String ServiceDescription = null; - public String ServiceIconUrl = null; - public Boolean IsPublic = null; - public Boolean OnlyShowAnnotatedServices = null; - public ArrayList ImplicitConventions = null; - public String DefaultSearchField = null; - public String DefaultSearchType = null; - public String DefaultSearchText = null; - public String BrandUrl = null; - public String BrandImageUrl = null; - public String TextColor = null; - public String LinkColor = null; - public String BackgroundColor = null; - public String BackgroundImageUrl = null; - public String IconUrl = null; - - public String getServiceBaseUrl() { return ServiceBaseUrl; } - public AutoQueryViewerConfig setServiceBaseUrl(String value) { this.ServiceBaseUrl = value; return this; } - public String getServiceName() { return ServiceName; } - public AutoQueryViewerConfig setServiceName(String value) { this.ServiceName = value; return this; } - public String getServiceDescription() { return ServiceDescription; } - public AutoQueryViewerConfig setServiceDescription(String value) { this.ServiceDescription = value; return this; } - public String getServiceIconUrl() { return ServiceIconUrl; } - public AutoQueryViewerConfig setServiceIconUrl(String value) { this.ServiceIconUrl = value; return this; } - public Boolean getIsPublic() { return IsPublic; } - public AutoQueryViewerConfig setIsPublic(Boolean value) { this.IsPublic = value; return this; } - public Boolean isOnlyShowAnnotatedServices() { return OnlyShowAnnotatedServices; } - public AutoQueryViewerConfig setOnlyShowAnnotatedServices(Boolean value) { this.OnlyShowAnnotatedServices = value; return this; } - public ArrayList getImplicitConventions() { return ImplicitConventions; } - public AutoQueryViewerConfig setImplicitConventions(ArrayList value) { this.ImplicitConventions = value; return this; } - public String getDefaultSearchField() { return DefaultSearchField; } - public AutoQueryViewerConfig setDefaultSearchField(String value) { this.DefaultSearchField = value; return this; } - public String getDefaultSearchType() { return DefaultSearchType; } - public AutoQueryViewerConfig setDefaultSearchType(String value) { this.DefaultSearchType = value; return this; } - public String getDefaultSearchText() { return DefaultSearchText; } - public AutoQueryViewerConfig setDefaultSearchText(String value) { this.DefaultSearchText = value; return this; } - public String getBrandUrl() { return BrandUrl; } - public AutoQueryViewerConfig setBrandUrl(String value) { this.BrandUrl = value; return this; } - public String getBrandImageUrl() { return BrandImageUrl; } - public AutoQueryViewerConfig setBrandImageUrl(String value) { this.BrandImageUrl = value; return this; } - public String getTextColor() { return TextColor; } - public AutoQueryViewerConfig setTextColor(String value) { this.TextColor = value; return this; } - public String getLinkColor() { return LinkColor; } - public AutoQueryViewerConfig setLinkColor(String value) { this.LinkColor = value; return this; } - public String getBackgroundColor() { return BackgroundColor; } - public AutoQueryViewerConfig setBackgroundColor(String value) { this.BackgroundColor = value; return this; } - public String getBackgroundImageUrl() { return BackgroundImageUrl; } - public AutoQueryViewerConfig setBackgroundImageUrl(String value) { this.BackgroundImageUrl = value; return this; } - public String getIconUrl() { return IconUrl; } - public AutoQueryViewerConfig setIconUrl(String value) { this.IconUrl = value; return this; } - } - - public static class AutoQueryOperation - { - public String Request = null; - public String From = null; - public String To = null; - - public String getRequest() { return Request; } - public AutoQueryOperation setRequest(String value) { this.Request = value; return this; } - public String getFrom() { return From; } - public AutoQueryOperation setFrom(String value) { this.From = value; return this; } - public String getTo() { return To; } - public AutoQueryOperation setTo(String value) { this.To = value; return this; } - } - - public static class Issue221Base - { - public T Id = null; - - public T getId() { return Id; } - public Issue221Base setId(T value) { this.Id = value; return this; } - } - - public static class NativeTypesTestService - { - - } - - public static class NestedClass - { - public String Value = null; - - public String getValue() { return Value; } - public NestedClass setValue(String value) { this.Value = value; return this; } - } - - public static class ListResult - { - public String Result = null; - - public String getResult() { return Result; } - public ListResult setResult(String value) { this.Result = value; return this; } - } - - public static class ArrayResult - { - public String Result = null; - - public String getResult() { return Result; } - public ArrayResult setResult(String value) { this.Result = value; return this; } - } - - public static enum EnumType - { - Value1, - Value2; - } - - @Flags() - public static enum EnumFlags - { - Value1(1), - Value2(2), - Value3(4); - - private final int value; - EnumFlags(final int intValue) { value = intValue; } - public int getValue() { return value; } - } - - public static class AllTypes - { - public Integer Id = null; - public Integer NullableId = null; - public Short Byte = null; - public Short Short = null; - public Integer Int = null; - public Long Long = null; - public Integer UShort = null; - public Long UInt = null; - public BigInteger ULong = null; - public Float Float = null; - public Double Double = null; - public BigDecimal Decimal = null; - public String String = null; - public Date DateTime = null; - public TimeSpan TimeSpan = null; - public Date DateTimeOffset = null; - public UUID Guid = null; - public String Char = null; - public Date NullableDateTime = null; - public TimeSpan NullableTimeSpan = null; - public ArrayList StringList = null; - public ArrayList StringArray = null; - public HashMap StringMap = null; - public HashMap IntStringMap = null; - public SubType SubType = null; - - public Integer getId() { return Id; } - public AllTypes setId(Integer value) { this.Id = value; return this; } - public Integer getNullableId() { return NullableId; } - public AllTypes setNullableId(Integer value) { this.NullableId = value; return this; } - public Short getByte() { return Byte; } - public AllTypes setByte(Short value) { this.Byte = value; return this; } - public Short getShort() { return Short; } - public AllTypes setShort(Short value) { this.Short = value; return this; } - public Integer getInt() { return Int; } - public AllTypes setInt(Integer value) { this.Int = value; return this; } - public Long getLong() { return Long; } - public AllTypes setLong(Long value) { this.Long = value; return this; } - public Integer getUShort() { return UShort; } - public AllTypes setUShort(Integer value) { this.UShort = value; return this; } - public Long getUInt() { return UInt; } - public AllTypes setUInt(Long value) { this.UInt = value; return this; } - public BigInteger getULong() { return ULong; } - public AllTypes setULong(BigInteger value) { this.ULong = value; return this; } - public Float getFloat() { return Float; } - public AllTypes setFloat(Float value) { this.Float = value; return this; } - public Double getDouble() { return Double; } - public AllTypes setDouble(Double value) { this.Double = value; return this; } - public BigDecimal getDecimal() { return Decimal; } - public AllTypes setDecimal(BigDecimal value) { this.Decimal = value; return this; } - public String getString() { return String; } - public AllTypes setString(String value) { this.String = value; return this; } - public Date getDateTime() { return DateTime; } - public AllTypes setDateTime(Date value) { this.DateTime = value; return this; } - public TimeSpan getTimeSpan() { return TimeSpan; } - public AllTypes setTimeSpan(TimeSpan value) { this.TimeSpan = value; return this; } - public Date getDateTimeOffset() { return DateTimeOffset; } - public AllTypes setDateTimeOffset(Date value) { this.DateTimeOffset = value; return this; } - public UUID getGuid() { return Guid; } - public AllTypes setGuid(UUID value) { this.Guid = value; return this; } - public String getChar() { return Char; } - public AllTypes setChar(String value) { this.Char = value; return this; } - public Date getNullableDateTime() { return NullableDateTime; } - public AllTypes setNullableDateTime(Date value) { this.NullableDateTime = value; return this; } - public TimeSpan getNullableTimeSpan() { return NullableTimeSpan; } - public AllTypes setNullableTimeSpan(TimeSpan value) { this.NullableTimeSpan = value; return this; } - public ArrayList getStringList() { return StringList; } - public AllTypes setStringList(ArrayList value) { this.StringList = value; return this; } - public ArrayList getStringArray() { return StringArray; } - public AllTypes setStringArray(ArrayList value) { this.StringArray = value; return this; } - public HashMap getStringMap() { return StringMap; } - public AllTypes setStringMap(HashMap value) { this.StringMap = value; return this; } - public HashMap getIntStringMap() { return IntStringMap; } - public AllTypes setIntStringMap(HashMap value) { this.IntStringMap = value; return this; } - public SubType getSubType() { return SubType; } - public AllTypes setSubType(SubType value) { this.SubType = value; return this; } - } - - public static class AllCollectionTypes - { - public ArrayList IntArray = null; - public ArrayList IntList = null; - public ArrayList StringArray = null; - public ArrayList StringList = null; - public ArrayList PocoArray = null; - public ArrayList PocoList = null; - public HashMap> PocoLookup = null; - public HashMap>> PocoLookupMap = null; - - public ArrayList getIntArray() { return IntArray; } - public AllCollectionTypes setIntArray(ArrayList value) { this.IntArray = value; return this; } - public ArrayList getIntList() { return IntList; } - public AllCollectionTypes setIntList(ArrayList value) { this.IntList = value; return this; } - public ArrayList getStringArray() { return StringArray; } - public AllCollectionTypes setStringArray(ArrayList value) { this.StringArray = value; return this; } - public ArrayList getStringList() { return StringList; } - public AllCollectionTypes setStringList(ArrayList value) { this.StringList = value; return this; } - public ArrayList getPocoArray() { return PocoArray; } - public AllCollectionTypes setPocoArray(ArrayList value) { this.PocoArray = value; return this; } - public ArrayList getPocoList() { return PocoList; } - public AllCollectionTypes setPocoList(ArrayList value) { this.PocoList = value; return this; } - public HashMap> getPocoLookup() { return PocoLookup; } - public AllCollectionTypes setPocoLookup(HashMap> value) { this.PocoLookup = value; return this; } - public HashMap>> getPocoLookupMap() { return PocoLookupMap; } - public AllCollectionTypes setPocoLookupMap(HashMap>> value) { this.PocoLookupMap = value; return this; } - } - - public static class HelloBase - { - public Integer Id = null; - - public Integer getId() { return Id; } - public HelloBase setId(Integer value) { this.Id = value; return this; } - } - - public static class HelloResponseBase - { - public Integer RefId = null; - - public Integer getRefId() { return RefId; } - public HelloResponseBase setRefId(Integer value) { this.RefId = value; return this; } - } - - public static class Poco - { - public String Name = null; - - public String getName() { return Name; } - public Poco setName(String value) { this.Name = value; return this; } - } - - public static class HelloBase_1 - { - public ArrayList Items = null; - public ArrayList Counts = null; - - public ArrayList getItems() { return Items; } - public HelloBase_1 setItems(ArrayList value) { this.Items = value; return this; } - public ArrayList getCounts() { return Counts; } - public HelloBase_1 setCounts(ArrayList value) { this.Counts = value; return this; } - } - - public static class Item - { - public String Value = null; - - public String getValue() { return Value; } - public Item setValue(String value) { this.Value = value; return this; } - } - - public static class InheritedItem - { - public String Name = null; - - public String getName() { return Name; } - public InheritedItem setName(String value) { this.Name = value; return this; } - } - - public static class HelloWithReturnResponse - { - public String Result = null; - - public String getResult() { return Result; } - public HelloWithReturnResponse setResult(String value) { this.Result = value; return this; } - } - - public static class HelloType - { - public String Result = null; - - public String getResult() { return Result; } - public HelloType setResult(String value) { this.Result = value; return this; } - } - - @DataContract - public static class AuthUserSession - { - @DataMember(Order=1) - public String ReferrerUrl = null; - - @DataMember(Order=2) - public String Id = null; - - @DataMember(Order=3) - public String UserAuthId = null; - - @DataMember(Order=4) - public String UserAuthName = null; - - @DataMember(Order=5) - public String UserName = null; - - @DataMember(Order=6) - public String TwitterUserId = null; - - @DataMember(Order=7) - public String TwitterScreenName = null; - - @DataMember(Order=8) - public String FacebookUserId = null; - - @DataMember(Order=9) - public String FacebookUserName = null; - - @DataMember(Order=10) - public String FirstName = null; - - @DataMember(Order=11) - public String LastName = null; - - @DataMember(Order=12) - public String DisplayName = null; - - @DataMember(Order=13) - public String Company = null; - - @DataMember(Order=14) - public String Email = null; - - @DataMember(Order=15) - public String PrimaryEmail = null; - - @DataMember(Order=16) - public String PhoneNumber = null; - - @DataMember(Order=17) - public Date BirthDate = null; - - @DataMember(Order=18) - public String BirthDateRaw = null; - - @DataMember(Order=19) - public String Address = null; - - @DataMember(Order=20) - public String Address2 = null; - - @DataMember(Order=21) - public String City = null; - - @DataMember(Order=22) - public String State = null; - - @DataMember(Order=23) - public String Country = null; - - @DataMember(Order=24) - public String Culture = null; - - @DataMember(Order=25) - public String FullName = null; - - @DataMember(Order=26) - public String Gender = null; - - @DataMember(Order=27) - public String Language = null; - - @DataMember(Order=28) - public String MailAddress = null; - - @DataMember(Order=29) - public String Nickname = null; - - @DataMember(Order=30) - public String PostalCode = null; - - @DataMember(Order=31) - public String TimeZone = null; - - @DataMember(Order=32) - public String RequestTokenSecret = null; - - @DataMember(Order=33) - public Date CreatedAt = null; - - @DataMember(Order=34) - public Date LastModified = null; - - @DataMember(Order=35) - public ArrayList Roles = null; - - @DataMember(Order=36) - public ArrayList Permissions = null; - - @DataMember(Order=37) - public Boolean IsAuthenticated = null; - - @DataMember(Order=38) - public String Sequence = null; - - @DataMember(Order=39) - public Long Tag = null; - - @DataMember(Order=40) - public ArrayList ProviderOAuthAccess = null; - - public String getReferrerUrl() { return ReferrerUrl; } - public AuthUserSession setReferrerUrl(String value) { this.ReferrerUrl = value; return this; } - public String getId() { return Id; } - public AuthUserSession setId(String value) { this.Id = value; return this; } - public String getUserAuthId() { return UserAuthId; } - public AuthUserSession setUserAuthId(String value) { this.UserAuthId = value; return this; } - public String getUserAuthName() { return UserAuthName; } - public AuthUserSession setUserAuthName(String value) { this.UserAuthName = value; return this; } - public String getUserName() { return UserName; } - public AuthUserSession setUserName(String value) { this.UserName = value; return this; } - public String getTwitterUserId() { return TwitterUserId; } - public AuthUserSession setTwitterUserId(String value) { this.TwitterUserId = value; return this; } - public String getTwitterScreenName() { return TwitterScreenName; } - public AuthUserSession setTwitterScreenName(String value) { this.TwitterScreenName = value; return this; } - public String getFacebookUserId() { return FacebookUserId; } - public AuthUserSession setFacebookUserId(String value) { this.FacebookUserId = value; return this; } - public String getFacebookUserName() { return FacebookUserName; } - public AuthUserSession setFacebookUserName(String value) { this.FacebookUserName = value; return this; } - public String getFirstName() { return FirstName; } - public AuthUserSession setFirstName(String value) { this.FirstName = value; return this; } - public String getLastName() { return LastName; } - public AuthUserSession setLastName(String value) { this.LastName = value; return this; } - public String getDisplayName() { return DisplayName; } - public AuthUserSession setDisplayName(String value) { this.DisplayName = value; return this; } - public String getCompany() { return Company; } - public AuthUserSession setCompany(String value) { this.Company = value; return this; } - public String getEmail() { return Email; } - public AuthUserSession setEmail(String value) { this.Email = value; return this; } - public String getPrimaryEmail() { return PrimaryEmail; } - public AuthUserSession setPrimaryEmail(String value) { this.PrimaryEmail = value; return this; } - public String getPhoneNumber() { return PhoneNumber; } - public AuthUserSession setPhoneNumber(String value) { this.PhoneNumber = value; return this; } - public Date getBirthDate() { return BirthDate; } - public AuthUserSession setBirthDate(Date value) { this.BirthDate = value; return this; } - public String getBirthDateRaw() { return BirthDateRaw; } - public AuthUserSession setBirthDateRaw(String value) { this.BirthDateRaw = value; return this; } - public String getAddress() { return Address; } - public AuthUserSession setAddress(String value) { this.Address = value; return this; } - public String getAddress2() { return Address2; } - public AuthUserSession setAddress2(String value) { this.Address2 = value; return this; } - public String getCity() { return City; } - public AuthUserSession setCity(String value) { this.City = value; return this; } - public String getState() { return State; } - public AuthUserSession setState(String value) { this.State = value; return this; } - public String getCountry() { return Country; } - public AuthUserSession setCountry(String value) { this.Country = value; return this; } - public String getCulture() { return Culture; } - public AuthUserSession setCulture(String value) { this.Culture = value; return this; } - public String getFullName() { return FullName; } - public AuthUserSession setFullName(String value) { this.FullName = value; return this; } - public String getGender() { return Gender; } - public AuthUserSession setGender(String value) { this.Gender = value; return this; } - public String getLanguage() { return Language; } - public AuthUserSession setLanguage(String value) { this.Language = value; return this; } - public String getMailAddress() { return MailAddress; } - public AuthUserSession setMailAddress(String value) { this.MailAddress = value; return this; } - public String getNickname() { return Nickname; } - public AuthUserSession setNickname(String value) { this.Nickname = value; return this; } - public String getPostalCode() { return PostalCode; } - public AuthUserSession setPostalCode(String value) { this.PostalCode = value; return this; } - public String getTimeZone() { return TimeZone; } - public AuthUserSession setTimeZone(String value) { this.TimeZone = value; return this; } - public String getRequestTokenSecret() { return RequestTokenSecret; } - public AuthUserSession setRequestTokenSecret(String value) { this.RequestTokenSecret = value; return this; } - public Date getCreatedAt() { return CreatedAt; } - public AuthUserSession setCreatedAt(Date value) { this.CreatedAt = value; return this; } - public Date getLastModified() { return LastModified; } - public AuthUserSession setLastModified(Date value) { this.LastModified = value; return this; } - public ArrayList getRoles() { return Roles; } - public AuthUserSession setRoles(ArrayList value) { this.Roles = value; return this; } - public ArrayList getPermissions() { return Permissions; } - public AuthUserSession setPermissions(ArrayList value) { this.Permissions = value; return this; } - public Boolean getIsAuthenticated() { return IsAuthenticated; } - public AuthUserSession setIsAuthenticated(Boolean value) { this.IsAuthenticated = value; return this; } - public String getSequence() { return Sequence; } - public AuthUserSession setSequence(String value) { this.Sequence = value; return this; } - public Long getTag() { return Tag; } - public AuthUserSession setTag(Long value) { this.Tag = value; return this; } - public ArrayList getProviderOAuthAccess() { return ProviderOAuthAccess; } - public AuthUserSession setProviderOAuthAccess(ArrayList value) { this.ProviderOAuthAccess = value; return this; } - } - - public static interface IPoco - { - public String Name = null; - } - - public static interface IEmptyInterface - { - } - - public static class EmptyClass - { - - } - - public static class TypeA - { - public ArrayList Bar = null; - - public ArrayList getBar() { return Bar; } - public TypeA setBar(ArrayList value) { this.Bar = value; return this; } - } - - public static class InnerType - { - public Long Id = null; - public String Name = null; - - public Long getId() { return Id; } - public InnerType setId(Long value) { this.Id = value; return this; } - public String getName() { return Name; } - public InnerType setName(String value) { this.Name = value; return this; } - } - - public static enum InnerEnum - { - Foo, - Bar, - Baz; - } - - public static interface IAuthTokens - { - public String Provider = null; - public String UserId = null; - public String AccessToken = null; - public String AccessTokenSecret = null; - public String RefreshToken = null; - public Date RefreshTokenExpiry = null; - public String RequestToken = null; - public String RequestTokenSecret = null; - public HashMap Items = null; - } - - public static class QueryBase - { - @DataMember(Order=1) - public Integer Skip = null; - - @DataMember(Order=2) - public Integer Take = null; - - @DataMember(Order=3) - public String OrderBy = null; - - @DataMember(Order=4) - public String OrderByDesc = null; - - public Integer getSkip() { return Skip; } - public QueryBase setSkip(Integer value) { this.Skip = value; return this; } - public Integer getTake() { return Take; } - public QueryBase setTake(Integer value) { this.Take = value; return this; } - public String getOrderBy() { return OrderBy; } - public QueryBase setOrderBy(String value) { this.OrderBy = value; return this; } - public String getOrderByDesc() { return OrderByDesc; } - public QueryBase setOrderByDesc(String value) { this.OrderByDesc = value; return this; } - } - - public static class MetadataTestNestedChild - { - public String Name = null; - - public String getName() { return Name; } - public MetadataTestNestedChild setName(String value) { this.Name = value; return this; } - } - - public static class MenuItemExample - { - @DataMember(Order=1) - @ApiMember() - public String Name1 = null; - - public MenuItemExampleItem MenuItemExampleItem = null; - - public String getName1() { return Name1; } - public MenuItemExample setName1(String value) { this.Name1 = value; return this; } - public MenuItemExampleItem getMenuItemExampleItem() { return MenuItemExampleItem; } - public MenuItemExample setMenuItemExampleItem(MenuItemExampleItem value) { this.MenuItemExampleItem = value; return this; } - } - - public static class MetadataTypeName - { - public String Name = null; - public String Namespace = null; - public ArrayList GenericArgs = null; - - public String getName() { return Name; } - public MetadataTypeName setName(String value) { this.Name = value; return this; } - public String getNamespace() { return Namespace; } - public MetadataTypeName setNamespace(String value) { this.Namespace = value; return this; } - public ArrayList getGenericArgs() { return GenericArgs; } - public MetadataTypeName setGenericArgs(ArrayList value) { this.GenericArgs = value; return this; } - } - - public static class MetadataRoute - { - public String Path = null; - public String Verbs = null; - public String Notes = null; - public String Summary = null; - - public String getPath() { return Path; } - public MetadataRoute setPath(String value) { this.Path = value; return this; } - public String getVerbs() { return Verbs; } - public MetadataRoute setVerbs(String value) { this.Verbs = value; return this; } - public String getNotes() { return Notes; } - public MetadataRoute setNotes(String value) { this.Notes = value; return this; } - public String getSummary() { return Summary; } - public MetadataRoute setSummary(String value) { this.Summary = value; return this; } - } - - public static class MetadataDataContract - { - public String Name = null; - public String Namespace = null; - - public String getName() { return Name; } - public MetadataDataContract setName(String value) { this.Name = value; return this; } - public String getNamespace() { return Namespace; } - public MetadataDataContract setNamespace(String value) { this.Namespace = value; return this; } - } - - public static class MetadataPropertyType - { - public String Name = null; - public String Type = null; - public Boolean IsValueType = null; - public String TypeNamespace = null; - public ArrayList GenericArgs = null; - public String Value = null; - public String Description = null; - public MetadataDataMember DataMember = null; - public Boolean ReadOnly = null; - public String ParamType = null; - public String DisplayType = null; - public Boolean IsRequired = null; - public ArrayList AllowableValues = null; - public Integer AllowableMin = null; - public Integer AllowableMax = null; - public ArrayList Attributes = null; - - public String getName() { return Name; } - public MetadataPropertyType setName(String value) { this.Name = value; return this; } - public String getType() { return Type; } - public MetadataPropertyType setType(String value) { this.Type = value; return this; } - public Boolean getIsValueType() { return IsValueType; } - public MetadataPropertyType setIsValueType(Boolean value) { this.IsValueType = value; return this; } - public String getTypeNamespace() { return TypeNamespace; } - public MetadataPropertyType setTypeNamespace(String value) { this.TypeNamespace = value; return this; } - public ArrayList getGenericArgs() { return GenericArgs; } - public MetadataPropertyType setGenericArgs(ArrayList value) { this.GenericArgs = value; return this; } - public String getValue() { return Value; } - public MetadataPropertyType setValue(String value) { this.Value = value; return this; } - public String getDescription() { return Description; } - public MetadataPropertyType setDescription(String value) { this.Description = value; return this; } - public MetadataDataMember getDataMember() { return DataMember; } - public MetadataPropertyType setDataMember(MetadataDataMember value) { this.DataMember = value; return this; } - public Boolean isReadOnly() { return ReadOnly; } - public MetadataPropertyType setReadOnly(Boolean value) { this.ReadOnly = value; return this; } - public String getParamType() { return ParamType; } - public MetadataPropertyType setParamType(String value) { this.ParamType = value; return this; } - public String getDisplayType() { return DisplayType; } - public MetadataPropertyType setDisplayType(String value) { this.DisplayType = value; return this; } - public Boolean getIsRequired() { return IsRequired; } - public MetadataPropertyType setIsRequired(Boolean value) { this.IsRequired = value; return this; } - public ArrayList getAllowableValues() { return AllowableValues; } - public MetadataPropertyType setAllowableValues(ArrayList value) { this.AllowableValues = value; return this; } - public Integer getAllowableMin() { return AllowableMin; } - public MetadataPropertyType setAllowableMin(Integer value) { this.AllowableMin = value; return this; } - public Integer getAllowableMax() { return AllowableMax; } - public MetadataPropertyType setAllowableMax(Integer value) { this.AllowableMax = value; return this; } - public ArrayList getAttributes() { return Attributes; } - public MetadataPropertyType setAttributes(ArrayList value) { this.Attributes = value; return this; } - } - - public static class MetadataAttribute - { - public String Name = null; - public ArrayList ConstructorArgs = null; - public ArrayList Args = null; - - public String getName() { return Name; } - public MetadataAttribute setName(String value) { this.Name = value; return this; } - public ArrayList getConstructorArgs() { return ConstructorArgs; } - public MetadataAttribute setConstructorArgs(ArrayList value) { this.ConstructorArgs = value; return this; } - public ArrayList getArgs() { return Args; } - public MetadataAttribute setArgs(ArrayList value) { this.Args = value; return this; } - } - - @DataContract - public static class Property - { - @DataMember - public String Name = null; - - @DataMember - public String Value = null; - - public String getName() { return Name; } - public Property setName(String value) { this.Name = value; return this; } - public String getValue() { return Value; } - public Property setValue(String value) { this.Value = value; return this; } - } - - public static class SubType - { - public Integer Id = null; - public String Name = null; - - public Integer getId() { return Id; } - public SubType setId(Integer value) { this.Id = value; return this; } - public String getName() { return Name; } - public SubType setName(String value) { this.Name = value; return this; } - } - - public static class TypeB - { - public String Foo = null; - - public String getFoo() { return Foo; } - public TypeB setFoo(String value) { this.Foo = value; return this; } - } - - public static class TypesGroup - { - - } - - public static class MenuItemExampleItem - { - @DataMember(Order=1) - @ApiMember() - public String Name1 = null; - - public String getName1() { return Name1; } - public MenuItemExampleItem setName1(String value) { this.Name1 = value; return this; } - } - - public static class MetadataDataMember - { - public String Name = null; - public Integer Order = null; - public Boolean IsRequired = null; - public Boolean EmitDefaultValue = null; - - public String getName() { return Name; } - public MetadataDataMember setName(String value) { this.Name = value; return this; } - public Integer getOrder() { return Order; } - public MetadataDataMember setOrder(Integer value) { this.Order = value; return this; } - public Boolean getIsRequired() { return IsRequired; } - public MetadataDataMember setIsRequired(Boolean value) { this.IsRequired = value; return this; } - public Boolean isEmitDefaultValue() { return EmitDefaultValue; } - public MetadataDataMember setEmitDefaultValue(Boolean value) { this.EmitDefaultValue = value; return this; } - } - - @DataContract - public static class QueryResponse - { - @DataMember(Order=1) - public Integer Offset = null; - - @DataMember(Order=2) - public Integer Total = null; - - @DataMember(Order=3) - public ArrayList Results = null; - - @DataMember(Order=4) - public HashMap Meta = null; - - @DataMember(Order=5) - public ResponseStatus ResponseStatus = null; - - public Integer getOffset() { return Offset; } - public QueryResponse setOffset(Integer value) { this.Offset = value; return this; } - public Integer getTotal() { return Total; } - public QueryResponse setTotal(Integer value) { this.Total = value; return this; } - public ArrayList getResults() { return Results; } - public QueryResponse setResults(ArrayList value) { this.Results = value; return this; } - public HashMap getMeta() { return Meta; } - public QueryResponse setMeta(HashMap value) { this.Meta = value; return this; } - public ResponseStatus getResponseStatus() { return ResponseStatus; } - public QueryResponse setResponseStatus(ResponseStatus value) { this.ResponseStatus = value; return this; } - } - - public static class ChangeRequestResponse - { - public String ContentType = null; - public String Header = null; - public String QueryString = null; - public String Form = null; - public ResponseStatus ResponseStatus = null; - - public String getContentType() { return ContentType; } - public ChangeRequestResponse setContentType(String value) { this.ContentType = value; return this; } - public String getHeader() { return Header; } - public ChangeRequestResponse setHeader(String value) { this.Header = value; return this; } - public String getQueryString() { return QueryString; } - public ChangeRequestResponse setQueryString(String value) { this.QueryString = value; return this; } - public String getForm() { return Form; } - public ChangeRequestResponse setForm(String value) { this.Form = value; return this; } - public ResponseStatus getResponseStatus() { return ResponseStatus; } - public ChangeRequestResponse setResponseStatus(ResponseStatus value) { this.ResponseStatus = value; return this; } - } - - public static class CustomHttpErrorResponse - { - public String Custom = null; - public ResponseStatus ResponseStatus = null; - - public String getCustom() { return Custom; } - public CustomHttpErrorResponse setCustom(String value) { this.Custom = value; return this; } - public ResponseStatus getResponseStatus() { return ResponseStatus; } - public CustomHttpErrorResponse setResponseStatus(ResponseStatus value) { this.ResponseStatus = value; return this; } - } - - public static class CustomFieldHttpErrorResponse - { - public String Custom = null; - public ResponseStatus ResponseStatus = null; - - public String getCustom() { return Custom; } - public CustomFieldHttpErrorResponse setCustom(String value) { this.Custom = value; return this; } - public ResponseStatus getResponseStatus() { return ResponseStatus; } - public CustomFieldHttpErrorResponse setResponseStatus(ResponseStatus value) { this.ResponseStatus = value; return this; } - } - - public static class NoRepeatResponse - { - public UUID Id = null; - - public UUID getId() { return Id; } - public NoRepeatResponse setId(UUID value) { this.Id = value; return this; } - } - - public static class BatchThrowsResponse - { - public String Result = null; - public ResponseStatus ResponseStatus = null; - - public String getResult() { return Result; } - public BatchThrowsResponse setResult(String value) { this.Result = value; return this; } - public ResponseStatus getResponseStatus() { return ResponseStatus; } - public BatchThrowsResponse setResponseStatus(ResponseStatus value) { this.ResponseStatus = value; return this; } - } - - public static class MetadataTestResponse - { - public Integer Id = null; - public ArrayList Results = null; - - public Integer getId() { return Id; } - public MetadataTestResponse setId(Integer value) { this.Id = value; return this; } - public ArrayList getResults() { return Results; } - public MetadataTestResponse setResults(ArrayList value) { this.Results = value; return this; } - } - - @DataContract - public static class GetExampleResponse - { - @DataMember(Order=1) - public ResponseStatus ResponseStatus = null; - - @DataMember(Order=2) - @ApiMember() - public MenuExample MenuExample1 = null; - - public ResponseStatus getResponseStatus() { return ResponseStatus; } - public GetExampleResponse setResponseStatus(ResponseStatus value) { this.ResponseStatus = value; return this; } - public MenuExample getMenuExample1() { return MenuExample1; } - public GetExampleResponse setMenuExample1(MenuExample value) { this.MenuExample1 = value; return this; } - } - - public static class AutoQueryMetadataResponse - { - public AutoQueryViewerConfig Config = null; - public ArrayList Operations = null; - public ArrayList Types = null; - public ResponseStatus ResponseStatus = null; - - public AutoQueryViewerConfig getConfig() { return Config; } - public AutoQueryMetadataResponse setConfig(AutoQueryViewerConfig value) { this.Config = value; return this; } - public ArrayList getOperations() { return Operations; } - public AutoQueryMetadataResponse setOperations(ArrayList value) { this.Operations = value; return this; } - public ArrayList getTypes() { return Types; } - public AutoQueryMetadataResponse setTypes(ArrayList value) { this.Types = value; return this; } - public ResponseStatus getResponseStatus() { return ResponseStatus; } - public AutoQueryMetadataResponse setResponseStatus(ResponseStatus value) { this.ResponseStatus = value; return this; } - } - - public static class HelloResponse - { - public String Result = null; - - public String getResult() { return Result; } - public HelloResponse setResult(String value) { this.Result = value; return this; } - } - - /** - * Description on HelloAllResponse type - */ - @DataContract - public static class HelloAnnotatedResponse - { - @DataMember - public String Result = null; - - public String getResult() { return Result; } - public HelloAnnotatedResponse setResult(String value) { this.Result = value; return this; } - } - - public static class HelloExistingResponse - { - public HelloList HelloList = null; - public HelloArray HelloArray = null; - public ArrayList ArrayResults = null; - public ArrayList ListResults = null; - - public HelloList getHelloList() { return HelloList; } - public HelloExistingResponse setHelloList(HelloList value) { this.HelloList = value; return this; } - public HelloArray getHelloArray() { return HelloArray; } - public HelloExistingResponse setHelloArray(HelloArray value) { this.HelloArray = value; return this; } - public ArrayList getArrayResults() { return ArrayResults; } - public HelloExistingResponse setArrayResults(ArrayList value) { this.ArrayResults = value; return this; } - public ArrayList getListResults() { return ListResults; } - public HelloExistingResponse setListResults(ArrayList value) { this.ListResults = value; return this; } - } - - public static class HelloAllTypesResponse - { - public String Result = null; - public AllTypes AllTypes = null; - public AllCollectionTypes AllCollectionTypes = null; - - public String getResult() { return Result; } - public HelloAllTypesResponse setResult(String value) { this.Result = value; return this; } - public AllTypes getAllTypes() { return AllTypes; } - public HelloAllTypesResponse setAllTypes(AllTypes value) { this.AllTypes = value; return this; } - public AllCollectionTypes getAllCollectionTypes() { return AllCollectionTypes; } - public HelloAllTypesResponse setAllCollectionTypes(AllCollectionTypes value) { this.AllCollectionTypes = value; return this; } - } - - @DataContract - public static class HelloWithDataContractResponse - { - @DataMember(Name="result", Order=1, IsRequired=true, EmitDefaultValue=false) - public String Result = null; - - public String getResult() { return Result; } - public HelloWithDataContractResponse setResult(String value) { this.Result = value; return this; } - } - - /** - * Description on HelloWithDescriptionResponse type - */ - public static class HelloWithDescriptionResponse - { - public String Result = null; - - public String getResult() { return Result; } - public HelloWithDescriptionResponse setResult(String value) { this.Result = value; return this; } - } - - public static class HelloWithInheritanceResponse extends HelloResponseBase - { - public String Result = null; - - public String getResult() { return Result; } - public HelloWithInheritanceResponse setResult(String value) { this.Result = value; return this; } - } - - public static class HelloWithAlternateReturnResponse extends HelloWithReturnResponse - { - public String AltResult = null; - - public String getAltResult() { return AltResult; } - public HelloWithAlternateReturnResponse setAltResult(String value) { this.AltResult = value; return this; } - } - - public static class HelloWithRouteResponse - { - public String Result = null; - - public String getResult() { return Result; } - public HelloWithRouteResponse setResult(String value) { this.Result = value; return this; } - } - - public static class HelloWithTypeResponse - { - public HelloType Result = null; - - public HelloType getResult() { return Result; } - public HelloWithTypeResponse setResult(HelloType value) { this.Result = value; return this; } - } - - public static class HelloSessionResponse - { - public AuthUserSession Result = null; - - public AuthUserSession getResult() { return Result; } - public HelloSessionResponse setResult(AuthUserSession value) { this.Result = value; return this; } - } - - public static class Request1Response - { - public TypeA Test = null; - - public TypeA getTest() { return Test; } - public Request1Response setTest(TypeA value) { this.Test = value; return this; } - } - - public static class Request2Response - { - public TypeA Test = null; - - public TypeA getTest() { return Test; } - public Request2Response setTest(TypeA value) { this.Test = value; return this; } - } - - public static class HelloInnerTypesResponse - { - public InnerType InnerType = null; - public InnerEnum InnerEnum = null; - - public InnerType getInnerType() { return InnerType; } - public HelloInnerTypesResponse setInnerType(InnerType value) { this.InnerType = value; return this; } - public InnerEnum getInnerEnum() { return InnerEnum; } - public HelloInnerTypesResponse setInnerEnum(InnerEnum value) { this.InnerEnum = value; return this; } - } - - public static class CustomUserSession extends AuthUserSession - { - @DataMember - public String CustomName = null; - - @DataMember - public String CustomInfo = null; - - public String getCustomName() { return CustomName; } - public CustomUserSession setCustomName(String value) { this.CustomName = value; return this; } - public String getCustomInfo() { return CustomInfo; } - public CustomUserSession setCustomInfo(String value) { this.CustomInfo = value; return this; } - } - - public static class Echo - { - public String Sentence = null; - - public String getSentence() { return Sentence; } - public Echo setSentence(String value) { this.Sentence = value; return this; } - } - - public static class ThrowTypeResponse - { - public ResponseStatus ResponseStatus = null; - - public ResponseStatus getResponseStatus() { return ResponseStatus; } - public ThrowTypeResponse setResponseStatus(ResponseStatus value) { this.ResponseStatus = value; return this; } - } - - public static class acsprofileResponse - { - public String profileId = null; - - public String getProfileId() { return profileId; } - public acsprofileResponse setProfileId(String value) { this.profileId = value; return this; } - } - - public static class AddressResponse - { - public String Address = null; - - public String getAddress() { return Address; } - public AddressResponse setAddress(String value) { this.Address = value; return this; } - } - - @Route("/anontype") - public static class AnonType - { - - } - - @Route("/query/rockstars") - public static class QueryRockstars extends QueryBase_1 implements IReturn> - { - public Integer Age = null; - - public Integer getAge() { return Age; } - public QueryRockstars setAge(Integer value) { this.Age = value; return this; } - private static Class responseType = new QueryResponse().getClass(); - public Class getResponseType() { return responseType; } - } - - @Route("/changerequest/{Id}") - public static class ChangeRequest implements IReturn - { - public String Id = null; - - public String getId() { return Id; } - public ChangeRequest setId(String value) { this.Id = value; return this; } - private static Class responseType = ChangeRequestResponse.class; - public Class getResponseType() { return responseType; } - } - - @Route("/Routing/LeadPost.aspx") - public static class LegacyLeadPost - { - public String LeadType = null; - public Integer MyId = null; - - public String getLeadType() { return LeadType; } - public LegacyLeadPost setLeadType(String value) { this.LeadType = value; return this; } - public Integer getMyId() { return MyId; } - public LegacyLeadPost setMyId(Integer value) { this.MyId = value; return this; } - } - - @Route("/info/{Id}") - public static class Info - { - public String Id = null; - - public String getId() { return Id; } - public Info setId(String value) { this.Id = value; return this; } - } - - public static class CustomHttpError implements IReturn - { - public Integer StatusCode = null; - public String StatusDescription = null; - - public Integer getStatusCode() { return StatusCode; } - public CustomHttpError setStatusCode(Integer value) { this.StatusCode = value; return this; } - public String getStatusDescription() { return StatusDescription; } - public CustomHttpError setStatusDescription(String value) { this.StatusDescription = value; return this; } - private static Class responseType = CustomHttpErrorResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class CustomFieldHttpError implements IReturn - { - - private static Class responseType = CustomFieldHttpErrorResponse.class; - public Class getResponseType() { return responseType; } - } - - @Route("{PathInfo*}") - public static class FallbackRoute - { - public String PathInfo = null; - - public String getPathInfo() { return PathInfo; } - public FallbackRoute setPathInfo(String value) { this.PathInfo = value; return this; } - } - - public static class NoRepeat implements IReturn - { - public UUID Id = null; - - public UUID getId() { return Id; } - public NoRepeat setId(UUID value) { this.Id = value; return this; } - private static Class responseType = NoRepeatResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class BatchThrows implements IReturn - { - public Integer Id = null; - public String Name = null; - - public Integer getId() { return Id; } - public BatchThrows setId(Integer value) { this.Id = value; return this; } - public String getName() { return Name; } - public BatchThrows setName(String value) { this.Name = value; return this; } - private static Class responseType = BatchThrowsResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class BatchThrowsAsync implements IReturn - { - public Integer Id = null; - public String Name = null; - - public Integer getId() { return Id; } - public BatchThrowsAsync setId(Integer value) { this.Id = value; return this; } - public String getName() { return Name; } - public BatchThrowsAsync setName(String value) { this.Name = value; return this; } - private static Class responseType = BatchThrowsResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class MetadataTest implements IReturn - { - public Integer Id = null; - - public Integer getId() { return Id; } - public MetadataTest setId(Integer value) { this.Id = value; return this; } - private static Class responseType = MetadataTestResponse.class; - public Class getResponseType() { return responseType; } - } - - @Route(Path="/example", Verbs="GET") - @DataContract - public static class GetExample implements IReturn - { - - private static Class responseType = GetExampleResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class MetadataRequest implements IReturn - { - public MetadataType MetadataType = null; - - public MetadataType getMetadataType() { return MetadataType; } - public MetadataRequest setMetadataType(MetadataType value) { this.MetadataType = value; return this; } - private static Class responseType = AutoQueryMetadataResponse.class; - public Class getResponseType() { return responseType; } - } - - @Route("/namedconnection") - public static class NamedConnection - { - public String EmailAddresses = null; - - public String getEmailAddresses() { return EmailAddresses; } - public NamedConnection setEmailAddresses(String value) { this.EmailAddresses = value; return this; } - } - - public static class Issue221Long extends Issue221Base - { - - } - - public static class HelloInService implements IReturn - { - public String Name = null; - - public String getName() { return Name; } - public HelloInService setName(String value) { this.Name = value; return this; } - private static Class responseType = HelloResponse.class; - public Class getResponseType() { return responseType; } - } - - @Route("/hello/{Name}") - // @Route("/hello") - public static class Hello implements IReturn - { - @Required() - public String Name = null; - - public String Title = null; - - public String getName() { return Name; } - public Hello setName(String value) { this.Name = value; return this; } - public String getTitle() { return Title; } - public Hello setTitle(String value) { this.Title = value; return this; } - private static Class responseType = HelloResponse.class; - public Class getResponseType() { return responseType; } - } - - /** - * Description on HelloAll type - */ - @DataContract - public static class HelloAnnotated implements IReturn - { - @DataMember - public String Name = null; - - public String getName() { return Name; } - public HelloAnnotated setName(String value) { this.Name = value; return this; } - private static Class responseType = HelloAnnotatedResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class HelloWithNestedClass implements IReturn - { - public String Name = null; - public NestedClass NestedClassProp = null; - - public String getName() { return Name; } - public HelloWithNestedClass setName(String value) { this.Name = value; return this; } - public NestedClass getNestedClassProp() { return NestedClassProp; } - public HelloWithNestedClass setNestedClassProp(NestedClass value) { this.NestedClassProp = value; return this; } - private static Class responseType = HelloResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class HelloList implements IReturn> - { - public ArrayList Names = null; - - public ArrayList getNames() { return Names; } - public HelloList setNames(ArrayList value) { this.Names = value; return this; } - private static Class responseType = new ArrayList().getClass(); - public Class getResponseType() { return responseType; } - } - - public static class HelloArray implements IReturn> - { - public ArrayList Names = null; - - public ArrayList getNames() { return Names; } - public HelloArray setNames(ArrayList value) { this.Names = value; return this; } - private static Class responseType = new ArrayList().getClass(); - public Class getResponseType() { return responseType; } - } - - public static class HelloExisting implements IReturn - { - public ArrayList Names = null; - - public ArrayList getNames() { return Names; } - public HelloExisting setNames(ArrayList value) { this.Names = value; return this; } - private static Class responseType = HelloExistingResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class HelloWithEnum - { - public EnumType EnumProp = null; - public EnumType NullableEnumProp = null; - public EnumFlags EnumFlags = null; - - public EnumType getEnumProp() { return EnumProp; } - public HelloWithEnum setEnumProp(EnumType value) { this.EnumProp = value; return this; } - public EnumType getNullableEnumProp() { return NullableEnumProp; } - public HelloWithEnum setNullableEnumProp(EnumType value) { this.NullableEnumProp = value; return this; } - public EnumFlags getEnumFlags() { return EnumFlags; } - public HelloWithEnum setEnumFlags(EnumFlags value) { this.EnumFlags = value; return this; } - } - - public static class RestrictedAttributes - { - public Integer Id = null; - public String Name = null; - public Hello Hello = null; - - public Integer getId() { return Id; } - public RestrictedAttributes setId(Integer value) { this.Id = value; return this; } - public String getName() { return Name; } - public RestrictedAttributes setName(String value) { this.Name = value; return this; } - public Hello getHello() { return Hello; } - public RestrictedAttributes setHello(Hello value) { this.Hello = value; return this; } - } - - /** - * AllowedAttributes Description - */ - @Route(Path="/allowed-attributes", Verbs="GET") - @Api("AllowedAttributes Description") - // @ApiResponse(400, "Your request was not understood") - @DataContract - public static class AllowedAttributes - { - @DataMember(Name="Aliased") - @ApiMember(Description="Range Description", ParameterType="path", DataType="double", IsRequired=true) - public Double Range = null; - - public Double getRange() { return Range; } - public AllowedAttributes setRange(Double value) { this.Range = value; return this; } - } - - public static class HelloAllTypes implements IReturn - { - public String Name = null; - public AllTypes AllTypes = null; - public AllCollectionTypes AllCollectionTypes = null; - - public String getName() { return Name; } - public HelloAllTypes setName(String value) { this.Name = value; return this; } - public AllTypes getAllTypes() { return AllTypes; } - public HelloAllTypes setAllTypes(AllTypes value) { this.AllTypes = value; return this; } - public AllCollectionTypes getAllCollectionTypes() { return AllCollectionTypes; } - public HelloAllTypes setAllCollectionTypes(AllCollectionTypes value) { this.AllCollectionTypes = value; return this; } - private static Class responseType = HelloAllTypesResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class HelloString - { - public String Name = null; - - public String getName() { return Name; } - public HelloString setName(String value) { this.Name = value; return this; } - } - - public static class HelloVoid implements IReturnVoid - { - public String Name = null; - - public String getName() { return Name; } - public HelloVoid setName(String value) { this.Name = value; return this; } - } - - @DataContract - public static class HelloWithDataContract implements IReturn - { - @DataMember(Name="name", Order=1, IsRequired=true, EmitDefaultValue=false) - public String Name = null; - - @DataMember(Name="id", Order=2, EmitDefaultValue=false) - public Integer Id = null; - - public String getName() { return Name; } - public HelloWithDataContract setName(String value) { this.Name = value; return this; } - public Integer getId() { return Id; } - public HelloWithDataContract setId(Integer value) { this.Id = value; return this; } - private static Class responseType = HelloWithDataContractResponse.class; - public Class getResponseType() { return responseType; } - } - - /** - * Description on HelloWithDescription type - */ - public static class HelloWithDescription implements IReturn - { - public String Name = null; - - public String getName() { return Name; } - public HelloWithDescription setName(String value) { this.Name = value; return this; } - private static Class responseType = HelloWithDescriptionResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class HelloWithInheritance extends HelloBase implements IReturn - { - public String Name = null; - - public String getName() { return Name; } - public HelloWithInheritance setName(String value) { this.Name = value; return this; } - private static Class responseType = HelloWithInheritanceResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class HelloWithGenericInheritance extends HelloBase_1 - { - public String Result = null; - - public String getResult() { return Result; } - public HelloWithGenericInheritance setResult(String value) { this.Result = value; return this; } - } - - public static class HelloWithGenericInheritance2 extends HelloBase_1 - { - public String Result = null; - - public String getResult() { return Result; } - public HelloWithGenericInheritance2 setResult(String value) { this.Result = value; return this; } - } - - public static class HelloWithNestedInheritance extends HelloBase_1 - { - - } - - public static class HelloWithListInheritance extends ArrayList - { - - } - - public static class HelloWithReturn implements IReturn - { - public String Name = null; - - public String getName() { return Name; } - public HelloWithReturn setName(String value) { this.Name = value; return this; } - private static Class responseType = HelloWithAlternateReturnResponse.class; - public Class getResponseType() { return responseType; } - } - - @Route("/helloroute") - public static class HelloWithRoute implements IReturn - { - public String Name = null; - - public String getName() { return Name; } - public HelloWithRoute setName(String value) { this.Name = value; return this; } - private static Class responseType = HelloWithRouteResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class HelloWithType implements IReturn - { - public String Name = null; - - public String getName() { return Name; } - public HelloWithType setName(String value) { this.Name = value; return this; } - private static Class responseType = HelloWithTypeResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class HelloSession implements IReturn - { - - private static Class responseType = HelloSessionResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class HelloInterface - { - public IPoco Poco = null; - public IEmptyInterface EmptyInterface = null; - public EmptyClass EmptyClass = null; - public String Value = null; - - public IPoco getPoco() { return Poco; } - public HelloInterface setPoco(IPoco value) { this.Poco = value; return this; } - public IEmptyInterface getEmptyInterface() { return EmptyInterface; } - public HelloInterface setEmptyInterface(IEmptyInterface value) { this.EmptyInterface = value; return this; } - public EmptyClass getEmptyClass() { return EmptyClass; } - public HelloInterface setEmptyClass(EmptyClass value) { this.EmptyClass = value; return this; } - public String getValue() { return Value; } - public HelloInterface setValue(String value) { this.Value = value; return this; } - } - - public static class Request1 implements IReturn - { - public TypeA Test = null; - - public TypeA getTest() { return Test; } - public Request1 setTest(TypeA value) { this.Test = value; return this; } - private static Class responseType = Request1Response.class; - public Class getResponseType() { return responseType; } - } - - public static class Request2 implements IReturn - { - public TypeA Test = null; - - public TypeA getTest() { return Test; } - public Request2 setTest(TypeA value) { this.Test = value; return this; } - private static Class responseType = Request2Response.class; - public Class getResponseType() { return responseType; } - } - - public static class HelloInnerTypes implements IReturn - { - - private static Class responseType = HelloInnerTypesResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class GetUserSession implements IReturn - { - - private static Class responseType = CustomUserSession.class; - public Class getResponseType() { return responseType; } - } - - /** - * Echoes a sentence - */ - @Route(Path="/echoes", Verbs="POST") - @Api("Echoes a sentence") - public static class Echoes implements IReturn - { - @ApiMember(Description="The sentence to echo.", ParameterType="form", DataType="string", IsRequired=true, Name="Sentence") - public String Sentence = null; - - public String getSentence() { return Sentence; } - public Echoes setSentence(String value) { this.Sentence = value; return this; } - private static Class responseType = Echo.class; - public Class getResponseType() { return responseType; } - } - - public static class CachedEcho - { - public Boolean Reload = null; - public String Sentence = null; - - public Boolean isReload() { return Reload; } - public CachedEcho setReload(Boolean value) { this.Reload = value; return this; } - public String getSentence() { return Sentence; } - public CachedEcho setSentence(String value) { this.Sentence = value; return this; } - } - - public static class AsyncTest implements IReturn - { - - private static Class responseType = Echo.class; - public Class getResponseType() { return responseType; } - } - - @Route("/throwhttperror/{Status}") - public static class ThrowHttpError - { - public Integer Status = null; - public String Message = null; - - public Integer getStatus() { return Status; } - public ThrowHttpError setStatus(Integer value) { this.Status = value; return this; } - public String getMessage() { return Message; } - public ThrowHttpError setMessage(String value) { this.Message = value; return this; } - } - - @Route("/throw404") - // @Route("/throw404/{Message}") - public static class Throw404 - { - public String Message = null; - - public String getMessage() { return Message; } - public Throw404 setMessage(String value) { this.Message = value; return this; } - } - - @Route("/throw/{Type}") - public static class ThrowType implements IReturn - { - public String Type = null; - public String Message = null; - - public String getType() { return Type; } - public ThrowType setType(String value) { this.Type = value; return this; } - public String getMessage() { return Message; } - public ThrowType setMessage(String value) { this.Message = value; return this; } - private static Class responseType = ThrowTypeResponse.class; - public Class getResponseType() { return responseType; } - } - - @Route("/api/acsprofiles/{profileId}") - // @Route(Path="/api/acsprofiles", Verbs="POST,PUT,PATCH,DELETE") - public static class ACSProfile implements IReturn - { - public String profileId = null; - @Required() - @StringLength(20) - public String shortName = null; - - @StringLength(60) - public String longName = null; - - @StringLength(20) - public String regionId = null; - - @StringLength(20) - public String groupId = null; - - @StringLength(12) - public String deviceID = null; - - public Date lastUpdated = null; - public Boolean enabled = null; - - public String getProfileId() { return profileId; } - public ACSProfile setProfileId(String value) { this.profileId = value; return this; } - public String getShortName() { return shortName; } - public ACSProfile setShortName(String value) { this.shortName = value; return this; } - public String getLongName() { return longName; } - public ACSProfile setLongName(String value) { this.longName = value; return this; } - public String getRegionId() { return regionId; } - public ACSProfile setRegionId(String value) { this.regionId = value; return this; } - public String getGroupId() { return groupId; } - public ACSProfile setGroupId(String value) { this.groupId = value; return this; } - public String getDeviceID() { return deviceID; } - public ACSProfile setDeviceID(String value) { this.deviceID = value; return this; } - public Date getLastUpdated() { return lastUpdated; } - public ACSProfile setLastUpdated(Date value) { this.lastUpdated = value; return this; } - public Boolean isEnabled() { return enabled; } - public ACSProfile setEnabled(Boolean value) { this.enabled = value; return this; } - private static Class responseType = acsprofileResponse.class; - public Class getResponseType() { return responseType; } - } - - public static class TestMiniverView - { - - } - - @Route("/user/{UserId}/Address") - public static class UpdateAddress implements IReturn - { - public Integer UserId = null; - public String Address = null; - - public Integer getUserId() { return UserId; } - public UpdateAddress setUserId(Integer value) { this.UserId = value; return this; } - public String getAddress() { return Address; } - public UpdateAddress setAddress(String value) { this.Address = value; return this; } - private static Class responseType = AddressResponse.class; - public Class getResponseType() { return responseType; } - } - - @Route("/user/{UserId}/AddressVoid") - public static class UpdateAddressVoid implements IReturnVoid - { - public Integer UserId = null; - public String Address = null; - - public Integer getUserId() { return UserId; } - public UpdateAddressVoid setUserId(Integer value) { this.UserId = value; return this; } - public String getAddress() { return Address; } - public UpdateAddressVoid setAddress(String value) { this.Address = value; return this; } - } - -} \ No newline at end of file diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestDtos.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestDtos.java new file mode 100644 index 00000000..6a1a3652 --- /dev/null +++ b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestDtos.java @@ -0,0 +1,4568 @@ +/* Options: +Date: 2024-10-24 02:46:25 +Version: 8.41 +Tip: To override a DTO option, remove "//" prefix before updating +BaseUrl: https://test.servicestack.net + +Package: net.servicestack.client.tests +GlobalNamespace: TestDtos +//AddPropertyAccessors: True +//SettersReturnThis: True +//AddServiceStackTypes: True +//AddResponseStatus: False +//AddDescriptionAsComments: True +//AddImplicitVersion: +//IncludeTypes: +//ExcludeTypes: +//TreatTypesAsStrings: +//DefaultImports: java.math.*,java.util.*,java.io.InputStream,net.servicestack.client.*,com.google.gson.annotations.*,com.google.gson.reflect.*,java.io.* +*/ + +package net.servicestack.client.tests; + +import java.math.*; +import java.util.*; +import java.io.InputStream; +import net.servicestack.client.*; +import com.google.gson.annotations.*; +import com.google.gson.reflect.*; + +public class TestDtos +{ + + public static class QueryItems extends QueryDb_2 implements IReturn> + { + + private static Object responseType = new TypeToken>(){}.getType(); + public Object getResponseType() { return responseType; } + } + + @Route(Path="/channels/{Channel}/raw") + public static class PostRawToChannel implements IReturnVoid + { + public String from = null; + public String toUserId = null; + public String channel = null; + public String message = null; + public String selector = null; + + public String getFrom() { return from; } + public PostRawToChannel setFrom(String value) { this.from = value; return this; } + public String getToUserId() { return toUserId; } + public PostRawToChannel setToUserId(String value) { this.toUserId = value; return this; } + public String getChannel() { return channel; } + public PostRawToChannel setChannel(String value) { this.channel = value; return this; } + public String getMessage() { return message; } + public PostRawToChannel setMessage(String value) { this.message = value; return this; } + public String getSelector() { return selector; } + public PostRawToChannel setSelector(String value) { this.selector = value; return this; } + } + + @Route(Path="/channels/{Channel}/chat") + public static class PostChatToChannel implements IReturn + { + public String from = null; + public String toUserId = null; + public String channel = null; + public String message = null; + public String selector = null; + + public String getFrom() { return from; } + public PostChatToChannel setFrom(String value) { this.from = value; return this; } + public String getToUserId() { return toUserId; } + public PostChatToChannel setToUserId(String value) { this.toUserId = value; return this; } + public String getChannel() { return channel; } + public PostChatToChannel setChannel(String value) { this.channel = value; return this; } + public String getMessage() { return message; } + public PostChatToChannel setMessage(String value) { this.message = value; return this; } + public String getSelector() { return selector; } + public PostChatToChannel setSelector(String value) { this.selector = value; return this; } + private static Object responseType = ChatMessage.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/chathistory") + public static class GetChatHistory implements IReturn + { + public ArrayList channels = null; + public Long afterId = null; + public Integer take = null; + + public ArrayList getChannels() { return channels; } + public GetChatHistory setChannels(ArrayList value) { this.channels = value; return this; } + public Long getAfterId() { return afterId; } + public GetChatHistory setAfterId(Long value) { this.afterId = value; return this; } + public Integer getTake() { return take; } + public GetChatHistory setTake(Integer value) { this.take = value; return this; } + private static Object responseType = GetChatHistoryResponse.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/reset") + public static class ClearChatHistory implements IReturnVoid + { + + } + + @Route(Path="/reset-serverevents") + public static class ResetServerEvents implements IReturnVoid + { + + } + + @Route(Path="/channels/{Channel}/object") + public static class PostObjectToChannel implements IReturnVoid + { + public String toUserId = null; + public String channel = null; + public String selector = null; + public CustomType customType = null; + public SetterType setterType = null; + + public String getToUserId() { return toUserId; } + public PostObjectToChannel setToUserId(String value) { this.toUserId = value; return this; } + public String getChannel() { return channel; } + public PostObjectToChannel setChannel(String value) { this.channel = value; return this; } + public String getSelector() { return selector; } + public PostObjectToChannel setSelector(String value) { this.selector = value; return this; } + public CustomType getCustomType() { return customType; } + public PostObjectToChannel setCustomType(CustomType value) { this.customType = value; return this; } + public SetterType getSetterType() { return setterType; } + public PostObjectToChannel setSetterType(SetterType value) { this.setterType = value; return this; } + } + + @Route(Path="/account") + public static class GetUserDetails implements IReturn + { + + private static Object responseType = GetUserDetailsResponse.class; + public Object getResponseType() { return responseType; } + } + + public static class CustomHttpError implements IReturn + { + public Integer statusCode = null; + public String statusDescription = null; + + public Integer getStatusCode() { return statusCode; } + public CustomHttpError setStatusCode(Integer value) { this.statusCode = value; return this; } + public String getStatusDescription() { return statusDescription; } + public CustomHttpError setStatusDescription(String value) { this.statusDescription = value; return this; } + private static Object responseType = CustomHttpErrorResponse.class; + public Object getResponseType() { return responseType; } + } + + public static class AltQueryItems implements IReturn> + { + public String name = null; + + public String getName() { return name; } + public AltQueryItems setName(String value) { this.name = value; return this; } + private static Object responseType = new TypeToken>(){}.getType(); + public Object getResponseType() { return responseType; } + } + + public static class GetItems implements IReturn + { + + private static Object responseType = Items.class; + public Object getResponseType() { return responseType; } + } + + public static class GetNakedItems implements IReturn> + { + + private static Object responseType = new TypeToken>(){}.getType(); + public Object getResponseType() { return responseType; } + } + + @ValidateRequest(Validator="IsAuthenticated") + public static class DeclarativeValidationAuth + { + public String name = null; + + public String getName() { return name; } + public DeclarativeValidationAuth setName(String value) { this.name = value; return this; } + } + + public static class DeclarativeCollectiveValidationTest implements IReturn + { + @Validate(Validator="NotEmpty") + // @Validate(Validator="MaximumLength(20)") + public String site = null; + + public ArrayList declarativeValidations = null; + public ArrayList fluentValidations = null; + + public String getSite() { return site; } + public DeclarativeCollectiveValidationTest setSite(String value) { this.site = value; return this; } + public ArrayList getDeclarativeValidations() { return declarativeValidations; } + public DeclarativeCollectiveValidationTest setDeclarativeValidations(ArrayList value) { this.declarativeValidations = value; return this; } + public ArrayList getFluentValidations() { return fluentValidations; } + public DeclarativeCollectiveValidationTest setFluentValidations(ArrayList value) { this.fluentValidations = value; return this; } + private static Object responseType = EmptyResponse.class; + public Object getResponseType() { return responseType; } + } + + public static class DeclarativeSingleValidationTest implements IReturn + { + @Validate(Validator="NotEmpty") + // @Validate(Validator="MaximumLength(20)") + public String site = null; + + public DeclarativeSingleValidation declarativeSingleValidation = null; + public FluentSingleValidation fluentSingleValidation = null; + + public String getSite() { return site; } + public DeclarativeSingleValidationTest setSite(String value) { this.site = value; return this; } + public DeclarativeSingleValidation getDeclarativeSingleValidation() { return declarativeSingleValidation; } + public DeclarativeSingleValidationTest setDeclarativeSingleValidation(DeclarativeSingleValidation value) { this.declarativeSingleValidation = value; return this; } + public FluentSingleValidation getFluentSingleValidation() { return fluentSingleValidation; } + public DeclarativeSingleValidationTest setFluentSingleValidation(FluentSingleValidation value) { this.fluentSingleValidation = value; return this; } + private static Object responseType = EmptyResponse.class; + public Object getResponseType() { return responseType; } + } + + public static class DummyTypes + { + public ArrayList helloResponses = null; + public ArrayList listResult = null; + public ArrayList arrayResult = null; + public CancelRequest cancelRequest = null; + public CancelRequestResponse cancelRequestResponse = null; + public UpdateEventSubscriber updateEventSubscriber = null; + public UpdateEventSubscriberResponse updateEventSubscriberResponse = null; + public GetApiKeys getApiKeys = null; + public GetApiKeysResponse getApiKeysResponse = null; + public RegenerateApiKeys regenerateApiKeys = null; + public RegenerateApiKeysResponse regenerateApiKeysResponse = null; + public UserApiKey userApiKey = null; + public ConvertSessionToToken convertSessionToToken = null; + public ConvertSessionToTokenResponse convertSessionToTokenResponse = null; + public GetAccessToken getAccessToken = null; + public GetAccessTokenResponse getAccessTokenResponse = null; + public NavItem navItem = null; + public GetNavItems getNavItems = null; + public GetNavItemsResponse getNavItemsResponse = null; + public EmptyResponse emptyResponse = null; + public IdResponse idResponse = null; + public StringResponse stringResponse = null; + public StringsResponse stringsResponse = null; + public AuditBase auditBase = null; + + public ArrayList getHelloResponses() { return helloResponses; } + public DummyTypes setHelloResponses(ArrayList value) { this.helloResponses = value; return this; } + public ArrayList getListResult() { return listResult; } + public DummyTypes setListResult(ArrayList value) { this.listResult = value; return this; } + public ArrayList getArrayResult() { return arrayResult; } + public DummyTypes setArrayResult(ArrayList value) { this.arrayResult = value; return this; } + public CancelRequest getCancelRequest() { return cancelRequest; } + public DummyTypes setCancelRequest(CancelRequest value) { this.cancelRequest = value; return this; } + public CancelRequestResponse getCancelRequestResponse() { return cancelRequestResponse; } + public DummyTypes setCancelRequestResponse(CancelRequestResponse value) { this.cancelRequestResponse = value; return this; } + public UpdateEventSubscriber getUpdateEventSubscriber() { return updateEventSubscriber; } + public DummyTypes setUpdateEventSubscriber(UpdateEventSubscriber value) { this.updateEventSubscriber = value; return this; } + public UpdateEventSubscriberResponse getUpdateEventSubscriberResponse() { return updateEventSubscriberResponse; } + public DummyTypes setUpdateEventSubscriberResponse(UpdateEventSubscriberResponse value) { this.updateEventSubscriberResponse = value; return this; } + public GetApiKeys getGetApiKeys() { return getApiKeys; } + public DummyTypes setGetApiKeys(GetApiKeys value) { this.getApiKeys = value; return this; } + public GetApiKeysResponse getGetApiKeysResponse() { return getApiKeysResponse; } + public DummyTypes setGetApiKeysResponse(GetApiKeysResponse value) { this.getApiKeysResponse = value; return this; } + public RegenerateApiKeys getRegenerateApiKeys() { return regenerateApiKeys; } + public DummyTypes setRegenerateApiKeys(RegenerateApiKeys value) { this.regenerateApiKeys = value; return this; } + public RegenerateApiKeysResponse getRegenerateApiKeysResponse() { return regenerateApiKeysResponse; } + public DummyTypes setRegenerateApiKeysResponse(RegenerateApiKeysResponse value) { this.regenerateApiKeysResponse = value; return this; } + public UserApiKey getUserApiKey() { return userApiKey; } + public DummyTypes setUserApiKey(UserApiKey value) { this.userApiKey = value; return this; } + public ConvertSessionToToken getConvertSessionToToken() { return convertSessionToToken; } + public DummyTypes setConvertSessionToToken(ConvertSessionToToken value) { this.convertSessionToToken = value; return this; } + public ConvertSessionToTokenResponse getConvertSessionToTokenResponse() { return convertSessionToTokenResponse; } + public DummyTypes setConvertSessionToTokenResponse(ConvertSessionToTokenResponse value) { this.convertSessionToTokenResponse = value; return this; } + public GetAccessToken getGetAccessToken() { return getAccessToken; } + public DummyTypes setGetAccessToken(GetAccessToken value) { this.getAccessToken = value; return this; } + public GetAccessTokenResponse getGetAccessTokenResponse() { return getAccessTokenResponse; } + public DummyTypes setGetAccessTokenResponse(GetAccessTokenResponse value) { this.getAccessTokenResponse = value; return this; } + public NavItem getNavItem() { return navItem; } + public DummyTypes setNavItem(NavItem value) { this.navItem = value; return this; } + public GetNavItems getGetNavItems() { return getNavItems; } + public DummyTypes setGetNavItems(GetNavItems value) { this.getNavItems = value; return this; } + public GetNavItemsResponse getGetNavItemsResponse() { return getNavItemsResponse; } + public DummyTypes setGetNavItemsResponse(GetNavItemsResponse value) { this.getNavItemsResponse = value; return this; } + public EmptyResponse getEmptyResponse() { return emptyResponse; } + public DummyTypes setEmptyResponse(EmptyResponse value) { this.emptyResponse = value; return this; } + public IdResponse getIdResponse() { return idResponse; } + public DummyTypes setIdResponse(IdResponse value) { this.idResponse = value; return this; } + public StringResponse getStringResponse() { return stringResponse; } + public DummyTypes setStringResponse(StringResponse value) { this.stringResponse = value; return this; } + public StringsResponse getStringsResponse() { return stringsResponse; } + public DummyTypes setStringsResponse(StringsResponse value) { this.stringsResponse = value; return this; } + public AuditBase getAuditBase() { return auditBase; } + public DummyTypes setAuditBase(AuditBase value) { this.auditBase = value; return this; } + } + + @Route(Path="/throwhttperror/{Status}") + public static class ThrowHttpError + { + public Integer status = null; + public String message = null; + + public Integer getStatus() { return status; } + public ThrowHttpError setStatus(Integer value) { this.status = value; return this; } + public String getMessage() { return message; } + public ThrowHttpError setMessage(String value) { this.message = value; return this; } + } + + @Route(Path="/throw404") + // @Route(Path="/throw404/{Message}") + public static class Throw404 + { + public String message = null; + + public String getMessage() { return message; } + public Throw404 setMessage(String value) { this.message = value; return this; } + } + + @Route(Path="/throwcustom400") + // @Route(Path="/throwcustom400/{Message}") + public static class ThrowCustom400 + { + public String message = null; + + public String getMessage() { return message; } + public ThrowCustom400 setMessage(String value) { this.message = value; return this; } + } + + @Route(Path="/returncustom400") + // @Route(Path="/returncustom400/{Message}") + public static class ReturnCustom400 implements IReturn + { + public String message = null; + + public String getMessage() { return message; } + public ReturnCustom400 setMessage(String value) { this.message = value; return this; } + private static Object responseType = ReturnCustom400Response.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/throw/{Type}") + public static class ThrowType implements IReturn + { + public String type = null; + public String message = null; + + public String getType() { return type; } + public ThrowType setType(String value) { this.type = value; return this; } + public String getMessage() { return message; } + public ThrowType setMessage(String value) { this.message = value; return this; } + private static Object responseType = ThrowTypeResponse.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/throwvalidation") + public static class ThrowValidation implements IReturn + { + public Integer age = null; + public String required = null; + public String email = null; + + public Integer getAge() { return age; } + public ThrowValidation setAge(Integer value) { this.age = value; return this; } + public String getRequired() { return required; } + public ThrowValidation setRequired(String value) { this.required = value; return this; } + public String getEmail() { return email; } + public ThrowValidation setEmail(String value) { this.email = value; return this; } + private static Object responseType = ThrowValidationResponse.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/throwbusinesserror") + public static class ThrowBusinessError implements IReturn + { + + private static Object responseType = ThrowBusinessErrorResponse.class; + public Object getResponseType() { return responseType; } + } + + /** + * Convert speech to text + */ + @Api(Description="Convert speech to text") + public static class SpeechToText implements IReturn, IGeneration + { + /** + * The audio stream containing the speech to be transcribed + */ + @ApiMember(Description="The audio stream containing the speech to be transcribed") + @Required() + public InputStream audio = null; + + /** + * Optional client-provided identifier for the request + */ + @ApiMember(Description="Optional client-provided identifier for the request") + public String refId = null; + + /** + * Tag to identify the request + */ + @ApiMember(Description="Tag to identify the request") + public String tag = null; + + public InputStream getAudio() { return audio; } + public SpeechToText setAudio(InputStream value) { this.audio = value; return this; } + public String getRefId() { return refId; } + public SpeechToText setRefId(String value) { this.refId = value; return this; } + public String getTag() { return tag; } + public SpeechToText setTag(String value) { this.tag = value; return this; } + private static Object responseType = GenerationResponse.class; + public Object getResponseType() { return responseType; } + } + + public static class TestFileUploads implements IReturn + { + public Integer id = null; + public String refId = null; + + public Integer getId() { return id; } + public TestFileUploads setId(Integer value) { this.id = value; return this; } + public String getRefId() { return refId; } + public TestFileUploads setRefId(String value) { this.refId = value; return this; } + private static Object responseType = TestFileUploadsResponse.class; + public Object getResponseType() { return responseType; } + } + + public static class RootPathRoutes + { + public String path = null; + + public String getPath() { return path; } + public RootPathRoutes setPath(String value) { this.path = value; return this; } + } + + public static class GetAccount implements IReturn + { + public String account = null; + + public String getAccount() { return account; } + public GetAccount setAccount(String value) { this.account = value; return this; } + private static Object responseType = Account.class; + public Object getResponseType() { return responseType; } + } + + public static class GetProject implements IReturn + { + public String account = null; + public String project = null; + + public String getAccount() { return account; } + public GetProject setAccount(String value) { this.account = value; return this; } + public String getProject() { return project; } + public GetProject setProject(String value) { this.project = value; return this; } + private static Object responseType = Project.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/image-stream") + public static class ImageAsStream implements IReturn + { + public String format = null; + + public String getFormat() { return format; } + public ImageAsStream setFormat(String value) { this.format = value; return this; } + private static Object responseType = InputStream.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/image-bytes") + public static class ImageAsBytes implements IReturn + { + public String format = null; + + public String getFormat() { return format; } + public ImageAsBytes setFormat(String value) { this.format = value; return this; } + private static Object responseType = byte[].class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/image-custom") + public static class ImageAsCustomResult implements IReturn + { + public String format = null; + + public String getFormat() { return format; } + public ImageAsCustomResult setFormat(String value) { this.format = value; return this; } + private static Object responseType = byte[].class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/image-response") + public static class ImageWriteToResponse implements IReturn + { + public String format = null; + + public String getFormat() { return format; } + public ImageWriteToResponse setFormat(String value) { this.format = value; return this; } + private static Object responseType = byte[].class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/image-file") + public static class ImageAsFile implements IReturn + { + public String format = null; + + public String getFormat() { return format; } + public ImageAsFile setFormat(String value) { this.format = value; return this; } + private static Object responseType = byte[].class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/image-redirect") + public static class ImageAsRedirect + { + public String format = null; + + public String getFormat() { return format; } + public ImageAsRedirect setFormat(String value) { this.format = value; return this; } + } + + @Route(Path="/hello-image/{Name}") + public static class HelloImage implements IReturn + { + public String name = null; + public String format = null; + public Integer width = null; + public Integer height = null; + public Integer fontSize = null; + public String fontFamily = null; + public String foreground = null; + public String background = null; + + public String getName() { return name; } + public HelloImage setName(String value) { this.name = value; return this; } + public String getFormat() { return format; } + public HelloImage setFormat(String value) { this.format = value; return this; } + public Integer getWidth() { return width; } + public HelloImage setWidth(Integer value) { this.width = value; return this; } + public Integer getHeight() { return height; } + public HelloImage setHeight(Integer value) { this.height = value; return this; } + public Integer getFontSize() { return fontSize; } + public HelloImage setFontSize(Integer value) { this.fontSize = value; return this; } + public String getFontFamily() { return fontFamily; } + public HelloImage setFontFamily(String value) { this.fontFamily = value; return this; } + public String getForeground() { return foreground; } + public HelloImage setForeground(String value) { this.foreground = value; return this; } + public String getBackground() { return background; } + public HelloImage setBackground(String value) { this.background = value; return this; } + private static Object responseType = byte[].class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/secured") + @ValidateRequest(Validator="IsAuthenticated") + public static class Secured implements IReturn + { + public String name = null; + + public String getName() { return name; } + public Secured setName(String value) { this.name = value; return this; } + private static Object responseType = SecuredResponse.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/jwt") + public static class CreateJwt extends AuthUserSession implements IReturn + { + public Date jwtExpiry = null; + + public Date getJwtExpiry() { return jwtExpiry; } + public CreateJwt setJwtExpiry(Date value) { this.jwtExpiry = value; return this; } + private static Object responseType = CreateJwtResponse.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/jwt-refresh") + public static class CreateRefreshJwt implements IReturn + { + public String userAuthId = null; + public Date jwtExpiry = null; + + public String getUserAuthId() { return userAuthId; } + public CreateRefreshJwt setUserAuthId(String value) { this.userAuthId = value; return this; } + public Date getJwtExpiry() { return jwtExpiry; } + public CreateRefreshJwt setJwtExpiry(Date value) { this.jwtExpiry = value; return this; } + private static Object responseType = CreateRefreshJwtResponse.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/jwt-invalidate") + public static class InvalidateLastAccessToken implements IReturn + { + + private static Object responseType = EmptyResponse.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/logs") + public static class ViewLogs implements IReturn + { + public Boolean clear = null; + + public Boolean isClear() { return clear; } + public ViewLogs setClear(Boolean value) { this.clear = value; return this; } + private static Object responseType = String.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/metadatatest") + public static class MetadataTest implements IReturn + { + public Integer id = null; + + public Integer getId() { return id; } + public MetadataTest setId(Integer value) { this.id = value; return this; } + private static Object responseType = MetadataTestResponse.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/metadatatest-array") + public static class MetadataTestArray implements IReturn> + { + public Integer id = null; + + public Integer getId() { return id; } + public MetadataTestArray setId(Integer value) { this.id = value; return this; } + private static Object responseType = new TypeToken>(){}.getType(); + public Object getResponseType() { return responseType; } + } + + @Route(Path="/example", Verbs="GET") + @DataContract + public static class GetExample implements IReturn + { + + private static Object responseType = GetExampleResponse.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/messages/{Id}", Verbs="GET") + public static class RequestMessage implements IReturn + { + public Integer id = null; + + public Integer getId() { return id; } + public RequestMessage setId(Integer value) { this.id = value; return this; } + private static Object responseType = Message.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/messages/{Id}", Verbs="PUT") + public static class Message implements IReturn + { + public Integer id = null; + public String name = null; + + public Integer getId() { return id; } + public Message setId(Integer value) { this.id = value; return this; } + public String getName() { return name; } + public Message setName(String value) { this.name = value; return this; } + private static Object responseType = Message.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/randomids") + public static class GetRandomIds implements IReturn + { + public Integer take = null; + + public Integer getTake() { return take; } + public GetRandomIds setTake(Integer value) { this.take = value; return this; } + private static Object responseType = GetRandomIdsResponse.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/textfile-test") + public static class TextFileTest + { + public Boolean asAttachment = null; + + public Boolean isAsAttachment() { return asAttachment; } + public TextFileTest setAsAttachment(Boolean value) { this.asAttachment = value; return this; } + } + + @Route(Path="/return/text") + public static class ReturnText + { + public String text = null; + + public String getText() { return text; } + public ReturnText setText(String value) { this.text = value; return this; } + } + + @Route(Path="/return/html") + public static class ReturnHtml + { + public String text = null; + + public String getText() { return text; } + public ReturnHtml setText(String value) { this.text = value; return this; } + } + + @Route(Path="/hello") + // @Route(Path="/hello/{Name}") + public static class Hello implements IReturn + { + @Required() + public String name = null; + + public String title = null; + + public String getName() { return name; } + public Hello setName(String value) { this.name = value; return this; } + public String getTitle() { return title; } + public Hello setTitle(String value) { this.title = value; return this; } + private static Object responseType = HelloResponse.class; + public Object getResponseType() { return responseType; } + } + + @Route(Path="/hello-secure/{Name}") + @ValidateRequest(Validator="IsAuthenticated") + public static class HelloSecure implements IReturn + { + public String name = null; + + public String getName() { return name; } + public HelloSecure setName(String value) { this.name = value; return this; } + private static Object responseType = HelloResponse.class; + public Object getResponseType() { return responseType; } + } + + /** + * Description on HelloAll type + */ + @DataContract + public static class HelloAnnotated implements IReturn + { + @DataMember + public String name = null; + + public String getName() { return name; } + public HelloAnnotated setName(String value) { this.name = value; return this; } + private static Object responseType = HelloAnnotatedResponse.class; + public Object getResponseType() { return responseType; } + } + + public static class HelloWithNestedClass implements IReturn + { + public String name = null; + public NestedClass nestedClassProp = null; + + public String getName() { return name; } + public HelloWithNestedClass setName(String value) { this.name = value; return this; } + public NestedClass getNestedClassProp() { return nestedClassProp; } + public HelloWithNestedClass setNestedClassProp(NestedClass value) { this.nestedClassProp = value; return this; } + private static Object responseType = HelloResponse.class; + public Object getResponseType() { return responseType; } + } + + public static class HelloList implements IReturn> + { + public ArrayList names = null; + + public ArrayList getNames() { return names; } + public HelloList setNames(ArrayList value) { this.names = value; return this; } + private static Object responseType = new TypeToken>(){}.getType(); + public Object getResponseType() { return responseType; } + } + + public static class HelloArray implements IReturn> + { + public ArrayList names = null; + + public ArrayList getNames() { return names; } + public HelloArray setNames(ArrayList value) { this.names = value; return this; } + private static Object responseType = new TypeToken>(){}.getType(); + public Object getResponseType() { return responseType; } + } + + public static class HelloMap implements IReturn> + { + public ArrayList names = null; + + public ArrayList getNames() { return names; } + public HelloMap setNames(ArrayList value) { this.names = value; return this; } + private static Object responseType = new TypeToken>(){}.getType(); + public Object getResponseType() { return responseType; } + } + + public static class HelloQueryResponse implements IReturn> + { + public ArrayList names = null; + + public ArrayList getNames() { return names; } + public HelloQueryResponse setNames(ArrayList value) { this.names = value; return this; } + private static Object responseType = new TypeToken>(){}.getType(); + public Object getResponseType() { return responseType; } + } + + public static class HelloWithEnum + { + public EnumType enumProp = null; + public EnumTypeFlags enumTypeFlags = null; + public EnumWithValues enumWithValues = null; + public EnumType nullableEnumProp = null; + public EnumFlags enumFlags = null; + public EnumAsInt enumAsInt = null; + public EnumStyle enumStyle = null; + public EnumStyleMembers enumStyleMembers = null; + + public EnumType getEnumProp() { return enumProp; } + public HelloWithEnum setEnumProp(EnumType value) { this.enumProp = value; return this; } + public EnumTypeFlags getEnumTypeFlags() { return enumTypeFlags; } + public HelloWithEnum setEnumTypeFlags(EnumTypeFlags value) { this.enumTypeFlags = value; return this; } + public EnumWithValues getEnumWithValues() { return enumWithValues; } + public HelloWithEnum setEnumWithValues(EnumWithValues value) { this.enumWithValues = value; return this; } + public EnumType getNullableEnumProp() { return nullableEnumProp; } + public HelloWithEnum setNullableEnumProp(EnumType value) { this.nullableEnumProp = value; return this; } + public EnumFlags getEnumFlags() { return enumFlags; } + public HelloWithEnum setEnumFlags(EnumFlags value) { this.enumFlags = value; return this; } + public EnumAsInt getEnumAsInt() { return enumAsInt; } + public HelloWithEnum setEnumAsInt(EnumAsInt value) { this.enumAsInt = value; return this; } + public EnumStyle getEnumStyle() { return enumStyle; } + public HelloWithEnum setEnumStyle(EnumStyle value) { this.enumStyle = value; return this; } + public EnumStyleMembers getEnumStyleMembers() { return enumStyleMembers; } + public HelloWithEnum setEnumStyleMembers(EnumStyleMembers value) { this.enumStyleMembers = value; return this; } + } + + public static class HelloWithEnumList + { + public ArrayList enumProp = null; + public ArrayList enumWithValues = null; + public ArrayList nullableEnumProp = null; + public ArrayList enumFlags = null; + public ArrayList enumStyle = null; + + public ArrayList getEnumProp() { return enumProp; } + public HelloWithEnumList setEnumProp(ArrayList value) { this.enumProp = value; return this; } + public ArrayList getEnumWithValues() { return enumWithValues; } + public HelloWithEnumList setEnumWithValues(ArrayList value) { this.enumWithValues = value; return this; } + public ArrayList getNullableEnumProp() { return nullableEnumProp; } + public HelloWithEnumList setNullableEnumProp(ArrayList value) { this.nullableEnumProp = value; return this; } + public ArrayList getEnumFlags() { return enumFlags; } + public HelloWithEnumList setEnumFlags(ArrayList value) { this.enumFlags = value; return this; } + public ArrayList getEnumStyle() { return enumStyle; } + public HelloWithEnumList setEnumStyle(ArrayList value) { this.enumStyle = value; return this; } + } + + public static class HelloWithEnumMap + { + public HashMap enumProp = null; + public HashMap

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.