Author: ash2k
Date: Mon Apr 1 10:53:57 2013
New Revision: 1463119
URL: http://svn.apache.org/r1463119
Log:
[ONAMI-88] converters: catch only checked exceptions, do not use
ProvisionException, minor JavaDoc fixes
Modified:
incubator/onami/trunk/converters/i18n/src/main/java/org/apache/onami/converters/i18n/DateConverter.java
incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/InetAddressConverter.java
incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/URIConverter.java
incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/URLConverter.java
incubator/onami/trunk/converters/numbers/src/main/java/org/apache/onami/converters/numbers/BigIntegerConverter.java
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/ClobConverter.java
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLDateConverter.java
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLTimeConverter.java
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLTimestampConverter.java
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/BitSetConverter.java
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/CharsetConverter.java
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/PropertiesConverter.java
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/UUIDConverter.java
Modified:
incubator/onami/trunk/converters/i18n/src/main/java/org/apache/onami/converters/i18n/DateConverter.java
URL:
http://svn.apache.org/viewvc/incubator/onami/trunk/converters/i18n/src/main/java/org/apache/onami/converters/i18n/DateConverter.java?rev=1463119&r1=1463118&r2=1463119&view=diff
==============================================================================
---
incubator/onami/trunk/converters/i18n/src/main/java/org/apache/onami/converters/i18n/DateConverter.java
(original)
+++
incubator/onami/trunk/converters/i18n/src/main/java/org/apache/onami/converters/i18n/DateConverter.java
Mon Apr 1 10:53:57 2013
@@ -33,7 +33,6 @@ import org.apache.onami.converters.core.
import org.kohsuke.MetaInfServices;
import com.google.inject.Module;
-import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral;
/**
@@ -128,7 +127,7 @@ public final class DateConverter
return date;
}
- catch ( Exception ex )
+ catch ( RuntimeException ex )
{
if ( firstEx == null )
{
@@ -156,7 +155,7 @@ public final class DateConverter
{
msg += " using pattern '" + ( (SimpleDateFormat) format
).toPattern() + "'";
}
- throw new ProvisionException( msg );
+ throw new IllegalArgumentException( msg );
}
return parsedDate;
Modified:
incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/InetAddressConverter.java
URL:
http://svn.apache.org/viewvc/incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/InetAddressConverter.java?rev=1463119&r1=1463118&r2=1463119&view=diff
==============================================================================
---
incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/InetAddressConverter.java
(original)
+++
incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/InetAddressConverter.java
Mon Apr 1 10:53:57 2013
@@ -26,7 +26,6 @@ import org.apache.onami.converters.core.
import org.kohsuke.MetaInfServices;
import com.google.inject.Module;
-import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral;
/**
@@ -48,7 +47,7 @@ public final class InetAddressConverter
}
catch ( UnknownHostException e )
{
- throw new ProvisionException( "String value '" + value + "' is not
a valid InetAddress", e );
+ throw new IllegalArgumentException( "String value '" + value + "'
is not a valid InetAddress", e );
}
}
Modified:
incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/URIConverter.java
URL:
http://svn.apache.org/viewvc/incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/URIConverter.java?rev=1463119&r1=1463118&r2=1463119&view=diff
==============================================================================
---
incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/URIConverter.java
(original)
+++
incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/URIConverter.java
Mon Apr 1 10:53:57 2013
@@ -19,14 +19,14 @@ package org.apache.onami.converters.net;
* under the License.
*/
+import static java.net.URI.create;
+
import java.net.URI;
-import java.net.URISyntaxException;
import org.apache.onami.converters.core.AbstractConverter;
import org.kohsuke.MetaInfServices;
import com.google.inject.Module;
-import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral;
/**
@@ -42,14 +42,7 @@ public final class URIConverter
*/
public Object convert( String value, TypeLiteral<?> toType )
{
- try
- {
- return new URI( value );
- }
- catch ( URISyntaxException e )
- {
- throw new ProvisionException( "String value '" + value + "' is not
a valid URI", e );
- }
+ return create( value );
}
}
Modified:
incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/URLConverter.java
URL:
http://svn.apache.org/viewvc/incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/URLConverter.java?rev=1463119&r1=1463118&r2=1463119&view=diff
==============================================================================
---
incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/URLConverter.java
(original)
+++
incubator/onami/trunk/converters/net/src/main/java/org/apache/onami/converters/net/URLConverter.java
Mon Apr 1 10:53:57 2013
@@ -26,7 +26,6 @@ import org.apache.onami.converters.core.
import org.kohsuke.MetaInfServices;
import com.google.inject.Module;
-import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral;
/**
@@ -60,7 +59,7 @@ public final class URLConverter
{
classLoader = Thread.currentThread().getContextClassLoader();
}
- catch ( Throwable t )
+ catch ( SecurityException t )
{
// Cannot access thread context ClassLoader - falling back to
system class loader...
}
@@ -72,7 +71,7 @@ public final class URLConverter
URL url = classLoader.getResource( path );
if ( url == null )
{
- throw new ProvisionException( "class path resource '"
+ throw new IllegalArgumentException( "class path resource '"
+ path
+ "' cannot be resolved to URL
because it does not exist" );
}
@@ -86,7 +85,7 @@ public final class URLConverter
}
catch ( MalformedURLException e )
{
- throw new ProvisionException( "String value '" + value + "' is not
a valid URL", e );
+ throw new IllegalArgumentException( "String value '" + value + "'
is not a valid URL", e );
}
}
Modified:
incubator/onami/trunk/converters/numbers/src/main/java/org/apache/onami/converters/numbers/BigIntegerConverter.java
URL:
http://svn.apache.org/viewvc/incubator/onami/trunk/converters/numbers/src/main/java/org/apache/onami/converters/numbers/BigIntegerConverter.java?rev=1463119&r1=1463118&r2=1463119&view=diff
==============================================================================
---
incubator/onami/trunk/converters/numbers/src/main/java/org/apache/onami/converters/numbers/BigIntegerConverter.java
(original)
+++
incubator/onami/trunk/converters/numbers/src/main/java/org/apache/onami/converters/numbers/BigIntegerConverter.java
Mon Apr 1 10:53:57 2013
@@ -28,7 +28,7 @@ import com.google.inject.Module;
import com.google.inject.TypeLiteral;
/**
- * Converter implementation for {@code java.math.BigDecimal}.
+ * Converter implementation for {@code java.math.BigInteger}.
*/
@MetaInfServices( Module.class )
public final class BigIntegerConverter
Modified:
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/ClobConverter.java
URL:
http://svn.apache.org/viewvc/incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/ClobConverter.java?rev=1463119&r1=1463118&r2=1463119&view=diff
==============================================================================
---
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/ClobConverter.java
(original)
+++
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/ClobConverter.java
Mon Apr 1 10:53:57 2013
@@ -20,6 +20,7 @@ package org.apache.onami.converters.sql;
*/
import java.sql.Clob;
+import java.sql.SQLException;
import javax.sql.rowset.serial.SerialClob;
@@ -27,7 +28,6 @@ import org.apache.onami.converters.core.
import org.kohsuke.MetaInfServices;
import com.google.inject.Module;
-import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral;
/**
@@ -47,9 +47,9 @@ public final class ClobConverter
{
return new SerialClob( value.toCharArray() );
}
- catch ( Exception e )
+ catch ( SQLException e )
{
- throw new ProvisionException( "String value '" + value + "' is not
a valid InetAddress", e );
+ throw new IllegalArgumentException( "String value '" + value + "'
is not a valid SerialClob", e );
}
}
Modified:
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLDateConverter.java
URL:
http://svn.apache.org/viewvc/incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLDateConverter.java?rev=1463119&r1=1463118&r2=1463119&view=diff
==============================================================================
---
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLDateConverter.java
(original)
+++
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLDateConverter.java
Mon Apr 1 10:53:57 2013
@@ -25,7 +25,6 @@ import org.apache.onami.converters.core.
import org.kohsuke.MetaInfServices;
import com.google.inject.Module;
-import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral;
/**
@@ -41,14 +40,7 @@ public final class SQLDateConverter
*/
public Object convert( String value, TypeLiteral<?> toType )
{
- try
- {
- return Date.valueOf( value );
- }
- catch ( Throwable t )
- {
- throw new ProvisionException( "String must be in JDBC format
[yyyy-MM-dd] to create a java.sql.Date" );
- }
+ return Date.valueOf( value );
}
}
Modified:
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLTimeConverter.java
URL:
http://svn.apache.org/viewvc/incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLTimeConverter.java?rev=1463119&r1=1463118&r2=1463119&view=diff
==============================================================================
---
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLTimeConverter.java
(original)
+++
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLTimeConverter.java
Mon Apr 1 10:53:57 2013
@@ -25,11 +25,10 @@ import org.apache.onami.converters.core.
import org.kohsuke.MetaInfServices;
import com.google.inject.Module;
-import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral;
/**
- * Converter implementation for {@code java.sql.Date}.
+ * Converter implementation for {@code java.sql.Time}.
*/
@MetaInfServices( Module.class )
public final class SQLTimeConverter
@@ -41,14 +40,7 @@ public final class SQLTimeConverter
*/
public Object convert( String value, TypeLiteral<?> toType )
{
- try
- {
- return Time.valueOf( value );
- }
- catch ( Throwable t )
- {
- throw new ProvisionException( "String must be in JDBC format
[HH:mm:ss] to create a java.sql.Time" );
- }
+ return Time.valueOf( value );
}
}
Modified:
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLTimestampConverter.java
URL:
http://svn.apache.org/viewvc/incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLTimestampConverter.java?rev=1463119&r1=1463118&r2=1463119&view=diff
==============================================================================
---
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLTimestampConverter.java
(original)
+++
incubator/onami/trunk/converters/sql/src/main/java/org/apache/onami/converters/sql/SQLTimestampConverter.java
Mon Apr 1 10:53:57 2013
@@ -25,11 +25,10 @@ import org.apache.onami.converters.core.
import org.kohsuke.MetaInfServices;
import com.google.inject.Module;
-import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral;
/**
- * Converter implementation for {@code java.sql.Date}.
+ * Converter implementation for {@code java.sql.Timestamp}.
*/
@MetaInfServices( Module.class )
public final class SQLTimestampConverter
@@ -41,14 +40,7 @@ public final class SQLTimestampConverter
*/
public Object convert( String value, TypeLiteral<?> toType )
{
- try
- {
- return Timestamp.valueOf( value );
- }
- catch ( Throwable t )
- {
- throw new ProvisionException( "String must be in JDBC format
[yyyy-MM-dd HH:mm:ss.fffffffff] to create a java.sql.Timestamp" );
- }
+ return Timestamp.valueOf( value );
}
}
Modified:
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/BitSetConverter.java
URL:
http://svn.apache.org/viewvc/incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/BitSetConverter.java?rev=1463119&r1=1463118&r2=1463119&view=diff
==============================================================================
---
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/BitSetConverter.java
(original)
+++
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/BitSetConverter.java
Mon Apr 1 10:53:57 2013
@@ -26,11 +26,10 @@ import org.apache.onami.converters.core.
import org.kohsuke.MetaInfServices;
import com.google.inject.Module;
-import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral;
/**
- * Converter implementation for {@code java.util.UUID}.
+ * Converter implementation for {@code java.util.BitSet}.
*/
@MetaInfServices( Module.class )
public final class BitSetConverter
@@ -56,7 +55,7 @@ public final class BitSetConverter
if ( current.length() == 0 )
{
- throw new ProvisionException( "Input '" + value
+ throw new IllegalArgumentException( "Input '" + value
+ "' is not a valid java.util.BitSet, fragment at position
" + currentIndex + " is empty" );
}
@@ -70,7 +69,7 @@ public final class BitSetConverter
{
if ( !Character.isDigit( current.charAt( i ) ) )
{
- throw new ProvisionException( "Input '"
+ throw new IllegalArgumentException( "Input '"
+ value
+ "' is not a valid
java.util.BitSet, fragment '"
+ current
Modified:
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/CharsetConverter.java
URL:
http://svn.apache.org/viewvc/incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/CharsetConverter.java?rev=1463119&r1=1463118&r2=1463119&view=diff
==============================================================================
---
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/CharsetConverter.java
(original)
+++
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/CharsetConverter.java
Mon Apr 1 10:53:57 2013
@@ -25,7 +25,6 @@ import org.apache.onami.converters.core.
import org.kohsuke.MetaInfServices;
import com.google.inject.Module;
-import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral;
/**
@@ -43,7 +42,7 @@ public final class CharsetConverter
{
if ( value.length() == 0 )
{
- throw new ProvisionException( "Impossible to convert an empty
value to a Charset" );
+ throw new IllegalArgumentException( "Impossible to convert an
empty value to a Charset" );
}
return Charset.forName( value );
}
Modified:
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/PropertiesConverter.java
URL:
http://svn.apache.org/viewvc/incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/PropertiesConverter.java?rev=1463119&r1=1463118&r2=1463119&view=diff
==============================================================================
---
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/PropertiesConverter.java
(original)
+++
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/PropertiesConverter.java
Mon Apr 1 10:53:57 2013
@@ -27,7 +27,6 @@ import org.apache.onami.converters.core.
import org.kohsuke.MetaInfServices;
import com.google.inject.Module;
-import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral;
/**
@@ -52,7 +51,7 @@ public final class PropertiesConverter
catch ( IOException e )
{
// Should never happen.
- throw new ProvisionException( "Failed to parse '" + value + "'
into Properties", e );
+ throw new IllegalArgumentException( "Failed to parse '" + value +
"' into Properties", e );
}
return properties;
Modified:
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/UUIDConverter.java
URL:
http://svn.apache.org/viewvc/incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/UUIDConverter.java?rev=1463119&r1=1463118&r2=1463119&view=diff
==============================================================================
---
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/UUIDConverter.java
(original)
+++
incubator/onami/trunk/converters/system/src/main/java/org/apache/onami/converters/system/UUIDConverter.java
Mon Apr 1 10:53:57 2013
@@ -27,7 +27,6 @@ import org.apache.onami.converters.core.
import org.kohsuke.MetaInfServices;
import com.google.inject.Module;
-import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral;
/**
@@ -43,14 +42,7 @@ public final class UUIDConverter
*/
public Object convert( String value, TypeLiteral<?> toType )
{
- try
- {
- return fromString( value );
- }
- catch ( Throwable t )
- {
- throw new ProvisionException( "String value '" + value + "' is not
a valid UUID", t );
- }
+ return fromString( value );
}
}
