From 95218294d25451c65f7cfb439e4ec1e7327929de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9=20=D0=91=D0=B5?= =?UTF-8?q?=D0=B7=D1=80=D1=83=D0=BA=D0=BE=D0=B2?= <2sinsincuba@gmail.com> Date: Sat, 25 Mar 2023 19:26:15 +0500 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20=D0=B2=20=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D1=83=D1=8E=20=D0=B2=D0=B5=D1=82=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edu/java/linkparser/LinkParserDemo.java | 22 +++++++++++++++++++ .../linkparser/absracts/AbstractParser.java | 21 ++++++++++++++++++ .../java/linkparser/absracts/GitParser.java | 18 +++++++++++++++ .../java/linkparser/absracts/OtherParser.java | 9 ++++++++ .../java/linkparser/absracts/StackParser.java | 18 +++++++++++++++ 5 files changed, 88 insertions(+) create mode 100644 FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/LinkParserDemo.java create mode 100644 FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/AbstractParser.java create mode 100644 FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/GitParser.java create mode 100644 FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/OtherParser.java create mode 100644 FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/StackParser.java diff --git a/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/LinkParserDemo.java b/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/LinkParserDemo.java new file mode 100644 index 0000000..b6d44bb --- /dev/null +++ b/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/LinkParserDemo.java @@ -0,0 +1,22 @@ +package ru.tinkoff.edu.java.linkparser; + +import ru.tinkoff.edu.java.linkparser.absracts.*; + +public class LinkParserDemo { + + public static void main (String [] args) { + + String link = "https://github.com/sanyarnd/tinkoff-java-course-2022/"; + String link2 = "https://stackoverflow.com/questions/1642028/what-is-the-operator-in-c"; + String link3 = "https://stackoverflow.com/search?q=unsupported%20link"; + + AbstractParser gitParser = new GitParser(); + AbstractParser stackParser = new StackParser(); + AbstractParser otherParser = new OtherParser(); + + gitParser.setNextParser(stackParser); + stackParser.setNextParser(otherParser); + + System.out.println(gitParser.logParser(link3)); + } +} diff --git a/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/AbstractParser.java b/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/AbstractParser.java new file mode 100644 index 0000000..89c15f3 --- /dev/null +++ b/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/AbstractParser.java @@ -0,0 +1,21 @@ +package ru.tinkoff.edu.java.linkparser.absracts; + +public abstract class AbstractParser { + + private AbstractParser nextParser; + + public void setNextParser(AbstractParser nextParser) { + this.nextParser = nextParser; + } + + public String logParser (String link) { + if(nextParser != null) { + if(this.parsAbstract(link) == null) return nextParser.logParser(link); + return this.parsAbstract(link); + } + return null; + } + + abstract protected String parsAbstract(String link); + +} diff --git a/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/GitParser.java b/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/GitParser.java new file mode 100644 index 0000000..8df5abd --- /dev/null +++ b/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/GitParser.java @@ -0,0 +1,18 @@ +package ru.tinkoff.edu.java.linkparser.absracts; + +import java.util.Objects; + +public class GitParser extends AbstractParser { + + @Override + protected String parsAbstract(String link) { + + String[] parsed = link.split("/"); + + if(!Objects.equals(parsed[2], "github.com")) return null; + + if (parsed.length > 4) return parsed[3] + " " + parsed[4]; + + return null; + } +} diff --git a/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/OtherParser.java b/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/OtherParser.java new file mode 100644 index 0000000..09c62e5 --- /dev/null +++ b/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/OtherParser.java @@ -0,0 +1,9 @@ +package ru.tinkoff.edu.java.linkparser.absracts; + +public class OtherParser extends AbstractParser { + + @Override + protected String parsAbstract(String link) { + return "Ссылка не поддерживается"; + } +} diff --git a/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/StackParser.java b/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/StackParser.java new file mode 100644 index 0000000..cd68e2a --- /dev/null +++ b/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/StackParser.java @@ -0,0 +1,18 @@ +package ru.tinkoff.edu.java.linkparser.absracts; + +import java.util.Objects; + +public class StackParser extends AbstractParser { + + @Override + protected String parsAbstract(String link) { + + String[] parsed = link.split("/"); + + if (!Objects.equals(parsed[2], "stackoverflow.com")) return null; + + if (parsed.length > 4) return parsed[4]; + + return null; + } +} From 5f4eac289372a1d81db0044d6d2f3c8d4de20d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9=20=D0=91=D0=B5?= =?UTF-8?q?=D0=B7=D1=80=D1=83=D0=BA=D0=BE=D0=B2?= <2sinsincuba@gmail.com> Date: Sat, 25 Mar 2023 19:35:15 +0500 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20=D0=B2=20=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D1=83=D1=8E=20=D0=B2=D0=B5=D1=82=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FP_re/bot/pom.xml | 53 +++++++++++ .../tinkoff/edu/java/bot/BotApplication.java | 16 ++++ .../bot/configuration/ApplicationConfig.java | 9 ++ .../src/main/resources/application.properties | 1 + FP_re/link-parser/pom.xml | 14 +++ .../edu/java/linkparser/LinkParserDemo.java | 0 .../linkparser/absracts/AbstractParser.java | 0 .../java/linkparser/absracts/GitParser.java | 0 .../java/linkparser/absracts/OtherParser.java | 0 .../java/linkparser/absracts/StackParser.java | 0 FP_re/pom.xml | 95 +++++++++++++++++++ FP_re/scrapper/pom.xml | 53 +++++++++++ .../java/scrapper/ScrapperApplication.java | 16 ++++ .../configuration/ApplicationConfig.java | 9 ++ .../src/main/resources/application.properties | 1 + 15 files changed, 267 insertions(+) create mode 100644 FP_re/bot/pom.xml create mode 100644 FP_re/bot/src/main/java/ru/tinkoff/edu/java/bot/BotApplication.java create mode 100644 FP_re/bot/src/main/java/ru/tinkoff/edu/java/bot/configuration/ApplicationConfig.java create mode 100644 FP_re/bot/src/main/resources/application.properties create mode 100644 FP_re/link-parser/pom.xml rename {FP => FP_re}/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/LinkParserDemo.java (100%) rename {FP => FP_re}/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/AbstractParser.java (100%) rename {FP => FP_re}/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/GitParser.java (100%) rename {FP => FP_re}/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/OtherParser.java (100%) rename {FP => FP_re}/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/StackParser.java (100%) create mode 100644 FP_re/pom.xml create mode 100644 FP_re/scrapper/pom.xml create mode 100644 FP_re/scrapper/src/main/java/ru/tinkoff/edu/java/scrapper/ScrapperApplication.java create mode 100644 FP_re/scrapper/src/main/java/ru/tinkoff/edu/java/scrapper/configuration/ApplicationConfig.java create mode 100644 FP_re/scrapper/src/main/resources/application.properties diff --git a/FP_re/bot/pom.xml b/FP_re/bot/pom.xml new file mode 100644 index 0000000..80a47a0 --- /dev/null +++ b/FP_re/bot/pom.xml @@ -0,0 +1,53 @@ + + + + org.example + FP + 1.0 + + + 4.0.0 + + bot + + + 3.0.1 + 2.7.6 + + + + + org.springframework.boot + spring-boot-starter-validation + ${starter-validation.version} + + + org.springframework.boot + spring-boot-starter-web + ${starter-web.version} + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.springframework + spring-context-indexer + true + + + org.projectlombok + lombok + true + + + \ No newline at end of file diff --git a/FP_re/bot/src/main/java/ru/tinkoff/edu/java/bot/BotApplication.java b/FP_re/bot/src/main/java/ru/tinkoff/edu/java/bot/BotApplication.java new file mode 100644 index 0000000..0e60ab2 --- /dev/null +++ b/FP_re/bot/src/main/java/ru/tinkoff/edu/java/bot/BotApplication.java @@ -0,0 +1,16 @@ +package ru.tinkoff.edu.java.bot; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import ru.tinkoff.edu.java.bot.configuration.ApplicationConfig; + +@SpringBootApplication +@EnableConfigurationProperties(ApplicationConfig.class) +public class BotApplication { +public static void main(String[] args) { + var ctx = SpringApplication.run(BotApplication.class, args); + ApplicationConfig config = ctx.getBean(ApplicationConfig.class); + System.out.println(config); + } +} diff --git a/FP_re/bot/src/main/java/ru/tinkoff/edu/java/bot/configuration/ApplicationConfig.java b/FP_re/bot/src/main/java/ru/tinkoff/edu/java/bot/configuration/ApplicationConfig.java new file mode 100644 index 0000000..11b120c --- /dev/null +++ b/FP_re/bot/src/main/java/ru/tinkoff/edu/java/bot/configuration/ApplicationConfig.java @@ -0,0 +1,9 @@ +package ru.tinkoff.edu.java.bot.configuration; + +import jakarta.validation.constraints.NotNull; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.validation.annotation.Validated; + +@Validated +@ConfigurationProperties(prefix = "app", ignoreUnknownFields = false) +public record ApplicationConfig(@NotNull String test) {} diff --git a/FP_re/bot/src/main/resources/application.properties b/FP_re/bot/src/main/resources/application.properties new file mode 100644 index 0000000..6eb4921 --- /dev/null +++ b/FP_re/bot/src/main/resources/application.properties @@ -0,0 +1 @@ +app.test="123" \ No newline at end of file diff --git a/FP_re/link-parser/pom.xml b/FP_re/link-parser/pom.xml new file mode 100644 index 0000000..1a9e456 --- /dev/null +++ b/FP_re/link-parser/pom.xml @@ -0,0 +1,14 @@ + + + + org.example + FP + 1.0 + + + 4.0.0 + + link-parser + \ No newline at end of file diff --git a/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/LinkParserDemo.java b/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/LinkParserDemo.java similarity index 100% rename from FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/LinkParserDemo.java rename to FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/LinkParserDemo.java diff --git a/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/AbstractParser.java b/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/AbstractParser.java similarity index 100% rename from FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/AbstractParser.java rename to FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/AbstractParser.java diff --git a/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/GitParser.java b/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/GitParser.java similarity index 100% rename from FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/GitParser.java rename to FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/GitParser.java diff --git a/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/OtherParser.java b/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/OtherParser.java similarity index 100% rename from FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/OtherParser.java rename to FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/OtherParser.java diff --git a/FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/StackParser.java b/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/StackParser.java similarity index 100% rename from FP/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/StackParser.java rename to FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/StackParser.java diff --git a/FP_re/pom.xml b/FP_re/pom.xml new file mode 100644 index 0000000..302e82c --- /dev/null +++ b/FP_re/pom.xml @@ -0,0 +1,95 @@ + + + 4.0.0 + + org.example + + FP + + pom + + 1.0 + + + bot + link-parser + scrapper + + + + UTF-8 + 17 + 17 + 3.8.1 + 3.0.1 + 2022.0.0 + 23.1.0 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version + + + true + + + + org.projectlombok + lombok + + + + + + + repackage + build-info + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 17 + true + + + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + org.jetbrains + annotations + ${annotations.version} + provided + + + + \ No newline at end of file diff --git a/FP_re/scrapper/pom.xml b/FP_re/scrapper/pom.xml new file mode 100644 index 0000000..ae2e977 --- /dev/null +++ b/FP_re/scrapper/pom.xml @@ -0,0 +1,53 @@ + + + + org.example + FP + 1.0 + + + 4.0.0 + + scrapper + + + 3.0.1 + 2.7.6 + + + + + org.springframework.boot + spring-boot-starter-validation + ${starter-validation.version} + + + org.springframework.boot + spring-boot-starter-web + ${starter-web.version} + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.springframework + spring-context-indexer + true + + + org.projectlombok + lombok + true + + + \ No newline at end of file diff --git a/FP_re/scrapper/src/main/java/ru/tinkoff/edu/java/scrapper/ScrapperApplication.java b/FP_re/scrapper/src/main/java/ru/tinkoff/edu/java/scrapper/ScrapperApplication.java new file mode 100644 index 0000000..48dc366 --- /dev/null +++ b/FP_re/scrapper/src/main/java/ru/tinkoff/edu/java/scrapper/ScrapperApplication.java @@ -0,0 +1,16 @@ +package ru.tinkoff.edu.java.scrapper; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import ru.tinkoff.edu.java.scrapper.configuration.ApplicationConfig; + +@SpringBootApplication +@EnableConfigurationProperties(ApplicationConfig.class) +public class ScrapperApplication { +public static void main(String[] args) { + var ctx = SpringApplication.run(ScrapperApplication.class, args); + ApplicationConfig config = ctx.getBean(ApplicationConfig.class); + System.out.println(config); + } +} diff --git a/FP_re/scrapper/src/main/java/ru/tinkoff/edu/java/scrapper/configuration/ApplicationConfig.java b/FP_re/scrapper/src/main/java/ru/tinkoff/edu/java/scrapper/configuration/ApplicationConfig.java new file mode 100644 index 0000000..5d7125d --- /dev/null +++ b/FP_re/scrapper/src/main/java/ru/tinkoff/edu/java/scrapper/configuration/ApplicationConfig.java @@ -0,0 +1,9 @@ +package ru.tinkoff.edu.java.scrapper.configuration; + +import jakarta.validation.constraints.NotNull; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.validation.annotation.Validated; + +@Validated +@ConfigurationProperties(prefix = "app", ignoreUnknownFields = false) +public record ApplicationConfig(@NotNull String test) {} diff --git a/FP_re/scrapper/src/main/resources/application.properties b/FP_re/scrapper/src/main/resources/application.properties new file mode 100644 index 0000000..7637125 --- /dev/null +++ b/FP_re/scrapper/src/main/resources/application.properties @@ -0,0 +1 @@ +app.test="456" \ No newline at end of file From e900370fe42bbf6ce1de5e45794d72c9d5d11048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9=20=D0=91=D0=B5?= =?UTF-8?q?=D0=B7=D1=80=D1=83=D0=BA=D0=BE=D0=B2?= <2sinsincuba@gmail.com> Date: Sat, 25 Mar 2023 19:59:00 +0500 Subject: [PATCH 3/4] =?UTF-8?q?"=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D0=B9=20=D0=B2=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D0=B8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/tinkoff/edu/java/linkparser/absracts/StackParser.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/StackParser.java b/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/StackParser.java index cd68e2a..a73b23b 100644 --- a/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/StackParser.java +++ b/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/StackParser.java @@ -10,6 +10,8 @@ protected String parsAbstract(String link) { String[] parsed = link.split("/"); if (!Objects.equals(parsed[2], "stackoverflow.com")) return null; + if (!Objects.equals(parsed[3], "questions")) return null; + if (parsed.length > 4) return parsed[4]; From 045daf8897835f5838b341ede794d66149259511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9=20=D0=91=D0=B5?= =?UTF-8?q?=D0=B7=D1=80=D1=83=D0=BA=D0=BE=D0=B2?= <2sinsincuba@gmail.com> Date: Sat, 25 Mar 2023 20:38:36 +0500 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D1=81=D1=80=D0=BF=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B8=20?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D0=BF=D0=B0=D1=80=D1=81?= =?UTF-8?q?=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/tinkoff/edu/java/linkparser/LinkParserDemo.java | 2 +- .../tinkoff/edu/java/linkparser/absracts/AbstractParser.java | 3 +-- .../ru/tinkoff/edu/java/linkparser/absracts/OtherParser.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/LinkParserDemo.java b/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/LinkParserDemo.java index b6d44bb..b77b570 100644 --- a/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/LinkParserDemo.java +++ b/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/LinkParserDemo.java @@ -17,6 +17,6 @@ public static void main (String [] args) { gitParser.setNextParser(stackParser); stackParser.setNextParser(otherParser); - System.out.println(gitParser.logParser(link3)); + System.out.println(gitParser.logParser(link)); } } diff --git a/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/AbstractParser.java b/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/AbstractParser.java index 89c15f3..503e413 100644 --- a/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/AbstractParser.java +++ b/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/AbstractParser.java @@ -11,9 +11,8 @@ public void setNextParser(AbstractParser nextParser) { public String logParser (String link) { if(nextParser != null) { if(this.parsAbstract(link) == null) return nextParser.logParser(link); - return this.parsAbstract(link); } - return null; + return this.parsAbstract(link); } abstract protected String parsAbstract(String link); diff --git a/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/OtherParser.java b/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/OtherParser.java index 09c62e5..f3746fe 100644 --- a/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/OtherParser.java +++ b/FP_re/link-parser/src/main/java/ru/tinkoff/edu/java/linkparser/absracts/OtherParser.java @@ -4,6 +4,6 @@ public class OtherParser extends AbstractParser { @Override protected String parsAbstract(String link) { - return "Ссылка не поддерживается"; + return null; } }