commit a4ff64bed8d51ba7a70f39df9e8768bcb772dfde Author: Timo Ley Date: Wed Sep 30 21:49:19 2020 +0200 Init diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5ada266 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.idea +.gradle +build +gradle.properties \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..24880dd --- /dev/null +++ b/build.gradle @@ -0,0 +1,41 @@ +plugins { + id 'java' + id 'maven-publish' +} + +group 'ley.jensmemes' +version '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} + +dependencies { + compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6' + compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12' + compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.3' + testCompile group: 'junit', name: 'junit', version: '4.12' +} + +task sourceJar(type: Jar) { + classifier 'sources' + from sourceSets.main.allJava +} + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + artifact tasks.sourceJar + } + } + repositories { + maven { + credentials { + username findProperty("username") + password findProperty("password") + } + url = "https://data.tilera.xyz/maven" + } + } +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..62d4c05 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..44e7c4d --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..fbd7c51 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..5093609 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,104 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..99d1154 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'jensmemeslib' + diff --git a/src/main/java/ley/jensmemes/HTTPClient.java b/src/main/java/ley/jensmemes/HTTPClient.java new file mode 100644 index 0000000..20dc559 --- /dev/null +++ b/src/main/java/ley/jensmemes/HTTPClient.java @@ -0,0 +1,108 @@ +package ley.jensmemes; + +import ley.jensmemes.model.response.*; +import org.apache.http.HttpEntity; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.utils.URIBuilder; +import org.apache.http.entity.mime.MultipartEntityBuilder; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; + +public class HTTPClient { + + static URIBuilder getBuilder(String path) { + try { + return new URIBuilder("https://data.tilera.xyz").setPathSegments("api", "jensmemes", path); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + } + + public static UploadResponse upload(String token, String category, File image) throws IOException, URISyntaxException { + CloseableHttpClient client = HttpClients.createDefault(); + URIBuilder builder = getBuilder("upload"); + HttpPost request = new HttpPost(builder.build()); + MultipartEntityBuilder mpbuild = MultipartEntityBuilder.create(); + mpbuild.addTextBody("category", category); + mpbuild.addTextBody("token", token); + mpbuild.addBinaryBody("file", image); + request.setEntity(mpbuild.build()); + HttpEntity response = client.execute(request).getEntity(); + return UploadResponse.read(response.getContent()); + } + + public static CategoriesResponse categories() throws IOException, URISyntaxException { + CloseableHttpClient client = HttpClients.createDefault(); + URIBuilder builder = getBuilder("categories"); + HttpGet request = new HttpGet(builder.build()); + HttpEntity response = client.execute(request).getEntity(); + return CategoriesResponse.read(response.getContent()); + } + + public static UsersResponse users() throws IOException, URISyntaxException { + CloseableHttpClient client = HttpClients.createDefault(); + URIBuilder builder = getBuilder("users"); + HttpGet request = new HttpGet(builder.build()); + HttpEntity response = client.execute(request).getEntity(); + return UsersResponse.read(response.getContent()); + } + + public static CategoryResponse category(String id) throws IOException, URISyntaxException { + CloseableHttpClient client = HttpClients.createDefault(); + URIBuilder builder = getBuilder("category"); + builder.addParameter("id", id); + HttpGet request = new HttpGet(builder.build()); + HttpEntity response = client.execute(request).getEntity(); + return CategoryResponse.read(response.getContent()); + } + + public static MemeResponse meme(int id) throws IOException, URISyntaxException { + CloseableHttpClient client = HttpClients.createDefault(); + URIBuilder builder = getBuilder("meme"); + builder.setParameter("id", String.valueOf(id)); + HttpGet request = new HttpGet(builder.build()); + HttpEntity response = client.execute(request).getEntity(); + return MemeResponse.read(response.getContent()); + } + + public static MemesResponse memes(String category, String user, String search) throws IOException, URISyntaxException { + CloseableHttpClient client = HttpClients.createDefault(); + URIBuilder builder = getBuilder("memes"); + if (category != null) { + builder.setParameter("category", category); + } + if (user != null) { + builder.setParameter("user", user); + } + if (search != null) { + builder.setParameter("search", search); + } + HttpGet request = new HttpGet(builder.build()); + HttpEntity response = client.execute(request).getEntity(); + return MemesResponse.read(response.getContent()); + } + + public static UserResponse user(String id) throws IOException, URISyntaxException { + CloseableHttpClient client = HttpClients.createDefault(); + URIBuilder builder = getBuilder("user"); + builder.setParameter("id", id); + HttpGet request = new HttpGet(builder.build()); + HttpEntity response = client.execute(request).getEntity(); + return UserResponse.read(response.getContent()); + } + + public static UserResponse userByName(String name) throws IOException, URISyntaxException { + CloseableHttpClient client = HttpClients.createDefault(); + URIBuilder builder = getBuilder("user"); + builder.setParameter("name", name); + HttpGet request = new HttpGet(builder.build()); + HttpEntity response = client.execute(request).getEntity(); + return UserResponse.read(response.getContent()); + } + +} diff --git a/src/main/java/ley/jensmemes/model/Category.java b/src/main/java/ley/jensmemes/model/Category.java new file mode 100644 index 0000000..0e3c9c9 --- /dev/null +++ b/src/main/java/ley/jensmemes/model/Category.java @@ -0,0 +1,18 @@ +package ley.jensmemes.model; + +import com.google.gson.annotations.Expose; + +public class Category { + + @Expose + public String id; + + @Expose + public String name; + + @Override + public String toString() { + return name; + } + +} diff --git a/src/main/java/ley/jensmemes/model/Meme.java b/src/main/java/ley/jensmemes/model/Meme.java new file mode 100644 index 0000000..890a871 --- /dev/null +++ b/src/main/java/ley/jensmemes/model/Meme.java @@ -0,0 +1,19 @@ +package ley.jensmemes.model; + +import com.google.gson.annotations.Expose; + +public class Meme { + + @Expose + public int id; + + @Expose + public String link; + + @Expose + public String category; + + @Expose + public String user; + +} diff --git a/src/main/java/ley/jensmemes/model/User.java b/src/main/java/ley/jensmemes/model/User.java new file mode 100644 index 0000000..08189c4 --- /dev/null +++ b/src/main/java/ley/jensmemes/model/User.java @@ -0,0 +1,22 @@ +package ley.jensmemes.model; + +import com.google.gson.annotations.Expose; + +public class User { + + @Expose + public String id; + + @Expose + public String name; + + @Expose + public String userdir; + + @Expose + public String tokenhash; + + @Expose + public int dayuploads; + +} diff --git a/src/main/java/ley/jensmemes/model/response/CategoriesResponse.java b/src/main/java/ley/jensmemes/model/response/CategoriesResponse.java new file mode 100644 index 0000000..d184f9b --- /dev/null +++ b/src/main/java/ley/jensmemes/model/response/CategoriesResponse.java @@ -0,0 +1,29 @@ +package ley.jensmemes.model.response; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonSyntaxException; +import com.google.gson.annotations.Expose; +import ley.jensmemes.model.Category; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.List; + +public class CategoriesResponse extends Response { + + public static CategoriesResponse read(InputStream json) { + Gson gson = new GsonBuilder().disableHtmlEscaping().create(); + try { + return gson.fromJson(new InputStreamReader(json), CategoriesResponse.class); + } catch (JsonSyntaxException e) { + CategoriesResponse res = new CategoriesResponse(); + res.status = 400; + return res; + } + } + + @Expose + public List categories; + +} diff --git a/src/main/java/ley/jensmemes/model/response/CategoryResponse.java b/src/main/java/ley/jensmemes/model/response/CategoryResponse.java new file mode 100644 index 0000000..4c950ba --- /dev/null +++ b/src/main/java/ley/jensmemes/model/response/CategoryResponse.java @@ -0,0 +1,38 @@ +package ley.jensmemes.model.response; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonSyntaxException; +import com.google.gson.annotations.Expose; +import ley.jensmemes.model.Category; + +import java.io.InputStream; +import java.io.InputStreamReader; + +public class CategoryResponse extends Response { + + public static CategoryResponse read(InputStream json) { + Gson gson = new GsonBuilder().disableHtmlEscaping().create(); + try { + return gson.fromJson(new InputStreamReader(json), CategoryResponse.class); + } catch (JsonSyntaxException e) { + CategoryResponse res = new CategoryResponse(); + res.status = 400; + return res; + } + } + + @Expose + public String id; + + @Expose + public String name; + + public Category toCategory() { + Category category = new Category(); + category.id = id; + category.name = name; + return category; + } + +} diff --git a/src/main/java/ley/jensmemes/model/response/MemeResponse.java b/src/main/java/ley/jensmemes/model/response/MemeResponse.java new file mode 100644 index 0000000..101bc60 --- /dev/null +++ b/src/main/java/ley/jensmemes/model/response/MemeResponse.java @@ -0,0 +1,46 @@ +package ley.jensmemes.model.response; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonSyntaxException; +import com.google.gson.annotations.Expose; +import ley.jensmemes.model.Meme; + +import java.io.InputStream; +import java.io.InputStreamReader; + +public class MemeResponse extends Response { + + public static MemeResponse read(InputStream json) { + Gson gson = new GsonBuilder().disableHtmlEscaping().create(); + try { + return gson.fromJson(new InputStreamReader(json), MemeResponse.class); + } catch (JsonSyntaxException e) { + MemeResponse res = new MemeResponse(); + res.status = 400; + return res; + } + } + + @Expose + public int id; + + @Expose + public String link; + + @Expose + public String category; + + @Expose + public String user; + + public Meme toMeme() { + Meme meme = new Meme(); + meme.id = id; + meme.link = link; + meme.category = category; + meme.user = user; + return meme; + } + +} diff --git a/src/main/java/ley/jensmemes/model/response/MemesResponse.java b/src/main/java/ley/jensmemes/model/response/MemesResponse.java new file mode 100644 index 0000000..45ac462 --- /dev/null +++ b/src/main/java/ley/jensmemes/model/response/MemesResponse.java @@ -0,0 +1,29 @@ +package ley.jensmemes.model.response; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonSyntaxException; +import com.google.gson.annotations.Expose; +import ley.jensmemes.model.Meme; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.List; + +public class MemesResponse extends Response { + + public static MemesResponse read(InputStream json) { + Gson gson = new GsonBuilder().disableHtmlEscaping().create(); + try { + return gson.fromJson(new InputStreamReader(json), MemesResponse.class); + } catch (JsonSyntaxException e) { + MemesResponse res = new MemesResponse(); + res.status = 400; + return res; + } + } + + @Expose + public List memes; + +} diff --git a/src/main/java/ley/jensmemes/model/response/Response.java b/src/main/java/ley/jensmemes/model/response/Response.java new file mode 100644 index 0000000..cd88187 --- /dev/null +++ b/src/main/java/ley/jensmemes/model/response/Response.java @@ -0,0 +1,15 @@ +package ley.jensmemes.model.response; + +import com.google.gson.annotations.Expose; + +import java.io.InputStream; + +public class Response { + + @Expose + public int status; + + @Expose + public String error; + +} diff --git a/src/main/java/ley/jensmemes/model/response/UploadResponse.java b/src/main/java/ley/jensmemes/model/response/UploadResponse.java new file mode 100644 index 0000000..19b89f7 --- /dev/null +++ b/src/main/java/ley/jensmemes/model/response/UploadResponse.java @@ -0,0 +1,28 @@ +package ley.jensmemes.model.response; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonSyntaxException; +import com.google.gson.annotations.Expose; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.List; + +public class UploadResponse extends Response { + + public static UploadResponse read(InputStream json) { + Gson gson = new GsonBuilder().disableHtmlEscaping().create(); + try { + return gson.fromJson(new InputStreamReader(json), UploadResponse.class); + } catch (JsonSyntaxException e) { + UploadResponse res = new UploadResponse(); + res.status = 400; + return res; + } + } + + @Expose + public List files; + +} diff --git a/src/main/java/ley/jensmemes/model/response/UserResponse.java b/src/main/java/ley/jensmemes/model/response/UserResponse.java new file mode 100644 index 0000000..45c6d57 --- /dev/null +++ b/src/main/java/ley/jensmemes/model/response/UserResponse.java @@ -0,0 +1,28 @@ +package ley.jensmemes.model.response; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonSyntaxException; +import com.google.gson.annotations.Expose; +import ley.jensmemes.model.User; + +import java.io.InputStream; +import java.io.InputStreamReader; + +public class UserResponse extends Response { + + public static UserResponse read(InputStream json) { + Gson gson = new GsonBuilder().disableHtmlEscaping().create(); + try { + return gson.fromJson(new InputStreamReader(json), UserResponse.class); + } catch (JsonSyntaxException e) { + UserResponse res = new UserResponse(); + res.status = 400; + return res; + } + } + + @Expose + public User user; + +} diff --git a/src/main/java/ley/jensmemes/model/response/UsersResponse.java b/src/main/java/ley/jensmemes/model/response/UsersResponse.java new file mode 100644 index 0000000..4415823 --- /dev/null +++ b/src/main/java/ley/jensmemes/model/response/UsersResponse.java @@ -0,0 +1,29 @@ +package ley.jensmemes.model.response; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonSyntaxException; +import com.google.gson.annotations.Expose; +import ley.jensmemes.model.User; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.List; + +public class UsersResponse extends Response { + + public static UsersResponse read(InputStream json) { + Gson gson = new GsonBuilder().disableHtmlEscaping().create(); + try { + return gson.fromJson(new InputStreamReader(json), UsersResponse.class); + } catch (JsonSyntaxException e) { + UsersResponse res = new UsersResponse(); + res.status = 400; + return res; + } + } + + @Expose + public List users; + +}