Author: simonetripodi
Date: Fri Feb 24 20:44:42 2012
New Revision: 1293407
URL: http://svn.apache.org/viewvc?rev=1293407&view=rev
Log:
restructured the schedule disposal, missed that it could not expire
Added:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/DefaultScheduleDisposalBuilder.java
(with props)
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/ScheduleDisposalBuilder.java
(with props)
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/AbstractCacheConfiguration.java
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/CacheConfigurator.java
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/CacheConfiguratorImpl.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/BootstrapTestCase.java
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/AbstractCacheConfiguration.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/AbstractCacheConfiguration.java?rev=1293407&r1=1293406&r2=1293407&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/AbstractCacheConfiguration.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/AbstractCacheConfiguration.java
Fri Feb 24 20:44:42 2012
@@ -60,9 +60,9 @@ public abstract class AbstractCacheConfi
return cacheConfigurator.numberOfBuffers();
}
- protected final TimeMeasureBuilder scheduleDisposalEvery( long time )
+ protected final ScheduleDisposalBuilder scheduleDisposal()
{
- return cacheConfigurator.scheduleDisposalEvery( time );
+ return cacheConfigurator.scheduleDisposal();
}
}
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/CacheConfigurator.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/CacheConfigurator.java?rev=1293407&r1=1293406&r2=1293407&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/CacheConfigurator.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/CacheConfigurator.java
Fri Feb 24 20:44:42 2012
@@ -26,6 +26,6 @@ public interface CacheConfigurator<K, V>
SizeBuilder numberOfBuffers();
- TimeMeasureBuilder scheduleDisposalEvery( long time );
+ ScheduleDisposalBuilder scheduleDisposal();
}
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/CacheConfiguratorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/CacheConfiguratorImpl.java?rev=1293407&r1=1293406&r2=1293407&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/CacheConfiguratorImpl.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/CacheConfiguratorImpl.java
Fri Feb 24 20:44:42 2012
@@ -75,13 +75,12 @@ final class CacheConfiguratorImpl<K, V>
}
@Override
- public TimeMeasureBuilder scheduleDisposalEvery( long time )
+ public ScheduleDisposalBuilder scheduleDisposal()
{
- checkInput( time > 0, "Input value %s is not a valid value to express
a time measure", time );
- return new DefaultTimeMeasureBuilder( this, time );
+ return new DefaultScheduleDisposalBuilder( this );
}
- private void checkInput( boolean expression, String errorMessageTemplate,
Object... errorMessageArgs )
+ void checkInput( boolean expression, String errorMessageTemplate,
Object... errorMessageArgs )
{
if ( !expression )
{
@@ -111,7 +110,7 @@ final class CacheConfiguratorImpl<K, V>
fileElement.getFileName(),
fileElement.getLineNumber()
);
- errors.add( new ErrorMessage( enhancedErrorMessage,
errorMessageArgs ) );
+ errors.add( new ErrorMessage( errorMessageTemplate,
errorMessageArgs ) );
}
}
Added:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/DefaultScheduleDisposalBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/DefaultScheduleDisposalBuilder.java?rev=1293407&view=auto
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/DefaultScheduleDisposalBuilder.java
(added)
+++
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/DefaultScheduleDisposalBuilder.java
Fri Feb 24 20:44:42 2012
@@ -0,0 +1,47 @@
+package org.apache.directmemory;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+final class DefaultScheduleDisposalBuilder
+ extends AbstractChainedBuilder
+ implements ScheduleDisposalBuilder
+{
+
+ private static final long NEVER = 1L;
+
+ public DefaultScheduleDisposalBuilder( CacheConfiguratorImpl<?, ?>
cacheConfigurator )
+ {
+ super( cacheConfigurator );
+ }
+
+ @Override
+ public void withoutExpiring()
+ {
+ cacheConfigurator.scheduleDisposal = NEVER;
+ }
+
+ @Override
+ public TimeMeasureBuilder every( long time )
+ {
+ cacheConfigurator.checkInput( time > 0, "Input value %s is not a valid
value to express a time measure", time );
+ return new DefaultTimeMeasureBuilder( cacheConfigurator, time );
+ }
+
+}
Propchange:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/DefaultScheduleDisposalBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/DefaultScheduleDisposalBuilder.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/DefaultScheduleDisposalBuilder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/ScheduleDisposalBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/ScheduleDisposalBuilder.java?rev=1293407&view=auto
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/ScheduleDisposalBuilder.java
(added)
+++
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/ScheduleDisposalBuilder.java
Fri Feb 24 20:44:42 2012
@@ -0,0 +1,29 @@
+package org.apache.directmemory;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public interface ScheduleDisposalBuilder
+{
+
+ void withoutExpiring();
+
+ TimeMeasureBuilder every( long time );
+
+}
Propchange:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/ScheduleDisposalBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/ScheduleDisposalBuilder.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/ScheduleDisposalBuilder.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/BootstrapTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/BootstrapTestCase.java?rev=1293407&r1=1293406&r2=1293407&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/BootstrapTestCase.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/BootstrapTestCase.java
Fri Feb 24 20:44:42 2012
@@ -71,7 +71,7 @@ public final class BootstrapTestCase
@Override
public void configure( CacheConfigurator<String, String>
cacheConfigurator )
{
- cacheConfigurator.scheduleDisposalEvery( 0 ).days();
+ cacheConfigurator.scheduleDisposal().every( 0 ).days();
}
} );
@@ -86,7 +86,7 @@ public final class BootstrapTestCase
@Override
public void configure()
{
- scheduleDisposalEvery( 0 ).days();
+ scheduleDisposal().every( 0 ).days();
}
} );
