QPID-5686 : Address review comments from Alex Rudyy

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1590689 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 22 insertions, 62 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
index a169aed0fe..828643273a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AttributeValueConverter.java
@@ -423,27 +423,6 @@ abstract class AttributeValueConverter<T>
             _memberConverter = getConverter(getRawType(genericType), genericType);
         }
 
-        private static Class getRawType(Type t)
-        {
-            if(t instanceof Class)
-            {
-                return (Class)t;
-            }
-            else if(t instanceof ParameterizedType)
-            {
-                return (Class)((ParameterizedType)t).getRawType();
-            }
-            else if(t instanceof TypeVariable)
-            {
-                Type[] bounds = ((TypeVariable)t).getBounds();
-                if(bounds.length == 1)
-                {
-                    return getRawType(bounds[0]);
-                }
-            }
-            throw new ServerScopedRuntimeException("Unable to process type when constructing configuration model: " + t);
-        }
-
         @Override
         public List convert(final Object value, final ConfiguredObject object)
         {
@@ -495,27 +474,6 @@ abstract class AttributeValueConverter<T>
             _memberConverter = getConverter(getRawType(genericType), genericType);
         }
 
-        private static Class getRawType(Type t)
-        {
-            if(t instanceof Class)
-            {
-                return (Class)t;
-            }
-            else if(t instanceof ParameterizedType)
-            {
-                return (Class)((ParameterizedType)t).getRawType();
-            }
-            else if(t instanceof TypeVariable)
-            {
-                Type[] bounds = ((TypeVariable)t).getBounds();
-                if(bounds.length == 1)
-                {
-                    return getRawType(bounds[0]);
-                }
-            }
-            throw new ServerScopedRuntimeException("Unable to process type when constructing configuration model: " + t);
-        }
-
         @Override
         public Set convert(final Object value, final ConfiguredObject object)
         {
@@ -567,26 +525,6 @@ abstract class AttributeValueConverter<T>
             _memberConverter = getConverter(getRawType(genericType), genericType);
         }
 
-        private static Class getRawType(Type t)
-        {
-            if(t instanceof Class)
-            {
-                return (Class)t;
-            }
-            else if(t instanceof ParameterizedType)
-            {
-                return (Class)((ParameterizedType)t).getRawType();
-            }
-            else if(t instanceof TypeVariable)
-            {
-                Type[] bounds = ((TypeVariable)t).getBounds();
-                if(bounds.length == 1)
-                {
-                    return getRawType(bounds[0]);
-                }
-            }
-            throw new ServerScopedRuntimeException("Unable to process type when constructing configuration model: " + t);
-        }
 
         @Override
         public Collection convert(final Object value, final ConfiguredObject object)
@@ -719,4 +657,26 @@ abstract class AttributeValueConverter<T>
             }
         }
     }
+
+    private static Class getRawType(Type t)
+    {
+        if(t instanceof Class)
+        {
+            return (Class)t;
+        }
+        else if(t instanceof ParameterizedType)
+        {
+            return (Class)((ParameterizedType)t).getRawType();
+        }
+        else if(t instanceof TypeVariable)
+        {
+            Type[] bounds = ((TypeVariable)t).getBounds();
+            if(bounds.length == 1)
+            {
+                return getRawType(bounds[0]);
+            }
+        }
+        throw new ServerScopedRuntimeException("Unable to process type when constructing configuration model: " + t);
+    }
+
 }