From 368172843658b859b3187f5ba549ebbd919c634f Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 15 Sep 2016 01:24:53 +0300 Subject: juick-rss: ugnich Utils -> commons-lang NumberUtils --- juick-rss/build.gradle | 1 + juick-rss/src/main/java/com/juick/rss/Main.java | 5 ++-- juick-rss/src/main/java/com/juick/rss/Utils.java | 36 ------------------------ 3 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 juick-rss/src/main/java/com/juick/rss/Utils.java diff --git a/juick-rss/build.gradle b/juick-rss/build.gradle index 6eab9249..2fe22275 100644 --- a/juick-rss/build.gradle +++ b/juick-rss/build.gradle @@ -11,6 +11,7 @@ dependencies { compile project(':juick-core') providedCompile 'javax.servlet:javax.servlet-api:3.1.0' compile 'org.apache.commons:commons-dbcp2:2.1.1' + compile 'org.apache.commons:commons-lang3:3.4' providedRuntime 'mysql:mysql-connector-java:5.1.39' } 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 46e06677..471753b7 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 mids = getLastMessages(hours); List 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 036a5a6b..00000000 --- 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 . - */ -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; - } -} -- cgit v1.2.3