From ecb00abefb73ae8aec58cd549cfcbbc1af209ed0 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Fri, 9 May 2014 14:12:27 +0200 Subject: Get rid of useless method --- src/database/QueryUtils.java | 86 +++++++++++++++++++------------------------- src/main/DataFiller.java | 15 ++++---- 2 files changed, 44 insertions(+), 57 deletions(-) diff --git a/src/database/QueryUtils.java b/src/database/QueryUtils.java index d0a424d..ceec1e3 100644 --- a/src/database/QueryUtils.java +++ b/src/database/QueryUtils.java @@ -12,61 +12,49 @@ import java.sql.SQLException; */ public class QueryUtils { - /** - * Create an insert tweet. - * - * @return A valid database query. - */ - public static String insertProfile() { - return "INSERT INTO twitteruser (userid,displayname,timezone,tweetcount," - + "followercount,followedcount,location,tweetname,createdat,language) " - + "SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?, ? " - + "WHERE NOT EXISTS " - + "(SELECT * FROM twitteruser WHERE userid= ? )"; - } + public final static String insertProfile + = "INSERT INTO twitteruser (userid,displayname,timezone,tweetcount," + + "followercount,followedcount,location,tweetname,createdat,language) " + + "SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?, ? " + + "WHERE NOT EXISTS " + + "(SELECT * FROM twitteruser WHERE userid= ? )"; - public static String insertTweet() { - return "INSERT INTO tweet (tweetid,createdat,favcount,retweetcount,text," - + "coordinates,language,retweetid,replyid,place) " - + "SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?, ? " - + "WHERE NOT EXISTS " - + "(SELECT * FROM tweet WHERE tweetid=? )"; - } + public final static String insertTweet + = "INSERT INTO tweet (tweetid,createdat,favcount,retweetcount,text," + + "coordinates,language,retweetid,replyid,place) " + + "SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?, ? " + + "WHERE NOT EXISTS " + + "(SELECT * FROM tweet WHERE tweetid=? )"; - public static String insertHash() { - return "INSERT INTO hashtag (tweetid, hashtag) " - + "SELECT ?, ? " - + "WHERE NOT EXISTS " - + "(SELECT * FROM hashtag WHERE tweetid=? and hashtag =? )"; - } + public final static String insertHash + = "INSERT INTO hashtag (tweetid, hashtag) " + + "SELECT ?, ? " + + "WHERE NOT EXISTS " + + "(SELECT * FROM hashtag WHERE tweetid=? and hashtag =? )"; - public static String insertUrl() { - return "INSERT INTO url (tweetid, url) " - + "SELECT ?, ? " - + "WHERE NOT EXISTS " - + "(SELECT * FROM url WHERE tweetid=? and url =? )"; - } + public final static String insertUrl + = "INSERT INTO url (tweetid, url) " + + "SELECT ?, ? " + + "WHERE NOT EXISTS " + + "(SELECT * FROM url WHERE tweetid=? and url =? )"; - public static String insertMentions() { - return "INSERT INTO mentionsuser (tweetid, userid) " - + "SELECT ?, ? " - + "WHERE NOT EXISTS " - + "(SELECT * FROM mentionsuser WHERE tweetid=? and userid =? )"; - } + public final static String insertMentions + = "INSERT INTO mentionsuser (tweetid, userid) " + + "SELECT ?, ? " + + "WHERE NOT EXISTS " + + "(SELECT * FROM mentionsuser WHERE tweetid=? and userid =? )"; - public static String insertPosted() { - return "INSERT INTO ispostedby (tweetid,userid) " - + "SELECT ? , ? " - + "WHERE NOT EXISTS " - + "(SELECT * FROM ispostedby WHERE tweetid= ? )"; - } + public final static String insertPosted + = "INSERT INTO ispostedby (tweetid,userid) " + + "SELECT ? , ? " + + "WHERE NOT EXISTS " + + "(SELECT * FROM ispostedby WHERE tweetid= ? )"; - public static String insertBrand() { - return "INSERT INTO mentionsbrand (tweetid,brand) " - + "SELECT ? , ? " - + "WHERE NOT EXISTS " - + "(SELECT * FROM mentionsbrand WHERE tweetid = ? AND brand = ?)"; - } + public final static String insertBrand + = "INSERT INTO mentionsbrand (tweetid,brand) " + + "SELECT ? , ? " + + "WHERE NOT EXISTS " + + "(SELECT * FROM mentionsbrand WHERE tweetid = ? AND brand = ?)"; public static void setInsertParams(PreparedStatement tweetStatement, PreparedStatement profileStatement, diff --git a/src/main/DataFiller.java b/src/main/DataFiller.java index 6e1ba9d..4f06006 100644 --- a/src/main/DataFiller.java +++ b/src/main/DataFiller.java @@ -64,14 +64,13 @@ public class DataFiller { public DataFiller(Connection connection) { try { m_connection = connection; - m_insertTweet = m_connection.prepareStatement(QueryUtils.insertTweet()); - m_insertProfile = m_connection.prepareStatement(QueryUtils.insertProfile()); - m_insertPosted = m_connection.prepareStatement(QueryUtils.insertPosted()); - m_insertBrand = m_connection.prepareStatement(QueryUtils.insertBrand()); - m_insertHash = m_connection.prepareStatement(QueryUtils.insertHash()); - m_insertUrl = m_connection.prepareStatement(QueryUtils.insertUrl()); - m_insertMentions = m_connection.prepareStatement(QueryUtils.insertMentions()); - + m_insertTweet = m_connection.prepareStatement(QueryUtils.insertTweet); + m_insertProfile = m_connection.prepareStatement(QueryUtils.insertProfile); + m_insertPosted = m_connection.prepareStatement(QueryUtils.insertPosted); + m_insertBrand = m_connection.prepareStatement(QueryUtils.insertBrand); + m_insertHash = m_connection.prepareStatement(QueryUtils.insertHash); + m_insertUrl = m_connection.prepareStatement(QueryUtils.insertUrl); + m_insertMentions = m_connection.prepareStatement(QueryUtils.insertMentions); } catch (SQLException ex) { throw new RuntimeException(ex.getMessage()); } -- cgit v1.2.1