Skip to content

Commit 4b12234

Browse files
committed
TIKA-4545: checkstyle and minor bug fixes
1 parent 7cfa946 commit 4b12234

39 files changed

Lines changed: 28 additions & 99 deletions

File tree

tika-annotation-processor/src/main/java/org/apache/tika/annotation/TikaComponentProcessor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public class TikaComponentProcessor extends AbstractProcessor {
6969
SERVICE_INTERFACES.put("org.apache.tika.parser.Parser", "parsers");
7070
SERVICE_INTERFACES.put("org.apache.tika.detect.Detector", "detectors");
7171
SERVICE_INTERFACES.put("org.apache.tika.detect.EncodingDetector", "encoding-detectors");
72+
SERVICE_INTERFACES.put("org.apache.tika.language.detect.LanguageDetector", "language-detectors");
7273
SERVICE_INTERFACES.put("org.apache.tika.language.translate.Translator", "translators");
7374
SERVICE_INTERFACES.put("org.apache.tika.renderer.Renderer", "renderers");
7475
SERVICE_INTERFACES.put("org.apache.tika.metadata.filter.MetadataFilter", "metadata-filters");

tika-core/src/main/java/org/apache/tika/config/ConfigBase.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -364,11 +364,8 @@ private static boolean hasChildNodes(Node param) {
364364
}
365365

366366
private static void tryToSetSet(Object object, Node param) throws TikaConfigException {
367-
// if (hasClass(param)) {
368-
// tryToSetClassList(object, param);
369-
// } else {
370-
tryToSetStringSet(object, param);
371-
// }
367+
//simple hack for now -- only handle Set<String>
368+
tryToSetStringSet(object, param);
372369
}
373370

374371
private static void tryToSetStringSet(Object object, Node param) throws TikaConfigException {

tika-core/src/main/java/org/apache/tika/detect/OverrideEncodingDetector.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.nio.charset.StandardCharsets;
2424

2525
import org.apache.tika.config.ConfigDeserializer;
26-
import org.apache.tika.config.Field;
2726
import org.apache.tika.config.JsonConfig;
2827
import org.apache.tika.config.TikaComponent;
2928
import org.apache.tika.metadata.Metadata;

tika-core/src/main/java/org/apache/tika/extractor/RUnpackExtractorFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import java.util.Collections;
2020
import java.util.HashSet;
21-
import java.util.List;
2221
import java.util.Set;
2322

2423
import org.apache.tika.config.Field;

tika-core/src/main/java/org/apache/tika/metadata/writefilter/StandardWriteFilterFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.apache.tika.metadata.writefilter;
1818

1919
import java.util.Collections;
20-
import java.util.List;
2120
import java.util.Set;
2221
import java.util.concurrent.ConcurrentHashMap;
2322

tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.apache.tika.metadata.TikaCoreProperties;
3838
import org.apache.tika.mime.MediaType;
3939
import org.apache.tika.mime.MediaTypeRegistry;
40-
import org.apache.tika.mime.MimeTypes;
4140
import org.apache.tika.sax.SecureContentHandler;
4241

4342
public class AutoDetectParser extends CompositeParser {

tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.lang.reflect.InvocationTargetException;
2323
import java.nio.charset.StandardCharsets;
2424
import java.nio.file.Files;
25-
import java.nio.file.Paths;
2625
import java.util.HashMap;
2726
import java.util.LinkedHashMap;
2827
import java.util.List;

tika-langdetect/tika-langdetect-opennlp/src/main/java/org/apache/tika/langdetect/opennlp/OpenNLPDetector.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import opennlp.tools.util.normalizer.ShrinkCharSequenceNormalizer;
3333
import opennlp.tools.util.normalizer.TwitterCharSequenceNormalizer;
3434

35+
import org.apache.tika.config.TikaComponent;
3536
import org.apache.tika.language.detect.LanguageConfidence;
3637
import org.apache.tika.language.detect.LanguageDetector;
3738
import org.apache.tika.language.detect.LanguageResult;
@@ -78,6 +79,7 @@
7879
* Language Resources and Evaluation Conference (LREC), p. 4003-4012,
7980
* May 2020, pdf, bib.
8081
*/
82+
@TikaComponent
8183
public class OpenNLPDetector extends LanguageDetector {
8284

8385
static LanguageDetectorModel LANG_MODEL;

tika-langdetect/tika-langdetect-optimaize/src/main/java/org/apache/tika/langdetect/optimaize/OptimaizeLangDetector.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.optimaize.langdetect.profiles.LanguageProfile;
3636
import com.optimaize.langdetect.profiles.LanguageProfileReader;
3737

38+
import org.apache.tika.config.TikaComponent;
3839
import org.apache.tika.language.detect.LanguageConfidence;
3940
import org.apache.tika.language.detect.LanguageDetector;
4041
import org.apache.tika.language.detect.LanguageNames;
@@ -44,6 +45,7 @@
4445
* Implementation of the LanguageDetector API that uses
4546
* https://github.com/optimaize/language-detector
4647
*/
48+
@TikaComponent
4749
public class OptimaizeLangDetector extends LanguageDetector {
4850

4951
private static final List<LanguageProfile> DEFAULT_LANGUAGE_PROFILES;

tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-ocr-module/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@
1717
package org.apache.tika.parser.ocr;
1818

1919
import java.io.Serializable;
20-
import java.lang.reflect.Field;
21-
import java.lang.reflect.Modifier;
22-
import java.util.ArrayList;
2320
import java.util.HashMap;
2421
import java.util.HashSet;
25-
import java.util.List;
2622
import java.util.Locale;
2723
import java.util.Map;
2824
import java.util.Set;
@@ -32,11 +28,7 @@
3228
import org.slf4j.Logger;
3329
import org.slf4j.LoggerFactory;
3430

35-
import org.apache.tika.config.ConfigDeserializer;
36-
import org.apache.tika.config.JsonConfig;
37-
import org.apache.tika.config.TikaConfig;
3831
import org.apache.tika.exception.TikaConfigException;
39-
import org.apache.tika.exception.TikaException;
4032
import org.apache.tika.utils.StringUtils;
4133

4234
/**

0 commit comments

Comments
 (0)