[commons-jcs] 08/14: Use enum consistently

[tv]

This is an automated email from the ASF dual-hosted git repository.

tv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git

commit 224948d108715623590bc39861b4d3cd6a61b845
Author: Thomas Vandahl <t...@apache.org>
AuthorDate: Mon Mar 29 16:23:35 2021 +0200

    Use enum consistently
---
 .../auxiliary/lateral/LateralCacheAttributes.java   |  9 ++-------
 .../lateral/behavior/ILateralCacheAttributes.java   | 21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheAttributes.java
 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheAttributes.java
index 67c99c6..c25655e 100644
--- 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheAttributes.java
+++ 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheAttributes.java
@@ -35,9 +35,6 @@ public class LateralCacheAttributes
     /** Default receive setting */
     private static final boolean DEFAULT_RECEIVE = true;
 
-    /** THe type of lateral */
-    private String transmissionTypeName = "UDP";
-
     /** indicates the lateral type, this needs to change */
     private Type transmissionType = Type.UDP;
 
@@ -177,7 +174,6 @@ public class LateralCacheAttributes
     public void setTransmissionType( final Type val )
     {
         this.transmissionType = val;
-        this.transmissionTypeName = val.toString();
     }
 
     /**
@@ -197,7 +193,6 @@ public class LateralCacheAttributes
     @Override
     public void setTransmissionTypeName( final String val )
     {
-        this.transmissionTypeName = val;
         this.transmissionType = Type.valueOf(val);
     }
 
@@ -208,7 +203,7 @@ public class LateralCacheAttributes
     @Override
     public String getTransmissionTypeName()
     {
-        return this.transmissionTypeName;
+        return this.transmissionType.toString();
     }
 
     /**
@@ -286,7 +281,7 @@ public class LateralCacheAttributes
         //buf.append( "transmissionTypeName=" + transmissionTypeName + "\n" );
         //buf.append( "transmissionType=" + transmissionType + "\n" );
         //buf.append( "tcpServer=" + tcpServer + "\n" );
-        buf.append( transmissionTypeName + httpServer + udpMulticastAddr + 
String.valueOf( udpMulticastPort ) );
+        buf.append( transmissionType.toString() + httpServer + 
udpMulticastAddr + String.valueOf( udpMulticastPort ) );
         return buf.toString();
     }
 }
diff --git 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/behavior/ILateralCacheAttributes.java
 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/behavior/ILateralCacheAttributes.java
index 6cec965..02ff5ae 100644
--- 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/behavior/ILateralCacheAttributes.java
+++ 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/behavior/ILateralCacheAttributes.java
@@ -33,16 +33,29 @@ public interface ILateralCacheAttributes
     enum Type
     {
         /** HTTP type */
-        HTTP, // 1
+        HTTP("HTTP"), // 1
 
         /** UDP type */
-        UDP, // 2
+        UDP("UDP"), // 2
 
         /** TCP type */
-        TCP, // 3
+        TCP("TCP"), // 3
 
         /** XMLRPC type */
-        XMLRPC // 4
+        XMLRPC("XMLRPC"); // 4
+
+        private final String typeName;
+
+        Type(String typeName)
+        {
+            this.typeName = typeName;
+        }
+
+        @Override
+        public String toString()
+        {
+            return typeName;
+        }
     }
 
     /**