Author: tv
Date: Sat Mar 29 21:37:26 2014
New Revision: 1583060
URL: http://svn.apache.org/r1583060
Log:
Clean up some Findbugs complaints
Removed:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryInfo.java
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryMessage.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySender.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/key/KeyGeneratorUtil.java
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryMessage.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryMessage.java?rev=1583060&r1=1583059&r2=1583060&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryMessage.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryMessage.java
Sat Mar 29 21:37:26 2014
@@ -31,24 +31,27 @@ public class UDPDiscoveryMessage
/** Don't change */
private static final long serialVersionUID = -5332377899560951793L;
- /**
- * This is the periodic broadcast of a servers location. This type of
message is also sent in
- * response to a REQUEST_BROADCAST.
- */
- public static final int PASSIVE_BROADCAST = 0;
-
- /**
- * This asks recipients to broadcast their location. This is used on
startup.
- */
- public static final int REQUEST_BROADCAST = 1;
-
- /**
- * This message instructs the receiver to remove this service from its
list.
- */
- public static final int REMOVE_BROADCAST = 2;
+ public enum BroadcastType
+ {
+ /**
+ * This is the periodic broadcast of a servers location. This type of
message is also sent in
+ * response to a REQUEST_BROADCAST.
+ */
+ PASSIVE,
+
+ /**
+ * This asks recipients to broadcast their location. This is used on
startup.
+ */
+ REQUEST,
+
+ /**
+ * This message instructs the receiver to remove this service from its
list.
+ */
+ REMOVE
+ }
/** The message type */
- private int messageType = PASSIVE_BROADCAST;
+ private BroadcastType messageType = BroadcastType.PASSIVE;
/** udp port */
private int port = 6789;
@@ -56,7 +59,7 @@ public class UDPDiscoveryMessage
/** UDP host */
private String host = "228.5.6.7";
- /** Id of the requestor, allows self-filtration */
+ /** Id of the requester, allows self-filtration */
private long requesterId;
/** Names of regions */
@@ -113,7 +116,7 @@ public class UDPDiscoveryMessage
/**
* @param messageType The messageType to set.
*/
- public void setMessageType( int messageType )
+ public void setMessageType( BroadcastType messageType )
{
this.messageType = messageType;
}
@@ -121,7 +124,7 @@ public class UDPDiscoveryMessage
/**
* @return Returns the messageType.
*/
- public int getMessageType()
+ public BroadcastType getMessageType()
{
return messageType;
}
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java?rev=1583060&r1=1583059&r2=1583060&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java
Sat Mar 29 21:37:26 2014
@@ -29,7 +29,9 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
+import org.apache.commons.jcs.engine.CacheInfo;
import org.apache.commons.jcs.engine.behavior.IShutdownObserver;
+import
org.apache.commons.jcs.utils.discovery.UDPDiscoveryMessage.BroadcastType;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -287,7 +289,7 @@ public class UDPDiscoveryReceiver
public void run()
{
// consider comparing ports here instead.
- if ( message.getRequesterId() == UDPDiscoveryInfo.listenerId )
+ if ( message.getRequesterId() == CacheInfo.listenerId )
{
if ( log.isDebugEnabled() )
{
@@ -329,16 +331,16 @@ public class UDPDiscoveryReceiver
// if this is a request message, have the service handle it and
// return
- if ( message.getMessageType() ==
UDPDiscoveryMessage.REQUEST_BROADCAST )
+ if ( message.getMessageType() == BroadcastType.REQUEST )
{
if ( log.isDebugEnabled() )
{
- log.debug( "Message is a Request Broadcase, will have the
service handle it." );
+ log.debug( "Message is a Request Broadcast, will have the
service handle it." );
}
service.serviceRequestBroadcast();
return;
}
- else if ( message.getMessageType() ==
UDPDiscoveryMessage.REMOVE_BROADCAST )
+ else if ( message.getMessageType() == BroadcastType.REMOVE )
{
if ( log.isDebugEnabled() )
{
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySender.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySender.java?rev=1583060&r1=1583059&r2=1583060&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySender.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoverySender.java
Sat Mar 29 21:37:26 2014
@@ -26,6 +26,8 @@ import java.net.InetAddress;
import java.net.MulticastSocket;
import java.util.ArrayList;
+import org.apache.commons.jcs.engine.CacheInfo;
+import
org.apache.commons.jcs.utils.discovery.UDPDiscoveryMessage.BroadcastType;
import org.apache.commons.jcs.utils.serialization.StandardSerializer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -180,8 +182,8 @@ public class UDPDiscoverySender
}
UDPDiscoveryMessage message = new UDPDiscoveryMessage();
- message.setRequesterId( UDPDiscoveryInfo.listenerId );
- message.setMessageType( UDPDiscoveryMessage.REQUEST_BROADCAST );
+ message.setRequesterId( CacheInfo.listenerId );
+ message.setMessageType( BroadcastType.REQUEST );
send( message );
}
@@ -197,7 +199,7 @@ public class UDPDiscoverySender
public void passiveBroadcast( String host, int port, ArrayList<String>
cacheNames )
throws IOException
{
- passiveBroadcast( host, port, cacheNames, UDPDiscoveryInfo.listenerId
);
+ passiveBroadcast( host, port, cacheNames, CacheInfo.listenerId );
}
/**
@@ -222,7 +224,7 @@ public class UDPDiscoverySender
message.setPort( port );
message.setCacheNames( cacheNames );
message.setRequesterId( listenerId );
- message.setMessageType( UDPDiscoveryMessage.PASSIVE_BROADCAST );
+ message.setMessageType( BroadcastType.PASSIVE );
send( message );
}
@@ -239,7 +241,7 @@ public class UDPDiscoverySender
public void removeBroadcast( String host, int port, ArrayList<String>
cacheNames )
throws IOException
{
- removeBroadcast( host, port, cacheNames, UDPDiscoveryInfo.listenerId );
+ removeBroadcast( host, port, cacheNames, CacheInfo.listenerId );
}
/**
@@ -264,7 +266,7 @@ public class UDPDiscoverySender
message.setPort( port );
message.setCacheNames( cacheNames );
message.setRequesterId( listenerId );
- message.setMessageType( UDPDiscoveryMessage.REMOVE_BROADCAST );
+ message.setMessageType( BroadcastType.REMOVE );
send( message );
}
}
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/key/KeyGeneratorUtil.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/key/KeyGeneratorUtil.java?rev=1583060&r1=1583059&r2=1583060&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/key/KeyGeneratorUtil.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/key/KeyGeneratorUtil.java
Sat Mar 29 21:37:26 2014
@@ -20,10 +20,11 @@ package org.apache.commons.jcs.utils.key
*/
import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-import org.apache.commons.jcs.utils.date.DateFormatter;
+import org.apache.commons.jcs.utils.net.AddressUtil;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -48,7 +49,7 @@ public final class KeyGeneratorUtil
private static final long DEFAULT_COUNTER_RESET_INTERVAL_MILLIS = 2 * 60 *
60 * 1000;
/** How often should we reset the counter. */
- protected static long counterResetIntervalMillis =
DEFAULT_COUNTER_RESET_INTERVAL_MILLIS;
+ static long counterResetIntervalMillis =
DEFAULT_COUNTER_RESET_INTERVAL_MILLIS;
/** The size of the data portion. */
private static final int LENGTH_OF_DATE_STRING = 8;
@@ -63,7 +64,10 @@ public final class KeyGeneratorUtil
public static final int DEFAULT_LEAD_NUMBER = 3;
/** We lead with a number so it can be converted to a number. This is the
prefix to all ids. */
- protected static int leadNumber = DEFAULT_LEAD_NUMBER;
+ static int leadNumber = DEFAULT_LEAD_NUMBER;
+
+ /** DDDHHmm */
+ static final String dddHHmmFormat = "DDDHHmm";
static
{
@@ -102,8 +106,9 @@ public final class KeyGeneratorUtil
int counter = getNextRequestCounter();
Date d = new Date();
- String dateString = DateFormatter.getDddHHmm( d );
- String finalOctetOfIp =
org.apache.commons.jcs.utils.net.AddressUtil.obtainFinalThreeDigitsOfAddressAsString();
+ SimpleDateFormat sdf = new SimpleDateFormat(dddHHmmFormat);
+ String dateString = sdf.format( d );
+ String finalOctetOfIp =
AddressUtil.obtainFinalThreeDigitsOfAddressAsString();
String queryId = leadNumber + dateString + finalOctetOfIp + counter;
return queryId;
}
