Author: dkulp
Date: Tue Jan 10 16:46:21 2012
New Revision: 1229631
URL: http://svn.apache.org/viewvc?rev=1229631&view=rev
Log:
Cleanup some use of generics. Neethi is warning free in eclipse with
the eclipse default warning levels.
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AbstractPolicyOperator.java
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AssertionBuilderFactoryImpl.java
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/ExactlyOne.java
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/Policy.java
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyBuilder.java
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyEngine.java
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/PolicyContainingPrimitiveAssertion.java
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/AbstractOMConverter.java
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/ConverterRegistry.java
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/xml/XmlPrimitiveAssertion.java
webservices/commons/trunk/modules/neethi/src/test/java/org/apache/neethi/BasicTestCases.java
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AbstractPolicyOperator.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AbstractPolicyOperator.java?rev=1229631&r1=1229630&r2=1229631&view=diff
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AbstractPolicyOperator.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AbstractPolicyOperator.java
Tue Jan 10 16:46:21 2012
@@ -215,11 +215,11 @@ public abstract class AbstractPolicyOper
All currentAll1;
All currentAll2;
- for (Iterator iter1 = exactlyOne1.getPolicyComponents().iterator();
iter1.hasNext();) {
- currentAll1 = (All) iter1.next();
+ for (PolicyComponent pc : exactlyOne1.getPolicyComponents()) {
+ currentAll1 = (All)pc;
- for (Iterator iter2 =
exactlyOne2.getPolicyComponents().iterator(); iter2.hasNext();) {
- currentAll2 = (All) iter2.next();
+ for (PolicyComponent pc2 : exactlyOne2.getPolicyComponents()) {
+ currentAll2 = (All)pc2;
crossProductAll = new All();
crossProductAll.addPolicyComponents(currentAll1.getPolicyComponents());
crossProductAll.addPolicyComponents(currentAll2.getPolicyComponents());
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AssertionBuilderFactoryImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AssertionBuilderFactoryImpl.java?rev=1229631&r1=1229630&r2=1229631&view=diff
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AssertionBuilderFactoryImpl.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/AssertionBuilderFactoryImpl.java
Tue Jan 10 16:46:21 2012
@@ -41,14 +41,14 @@ public class AssertionBuilderFactoryImpl
private Map<QName, AssertionBuilder<?>> registeredBuilders
= new ConcurrentHashMap<QName, AssertionBuilder<?>>();
- protected AssertionBuilder defaultBuilder;
+ protected AssertionBuilder<?> defaultBuilder;
protected ConverterRegistry converters = new ConverterRegistry();
protected PolicyBuilder engine;
public AssertionBuilderFactoryImpl(PolicyBuilder eng) {
engine = eng;
- for (AssertionBuilder builder :
Service.providers(AssertionBuilder.class)) {
+ for (AssertionBuilder<?> builder :
Service.providers(AssertionBuilder.class)) {
QName[] knownElements = builder.getKnownElements();
for (int i = 0; i < knownElements.length; i++) {
registeredBuilders.put(knownElements[i], builder);
@@ -100,7 +100,7 @@ public class AssertionBuilderFactoryImpl
*/
public Assertion build(Object element) {
loadDynamic();
- AssertionBuilder builder;
+ AssertionBuilder<?> builder;
QName qname = converters.findQName(element);
builder = registeredBuilders.get(qname);
@@ -117,24 +117,26 @@ public class AssertionBuilderFactoryImpl
* @param qname
* @return a AssertionBuilder to use for the element.
*/
- protected AssertionBuilder handleNoRegisteredBuilder(QName qname) {
+ protected AssertionBuilder<?> handleNoRegisteredBuilder(QName qname) {
// if we can't locate an appropriate AssertionBuilder, we always use
the
// XMLPrimitiveAssertionBuilder
return defaultBuilder;
}
- @SuppressWarnings("unchecked")
- private Assertion invokeBuilder(Object element, AssertionBuilder builder) {
+ private Assertion invokeBuilder(Object element, AssertionBuilder<?>
builder) {
Class<?> type = findAssertionBuilderTarget(builder.getClass());
- return builder.build(converters.convert(element, type), this);
+ Object o = converters.convert(element, type);
+ @SuppressWarnings("unchecked")
+ AssertionBuilder<Object> b = (AssertionBuilder<Object>)builder;
+ return b.build(o, this);
}
private Class<?> findAssertionBuilderTarget(Class<?> c) {
- Class interfaces[] = c.getInterfaces();
+ Class<?> interfaces[] = c.getInterfaces();
for (int x = 0; x < interfaces.length; x++) {
if (interfaces[x] == AssertionBuilder.class) {
ParameterizedType pt =
(ParameterizedType)c.getGenericInterfaces()[x];
- return (Class)pt.getActualTypeArguments()[0];
+ return (Class<?>)pt.getActualTypeArguments()[0];
}
}
if (c.getClass().getSuperclass() != null) {
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/ExactlyOne.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/ExactlyOne.java?rev=1229631&r1=1229630&r2=1229631&view=diff
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/ExactlyOne.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/ExactlyOne.java
Tue Jan 10 16:46:21 2012
@@ -19,8 +19,6 @@
package org.apache.neethi;
-import java.util.Iterator;
-
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
@@ -52,11 +50,7 @@ public class ExactlyOne extends Abstract
Constants.ELEM_EXACTLYONE);
}
- PolicyComponent policyComponent;
-
- for (Iterator iterator = getPolicyComponents().iterator(); iterator
- .hasNext();) {
- policyComponent = (PolicyComponent) iterator.next();
+ for (PolicyComponent policyComponent : getPolicyComponents()) {
policyComponent.serialize(writer);
}
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/Policy.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/Policy.java?rev=1229631&r1=1229630&r2=1229631&view=diff
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/Policy.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/Policy.java
Tue Jan 10 16:46:21 2012
@@ -195,19 +195,12 @@ public class Policy extends All {
writer.writeNamespace(wspPrefix, nspace);
}
- String prefiX;
- for (Iterator iterator = prefix2ns.keySet().iterator(); iterator
- .hasNext();) {
- prefiX = (String) iterator.next();
- writer.writeNamespace(prefiX, (String) prefix2ns.get(prefiX));
+ for (String pfx :prefix2ns.keySet()) {
+ writer.writeNamespace(pfx, prefix2ns.get(pfx));
}
- PolicyComponent policyComponent;
-
- for (Iterator iterator = getPolicyComponents().iterator(); iterator
- .hasNext();) {
- policyComponent = (PolicyComponent) iterator.next();
+ for (PolicyComponent policyComponent : getPolicyComponents()) {
policyComponent.serialize(writer);
}
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyBuilder.java?rev=1229631&r1=1229630&r2=1229631&view=diff
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyBuilder.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyBuilder.java
Tue Jan 10 16:46:21 2012
@@ -29,7 +29,6 @@ import javax.xml.stream.XMLStreamReader;
import org.w3c.dom.Element;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.neethi.builders.converters.ConverterRegistry;
/**
* PolicyBuilder provides set of methods to create a Policy object from an
@@ -64,7 +63,7 @@ public class PolicyBuilder {
* the AssertionBuilder that can build assertions that of
'qname'
* type
*/
- public void registerBuilder(QName qname, AssertionBuilder builder) {
+ public void registerBuilder(QName qname, AssertionBuilder<?> builder) {
factory.registerBuilder(qname, builder);
}
@@ -198,7 +197,7 @@ public class PolicyBuilder {
}
}
- for (Iterator iterator =
factory.getConverterRegistry().getChildElements(operationElement);
+ for (Iterator<?> iterator =
factory.getConverterRegistry().getChildElements(operationElement);
iterator.hasNext();) {
Object childElement = iterator.next();
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyEngine.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyEngine.java?rev=1229631&r1=1229630&r2=1229631&view=diff
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyEngine.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/PolicyEngine.java
Tue Jan 10 16:46:21 2012
@@ -22,9 +22,7 @@ package org.apache.neethi;
import org.apache.axiom.om.OMElement;
import org.apache.neethi.builders.AssertionBuilder;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
import java.io.InputStream;
-import java.util.Iterator;
/**
* PolicyEngine provides set of static methods to create a Policy object from
an
@@ -65,7 +63,7 @@ public class PolicyEngine {
* the AssertionBuilder that can build assertions that of
'qname'
* type
*/
- public static void registerBuilder(QName qname, AssertionBuilder builder) {
+ public static void registerBuilder(QName qname, AssertionBuilder<?>
builder) {
getBuilder().getAssertionBuilderFactory().registerBuilder(qname,
builder);
}
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/PolicyContainingPrimitiveAssertion.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/PolicyContainingPrimitiveAssertion.java?rev=1229631&r1=1229630&r2=1229631&view=diff
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/PolicyContainingPrimitiveAssertion.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/PolicyContainingPrimitiveAssertion.java
Tue Jan 10 16:46:21 2012
@@ -30,7 +30,6 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.neethi.All;
import org.apache.neethi.Assertion;
-import org.apache.neethi.Constants;
import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/AbstractOMConverter.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/AbstractOMConverter.java?rev=1229631&r1=1229630&r2=1229631&view=diff
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/AbstractOMConverter.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/AbstractOMConverter.java
Tue Jan 10 16:46:21 2012
@@ -41,7 +41,7 @@ public abstract class AbstractOMConverte
}
public Map<QName, String> getAttributes(OMElement s) {
Map<QName, String> mp = new HashMap<QName, String>();
- Iterator it = s.getAllAttributes();
+ Iterator<?> it = s.getAllAttributes();
while (it.hasNext()) {
OMAttribute attr = (OMAttribute)it.next();
if (attr.getNamespace() == null) {
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/ConverterRegistry.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/ConverterRegistry.java?rev=1229631&r1=1229630&r2=1229631&view=diff
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/ConverterRegistry.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/ConverterRegistry.java
Tue Jan 10 16:46:21 2012
@@ -39,7 +39,7 @@ public class ConverterRegistry {
private static class ConverterKey {
Class<?> src;
Class<?> target;
- Converter converter;
+ Converter<?, ?> converter;
}
private List<ConverterKey> registeredConverters = new
CopyOnWriteArrayList<ConverterKey>();
@@ -64,7 +64,7 @@ public class ConverterRegistry {
private void registerConverter(String name) {
try {
- Converter c = (Converter)Class.forName(name, true,
+ Converter<?, ?> c = (Converter<?, ?>)Class.forName(name, true,
Converter.class.getClassLoader()).newInstance();
registerConverter(c);
} catch (Throwable e) {
@@ -75,13 +75,13 @@ public class ConverterRegistry {
}
private static ConverterKey createConverterKey(Converter<?, ?> converter,
Class<?> c) {
- Class interfaces[] = c.getInterfaces();
+ Class<?> interfaces[] = c.getInterfaces();
for (int x = 0; x < interfaces.length; x++) {
if (interfaces[x] == Converter.class) {
ParameterizedType pt =
(ParameterizedType)c.getGenericInterfaces()[x];
ConverterKey key = new ConverterKey();
- key.src = (Class)pt.getActualTypeArguments()[0];
- key.target = (Class)pt.getActualTypeArguments()[1];
+ key.src = (Class<?>)pt.getActualTypeArguments()[0];
+ key.target = (Class<?>)pt.getActualTypeArguments()[1];
key.converter = converter;
return key;
}
@@ -135,11 +135,12 @@ public class ConverterRegistry {
}
}
- @SuppressWarnings("unchecked")
- public Object convert(Object src, Class<?> target) {
+ public <S, T> T convert(S src, Class<T> target) {
for (ConverterKey ent : registeredConverters) {
if (ent.src.isInstance(src) &&
ent.target.isAssignableFrom(target)) {
- return ent.converter.convert(src);
+ @SuppressWarnings("unchecked")
+ Converter<S, T> cv = (Converter<S, T>)ent.converter;
+ return cv.convert(src);
}
}
throw new RuntimeException("Could not find a converter to convert from
"
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/xml/XmlPrimitiveAssertion.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/xml/XmlPrimitiveAssertion.java?rev=1229631&r1=1229630&r2=1229631&view=diff
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/xml/XmlPrimitiveAssertion.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/xml/XmlPrimitiveAssertion.java
Tue Jan 10 16:46:21 2012
@@ -175,7 +175,7 @@ public class XmlPrimitiveAssertion exten
QName n = se.getName();
writer.writeStartElement(n.getPrefix(), n.getLocalPart(),
n.getNamespaceURI());
- Iterator it = se.getNamespaces();
+ Iterator<?> it = se.getNamespaces();
while (it.hasNext()) {
Namespace ns = (Namespace) it.next();
writer.writeNamespace(ns.getPrefix(),
ns.getNamespaceURI());
Modified:
webservices/commons/trunk/modules/neethi/src/test/java/org/apache/neethi/BasicTestCases.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/test/java/org/apache/neethi/BasicTestCases.java?rev=1229631&r1=1229630&r2=1229631&view=diff
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/test/java/org/apache/neethi/BasicTestCases.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/test/java/org/apache/neethi/BasicTestCases.java
Tue Jan 10 16:46:21 2012
@@ -22,8 +22,6 @@ package org.apache.neethi;
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
-import java.util.Iterator;
-import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
@@ -41,7 +39,6 @@ import org.xml.sax.SAXException;
import org.apache.neethi.builders.PrimitiveAssertion;
import org.apache.neethi.builders.xml.XMLPrimitiveAssertionBuilder;
-import org.junit.Assert;
import org.junit.Test;
/**
