diff --git a/src/main/java/wtf/beatrice/releasehive/Main.java b/src/main/java/wtf/beatrice/releasehive/HiveMain.java similarity index 71% rename from src/main/java/wtf/beatrice/releasehive/Main.java rename to src/main/java/wtf/beatrice/releasehive/HiveMain.java index 11e1a9e..905a376 100644 --- a/src/main/java/wtf/beatrice/releasehive/Main.java +++ b/src/main/java/wtf/beatrice/releasehive/HiveMain.java @@ -12,9 +12,9 @@ import wtf.beatrice.releasehive.models.User; import java.util.List; @SpringBootApplication -public class Main { +public class HiveMain { - private static final Logger LOGGER = LogManager.getLogger(Main.class); + private static final Logger LOGGER = LogManager.getLogger(HiveMain.class); public static void main(String[] args) { LOGGER.info("Hello world!"); @@ -26,7 +26,7 @@ public class Main { HibernateManager.initialize(); LOGGER.info("Initializing Spring Boot"); - SpringApplication.run(Main.class, args); + SpringApplication.run(HiveMain.class, args); LOGGER.info("Spring Boot & DB initialized!"); @@ -35,7 +35,13 @@ public class Main { List users = session.createQuery("FROM User", User.class).getResultList(); transaction.commit(); - users.forEach(user -> LOGGER.info("ID: {}, Name: {}", user.getUuid(), user.getUsername())); + StringBuilder usersListBuilder = new StringBuilder("["); + users.forEach(user -> usersListBuilder.append(user.getUsername()).append(",")); + usersListBuilder.deleteCharAt(usersListBuilder.length() - 1); + usersListBuilder.append("]"); + + + LOGGER.info("Found users: {}, Total: {}", usersListBuilder, users.size()); } private static final Thread shutdownHook = new Thread(() -> { diff --git a/src/main/java/wtf/beatrice/releasehive/models/User.java b/src/main/java/wtf/beatrice/releasehive/models/User.java index cbe223a..3832ce3 100644 --- a/src/main/java/wtf/beatrice/releasehive/models/User.java +++ b/src/main/java/wtf/beatrice/releasehive/models/User.java @@ -24,7 +24,6 @@ public class User implements UserDetails @Column(nullable = false) private String username; - @Column(unique = true, length = 64, nullable = false) private String email; diff --git a/src/main/java/wtf/beatrice/releasehive/services/AccountServiceImpl.java b/src/main/java/wtf/beatrice/releasehive/services/AccountServiceImpl.java index a3904bb..01cd354 100644 --- a/src/main/java/wtf/beatrice/releasehive/services/AccountServiceImpl.java +++ b/src/main/java/wtf/beatrice/releasehive/services/AccountServiceImpl.java @@ -20,8 +20,8 @@ public class AccountServiceImpl implements AccountService { public AccountServiceImpl( @Autowired UserRepository userRepository, @Autowired AuthenticationManager authenticationManager, - @Autowired PasswordEncoder passwordEncoder - ) { + @Autowired PasswordEncoder passwordEncoder) + { this.authenticationManager = authenticationManager; this.userRepository = userRepository; this.passwordEncoder = passwordEncoder;