From 8c8338192cfa715980d0b6fb032f63d184ee22ab Mon Sep 17 00:00:00 2001 From: mavlonerkinboev Date: Fri, 23 Jul 2021 02:03:20 +0500 Subject: ninth commit --- src/main/java/files/Anime.java | 10 +++++----- src/main/java/files/App.java | 2 +- src/main/java/files/Parser.java | 8 ++++---- src/main/java/files/entity/User.java | 3 ++- 4 files changed, 12 insertions(+), 11 deletions(-) (limited to 'src/main/java/files') diff --git a/src/main/java/files/Anime.java b/src/main/java/files/Anime.java index ddca1a0..92aa954 100644 --- a/src/main/java/files/Anime.java +++ b/src/main/java/files/Anime.java @@ -1,11 +1,11 @@ package files; public class Anime { - private String name; - private String description; - private String[] genres; - private String year; - private String image; + private final String name; + private final String description; + private final String[] genres; + private final String year; + private final String image; public Anime(String name, String description, String[] genres, String year, String image) { this.name = name; diff --git a/src/main/java/files/App.java b/src/main/java/files/App.java index d84bf9c..4e8c4bc 100644 --- a/src/main/java/files/App.java +++ b/src/main/java/files/App.java @@ -40,7 +40,7 @@ public class App { bot.execute(new SendMessage(update.message().chat().id(), "Привет!")); - User user = new User(telegramId, isBot, fullName, date); + User user = new User(telegramId, username, isBot, fullName, date); System.out.println(user.getFullName()); manager.getTransaction().begin(); manager.merge(user); diff --git a/src/main/java/files/Parser.java b/src/main/java/files/Parser.java index 3ec2231..048b147 100644 --- a/src/main/java/files/Parser.java +++ b/src/main/java/files/Parser.java @@ -26,22 +26,22 @@ public class Parser { byte countOfAnime = (byte) namesTemp.size(); - ArrayList names = new ArrayList(); + ArrayList names = new ArrayList<>(); for (Element name : namesTemp) { names.add(Jsoup.parse(String.valueOf(name)).text()); } - ArrayList descriptions = new ArrayList(); + ArrayList descriptions = new ArrayList<>(); for (Element description : descriptionsTemp) { descriptions.add(Jsoup.parse(String.valueOf(description)).text()); } - ArrayList years = new ArrayList(); + ArrayList years = new ArrayList<>(); for (Element year : yearsTemp) { years.add(Jsoup.parse(String.valueOf(year)).text()); } - ArrayList images = new ArrayList(); + ArrayList images = new ArrayList<>(); for (Element image : imagesTemp) { String text = image.toString(); int start = text.indexOf("data-original=") + 15; diff --git a/src/main/java/files/entity/User.java b/src/main/java/files/entity/User.java index 31eca82..973d781 100644 --- a/src/main/java/files/entity/User.java +++ b/src/main/java/files/entity/User.java @@ -7,13 +7,14 @@ import javax.persistence.Id; public class User { @Id private Long id; + private String username; private Boolean isBot; private String fullName; private String date; public User() {} - public User(long id, boolean isBot, String fullName, String date) { + public User(long id, String username, boolean isBot, String fullName, String date) { this.id = id; this.isBot = isBot; this.fullName = fullName; -- cgit v1.2.3