commit d80024c494755ef3cefcd908044721beb9892a4f Author: Przemek Dragańczuk Date: Thu Feb 13 23:52:33 2020 +0100 Base api works diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..66f8050 --- /dev/null +++ b/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..00a51af --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# These are explicitly windows files and should use crlf +*.bat text eol=crlf + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1b6985c --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/.project b/.project new file mode 100644 index 0000000..b6f00df --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + url + Project url created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000..e889521 --- /dev/null +++ b/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir= +eclipse.preferences.version=1 diff --git a/bin/main/tk/draganczuk/url/App.class b/bin/main/tk/draganczuk/url/App.class new file mode 100644 index 0000000..df2c8d7 Binary files /dev/null and b/bin/main/tk/draganczuk/url/App.class differ diff --git a/bin/main/tk/draganczuk/url/Pair.class b/bin/main/tk/draganczuk/url/Pair.class new file mode 100644 index 0000000..d845a4e Binary files /dev/null and b/bin/main/tk/draganczuk/url/Pair.class differ diff --git a/bin/main/tk/draganczuk/url/Routes.class b/bin/main/tk/draganczuk/url/Routes.class new file mode 100644 index 0000000..74eaa03 Binary files /dev/null and b/bin/main/tk/draganczuk/url/Routes.class differ diff --git a/bin/main/tk/draganczuk/url/UrlFile.class b/bin/main/tk/draganczuk/url/UrlFile.class new file mode 100644 index 0000000..8685d35 Binary files /dev/null and b/bin/main/tk/draganczuk/url/UrlFile.class differ diff --git a/bin/main/tk/draganczuk/url/Utils.class b/bin/main/tk/draganczuk/url/Utils.class new file mode 100644 index 0000000..96f2812 Binary files /dev/null and b/bin/main/tk/draganczuk/url/Utils.class differ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..b382be2 --- /dev/null +++ b/build.gradle @@ -0,0 +1,20 @@ + +plugins { + // Apply the java plugin to add support for Java + id 'java' + + // Apply the application plugin to add support for building a CLI application. + id 'application' +} + +repositories { + jcenter() +} + +dependencies { + compile "com.sparkjava:spark-core:2.8.0" +} + +application { + mainClassName = 'tk.draganczuk.url.App' +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f3d88b1 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..1b16c34 --- /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-6.1.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..2fe81a7 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/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..9618d8d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@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 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..5adf1f8 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/6.1.1/userguide/multi_project_builds.html + */ + +rootProject.name = 'url' diff --git a/src/main/java/tk/draganczuk/url/App.java b/src/main/java/tk/draganczuk/url/App.java new file mode 100644 index 0000000..4ced994 --- /dev/null +++ b/src/main/java/tk/draganczuk/url/App.java @@ -0,0 +1,12 @@ +package tk.draganczuk.url; + +import static spark.Spark.*; + +public class App { + + public static void main(String[] args) { + get("/all", Routes::getAll); + post("/new", Routes::addUrl); + get("/:shortUrl", Routes::goToLongUrl); + } +} diff --git a/src/main/java/tk/draganczuk/url/Pair.java b/src/main/java/tk/draganczuk/url/Pair.java new file mode 100644 index 0000000..04a93b1 --- /dev/null +++ b/src/main/java/tk/draganczuk/url/Pair.java @@ -0,0 +1,36 @@ +package tk.draganczuk.url; + +/** +* Pair +*/ +public class Pair { + + private T left; + private U right; + + + public Pair(T left, U right) { + this.left = left; + this.right = right; + } + + public static Pair of(T left, U right){ + return new Pair(left, right); + } + + public T getLeft() { + return left; + } + + public void setLeft(T left) { + this.left = left; + } + + public U getRight() { + return right; + } + + public void setRight(U right) { + this.right = right; + } +} diff --git a/src/main/java/tk/draganczuk/url/Routes.java b/src/main/java/tk/draganczuk/url/Routes.java new file mode 100644 index 0000000..32d206e --- /dev/null +++ b/src/main/java/tk/draganczuk/url/Routes.java @@ -0,0 +1,54 @@ +package tk.draganczuk.url; + +import java.io.IOException; +import java.util.List; +import java.util.UUID; + +import org.eclipse.jetty.util.log.Log; + +import spark.Request; +import spark.Response; + +public class Routes { + + private static UrlFile urlFile; + + static{ + try { + urlFile = new UrlFile(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static List getAll(Request req, Response res) throws IOException{ + return urlFile.getAll(); + } + + public static String addUrl(Request req, Response res) { + String longUrl = req.queryParams("long"); + String shortUrl = req.queryParams("short"); + + if (shortUrl == null) { + shortUrl = Utils.randomString(); + } + + return urlFile.addUrl(longUrl, shortUrl); + } + + public static String goToLongUrl(Request req, Response res){ + String shortUrl = req.params("shortUrl"); + var longUrlOpt = urlFile + .findForShortUrl(shortUrl); + + if(longUrlOpt.isEmpty()){ + res.status(404); + return ""; + } + + res.redirect(longUrlOpt.get()); + + return ""; + } + +} diff --git a/src/main/java/tk/draganczuk/url/UrlFile.java b/src/main/java/tk/draganczuk/url/UrlFile.java new file mode 100644 index 0000000..69e01fc --- /dev/null +++ b/src/main/java/tk/draganczuk/url/UrlFile.java @@ -0,0 +1,60 @@ +package tk.draganczuk.url; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.StandardOpenOption; +import java.util.List; +import java.util.Optional; + +import org.eclipse.jetty.util.log.Log; + + +public class UrlFile { + + private File file; + + public UrlFile() throws IOException{ + String path = System.getProperty("file.location", "./urls.csv"); + this.file = new File(path); + if(! file.exists()){ + file.createNewFile(); + } + } + + public List getAll() throws IOException{ + return Files.readAllLines(file.toPath()); + } + + public String addUrl(String longURL, String shortUrl){ + String entry = String.format("%s,%s",shortUrl,longURL); + try { + var lineOpt = Files.lines(file.toPath()) + .filter(line -> line.equals(entry)) + .findAny(); + if(lineOpt.isEmpty()){ + Files.writeString(file.toPath(), entry + System.lineSeparator(), StandardOpenOption.APPEND); + } + } catch (IOException e) { + e.printStackTrace(); + } + return entry; + } + + public Optional findForShortUrl(String shortUrl){ + try { + return Files.lines(file.toPath()) + .map(this::splitLine) + .filter(pair -> pair.getLeft().equals(shortUrl)) + .map(Pair::getRight) + .findAny(); + } catch (IOException e) { + return Optional.empty(); + } + } + + public Pair splitLine(String line){ + var split = line.split(","); + return new Pair<>(split[0], split[1]); + } +} diff --git a/src/main/java/tk/draganczuk/url/Utils.java b/src/main/java/tk/draganczuk/url/Utils.java new file mode 100644 index 0000000..0c868c4 --- /dev/null +++ b/src/main/java/tk/draganczuk/url/Utils.java @@ -0,0 +1,23 @@ +package tk.draganczuk.url; + +import java.util.Random; + +public class Utils { + private static final Random random = new Random(System.currentTimeMillis()); + + public static String randomString() { + int leftLimit = 48; // numeral '0' + int rightLimit = 122; // letter 'z' + int targetStringLength = 10; + + String generatedString = random.ints(leftLimit, rightLimit + 1) + .filter(i -> (i <= 57 || i >= 65) && (i <= 90 || i >= 97)) + .limit(targetStringLength) + .collect(StringBuilder::new, + StringBuilder::appendCodePoint, + StringBuilder::append) + .toString(); + + return generatedString; + } +}