Rename SiteParser to JsoupSiteParser.

Addressed to #801

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/config/EventsConfig.java

@@ -41,7 +41,7 @@
 
 // CheckStyle: ignore AvoidStarImportCheck for next 1 line
 import ru.mystamps.web.controller.event.*; // NOPMD: UnusedImports (false positive)
-import ru.mystamps.web.util.extractor.SiteParser;
+import ru.mystamps.web.util.extractor.JsoupSiteParser;
 
 @Configuration
 @RequiredArgsConstructor
@@ -56,10 +56,10 @@ public class EventsConfig {
 
 	@PostConstruct
 	public void init() {
-		Map<Integer, SiteParser> parsers = createSiteParsers();
-		for (Map.Entry<Integer, SiteParser> entry : parsers.entrySet()) {
+		Map<Integer, JsoupSiteParser> parsers = createSiteParsers();
+		for (Map.Entry<Integer, JsoupSiteParser> entry : parsers.entrySet()) {
 			Integer num = entry.getKey();
-			SiteParser parser = entry.getValue();
+			JsoupSiteParser parser = entry.getValue();
 			if (!parser.isFullyInitialized()) {
 				LOG.warn("Ignored non-fully initialized site parser (app.site-parser[{}])", num);
 				continue;
@@ -89,7 +89,7 @@ public ApplicationListener<DownloadingFailed> getDownloadingFailedEventListener(
 
 	@Bean
 	public ApplicationListener<DownloadingSucceeded> getDownloadingSucceededEventListener(
-		List<SiteParser> siteParsers) {
+		List<JsoupSiteParser> siteParsers) {
 
 		return new DownloadingSucceededEventListener(
 			LoggerFactory.getLogger(DownloadingSucceededEventListener.class),
@@ -108,9 +108,9 @@ public ApplicationListener<ParsingFailed> getParsingFailedEventListener() {
 	}
 
 	@SuppressWarnings("PMD.ModifiedCyclomaticComplexity") // TODO: deal with it someday
-	private Map<Integer, SiteParser> createSiteParsers() {
+	private Map<Integer, JsoupSiteParser> createSiteParsers() {
 		boolean foundSiteParserProps = false;
-		Map<Integer, SiteParser> parsers = new HashMap<>();
+		Map<Integer, JsoupSiteParser> parsers = new HashMap<>();
 
 		for (PropertySource<?> source : env.getPropertySources()) {
 			// while we expect that properties will be in PropertiesPropertySource, we use
@@ -140,8 +140,8 @@ private Map<Integer, SiteParser> createSiteParsers() {
 
 				Integer num = Integer.valueOf(strNum);
 				if (!parsers.containsKey(num)) {
-					SiteParser parser =
-						new SiteParser(); // NOPMD: AvoidInstantiatingObjectsInLoops
+					JsoupSiteParser parser =
+						new JsoupSiteParser(); // NOPMD: AvoidInstantiatingObjectsInLoops
 					parsers.put(num, parser);
 				}
 
@@ -152,7 +152,7 @@ private Map<Integer, SiteParser> createSiteParsers() {
 					continue;
 				}
 
-				SiteParser parser = parsers.get(num);
+				JsoupSiteParser parser = parsers.get(num);
 				boolean validProperty = parser.setField(fieldName, propertyValue);
 				if (!validProperty) {
 					LOG.warn("Ignored property '{}': unknown or unsupported", name);

src/main/java/ru/mystamps/web/controller/event/DownloadingSucceededEventListener.java

@@ -31,7 +31,7 @@
 import ru.mystamps.web.service.SeriesImportService;
 import ru.mystamps.web.service.dto.RawParsedDataDto;
 import ru.mystamps.web.util.extractor.SeriesInfo;
-import ru.mystamps.web.util.extractor.SiteParser;
+import ru.mystamps.web.util.extractor.JsoupSiteParser;
 
 /**
  * Listener of the @{link DownloadingSucceeded} event.
@@ -44,7 +44,7 @@ public class DownloadingSucceededEventListener
 
 	private final Logger log;
 	private final SeriesImportService importService;
-	private final List<SiteParser> siteParsers;
+	private final List<JsoupSiteParser> siteParsers;
 	private final ApplicationEventPublisher eventPublisher;
 
 	@PostConstruct
@@ -66,8 +66,8 @@ public void onApplicationEvent(DownloadingSucceeded event) {
 		}
 
 		String url = event.getUrl();
-		SiteParser parser = null;
-		for (SiteParser candidate : siteParsers) {
+		JsoupSiteParser parser = null;
+		for (JsoupSiteParser candidate : siteParsers) {
 			if (candidate.canParse(url)) {
 				parser = candidate;
 				break;

src/main/java/ru/mystamps/web/util/extractor/SiteParser.java renamed to src/main/java/ru/mystamps/web/util/extractor/JsoupSiteParser.java

@@ -35,12 +35,12 @@
 // Getters/setters are being used in unit tests
 @Getter(AccessLevel.PROTECTED)
 @Setter(AccessLevel.PROTECTED)
-public class SiteParser {
-	private static final Logger LOG = LoggerFactory.getLogger(SiteParser.class);
+public class JsoupSiteParser {
+	private static final Logger LOG = LoggerFactory.getLogger(JsoupSiteParser.class);
 
 	// When you're adding a new field don't forget to also update:
-	// - SiteParser.setField()
-	// - SiteParser.isFullyInitialized() (optionally)
+	// - JsoupSiteParser.setField()
+	// - JsoupSiteParser.isFullyInitialized() (optionally)
 	// - SiteParserTest.describe()
 	private String name;
 	private String matchedUrl;

src/test/java/ru/mystamps/web/util/extractor/SiteParserTest.java

@@ -42,11 +42,11 @@ public class SiteParserTest {
 	@Rule
 	public ExpectedException thrown = ExpectedException.none();
 
-	private SiteParser parser;
+	private JsoupSiteParser parser;
 
 	@Before
 	public void init() {
-		parser = new SiteParser();
+		parser = new JsoupSiteParser();
 	}
 
 	//
@@ -712,9 +712,9 @@ public void extractPerforatedShouldReturnTextOfShortDescriptionLocator() {
 		assertThat(msg, perforated, equalTo(expectedValue));
 	}
 
-	private static String describe(SiteParser parser) {
+	private static String describe(JsoupSiteParser parser) {
 		StringBuilder sb = new StringBuilder();
-		sb.append("SiteParser[name=")
+		sb.append("JsoupSiteParser[name=")
 			.append(parser.getName())
 			.append(", matchedUrl=")
 			.append(parser.getMatchedUrl())