This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 611050b6692de7b4bf259ea4503fcf1f66f36a9b
Author: Daniel Kulp <d...@kulp.com>
AuthorDate: Wed Feb 15 15:25:45 2023 +0100
Minor cleanup of some warnings
(cherry picked from commit 692ba1273df1a64723aa1817631191afbe5ca184)
---
.../org/apache/cxf/common/util/SortedArraySet.java | 3 ++-
.../java/org/apache/cxf/message/MessageUtilsTest.java | 6 +++---
.../org/apache/cxf/aegis/type/xml/SourceType.java | 18 ++++++------------
.../org/apache/cxf/jaxb/JAXBContextInitializer.java | 1 -
.../cxf/ext/logging/MaskSensitiveHelperTest.java | 2 +-
.../interceptors/AbstractMetricsInterceptor.java | 3 +--
.../interceptors/WebFaultOutInterceptorTestCase.java | 19 +++++++++----------
.../java/org/apache/cxf/wsdl/JAXBExtensionHelper.java | 3 +--
.../provider/AbstractSourcePayloadProvider.java | 7 +++++--
9 files changed, 28 insertions(+), 34 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
b/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
index 9891fa9908..a25b1646a1 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
@@ -231,7 +231,8 @@ public final class SortedArraySet<T> implements
SortedSet<T> {
@Override
public void remove() {
if (idx > 0) {
- SortedArraySet.this.remove(data[idx - 1]);
+ Object o = data[idx - 1];
+ SortedArraySet.this.remove(o);
}
}
}
diff --git a/core/src/test/java/org/apache/cxf/message/MessageUtilsTest.java
b/core/src/test/java/org/apache/cxf/message/MessageUtilsTest.java
index 243d52b821..84456a2524 100644
--- a/core/src/test/java/org/apache/cxf/message/MessageUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/message/MessageUtilsTest.java
@@ -36,10 +36,10 @@ import org.apache.cxf.service.model.OperationInfo;
import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
public class MessageUtilsTest {
@@ -102,7 +102,7 @@ public class MessageUtilsTest {
Message message = new MessageImpl();
String key = "key1";
message.put(key, "aaaa, bbb , cc, d");
- Set contextualStrings = MessageUtils.getContextualStrings(message,
key, Collections.EMPTY_SET);
+ Set<String> contextualStrings =
MessageUtils.getContextualStrings(message, key, Collections.emptySet());
assertEquals(4, contextualStrings.size());
assertTrue(contextualStrings.remove("aaaa"));
assertTrue(contextualStrings.remove("bbb"));
@@ -114,7 +114,7 @@ public class MessageUtilsTest {
defaults.add("aaa");
defaults.add("zzz");
defaults.add("eee");
- Set contextualStringsDefault =
MessageUtils.getContextualStrings(message, "unknownKey", defaults);
+ Set<String> contextualStringsDefault =
MessageUtils.getContextualStrings(message, "unknownKey", defaults);
assertEquals(defaults, contextualStringsDefault);
}
}
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
index e6c216e839..81e9827412 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
@@ -18,6 +18,8 @@
*/
package org.apache.cxf.aegis.type.xml;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
@@ -29,7 +31,6 @@ import org.w3c.dom.Element;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
import org.apache.cxf.aegis.Context;
import org.apache.cxf.aegis.DatabindingException;
@@ -100,17 +101,10 @@ public class SourceType extends AegisType {
}
}
- protected XMLReader createXMLReader() throws SAXException {
- // In JDK 1.4, the xml reader factory does not look for META-INF
- // services
- // If the org.xml.sax.driver system property is not defined, and
- // exception will be thrown.
- // In these cases, default to xerces parser
- try {
- return XMLReaderFactory.createXMLReader();
- } catch (Exception e) {
- return
XMLReaderFactory.createXMLReader("org.apache.xerces.parsers.SAXParser");
- }
+ protected XMLReader createXMLReader() throws SAXException,
ParserConfigurationException {
+ SAXParserFactory spf = SAXParserFactory.newInstance();
+ spf.setNamespaceAware(true);
+ return spf.newSAXParser().getXMLReader();
}
}
diff --git
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
index 0dd420ba55..d29ad92da9 100644
---
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
+++
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
@@ -552,7 +552,6 @@ class JAXBContextInitializer extends ServiceModelVisitor {
return null;
}
- @SuppressWarnings("unused")
private Object createFactory(Class<?> cls) {
FactoryClassCreator creator =
bus.getExtension(FactoryClassCreator.class);
diff --git
a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java
b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java
index 514fcfa63a..46450d9797 100644
---
a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java
+++
b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java
@@ -82,7 +82,7 @@ public class MaskSensitiveHelperTest {
}
@Parameterized.Parameters
- public static Collection primeNumbers() {
+ public static Collection<Object[]> primeNumbers() {
return Arrays.asList(new Object[][] {
{SENSITIVE_LOGGING_CONTENT_XML, MASKED_LOGGING_CONTENT_XML,
APPLICATION_XML},
{SENSITIVE_LOGGING_CONTENT_XML_WITH_ATTRIBUTE,
MASKED_LOGGING_CONTENT_XML_WITH_ATTRIBUTE, APPLICATION_XML},
diff --git
a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/AbstractMetricsInterceptor.java
b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/AbstractMetricsInterceptor.java
index 3a7a41e34c..b5e7000f3b 100644
---
a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/AbstractMetricsInterceptor.java
+++
b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/AbstractMetricsInterceptor.java
@@ -131,8 +131,7 @@ public abstract class AbstractMetricsInterceptor extends
AbstractPhaseIntercepto
//likely a REST service, let's see if we have a resource name
Object nameProperty =
m.getExchange().get("org.apache.cxf.resource.operation.name");
if (nameProperty != null) {
- Map<String, Object> restMap =
getRestMetricsMap(m.getExchange().getEndpoint());
- metrics = restMap.get(nameProperty.toString());
+ metrics =
getRestMetricsMap(m.getExchange().getEndpoint()).get(nameProperty.toString());
if (metrics == null) {
metrics = createMetricsContextForRestResource(m,
nameProperty.toString());
}
diff --git
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
index e998be4b22..fd138b3be8 100644
---
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
+++
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptorTestCase.java
@@ -131,7 +131,6 @@ public class WebFaultOutInterceptorTestCase {
return message;
}
- @SuppressWarnings("rawtypes") // old SAAJ API doesn't have generics
private final class SOAPFaultStub implements SOAPFault {
@Override
@@ -225,12 +224,12 @@ public class WebFaultOutInterceptorTestCase {
}
@Override
- public Iterator getFaultReasonLocales() throws SOAPException {
+ public Iterator<Locale> getFaultReasonLocales() throws SOAPException {
return Collections.emptyIterator();
}
@Override
- public Iterator getFaultReasonTexts() throws SOAPException {
+ public Iterator<String> getFaultReasonTexts() throws SOAPException {
return null;
}
@@ -330,12 +329,12 @@ public class WebFaultOutInterceptorTestCase {
}
@Override
- public Iterator getAllAttributes() {
+ public Iterator<Name> getAllAttributes() {
return null;
}
@Override
- public Iterator getAllAttributesAsQNames() {
+ public Iterator<QName> getAllAttributesAsQNames() {
return null;
}
@@ -345,12 +344,12 @@ public class WebFaultOutInterceptorTestCase {
}
@Override
- public Iterator getNamespacePrefixes() {
+ public Iterator<String> getNamespacePrefixes() {
return null;
}
@Override
- public Iterator getVisibleNamespacePrefixes() {
+ public Iterator<String> getVisibleNamespacePrefixes() {
return null;
}
@@ -390,17 +389,17 @@ public class WebFaultOutInterceptorTestCase {
}
@Override
- public Iterator getChildElements() {
+ public Iterator<javax.xml.soap.Node> getChildElements() {
return null;
}
@Override
- public Iterator getChildElements(Name name) {
+ public Iterator<javax.xml.soap.Node> getChildElements(Name name) {
return null;
}
@Override
- public Iterator getChildElements(QName qName) {
+ public Iterator<javax.xml.soap.Node> getChildElements(QName qName) {
return null;
}
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
index 165d153c1f..ac4f4cf299 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
@@ -401,8 +401,7 @@ public class JAXBExtensionHelper implements
ExtensionSerializer, ExtensionDeseri
return ctx.getPrefix(namespaceURI);
}
- @SuppressWarnings("rawtypes")
- public Iterator getPrefixes(String namespaceURI) {
+ public Iterator<String> getPrefixes(String namespaceURI) {
if (jaxbNamespace.equals(namespaceURI)) {
return ctx.getPrefixes(namespace);
}
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
index c56f44755a..626579f924 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
+++
b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/AbstractSourcePayloadProvider.java
@@ -25,6 +25,7 @@ import java.io.Writer;
import javax.annotation.Resource;
import javax.jws.HandlerChain;
import javax.xml.namespace.QName;
+import javax.xml.parsers.SAXParserFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Source;
@@ -42,7 +43,6 @@ import javax.xml.ws.handler.MessageContext;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
import org.apache.cxf.staxutils.StaxSource;
import org.apache.cxf.staxutils.StaxUtils;
@@ -99,7 +99,10 @@ public abstract class AbstractSourcePayloadProvider
implements SourceProvider {
return new DOMSource(StaxUtils.read(greetMeInputStream));
} else if (StaxSource.class.equals(class1)) {
if (doneStax) {
- XMLReader reader = XMLReaderFactory.createXMLReader();
+ SAXParserFactory spf = SAXParserFactory.newInstance();
+ spf.setNamespaceAware(true);
+ XMLReader reader = spf.newSAXParser().getXMLReader();
+
return new SAXSource(reader, new
InputSource(greetMeInputStream));
}
doneStax = true;
