diff --git a/CHANGELOG.md b/CHANGELOG.md index decea52..487d0b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changes This document main purpose is to list changes which might affect backwards compatibility. -It will not list all releases as Twitter Backend Java is built in a continous delivery fashion. +It will not list all releases as Twitter Backend Java is built in a continuous delivery fashion. ### 0.1.0-SNAPSHOT * Fix #1: Added GitHub Action workflows diff --git a/pom.xml b/pom.xml index 5b3c708..6db0307 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.17 + 3.2.0 @@ -51,7 +51,7 @@ ohbus hello@subho.xyz https://subho.xyz - Asia/Kolkata + Europe/Vienna @@ -121,12 +121,6 @@ spring-boot-starter-test test - - - io.springfox - springfox-boot-starter - 3.0.0 - diff --git a/src/main/java/xyz/subho/clone/twitter/TwitterBackendApplication.java b/src/main/java/xyz/subho/clone/twitter/TwitterBackendApplication.java index 8e9573e..c49c3f9 100644 --- a/src/main/java/xyz/subho/clone/twitter/TwitterBackendApplication.java +++ b/src/main/java/xyz/subho/clone/twitter/TwitterBackendApplication.java @@ -20,10 +20,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import springfox.documentation.swagger2.annotations.EnableSwagger2; @SpringBootApplication -@EnableSwagger2 public class TwitterBackendApplication { public static void main(String[] args) { diff --git a/src/main/java/xyz/subho/clone/twitter/config/ApplicationErrorController.java b/src/main/java/xyz/subho/clone/twitter/config/ApplicationErrorController.java index 34cd338..9a0c299 100644 --- a/src/main/java/xyz/subho/clone/twitter/config/ApplicationErrorController.java +++ b/src/main/java/xyz/subho/clone/twitter/config/ApplicationErrorController.java @@ -18,8 +18,8 @@ package xyz.subho.clone.twitter.config; +import jakarta.servlet.http.HttpServletRequest; import java.util.Map; -import javax.servlet.http.HttpServletRequest; import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController; import org.springframework.boot.web.servlet.error.ErrorAttributes; diff --git a/src/main/java/xyz/subho/clone/twitter/entity/HashtagPosts.java b/src/main/java/xyz/subho/clone/twitter/entity/HashtagPosts.java index 3c8dfb9..6ffa08d 100644 --- a/src/main/java/xyz/subho/clone/twitter/entity/HashtagPosts.java +++ b/src/main/java/xyz/subho/clone/twitter/entity/HashtagPosts.java @@ -18,16 +18,16 @@ package xyz.subho.clone.twitter.entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.util.Date; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; import lombok.Data; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; diff --git a/src/main/java/xyz/subho/clone/twitter/entity/Hashtags.java b/src/main/java/xyz/subho/clone/twitter/entity/Hashtags.java index 5a88376..8922e2a 100644 --- a/src/main/java/xyz/subho/clone/twitter/entity/Hashtags.java +++ b/src/main/java/xyz/subho/clone/twitter/entity/Hashtags.java @@ -19,20 +19,20 @@ package xyz.subho.clone.twitter.entity; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.OneToMany; -import javax.persistence.Table; import lombok.Data; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; diff --git a/src/main/java/xyz/subho/clone/twitter/entity/Likes.java b/src/main/java/xyz/subho/clone/twitter/entity/Likes.java index d08ed76..415c520 100644 --- a/src/main/java/xyz/subho/clone/twitter/entity/Likes.java +++ b/src/main/java/xyz/subho/clone/twitter/entity/Likes.java @@ -18,16 +18,16 @@ package xyz.subho.clone.twitter.entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.util.Date; import java.util.UUID; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; import lombok.Data; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; diff --git a/src/main/java/xyz/subho/clone/twitter/entity/Posts.java b/src/main/java/xyz/subho/clone/twitter/entity/Posts.java index 43e91b0..228b92d 100644 --- a/src/main/java/xyz/subho/clone/twitter/entity/Posts.java +++ b/src/main/java/xyz/subho/clone/twitter/entity/Posts.java @@ -19,24 +19,24 @@ package xyz.subho.clone.twitter.entity; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; import lombok.Data; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; diff --git a/src/main/java/xyz/subho/clone/twitter/entity/Users.java b/src/main/java/xyz/subho/clone/twitter/entity/Users.java index b4187a2..3dfdff2 100644 --- a/src/main/java/xyz/subho/clone/twitter/entity/Users.java +++ b/src/main/java/xyz/subho/clone/twitter/entity/Users.java @@ -19,23 +19,23 @@ package xyz.subho.clone.twitter.entity; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.OneToMany; -import javax.persistence.Table; import lombok.Data; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 20368d0..c7e2e68 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -29,11 +29,11 @@ # ===================================== # Set here configurations for the database connection -spring.datasource.url=jdbc:mysql://localhost:3306/twitter?createDatabaseIfNotExist=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Kolkata&useSSL=false +spring.datasource.url=jdbc:mysql://${MYSQL_DB_HOST}:${MYSQL_DB_PORT}/twitter?createDatabaseIfNotExist=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Kolkata&useSSL=false # Username and secret -spring.datasource.username=root -spring.datasource.password=root +spring.datasource.username=${MYSQL_DB_UNAME} +spring.datasource.password=${MYSQL_DB_PASSWD} # Keep the connection alive if idle for a long time (needed in production) spring.datasource.testWhileIdle=true @@ -51,9 +51,9 @@ spring.jpa.show-sql=true spring.jpa.properties.hibernate.format_sql=true # Create the SQL file for initializing the database -#spring.jpa.properties.javax.persistence.schema-generation.scripts.action=create -#spring.jpa.properties.javax.persistence.schema-generation.scripts.create-target=target/db/covid-help.sql -#spring.jpa.properties.javax.persistence.schema-generation.scripts.create-source=metadata +#spring.jpa.properties.jakarta.persistence.schema-generation.scripts.action=create +#spring.jpa.properties.jakarta.persistence.schema-generation.scripts.create-target=target/db/covid-help.sql +#spring.jpa.properties.jakarta.persistence.schema-generation.scripts.create-source=metadata # Hibernate ddl auto (create, create-drop, update): with "update" the database # schema will be automatically updated accordingly to java entities found in diff --git a/src/test/java/xyz/subho/clone/twitter/TwitterBackendApplicationTests.java b/src/test/java/xyz/subho/clone/twitter/TwitterBackendApplicationTests.java index bb50c9a..75275d7 100644 --- a/src/test/java/xyz/subho/clone/twitter/TwitterBackendApplicationTests.java +++ b/src/test/java/xyz/subho/clone/twitter/TwitterBackendApplicationTests.java @@ -22,7 +22,7 @@ import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class TwitterBackendApplicationTests { +class DemoApplicationTests { @Test void contextLoads() {}