diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml new file mode 100644 index 00000000..ac397818 --- /dev/null +++ b/.github/workflows/build-test-publish.yml @@ -0,0 +1,58 @@ +name: Build and Publish to GitHub Packages + +on: + push: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup Java + uses: actions/setup-java@v2 + with: + java-version: '17' + distribution: 'adopt' + + - name: Cache Gradle packages + uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle + + - name: Set up permissions client + run: chmod +x ./src/AndroidClient/gradlew + + - name: Build client + working-directory: ./src/AndroidClient + run: ./gradlew client:build + + - name: Build and Publish Client + env: + USERNAME_GITHUB: ${{ github.actor }} + TOKEN_GITHUB: ${{ secrets.GITHUB_TOKEN }} + VERSION_SUFFIX: ${{ github.run_number }} + working-directory: ./src/AndroidClient + run: ./gradlew client:publishAllPublicationsToGitHubPackagesRepository -PversionSuffix=$VERSION_SUFFIX + + - name: Build android + working-directory: ./src/AndroidClient + run: ./gradlew android:build + + - name: Build and Publish Android + env: + USERNAME_GITHUB: ${{ github.actor }} + TOKEN_GITHUB: ${{ secrets.GITHUB_TOKEN }} + VERSION_SUFFIX: ${{ github.run_number }} + working-directory: ./src/AndroidClient + run: ./gradlew android:publishAllPublicationsToGitHubPackagesRepository -PversionSuffix=$VERSION_SUFFIX + +# env: +# OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} +# OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} diff --git a/.github/workflows/publish-android-maven-central.yml b/.github/workflows/publish-android-maven-central.yml new file mode 100644 index 00000000..6c159161 --- /dev/null +++ b/.github/workflows/publish-android-maven-central.yml @@ -0,0 +1,43 @@ +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: + +jobs: + publish: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup Java + uses: actions/setup-java@v2 + with: + java-version: '21' + distribution: 'adopt' + + - name: Cache Gradle packages + uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle + + - name: Set up permissions client + run: chmod +x ./src/AndroidClient/gradlew + + - name: Build android + working-directory: ./src/AndroidClient + run: ./gradlew android:build + + - name: Publish to Maven Central + env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} + working-directory: ./src/AndroidClient + run: ./gradlew android:publishAllPublicationsToOSSRHRepository diff --git a/.github/workflows/publish-client-maven-central.yml b/.github/workflows/publish-client-maven-central.yml new file mode 100644 index 00000000..3c6a535c --- /dev/null +++ b/.github/workflows/publish-client-maven-central.yml @@ -0,0 +1,43 @@ +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: + +jobs: + publish: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup Java + uses: actions/setup-java@v2 + with: + java-version: '21' + distribution: 'adopt' + + - name: Cache Gradle packages + uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle + + - name: Set up permissions client + run: chmod +x ./src/AndroidClient/gradlew + + - name: Build client + working-directory: ./src/AndroidClient + run: ./gradlew client:build + + - name: Publish to Maven Central + env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} + working-directory: ./src/AndroidClient + run: ./gradlew client:publishAllPublicationsToOSSRHRepository diff --git a/.gitignore b/.gitignore index b57d78b4..466d0cad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +vars.json + # Built application files *.apk *.ap_ @@ -43,3 +45,6 @@ src/ServiceStackEclipse/**/target src/ServiceStackEclipse/**/.settings src/AndroidClient/client/pom.xml +.idea/ +src/AndroidClient/.idea/**/* + diff --git a/.idea/ServiceStack.Java.iml b/.idea/ServiceStack.Java.iml index c2ece305..ac9e42a7 100644 --- a/.idea/ServiceStack.Java.iml +++ b/.idea/ServiceStack.Java.iml @@ -18,6 +18,7 @@ + \ No newline at end of file diff --git a/README.md b/README.md index 3827ace3..56bd7692 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,45 @@ 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: + +```java +const client = new JsonServiceClient(baseUrl); +client.setBasePath(); +``` + ## Install ### [Install ServiceStack IDEA Plugin on Android Studio and IntelliJ](https://github.com/ServiceStack/ServiceStack/wiki/Java-Add-ServiceStack-Reference#servicestack-idea-android-studio-plugin) 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/caches/build_file_checksums.ser b/src/AndroidClient/.idea/caches/build_file_checksums.ser deleted file mode 100644 index 5d7fb51d..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 681f41ae..00000000 --- a/src/AndroidClient/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - \ 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 4e5f2d1e..00000000 --- a/src/AndroidClient/.idea/gradle.xml +++ /dev/null @@ -1,27 +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 b0c7b20c..00000000 --- a/src/AndroidClient/.idea/misc.xml +++ /dev/null @@ -1,38 +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 61f53ccf..00000000 --- a/src/AndroidClient/.idea/modules.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/.idea/runConfigurations.xml b/src/AndroidClient/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460d..00000000 --- a/src/AndroidClient/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/AndroidClient.iml b/src/AndroidClient/AndroidClient.iml index fa760751..ce2b513e 100644 --- a/src/AndroidClient/AndroidClient.iml +++ b/src/AndroidClient/AndroidClient.iml @@ -1,19 +1,12 @@ - - - - - - - - + + + - + \ No newline at end of file diff --git a/src/AndroidClient/android/android.iml b/src/AndroidClient/android/android.iml deleted file mode 100644 index b513b716..00000000 --- a/src/AndroidClient/android/android.iml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AndroidClient/android/build.gradle b/src/AndroidClient/android/build.gradle index 349aba14..2c37cd87 100644 --- a/src/AndroidClient/android/build.gradle +++ b/src/AndroidClient/android/build.gradle @@ -1,28 +1,40 @@ +// Apply necessary plugins apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' -apply plugin: 'com.jfrog.bintray' +apply plugin: 'maven-publish' +apply plugin: 'signing' -version = "1.0.43" +// Define the version and group for the Maven package +version = "1.1.5" +group = "net.servicestack" +if (project.hasProperty('versionSuffix')) { + version = "${version}-${versionSuffix}" +} + + +// Specify dependencies dependencies { - implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6' - implementation 'com.squareup.okhttp3:okhttp:3.12.1' + 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.12' + 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' } +// Android specific configurations android { - compileSdkVersion 29 - buildToolsVersion '29.0.2' + namespace "net.servicestack.android" + compileSdk 34 + + lintOptions { + abortOnError false + } defaultConfig { minSdkVersion 15 - targetSdkVersion 29 - versionCode 1 - versionName version + targetSdkVersion 34 testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' } @@ -37,74 +49,82 @@ android { } } -Properties properties = System.properties; -if(properties.getProperty("bintray.user", null) == null) { - properties.load(project.file('./local.properties').newDataInputStream()) -} +// Configure the publishing block for Maven Central deployment +publishing { + publications { + mavenJava(MavenPublication) { + artifact("$buildDir/outputs/aar/${project.name}-release.aar") -def siteUrl = 'https://github.com/ServiceStack/ServiceStack.Java' // Homepage URL of the library -def gitUrl = 'https://github.com/ServiceStack/ServiceStack.Java.git' // Git repository URL -group = "net.servicestack" // Maven Group ID for the artifact - -bintray { - user = properties.getProperty("bintray.user") - key = properties.getProperty("bintray.apiKey") - - configurations = ['archives'] - pkg { - repo = "maven" - name = "ServiceStack.Android" - websiteUrl = siteUrl - vcsUrl = gitUrl - licenses = ["BSD 3-Clause"] - publish = properties.getProperty('bintray.publish') == 'true' - userOrg = 'servicestack' - } -} - -install { - repositories.mavenInstaller { - // This generates POM.xml with proper parameters - pom { - project { - packaging 'aar' + groupId = group + artifactId = 'android' + version = version - // Add your description here - name 'ServiceStack.Android' - description 'A client library to call your ServiceStack webservices for Android clients.' - url siteUrl + pom { + name = 'ServiceStack.Android' + description = 'A client library to call your ServiceStack webservices for Android clients.' + url = 'https://github.com/ServiceStack/ServiceStack.Java' - // Set your license licenses { license { - name 'The BSD 3-Clause License' - url 'https://servicestack.net/bsd-license.txt' + name = 'The BSD 3-Clause License' + url = 'https://servicestack.net/bsd-license.txt' } } developers { developer { - id 'mythz' - name 'Demis Bellot' - email 'team@servicestack.net' + id = 'mythz' + name = 'Demis Bellot' + email = 'team@servicestack.net' } developer { - id 'layoric' - name 'Darren Reid' - email 'team@servicestack.net' + id = 'layoric' + name = 'Darren Reid' + email = 'team@servicestack.net' } } - scm { - connection 'https://github.com/ServiceStack/ServiceStack.Java' - developerConnection 'https://github.com/ServiceStack/ServiceStack.Java' - url 'https://github.com/ServiceStack/ServiceStack.Java' + scm { + connection = 'https://github.com/ServiceStack/ServiceStack.Java.git' + developerConnection = 'https://github.com/ServiceStack/ServiceStack.Java.git' + url = 'https://github.com/ServiceStack/ServiceStack.Java' } } } } -} -repositories { - mavenCentral() + repositories { + maven { + name = 'OSSRH' + url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") + credentials { + username = project.findProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME") + password = project.findProperty("ossrhPassword") ?: System.getenv("OSSRH_TOKEN") + } + } + maven { + name = 'GitHubPackages' + url = uri("https://maven.pkg.github.com/ServiceStack/ServiceStack.Java") + + credentials { + username = project.findProperty("gpr.user") ?: System.getenv("USERNAME_GITHUB") + password = project.findProperty("gpr.token") ?: System.getenv("TOKEN_GITHUB") + } + } + } } + +// Check if the environment variables are set +def signingKey = System.getenv('SIGNING_KEY') +def signingPassword = System.getenv('SIGNING_PASSWORD') + +// Conditionally apply the signing plugin and configuration +if (signingKey && signingPassword) { + println "Signing enabled" + signing { + useInMemoryPgpKeys(signingKey, signingPassword) + sign publishing.publications.mavenJava + } +} else { + println "Signing disabled" +} \ No newline at end of file diff --git a/src/AndroidClient/android/src/androidTest/java/chat/chatdtos.java b/src/AndroidClient/android/src/androidTest/java/chat/chatdtos.java deleted file mode 100644 index 1189595a..00000000 --- a/src/AndroidClient/android/src/androidTest/java/chat/chatdtos.java +++ /dev/null @@ -1,273 +0,0 @@ -/* Options: -Date: 2017-02-12 03:54:05 -Version: 4.00 -Tip: To override a DTO option, remove "//" prefix before updating -BaseUrl: http://chat.servicestack.net - -Package: chat -GlobalNamespace: chatdtos -//AddPropertyAccessors: True -//SettersReturnThis: True -//AddServiceStackTypes: True -//AddResponseStatus: False -//AddDescriptionAsComments: True -//AddImplicitVersion: -//IncludeTypes: -ExcludeTypes: Authenticate,AuthenticateResponse,AssignRoles,AssignRolesResponse,UnAssignRoles,UnAssignRolesResponse -//TreatTypesAsStrings: -//DefaultImports: java.math.*,java.util.*,net.servicestack.client.*,com.google.gson.annotations.*,com.google.gson.reflect.* -*/ - -package chat; - -import java.math.*; -import java.util.*; -import net.servicestack.client.*; -import com.google.gson.annotations.*; -import com.google.gson.reflect.*; - -public class chatdtos -{ - - @Route("/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("/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("/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("/reset") - public static class ClearChatHistory implements IReturnVoid - { - - } - - @Route("/reset-serverevents") - public static class ResetServerEvents implements IReturnVoid - { - - } - - @Route("/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("/account") - public static class GetUserDetails implements IReturn - { - - private static Object responseType = GetUserDetailsResponse.class; - public Object getResponseType() { return responseType; } - } - - public static class ChatMessage - { - public Long id = null; - public String channel = null; - public String fromUserId = null; - public String fromName = null; - public String displayName = null; - public String message = null; - public String userAuthId = null; - @SerializedName("private") public Boolean Private = null; - - public Long getId() { return id; } - public ChatMessage setId(Long value) { this.id = value; return this; } - public String getChannel() { return channel; } - public ChatMessage setChannel(String value) { this.channel = value; return this; } - public String getFromUserId() { return fromUserId; } - public ChatMessage setFromUserId(String value) { this.fromUserId = value; return this; } - public String getFromName() { return fromName; } - public ChatMessage setFromName(String value) { this.fromName = value; return this; } - public String getDisplayName() { return displayName; } - public ChatMessage setDisplayName(String value) { this.displayName = value; return this; } - public String getMessage() { return message; } - public ChatMessage setMessage(String value) { this.message = value; return this; } - public String getUserAuthId() { return userAuthId; } - public ChatMessage setUserAuthId(String value) { this.userAuthId = value; return this; } - public Boolean isPrivate() { return Private; } - public ChatMessage setPrivate(Boolean value) { this.Private = value; return this; } - } - - public static class GetChatHistoryResponse - { - public ArrayList results = null; - public ResponseStatus responseStatus = null; - - public ArrayList getResults() { return results; } - public GetChatHistoryResponse setResults(ArrayList value) { this.results = value; return this; } - public ResponseStatus getResponseStatus() { return responseStatus; } - public GetChatHistoryResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } - } - - public static class GetUserDetailsResponse - { - public String provider = null; - public String userId = null; - public String userName = null; - public String fullName = null; - public String displayName = null; - public String firstName = null; - public String lastName = null; - public String company = null; - public String email = null; - public String phoneNumber = null; - public Date birthDate = null; - public String birthDateRaw = null; - public String address = null; - public String address2 = null; - public String city = null; - public String state = null; - public String country = null; - public String culture = null; - public String gender = null; - public String language = null; - public String mailAddress = null; - public String nickname = null; - public String postalCode = null; - public String timeZone = null; - - public String getProvider() { return provider; } - public GetUserDetailsResponse setProvider(String value) { this.provider = value; return this; } - public String getUserId() { return userId; } - public GetUserDetailsResponse setUserId(String value) { this.userId = value; return this; } - public String getUserName() { return userName; } - public GetUserDetailsResponse setUserName(String value) { this.userName = value; return this; } - public String getFullName() { return fullName; } - public GetUserDetailsResponse setFullName(String value) { this.fullName = value; return this; } - public String getDisplayName() { return displayName; } - public GetUserDetailsResponse setDisplayName(String value) { this.displayName = value; return this; } - public String getFirstName() { return firstName; } - public GetUserDetailsResponse setFirstName(String value) { this.firstName = value; return this; } - public String getLastName() { return lastName; } - public GetUserDetailsResponse setLastName(String value) { this.lastName = value; return this; } - public String getCompany() { return company; } - public GetUserDetailsResponse setCompany(String value) { this.company = value; return this; } - public String getEmail() { return email; } - public GetUserDetailsResponse setEmail(String value) { this.email = value; return this; } - public String getPhoneNumber() { return phoneNumber; } - public GetUserDetailsResponse setPhoneNumber(String value) { this.phoneNumber = value; return this; } - public Date getBirthDate() { return birthDate; } - public GetUserDetailsResponse setBirthDate(Date value) { this.birthDate = value; return this; } - public String getBirthDateRaw() { return birthDateRaw; } - public GetUserDetailsResponse setBirthDateRaw(String value) { this.birthDateRaw = value; return this; } - public String getAddress() { return address; } - public GetUserDetailsResponse setAddress(String value) { this.address = value; return this; } - public String getAddress2() { return address2; } - public GetUserDetailsResponse setAddress2(String value) { this.address2 = value; return this; } - public String getCity() { return city; } - public GetUserDetailsResponse setCity(String value) { this.city = value; return this; } - public String getState() { return state; } - public GetUserDetailsResponse setState(String value) { this.state = value; return this; } - public String getCountry() { return country; } - public GetUserDetailsResponse setCountry(String value) { this.country = value; return this; } - public String getCulture() { return culture; } - public GetUserDetailsResponse setCulture(String value) { this.culture = value; return this; } - public String getGender() { return gender; } - public GetUserDetailsResponse setGender(String value) { this.gender = value; return this; } - public String getLanguage() { return language; } - public GetUserDetailsResponse setLanguage(String value) { this.language = value; return this; } - public String getMailAddress() { return mailAddress; } - public GetUserDetailsResponse setMailAddress(String value) { this.mailAddress = value; return this; } - public String getNickname() { return nickname; } - public GetUserDetailsResponse setNickname(String value) { this.nickname = value; return this; } - public String getPostalCode() { return postalCode; } - public GetUserDetailsResponse setPostalCode(String value) { this.postalCode = value; return this; } - public String getTimeZone() { return timeZone; } - public GetUserDetailsResponse setTimeZone(String value) { this.timeZone = value; return this; } - } - - public static class CustomType - { - public Integer id = null; - public String name = null; - - public Integer getId() { return id; } - public CustomType setId(Integer value) { this.id = value; return this; } - public String getName() { return name; } - public CustomType setName(String value) { this.name = value; return this; } - } - - public static class SetterType - { - public Integer id = null; - public String name = null; - - public Integer getId() { return id; } - public SetterType setId(Integer value) { this.id = value; return this; } - public String getName() { return name; } - public SetterType setName(String value) { this.name = value; return this; } - } - -} diff --git a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/AndroidServiceClientTests.java b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/AndroidServiceClientTests.java index 7c84fc3a..5c45597b 100644 --- a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/AndroidServiceClientTests.java +++ b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/AndroidServiceClientTests.java @@ -13,7 +13,7 @@ public AndroidServiceClientTests() { Log.Instance = new AndroidLogProvider("ZZZ"); } - AndroidServiceClient client = new AndroidServiceClient("https://www.techstacks.io"); + AndroidServiceClient client = new AndroidServiceClient("https://techstacks.io"); @Test public void test(){ diff --git a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/ApplicationTest.java b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/ApplicationTest.java index 70331d83..2d1b0725 100644 --- a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/ApplicationTest.java +++ b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/ApplicationTest.java @@ -26,7 +26,7 @@ @RunWith(AndroidJUnit4.class) public class ApplicationTest { - AndroidServiceClient client = new AndroidServiceClient("http://techstacks.io"); + AndroidServiceClient client = new AndroidServiceClient("https://techstacks.io"); @Test public void test_Can_download_image_bytes(){ diff --git a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/ServerEventClientTests.java b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/ServerEventClientTests.java index 952788dd..d7978be3 100644 --- a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/ServerEventClientTests.java +++ b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/ServerEventClientTests.java @@ -2,32 +2,18 @@ import android.os.Build; import android.support.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; +import junit.framework.TestCase; +import static net.servicestack.android.test.dtos.*; import static org.junit.Assert.assertArrayEquals; import net.servicestack.client.JsonUtils; import net.servicestack.client.Log; -import net.servicestack.client.Utils; -import net.servicestack.client.sse.ExceptionCallback; -import net.servicestack.client.sse.GetEventSubscribers; -import net.servicestack.client.sse.ServerEventCallback; -import net.servicestack.client.sse.ServerEventConnect; -import net.servicestack.client.sse.ServerEventConnectCallback; -import net.servicestack.client.sse.ServerEventJoin; -import net.servicestack.client.sse.ServerEventLeave; -import net.servicestack.client.sse.ServerEventMessage; -import net.servicestack.client.sse.ServerEventMessageCallback; -import net.servicestack.client.sse.ServerEventUser; -import net.servicestack.client.sse.ServerEventsClient; -import net.servicestack.client.sse.SingletonInstanceResolver; +import net.servicestack.client.sse.*; import net.servicestack.func.Action; import net.servicestack.func.Func; import net.servicestack.func.Predicate; +import org.junit.Test; +import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.HashMap; @@ -35,13 +21,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static chat.chatdtos.ChatMessage; -import static chat.chatdtos.CustomType; -import static chat.chatdtos.PostChatToChannel; -import static chat.chatdtos.PostObjectToChannel; -import static chat.chatdtos.PostRawToChannel; -import static chat.chatdtos.ResetServerEvents; -import static chat.chatdtos.SetterType; /** * Created by mythz on 2/10/2017. @@ -49,7 +28,7 @@ @android.support.annotation.RequiresApi(api = Build.VERSION_CODES.KITKAT) @RunWith(AndroidJUnit4.class) -public class ServerEventClientTests { +public class ServerEventClientTests extends TestCase { public ServerEventClientTests() { Log.setInstance(new AndroidLogProvider("ZZZ", true)); @@ -65,7 +44,7 @@ public ServerEventsClient createServerEventsClient(String baseUrl, String... cha public void Can_connect_to_ServerEventsStream() throws Exception { final CountDownLatch signal = new CountDownLatch(1); - try (ServerEventsClient client = createServerEventsClient("http://chat.servicestack.net", "home") + try (ServerEventsClient client = createServerEventsClient("https://chat.netcore.io", "home") .setOnConnect(new ServerEventConnectCallback() { @Override public void execute(ServerEventConnect e) { @@ -82,13 +61,13 @@ public void execute(ServerEventConnect e) { public void Does_fire_onJoin_events() throws Exception { final CountDownLatch signal = new CountDownLatch(1); - try(ServerEventsClient client = createServerEventsClient("http://chat.servicestack.net", "home")) + try(ServerEventsClient client = createServerEventsClient("https://chat.netcore.io", "home")) { client .setOnConnect(new ServerEventConnectCallback() { @Override public void execute(ServerEventConnect e) { - assertTrue(e.getHeartbeatUrl().startsWith("http://chat.servicestack.net")); + assertTrue(e.getHeartbeatUrl().startsWith("https://chat.netcore.io")); } }) .setOnCommand(new ServerEventMessageCallback() { @@ -114,7 +93,7 @@ public void Does_fire_onJoin_events_for_multiple_Channels() throws Exception { final String[] channels = new String[] { "A", "B", "C" }; final List joinMsgs = new ArrayList<>(); - try (ServerEventsClient client = createServerEventsClient("http://chat.servicestack.net", channels)) + try (ServerEventsClient client = createServerEventsClient("https://chat.netcore.io", channels)) { client .setOnCommand(new ServerEventMessageCallback() { @@ -143,7 +122,7 @@ public void execute(ServerEventMessage e) { private void clearPreviousRun(String[] channels) throws Exception { final CountDownLatch signal = new CountDownLatch(1); - try (ServerEventsClient client = createServerEventsClient("http://chat.servicestack.net", channels) + try (ServerEventsClient client = createServerEventsClient("https://chat.netcore.io", channels) .setOnConnect(new ServerEventConnectCallback() { @Override public void execute(ServerEventConnect e) { @@ -170,7 +149,7 @@ public void Does_fire_all_callbacks() throws Exception { final List commands = new ArrayList<>(); final List errors = new ArrayList<>(); - try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net") + try(ServerEventsClient client1 = createServerEventsClient("https://chat.netcore.io") .setOnConnect(new ServerEventConnectCallback() { @Override public void execute(ServerEventConnect e) { @@ -213,7 +192,7 @@ public void execute(Exception e) { connectMsgs.clear(); commands.clear(); - try(ServerEventsClient client2 = createServerEventsClient("http://chat.servicestack.net") + try(ServerEventsClient client2 = createServerEventsClient("https://chat.netcore.io") .setOnConnect(new ServerEventConnectCallback() { @Override public void execute(ServerEventConnect e) { @@ -297,7 +276,7 @@ public void Does_receive_messages() throws Exception { final List msgs2 = new ArrayList<>(); try ( - ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net") + ServerEventsClient client1 = createServerEventsClient("https://chat.netcore.io") .setOnConnect(new ServerEventConnectCallback() { @Override public void execute(ServerEventConnect e) { @@ -317,7 +296,7 @@ public void execute(ServerEventMessage e) { } }); - ServerEventsClient client2 = createServerEventsClient("http://chat.servicestack.net") + ServerEventsClient client2 = createServerEventsClient("https://chat.netcore.io") .setOnConnect(new ServerEventConnectCallback() { @Override public void execute(ServerEventConnect e) { @@ -399,7 +378,7 @@ public void Does_send_multiple_heartbeats() throws Exception { final CountDownLatch signal = new CountDownLatch(1); final List heartbeats = new ArrayList<>(); - try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net") + try(ServerEventsClient client1 = createServerEventsClient("https://chat.netcore.io") .setOnConnect(new ServerEventConnectCallback() { @Override public void execute(ServerEventConnect e) { @@ -427,7 +406,7 @@ public void Does_reconnect_on_lost_connection() throws Exception { final List connectMsgs = new ArrayList<>(); final List msgs1 = new ArrayList<>(); - try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net") + try(ServerEventsClient client1 = createServerEventsClient("https://chat.netcore.io") .setOnConnect(new ServerEventConnectCallback() { @Override public void execute(ServerEventConnect e) { @@ -454,7 +433,7 @@ public void execute(ServerEventMessage e) { client1.getServiceClient().post(new ResetServerEvents()); - try(ServerEventsClient client2 = createServerEventsClient("http://chat.servicestack.net") + try(ServerEventsClient client2 = createServerEventsClient("https://chat.netcore.io") .setOnConnect(new ServerEventConnectCallback() { @Override public void execute(ServerEventConnect e) { @@ -487,7 +466,7 @@ public void Does_send_message_to_Handler() throws Exception { final List chatMsgs = new ArrayList<>(); - try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net") + try(ServerEventsClient client1 = createServerEventsClient("https://chat.netcore.io") .registerHandler("chat", new ServerEventCallback() { @Override public void execute(ServerEventsClient client, ServerEventMessage e) { @@ -522,7 +501,7 @@ public void execute(ServerEventsClient client, ServerEventMessage e) { public void Does_send_message_to_named_receiver() throws Exception { final List msgs1 = new ArrayList<>(); - try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net") + try(ServerEventsClient client1 = createServerEventsClient("https://chat.netcore.io") .registerNamedReceiver("test", TestNamedReceiver.class) .setOnMessage(new ServerEventMessageCallback() { @Override @@ -592,7 +571,7 @@ public void execute(ServerEventMessage e) { public void Does_send_message_to_global_receiver() throws Exception { final List msgs1 = new ArrayList<>(); - try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net") + try(ServerEventsClient client1 = createServerEventsClient("https://chat.netcore.io") .registerReceiver(TestGlobalReceiver.class) .setOnMessage(new ServerEventMessageCallback() { @Override @@ -622,7 +601,7 @@ public void execute(ServerEventMessage e) { public void Does_set_properties_on_global_receiver() throws Exception { final List msgs1 = new ArrayList<>(); - try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net") + try(ServerEventsClient client1 = createServerEventsClient("https://chat.netcore.io") .registerReceiver(TestGlobalReceiver.class) .setOnMessage(new ServerEventMessageCallback() { @Override @@ -652,7 +631,7 @@ public void execute(ServerEventMessage e) { public void Does_send_raw_string_messages() throws Exception { final List msgs1 = new ArrayList<>(); - try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net") + try(ServerEventsClient client1 = createServerEventsClient("https://chat.netcore.io") .registerReceiver(TestJavaScriptReceiver.class) .registerNamedReceiver("css", TestJavaScriptReceiver.class) .setOnMessage(new ServerEventMessageCallback() { @@ -717,7 +696,7 @@ public void execute(ServerEventMessage e) { public void Can_reuse_same_instance() throws Exception { final List msgs1 = new ArrayList<>(); - try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net") + try(ServerEventsClient client1 = createServerEventsClient("https://chat.netcore.io") .registerReceiver(TestJavaScriptReceiver.class) .registerNamedReceiver("css", TestJavaScriptReceiver.class) .setResolver(new SingletonInstanceResolver()) @@ -761,7 +740,7 @@ public void Does_receive_messages_on_to_clients_subscribed_on_multiple_channels( final List msgsABC = new ArrayList<>(); final List msgsABCD = new ArrayList<>(); - try(ServerEventsClient clientA = createServerEventsClient("http://chat.servicestack.net", "A") + try(ServerEventsClient clientA = createServerEventsClient("https://chat.netcore.io", "A") .setOnMessage(new ServerEventMessageCallback() { @Override public void execute(ServerEventMessage e) { @@ -769,7 +748,7 @@ public void execute(ServerEventMessage e) { } }) .start(); - ServerEventsClient clientAB = createServerEventsClient("http://chat.servicestack.net", "A", "B") + ServerEventsClient clientAB = createServerEventsClient("https://chat.netcore.io", "A", "B") .setOnMessage(new ServerEventMessageCallback() { @Override public void execute(ServerEventMessage e) { @@ -777,7 +756,7 @@ public void execute(ServerEventMessage e) { } }) .start(); - ServerEventsClient clientABC = createServerEventsClient("http://chat.servicestack.net", "A", "B", "C") + ServerEventsClient clientABC = createServerEventsClient("https://chat.netcore.io", "A", "B", "C") .setOnMessage(new ServerEventMessageCallback() { @Override public void execute(ServerEventMessage e) { @@ -785,7 +764,7 @@ public void execute(ServerEventMessage e) { } }) .start(); - ServerEventsClient clientABCD = createServerEventsClient("http://chat.servicestack.net", "A", "B", "C", "D") + ServerEventsClient clientABCD = createServerEventsClient("https://chat.netcore.io", "A", "B", "C", "D") .setOnMessage(new ServerEventMessageCallback() { @Override public void execute(ServerEventMessage e) { @@ -843,7 +822,7 @@ public void Does_receive_all_join_and_leave_messages() throws Exception { final List leaveB = new ArrayList<>(); final List leaveAB = new ArrayList<>(); - try(ServerEventsClient clientA = createServerEventsClient("http://chat.servicestack.net", "A") + try(ServerEventsClient clientA = createServerEventsClient("https://chat.netcore.io", "A") .setOnCommand(new ServerEventMessageCallback() { @Override public void execute(ServerEventMessage e) { @@ -854,7 +833,7 @@ public void execute(ServerEventMessage e) { } } }); - ServerEventsClient clientB = createServerEventsClient("http://chat.servicestack.net", "B") + ServerEventsClient clientB = createServerEventsClient("https://chat.netcore.io", "B") .setOnCommand(new ServerEventMessageCallback() { @Override public void execute(ServerEventMessage e) { @@ -865,7 +844,7 @@ public void execute(ServerEventMessage e) { } } }); - ServerEventsClient clientAB = createServerEventsClient("http://chat.servicestack.net", "A", "B") + ServerEventsClient clientAB = createServerEventsClient("https://chat.netcore.io", "A", "B") .setOnCommand(new ServerEventMessageCallback() { @Override public void execute(ServerEventMessage e) { @@ -935,7 +914,7 @@ public void MultiChannel_Does_receive_all_join_and_leave_messages() throws Excep final List leaveB = new ArrayList<>(); final List leaveAB = new ArrayList<>(); - try(ServerEventsClient clientAB = createServerEventsClient("http://chat.servicestack.net", "A", "B") + try(ServerEventsClient clientAB = createServerEventsClient("https://chat.netcore.io", "A", "B") .setOnCommand(new ServerEventMessageCallback() { @Override public void execute(ServerEventMessage e) { @@ -946,7 +925,7 @@ public void execute(ServerEventMessage e) { } } }); - ServerEventsClient clientA = createServerEventsClient("http://chat.servicestack.net", "A") + ServerEventsClient clientA = createServerEventsClient("https://chat.netcore.io", "A") .setOnCommand(new ServerEventMessageCallback() { @Override public void execute(ServerEventMessage e) { @@ -957,7 +936,7 @@ public void execute(ServerEventMessage e) { } } }); - ServerEventsClient clientB = createServerEventsClient("http://chat.servicestack.net", "B") + ServerEventsClient clientB = createServerEventsClient("https://chat.netcore.io", "B") .setOnCommand(new ServerEventMessageCallback() { @Override public void execute(ServerEventMessage e) { @@ -997,7 +976,7 @@ public void Can_subscribe_to_channels_whilst_connected() throws Exception { final List msgs1 = new ArrayList<>(); final List msgs2 = new ArrayList<>(); - try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net", "A") + try(ServerEventsClient client1 = createServerEventsClient("https://chat.netcore.io", "A") .setOnMessage(new ServerEventMessageCallback() { @Override public void execute(ServerEventMessage e) { @@ -1005,7 +984,7 @@ public void execute(ServerEventMessage e) { } }) .start(); - ServerEventsClient client2 = createServerEventsClient("http://chat.servicestack.net", "B") + ServerEventsClient client2 = createServerEventsClient("https://chat.netcore.io", "B") .setOnMessage(new ServerEventMessageCallback() { @Override public void execute(ServerEventMessage e) { @@ -1060,7 +1039,7 @@ public void Can_unsubscribe_from_channels_whilst_connected() throws Exception { final List msgs1 = new ArrayList<>(); final List msgs2 = new ArrayList<>(); - try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net", "A","B","C") + try(ServerEventsClient client1 = createServerEventsClient("https://chat.netcore.io", "A","B","C") .setOnMessage(new ServerEventMessageCallback() { @Override public void execute(ServerEventMessage e) { @@ -1069,7 +1048,7 @@ public void execute(ServerEventMessage e) { }) .start() .waitTillConnected(); - ServerEventsClient client2 = createServerEventsClient("http://chat.servicestack.net", "B","C") + ServerEventsClient client2 = createServerEventsClient("https://chat.netcore.io", "B","C") .setOnMessage(new ServerEventMessageCallback() { @Override public void execute(ServerEventMessage e) { @@ -1130,7 +1109,7 @@ public void apply(ServerEventMessage e) { } }; - try (ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net") + try (ServerEventsClient client1 = createServerEventsClient("https://chat.netcore.io") .addListener("customEvent", handler) .addListener("customEvent", new Action() { @Override @@ -1140,7 +1119,7 @@ public void apply(ServerEventMessage e) { }) .start() .waitTillConnected(); - ServerEventsClient client2 = createServerEventsClient("http://chat.servicestack.net") + ServerEventsClient client2 = createServerEventsClient("https://chat.netcore.io") .start() .waitTillConnected()) { diff --git a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestGlobalReceiver.java b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestGlobalReceiver.java index 19fe2d88..26796172 100644 --- a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestGlobalReceiver.java +++ b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestGlobalReceiver.java @@ -1,11 +1,10 @@ package net.servicestack.android; +import static net.servicestack.android.test.dtos.*; import net.servicestack.client.JsonUtils; import net.servicestack.client.sse.ServerEventMessage; import net.servicestack.client.sse.ServerEventReceiver; -import static chat.chatdtos.*; - /** * Created by mythz on 2/12/2017. */ diff --git a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestJavaScriptReceiver.java b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestJavaScriptReceiver.java index 643f7ceb..85f239ea 100644 --- a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestJavaScriptReceiver.java +++ b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestJavaScriptReceiver.java @@ -1,12 +1,9 @@ package net.servicestack.android; +import static net.servicestack.android.test.dtos.*; import net.servicestack.client.sse.ServerEventMessage; import net.servicestack.client.sse.ServerEventReceiver; -import chat.chatdtos; - -import static chat.chatdtos.*; - /** * Created by mythz on 2/12/2017. */ diff --git a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestNamedReceiver.java b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestNamedReceiver.java index 984cf1c0..e2074d9e 100644 --- a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestNamedReceiver.java +++ b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestNamedReceiver.java @@ -1,10 +1,10 @@ package net.servicestack.android; +import static net.servicestack.android.test.dtos.*; import net.servicestack.client.JsonUtils; import net.servicestack.client.sse.ServerEventMessage; import net.servicestack.client.sse.ServerEventReceiver; -import static chat.chatdtos.*; /** * Created by mythz on 2/11/2017. 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/techstacks/TechStacksServiceTests.java b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/techstacks/TechStacksServiceTests.java index 17b2a2cf..0a067992 100644 --- a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/techstacks/TechStacksServiceTests.java +++ b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/techstacks/TechStacksServiceTests.java @@ -38,7 +38,7 @@ public TechStacksServiceTests() { } - JsonServiceClient client = new JsonServiceClient("https://www.techstacks.io"); + JsonServiceClient client = new JsonServiceClient("https://techstacks.io"); @Test public void test_Can_GET_TechStacks_Overview(){ @@ -65,7 +65,7 @@ public void test_Can_GET_TechStacks_Overview_with_relative_url() { @Test public void test_Can_GET_TechStacks_Overview_with_absolute_url() { - OverviewResponse response = client.get("https://www.techstacks.io/overview", OverviewResponse.class); + OverviewResponse response = client.get("https://techstacks.io/overview", OverviewResponse.class); assertOverviewResponse(response); } @@ -150,7 +150,7 @@ public void test_Can_deserialize_Full_Option() { @Test public void test_does_handle_auth_failure() { - JsonServiceClient techStacksClient = new JsonServiceClient("http://techstacks.io/"); + JsonServiceClient techStacksClient = new JsonServiceClient("https://techstacks.io/"); int errorCode = 0; try { LockTechStack request = new LockTechStack(); @@ -197,16 +197,16 @@ public void test_Can_deserialize_Overview() throws IOException { assertEquals("TechStacks Website", techstacks.getName()); assertEquals("ServiceStack", techstacks.getVendorName()); assertTrue(techstacks.description.startsWith("This Website! ")); - assertEquals("http://techstacks.io", techstacks.getAppUrl()); + assertEquals("https://techstacks.io", techstacks.getAppUrl()); assertEquals("https://raw.githubusercontent.com/ServiceStack/Assets/master/img/livedemos/techstacks/screenshots/techstacks.png", techstacks.getScreenshotUrl()); - assertEquals(Utils.parseDate("2015-01-01T17:33:58.9892560"), techstacks.getCreated()); + assertEquals(Utils.fromDateTime("2015-01-01T17:33:58.9892560"), techstacks.getCreated()); assertEquals("layoric", techstacks.getCreatedBy()); - assertEquals(Utils.parseDate("2015-01-12T23:34:12.4516410"), techstacks.getLastModified()); + assertEquals(Utils.fromDateTime("2015-01-12T23:34:12.4516410"), techstacks.getLastModified()); assertEquals("layoric", techstacks.getLastModifiedBy()); assertTrue(techstacks.getIsLocked()); assertEquals("2", techstacks.getOwnerId()); assertEquals("techstacks-website", techstacks.getSlug()); - assertEquals(Utils.parseDate("2015-01-12T23:34:12.4516410"), techstacks.getLastStatusUpdate()); + assertEquals(Utils.fromDateTime("2015-01-12T23:34:12.4516410"), techstacks.getLastStatusUpdate()); ArrayList techstackChoices = techstacks.getTechnologyChoices(); assertEquals(10, techstackChoices.size()); @@ -219,9 +219,9 @@ public void test_Can_deserialize_Overview() throws IOException { assertEquals("https://servicestack.net", techChoice.getVendorUrl()); assertEquals("https://servicestack.net", techChoice.getProductUrl()); assertEquals("https://raw.githubusercontent.com/ServiceStack/Assets/master/img/livedemos/techstacks/servicestack-logo.png", techChoice.getLogoUrl()); - assertEquals(Utils.parseDate("2014-12-28T08:49:20.9542550"), techChoice.getCreated()); + assertEquals(Utils.fromDateTime("2014-12-28T08:49:20.9542550"), techChoice.getCreated()); assertEquals("demisbellot", techChoice.getCreatedBy()); - assertEquals(Utils.parseDate("2014-12-28T08:49:20.9542550"), techChoice.getLastModified()); + assertEquals(Utils.fromDateTime("2014-12-28T08:49:20.9542550"), techChoice.getLastModified()); assertEquals("demisbellot", techChoice.getLastModifiedBy()); assertEquals("1", techChoice.getOwnerId()); assertEquals("servicestack", techChoice.getSlug()); diff --git a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/techstacks/TechStacksServiceTestsAsync.java b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/techstacks/TechStacksServiceTestsAsync.java index cfe171bf..322b7eb2 100644 --- a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/techstacks/TechStacksServiceTestsAsync.java +++ b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/techstacks/TechStacksServiceTestsAsync.java @@ -33,7 +33,7 @@ public TechStacksServiceTestsAsync() { Log.Instance = new AndroidLogProvider("ZZZ"); } - AndroidServiceClient client = new AndroidServiceClient("https://www.techstacks.io"); + AndroidServiceClient client = new AndroidServiceClient("https://techstacks.io"); @Test public void test_Can_GET_TechStacks_Overview() throws InterruptedException { @@ -98,7 +98,7 @@ public void complete() { public void test_Can_GET_TechStacks_Overview_with_absolute_url_Async() throws InterruptedException { final CountDownLatch signal = new CountDownLatch(1); - client.getAsync("http://techstacks.io/overview", OverviewResponse.class, new AsyncResult() { + client.getAsync("https://techstacks.io/overview", OverviewResponse.class, new AsyncResult() { @Override public void success(OverviewResponse response) { assertOverviewResponse(response); diff --git a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/techstacks/dtos.java b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/techstacks/dtos.java index 94b85120..35bccedf 100644 --- a/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/techstacks/dtos.java +++ b/src/AndroidClient/android/src/androidTest/java/net/servicestack/android/techstacks/dtos.java @@ -1,8 +1,8 @@ /* Options: -Date: 2018-10-17 14:36:01 -Version: 5.10 +Date: 2021-03-01 09:48:32 +Version: 5.105 Tip: To override a DTO option, remove "//" prefix before updating -BaseUrl: https://www.techstacks.io +BaseUrl: https://techstacks.io Package: net.servicestack.android.techstacks //GlobalNamespace: dtos @@ -11,31 +11,20 @@ //AddServiceStackTypes: True //AddResponseStatus: False //AddDescriptionAsComments: True -//AddImplicitVersion: -//IncludeTypes: -//ExcludeTypes: -//TreatTypesAsStrings: +//AddImplicitVersion: +//IncludeTypes: +//ExcludeTypes: +//TreatTypesAsStrings: //DefaultImports: java.math.*,java.util.*,net.servicestack.client.*,com.google.gson.annotations.*,com.google.gson.reflect.* */ package net.servicestack.android.techstacks; -import com.google.gson.annotations.SerializedName; -import com.google.gson.reflect.TypeToken; - -import net.servicestack.client.AutoQueryViewer; -import net.servicestack.client.DataContract; -import net.servicestack.client.DataMember; -import net.servicestack.client.IPost; -import net.servicestack.client.IReturn; -import net.servicestack.client.IReturnVoid; -import net.servicestack.client.ResponseStatus; -import net.servicestack.client.Route; -import net.servicestack.client.StringLength; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; +import java.math.*; +import java.util.*; +import net.servicestack.client.*; +import com.google.gson.annotations.*; +import com.google.gson.reflect.*; public class dtos { @@ -43,22 +32,22 @@ public class dtos @Route("/ping") public static class Ping { - + } public static class DummyTypes { public ArrayList post = null; - + public ArrayList getPost() { return post; } public DummyTypes setPost(ArrayList value) { this.post = value; return this; } } @Route(Path="/orgs/{Id}", Verbs="GET") - public static class GetOrganization implements IReturn + public static class GetOrganization implements IReturn, IGet { public Integer id = null; - + public Integer getId() { return id; } public GetOrganization setId(Integer value) { this.id = value; return this; } private static Object responseType = GetOrganizationResponse.class; @@ -66,10 +55,10 @@ public static class GetOrganization implements IReturn } @Route(Path="/organizations/{Slug}", Verbs="GET") - public static class GetOrganizationBySlug implements IReturn + public static class GetOrganizationBySlug implements IReturn, IGet { public String slug = null; - + public String getSlug() { return slug; } public GetOrganizationBySlug setSlug(String value) { this.slug = value; return this; } private static Object responseType = GetOrganizationResponse.class; @@ -77,10 +66,10 @@ public static class GetOrganizationBySlug implements IReturn + public static class GetOrganizationMembers implements IReturn, IGet { public Integer id = null; - + public Integer getId() { return id; } public GetOrganizationMembers setId(Integer value) { this.id = value; return this; } private static Object responseType = GetOrganizationMembersResponse.class; @@ -88,10 +77,10 @@ public static class GetOrganizationMembers implements IReturn + public static class GetOrganizationAdmin implements IReturn, IGet { public Integer id = null; - + public Integer getId() { return id; } public GetOrganizationAdmin setId(Integer value) { this.id = value; return this; } private static Object responseType = GetOrganizationAdminResponse.class; @@ -99,11 +88,11 @@ public static class GetOrganizationAdmin implements IReturn + public static class CreateOrganizationForTechnology implements IReturn, IPost { public Long technologyId = null; public Long techStackId = null; - + public Long getTechnologyId() { return technologyId; } public CreateOrganizationForTechnology setTechnologyId(Long value) { this.technologyId = value; return this; } public Long getTechStackId() { return techStackId; } @@ -113,7 +102,7 @@ public static class CreateOrganizationForTechnology implements IReturn + public static class CreateOrganization implements IReturn, IPost { public String name = null; public String slug = null; @@ -121,7 +110,7 @@ public static class CreateOrganization implements IReturn + public static class UpdateOrganization implements IReturn, IPut { public Integer id = null; public String slug = null; @@ -160,7 +149,7 @@ public static class UpdateOrganization implements IReturn postTypes = null; public ArrayList moderatorPostTypes = null; public ArrayList technologyIds = null; - + public Integer getId() { return id; } public UpdateOrganization setId(Integer value) { this.id = value; return this; } public String getSlug() { return slug; } @@ -204,21 +193,21 @@ public static class UpdateOrganization implements IReturn + public static class AddOrganizationLabel implements IReturn, IPost { public Integer organizationId = null; public String slug = null; public String description = null; public String color = null; - + public Integer getOrganizationId() { return organizationId; } public AddOrganizationLabel setOrganizationId(Integer value) { this.organizationId = value; return this; } public String getSlug() { return slug; } @@ -248,13 +237,13 @@ public static class AddOrganizationLabel implements IReturn + public static class UpdateOrganizationLabel implements IReturn, IPut { public Integer organizationId = null; public String slug = null; public String description = null; public String color = null; - + public Integer getOrganizationId() { return organizationId; } public UpdateOrganizationLabel setOrganizationId(Integer value) { this.organizationId = value; return this; } public String getSlug() { return slug; } @@ -268,11 +257,11 @@ public static class UpdateOrganizationLabel implements IReturn + public static class AddOrganizationCategory implements IReturn, IPost { public Integer organizationId = null; public String slug = null; public String name = null; public String description = null; public ArrayList technologyIds = null; - + public Integer getOrganizationId() { return organizationId; } public AddOrganizationCategory setOrganizationId(Integer value) { this.organizationId = value; return this; } public String getSlug() { return slug; } @@ -303,7 +292,7 @@ public static class AddOrganizationCategory implements IReturn + public static class UpdateOrganizationCategory implements IReturn, IPut { public Integer organizationId = null; public Integer id = null; @@ -311,7 +300,7 @@ public static class UpdateOrganizationCategory implements IReturn technologyIds = null; - + public Integer getOrganizationId() { return organizationId; } public UpdateOrganizationCategory setOrganizationId(Integer value) { this.organizationId = value; return this; } public Integer getId() { return id; } @@ -329,11 +318,11 @@ public static class UpdateOrganizationCategory implements IReturn + public static class AddOrganizationMember implements IReturn, IPost { public Integer organizationId = null; public String userName = null; @@ -351,7 +340,7 @@ public static class AddOrganizationMember implements IReturn + public static class UpdateOrganizationMember implements IReturn, IPut { public Integer organizationId = null; public Integer userId = null; @@ -383,7 +372,7 @@ public static class UpdateOrganizationMember implements IReturn + public static class SetOrganizationMembers implements IReturn, IPost { public Integer organizationId = null; public ArrayList githubUserNames = null; @@ -429,7 +418,7 @@ public static class SetOrganizationMembers implements IReturn getGithubUserNames() { return githubUserNames; } @@ -455,10 +444,10 @@ public static class SetOrganizationMembers implements IReturn + public static class GetOrganizationMemberInvites implements IReturn, IGet { public Integer organizationId = null; - + public Integer getOrganizationId() { return organizationId; } public GetOrganizationMemberInvites setOrganizationId(Integer value) { this.organizationId = value; return this; } private static Object responseType = GetOrganizationMemberInvitesResponse.class; @@ -466,10 +455,10 @@ public static class GetOrganizationMemberInvites implements IReturn + public static class RequestOrganizationMemberInvite implements IReturn, IPost { public Integer organizationId = null; - + public Integer getOrganizationId() { return organizationId; } public RequestOrganizationMemberInvite setOrganizationId(Integer value) { this.organizationId = value; return this; } private static Object responseType = RequestOrganizationMemberInviteResponse.class; @@ -477,13 +466,13 @@ public static class RequestOrganizationMemberInvite implements IReturn + public static class UpdateOrganizationMemberInvite implements IReturn, IPut { public Integer organizationId = null; public String userName = null; public Boolean approve = null; public Boolean dismiss = null; - + public Integer getOrganizationId() { return organizationId; } public UpdateOrganizationMemberInvite setOrganizationId(Integer value) { this.organizationId = value; return this; } public String getUserName() { return userName; } @@ -497,7 +486,7 @@ public static class UpdateOrganizationMemberInvite implements IReturn implements IReturn> + public static class QueryPosts extends QueryDb implements IReturn>, IGet { public ArrayList ids = null; public Integer organizationId = null; @@ -505,7 +494,7 @@ public static class QueryPosts extends QueryDb implements IReturn types = null; public ArrayList anyTechnologyIds = null; public ArrayList is = null; - + public ArrayList getIds() { return ids; } public QueryPosts setIds(ArrayList value) { this.ids = value; return this; } public Integer getOrganizationId() { return organizationId; } @@ -523,11 +512,11 @@ public static class QueryPosts extends QueryDb implements IReturn + public static class GetPost implements IReturn, IGet { public Long id = null; public String include = null; - + public Long getId() { return id; } public GetPost setId(Long value) { this.id = value; return this; } public String getInclude() { return include; } @@ -537,7 +526,7 @@ public static class GetPost implements IReturn } @Route(Path="/posts", Verbs="POST") - public static class CreatePost implements IReturn + public static class CreatePost implements IReturn, IPost { public Integer organizationId = null; public PostType type = null; @@ -556,7 +545,7 @@ public static class CreatePost implements IReturn public Long refId = null; public String refSource = null; public String refUrn = null; - + public Integer getOrganizationId() { return organizationId; } public CreatePost setOrganizationId(Integer value) { this.organizationId = value; return this; } public PostType getType() { return type; } @@ -596,7 +585,7 @@ public static class CreatePost implements IReturn } @Route(Path="/posts/{Id}", Verbs="PUT") - public static class UpdatePost implements IReturn + public static class UpdatePost implements IReturn, IPut { public Long id = null; public Integer organizationId = null; @@ -613,7 +602,7 @@ public static class UpdatePost implements IReturn public Date toDate = null; public String metaType = null; public String meta = null; - + public Long getId() { return id; } public UpdatePost setId(Long value) { this.id = value; return this; } public Integer getOrganizationId() { return organizationId; } @@ -649,10 +638,10 @@ public static class UpdatePost implements IReturn } @Route(Path="/posts/{Id}", Verbs="DELETE") - public static class DeletePost implements IReturn + public static class DeletePost implements IReturn, IDelete { public Long id = null; - + public Long getId() { return id; } public DeletePost setId(Long value) { this.id = value; return this; } private static Object responseType = DeletePostResponse.class; @@ -660,12 +649,12 @@ public static class DeletePost implements IReturn } @Route(Path="/posts/{Id}/lock", Verbs="PUT") - public static class LockPost implements IReturnVoid + public static class LockPost implements IReturnVoid, IPut { public Long id = null; public Boolean lock = null; public String reason = null; - + public Long getId() { return id; } public LockPost setId(Long value) { this.id = value; return this; } public Boolean isLock() { return lock; } @@ -675,12 +664,12 @@ public static class LockPost implements IReturnVoid } @Route(Path="/posts/{Id}/hide", Verbs="PUT") - public static class HidePost implements IReturnVoid + public static class HidePost implements IReturnVoid, IPut { public Long id = null; public Boolean hide = null; public String reason = null; - + public Long getId() { return id; } public HidePost setId(Long value) { this.id = value; return this; } public Boolean isHide() { return hide; } @@ -690,12 +679,12 @@ public static class HidePost implements IReturnVoid } @Route(Path="/posts/{Id}/status/{Status}", Verbs="PUT") - public static class ChangeStatusPost implements IReturnVoid + public static class ChangeStatusPost implements IReturnVoid, IPut { public Long id = null; public String status = null; public String reason = null; - + public Long getId() { return id; } public ChangeStatusPost setId(Long value) { this.id = value; return this; } public String getStatus() { return status; } @@ -705,12 +694,12 @@ public static class ChangeStatusPost implements IReturnVoid } @Route(Path="/posts/{PostId}/report/{Id}", Verbs="POST") - public static class ActionPostReport implements IReturnVoid + public static class ActionPostReport implements IReturnVoid, IPost { public Long postId = null; public Long id = null; public ReportAction reportAction = null; - + public Long getPostId() { return postId; } public ActionPostReport setPostId(Long value) { this.postId = value; return this; } public Long getId() { return id; } @@ -720,12 +709,12 @@ public static class ActionPostReport implements IReturnVoid } @Route(Path="/posts/{PostId}/comments", Verbs="POST") - public static class CreatePostComment implements IReturn + public static class CreatePostComment implements IReturn, IPost { public Long postId = null; public Long replyId = null; public String content = null; - + public Long getPostId() { return postId; } public CreatePostComment setPostId(Long value) { this.postId = value; return this; } public Long getReplyId() { return replyId; } @@ -737,12 +726,12 @@ public static class CreatePostComment implements IReturn + public static class UpdatePostComment implements IReturn, IPut { public Long id = null; public Long postId = null; public String content = null; - + public Long getId() { return id; } public UpdatePostComment setId(Long value) { this.id = value; return this; } public Long getPostId() { return postId; } @@ -754,11 +743,11 @@ public static class UpdatePostComment implements IReturn + public static class DeletePostComment implements IReturn, IDelete { public Long id = null; public Long postId = null; - + public Long getId() { return id; } public DeletePostComment setId(Long value) { this.id = value; return this; } public Long getPostId() { return postId; } @@ -768,13 +757,13 @@ public static class DeletePostComment implements IReturn + public static class GetUserPostCommentVotes implements IReturn, IGet { public Long postId = null; - + public Long getPostId() { return postId; } public GetUserPostCommentVotes setPostId(Long value) { this.postId = value; return this; } private static Object responseType = GetUserPostCommentVotesResponse.class; public Object getResponseType() { return responseType; } } - @Route(Path="/posts/{PostId}/comments/{Id}/pin", Verbs="UPDATE") - public static class PinPostComment implements IReturn + @Route(Path="/posts/{PostId}/comments/{Id}/pin", Verbs="PUT") + public static class PinPostComment implements IReturn, IPut { public Long id = null; public Long postId = null; public Boolean pin = null; - + public Long getId() { return id; } public PinPostComment setId(Long value) { this.id = value; return this; } public Long getPostId() { return postId; } @@ -814,10 +803,10 @@ public static class PinPostComment implements IReturn } @Route("/users/by-email") - public static class GetUsersByEmails implements IReturn + public static class GetUsersByEmails implements IReturn, IGet { public ArrayList emails = null; - + public ArrayList getEmails() { return emails; } public GetUsersByEmails setEmails(ArrayList value) { this.emails = value; return this; } private static Object responseType = GetUsersByEmailsResponse.class; @@ -825,27 +814,27 @@ public static class GetUsersByEmails implements IReturn + public static class GetUserPostActivity implements IReturn, IGet { - + private static Object responseType = GetUserPostActivityResponse.class; public Object getResponseType() { return responseType; } } @Route("/user/organizations") - public static class GetUserOrganizations implements IReturn + public static class GetUserOrganizations implements IReturn, IGet { - + private static Object responseType = GetUserOrganizationsResponse.class; public Object getResponseType() { return responseType; } } @Route(Path="/posts/{Id}/vote", Verbs="PUT") - public static class UserPostVote implements IReturn + public static class UserPostVote implements IReturn, IPut { public Long id = null; public Integer weight = null; - + public Long getId() { return id; } public UserPostVote setId(Long value) { this.id = value; return this; } public Integer getWeight() { return weight; } @@ -855,10 +844,10 @@ public static class UserPostVote implements IReturn } @Route(Path="/posts/{Id}/favorite", Verbs="PUT") - public static class UserPostFavorite implements IReturn + public static class UserPostFavorite implements IReturn, IPut { public Long id = null; - + public Long getId() { return id; } public UserPostFavorite setId(Long value) { this.id = value; return this; } private static Object responseType = UserPostFavoriteResponse.class; @@ -866,12 +855,12 @@ public static class UserPostFavorite implements IReturn + public static class UserPostReport implements IReturn, IPut { public Long id = null; public FlagType flagType = null; public String reportNotes = null; - + public Long getId() { return id; } public UserPostReport setId(Long value) { this.id = value; return this; } public FlagType getFlagType() { return flagType; } @@ -883,12 +872,12 @@ public static class UserPostReport implements IReturn } @Route(Path="/posts/{PostId}/comments/{Id}", Verbs="GET") - public static class UserPostCommentVote implements IReturn + public static class UserPostCommentVote implements IReturn, IGet { public Long id = null; public Long postId = null; public Integer weight = null; - + public Long getId() { return id; } public UserPostCommentVote setId(Long value) { this.id = value; return this; } public Long getPostId() { return postId; } @@ -900,13 +889,13 @@ public static class UserPostCommentVote implements IReturn + public static class UserPostCommentReport implements IReturn, IPut { public Long id = null; public Long postId = null; public FlagType flagType = null; public String reportNotes = null; - + public Long getId() { return id; } public UserPostCommentReport setId(Long value) { this.id = value; return this; } public Long getPostId() { return postId; } @@ -920,19 +909,19 @@ public static class UserPostCommentReport implements IReturn + public static class GetPreRender implements IReturn, IGet { public String path = null; - + public String getPath() { return path; } public GetPreRender setPath(String value) { this.path = value; return this; } private static Object responseType = String.class; @@ -940,20 +929,20 @@ public static class GetPreRender implements IReturn } @Route("/my-session") - public static class SessionInfo implements IReturn + public static class SessionInfo implements IReturn, IGet { - + private static Object responseType = SessionInfoResponse.class; public Object getResponseType() { return responseType; } } @Route(Path="/orgs/{OrganizationId}/subscribe", Verbs="PUT") - public static class SubscribeToOrganization implements IReturnVoid + public static class SubscribeToOrganization implements IReturnVoid, IPut { public Integer organizationId = null; public ArrayList postTypes = null; public Frequency frequency = null; - + public Integer getOrganizationId() { return organizationId; } public SubscribeToOrganization setOrganizationId(Integer value) { this.organizationId = value; return this; } public ArrayList getPostTypes() { return postTypes; } @@ -963,37 +952,37 @@ public static class SubscribeToOrganization implements IReturnVoid } @Route(Path="/posts/{PostId}/subscribe", Verbs="PUT") - public static class SubscribeToPost implements IReturnVoid + public static class SubscribeToPost implements IReturnVoid, IPut { public Long postId = null; - + public Long getPostId() { return postId; } public SubscribeToPost setPostId(Long value) { this.postId = value; return this; } } @Route(Path="/orgs/{OrganizationId}/subscribe", Verbs="DELETE") - public static class DeleteOrganizationSubscription implements IReturnVoid + public static class DeleteOrganizationSubscription implements IReturnVoid, IDelete { public Long organizationId = null; - + public Long getOrganizationId() { return organizationId; } public DeleteOrganizationSubscription setOrganizationId(Long value) { this.organizationId = value; return this; } } @Route(Path="/posts/{PostId}/subscribe", Verbs="DELETE") - public static class DeletePostSubscription implements IReturnVoid + public static class DeletePostSubscription implements IReturnVoid, IDelete { public Long postId = null; - + public Long getPostId() { return postId; } public DeletePostSubscription setPostId(Long value) { this.postId = value; return this; } } @Route(Path="/technology/{Slug}/previous-versions", Verbs="GET") - public static class GetTechnologyPreviousVersions implements IReturn + public static class GetTechnologyPreviousVersions implements IReturn, IGet { public String slug = null; - + public String getSlug() { return slug; } public GetTechnologyPreviousVersions setSlug(String value) { this.slug = value; return this; } private static Object responseType = GetTechnologyPreviousVersionsResponse.class; @@ -1001,20 +990,20 @@ public static class GetTechnologyPreviousVersions implements IReturn + public static class GetAllTechnologies implements IReturn, IGet { - + private static Object responseType = GetAllTechnologiesResponse.class; public Object getResponseType() { return responseType; } } @Route("/technology/search") @AutoQueryViewer(DefaultSearchField="Tier", DefaultSearchText="Data", DefaultSearchType="=", Description="Explore different Technologies", IconUrl="octicon:database", Title="Find Technologies") - public static class FindTechnologies extends QueryDb implements IReturn> + public static class FindTechnologies extends QueryDb implements IReturn>, IGet { public String name = null; public String nameContains = null; - + public String getName() { return name; } public FindTechnologies setName(String value) { this.name = value; return this; } public String getNameContains() { return nameContains; } @@ -1024,18 +1013,18 @@ public static class FindTechnologies extends QueryDb implements IRet } @Route("/technology/query") - public static class QueryTechnology extends QueryDb implements IReturn> + public static class QueryTechnology extends QueryDb implements IReturn>, IGet { - + private static Object responseType = new TypeToken>(){}.getType(); public Object getResponseType() { return responseType; } } @Route("/technology/{Slug}") - public static class GetTechnology implements IReturn, IRegisterStats + public static class GetTechnology implements IReturn, IRegisterStats, IGet { public String slug = null; - + public String getSlug() { return slug; } public GetTechnology setSlug(String value) { this.slug = value; return this; } private static Object responseType = GetTechnologyResponse.class; @@ -1043,10 +1032,10 @@ public static class GetTechnology implements IReturn, IRe } @Route("/technology/{Slug}/favorites") - public static class GetTechnologyFavoriteDetails implements IReturn + public static class GetTechnologyFavoriteDetails implements IReturn, IGet { public String slug = null; - + public String getSlug() { return slug; } public GetTechnologyFavoriteDetails setSlug(String value) { this.slug = value; return this; } private static Object responseType = GetTechnologyFavoriteDetailsResponse.class; @@ -1054,7 +1043,7 @@ public static class GetTechnologyFavoriteDetails implements IReturn + public static class CreateTechnology implements IReturn, IPost { public String name = null; public String slug = null; @@ -1065,7 +1054,7 @@ public static class CreateTechnology implements IReturn + public static class UpdateTechnology implements IReturn, IPut { public Long id = null; public String name = null; @@ -1100,7 +1089,7 @@ public static class UpdateTechnology implements IReturn + public static class DeleteTechnology implements IReturn, IDelete { public Long id = null; - + public Long getId() { return id; } public DeleteTechnology setId(Long value) { this.id = value; return this; } private static Object responseType = DeleteTechnologyResponse.class; @@ -1135,10 +1124,10 @@ public static class DeleteTechnology implements IReturn + public static class GetTechnologyStackPreviousVersions implements IReturn, IGet { public String slug = null; - + public String getSlug() { return slug; } public GetTechnologyStackPreviousVersions setSlug(String value) { this.slug = value; return this; } private static Object responseType = GetTechnologyStackPreviousVersionsResponse.class; @@ -1146,12 +1135,12 @@ public static class GetTechnologyStackPreviousVersions implements IReturn + public static class GetPageStats implements IReturn, IGet { public String type = null; public String slug = null; public Integer id = null; - + public String getType() { return type; } public GetPageStats setType(String value) { this.type = value; return this; } public String getSlug() { return slug; } @@ -1163,18 +1152,18 @@ public static class GetPageStats implements IReturn } @Route("/cache/clear") - public static class ClearCache implements IReturn + public static class ClearCache implements IReturn, IGet { - + private static Object responseType = String.class; public Object getResponseType() { return responseType; } } @Route("/tasks/hourly") - public static class HourlyTask implements IReturn + public static class HourlyTask implements IReturn, IGet { public Boolean force = null; - + public Boolean isForce() { return force; } public HourlyTask setForce(Boolean value) { this.force = value; return this; } private static Object responseType = HourlyTaskResponse.class; @@ -1183,10 +1172,10 @@ public static class HourlyTask implements IReturn @Route("/techstacks/search") @AutoQueryViewer(DefaultSearchField="Description", DefaultSearchText="ServiceStack", DefaultSearchType="Contains", Description="Explore different Technology Stacks", IconUrl="material-icons:cloud", Title="Find Technology Stacks") - public static class FindTechStacks extends QueryDb implements IReturn> + public static class FindTechStacks extends QueryDb implements IReturn>, IGet { public String nameContains = null; - + public String getNameContains() { return nameContains; } public FindTechStacks setNameContains(String value) { this.nameContains = value; return this; } private static Object responseType = new TypeToken>(){}.getType(); @@ -1194,18 +1183,18 @@ public static class FindTechStacks extends QueryDb implements I } @Route("/techstacks/query") - public static class QueryTechStacks extends QueryDb implements IReturn> + public static class QueryTechStacks extends QueryDb implements IReturn>, IGet { - + private static Object responseType = new TypeToken>(){}.getType(); public Object getResponseType() { return responseType; } } @Route("/overview") - public static class Overview implements IReturn + public static class Overview implements IReturn, IGet { public Boolean reload = null; - + public Boolean isReload() { return reload; } public Overview setReload(Boolean value) { this.reload = value; return this; } private static Object responseType = OverviewResponse.class; @@ -1213,10 +1202,10 @@ public static class Overview implements IReturn } @Route("/app-overview") - public static class AppOverview implements IReturn + public static class AppOverview implements IReturn, IGet { public Boolean reload = null; - + public Boolean isReload() { return reload; } public AppOverview setReload(Boolean value) { this.reload = value; return this; } private static Object responseType = AppOverviewResponse.class; @@ -1224,18 +1213,18 @@ public static class AppOverview implements IReturn } @Route(Path="/techstacks", Verbs="GET") - public static class GetAllTechnologyStacks implements IReturn + public static class GetAllTechnologyStacks implements IReturn, IGet { - + private static Object responseType = GetAllTechnologyStacksResponse.class; public Object getResponseType() { return responseType; } } @Route(Path="/techstacks/{Slug}", Verbs="GET") - public static class GetTechnologyStack implements IReturn, IRegisterStats + public static class GetTechnologyStack implements IReturn, IRegisterStats, IGet { public String slug = null; - + public String getSlug() { return slug; } public GetTechnologyStack setSlug(String value) { this.slug = value; return this; } private static Object responseType = GetTechnologyStackResponse.class; @@ -1243,10 +1232,10 @@ public static class GetTechnologyStack implements IReturn + public static class GetTechnologyStackFavoriteDetails implements IReturn, IGet { public String slug = null; - + public String getSlug() { return slug; } public GetTechnologyStackFavoriteDetails setSlug(String value) { this.slug = value; return this; } private static Object responseType = GetTechnologyStackFavoriteDetailsResponse.class; @@ -1254,15 +1243,15 @@ public static class GetTechnologyStackFavoriteDetails implements IReturn + public static class GetConfig implements IReturn, IGet { - + private static Object responseType = GetConfigResponse.class; public Object getResponseType() { return responseType; } } @Route(Path="/techstacks", Verbs="POST") - public static class CreateTechnologyStack implements IReturn + public static class CreateTechnologyStack implements IReturn, IPost { public String name = null; public String slug = null; @@ -1273,7 +1262,7 @@ public static class CreateTechnologyStack implements IReturn technologyIds = null; - + public String getName() { return name; } public CreateTechnologyStack setName(String value) { this.name = value; return this; } public String getSlug() { return slug; } @@ -1297,7 +1286,7 @@ public static class CreateTechnologyStack implements IReturn + public static class UpdateTechnologyStack implements IReturn, IPut { public Long id = null; public String name = null; @@ -1308,7 +1297,7 @@ public static class UpdateTechnologyStack implements IReturn technologyIds = null; - + public Long getId() { return id; } public UpdateTechnologyStack setId(Long value) { this.id = value; return this; } public String getName() { return name; } @@ -1332,10 +1321,10 @@ public static class UpdateTechnologyStack implements IReturn + public static class DeleteTechnologyStack implements IReturn, IDelete { public Long id = null; - + public Long getId() { return id; } public DeleteTechnologyStack setId(Long value) { this.id = value; return this; } private static Object responseType = DeleteTechnologyStackResponse.class; @@ -1343,10 +1332,10 @@ public static class DeleteTechnologyStack implements IReturn + public static class GetFavoriteTechStack implements IReturn, IGet { public Integer technologyStackId = null; - + public Integer getTechnologyStackId() { return technologyStackId; } public GetFavoriteTechStack setTechnologyStackId(Integer value) { this.technologyStackId = value; return this; } private static Object responseType = GetFavoriteTechStackResponse.class; @@ -1354,10 +1343,10 @@ public static class GetFavoriteTechStack implements IReturn + public static class AddFavoriteTechStack implements IReturn, IPut { public Integer technologyStackId = null; - + public Integer getTechnologyStackId() { return technologyStackId; } public AddFavoriteTechStack setTechnologyStackId(Integer value) { this.technologyStackId = value; return this; } private static Object responseType = FavoriteTechStackResponse.class; @@ -1365,10 +1354,10 @@ public static class AddFavoriteTechStack implements IReturn + public static class RemoveFavoriteTechStack implements IReturn, IDelete { public Integer technologyStackId = null; - + public Integer getTechnologyStackId() { return technologyStackId; } public RemoveFavoriteTechStack setTechnologyStackId(Integer value) { this.technologyStackId = value; return this; } private static Object responseType = FavoriteTechStackResponse.class; @@ -1376,10 +1365,10 @@ public static class RemoveFavoriteTechStack implements IReturn + public static class GetFavoriteTechnologies implements IReturn, IGet { public Integer technologyId = null; - + public Integer getTechnologyId() { return technologyId; } public GetFavoriteTechnologies setTechnologyId(Integer value) { this.technologyId = value; return this; } private static Object responseType = GetFavoriteTechnologiesResponse.class; @@ -1387,10 +1376,10 @@ public static class GetFavoriteTechnologies implements IReturn + public static class AddFavoriteTechnology implements IReturn, IPut { public Integer technologyId = null; - + public Integer getTechnologyId() { return technologyId; } public AddFavoriteTechnology setTechnologyId(Integer value) { this.technologyId = value; return this; } private static Object responseType = FavoriteTechnologyResponse.class; @@ -1398,10 +1387,10 @@ public static class AddFavoriteTechnology implements IReturn + public static class RemoveFavoriteTechnology implements IReturn, IDelete { public Integer technologyId = null; - + public Integer getTechnologyId() { return technologyId; } public RemoveFavoriteTechnology setTechnologyId(Integer value) { this.technologyId = value; return this; } private static Object responseType = FavoriteTechnologyResponse.class; @@ -1409,18 +1398,18 @@ public static class RemoveFavoriteTechnology implements IReturn + public static class GetUserFeed implements IReturn, IGet { - + private static Object responseType = GetUserFeedResponse.class; public Object getResponseType() { return responseType; } } @Route(Path="/users/karma", Verbs="GET") - public static class GetUsersKarma implements IReturn + public static class GetUsersKarma implements IReturn, IGet { public ArrayList userIds = null; - + public ArrayList getUserIds() { return userIds; } public GetUsersKarma setUserIds(ArrayList value) { this.userIds = value; return this; } private static Object responseType = GetUsersKarmaResponse.class; @@ -1428,10 +1417,10 @@ public static class GetUsersKarma implements IReturn } @Route("/userinfo/{UserName}") - public static class GetUserInfo implements IReturn + public static class GetUserInfo implements IReturn, IGet { public String userName = null; - + public String getUserName() { return userName; } public GetUserInfo setUserName(String value) { this.userName = value; return this; } private static Object responseType = GetUserInfoResponse.class; @@ -1439,10 +1428,10 @@ public static class GetUserInfo implements IReturn } @Route(Path="/users/{UserName}/avatar", Verbs="GET") - public static class UserAvatar + public static class UserAvatar implements IGet { public String userName = null; - + public String getUserName() { return userName; } public UserAvatar setUserName(String value) { this.userName = value; return this; } } @@ -1450,7 +1439,7 @@ public static class UserAvatar @Route("/mq/start") public static class MqStart implements IReturn { - + private static Object responseType = String.class; public Object getResponseType() { return responseType; } } @@ -1458,7 +1447,7 @@ public static class MqStart implements IReturn @Route("/mq/stop") public static class MqStop implements IReturn { - + private static Object responseType = String.class; public Object getResponseType() { return responseType; } } @@ -1466,7 +1455,7 @@ public static class MqStop implements IReturn @Route("/mq/stats") public static class MqStats implements IReturn { - + private static Object responseType = String.class; public Object getResponseType() { return responseType; } } @@ -1474,16 +1463,16 @@ public static class MqStats implements IReturn @Route("/mq/status") public static class MqStatus implements IReturn { - + private static Object responseType = String.class; public Object getResponseType() { return responseType; } } @Route("/sync/discourse/{Site}") - public static class SyncDiscourseSite implements IReturn + public static class SyncDiscourseSite implements IReturn, IPost { public String site = null; - + public String getSite() { return site; } public SyncDiscourseSite setSite(String value) { this.site = value; return this; } private static Object responseType = SyncDiscourseSiteResponse.class; @@ -1491,11 +1480,11 @@ public static class SyncDiscourseSite implements IReturn + public static class LogoUrlApproval implements IReturn, IPut { public Long technologyId = null; public Boolean approved = null; - + public Long getTechnologyId() { return technologyId; } public LogoUrlApproval setTechnologyId(Long value) { this.technologyId = value; return this; } public Boolean isApproved() { return approved; } @@ -1505,11 +1494,11 @@ public static class LogoUrlApproval implements IReturn } @Route("/admin/techstacks/{TechnologyStackId}/lock") - public static class LockTechStack implements IReturn + public static class LockTechStack implements IReturn, IPut { public Long technologyStackId = null; public Boolean isLocked = null; - + public Long getTechnologyStackId() { return technologyStackId; } public LockTechStack setTechnologyStackId(Long value) { this.technologyStackId = value; return this; } public Boolean getIsLocked() { return isLocked; } @@ -1519,11 +1508,11 @@ public static class LockTechStack implements IReturn } @Route("/admin/technology/{TechnologyId}/lock") - public static class LockTech implements IReturn + public static class LockTech implements IReturn, IPut { public Long technologyId = null; public Boolean isLocked = null; - + public Long getTechnologyId() { return technologyId; } public LockTech setTechnologyId(Long value) { this.technologyId = value; return this; } public Boolean getIsLocked() { return isLocked; } @@ -1536,14 +1525,14 @@ public static class LockTech implements IReturn public static class EmailTest implements IReturn { public Integer postId = null; - + public Integer getPostId() { return postId; } public EmailTest setPostId(Integer value) { this.postId = value; return this; } private static Object responseType = EmailTestRespoonse.class; public Object getResponseType() { return responseType; } } - public static class ImportUser implements IReturn + public static class ImportUser implements IReturn, IPost { public String userName = null; public String email = null; @@ -1557,7 +1546,7 @@ public static class ImportUser implements IReturn public String refUrn = null; public String defaultProfileUrl = null; public HashMap meta = null; - + public String getUserName() { return userName; } public ImportUser setUserName(String value) { this.userName = value; return this; } public String getEmail() { return email; } @@ -1587,7 +1576,7 @@ public static class ImportUser implements IReturn } @Route("/import/uservoice/suggestion") - public static class ImportUserVoiceSuggestion implements IReturn + public static class ImportUserVoiceSuggestion implements IReturn, IPost { public Integer organizationId = null; public String url = null; @@ -1608,7 +1597,7 @@ public static class ImportUserVoiceSuggestion implements IReturn, IPost { @@ -1679,39 +1666,42 @@ public static class Authenticate implements IReturn, IPost @DataMember(Order=7) public Boolean rememberMe = null; - @DataMember(Order=8) - @SerializedName("continue") public String Continue = null; - @DataMember(Order=9) - public String nonce = null; + public String errorView = null; @DataMember(Order=10) - public String uri = null; + public String nonce = null; @DataMember(Order=11) - public String response = null; + public String uri = null; @DataMember(Order=12) - public String qop = null; + public String response = null; @DataMember(Order=13) - public String nc = null; + public String qop = null; @DataMember(Order=14) - public String cnonce = null; + public String nc = null; @DataMember(Order=15) - public Boolean useTokenCookie = null; + public String cnonce = null; @DataMember(Order=16) - public String accessToken = null; + public Boolean useTokenCookie = null; @DataMember(Order=17) - public String accessTokenSecret = null; + public String accessToken = null; @DataMember(Order=18) - public HashMap meta = null; + public String accessTokenSecret = null; + + @DataMember(Order=19) + public String scope = null; + @DataMember(Order=20) + public HashMap meta = null; + public String getProvider() { return provider; } public Authenticate setProvider(String value) { this.provider = value; return this; } public String getState() { return state; } @@ -1726,8 +1716,8 @@ public static class Authenticate implements IReturn, IPost public Authenticate setPassword(String value) { this.password = value; return this; } public Boolean isRememberMe() { return rememberMe; } public Authenticate setRememberMe(Boolean value) { this.rememberMe = value; return this; } - public String getContinue() { return Continue; } - public Authenticate setContinue(String value) { this.Continue = value; return this; } + public String getErrorView() { return errorView; } + public Authenticate setErrorView(String value) { this.errorView = value; return this; } public String getNonce() { return nonce; } public Authenticate setNonce(String value) { this.nonce = value; return this; } public String getUri() { return uri; } @@ -1746,6 +1736,8 @@ public static class Authenticate implements IReturn, IPost public Authenticate setAccessToken(String value) { this.accessToken = value; return this; } public String getAccessTokenSecret() { return accessTokenSecret; } public Authenticate setAccessTokenSecret(String value) { this.accessTokenSecret = value; return this; } + public String getScope() { return scope; } + public Authenticate setScope(String value) { this.scope = value; return this; } public HashMap getMeta() { return meta; } public Authenticate setMeta(HashMap value) { this.meta = value; return this; } private static Object responseType = AuthenticateResponse.class; @@ -1765,12 +1757,17 @@ public static class AssignRoles implements IReturn, IPost @DataMember(Order=3) public ArrayList roles = null; + @DataMember(Order=4) + public HashMap meta = null; + public String getUserName() { return userName; } public AssignRoles setUserName(String value) { this.userName = value; return this; } public ArrayList getPermissions() { return permissions; } public AssignRoles setPermissions(ArrayList value) { this.permissions = value; return this; } public ArrayList getRoles() { return roles; } public AssignRoles setRoles(ArrayList value) { this.roles = value; return this; } + public HashMap getMeta() { return meta; } + public AssignRoles setMeta(HashMap value) { this.meta = value; return this; } private static Object responseType = AssignRolesResponse.class; public Object getResponseType() { return responseType; } } @@ -1788,12 +1785,17 @@ public static class UnAssignRoles implements IReturn, IPo @DataMember(Order=3) public ArrayList roles = null; + @DataMember(Order=4) + public HashMap meta = null; + public String getUserName() { return userName; } public UnAssignRoles setUserName(String value) { this.userName = value; return this; } public ArrayList getPermissions() { return permissions; } public UnAssignRoles setPermissions(ArrayList value) { this.permissions = value; return this; } public ArrayList getRoles() { return roles; } public UnAssignRoles setRoles(ArrayList value) { this.roles = value; return this; } + public HashMap getMeta() { return meta; } + public UnAssignRoles setMeta(HashMap value) { this.meta = value; return this; } private static Object responseType = UnAssignRolesResponse.class; public Object getResponseType() { return responseType; } } @@ -1805,8 +1807,13 @@ public static class ConvertSessionToToken implements IReturn meta = null; + public Boolean isPreserveSession() { return preserveSession; } public ConvertSessionToToken setPreserveSession(Boolean value) { this.preserveSession = value; return this; } + public HashMap getMeta() { return meta; } + public ConvertSessionToToken setMeta(HashMap value) { this.meta = value; return this; } private static Object responseType = ConvertSessionToTokenResponse.class; public Object getResponseType() { return responseType; } } @@ -1818,18 +1825,28 @@ public static class GetAccessToken implements IReturn, I @DataMember(Order=1) public String refreshToken = null; + @DataMember(Order=2) + public Boolean useTokenCookie = null; + + @DataMember(Order=3) + public HashMap meta = null; + public String getRefreshToken() { return refreshToken; } public GetAccessToken setRefreshToken(String value) { this.refreshToken = value; return this; } + public Boolean isUseTokenCookie() { return useTokenCookie; } + public GetAccessToken setUseTokenCookie(Boolean value) { this.useTokenCookie = value; return this; } + public HashMap getMeta() { return meta; } + public GetAccessToken setMeta(HashMap value) { this.meta = value; return this; } private static Object responseType = GetAccessTokenResponse.class; public Object getResponseType() { return responseType; } } @Route(Path="/posts/comment", Verbs="GET") - public static class QueryPostComments extends QueryDb implements IReturn> + public static class QueryPostComments extends QueryDb implements IReturn>, IGet { public Integer userId = null; public Integer postId = null; - + public Integer getUserId() { return userId; } public QueryPostComments setUserId(Integer value) { this.userId = value; return this; } public Integer getPostId() { return postId; } @@ -1843,7 +1860,7 @@ public static class QueryPostComments extends QueryDb implements IR public static class FindTechnologiesAdmin extends QueryDb implements IReturn> { public String name = null; - + public String getName() { return name; } public FindTechnologiesAdmin setName(String value) { this.name = value; return this; } private static Object responseType = new TypeToken>(){}.getType(); @@ -1862,7 +1879,7 @@ public static class GetOrganizationResponse public ArrayList moderators = null; public Long membersCount = null; public ResponseStatus responseStatus = null; - + public Long getCache() { return cache; } public GetOrganizationResponse setCache(Long value) { this.cache = value; return this; } public Integer getId() { return id; } @@ -1890,7 +1907,7 @@ public static class GetOrganizationMembersResponse public Integer organizationId = null; public ArrayList results = null; public ResponseStatus responseStatus = null; - + public Integer getOrganizationId() { return organizationId; } public GetOrganizationMembersResponse setOrganizationId(Integer value) { this.organizationId = value; return this; } public ArrayList getResults() { return results; } @@ -1907,7 +1924,7 @@ public static class GetOrganizationAdminResponse public ArrayList reportedPosts = null; public ArrayList reportedPostComments = null; public ResponseStatus responseStatus = null; - + public ArrayList getLabels() { return labels; } public GetOrganizationAdminResponse setLabels(ArrayList value) { this.labels = value; return this; } public ArrayList getMembers() { return members; } @@ -1929,7 +1946,7 @@ public static class CreateOrganizationForTechnologyResponse public Long commentsPostId = null; public String commentsPostSlug = null; public ResponseStatus responseStatus = null; - + public Integer getOrganizationId() { return organizationId; } public CreateOrganizationForTechnologyResponse setOrganizationId(Integer value) { this.organizationId = value; return this; } public String getOrganizationSlug() { return organizationSlug; } @@ -1947,7 +1964,7 @@ public static class CreateOrganizationResponse public Integer id = null; public String slug = null; public ResponseStatus responseStatus = null; - + public Integer getId() { return id; } public CreateOrganizationResponse setId(Integer value) { this.id = value; return this; } public String getSlug() { return slug; } @@ -1959,7 +1976,7 @@ public static class CreateOrganizationResponse public static class UpdateOrganizationResponse { public ResponseStatus responseStatus = null; - + public ResponseStatus getResponseStatus() { return responseStatus; } public UpdateOrganizationResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } } @@ -1967,7 +1984,7 @@ public static class UpdateOrganizationResponse public static class OrganizationLabelResponse { public ResponseStatus responseStatus = null; - + public ResponseStatus getResponseStatus() { return responseStatus; } public OrganizationLabelResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } } @@ -1977,7 +1994,7 @@ public static class AddOrganizationCategoryResponse public Integer id = null; public String slug = null; public ResponseStatus responseStatus = null; - + public Integer getId() { return id; } public AddOrganizationCategoryResponse setId(Integer value) { this.id = value; return this; } public String getSlug() { return slug; } @@ -1989,7 +2006,7 @@ public static class AddOrganizationCategoryResponse public static class UpdateOrganizationCategoryResponse { public ResponseStatus responseStatus = null; - + public ResponseStatus getResponseStatus() { return responseStatus; } public UpdateOrganizationCategoryResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } } @@ -1997,7 +2014,7 @@ public static class UpdateOrganizationCategoryResponse public static class AddOrganizationMemberResponse { public ResponseStatus responseStatus = null; - + public ResponseStatus getResponseStatus() { return responseStatus; } public AddOrganizationMemberResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } } @@ -2005,7 +2022,7 @@ public static class AddOrganizationMemberResponse public static class UpdateOrganizationMemberResponse { public ResponseStatus responseStatus = null; - + public ResponseStatus getResponseStatus() { return responseStatus; } public UpdateOrganizationMemberResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } } @@ -2015,7 +2032,7 @@ public static class SetOrganizationMembersResponse public ArrayList userIdsAdded = null; public ArrayList userIdsRemoved = null; public ResponseStatus responseStatus = null; - + public ArrayList getUserIdsAdded() { return userIdsAdded; } public SetOrganizationMembersResponse setUserIdsAdded(ArrayList value) { this.userIdsAdded = value; return this; } public ArrayList getUserIdsRemoved() { return userIdsRemoved; } @@ -2028,7 +2045,7 @@ public static class GetOrganizationMemberInvitesResponse { public ArrayList results = null; public ResponseStatus responseStatus = null; - + public ArrayList getResults() { return results; } public GetOrganizationMemberInvitesResponse setResults(ArrayList value) { this.results = value; return this; } public ResponseStatus getResponseStatus() { return responseStatus; } @@ -2039,7 +2056,7 @@ public static class RequestOrganizationMemberInviteResponse { public Integer organizationId = null; public ResponseStatus responseStatus = null; - + public Integer getOrganizationId() { return organizationId; } public RequestOrganizationMemberInviteResponse setOrganizationId(Integer value) { this.organizationId = value; return this; } public ResponseStatus getResponseStatus() { return responseStatus; } @@ -2049,7 +2066,7 @@ public static class RequestOrganizationMemberInviteResponse public static class UpdateOrganizationMemberInviteResponse { public ResponseStatus responseStatus = null; - + public ResponseStatus getResponseStatus() { return responseStatus; } public UpdateOrganizationMemberInviteResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } } @@ -2071,7 +2088,7 @@ public static class QueryResponse @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; } @@ -2090,7 +2107,7 @@ public static class GetPostResponse public Post post = null; public ArrayList comments = null; public ResponseStatus responseStatus = null; - + public Long getCache() { return cache; } public GetPostResponse setCache(Long value) { this.cache = value; return this; } public Post getPost() { return post; } @@ -2106,7 +2123,7 @@ public static class CreatePostResponse public Long id = null; public String slug = null; public ResponseStatus responseStatus = null; - + public Long getId() { return id; } public CreatePostResponse setId(Long value) { this.id = value; return this; } public String getSlug() { return slug; } @@ -2118,7 +2135,7 @@ public static class CreatePostResponse public static class UpdatePostResponse { public ResponseStatus responseStatus = null; - + public ResponseStatus getResponseStatus() { return responseStatus; } public UpdatePostResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } } @@ -2127,7 +2144,7 @@ public static class DeletePostResponse { public Long id = null; public ResponseStatus responseStatus = null; - + public Long getId() { return id; } public DeletePostResponse setId(Long value) { this.id = value; return this; } public ResponseStatus getResponseStatus() { return responseStatus; } @@ -2139,7 +2156,7 @@ public static class CreatePostCommentResponse public Long id = null; public Long postId = null; public ResponseStatus responseStatus = null; - + public Long getId() { return id; } public CreatePostCommentResponse setId(Long value) { this.id = value; return this; } public Long getPostId() { return postId; } @@ -2151,7 +2168,7 @@ public static class CreatePostCommentResponse public static class UpdatePostCommentResponse { public ResponseStatus responseStatus = null; - + public ResponseStatus getResponseStatus() { return responseStatus; } public UpdatePostCommentResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } } @@ -2161,7 +2178,7 @@ public static class DeletePostCommentResponse public Long id = null; public Long postId = null; public ResponseStatus responseStatus = null; - + public Long getId() { return id; } public DeletePostCommentResponse setId(Long value) { this.id = value; return this; } public Long getPostId() { return postId; } @@ -2175,7 +2192,7 @@ public static class GetUserPostCommentVotesResponse public Long postId = null; public ArrayList upVotedCommentIds = null; public ArrayList downVotedCommentIds = null; - + public Long getPostId() { return postId; } public GetUserPostCommentVotesResponse setPostId(Long value) { this.postId = value; return this; } public ArrayList getUpVotedCommentIds() { return upVotedCommentIds; } @@ -2187,7 +2204,7 @@ public static class GetUserPostCommentVotesResponse public static class PinPostCommentResponse { public ResponseStatus responseStatus = null; - + public ResponseStatus getResponseStatus() { return responseStatus; } public PinPostCommentResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } } @@ -2196,7 +2213,7 @@ public static class GetUsersByEmailsResponse { public ArrayList results = null; public ResponseStatus responseStatus = null; - + public ArrayList getResults() { return results; } public GetUsersByEmailsResponse setResults(ArrayList value) { this.results = value; return this; } public ResponseStatus getResponseStatus() { return responseStatus; } @@ -2209,7 +2226,7 @@ public static class GetUserPostActivityResponse public ArrayList downVotedPostIds = null; public ArrayList favoritePostIds = null; public ResponseStatus responseStatus = null; - + public ArrayList getUpVotedPostIds() { return upVotedPostIds; } public GetUserPostActivityResponse setUpVotedPostIds(ArrayList value) { this.upVotedPostIds = value; return this; } public ArrayList getDownVotedPostIds() { return downVotedPostIds; } @@ -2225,7 +2242,7 @@ public static class GetUserOrganizationsResponse public ArrayList members = null; public ArrayList memberInvites = null; public ArrayList subscriptions = null; - + public ArrayList getMembers() { return members; } public GetUserOrganizationsResponse setMembers(ArrayList value) { this.members = value; return this; } public ArrayList getMemberInvites() { return memberInvites; } @@ -2237,7 +2254,7 @@ public static class GetUserOrganizationsResponse public static class UserPostVoteResponse { public ResponseStatus responseStatus = null; - + public ResponseStatus getResponseStatus() { return responseStatus; } public UserPostVoteResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } } @@ -2245,7 +2262,7 @@ public static class UserPostVoteResponse public static class UserPostFavoriteResponse { public ResponseStatus responseStatus = null; - + public ResponseStatus getResponseStatus() { return responseStatus; } public UserPostFavoriteResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } } @@ -2253,7 +2270,7 @@ public static class UserPostFavoriteResponse public static class UserPostReportResponse { public ResponseStatus responseStatus = null; - + public ResponseStatus getResponseStatus() { return responseStatus; } public UserPostReportResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } } @@ -2261,7 +2278,7 @@ public static class UserPostReportResponse public static class UserPostCommentVoteResponse { public ResponseStatus responseStatus = null; - + public ResponseStatus getResponseStatus() { return responseStatus; } public UserPostCommentVoteResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } } @@ -2269,7 +2286,7 @@ public static class UserPostCommentVoteResponse public static class UserPostCommentReportResponse { public ResponseStatus responseStatus = null; - + public ResponseStatus getResponseStatus() { return responseStatus; } public UserPostCommentReportResponse setResponseStatus(ResponseStatus value) { this.responseStatus = value; return this; } } @@ -2305,7 +2322,7 @@ public static class SessionInfoResponse public ArrayList memberInvites = null; public ArrayList subscriptions = null; public ResponseStatus responseStatus = null; - + public Date getCreated() { return created; } public SessionInfoResponse setCreated(Date value) { this.created = value; return this; } public String getId() { return id; } @@ -2369,7 +2386,7 @@ public static class SessionInfoResponse public static class GetTechnologyPreviousVersionsResponse { public ArrayList results = null; - + public ArrayList getResults() { return results; } public GetTechnologyPreviousVersionsResponse setResults(ArrayList value) { this.results = value; return this; } } @@ -2378,7 +2395,7 @@ public static class GetAllTechnologiesResponse { public ArrayList results = null; public Long total = null; - + public ArrayList getResults() { return results; } public GetAllTechnologiesResponse setResults(ArrayList value) { this.results = value; return this; } public Long getTotal() { return total; } @@ -2391,7 +2408,7 @@ public static class GetTechnologyResponse public Technology technology = null; public ArrayList technologyStacks = null; public ResponseStatus responseStatus = null; - + public Date getCreated() { return created; } public GetTechnologyResponse setCreated(Date value) { this.created = value; return this; } public Technology getTechnology() { return technology; } @@ -2406,7 +2423,7 @@ public static class GetTechnologyFavoriteDetailsResponse { public ArrayList users = null; public Integer favoriteCount = null; - + public ArrayList getUsers() { return users; } public GetTechnologyFavoriteDetailsResponse setUsers(ArrayList value) { this.users = value; return this; } public Integer getFavoriteCount() { return favoriteCount; } @@ -2417,7 +2434,7 @@ public static class CreateTechnologyResponse { public Technology result = null; public ResponseStatus responseStatus = null; - + public Technology getResult() { return result; } public CreateTechnologyResponse setResult(Technology value) { this.result = value; return this; } public ResponseStatus getResponseStatus() { return responseStatus; } @@ -2428,7 +2445,7 @@ public static class UpdateTechnologyResponse { public Technology result = null; public ResponseStatus responseStatus = null; - + public Technology getResult() { return result; } public UpdateTechnologyResponse setResult(Technology value) { this.result = value; return this; } public ResponseStatus getResponseStatus() { return responseStatus; } @@ -2439,7 +2456,7 @@ public static class DeleteTechnologyResponse { public Technology result = null; public ResponseStatus responseStatus = null; - + public Technology getResult() { return result; } public DeleteTechnologyResponse setResult(Technology value) { this.result = value; return this; } public ResponseStatus getResponseStatus() { return responseStatus; } @@ -2449,7 +2466,7 @@ public static class DeleteTechnologyResponse public static class GetTechnologyStackPreviousVersionsResponse { public ArrayList results = null; - + public ArrayList getResults() { return results; } public GetTechnologyStackPreviousVersionsResponse setResults(ArrayList value) { this.results = value; return this; } } @@ -2460,7 +2477,7 @@ public static class GetPageStatsResponse public String slug = null; public Long viewCount = null; public Long favCount = null; - + public String getType() { return type; } public GetPageStatsResponse setType(String value) { this.type = value; return this; } public String getSlug() { return slug; } @@ -2475,7 +2492,7 @@ public static class HourlyTaskResponse { public HashMap meta = null; public ResponseStatus responseStatus = null; - + public HashMap getMeta() { return meta; } public HourlyTaskResponse setMeta(HashMap value) { this.meta = value; return this; } public ResponseStatus getResponseStatus() { return responseStatus; } @@ -2492,7 +2509,7 @@ public static class OverviewResponse public ArrayList allOrganizations = null; public HashMap> topTechnologiesByTier = null; public ResponseStatus responseStatus = null; - + public Date getCreated() { return created; } public OverviewResponse setCreated(Date value) { this.created = value; return this; } public ArrayList getTopUsers() { return topUsers; } @@ -2517,7 +2534,7 @@ public static class AppOverviewResponse public ArrayList