Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
c16377c
#1 | Hendi Santika | Upgraded into Spring Boot 2.8.0 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
84799a9
#1 | Hendi Santika | Upgraded into Spring Boot 2.8.1 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
d55ccfa
#1 | Hendi Santika | Upgraded into Spring Boot 2.8.2 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
753b92c
#1 | Hendi Santika | Upgraded into Spring Boot 2.8.3 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
197c688
#1 | Hendi Santika | Upgraded into Spring Boot 2.8.4 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
0d102f1
#1 | Hendi Santika | Upgraded into Spring Boot 2.8.5 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
b989c92
#1 | Hendi Santika | Upgraded into Spring Boot 2.8.6 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
65eed3a
#1 | Hendi Santika | Upgraded into Spring Boot 2.8.7 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
bbc7f07
#1 | Hendi Santika | Upgraded into Spring Boot 2.8.8 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
9b13882
#1 | Hendi Santika | Upgraded into Spring Boot 2.8.9 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
cb02308
#1 | Hendi Santika | Upgraded into Spring Boot 2.9.0 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
2a3cee5
#1 | Hendi Santika | Upgraded into Spring Boot 2.9.1 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
b7a0ae6
#1 | Hendi Santika | Upgraded into Spring Boot 2.9.2 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
e44c371
#1 | Hendi Santika | Upgraded into Spring Boot 2.9.3 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
484cbde
#1 | Hendi Santika | Upgraded into Spring Boot 2.9.4 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
89f09a6
#1 | Hendi Santika | Upgraded into Spring Boot 2.9.5 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
ac064cb
#1 | Hendi Santika | Upgraded into Spring Boot 2.9.6 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
2bfcdf2
#1 | Hendi Santika | Upgraded into Spring Boot 2.9.7 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
edbf41e
#1 | Hendi Santika | Upgraded into Spring Boot 2.9.8 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
b6bbaf8
#1 | Hendi Santika | Upgraded into Spring Boot 2.9.9 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
ba37a92
#1 | Hendi Santika | Upgraded into Spring Boot 3.0.0 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
5844aa7
#1 | Hendi Santika | Upgraded into Spring Boot 3.0.1 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
aa2ec6b
#1 | Hendi Santika | Upgraded into Spring Boot 3.0.2 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
d9c2860
#1 | Hendi Santika | Upgraded into Spring Boot 3.0.3 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
837bcdc
#1 | Hendi Santika | Upgraded into Spring Boot 3.0.4 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
c638b9a
#1 | Hendi Santika | Upgraded into Spring Boot 3.0.5 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
31be5dc
#1 | Hendi Santika | Upgraded into Spring Boot 3.0.6 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
857b406
#1 | Hendi Santika | Upgraded into Spring Boot 3.0.7 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
50faa00
#1 | Hendi Santika | Upgraded into Spring Boot 3.0.8 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
d398d24
#1 | Hendi Santika | Upgraded into Spring Boot 3.0.9 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
c048e3a
#1 | Hendi Santika | Upgraded into Spring Boot 3.0.10 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
de6d08b
#1 | Hendi Santika | Upgraded into Spring Boot 3.1.0 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
67d8633
#1 | Hendi Santika | Upgraded into Spring Boot 3.1.1 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
43c97a4
#1 | Hendi Santika | Upgraded into Spring Boot 3.1.2 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
79ada57
#1 | Hendi Santika | Upgraded into Spring Boot 3.1.3 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
1f57abf
#1 | Hendi Santika | Upgraded into Spring Boot 3.1.4 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
cc5a772
#1 | Hendi Santika | Upgraded into Spring Boot 3.1.5 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
fc84de7
#1 | Hendi Santika | Upgraded into Spring Boot 3.1.6 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
3a871d2
#1 | Hendi Santika | Upgraded into Spring Boot 3.1.7 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
76b5328
#1 | Hendi Santika | Upgraded into Spring Boot 3.1.8 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
235332a
#1 | Hendi Santika | Upgraded into Spring Boot 3.1.9 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
1bc05a1
#1 | Hendi Santika | Upgraded into Spring Boot 3.2.0 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
6746818
#1 | Hendi Santika | Upgraded into Spring Boot 3.2.1 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
66a9580
#1 | Hendi Santika | Upgraded into Spring Boot 3.2.2 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
8e54f7a
#1 | Hendi Santika | Upgraded into Spring Boot 3.2.3 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
2629015
#1 | Hendi Santika | Upgraded into Spring Boot 3.2.4 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
3ff3948
#1 | Hendi Santika | Upgraded into Spring Boot 3.2.5 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
45a2340
#1 | Hendi Santika | Upgraded into Spring Boot 3.2.6 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
b30b063
#1 | Hendi Santika | Upgraded into Spring Boot 3.2.7 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
1a650e1
#1 | Hendi Santika | Upgraded into Spring Boot 3.2.8 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
4d6c2e1
#1 | Hendi Santika | Upgraded into Spring Boot 3.2.9 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
8eb1b20
#1 | Hendi Santika | Upgraded into Spring Boot 3.3.0 version πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
644554e
#1 | Hendi Santika | Adjust all codes πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Jul 18, 2024
405ba04
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.3.1 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
572c366
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.3.2 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
14e698f
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.3.3 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
6c4a77c
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.3.4 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
52a7bec
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.3.5 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
e40fc22
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.3.6 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
295fe69
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.3.7 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
99b68aa
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.3.8 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
eeb14b1
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.3.9 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
b1aa24b
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.4.0 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
9d72e31
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.4.1 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
4adbbc9
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.4.2 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
24ed29a
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.4.3 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
f73a876
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.4.4 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
9ead266
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.4.5 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
fd6f8d4
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.4.6 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
244d89a
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.4.7 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
12b2db1
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.4.8 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
1f316f5
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.4.9 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
bc23fe5
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.5.0 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
40fd4b0
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.5.1 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
903e089
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.5.2 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
0e8d580
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.5.3 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
8fd8260
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.5.4 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
884a513
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.5.5 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
d226204
#1 | @hendisantika | feat: Upgraded into Spring Boot 3.5.6 version πŸ«ΈπŸŒ€β€¦
hendisantika Oct 10, 2025
b55a7c7
#4 | @hendisantika | ci: Setup GitHub Action πŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Oct 10, 2025
8af930f
#5 | @hendisantika | ci: Setup dependabot.ymlπŸ«ΈπŸŒ€βœοΈπŸ“—πŸ§πŸ³β¬†
hendisantika Oct 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: 2
updates:
- package-ecosystem: maven
directory: "/"
schedule:
interval: daily
time: '05:00'
timezone: Asia/Jakarta
open-pull-requests-limit: 10
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
time: '05:00'
timezone: Asia/Jakarta
open-pull-requests-limit: 10
35 changes: 35 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Java CI with Maven

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml

# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
- name: Update dependency graph
uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ target/

### IntelliJ IDEA ###
.idea
logs
*.iws
*.iml
*.ipr
Expand Down
15 changes: 8 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.6.RELEASE</version>
<version>3.5.6</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>com.halim</groupId>
Expand All @@ -16,7 +16,7 @@
<description> Spring Boot</description>

<properties>
<java.version>11</java.version>
<java.version>21</java.version>
</properties>

<dependencies>
Expand All @@ -32,25 +32,26 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<scope>runtime</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-devtools -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<version>2.3.0.RELEASE</version><!--$NO-MVN-MAN-VER$ -->
</dependency>
<!-- https://mvnrepository.com/artifact/net.coobird/thumbnailator -->
<dependency>
<groupId>net.coobird</groupId>
<artifactId>thumbnailator</artifactId>
<version>0.4.12</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand Down
24 changes: 10 additions & 14 deletions src/main/java/com/halim/model/Carousel.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package com.halim.model;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;

import com.sun.istack.NotNull;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Lob;
import jakarta.validation.constraints.NotNull;

@Entity
public class Carousel {
Expand Down Expand Up @@ -51,11 +50,8 @@ public boolean equals(Object obj) {
return false;
Carousel other = (Carousel) obj;
if (id == null) {
if (other.id != null)
return false;
} else if (!id.equals(other.id))
return false;
return true;
}
return other.id == null;
} else return id.equals(other.id);
}

}
28 changes: 13 additions & 15 deletions src/main/java/com/halim/model/CartItem.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.halim.model;

