Parent: 736e3dee | Patch | Commit | show whitespace
Hendrik Jungnitsch
2023-09-19 4d3d86dea4885a729d02aeb2194bdf0500b05bd4 
Merge branch 'exercise04' into exercise05

# Conflicts:
#	src/main/java/de/gedoplan/seminar/jpa/exercise/domain/MaintenanceDepartment.java
4 Dateien geändert
34 ■■■■■ Geänderte Dateien
pom.xml 2 ●●●●● Patch | Ansicht | Raw | Blame | Historie
src/main/java/de/gedoplan/seminar/jpa/exercise/common/GeneratedIntegerIdEntity.java 8 ●●●●● Patch | Ansicht | Raw | Blame | Historie
src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Highway.java 8 ●●●●● Patch | Ansicht | Raw | Blame | Historie
src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Junction.java 16 ●●●●● Patch | Ansicht | Raw | Blame | Historie 
 pom.xml


@@ -5,7 +5,7 @@


    <parent>


        <groupId>org.springframework.boot</groupId>


        <artifactId>spring-boot-starter-parent</artifactId>


        <version>2.7.3</version>


        <version>3.1.3</version>


        <relativePath/> <!-- lookup parent from repository -->


    </parent>


    <groupId>de.gedoplan.edumat.sbt</groupId>




 src/main/java/de/gedoplan/seminar/jpa/exercise/common/GeneratedIntegerIdEntity.java


@@ -2,10 +2,10 @@




import java.util.Objects;




import javax.persistence.GeneratedValue;


import javax.persistence.GenerationType;


import javax.persistence.Id;


import javax.persistence.MappedSuperclass;


import jakarta.persistence.GeneratedValue;


import jakarta.persistence.GenerationType;


import jakarta.persistence.Id;


import jakarta.persistence.MappedSuperclass;




@MappedSuperclass


public abstract class GeneratedIntegerIdEntity {




 src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Highway.java


@@ -3,10 +3,10 @@


import java.util.ArrayList;


import java.util.List;




import javax.persistence.Entity;


import javax.persistence.Id;


import javax.persistence.OneToMany;


import javax.persistence.Table;


import jakarta.persistence.Entity;


import jakarta.persistence.Id;


import jakarta.persistence.OneToMany;


import jakarta.persistence.Table;




import com.fasterxml.jackson.annotation.JsonIgnoreProperties;






 src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Junction.java


@@ -2,14 +2,14 @@




import java.util.Objects;




import javax.persistence.Entity;


import javax.persistence.EnumType;


import javax.persistence.Enumerated;


import javax.persistence.GeneratedValue;


import javax.persistence.GenerationType;


import javax.persistence.Id;


import javax.persistence.ManyToOne;


import javax.persistence.Table;


import jakarta.persistence.Entity;


import jakarta.persistence.EnumType;


import jakarta.persistence.Enumerated;


import jakarta.persistence.GeneratedValue;


import jakarta.persistence.GenerationType;


import jakarta.persistence.Id;


import jakarta.persistence.ManyToOne;


import jakarta.persistence.Table;




import com.fasterxml.jackson.annotation.JsonIgnoreProperties;