[jboss-cvs] JBossCache/src/org/jboss/cache/config ...

[Manik Surtani]

  User: msurtani
  Date: 06/08/14 13:52:34

  Modified:    src/org/jboss/cache/config  Configuration.java
  Log:
  Converted NodeLockingScheme, IsolationLevel and LockType to enums
  
  Revision  Changes    Path
  1.12      +23 -16    JBossCache/src/org/jboss/cache/config/Configuration.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Configuration.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/config/Configuration.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- Configuration.java	20 Jul 2006 19:31:39 -0000	1.11
  +++ Configuration.java	14 Aug 2006 17:52:34 -0000	1.12
  @@ -24,10 +24,7 @@
   {
       public enum CacheMode { LOCAL, REPL_SYNC, REPL_ASYNC, INVALIDATION_SYNC, INVALIDATION_ASYNC }
   
  -    // TODO; enable these enums
  -//    public enum NodeLockingScheme{ PESSIMISTIC, OPTIMISTIC }
  -//
  -//    public enum IsolationLevel { NONE, READ_UNCOMMITTED, READ_COMMITTED, REPEATABLE_READ, SERIALIZABLE }
  +    public enum NodeLockingScheme{ PESSIMISTIC, OPTIMISTIC }
   
       private Log log = LogFactory.getLog(Configuration.class);
   
  @@ -123,7 +120,7 @@
       private Element buddyReplicationConfig;
   
       private boolean nodeLockingOptimistic = false;
  -    private String nodeLockingScheme = "PESSIMISTIC";
  +    private NodeLockingScheme nodeLockingScheme = NodeLockingScheme.PESSIMISTIC;
   
       String parseClusterConfigXml(Element config)
       {
  @@ -329,15 +326,6 @@
           return isolationLevel;
       }
   
  -    public void setIsolationLevel(String isolationLevel)
  -    {
  -        this.isolationLevel = IsolationLevel.stringToIsolationLevel(isolationLevel);
  -        if (this.isolationLevel == null)
  -        {
  -           throw new ConfigurationException("IsolationLevel: level \"" + isolationLevel + "\" is invalid", "IsolationLevel");
  -        }
  -    }
  -
       public Element getEvictionPolicyConfig()
       {
           return evictionPolicyConfig;
  @@ -408,12 +396,12 @@
           this.buddyReplicationConfig = buddyReplicationConfig;
       }
   
  -    public String getNodeLockingScheme()
  +    public NodeLockingScheme getNodeLockingScheme()
       {
           return nodeLockingScheme;
       }
   
  -    public void setNodeLockingScheme(String nodeLockingScheme)
  +    public void setNodeLockingScheme(NodeLockingScheme nodeLockingScheme)
       {
           this.nodeLockingScheme = nodeLockingScheme;
       }
  @@ -443,5 +431,24 @@
           this.initialStateRetrievalTimeout = initialStateRetrievalTimeout;
       }
   
  +    public void setNodeLockingScheme(String nodeLockingScheme)
  +    {
  +        this.nodeLockingScheme = NodeLockingScheme.valueOf(nodeLockingScheme);
  +        if (this.nodeLockingScheme == null)
  +        {
  +            log.warn("Unknown node locking scheme '"+nodeLockingScheme+"', using defaults.");
  +            this.nodeLockingScheme = NodeLockingScheme.PESSIMISTIC;
  +        }
  +    }
  +
  +    public void setIsolationLevel(String isolationLevel)
  +    {
  +        this.isolationLevel = IsolationLevel.valueOf(isolationLevel);
  +        if (this.isolationLevel == null)
  +        {
  +            log.warn("Unknown isolation level '"+isolationLevel+"', using defaults.");
  +            this.isolationLevel = IsolationLevel.REPEATABLE_READ;
  +        }
  +    }
   
   }