Author: struberg
Date: Sun Jun 18 11:32:41 2017
New Revision: 1799076
URL: http://svn.apache.org/viewvc?rev=1799076&view=rev
Log:
OWB-1195 remove redundant throws
Modified:
openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java
openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NumberProducer.java
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedMethodExpression.java
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedValueExpression.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/OwbTckElResolver.java
Modified:
openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java?rev=1799076&r1=1799075&r2=1799076&view=diff
==============================================================================
---
openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java
(original)
+++
openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java
Sun Jun 18 11:32:41 2017
@@ -57,7 +57,7 @@ public class ShoppingCardBean implements
{
model.getList().add(this.book);
- StringBuffer buffer = new StringBuffer("Your shopping card contents :
[");
+ StringBuilder buffer = new StringBuilder("Your shopping card contents
: [");
for(String b : model.getList())
{
@@ -72,7 +72,7 @@ public class ShoppingCardBean implements
public String getBooks()
{
- StringBuffer buffer = new StringBuffer("Your shopping card contents :
[");
+ StringBuilder buffer = new StringBuilder("Your shopping card contents
: [");
for(String b : model.getList())
{
Modified:
openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NumberProducer.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NumberProducer.java?rev=1799076&r1=1799075&r2=1799076&view=diff
==============================================================================
---
openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NumberProducer.java
(original)
+++
openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NumberProducer.java
Sun Jun 18 11:32:41 2017
@@ -41,7 +41,7 @@ public class NumberProducer implements S
@NextNumber
public Integer next()
{
- return Integer.valueOf(new java.util.Random().nextInt(101));
+ return new java.util.Random().nextInt(101);
}
@Produces
Modified:
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedMethodExpression.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedMethodExpression.java?rev=1799076&r1=1799075&r2=1799076&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedMethodExpression.java
(original)
+++
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedMethodExpression.java
Sun Jun 18 11:32:41 2017
@@ -24,8 +24,6 @@ import javax.el.ELContext;
import javax.el.ELException;
import javax.el.MethodExpression;
import javax.el.MethodInfo;
-import javax.el.MethodNotFoundException;
-import javax.el.PropertyNotFoundException;
public class WrappedMethodExpression extends MethodExpression
{
@@ -33,19 +31,19 @@ public class WrappedMethodExpression ext
public WrappedMethodExpression(MethodExpression methodExpression)
{
- this.delegate = methodExpression;
+ delegate = methodExpression;
}
@Override
public MethodInfo getMethodInfo(ELContext context)
- throws NullPointerException, PropertyNotFoundException,
MethodNotFoundException, ELException
+ throws NullPointerException, ELException
{
return delegate.getMethodInfo(context);
}
@Override
public Object invoke(ELContext context, Object[] params)
- throws NullPointerException, PropertyNotFoundException,
MethodNotFoundException, ELException
+ throws NullPointerException, ELException
{
try
{
Modified:
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedValueExpression.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedValueExpression.java?rev=1799076&r1=1799075&r2=1799076&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedValueExpression.java
(original)
+++
openwebbeans/trunk/webbeans-el22/src/main/java/org/apache/webbeans/el22/WrappedValueExpression.java
Sun Jun 18 11:32:41 2017
@@ -20,8 +20,6 @@ package org.apache.webbeans.el22;
import javax.el.ELContext;
import javax.el.ELException;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
import javax.el.ValueExpression;
import javax.el.ValueReference;
@@ -56,13 +54,13 @@ public class WrappedValueExpression exte
}
@Override
- public Class<?> getType(ELContext arg0) throws NullPointerException,
PropertyNotFoundException, ELException
+ public Class<?> getType(ELContext arg0) throws NullPointerException,
ELException
{
return valueExpression.getType(arg0);
}
@Override
- public Object getValue(ELContext context) throws NullPointerException,
PropertyNotFoundException, ELException
+ public Object getValue(ELContext context) throws NullPointerException,
ELException
{
Object value = null;
try
@@ -84,13 +82,13 @@ public class WrappedValueExpression exte
}
@Override
- public boolean isReadOnly(ELContext arg0) throws NullPointerException,
PropertyNotFoundException, ELException
+ public boolean isReadOnly(ELContext arg0) throws NullPointerException,
ELException
{
return valueExpression.isReadOnly(arg0);
}
@Override
- public void setValue(ELContext arg0, Object arg1) throws
NullPointerException, PropertyNotFoundException, PropertyNotWritableException,
ELException
+ public void setValue(ELContext arg0, Object arg1) throws
NullPointerException, ELException
{
valueExpression.setValue(arg0, arg1);
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java?rev=1799076&r1=1799075&r2=1799076&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
Sun Jun 18 11:32:41 2017
@@ -192,7 +192,7 @@ public class InjectionPointImpl implemen
{
Class<?> beanClass = ((AnnotatedMember)
annotated).getDeclaringType().getJavaClass();
out.writeObject(beanClass);
- out.writeObject(Character.valueOf('~'));
+ out.writeObject('~');
}
else
{
@@ -316,12 +316,12 @@ public class InjectionPointImpl implemen
{
for (Annotation qualifier : qualifiers)
{
- out.writeObject(Character.valueOf('-')); // throw-away delimiter
so alternating annotations don't get swallowed in the read.
+ out.writeObject('-'); // throw-away delimiter so alternating
annotations don't get swallowed in the read.
out.writeObject(qualifier);
}
// terminate character
- out.writeObject(Character.valueOf('~'));
+ out.writeObject('~');
}
private Set<Annotation> readQualifiers(ObjectInputStream in) throws
IOException, ClassNotFoundException
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java?rev=1799076&r1=1799075&r2=1799076&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
Sun Jun 18 11:32:41 2017
@@ -112,7 +112,7 @@ public class InterceptorDecoratorProxyFa
/**
* @return the internal instance which gets proxied.
*/
- public static <T> T unwrapInstance(T proxyInstance)
+ public <T> T unwrapInstance(T proxyInstance)
{
try
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java?rev=1799076&r1=1799075&r2=1799076&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
Sun Jun 18 11:32:41 2017
@@ -67,13 +67,13 @@ public final class ClassUtil
primitiveToWrappersMap.put(Void.TYPE,Void.class);
PRIMITIVE_TO_WRAPPERS_MAP =
Collections.unmodifiableMap(primitiveToWrappersMap);
Map<Class<?>, Object> defaultValuesMap = new HashMap<Class<?>,
Object>();
- defaultValuesMap.put(Integer.TYPE, Integer.valueOf(0));
- defaultValuesMap.put(Float.TYPE, Float.valueOf(0F));
- defaultValuesMap.put(Double.TYPE, Double.valueOf(0D));
- defaultValuesMap.put(Character.TYPE, Character.valueOf('\u0000'));
- defaultValuesMap.put(Long.TYPE, Long.valueOf(0L));
- defaultValuesMap.put(Byte.TYPE, Byte.valueOf((byte)0));
- defaultValuesMap.put(Short.TYPE, Short.valueOf((short)0));
+ defaultValuesMap.put(Integer.TYPE, 0);
+ defaultValuesMap.put(Float.TYPE, 0F);
+ defaultValuesMap.put(Double.TYPE, 0D);
+ defaultValuesMap.put(Character.TYPE, '\u0000');
+ defaultValuesMap.put(Long.TYPE, 0L);
+ defaultValuesMap.put(Byte.TYPE, (byte) 0);
+ defaultValuesMap.put(Short.TYPE, (short) 0);
defaultValuesMap.put(Boolean.TYPE, Boolean.FALSE);
DEFAULT_VALUES_MAP = Collections.unmodifiableMap(defaultValuesMap);
}
Modified:
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java?rev=1799076&r1=1799075&r2=1799076&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
(original)
+++
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
Sun Jun 18 11:32:41 2017
@@ -67,10 +67,10 @@ public class ConversationAwareViewHandle
{
if (owbApplication == null)
{
- owbApplication =
Boolean.valueOf(WebBeansContext.getInstance().getBeanManagerImpl().isInUse());
+ owbApplication =
WebBeansContext.getInstance().getBeanManagerImpl().isInUse();
}
- return owbApplication.booleanValue();
+ return owbApplication;
}
/**
Modified:
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/OwbTckElResolver.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/OwbTckElResolver.java?rev=1799076&r1=1799075&r2=1799076&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/OwbTckElResolver.java
(original)
+++
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/OwbTckElResolver.java
Sun Jun 18 11:32:41 2017
@@ -22,7 +22,6 @@ import java.util.Set;
import javax.el.ELContext;
import javax.el.ELException;
-import javax.el.PropertyNotFoundException;
import javax.enterprise.context.Dependent;
import javax.enterprise.inject.spi.Bean;
@@ -46,7 +45,7 @@ public class OwbTckElResolver extends We
*/
@Override
@SuppressWarnings("unchecked")
- public Object getValue(ELContext context, Object obj, Object property)
throws NullPointerException, PropertyNotFoundException, ELException
+ public Object getValue(ELContext context, Object obj, Object property)
throws NullPointerException, ELException
{
//Bean instance
Object contextualInstance = null;
