You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ti...@apache.org on 2024/02/24 15:39:59 UTC
(tika) branch main updated (b679545b9 -> f37fcad37)
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
from b679545b9 TIKA-4166: update aws, azure, mime4j
new 297fcd187 TIKA-4203: add @Deprecated annotation
new bfce47310 TIKA-4203: add @Deprecated / @Override annotation
new f37fcad37 TIKA-4203: add @Deprecated / @Override annotation
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tika-core/src/main/java/org/apache/tika/metadata/IPTC.java | 8 ++++++++
tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java | 4 +++-
.../src/main/java/org/apache/tika/parser/AbstractParser.java | 1 +
.../src/main/java/org/apache/tika/parser/ParserDecorator.java | 1 +
.../org/apache/tika/parser/multiple/AbstractMultipleParser.java | 1 +
.../src/main/java/org/apache/tika/detect/ole/MiscOLEDetector.java | 4 +++-
.../src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java | 1 +
.../src/main/java/org/apache/tika/parser/xml/MetadataHandler.java | 4 ++++
8 files changed, 22 insertions(+), 2 deletions(-)
(tika) 01/03: TIKA-4203: add @Deprecated annotation
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 297fcd187c186147423ced3a3a25fe01c42e02a2
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Feb 24 16:35:12 2024 +0100
TIKA-4203: add @Deprecated annotation
---
tika-core/src/main/java/org/apache/tika/metadata/IPTC.java | 8 ++++++++
tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java | 4 +++-
.../src/main/java/org/apache/tika/parser/AbstractParser.java | 1 +
.../src/main/java/org/apache/tika/parser/ParserDecorator.java | 1 +
.../org/apache/tika/parser/multiple/AbstractMultipleParser.java | 1 +
5 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/tika-core/src/main/java/org/apache/tika/metadata/IPTC.java b/tika-core/src/main/java/org/apache/tika/metadata/IPTC.java
index d20f45038..f5fa6442b 100644
--- a/tika-core/src/main/java/org/apache/tika/metadata/IPTC.java
+++ b/tika-core/src/main/java/org/apache/tika/metadata/IPTC.java
@@ -506,6 +506,7 @@ public interface IPTC {
*
* @deprecated
*/
+ @Deprecated
Property URGENCY = Photoshop.URGENCY;
/**
@@ -518,6 +519,7 @@ public interface IPTC {
*
* @deprecated
*/
+ @Deprecated
Property CATEGORY = Photoshop.CATEGORY;
/**
@@ -528,6 +530,7 @@ public interface IPTC {
*
* @deprecated
*/
+ @Deprecated
Property SUPPLEMENTAL_CATEGORIES = Photoshop.SUPPLEMENTAL_CATEGORIES;
/**
@@ -638,6 +641,7 @@ public interface IPTC {
*
* @deprecated
*/
+ @Deprecated
Property DIGITAL_SOURCE_FILE_TYPE = Property.internalText(
PREFIX_IPTC_EXT + TikaCoreProperties.NAMESPACE_PREFIX_DELIMITER +
"DigitalSourcefileType");
@@ -690,6 +694,7 @@ public interface IPTC {
/**
* @deprecated use {@link IPTC#IMAGE_SUPPLIER_ID}
*/
+ @Deprecated
String IMAGE_SUPPLIER_ID_WRONG_CASE =
PREFIX_PLUS + TikaCoreProperties.NAMESPACE_PREFIX_DELIMITER + "ImageSupplierId";
/**
@@ -796,6 +801,7 @@ public interface IPTC {
/**
* @deprecated use {@link IPTC#COPYRIGHT_OWNER_ID}
*/
+ @Deprecated
String COPYRIGHT_OWNER_ID_WRONG_CASE =
PREFIX_PLUS + TikaCoreProperties.NAMESPACE_PREFIX_DELIMITER + "CopyrightOwnerId";
/**
@@ -839,6 +845,7 @@ public interface IPTC {
/**
* @deprecated use {@link IPTC#IMAGE_CREATOR_ID}
*/
+ @Deprecated
String IMAGE_CREATOR_ID_WRONG_CASE =
PREFIX_PLUS + TikaCoreProperties.NAMESPACE_PREFIX_DELIMITER + "ImageCreatorId";
/**
@@ -883,6 +890,7 @@ public interface IPTC {
/**
* @deprecated use {@link IPTC#LICENSOR_ID}
*/
+ @Deprecated
String LICENSOR_ID_WRONG_CASE =
PREFIX_PLUS + TikaCoreProperties.NAMESPACE_PREFIX_DELIMITER + "LicensorId";
/**
diff --git a/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java b/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java
index 40e4d33af..10ef6cbc7 100644
--- a/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java
+++ b/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java
@@ -177,6 +177,7 @@ public final class MimeTypes implements Detector, Serializable {
* @return the Mime Content Type of the specified document name
* @deprecated Use {@link Tika#detect(String)} instead
*/
+ @Deprecated
public MimeType getMimeType(String name) {
MimeType type = patterns.matches(name);
if (type != null) {
@@ -200,6 +201,7 @@ public final class MimeTypes implements Detector, Serializable {
* @throws IOException if the file can't be read
* @deprecated Use {@link Tika#detect(File)} instead
*/
+ @Deprecated
public MimeType getMimeType(File file) throws MimeTypeException, IOException {
return forName(new Tika(this).detect(file));
}
@@ -369,7 +371,7 @@ public final class MimeTypes implements Detector, Serializable {
/**
* Returns the registered, normalised media type with the given name (or alias).
*
- * <p>Unlike {@link #forName(String)}, this function will <em>not<em> create a
+ * <p>Unlike {@link #forName(String)}, this function will <em>not</em> create a
* new MimeType and register it. Instead, <code>null</code> will be returned if
* there is no definition available for the given name.
*
diff --git a/tika-core/src/main/java/org/apache/tika/parser/AbstractParser.java b/tika-core/src/main/java/org/apache/tika/parser/AbstractParser.java
index ebd37a3d3..f6017d6c0 100644
--- a/tika-core/src/main/java/org/apache/tika/parser/AbstractParser.java
+++ b/tika-core/src/main/java/org/apache/tika/parser/AbstractParser.java
@@ -51,6 +51,7 @@ public abstract class AbstractParser implements Parser {
* @deprecated use the {@link Parser#parse(InputStream, ContentHandler,
* Metadata, ParseContext)} method instead
*/
+ @Deprecated
public void parse(InputStream stream, ContentHandler handler, Metadata metadata)
throws IOException, SAXException, TikaException {
parse(stream, handler, metadata, new ParseContext());
diff --git a/tika-core/src/main/java/org/apache/tika/parser/ParserDecorator.java b/tika-core/src/main/java/org/apache/tika/parser/ParserDecorator.java
index 587277aad..32d6661fb 100644
--- a/tika-core/src/main/java/org/apache/tika/parser/ParserDecorator.java
+++ b/tika-core/src/main/java/org/apache/tika/parser/ParserDecorator.java
@@ -120,6 +120,7 @@ public class ParserDecorator implements Parser {
*
* @deprecated This has been replaced by {@link FallbackParser}
*/
+ @Deprecated
public static final Parser withFallbacks(final Collection<? extends Parser> parsers,
final Set<MediaType> types) {
// Delegate to the new FallbackParser for now, until people upgrade
diff --git a/tika-core/src/main/java/org/apache/tika/parser/multiple/AbstractMultipleParser.java b/tika-core/src/main/java/org/apache/tika/parser/multiple/AbstractMultipleParser.java
index e1dd2baac..9f2ea8a3b 100644
--- a/tika-core/src/main/java/org/apache/tika/parser/multiple/AbstractMultipleParser.java
+++ b/tika-core/src/main/java/org/apache/tika/parser/multiple/AbstractMultipleParser.java
@@ -252,6 +252,7 @@ public abstract class AbstractMultipleParser implements Parser {
* @deprecated The {@link ContentHandlerFactory} override is still experimental
* and the method signature is subject to change before Tika 2.0
*/
+ @Deprecated
public void parse(InputStream stream, ContentHandlerFactory handlers, Metadata metadata,
ParseContext context) throws IOException, SAXException, TikaException {
parse(stream, null, handlers, metadata, context);
(tika) 02/03: TIKA-4203: add @Deprecated / @Override annotation
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit bfce473109c8692815db5ccb2280e9dac6d3e3d8
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Feb 24 16:38:06 2024 +0100
TIKA-4203: add @Deprecated / @Override annotation
---
.../src/main/java/org/apache/tika/parser/xml/MetadataHandler.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/MetadataHandler.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/MetadataHandler.java
index e21aebe23..75a8e1e0f 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/MetadataHandler.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-xml-module/src/main/java/org/apache/tika/parser/xml/MetadataHandler.java
@@ -31,6 +31,7 @@ import org.apache.tika.metadata.Property;
* @deprecated Use the {@link AttributeMetadataHandler} and
* {@link ElementMetadataHandler} classes instead
*/
+@Deprecated
public class MetadataHandler extends DefaultHandler {
private final Metadata metadata;
@@ -67,11 +68,13 @@ public class MetadataHandler extends DefaultHandler {
}
}
+ @Override
public void endElement(String uri, String localName, String name) {
addMetadata(buffer.toString());
buffer.setLength(0);
}
+ @Override
public void startElement(String uri, String localName, String name, Attributes attributes) {
for (int i = 0; i < attributes.getLength(); i++) {
addMetadata(attributes.getValue(i));
@@ -79,6 +82,7 @@ public class MetadataHandler extends DefaultHandler {
}
+ @Override
public void characters(char[] ch, int start, int length) {
buffer.append(ch, start, length);
}
(tika) 03/03: TIKA-4203: add @Deprecated / @Override annotation
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit f37fcad37f375fc70e01adb68a494fae942f1e67
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Feb 24 16:38:53 2024 +0100
TIKA-4203: add @Deprecated / @Override annotation
---
.../src/main/java/org/apache/tika/detect/ole/MiscOLEDetector.java | 4 +++-
.../src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/detect/ole/MiscOLEDetector.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/detect/ole/MiscOLEDetector.java
index aefac501b..b6372903e 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/detect/ole/MiscOLEDetector.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/detect/ole/MiscOLEDetector.java
@@ -75,6 +75,7 @@ public class MiscOLEDetector implements Detector {
* entry of the filesystem whose type is to be detected, as a
* second argument.
*/
+ @Deprecated
protected static MediaType detect(Set<String> names) {
return detect(names, null);
}
@@ -90,7 +91,7 @@ public class MiscOLEDetector implements Detector {
* @return
*/
protected static MediaType detect(Set<String> names, DirectoryEntry root) {
- if (names == null || names.size() == 0) {
+ if (names == null || names.isEmpty()) {
return OLE;
} else if (names.contains("\u0005HwpSummaryInformation")) {
// Hangul Word Processor v5+ (previous aren't OLE2-based)
@@ -162,6 +163,7 @@ public class MiscOLEDetector implements Detector {
}
}
+ @Override
public MediaType detect(InputStream input, Metadata metadata) throws IOException {
// Check if we have access to the document
if (input == null) {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java
index ad52ca775..dac96295c 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java
@@ -115,6 +115,7 @@ public class IptcAnpaParser implements Parser {
/**
* @deprecated This method will be removed in Apache Tika 1.0.
*/
+ @Deprecated
public void parse(InputStream stream, ContentHandler handler, Metadata metadata)
throws IOException, SAXException, TikaException {
parse(stream, handler, metadata, new ParseContext());