mirror of
https://github.com/minoplhy/chhoto-url.git
synced 2024-11-22 09:16:46 +00:00
Fix all urls and empty shortUrl check
This commit is contained in:
parent
0f41363740
commit
a61e820b5e
@ -1,19 +1,15 @@
|
||||
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;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class Routes {
|
||||
|
||||
private static UrlFile urlFile;
|
||||
|
||||
static{
|
||||
static {
|
||||
try {
|
||||
urlFile = new UrlFile();
|
||||
} catch (IOException e) {
|
||||
@ -21,17 +17,17 @@ public class Routes {
|
||||
}
|
||||
}
|
||||
|
||||
public static List<String> getAll(Request req, Response res) throws IOException{
|
||||
return urlFile.getAll();
|
||||
public static String getAll(Request req, Response res) throws IOException {
|
||||
return String.join("\n", 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();
|
||||
}
|
||||
if (shortUrl == null || shortUrl.isBlank()) {
|
||||
shortUrl = Utils.randomString();
|
||||
}
|
||||
|
||||
return urlFile.addUrl(longUrl, shortUrl);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user