remove jakarta.xml.bind.Validator reference from SomeJaxbContext.java

Signed-off-by: Scott Marlow <smarlow@redhat.com>
jakartaee · Nov 5, 2021 · e1a2809 · e1a2809
1 parent 42de7fc
commit e1a2809
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/src/com/sun/ts/tests/jaxrs/spec/provider/jaxbcontext/SomeJaxbContext.java b/src/com/sun/ts/tests/jaxrs/spec/provider/jaxbcontext/SomeJaxbContext.java
@@ -20,7 +20,6 @@
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
 import jakarta.xml.bind.Unmarshaller;
-import jakarta.xml.bind.Validator;
 
 @SuppressWarnings("deprecation")
 public class SomeJaxbContext extends JAXBContext {
@@ -35,9 +34,4 @@ public Unmarshaller createUnmarshaller() throws JAXBException {
     return new SomeUnmarshaller();
   }
 
-  @Override
-  public Validator createValidator() throws JAXBException {
-    return null;
-  }
-
 }
diff --git a/src/com/sun/ts/tests/jaxrs/spec/provider/jaxbcontext/SomeMarshaller.java b/src/com/sun/ts/tests/jaxrs/spec/provider/jaxbcontext/SomeMarshaller.java
@@ -45,7 +45,7 @@
 public class SomeMarshaller implements Marshaller {
 
   @Override
-  public <A extends XmlAdapter> A getAdapter(Class<A> arg0) {
+  public <A extends XmlAdapter<?, ?>> A getAdapter(Class<A> arg0) {
     return null;
   }
 
@@ -165,11 +165,11 @@ public void marshal(Object jaxbElement, XMLEventWriter writer)
   }
 
   @Override
-  public void setAdapter(XmlAdapter adapter) {
+  public <A extends XmlAdapter<?, ?>> void setAdapter( Class<A> type, A adapter ) {
   }
 
   @Override
-  public <A extends XmlAdapter> void setAdapter(Class<A> type, A adapter) {
+  public <A extends XmlAdapter<?, ?>> void setAdapter( A adapter ) {
   }
 
   @Override

diff --git a/src/com/sun/ts/tests/jaxrs/spec/provider/jaxbcontext/SomeUnmarshaller.java b/src/com/sun/ts/tests/jaxrs/spec/provider/jaxbcontext/SomeUnmarshaller.java
@@ -48,7 +48,7 @@
 public class SomeUnmarshaller implements Unmarshaller {
 
   @Override
-  public <A extends XmlAdapter> A getAdapter(Class<A> type) {
+  public <A extends XmlAdapter<?, ?>> A getAdapter(Class<A> type) {
     return null;
   }
 
@@ -82,17 +82,12 @@ public UnmarshallerHandler getUnmarshallerHandler() {
     return null;
   }
 
-  @Override
-  public boolean isValidating() throws JAXBException {
-    return false;
-  }
-
   @Override
   public void setAdapter(XmlAdapter adapter) {
   }
 
   @Override
-  public <A extends XmlAdapter> void setAdapter(Class<A> type, A adapter) {
+  public <A extends XmlAdapter<?, ?>> void setAdapter(Class<A> type, A adapter) { 
   }
 
   @Override
@@ -116,10 +111,6 @@ public void setProperty(String name, Object value) throws PropertyException {
   public void setSchema(Schema schema) {
   }
 
-  @Override
-  public void setValidating(boolean validating) throws JAXBException {
-  }
-
   @Override
   public Object unmarshal(File f) throws JAXBException {
     try {