# HG changeset patch
# User joehw
# Date 1508897129 25200
# Node ID 711ef438b6ad3df354275beb5b1962d694935df3
# Parent 560ee83bfce5b712abfa105d4c807736dbac5d82
8176891: Fix lint warnings in JAXP repo: serial
Reviewed-by: lancea
diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java Tue Oct 24 08:56:47 2017 -0700
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java Tue Oct 24 19:05:29 2017 -0700
@@ -1,6 +1,6 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +26,7 @@
*/
public final class ConfigurationError
extends Error {
+ private static final long serialVersionUID = 749136645488750664L;
//
// Data
diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java Tue Oct 24 08:56:47 2017 -0700
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java Tue Oct 24 19:05:29 2017 -0700
@@ -1,6 +1,6 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +26,8 @@
* state from which it cannot recover.
*/
public class InternalError extends Error {
+ private static final long serialVersionUID = -6690855975016554786L;
+
/**
* Construct an InternalError
with the specified error message.
* @param msg the error message
diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java Tue Oct 24 08:56:47 2017 -0700
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java Tue Oct 24 19:05:29 2017 -0700
@@ -1,6 +1,6 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +27,7 @@
* As java.lang.AssertionError was introduced in JDK 1.4 we can't use that yet.
*/
public class InternalRuntimeError extends Error {
+ private static final long serialVersionUID = 2802784919179095307L;
public InternalRuntimeError(String message) {
super(message);
diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java Tue Oct 24 08:56:47 2017 -0700
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java Tue Oct 24 19:05:29 2017 -0700
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2009, 2017 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,10 +23,6 @@
* questions.
*/
-/*
- * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved.
- */
-
package com.sun.org.apache.xerces.internal.jaxp.datatype;
@@ -52,6 +49,7 @@
class DurationDayTimeImpl
extends DurationImpl {
+ private static final long serialVersionUID = 844792794952655204L;
public DurationDayTimeImpl(
boolean isPositive,
diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java Tue Oct 24 08:56:47 2017 -0700
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java Tue Oct 24 19:05:29 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2017 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
class DurationYearMonthImpl
extends DurationImpl {
-
+ private static final long serialVersionUID = -4430140662861507958L;
/**
*
Constructs a new Duration object by specifying each field individually.
diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java --- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java Tue Oct 24 08:56:47 2017 -0700 +++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java Tue Oct 24 19:05:29 2017 -0700 @@ -1,6 +1,6 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * @LastModified: Oct 2017 */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -40,6 +40,8 @@ * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com) */ public class WrappedSAXException extends RuntimeException { + private static final long serialVersionUID = -3201986204982729962L; + public final SAXException exception; WrappedSAXException( SAXException e ) { diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java --- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java Tue Oct 24 08:56:47 2017 -0700 +++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java Tue Oct 24 19:05:29 2017 -0700 @@ -1,6 +1,6 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * @LastModified: Oct 2017 */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -24,8 +24,8 @@ /** * A configuration error. This was an internal class in ObjectFactory previously */ -public final class ConfigurationError - extends Error { +public final class ConfigurationError extends Error { + private static final long serialVersionUID = 8095902236393167968L; // // Data diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java --- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java Tue Oct 24 08:56:47 2017 -0700 +++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java Tue Oct 24 19:05:29 2017 -0700 @@ -1,6 +1,6 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * @LastModified: Oct 2017 */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -73,6 +73,7 @@ */ public static class MalformedURIException extends IOException { + private static final long serialVersionUID = 4651455286983598951L; /** * Constructs aMalformedURIException
with no specified
diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java Tue Oct 24 08:56:47 2017 -0700
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java Tue Oct 24 19:05:29 2017 -0700
@@ -1,6 +1,6 @@
/*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -61,7 +61,7 @@
*/
public class URI implements Serializable
{
- static final long serialVersionUID = 7096266377907081897L;
+ private static final long serialVersionUID = 7096266377907081897L;
/**
* MalformedURIExceptions are thrown in the process of building a URI
@@ -71,6 +71,7 @@
*/
public static class MalformedURIException extends IOException
{
+ private static final long serialVersionUID = -8498313684991136829L;
/**
* Constructs a MalformedURIException
with no specified
diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java
--- a/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java Tue Oct 24 08:56:47 2017 -0700
+++ b/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java Tue Oct 24 19:05:29 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
*/
public class DatatypeConfigurationException extends Exception {
+ private static final long serialVersionUID = -1699373159027047238L;
/**
* Create a new DatatypeConfigurationException
with
diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/javax/xml/namespace/QName.java
--- a/src/java.xml/share/classes/javax/xml/namespace/QName.java Tue Oct 24 08:56:47 2017 -0700
+++ b/src/java.xml/share/classes/javax/xml/namespace/QName.java Tue Oct 24 19:05:29 2017 -0700
@@ -70,57 +70,8 @@
*/
public class QName implements Serializable {
-
- /**
- *
Stream Unique Identifier.
- * - *Due to a historical defect, QName was released with multiple - * serialVersionUID values even though its serialization was the - * same.
- * - *To workaround this issue, serialVersionUID is set with either - * a default value or a compatibility value. To use the - * compatibility value, set the system property:
- * - *com.sun.xml.namespace.QName.useCompatibleSerialVersionUID=1.0
- *
- * This workaround was inspired by classes in the javax.management - * package, e.g. ObjectName, etc. - * See CR6267224 for original defect report.
- */ - private static final long serialVersionUID; - /** - *Default serialVersionUID
value.
Compatibility serialVersionUID
value.
Flag to use default or campatible serialVersionUID.
- */ - private static boolean useDefaultSerialVersionUID = true; - static { - try { - // use a privileged block as reading a system property - String valueUseCompatibleSerialVersionUID = SecuritySupport.getSystemProperty( - "com.sun.xml.namespace.QName.useCompatibleSerialVersionUID"); - - useDefaultSerialVersionUID = (valueUseCompatibleSerialVersionUID != null - && valueUseCompatibleSerialVersionUID.equals("1.0")) ? false : true; - } catch (Exception exception) { - // use default if any Exceptions - useDefaultSerialVersionUID = true; - } - - // set serialVersionUID to desired value - if (useDefaultSerialVersionUID) { - serialVersionUID = defaultSerialVersionUID; - } else { - serialVersionUID = compatibleSerialVersionUID; - } - } + // tests show that the ID is the same from JDK 1.5 through JDK 9 + private static final long serialVersionUID = -9120448754896609940L; /** *Namespace URI of this QName
.
ParserConfigurationException
with no
* detail message.
diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java
--- a/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java Tue Oct 24 08:56:47 2017 -0700
+++ b/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java Tue Oct 24 19:05:29 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2017 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@
*/
public class XMLStreamException extends Exception {
+ private static final long serialVersionUID = 2018819321811497362L;
protected Throwable nested;
protected Location location;
diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/org/w3c/dom/events/EventException.java
--- a/src/java.xml/share/classes/org/w3c/dom/events/EventException.java Tue Oct 24 08:56:47 2017 -0700
+++ b/src/java.xml/share/classes/org/w3c/dom/events/EventException.java Tue Oct 24 19:05:29 2017 -0700
@@ -48,6 +48,8 @@
* @since 1.5, DOM Level 2
*/
public class EventException extends RuntimeException {
+ private static final long serialVersionUID = 242753408332692061L;
+
public EventException(short code, String message) {
super(message);
this.code = code;
diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/org/w3c/dom/ls/LSException.java
--- a/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java Tue Oct 24 08:56:47 2017 -0700
+++ b/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java Tue Oct 24 19:05:29 2017 -0700
@@ -58,6 +58,8 @@
* @since 1.5
*/
public class LSException extends RuntimeException {
+ private static final long serialVersionUID = 5371691160978884690L;
+
public LSException(short code, String message) {
super(message);
this.code = code;
diff -r 560ee83bfce5 -r 711ef438b6ad src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java
--- a/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java Tue Oct 24 08:56:47 2017 -0700
+++ b/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java Tue Oct 24 19:05:29 2017 -0700
@@ -48,6 +48,8 @@
* @since 9, DOM Level 2
*/
public class RangeException extends RuntimeException {
+ private static final long serialVersionUID = 2427563372446661889L;
+
public RangeException(short code, String message) {
super(message);
this.code = code;