[ANY23-464] Performance improvement for inner classes
diff --git a/core/src/main/java/org/apache/any23/extractor/html/EmbeddedJSONLDExtractor.java b/core/src/main/java/org/apache/any23/extractor/html/EmbeddedJSONLDExtractor.java
index 745c418..d3fd414 100644
--- a/core/src/main/java/org/apache/any23/extractor/html/EmbeddedJSONLDExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/html/EmbeddedJSONLDExtractor.java
@@ -176,7 +176,7 @@
return EmbeddedJSONLDExtractorFactory.getDescriptionInstance();
}
- private class JSONLDScript {
+ private static class JSONLDScript {
private String xpath;
diff --git a/core/src/main/java/org/apache/any23/extractor/html/HCardName.java b/core/src/main/java/org/apache/any23/extractor/html/HCardName.java
index e0c6279..0e1affc 100644
--- a/core/src/main/java/org/apache/any23/extractor/html/HCardName.java
+++ b/core/src/main/java/org/apache/any23/extractor/html/HCardName.java
@@ -220,7 +220,7 @@
/**
* Represents a possible field value.
*/
- private class FieldValue {
+ private static class FieldValue {
private TextField value;
private List<TextField> multiValue = new ArrayList<TextField>();
diff --git a/core/src/main/java/org/apache/any23/extractor/html/HTMLMetaExtractor.java b/core/src/main/java/org/apache/any23/extractor/html/HTMLMetaExtractor.java
index 942e812..0d8d1ec 100644
--- a/core/src/main/java/org/apache/any23/extractor/html/HTMLMetaExtractor.java
+++ b/core/src/main/java/org/apache/any23/extractor/html/HTMLMetaExtractor.java
@@ -193,7 +193,7 @@
return HTMLMetaExtractorFactory.getDescriptionInstance();
}
- private class Meta {
+ private static class Meta {
private String xpath;
diff --git a/core/src/main/java/org/apache/any23/extractor/rdf/RDFParserFactory.java b/core/src/main/java/org/apache/any23/extractor/rdf/RDFParserFactory.java
index 810c5d2..6a64048 100644
--- a/core/src/main/java/org/apache/any23/extractor/rdf/RDFParserFactory.java
+++ b/core/src/main/java/org/apache/any23/extractor/rdf/RDFParserFactory.java
@@ -307,7 +307,7 @@
/**
* Internal listener used to trace <i>RDF</i> parse errors.
*/
- private class InternalParseErrorListener implements ParseErrorListener {
+ private static class InternalParseErrorListener implements ParseErrorListener {
private final IssueReport extractionResult;
@@ -352,7 +352,7 @@
/**
* This extended Turtle parser sets the default namespace to the base IRI before the parsing.
*/
- private class ExtendedTurtleParser extends TurtleParser {
+ private static class ExtendedTurtleParser extends TurtleParser {
@Override
public void parse(Reader reader, String baseIRI) throws IOException, RDFParseException, RDFHandlerException {
setNamespace("", baseIRI);
diff --git a/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Parser.java b/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Parser.java
index ba416af..4028ac1 100644
--- a/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Parser.java
+++ b/core/src/main/java/org/apache/any23/extractor/rdfa/RDFa11Parser.java
@@ -999,7 +999,7 @@
/**
* Defines a prefix mapping.
*/
- private class PrefixMap {
+ private static class PrefixMap {
final String prefix;
final IRI IRI;
@@ -1012,7 +1012,7 @@
/**
* Defines a IRI mapping.
*/
- private class IRIMapping {
+ private static class IRIMapping {
final Node sourceNode;
final Map<String, IRI> map;
@@ -1032,7 +1032,7 @@
/**
* Defines an incomplete triple.
*/
- private class IncompleteTriple {
+ private static class IncompleteTriple {
final Node originatingNode;
final Resource subject;
final IRI predicate;
@@ -1072,7 +1072,7 @@
/**
* Defines a vocabulary object.
*/
- private class Vocabulary {
+ private static class Vocabulary {
final Node originatingNode;
final IRI prefix;
diff --git a/core/src/main/java/org/apache/any23/extractor/yaml/ElementsProcessor.java b/core/src/main/java/org/apache/any23/extractor/yaml/ElementsProcessor.java
index 9283127..b4bc637 100644
--- a/core/src/main/java/org/apache/any23/extractor/yaml/ElementsProcessor.java
+++ b/core/src/main/java/org/apache/any23/extractor/yaml/ElementsProcessor.java
@@ -65,7 +65,7 @@
* A model holder describes the two required parameters which makes a model useful in further processing: a root
* node and model itself.
*/
- public class ModelHolder {
+ public static class ModelHolder {
private final Value root;
private final Model model;
diff --git a/core/src/main/java/org/apache/any23/filter/ExtractionContextBlocker.java b/core/src/main/java/org/apache/any23/filter/ExtractionContextBlocker.java
index 2409267..15ae003 100644
--- a/core/src/main/java/org/apache/any23/filter/ExtractionContextBlocker.java
+++ b/core/src/main/java/org/apache/any23/filter/ExtractionContextBlocker.java
@@ -143,7 +143,7 @@
contextQueues.clear();
}
- private class ValvedTriplePipeException extends Exception {
+ private static class ValvedTriplePipeException extends Exception {
private ValvedTriplePipeException(String s) {
super(s);
diff --git a/core/src/main/java/org/apache/any23/writer/BenchmarkTripleHandler.java b/core/src/main/java/org/apache/any23/writer/BenchmarkTripleHandler.java
index ef6a21d..3e77763 100644
--- a/core/src/main/java/org/apache/any23/writer/BenchmarkTripleHandler.java
+++ b/core/src/main/java/org/apache/any23/writer/BenchmarkTripleHandler.java
@@ -144,7 +144,7 @@
/**
* A single statistics.
*/
- private class StatObject {
+ private static class StatObject {
AtomicInteger methodCalls = new AtomicInteger(0);
AtomicInteger triples = new AtomicInteger(0);
diff --git a/core/src/test/java/org/apache/any23/validator/DefaultValidatorTest.java b/core/src/test/java/org/apache/any23/validator/DefaultValidatorTest.java
index 22ebd44..ca2df95 100644
--- a/core/src/test/java/org/apache/any23/validator/DefaultValidatorTest.java
+++ b/core/src/test/java/org/apache/any23/validator/DefaultValidatorTest.java
@@ -130,7 +130,7 @@
return new DefaultDOMDocument(new URI(documentIRI), tsp.getDOM());
}
- class FakeRule implements Rule {
+ static class FakeRule implements Rule {
public String getHRName() {
return "fake-rule";
}
@@ -141,7 +141,7 @@
}
}
- class FakeFix implements Fix {
+ static class FakeFix implements Fix {
public String getHRName() {
return "fake-fix";
}
diff --git a/core/src/test/java/org/apache/any23/vocab/VocabularyTest.java b/core/src/test/java/org/apache/any23/vocab/VocabularyTest.java
index 4d3e0df..2321ea5 100644
--- a/core/src/test/java/org/apache/any23/vocab/VocabularyTest.java
+++ b/core/src/test/java/org/apache/any23/vocab/VocabularyTest.java
@@ -81,7 +81,7 @@
/**
* Target test class.
*/
- class TargetVocabulary extends Vocabulary {
+ static class TargetVocabulary extends Vocabulary {
@Comment("Comment prop 1.")
public final IRI property1 = createProperty(namespace, "prop1");
