Sonarqube Fixes
https://github.com/eclipse-ee4j/jaxb-ri/issues/1603
xsom/src/main/java/com/sun/xml/xsom/XSSchema.java
Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck]
jxc/src/main/java/com/sun/tools/jxc/ConfigReader.java
Replace the type specification in this constructor call with the diamond operator ("<>"). [squid:S2293]
runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Lister.java
Replace the type specification in this constructor call with the diamond operator ("<>"). [squid:S2293]
xsom/src/main/java/com/sun/xml/xsom/impl/scd/SimpleCharStream.java
Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck]
core/src/main/java/org/glassfish/jaxb/core/marshaller/Messages.java
Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck]
xsom/src/main/java/com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java
Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck]
core/src/main/java/org/glassfish/jaxb/core/unmarshaller/DOMScanner.java
Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck]
codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationArrayMember.java
Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck]
runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Coordinator.java
Replace the type specification in this constructor call with the diamond operator ("<>"). [squid:S2293]
Signed-off-by: Sanddust <sanddust@j2eeguys.com>
Also-by: Stephen Davidson <steve@j2eeguys.com>
diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationArrayMember.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationArrayMember.java
index 25f8443..7d810f6 100644
--- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationArrayMember.java
+++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationArrayMember.java
@@ -266,7 +266,7 @@
* @deprecated
* use {@link #annotate}
*/
- @Deprecated
+ @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
public JAnnotationArrayMember param (JAnnotationUse value ){
values.add(value);
return this;
diff --git a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/Messages.java b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/Messages.java
index 1b34f00..042031e 100644
--- a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/Messages.java
+++ b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/Messages.java
@@ -69,7 +69,7 @@
/**
* @deprecated use ERR_MISSING_OBJECT2
*/
- @Deprecated
+ @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
public static final String ERR_MISSING_OBJECT = // 0 args
"SAXMarshaller.MissingObject";
@@ -84,14 +84,14 @@
/**
* @deprecated only used from 1.0
*/
- @Deprecated
+ @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
public static final String ERR_DANGLING_IDREF = // 1 arg
"SAXMarshaller.DanglingIDREF";
/**
* @deprecated only used from 1.0
*/
- @Deprecated
+ @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
public static final String ERR_NOT_IDENTIFIABLE = // 0 args
"SAXMarshaller.NotIdentifiable";
diff --git a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/unmarshaller/DOMScanner.java b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/unmarshaller/DOMScanner.java
index 6490fa3..3b95860 100644
--- a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/unmarshaller/DOMScanner.java
+++ b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/unmarshaller/DOMScanner.java
@@ -121,7 +121,7 @@
* @deprecated in JAXB 2.0
* Use {@link #scan(Element)}
*/
- @Deprecated
+ @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
public void parse( Element e, ContentHandler handler ) throws SAXException {
// it might be better to set receiver at the constructor.
receiver = handler;
@@ -143,7 +143,7 @@
* @deprecated in JAXB 2.0
* Use {@link #scan(Element)}
*/
- @Deprecated
+ @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
public void parseWithContext( Element e, ContentHandler handler ) throws SAXException {
setContentHandler(handler);
scan(e);
diff --git a/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/ConfigReader.java b/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/ConfigReader.java
index 0898571..04defde 100644
--- a/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/ConfigReader.java
+++ b/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/ConfigReader.java
@@ -58,7 +58,7 @@
* The set of classes to be passed to XJC
*
*/
- private final Set<Reference> classesToBeIncluded = new HashSet<Reference>();
+ private final Set<Reference> classesToBeIncluded = new HashSet<>();
/**
@@ -229,7 +229,7 @@
* Namespace URI to the location of the schema.
* This captures what the user specifies.
*/
- private final Map<String,File> schemas = new HashMap<String,File>();
+ private final Map<String,File> schemas = new HashMap<>();
/**
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Coordinator.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Coordinator.java
index 872cc3a..19c8462 100644
--- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Coordinator.java
+++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Coordinator.java
@@ -78,7 +78,7 @@
}
// this much is necessary to avoid calling get and set twice when we push.
- private static final ThreadLocal<Coordinator> activeTable = new ThreadLocal<Coordinator>();
+ private static final ThreadLocal<Coordinator> activeTable = new ThreadLocal<>();
/**
* The {@link Coordinator} in charge before this {@link Coordinator}.
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Lister.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Lister.java
index 4745943..d6c5996 100644
--- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Lister.java
+++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Lister.java
@@ -212,7 +212,7 @@
/**
* Listers for the primitive type arrays, keyed by their primitive Class object.
*/
- /*package*/ static final Map<Class,Lister> primitiveArrayListers = new HashMap<Class,Lister>();
+ /*package*/ static final Map<Class,Lister> primitiveArrayListers = new HashMap<>();
static {
// register primitive array listers
diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSSchema.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSSchema.java
index 250eda6..f474557 100644
--- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSSchema.java
+++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSSchema.java
@@ -113,7 +113,7 @@
* this method from {@link XSSchema} and not from {@link XSComponent},
* there's something wrong with your code.
*/
- @Deprecated
+ @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
SchemaDocument getSourceDocument();
/**
diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SimpleCharStream.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SimpleCharStream.java
index e711848..60272e2 100644
--- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SimpleCharStream.java
+++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SimpleCharStream.java
@@ -212,7 +212,7 @@
* @deprecated
* @see #getEndColumn
*/
- @Deprecated
+ @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
public int getColumn() {
return bufcolumn[bufpos];
}
@@ -221,7 +221,7 @@
* @deprecated
* @see #getEndLine
*/
- @Deprecated
+ @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true)
public int getLine() {
return bufline[bufpos];
}
