This is an automated email from the ASF dual-hosted git repository. veithen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push: new 5b036d1b8 [AXIOM-506] Remove some more DataHandler related legacy classes 5b036d1b8 is described below commit 5b036d1b8a67bcef1aecc4083466c763271a80d4 Author: Andreas Veithen <andreas.veit...@gmail.com> AuthorDate: Tue Nov 1 23:28:02 2022 +0000 [AXIOM-506] Remove some more DataHandler related legacy classes --- .../om/impl/builder/DataHandlerReaderUtils.java | 40 -------------- .../axiom/util/jaxb/UnmarshallerAdapter.java | 63 ---------------------- 2 files changed, 103 deletions(-) diff --git a/axiom-compat/src/main/java/org/apache/axiom/om/impl/builder/DataHandlerReaderUtils.java b/axiom-compat/src/main/java/org/apache/axiom/om/impl/builder/DataHandlerReaderUtils.java deleted file mode 100644 index 4b529a8a3..000000000 --- a/axiom-compat/src/main/java/org/apache/axiom/om/impl/builder/DataHandlerReaderUtils.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.axiom.om.impl.builder; - -import javax.xml.stream.XMLStreamReader; - -import org.apache.axiom.ext.stax.datahandler.DataHandlerReader; -import org.apache.axiom.util.stax.XMLStreamReaderUtils; - -/** - * @deprecated Use the corresponding methods in {@link XMLStreamReaderUtils} instead. - */ -public class DataHandlerReaderUtils { - private DataHandlerReaderUtils() {} - - public static DataHandlerReader getDataHandlerReader(final XMLStreamReader reader) { - return XMLStreamReaderUtils.getDataHandlerReader(reader); - } - - public static Object processGetProperty(DataHandlerReader extension, String propertyName) { - return XMLStreamReaderUtils.processGetProperty(extension, propertyName); - } -} diff --git a/axiom-compat/src/main/java/org/apache/axiom/util/jaxb/UnmarshallerAdapter.java b/axiom-compat/src/main/java/org/apache/axiom/util/jaxb/UnmarshallerAdapter.java deleted file mode 100644 index c6c10575f..000000000 --- a/axiom-compat/src/main/java/org/apache/axiom/util/jaxb/UnmarshallerAdapter.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.axiom.util.jaxb; - -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.attachment.AttachmentUnmarshaller; -import javax.xml.stream.XMLStreamReader; - -import org.apache.axiom.ext.stax.datahandler.DataHandlerReader; - -/** - * Adapter that enables an {@link Unmarshaller} to perform XOP/MTOM processing on an - * {@link XMLStreamReader} that exposes the {@link DataHandlerReader} extension. - * - * @see JAXBUtils#getUnmarshallerAdapter(XMLStreamReader) - * - * @deprecated - */ -public class UnmarshallerAdapter { - private final XMLStreamReader reader; - private final AttachmentUnmarshaller attachmentUnmarshaller; - - UnmarshallerAdapter(XMLStreamReader reader, AttachmentUnmarshaller attachmentUnmarshaller) { - this.reader = reader; - this.attachmentUnmarshaller = attachmentUnmarshaller; - } - - /** - * Get the {@link XMLStreamReader} to be passed to the {@link Unmarshaller}. - * - * @return the reader - */ - public XMLStreamReader getReader() { - return reader; - } - - /** - * Get the {@link AttachmentUnmarshaller} to be configured on the {@link Unmarshaller}. - * - * @return the {@link AttachmentUnmarshaller} instance; this may be <code>null</code> if the - * underlying {@link XMLStreamReader} doesn't expose the {@link DataHandlerReader} - * extension - */ - public AttachmentUnmarshaller getAttachmentUnmarshaller() { - return attachmentUnmarshaller; - } -}