Author: reinhard
Date: Tue Jun 26 16:32:24 2012
New Revision: 1354100
URL: http://svn.apache.org/viewvc?rev=1354100&view=rev
Log:
@Override
Modified:
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/Pipeline.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/builder/PipelineBuilder.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCache.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCacheKey.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCacheValue.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CacheRefreshManagerImpl.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompleteCacheValue.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompoundCacheKey.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ObjectCacheValue.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ParameterCacheKey.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/SimpleCacheKey.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/TimestampCacheKey.java
cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/AbstractPipelineComponent.java
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/AbstractPipeline.java Tue Jun 26 16:32:24 2012
@@ -36,25 +36,21 @@ import org.slf4j.LoggerFactory;
* Basic pipeline implementation that collects the {@link PipelineComponent}s
* and connects them with each other.
*/
-public abstract class AbstractPipeline<T extends PipelineComponent> implements Pipeline<T> {
+public abstract class AbstractPipeline<PC extends PipelineComponent> implements Pipeline<PC> {
- /**
- * Logger.
- */
- private static final Logger LOG =
- LoggerFactory.getLogger(AbstractPipeline.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractPipeline.class);
- private final LinkedList<T> components = new LinkedList<T>();
+ private final LinkedList<PC> components = new LinkedList<PC>();
private boolean setupDone;
/**
* {@inheritDoc}
*
- * @see org.apache.cocoon.pipeline.Pipeline#addComponent(org.apache.cocoon.pipeline.component.PipelineComponent)
+ * @see org.apache.cocoon.pipeline.Pipeline#add(org.apache.cocoon.pipeline.component.PipelineComponent)
*/
@Override
- public void addComponent(T pipelineComponent) {
+ public void add(PC pipelineComponent) {
if (this.setupDone) {
throw new SetupException(new IllegalStateException(
"Pass all pipeline components to the pipeline before calling this method."));
@@ -139,7 +135,7 @@ public abstract class AbstractPipeline<T
return StringRepresentation.buildString(this, "components=" + this.getComponents());
}
- protected LinkedList<T> getComponents() {
+ protected LinkedList<PC> getComponents() {
return this.components;
}
@@ -186,7 +182,7 @@ public abstract class AbstractPipeline<T
first.setup(parameters);
// next component to link is the second in the list
- for (ListIterator<T> i = this.components.listIterator(1); i.hasNext();) {
+ for (ListIterator<PC> i = this.components.listIterator(1); i.hasNext();) {
// link the current with the next component
PipelineComponent nextComponent = i.next();
this.linkComponents(currentComponent, nextComponent);
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/Pipeline.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/Pipeline.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/Pipeline.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/Pipeline.java Tue Jun 26 16:32:24 2012
@@ -30,7 +30,7 @@ import org.apache.cocoon.pipeline.compon
/**
* <p>
* A pipeline expects one or more {@link PipelineComponent}s that passed by
- * using {@link #addComponent(PipelineComponent)}. Then these components get
+ * using {@link #add(PipelineComponent)}. Then these components get
* linked with each other in the order they were added. The
* {@link #setup(OutputStream, Map)} method, calls the setup method on all
* pipeline components and assembles the pipeline. Finally the
@@ -61,7 +61,7 @@ import org.apache.cocoon.pipeline.compon
* {@link Consumer}.
* </p>
*/
-public interface Pipeline<T extends PipelineComponent> {
+public interface Pipeline<PC extends PipelineComponent> {
/**
* Add a {@link PipelineComponent} to the pipeline. The order of when the
@@ -69,7 +69,7 @@ public interface Pipeline<T extends Pipe
*
* @param pipelineComponent The {@link PipelineComponent}.
*/
- void addComponent(T pipelineComponent);
+ void add(PC pipelineComponent);
/**
* After the pipeline has been setup ({@link #setup(OutputStream, Map)},
@@ -96,7 +96,7 @@ public interface Pipeline<T extends Pipe
long getLastModified();
/**
- * After the pipeline has been prepared ({@link #addComponent(PipelineComponent)},
+ * After the pipeline has been prepared ({@link #add(PipelineComponent)},
* this method can be invoked in order to setup and initialize the pipeline
* and its components.
*
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/builder/PipelineBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/builder/PipelineBuilder.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/builder/PipelineBuilder.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/builder/PipelineBuilder.java Tue Jun 26 16:32:24 2012
@@ -29,8 +29,6 @@ import org.apache.cocoon.pipeline.compon
import org.apache.cocoon.pipeline.component.Starter;
/**
- *
- *
* @param <PC> the {@link PipelineComponent} type.
* @version $Id$
*/
@@ -67,6 +65,7 @@ public final class PipelineBuilder {
private static <PC extends PipelineComponent> LinkedPipelineStarterBuilder<PC> newPipeline(final Pipeline<PC> pipeline) {
return new LinkedPipelineStarterBuilder<PC>() {
+ @Override
public LinkedPipelineComponentBuilder<PC> setStarter(final PC starter) {
if (starter == null) {
throw new IllegalArgumentException("Parameter 'starter' must be not null");
@@ -74,18 +73,20 @@ public final class PipelineBuilder {
if (!(starter instanceof Starter)) {
throw new IllegalArgumentException("Parameter 'starter' must be org.apache.cocoon.pipeline.component.Starter instance");
}
- pipeline.addComponent(starter);
+ pipeline.add(starter);
return new LinkedPipelineComponentBuilder<PC>() {
+ @Override
public LinkedPipelineComponentBuilder<PC> addComponent(final PC pipelineComponent) {
if (pipelineComponent == null) {
throw new IllegalArgumentException("Parameter 'pipelineComponent' must be not null");
}
- pipeline.addComponent(pipelineComponent);
+ pipeline.add(pipelineComponent);
return this;
}
+ @Override
public LinkedPipelineConfigurationBuilder<PC> setFinisher(final PC finisher) {
if (finisher == null) {
throw new IllegalArgumentException("Parameter 'finisher' must be not null");
@@ -93,15 +94,17 @@ public final class PipelineBuilder {
if (!(finisher instanceof Finisher)) {
throw new IllegalArgumentException("Parameter 'finisher' must be org.apache.cocoon.pipeline.component.Finisher instance");
}
- pipeline.addComponent(finisher);
+ pipeline.add(finisher);
return new LinkedPipelineConfigurationBuilder<PC>() {
+ @Override
@SuppressWarnings("unchecked")
public LinkedPipelineSetupBuilder<PC> withEmptyConfiguration() {
return this.setConfiguration(Collections.EMPTY_MAP);
}
+ @Override
public LinkedPipelineSetupBuilder<PC> setConfiguration(final Map<String, ? extends Object> parameters) {
if (parameters == null) {
throw new IllegalArgumentException("Parameter 'parameters' must be not null");
@@ -110,6 +113,7 @@ public final class PipelineBuilder {
return new LinkedPipelineSetupBuilder<PC>() {
+ @Override
public Pipeline<PC> setup(final OutputStream outputStream) {
if (outputStream == null) {
throw new IllegalArgumentException("Parameter 'outputStream' must be not null");
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCache.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCache.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCache.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCache.java Tue Jun 26 16:32:24 2012
@@ -30,18 +30,20 @@ public abstract class AbstractCache impl
/**
* {@inheritDoc}
- *
+ *
* @see org.apache.cocoon.pipeline.caching.Cache#get(org.apache.cocoon.pipeline.caching.CacheKey)
*/
+ @Override
public final CacheValue get(CacheKey cacheKey) {
return this.get(cacheKey, false);
}
/**
* {@inheritDoc}
- *
+ *
* @see org.apache.cocoon.pipeline.caching.Cache#get(org.apache.cocoon.pipeline.caching.CacheKey, boolean)
*/
+ @Override
public final CacheValue get(CacheKey cacheKey, boolean includeInvalid) {
CacheValue cacheValue = this.retrieve(cacheKey);
@@ -54,10 +56,11 @@ public abstract class AbstractCache impl
/**
* {@inheritDoc}
- *
+ *
* @see org.apache.cocoon.pipeline.caching.Cache#put(org.apache.cocoon.pipeline.caching.CacheKey,
* org.apache.cocoon.pipeline.caching.CacheValue)
*/
+ @Override
public final void put(CacheKey cacheKey, CacheValue cacheValue) {
this.store(cacheKey, cacheValue);
}
@@ -67,6 +70,7 @@ public abstract class AbstractCache impl
*
* @see org.apache.cocoon.pipeline.caching.Cache#clear()
*/
+ @Override
public void clear() {
this.doClear();
}
@@ -76,6 +80,7 @@ public abstract class AbstractCache impl
*
* @see org.apache.cocoon.pipeline.caching.Cache#remove(org.apache.cocoon.pipeline.caching.CacheKey)
*/
+ @Override
public boolean remove(CacheKey cacheKey) {
return this.doRemove(cacheKey);
}
@@ -85,6 +90,7 @@ public abstract class AbstractCache impl
*
* @see org.apache.cocoon.pipeline.caching.Cache#keySet()
*/
+ @Override
public Set<CacheKey> keySet() {
return this.retrieveKeySet();
}
@@ -111,7 +117,7 @@ public abstract class AbstractCache impl
/**
* Actually retrieves the {@link CacheValue} from the underlying storage.<br>
* This method must return the previously stored value - even if it is not valid anymore.
- *
+ *
* @param cacheKey The {@link CacheKey} to be used for retrieval.
* @return The previously stored {@link CacheValue} or <code>null</code> if no {@link CacheValue} is stored at the given
* <code>cacheKey</code>.
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCacheKey.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCacheKey.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCacheKey.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCacheKey.java Tue Jun 26 16:32:24 2012
@@ -23,14 +23,17 @@ public abstract class AbstractCacheKey i
private String jmxGroupName;
+ @Override
public String getJmxGroupName() {
return this.jmxGroupName;
}
+ @Override
public boolean hasJmxGroupName() {
return this.jmxGroupName != null && !this.jmxGroupName.equals("");
}
+ @Override
public void setJmxGroupName(String jmxGroupName) {
this.jmxGroupName = jmxGroupName;
}
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCacheValue.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCacheValue.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCacheValue.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/AbstractCacheValue.java Tue Jun 26 16:32:24 2012
@@ -32,9 +32,10 @@ public abstract class AbstractCacheValue
/**
* {@inheritDoc}
- *
+ *
* @see org.apache.cocoon.pipeline.caching.CacheValue#isValid(org.apache.cocoon.pipeline.caching.CacheKey)
*/
+ @Override
public boolean isValid(CacheKey otherCacheKey) {
return this.cacheKey != null && this.cacheKey.isValid(otherCacheKey);
}
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CacheRefreshManagerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CacheRefreshManagerImpl.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CacheRefreshManagerImpl.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CacheRefreshManagerImpl.java Tue Jun 26 16:32:24 2012
@@ -35,7 +35,7 @@ public class CacheRefreshManagerImpl imp
*/
private static final Logger LOG =
LoggerFactory.getLogger(CacheRefreshManagerImpl.class);
-
+
private static final int threadPoolSize = 50;
private final ExecutorService executorService = Executors.newFixedThreadPool(threadPoolSize);
@@ -44,10 +44,11 @@ public class CacheRefreshManagerImpl imp
/**
* {@inheritDoc}
- *
+ *
* @see org.apache.cocoon.pipeline.caching.CacheRefreshManager#refreshCacheValue(org.apache.cocoon.pipeline.caching.CacheKey,
* org.apache.cocoon.pipeline.caching.CacheRefreshJob)
*/
+ @Override
public void refreshCacheValue(CacheKey cacheKey, CacheRefreshJob cacheRefreshJob) {
if (this.pendingCacheKeys.contains(cacheKey)) {
// the refresh of this cache key is already scheduled
@@ -81,6 +82,7 @@ public class CacheRefreshManagerImpl imp
this.cacheRefreshJob = cacheRefreshJob;
}
+ @Override
public void run() {
CacheRefreshManagerImpl.this.executeCacheRefreshJob(this.cacheRefreshJob, this.cacheKey);
}
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompleteCacheValue.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompleteCacheValue.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompleteCacheValue.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompleteCacheValue.java Tue Jun 26 16:32:24 2012
@@ -49,6 +49,7 @@ public class CompleteCacheValue extends
*
* @see org.apache.cocoon.pipeline.caching.CacheValue#getValue()
*/
+ @Override
public Object getValue() {
return this.content.clone();
}
@@ -58,6 +59,7 @@ public class CompleteCacheValue extends
*
* @see org.apache.cocoon.pipeline.caching.CacheValue#setValue()
*/
+ @Override
public void setValue(final Object value) {
if (value instanceof String) {
this.content = ((String) value).getBytes();
@@ -92,6 +94,7 @@ public class CompleteCacheValue extends
*
* @see org.apache.cocoon.pipeline.caching.CacheValue#size()
*/
+ @Override
public double size() {
return this.content.length;
}
@@ -102,6 +105,7 @@ public class CompleteCacheValue extends
* @see org.apache.cocoon.pipeline.caching.CacheValue
* #writeTo(java.io.OutputStream)
*/
+ @Override
public void writeTo(final OutputStream outputStream) throws IOException {
outputStream.write(this.content);
}
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompoundCacheKey.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompoundCacheKey.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompoundCacheKey.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompoundCacheKey.java Tue Jun 26 16:32:24 2012
@@ -30,12 +30,8 @@ public class CompoundCacheKey extends Ab
private static final long serialVersionUID = 1L;
- /**
- * Logger.
- */
- private static final Logger LOG =
- LoggerFactory.getLogger(CompoundCacheKey.class);
-
+ private static final Logger LOG = LoggerFactory.getLogger(CompoundCacheKey.class);
+
private final List<CacheKey> cacheKeys = new LinkedList<CacheKey>();
public void addCacheKey(final CacheKey cacheKey) {
@@ -95,6 +91,7 @@ public class CompoundCacheKey extends Ab
*
* @see org.apache.cocoon.pipeline.caching.CacheKey#isValid(org.apache.cocoon.pipeline.caching.CacheKey)
*/
+ @Override
public boolean isValid(final CacheKey cacheKey) {
if (!(cacheKey instanceof CompoundCacheKey) || !this.equals(cacheKey)) {
return false;
@@ -124,6 +121,7 @@ public class CompoundCacheKey extends Ab
return true;
}
+ @Override
public long getLastModified() {
long lastModified = 0;
long eachLastModified;
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ExpiresCacheKey.java Tue Jun 26 16:32:24 2012
@@ -27,12 +27,12 @@ import org.apache.cocoon.util.murmurhash
public final class ExpiresCacheKey extends AbstractCacheKey {
private static final long serialVersionUID = 1L;
- private final CacheKey cacheKey;
+ private final CacheKey expiresCacheKey;
private final long timestamp;
private final long expirationTimestamp;
public ExpiresCacheKey(CacheKey cacheKey, String expires) {
- this.cacheKey = cacheKey;
+ this.expiresCacheKey = cacheKey;
this.timestamp = System.currentTimeMillis();
this.expirationTimestamp = this.timestamp + Long.parseLong(expires) * 1000;
}
@@ -42,6 +42,7 @@ public final class ExpiresCacheKey exten
*
* @see org.apache.cocoon.pipeline.caching.CacheKey#isValid(org.apache.cocoon.pipeline.caching.CacheKey)
*/
+ @Override
public boolean isValid(CacheKey cacheKey) {
if (!(cacheKey instanceof ExpiresCacheKey)) {
return false;
@@ -53,7 +54,7 @@ public final class ExpiresCacheKey exten
return true;
}
- return this.cacheKey.isValid(other.cacheKey);
+ return this.expiresCacheKey.isValid(other.expiresCacheKey);
}
/**
@@ -61,8 +62,9 @@ public final class ExpiresCacheKey exten
*
* @see org.apache.cocoon.pipeline.caching.CacheKey#getLastModified()
*/
+ @Override
public long getLastModified() {
- return this.cacheKey.getLastModified();
+ return this.expiresCacheKey.getLastModified();
}
public long getExpirationTimestamp() {
@@ -81,7 +83,7 @@ public final class ExpiresCacheKey exten
}
ExpiresCacheKey other = (ExpiresCacheKey) obj;
- return this.cacheKey.equals(other.cacheKey);
+ return this.expiresCacheKey.equals(other.expiresCacheKey);
}
/**
@@ -91,7 +93,7 @@ public final class ExpiresCacheKey exten
*/
@Override
public int hashCode() {
- return new MurmurHashCodeBuilder().append(this.getClass().getName()).append(this.cacheKey.hashCode())
+ return new MurmurHashCodeBuilder().append(this.getClass().getName()).append(this.expiresCacheKey.hashCode())
.toHashCode();
}
}
\ No newline at end of file
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/InvalidCacheKey.java Tue Jun 26 16:32:24 2012
@@ -43,6 +43,7 @@ public class InvalidCacheKey extends Abs
return this.expiresCacheKey.equals(other.expiresCacheKey);
}
+ @Override
public long getLastModified() {
return -1;
}
@@ -53,6 +54,7 @@ public class InvalidCacheKey extends Abs
.toHashCode();
}
+ @Override
public boolean isValid(CacheKey cacheKey) {
return false;
}
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ObjectCacheValue.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ObjectCacheValue.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ObjectCacheValue.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ObjectCacheValue.java Tue Jun 26 16:32:24 2012
@@ -33,12 +33,8 @@ public class ObjectCacheValue extends Ab
private static final long serialVersionUID = 1L;
- /**
- * Logger.
- */
- private static final Logger LOG =
- LoggerFactory.getLogger(ObjectCacheValue.class);
-
+ private static final Logger LOG = LoggerFactory.getLogger(ObjectCacheValue.class);
+
private final Object value;
public ObjectCacheValue(Object value, CacheKey cacheKey) {
@@ -49,9 +45,10 @@ public class ObjectCacheValue extends Ab
/**
* {@inheritDoc}
- *
+ *
* @see org.apache.cocoon.pipeline.caching.CacheValue#getValue()
*/
+ @Override
public Object getValue() {
return this.value;
}
@@ -61,6 +58,7 @@ public class ObjectCacheValue extends Ab
*
* @see org.apache.cocoon.pipeline.caching.CacheValue#setValue()
*/
+ @Override
public void setValue(Object value) {
throw new UnsupportedOperationException("Cannot set the content of ObjectCacheValue to OutputStream.");
}
@@ -70,6 +68,7 @@ public class ObjectCacheValue extends Ab
*
* @see org.apache.cocoon.pipeline.caching.CacheValue#size()
*/
+ @Override
public double size() {
ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
try {
@@ -89,6 +88,7 @@ public class ObjectCacheValue extends Ab
*
* @see org.apache.cocoon.pipeline.caching.CacheValue#writeTo(java.io.OutputStream)
*/
+ @Override
public void writeTo(OutputStream outputStream) throws IOException {
throw new UnsupportedOperationException("Cannot write the content of ObjectCacheValue to OutputStream.");
}
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ParameterCacheKey.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ParameterCacheKey.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ParameterCacheKey.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/ParameterCacheKey.java Tue Jun 26 16:32:24 2012
@@ -90,6 +90,7 @@ public class ParameterCacheKey extends A
*
* @see org.apache.cocoon.pipeline.caching.CacheKey#getLastModified()
*/
+ @Override
public long getLastModified() {
return -1;
}
@@ -113,6 +114,7 @@ public class ParameterCacheKey extends A
*
* @see org.apache.cocoon.pipeline.caching.CacheKey#isValid(org.apache.cocoon.pipeline.caching.CacheKey)
*/
+ @Override
public boolean isValid(CacheKey cacheKey) {
return this.equals(cacheKey);
}
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/SimpleCacheKey.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/SimpleCacheKey.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/SimpleCacheKey.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/SimpleCacheKey.java Tue Jun 26 16:32:24 2012
@@ -35,10 +35,12 @@ public class SimpleCacheKey extends Abst
return new MurmurHashCodeBuilder().append(this.getClass().getName()).toHashCode();
}
+ @Override
public boolean isValid(CacheKey cacheKey) {
return true;
}
+ @Override
public long getLastModified() {
return 0;
}
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/TimestampCacheKey.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/TimestampCacheKey.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/TimestampCacheKey.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/TimestampCacheKey.java Tue Jun 26 16:32:24 2012
@@ -54,6 +54,7 @@ public class TimestampCacheKey extends A
return this.timestamp;
}
+ @Override
public long getLastModified() {
return this.getTimestamp();
}
@@ -64,9 +65,9 @@ public class TimestampCacheKey extends A
append(this.timestamp).toHashCode();
}
+ @Override
public boolean isValid(final CacheKey cacheKey) {
- if (!(cacheKey instanceof TimestampCacheKey)
- || !this.equals(cacheKey)) {
+ if (!(cacheKey instanceof TimestampCacheKey) || !this.equals(cacheKey)) {
return false;
}
@@ -77,8 +78,7 @@ public class TimestampCacheKey extends A
@Override
public String toString() {
- final SimpleDateFormat dateFormat =
- new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S");
+ final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S");
return StringRepresentation.buildString(this,
"url=" + this.url, "timestamp=" + this.timestamp + " ("
+ dateFormat.format(new Date(this.timestamp)) + ")");
Modified: cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/AbstractPipelineComponent.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/AbstractPipelineComponent.java?rev=1354100&r1=1354099&r2=1354100&view=diff
==============================================================================
--- cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/AbstractPipelineComponent.java (original)
+++ cocoon/whiteboard/c3-pipeline-api-refactoring/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/AbstractPipelineComponent.java Tue Jun 26 16:32:24 2012
@@ -24,14 +24,17 @@ import java.util.Map;
*/
public abstract class AbstractPipelineComponent implements PipelineComponent {
+ @Override
public void finish() {
// do nothing
}
+ @Override
public void setConfiguration(Map<String, ? extends Object> configuration) {
// do nothing
}
+ @Override
public void setup(Map<String, Object> parameters) {
// do nothing
}
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.