articleQueue = - new ConcurrentLinkedQueue

(); - - @Override - public void run() - { - while(isRunning()) - { - try - { - synchronized(this) - { - this.wait(); - } - - List subscriptions = StorageManager.current() - .getSubscriptions(FeedManager.TYPE_PUSH); - Article article = this.articleQueue.poll(); - String[] groups = article.getHeader(Headers.NEWSGROUPS)[0].split(","); - Log.get().info("PushFeed: " + article.getMessageID()); - for(Subscription sub : subscriptions) - { - // Circle check - if(article.getHeader(Headers.PATH)[0].contains(sub.getHost())) - { - Log.get().info(article.getMessageID() + " skipped for host " - + sub.getHost()); - continue; - } + private ConcurrentLinkedQueue

articleQueue = + new ConcurrentLinkedQueue

(); - try - { - for(String group : groups) - { - if(sub.getGroup().equals(group)) - { - // Delete headers that may cause problems - article.removeHeader(Headers.NNTP_POSTING_DATE); - article.removeHeader(Headers.NNTP_POSTING_HOST); - article.removeHeader(Headers.X_COMPLAINTS_TO); - article.removeHeader(Headers.X_TRACE); - article.removeHeader(Headers.XREF); - - // POST the message to remote server - ArticleWriter awriter = new ArticleWriter(sub.getHost(), sub.getPort()); - awriter.writeArticle(article); - break; - } - } - } - catch(IOException ex) - { - Log.get().warning(ex.toString()); - } - } - } - catch(StorageBackendException ex) - { - Log.get().severe(ex.toString()); - } - catch(InterruptedException ex) - { - Log.get().warning("PushFeeder interrupted: " + ex); - } - } - } - - public void queueForPush(Article article) - { - this.articleQueue.add(article); - synchronized(this) - { - this.notifyAll(); - } - } - + @Override + public void run() + { + while (isRunning()) { + try { + synchronized (this) { + this.wait(); + } + + List subscriptions = StorageManager.current().getSubscriptions(FeedManager.TYPE_PUSH); + + Article article = this.articleQueue.poll(); + String[] groups = article.getHeader(Headers.NEWSGROUPS)[0].split(","); + Log.get().info("PushFeed: " + article.getMessageID()); + for (Subscription sub : subscriptions) { + // Circle check + if (article.getHeader(Headers.PATH)[0].contains(sub.getHost())) { + Log.get().info(article.getMessageID() + " skipped for host " + + sub.getHost()); + continue; + } + + try { + for (String group : groups) { + if (sub.getGroup().equals(group)) { + // Delete headers that may cause problems + article.removeHeader(Headers.NNTP_POSTING_DATE); + article.removeHeader(Headers.NNTP_POSTING_HOST); + article.removeHeader(Headers.X_COMPLAINTS_TO); + article.removeHeader(Headers.X_TRACE); + article.removeHeader(Headers.XREF); + + // POST the message to remote server + ArticleWriter awriter = new ArticleWriter(sub.getHost(), sub.getPort()); + awriter.writeArticle(article); + break; + } + } + } catch (IOException ex) { + Log.get().warning(ex.toString()); + } + } + } catch (StorageBackendException ex) { + Log.get().severe(ex.toString()); + } catch (InterruptedException ex) { + Log.get().warning("PushFeeder interrupted: " + ex); + } + } + } + + public void queueForPush(Article article) + { + this.articleQueue.add(article); + synchronized (this) { + this.notifyAll(); + } + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/feed/Subscription.java --- a/src/org/sonews/feed/Subscription.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/feed/Subscription.java Sun Aug 29 18:17:37 2010 +0200 @@ -24,61 +24,57 @@ * @author Christian Lins * @since sonews/0.5.0 */ -public class Subscription +public class Subscription { - private String host; - private int port; - private int feedtype; - private String group; - - public Subscription(String host, int port, int feedtype, String group) - { - this.host = host; - this.port = port; - this.feedtype = feedtype; - this.group = group; - } + private String host; + private int port; + private int feedtype; + private String group; - @Override - public boolean equals(Object obj) - { - if(obj instanceof Subscription) - { - Subscription sub = (Subscription)obj; - return sub.host.equals(host) && sub.group.equals(group) - && sub.port == port && sub.feedtype == feedtype; - } - else - { - return false; - } - } + public Subscription(String host, int port, int feedtype, String group) + { + this.host = host; + this.port = port; + this.feedtype = feedtype; + this.group = group; + } - @Override - public int hashCode() - { - return host.hashCode() + port + feedtype + group.hashCode(); - } + @Override + public boolean equals(Object obj) + { + if (obj instanceof Subscription) { + Subscription sub = (Subscription) obj; + return sub.host.equals(host) && sub.group.equals(group) + && sub.port == port && sub.feedtype == feedtype; + } else { + return false; + } + } - public int getFeedtype() - { - return feedtype; - } + @Override + public int hashCode() + { + return host.hashCode() + port + feedtype + group.hashCode(); + } - public String getGroup() - { - return group; - } + public int getFeedtype() + { + return feedtype; + } - public String getHost() - { - return host; - } + public String getGroup() + { + return group; + } - public int getPort() - { - return port; - } - + public String getHost() + { + return host; + } + + public int getPort() + { + return port; + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/mlgw/Dispatcher.java --- a/src/org/sonews/mlgw/Dispatcher.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/mlgw/Dispatcher.java Sun Aug 29 18:17:37 2010 +0200 @@ -43,267 +43,233 @@ * @author Christian Lins * @since sonews/0.5.0 */ -public class Dispatcher +public class Dispatcher { - static class PasswordAuthenticator extends Authenticator - { - - @Override - public PasswordAuthentication getPasswordAuthentication() - { - final String username = - Config.inst().get(Config.MLSEND_USER, "user"); - final String password = - Config.inst().get(Config.MLSEND_PASSWORD, "mysecret"); + static class PasswordAuthenticator extends Authenticator + { - return new PasswordAuthentication(username, password); - } - - } + @Override + public PasswordAuthentication getPasswordAuthentication() + { + final String username = + Config.inst().get(Config.MLSEND_USER, "user"); + final String password = + Config.inst().get(Config.MLSEND_PASSWORD, "mysecret"); - /** - * Chunks out the email address of the full List-Post header field. - * @param listPostValue - * @return The matching email address or null - */ - private static String chunkListPost(String listPostValue) - { - // listPostValue is of form "" - Pattern mailPattern = Pattern.compile("(\\w+[-|.])*\\w+@(\\w+.)+\\w+"); - Matcher mailMatcher = mailPattern.matcher(listPostValue); - if(mailMatcher.find()) - { - return listPostValue.substring(mailMatcher.start(), mailMatcher.end()); - } - else - { - return null; - } - } + return new PasswordAuthentication(username, password); + } + } - /** - * This method inspects the header of the given message, trying - * to find the most appropriate recipient. - * @param msg - * @param fallback If this is false only List-Post and X-List-Post headers - * are examined. - * @return null or fitting group name for the given message. - */ - private static List getGroupFor(final Message msg, final boolean fallback) - throws MessagingException, StorageBackendException - { - List groups = null; + /** + * Chunks out the email address of the full List-Post header field. + * @param listPostValue + * @return The matching email address or null + */ + private static String chunkListPost(String listPostValue) + { + // listPostValue is of form "" + Pattern mailPattern = Pattern.compile("(\\w+[-|.])*\\w+@(\\w+.)+\\w+"); + Matcher mailMatcher = mailPattern.matcher(listPostValue); + if (mailMatcher.find()) { + return listPostValue.substring(mailMatcher.start(), mailMatcher.end()); + } else { + return null; + } + } - // Is there a List-Post header? - String[] listPost = msg.getHeader(Headers.LIST_POST); - InternetAddress listPostAddr; + /** + * This method inspects the header of the given message, trying + * to find the most appropriate recipient. + * @param msg + * @param fallback If this is false only List-Post and X-List-Post headers + * are examined. + * @return null or fitting group name for the given message. + */ + private static List getGroupFor(final Message msg, final boolean fallback) + throws MessagingException, StorageBackendException + { + List groups = null; - if(listPost == null || listPost.length == 0 || "".equals(listPost[0])) - { - // Is there a X-List-Post header? - listPost = msg.getHeader(Headers.X_LIST_POST); - } + // Is there a List-Post header? + String[] listPost = msg.getHeader(Headers.LIST_POST); + InternetAddress listPostAddr; - if(listPost != null && listPost.length > 0 - && !"".equals(listPost[0]) && chunkListPost(listPost[0]) != null) - { - // listPost[0] is of form "" - listPost[0] = chunkListPost(listPost[0]); - listPostAddr = new InternetAddress(listPost[0], false); - groups = StorageManager.current().getGroupsForList(listPostAddr.getAddress()); - } - else if(fallback) - { - Log.get().info("Using fallback recipient discovery for: " + msg.getSubject()); - groups = new ArrayList(); - // Fallback to TO/CC/BCC addresses - Address[] to = msg.getAllRecipients(); - for(Address toa : to) // Address can have '<' '>' around - { - if(toa instanceof InternetAddress) - { - List g = StorageManager.current() - .getGroupsForList(((InternetAddress)toa).getAddress()); - groups.addAll(g); - } - } - } - - return groups; - } - - /** - * Posts a message that was received from a mailing list to the - * appropriate newsgroup. - * If the message already exists in the storage, this message checks - * if it must be posted in an additional group. This can happen for - * crosspostings in different mailing lists. - * @param msg - */ - public static boolean toGroup(final Message msg) - { - if(msg == null) + if (listPost == null || listPost.length == 0 || "".equals(listPost[0])) { + // Is there a X-List-Post header? + listPost = msg.getHeader(Headers.X_LIST_POST); + } + + if (listPost != null && listPost.length > 0 + && !"".equals(listPost[0]) && chunkListPost(listPost[0]) != null) { + // listPost[0] is of form "" + listPost[0] = chunkListPost(listPost[0]); + listPostAddr = new InternetAddress(listPost[0], false); + groups = StorageManager.current().getGroupsForList(listPostAddr.getAddress()); + } else if (fallback) { + Log.get().info("Using fallback recipient discovery for: " + msg.getSubject()); + groups = new ArrayList(); + // Fallback to TO/CC/BCC addresses + Address[] to = msg.getAllRecipients(); + for (Address toa : to) // Address can have '<' '>' around + { + if (toa instanceof InternetAddress) { + List g = StorageManager.current().getGroupsForList(((InternetAddress) toa).getAddress()); + groups.addAll(g); + } + } + } + + return groups; + } + + /** + * Posts a message that was received from a mailing list to the + * appropriate newsgroup. + * If the message already exists in the storage, this message checks + * if it must be posted in an additional group. This can happen for + * crosspostings in different mailing lists. + * @param msg + */ + public static boolean toGroup(final Message msg) { - throw new IllegalArgumentException("Argument 'msg' must not be null!"); - } + if (msg == null) { + throw new IllegalArgumentException("Argument 'msg' must not be null!"); + } - try - { - // Create new Article object - Article article = new Article(msg); - boolean posted = false; + try { + // Create new Article object + Article article = new Article(msg); + boolean posted = false; - // Check if this mail is already existing the storage - boolean updateReq = - StorageManager.current().isArticleExisting(article.getMessageID()); + // Check if this mail is already existing the storage + boolean updateReq = + StorageManager.current().isArticleExisting(article.getMessageID()); - List newsgroups = getGroupFor(msg, !updateReq); - List oldgroups = new ArrayList(); - if(updateReq) - { - // Check for duplicate entries of the same group - Article oldArticle = StorageManager.current().getArticle(article.getMessageID()); - if(oldArticle != null) - { - List oldGroups = oldArticle.getGroups(); - for(Group oldGroup : oldGroups) - { - if(!newsgroups.contains(oldGroup.getName())) - { - oldgroups.add(oldGroup.getName()); - } - } + List newsgroups = getGroupFor(msg, !updateReq); + List oldgroups = new ArrayList(); + if (updateReq) { + // Check for duplicate entries of the same group + Article oldArticle = StorageManager.current().getArticle(article.getMessageID()); + if (oldArticle != null) { + List oldGroups = oldArticle.getGroups(); + for (Group oldGroup : oldGroups) { + if (!newsgroups.contains(oldGroup.getName())) { + oldgroups.add(oldGroup.getName()); + } + } + } + } + + if (newsgroups.size() > 0) { + newsgroups.addAll(oldgroups); + StringBuilder groups = new StringBuilder(); + for (int n = 0; n < newsgroups.size(); n++) { + groups.append(newsgroups.get(n)); + if (n + 1 != newsgroups.size()) { + groups.append(','); + } + } + Log.get().info("Posting to group " + groups.toString()); + + article.setGroup(groups.toString()); + //article.removeHeader(Headers.REPLY_TO); + //article.removeHeader(Headers.TO); + + // Write article to database + if (updateReq) { + Log.get().info("Updating " + article.getMessageID() + + " with additional groups"); + StorageManager.current().delete(article.getMessageID()); + StorageManager.current().addArticle(article); + } else { + Log.get().info("Gatewaying " + article.getMessageID() + " to " + + article.getHeader(Headers.NEWSGROUPS)[0]); + StorageManager.current().addArticle(article); + Stats.getInstance().mailGatewayed( + article.getHeader(Headers.NEWSGROUPS)[0]); + } + posted = true; + } else { + StringBuilder buf = new StringBuilder(); + for (Address toa : msg.getAllRecipients()) { + buf.append(' '); + buf.append(toa.toString()); + } + buf.append(" " + article.getHeader(Headers.LIST_POST)[0]); + Log.get().warning("No group for" + buf.toString()); + } + return posted; + } catch (Exception ex) { + ex.printStackTrace(); + return false; } - } + } - if(newsgroups.size() > 0) - { - newsgroups.addAll(oldgroups); - StringBuilder groups = new StringBuilder(); - for(int n = 0; n < newsgroups.size(); n++) - { - groups.append(newsgroups.get(n)); - if (n + 1 != newsgroups.size()) - { - groups.append(','); - } - } - Log.get().info("Posting to group " + groups.toString()); + /** + * Mails a message received through NNTP to the appropriate mailing list. + * This method MAY be called several times by PostCommand for the same + * article. + */ + public static void toList(Article article, String group) + throws IOException, MessagingException, StorageBackendException + { + // Get mailing lists for the group of this article + List rcptAddresses = StorageManager.current().getListsForGroup(group); - article.setGroup(groups.toString()); - //article.removeHeader(Headers.REPLY_TO); - //article.removeHeader(Headers.TO); + if (rcptAddresses == null || rcptAddresses.size() == 0) { + Log.get().warning("No ML-address for " + group + " found."); + return; + } - // Write article to database - if(updateReq) - { - Log.get().info("Updating " + article.getMessageID() - + " with additional groups"); - StorageManager.current().delete(article.getMessageID()); - StorageManager.current().addArticle(article); - } - else - { - Log.get().info("Gatewaying " + article.getMessageID() + " to " - + article.getHeader(Headers.NEWSGROUPS)[0]); - StorageManager.current().addArticle(article); - Stats.getInstance().mailGatewayed( - article.getHeader(Headers.NEWSGROUPS)[0]); - } - posted = true; - } - else - { - StringBuilder buf = new StringBuilder(); - for (Address toa : msg.getAllRecipients()) - { - buf.append(' '); - buf.append(toa.toString()); - } - buf.append(" " + article.getHeader(Headers.LIST_POST)[0]); - Log.get().warning("No group for" + buf.toString()); - } - return posted; - } - catch(Exception ex) - { - ex.printStackTrace(); - return false; - } - } - - /** - * Mails a message received through NNTP to the appropriate mailing list. - * This method MAY be called several times by PostCommand for the same - * article. - */ - public static void toList(Article article, String group) - throws IOException, MessagingException, StorageBackendException - { - // Get mailing lists for the group of this article - List rcptAddresses = StorageManager.current().getListsForGroup(group); + for (String rcptAddress : rcptAddresses) { + // Compose message and send it via given SMTP-Host + String smtpHost = Config.inst().get(Config.MLSEND_HOST, "localhost"); + int smtpPort = Config.inst().get(Config.MLSEND_PORT, 25); + String smtpUser = Config.inst().get(Config.MLSEND_USER, "user"); + String smtpPw = Config.inst().get(Config.MLSEND_PASSWORD, "mysecret"); + String smtpFrom = Config.inst().get( + Config.MLSEND_ADDRESS, article.getHeader(Headers.FROM)[0]); - if(rcptAddresses == null || rcptAddresses.size() == 0) - { - Log.get().warning("No ML-address for " + group + " found."); - return; - } + // TODO: Make Article cloneable() + article.getMessageID(); // Make sure an ID is existing + article.removeHeader(Headers.NEWSGROUPS); + article.removeHeader(Headers.PATH); + article.removeHeader(Headers.LINES); + article.removeHeader(Headers.BYTES); - for(String rcptAddress : rcptAddresses) - { - // Compose message and send it via given SMTP-Host - String smtpHost = Config.inst().get(Config.MLSEND_HOST, "localhost"); - int smtpPort = Config.inst().get(Config.MLSEND_PORT, 25); - String smtpUser = Config.inst().get(Config.MLSEND_USER, "user"); - String smtpPw = Config.inst().get(Config.MLSEND_PASSWORD, "mysecret"); - String smtpFrom = Config.inst().get( - Config.MLSEND_ADDRESS, article.getHeader(Headers.FROM)[0]); + article.setHeader("To", rcptAddress); + //article.setHeader("Reply-To", listAddress); - // TODO: Make Article cloneable() - article.getMessageID(); // Make sure an ID is existing - article.removeHeader(Headers.NEWSGROUPS); - article.removeHeader(Headers.PATH); - article.removeHeader(Headers.LINES); - article.removeHeader(Headers.BYTES); + if (Config.inst().get(Config.MLSEND_RW_SENDER, false)) { + rewriteSenderAddress(article); // Set the SENDER address + } - article.setHeader("To", rcptAddress); - //article.setHeader("Reply-To", listAddress); + SMTPTransport smtpTransport = new SMTPTransport(smtpHost, smtpPort); + smtpTransport.send(article, smtpFrom, rcptAddress); + smtpTransport.close(); - if (Config.inst().get(Config.MLSEND_RW_SENDER, false)) - { - rewriteSenderAddress(article); // Set the SENDER address - } + Stats.getInstance().mailGatewayed(group); + Log.get().info("MLGateway: Mail " + article.getHeader("Subject")[0] + + " was delivered to " + rcptAddress + "."); + } + } - SMTPTransport smtpTransport = new SMTPTransport(smtpHost, smtpPort); - smtpTransport.send(article, smtpFrom, rcptAddress); - smtpTransport.close(); + /** + * Sets the SENDER header of the given MimeMessage. This might be necessary + * for moderated groups that does not allow the "normal" FROM sender. + * @param msg + * @throws javax.mail.MessagingException + */ + private static void rewriteSenderAddress(Article msg) + throws MessagingException + { + String mlAddress = Config.inst().get(Config.MLSEND_ADDRESS, null); - Stats.getInstance().mailGatewayed(group); - Log.get().info("MLGateway: Mail " + article.getHeader("Subject")[0] - + " was delivered to " + rcptAddress + "."); - } - } - - /** - * Sets the SENDER header of the given MimeMessage. This might be necessary - * for moderated groups that does not allow the "normal" FROM sender. - * @param msg - * @throws javax.mail.MessagingException - */ - private static void rewriteSenderAddress(Article msg) - throws MessagingException - { - String mlAddress = Config.inst().get(Config.MLSEND_ADDRESS, null); - - if(mlAddress != null) - { - msg.setHeader(Headers.SENDER, mlAddress); - } - else - { - throw new MessagingException("Cannot rewrite SENDER header!"); - } - } - + if (mlAddress != null) { + msg.setHeader(Headers.SENDER, mlAddress); + } else { + throw new MessagingException("Cannot rewrite SENDER header!"); + } + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/mlgw/MailPoller.java --- a/src/org/sonews/mlgw/MailPoller.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/mlgw/MailPoller.java Sun Aug 29 18:17:37 2010 +0200 @@ -42,110 +42,94 @@ public class MailPoller extends AbstractDaemon { - static class PasswordAuthenticator extends Authenticator - { - - @Override - public PasswordAuthentication getPasswordAuthentication() - { - final String username = - Config.inst().get(Config.MLPOLL_USER, "user"); - final String password = - Config.inst().get(Config.MLPOLL_PASSWORD, "mysecret"); + static class PasswordAuthenticator extends Authenticator + { - return new PasswordAuthentication(username, password); - } - - } - - @Override - public void run() - { - Log.get().info("Starting Mailinglist Poller..."); - int errors = 0; - while(isRunning()) - { - try - { - // Wait some time between runs. At the beginning has advantages, - // because the wait is not skipped if an exception occurs. - Thread.sleep(60000 * (errors + 1)); // one minute * errors - - final String host = - Config.inst().get(Config.MLPOLL_HOST, "samplehost"); - final String username = - Config.inst().get(Config.MLPOLL_USER, "user"); - final String password = - Config.inst().get(Config.MLPOLL_PASSWORD, "mysecret"); - - Stats.getInstance().mlgwRunStart(); - - // Create empty properties - Properties props = System.getProperties(); - props.put("mail.pop3.host", host); - props.put("mail.mime.address.strict", "false"); + @Override + public PasswordAuthentication getPasswordAuthentication() + { + final String username = + Config.inst().get(Config.MLPOLL_USER, "user"); + final String password = + Config.inst().get(Config.MLPOLL_PASSWORD, "mysecret"); - // Get session - Session session = Session.getInstance(props); + return new PasswordAuthentication(username, password); + } + } - // Get the store - Store store = session.getStore("pop3"); - store.connect(host, 110, username, password); + @Override + public void run() + { + Log.get().info("Starting Mailinglist Poller..."); + int errors = 0; + while (isRunning()) { + try { + // Wait some time between runs. At the beginning has advantages, + // because the wait is not skipped if an exception occurs. + Thread.sleep(60000 * (errors + 1)); // one minute * errors - // Get folder - Folder folder = store.getFolder("INBOX"); - folder.open(Folder.READ_WRITE); + final String host = + Config.inst().get(Config.MLPOLL_HOST, "samplehost"); + final String username = + Config.inst().get(Config.MLPOLL_USER, "user"); + final String password = + Config.inst().get(Config.MLPOLL_PASSWORD, "mysecret"); - // Get directory - Message[] messages = folder.getMessages(); + Stats.getInstance().mlgwRunStart(); - // Dispatch messages and delete it afterwards on the inbox - for(Message message : messages) - { - if(Dispatcher.toGroup(message) - || Config.inst().get(Config.MLPOLL_DELETEUNKNOWN, false)) - { - // Delete the message - message.setFlag(Flag.DELETED, true); - } - } + // Create empty properties + Properties props = System.getProperties(); + props.put("mail.pop3.host", host); + props.put("mail.mime.address.strict", "false"); - // Close connection - folder.close(true); // true to expunge deleted messages - store.close(); - errors = 0; - - Stats.getInstance().mlgwRunEnd(); - } - catch(NoSuchProviderException ex) - { - Log.get().severe(ex.toString()); - shutdown(); - } - catch(AuthenticationFailedException ex) - { - // AuthentificationFailedException may be thrown if credentials are - // bad or if the Mailbox is in use (locked). - ex.printStackTrace(); - errors = errors < 5 ? errors + 1 : errors; - } - catch(InterruptedException ex) - { - System.out.println("sonews: " + this + " returns: " + ex); - return; - } - catch(MessagingException ex) - { - ex.printStackTrace(); - errors = errors < 5 ? errors + 1 : errors; - } - catch(Exception ex) - { - ex.printStackTrace(); - errors = errors < 5 ? errors + 1 : errors; - } - } - Log.get().severe("MailPoller exited."); - } - + // Get session + Session session = Session.getInstance(props); + + // Get the store + Store store = session.getStore("pop3"); + store.connect(host, 110, username, password); + + // Get folder + Folder folder = store.getFolder("INBOX"); + folder.open(Folder.READ_WRITE); + + // Get directory + Message[] messages = folder.getMessages(); + + // Dispatch messages and delete it afterwards on the inbox + for (Message message : messages) { + if (Dispatcher.toGroup(message) + || Config.inst().get(Config.MLPOLL_DELETEUNKNOWN, false)) { + // Delete the message + message.setFlag(Flag.DELETED, true); + } + } + + // Close connection + folder.close(true); // true to expunge deleted messages + store.close(); + errors = 0; + + Stats.getInstance().mlgwRunEnd(); + } catch (NoSuchProviderException ex) { + Log.get().severe(ex.toString()); + shutdown(); + } catch (AuthenticationFailedException ex) { + // AuthentificationFailedException may be thrown if credentials are + // bad or if the Mailbox is in use (locked). + ex.printStackTrace(); + errors = errors < 5 ? errors + 1 : errors; + } catch (InterruptedException ex) { + System.out.println("sonews: " + this + " returns: " + ex); + return; + } catch (MessagingException ex) { + ex.printStackTrace(); + errors = errors < 5 ? errors + 1 : errors; + } catch (Exception ex) { + ex.printStackTrace(); + errors = errors < 5 ? errors + 1 : errors; + } + } + Log.get().severe("MailPoller exited."); + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/mlgw/SMTPTransport.java --- a/src/org/sonews/mlgw/SMTPTransport.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/mlgw/SMTPTransport.java Sun Aug 29 18:17:37 2010 +0200 @@ -36,98 +36,90 @@ class SMTPTransport { - protected BufferedReader in; - protected BufferedOutputStream out; - protected Socket socket; + protected BufferedReader in; + protected BufferedOutputStream out; + protected Socket socket; - public SMTPTransport(String host, int port) - throws IOException, UnknownHostException - { - socket = new Socket(host, port); - this.in = new BufferedReader(new InputStreamReader(socket.getInputStream())); - this.out = new BufferedOutputStream(socket.getOutputStream()); + public SMTPTransport(String host, int port) + throws IOException, UnknownHostException + { + socket = new Socket(host, port); + this.in = new BufferedReader(new InputStreamReader(socket.getInputStream())); + this.out = new BufferedOutputStream(socket.getOutputStream()); - // Read helo from server - String line = this.in.readLine(); - if(line == null || !line.startsWith("220 ")) - { - throw new IOException("Invalid helo from server: " + line); - } + // Read helo from server + String line = this.in.readLine(); + if (line == null || !line.startsWith("220 ")) { + throw new IOException("Invalid helo from server: " + line); + } - // Send HELO to server - this.out.write( - ("HELO " + Config.inst().get(Config.HOSTNAME, "localhost") + "\r\n").getBytes("UTF-8")); - this.out.flush(); - line = this.in.readLine(); - if(line == null || !line.startsWith("250 ")) - { - throw new IOException("Unexpected reply: " + line); - } - } + // Send HELO to server + this.out.write( + ("HELO " + Config.inst().get(Config.HOSTNAME, "localhost") + "\r\n").getBytes("UTF-8")); + this.out.flush(); + line = this.in.readLine(); + if (line == null || !line.startsWith("250 ")) { + throw new IOException("Unexpected reply: " + line); + } + } - public SMTPTransport(String host) - throws IOException - { - this(host, 25); - } + public SMTPTransport(String host) + throws IOException + { + this(host, 25); + } - public void close() - throws IOException - { - this.out.write("QUIT".getBytes("UTF-8")); - this.out.flush(); - this.in.readLine(); + public void close() + throws IOException + { + this.out.write("QUIT".getBytes("UTF-8")); + this.out.flush(); + this.in.readLine(); - this.socket.close(); - } + this.socket.close(); + } - public void send(Article article, String mailFrom, String rcptTo) - throws IOException - { - assert(article != null); - assert(mailFrom != null); - assert(rcptTo != null); + public void send(Article article, String mailFrom, String rcptTo) + throws IOException + { + assert (article != null); + assert (mailFrom != null); + assert (rcptTo != null); - this.out.write(("MAIL FROM: " + mailFrom).getBytes("UTF-8")); - this.out.flush(); - String line = this.in.readLine(); - if(line == null || !line.startsWith("250 ")) - { - throw new IOException("Unexpected reply: " + line); - } + this.out.write(("MAIL FROM: " + mailFrom).getBytes("UTF-8")); + this.out.flush(); + String line = this.in.readLine(); + if (line == null || !line.startsWith("250 ")) { + throw new IOException("Unexpected reply: " + line); + } - this.out.write(("RCPT TO: " + rcptTo).getBytes("UTF-8")); - this.out.flush(); - line = this.in.readLine(); - if(line == null || !line.startsWith("250 ")) - { - throw new IOException("Unexpected reply: " + line); - } + this.out.write(("RCPT TO: " + rcptTo).getBytes("UTF-8")); + this.out.flush(); + line = this.in.readLine(); + if (line == null || !line.startsWith("250 ")) { + throw new IOException("Unexpected reply: " + line); + } - this.out.write("DATA".getBytes("UTF-8")); - this.out.flush(); - line = this.in.readLine(); - if(line == null || !line.startsWith("354 ")) - { - throw new IOException("Unexpected reply: " + line); - } + this.out.write("DATA".getBytes("UTF-8")); + this.out.flush(); + line = this.in.readLine(); + if (line == null || !line.startsWith("354 ")) { + throw new IOException("Unexpected reply: " + line); + } - ArticleInputStream artStream = new ArticleInputStream(article); - for(int b = artStream.read(); b >= 0; b = artStream.read()) - { - this.out.write(b); - } + ArticleInputStream artStream = new ArticleInputStream(article); + for (int b = artStream.read(); b >= 0; b = artStream.read()) { + this.out.write(b); + } - // Flush the binary stream; important because otherwise the output - // will be mixed with the PrintWriter. - this.out.flush(); - this.out.write("\r\n.\r\n".getBytes("UTF-8")); - this.out.flush(); - line = this.in.readLine(); - if(line == null || !line.startsWith("250 ")) - { - throw new IOException("Unexpected reply: " + line); - } - } - + // Flush the binary stream; important because otherwise the output + // will be mixed with the PrintWriter. + this.out.flush(); + this.out.write("\r\n.\r\n".getBytes("UTF-8")); + this.out.flush(); + line = this.in.readLine(); + if (line == null || !line.startsWith("250 ")) { + throw new IOException("Unexpected reply: " + line); + } + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/plugin/Plugin.java --- a/src/org/sonews/plugin/Plugin.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/plugin/Plugin.java Sun Aug 29 18:17:37 2010 +0200 @@ -28,15 +28,14 @@ public interface Plugin { - /** - * Called when the Plugin is loaded by sonews. This method can be used - * by implementing classes to install additional or required plugins. - */ - void load(); + /** + * Called when the Plugin is loaded by sonews. This method can be used + * by implementing classes to install additional or required plugins. + */ + void load(); - /** - * Called when the Plugin is unloaded by sonews. - */ - void unload(); - + /** + * Called when the Plugin is unloaded by sonews. + */ + void unload(); } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/storage/Article.java --- a/src/org/sonews/storage/Article.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/storage/Article.java Sun Aug 29 18:17:37 2010 +0200 @@ -41,213 +41,196 @@ */ public class Article extends ArticleHead { - - /** - * Loads the Article identified by the given ID from the JDBCDatabase. - * @param messageID - * @return null if Article is not found or if an error occurred. - */ - public static Article getByMessageID(final String messageID) - { - try - { - return StorageManager.current().getArticle(messageID); - } - catch(StorageBackendException ex) - { - ex.printStackTrace(); - return null; - } - } - - private byte[] body = new byte[0]; - - /** - * Default constructor. - */ - public Article() - { - } - - /** - * Creates a new Article object using the date from the given - * raw data. - */ - public Article(String headers, byte[] body) - { - try - { - this.body = body; - // Parse the header - this.headers = new InternetHeaders( - new ByteArrayInputStream(headers.getBytes())); - - this.headerSrc = headers; - } - catch(MessagingException ex) - { - ex.printStackTrace(); - } - } + /** + * Loads the Article identified by the given ID from the JDBCDatabase. + * @param messageID + * @return null if Article is not found or if an error occurred. + */ + public static Article getByMessageID(final String messageID) + { + try { + return StorageManager.current().getArticle(messageID); + } catch (StorageBackendException ex) { + ex.printStackTrace(); + return null; + } + } + private byte[] body = new byte[0]; - /** - * Creates an Article instance using the data from the javax.mail.Message - * object. This constructor is called by the Mailinglist gateway. - * @see javax.mail.Message - * @param msg - * @throws IOException - * @throws MessagingException - */ - public Article(final Message msg) - throws IOException, MessagingException - { - this.headers = new InternetHeaders(); + /** + * Default constructor. + */ + public Article() + { + } - for(Enumeration e = msg.getAllHeaders() ; e.hasMoreElements();) - { - final Header header = (Header)e.nextElement(); - this.headers.addHeader(header.getName(), header.getValue()); - } + /** + * Creates a new Article object using the date from the given + * raw data. + */ + public Article(String headers, byte[] body) + { + try { + this.body = body; - // Reads the raw byte body using Message.writeTo(OutputStream out) - this.body = readContent(msg); - - // Validate headers - validateHeaders(); - } + // Parse the header + this.headers = new InternetHeaders( + new ByteArrayInputStream(headers.getBytes())); - /** - * Reads from the given Message into a byte array. - * @param in - * @return - * @throws IOException - */ - private byte[] readContent(Message in) - throws IOException, MessagingException - { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - in.writeTo(out); - return out.toByteArray(); - } + this.headerSrc = headers; + } catch (MessagingException ex) { + ex.printStackTrace(); + } + } - /** - * Removes the header identified by the given key. - * @param headerKey - */ - public void removeHeader(final String headerKey) - { - this.headers.removeHeader(headerKey); - this.headerSrc = null; - } + /** + * Creates an Article instance using the data from the javax.mail.Message + * object. This constructor is called by the Mailinglist gateway. + * @see javax.mail.Message + * @param msg + * @throws IOException + * @throws MessagingException + */ + public Article(final Message msg) + throws IOException, MessagingException + { + this.headers = new InternetHeaders(); - /** - * Generates a message id for this article and sets it into - * the header object. You have to update the JDBCDatabase manually to make this - * change persistent. - * Note: a Message-ID should never be changed and only generated once. - */ - private String generateMessageID() - { - String randomString; - MessageDigest md5; - try - { - md5 = MessageDigest.getInstance("MD5"); - md5.reset(); - md5.update(getBody()); - md5.update(getHeader(Headers.SUBJECT)[0].getBytes()); - md5.update(getHeader(Headers.FROM)[0].getBytes()); - byte[] result = md5.digest(); - StringBuffer hexString = new StringBuffer(); - for (int i = 0; i < result.length; i++) - { - hexString.append(Integer.toHexString(0xFF & result[i])); - } - randomString = hexString.toString(); - } - catch (NoSuchAlgorithmException e) - { - e.printStackTrace(); - randomString = UUID.randomUUID().toString(); - } - String msgID = "<" + randomString + "@" - + Config.inst().get(Config.HOSTNAME, "localhost") + ">"; - - this.headers.setHeader(Headers.MESSAGE_ID, msgID); - - return msgID; - } + for (Enumeration e = msg.getAllHeaders(); e.hasMoreElements();) { + final Header header = (Header) e.nextElement(); + this.headers.addHeader(header.getName(), header.getValue()); + } - /** - * Returns the body string. - */ - public byte[] getBody() - { - return body; - } - - /** - * @return Numerical IDs of the newsgroups this Article belongs to. - */ - public List getGroups() - { - String[] groupnames = getHeader(Headers.NEWSGROUPS)[0].split(","); - ArrayList groups = new ArrayList(); + // Reads the raw byte body using Message.writeTo(OutputStream out) + this.body = readContent(msg); - try - { - for(String newsgroup : groupnames) - { - newsgroup = newsgroup.trim(); - Group group = StorageManager.current().getGroup(newsgroup); - if(group != null && // If the server does not provide the group, ignore it - !groups.contains(group)) // Yes, there may be duplicates - { - groups.add(group); - } - } - } - catch(StorageBackendException ex) - { - ex.printStackTrace(); - return null; - } - return groups; - } + // Validate headers + validateHeaders(); + } - public void setBody(byte[] body) - { - this.body = body; - } - - /** - * - * @param groupname Name(s) of newsgroups - */ - public void setGroup(String groupname) - { - this.headers.setHeader(Headers.NEWSGROUPS, groupname); - } + /** + * Reads from the given Message into a byte array. + * @param in + * @return + * @throws IOException + */ + private byte[] readContent(Message in) + throws IOException, MessagingException + { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + in.writeTo(out); + return out.toByteArray(); + } - /** - * Returns the Message-ID of this Article. If the appropriate header - * is empty, a new Message-ID is created. - * @return Message-ID of this Article. - */ - public String getMessageID() - { - String[] msgID = getHeader(Headers.MESSAGE_ID); - return msgID[0].equals("") ? generateMessageID() : msgID[0]; - } - - /** - * @return String containing the Message-ID. - */ - @Override - public String toString() - { - return getMessageID(); - } + /** + * Removes the header identified by the given key. + * @param headerKey + */ + public void removeHeader(final String headerKey) + { + this.headers.removeHeader(headerKey); + this.headerSrc = null; + } + /** + * Generates a message id for this article and sets it into + * the header object. You have to update the JDBCDatabase manually to make this + * change persistent. + * Note: a Message-ID should never be changed and only generated once. + */ + private String generateMessageID() + { + String randomString; + MessageDigest md5; + try { + md5 = MessageDigest.getInstance("MD5"); + md5.reset(); + md5.update(getBody()); + md5.update(getHeader(Headers.SUBJECT)[0].getBytes()); + md5.update(getHeader(Headers.FROM)[0].getBytes()); + byte[] result = md5.digest(); + StringBuffer hexString = new StringBuffer(); + for (int i = 0; i < result.length; i++) { + hexString.append(Integer.toHexString(0xFF & result[i])); + } + randomString = hexString.toString(); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + randomString = UUID.randomUUID().toString(); + } + String msgID = "<" + randomString + "@" + + Config.inst().get(Config.HOSTNAME, "localhost") + ">"; + + this.headers.setHeader(Headers.MESSAGE_ID, msgID); + + return msgID; + } + + /** + * Returns the body string. + */ + public byte[] getBody() + { + return body; + } + + /** + * @return Numerical IDs of the newsgroups this Article belongs to. + */ + public List getGroups() + { + String[] groupnames = getHeader(Headers.NEWSGROUPS)[0].split(","); + ArrayList groups = new ArrayList(); + + try { + for (String newsgroup : groupnames) { + newsgroup = newsgroup.trim(); + Group group = StorageManager.current().getGroup(newsgroup); + if (group != null && // If the server does not provide the group, ignore it + !groups.contains(group)) // Yes, there may be duplicates + { + groups.add(group); + } + } + } catch (StorageBackendException ex) { + ex.printStackTrace(); + return null; + } + return groups; + } + + public void setBody(byte[] body) + { + this.body = body; + } + + /** + * + * @param groupname Name(s) of newsgroups + */ + public void setGroup(String groupname) + { + this.headers.setHeader(Headers.NEWSGROUPS, groupname); + } + + /** + * Returns the Message-ID of this Article. If the appropriate header + * is empty, a new Message-ID is created. + * @return Message-ID of this Article. + */ + public String getMessageID() + { + String[] msgID = getHeader(Headers.MESSAGE_ID); + return msgID[0].equals("") ? generateMessageID() : msgID[0]; + } + + /** + * @return String containing the Message-ID. + */ + @Override + public String toString() + { + return getMessageID(); + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/storage/ArticleHead.java --- a/src/org/sonews/storage/ArticleHead.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/storage/ArticleHead.java Sun Aug 29 18:17:37 2010 +0200 @@ -31,131 +31,122 @@ * @author Christian Lins * @since sonews/0.5.0 */ -public class ArticleHead +public class ArticleHead { - protected InternetHeaders headers = null; - protected String headerSrc = null; - - protected ArticleHead() - { - } - - public ArticleHead(String headers) - { - try - { - // Parse the header - this.headers = new InternetHeaders( - new ByteArrayInputStream(headers.getBytes())); - } - catch(MessagingException ex) - { - ex.printStackTrace(); - } - } - - /** - * Returns the header field with given name. - * @param name Name of the header field(s). - * @param returnNull If set to true, this method will return null instead - * of an empty array if there is no header field found. - * @return Header values or empty string. - */ - public String[] getHeader(String name, boolean returnNull) - { - String[] ret = this.headers.getHeader(name); - if(ret == null && !returnNull) - { - ret = new String[]{""}; - } - return ret; - } + protected InternetHeaders headers = null; + protected String headerSrc = null; - public String[] getHeader(String name) - { - return getHeader(name, false); - } - - /** - * Sets the header value identified through the header name. - * @param name - * @param value - */ - public void setHeader(String name, String value) - { - this.headers.setHeader(name, value); - this.headerSrc = null; - } + protected ArticleHead() + { + } - public Enumeration getAllHeaders() - { - return this.headers.getAllHeaders(); - } + public ArticleHead(String headers) + { + try { + // Parse the header + this.headers = new InternetHeaders( + new ByteArrayInputStream(headers.getBytes())); + } catch (MessagingException ex) { + ex.printStackTrace(); + } + } - /** - * @return Header source code of this Article. - */ - public String getHeaderSource() - { - if(this.headerSrc != null) - { - return this.headerSrc; - } + /** + * Returns the header field with given name. + * @param name Name of the header field(s). + * @param returnNull If set to true, this method will return null instead + * of an empty array if there is no header field found. + * @return Header values or empty string. + */ + public String[] getHeader(String name, boolean returnNull) + { + String[] ret = this.headers.getHeader(name); + if (ret == null && !returnNull) { + ret = new String[] {""}; + } + return ret; + } - StringBuffer buf = new StringBuffer(); + public String[] getHeader(String name) + { + return getHeader(name, false); + } - for(Enumeration en = this.headers.getAllHeaders(); en.hasMoreElements();) - { - Header entry = (Header)en.nextElement(); + /** + * Sets the header value identified through the header name. + * @param name + * @param value + */ + public void setHeader(String name, String value) + { + this.headers.setHeader(name, value); + this.headerSrc = null; + } - String value = entry.getValue().replaceAll("[\r\n]", " "); - buf.append(entry.getName()); - buf.append(": "); - buf.append(MimeUtility.fold(entry.getName().length() + 2, value)); + public Enumeration getAllHeaders() + { + return this.headers.getAllHeaders(); + } - if(en.hasMoreElements()) - { - buf.append("\r\n"); - } - } + /** + * @return Header source code of this Article. + */ + public String getHeaderSource() + { + if (this.headerSrc != null) { + return this.headerSrc; + } - this.headerSrc = buf.toString(); - return this.headerSrc; - } + StringBuffer buf = new StringBuffer(); - /** - * Sets the headers of this Article. If headers contain no - * Message-Id a new one is created. - * @param headers - */ - public void setHeaders(InternetHeaders headers) - { - this.headers = headers; - this.headerSrc = null; - validateHeaders(); - } + for (Enumeration en = this.headers.getAllHeaders(); en.hasMoreElements();) { + Header entry = (Header) en.nextElement(); - /** - * Checks some headers for their validity and generates an - * appropriate Path-header for this host if not yet existing. - * This method is called by some Article constructors and the - * method setHeaders(). - * @return true if something on the headers was changed. - */ - protected void validateHeaders() - { - // Check for valid Path-header - final String path = getHeader(Headers.PATH)[0]; - final String host = Config.inst().get(Config.HOSTNAME, "localhost"); - if(!path.startsWith(host)) - { - StringBuffer pathBuf = new StringBuffer(); - pathBuf.append(host); - pathBuf.append('!'); - pathBuf.append(path); - this.headers.setHeader(Headers.PATH, pathBuf.toString()); - } - } - + String value = entry.getValue().replaceAll("[\r\n]", " "); + buf.append(entry.getName()); + buf.append(": "); + buf.append(MimeUtility.fold(entry.getName().length() + 2, value)); + + if (en.hasMoreElements()) { + buf.append("\r\n"); + } + } + + this.headerSrc = buf.toString(); + return this.headerSrc; + } + + /** + * Sets the headers of this Article. If headers contain no + * Message-Id a new one is created. + * @param headers + */ + public void setHeaders(InternetHeaders headers) + { + this.headers = headers; + this.headerSrc = null; + validateHeaders(); + } + + /** + * Checks some headers for their validity and generates an + * appropriate Path-header for this host if not yet existing. + * This method is called by some Article constructors and the + * method setHeaders(). + * @return true if something on the headers was changed. + */ + protected void validateHeaders() + { + // Check for valid Path-header + final String path = getHeader(Headers.PATH)[0]; + final String host = Config.inst().get(Config.HOSTNAME, "localhost"); + if (!path.startsWith(host)) { + StringBuffer pathBuf = new StringBuffer(); + pathBuf.append(host); + pathBuf.append('!'); + pathBuf.append(path); + this.headers.setHeader(Headers.PATH, pathBuf.toString()); + } + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/storage/Channel.java --- a/src/org/sonews/storage/Channel.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/storage/Channel.java Sun Aug 29 18:17:37 2010 +0200 @@ -33,79 +33,75 @@ public abstract class Channel { - /** - * If this flag is set the Group is no real newsgroup but a mailing list - * mirror. In that case every posting and receiving mails must go through - * the mailing list gateway. - */ - public static final int MAILINGLIST = 0x1; + /** + * If this flag is set the Group is no real newsgroup but a mailing list + * mirror. In that case every posting and receiving mails must go through + * the mailing list gateway. + */ + public static final int MAILINGLIST = 0x1; + /** + * If this flag is set the Group is marked as readonly and the posting + * is prohibited. This can be useful for groups that are synced only in + * one direction. + */ + public static final int READONLY = 0x2; + /** + * If this flag is set the Group is marked as deleted and must not occur + * in any output. The deletion is done lazily by a low priority daemon. + */ + public static final int DELETED = 0x80; - /** - * If this flag is set the Group is marked as readonly and the posting - * is prohibited. This can be useful for groups that are synced only in - * one direction. - */ - public static final int READONLY = 0x2; + public static List getAll() + { + List all = new ArrayList(); - /** - * If this flag is set the Group is marked as deleted and must not occur - * in any output. The deletion is done lazily by a low priority daemon. - */ - public static final int DELETED = 0x80; + /*List agroups = AggregatedGroup.getAll(); + if(agroups != null) + { + all.addAll(agroups); + }*/ - public static List getAll() - { - List all = new ArrayList(); + List groups = Group.getAll(); + if (groups != null) { + all.addAll(groups); + } - /*List agroups = AggregatedGroup.getAll(); - if(agroups != null) - { - all.addAll(agroups); - }*/ + return all; + } - List groups = Group.getAll(); - if(groups != null) - { - all.addAll(groups); - } + public static Channel getByName(String name) + throws StorageBackendException + { + return StorageManager.current().getGroup(name); + } - return all; - } + public abstract Article getArticle(long idx) + throws StorageBackendException; - public static Channel getByName(String name) - throws StorageBackendException - { - return StorageManager.current().getGroup(name); - } + public abstract List> getArticleHeads( + final long first, final long last) + throws StorageBackendException; - public abstract Article getArticle(long idx) - throws StorageBackendException; + public abstract List getArticleNumbers() + throws StorageBackendException; - public abstract List> getArticleHeads( - final long first, final long last) - throws StorageBackendException; + public abstract long getFirstArticleNumber() + throws StorageBackendException; - public abstract List getArticleNumbers() - throws StorageBackendException; + public abstract long getIndexOf(Article art) + throws StorageBackendException; - public abstract long getFirstArticleNumber() - throws StorageBackendException; + public abstract long getInternalID(); - public abstract long getIndexOf(Article art) - throws StorageBackendException; + public abstract long getLastArticleNumber() + throws StorageBackendException; - public abstract long getInternalID(); + public abstract String getName(); - public abstract long getLastArticleNumber() - throws StorageBackendException; + public abstract long getPostingsCount() + throws StorageBackendException; - public abstract String getName(); - - public abstract long getPostingsCount() - throws StorageBackendException; + public abstract boolean isDeleted(); - public abstract boolean isDeleted(); - - public abstract boolean isWriteable(); - + public abstract boolean isWriteable(); } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/storage/Group.java --- a/src/org/sonews/storage/Group.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/storage/Group.java Sun Aug 29 18:17:37 2010 +0200 @@ -31,154 +31,147 @@ // TODO: This class should not be public! public class Group extends Channel { - - private long id = 0; - private int flags = -1; - private String name = null; - /** - * @return List of all groups this server handles. - */ - public static List getAll() - { - try - { - return StorageManager.current().getGroups(); - } - catch(StorageBackendException ex) - { - Log.get().severe(ex.getMessage()); - return null; - } - } - - /** - * @param name - * @param id - */ - public Group(final String name, final long id, final int flags) - { - this.id = id; - this.flags = flags; - this.name = name; - } + private long id = 0; + private int flags = -1; + private String name = null; - @Override - public boolean equals(Object obj) - { - if(obj instanceof Group) - { - return ((Group)obj).id == this.id; - } - else - { - return false; - } - } + /** + * @return List of all groups this server handles. + */ + public static List getAll() + { + try { + return StorageManager.current().getGroups(); + } catch (StorageBackendException ex) { + Log.get().severe(ex.getMessage()); + return null; + } + } - public Article getArticle(long idx) - throws StorageBackendException - { - return StorageManager.current().getArticle(idx, this.id); - } + /** + * @param name + * @param id + */ + public Group(final String name, final long id, final int flags) + { + this.id = id; + this.flags = flags; + this.name = name; + } - public List> getArticleHeads(final long first, final long last) - throws StorageBackendException - { - return StorageManager.current().getArticleHeads(this, first, last); - } - - public List getArticleNumbers() - throws StorageBackendException - { - return StorageManager.current().getArticleNumbers(id); - } + @Override + public boolean equals(Object obj) + { + if (obj instanceof Group) { + return ((Group) obj).id == this.id; + } else { + return false; + } + } - public long getFirstArticleNumber() - throws StorageBackendException - { - return StorageManager.current().getFirstArticleNumber(this); - } + public Article getArticle(long idx) + throws StorageBackendException + { + return StorageManager.current().getArticle(idx, this.id); + } - public int getFlags() - { - return this.flags; - } + public List> getArticleHeads(final long first, final long last) + throws StorageBackendException + { + return StorageManager.current().getArticleHeads(this, first, last); + } - public long getIndexOf(Article art) - throws StorageBackendException - { - return StorageManager.current().getArticleIndex(art, this); - } + public List getArticleNumbers() + throws StorageBackendException + { + return StorageManager.current().getArticleNumbers(id); + } - /** - * Returns the group id. - */ - public long getInternalID() - { - assert id > 0; + public long getFirstArticleNumber() + throws StorageBackendException + { + return StorageManager.current().getFirstArticleNumber(this); + } - return id; - } + public int getFlags() + { + return this.flags; + } - public boolean isDeleted() - { - return (this.flags & DELETED) != 0; - } + public long getIndexOf(Article art) + throws StorageBackendException + { + return StorageManager.current().getArticleIndex(art, this); + } - public boolean isMailingList() - { - return (this.flags & MAILINGLIST) != 0; - } + /** + * Returns the group id. + */ + public long getInternalID() + { + assert id > 0; - public boolean isWriteable() - { - return true; - } + return id; + } - public long getLastArticleNumber() - throws StorageBackendException - { - return StorageManager.current().getLastArticleNumber(this); - } + public boolean isDeleted() + { + return (this.flags & DELETED) != 0; + } - public String getName() - { - return name; - } + public boolean isMailingList() + { + return (this.flags & MAILINGLIST) != 0; + } - /** - * Performs this.flags |= flag to set a specified flag and updates the data - * in the JDBCDatabase. - * @param flag - */ - public void setFlag(final int flag) - { - this.flags |= flag; - } + public boolean isWriteable() + { + return true; + } - public void setName(final String name) - { - this.name = name; - } + public long getLastArticleNumber() + throws StorageBackendException + { + return StorageManager.current().getLastArticleNumber(this); + } - /** - * @return Number of posted articles in this group. - * @throws java.sql.SQLException - */ - public long getPostingsCount() - throws StorageBackendException - { - return StorageManager.current().getPostingsCount(this.name); - } + public String getName() + { + return name; + } - /** - * Updates flags and name in the backend. - */ - public void update() - throws StorageBackendException - { - StorageManager.current().update(this); - } + /** + * Performs this.flags |= flag to set a specified flag and updates the data + * in the JDBCDatabase. + * @param flag + */ + public void setFlag(final int flag) + { + this.flags |= flag; + } + public void setName(final String name) + { + this.name = name; + } + + /** + * @return Number of posted articles in this group. + * @throws java.sql.SQLException + */ + public long getPostingsCount() + throws StorageBackendException + { + return StorageManager.current().getPostingsCount(this.name); + } + + /** + * Updates flags and name in the backend. + */ + public void update() + throws StorageBackendException + { + StorageManager.current().update(this); + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/storage/Headers.java --- a/src/org/sonews/storage/Headers.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/storage/Headers.java Sun Aug 29 18:17:37 2010 +0200 @@ -27,30 +27,30 @@ public final class Headers { - public static final String BYTES = "bytes"; - public static final String CONTENT_TYPE = "content-type"; - public static final String CONTROL = "control"; - public static final String DATE = "date"; - public static final String FROM = "from"; - public static final String LINES = "lines"; - public static final String LIST_POST = "list-post"; - public static final String MESSAGE_ID = "message-id"; - public static final String NEWSGROUPS = "newsgroups"; - public static final String NNTP_POSTING_DATE = "nntp-posting-date"; - public static final String NNTP_POSTING_HOST = "nntp-posting-host"; - public static final String PATH = "path"; - public static final String REFERENCES = "references"; - public static final String REPLY_TO = "reply-to"; - public static final String SENDER = "sender"; - public static final String SUBJECT = "subject"; - public static final String SUPERSEDES = "subersedes"; - public static final String TO = "to"; - public static final String X_COMPLAINTS_TO = "x-complaints-to"; - public static final String X_LIST_POST = "x-list-post"; - public static final String X_TRACE = "x-trace"; - public static final String XREF = "xref"; + public static final String BYTES = "bytes"; + public static final String CONTENT_TYPE = "content-type"; + public static final String CONTROL = "control"; + public static final String DATE = "date"; + public static final String FROM = "from"; + public static final String LINES = "lines"; + public static final String LIST_POST = "list-post"; + public static final String MESSAGE_ID = "message-id"; + public static final String NEWSGROUPS = "newsgroups"; + public static final String NNTP_POSTING_DATE = "nntp-posting-date"; + public static final String NNTP_POSTING_HOST = "nntp-posting-host"; + public static final String PATH = "path"; + public static final String REFERENCES = "references"; + public static final String REPLY_TO = "reply-to"; + public static final String SENDER = "sender"; + public static final String SUBJECT = "subject"; + public static final String SUPERSEDES = "subersedes"; + public static final String TO = "to"; + public static final String X_COMPLAINTS_TO = "x-complaints-to"; + public static final String X_LIST_POST = "x-list-post"; + public static final String X_TRACE = "x-trace"; + public static final String XREF = "xref"; - private Headers() - {} - + private Headers() + { + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/storage/Storage.java --- a/src/org/sonews/storage/Storage.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/storage/Storage.java Sun Aug 29 18:17:37 2010 +0200 @@ -30,121 +30,120 @@ public interface Storage { - /** - * Stores the given Article in the storage. - * @param art - * @throws StorageBackendException - */ - void addArticle(Article art) - throws StorageBackendException; + /** + * Stores the given Article in the storage. + * @param art + * @throws StorageBackendException + */ + void addArticle(Article art) + throws StorageBackendException; - void addEvent(long timestamp, int type, long groupID) - throws StorageBackendException; + void addEvent(long timestamp, int type, long groupID) + throws StorageBackendException; - void addGroup(String groupname, int flags) - throws StorageBackendException; + void addGroup(String groupname, int flags) + throws StorageBackendException; - int countArticles() - throws StorageBackendException; + int countArticles() + throws StorageBackendException; - int countGroups() - throws StorageBackendException; + int countGroups() + throws StorageBackendException; - void delete(String messageID) - throws StorageBackendException; + void delete(String messageID) + throws StorageBackendException; - Article getArticle(String messageID) - throws StorageBackendException; + Article getArticle(String messageID) + throws StorageBackendException; - Article getArticle(long articleIndex, long groupID) - throws StorageBackendException; + Article getArticle(long articleIndex, long groupID) + throws StorageBackendException; - List> getArticleHeads(Group group, long first, long last) - throws StorageBackendException; + List> getArticleHeads(Group group, long first, long last) + throws StorageBackendException; - List> getArticleHeaders(Channel channel, long start, long end, - String header, String pattern) - throws StorageBackendException; + List> getArticleHeaders(Channel channel, long start, long end, + String header, String pattern) + throws StorageBackendException; - long getArticleIndex(Article art, Group group) - throws StorageBackendException; + long getArticleIndex(Article art, Group group) + throws StorageBackendException; - List getArticleNumbers(long groupID) - throws StorageBackendException; + List getArticleNumbers(long groupID) + throws StorageBackendException; - String getConfigValue(String key) - throws StorageBackendException; + String getConfigValue(String key) + throws StorageBackendException; - int getEventsCount(int eventType, long startTimestamp, long endTimestamp, - Channel channel) - throws StorageBackendException; + int getEventsCount(int eventType, long startTimestamp, long endTimestamp, + Channel channel) + throws StorageBackendException; - double getEventsPerHour(int key, long gid) - throws StorageBackendException; + double getEventsPerHour(int key, long gid) + throws StorageBackendException; - int getFirstArticleNumber(Group group) - throws StorageBackendException; + int getFirstArticleNumber(Group group) + throws StorageBackendException; - Group getGroup(String name) - throws StorageBackendException; + Group getGroup(String name) + throws StorageBackendException; - List getGroups() - throws StorageBackendException; + List getGroups() + throws StorageBackendException; - /** - * Retrieves the collection of groupnames that are associated with the - * given list address. - * @param inetaddress - * @return - * @throws StorageBackendException - */ - List getGroupsForList(String listAddress) - throws StorageBackendException; + /** + * Retrieves the collection of groupnames that are associated with the + * given list address. + * @param inetaddress + * @return + * @throws StorageBackendException + */ + List getGroupsForList(String listAddress) + throws StorageBackendException; - int getLastArticleNumber(Group group) - throws StorageBackendException; + int getLastArticleNumber(Group group) + throws StorageBackendException; - /** - * Returns a list of email addresses that are related to the given - * groupname. In most cases the list may contain only one entry. - * @param groupname - * @return - * @throws StorageBackendException - */ - List getListsForGroup(String groupname) - throws StorageBackendException; + /** + * Returns a list of email addresses that are related to the given + * groupname. In most cases the list may contain only one entry. + * @param groupname + * @return + * @throws StorageBackendException + */ + List getListsForGroup(String groupname) + throws StorageBackendException; - String getOldestArticle() - throws StorageBackendException; + String getOldestArticle() + throws StorageBackendException; - int getPostingsCount(String groupname) - throws StorageBackendException; + int getPostingsCount(String groupname) + throws StorageBackendException; - List getSubscriptions(int type) - throws StorageBackendException; + List getSubscriptions(int type) + throws StorageBackendException; - boolean isArticleExisting(String messageID) - throws StorageBackendException; + boolean isArticleExisting(String messageID) + throws StorageBackendException; - boolean isGroupExisting(String groupname) - throws StorageBackendException; + boolean isGroupExisting(String groupname) + throws StorageBackendException; - void purgeGroup(Group group) - throws StorageBackendException; + void purgeGroup(Group group) + throws StorageBackendException; - void setConfigValue(String key, String value) - throws StorageBackendException; + void setConfigValue(String key, String value) + throws StorageBackendException; - /** - * Updates headers and channel references of the given article. - * @param article - * @return - * @throws StorageBackendException - */ - boolean update(Article article) - throws StorageBackendException; + /** + * Updates headers and channel references of the given article. + * @param article + * @return + * @throws StorageBackendException + */ + boolean update(Article article) + throws StorageBackendException; - boolean update(Group group) - throws StorageBackendException; - + boolean update(Group group) + throws StorageBackendException; } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/storage/StorageBackendException.java --- a/src/org/sonews/storage/StorageBackendException.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/storage/StorageBackendException.java Sun Aug 29 18:17:37 2010 +0200 @@ -19,21 +19,20 @@ package org.sonews.storage; /** - * + * Exception caused by the storage backend. * @author Christian Lins * @since sonews/1.0 */ public class StorageBackendException extends Exception { - public StorageBackendException(Throwable cause) - { - super(cause); - } + public StorageBackendException(Throwable cause) + { + super(cause); + } - public StorageBackendException(String msg) - { - super(msg); - } - + public StorageBackendException(String msg) + { + super(msg); + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/storage/StorageManager.java --- a/src/org/sonews/storage/StorageManager.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/storage/StorageManager.java Sun Aug 29 18:17:37 2010 +0200 @@ -26,64 +26,53 @@ public final class StorageManager { - private static StorageProvider provider; + private static StorageProvider provider; - public static Storage current() - throws StorageBackendException - { - synchronized(StorageManager.class) - { - if(provider == null) - { - return null; - } - else - { - return provider.storage(Thread.currentThread()); - } - } - } + public static Storage current() + throws StorageBackendException + { + synchronized (StorageManager.class) { + if (provider == null) { + return null; + } else { + return provider.storage(Thread.currentThread()); + } + } + } - public static StorageProvider loadProvider(String pluginClassName) - { - try - { - Class clazz = Class.forName(pluginClassName); - Object inst = clazz.newInstance(); - return (StorageProvider)inst; - } - catch(Exception ex) - { - System.err.println(ex); - return null; - } - } + public static StorageProvider loadProvider(String pluginClassName) + { + try { + Class clazz = Class.forName(pluginClassName); + Object inst = clazz.newInstance(); + return (StorageProvider) inst; + } catch (Exception ex) { + System.err.println(ex); + return null; + } + } - /** - * Sets the current storage provider. - * @param provider - */ - public static void enableProvider(StorageProvider provider) - { - synchronized(StorageManager.class) - { - if(StorageManager.provider != null) - { - disableProvider(); - } - StorageManager.provider = provider; - } - } + /** + * Sets the current storage provider. + * @param provider + */ + public static void enableProvider(StorageProvider provider) + { + synchronized (StorageManager.class) { + if (StorageManager.provider != null) { + disableProvider(); + } + StorageManager.provider = provider; + } + } - /** - * Disables the current provider. - */ - public static void disableProvider() - { - synchronized(StorageManager.class) - { - provider = null; - } - } - + /** + * Disables the current provider. + */ + public static void disableProvider() + { + synchronized (StorageManager.class) { + provider = null; + } + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/storage/StorageProvider.java --- a/src/org/sonews/storage/StorageProvider.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/storage/StorageProvider.java Sun Aug 29 18:17:37 2010 +0200 @@ -26,15 +26,14 @@ public interface StorageProvider { - public boolean isSupported(String uri); + public boolean isSupported(String uri); - /** - * This method returns the reference to the associated storage. - * The reference MAY be unique for each thread. In any case it MUST be - * thread-safe to use this method. - * @return The reference to the associated Storage. - */ - public Storage storage(Thread thread) - throws StorageBackendException; - + /** + * This method returns the reference to the associated storage. + * The reference MAY be unique for each thread. In any case it MUST be + * thread-safe to use this method. + * @return The reference to the associated Storage. + */ + public Storage storage(Thread thread) + throws StorageBackendException; } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/storage/impl/JDBCDatabase.java --- a/src/org/sonews/storage/impl/JDBCDatabase.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/storage/impl/JDBCDatabase.java Sun Aug 29 18:17:37 2010 +0200 @@ -52,1731 +52,1378 @@ public class JDBCDatabase implements Storage { - public static final int MAX_RESTARTS = 2; - - private Connection conn = null; - private PreparedStatement pstmtAddArticle1 = null; - private PreparedStatement pstmtAddArticle2 = null; - private PreparedStatement pstmtAddArticle3 = null; - private PreparedStatement pstmtAddArticle4 = null; - private PreparedStatement pstmtAddGroup0 = null; - private PreparedStatement pstmtAddEvent = null; - private PreparedStatement pstmtCountArticles = null; - private PreparedStatement pstmtCountGroups = null; - private PreparedStatement pstmtDeleteArticle0 = null; - private PreparedStatement pstmtDeleteArticle1 = null; - private PreparedStatement pstmtDeleteArticle2 = null; - private PreparedStatement pstmtDeleteArticle3 = null; - private PreparedStatement pstmtGetArticle0 = null; - private PreparedStatement pstmtGetArticle1 = null; - private PreparedStatement pstmtGetArticleHeaders0 = null; - private PreparedStatement pstmtGetArticleHeaders1 = null; - private PreparedStatement pstmtGetArticleHeads = null; - private PreparedStatement pstmtGetArticleIDs = null; - private PreparedStatement pstmtGetArticleIndex = null; - private PreparedStatement pstmtGetConfigValue = null; - private PreparedStatement pstmtGetEventsCount0 = null; - private PreparedStatement pstmtGetEventsCount1 = null; - private PreparedStatement pstmtGetGroupForList = null; - private PreparedStatement pstmtGetGroup0 = null; - private PreparedStatement pstmtGetGroup1 = null; - private PreparedStatement pstmtGetFirstArticleNumber = null; - private PreparedStatement pstmtGetListForGroup = null; - private PreparedStatement pstmtGetLastArticleNumber = null; - private PreparedStatement pstmtGetMaxArticleID = null; - private PreparedStatement pstmtGetMaxArticleIndex = null; - private PreparedStatement pstmtGetOldestArticle = null; - private PreparedStatement pstmtGetPostingsCount = null; - private PreparedStatement pstmtGetSubscriptions = null; - private PreparedStatement pstmtIsArticleExisting = null; - private PreparedStatement pstmtIsGroupExisting = null; - private PreparedStatement pstmtPurgeGroup0 = null; - private PreparedStatement pstmtPurgeGroup1 = null; - private PreparedStatement pstmtSetConfigValue0 = null; - private PreparedStatement pstmtSetConfigValue1 = null; - private PreparedStatement pstmtUpdateGroup = null; - - /** How many times the database connection was reinitialized */ - private int restarts = 0; - - /** - * Rises the database: reconnect and recreate all prepared statements. - * @throws java.lang.SQLException - */ - protected void arise() - throws SQLException - { - try - { - // Load database driver - Class.forName( - Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_DBMSDRIVER, "java.lang.Object")); + public static final int MAX_RESTARTS = 2; + private Connection conn = null; + private PreparedStatement pstmtAddArticle1 = null; + private PreparedStatement pstmtAddArticle2 = null; + private PreparedStatement pstmtAddArticle3 = null; + private PreparedStatement pstmtAddArticle4 = null; + private PreparedStatement pstmtAddGroup0 = null; + private PreparedStatement pstmtAddEvent = null; + private PreparedStatement pstmtCountArticles = null; + private PreparedStatement pstmtCountGroups = null; + private PreparedStatement pstmtDeleteArticle0 = null; + private PreparedStatement pstmtDeleteArticle1 = null; + private PreparedStatement pstmtDeleteArticle2 = null; + private PreparedStatement pstmtDeleteArticle3 = null; + private PreparedStatement pstmtGetArticle0 = null; + private PreparedStatement pstmtGetArticle1 = null; + private PreparedStatement pstmtGetArticleHeaders0 = null; + private PreparedStatement pstmtGetArticleHeaders1 = null; + private PreparedStatement pstmtGetArticleHeads = null; + private PreparedStatement pstmtGetArticleIDs = null; + private PreparedStatement pstmtGetArticleIndex = null; + private PreparedStatement pstmtGetConfigValue = null; + private PreparedStatement pstmtGetEventsCount0 = null; + private PreparedStatement pstmtGetEventsCount1 = null; + private PreparedStatement pstmtGetGroupForList = null; + private PreparedStatement pstmtGetGroup0 = null; + private PreparedStatement pstmtGetGroup1 = null; + private PreparedStatement pstmtGetFirstArticleNumber = null; + private PreparedStatement pstmtGetListForGroup = null; + private PreparedStatement pstmtGetLastArticleNumber = null; + private PreparedStatement pstmtGetMaxArticleID = null; + private PreparedStatement pstmtGetMaxArticleIndex = null; + private PreparedStatement pstmtGetOldestArticle = null; + private PreparedStatement pstmtGetPostingsCount = null; + private PreparedStatement pstmtGetSubscriptions = null; + private PreparedStatement pstmtIsArticleExisting = null; + private PreparedStatement pstmtIsGroupExisting = null; + private PreparedStatement pstmtPurgeGroup0 = null; + private PreparedStatement pstmtPurgeGroup1 = null; + private PreparedStatement pstmtSetConfigValue0 = null; + private PreparedStatement pstmtSetConfigValue1 = null; + private PreparedStatement pstmtUpdateGroup = null; + /** How many times the database connection was reinitialized */ + private int restarts = 0; - // Establish database connection - this.conn = DriverManager.getConnection( - Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_DATABASE, ""), - Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_USER, "root"), - Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_PASSWORD, "")); + /** + * Rises the database: reconnect and recreate all prepared statements. + * @throws java.lang.SQLException + */ + protected void arise() + throws SQLException + { + try { + // Load database driver + Class.forName( + Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_DBMSDRIVER, "java.lang.Object")); - this.conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE); - if(this.conn.getTransactionIsolation() != Connection.TRANSACTION_SERIALIZABLE) - { - Log.get().warning("Database is NOT fully serializable!"); - } + // Establish database connection + this.conn = DriverManager.getConnection( + Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_DATABASE, ""), + Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_USER, "root"), + Config.inst().get(Config.LEVEL_FILE, Config.STORAGE_PASSWORD, "")); - // Prepare statements for method addArticle() - this.pstmtAddArticle1 = conn.prepareStatement( - "INSERT INTO articles (article_id, body) VALUES(?, ?)"); - this.pstmtAddArticle2 = conn.prepareStatement( - "INSERT INTO headers (article_id, header_key, header_value, header_index) " + - "VALUES (?, ?, ?, ?)"); - this.pstmtAddArticle3 = conn.prepareStatement( - "INSERT INTO postings (group_id, article_id, article_index)" + - "VALUES (?, ?, ?)"); - this.pstmtAddArticle4 = conn.prepareStatement( - "INSERT INTO article_ids (article_id, message_id) VALUES (?, ?)"); + this.conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE); + if (this.conn.getTransactionIsolation() != Connection.TRANSACTION_SERIALIZABLE) { + Log.get().warning("Database is NOT fully serializable!"); + } - // Prepare statement for method addStatValue() - this.pstmtAddEvent = conn.prepareStatement( - "INSERT INTO events VALUES (?, ?, ?)"); - - // Prepare statement for method addGroup() - this.pstmtAddGroup0 = conn.prepareStatement( - "INSERT INTO groups (name, flags) VALUES (?, ?)"); - - // Prepare statement for method countArticles() - this.pstmtCountArticles = conn.prepareStatement( - "SELECT Count(article_id) FROM article_ids"); - - // Prepare statement for method countGroups() - this.pstmtCountGroups = conn.prepareStatement( - "SELECT Count(group_id) FROM groups WHERE " + - "flags & " + Channel.DELETED + " = 0"); - - // Prepare statements for method delete(article) - this.pstmtDeleteArticle0 = conn.prepareStatement( - "DELETE FROM articles WHERE article_id = " + - "(SELECT article_id FROM article_ids WHERE message_id = ?)"); - this.pstmtDeleteArticle1 = conn.prepareStatement( - "DELETE FROM headers WHERE article_id = " + - "(SELECT article_id FROM article_ids WHERE message_id = ?)"); - this.pstmtDeleteArticle2 = conn.prepareStatement( - "DELETE FROM postings WHERE article_id = " + - "(SELECT article_id FROM article_ids WHERE message_id = ?)"); - this.pstmtDeleteArticle3 = conn.prepareStatement( - "DELETE FROM article_ids WHERE message_id = ?"); + // Prepare statements for method addArticle() + this.pstmtAddArticle1 = conn.prepareStatement( + "INSERT INTO articles (article_id, body) VALUES(?, ?)"); + this.pstmtAddArticle2 = conn.prepareStatement( + "INSERT INTO headers (article_id, header_key, header_value, header_index) " + + "VALUES (?, ?, ?, ?)"); + this.pstmtAddArticle3 = conn.prepareStatement( + "INSERT INTO postings (group_id, article_id, article_index)" + + "VALUES (?, ?, ?)"); + this.pstmtAddArticle4 = conn.prepareStatement( + "INSERT INTO article_ids (article_id, message_id) VALUES (?, ?)"); - // Prepare statements for methods getArticle() - this.pstmtGetArticle0 = conn.prepareStatement( - "SELECT * FROM articles WHERE article_id = " + - "(SELECT article_id FROM article_ids WHERE message_id = ?)"); - this.pstmtGetArticle1 = conn.prepareStatement( - "SELECT * FROM articles WHERE article_id = " + - "(SELECT article_id FROM postings WHERE " + - "article_index = ? AND group_id = ?)"); - - // Prepare statement for method getArticleHeaders() - this.pstmtGetArticleHeaders0 = conn.prepareStatement( - "SELECT header_key, header_value FROM headers WHERE article_id = ? " + - "ORDER BY header_index ASC"); + // Prepare statement for method addStatValue() + this.pstmtAddEvent = conn.prepareStatement( + "INSERT INTO events VALUES (?, ?, ?)"); - // Prepare statement for method getArticleHeaders(regular expr pattern) - this.pstmtGetArticleHeaders1 = conn.prepareStatement( - "SELECT p.article_index, h.header_value FROM headers h " + - "INNER JOIN postings p ON h.article_id = p.article_id " + - "INNER JOIN groups g ON p.group_id = g.group_id " + - "WHERE g.name = ? AND " + - "h.header_key = ? AND " + - "p.article_index >= ? " + - "ORDER BY p.article_index ASC"); + // Prepare statement for method addGroup() + this.pstmtAddGroup0 = conn.prepareStatement( + "INSERT INTO groups (name, flags) VALUES (?, ?)"); - this.pstmtGetArticleIDs = conn.prepareStatement( - "SELECT article_index FROM postings WHERE group_id = ?"); - - // Prepare statement for method getArticleIndex - this.pstmtGetArticleIndex = conn.prepareStatement( - "SELECT article_index FROM postings WHERE " + - "article_id = (SELECT article_id FROM article_ids " + - "WHERE message_id = ?) " + - " AND group_id = ?"); + // Prepare statement for method countArticles() + this.pstmtCountArticles = conn.prepareStatement( + "SELECT Count(article_id) FROM article_ids"); - // Prepare statements for method getArticleHeads() - this.pstmtGetArticleHeads = conn.prepareStatement( - "SELECT article_id, article_index FROM postings WHERE " + - "postings.group_id = ? AND article_index >= ? AND " + - "article_index <= ?"); + // Prepare statement for method countGroups() + this.pstmtCountGroups = conn.prepareStatement( + "SELECT Count(group_id) FROM groups WHERE " + + "flags & " + Channel.DELETED + " = 0"); - // Prepare statements for method getConfigValue() - this.pstmtGetConfigValue = conn.prepareStatement( - "SELECT config_value FROM config WHERE config_key = ?"); + // Prepare statements for method delete(article) + this.pstmtDeleteArticle0 = conn.prepareStatement( + "DELETE FROM articles WHERE article_id = " + + "(SELECT article_id FROM article_ids WHERE message_id = ?)"); + this.pstmtDeleteArticle1 = conn.prepareStatement( + "DELETE FROM headers WHERE article_id = " + + "(SELECT article_id FROM article_ids WHERE message_id = ?)"); + this.pstmtDeleteArticle2 = conn.prepareStatement( + "DELETE FROM postings WHERE article_id = " + + "(SELECT article_id FROM article_ids WHERE message_id = ?)"); + this.pstmtDeleteArticle3 = conn.prepareStatement( + "DELETE FROM article_ids WHERE message_id = ?"); - // Prepare statements for method getEventsCount() - this.pstmtGetEventsCount0 = conn.prepareStatement( - "SELECT Count(*) FROM events WHERE event_key = ? AND " + - "event_time >= ? AND event_time < ?"); + // Prepare statements for methods getArticle() + this.pstmtGetArticle0 = conn.prepareStatement( + "SELECT * FROM articles WHERE article_id = " + + "(SELECT article_id FROM article_ids WHERE message_id = ?)"); + this.pstmtGetArticle1 = conn.prepareStatement( + "SELECT * FROM articles WHERE article_id = " + + "(SELECT article_id FROM postings WHERE " + + "article_index = ? AND group_id = ?)"); - this.pstmtGetEventsCount1 = conn.prepareStatement( - "SELECT Count(*) FROM events WHERE event_key = ? AND " + - "event_time >= ? AND event_time < ? AND group_id = ?"); - - // Prepare statement for method getGroupForList() - this.pstmtGetGroupForList = conn.prepareStatement( - "SELECT name FROM groups INNER JOIN groups2list " + - "ON groups.group_id = groups2list.group_id " + - "WHERE groups2list.listaddress = ?"); + // Prepare statement for method getArticleHeaders() + this.pstmtGetArticleHeaders0 = conn.prepareStatement( + "SELECT header_key, header_value FROM headers WHERE article_id = ? " + + "ORDER BY header_index ASC"); - // Prepare statement for method getGroup() - this.pstmtGetGroup0 = conn.prepareStatement( - "SELECT group_id, flags FROM groups WHERE Name = ?"); - this.pstmtGetGroup1 = conn.prepareStatement( - "SELECT name FROM groups WHERE group_id = ?"); + // Prepare statement for method getArticleHeaders(regular expr pattern) + this.pstmtGetArticleHeaders1 = conn.prepareStatement( + "SELECT p.article_index, h.header_value FROM headers h " + + "INNER JOIN postings p ON h.article_id = p.article_id " + + "INNER JOIN groups g ON p.group_id = g.group_id " + + "WHERE g.name = ? AND " + + "h.header_key = ? AND " + + "p.article_index >= ? " + + "ORDER BY p.article_index ASC"); - // Prepare statement for method getLastArticleNumber() - this.pstmtGetLastArticleNumber = conn.prepareStatement( - "SELECT Max(article_index) FROM postings WHERE group_id = ?"); + this.pstmtGetArticleIDs = conn.prepareStatement( + "SELECT article_index FROM postings WHERE group_id = ?"); - // Prepare statement for method getListForGroup() - this.pstmtGetListForGroup = conn.prepareStatement( - "SELECT listaddress FROM groups2list INNER JOIN groups " + - "ON groups.group_id = groups2list.group_id WHERE name = ?"); + // Prepare statement for method getArticleIndex + this.pstmtGetArticleIndex = conn.prepareStatement( + "SELECT article_index FROM postings WHERE " + + "article_id = (SELECT article_id FROM article_ids " + + "WHERE message_id = ?) " + + " AND group_id = ?"); - // Prepare statement for method getMaxArticleID() - this.pstmtGetMaxArticleID = conn.prepareStatement( - "SELECT Max(article_id) FROM articles"); - - // Prepare statement for method getMaxArticleIndex() - this.pstmtGetMaxArticleIndex = conn.prepareStatement( - "SELECT Max(article_index) FROM postings WHERE group_id = ?"); - - // Prepare statement for method getOldestArticle() - this.pstmtGetOldestArticle = conn.prepareStatement( - "SELECT message_id FROM article_ids WHERE article_id = " + - "(SELECT Min(article_id) FROM article_ids)"); + // Prepare statements for method getArticleHeads() + this.pstmtGetArticleHeads = conn.prepareStatement( + "SELECT article_id, article_index FROM postings WHERE " + + "postings.group_id = ? AND article_index >= ? AND " + + "article_index <= ?"); - // Prepare statement for method getFirstArticleNumber() - this.pstmtGetFirstArticleNumber = conn.prepareStatement( - "SELECT Min(article_index) FROM postings WHERE group_id = ?"); - - // Prepare statement for method getPostingsCount() - this.pstmtGetPostingsCount = conn.prepareStatement( - "SELECT Count(*) FROM postings NATURAL JOIN groups " + - "WHERE groups.name = ?"); - - // Prepare statement for method getSubscriptions() - this.pstmtGetSubscriptions = conn.prepareStatement( - "SELECT host, port, name FROM peers NATURAL JOIN " + - "peer_subscriptions NATURAL JOIN groups WHERE feedtype = ?"); - - // Prepare statement for method isArticleExisting() - this.pstmtIsArticleExisting = conn.prepareStatement( - "SELECT Count(article_id) FROM article_ids WHERE message_id = ?"); - - // Prepare statement for method isGroupExisting() - this.pstmtIsGroupExisting = conn.prepareStatement( - "SELECT * FROM groups WHERE name = ?"); - - // Prepare statement for method setConfigValue() - this.pstmtSetConfigValue0 = conn.prepareStatement( - "DELETE FROM config WHERE config_key = ?"); - this.pstmtSetConfigValue1 = conn.prepareStatement( - "INSERT INTO config VALUES(?, ?)"); + // Prepare statements for method getConfigValue() + this.pstmtGetConfigValue = conn.prepareStatement( + "SELECT config_value FROM config WHERE config_key = ?"); - // Prepare statements for method purgeGroup() - this.pstmtPurgeGroup0 = conn.prepareStatement( - "DELETE FROM peer_subscriptions WHERE group_id = ?"); - this.pstmtPurgeGroup1 = conn.prepareStatement( - "DELETE FROM groups WHERE group_id = ?"); + // Prepare statements for method getEventsCount() + this.pstmtGetEventsCount0 = conn.prepareStatement( + "SELECT Count(*) FROM events WHERE event_key = ? AND " + + "event_time >= ? AND event_time < ?"); - // Prepare statement for method update(Group) - this.pstmtUpdateGroup = conn.prepareStatement( - "UPDATE groups SET flags = ?, name = ? WHERE group_id = ?"); - } - catch(ClassNotFoundException ex) - { - throw new Error("JDBC Driver not found!", ex); - } - } - - /** - * Adds an article to the database. - * @param article - * @return - * @throws java.sql.SQLException - */ - @Override - public void addArticle(final Article article) - throws StorageBackendException - { - try - { - this.conn.setAutoCommit(false); + this.pstmtGetEventsCount1 = conn.prepareStatement( + "SELECT Count(*) FROM events WHERE event_key = ? AND " + + "event_time >= ? AND event_time < ? AND group_id = ?"); - int newArticleID = getMaxArticleID() + 1; + // Prepare statement for method getGroupForList() + this.pstmtGetGroupForList = conn.prepareStatement( + "SELECT name FROM groups INNER JOIN groups2list " + + "ON groups.group_id = groups2list.group_id " + + "WHERE groups2list.listaddress = ?"); - // Fill prepared statement with values; - // writes body to article table - pstmtAddArticle1.setInt(1, newArticleID); - pstmtAddArticle1.setBytes(2, article.getBody()); - pstmtAddArticle1.execute(); + // Prepare statement for method getGroup() + this.pstmtGetGroup0 = conn.prepareStatement( + "SELECT group_id, flags FROM groups WHERE Name = ?"); + this.pstmtGetGroup1 = conn.prepareStatement( + "SELECT name FROM groups WHERE group_id = ?"); - // Add headers - Enumeration headers = article.getAllHeaders(); - for(int n = 0; headers.hasMoreElements(); n++) - { - Header header = (Header)headers.nextElement(); - pstmtAddArticle2.setInt(1, newArticleID); - pstmtAddArticle2.setString(2, header.getName().toLowerCase()); - pstmtAddArticle2.setString(3, - header.getValue().replaceAll("[\r\n]", "")); - pstmtAddArticle2.setInt(4, n); - pstmtAddArticle2.execute(); - } - - // For each newsgroup add a reference - List groups = article.getGroups(); - for(Group group : groups) - { - pstmtAddArticle3.setLong(1, group.getInternalID()); - pstmtAddArticle3.setInt(2, newArticleID); - pstmtAddArticle3.setLong(3, getMaxArticleIndex(group.getInternalID()) + 1); - pstmtAddArticle3.execute(); - } - - // Write message-id to article_ids table - this.pstmtAddArticle4.setInt(1, newArticleID); - this.pstmtAddArticle4.setString(2, article.getMessageID()); - this.pstmtAddArticle4.execute(); + // Prepare statement for method getLastArticleNumber() + this.pstmtGetLastArticleNumber = conn.prepareStatement( + "SELECT Max(article_index) FROM postings WHERE group_id = ?"); - this.conn.commit(); - this.conn.setAutoCommit(true); + // Prepare statement for method getListForGroup() + this.pstmtGetListForGroup = conn.prepareStatement( + "SELECT listaddress FROM groups2list INNER JOIN groups " + + "ON groups.group_id = groups2list.group_id WHERE name = ?"); - this.restarts = 0; // Reset error count - } - catch(SQLException ex) - { - try - { - this.conn.rollback(); // Rollback changes - } - catch(SQLException ex2) - { - Log.get().severe("Rollback of addArticle() failed: " + ex2); - } - - try - { - this.conn.setAutoCommit(true); // and release locks - } - catch(SQLException ex2) - { - Log.get().severe("setAutoCommit(true) of addArticle() failed: " + ex2); - } + // Prepare statement for method getMaxArticleID() + this.pstmtGetMaxArticleID = conn.prepareStatement( + "SELECT Max(article_id) FROM articles"); - restartConnection(ex); - addArticle(article); - } - } - - /** - * Adds a group to the JDBCDatabase. This method is not accessible via NNTP. - * @param name - * @throws java.sql.SQLException - */ - @Override - public void addGroup(String name, int flags) - throws StorageBackendException - { - try - { - this.conn.setAutoCommit(false); - pstmtAddGroup0.setString(1, name); - pstmtAddGroup0.setInt(2, flags); + // Prepare statement for method getMaxArticleIndex() + this.pstmtGetMaxArticleIndex = conn.prepareStatement( + "SELECT Max(article_index) FROM postings WHERE group_id = ?"); - pstmtAddGroup0.executeUpdate(); - this.conn.commit(); - this.conn.setAutoCommit(true); - this.restarts = 0; // Reset error count - } - catch(SQLException ex) - { - try - { - this.conn.rollback(); - this.conn.setAutoCommit(true); - } - catch(SQLException ex2) - { - ex2.printStackTrace(); - } + // Prepare statement for method getOldestArticle() + this.pstmtGetOldestArticle = conn.prepareStatement( + "SELECT message_id FROM article_ids WHERE article_id = " + + "(SELECT Min(article_id) FROM article_ids)"); - restartConnection(ex); - addGroup(name, flags); - } - } + // Prepare statement for method getFirstArticleNumber() + this.pstmtGetFirstArticleNumber = conn.prepareStatement( + "SELECT Min(article_index) FROM postings WHERE group_id = ?"); - @Override - public void addEvent(long time, int type, long gid) - throws StorageBackendException - { - try - { - this.conn.setAutoCommit(false); - this.pstmtAddEvent.setLong(1, time); - this.pstmtAddEvent.setInt(2, type); - this.pstmtAddEvent.setLong(3, gid); - this.pstmtAddEvent.executeUpdate(); - this.conn.commit(); - this.conn.setAutoCommit(true); - this.restarts = 0; - } - catch(SQLException ex) - { - try - { - this.conn.rollback(); - this.conn.setAutoCommit(true); - } - catch(SQLException ex2) - { - ex2.printStackTrace(); - } + // Prepare statement for method getPostingsCount() + this.pstmtGetPostingsCount = conn.prepareStatement( + "SELECT Count(*) FROM postings NATURAL JOIN groups " + + "WHERE groups.name = ?"); - restartConnection(ex); - addEvent(time, type, gid); - } - } + // Prepare statement for method getSubscriptions() + this.pstmtGetSubscriptions = conn.prepareStatement( + "SELECT host, port, name FROM peers NATURAL JOIN " + + "peer_subscriptions NATURAL JOIN groups WHERE feedtype = ?"); - @Override - public int countArticles() - throws StorageBackendException - { - ResultSet rs = null; + // Prepare statement for method isArticleExisting() + this.pstmtIsArticleExisting = conn.prepareStatement( + "SELECT Count(article_id) FROM article_ids WHERE message_id = ?"); - try - { - rs = this.pstmtCountArticles.executeQuery(); - if(rs.next()) - { - return rs.getInt(1); - } - else - { - return -1; - } - } - catch(SQLException ex) - { - restartConnection(ex); - return countArticles(); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - restarts = 0; - } - } - } + // Prepare statement for method isGroupExisting() + this.pstmtIsGroupExisting = conn.prepareStatement( + "SELECT * FROM groups WHERE name = ?"); - @Override - public int countGroups() - throws StorageBackendException - { - ResultSet rs = null; + // Prepare statement for method setConfigValue() + this.pstmtSetConfigValue0 = conn.prepareStatement( + "DELETE FROM config WHERE config_key = ?"); + this.pstmtSetConfigValue1 = conn.prepareStatement( + "INSERT INTO config VALUES(?, ?)"); - try - { - rs = this.pstmtCountGroups.executeQuery(); - if(rs.next()) - { - return rs.getInt(1); - } - else - { - return -1; - } - } - catch(SQLException ex) - { - restartConnection(ex); - return countGroups(); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - restarts = 0; - } - } - } + // Prepare statements for method purgeGroup() + this.pstmtPurgeGroup0 = conn.prepareStatement( + "DELETE FROM peer_subscriptions WHERE group_id = ?"); + this.pstmtPurgeGroup1 = conn.prepareStatement( + "DELETE FROM groups WHERE group_id = ?"); - @Override - public void delete(final String messageID) - throws StorageBackendException - { - try - { - this.conn.setAutoCommit(false); - - this.pstmtDeleteArticle0.setString(1, messageID); - int rs = this.pstmtDeleteArticle0.executeUpdate(); - - // We do not trust the ON DELETE CASCADE functionality to delete - // orphaned references... - this.pstmtDeleteArticle1.setString(1, messageID); - rs = this.pstmtDeleteArticle1.executeUpdate(); + // Prepare statement for method update(Group) + this.pstmtUpdateGroup = conn.prepareStatement( + "UPDATE groups SET flags = ?, name = ? WHERE group_id = ?"); + } catch (ClassNotFoundException ex) { + throw new Error("JDBC Driver not found!", ex); + } + } - this.pstmtDeleteArticle2.setString(1, messageID); - rs = this.pstmtDeleteArticle2.executeUpdate(); + /** + * Adds an article to the database. + * @param article + * @return + * @throws java.sql.SQLException + */ + @Override + public void addArticle(final Article article) + throws StorageBackendException + { + try { + this.conn.setAutoCommit(false); - this.pstmtDeleteArticle3.setString(1, messageID); - rs = this.pstmtDeleteArticle3.executeUpdate(); - - this.conn.commit(); - this.conn.setAutoCommit(true); - } - catch(SQLException ex) - { - throw new StorageBackendException(ex); - } - } + int newArticleID = getMaxArticleID() + 1; - @Override - public Article getArticle(String messageID) - throws StorageBackendException - { - ResultSet rs = null; - try - { - pstmtGetArticle0.setString(1, messageID); - rs = pstmtGetArticle0.executeQuery(); + // Fill prepared statement with values; + // writes body to article table + pstmtAddArticle1.setInt(1, newArticleID); + pstmtAddArticle1.setBytes(2, article.getBody()); + pstmtAddArticle1.execute(); - if(!rs.next()) - { - return null; - } - else - { - byte[] body = rs.getBytes("body"); - String headers = getArticleHeaders(rs.getInt("article_id")); - return new Article(headers, body); - } - } - catch(SQLException ex) - { - restartConnection(ex); - return getArticle(messageID); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - restarts = 0; // Reset error count - } - } - } - - /** - * Retrieves an article by its ID. - * @param articleID - * @return - * @throws StorageBackendException - */ - @Override - public Article getArticle(long articleIndex, long gid) - throws StorageBackendException - { - ResultSet rs = null; + // Add headers + Enumeration headers = article.getAllHeaders(); + for (int n = 0; headers.hasMoreElements(); n++) { + Header header = (Header) headers.nextElement(); + pstmtAddArticle2.setInt(1, newArticleID); + pstmtAddArticle2.setString(2, header.getName().toLowerCase()); + pstmtAddArticle2.setString(3, + header.getValue().replaceAll("[\r\n]", "")); + pstmtAddArticle2.setInt(4, n); + pstmtAddArticle2.execute(); + } - try - { - this.pstmtGetArticle1.setLong(1, articleIndex); - this.pstmtGetArticle1.setLong(2, gid); + // For each newsgroup add a reference + List groups = article.getGroups(); + for (Group group : groups) { + pstmtAddArticle3.setLong(1, group.getInternalID()); + pstmtAddArticle3.setInt(2, newArticleID); + pstmtAddArticle3.setLong(3, getMaxArticleIndex(group.getInternalID()) + 1); + pstmtAddArticle3.execute(); + } - rs = this.pstmtGetArticle1.executeQuery(); + // Write message-id to article_ids table + this.pstmtAddArticle4.setInt(1, newArticleID); + this.pstmtAddArticle4.setString(2, article.getMessageID()); + this.pstmtAddArticle4.execute(); - if(rs.next()) - { - byte[] body = rs.getBytes("body"); - String headers = getArticleHeaders(rs.getInt("article_id")); - return new Article(headers, body); - } - else - { - return null; - } - } - catch(SQLException ex) - { - restartConnection(ex); - return getArticle(articleIndex, gid); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - restarts = 0; - } - } - } + this.conn.commit(); + this.conn.setAutoCommit(true); - /** - * Searches for fitting header values using the given regular expression. - * @param group - * @param start - * @param end - * @param headerKey - * @param pattern - * @return - * @throws StorageBackendException - */ - @Override - public List> getArticleHeaders(Channel group, long start, - long end, String headerKey, String patStr) - throws StorageBackendException, PatternSyntaxException - { - ResultSet rs = null; - List> heads = new ArrayList>(); + this.restarts = 0; // Reset error count + } catch (SQLException ex) { + try { + this.conn.rollback(); // Rollback changes + } catch (SQLException ex2) { + Log.get().severe("Rollback of addArticle() failed: " + ex2); + } - try - { - this.pstmtGetArticleHeaders1.setString(1, group.getName()); - this.pstmtGetArticleHeaders1.setString(2, headerKey); - this.pstmtGetArticleHeaders1.setLong(3, start); + try { + this.conn.setAutoCommit(true); // and release locks + } catch (SQLException ex2) { + Log.get().severe("setAutoCommit(true) of addArticle() failed: " + ex2); + } - rs = this.pstmtGetArticleHeaders1.executeQuery(); + restartConnection(ex); + addArticle(article); + } + } - // Convert the "NNTP" regex to Java regex - patStr = patStr.replace("*", ".*"); - Pattern pattern = Pattern.compile(patStr); + /** + * Adds a group to the JDBCDatabase. This method is not accessible via NNTP. + * @param name + * @throws java.sql.SQLException + */ + @Override + public void addGroup(String name, int flags) + throws StorageBackendException + { + try { + this.conn.setAutoCommit(false); + pstmtAddGroup0.setString(1, name); + pstmtAddGroup0.setInt(2, flags); - while(rs.next()) - { - Long articleIndex = rs.getLong(1); - if(end < 0 || articleIndex <= end) // Match start is done via SQL - { - String headerValue = rs.getString(2); - Matcher matcher = pattern.matcher(headerValue); - if(matcher.matches()) - { - heads.add(new Pair(articleIndex, headerValue)); - } - } - } - } - catch(SQLException ex) - { - restartConnection(ex); - return getArticleHeaders(group, start, end, headerKey, patStr); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } + pstmtAddGroup0.executeUpdate(); + this.conn.commit(); + this.conn.setAutoCommit(true); + this.restarts = 0; // Reset error count + } catch (SQLException ex) { + try { + this.conn.rollback(); + this.conn.setAutoCommit(true); + } catch (SQLException ex2) { + ex2.printStackTrace(); + } - return heads; - } + restartConnection(ex); + addGroup(name, flags); + } + } - private String getArticleHeaders(long articleID) - throws StorageBackendException - { - ResultSet rs = null; - - try - { - this.pstmtGetArticleHeaders0.setLong(1, articleID); - rs = this.pstmtGetArticleHeaders0.executeQuery(); - - StringBuilder buf = new StringBuilder(); - if(rs.next()) - { - for(;;) - { - buf.append(rs.getString(1)); // key - buf.append(": "); - String foldedValue = MimeUtility.fold(0, rs.getString(2)); - buf.append(foldedValue); // value - if(rs.next()) - { - buf.append("\r\n"); - } - else - { - break; - } - } - } - - return buf.toString(); - } - catch(SQLException ex) - { - restartConnection(ex); - return getArticleHeaders(articleID); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } + @Override + public void addEvent(long time, int type, long gid) + throws StorageBackendException + { + try { + this.conn.setAutoCommit(false); + this.pstmtAddEvent.setLong(1, time); + this.pstmtAddEvent.setInt(2, type); + this.pstmtAddEvent.setLong(3, gid); + this.pstmtAddEvent.executeUpdate(); + this.conn.commit(); + this.conn.setAutoCommit(true); + this.restarts = 0; + } catch (SQLException ex) { + try { + this.conn.rollback(); + this.conn.setAutoCommit(true); + } catch (SQLException ex2) { + ex2.printStackTrace(); + } - @Override - public long getArticleIndex(Article article, Group group) - throws StorageBackendException - { - ResultSet rs = null; + restartConnection(ex); + addEvent(time, type, gid); + } + } - try - { - this.pstmtGetArticleIndex.setString(1, article.getMessageID()); - this.pstmtGetArticleIndex.setLong(2, group.getInternalID()); - - rs = this.pstmtGetArticleIndex.executeQuery(); - if(rs.next()) - { - return rs.getLong(1); - } - else - { - return -1; - } - } - catch(SQLException ex) - { - restartConnection(ex); - return getArticleIndex(article, group); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } - - /** - * Returns a list of Long/Article Pairs. - * @throws java.sql.SQLException - */ - @Override - public List> getArticleHeads(Group group, long first, - long last) - throws StorageBackendException - { - ResultSet rs = null; + @Override + public int countArticles() + throws StorageBackendException + { + ResultSet rs = null; - try - { - this.pstmtGetArticleHeads.setLong(1, group.getInternalID()); - this.pstmtGetArticleHeads.setLong(2, first); - this.pstmtGetArticleHeads.setLong(3, last); - rs = pstmtGetArticleHeads.executeQuery(); + try { + rs = this.pstmtCountArticles.executeQuery(); + if (rs.next()) { + return rs.getInt(1); + } else { + return -1; + } + } catch (SQLException ex) { + restartConnection(ex); + return countArticles(); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + restarts = 0; + } + } + } - List> articles - = new ArrayList>(); + @Override + public int countGroups() + throws StorageBackendException + { + ResultSet rs = null; - while (rs.next()) - { - long aid = rs.getLong("article_id"); - long aidx = rs.getLong("article_index"); - String headers = getArticleHeaders(aid); - articles.add(new Pair(aidx, - new ArticleHead(headers))); - } + try { + rs = this.pstmtCountGroups.executeQuery(); + if (rs.next()) { + return rs.getInt(1); + } else { + return -1; + } + } catch (SQLException ex) { + restartConnection(ex); + return countGroups(); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + restarts = 0; + } + } + } - return articles; - } - catch(SQLException ex) - { - restartConnection(ex); - return getArticleHeads(group, first, last); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } + @Override + public void delete(final String messageID) + throws StorageBackendException + { + try { + this.conn.setAutoCommit(false); - @Override - public List getArticleNumbers(long gid) - throws StorageBackendException - { - ResultSet rs = null; - try - { - List ids = new ArrayList(); - this.pstmtGetArticleIDs.setLong(1, gid); - rs = this.pstmtGetArticleIDs.executeQuery(); - while(rs.next()) - { - ids.add(rs.getLong(1)); - } - return ids; - } - catch(SQLException ex) - { - restartConnection(ex); - return getArticleNumbers(gid); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - restarts = 0; // Clear the restart count after successful request - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } + this.pstmtDeleteArticle0.setString(1, messageID); + int rs = this.pstmtDeleteArticle0.executeUpdate(); - @Override - public String getConfigValue(String key) - throws StorageBackendException - { - ResultSet rs = null; - try - { - this.pstmtGetConfigValue.setString(1, key); + // We do not trust the ON DELETE CASCADE functionality to delete + // orphaned references... + this.pstmtDeleteArticle1.setString(1, messageID); + rs = this.pstmtDeleteArticle1.executeUpdate(); - rs = this.pstmtGetConfigValue.executeQuery(); - if(rs.next()) - { - return rs.getString(1); // First data on index 1 not 0 - } - else - { - return null; - } - } - catch(SQLException ex) - { - restartConnection(ex); - return getConfigValue(key); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - restarts = 0; // Clear the restart count after successful request - } - } - } + this.pstmtDeleteArticle2.setString(1, messageID); + rs = this.pstmtDeleteArticle2.executeUpdate(); - @Override - public int getEventsCount(int type, long start, long end, Channel channel) - throws StorageBackendException - { - ResultSet rs = null; - - try - { - if(channel == null) - { - this.pstmtGetEventsCount0.setInt(1, type); - this.pstmtGetEventsCount0.setLong(2, start); - this.pstmtGetEventsCount0.setLong(3, end); - rs = this.pstmtGetEventsCount0.executeQuery(); - } - else - { - this.pstmtGetEventsCount1.setInt(1, type); - this.pstmtGetEventsCount1.setLong(2, start); - this.pstmtGetEventsCount1.setLong(3, end); - this.pstmtGetEventsCount1.setLong(4, channel.getInternalID()); - rs = this.pstmtGetEventsCount1.executeQuery(); - } - - if(rs.next()) - { - return rs.getInt(1); - } - else - { - return -1; - } - } - catch(SQLException ex) - { - restartConnection(ex); - return getEventsCount(type, start, end, channel); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } - - /** - * Reads all Groups from the JDBCDatabase. - * @return - * @throws StorageBackendException - */ - @Override - public List getGroups() - throws StorageBackendException - { - ResultSet rs; - List buffer = new ArrayList(); - Statement stmt = null; + this.pstmtDeleteArticle3.setString(1, messageID); + rs = this.pstmtDeleteArticle3.executeUpdate(); - try - { - stmt = conn.createStatement(); - rs = stmt.executeQuery("SELECT * FROM groups ORDER BY name"); + this.conn.commit(); + this.conn.setAutoCommit(true); + } catch (SQLException ex) { + throw new StorageBackendException(ex); + } + } - while(rs.next()) - { - String name = rs.getString("name"); - long id = rs.getLong("group_id"); - int flags = rs.getInt("flags"); - - Group group = new Group(name, id, flags); - buffer.add(group); - } + @Override + public Article getArticle(String messageID) + throws StorageBackendException + { + ResultSet rs = null; + try { + pstmtGetArticle0.setString(1, messageID); + rs = pstmtGetArticle0.executeQuery(); - return buffer; - } - catch(SQLException ex) - { - restartConnection(ex); - return getGroups(); - } - finally - { - if(stmt != null) - { - try - { - stmt.close(); // Implicitely closes ResultSets - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } + if (!rs.next()) { + return null; + } else { + byte[] body = rs.getBytes("body"); + String headers = getArticleHeaders(rs.getInt("article_id")); + return new Article(headers, body); + } + } catch (SQLException ex) { + restartConnection(ex); + return getArticle(messageID); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + restarts = 0; // Reset error count + } + } + } - @Override - public List getGroupsForList(String listAddress) - throws StorageBackendException - { - ResultSet rs = null; - - try - { - this.pstmtGetGroupForList.setString(1, listAddress); + /** + * Retrieves an article by its ID. + * @param articleID + * @return + * @throws StorageBackendException + */ + @Override + public Article getArticle(long articleIndex, long gid) + throws StorageBackendException + { + ResultSet rs = null; - rs = this.pstmtGetGroupForList.executeQuery(); - List groups = new ArrayList(); - while(rs.next()) - { - String group = rs.getString(1); - groups.add(group); - } - return groups; - } - catch(SQLException ex) - { - restartConnection(ex); - return getGroupsForList(listAddress); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } - - /** - * Returns the Group that is identified by the name. - * @param name - * @return - * @throws StorageBackendException - */ - @Override - public Group getGroup(String name) - throws StorageBackendException - { - ResultSet rs = null; - - try - { - this.pstmtGetGroup0.setString(1, name); - rs = this.pstmtGetGroup0.executeQuery(); + try { + this.pstmtGetArticle1.setLong(1, articleIndex); + this.pstmtGetArticle1.setLong(2, gid); - if (!rs.next()) - { - return null; - } - else - { - long id = rs.getLong("group_id"); - int flags = rs.getInt("flags"); - return new Group(name, id, flags); - } - } - catch(SQLException ex) - { - restartConnection(ex); - return getGroup(name); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } + rs = this.pstmtGetArticle1.executeQuery(); - @Override - public List getListsForGroup(String group) - throws StorageBackendException - { - ResultSet rs = null; - List lists = new ArrayList(); + if (rs.next()) { + byte[] body = rs.getBytes("body"); + String headers = getArticleHeaders(rs.getInt("article_id")); + return new Article(headers, body); + } else { + return null; + } + } catch (SQLException ex) { + restartConnection(ex); + return getArticle(articleIndex, gid); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + restarts = 0; + } + } + } - try - { - this.pstmtGetListForGroup.setString(1, group); - rs = this.pstmtGetListForGroup.executeQuery(); + /** + * Searches for fitting header values using the given regular expression. + * @param group + * @param start + * @param end + * @param headerKey + * @param pattern + * @return + * @throws StorageBackendException + */ + @Override + public List> getArticleHeaders(Channel group, long start, + long end, String headerKey, String patStr) + throws StorageBackendException, PatternSyntaxException + { + ResultSet rs = null; + List> heads = new ArrayList>(); - while(rs.next()) - { - lists.add(rs.getString(1)); - } - return lists; - } - catch(SQLException ex) - { - restartConnection(ex); - return getListsForGroup(group); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } - - private int getMaxArticleIndex(long groupID) - throws StorageBackendException - { - ResultSet rs = null; + try { + this.pstmtGetArticleHeaders1.setString(1, group.getName()); + this.pstmtGetArticleHeaders1.setString(2, headerKey); + this.pstmtGetArticleHeaders1.setLong(3, start); - try - { - this.pstmtGetMaxArticleIndex.setLong(1, groupID); - rs = this.pstmtGetMaxArticleIndex.executeQuery(); + rs = this.pstmtGetArticleHeaders1.executeQuery(); - int maxIndex = 0; - if (rs.next()) - { - maxIndex = rs.getInt(1); - } + // Convert the "NNTP" regex to Java regex + patStr = patStr.replace("*", ".*"); + Pattern pattern = Pattern.compile(patStr); - return maxIndex; - } - catch(SQLException ex) - { - restartConnection(ex); - return getMaxArticleIndex(groupID); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } - - private int getMaxArticleID() - throws StorageBackendException - { - ResultSet rs = null; + while (rs.next()) { + Long articleIndex = rs.getLong(1); + if (end < 0 || articleIndex <= end) // Match start is done via SQL + { + String headerValue = rs.getString(2); + Matcher matcher = pattern.matcher(headerValue); + if (matcher.matches()) { + heads.add(new Pair(articleIndex, headerValue)); + } + } + } + } catch (SQLException ex) { + restartConnection(ex); + return getArticleHeaders(group, start, end, headerKey, patStr); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } - try - { - rs = this.pstmtGetMaxArticleID.executeQuery(); + return heads; + } - int maxIndex = 0; - if (rs.next()) - { - maxIndex = rs.getInt(1); - } + private String getArticleHeaders(long articleID) + throws StorageBackendException + { + ResultSet rs = null; - return maxIndex; - } - catch(SQLException ex) - { - restartConnection(ex); - return getMaxArticleID(); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } + try { + this.pstmtGetArticleHeaders0.setLong(1, articleID); + rs = this.pstmtGetArticleHeaders0.executeQuery(); - @Override - public int getLastArticleNumber(Group group) - throws StorageBackendException - { - ResultSet rs = null; + StringBuilder buf = new StringBuilder(); + if (rs.next()) { + for (;;) { + buf.append(rs.getString(1)); // key + buf.append(": "); + String foldedValue = MimeUtility.fold(0, rs.getString(2)); + buf.append(foldedValue); // value + if (rs.next()) { + buf.append("\r\n"); + } else { + break; + } + } + } - try - { - this.pstmtGetLastArticleNumber.setLong(1, group.getInternalID()); - rs = this.pstmtGetLastArticleNumber.executeQuery(); - if (rs.next()) - { - return rs.getInt(1); - } - else - { - return 0; - } - } - catch(SQLException ex) - { - restartConnection(ex); - return getLastArticleNumber(group); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } + return buf.toString(); + } catch (SQLException ex) { + restartConnection(ex); + return getArticleHeaders(articleID); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } - @Override - public int getFirstArticleNumber(Group group) - throws StorageBackendException - { - ResultSet rs = null; - try - { - this.pstmtGetFirstArticleNumber.setLong(1, group.getInternalID()); - rs = this.pstmtGetFirstArticleNumber.executeQuery(); - if(rs.next()) - { - return rs.getInt(1); - } - else - { - return 0; - } - } - catch(SQLException ex) - { - restartConnection(ex); - return getFirstArticleNumber(group); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } - - /** - * Returns a group name identified by the given id. - * @param id - * @return - * @throws StorageBackendException - */ - public String getGroup(int id) - throws StorageBackendException - { - ResultSet rs = null; + @Override + public long getArticleIndex(Article article, Group group) + throws StorageBackendException + { + ResultSet rs = null; - try - { - this.pstmtGetGroup1.setInt(1, id); - rs = this.pstmtGetGroup1.executeQuery(); + try { + this.pstmtGetArticleIndex.setString(1, article.getMessageID()); + this.pstmtGetArticleIndex.setLong(2, group.getInternalID()); - if (rs.next()) - { - return rs.getString(1); - } - else - { - return null; - } - } - catch(SQLException ex) - { - restartConnection(ex); - return getGroup(id); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } + rs = this.pstmtGetArticleIndex.executeQuery(); + if (rs.next()) { + return rs.getLong(1); + } else { + return -1; + } + } catch (SQLException ex) { + restartConnection(ex); + return getArticleIndex(article, group); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } - @Override - public double getEventsPerHour(int key, long gid) - throws StorageBackendException - { - String gidquery = ""; - if(gid >= 0) - { - gidquery = " AND group_id = " + gid; - } - - Statement stmt = null; - ResultSet rs = null; - - try - { - stmt = this.conn.createStatement(); - rs = stmt.executeQuery("SELECT Count(*) / (Max(event_time) - Min(event_time))" + - " * 1000 * 60 * 60 FROM events WHERE event_key = " + key + gidquery); - - if(rs.next()) - { - restarts = 0; // reset error count - return rs.getDouble(1); - } - else - { - return Double.NaN; - } - } - catch(SQLException ex) - { - restartConnection(ex); - return getEventsPerHour(key, gid); - } - finally - { - try - { - if(stmt != null) - { - stmt.close(); // Implicitely closes the result sets - } - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } + /** + * Returns a list of Long/Article Pairs. + * @throws java.sql.SQLException + */ + @Override + public List> getArticleHeads(Group group, long first, + long last) + throws StorageBackendException + { + ResultSet rs = null; - @Override - public String getOldestArticle() - throws StorageBackendException - { - ResultSet rs = null; + try { + this.pstmtGetArticleHeads.setLong(1, group.getInternalID()); + this.pstmtGetArticleHeads.setLong(2, first); + this.pstmtGetArticleHeads.setLong(3, last); + rs = pstmtGetArticleHeads.executeQuery(); - try - { - rs = this.pstmtGetOldestArticle.executeQuery(); - if(rs.next()) - { - return rs.getString(1); - } - else - { - return null; - } - } - catch(SQLException ex) - { - restartConnection(ex); - return getOldestArticle(); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } + List> articles = new ArrayList>(); - @Override - public int getPostingsCount(String groupname) - throws StorageBackendException - { - ResultSet rs = null; - - try - { - this.pstmtGetPostingsCount.setString(1, groupname); - rs = this.pstmtGetPostingsCount.executeQuery(); - if(rs.next()) - { - return rs.getInt(1); - } - else - { - Log.get().warning("Count on postings return nothing!"); - return 0; - } - } - catch(SQLException ex) - { - restartConnection(ex); - return getPostingsCount(groupname); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } + while (rs.next()) { + long aid = rs.getLong("article_id"); + long aidx = rs.getLong("article_index"); + String headers = getArticleHeaders(aid); + articles.add(new Pair(aidx, + new ArticleHead(headers))); + } - @Override - public List getSubscriptions(int feedtype) - throws StorageBackendException - { - ResultSet rs = null; - - try - { - List subs = new ArrayList(); - this.pstmtGetSubscriptions.setInt(1, feedtype); - rs = this.pstmtGetSubscriptions.executeQuery(); - - while(rs.next()) - { - String host = rs.getString("host"); - String group = rs.getString("name"); - int port = rs.getInt("port"); - subs.add(new Subscription(host, port, feedtype, group)); - } - - return subs; - } - catch(SQLException ex) - { - restartConnection(ex); - return getSubscriptions(feedtype); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } + return articles; + } catch (SQLException ex) { + restartConnection(ex); + return getArticleHeads(group, first, last); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } - /** - * Checks if there is an article with the given messageid in the JDBCDatabase. - * @param name - * @return - * @throws StorageBackendException - */ - @Override - public boolean isArticleExisting(String messageID) - throws StorageBackendException - { - ResultSet rs = null; - - try - { - this.pstmtIsArticleExisting.setString(1, messageID); - rs = this.pstmtIsArticleExisting.executeQuery(); - return rs.next() && rs.getInt(1) == 1; - } - catch(SQLException ex) - { - restartConnection(ex); - return isArticleExisting(messageID); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } - - /** - * Checks if there is a group with the given name in the JDBCDatabase. - * @param name - * @return - * @throws StorageBackendException - */ - @Override - public boolean isGroupExisting(String name) - throws StorageBackendException - { - ResultSet rs = null; - - try - { - this.pstmtIsGroupExisting.setString(1, name); - rs = this.pstmtIsGroupExisting.executeQuery(); - return rs.next(); - } - catch(SQLException ex) - { - restartConnection(ex); - return isGroupExisting(name); - } - finally - { - if(rs != null) - { - try - { - rs.close(); - } - catch(SQLException ex) - { - ex.printStackTrace(); - } - } - } - } + @Override + public List getArticleNumbers(long gid) + throws StorageBackendException + { + ResultSet rs = null; + try { + List ids = new ArrayList(); + this.pstmtGetArticleIDs.setLong(1, gid); + rs = this.pstmtGetArticleIDs.executeQuery(); + while (rs.next()) { + ids.add(rs.getLong(1)); + } + return ids; + } catch (SQLException ex) { + restartConnection(ex); + return getArticleNumbers(gid); + } finally { + if (rs != null) { + try { + rs.close(); + restarts = 0; // Clear the restart count after successful request + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } - @Override - public void setConfigValue(String key, String value) - throws StorageBackendException - { - try - { - conn.setAutoCommit(false); - this.pstmtSetConfigValue0.setString(1, key); - this.pstmtSetConfigValue0.execute(); - this.pstmtSetConfigValue1.setString(1, key); - this.pstmtSetConfigValue1.setString(2, value); - this.pstmtSetConfigValue1.execute(); - conn.commit(); - conn.setAutoCommit(true); - } - catch(SQLException ex) - { - restartConnection(ex); - setConfigValue(key, value); - } - } - - /** - * Closes the JDBCDatabase connection. - */ - public void shutdown() - throws StorageBackendException - { - try - { - if(this.conn != null) - { - this.conn.close(); - } - } - catch(SQLException ex) - { - throw new StorageBackendException(ex); - } - } + @Override + public String getConfigValue(String key) + throws StorageBackendException + { + ResultSet rs = null; + try { + this.pstmtGetConfigValue.setString(1, key); - @Override - public void purgeGroup(Group group) - throws StorageBackendException - { - try - { - this.pstmtPurgeGroup0.setLong(1, group.getInternalID()); - this.pstmtPurgeGroup0.executeUpdate(); + rs = this.pstmtGetConfigValue.executeQuery(); + if (rs.next()) { + return rs.getString(1); // First data on index 1 not 0 + } else { + return null; + } + } catch (SQLException ex) { + restartConnection(ex); + return getConfigValue(key); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + restarts = 0; // Clear the restart count after successful request + } + } + } - this.pstmtPurgeGroup1.setLong(1, group.getInternalID()); - this.pstmtPurgeGroup1.executeUpdate(); - } - catch(SQLException ex) - { - restartConnection(ex); - purgeGroup(group); - } - } - - private void restartConnection(SQLException cause) - throws StorageBackendException - { - restarts++; - Log.get().severe(Thread.currentThread() - + ": Database connection was closed (restart " + restarts + ")."); - - if(restarts >= MAX_RESTARTS) - { - // Delete the current, probably broken JDBCDatabase instance. - // So no one can use the instance any more. - JDBCDatabaseProvider.instances.remove(Thread.currentThread()); - - // Throw the exception upwards - throw new StorageBackendException(cause); - } - - try - { - Thread.sleep(1500L * restarts); - } - catch(InterruptedException ex) - { - Log.get().warning("Interrupted: " + ex.getMessage()); - } - - // Try to properly close the old database connection - try - { - if(this.conn != null) - { - this.conn.close(); - } - } - catch(SQLException ex) - { - Log.get().warning(ex.getMessage()); - } - - try - { - // Try to reinitialize database connection - arise(); - } - catch(SQLException ex) - { - Log.get().warning(ex.getMessage()); - restartConnection(ex); - } - } + @Override + public int getEventsCount(int type, long start, long end, Channel channel) + throws StorageBackendException + { + ResultSet rs = null; - @Override - public boolean update(Article article) - throws StorageBackendException - { - // DELETE FROM headers WHERE article_id = ? + try { + if (channel == null) { + this.pstmtGetEventsCount0.setInt(1, type); + this.pstmtGetEventsCount0.setLong(2, start); + this.pstmtGetEventsCount0.setLong(3, end); + rs = this.pstmtGetEventsCount0.executeQuery(); + } else { + this.pstmtGetEventsCount1.setInt(1, type); + this.pstmtGetEventsCount1.setLong(2, start); + this.pstmtGetEventsCount1.setLong(3, end); + this.pstmtGetEventsCount1.setLong(4, channel.getInternalID()); + rs = this.pstmtGetEventsCount1.executeQuery(); + } - // INSERT INTO headers ... + if (rs.next()) { + return rs.getInt(1); + } else { + return -1; + } + } catch (SQLException ex) { + restartConnection(ex); + return getEventsCount(type, start, end, channel); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } - // SELECT * FROM postings WHERE article_id = ? AND group_id = ? - return false; - } + /** + * Reads all Groups from the JDBCDatabase. + * @return + * @throws StorageBackendException + */ + @Override + public List getGroups() + throws StorageBackendException + { + ResultSet rs; + List buffer = new ArrayList(); + Statement stmt = null; - /** - * Writes the flags and the name of the given group to the database. - * @param group - * @throws StorageBackendException - */ - @Override - public boolean update(Group group) - throws StorageBackendException - { - try - { - this.pstmtUpdateGroup.setInt(1, group.getFlags()); - this.pstmtUpdateGroup.setString(2, group.getName()); - this.pstmtUpdateGroup.setLong(3, group.getInternalID()); - int rs = this.pstmtUpdateGroup.executeUpdate(); - return rs == 1; - } - catch(SQLException ex) - { - restartConnection(ex); - return update(group); - } - } + try { + stmt = conn.createStatement(); + rs = stmt.executeQuery("SELECT * FROM groups ORDER BY name"); + while (rs.next()) { + String name = rs.getString("name"); + long id = rs.getLong("group_id"); + int flags = rs.getInt("flags"); + + Group group = new Group(name, id, flags); + buffer.add(group); + } + + return buffer; + } catch (SQLException ex) { + restartConnection(ex); + return getGroups(); + } finally { + if (stmt != null) { + try { + stmt.close(); // Implicitely closes ResultSets + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } + + @Override + public List getGroupsForList(String listAddress) + throws StorageBackendException + { + ResultSet rs = null; + + try { + this.pstmtGetGroupForList.setString(1, listAddress); + + rs = this.pstmtGetGroupForList.executeQuery(); + List groups = new ArrayList(); + while (rs.next()) { + String group = rs.getString(1); + groups.add(group); + } + return groups; + } catch (SQLException ex) { + restartConnection(ex); + return getGroupsForList(listAddress); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } + + /** + * Returns the Group that is identified by the name. + * @param name + * @return + * @throws StorageBackendException + */ + @Override + public Group getGroup(String name) + throws StorageBackendException + { + ResultSet rs = null; + + try { + this.pstmtGetGroup0.setString(1, name); + rs = this.pstmtGetGroup0.executeQuery(); + + if (!rs.next()) { + return null; + } else { + long id = rs.getLong("group_id"); + int flags = rs.getInt("flags"); + return new Group(name, id, flags); + } + } catch (SQLException ex) { + restartConnection(ex); + return getGroup(name); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } + + @Override + public List getListsForGroup(String group) + throws StorageBackendException + { + ResultSet rs = null; + List lists = new ArrayList(); + + try { + this.pstmtGetListForGroup.setString(1, group); + rs = this.pstmtGetListForGroup.executeQuery(); + + while (rs.next()) { + lists.add(rs.getString(1)); + } + return lists; + } catch (SQLException ex) { + restartConnection(ex); + return getListsForGroup(group); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } + + private int getMaxArticleIndex(long groupID) + throws StorageBackendException + { + ResultSet rs = null; + + try { + this.pstmtGetMaxArticleIndex.setLong(1, groupID); + rs = this.pstmtGetMaxArticleIndex.executeQuery(); + + int maxIndex = 0; + if (rs.next()) { + maxIndex = rs.getInt(1); + } + + return maxIndex; + } catch (SQLException ex) { + restartConnection(ex); + return getMaxArticleIndex(groupID); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } + + private int getMaxArticleID() + throws StorageBackendException + { + ResultSet rs = null; + + try { + rs = this.pstmtGetMaxArticleID.executeQuery(); + + int maxIndex = 0; + if (rs.next()) { + maxIndex = rs.getInt(1); + } + + return maxIndex; + } catch (SQLException ex) { + restartConnection(ex); + return getMaxArticleID(); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } + + @Override + public int getLastArticleNumber(Group group) + throws StorageBackendException + { + ResultSet rs = null; + + try { + this.pstmtGetLastArticleNumber.setLong(1, group.getInternalID()); + rs = this.pstmtGetLastArticleNumber.executeQuery(); + if (rs.next()) { + return rs.getInt(1); + } else { + return 0; + } + } catch (SQLException ex) { + restartConnection(ex); + return getLastArticleNumber(group); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } + + @Override + public int getFirstArticleNumber(Group group) + throws StorageBackendException + { + ResultSet rs = null; + try { + this.pstmtGetFirstArticleNumber.setLong(1, group.getInternalID()); + rs = this.pstmtGetFirstArticleNumber.executeQuery(); + if (rs.next()) { + return rs.getInt(1); + } else { + return 0; + } + } catch (SQLException ex) { + restartConnection(ex); + return getFirstArticleNumber(group); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } + + /** + * Returns a group name identified by the given id. + * @param id + * @return + * @throws StorageBackendException + */ + public String getGroup(int id) + throws StorageBackendException + { + ResultSet rs = null; + + try { + this.pstmtGetGroup1.setInt(1, id); + rs = this.pstmtGetGroup1.executeQuery(); + + if (rs.next()) { + return rs.getString(1); + } else { + return null; + } + } catch (SQLException ex) { + restartConnection(ex); + return getGroup(id); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } + + @Override + public double getEventsPerHour(int key, long gid) + throws StorageBackendException + { + String gidquery = ""; + if (gid >= 0) { + gidquery = " AND group_id = " + gid; + } + + Statement stmt = null; + ResultSet rs = null; + + try { + stmt = this.conn.createStatement(); + rs = stmt.executeQuery("SELECT Count(*) / (Max(event_time) - Min(event_time))" + + " * 1000 * 60 * 60 FROM events WHERE event_key = " + key + gidquery); + + if (rs.next()) { + restarts = 0; // reset error count + return rs.getDouble(1); + } else { + return Double.NaN; + } + } catch (SQLException ex) { + restartConnection(ex); + return getEventsPerHour(key, gid); + } finally { + try { + if (stmt != null) { + stmt.close(); // Implicitely closes the result sets + } + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + + @Override + public String getOldestArticle() + throws StorageBackendException + { + ResultSet rs = null; + + try { + rs = this.pstmtGetOldestArticle.executeQuery(); + if (rs.next()) { + return rs.getString(1); + } else { + return null; + } + } catch (SQLException ex) { + restartConnection(ex); + return getOldestArticle(); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } + + @Override + public int getPostingsCount(String groupname) + throws StorageBackendException + { + ResultSet rs = null; + + try { + this.pstmtGetPostingsCount.setString(1, groupname); + rs = this.pstmtGetPostingsCount.executeQuery(); + if (rs.next()) { + return rs.getInt(1); + } else { + Log.get().warning("Count on postings return nothing!"); + return 0; + } + } catch (SQLException ex) { + restartConnection(ex); + return getPostingsCount(groupname); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } + + @Override + public List getSubscriptions(int feedtype) + throws StorageBackendException + { + ResultSet rs = null; + + try { + List subs = new ArrayList(); + this.pstmtGetSubscriptions.setInt(1, feedtype); + rs = this.pstmtGetSubscriptions.executeQuery(); + + while (rs.next()) { + String host = rs.getString("host"); + String group = rs.getString("name"); + int port = rs.getInt("port"); + subs.add(new Subscription(host, port, feedtype, group)); + } + + return subs; + } catch (SQLException ex) { + restartConnection(ex); + return getSubscriptions(feedtype); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } + + /** + * Checks if there is an article with the given messageid in the JDBCDatabase. + * @param name + * @return + * @throws StorageBackendException + */ + @Override + public boolean isArticleExisting(String messageID) + throws StorageBackendException + { + ResultSet rs = null; + + try { + this.pstmtIsArticleExisting.setString(1, messageID); + rs = this.pstmtIsArticleExisting.executeQuery(); + return rs.next() && rs.getInt(1) == 1; + } catch (SQLException ex) { + restartConnection(ex); + return isArticleExisting(messageID); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } + + /** + * Checks if there is a group with the given name in the JDBCDatabase. + * @param name + * @return + * @throws StorageBackendException + */ + @Override + public boolean isGroupExisting(String name) + throws StorageBackendException + { + ResultSet rs = null; + + try { + this.pstmtIsGroupExisting.setString(1, name); + rs = this.pstmtIsGroupExisting.executeQuery(); + return rs.next(); + } catch (SQLException ex) { + restartConnection(ex); + return isGroupExisting(name); + } finally { + if (rs != null) { + try { + rs.close(); + } catch (SQLException ex) { + ex.printStackTrace(); + } + } + } + } + + @Override + public void setConfigValue(String key, String value) + throws StorageBackendException + { + try { + conn.setAutoCommit(false); + this.pstmtSetConfigValue0.setString(1, key); + this.pstmtSetConfigValue0.execute(); + this.pstmtSetConfigValue1.setString(1, key); + this.pstmtSetConfigValue1.setString(2, value); + this.pstmtSetConfigValue1.execute(); + conn.commit(); + conn.setAutoCommit(true); + } catch (SQLException ex) { + restartConnection(ex); + setConfigValue(key, value); + } + } + + /** + * Closes the JDBCDatabase connection. + */ + public void shutdown() + throws StorageBackendException + { + try { + if (this.conn != null) { + this.conn.close(); + } + } catch (SQLException ex) { + throw new StorageBackendException(ex); + } + } + + @Override + public void purgeGroup(Group group) + throws StorageBackendException + { + try { + this.pstmtPurgeGroup0.setLong(1, group.getInternalID()); + this.pstmtPurgeGroup0.executeUpdate(); + + this.pstmtPurgeGroup1.setLong(1, group.getInternalID()); + this.pstmtPurgeGroup1.executeUpdate(); + } catch (SQLException ex) { + restartConnection(ex); + purgeGroup(group); + } + } + + private void restartConnection(SQLException cause) + throws StorageBackendException + { + restarts++; + Log.get().severe(Thread.currentThread() + + ": Database connection was closed (restart " + restarts + ")."); + + if (restarts >= MAX_RESTARTS) { + // Delete the current, probably broken JDBCDatabase instance. + // So no one can use the instance any more. + JDBCDatabaseProvider.instances.remove(Thread.currentThread()); + + // Throw the exception upwards + throw new StorageBackendException(cause); + } + + try { + Thread.sleep(1500L * restarts); + } catch (InterruptedException ex) { + Log.get().warning("Interrupted: " + ex.getMessage()); + } + + // Try to properly close the old database connection + try { + if (this.conn != null) { + this.conn.close(); + } + } catch (SQLException ex) { + Log.get().warning(ex.getMessage()); + } + + try { + // Try to reinitialize database connection + arise(); + } catch (SQLException ex) { + Log.get().warning(ex.getMessage()); + restartConnection(ex); + } + } + + @Override + public boolean update(Article article) + throws StorageBackendException + { + // DELETE FROM headers WHERE article_id = ? + + // INSERT INTO headers ... + + // SELECT * FROM postings WHERE article_id = ? AND group_id = ? + return false; + } + + /** + * Writes the flags and the name of the given group to the database. + * @param group + * @throws StorageBackendException + */ + @Override + public boolean update(Group group) + throws StorageBackendException + { + try { + this.pstmtUpdateGroup.setInt(1, group.getFlags()); + this.pstmtUpdateGroup.setString(2, group.getName()); + this.pstmtUpdateGroup.setLong(3, group.getInternalID()); + int rs = this.pstmtUpdateGroup.executeUpdate(); + return rs == 1; + } catch (SQLException ex) { + restartConnection(ex); + return update(group); + } + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/storage/impl/JDBCDatabaseProvider.java --- a/src/org/sonews/storage/impl/JDBCDatabaseProvider.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/storage/impl/JDBCDatabaseProvider.java Sun Aug 29 18:17:37 2010 +0200 @@ -33,37 +33,29 @@ public class JDBCDatabaseProvider implements StorageProvider { - protected static final Map instances - = new ConcurrentHashMap(); + protected static final Map instances = new ConcurrentHashMap(); - @Override - public boolean isSupported(String uri) - { - throw new UnsupportedOperationException("Not supported yet."); - } + @Override + public boolean isSupported(String uri) + { + throw new UnsupportedOperationException("Not supported yet."); + } - @Override - public Storage storage(Thread thread) - throws StorageBackendException - { - try - { - if(!instances.containsKey(Thread.currentThread())) - { - JDBCDatabase db = new JDBCDatabase(); - db.arise(); - instances.put(Thread.currentThread(), db); - return db; - } - else - { - return instances.get(Thread.currentThread()); - } - } - catch(SQLException ex) - { - throw new StorageBackendException(ex); - } - } - + @Override + public Storage storage(Thread thread) + throws StorageBackendException + { + try { + if (!instances.containsKey(Thread.currentThread())) { + JDBCDatabase db = new JDBCDatabase(); + db.arise(); + instances.put(Thread.currentThread(), db); + return db; + } else { + return instances.get(Thread.currentThread()); + } + } catch (SQLException ex) { + throw new StorageBackendException(ex); + } + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/util/DatabaseSetup.java --- a/src/org/sonews/util/DatabaseSetup.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/util/DatabaseSetup.java Sun Aug 29 18:17:37 2010 +0200 @@ -25,7 +25,6 @@ import java.sql.Statement; import java.util.HashMap; import java.util.Map; -import org.sonews.config.Config; import org.sonews.util.io.Resource; /** @@ -33,95 +32,85 @@ * @author Christian Lins * @since sonews/0.5.0 */ -public final class DatabaseSetup +public final class DatabaseSetup { - private static final Map templateMap - = new HashMap(); - private static final Map urlMap - = new HashMap(); - private static final Map driverMap - = new HashMap(); - - static - { - templateMap.put("1", "helpers/database_mysql5_tmpl.sql"); - templateMap.put("2", "helpers/database_postgresql8_tmpl.sql"); - - urlMap.put("1", new StringTemplate("jdbc:mysql://%HOSTNAME/%DB")); - urlMap.put("2", new StringTemplate("jdbc:postgresql://%HOSTNAME/%DB")); - - driverMap.put("1", "com.mysql.jdbc.Driver"); - driverMap.put("2", "org.postgresql.Driver"); - } - - public static void main(String[] args) - throws Exception - { - System.out.println("sonews Database setup helper"); - System.out.println("This program will create a initial database table structure"); - System.out.println("for the sonews Newsserver."); - System.out.println("You need to create a database and a db user manually before!"); - - System.out.println("Select DBMS type:"); - System.out.println("[1] MySQL 5.x or higher"); - System.out.println("[2] PostgreSQL 8.x or higher"); - System.out.print("Your choice: "); - - BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); - String dbmsType = in.readLine(); - String tmplName = templateMap.get(dbmsType); - if(tmplName == null) - { - System.err.println("Invalid choice. Try again you fool!"); - main(args); - return; - } - - // Load JDBC Driver class - Class.forName(driverMap.get(dbmsType)); - - String tmpl = Resource.getAsString(tmplName, true); - - System.out.print("Database server hostname (e.g. localhost): "); - String dbHostname = in.readLine(); - - System.out.print("Database name: "); - String dbName = in.readLine(); + private static final Map templateMap = new HashMap(); + private static final Map urlMap = new HashMap(); + private static final Map driverMap = new HashMap(); - System.out.print("Give name of DB user that can create tables: "); - String dbUser = in.readLine(); + static { + templateMap.put("1", "helpers/database_mysql5_tmpl.sql"); + templateMap.put("2", "helpers/database_postgresql8_tmpl.sql"); - System.out.print("Password: "); - String dbPassword = in.readLine(); - - String url = urlMap.get(dbmsType) - .set("HOSTNAME", dbHostname) - .set("DB", dbName).toString(); - - Connection conn = - DriverManager.getConnection(url, dbUser, dbPassword); - conn.setAutoCommit(false); - - String[] tmplChunks = tmpl.split(";"); - - for(String chunk : tmplChunks) - { - if(chunk.trim().equals("")) - { - continue; - } - - Statement stmt = conn.createStatement(); - stmt.execute(chunk); - } - - conn.commit(); - conn.setAutoCommit(true); - - // Create config file - - System.out.println("Ok"); - } - + urlMap.put("1", new StringTemplate("jdbc:mysql://%HOSTNAME/%DB")); + urlMap.put("2", new StringTemplate("jdbc:postgresql://%HOSTNAME/%DB")); + + driverMap.put("1", "com.mysql.jdbc.Driver"); + driverMap.put("2", "org.postgresql.Driver"); + } + + public static void main(String[] args) + throws Exception + { + System.out.println("sonews Database setup helper"); + System.out.println("This program will create a initial database table structure"); + System.out.println("for the sonews Newsserver."); + System.out.println("You need to create a database and a db user manually before!"); + + System.out.println("Select DBMS type:"); + System.out.println("[1] MySQL 5.x or higher"); + System.out.println("[2] PostgreSQL 8.x or higher"); + System.out.print("Your choice: "); + + BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); + String dbmsType = in.readLine(); + String tmplName = templateMap.get(dbmsType); + if (tmplName == null) { + System.err.println("Invalid choice. Try again you fool!"); + main(args); + return; + } + + // Load JDBC Driver class + Class.forName(driverMap.get(dbmsType)); + + String tmpl = Resource.getAsString(tmplName, true); + + System.out.print("Database server hostname (e.g. localhost): "); + String dbHostname = in.readLine(); + + System.out.print("Database name: "); + String dbName = in.readLine(); + + System.out.print("Give name of DB user that can create tables: "); + String dbUser = in.readLine(); + + System.out.print("Password: "); + String dbPassword = in.readLine(); + + String url = urlMap.get(dbmsType).set("HOSTNAME", dbHostname).set("DB", dbName).toString(); + + Connection conn = + DriverManager.getConnection(url, dbUser, dbPassword); + conn.setAutoCommit(false); + + String[] tmplChunks = tmpl.split(";"); + + for (String chunk : tmplChunks) { + if (chunk.trim().equals("")) { + continue; + } + + Statement stmt = conn.createStatement(); + stmt.execute(chunk); + } + + conn.commit(); + conn.setAutoCommit(true); + + // Create config file + + System.out.println("Ok"); + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/util/Log.java --- a/src/org/sonews/util/Log.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/util/Log.java Sun Aug 29 18:17:37 2010 +0200 @@ -33,25 +33,24 @@ public class Log extends Logger { - private static Log instance = new Log(); + private static Log instance = new Log(); - private Log() - { - super("org.sonews", null); + private Log() + { + super("org.sonews", null); - StreamHandler handler = new StreamHandler(System.out, new SimpleFormatter()); - Level level = Level.parse(Config.inst().get(Config.LOGLEVEL, "INFO")); - handler.setLevel(level); - addHandler(handler); - setLevel(level); - LogManager.getLogManager().addLogger(this); - } + StreamHandler handler = new StreamHandler(System.out, new SimpleFormatter()); + Level level = Level.parse(Config.inst().get(Config.LOGLEVEL, "INFO")); + handler.setLevel(level); + addHandler(handler); + setLevel(level); + LogManager.getLogManager().addLogger(this); + } - public static Logger get() - { - Level level = Level.parse(Config.inst().get(Config.LOGLEVEL, "INFO")); - instance.setLevel(level); - return instance; - } - + public static Logger get() + { + Level level = Level.parse(Config.inst().get(Config.LOGLEVEL, "INFO")); + instance.setLevel(level); + return instance; + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/util/Pair.java --- a/src/org/sonews/util/Pair.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/util/Pair.java Sun Aug 29 18:17:37 2010 +0200 @@ -23,26 +23,25 @@ * @author Christian Lins * @since sonews/0.5.0 */ -public class Pair +public class Pair { - - private T1 a; - private T2 b; - - public Pair(T1 a, T2 b) - { - this.a = a; - this.b = b; - } - public T1 getA() - { - return a; - } + private T1 a; + private T2 b; - public T2 getB() - { - return b; - } - + public Pair(T1 a, T2 b) + { + this.a = a; + this.b = b; + } + + public T1 getA() + { + return a; + } + + public T2 getB() + { + return b; + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/util/Purger.java --- a/src/org/sonews/util/Purger.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/util/Purger.java Sun Aug 29 18:17:37 2010 +0200 @@ -40,110 +40,91 @@ public class Purger extends AbstractDaemon { - /** - * Loops through all messages and deletes them if their time - * has come. - */ - @Override - public void run() - { - try - { - while(isRunning()) - { - purgeDeleted(); - purgeOutdated(); + /** + * Loops through all messages and deletes them if their time + * has come. + */ + @Override + public void run() + { + try { + while (isRunning()) { + purgeDeleted(); + purgeOutdated(); - Thread.sleep(120000); // Sleep for two minutes - } - } - catch(StorageBackendException ex) - { - ex.printStackTrace(); - } - catch(InterruptedException ex) - { - Log.get().warning("Purger interrupted: " + ex); - } - } + Thread.sleep(120000); // Sleep for two minutes + } + } catch (StorageBackendException ex) { + ex.printStackTrace(); + } catch (InterruptedException ex) { + Log.get().warning("Purger interrupted: " + ex); + } + } - private void purgeDeleted() - throws StorageBackendException - { - List groups = StorageManager.current().getGroups(); - for(Channel channel : groups) - { - if(!(channel instanceof Group)) - continue; - - Group group = (Group)channel; - // Look for groups that are marked as deleted - if(group.isDeleted()) - { - List ids = StorageManager.current().getArticleNumbers(group.getInternalID()); - if(ids.size() == 0) - { - StorageManager.current().purgeGroup(group); - Log.get().info("Group " + group.getName() + " purged."); - } + private void purgeDeleted() + throws StorageBackendException + { + List groups = StorageManager.current().getGroups(); + for (Channel channel : groups) { + if (!(channel instanceof Group)) { + continue; + } - for(int n = 0; n < ids.size() && n < 10; n++) - { - Article art = StorageManager.current().getArticle(ids.get(n), group.getInternalID()); - StorageManager.current().delete(art.getMessageID()); - Log.get().info("Article " + art.getMessageID() + " purged."); - } - } - } - } + Group group = (Group) channel; + // Look for groups that are marked as deleted + if (group.isDeleted()) { + List ids = StorageManager.current().getArticleNumbers(group.getInternalID()); + if (ids.size() == 0) { + StorageManager.current().purgeGroup(group); + Log.get().info("Group " + group.getName() + " purged."); + } - private void purgeOutdated() - throws InterruptedException, StorageBackendException - { - long articleMaximum = - Config.inst().get("sonews.article.maxnum", Long.MAX_VALUE); - long lifetime = - Config.inst().get("sonews.article.lifetime", -1); + for (int n = 0; n < ids.size() && n < 10; n++) { + Article art = StorageManager.current().getArticle(ids.get(n), group.getInternalID()); + StorageManager.current().delete(art.getMessageID()); + Log.get().info("Article " + art.getMessageID() + " purged."); + } + } + } + } - if(lifetime > 0 || articleMaximum < Stats.getInstance().getNumberOfNews()) - { - Log.get().info("Purging old messages..."); - String mid = StorageManager.current().getOldestArticle(); - if (mid == null) // No articles in the database - { - return; - } + private void purgeOutdated() + throws InterruptedException, StorageBackendException + { + long articleMaximum = + Config.inst().get("sonews.article.maxnum", Long.MAX_VALUE); + long lifetime = + Config.inst().get("sonews.article.lifetime", -1); - Article art = StorageManager.current().getArticle(mid); - long artDate = 0; - String dateStr = art.getHeader(Headers.DATE)[0]; - try - { - artDate = Date.parse(dateStr) / 1000 / 60 / 60 / 24; - } - catch (IllegalArgumentException ex) - { - Log.get().warning("Could not parse date string: " + dateStr + " " + ex); - } + if (lifetime > 0 || articleMaximum < Stats.getInstance().getNumberOfNews()) { + Log.get().info("Purging old messages..."); + String mid = StorageManager.current().getOldestArticle(); + if (mid == null) // No articles in the database + { + return; + } - // Should we delete the message because of its age or because the - // article maximum was reached? - if (lifetime < 0 || artDate < (new Date().getTime() + lifetime)) - { - StorageManager.current().delete(mid); - System.out.println("Deleted: " + mid); - } - else - { - Thread.sleep(1000 * 60); // Wait 60 seconds - return; - } - } - else - { - Log.get().info("Lifetime purger is disabled"); - Thread.sleep(1000 * 60 * 30); // Wait 30 minutes - } - } + Article art = StorageManager.current().getArticle(mid); + long artDate = 0; + String dateStr = art.getHeader(Headers.DATE)[0]; + try { + artDate = Date.parse(dateStr) / 1000 / 60 / 60 / 24; + } catch (IllegalArgumentException ex) { + Log.get().warning("Could not parse date string: " + dateStr + " " + ex); + } + // Should we delete the message because of its age or because the + // article maximum was reached? + if (lifetime < 0 || artDate < (new Date().getTime() + lifetime)) { + StorageManager.current().delete(mid); + System.out.println("Deleted: " + mid); + } else { + Thread.sleep(1000 * 60); // Wait 60 seconds + return; + } + } else { + Log.get().info("Lifetime purger is disabled"); + Thread.sleep(1000 * 60 * 30); // Wait 30 minutes + } + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/util/Stats.java --- a/src/org/sonews/util/Stats.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/util/Stats.java Sun Aug 29 18:17:37 2010 +0200 @@ -29,178 +29,157 @@ * @author Christian Lins * @since sonews/0.5.0 */ -public final class Stats +public final class Stats { - - public static final byte CONNECTIONS = 1; - public static final byte POSTED_NEWS = 2; - public static final byte GATEWAYED_NEWS = 3; - public static final byte FEEDED_NEWS = 4; - public static final byte MLGW_RUNSTART = 5; - public static final byte MLGW_RUNEND = 6; - private static Stats instance = new Stats(); - - public static Stats getInstance() - { - return Stats.instance; - } - - private Stats() {} - - private volatile int connectedClients = 0; + public static final byte CONNECTIONS = 1; + public static final byte POSTED_NEWS = 2; + public static final byte GATEWAYED_NEWS = 3; + public static final byte FEEDED_NEWS = 4; + public static final byte MLGW_RUNSTART = 5; + public static final byte MLGW_RUNEND = 6; + private static Stats instance = new Stats(); - /** - * A generic method that writes event data to the storage backend. - * If event logging is disabled with sonews.eventlog=false this method - * simply does nothing. - * @param type - * @param groupname - */ - private void addEvent(byte type, String groupname) - { - try - { - if (Config.inst().get(Config.EVENTLOG, true)) - { + public static Stats getInstance() + { + return Stats.instance; + } - Channel group = Channel.getByName(groupname); - if (group != null) - { - StorageManager.current().addEvent( - System.currentTimeMillis(), type, group.getInternalID()); - } - } - else - { - Log.get().info("Group " + groupname + " does not exist."); - } - } - catch (StorageBackendException ex) - { - ex.printStackTrace(); - } - } - - public void clientConnect() - { - this.connectedClients++; - } - - public void clientDisconnect() - { - this.connectedClients--; - } - - public int connectedClients() - { - return this.connectedClients; - } - - public int getNumberOfGroups() - { - try - { - return StorageManager.current().countGroups(); - } - catch(StorageBackendException ex) - { - ex.printStackTrace(); - return -1; - } - } - - public int getNumberOfNews() - { - try - { - return StorageManager.current().countArticles(); - } - catch(StorageBackendException ex) - { - ex.printStackTrace(); - return -1; - } - } - - public int getYesterdaysEvents(final byte eventType, final int hour, - final Channel group) - { - // Determine the timestamp values for yesterday and the given hour - Calendar cal = Calendar.getInstance(); - int year = cal.get(Calendar.YEAR); - int month = cal.get(Calendar.MONTH); - int dayom = cal.get(Calendar.DAY_OF_MONTH) - 1; // Yesterday - - cal.set(year, month, dayom, hour, 0, 0); - long startTimestamp = cal.getTimeInMillis(); - - cal.set(year, month, dayom, hour + 1, 0, 0); - long endTimestamp = cal.getTimeInMillis(); - - try - { - return StorageManager.current() - .getEventsCount(eventType, startTimestamp, endTimestamp, group); - } - catch(StorageBackendException ex) - { - ex.printStackTrace(); - return -1; - } - } - - public void mailPosted(String groupname) - { - addEvent(POSTED_NEWS, groupname); - } - - public void mailGatewayed(String groupname) - { - addEvent(GATEWAYED_NEWS, groupname); - } - - public void mailFeeded(String groupname) - { - addEvent(FEEDED_NEWS, groupname); - } - - public void mlgwRunStart() - { - addEvent(MLGW_RUNSTART, "control"); - } - - public void mlgwRunEnd() - { - addEvent(MLGW_RUNEND, "control"); - } - - private double perHour(int key, long gid) - { - try - { - return StorageManager.current().getEventsPerHour(key, gid); - } - catch(StorageBackendException ex) - { - ex.printStackTrace(); - return -1; - } - } - - public double postedPerHour(long gid) - { - return perHour(POSTED_NEWS, gid); - } - - public double gatewayedPerHour(long gid) - { - return perHour(GATEWAYED_NEWS, gid); - } - - public double feededPerHour(long gid) - { - return perHour(FEEDED_NEWS, gid); - } - + private Stats() + { + } + private volatile int connectedClients = 0; + + /** + * A generic method that writes event data to the storage backend. + * If event logging is disabled with sonews.eventlog=false this method + * simply does nothing. + * @param type + * @param groupname + */ + private void addEvent(byte type, String groupname) + { + try { + if (Config.inst().get(Config.EVENTLOG, true)) { + + Channel group = Channel.getByName(groupname); + if (group != null) { + StorageManager.current().addEvent( + System.currentTimeMillis(), type, group.getInternalID()); + } + } else { + Log.get().info("Group " + groupname + " does not exist."); + } + } catch (StorageBackendException ex) { + ex.printStackTrace(); + } + } + + public void clientConnect() + { + this.connectedClients++; + } + + public void clientDisconnect() + { + this.connectedClients--; + } + + public int connectedClients() + { + return this.connectedClients; + } + + public int getNumberOfGroups() + { + try { + return StorageManager.current().countGroups(); + } catch (StorageBackendException ex) { + ex.printStackTrace(); + return -1; + } + } + + public int getNumberOfNews() + { + try { + return StorageManager.current().countArticles(); + } catch (StorageBackendException ex) { + ex.printStackTrace(); + return -1; + } + } + + public int getYesterdaysEvents(final byte eventType, final int hour, + final Channel group) + { + // Determine the timestamp values for yesterday and the given hour + Calendar cal = Calendar.getInstance(); + int year = cal.get(Calendar.YEAR); + int month = cal.get(Calendar.MONTH); + int dayom = cal.get(Calendar.DAY_OF_MONTH) - 1; // Yesterday + + cal.set(year, month, dayom, hour, 0, 0); + long startTimestamp = cal.getTimeInMillis(); + + cal.set(year, month, dayom, hour + 1, 0, 0); + long endTimestamp = cal.getTimeInMillis(); + + try { + return StorageManager.current().getEventsCount(eventType, startTimestamp, endTimestamp, group); + } catch (StorageBackendException ex) { + ex.printStackTrace(); + return -1; + } + } + + public void mailPosted(String groupname) + { + addEvent(POSTED_NEWS, groupname); + } + + public void mailGatewayed(String groupname) + { + addEvent(GATEWAYED_NEWS, groupname); + } + + public void mailFeeded(String groupname) + { + addEvent(FEEDED_NEWS, groupname); + } + + public void mlgwRunStart() + { + addEvent(MLGW_RUNSTART, "control"); + } + + public void mlgwRunEnd() + { + addEvent(MLGW_RUNEND, "control"); + } + + private double perHour(int key, long gid) + { + try { + return StorageManager.current().getEventsPerHour(key, gid); + } catch (StorageBackendException ex) { + ex.printStackTrace(); + return -1; + } + } + + public double postedPerHour(long gid) + { + return perHour(POSTED_NEWS, gid); + } + + public double gatewayedPerHour(long gid) + { + return perHour(GATEWAYED_NEWS, gid); + } + + public double feededPerHour(long gid) + { + return perHour(FEEDED_NEWS, gid); + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/util/StringTemplate.java --- a/src/org/sonews/util/StringTemplate.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/util/StringTemplate.java Sun Aug 29 18:17:37 2010 +0200 @@ -26,72 +26,67 @@ * @author Christian Lins * @since sonews/0.5.0 */ -public class StringTemplate +public class StringTemplate { - private String str = null; - private String templateDelimiter = "%"; - private Map templateValues = new HashMap(); - - public StringTemplate(String str, final String templateDelimiter) - { - if(str == null || templateDelimiter == null) - { - throw new IllegalArgumentException("null arguments not allowed"); - } + private String str = null; + private String templateDelimiter = "%"; + private Map templateValues = new HashMap(); - this.str = str; - this.templateDelimiter = templateDelimiter; - } - - public StringTemplate(String str) - { - this(str, "%"); - } - - public StringTemplate set(String template, String value) - { - if(template == null || value == null) - { - throw new IllegalArgumentException("null arguments not allowed"); - } - - this.templateValues.put(template, value); - return this; - } - - public StringTemplate set(String template, long value) - { - return set(template, Long.toString(value)); - } - - public StringTemplate set(String template, double value) - { - return set(template, Double.toString(value)); - } - - public StringTemplate set(String template, Object obj) - { - if(template == null || obj == null) - { - throw new IllegalArgumentException("null arguments not allowed"); - } + public StringTemplate(String str, final String templateDelimiter) + { + if (str == null || templateDelimiter == null) { + throw new IllegalArgumentException("null arguments not allowed"); + } - return set(template, obj.toString()); - } - - @Override - public String toString() - { - String ret = str; + this.str = str; + this.templateDelimiter = templateDelimiter; + } - for(String key : this.templateValues.keySet()) - { - String value = this.templateValues.get(key); - ret = ret.replace(templateDelimiter + key, value); - } - - return ret; - } + public StringTemplate(String str) + { + this(str, "%"); + } + public StringTemplate set(String template, String value) + { + if (template == null || value == null) { + throw new IllegalArgumentException("null arguments not allowed"); + } + + this.templateValues.put(template, value); + return this; + } + + public StringTemplate set(String template, long value) + { + return set(template, Long.toString(value)); + } + + public StringTemplate set(String template, double value) + { + return set(template, Double.toString(value)); + } + + public StringTemplate set(String template, Object obj) + { + if (template == null || obj == null) { + throw new IllegalArgumentException("null arguments not allowed"); + } + + return set(template, obj.toString()); + } + + @Override + public String toString() + { + String ret = str; + + for (String key : this.templateValues.keySet()) { + String value = this.templateValues.get(key); + ret = ret.replace(templateDelimiter + key, value); + } + + return ret; + } } diff -r c404a87db5b7 -r 74139325d305 src/org/sonews/util/TimeoutMap.java --- a/src/org/sonews/util/TimeoutMap.java Sun Aug 29 17:43:58 2010 +0200 +++ b/src/org/sonews/util/TimeoutMap.java Sun Aug 29 18:17:37 2010 +0200 @@ -31,115 +31,99 @@ * @author Christian Lins * @since sonews/0.5.0 */ -public class TimeoutMap extends ConcurrentHashMap +public class TimeoutMap extends ConcurrentHashMap { - - private static final long serialVersionUID = 453453467700345L; - private int timeout = 60000; // 60 sec - private transient Map timeoutMap = new HashMap(); - - /** - * Constructor. - * @param timeout Timeout in milliseconds - */ - public TimeoutMap(final int timeout) - { - this.timeout = timeout; - } - - /** - * Uses default timeout (60 sec). - */ - public TimeoutMap() - { - } - - /** - * - * @param key - * @return true if key is still valid. - */ - protected boolean checkTimeOut(Object key) - { - synchronized(this.timeoutMap) - { - if(this.timeoutMap.containsKey(key)) - { - long keytime = this.timeoutMap.get(key); - if((System.currentTimeMillis() - keytime) < this.timeout) - { - return true; - } - else - { - remove(key); - return false; - } - } - else - { - return false; - } - } - } - - @Override - public boolean containsKey(Object key) - { - return checkTimeOut(key); - } + private static final long serialVersionUID = 453453467700345L; + private int timeout = 60000; // 60 sec + private transient Map timeoutMap = new HashMap(); - @Override - public synchronized V get(Object key) - { - if(checkTimeOut(key)) - { - return super.get(key); - } - else - { - return null; - } - } + /** + * Constructor. + * @param timeout Timeout in milliseconds + */ + public TimeoutMap(final int timeout) + { + this.timeout = timeout; + } - @Override - public V put(K key, V value) - { - synchronized(this.timeoutMap) - { - removeStaleKeys(); - this.timeoutMap.put(key, System.currentTimeMillis()); - return super.put(key, value); - } - } + /** + * Uses default timeout (60 sec). + */ + public TimeoutMap() + { + } - /** - * @param arg0 - * @return - */ - @Override - public V remove(Object arg0) - { - synchronized(this.timeoutMap) - { - this.timeoutMap.remove(arg0); - V val = super.remove(arg0); - return val; - } - } + /** + * + * @param key + * @return true if key is still valid. + */ + protected boolean checkTimeOut(Object key) + { + synchronized (this.timeoutMap) { + if (this.timeoutMap.containsKey(key)) { + long keytime = this.timeoutMap.get(key); + if ((System.currentTimeMillis() - keytime) < this.timeout) { + return true; + } else { + remove(key); + return false; + } + } else { + return false; + } + } + } - protected void removeStaleKeys() - { - synchronized(this.timeoutMap) - { - Set