Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025 Contributors to the Eclipse Foundation. 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
Expand Down Expand Up @@ -28,8 +29,7 @@
*
* @author Kohsuke Kawaguchi
*/
@SuppressWarnings({"removal"})
public interface J2SJAXBModel extends com.sun.tools.xjc.api.J2SJAXBModel {
public interface J2SJAXBModel extends JAXBModel {
/**
* Returns the name of the XML Type bound to the
* specified Java type.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025 Contributors to the Eclipse Foundation. 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
Expand All @@ -24,8 +25,7 @@
* @author
* Kohsuke Kawaguchi ([email protected])
*/
@SuppressWarnings({"removal"})
public interface JavaCompiler extends com.sun.tools.xjc.api.JavaCompiler {
public interface JavaCompiler {

/**
* Compiles the given annotated Java source code.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025 Contributors to the Eclipse Foundation. 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
Expand Down Expand Up @@ -124,7 +125,6 @@ public JAXBModelImpl(TypeInfoSet<TypeMirror, TypeElement, VariableElement, Execu
}

@Override
@SuppressWarnings({"deprecation"})
public List<String> getClassList() {
return classList;
}
Expand Down Expand Up @@ -152,12 +152,6 @@ private NonElement<TypeMirror, TypeElement> getXmlType(Reference r) {
return types.getTypeInfo(ref);
}

@Override
@SuppressWarnings({"removal"})
public QName getXmlTypeName(com.sun.tools.xjc.api.Reference javaType) {
return getXmlTypeName(new Reference(javaType.type, javaType.annotations));
}

@Override
public void generateSchema(SchemaOutputResolver outputResolver, ErrorListener errorListener) throws IOException {
getSchemaGenerator().write(outputResolver,errorListener);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025 Contributors to the Eclipse Foundation. 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
Expand All @@ -14,7 +15,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;

import jakarta.xml.bind.annotation.XmlList;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
Expand Down Expand Up @@ -82,25 +82,6 @@ public J2SJAXBModel bind(
return new JAXBModelImpl(r, builder.reader, rootClasses, new HashMap<>(additionalElementDecls));
}

@Override
@SuppressWarnings({"removal"})
public J2SJAXBModel bind(
Collection<com.sun.tools.xjc.api.Reference> rootTypes,
Map<QName, com.sun.tools.xjc.api.Reference> additionalElementDecls,
String defaultNamespaceRemap,
ProcessingEnvironment env) {
Collection<Reference> types = rootTypes.stream().map(ref -> new Reference(ref.type, ref.annotations)).collect(Collectors.toList());
Map<QName, Reference> elements = additionalElementDecls.entrySet()
.stream()
.collect(
Collectors.toMap(
Map.Entry::getKey,
e -> new Reference(e.getValue().type, e.getValue().annotations)
)
);
return bind(types, elements, env, defaultNamespaceRemap);
}

private static final class ErrorHandlerImpl implements ErrorHandler {
private final Messager messager;

Expand Down
3 changes: 2 additions & 1 deletion jaxb-ri/jxc/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2017, 2023 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025 Contributors to the Eclipse Foundation. 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
Expand All @@ -14,7 +15,7 @@
module org.glassfish.jaxb.jxc {

requires transitive jakarta.xml.bind;
requires transitive java.compiler;
requires static java.compiler;
requires jdk.compiler;
requires java.logging;
requires transitive org.glassfish.jaxb.runtime;
Expand Down
73 changes: 0 additions & 73 deletions jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/J2SJAXBModel.java

This file was deleted.

69 changes: 0 additions & 69 deletions jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/JavaCompiler.java

This file was deleted.

96 changes: 0 additions & 96 deletions jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/api/Reference.java

This file was deleted.

2 changes: 1 addition & 1 deletion jaxb-ri/xjc/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2017, 2023 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025 Contributors to the Eclipse Foundation. 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
Expand All @@ -17,7 +18,6 @@
requires transitive jakarta.activation;

requires java.logging;
requires static java.compiler; // required by com.sun.tools.xjc.api.Reference used by jxc
requires transitive java.xml;
requires java.desktop;

Expand Down