From 2e000ce25a6767e33ee84728dd34bcdb19e48137 Mon Sep 17 00:00:00 2001 From: Sanddust Date: Sun, 13 Feb 2022 15:19:39 -0600 Subject: [PATCH 1/6] 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 Also-by: Stephen Davidson --- .../main/java/com/sun/codemodel/JAnnotationArrayMember.java | 2 +- .../java/org/glassfish/jaxb/core/marshaller/Messages.java | 6 +++--- .../org/glassfish/jaxb/core/unmarshaller/DOMScanner.java | 4 ++-- .../jxc/src/main/java/com/sun/tools/jxc/ConfigReader.java | 4 ++-- .../org/glassfish/jaxb/runtime/v2/runtime/Coordinator.java | 2 +- .../glassfish/jaxb/runtime/v2/runtime/reflect/Lister.java | 2 +- jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSSchema.java | 2 +- .../java/com/sun/xml/xsom/impl/scd/SimpleCharStream.java | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) 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 25f84436a..7d810f607 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 @@ public Collection annotations2() { * @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 1b34f0018..042031ee5 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 @@ static String format( String property, Object[] args ) { /** * @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 @@ static String format( String property, Object[] args ) { /** * @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 6490fa345..3b9586064 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 @@ public void scan( Element e) throws SAXException { * @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 @@ public void parse( Element e, ContentHandler handler ) throws SAXException { * @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 0898571da..04defded5 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 @@ public final class ConfigReader { * The set of classes to be passed to XJC * */ - private final Set classesToBeIncluded = new HashSet(); + private final Set classesToBeIncluded = new HashSet<>(); /** @@ -229,7 +229,7 @@ private static final class SchemaOutputResolverImpl extends SchemaOutputResolver * Namespace URI to the location of the schema. * This captures what the user specifies. */ - private final Map schemas = new HashMap(); + private final Map 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 872cc3af6..19c84624d 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 @@ public boolean containsAdapter(Class type) { } // this much is necessary to avoid calling get and set twice when we push. - private static final ThreadLocal activeTable = new ThreadLocal(); + private static final ThreadLocal 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 474594336..d6c599619 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 @@ public ItemT[] build() { /** * Listers for the primitive type arrays, keyed by their primitive Class object. */ - /*package*/ static final Map primitiveArrayListers = new HashMap(); + /*package*/ static final Map 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 250eda644..f4745575c 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 @@ public interface XSSchema extends XSComponent * 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 e7118487b..60272e23a 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 @@ public char readChar() throws java.io.IOException * @deprecated * @see #getEndColumn */ - @Deprecated + @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true) public int getColumn() { return bufcolumn[bufpos]; } @@ -221,7 +221,7 @@ public int getColumn() { * @deprecated * @see #getEndLine */ - @Deprecated + @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true) public int getLine() { return bufline[bufpos]; } From 2d8f114d268a8535129994f518496402a6745faf Mon Sep 17 00:00:00 2001 From: Steve Davidson Date: Sun, 13 Feb 2022 16:13:01 -0600 Subject: [PATCH 2/6] Sonarqube Fixes https://github.com/eclipse-ee4j/jaxb-ri/issues/1603 Updated copyrights in modified files. Signed-off-by: Stephen Davidson --- .../src/main/java/com/sun/codemodel/JAnnotationArrayMember.java | 2 +- .../main/java/org/glassfish/jaxb/core/marshaller/Messages.java | 2 +- .../java/org/glassfish/jaxb/core/unmarshaller/DOMScanner.java | 2 +- jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/ConfigReader.java | 2 +- .../java/org/glassfish/jaxb/runtime/v2/runtime/Coordinator.java | 2 +- .../org/glassfish/jaxb/runtime/v2/runtime/reflect/Lister.java | 2 +- jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSSchema.java | 2 +- .../com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java | 2 +- .../main/java/com/sun/xml/xsom/impl/scd/SimpleCharStream.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) 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 7d810f607..81a753bff 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at 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 042031ee5..5b9e9eca6 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at 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 3b9586064..6ea9f2dd7 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at 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 04defded5..64ab34abe 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at 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 19c84624d..e7af5af0c 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at 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 d6c599619..24bebd672 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at 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 f4745575c..eb74c1d03 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java index 8528f0605..ff0b83687 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at 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 60272e23a..c2fd50022 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at From 44dbf46adf61b197525b00faebc2371cf0062b82 Mon Sep 17 00:00:00 2001 From: Steve Davidson Date: Thu, 17 Feb 2022 10:44:06 -0600 Subject: [PATCH 3/6] Sonarqube Fixes #1603 https://github.com/eclipse-ee4j/jaxb-ri/issues/1603 Fixed version in @Deprecated annotations. Signed-off-by: Steve Davidson --- .../main/java/com/sun/codemodel/JAnnotationArrayMember.java | 2 +- .../java/org/glassfish/jaxb/core/marshaller/Messages.java | 6 +++--- .../org/glassfish/jaxb/core/unmarshaller/DOMScanner.java | 4 ++-- jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSSchema.java | 2 +- .../java/com/sun/xml/xsom/impl/scd/SimpleCharStream.java | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) 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 81a753bff..4f8e582ca 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 @@ public Collection annotations2() { * @deprecated * use {@link #annotate} */ - @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.3", 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 5b9e9eca6..679585f78 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 @@ static String format( String property, Object[] args ) { /** * @deprecated use ERR_MISSING_OBJECT2 */ - @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.0", forRemoval=true) public static final String ERR_MISSING_OBJECT = // 0 args "SAXMarshaller.MissingObject"; @@ -84,14 +84,14 @@ static String format( String property, Object[] args ) { /** * @deprecated only used from 1.0 */ - @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.0", forRemoval=true) public static final String ERR_DANGLING_IDREF = // 1 arg "SAXMarshaller.DanglingIDREF"; /** * @deprecated only used from 1.0 */ - @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.0", 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 6ea9f2dd7..d1b626d53 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 @@ public void scan( Element e) throws SAXException { * @deprecated in JAXB 2.0 * Use {@link #scan(Element)} */ - @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.0", 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 @@ public void parse( Element e, ContentHandler handler ) throws SAXException { * @deprecated in JAXB 2.0 * Use {@link #scan(Element)} */ - @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.0", forRemoval=true) public void parseWithContext( Element e, ContentHandler handler ) throws SAXException { setContentHandler(handler); scan(e); 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 eb74c1d03..8d528a48d 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 @@ public interface XSSchema extends XSComponent * this method from {@link XSSchema} and not from {@link XSComponent}, * there's something wrong with your code. */ - @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.3", 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 c2fd50022..af229e751 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 @@ public char readChar() throws java.io.IOException * @deprecated * @see #getEndColumn */ - @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.3", forRemoval=true) public int getColumn() { return bufcolumn[bufpos]; } @@ -221,7 +221,7 @@ public int getColumn() { * @deprecated * @see #getEndLine */ - @Deprecated(since="4.0.0-SNAPSHOT", forRemoval=true) + @Deprecated(since="2.3", forRemoval=true) public int getLine() { return bufline[bufpos]; } From 146888f42d043c15bef08a3c3a5c7083e7f0d1e3 Mon Sep 17 00:00:00 2001 From: Honor Systems Updater Jenkins Date: Mon, 20 Jun 2022 02:41:33 +0000 Subject: [PATCH 4/6] Honor Systems generated updates https://github.com/eclipse-ee4j/jaxb-ri/issues/1603 Automatic updates https://jenkins.updater.j2eeguys.com/ txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] codemodel/codemodel/src/main/java/com/sun/codemodel/JCodeModel.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/model/nav/NavigatorImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] codemodel/codemodel/src/main/java/com/sun/codemodel/JClassContainer.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/model/Model.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/api/SchemaCompiler.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xsom/src/main/java/com/sun/xml/xsom/XSDeclaration.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] codemodel/codemodel/src/main/java/com/sun/codemodel/JDefinedClass.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementInfoImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/model/CElementInfo.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/IncludedGrammar.java Remove this unused import 'com.sun.tools.rngom.parse.Parseable'. [java:S1128] xsom/src/main/java/com/sun/xml/xsom/impl/ElementDecl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/UCode_UCodeESC_CharStream.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/model/CClassInfo.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/model/CEnumLeafInfo.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/api/JAXBModel.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ClassInfoImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] core/src/main/java/org/glassfish/jaxb/core/annotation/XmlIsSet.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] codemodel/codemodel/src/main/java/com/sun/codemodel/JPrimitiveType.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] xsom/src/main/java/com/sun/xml/xsom/impl/ParticleImpl.java Remove this unused import 'com.sun.xml.xsom.ForeignAttributes'. [java:S1128] xjc/src/main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/LeafInfoImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ArrayInfoImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] codemodel/codemodel/src/main/java/com/sun/codemodel/JPackage.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/reader/gbind/Element.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/model/CPropertyInfo.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationUse.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/DatatypeConverterImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xjc/src/main/java/com/sun/tools/xjc/XJCBase.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java Remove this unused import 'java.io.UnsupportedEncodingException'. [java:S1128] codemodel/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java Remove this unused import 'java.net.MalformedURLException'. [java:S1128] Remove this unused import 'java.net.URL'. [java:S1128] xsom/src/main/java/com/sun/xml/xsom/impl/DeclarationImpl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/ContextFactory.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] xsom/src/main/java/com/sun/xml/xsom/XSElementDecl.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/JavaCharStream.java Add 'since' and/or 'forRemoval' arguments to the @Deprecated annotation. [squid:MissingDeprecatedCheck] Also-by: Stephen Davidson Signed-off-by: Honor Systems Updater Jenkins --- .../src/main/java/com/sun/codemodel/ac/ACTask.java | 2 -- .../src/main/java/com/sun/codemodel/JAnnotationUse.java | 2 +- .../src/main/java/com/sun/codemodel/JClassContainer.java | 2 +- .../src/main/java/com/sun/codemodel/JCodeModel.java | 2 +- .../src/main/java/com/sun/codemodel/JDefinedClass.java | 2 +- .../src/main/java/com/sun/codemodel/JPackage.java | 2 +- .../src/main/java/com/sun/codemodel/JPrimitiveType.java | 2 +- .../java/org/glassfish/jaxb/core/annotation/XmlIsSet.java | 4 ++-- .../org/glassfish/jaxb/core/marshaller/DataWriter.java | 4 ++-- .../org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java | 4 ++-- .../tools/rngdatatype/helpers/DatatypeLibraryLoader.java | 1 - .../com/sun/tools/rngom/ast/builder/IncludedGrammar.java | 3 +-- .../com/sun/tools/rngom/parse/compact/JavaCharStream.java | 6 +++--- .../rngom/parse/compact/UCode_UCodeESC_CharStream.java | 6 +++--- .../org/glassfish/jaxb/runtime/DatatypeConverterImpl.java | 2 +- .../org/glassfish/jaxb/runtime/v2/ContextFactory.java | 4 ++-- .../glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java | 4 ++-- .../jaxb/runtime/v2/model/impl/ArrayInfoImpl.java | 2 +- .../jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java | 6 +++--- .../jaxb/runtime/v2/model/impl/ClassInfoImpl.java | 2 +- .../jaxb/runtime/v2/model/impl/ElementInfoImpl.java | 4 ++-- .../jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java | 6 +++--- .../jaxb/runtime/v2/model/impl/LeafInfoImpl.java | 4 ++-- .../glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java | 2 +- .../runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java | 4 ++-- .../src/main/java/com/sun/xml/txw2/output/DataWriter.java | 4 ++-- .../java/com/sun/xml/txw2/output/IndentingXMLFilter.java | 4 ++-- .../com/sun/xml/txw2/output/IndentingXMLStreamWriter.java | 4 ++-- jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/XJCBase.java | 2 +- .../src/main/java/com/sun/tools/xjc/api/JAXBModel.java | 4 ++-- .../main/java/com/sun/tools/xjc/api/SchemaCompiler.java | 2 +- .../com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java | 4 ++-- .../java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java | 8 ++++---- .../src/main/java/com/sun/tools/xjc/model/CClassInfo.java | 2 +- .../main/java/com/sun/tools/xjc/model/CElementInfo.java | 2 +- .../main/java/com/sun/tools/xjc/model/CEnumLeafInfo.java | 4 ++-- .../main/java/com/sun/tools/xjc/model/CPropertyInfo.java | 2 +- .../xjc/src/main/java/com/sun/tools/xjc/model/Model.java | 4 ++-- .../java/com/sun/tools/xjc/model/nav/NavigatorImpl.java | 2 +- .../main/java/com/sun/tools/xjc/reader/gbind/Element.java | 2 +- .../src/main/java/com/sun/xml/xsom/XSDeclaration.java | 4 ++-- .../src/main/java/com/sun/xml/xsom/XSElementDecl.java | 4 ++-- .../main/java/com/sun/xml/xsom/impl/DeclarationImpl.java | 2 +- .../src/main/java/com/sun/xml/xsom/impl/ElementDecl.java | 2 +- .../src/main/java/com/sun/xml/xsom/impl/ParticleImpl.java | 1 - .../sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java | 4 ++-- 46 files changed, 72 insertions(+), 77 deletions(-) diff --git a/jaxb-ri/codemodel/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java b/jaxb-ri/codemodel/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java index 11d9577f5..38ce6de24 100644 --- a/jaxb-ri/codemodel/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java +++ b/jaxb-ri/codemodel/codemodel-annotation-compiler/src/main/java/com/sun/codemodel/ac/ACTask.java @@ -32,8 +32,6 @@ import java.io.IOException; import java.lang.annotation.Annotation; import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationUse.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationUse.java index 6aee994e7..6280b4fd8 100644 --- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationUse.java +++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JAnnotationUse.java @@ -373,7 +373,7 @@ public JAnnotationArrayMember paramArray(String name){ * @deprecated * use {@link JAnnotationArrayMember#annotate} */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public JAnnotationUse annotate(Class clazz) { return new JAnnotationUse(owner().ref(clazz)); } diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JClassContainer.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JClassContainer.java index f59f6395d..e887e687c 100644 --- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JClassContainer.java +++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JClassContainer.java @@ -80,7 +80,7 @@ public interface JClassContainer { * @deprecated * use {@link #_class(int, String, ClassType)} */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) JDefinedClass _class(int mods, String name, boolean isInterface) throws JClassAlreadyExistsException; diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JCodeModel.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JCodeModel.java index bbca727b0..c6fb6685e 100644 --- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JCodeModel.java +++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JCodeModel.java @@ -249,7 +249,7 @@ public JDefinedClass _getClass(String fullyQualifiedName) { * The naming convention doesn't match the rest of the CodeModel. * Use {@link #anonymousClass(JClass)} instead. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public JDefinedClass newAnonymousClass(JClass baseType) { return new JAnonymousClass(baseType); } diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JDefinedClass.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JDefinedClass.java index bed061827..0ff106114 100644 --- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JDefinedClass.java +++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JDefinedClass.java @@ -652,7 +652,7 @@ public JDefinedClass _class(int mods, String name) * * @deprecated */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public JDefinedClass _class(int mods, String name, boolean isInterface) throws JClassAlreadyExistsException { return _class(mods,name,isInterface?ClassType.INTERFACE:ClassType.CLASS); diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPackage.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPackage.java index ffcc6b4f9..a90d17f42 100644 --- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPackage.java +++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPackage.java @@ -143,7 +143,7 @@ public JDefinedClass _class(int mods, String name) throws JClassAlreadyExistsExc * * @deprecated */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public JDefinedClass _class( int mods, String name, boolean isInterface ) throws JClassAlreadyExistsException { return _class(mods,name, isInterface?ClassType.INTERFACE:ClassType.CLASS ); diff --git a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPrimitiveType.java b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPrimitiveType.java index 809790642..36db26b1e 100644 --- a/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPrimitiveType.java +++ b/jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/JPrimitiveType.java @@ -79,7 +79,7 @@ public JType unboxify() { * @deprecated * Use {@link #boxify()}. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public JClass getWrapperClass() { return boxify(); } diff --git a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/annotation/XmlIsSet.java b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/annotation/XmlIsSet.java index 4b1e2aca1..6aba2de0b 100644 --- a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/annotation/XmlIsSet.java +++ b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/annotation/XmlIsSet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -90,7 +90,7 @@ */ @Retention(RUNTIME) @Target({FIELD,METHOD}) -@Deprecated +@Deprecated(since="4.0.0", forRemoval=true) public @interface XmlIsSet { /** * Specifies the name of the property to attach to. diff --git a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java index 65d6ea222..0e47e8cf0 100644 --- a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java +++ b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java @@ -131,7 +131,7 @@ public DataWriter (Writer writer, String encoding ) { * @deprecated * Only return the length of the indent string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getIndentStep () { return indentStep.length(); @@ -148,7 +148,7 @@ public int getIndentStep () * @deprecated * Should use the version that takes string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public void setIndentStep (int indentStep) { StringBuilder buf = new StringBuilder(); diff --git a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java index d4e2df840..737e36a46 100644 --- a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java +++ b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -82,7 +82,7 @@ public SAX2DOMEx(DocumentBuilderFactory f) throws ParserConfigurationException { * Creates a fresh empty DOM document and adds nodes under this document. * @deprecated */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public SAX2DOMEx() throws ParserConfigurationException { DocumentBuilderFactory factory = XmlFactory.createDocumentBuilderFactory(false); factory.setValidating(false); diff --git a/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java b/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java index c0b6b8fd5..26579fee6 100644 --- a/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java +++ b/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java @@ -43,7 +43,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; -import java.io.UnsupportedEncodingException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Enumeration; diff --git a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/IncludedGrammar.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/IncludedGrammar.java index 5ec43ab55..ea1fc382e 100644 --- a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/IncludedGrammar.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/ast/builder/IncludedGrammar.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2015 + * Copyright (C) 2004-2022 * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -24,7 +24,6 @@ import com.sun.tools.rngom.ast.om.ParsedElementAnnotation; import com.sun.tools.rngom.ast.om.Location; import com.sun.tools.rngom.ast.om.ParsedPattern; -import com.sun.tools.rngom.parse.Parseable; /** * {@link Scope} for {@code } element of the {@code }d grammar. diff --git a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/JavaCharStream.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/JavaCharStream.java index 77aaa4386..83340b238 100644 --- a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/JavaCharStream.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/JavaCharStream.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2011 + * Copyright (C) 2004-2022 * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -372,7 +372,7 @@ public char readChar() throws java.io.IOException * @deprecated * @see #getEndColumn */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getColumn() { return bufcolumn[bufpos]; } @@ -381,7 +381,7 @@ public int getColumn() { * @deprecated * @see #getEndLine */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getLine() { return bufline[bufpos]; } diff --git a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/UCode_UCodeESC_CharStream.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/UCode_UCodeESC_CharStream.java index 8e35817fd..59e30e8de 100644 --- a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/UCode_UCodeESC_CharStream.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/UCode_UCodeESC_CharStream.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2012 + * Copyright (C) 2004-2022 * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -387,7 +387,7 @@ public char readChar() throws EOFException { /** * @deprecated @see #getEndColumn */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getColumn() { return bufcolumn[bufpos]; } @@ -395,7 +395,7 @@ public int getColumn() { /** * @deprecated @see #getEndLine */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getLine() { return bufline[bufpos]; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/DatatypeConverterImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/DatatypeConverterImpl.java index 3620f10bf..4a63f997f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/DatatypeConverterImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/DatatypeConverterImpl.java @@ -43,7 +43,7 @@ * @deprecated in JAXB 2.2.4 - use jakarta.xml.bind.DatatypeConverterImpl instead * or let us know why you can't */ -@Deprecated +@Deprecated(since="4.0.0", forRemoval=true) public final class DatatypeConverterImpl implements DatatypeConverterInterface { @Deprecated diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/ContextFactory.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/ContextFactory.java index 79f753b51..2b81cc6c3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/ContextFactory.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/ContextFactory.java @@ -162,7 +162,7 @@ private static T getPropertyValue(Map properties, String key * * @deprecated use {@code createContext(Class[] classes, Map properties)} method instead */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public static JAXBRIContext createContext( Class[] classes, Collection typeRefs, Map subclassReplacements, String defaultNsUri, boolean c14nSupport, RuntimeAnnotationReader ar, @@ -177,7 +177,7 @@ public static JAXBRIContext createContext( Class[] classes, * * @deprecated use {@code createContext( Class[] classes, Map properties)} method instead */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public static JAXBRIContext createContext( Class[] classes, Collection typeRefs, Map subclassReplacements, String defaultNsUri, boolean c14nSupport, RuntimeAnnotationReader ar, diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java index d352e7c07..f912523ff 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -66,7 +66,7 @@ public Location getLocation() { * why are you calling a method whose return value is always known? */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final boolean canBeReferencedByIDREF() { return true; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ArrayInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ArrayInfoImpl.java index 5d8c01a73..dac47d560 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ArrayInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ArrayInfoImpl.java @@ -82,7 +82,7 @@ public TypeT getType() { * why are you calling a method whose return value is always known? */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final boolean canBeReferencedByIDREF() { return false; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java index 577a00361..c61b03700 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java @@ -48,7 +48,7 @@ public final QName[] getTypeNames() { * @deprecated always return false at this level. */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final boolean isElement() { return false; } @@ -57,7 +57,7 @@ public final boolean isElement() { * @deprecated always return null at this level. */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final QName getElementName() { return null; } @@ -66,7 +66,7 @@ public final QName getElementName() { * @deprecated always return null at this level. */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final Element asElement() { return null; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ClassInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ClassInfoImpl.java index 03800ae84..8fcc9edd9 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ClassInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ClassInfoImpl.java @@ -241,7 +241,7 @@ public final C getClazz() { * you shouldn't be invoking this method on . */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public ClassInfoImpl getScope() { return null; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementInfoImpl.java index 19dfe6fc7..a5a1c1bd2 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -366,7 +366,7 @@ public T getType() { * why are you calling a method whose return value is always known? */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final boolean canBeReferencedByIDREF() { return false; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java index 21a0597fe..694fa8357 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java @@ -148,7 +148,7 @@ public boolean isToken() { * why are you calling a method whose return value is always known? */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final boolean canBeReferencedByIDREF() { return false; } @@ -198,7 +198,7 @@ public void link() { * @deprecated if you are invoking this method directly, there's something wrong. */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public Element getSubstitutionHead() { return null; } @@ -229,7 +229,7 @@ public Element asElement() { * you shouldn't be invoking this method on {@link ClassInfoImpl}. */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public ClassInfo getScope() { return null; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/LeafInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/LeafInfoImpl.java index bd52d9bbf..e28141568 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/LeafInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/LeafInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -48,7 +48,7 @@ public TypeT getType() { * why are you calling a method whose return value is always known? */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public final boolean canBeReferencedByIDREF() { return false; } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java index 36a31dd6f..3b94f2813 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java @@ -176,7 +176,7 @@ public final class XMLSerializer extends Coordinator { * {@link Base64Data} is no longer cached, so that * XMLStreamWriterEx impl can retain the data, like JAX-WS does. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public Base64Data getCachedBase64DataInstance() { return new Base64Data(); } diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java index efd33cf9a..53150327f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java @@ -500,7 +500,7 @@ public void setAttachmentUnmarshaller(AttachmentUnmarshaller au) { /** * @deprecated since 2.0 */ - @Deprecated + @Deprecated(since="2.0", forRemoval=true) public boolean isValidating() { throw new UnsupportedOperationException(); } @@ -508,7 +508,7 @@ public boolean isValidating() { /** * @deprecated since 2.0 */ - @Deprecated + @Deprecated(since="2.0", forRemoval=true) public void setValidating(boolean validating) { throw new UnsupportedOperationException(); } diff --git a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java index d4ba20d81..7f2d5c2a2 100644 --- a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java +++ b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java @@ -135,7 +135,7 @@ public DataWriter (Writer writer) { * @deprecated * Only return the length of the indent string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getIndentStep () { return indentStep.length(); @@ -152,7 +152,7 @@ public int getIndentStep () * @deprecated * Should use the version that takes string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public void setIndentStep (int indentStep) { StringBuilder s = new StringBuilder(); diff --git a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java index 98ba0d58a..c20287fb4 100644 --- a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java +++ b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java @@ -61,7 +61,7 @@ public void setLexicalHandler(LexicalHandler lexical) { * @deprecated * Only return the length of the indent string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getIndentStep () { return indentStep.length(); @@ -78,7 +78,7 @@ public int getIndentStep () * @deprecated * Should use the version that takes string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public void setIndentStep (int indentStep) { StringBuilder s = new StringBuilder(); diff --git a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java index f31afb088..a607fe087 100644 --- a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java +++ b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java @@ -46,7 +46,7 @@ public IndentingXMLStreamWriter(XMLStreamWriter writer) { * @deprecated * Only return the length of the indent string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public int getIndentStep() { return indentStep.length(); } @@ -62,7 +62,7 @@ public int getIndentStep() { * @deprecated * Should use the version that takes string. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public void setIndentStep(int indentStep) { StringBuilder s = new StringBuilder(); for (; indentStep > 0; indentStep--) s.append(' '); diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/XJCBase.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/XJCBase.java index 9c00aa62a..ea5a9afbb 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/XJCBase.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/XJCBase.java @@ -338,7 +338,7 @@ public void setFailonerror(boolean value) { * * @deprecated not much need for JAXB2, as we now use much less stack. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public void setStackSize(String ss) { try { stackSize = Long.parseLong(ss); diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/JAXBModel.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/JAXBModel.java index bfaf8fe14..1cb513017 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/JAXBModel.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/JAXBModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -39,7 +39,7 @@ public interface JAXBModel { * @deprecated * this method is provided for now to allow gradual migration for JAX-RPC. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) List getClassList(); } diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/SchemaCompiler.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/SchemaCompiler.java index ecae0812b..14f150ad8 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/SchemaCompiler.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/SchemaCompiler.java @@ -235,6 +235,6 @@ public interface SchemaCompiler { * {@link Options} class in the compatible fashion. So please don't * use this method unless you know what you're doing. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @NotNull Options getOptions(); } diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java index 946a5a512..c4debdffb 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -66,7 +66,7 @@ public final XSComponent getSchemaComponent() { * @deprecated * why are you calling an unimplemented method? */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public final boolean canBeReferencedByIDREF() { // we aren't doing any error check in XJC, so no point in implementing this method. diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java index 5cc983786..0f483806c 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java @@ -181,7 +181,7 @@ public final TypeUse makeMimeTyped( MimeType mt ) { /** * @deprecated always return false at this level. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public final boolean isElement() { return false; @@ -190,7 +190,7 @@ public final boolean isElement() { /** * @deprecated always return null at this level. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public final QName getElementName() { return null; @@ -199,7 +199,7 @@ public final QName getElementName() { /** * @deprecated always return null at this level. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public final Element asElement() { return null; @@ -229,7 +229,7 @@ public final QName[] getTypeNames() { * @deprecated * why are you calling a method whose return value is always known? */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public final boolean canBeReferencedByIDREF() { return false; diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CClassInfo.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CClassInfo.java index d2b7517db..d8b502662 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CClassInfo.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CClassInfo.java @@ -320,7 +320,7 @@ public boolean isOrdered() { * @deprecated * if you are calling this method directly, you must be doing something wrong. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public boolean isFinal() { return false; diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CElementInfo.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CElementInfo.java index 0d788a988..dd4c6e936 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CElementInfo.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CElementInfo.java @@ -193,7 +193,7 @@ public CClassInfo getScope() { /** * @deprecated why are you calling a method that returns this? */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public NType getType() { return this; diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CEnumLeafInfo.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CEnumLeafInfo.java index 41e97a5a3..b37493723 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CEnumLeafInfo.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CEnumLeafInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -144,7 +144,7 @@ public NType getType() { * @deprecated * why are you calling the method whose return value is known? */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public boolean canBeReferencedByIDREF() { return false; diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CPropertyInfo.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CPropertyInfo.java index d5c70871a..f8bf4df3c 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CPropertyInfo.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CPropertyInfo.java @@ -173,7 +173,7 @@ public final XSComponent getSchemaComponent() { * * @see #getName(boolean) */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public String getName() { return getName(false); diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/Model.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/Model.java index 17cb6d740..9ded2e60f 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/Model.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/Model.java @@ -401,7 +401,7 @@ public Iterable getAllElements() { * @deprecated * Always return null. Perhaps you are interested in {@link #schemaComponent}? */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public XSComponent getSchemaComponent() { return null; @@ -411,7 +411,7 @@ public XSComponent getSchemaComponent() { * @deprecated * No line number available for the "root" component. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public Locator getLocator() { LocatorImpl r = new LocatorImpl(); diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/nav/NavigatorImpl.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/nav/NavigatorImpl.java index bf3d76568..0e3737851 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/nav/NavigatorImpl.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/nav/NavigatorImpl.java @@ -310,7 +310,7 @@ public boolean isAbstract(NClass clazz) { * @deprecated * no class generated by XJC is final. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public boolean isFinal(NClass clazz) { return false; diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/gbind/Element.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/gbind/Element.java index 59fc01080..95ee8e1be 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/gbind/Element.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/gbind/Element.java @@ -108,7 +108,7 @@ public boolean contains(ElementSet rhs) { * @deprecated * if you statically call this method, there's something wrong. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) @Override public Iterator iterator() { return Collections.singleton(this).iterator(); diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSDeclaration.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSDeclaration.java index 52e1fa9c5..db8a21447 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSDeclaration.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -35,7 +35,7 @@ public interface XSDeclaration extends XSComponent * @deprecated use the isGlobal method, which always returns * the opposite of this function. Or the isLocal method. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) boolean isAnonymous(); /** diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSElementDecl.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSElementDecl.java index b4e72a501..13ad1412f 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSElementDecl.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/XSElementDecl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -89,7 +89,7 @@ public interface XSElementDecl extends XSDeclaration, XSTerm * inefficient when working with a large schema. Use * {@link #getSubstitutables()} instead. */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) XSElementDecl[] listSubstitutables(); /** diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/DeclarationImpl.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/DeclarationImpl.java index 31bc2d158..f63923985 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/DeclarationImpl.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/DeclarationImpl.java @@ -34,7 +34,7 @@ abstract class DeclarationImpl extends ComponentImpl implements XSDeclaration private final boolean anonymous; /** @deprecated */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public boolean isAnonymous() { return anonymous; } public final boolean isGlobal() { return !isAnonymous(); } diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ElementDecl.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ElementDecl.java index 34be8f677..0a9ba02a2 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ElementDecl.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ElementDecl.java @@ -120,7 +120,7 @@ public Boolean getForm() { * @deprecated */ @Override - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public XSElementDecl[] listSubstitutables() { Set s = getSubstitutables(); return s.toArray(new XSElementDecl[0]); diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ParticleImpl.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ParticleImpl.java index c4982ddbf..052a73c6e 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ParticleImpl.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/ParticleImpl.java @@ -10,7 +10,6 @@ package com.sun.xml.xsom.impl; -import com.sun.xml.xsom.ForeignAttributes; import com.sun.xml.xsom.XSContentType; import com.sun.xml.xsom.XSParticle; import com.sun.xml.xsom.XSSimpleType; diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java index ff0b83687..c2ec36ae4 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/SAXParserFactoryAdaptor.java @@ -32,7 +32,7 @@ * @author * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) */ -@Deprecated +@Deprecated(since="4.0.0", forRemoval=true) public class SAXParserFactoryAdaptor extends SAXParserFactory { private final XMLParser parser; @@ -60,7 +60,7 @@ private class SAXParserImpl extends SAXParser /** * @deprecated */ - @Deprecated + @Deprecated(since="4.0.0", forRemoval=true) public org.xml.sax.Parser getParser() throws SAXException { return new XMLReaderAdapter(reader); } From 6e5eec469b812b1057cea26ace9880f0c2208105 Mon Sep 17 00:00:00 2001 From: Sanddust Date: Tue, 5 Jul 2022 17:07:44 -0500 Subject: [PATCH 5/6] Sonarqube updates https://github.com/eclipse-ee4j/jaxb-ri/issues/1651 Use List, DeQueue, LinkedList and Hashmap rather than synchronized Stack, Vector, and Hashtable. With assist from the Honor Systems Updater. Also-by: Stephen Davidson Signed-off-by: Sanddust --- .../helpers/DatatypeLibraryLoader.java | 16 ++++--- .../tools/rngom/binary/SchemaBuilderImpl.java | 18 ++++---- .../rngom/parse/compact/CompactSyntax.java | 13 ++++-- .../tools/rngom/parse/xml/SchemaParser.java | 40 ++++++++-------- .../com/sun/xml/txw2/NamespaceSupport.java | 46 ++++++++++--------- .../reader/xmlschema/SimpleTypeBuilder.java | 26 +++++------ .../parser/CustomizationContextChecker.java | 8 ++-- .../xml/xsom/impl/parser/NGCCRuntimeEx.java | 33 ++++++------- .../com/sun/xml/xsom/impl/scd/SCDParser.java | 10 ++-- 9 files changed, 112 insertions(+), 98 deletions(-) diff --git a/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java b/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java index 26579fee6..449be9929 100644 --- a/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java +++ b/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/DatatypeLibraryLoader.java @@ -46,6 +46,8 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Enumeration; +import java.util.LinkedList; +import java.util.List; import java.util.NoSuchElementException; import java.util.Vector; @@ -80,7 +82,7 @@ private static class Service { private final Class serviceClass; private final Enumeration configFiles; private Enumeration classNames = null; - private final Vector providers = new Vector(); + private final List providers = new LinkedList(); private Loader loader; private class ProviderEnumeration implements Enumeration { @@ -92,7 +94,7 @@ public boolean hasMoreElements() { public Object nextElement() { try { - return providers.elementAt(nextIndex++); + return providers.get(nextIndex++); } catch (ArrayIndexOutOfBoundsException e) { throw new NoSuchElementException(); @@ -197,7 +199,7 @@ synchronized private boolean moreProviders() { Class cls = loader.loadClass(className); Object obj = cls.getConstructor().newInstance(); if (serviceClass.isInstance(obj)) { - providers.addElement(obj); + providers.add(obj); return true; } } @@ -217,7 +219,7 @@ private static Enumeration parseConfigFile(URL url) { Reader r; r = new InputStreamReader(in, StandardCharsets.UTF_8); r = new BufferedReader(r); - Vector tokens = new Vector(); + List tokens = new LinkedList(); StringBuilder tokenBuf = new StringBuilder(); int state = START; for (;;) { @@ -244,13 +246,13 @@ private static Enumeration parseConfigFile(URL url) { break; } if (tokenBuf.length() != 0 && state != IN_NAME) { - tokens.addElement(tokenBuf.toString()); + tokens.add(tokenBuf.toString()); tokenBuf.setLength(0); } } if (tokenBuf.length() != 0) - tokens.addElement(tokenBuf.toString()); - return tokens.elements(); + tokens.add(tokenBuf.toString()); + return new Vector<>(tokens).elements();//NOSONAR } catch (IOException e) { return null; diff --git a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaBuilderImpl.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaBuilderImpl.java index 5e88133fd..c054c3372 100644 --- a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaBuilderImpl.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaBuilderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2012 + * Copyright (C) 2004-2012, 2022 * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ package com.sun.tools.rngom.binary; import java.util.Enumeration; -import java.util.Hashtable; +import java.util.HashMap; import java.util.List; import com.sun.tools.rngom.ast.builder.Annotations; @@ -58,6 +58,7 @@ import com.sun.tools.rngdatatype.DatatypeLibraryFactory; import com.sun.tools.rngdatatype.ValidationContext; import com.sun.tools.rngdatatype.helpers.DatatypeLibraryLoader; +import java.util.Map; import org.xml.sax.ErrorHandler; import org.xml.sax.Locator; import org.xml.sax.SAXException; @@ -425,14 +426,14 @@ public ParsedPattern makeValue(String datatypeLibrary, String type, String value static class GrammarImpl implements Grammar, Div, IncludedGrammar { private final SchemaBuilderImpl sb; - private final Hashtable defines; + private final Map defines; private final RefPattern startRef; private final Scope parent; private GrammarImpl(SchemaBuilderImpl sb, Scope parent) { this.sb = sb; this.parent = parent; - this.defines = new Hashtable(); + this.defines = new HashMap(); this.startRef = new RefPattern(null); } @@ -444,15 +445,14 @@ protected GrammarImpl(SchemaBuilderImpl sb, GrammarImpl g) { } public ParsedPattern endGrammar(Location loc, Annotations anno) throws BuildException { - for (Enumeration e = defines.keys(); - e.hasMoreElements();) { - String name = (String) e.nextElement(); - RefPattern rp = (RefPattern) defines.get(name); + for (Map.Entry entry : defines.entrySet()) { + String name = entry.getKey(); + RefPattern rp = entry.getValue(); if (rp.getPattern() == null) { sb.error("reference_to_undefined", name, rp.getRefLocator()); rp.setPattern(sb.pb.makeError()); } - } + } Pattern start = startRef.getPattern(); if (start == null) { sb.error("missing_start_element", (Locator) loc); diff --git a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntax.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntax.java index 416f93935..e06da73d4 100644 --- a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntax.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/compact/CompactSyntax.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; -import java.util.Hashtable; +import java.util.HashMap; import java.util.List; import com.sun.tools.rngom.ast.builder.Annotations; @@ -55,6 +55,9 @@ import com.sun.tools.rngom.ast.builder.ElementAnnotationBuilder; import com.sun.tools.rngom.ast.builder.SchemaBuilder; import com.sun.tools.rngom.ast.om.ParsedNameClass; +import java.util.Map; +import java.util.Vector; + import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; @@ -77,11 +80,11 @@ public class CompactSyntax implements Context, CompactSyntaxConstants { */ private CompactParseable parseable; private ErrorHandler eh; - private final Hashtable namespaceTable = new Hashtable(); - private final Hashtable datatypesTable = new Hashtable(); + private final Map namespaceTable = new HashMap(); + private final Map datatypesTable = new HashMap(); private boolean hadError = false; private static final Localizer localizer = new Localizer(new Localizer(Parseable.class),CompactSyntax.class); - private final Hashtable attributeNameTable = new Hashtable(); + private final Map attributeNameTable = new HashMap(); private boolean annotationsIncludeElements = false; /** @@ -255,7 +258,7 @@ public String resolveNamespacePrefix(String prefix) { } public Enumeration prefixes() { - return namespaceTable.keys(); + return new Vector<>(namespaceTable.keySet()).elements(); //NOSONAR } public String getBaseUri() { diff --git a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/SchemaParser.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/SchemaParser.java index 6a3428287..1b1eddcfa 100644 --- a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/SchemaParser.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/SchemaParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2012 + * Copyright (C) 2004-2012, 2022 * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,9 +21,11 @@ */ package com.sun.tools.rngom.parse.xml; +import java.util.Deque; import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Stack; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; import java.util.Vector; import java.util.List; import java.util.ArrayList; @@ -85,8 +87,8 @@ class SchemaParser { private final XmlBaseHandler xmlBaseHandler = new XmlBaseHandler(); private final ContextImpl context = new ContextImpl(); private boolean hadError = false; - private Hashtable patternTable; - private Hashtable nameClassTable; + private Map patternTable; + private Map nameClassTable; static class PrefixMapping { @@ -124,13 +126,13 @@ public String resolveNamespacePrefix(String prefix) { } public Enumeration prefixes() { - Vector v = new Vector(); + List v = new LinkedList(); for (PrefixMapping p = prefixMapping; p != null; p = p.next) { if (!v.contains(p.prefix)) { - v.addElement(p.prefix); + v.add(p.prefix); } } - return v.elements(); + return new Vector<>(v).elements(); //NOSONAR } public Context copy() { @@ -401,8 +403,8 @@ class ForeignElementHandler extends Handler { final State nextState; ElementAnnotationBuilder builder; - final Stack builderStack = new Stack(); - StringBuffer textBuf; + final Deque builderLinkedList = new LinkedList(); + StringBuilder textBuf; Location textLoc; ForeignElementHandler(State nextState, CommentList comments) { @@ -414,7 +416,7 @@ public void startElement(String namespaceURI, String localName, String qName, Attributes atts) { flushText(); if (builder != null) { - builderStack.push(builder); + builderLinkedList.push(builder); } Location loc = makeLocation(); builder = schemaBuilder.makeElementAnnotationBuilder(namespaceURI, @@ -438,18 +440,18 @@ public void endElement(String namespaceURI, String localName, builder.addComment(getComments()); } ParsedElementAnnotation ea = builder.makeElementAnnotation(); - if (builderStack.empty()) { + if (builderLinkedList.isEmpty()) { nextState.endForeignChild(ea); nextState.set(); } else { - builder = (ElementAnnotationBuilder) builderStack.pop(); + builder = (ElementAnnotationBuilder) builderLinkedList.pop(); builder.addElement(ea); } } public void characters(char[] ch, int start, int length) { if (textBuf == null) { - textBuf = new StringBuffer(); + textBuf = new StringBuilder(); } textBuf.append(ch, start, length); if (textLoc == null) { @@ -810,7 +812,7 @@ ParsedPattern makePattern() { class ValueState extends EmptyContentState { - final StringBuffer buf = new StringBuffer(); + final StringBuilder buf = new StringBuilder(); String type; State create() { @@ -929,7 +931,7 @@ void endChild(ParsedPattern pattern) { class ParamState extends State { - private final StringBuffer buf = new StringBuffer(); + private final StringBuilder buf = new StringBuilder(); private final DataPatternBuilder dpb; private String name; @@ -1448,7 +1450,7 @@ void end() throws SAXException { class NameState extends NameClassBaseState { - final StringBuffer buf = new StringBuffer(); + final StringBuilder buf = new StringBuilder(); State createChildState(String localName) throws SAXException { error("expected_name", localName); @@ -1627,7 +1629,7 @@ void end() throws SAXException { } private void initPatternTable() { - patternTable = new Hashtable(); + patternTable = new HashMap(); patternTable.put("zeroOrMore", new ZeroOrMoreState()); patternTable.put("oneOrMore", new OneOrMoreState()); patternTable.put("optional", new OptionalState()); @@ -1650,7 +1652,7 @@ private void initPatternTable() { } private void initNameClassTable() { - nameClassTable = new Hashtable(); + nameClassTable = new HashMap(); nameClassTable.put("name", new NameState()); nameClassTable.put("anyName", new AnyNameState()); nameClassTable.put("nsName", new NsNameState()); diff --git a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/NamespaceSupport.java b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/NamespaceSupport.java index 35c6263c6..87db793f9 100644 --- a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/NamespaceSupport.java +++ b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/NamespaceSupport.java @@ -6,9 +6,13 @@ package com.sun.xml.txw2; +import java.util.Collections; import java.util.EmptyStackException; import java.util.Enumeration; -import java.util.Hashtable; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Vector; @@ -114,7 +118,7 @@ final class NamespaceSupport * An empty enumeration. */ private final static Enumeration EMPTY_ENUMERATION = - new Vector().elements(); + new Vector(Collections.emptyList()).elements(); //////////////////////////////////////////////////////////////////// @@ -438,15 +442,15 @@ public String getPrefix (String uri) */ public Enumeration getPrefixes (String uri) { - Vector prefixes = new Vector<>(); + List prefixes = new LinkedList<>(); Enumeration allPrefixes = getPrefixes(); while (allPrefixes.hasMoreElements()) { String prefix = allPrefixes.nextElement(); if (uri.equals(getURI(prefix))) { - prefixes.addElement(prefix); + prefixes.add(prefix); } } - return prefixes.elements(); + return new Vector(prefixes).elements(); } @@ -594,7 +598,7 @@ void declarePrefix (String prefix, String uri) copyTables(); } if (declarations == null) { - declarations = new Vector<>(); + declarations = new LinkedList<>(); } prefix = prefix.intern(); @@ -605,7 +609,7 @@ void declarePrefix (String prefix, String uri) prefixTable.put(prefix, uri); uriTable.put(uri, prefix); // may wipe out another prefix } - declarations.addElement(prefix); + declarations.add(prefix); } @@ -623,7 +627,7 @@ void declarePrefix (String prefix, String uri) String [] processName (String qName, boolean isAttribute) { String[] name; - Hashtable table; + HashMap table; // Select the appropriate table. if (isAttribute) { @@ -741,7 +745,7 @@ Enumeration getDeclaredPrefixes () if (declarations == null) { return EMPTY_ENUMERATION; } else { - return declarations.elements(); + return new Vector(declarations).elements(); } } @@ -760,7 +764,7 @@ Enumeration getPrefixes () if (prefixTable == null) { return EMPTY_ENUMERATION; } else { - return prefixTable.keys(); + return new Vector(prefixTable.keySet()).elements(); } } @@ -781,17 +785,17 @@ Enumeration getPrefixes () private void copyTables () { if (prefixTable != null) { - prefixTable = (Hashtable)prefixTable.clone(); + prefixTable = (Map)((HashMap)prefixTable) .clone(); } else { - prefixTable = new Hashtable<>(); + prefixTable = new HashMap<>(); } if (uriTable != null) { - uriTable = (Hashtable)uriTable.clone(); + uriTable = (Map)((HashMap)uriTable).clone(); } else { - uriTable = new Hashtable<>(); + uriTable = new HashMap<>(); } - elementNameTable = new Hashtable<>(); - attributeNameTable = new Hashtable<>(); + elementNameTable = new HashMap<>(); + attributeNameTable = new HashMap<>(); declSeen = true; } @@ -801,10 +805,10 @@ private void copyTables () // Protected state. //////////////////////////////////////////////////////////////// - Hashtable prefixTable; - Hashtable uriTable; - Hashtable elementNameTable; - Hashtable attributeNameTable; + Map prefixTable; + Map uriTable; + HashMap elementNameTable; + HashMap attributeNameTable; String defaultNS = ""; @@ -813,7 +817,7 @@ private void copyTables () // Internal state. //////////////////////////////////////////////////////////////// - private Vector declarations = null; + private List declarations = null; private boolean declSeen = false; private Context parent = null; } diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/SimpleTypeBuilder.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/SimpleTypeBuilder.java index a189c08bb..cf7008b56 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/SimpleTypeBuilder.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/SimpleTypeBuilder.java @@ -10,24 +10,29 @@ package com.sun.tools.xjc.reader.xmlschema; +import static org.glassfish.jaxb.core.v2.WellKnownNamespace.XML_MIME_URI; + import java.io.StringWriter; import java.math.BigInteger; import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.Deque; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.Stack; +import java.util.concurrent.ConcurrentLinkedDeque; -import jakarta.activation.MimeTypeParseException; -import jakarta.xml.bind.DatatypeConverter; +import javax.xml.XMLConstants; -import com.sun.codemodel.JJavaName; import org.glassfish.jaxb.core.v2.WellKnownNamespace; +import org.glassfish.jaxb.core.v2.runtime.SwaRefAdapterMarker; +import org.xml.sax.Locator; + +import com.sun.codemodel.JJavaName; import com.sun.tools.xjc.ErrorReceiver; import com.sun.tools.xjc.model.CBuiltinLeafInfo; import com.sun.tools.xjc.model.CClassInfo; @@ -48,10 +53,6 @@ import com.sun.tools.xjc.reader.xmlschema.bindinfo.BindInfo; import com.sun.tools.xjc.reader.xmlschema.bindinfo.EnumMemberMode; import com.sun.tools.xjc.util.MimeTypeRange; - -import static org.glassfish.jaxb.core.v2.WellKnownNamespace.XML_MIME_URI; - -import org.glassfish.jaxb.core.v2.runtime.SwaRefAdapterMarker; import com.sun.xml.xsom.XSAttributeDecl; import com.sun.xml.xsom.XSComplexType; import com.sun.xml.xsom.XSComponent; @@ -66,9 +67,8 @@ import com.sun.xml.xsom.visitor.XSSimpleTypeFunction; import com.sun.xml.xsom.visitor.XSVisitor; -import org.xml.sax.Locator; - -import javax.xml.XMLConstants; +import jakarta.activation.MimeTypeParseException; +import jakarta.xml.bind.DatatypeConverter; /** * Builds {@link TypeUse} from simple types. @@ -108,9 +108,9 @@ public final class SimpleTypeBuilder extends BindingComponent { * its point of reference. See my comment at the header * of this class for details. * - * UGLY: Implemented as a Stack of XSComponent to fix a bug + * UGLY: Implemented as a ConcrrentLinkedList of XSComponent to fix a bug */ - public final Stack refererStack = new Stack<>(); + public final Deque refererStack = new ConcurrentLinkedDeque<>(); /** * Records what xmime:expectedContentTypes annotations we honored and processed, diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/parser/CustomizationContextChecker.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/parser/CustomizationContextChecker.java index fd7a5208c..294de80fe 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/parser/CustomizationContextChecker.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/parser/CustomizationContextChecker.java @@ -11,14 +11,12 @@ package com.sun.tools.xjc.reader.xmlschema.parser; import java.util.HashSet; +import java.util.LinkedList; import java.util.Set; -import java.util.Stack; import javax.xml.XMLConstants; import javax.xml.namespace.QName; -import com.sun.tools.xjc.reader.Const; - import org.xml.sax.Attributes; import org.xml.sax.ErrorHandler; import org.xml.sax.Locator; @@ -26,6 +24,8 @@ import org.xml.sax.SAXParseException; import org.xml.sax.helpers.XMLFilterImpl; +import com.sun.tools.xjc.reader.Const; + /** * Checks if binding declarations are placed where they are allowed. * @@ -100,7 +100,7 @@ public class CustomizationContextChecker extends XMLFilterImpl { /** Keep names of all the ancestor elements. */ - private final Stack elementNames = new Stack<>(); + private final LinkedList elementNames = new LinkedList<>(); private final ErrorHandler errorHandler; diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/NGCCRuntimeEx.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/NGCCRuntimeEx.java index 759c6a652..98a4e5c7a 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/NGCCRuntimeEx.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/NGCCRuntimeEx.java @@ -10,6 +10,22 @@ package com.sun.xml.xsom.impl.parser; +import java.io.IOException; +import java.net.URI; +import java.net.URL; +import java.text.MessageFormat; +import java.util.LinkedList; +import java.util.regex.Pattern; + +import org.xml.sax.Attributes; +import org.xml.sax.EntityResolver; +import org.xml.sax.ErrorHandler; +import org.xml.sax.InputSource; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; +import org.xml.sax.helpers.LocatorImpl; + import com.sun.tools.rngdatatype.ValidationContext; import com.sun.xml.xsom.XSDeclaration; import com.sun.xml.xsom.XSSimpleType; @@ -21,21 +37,6 @@ import com.sun.xml.xsom.impl.parser.state.NGCCRuntime; import com.sun.xml.xsom.impl.parser.state.Schema; import com.sun.xml.xsom.parser.AnnotationParser; -import org.xml.sax.Attributes; -import org.xml.sax.EntityResolver; -import org.xml.sax.ErrorHandler; -import org.xml.sax.InputSource; -import org.xml.sax.Locator; -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import org.xml.sax.helpers.LocatorImpl; - -import java.io.IOException; -import java.net.URI; -import java.net.URL; -import java.text.MessageFormat; -import java.util.Stack; -import java.util.regex.Pattern; /** * NGCCRuntime extended with various utility methods for @@ -87,7 +88,7 @@ public class NGCCRuntimeEx extends NGCCRuntime implements PatcherManager { * This information is passed to AnnotationParser as * context information */ - private final Stack elementNames = new Stack<>(); + private final LinkedList elementNames = new LinkedList<>(); /** * Points to the schema document (the parser of it) that included/imported diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SCDParser.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SCDParser.java index b3a95b588..7b2361615 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SCDParser.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SCDParser.java @@ -14,6 +14,8 @@ import java.util.*; import java.io.*; import com.sun.xml.xsom.impl.UName; +import java.util.LinkedList; +import java.util.List; import javax.xml.namespace.*; public class SCDParser implements SCDParserConstants { @@ -498,12 +500,12 @@ private int jj_ntk() { return (jj_ntk = jj_nt.kind); } - private java.util.Vector jj_expentries = new java.util.Vector(); + private List jj_expentries = new java.util.LinkedList(); private int[] jj_expentry; private int jj_kind = -1; public ParseException generateParseException() { - jj_expentries.removeAllElements(); + jj_expentries.clear(); boolean[] la1tokens = new boolean[47]; for (int i = 0; i < 47; i++) { la1tokens[i] = false; @@ -528,12 +530,12 @@ public ParseException generateParseException() { if (la1tokens[i]) { jj_expentry = new int[1]; jj_expentry[0] = i; - jj_expentries.addElement(jj_expentry); + jj_expentries.add(jj_expentry); } } int[][] exptokseq = new int[jj_expentries.size()][]; for (int i = 0; i < jj_expentries.size(); i++) { - exptokseq[i] = (int[])jj_expentries.elementAt(i); + exptokseq[i] = (int[])jj_expentries.get(i); } return new ParseException(token, exptokseq, tokenImage); } From e530383de1fba0c550a5f455f9498fe4d34ff56f Mon Sep 17 00:00:00 2001 From: Honor Systems Updater Jenkins Date: Wed, 6 Jul 2022 04:33:13 +0000 Subject: [PATCH 6/6] Honor Systems generated updates https://github.com/eclipse-ee4j/jaxb-ri/issues/1651 Automatic updates https://jenkins.updater.j2eeguys.com/ txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java Replace the synchronized class "Stack" by an unsynchronized one such as "Deque". [java:S1149] external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/DtdContext.java Replace the synchronized class "Hashtable" by an unsynchronized one such as "HashMap". [java:S1149] xsom/src/main/java/com/sun/xml/xsom/impl/parser/state/NGCCRuntime.java Replace the synchronized class "Stack" by an unsynchronized one such as "Deque". [java:S1149] Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder". [java:S1149] xsom/src/main/java/com/sun/xml/xsom/impl/parser/ParserContext.java Replace the synchronized class "Vector" by an unsynchronized one such as "ArrayList" or "LinkedList". [java:S1149] xjc/src/main/java/com/sun/tools/xjc/reader/dtd/TDTDReader.java Replace the synchronized class "Stack" by an unsynchronized one such as "Deque". [java:S1149] jxc/src/main/java/com/sun/tools/jxc/gen/config/NGCCRuntime.java Replace the synchronized class "Stack" by an unsynchronized one such as "Deque". [java:S1149] Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder". [java:S1149] external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/StreamingValidatorImpl.java Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder". [java:S1149] xsom/src/main/java/com/sun/xml/xsom/impl/scd/SCDParser.java Remove this unused import 'java.util.LinkedList'. [java:S1128] txw/compiler/src/main/java/com/sun/tools/txw2/model/XmlNode.java Replace the synchronized class "Stack" by an unsynchronized one such as "Deque". [java:S1149] xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/TypePatternBinder.java Replace the synchronized class "Stack" by an unsynchronized one such as "Deque". [java:S1149] txw/runtime/src/main/java/com/sun/xml/txw2/output/SaxSerializer.java Replace the synchronized class "Stack" by an unsynchronized one such as "Deque". [java:S1149] txw/compiler/src/main/java/com/sun/tools/txw2/NameUtil.java Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder". [java:S1149] xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/ClassSelector.java Replace the synchronized class "Stack" by an unsynchronized one such as "Deque". [java:S1149] txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java Replace the synchronized class "Stack" by an unsynchronized one such as "Deque". [java:S1149] core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java Replace the synchronized class "Stack" by an unsynchronized one such as "Deque". [java:S1149] txw/runtime/src/main/java/com/sun/xml/txw2/output/DomSerializer.java Replace the synchronized class "Stack" by an unsynchronized one such as "Deque". [java:S1149] external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaBuilderImpl.java Remove this unused import 'java.util.Enumeration'. [java:S1128] core/src/main/java/org/glassfish/jaxb/core/v2/util/XmlFactory.java Disable access to external entities in XML parsing. [java:S2755] runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ContentHandlerAdaptor.java Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder". [java:S1149] xsom/src/main/java/com/sun/xml/xsom/util/DomAnnotationParserFactory.java Disable access to external entities in XML parsing. [java:S2755] xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/DefaultParticleBinder.java Replace the synchronized class "Hashtable" by an unsynchronized one such as "HashMap". [java:S1149] core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java Replace the synchronized class "Stack" by an unsynchronized one such as "Deque". [java:S1149] xsom/src/main/java/com/sun/xml/xsom/parser/XmlFactory.java Disable access to external entities in XML parsing. [java:S2755] txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java Replace the synchronized class "Stack" by an unsynchronized one such as "Deque". [java:S1149] xsom/src/main/java/com/sun/xml/xsom/impl/parser/state/SimpleType_Union.java Replace the synchronized class "Vector" by an unsynchronized one such as "ArrayList" or "LinkedList". [java:S1149] xsom/src/main/java/com/sun/xml/xsom/impl/SchemaSetImpl.java Replace the synchronized class "Vector" by an unsynchronized one such as "ArrayList" or "LinkedList". [java:S1149] xjc/src/main/java/com/sun/tools/xjc/reader/dtd/bindinfo/BIUserConversion.java Disable access to external entities in XML parsing. [java:S2755] Also-by: Stephen Davidson Signed-off-by: Honor Systems Updater Jenkins --- .../jaxb/core/marshaller/DataWriter.java | 11 +++--- .../jaxb/core/marshaller/SAX2DOMEx.java | 23 +++++------ .../jaxb/core/v2/util/XmlFactory.java | 13 +++++++ .../helpers/StreamingValidatorImpl.java | 4 +- .../tools/rngom/binary/SchemaBuilderImpl.java | 1 - .../sun/tools/rngom/parse/xml/DtdContext.java | 13 ++++--- .../sun/tools/jxc/gen/config/NGCCRuntime.java | 39 ++++++++++--------- .../v2/runtime/ContentHandlerAdaptor.java | 2 +- .../java/com/sun/tools/txw2/NameUtil.java | 8 ++-- .../com/sun/tools/txw2/model/XmlNode.java | 5 ++- .../com/sun/xml/txw2/output/DataWriter.java | 11 +++--- .../sun/xml/txw2/output/DomSerializer.java | 5 ++- .../xml/txw2/output/IndentingXMLFilter.java | 9 +++-- .../txw2/output/IndentingXMLStreamWriter.java | 9 +++-- .../sun/xml/txw2/output/SaxSerializer.java | 9 +++-- .../sun/tools/xjc/reader/dtd/TDTDReader.java | 5 ++- .../reader/dtd/bindinfo/BIUserConversion.java | 4 ++ .../xjc/reader/relaxng/TypePatternBinder.java | 7 ++-- .../xjc/reader/xmlschema/ClassSelector.java | 7 ++-- .../xmlschema/DefaultParticleBinder.java | 3 +- .../com/sun/xml/xsom/impl/SchemaSetImpl.java | 4 +- .../xml/xsom/impl/parser/ParserContext.java | 7 ++-- .../xsom/impl/parser/state/NGCCRuntime.java | 39 ++++++++++--------- .../impl/parser/state/SimpleType_Union.java | 6 ++- .../com/sun/xml/xsom/impl/scd/SCDParser.java | 1 - .../com/sun/xml/xsom/parser/XmlFactory.java | 3 ++ .../xsom/util/DomAnnotationParserFactory.java | 7 +++- 27 files changed, 147 insertions(+), 108 deletions(-) diff --git a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java index 0e47e8cf0..da9369857 100644 --- a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java +++ b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/DataWriter.java @@ -16,7 +16,8 @@ import java.io.IOException; import java.io.Writer; -import java.util.Stack; +import java.util.Deque; +import java.util.LinkedList; import org.xml.sax.Attributes; import org.xml.sax.SAXException; @@ -180,7 +181,7 @@ public void reset () { depth = 0; state = SEEN_NOTHING; - stateStack = new Stack<>(); + stateLinkedList = new LinkedList<>(); super.reset(); } @@ -215,7 +216,7 @@ public void startElement (String uri, String localName, String qName, Attributes atts) throws SAXException { - stateStack.push(SEEN_ELEMENT); + stateLinkedList.push(SEEN_ELEMENT); state = SEEN_NOTHING; if (depth > 0) { super.characters("\n"); @@ -254,7 +255,7 @@ public void endElement (String uri, String localName, String qName) doIndent(); } super.endElement(uri, localName, qName); - state = stateStack.pop(); + state = stateLinkedList.pop(); } @Override @@ -359,7 +360,7 @@ private void doIndent () //////////////////////////////////////////////////////////////////// private Object state = SEEN_NOTHING; - private Stack stateStack = new Stack<>(); + private Deque stateLinkedList = new LinkedList<>(); private String indentStep = ""; private int depth = 0; diff --git a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java index 737e36a46..95d5029f1 100644 --- a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java +++ b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/marshaller/SAX2DOMEx.java @@ -10,7 +10,8 @@ package org.glassfish.jaxb.core.marshaller; -import java.util.Stack; +import java.util.Deque; +import java.util.LinkedList; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -37,7 +38,7 @@ public class SAX2DOMEx implements ContentHandler { private Node node = null; private boolean isConsolidate; - protected final Stack nodeStack = new Stack<>(); + protected final Deque nodeLinkedList = new LinkedList<>(); private final FinalArrayList unprocessedNamespaces = new FinalArrayList<>(); /** * Document object that owns the specified node. @@ -59,7 +60,7 @@ public SAX2DOMEx(Node node) { public SAX2DOMEx(Node node, boolean isConsolidate) { this.node = node; this.isConsolidate = isConsolidate; - nodeStack.push(this.node); + nodeLinkedList.push(this.node); if (node instanceof Document) { this.document = (Document) node; @@ -75,7 +76,7 @@ public SAX2DOMEx(DocumentBuilderFactory f) throws ParserConfigurationException { f.setValidating(false); document = f.newDocumentBuilder().newDocument(); node = document; - nodeStack.push(document); + nodeLinkedList.push(document); } /** @@ -89,11 +90,11 @@ public SAX2DOMEx() throws ParserConfigurationException { document = factory.newDocumentBuilder().newDocument(); node = document; - nodeStack.push(document); + nodeLinkedList.push(document); } public final Element getCurrentElement() { - return (Element) nodeStack.peek(); + return (Element) nodeLinkedList.peek(); } public Node getDOM() { @@ -136,7 +137,7 @@ protected void namespace(Element element, String prefix, String uri) { @Override public void startElement(String namespace, String localName, String qName, Attributes attrs) { - Node parent = nodeStack.peek(); + Node parent = nodeLinkedList.peek(); // some broken DOM implementation (we confirmed it with SAXON) // return null from this method. @@ -173,12 +174,12 @@ public void startElement(String namespace, String localName, String qName, Attri // append this new node onto current stack node parent.appendChild(element); // push this node onto stack - nodeStack.push(element); + nodeLinkedList.push(element); } @Override public void endElement(String namespace, String localName, String qName) { - nodeStack.pop(); + nodeLinkedList.pop(); } @Override @@ -187,7 +188,7 @@ public void characters(char[] ch, int start, int length) { } protected Text characters(String s) { - Node parent = nodeStack.peek(); + Node parent = nodeLinkedList.peek(); Node lastChild = parent.getLastChild(); Text text; if (isConsolidate && lastChild != null && lastChild.getNodeType() == Node.TEXT_NODE) { @@ -206,7 +207,7 @@ public void ignorableWhitespace(char[] ch, int start, int length) { @Override public void processingInstruction(String target, String data) throws org.xml.sax.SAXException { - Node parent = nodeStack.peek(); + Node parent = nodeLinkedList.peek(); Node n = document.createProcessingInstruction(target, data); parent.appendChild(n); } diff --git a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/v2/util/XmlFactory.java b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/v2/util/XmlFactory.java index e13c8a392..f291c634d 100644 --- a/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/v2/util/XmlFactory.java +++ b/jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/v2/util/XmlFactory.java @@ -72,6 +72,9 @@ private static boolean isXMLSecurityDisabled(boolean runtimeSetting) { public static SchemaFactory createSchemaFactory(final String language, boolean disableSecureProcessing) throws IllegalStateException { try { SchemaFactory factory = SchemaFactory.newInstance(language); + //https://rules.sonarsource.com/java/RSPEC-2755 + factory.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, ""); + factory.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, ""); if (LOGGER.isLoggable(Level.FINE)) { LOGGER.log(Level.FINE, "SchemaFactory instance: {0}", factory); } @@ -94,6 +97,9 @@ public static SchemaFactory createSchemaFactory(final String language, boolean d public static SAXParserFactory createParserFactory(boolean disableSecureProcessing) throws IllegalStateException { try { SAXParserFactory factory = SAXParserFactory.newInstance(); + //https://rules.sonarsource.com/java/RSPEC-2755 + factory.setFeature("http://xml.org/sax/features/external-general-entities", false); + factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false); if (LOGGER.isLoggable(Level.FINE)) { LOGGER.log(Level.FINE, "SAXParserFactory instance: {0}", factory); } @@ -137,6 +143,10 @@ public static XPathFactory createXPathFactory(boolean disableSecureProcessing) t public static TransformerFactory createTransformerFactory(boolean disableSecureProcessing) throws IllegalStateException { try { TransformerFactory factory = TransformerFactory.newInstance(); + //https://rules.sonarsource.com/java/RSPEC-2755 + factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, ""); + //ACCESS_EXTERNAL_SCHEMA not supported in several TransformerFactory implementations + factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, ""); if (LOGGER.isLoggable(Level.FINE)) { LOGGER.log(Level.FINE, "TransformerFactory instance: {0}", factory); } @@ -159,6 +169,9 @@ public static TransformerFactory createTransformerFactory(boolean disableSecureP public static DocumentBuilderFactory createDocumentBuilderFactory(boolean disableSecureProcessing) throws IllegalStateException { try { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + //https://rules.sonarsource.com/java/RSPEC-2755 + factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, ""); + factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, ""); if (LOGGER.isLoggable(Level.FINE)) { LOGGER.log(Level.FINE, "DocumentBuilderFactory instance: {0}", factory); } diff --git a/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/StreamingValidatorImpl.java b/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/StreamingValidatorImpl.java index dd6bef6e4..928f1c714 100644 --- a/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/StreamingValidatorImpl.java +++ b/jaxb-ri/external/relaxng-datatype/src/main/java/com/sun/tools/rngdatatype/helpers/StreamingValidatorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Thai Open Source Software Center Ltd + * Copyright (c) 2005, 2010, 2022, Thai Open Source Software Center Ltd * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -64,7 +64,7 @@ public final class StreamingValidatorImpl implements DatatypeStreamingValidator { /** This buffer accumulates characters. */ - private final StringBuffer buffer = new StringBuffer(); + private final StringBuilder buffer = new StringBuilder(); /** Datatype obejct that creates this streaming validator. */ private final Datatype baseType; diff --git a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaBuilderImpl.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaBuilderImpl.java index c054c3372..438e2db2d 100644 --- a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaBuilderImpl.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/binary/SchemaBuilderImpl.java @@ -21,7 +21,6 @@ */ package com.sun.tools.rngom.binary; -import java.util.Enumeration; import java.util.HashMap; import java.util.List; diff --git a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/DtdContext.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/DtdContext.java index c018fab41..92699d674 100644 --- a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/DtdContext.java +++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/parse/xml/DtdContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2011 + * Copyright (C) 2004-2011, 2022 * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,19 +21,20 @@ */ package com.sun.tools.rngom.parse.xml; +import java.util.HashMap; +import java.util.Map; import org.xml.sax.DTDHandler; import org.xml.sax.SAXException; import com.sun.tools.rngdatatype.ValidationContext; -import java.util.Hashtable; public abstract class DtdContext implements DTDHandler, ValidationContext { - private final Hashtable notationTable; - private final Hashtable unparsedEntityTable; + private final Map notationTable; + private final Map unparsedEntityTable; public DtdContext() { - notationTable = new Hashtable(); - unparsedEntityTable = new Hashtable(); + notationTable = new HashMap(); + unparsedEntityTable = new HashMap(); } public DtdContext(DtdContext dc) { diff --git a/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/gen/config/NGCCRuntime.java b/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/gen/config/NGCCRuntime.java index d4cc7ff79..4dd6ad41a 100644 --- a/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/gen/config/NGCCRuntime.java +++ b/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/gen/config/NGCCRuntime.java @@ -12,8 +12,9 @@ import java.text.MessageFormat; import java.util.ArrayList; +import java.util.Deque; +import java.util.LinkedList; import java.util.List; -import java.util.Stack; import java.util.StringTokenizer; import org.xml.sax.Attributes; @@ -80,7 +81,7 @@ public void setRootHandler( NGCCHandler rootHandler ) { * as the runtime resets itself after the endDocument method. */ public void reset() { - attStack.clear(); + attLinkedList.clear(); currentAtts = null; currentHandler = null; indent=0; @@ -89,10 +90,10 @@ public void reset() { needIndent = true; redirect = null; redirectionDepth = 0; - text = new StringBuffer(); + text = new StringBuilder(); // add a dummy attributes at the bottom as a "centinel." - attStack.push(new AttributesImpl()); + attLinkedList.push(new AttributesImpl()); } // current content handler can be acccessed via set/getContentHandler. @@ -112,8 +113,8 @@ public void reset() { /** stack of {@link Attributes}. */ - private final Stack attStack = new Stack<>(); - /** current attributes set. always equal to attStack.peek() */ + private final Deque attLinkedList = new LinkedList<>(); + /** current attributes set. always equal to attLinkedList.peek() */ private AttributesImpl currentAtts; /** @@ -130,12 +131,12 @@ public Attributes getCurrentAttributes() { } /** accumulated text. */ - private StringBuffer text = new StringBuffer(); + private StringBuilder text = new StringBuilder(); - /** The current NGCCHandler. Always equals to handlerStack.peek() */ + /** The current NGCCHandler. Always equals to handlerLinkedList.peek() */ private NGCCEventReceiver currentHandler; @Override @@ -215,8 +216,8 @@ private void processPendingText(boolean ignorable) throws SAXException { else currentHandler.text(text.toString()); // otherwise consume this token - // truncate StringBuffer, but avoid excessive allocation. - if(text.length()>1024) text = new StringBuffer(); + // truncate StringBuilder, but avoid excessive allocation. + if(text.length()>1024) text = new StringBuilder(); else text.setLength(0); } @@ -235,7 +236,7 @@ public void startElement(String uri, String localname, String qname, Attributes redirectionDepth++; } else { processPendingText(true); - // System.out.println("startElement:"+localname+"->"+_attrStack.size()); + // System.out.println("startElement:"+localname+"->"+_attrLinkedList.size()); currentHandler.enterElement(uri, localname, qname, atts); } } @@ -263,8 +264,8 @@ public void startElement(String uri, String localname, String qname, Attributes */ public void onEnterElementConsumed( String uri, String localName, String qname,Attributes atts) throws SAXException { - attStack.push(currentAtts=new AttributesImpl(atts)); - nsEffectiveStack.push(nsEffectivePtr); + attLinkedList.push(currentAtts=new AttributesImpl(atts)); + nsEffectiveLinkedList.push(nsEffectivePtr); nsEffectivePtr = namespaces.size(); } @@ -275,12 +276,12 @@ public void onEnterElementConsumed( * @throws SAXException for errors */ public void onLeaveElementConsumed(String uri, String localName, String qname) throws SAXException { - attStack.pop(); - if(attStack.isEmpty()) + attLinkedList.pop(); + if(attLinkedList.isEmpty()) currentAtts = null; else - currentAtts = attStack.peek(); - nsEffectivePtr = nsEffectiveStack.pop(); + currentAtts = attLinkedList.peek(); + nsEffectivePtr = nsEffectiveLinkedList.pop(); } @Override @@ -527,9 +528,9 @@ public void redirectSubtree( ContentHandler child, private int nsEffectivePtr=0; /** - * Stack to preserve old nsEffectivePtr values. + * LinkedList to preserve old nsEffectivePtr values. */ - private final Stack nsEffectiveStack = new Stack<>(); + private final Deque nsEffectiveLinkedList = new LinkedList<>(); public String resolveNamespacePrefix( String prefix ) { for( int i = nsEffectivePtr-2; i>=0; i-=2 ) diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ContentHandlerAdaptor.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ContentHandlerAdaptor.java index 9a805d6f5..c220757e6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ContentHandlerAdaptor.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ContentHandlerAdaptor.java @@ -34,7 +34,7 @@ final class ContentHandlerAdaptor extends DefaultHandler { /** Events will be sent to this object. */ private final XMLSerializer serializer; - private final StringBuffer text = new StringBuffer(); + private final StringBuilder text = new StringBuilder(); ContentHandlerAdaptor( XMLSerializer _serializer ) { diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/NameUtil.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/NameUtil.java index 27ad1efc7..068a943c5 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/NameUtil.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/NameUtil.java @@ -185,15 +185,15 @@ public static String toConstantName(String[] ss) { * printed by only using US-ASCII characters. * * The escaped characters will be appended to the given - * StringBuffer. + * StringBuilder. * * @param sb - * StringBuffer that receives escaped string. + * StringBuilder that receives escaped string. * @param s * String to be escaped. s.substring(start) * will be escaped and copied to the string buffer. */ - public static void escape(StringBuffer sb, String s, int start) { + public static void escape(StringBuilder sb, String s, int start) { int n = s.length(); for (int i = start; i < n; i++) { char c = s.charAt(i); @@ -217,7 +217,7 @@ private static String escape(String s) { int n = s.length(); for (int i = 0; i < n; i++) if (!Character.isJavaIdentifierPart(s.charAt(i))) { - StringBuffer sb = new StringBuffer(s.substring(0, i)); + StringBuilder sb = new StringBuilder(s.substring(0, i)); escape(sb, s, i); return sb.toString(); } diff --git a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/model/XmlNode.java b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/model/XmlNode.java index fded62ae3..a44e1515d 100644 --- a/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/model/XmlNode.java +++ b/jaxb-ri/txw/compiler/src/main/java/com/sun/tools/txw2/model/XmlNode.java @@ -10,12 +10,13 @@ package com.sun.tools.txw2.model; +import java.util.Deque; +import java.util.LinkedList; import org.xml.sax.Locator; import javax.xml.namespace.QName; import java.util.HashSet; import java.util.Set; -import java.util.Stack; /** * Either an {@link Element} or {@link Attribute}. @@ -42,7 +43,7 @@ protected XmlNode(Locator location, QName name, Leaf leaf) { protected final Set collectChildren() { Set result = new HashSet<>(); - Stack work = new Stack<>(); + Deque work = new LinkedList<>(); work.push(this); while(!work.isEmpty()) { diff --git a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java index 7f2d5c2a2..31fee99f7 100644 --- a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java +++ b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DataWriter.java @@ -14,11 +14,12 @@ package com.sun.xml.txw2.output; +import java.util.Deque; +import java.util.LinkedList; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import java.io.Writer; -import java.util.Stack; /** @@ -183,7 +184,7 @@ public void reset () { depth = 0; state = SEEN_NOTHING; - stateStack = new Stack<>(); + stateLinkedList = new LinkedList<>(); super.reset(); } @@ -212,7 +213,7 @@ public void startElement (String uri, String localName, String qName, Attributes atts) throws SAXException { - stateStack.push(SEEN_ELEMENT); + stateLinkedList.push(SEEN_ELEMENT); state = SEEN_NOTHING; if (depth > 0) { super.characters("\n"); @@ -251,7 +252,7 @@ public void endElement (String uri, String localName, String qName) doIndent(); } super.endElement(uri, localName, qName); - state = stateStack.pop(); + state = stateLinkedList.pop(); } @@ -356,7 +357,7 @@ private void doIndent () //////////////////////////////////////////////////////////////////// private Object state = SEEN_NOTHING; - private Stack stateStack = new Stack<>(); + private Deque stateLinkedList = new LinkedList<>(); private String indentStep = ""; private int depth = 0; diff --git a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DomSerializer.java b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DomSerializer.java index 3e055e0cd..734d44674 100644 --- a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DomSerializer.java +++ b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/DomSerializer.java @@ -10,6 +10,8 @@ package com.sun.xml.txw2.output; +import java.util.Deque; +import java.util.LinkedList; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -25,7 +27,6 @@ import javax.xml.transform.dom.DOMResult; import java.util.ArrayList; import java.util.List; -import java.util.Stack; import com.sun.xml.txw2.TxwException; @@ -131,7 +132,7 @@ public void flush() { class Dom2SaxAdapter implements ContentHandler, LexicalHandler { private final Node _node; - private final Stack _nodeStk = new Stack<>(); + private final Deque _nodeStk = new LinkedList<>(); private boolean inCDATA; public final Element getCurrentElement() { diff --git a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java index c20287fb4..e6904ad6a 100644 --- a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java +++ b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLFilter.java @@ -10,13 +10,14 @@ package com.sun.xml.txw2.output; +import java.util.Deque; +import java.util.LinkedList; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.ext.LexicalHandler; import org.xml.sax.helpers.XMLFilterImpl; -import java.util.Stack; /** * {@link XMLFilterImpl} that does indentation to SAX events. @@ -119,7 +120,7 @@ public void setIndentStep(String s) { public void startElement (String uri, String localName, String qName, Attributes atts) throws SAXException { - stateStack.push(SEEN_ELEMENT); + stateLinkedList.push(SEEN_ELEMENT); state = SEEN_NOTHING; if (depth > 0) { writeNewLine(); @@ -164,7 +165,7 @@ public void endElement (String uri, String localName, String qName) doIndent(); } super.endElement(uri, localName, qName); - state = stateStack.pop(); + state = stateLinkedList.pop(); } @@ -302,7 +303,7 @@ private void doIndent () //////////////////////////////////////////////////////////////////// private Object state = SEEN_NOTHING; - private Stack stateStack = new Stack<>(); + private Deque stateLinkedList = new LinkedList<>(); private String indentStep = ""; private int depth = 0; diff --git a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java index a607fe087..aec9801e9 100644 --- a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java +++ b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/IndentingXMLStreamWriter.java @@ -10,9 +10,10 @@ package com.sun.xml.txw2.output; +import java.util.Deque; +import java.util.LinkedList; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import java.util.Stack; /** * @author Kohsuke Kawaguchi @@ -23,7 +24,7 @@ public class IndentingXMLStreamWriter extends DelegatingXMLStreamWriter { private final static Object SEEN_DATA = new Object(); private Object state = SEEN_NOTHING; - private Stack stateStack = new Stack<>(); + private Deque stateLinkedList = new LinkedList<>(); private String indentStep = " "; private int depth = 0; @@ -74,7 +75,7 @@ public void setIndentStep(String s) { } private void onStartElement() throws XMLStreamException { - stateStack.push(SEEN_ELEMENT); + stateLinkedList.push(SEEN_ELEMENT); state = SEEN_NOTHING; if (depth > 0) { super.writeCharacters("\n"); @@ -89,7 +90,7 @@ private void onEndElement() throws XMLStreamException { super.writeCharacters("\n"); doIndent(); } - state = stateStack.pop(); + state = stateLinkedList.pop(); } private void onEmptyElement() throws XMLStreamException { diff --git a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/SaxSerializer.java b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/SaxSerializer.java index c0abaa527..bc0f79d11 100644 --- a/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/SaxSerializer.java +++ b/jaxb-ri/txw/runtime/src/main/java/com/sun/xml/txw2/output/SaxSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2021, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -11,13 +11,14 @@ package com.sun.xml.txw2.output; import com.sun.xml.txw2.TxwException; +import java.util.Deque; +import java.util.LinkedList; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.ext.LexicalHandler; import org.xml.sax.helpers.AttributesImpl; import javax.xml.transform.sax.SAXResult; -import java.util.Stack; /** * {@link XmlSerializer} for {@link SAXResult} and {@link ContentHandler}. @@ -75,7 +76,7 @@ public void startDocument() { // namespace prefix bindings // add in #writeXmlns and fired in #endStartTag - private final Stack prefixBindings = new Stack<>(); + private final Deque prefixBindings = new LinkedList<>(); @Override public void writeXmlns(String prefix, String uri) { @@ -93,7 +94,7 @@ public void writeXmlns(String prefix, String uri) { } // element stack - private final Stack elementBindings = new Stack<>(); + private final Deque elementBindings = new LinkedList<>(); @Override public void beginStartTag(String uri, String localName, String prefix) { diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/dtd/TDTDReader.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/dtd/TDTDReader.java index e1184f76a..070e2458d 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/dtd/TDTDReader.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/dtd/TDTDReader.java @@ -12,9 +12,10 @@ import java.io.IOException; import java.util.Collections; +import java.util.Deque; import java.util.HashMap; +import java.util.LinkedList; import java.util.Map; -import java.util.Stack; import javax.xml.namespace.QName; @@ -347,7 +348,7 @@ public void endContentModel(String elementName, short contentModelType) throws S } - private final Stack modelGroups = new Stack<>(); + private final Deque modelGroups = new LinkedList<>(); @Override public void startModelGroup() throws SAXException { diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/dtd/bindinfo/BIUserConversion.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/dtd/bindinfo/BIUserConversion.java index eebbb7391..e0686fb89 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/dtd/bindinfo/BIUserConversion.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/dtd/bindinfo/BIUserConversion.java @@ -15,6 +15,7 @@ import java.util.Map; import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -75,6 +76,9 @@ private static Element parse(String text) { //this is parsing well known schemas, do not configure secure processing - always true DocumentBuilderFactory dbf = XmlFactory.createDocumentBuilderFactory(false); InputSource is = new InputSource(new StringReader(text)); + //https://rules.sonarsource.com/java/RSPEC-2755 + dbf.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, ""); + dbf.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, ""); return dbf.newDocumentBuilder().parse(is).getDocumentElement(); } catch (SAXException | IOException | ParserConfigurationException x) { throw new Error(x); diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/TypePatternBinder.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/TypePatternBinder.java index 4e35820a3..42c44ba81 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/TypePatternBinder.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/relaxng/TypePatternBinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2021, 2022 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -10,9 +10,10 @@ package com.sun.tools.xjc.reader.relaxng; +import java.util.Deque; import java.util.HashSet; +import java.util.LinkedList; import java.util.Set; -import java.util.Stack; import com.sun.tools.rngom.digested.DAttributePattern; import com.sun.tools.rngom.digested.DChoicePattern; @@ -32,7 +33,7 @@ */ final class TypePatternBinder extends DPatternWalker { private boolean canInherit; - private final Stack stack = new Stack<>(); + private final Deque stack = new LinkedList<>(); /** * Patterns that are determined not to be bindable to inheritance. diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/ClassSelector.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/ClassSelector.java index 90fed06fb..4739287ca 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/ClassSelector.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/ClassSelector.java @@ -11,11 +11,12 @@ package com.sun.tools.xjc.reader.xmlschema; import java.io.StringWriter; +import java.util.Deque; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedList; import java.util.Map; import java.util.Set; -import java.util.Stack; import com.sun.codemodel.JCodeModel; import com.sun.codemodel.JJavaName; @@ -89,7 +90,7 @@ public final class ClassSelector extends BindingComponent { /** * A list of {@link Binding}s object that needs to be built. */ - private final Stack bindQueue = new Stack<>(); + private final Deque bindQueue = new LinkedList<>(); /** * {@link CClassInfo}s that are already {@link Binding#build() built}. @@ -106,7 +107,7 @@ public final class ClassSelector extends BindingComponent { * {@link CClassInfoParent}s that determines where a new class * should be created. */ - private final Stack classScopes = new Stack<>(); + private final Deque classScopes = new LinkedList<>(); /** * The component that is being bound to {@link #currentBean}. diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/DefaultParticleBinder.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/DefaultParticleBinder.java index bd0a476ca..c1b824c68 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/DefaultParticleBinder.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/DefaultParticleBinder.java @@ -14,7 +14,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.Hashtable; import java.util.List; import java.util.Map; @@ -279,7 +278,7 @@ void readSuperClass( CClassInfo base ) { /** Keep the computed label names for particles. */ - private final Map labelCache = new Hashtable<>(); + private final Map labelCache = new HashMap<>(); /** * Hides the computeLabel method of the outer class diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/SchemaSetImpl.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/SchemaSetImpl.java index c69e0661d..936f76447 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/SchemaSetImpl.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/SchemaSetImpl.java @@ -40,6 +40,7 @@ import com.sun.xml.xsom.visitor.XSSimpleTypeFunction; import com.sun.xml.xsom.visitor.XSSimpleTypeVisitor; import com.sun.xml.xsom.visitor.XSVisitor; +import java.util.LinkedList; import org.xml.sax.Locator; import javax.xml.namespace.NamespaceContext; @@ -51,12 +52,11 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Vector; public class SchemaSetImpl implements XSSchemaSet { private final Map schemas = new HashMap<>(); - private final Vector schemas2 = new Vector<>(); + private final List schemas2 = new LinkedList<>(); private final List readonlySchemaList = Collections.unmodifiableList(schemas2); /** diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/ParserContext.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/ParserContext.java index 613eca748..715278fc8 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/ParserContext.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/ParserContext.java @@ -17,6 +17,8 @@ import com.sun.xml.xsom.parser.AnnotationParserFactory; import com.sun.xml.xsom.parser.XMLParser; import com.sun.xml.xsom.parser.XSOMParser; +import java.util.LinkedList; +import java.util.List; import org.xml.sax.EntityResolver; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; @@ -29,7 +31,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import java.util.Vector; /** * Provides context information to be used by {@link NGCCRuntimeEx}s. @@ -51,8 +52,8 @@ public class ParserContext { final XMLParser parser; - private final Vector patchers = new Vector<>(); - private final Vector errorCheckers = new Vector<>(); + private final List patchers = new LinkedList<>(); + private final List errorCheckers = new LinkedList<>(); /** * Documents that are parsed already. Used to avoid cyclic inclusion/double diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/state/NGCCRuntime.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/state/NGCCRuntime.java index 4a04b4f72..465949bc4 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/state/NGCCRuntime.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/state/NGCCRuntime.java @@ -12,7 +12,8 @@ import java.text.MessageFormat; import java.util.ArrayList; -import java.util.Stack; +import java.util.Deque; +import java.util.LinkedList; import java.util.StringTokenizer; import org.xml.sax.Attributes; @@ -79,7 +80,7 @@ public void setRootHandler( NGCCHandler rootHandler ) { * as the runtime resets itself after the endDocument method. */ public void reset() { - attStack.clear(); + attLinkedList.clear(); currentAtts = null; currentHandler = null; indent=0; @@ -88,10 +89,10 @@ public void reset() { needIndent = true; redirect = null; redirectionDepth = 0; - text = new StringBuffer(); + text = new StringBuilder(); // add a dummy attributes at the bottom as a "centinel." - attStack.push(new AttributesImpl()); + attLinkedList.push(new AttributesImpl()); } // current content handler can be acccessed via set/getContentHandler. @@ -109,8 +110,8 @@ public void reset() { /** stack of {@link Attributes}. */ - private final Stack attStack = new Stack(); - /** current attributes set. always equal to attStack.peek() */ + private final Deque attLinkedList = new LinkedList(); + /** current attributes set. always equal to attLinkedList.peek() */ private AttributesImpl currentAtts; /** @@ -126,12 +127,12 @@ public Attributes getCurrentAttributes() { } /** accumulated text. */ - private StringBuffer text = new StringBuffer(); + private StringBuilder text = new StringBuilder(); - /** The current NGCCHandler. Always equals to handlerStack.peek() */ + /** The current NGCCHandler. Always equals to handlerLinkedList.peek() */ private NGCCEventReceiver currentHandler; public int replace( NGCCEventReceiver o, NGCCEventReceiver n ) { @@ -210,8 +211,8 @@ private void processPendingText(boolean ignorable) throws SAXException { else currentHandler.text(text.toString()); // otherwise consume this token - // truncate StringBuffer, but avoid excessive allocation. - if(text.length()>1024) text = new StringBuffer(); + // truncate StringBuilder, but avoid excessive allocation. + if(text.length()>1024) text = new StringBuilder(); else text.setLength(0); } @@ -229,7 +230,7 @@ public void startElement(String uri, String localname, String qname, Attributes redirectionDepth++; } else { processPendingText(true); - // System.out.println("startElement:"+localname+"->"+_attrStack.size()); + // System.out.println("startElement:"+localname+"->"+_attrLinkedList.size()); currentHandler.enterElement(uri, localname, qname, atts); } } @@ -251,18 +252,18 @@ public void startElement(String uri, String localname, String qname, Attributes */ public void onEnterElementConsumed( String uri, String localName, String qname,Attributes atts) throws SAXException { - attStack.push(currentAtts=new AttributesImpl(atts)); - nsEffectiveStack.push(nsEffectivePtr); + attLinkedList.push(currentAtts=new AttributesImpl(atts)); + nsEffectiveLinkedList.push(nsEffectivePtr); nsEffectivePtr = namespaces.size(); } public void onLeaveElementConsumed(String uri, String localName, String qname) throws SAXException { - attStack.pop(); - if(attStack.isEmpty()) + attLinkedList.pop(); + if(attLinkedList.isEmpty()) currentAtts = null; else - currentAtts = (AttributesImpl)attStack.peek(); - nsEffectivePtr = (Integer) nsEffectiveStack.pop(); + currentAtts = (AttributesImpl)attLinkedList.peek(); + nsEffectivePtr = (Integer) nsEffectiveLinkedList.pop(); } public void endElement(String uri, String localname, String qname) @@ -487,9 +488,9 @@ public void redirectSubtree( ContentHandler child, private int nsEffectivePtr=0; /** - * Stack to preserve old nsEffectivePtr values. + * LinkedList to preserve old nsEffectivePtr values. */ - private final Stack nsEffectiveStack = new Stack(); + private final Deque nsEffectiveLinkedList = new LinkedList(); public String resolveNamespacePrefix( String prefix ) { for( int i = nsEffectivePtr-2; i>=0; i-=2 ) diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/state/SimpleType_Union.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/state/SimpleType_Union.java index 06758d3e5..fa51287bd 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/state/SimpleType_Union.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/parser/state/SimpleType_Union.java @@ -10,6 +10,8 @@ /* this file is generated by RelaxNGCC */ package com.sun.xml.xsom.impl.parser.state; +import java.util.LinkedList; +import java.util.List; import org.xml.sax.SAXException; import org.xml.sax.Attributes; @@ -434,8 +436,8 @@ public boolean accepted() { /** computed simple type object */ private UnionSimpleTypeImpl result; - // Vector of Ref.SimpleType - private final Vector members = new Vector(); + // LinkedList of Ref.SimpleType + private final List members = new LinkedList(); // locator of private Locator uloc; diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SCDParser.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SCDParser.java index 7b2361615..fa785bc81 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SCDParser.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/impl/scd/SCDParser.java @@ -14,7 +14,6 @@ import java.util.*; import java.io.*; import com.sun.xml.xsom.impl.UName; -import java.util.LinkedList; import java.util.List; import javax.xml.namespace.*; diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/parser/XmlFactory.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/parser/XmlFactory.java index 0bfeccb85..558fa281d 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/parser/XmlFactory.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/parser/XmlFactory.java @@ -65,6 +65,9 @@ private static boolean isXMLSecurityDisabled(boolean runtimeSetting) { public static SAXParserFactory createParserFactory(boolean disableSecureProcessing) throws IllegalStateException { try { SAXParserFactory factory = SAXParserFactory.newInstance(); + //https://rules.sonarsource.com/java/RSPEC-2755 + factory.setFeature("http://xml.org/sax/features/external-general-entities", false); + factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false); if (LOGGER.isLoggable(Level.FINE)) { LOGGER.log(Level.FINE, "SAXParserFactory instance: {0}", factory); } diff --git a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/util/DomAnnotationParserFactory.java b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/util/DomAnnotationParserFactory.java index fd657a376..4b6f57486 100644 --- a/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/util/DomAnnotationParserFactory.java +++ b/jaxb-ri/xsom/src/main/java/com/sun/xml/xsom/util/DomAnnotationParserFactory.java @@ -59,7 +59,12 @@ public AnnotationParser create(boolean disableSecureProcessing) { private static final ContextClassloaderLocal stf = new ContextClassloaderLocal<>() { @Override protected SAXTransformerFactory initialValue() throws Exception { - return (SAXTransformerFactory) SAXTransformerFactory.newInstance(); + final SAXTransformerFactory xmlParserFactory = (SAXTransformerFactory) SAXTransformerFactory.newInstance(); + //https://rules.sonarsource.com/java/RSPEC-2755 + xmlParserFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, ""); + //ACCESS_EXTERNAL_SCHEMA not supported in several TransformerFactory implementations + xmlParserFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, ""); + return xmlParserFactory; } };