From 78a38d6fc123fb631f9bfbf988f1a944f8ac1d9b Mon Sep 17 00:00:00 2001 From: szznax Date: Thu, 21 May 2009 23:34:18 +0000 Subject: [PATCH] minor improvement * Extractor.java added instance initializer for DEFAULT_PARAMETERS, and set @Autowired(required=false) eliminates the need for test classes to set them explicitly. * ExtractorCSSTest.java remove explicit setting of default parameters * ExtractorHTMLTest.java remove explicit setting of default parameters * JerichoExtractorHTMLTest.java remove explicit setting of default parameters --- .../main/java/org/archive/modules/extractor/Extractor.java | 5 ++++- .../java/org/archive/modules/extractor/ExtractorCSSTest.java | 1 - .../org/archive/modules/extractor/ExtractorHTMLTest.java | 1 - .../archive/modules/extractor/JerichoExtractorHTMLTest.java | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/src/main/java/org/archive/modules/extractor/Extractor.java b/modules/src/main/java/org/archive/modules/extractor/Extractor.java index 1a1eed4e..2bb12b23 100644 --- a/modules/src/main/java/org/archive/modules/extractor/Extractor.java +++ b/modules/src/main/java/org/archive/modules/extractor/Extractor.java @@ -62,11 +62,14 @@ public abstract class Extractor extends Processor { this.loggerModule = loggerModule; } + { + setExtractorParameters(DEFAULT_PARAMETERS); + } transient ExtractorParameters extractorParameters; public ExtractorParameters getExtractorParameters() { return extractorParameters; } - @Autowired + @Autowired(required=false) public void setExtractorParameters(ExtractorParameters helper) { this.extractorParameters = helper; } diff --git a/modules/src/test/java/org/archive/modules/extractor/ExtractorCSSTest.java b/modules/src/test/java/org/archive/modules/extractor/ExtractorCSSTest.java index 21cd54ce..34495d03 100644 --- a/modules/src/test/java/org/archive/modules/extractor/ExtractorCSSTest.java +++ b/modules/src/test/java/org/archive/modules/extractor/ExtractorCSSTest.java @@ -67,7 +67,6 @@ public class ExtractorCSSTest extends StringExtractorTestBase { ExtractorCSS result = new ExtractorCSS(); UriErrorLoggerModule ulm = new UnitTestUriLoggerModule(); result.setLoggerModule(ulm); - result.setExtractorParameters(Extractor.DEFAULT_PARAMETERS); return result; } diff --git a/modules/src/test/java/org/archive/modules/extractor/ExtractorHTMLTest.java b/modules/src/test/java/org/archive/modules/extractor/ExtractorHTMLTest.java index c19f88af..5d83b643 100644 --- a/modules/src/test/java/org/archive/modules/extractor/ExtractorHTMLTest.java +++ b/modules/src/test/java/org/archive/modules/extractor/ExtractorHTMLTest.java @@ -77,7 +77,6 @@ public class ExtractorHTMLTest extends StringExtractorTestBase { ExtractorHTML result = new ExtractorHTML(); UriErrorLoggerModule ulm = new UnitTestUriLoggerModule(); result.setLoggerModule(ulm); - result.setExtractorParameters(Extractor.DEFAULT_PARAMETERS); result.afterPropertiesSet(); return result; } diff --git a/modules/src/test/java/org/archive/modules/extractor/JerichoExtractorHTMLTest.java b/modules/src/test/java/org/archive/modules/extractor/JerichoExtractorHTMLTest.java index 19509a37..eec21aa5 100644 --- a/modules/src/test/java/org/archive/modules/extractor/JerichoExtractorHTMLTest.java +++ b/modules/src/test/java/org/archive/modules/extractor/JerichoExtractorHTMLTest.java @@ -42,7 +42,6 @@ public class JerichoExtractorHTMLTest extends ExtractorHTMLTest { JerichoExtractorHTML result = new JerichoExtractorHTML(); UriErrorLoggerModule ulm = new UnitTestUriLoggerModule(); result.setLoggerModule(ulm); - result.setExtractorParameters(Extractor.DEFAULT_PARAMETERS); result.afterPropertiesSet(); return result; }