clean up CacheModeType enum

hibernate-core/src/main/java/org/hibernate/annotations/CacheModeType.java

@@ -6,6 +6,7 @@
  */
 package org.hibernate.annotations;
 
+import org.hibernate.AssertionFailure;
 import org.hibernate.CacheMode;
 import org.hibernate.Remove;
 
@@ -28,44 +29,51 @@ public enum CacheModeType {
 	 *
 	 * @see CacheMode#GET
 	 */
-	GET( CacheMode.GET ),
+	GET,
 
 	/**
 	 * Corresponds to {@link CacheMode#IGNORE}.
 	 *
 	 * @see CacheMode#IGNORE
 	 */
-	IGNORE( CacheMode.IGNORE ),
+	IGNORE,
 
 	/**
 	 * Corresponds to {@link CacheMode#NORMAL}.
 	 *
 	 * @see CacheMode#NORMAL
 	 */
-	NORMAL( CacheMode.NORMAL ),
+	NORMAL,
 
 	/**
 	 * Corresponds to {@link CacheMode#PUT}.
 	 *
 	 * @see CacheMode#PUT
 	 */
-	PUT( CacheMode.PUT ),
+	PUT,
 
 	/**
 	 * Corresponds to {@link CacheMode#REFRESH}.
 	 *
 	 * @see CacheMode#REFRESH
 	 */
-	REFRESH( CacheMode.REFRESH );
-
-	private final CacheMode cacheMode;
-
-	CacheModeType(CacheMode cacheMode) {
-		this.cacheMode = cacheMode;
-	}
+	REFRESH;
 
 	public CacheMode getCacheMode() {
-		return cacheMode;
+		switch (this) {
+			case GET:
+				return CacheMode.GET;
+			case IGNORE:
+				return CacheMode.IGNORE;
+			case NORMAL:
+				return CacheMode.NORMAL;
+			case PUT:
+				return CacheMode.PUT;
+			case REFRESH:
+				return CacheMode.REFRESH;
+			default:
+				throw new AssertionFailure( "Unknown CacheModeType" );
+		}
 	}
 
 	/**
@@ -73,7 +81,8 @@ public enum CacheModeType {
 	 *
 	 * @param cacheMode The cache mode to convert
 	 *
-	 * @return The corresponding enum value.  Will be {@code null} if the given {@code accessType} is {@code null}.
+	 * @return The corresponding enum value.
+	 *         Will be {@code null} if the given {@code accessType} is {@code null}.
 	 */
 	public static CacheModeType fromCacheMode(CacheMode cacheMode) {
 		if ( null == cacheMode ) {
@@ -81,24 +90,18 @@ public enum CacheModeType {
 		}
 
 		switch ( cacheMode ) {
-			case NORMAL: {
+			case NORMAL:
 				return NORMAL;
-			}
-			case GET: {
+			case GET:
 				return GET;
-			}
-			case PUT: {
+			case PUT:
 				return PUT;
-			}
-			case REFRESH: {
+			case REFRESH:
 				return REFRESH;
-			}
-			case IGNORE: {
+			case IGNORE:
 				return IGNORE;
-			}
-			default: {
+			default:
 				throw new IllegalArgumentException( "Unrecognized CacheMode : " + cacheMode );
-			}
 		}
 	}
 }