From 9954923bd42ff79c196e85d74a760bb097b737d6 Mon Sep 17 00:00:00 2001 From: Niquelle Date: Mon, 22 Nov 2021 19:53:54 -0500 Subject: [PATCH] completed studio --- .../codingevents/models/AbstractEntity.java | 32 +++++++++++++++++++ .../launchcode/codingevents/models/Event.java | 22 ++----------- .../codingevents/models/EventCategory.java | 22 ++----------- src/main/resources/application.properties | 4 +-- 4 files changed, 39 insertions(+), 41 deletions(-) create mode 100644 src/main/java/org/launchcode/codingevents/models/AbstractEntity.java diff --git a/src/main/java/org/launchcode/codingevents/models/AbstractEntity.java b/src/main/java/org/launchcode/codingevents/models/AbstractEntity.java new file mode 100644 index 000000000..af1cc0d03 --- /dev/null +++ b/src/main/java/org/launchcode/codingevents/models/AbstractEntity.java @@ -0,0 +1,32 @@ +package org.launchcode.codingevents.models; + +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.MappedSuperclass; +import java.util.Objects; + + +@MappedSuperclass +public abstract class AbstractEntity { + + @Id + @GeneratedValue + private int id; + + public int getId() { + return id; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + AbstractEntity entity = (AbstractEntity) o; + return id == entity.id; + } + + @Override + public int hashCode() { + return Objects.hash(id); + } +} diff --git a/src/main/java/org/launchcode/codingevents/models/Event.java b/src/main/java/org/launchcode/codingevents/models/Event.java index 11ed18d43..26d88e066 100644 --- a/src/main/java/org/launchcode/codingevents/models/Event.java +++ b/src/main/java/org/launchcode/codingevents/models/Event.java @@ -12,11 +12,7 @@ * Created by Chris Bay */ @Entity -public class Event { - - @Id - @GeneratedValue - private int id; +public class Event extends AbstractEntity{ @NotBlank(message = "Name is required") @Size(min = 3, max = 50, message = "Name must be between 3 and 50 characters") @@ -72,25 +68,13 @@ public void setType(EventType type) { this.type = type; } - public int getId() { - return id; - } @Override public String toString() { return name; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - Event event = (Event) o; - return id == event.id; - } - @Override - public int hashCode() { - return Objects.hash(id); - } + + } diff --git a/src/main/java/org/launchcode/codingevents/models/EventCategory.java b/src/main/java/org/launchcode/codingevents/models/EventCategory.java index b088c7a0e..d1b626995 100644 --- a/src/main/java/org/launchcode/codingevents/models/EventCategory.java +++ b/src/main/java/org/launchcode/codingevents/models/EventCategory.java @@ -3,6 +3,7 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; +import javax.swing.plaf.nimbus.AbstractRegionPainter; import javax.validation.constraints.Size; import java.util.Objects; @@ -10,11 +11,7 @@ * Created by Chris Bay */ @Entity -public class EventCategory { - - @Id - @GeneratedValue - private int id; +public class EventCategory extends AbstractEntity { @Size(min=3, message="Name must be at least 3 characters long") private String name; @@ -33,25 +30,10 @@ public void setName(String name) { this.name = name; } - public int getId() { - return id; - } - @Override public String toString() { return name; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - EventCategory that = (EventCategory) o; - return id == that.id; - } - @Override - public int hashCode() { - return Objects.hash(id); - } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 38084f5f5..f8244c57f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ -spring.datasource.url=jdbc:mysql://localhost:3306/coding_events_demo -spring.datasource.username=coding_events_demo +spring.datasource.url=jdbc:mysql://localhost:3306/coding_events +spring.datasource.username=coding_events spring.datasource.password=Learn2code! # Specify the DBMS