refactoring

Author: oleksandrh

src/main/java/org/springframework/samples/petclinic/clinicactivity/ClinicActivityController.java

@@ -23,7 +23,7 @@
 
 @RestController
 @RequestMapping("/api/clinic-activity")
-@Profile("postgres")
+@Profile({"postgres", "mysql"})
 public class ClinicActivityController implements InitializingBean {
 
     private static final Logger logger = LoggerFactory.getLogger(ClinicActivityController.class);

src/main/java/org/springframework/samples/petclinic/clinicactivity/ClinicActivityDataService.java

@@ -36,7 +36,7 @@
 import java.util.HashMap;
 
 @Service
-@Profile("postgres")
+@Profile({"postgres", "mysql"})
 public class ClinicActivityDataService {
 
     private static final Logger logger = LoggerFactory.getLogger(ClinicActivityDataService.class);

src/main/java/org/springframework/samples/petclinic/config/DatabaseConfig.java

@@ -19,25 +19,25 @@ public class DatabaseConfig {
     @Primary
     @Bean(name = "postgresDataSource")
     @ConfigurationProperties("app.datasource.postgres")
-    @Profile("postgres")
     public DataSource postgresDataSource() {
         return DataSourceBuilder.create().type(HikariDataSource.class).build();
     }
 
     @Bean(name = "mysqlDataSource")
     @ConfigurationProperties("app.datasource.mysql")
+    @Profile("mysql")
     public DataSource mysqlDataSource() {
         return DataSourceBuilder.create().type(HikariDataSource.class).build();
     }
 
     @Primary
     @Bean(name = "postgresJdbcTemplate")
-    @Profile("postgres")
     public JdbcTemplate postgresJdbcTemplate(@Qualifier("postgresDataSource") DataSource dataSource) {
         return new JdbcTemplate(dataSource);
     }
 
     @Bean(name = "mysqlJdbcTemplate")
+    @Profile("mysql")
     public JdbcTemplate mysqlJdbcTemplate(@Qualifier("mysqlDataSource") DataSource dataSource) {
         return new JdbcTemplate(dataSource);
     }

src/main/java/org/springframework/samples/petclinic/config/MySqlConfig.java

@@ -23,7 +23,7 @@
     transactionManagerRef = "mysqlTransactionManager",
     basePackages = {"org.springframework.samples.petclinic.patientrecords"}
 )
-@Profile({"postgres", "mysql"})
+@Profile("mysql")
 public class MySqlConfig {
 
     @Bean(name = "mysqlEntityManagerFactory")

src/main/java/org/springframework/samples/petclinic/config/PostgresConfig.java

@@ -28,7 +28,7 @@
         "org.springframework.samples.petclinic.clinicactivity"
     }
 )
-@Profile("postgres")
+@Profile({"postgres", "mysql"})
 public class PostgresConfig {
 
     @Primary

src/main/java/org/springframework/samples/petclinic/patientrecords/PatientRecordController.java

@@ -22,7 +22,7 @@
 
 @RestController
 @RequestMapping("/api/patient-records")
-@Profile({"postgres", "mysql"})
+@Profile("mysql")
 public class PatientRecordController implements InitializingBean {
 
     private static final Logger logger = LoggerFactory.getLogger(PatientRecordController.class);

src/main/java/org/springframework/samples/petclinic/patientrecords/PatientRecordDataService.java

@@ -24,7 +24,7 @@
 import java.util.concurrent.TimeUnit;
 
 @Service
-@Profile({"postgres", "mysql"})
+@Profile("mysql")
 public class PatientRecordDataService {
 
     private static final Logger logger = LoggerFactory.getLogger(PatientRecordDataService.class);

src/main/java/org/springframework/samples/petclinic/patientrecords/PatientRecordUiController.java

@@ -11,7 +11,7 @@
 
 @Controller
 @RequestMapping("/patient-records")
-@Profile({"postgres", "mysql"})
+@Profile("mysql")
 public class PatientRecordUiController {
 
     private final JdbcTemplate mysqlJdbcTemplate;

src/main/resources/application-mysql.properties

@@ -1,27 +1,33 @@
-database=h2
-
-# MySQL Configuration for Patient Records ONLY
-# This profile enables MySQL ONLY for patient records
-# Main petclinic data (owners, pets, visits, vets) uses H2 database
-
-# Primary DataSource - H2 (Main PetClinic Data)
-# H2 handles all petclinic functionality when using MySQL profile
-# spring.datasource settings are inherited from default application.properties
+database=postgres
+
+# Multi-Database Configuration - PostgreSQL + MySQL
+# This is the ONLY profile that enables both databases
+# PostgreSQL: Main petclinic data (owners, pets, visits, vets) + clinic activity
+# MySQL: Patient records ONLY (separate medical records system)
+
+# Primary DataSource - PostgreSQL (Main PetClinic Data + Clinic Activity)
+app.datasource.postgres.jdbcUrl=jdbc:postgresql://localhost:5442/petclinic
+app.datasource.postgres.username=${POSTGRES_USER:postgres}
+app.datasource.postgres.password=${POSTGRES_PASS:postgres}
+app.datasource.postgres.driverClassName=org.postgresql.Driver
+app.datasource.postgres.maximumPoolSize=20
+app.datasource.postgres.minimumIdle=5
+app.datasource.postgres.connectionTimeout=20000
+app.datasource.postgres.idleTimeout=300000
+app.datasource.postgres.maxLifetime=1200000
 
 # Secondary DataSource - MySQL (Patient Records ONLY)
-app.datasource.mysql.jdbc-url=${MYSQL_URL:jdbc:mysql://localhost:3306/patient_records}
+app.datasource.mysql.jdbcUrl=${MYSQL_URL:jdbc:mysql://localhost:3306/patient_records}
 app.datasource.mysql.username=${MYSQL_USER:patient_user}
 app.datasource.mysql.password=${MYSQL_PASS:patient_pass}
-app.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-
-# Connection Pool Settings for MySQL (Patient Records)
-app.datasource.mysql.maximum-pool-size=10
-app.datasource.mysql.minimum-idle=2
-app.datasource.mysql.connection-timeout=20000
-app.datasource.mysql.idle-timeout=300000
-app.datasource.mysql.max-lifetime=1200000
-
-# Schema and Data Initialization - H2 ONLY (Main PetClinic)
+app.datasource.mysql.driverClassName=com.mysql.cj.jdbc.Driver
+app.datasource.mysql.maximumPoolSize=10
+app.datasource.mysql.minimumIdle=2
+app.datasource.mysql.connectionTimeout=20000
+app.datasource.mysql.idleTimeout=300000
+app.datasource.mysql.maxLifetime=1200000
+
+# Schema and Data Initialization - PostgreSQL (Main PetClinic)
 spring.sql.init.mode=always
 spring.sql.init.continue-on-error=false
 spring.sql.init.separator=;
@@ -31,7 +37,8 @@ spring.sql.init.separator=;
 app.patient.records.auto-init=false
 app.patient.records.enabled=${PATIENT_RECORDS_ENABLED:true}
 
-# JPA/Hibernate Settings - H2 (Main PetClinic Data)
+# JPA/Hibernate Settings - PostgreSQL (Main PetClinic Data)
+spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.hibernate.ddl-auto=none
 spring.jpa.show-sql=false
 spring.jpa.properties.hibernate.format_sql=false
@@ -41,8 +48,8 @@ spring.jpa.properties.hibernate.order_updates=true
 spring.jpa.properties.hibernate.jdbc.batch_versioned_data=true
 
 # Application Architecture Settings
-app.database.primary=h2
+app.database.primary=postgres
 app.database.secondary=mysql
-app.database.mode=separated
-app.database.primary.purpose=petclinic_data
+app.database.mode=multi_database
+app.database.primary.purpose=petclinic_data_and_clinic_activity
 app.database.secondary.purpose=patient_records_only