Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumped up compile warnings

Browse Source 
Bumped up the compiler warning to errors.
This commit is contained in:
Arjen Poutsma
2014-04-24 14:13:23 +02:00
parent ded1efd456
commit 12a10a34f1
125 changed files with 444 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-xml/src/main/java/org/springframework/xml/XmlException.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006 the original author or authors.
* Copyright 2005-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import org.springframework.core.NestedRuntimeException;
* @author Arjen Poutsma
* @since 1.0.0
*/
@SuppressWarnings("serial")
public abstract class XmlException extends NestedRuntimeException {
/**

4
spring-xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2005-2010 the original author or authors.
* Copyright 2005-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ public class QNameEditor extends PropertyEditorSupport {
}
else {
QName qName = (QName) value;
String prefix = QNameUtils.getPrefix(qName);
String prefix = qName.getPrefix();
if (StringUtils.hasLength(qName.getNamespaceURI()) && StringUtils.hasLength(prefix)) {
return "{" + qName.getNamespaceURI() + "}" + prefix + ":" + qName.getLocalPart();
}

46
spring-xml/src/main/java/org/springframework/xml/namespace/QNameUtils.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2005-2010 the original author or authors.
* Copyright 2005-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,11 +18,11 @@ package org.springframework.xml.namespace;
import javax.xml.namespace.QName;
import org.w3c.dom.Node;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.w3c.dom.Node;
/**
* Helper class for using {@link QName}.
*
@@ -32,20 +32,7 @@ import org.w3c.dom.Node;
*/
public abstract class QNameUtils {
/** Indicates whether {@link QName} has a prefix. The first release of the class did not have this. */
private static boolean qNameHasPrefix;
static {
try {
QName.class.getDeclaredConstructor(new Class[]{String.class, String.class, String.class});
qNameHasPrefix = true;
}
catch (NoSuchMethodException e) {
qNameHasPrefix = false;
}
}
/**
/**
* Creates a new {@code QName} with the given parameters. Sets the prefix if possible, i.e. if the
* {@code QName(String, String, String)} constructor can be found. If this constructor is not available (as is
* the case on older implementations of JAX-RPC), the prefix is ignored.
@@ -55,14 +42,11 @@ public abstract class QNameUtils {
* @param prefix prefix of the {@code QName}. May be ignored.
* @return the created {@code QName}
* @see QName#QName(String,String,String)
* @deprecated in favor of {@link QName#QName(String, String, String)}
*/
@Deprecated
public static QName createQName(String namespaceUri, String localPart, String prefix) {
if (qNameHasPrefix) {
return new QName(namespaceUri, localPart, prefix);
}
else {
return new QName(namespaceUri, localPart);
}
return new QName(namespaceUri, localPart, prefix);
}
/**
@@ -73,9 +57,11 @@ public abstract class QNameUtils {
* @param qName the {@code QName} to return the prefix from
* @return the prefix, if available, or an empty string
* @see javax.xml.namespace.QName#getPrefix()
* @deprecated in favor of {@link QName#getPrefix()}
*/
@Deprecated
public static String getPrefix(QName qName) {
return qNameHasPrefix ? qName.getPrefix() : "";
return qName.getPrefix();
}
/**
@@ -106,7 +92,8 @@ public abstract class QNameUtils {
*/
public static QName getQNameForNode(Node node) {
if (node.getNamespaceURI() != null && node.getPrefix() != null && node.getLocalName() != null) {
return createQName(node.getNamespaceURI(), node.getLocalName(), node.getPrefix());
return new QName(node.getNamespaceURI(), node.getLocalName(),
node.getPrefix());
}
else if (node.getNamespaceURI() != null && node.getLocalName() != null) {
return new QName(node.getNamespaceURI(), node.getLocalName());
@@ -128,7 +115,7 @@ public abstract class QNameUtils {
* @return the qualified name
*/
public static String toQualifiedName(QName qName) {
String prefix = getPrefix(qName);
String prefix = qName.getPrefix();
if (!StringUtils.hasLength(prefix)) {
return qName.getLocalPart();
}
@@ -151,7 +138,8 @@ public abstract class QNameUtils {
return new QName(namespaceUri, qualifiedName);
}
else {
return createQName(namespaceUri, qualifiedName.substring(idx + 1), qualifiedName.substring(0, idx));
return new QName(namespaceUri, qualifiedName.substring(idx + 1),
qualifiedName.substring(0, idx));
}
}
@@ -181,8 +169,8 @@ public abstract class QNameUtils {
return new QName(namespaceURI, qNameString.substring(endOfNamespaceURI + 1));
}
else {
return createQName(namespaceURI, qNameString.substring(prefixSeperator + 1),
qNameString.substring(endOfNamespaceURI + 1, prefixSeperator));
return new QName(namespaceURI, qNameString.substring(prefixSeperator + 1),
qNameString.substring(endOfNamespaceURI + 1, prefixSeperator));
}
}

3
spring-xml/src/main/java/org/springframework/xml/validation/XmlValidationException.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006 the original author or authors.
* Copyright 2005-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import org.springframework.xml.XmlException;
* @author Arjen Poutsma
* @since 1.0.0
*/
@SuppressWarnings("serial")
public class XmlValidationException extends XmlException {
public XmlValidationException(String s) {

3
spring-xml/src/main/java/org/springframework/xml/xpath/XPathException.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006 the original author or authors.
* Copyright 2005-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import org.springframework.xml.XmlException;
* @author Arjen Poutsma
* @since 1.0.0
*/
@SuppressWarnings("serial")
public class XPathException extends XmlException {
/**

3
spring-xml/src/main/java/org/springframework/xml/xpath/XPathParseException.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006 the original author or authors.
* Copyright 2005-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ package org.springframework.xml.xpath;
* @author Arjen Poutsma
* @since 1.0.0
*/
@SuppressWarnings("serial")
public class XPathParseException extends XPathException {
/**

5
spring-xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java
View File

@@ -31,7 +31,6 @@ import org.xml.sax.SAXException;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.Resource;
import org.springframework.util.Assert;
import org.springframework.xml.namespace.QNameUtils;
import org.springframework.xml.sax.SaxUtils;
import org.springframework.xml.validation.XmlValidator;
import org.springframework.xml.validation.XmlValidatorFactory;
@@ -52,9 +51,9 @@ public class SimpleXsdSchema implements XsdSchema, InitializingBean {
private static final String SCHEMA_NAMESPACE = "http://www.w3.org/2001/XMLSchema";
private static final QName SCHEMA_NAME = QNameUtils.createQName(SCHEMA_NAMESPACE, "schema", "xsd");
private static final QName SCHEMA_NAME = new QName(SCHEMA_NAMESPACE, "schema", "xsd");
private Resource xsdResource;
private Resource xsdResource;
private Element schemaElement;

3
spring-xml/src/main/java/org/springframework/xml/xsd/XsdSchemaException.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008 the original author or authors.
* Copyright 2005-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import org.springframework.xml.XmlException;
* @author Arjen Poutsma
* @since 1.5.0
*/
@SuppressWarnings("serial")
public class XsdSchemaException extends XmlException {
public XsdSchemaException(String message) {

3
spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaException.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008 the original author or authors.
* Copyright 2005-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import org.springframework.xml.xsd.XsdSchemaException;
* @author Arjen Poutsma
* @since 1.5.0
*/
@SuppressWarnings("serial")
public class CommonsXsdSchemaException extends XsdSchemaException {
public CommonsXsdSchemaException(String message) {