ISPN-1566 Remove duplicate async/singletonStore definitions

core/src/main/java/org/infinispan/configuration/cache/AbstractLoaderConfiguration.java

@@ -1,3 +1,22 @@
+/*
+ * Copyright 2011 Red Hat, Inc. and/or its affiliates.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
 package org.infinispan.configuration.cache;
 
 import org.infinispan.configuration.AbstractTypedPropertiesConfiguration;

core/src/main/java/org/infinispan/configuration/cache/AbstractLoaderConfigurationBuilder.java

@@ -1,13 +1,32 @@
+/*
+ * Copyright 2011 Red Hat, Inc. and/or its affiliates.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
 package org.infinispan.configuration.cache;
 
 import java.util.Properties;
 
 /*
  * This is slightly different AbstractLoaderConfigurationChildBuilder, as it instantiates a new set of children (async and singletonStore)
  * rather than delegate to existing ones. 
- * 
  */
-public abstract class AbstractLoaderConfigurationBuilder<T extends AbstractLoaderConfiguration> extends AbstractLoadersConfigurationChildBuilder<T> {
+public abstract class AbstractLoaderConfigurationBuilder<T extends AbstractLoaderConfiguration>
+      extends AbstractLoadersConfigurationChildBuilder<T> {
 
    protected final AsyncLoaderConfigurationBuilder async;
    protected final SingletonStoreConfigurationBuilder singletonStore;

core/src/main/java/org/infinispan/configuration/cache/FileCacheStoreConfigurationBuilder.java

@@ -25,10 +25,10 @@
 import org.infinispan.util.TypedProperties;
 
 /**
- * // TODO: Document this
+ * File cache store configuration builder
  * 
  * @author Galder Zamarreño
- * @since // TODO
+ * @since 5.1
  */
 public class FileCacheStoreConfigurationBuilder extends AbstractLoaderConfigurationBuilder<FileCacheStoreConfiguration> {
 
@@ -42,14 +42,10 @@ public class FileCacheStoreConfigurationBuilder extends AbstractLoaderConfigurat
    private boolean purgeSynchronously = false;
    private int lockConcurrencyLevel;
    private long lockAcquistionTimeout;
-   private final AsyncLoaderConfigurationBuilder async;
-   private final SingletonStoreConfigurationBuilder singletonStore;
    private Properties properties = new Properties();
 
    protected FileCacheStoreConfigurationBuilder(LoadersConfigurationBuilder builder) {
       super(builder);
-      this.async = new AsyncLoaderConfigurationBuilder(this);
-      this.singletonStore = new SingletonStoreConfigurationBuilder(this);
    }
 
    public FileCacheStoreConfigurationBuilder location(String location) {
@@ -121,7 +117,11 @@ public static enum FsyncMode {
 
    @Override
    FileCacheStoreConfiguration create() {
-      return new FileCacheStoreConfiguration(location, fsyncInterval, fsyncMode, streamBufferSize, lockAcquistionTimeout, lockConcurrencyLevel, purgeOnStartup, purgeSynchronously, fetchPersistentState, ignoreModifications, TypedProperties.toTypedProperties(properties), async.create(), singletonStore.create());
+      return new FileCacheStoreConfiguration(location, fsyncInterval, fsyncMode,
+            streamBufferSize, lockAcquistionTimeout, lockConcurrencyLevel,
+            purgeOnStartup, purgeSynchronously, fetchPersistentState,
+            ignoreModifications, TypedProperties.toTypedProperties(properties),
+            async.create(), singletonStore.create());
    }
 
    @Override