Cleanup

Author: cyrille-leclerc

src/main/java/com/cloudbees/syslog/sender/AbstractSyslogMessageSender.java

@@ -123,8 +123,8 @@ public void setDefaultAppName(String defaultAppName) {
         this.defaultAppName = defaultAppName;
     }
 
-    public void setDefaultMessageHostName(String defaultHostName) {
-        this.defaultMessageHostname = defaultHostName;
+    public void setDefaultMessageHostname(String defaultHostname) {
+        this.defaultMessageHostname = defaultHostname;
     }
 
     public void setDefaultFacility(Facility defaultFacility) {

src/main/java/com/cloudbees/syslog/sender/SyslogMessageUdpSender.java renamed to src/main/java/com/cloudbees/syslog/sender/UdpSyslogMessageSender.java

@@ -19,9 +19,7 @@
 import com.cloudbees.syslog.util.CachingReference;
 
 import javax.annotation.Nullable;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
+import java.io.*;
 import java.net.*;
 import java.util.logging.Level;
 
@@ -33,7 +31,7 @@
  *
  * @author <a href="mailto:[email protected]">Cyrille Le Clerc</a>
  */
-public class SyslogMessageUdpSender extends AbstractSyslogMessageSender {
+public class UdpSyslogMessageSender extends AbstractSyslogMessageSender {
     /**
      * {@link java.net.InetAddress InetAddress} of the remote Syslog Server.
      * <p/>
@@ -51,7 +49,7 @@ public class SyslogMessageUdpSender extends AbstractSyslogMessageSender {
 
     private DatagramSocket datagramSocket;
 
-    public SyslogMessageUdpSender() {
+    public UdpSyslogMessageSender() {
         try {
             setSyslogServerHostname(DEFAULT_SYSLOG_HOST);
             datagramSocket = new DatagramSocket();
@@ -73,15 +71,14 @@ public void sendMessage(SyslogMessage message) throws IOException {
 
         try {
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            OutputStreamWriter out = new OutputStreamWriter(baos, UTF_8);
-
+            Writer out = new OutputStreamWriter(baos, UTF_8);
             message.toSyslogMessage(messageFormat, out);
+            out.flush();
 
             if (logger.isLoggable(Level.FINEST)) {
                 logger.finest("Send syslog message " + new String(baos.toByteArray(), UTF_8));
             }
             byte[] bytes = baos.toByteArray();
-            baos.close();
 
             DatagramPacket packet = new DatagramPacket(bytes, bytes.length, syslogServerHostnameReference.get(), syslogServerPort);
             datagramSocket.send(packet);
@@ -97,7 +94,7 @@ public void sendMessage(SyslogMessage message) throws IOException {
     }
 
 
-    public void setSyslogServerHostname(final String syslogServerHostname) throws UnknownHostException {
+    public void setSyslogServerHostname(final String syslogServerHostname) {
         this.syslogServerHostnameReference = new CachingReference<InetAddress>(DEFAULT_INET_ADDRESS_TTL_IN_NANOS) {
             @Nullable
             @Override

src/main/java/com/cloudbees/syslog/util/CachingReference.java

@@ -28,7 +28,7 @@
  * <p/>
  * {@code Object} is created implementing the {@link #newObject()} method.
  * <p/>
- *
+ * <p/>
  * Sample to get an {@code InetAddress} refreshed against a DNS every 10 seconds:
  * <code><pre>
  * CachingReference myRemoteServerAddress = new CachingReference<InetAddress>(10, TimeUnit.SECONDS) {
@@ -93,4 +93,9 @@ public E get() {
             rwl.readLock().unlock();
         }
     }
+
+    @Override
+    public String toString() {
+        return "CachingReference[" + this.object + "]";
+    }
 }

src/main/java/com/cloudbees/syslog/util/ConcurrentDateFormat.java

@@ -41,7 +41,7 @@ public class ConcurrentDateFormat {
      *
      * @param pattern      the pattern describing the date and time pattern
      * @param locale       the locale whose date pattern symbols should be used
-     * @param timeZone the timezone used by the underlying calendar
+     * @param timeZone     the timezone used by the underlying calendar
      * @param maxCacheSize
      * @throws NullPointerException     if the given pattern or locale is null
      * @throws IllegalArgumentException if the given pattern is invalid
@@ -72,4 +72,9 @@ public String format(@Nonnull Date date) {
             dateFormats.offer(dateFormat);
         }
     }
+
+    @Override
+    public String toString() {
+        return "ConcurrentDateFormat[pattern=" + pattern + "]";
+    }
 }

src/test/java/com/cloudbees/syslog/sender/SyslogMessageUdpSenderLoadTest.java renamed to src/test/java/com/cloudbees/syslog/sender/UdpSyslogMessageSenderLoadTest.java

@@ -27,16 +27,16 @@
 /**
  * @author <a href="mailto:[email protected]">Cyrille Le Clerc</a>
  */
-public class SyslogMessageUdpSenderLoadTest {
+public class UdpSyslogMessageSenderLoadTest {
 
     public static void main(String[] args) throws Exception {
         final int THREADS_COUNT = 10;
         final int ITERATION_COUNT = 1000;
 
         ExecutorService executorService = Executors.newFixedThreadPool(THREADS_COUNT);
 
-        final SyslogMessageUdpSender messageSender = new SyslogMessageUdpSender();
-        messageSender.setDefaultMessageHostName("mysecretkey");
+        final UdpSyslogMessageSender messageSender = new UdpSyslogMessageSender();
+        messageSender.setDefaultMessageHostname("mysecretkey");
         messageSender.setDefaultAppName("myapp");
         messageSender.setDefaultFacility(Facility.USER);
         messageSender.setDefaultSeverity(Severity.INFORMATIONAL);

src/test/java/com/cloudbees/syslog/sender/SyslogMessageUdpSenderTest.java renamed to src/test/java/com/cloudbees/syslog/sender/UpdSyslogMessageSenderTest.java

@@ -24,13 +24,13 @@
 /**
  * @author <a href="mailto:[email protected]">Cyrille Le Clerc</a>
  */
-public class SyslogMessageUdpSenderTest {
+public class UpdSyslogMessageSenderTest {
 
     // @Ignore
     @Test
     public void send() throws Exception {
-        SyslogMessageUdpSender messageSender = new SyslogMessageUdpSender();
-        messageSender.setDefaultMessageHostName("mysecretkey");
+        UdpSyslogMessageSender messageSender = new UdpSyslogMessageSender();
+        messageSender.setDefaultMessageHostname("mysecretkey");
         messageSender.setDefaultAppName("myapp");
         messageSender.setDefaultFacility(Facility.USER);
         messageSender.setDefaultSeverity(Severity.INFORMATIONAL);