fix missing copy strategy in guava cache configuration

scm-webapp/src/main/java/sonia/scm/cache/CopyStrategy.java

@@ -48,18 +48,22 @@ import java.util.Locale;
 public enum CopyStrategy
 {
 
-  NONE(false, false), READ(true, false), WRITE(false, true),
+  NONE("none", false, false), READ("read", true, false),
-    READWRITE(true, true);
+    WRITE("write", false, true), READWRITE("read-write", true, true);
 
   /**
    * Constructs ...
    *
    *
+   *
+   * @param configName
    * @param copyOnRead
    * @param copyOnWrite
    */
-  private CopyStrategy(boolean copyOnRead, boolean copyOnWrite)
+  private CopyStrategy(String configName, boolean copyOnRead,
+    boolean copyOnWrite)
   {
+    this.configName = configName;
     this.copyOnRead = copyOnRead;
     this.copyOnWrite = copyOnWrite;
   }
@@ -111,6 +115,21 @@ public enum CopyStrategy
       : object;
   }
 
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public String getConfigName()
+  {
+    return configName;
+  }
+
+  //~--- methods --------------------------------------------------------------
+
   /**
    * Method description
    *
@@ -139,6 +158,9 @@ public enum CopyStrategy
 
   //~--- fields ---------------------------------------------------------------
 
+  /** Field description */
+  private String configName;
+
   /** Field description */
   private boolean copyOnRead;
 

scm-webapp/src/main/java/sonia/scm/cache/GuavaCacheConfiguration.java

@@ -31,6 +31,10 @@
 
 package sonia.scm.cache;
 
+//~--- non-JDK imports --------------------------------------------------------
+
+import com.google.common.base.Objects;
+
 //~--- JDK imports ------------------------------------------------------------
 
 import java.io.Serializable;
@@ -39,6 +43,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 /**
  *
@@ -52,6 +57,34 @@ public class GuavaCacheConfiguration implements Serializable
   /** Field description */
   private static final long serialVersionUID = -8734373158089010603L;
 
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @Override
+  public String toString()
+  {
+    //J-
+    return Objects.toStringHelper(this)
+                  .add("concurrencyLevel", concurrencyLevel)
+                  .add("copyStrategy", copyStrategy)
+                  .add("expireAfterAccess", expireAfterAccess)
+                  .add("expireAfterWrite", expireAfterWrite)
+                  .add("initialCapacity", initialCapacity)
+                  .add("maximumSize", maximumSize)
+                  .add("maximumWeight", maximumWeight)
+                  .add("recordStats", recordStats)
+                  .add("softValues", softValues)
+                  .add("weakKeys", weakKeys)
+                  .add("weakValues", weakValues)
+                  .omitNullValues().toString();
+    //J+
+  }
+
   //~--- get methods ----------------------------------------------------------
 
   /**
@@ -183,6 +216,7 @@ public class GuavaCacheConfiguration implements Serializable
 
   /** Field description */
   @XmlAttribute
+  @XmlJavaTypeAdapter(XmlCopyStrategyAdapter.class)
   private CopyStrategy copyStrategy;
 
   /** Field description */

scm-webapp/src/main/java/sonia/scm/cache/XmlCopyStrategyAdapter.java

@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.cache;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class XmlCopyStrategyAdapter extends XmlAdapter<String, CopyStrategy>
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @param v
+   *
+   * @return
+   *
+   * @throws Exception
+   */
+  @Override
+  public String marshal(CopyStrategy v) throws Exception
+  {
+    return v.getConfigName();
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param v
+   *
+   * @return
+   *
+   * @throws Exception
+   */
+  @Override
+  public CopyStrategy unmarshal(String v) throws Exception
+  {
+    return CopyStrategy.fromString(v);
+  }
+}