import java.util.Date;
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.Table;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;

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.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import java.util.Date;

@Entity
@Table(name = "cartitem")
Expand Down Expand Up @@ -93,10 +93,8 @@ public boolean equals(Object obj) {
return false;
} else if (!product.equals(other.product))
return false;
if (quantity != other.quantity)
return false;
return true;
}
return quantity == other.quantity;
}

@Override
public String toString() {
Expand Down
26 changes: 12 additions & 14 deletions src/main/java/com/halim/model/Category.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package com.halim.model;

import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.Transient;
import org.antlr.v4.runtime.misc.NotNull;

import java.util.Set;

import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.Transient;
import com.sun.istack.NotNull;

@Entity
public class Category {
Expand Down Expand Up @@ -74,12 +75,9 @@ public boolean equals(Object obj) {
} else if (!id.equals(other.id))
return false;
if (name == null) {
if (other.name != null)
return false;
} else if (!name.equals(other.name))
return false;
return true;
}
return other.name == null;
} else return name.equals(other.name);
}


}
25 changes: 10 additions & 15 deletions src/main/java/com/halim/model/Coupon.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.halim.model;

import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Transient;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Transient;

@Entity
public class Coupon {
Expand All @@ -27,10 +27,8 @@ public void setDiscount(int discount) {
this.discount = discount;
}
public boolean isDicount() {
if(this.discount != 0)
return true;
return false;
}
return this.discount != 0;
}
@Override
public int hashCode() {
final int prime = 31;
Expand All @@ -51,12 +49,9 @@ public boolean equals(Object obj) {
if (discount != other.discount)
return false;
if (id == null) {
if (other.id != null)
return false;
} else if (!id.equals(other.id))
return false;
return true;
}
return other.id == null;
} else return id.equals(other.id);
}


}
37 changes: 17 additions & 20 deletions src/main/java/com/halim/model/Product.java
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
package com.halim.model;

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.JoinColumn;
import jakarta.persistence.JoinTable;
import jakarta.persistence.Lob;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OneToOne;

import java.util.HashSet;
import java.util.Set;

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.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.Lob;
import javax.persistence.ManyToMany;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;


@Entity
public class Product {
Expand Down Expand Up @@ -128,12 +128,9 @@ public boolean equals(Object obj) {
} else if (!id.equals(other.id))
return false;
if (name == null) {
if (other.name != null)
return false;
} else if (!name.equals(other.name))
return false;
return true;
}
return other.name == null;
} else return name.equals(other.name);
}
@Override
public String toString() {
return "Product [id=" + id + ", name=" + name + "]";
Expand Down
33 changes: 15 additions & 18 deletions src/main/java/com/halim/model/ShoppingCart.java
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package com.halim.model;

import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import jakarta.persistence.Transient;

import java.util.Date;
import java.util.HashSet;
import java.util.Set;

import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;

@Entity
@Table(name = "shoppingcart")
public class ShoppingCart {
Expand Down Expand Up @@ -111,11 +111,8 @@ public boolean equals(Object obj) {
} else if (!items.equals(other.items))
return false;
if (sessionToken == null) {
if (other.sessionToken != null)
return false;
} else if (!sessionToken.equals(other.sessionToken))
return false;
return true;
}
return other.sessionToken == null;
} else return sessionToken.equals(other.sessionToken);
}

}
Loading