Author: tv
Date: Thu Jan 9 14:21:54 2014
New Revision: 1556812
URL: http://svn.apache.org/r1556812
Log:
Remove dependency on commons-lang3
Modified:
commons/proper/jcs/trunk/pom.xml
commons/proper/jcs/trunk/src/changes/changes.xml
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/logging/CacheEvent.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/DiscoveredService.java
Modified: commons/proper/jcs/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/pom.xml?rev=1556812&r1=1556811&r2=1556812&view=diff
==============================================================================
--- commons/proper/jcs/trunk/pom.xml (original)
+++ commons/proper/jcs/trunk/pom.xml Thu Jan 9 14:21:54 2014
@@ -43,12 +43,6 @@
<version>1.1.3</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
- </dependency>
-
<!-- JDBC DISK CACHE -->
<dependency>
<groupId>commons-dbcp</groupId>
Modified: commons/proper/jcs/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/changes/changes.xml?rev=1556812&r1=1556811&r2=1556812&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/changes/changes.xml (original)
+++ commons/proper/jcs/trunk/src/changes/changes.xml Thu Jan 9 14:21:54 2014
@@ -20,6 +20,9 @@
</properties>
<body>
<release version="2.0" date="unreleased" description="JDK 1.6
based major release">
+ <action dev="tv" type="remove">
+ Remove dependency on commons-lang3
+ </action>
<action dev="tv" type="add">
Add simple JMX monitoring feature by exposing the JCSAdminBean
to JMX
</action>
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/logging/CacheEvent.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/logging/CacheEvent.java?rev=1556812&r1=1556811&r2=1556812&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/logging/CacheEvent.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/logging/CacheEvent.java
Thu Jan 9 14:21:54 2014
@@ -1,9 +1,9 @@
package org.apache.commons.jcs.engine.logging;
import java.io.Serializable;
+import java.util.Date;
import org.apache.commons.jcs.engine.logging.behavior.ICacheEvent;
-import org.apache.commons.lang3.builder.ToStringBuilder;
/** It's returned from create and passed into log. */
public class CacheEvent<K extends Serializable>
@@ -33,7 +33,8 @@ public class CacheEvent<K extends Serial
/**
* @param source the source to set
*/
- public void setSource( String source )
+ @Override
+ public void setSource( String source )
{
this.source = source;
}
@@ -41,7 +42,8 @@ public class CacheEvent<K extends Serial
/**
* @return the source
*/
- public String getSource()
+ @Override
+ public String getSource()
{
return source;
}
@@ -49,7 +51,8 @@ public class CacheEvent<K extends Serial
/**
* @param region the region to set
*/
- public void setRegion( String region )
+ @Override
+ public void setRegion( String region )
{
this.region = region;
}
@@ -57,7 +60,8 @@ public class CacheEvent<K extends Serial
/**
* @return the region
*/
- public String getRegion()
+ @Override
+ public String getRegion()
{
return region;
}
@@ -65,7 +69,8 @@ public class CacheEvent<K extends Serial
/**
* @param eventName the eventName to set
*/
- public void setEventName( String eventName )
+ @Override
+ public void setEventName( String eventName )
{
this.eventName = eventName;
}
@@ -73,7 +78,8 @@ public class CacheEvent<K extends Serial
/**
* @return the eventName
*/
- public String getEventName()
+ @Override
+ public String getEventName()
{
return eventName;
}
@@ -81,7 +87,8 @@ public class CacheEvent<K extends Serial
/**
* @param optionalDetails the optionalDetails to set
*/
- public void setOptionalDetails( String optionalDetails )
+ @Override
+ public void setOptionalDetails( String optionalDetails )
{
this.optionalDetails = optionalDetails;
}
@@ -89,7 +96,8 @@ public class CacheEvent<K extends Serial
/**
* @return the optionalDetails
*/
- public String getOptionalDetails()
+ @Override
+ public String getOptionalDetails()
{
return optionalDetails;
}
@@ -97,7 +105,8 @@ public class CacheEvent<K extends Serial
/**
* @param key the key to set
*/
- public void setKey( K key )
+ @Override
+ public void setKey( K key )
{
this.key = key;
}
@@ -105,7 +114,8 @@ public class CacheEvent<K extends Serial
/**
* @return the key
*/
- public K getKey()
+ @Override
+ public K getKey()
{
return key;
}
@@ -126,6 +136,24 @@ public class CacheEvent<K extends Serial
@Override
public String toString()
{
- return ToStringBuilder.reflectionToString( this );
+ StringBuilder sb = new StringBuilder();
+ sb.append("CacheEvent: ").append(eventName).append(" Created:
").append(new Date(createTime));
+ if (source != null)
+ {
+ sb.append(" Source: ").append(source);
+ }
+ if (region != null)
+ {
+ sb.append(" Region: ").append(region);
+ }
+ if (key != null)
+ {
+ sb.append(" Key: ").append(key);
+ }
+ if (optionalDetails != null)
+ {
+ sb.append(" Details: ").append(optionalDetails);
+ }
+ return sb.toString();
}
}
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/DiscoveredService.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/DiscoveredService.java?rev=1556812&r1=1556811&r2=1556812&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/DiscoveredService.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/DiscoveredService.java
Thu Jan 9 14:21:54 2014
@@ -22,9 +22,6 @@ package org.apache.commons.jcs.utils.dis
import java.io.Serializable;
import java.util.ArrayList;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
/**
* This contains info about a discovered service. These objects are stored in
a set in the
* UDPDiscoveryService.
@@ -114,17 +111,18 @@ public class DiscoveredService
}
/** @return hashcode based on address/port */
- @Override
- public int hashCode()
- {
- HashCodeBuilder builder = new HashCodeBuilder();
- builder.append( this.getServiceAddress() );
- builder.append( this.getServicePort() );
- //builder.append( this.getCacheNames().toString() );
- return builder.toHashCode();
- }
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result
+ + ((serviceAddress == null) ? 0 :
serviceAddress.hashCode());
+ result = prime * result + servicePort;
+ return result;
+ }
- /**
+ /**
* NOTE - this object is often put into sets, so equals needs to be
overridden.
* <p>
* We can't use cache names as part of the equals unless we manually only
use the address and
@@ -134,20 +132,39 @@ public class DiscoveredService
* @param otherArg other
* @return equality based on the address/port
*/
- @Override
- public boolean equals( Object otherArg )
- {
- if ( otherArg instanceof DiscoveredService )
- {
- DiscoveredService other = (DiscoveredService) otherArg;
- EqualsBuilder builder = new EqualsBuilder();
- builder.append( this.getServiceAddress(),
other.getServiceAddress() );
- builder.append( this.getServicePort(), other.getServicePort() );
- //builder.append( this.getCacheNames().toString(),
other.getCacheNames().toString() );
- return builder.isEquals();
- }
- return false;
- }
+ @Override
+ public boolean equals(Object otherArg)
+ {
+ if (this == otherArg)
+ {
+ return true;
+ }
+ if (otherArg == null)
+ {
+ return false;
+ }
+ if (!(otherArg instanceof DiscoveredService))
+ {
+ return false;
+ }
+ DiscoveredService other = (DiscoveredService) otherArg;
+ if (serviceAddress == null)
+ {
+ if (other.serviceAddress != null)
+ {
+ return false;
+ }
+ } else if (!serviceAddress.equals(other.serviceAddress))
+ {
+ return false;
+ }
+ if (servicePort != other.servicePort)
+ {
+ return false;
+ }
+
+ return true;
+ }
/**
* @return string for debugging purposes.
