aboutsummaryrefslogtreecommitdiff
path: root/juick-rss/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'juick-rss/src/main/java')
-rw-r--r--juick-rss/src/main/java/com/juick/rss/Main.java5
-rw-r--r--juick-rss/src/main/java/com/juick/rss/Utils.java36
2 files changed, 3 insertions, 38 deletions
diff --git a/juick-rss/src/main/java/com/juick/rss/Main.java b/juick-rss/src/main/java/com/juick/rss/Main.java
index 46e06677d..471753b7b 100644
--- a/juick-rss/src/main/java/com/juick/rss/Main.java
+++ b/juick-rss/src/main/java/com/juick/rss/Main.java
@@ -21,6 +21,7 @@ import com.juick.Message;
import com.juick.server.MessagesQueries;
import com.juick.server.UserQueries;
import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.commons.lang3.math.NumberUtils;
import org.springframework.jdbc.core.JdbcTemplate;
import javax.servlet.ServletException;
@@ -70,7 +71,7 @@ public class Main extends HttpServlet {
String uri = request.getRequestURI();
if (uri.equals("/")) {
- int hours = Utils.parseInt(request.getParameter("hours"), 0);
+ int hours = NumberUtils.toInt(request.getParameter("hours"), 0);
if (hours > 0 && hours < 13) {
List<Integer> mids = getLastMessages(hours);
List<Message> msgs = MessagesQueries.getMessages(sql, mids);
@@ -79,7 +80,7 @@ public class Main extends HttpServlet {
response.sendError(404);
}
} else if (uri.equals("/comments")) {
- int hours = Utils.parseInt(request.getParameter("hours"), 0);
+ int hours = NumberUtils.toInt(request.getParameter("hours"), 0);
if (hours > 0 && hours < 13) {
responseReplies(response, hours);
} else {
diff --git a/juick-rss/src/main/java/com/juick/rss/Utils.java b/juick-rss/src/main/java/com/juick/rss/Utils.java
deleted file mode 100644
index 036a5a6b1..000000000
--- a/juick-rss/src/main/java/com/juick/rss/Utils.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, ugnich
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.rss;
-
-/**
- *
- * @author ugnich
- */
-public class Utils {
-
- public static int parseInt(String str, int def) {
- int ret = def;
- if (str != null) {
- try {
- ret = Integer.parseInt(str);
- } catch (Exception e) {
- }
- }
- return ret;
- }
-}