Adnan

pom.xml

@@ -5,21 +5,25 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<version>2.7.9</version>
+		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.dsleandro</groupId>
 	<artifactId>image-gallery</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>image-gallery</name>
 	<description>Image gallery with spring</description>
-
 	<properties>
 		<java.version>1.8</java.version>
 	</properties>
-
 	<dependencies>
 		<dependency>
+    <groupId>com.h2database</groupId>
+    <artifactId>h2</artifactId>
+    <scope>runtime</scope>
+</dependency>
+
+		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
@@ -34,11 +38,11 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<scope>runtime</scope>
+			<version>8.0.28</version>
 		</dependency>
 		<dependency>
-    		<groupId>org.springframework.boot</groupId>
-    		<artifactId>spring-boot-starter-security</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -52,14 +56,11 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-   			<groupId>org.springframework.boot</groupId>
-    		<artifactId>spring-boot-starter-validation</artifactId>
-    		<version>2.3.1.RELEASE</version>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
+			<version>2.3.1.RELEASE</version>
 		</dependency>
-
-
 	</dependencies>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -68,5 +69,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
 </project>

src/main/java/com/dsleandro/imagegallery/ImageGalleryApplication.java → src/main/java/com/synchrony/imagegallery/ImageGalleryApplication.java

@@ -1,14 +1,14 @@
-package com.dsleandro.imagegallery;
-
-import com.dsleandro.imagegallery.storage.StorageProperties;
-import com.dsleandro.imagegallery.storage.StorageService;
+package com.synchrony.imagegallery;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 
+import com.synchrony.imagegallery.storage.StorageProperties;
+import com.synchrony.imagegallery.storage.StorageService;
+
 @SpringBootApplication
 @EnableConfigurationProperties(StorageProperties.class)
 public class ImageGalleryApplication {

src/main/java/com/dsleandro/imagegallery/controller/ImageController.java → src/main/java/com/synchrony/imagegallery/controller/ImageController.java

@@ -1,17 +1,11 @@
-package com.dsleandro.imagegallery.controller;
+package com.synchrony.imagegallery.controller;
 
 import java.io.IOException;
 import java.nio.file.Path;
 import java.security.Principal;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import com.dsleandro.imagegallery.entity.Image;
-import com.dsleandro.imagegallery.entity.User;
-import com.dsleandro.imagegallery.repository.ImageRepository;
-import com.dsleandro.imagegallery.repository.UserRepository;
-import com.dsleandro.imagegallery.storage.StorageService;
-
 import org.springframework.core.io.Resource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
@@ -26,6 +20,12 @@
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder;
 
+import com.synchrony.imagegallery.entity.Image;
+import com.synchrony.imagegallery.entity.User;
+import com.synchrony.imagegallery.repository.ImageRepository;
+import com.synchrony.imagegallery.repository.UserRepository;
+import com.synchrony.imagegallery.storage.StorageService;
+
 @Controller
 public class ImageController {
 

src/main/java/com/dsleandro/imagegallery/controller/UserController.java → src/main/java/com/synchrony/imagegallery/controller/UserController.java

@@ -1,18 +1,19 @@
-package com.dsleandro.imagegallery.controller;
+package com.synchrony.imagegallery.controller;
 
 import java.security.Principal;
 
 import javax.validation.Valid;
 
-import com.dsleandro.imagegallery.entity.User;
-import com.dsleandro.imagegallery.service.UserService;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
+
+import com.synchrony.imagegallery.entity.User;
+import com.synchrony.imagegallery.service.UserService;
+
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 

src/main/java/com/dsleandro/imagegallery/entity/Image.java → src/main/java/com/synchrony/imagegallery/entity/Image.java

@@ -1,4 +1,4 @@
-package com.dsleandro.imagegallery.entity;
+package com.synchrony.imagegallery.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -24,7 +24,7 @@ public class Image {
     private String path;
 
     @ManyToOne(optional = false)
-    @JoinColumn(name = "user")
+    @JoinColumn(name = "user_details")
     private User user;
 
     public Image() {

src/main/java/com/dsleandro/imagegallery/entity/User.java → src/main/java/com/synchrony/imagegallery/entity/User.java

@@ -1,4 +1,4 @@
-package com.dsleandro.imagegallery.entity;
+package com.synchrony.imagegallery.entity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,7 +17,7 @@
 import javax.validation.constraints.Pattern.Flag;
 
 @Entity
-@Table(name = "user")
+@Table(name = "user_details")
 public class User {
 
     @Id

src/main/java/com/dsleandro/imagegallery/repository/ImageRepository.java → src/main/java/com/synchrony/imagegallery/repository/ImageRepository.java

@@ -1,13 +1,13 @@
-package com.dsleandro.imagegallery.repository;
+package com.synchrony.imagegallery.repository;
 
 import java.util.List;
 
-import com.dsleandro.imagegallery.entity.Image;
-import com.dsleandro.imagegallery.entity.User;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import com.synchrony.imagegallery.entity.Image;
+import com.synchrony.imagegallery.entity.User;
+
 @Repository("imageRepository")
 public interface ImageRepository extends JpaRepository<Image, Long> {
    List<Image> findByUser(User user);

src/main/java/com/dsleandro/imagegallery/repository/UserRepository.java → src/main/java/com/synchrony/imagegallery/repository/UserRepository.java

@@ -1,12 +1,12 @@
-package com.dsleandro.imagegallery.repository;
+package com.synchrony.imagegallery.repository;
 
 import java.util.Optional;
 
-import com.dsleandro.imagegallery.entity.User;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import com.synchrony.imagegallery.entity.User;
+
 @Repository("userRepository")
 public interface UserRepository extends JpaRepository<User, Long>{
    public Optional<User> findByUsername(String username);

src/main/java/com/dsleandro/imagegallery/security/WebSecurity.java → src/main/java/com/synchrony/imagegallery/security/WebSecurity.java

@@ -1,4 +1,4 @@
-package com.dsleandro.imagegallery.security;
+package com.synchrony.imagegallery.security;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;

src/main/java/com/dsleandro/imagegallery/service/UserDetailsServiceImpl.java → src/main/java/com/synchrony/imagegallery/service/UserDetailsServiceImpl.java

@@ -1,9 +1,7 @@
-package com.dsleandro.imagegallery.service;
+package com.synchrony.imagegallery.service;
 
 import java.util.Collections;
 
-import com.dsleandro.imagegallery.repository.UserRepository;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -12,6 +10,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.synchrony.imagegallery.repository.UserRepository;
+
 @Service
 @Transactional
 public class UserDetailsServiceImpl implements UserDetailsService {
@@ -22,7 +22,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
 
-        com.dsleandro.imagegallery.entity.User user = userRepository.findByUsername(username).orElseThrow(()-> new UsernameNotFoundException("Invalid username"));
+        com.synchrony.imagegallery.entity.User user = userRepository.findByUsername(username).orElseThrow(()-> new UsernameNotFoundException("Invalid username"));
 
         return new User(username, user.getPassword(), Collections.emptyList());
 

src/main/java/com/dsleandro/imagegallery/service/UserService.java → src/main/java/com/synchrony/imagegallery/service/UserService.java

@@ -1,11 +1,11 @@
-package com.dsleandro.imagegallery.service;
-
-import com.dsleandro.imagegallery.entity.User;
-import com.dsleandro.imagegallery.repository.UserRepository;
+package com.synchrony.imagegallery.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.synchrony.imagegallery.entity.User;
+import com.synchrony.imagegallery.repository.UserRepository;
+
 @Service
 public class UserService {
 

src/main/java/com/dsleandro/imagegallery/storage/FileSystemStorageService.java → src/main/java/com/synchrony/imagegallery/storage/FileSystemStorageService.java

@@ -1,4 +1,4 @@
-package com.dsleandro.imagegallery.storage;
+package com.synchrony.imagegallery.storage;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -9,15 +9,15 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-import com.dsleandro.imagegallery.entity.Image;
-import com.dsleandro.imagegallery.entity.User;
-import com.dsleandro.imagegallery.repository.ImageRepository;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.stereotype.Service;
 
+import com.synchrony.imagegallery.entity.Image;
+import com.synchrony.imagegallery.entity.User;
+import com.synchrony.imagegallery.repository.ImageRepository;
+
 @Service
 public class FileSystemStorageService implements StorageService {
 

src/main/java/com/dsleandro/imagegallery/storage/StorageException.java → src/main/java/com/synchrony/imagegallery/storage/StorageException.java

@@ -1,4 +1,4 @@
-package com.dsleandro.imagegallery.storage;
+package com.synchrony.imagegallery.storage;
 
 public class StorageException extends RuntimeException {
 

src/main/java/com/dsleandro/imagegallery/storage/StorageFileNotFoundException.java → src/main/java/com/synchrony/imagegallery/storage/StorageFileNotFoundException.java

@@ -1,4 +1,4 @@
-package com.dsleandro.imagegallery.storage;
+package com.synchrony.imagegallery.storage;
 
 public class StorageFileNotFoundException extends StorageException {
 

src/main/java/com/dsleandro/imagegallery/storage/StorageProperties.java → src/main/java/com/synchrony/imagegallery/storage/StorageProperties.java

@@ -1,4 +1,4 @@
-package com.dsleandro.imagegallery.storage;
+package com.synchrony.imagegallery.storage;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

src/main/java/com/dsleandro/imagegallery/storage/StorageService.java → src/main/java/com/synchrony/imagegallery/storage/StorageService.java

@@ -1,12 +1,12 @@
-package com.dsleandro.imagegallery.storage;
+package com.synchrony.imagegallery.storage;
 
 import org.springframework.core.io.Resource;
 
+import com.synchrony.imagegallery.entity.User;
+
 import java.nio.file.Path;
 import java.util.stream.Stream;
 
-import com.dsleandro.imagegallery.entity.User;
-
 public interface StorageService {
 
 	void init();

src/main/resources/application.properties

@@ -1,7 +1,19 @@
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://localhost:3306/imagegallery?serverTimezone=UTC
-
-spring.datasource.username=root
+#H2 CONFIGS
+spring.datasource.url=jdbc:h2:mem:testdb
+spring.datasource.driverClassName=org.h2.Driver
+spring.datasource.username=sa
 spring.datasource.password=
+spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.show-sql=true
+server.port=8082
 
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
+#MYSQL CONFIGS
+#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.url=jdbc:mysql://localhost:3306/testdb
+#spring.datasource.username=root
+#spring.datasource.password=1234
+#spring.jpa.hibernate.ddl-auto=update
+#spring.jpa.show-sql=true
+#server.port=8082
+#spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect