Merge remote-tracking branch 'origin/feature/2-dataaccess' into feature/2-dataaccess-repositories

# Conflicts:
#	pom.xml
#	src/main/java/com/capgemini/training/appointmentbooking/dataaccess/entity/TreatmentEntity.java
#	src/test/java/com/capgemini/training/appointmentbooking/dataaccess/entity/EntitySmokeIT.java

Author: Piotr Kubicki

README.md

@@ -1,25 +1,53 @@
-# Java Backend Developer Training – Lab Source
+# Java Backend Developer Training – Reference Implementation
 
-> 📌 **This repository contains the reference implementation of the application developed during the Java Backend Developer training.**\
-> Participants progressively gain access to additional branches as they progress through the course.
+> 📌 **This repository contains the _reference implementation_ of the application developed step-by-step during the _Java Backend Developer Training_.**  
+> Each subsequent branch adds more functionality on top of the previous one, allowing participants to explore and compare their solutions.
 
 ## 📖 Project Overview
 
-This project is a **Spring Boot 3** application designed to serve as a **backend development reference implementation**. It follows **clean coding principles** and modern development best practices.
+This is a **Spring Boot 3** backend application named **_Appointment Booking System_**, created as part of hands-on backend development training.  
+It follows modern architectural and coding practices, including **clean code**, **layered structure**, and **modular design**.
 
-The application developed during the Java Backend Developer training is called _**Appointment Booking System**_. 
+📄 Specification: [**AppointmentBookingAppDoc.md**](AppointmentBookingAppDoc.md)
 
-#### Here you will find the specification: **[AppointmentBookingAppDoc.md](AppointmentBookingAppDoc.md).**
+## 🌱 Branch Progression
 
