#188: Remove deprecated jakarta.xml.bind.Validator

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
jakartaee · Jun 16, 2021 · 7b78b7f · 7b78b7f
1 parent f2897d7
commit 7b78b7f
Show file tree

Hide file tree

Showing 31 changed files with 52 additions and 571 deletions.
diff --git a/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextServiceProviderNPETest.java b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextServiceProviderNPETest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 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
@@ -51,10 +51,6 @@ public Marshaller createMarshaller() throws JAXBException {
             return null;
         }
 
-        @Override
-        public Validator createValidator() throws JAXBException {
-            return null;
-        }
     }
 
     @Test

diff --git a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid.java b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 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
@@ -14,7 +14,6 @@
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
 import jakarta.xml.bind.Unmarshaller;
-import jakarta.xml.bind.Validator;
 import java.util.Map;
 
 /**
@@ -43,10 +42,5 @@ public Unmarshaller createUnmarshaller() throws JAXBException {
         public Marshaller createMarshaller() throws JAXBException {
             return null;
         }
-
-        @Override
-        public Validator createValidator() throws JAXBException {
-            return null;
-        }
     }
 }
diff --git a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid2.java b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 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
@@ -14,7 +14,6 @@
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
 import jakarta.xml.bind.Unmarshaller;
-import jakarta.xml.bind.Validator;
 import java.util.Map;
 
 /**
@@ -44,10 +43,5 @@ public Unmarshaller createUnmarshaller() throws JAXBException {
         public Marshaller createMarshaller() throws JAXBException {
             return null;
         }
-
-        @Override
-        public Validator createValidator() throws JAXBException {
-            return null;
-        }
     }
 }
diff --git a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid3.java b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 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
@@ -14,7 +14,6 @@
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
 import jakarta.xml.bind.Unmarshaller;
-import jakarta.xml.bind.Validator;
 import java.util.Map;
 
 /**
@@ -44,10 +43,5 @@ public Unmarshaller createUnmarshaller() throws JAXBException {
         public Marshaller createMarshaller() throws JAXBException {
             return null;
         }
-
-        @Override
-        public Validator createValidator() throws JAXBException {
-            return null;
-        }
     }
 }
diff --git a/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid.java b/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 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
@@ -15,7 +15,6 @@
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
 import jakarta.xml.bind.Unmarshaller;
-import jakarta.xml.bind.Validator;
 import java.util.Map;
 
 /**
@@ -43,11 +42,6 @@ public Unmarshaller createUnmarshaller() throws JAXBException {
         public Marshaller createMarshaller() throws JAXBException {
             return null;
         }
-
-        @Override
-        public Validator createValidator() throws JAXBException {
-            return null;
-        }
     }
 
 }
diff --git a/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid2.java b/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 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
@@ -15,7 +15,6 @@
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
 import jakarta.xml.bind.Unmarshaller;
-import jakarta.xml.bind.Validator;
 import java.util.Map;
 
 /**
@@ -43,11 +42,6 @@ public Unmarshaller createUnmarshaller() throws JAXBException {
         public Marshaller createMarshaller() throws JAXBException {
             return null;
         }
-
-        @Override
-        public Validator createValidator() throws JAXBException {
-            return null;
-        }
     }
 
 }
diff --git a/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid3.java b/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 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
@@ -15,7 +15,6 @@
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
 import jakarta.xml.bind.Unmarshaller;
-import jakarta.xml.bind.Validator;
 import java.util.Map;
 
 /**
@@ -44,10 +43,6 @@ public Marshaller createMarshaller() throws JAXBException {
             return null;
         }
 
-        @Override
-        public Validator createValidator() throws JAXBException {
-            return null;
-        }
     }
 
 }
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/JAXBContext.java b/jaxb-api/src/main/java/jakarta/xml/bind/JAXBContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 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
@@ -159,14 +159,8 @@
  *
  * <h3>Validation</h3>
  * <p>
- * Validation has been changed significantly since JAXB 1.0.  The {@link Validator}
- * class has been deprecated and made optional.  This means that you are advised
- * not to use this class and, in fact, it may not even be available depending on
- * your Jakarta XML Binding provider.  JAXB 1.0 client applications that rely on {@code Validator}
- * will still work properly when deployed with the JAXB 1.0 runtime system.
- *
  * In Jakarta XML Binding, the {@link Unmarshaller} has included convenience methods that expose
- * the JAXP 1.3 {@link javax.xml.validation} framework.  Please refer to the
+ * the JAXP {@link javax.xml.validation} framework.  Please refer to the
  * {@link Unmarshaller#setSchema(javax.xml.validation.Schema)} API for more
  * information.
  *
@@ -715,22 +709,6 @@ public static JAXBContext newInstance( Class<?>[] classesToBeBound, Map<String,?
     public abstract Marshaller createMarshaller() throws JAXBException;
 
 
-    /**
-     * {@link Validator} has been made optional and deprecated in Jakarta XML Binding.  Please
-     * refer to the javadoc for {@link Validator} for more detail.
-     * <p>
-     * Create a {@code Validator} object that can be used to validate a
-     * java content tree against its source schema.
-     *
-     * @return a {@code Validator} object
-     *
-     * @throws JAXBException if an error was encountered while creating the
-     *                       {@code Validator} object
-     * @deprecated since JAXB2.0
-     */
-    @Deprecated
-    public abstract Validator createValidator() throws JAXBException;
-
     /**
      * Creates a {@code Binder} object that can be used for
      * associative/in-place unmarshalling/marshalling.

diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/Marshaller.java b/jaxb-api/src/main/java/jakarta/xml/bind/Marshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 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
@@ -294,7 +294,6 @@
  * 
  * @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
  * @see JAXBContext
- * @see Validator
  * @see Unmarshaller
  * @since 1.6, JAXB 1.0
  */
@@ -701,7 +700,7 @@ public ValidationEventHandler getEventHandler()
     AttachmentMarshaller getAttachmentMarshaller();
 
     /**
-     * Specify the JAXP 1.3 {@link javax.xml.validation.Schema Schema}
+     * Specify the JAXP {@link javax.xml.validation.Schema Schema}
      * object that should be used to validate subsequent marshal operations
      * against.  Passing null into this method will disable validation.
      *
@@ -720,7 +719,7 @@ public ValidationEventHandler getEventHandler()
     public void setSchema( Schema schema );
 
     /**
-     * Get the JAXP 1.3 {@link javax.xml.validation.Schema Schema} object
+     * Get the JAXP {@link javax.xml.validation.Schema Schema} object
      * being used to perform marshal-time validation.  If there is no
      * Schema set on the marshaller, then this method will return null
      * indicating that marshal-time validation will not be performed.

diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/NotIdentifiableEvent.java b/jaxb-api/src/main/java/jakarta/xml/bind/NotIdentifiableEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021 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
@@ -15,7 +15,6 @@
  * 
  * 
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul> 
- * @see Validator
  * @see ValidationEventHandler
  * @since 1.6, JAXB 1.0
  */

diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/PropertyException.java b/jaxb-api/src/main/java/jakarta/xml/bind/PropertyException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2021 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
@@ -18,7 +18,6 @@
  * 
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
  * @see JAXBContext
- * @see Validator
  * @see Unmarshaller
  * @since 1.6, JAXB 1.0
  */