Minor refactoring

olegshan · olegshan · commit f56a3089bb26 · 2016-12-04T18:49:36.000+02:00
diff --git a/src/main/java/com/olegshan/parser/impl/ParserImpl.java b/src/main/java/com/olegshan/parser/impl/ParserImpl.java
@@ -46,7 +46,7 @@ public void parse(JobSite jobSite) {
                 String title = jobParser.getTitle(titleBlock);
                 String description = jobParser.getDescription(job);
                 String company = jobParser.getCompany(job, url);
-                LocalDateTime date = jobParser.getDate(job, url, titleBlock);
+                LocalDateTime date = jobParser.getDate(job, url);
 
                 Job parsedJob = new Job(title, description, company, jobSite.getSiteName(), url, date);
                 jobService.save(parsedJob);
@@ -56,6 +56,4 @@ public void parse(JobSite jobSite) {
             notifier.notifyAdmin(e.getMessage());
         }
     }
-
-
-}
+}
diff --git a/src/main/java/com/olegshan/parser/siteparsers/DouUaJobParser.java b/src/main/java/com/olegshan/parser/siteparsers/DouUaJobParser.java
@@ -19,7 +19,7 @@ public DouUaJobParser(JobSite jobSite) {
     }
 
     @Override
-    public LocalDateTime getDate(Element job, String url, Elements titleBlock) throws ParserException {
+    public LocalDateTime getDate(Element job, String url) throws ParserException {
 
         Document dateDoc = getDoc(url);
 
diff --git a/src/main/java/com/olegshan/parser/siteparsers/JobParser.java b/src/main/java/com/olegshan/parser/siteparsers/JobParser.java
@@ -68,7 +68,7 @@ public String getCompany(Element job, String url) throws ParserException {
         return company;
     }
 
-    public LocalDateTime getDate(Element job, String url, Elements titleBlock) throws ParserException {
+    public LocalDateTime getDate(Element job, String url) throws ParserException {
         String dateLine = job.getElementsByAttributeValue(jobSite.getDateData()[0],
                 jobSite.getDateData()[1]).text();
         check(dateLine, "date", url);
diff --git a/src/main/java/com/olegshan/parser/siteparsers/RabotaUaJobParser.java b/src/main/java/com/olegshan/parser/siteparsers/RabotaUaJobParser.java
@@ -59,7 +59,7 @@ public String getCompany(Element job, String url) throws ParserException {
     }
 
     @Override
-    public LocalDateTime getDate(Element job, String url, Elements titleBlock) throws ParserException {
+    public LocalDateTime getDate(Element job, String url) throws ParserException {
         /*
         * There are several problems here.
         * First: there are two types of date tags, used on rabota.ua on different pages: "d-date" and "datePosted".
diff --git a/src/main/java/com/olegshan/parser/siteparsers/WorkUaJobParser.java b/src/main/java/com/olegshan/parser/siteparsers/WorkUaJobParser.java
@@ -30,8 +30,8 @@ public Elements getTitleBlock(Element job) {
     }
 
     @Override
-    public LocalDateTime getDate(Element job, String url, Elements titleBlock) throws ParserException {
-        String dateLine = titleBlock.attr("title");
+    public LocalDateTime getDate(Element job, String url) throws ParserException {
+        String dateLine = getTitleBlock(job).attr("title");
         String[] dateParts = dateLine.substring(dateLine.length() - 8).split(jobSite.getSplit());
         check(dateParts, "date parts", url);
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public DouUaJobParser(JobSite jobSite) {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`
`22`		`- public LocalDateTime getDate(Element job, String url, Elements titleBlock) throws ParserException {`
	`22`	`+ public LocalDateTime getDate(Element job, String url) throws ParserException {`
`23`	`23`
`24`	`24`	`Document dateDoc = getDoc(url);`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public String getCompany(Element job, String url) throws ParserException {`
`68`	`68`	`return company;`
`69`	`69`	`}`
`70`	`70`
`71`		`- public LocalDateTime getDate(Element job, String url, Elements titleBlock) throws ParserException {`
	`71`	`+ public LocalDateTime getDate(Element job, String url) throws ParserException {`
`72`	`72`	`String dateLine = job.getElementsByAttributeValue(jobSite.getDateData()[0],`
`73`	`73`	`jobSite.getDateData()[1]).text();`
`74`	`74`	`check(dateLine, "date", url);`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public String getCompany(Element job, String url) throws ParserException {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Override`
`62`		`- public LocalDateTime getDate(Element job, String url, Elements titleBlock) throws ParserException {`
	`62`	`+ public LocalDateTime getDate(Element job, String url) throws ParserException {`
`63`	`63`	`/*`
`64`	`64`	`* There are several problems here.`
`65`	`65`	`* First: there are two types of date tags, used on rabota.ua on different pages: "d-date" and "datePosted".`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ public Elements getTitleBlock(Element job) {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
`33`		`- public LocalDateTime getDate(Element job, String url, Elements titleBlock) throws ParserException {`
`34`		`- String dateLine = titleBlock.attr("title");`
	`33`	`+ public LocalDateTime getDate(Element job, String url) throws ParserException {`
	`34`	`+ String dateLine = getTitleBlock(job).attr("title");`
`35`	`35`	`String[] dateParts = dateLine.substring(dateLine.length() - 8).split(jobSite.getSplit());`
`36`	`36`	`check(dateParts, "date parts", url);`
`37`	`37`