[jboss-cvs] JBossCache/src/org/jboss/cache/eviction ...
Brian Stansberry
brian.stansberry at jboss.com
Mon Mar 12 16:20:23 EDT 2007
User: bstansberry
Date: 07/03/12 16:20:23
Modified: src/org/jboss/cache/eviction
EvictionPolicyConfigBase.java MRUConfiguration.java
ElementSizeConfiguration.java LRUConfiguration.java
ExpirationConfiguration.java LFUConfiguration.java
FIFOConfiguration.java
Log:
EvictionPolicyConfigBase sets policy class name in c'tor.
Better error msgs in validate().
Revision Changes Path
1.3 +6 -2 JBossCache/src/org/jboss/cache/eviction/EvictionPolicyConfigBase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EvictionPolicyConfigBase.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/EvictionPolicyConfigBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- EvictionPolicyConfigBase.java 15 Nov 2006 15:16:39 -0000 1.2
+++ EvictionPolicyConfigBase.java 12 Mar 2007 20:20:23 -0000 1.3
@@ -24,8 +24,12 @@
/**
* Can only be instantiated by a subclass.
*
+ * Calls {@link #setEvictionPolicyClassName()}.
*/
- protected EvictionPolicyConfigBase() {}
+ protected EvictionPolicyConfigBase()
+ {
+ setEvictionPolicyClassName();
+ }
public String getEvictionPolicyClass()
{
1.8 +2 -2 JBossCache/src/org/jboss/cache/eviction/MRUConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MRUConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/MRUConfiguration.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- MRUConfiguration.java 15 Nov 2006 15:48:25 -0000 1.7
+++ MRUConfiguration.java 12 Mar 2007 20:20:23 -0000 1.8
@@ -22,7 +22,7 @@
* Requires a "maxNodes" attribute otherwise a ConfigurationException is thrown.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class MRUConfiguration extends EvictionPolicyConfigBase
{
@@ -31,7 +31,7 @@
public MRUConfiguration()
{
- setEvictionPolicyClassName();
+ super();
// We require that maxNodes is set
setMaxNodes(-1);
}
1.6 +7 -3 JBossCache/src/org/jboss/cache/eviction/ElementSizeConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ElementSizeConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/ElementSizeConfiguration.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ElementSizeConfiguration.java 15 Nov 2006 15:16:39 -0000 1.5
+++ ElementSizeConfiguration.java 12 Mar 2007 20:20:23 -0000 1.6
@@ -26,7 +26,7 @@
* @author Daniel Huang
* @author Brian Stansberry
*
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class ElementSizeConfiguration extends EvictionPolicyConfigBase
{
@@ -38,7 +38,7 @@
public ElementSizeConfiguration()
{
- setEvictionPolicyClassName();
+ super();
// Force configuration of maxElementsPerNode
setMaxElementsPerNode(-1);
}
@@ -67,7 +67,11 @@
@Override
public void validate() throws ConfigurationException
{
- if (maxElementsPerNode < 0) throw new ConfigurationException("maxElementsPerNode must be configured");
+ if (maxElementsPerNode < 0)
+ {
+ throw new ConfigurationException("maxElementsPerNode must be must be " +
+ "configured to a value greater than or equal to 0");
+ }
}
public String toString()
1.6 +6 -3 JBossCache/src/org/jboss/cache/eviction/LRUConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LRUConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/LRUConfiguration.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- LRUConfiguration.java 15 Nov 2006 15:16:39 -0000 1.5
+++ LRUConfiguration.java 12 Mar 2007 20:20:23 -0000 1.6
@@ -23,7 +23,7 @@
* </pre>
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class LRUConfiguration extends EvictionPolicyConfigBase
{
@@ -37,7 +37,7 @@
public LRUConfiguration()
{
- setEvictionPolicyClassName();
+ super();
// Force config of ttls
setTimeToLiveSeconds(-1);
}
@@ -79,7 +79,10 @@
public void validate() throws ConfigurationException
{
if (timeToLiveSeconds < 0)
- throw new ConfigurationException("timeToLiveSeconds not configured");
+ {
+ throw new ConfigurationException("timeToLiveSeconds must be " +
+ "configured to a value greater than or equal to 0");
+ }
}
public String toString()
1.5 +1 -1 JBossCache/src/org/jboss/cache/eviction/ExpirationConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ExpirationConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/ExpirationConfiguration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ExpirationConfiguration.java 10 Jan 2007 00:10:47 -0000 1.4
+++ ExpirationConfiguration.java 12 Mar 2007 20:20:23 -0000 1.5
@@ -29,7 +29,7 @@
public ExpirationConfiguration()
{
- setEvictionPolicyClassName();
+ super();
}
@Override
1.9 +2 -2 JBossCache/src/org/jboss/cache/eviction/LFUConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LFUConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/LFUConfiguration.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- LFUConfiguration.java 15 Nov 2006 15:48:25 -0000 1.8
+++ LFUConfiguration.java 12 Mar 2007 20:20:23 -0000 1.9
@@ -21,7 +21,7 @@
* </pre>
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class LFUConfiguration extends EvictionPolicyConfigBase
{
@@ -33,7 +33,7 @@
public LFUConfiguration()
{
- setEvictionPolicyClassName();
+ super();
}
@Override
1.9 +6 -3 JBossCache/src/org/jboss/cache/eviction/FIFOConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FIFOConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/eviction/FIFOConfiguration.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- FIFOConfiguration.java 15 Nov 2006 15:48:25 -0000 1.8
+++ FIFOConfiguration.java 12 Mar 2007 20:20:23 -0000 1.9
@@ -22,7 +22,7 @@
* Requires a "maxNodes" attribute otherwise a ConfigurationException is thrown.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class FIFOConfiguration extends EvictionPolicyConfigBase
{
@@ -31,7 +31,7 @@
public FIFOConfiguration()
{
- setEvictionPolicyClassName();
+ super();
// We require that maxNodes is set
setMaxNodes(-1);
}
@@ -44,7 +44,10 @@
public void validate() throws ConfigurationException
{
if (getMaxNodes() < 0)
- throw new ConfigurationException("maxNodes not configured");
+ {
+ throw new ConfigurationException("maxNodes must be must be " +
+ "configured to a value greater than or equal to 0");
+ }
}
public String toString()
More information about the jboss-cvs-commits
mailing list