-### 🛠 Tech Stack
+The repository grows in complexity and functionality across branches:
+
+| Branch | Description                                                            |
+|--------|------------------------------------------------------------------------|
+| `main` | Base Spring Boot setup with basic health and H2 endpoints              |
+| `feature/1-create-new-application` | Same as main                                                           |
+| `feature/2-dataaccess` | Persistence layer with Spring Data JPA and H2, part 1                  |
+| `feature/2-dataaccess-repositories` | Persistence layer with Spring Data JPA and H2, part 2                  |
+| `feature/3-business-logic` | Service layer and business logic introduced                            |
+| `feature/4-services` | OpenAPI/Swagger setup for live API documentation and testing           |
+| `feature/5-security` | Spring Security integration for basic authentication and authorization |
+
+## 🌐 Useful Endpoints
+
+After starting the application, you can access the following in your browser:
+
+| URL | Available from | Description |
+|-----|----------------|-------------|
+| [http://localhost:8080/actuator/health](http://localhost:8080/actuator/health) | `main` | Basic application health check |
+| [http://localhost:8080/h2-console](http://localhost:8080/h2-console) | `main` | In-memory H2 database console |
+| [http://localhost:8080/swagger-ui/index.html](http://localhost:8080/swagger-ui/index.html) | `feature/4-services` | OpenAPI UI for testing and exploring REST API |
+
+## 🛠 Tech Stack
 
 - **Java 21**
 - **Spring Boot 3**
-- **Maven 3.9.x** as the build tool
-- **JUnit 5 & AssertJ** for testing
+- **Maven 3.9+**
+- **JUnit 5 & AssertJ**
+- **H2 Database**
+- **OpenAPI & Swagger UI**
+- **Spring Security**
 - **GitHub Actions** for CI/CD
 
-## 📂 Repository Structure
+## 📁 Project Structure
+
+
 
 ```
 java-backend-developer-app/
@@ -80,12 +108,17 @@ GitHub Actions is used for CI/CD, configured in \`.github/workflows/ci.yml\`. Th
 - **Every push and pull request** to \`main\` and feature branches.
 - **Runs tests** and generates reports.
 
+## 🙋 Who Is This For?
+This reference repo is intended for trainers and mentors to demonstrate completed solutions.
+🧑‍💻 **Each training participant works independently in a separate student repository.** This repository serves as a working example.
+
 ## 🤝 Contribution Guidelines
 
-1. Create a **feature branch** for any changes.
+1. Create a **feature branch** for any changes from a particular, possibly smallest "main" feature branch, e.g. 'feature/2-data-access'.
 2. Ensure the code **follows project conventions** and is properly tested.
-3. Open a **Pull Request** to \`main\`. Direct pushes are restricted.
+3. Open a **Pull Request** to particular, corresponding "main" feature branch, e.g. 'feature/2-data-access'. Direct pushes are restricted. 
 4. Wait for **CI to pass** and a **review** before merging.
+5. Rebase higher feature branches onto changed one, e.g. if you merged to 'feature/3-business-logic', then you should rebase 'feature/4-services' and 'feature/5-security' to have your changes there as well.
 
 ## License
 

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.4.3</version>
+		<version>3.4.4</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.capgemini.training</groupId>
@@ -55,7 +55,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<scope>provided</scope>
+            <scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -79,6 +79,13 @@
 
 	<build>
 		<plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <release>${java.version}</release>
+                </configuration>
+            </plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -104,12 +111,12 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.5.2</version>
+				<version>3.5.3</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.5.2</version>
+				<version>3.5.3</version>
 				<executions>
 					<execution>
 						<goals>
@@ -122,7 +129,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-report-plugin</artifactId>
-				<version>3.5.2</version>
+				<version>3.5.3</version>
 				<executions>
 					<execution>
 						<phase>verify</phase>
@@ -151,6 +158,24 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>com.diffplug.spotless</groupId>
+				<artifactId>spotless-maven-plugin</artifactId>
+				<version>2.43.0</version>
+				<configuration>
+					<java>
+						<removeUnusedImports/>
+						<eclipse/>
+					</java>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

src/main/java/com/capgemini/training/appointmentbooking/common/datatype/AppointmentStatus.java

@@ -1,5 +1,5 @@
 package com.capgemini.training.appointmentbooking.common.datatype;
 
 public enum AppointmentStatus {
-SCHEDULED, CANCELLED, COMPLETED;
+	SCHEDULED, CANCELLED, COMPLETED
 }

src/main/java/com/capgemini/training/appointmentbooking/common/datatype/Specialization.java

@@ -1,24 +1,19 @@
 package com.capgemini.training.appointmentbooking.common.datatype;
 
+import lombok.Getter;
+
+@Getter
 public enum Specialization {
-	
-	DENTIST("Dentist"), 
-	CARDIOLOGIST("Cardiologist"), 
-	PEDIATRICIAN("Pediatrician"), 
-	UROLOGIST("Urologist"), 
-	NEUROLOGIST("Neurologist"), 
-	ORTHOPAEDIST("Orthopaedist");
-	
-	private String name;
-
-	private Specialization(String name) {
+
+	DENTIST("Dentist"), CARDIOLOGIST("Cardiologist"), PEDIATRICIAN("Pediatrician"), UROLOGIST("Urologist"), NEUROLOGIST(
+			"Neurologist"), ORTHOPAEDIST("Orthopaedist");
+
+	private final String name;
+
+	Specialization(String name) {
 		this.name = name;
 	}
 
-	public String getName() {
-		return this.name;
-	}
-	
 	public static Specialization getByName(String name) {
 
 		for (Specialization s : Specialization.values()) {
@@ -28,5 +23,5 @@ public static Specialization getByName(String name) {
 		}
 		return null;
 	}
-	
+
 }

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/converter/SpecializationConverter.java

@@ -9,17 +9,17 @@ public class SpecializationConverter implements AttributeConverter<Specializatio
 
 	@Override
 	public String convertToDatabaseColumn(Specialization specialization) {
-		
+
 		return specialization != null ? specialization.getName() : null;
-		
+
 	}
 
 	@Override
-    public Specialization convertToEntityAttribute(String dbData) {
-        if (dbData == null) {
-            return null;
-        }
-        return Specialization.getByName(dbData);
-    }
+	public Specialization convertToEntityAttribute(String dbData) {
+		if (dbData == null) {
+			return null;
+		}
+		return Specialization.getByName(dbData);
+	}
 
 }

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/entity/AppointmentEntity.java

@@ -19,26 +19,26 @@
 import lombok.Setter;
 
 @Entity
-@Table(name="APPOINTMENT")
+@Table(name = "APPOINTMENT")
 @Getter
 @Setter
 public class AppointmentEntity extends BaseEntity {
-	
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "APPOINTMENT_SEQ_GEN")
-	@SequenceGenerator(sequenceName = "APPOINTMENT_SEQ", name = "APPOINTMENT_SEQ_GEN", allocationSize = 100, initialValue = 1)
+	@SequenceGenerator(sequenceName = "APPOINTMENT_SEQ", name = "APPOINTMENT_SEQ_GEN", allocationSize = 100)
 	private Long id;
-	
+
 	@ManyToOne(fetch = FetchType.LAZY)
 	private ClientEntity client;
-	
+
 	@ManyToOne(fetch = FetchType.LAZY)
 	private TreatmentEntity treatment;
-	
-	@Column(name="DATE_TIME")
+
+	@Column(name = "DATE_TIME")
 	private Instant dateTime;
-	
+
 	@Enumerated(EnumType.STRING)
 	private AppointmentStatus status;
-	
+
 }

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/entity/BaseEntity.java

@@ -1,7 +1,6 @@
 package com.capgemini.training.appointmentbooking.dataaccess.entity;
 
 import java.time.Instant;
-import java.util.Date;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.MappedSuperclass;
@@ -14,24 +13,24 @@
 @MappedSuperclass
 @Getter
 public class BaseEntity {
-	
+
 	@Version
 	@Setter
 	private int version;
 
-	@Column(insertable = true, updatable = false)
+	@Column(updatable = false)
 	private Instant created;
-	
-	@Column(name="LAST_UPDATED")
+
+	@Column(name = "LAST_UPDATED")
 	private Instant lastUpdated;
-	
+
 	@PrePersist
 	public void prePersist() {
 		Instant now = Instant.now();
 		this.created = now;
 		this.lastUpdated = now;
 	}
-	
+
 	@PreUpdate
 	public void preUpdate() {
 		this.lastUpdated = Instant.now();

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/entity/ClientEntity.java

@@ -16,20 +16,21 @@
 import lombok.Setter;
 
 @Entity
-@Table(name="CLIENT")
+@Table(name = "CLIENT")
 @Getter
 @Setter
-public class ClientEntity  extends BaseEntity {
-	
+public class ClientEntity extends BaseEntity {
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "CLIENT_SEQ_GEN")
-	@SequenceGenerator(sequenceName = "CLIENT_SEQ", name = "CLIENT_SEQ_GEN", allocationSize = 100, initialValue = 1)
+	@SequenceGenerator(sequenceName = "CLIENT_SEQ", name = "CLIENT_SEQ_GEN", allocationSize = 100)
 	private Long id;
-	
-	@OneToOne(optional = false, fetch = FetchType.LAZY, cascade = { CascadeType.PERSIST })
+
+	@OneToOne(optional = false, fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
 	private UserEntity user;
-	
-	@OneToMany(mappedBy = "client", fetch = FetchType.LAZY, orphanRemoval=true, cascade = { CascadeType.PERSIST, CascadeType.REMOVE })
+
+	@OneToMany(mappedBy = "client", fetch = FetchType.LAZY, orphanRemoval = true, cascade = {CascadeType.PERSIST,
+			CascadeType.REMOVE})
 	private List<AppointmentEntity> appointments;
-	
+
 }

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/entity/SpecialistEntity.java

@@ -9,23 +9,24 @@
 import java.util.List;
 
 @Entity
-@Table(name="SPECIALIST")
+@Table(name = "SPECIALIST")
 @Getter
 @Setter
 @NamedQuery(name = "SpecialistEntity.findBySpecialization", query = "select s from SpecialistEntity s where specialization =:specialization")
 public class SpecialistEntity extends BaseEntity {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SPECIALIST_SEQ_GEN")
-	@SequenceGenerator(sequenceName = "SPECIALIST_SEQ", name = "SPECIALIST_SEQ_GEN", allocationSize = 100, initialValue = 1)
+	@SequenceGenerator(sequenceName = "SPECIALIST_SEQ", name = "SPECIALIST_SEQ_GEN", allocationSize = 100)
 	private Long id;
-	
-	@OneToOne(optional = false, fetch = FetchType.LAZY, cascade = { CascadeType.PERSIST })
+
+	@OneToOne(optional = false, fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
 	private UserEntity user;
-	
+
 	@Convert(converter = SpecializationConverter.class)
 	private Specialization specialization;
 
-	@OneToMany(mappedBy = "specialist", fetch = FetchType.LAZY, orphanRemoval = true, cascade = { CascadeType.PERSIST, CascadeType.REMOVE })
+	@OneToMany(mappedBy = "specialist", fetch = FetchType.LAZY, orphanRemoval = true, cascade = {CascadeType.PERSIST,
+			CascadeType.REMOVE})
 	private List<TreatmentEntity> treatments;
 }