svn commit: r1535528 - in /commons/proper/beanutils/branches/java5/src: main/java/org/apache/commons/beanutils/converters/StringConverter.java test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java

[oh...@apache.org]

Author: oheger
Date: Thu Oct 24 20:27:34 2013
New Revision: 1535528

URL: http://svn.apache.org/r1535528
Log:
Generified StringConverter.

Also added a test class because there was none.

Added:
    commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java
Modified:
    commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java

Modified: commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java?rev=1535528&r1=1535527&r2=1535528&view=diff
==============================================================================
--- commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java (original)
+++ commons/proper/beanutils/branches/java5/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java Thu Oct 24 20:27:34 2013
@@ -71,7 +71,7 @@ public final class StringConverter exten
      * @since 1.8.0
      */
     @Override
-    protected Class getDefaultType() {
+    protected Class<?> getDefaultType() {
         return String.class;
     }
 
@@ -86,8 +86,13 @@ public final class StringConverter exten
      * @since 1.8.0
      */
     @Override
-    protected Object convertToType(Class type, Object value) throws Throwable {
-        return value.toString();
+    protected <T> T convertToType(Class<T> type, Object value) throws Throwable {
+        // We have to support Object, too, because this class is sometimes
+        // used for a standard to Object conversion
+        if (String.class.equals(type) || Object.class.equals(type)) {
+            return type.cast(value.toString());
+        }
+        throw conversionException(type, value);
     }
 
 

Added: commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java?rev=1535528&view=auto
==============================================================================
--- commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java (added)
+++ commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java Thu Oct 24 20:27:34 2013
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.beanutils.converters;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.beanutils.ConversionException;
+
+/**
+ * Test case for {@code StringConverter}.
+ *
+ * @version $Id: $
+ */
+public class StringConverterTestCase extends TestCase {
+    /** The converter to be tested. */
+    private StringConverter converter;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        converter = new StringConverter();
+    }
+
+    /**
+     * Tests whether the correct default type is returned.
+     */
+    public void testDefaultType() {
+        assertEquals("Wrong default type", String.class, converter.getDefaultType());
+    }
+
+    /**
+     * Tests a conversion to a string type.
+     */
+    public void testConvertToTypeString() {
+        Object value = new Object();
+        String strVal = converter.convert(String.class, value);
+        assertEquals("Wrong conversion result", value.toString(), strVal);
+    }
+
+    /**
+     * Tries to convert an object to an unsupported type.
+     */
+    public void testConvertToUnsupportedType() {
+        try {
+            converter.convert(Integer.class, new Object());
+            fail("No conversion exception thrown!");
+        } catch(ConversionException cex) {
+            // expected result
+        }
+    }
+}