diff --git a/src/main/java/com/alterdekim/javabot/bot/InfoSections.java b/src/main/java/com/alterdekim/javabot/bot/InfoSections.java index 0980a76..f4dd993 100644 --- a/src/main/java/com/alterdekim/javabot/bot/InfoSections.java +++ b/src/main/java/com/alterdekim/javabot/bot/InfoSections.java @@ -2,7 +2,9 @@ package com.alterdekim.javabot.bot; import lombok.Getter; import lombok.Setter; +import lombok.ToString; +@ToString @Getter @Setter public class InfoSections { diff --git a/src/main/java/com/alterdekim/javabot/bot/Player.java b/src/main/java/com/alterdekim/javabot/bot/Player.java index da00e94..a1d9557 100644 --- a/src/main/java/com/alterdekim/javabot/bot/Player.java +++ b/src/main/java/com/alterdekim/javabot/bot/Player.java @@ -4,9 +4,11 @@ import com.alterdekim.javabot.entities.*; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import lombok.ToString; import java.util.List; +@ToString @Getter @Setter @AllArgsConstructor diff --git a/src/main/java/com/alterdekim/javabot/components/BunkerBot.java b/src/main/java/com/alterdekim/javabot/components/BunkerBot.java index 89900fd..5e9404f 100644 --- a/src/main/java/com/alterdekim/javabot/components/BunkerBot.java +++ b/src/main/java/com/alterdekim/javabot/components/BunkerBot.java @@ -258,7 +258,14 @@ public class BunkerBot extends TelegramLongPollingBot { globals.set("player", LuaSerializer.serializeObject(p)); LuaValue chunk = globals.load(script.getScriptBody()); chunk.call(); - players = LuaDeserializer.deserializePlayers(globals.get("players")); + List pls = LuaDeserializer.deserializePlayers(globals.get("players")); + for(Player p1 : players) { + log.info(p1.toString()); + } + log.info("returned:"); + for(Player p1 : pls) { + log.info(p1.toString()); + } } private void processNightButton(CallbackQuery callbackQuery) { diff --git a/src/main/java/com/alterdekim/javabot/entities/ActionScript.java b/src/main/java/com/alterdekim/javabot/entities/ActionScript.java index 0b59efd..301d44a 100644 --- a/src/main/java/com/alterdekim/javabot/entities/ActionScript.java +++ b/src/main/java/com/alterdekim/javabot/entities/ActionScript.java @@ -1,11 +1,9 @@ package com.alterdekim.javabot.entities; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; +@ToString @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/alterdekim/javabot/entities/Bio.java b/src/main/java/com/alterdekim/javabot/entities/Bio.java index e54fedf..43f2807 100644 --- a/src/main/java/com/alterdekim/javabot/entities/Bio.java +++ b/src/main/java/com/alterdekim/javabot/entities/Bio.java @@ -2,14 +2,12 @@ package com.alterdekim.javabot.entities; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; import org.hibernate.annotations.JoinFormula; import java.util.List; +@ToString @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/alterdekim/javabot/entities/Health.java b/src/main/java/com/alterdekim/javabot/entities/Health.java index d7de87a..b7e45b6 100644 --- a/src/main/java/com/alterdekim/javabot/entities/Health.java +++ b/src/main/java/com/alterdekim/javabot/entities/Health.java @@ -1,16 +1,14 @@ package com.alterdekim.javabot.entities; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; import org.hibernate.annotations.JoinFormula; import org.springframework.data.jpa.repository.Query; import java.util.List; import java.util.Set; +@ToString @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/alterdekim/javabot/entities/Hobby.java b/src/main/java/com/alterdekim/javabot/entities/Hobby.java index 4c88abf..015c833 100644 --- a/src/main/java/com/alterdekim/javabot/entities/Hobby.java +++ b/src/main/java/com/alterdekim/javabot/entities/Hobby.java @@ -1,14 +1,12 @@ package com.alterdekim.javabot.entities; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; import org.hibernate.annotations.JoinFormula; import java.util.List; +@ToString @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/alterdekim/javabot/entities/Luggage.java b/src/main/java/com/alterdekim/javabot/entities/Luggage.java index c0bc8ca..c670dc3 100644 --- a/src/main/java/com/alterdekim/javabot/entities/Luggage.java +++ b/src/main/java/com/alterdekim/javabot/entities/Luggage.java @@ -1,10 +1,7 @@ package com.alterdekim.javabot.entities; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinColumnsOrFormulas; import org.hibernate.annotations.JoinFormula; @@ -12,6 +9,7 @@ import org.hibernate.annotations.WhereJoinTable; import java.util.List; +@ToString @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/alterdekim/javabot/entities/Work.java b/src/main/java/com/alterdekim/javabot/entities/Work.java index 28e5a3b..5559f46 100644 --- a/src/main/java/com/alterdekim/javabot/entities/Work.java +++ b/src/main/java/com/alterdekim/javabot/entities/Work.java @@ -2,14 +2,12 @@ package com.alterdekim.javabot.entities; import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; import org.hibernate.annotations.JoinFormula; import java.util.List; +@ToString @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/alterdekim/javabot/util/LuaDeserializer.java b/src/main/java/com/alterdekim/javabot/util/LuaDeserializer.java index 57d588f..f0ec8e9 100644 --- a/src/main/java/com/alterdekim/javabot/util/LuaDeserializer.java +++ b/src/main/java/com/alterdekim/javabot/util/LuaDeserializer.java @@ -6,12 +6,10 @@ import com.alterdekim.javabot.entities.*; import lombok.extern.slf4j.Slf4j; import org.luaj.vm2.LuaTable; import org.luaj.vm2.LuaValue; -import org.springframework.security.core.parameters.P; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import java.util.stream.IntStream; @Slf4j public class LuaDeserializer { diff --git a/src/main/java/com/alterdekim/javabot/util/LuaSerializer.java b/src/main/java/com/alterdekim/javabot/util/LuaSerializer.java index a71c63e..fad20d6 100644 --- a/src/main/java/com/alterdekim/javabot/util/LuaSerializer.java +++ b/src/main/java/com/alterdekim/javabot/util/LuaSerializer.java @@ -1,7 +1,6 @@ package com.alterdekim.javabot.util; import com.alterdekim.javabot.bot.Player; -import com.alterdekim.javabot.entities.Bio; import lombok.extern.slf4j.Slf4j; import org.luaj.vm2.LuaTable; import org.luaj.vm2.LuaValue;