From 88b003238ebbdbee5ad32e9e51ff039bb92cf79d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20J=C3=A4rvinen?= Date: Fri, 23 May 2025 15:34:21 +0300 Subject: [PATCH 1/7] Update common to version 2.0.3-RC6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3dadd4d..0d8ff11 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ UTF-8 - 2.0.2.0 + 2.0.3-RC6 2.12.7 From 68c9eb09523cd3213f530f357d3d29c9ec123122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Jyrki=C3=A4inen?= Date: Mon, 30 Jun 2025 11:52:41 +0300 Subject: [PATCH 2/7] jdbc url update --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f0c7de9..4d99aa0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ jdbc.driverClassName=org.postgresql.Driver hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect -jdbc.url=jdbc:postgresql://${TIMESCALEDB_ADDRESS}/citus?user=citus&sslmode=require&reWriteBatchedInserts=true +jdbc.url=jdbc:postgresql://${TIMESCALEDB_ADDRESS}/citus?user=${timescale_db_username}&sslmode=require&reWriteBatchedInserts=true jdbc.user=${timescale_db_username} jdbc.pass=${timescale_db_password} spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect From 462d7807ad1f53bbaf9edde069f6c41100128e8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Jyrki=C3=A4inen?= Date: Mon, 30 Jun 2025 11:56:18 +0300 Subject: [PATCH 3/7] common update --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0d8ff11..f2d2800 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ UTF-8 - 2.0.3-RC6 + 2.0.3 2.12.7 From dae79ad18aa0211d8824840e433c025bda60bf0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Jyrki=C3=A4inen?= Date: Fri, 1 Aug 2025 13:53:45 +0300 Subject: [PATCH 4/7] postgres dependecy update, common update --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f2d2800..65b6418 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ UTF-8 - 2.0.3 + 2.0.4 2.12.7 @@ -67,7 +67,7 @@ org.postgresql postgresql - 42.5.0 + 42.6.0 From 08c10e8396e88f789fad1fb8f9d7c9ae79c10a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Jyrki=C3=A4inen?= Date: Fri, 1 Aug 2025 13:58:58 +0300 Subject: [PATCH 5/7] liquibase version bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 65b6418..0b0fde9 100644 --- a/pom.xml +++ b/pom.xml @@ -175,7 +175,7 @@ org.liquibase liquibase-core - 3.8.0 + 4.8.0 org.springframework.boot From 76e850c2f3c012ca100e4a77a67472a7efec0023 Mon Sep 17 00:00:00 2001 From: bogdandina Date: Wed, 17 Sep 2025 10:33:22 +0300 Subject: [PATCH 6/7] feat(64971): integrate autoformatter --- .github/workflows/test-and-build.yml | 4 + eclipse-java-formatter.xml | 18 +++++ pom.xml | 30 +++++++- .../fi/hsl/transitlog/hfp/HfpDataParser.java | 3 +- .../hfp/TransitDataSchemaWrapper.java | 4 +- .../configuration/DatabaseConfiguration.java | 30 +++----- .../fi/hsl/transitlog/hfp/domain/Event.java | 21 +++--- .../hfp/domain/LightPriorityEvent.java | 2 +- .../persisthfpdata/DomainMappingWriter.java | 75 +++++++++---------- .../hfp/persisthfpdata/MessageProcessor.java | 3 +- .../persisthfpdata/PulsarListenerService.java | 3 +- .../persisthfpdata/archivetodw/DWFile.java | 11 ++- .../archivetodw/LazyDWService.java | 14 ++-- .../archivetodw/azure/AzureBlobClient.java | 8 +- .../archivetodw/azure/AzureUploader.java | 5 +- .../azure/PrivateAzureBlobClient.java | 3 +- .../archivetodw/filesystem/CSVMapper.java | 3 +- .../archivetodw/filesystem/FileStream.java | 3 +- src/test/java/config/H2Configuration.java | 32 +++----- .../hfp/persisthfpdata/DumpServiceIT.java | 4 +- .../archivetodw/LazyDWServiceTest.java | 20 +---- 21 files changed, 149 insertions(+), 147 deletions(-) create mode 100644 eclipse-java-formatter.xml diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index 040cac8..f0fe8cc 100644 --- a/.github/workflows/test-and-build.yml +++ b/.github/workflows/test-and-build.yml @@ -13,6 +13,10 @@ jobs: distribution: 'temurin' java-version: '11' cache: 'maven' + - name: Run Spotless Apply + run: mvn spotless:apply + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build with Maven run: mvn --file pom.xml clean install env: diff --git a/eclipse-java-formatter.xml b/eclipse-java-formatter.xml new file mode 100644 index 0000000..4ae144a --- /dev/null +++ b/eclipse-java-formatter.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3dadd4d..5ba98d5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,8 +7,10 @@ UTF-8 - 2.0.2.0 + 2.0.5 2.12.7 + 2.43.0 + 1.17.0 @@ -226,6 +228,32 @@ true + + com.diffplug.spotless + spotless-maven-plugin + ${spotlessMavenPlugin.version} + + + + ${project.basedir}/eclipse-java-formatter.xml + + + + + + spotless-check + + check + + + + spotless-apply + + apply + + + + diff --git a/src/main/java/fi/hsl/transitlog/hfp/HfpDataParser.java b/src/main/java/fi/hsl/transitlog/hfp/HfpDataParser.java index dbe81a5..9b01c1a 100644 --- a/src/main/java/fi/hsl/transitlog/hfp/HfpDataParser.java +++ b/src/main/java/fi/hsl/transitlog/hfp/HfpDataParser.java @@ -5,8 +5,7 @@ import org.springframework.stereotype.Component; @Component -public -class HfpDataParser { +public class HfpDataParser { public Hfp.Data parseFrom(byte[] data) throws InvalidProtocolBufferException { return Hfp.Data.parseFrom(data); } diff --git a/src/main/java/fi/hsl/transitlog/hfp/TransitDataSchemaWrapper.java b/src/main/java/fi/hsl/transitlog/hfp/TransitDataSchemaWrapper.java index 6382e61..e3eb565 100644 --- a/src/main/java/fi/hsl/transitlog/hfp/TransitDataSchemaWrapper.java +++ b/src/main/java/fi/hsl/transitlog/hfp/TransitDataSchemaWrapper.java @@ -5,10 +5,8 @@ import org.apache.pulsar.client.api.Message; import org.springframework.stereotype.Component; - @Component -public -class TransitDataSchemaWrapper { +public class TransitDataSchemaWrapper { public boolean hasProtobufSchema(Message message) { return TransitdataSchema.hasProtobufSchema(message, TransitdataProperties.ProtobufSchema.HfpData); } diff --git a/src/main/java/fi/hsl/transitlog/hfp/configuration/DatabaseConfiguration.java b/src/main/java/fi/hsl/transitlog/hfp/configuration/DatabaseConfiguration.java index 48bfbb1..ffdbeb4 100644 --- a/src/main/java/fi/hsl/transitlog/hfp/configuration/DatabaseConfiguration.java +++ b/src/main/java/fi/hsl/transitlog/hfp/configuration/DatabaseConfiguration.java @@ -17,11 +17,7 @@ @Configuration @PropertySource({"classpath:application.properties"}) -@EnableJpaRepositories( - basePackages = "fi.hsl.transitlog.hfp.domain.repositories", - entityManagerFactoryRef = "devWriteEntityManager", - transactionManagerRef = "devWriteTransactionManager" -) +@EnableJpaRepositories(basePackages = "fi.hsl.transitlog.hfp.domain.repositories", entityManagerFactoryRef = "devWriteEntityManager", transactionManagerRef = "devWriteTransactionManager") @Profile(value = {"default", "dev"}) @EnableTransactionManagement @EnableAsync @@ -32,28 +28,22 @@ public class DatabaseConfiguration { @Bean @Primary public PlatformTransactionManager devWriteTransactionManager() { - JpaTransactionManager transactionManager - = new JpaTransactionManager(); - transactionManager.setEntityManagerFactory( - devWriteEntityManager().getObject()); + JpaTransactionManager transactionManager = new JpaTransactionManager(); + transactionManager.setEntityManagerFactory(devWriteEntityManager().getObject()); return transactionManager; } @Bean @Primary public LocalContainerEntityManagerFactoryBean devWriteEntityManager() { - LocalContainerEntityManagerFactoryBean em - = new LocalContainerEntityManagerFactoryBean(); + LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); em.setDataSource(devWriteDataSource()); - em.setPackagesToScan( - "fi.hsl.transitlog.hfp.domain"); + em.setPackagesToScan("fi.hsl.transitlog.hfp.domain"); - HibernateJpaVendorAdapter vendorAdapter - = new HibernateJpaVendorAdapter(); + HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); em.setJpaVendorAdapter(vendorAdapter); HashMap properties = new HashMap<>(); - properties.put("hibernate.dialect", - env.getProperty("hibernate.dialect")); + properties.put("hibernate.dialect", env.getProperty("hibernate.dialect")); properties.put("hibernate.order_inserts", true); properties.put("hibernate.jdbc.batch_size", 5000); properties.put("hibernate.order_updates", true); @@ -70,10 +60,8 @@ public LocalContainerEntityManagerFactoryBean devWriteEntityManager() { @Bean @Primary public DataSource devWriteDataSource() { - HikariDataSource dataSource - = new HikariDataSource(); - dataSource.setDriverClassName( - env.getProperty("jdbc.driverClassName")); + HikariDataSource dataSource = new HikariDataSource(); + dataSource.setDriverClassName(env.getProperty("jdbc.driverClassName")); dataSource.setJdbcUrl(env.getProperty("jdbc.url")); dataSource.setUsername(env.getProperty("jdbc.user")); dataSource.setPassword(env.getProperty("jdbc.pass")); diff --git a/src/main/java/fi/hsl/transitlog/hfp/domain/Event.java b/src/main/java/fi/hsl/transitlog/hfp/domain/Event.java index d661f5e..ac21a09 100644 --- a/src/main/java/fi/hsl/transitlog/hfp/domain/Event.java +++ b/src/main/java/fi/hsl/transitlog/hfp/domain/Event.java @@ -16,13 +16,11 @@ @MappedSuperclass @EqualsAndHashCode -@JsonSubTypes({ - @JsonSubTypes.Type(value = VehiclePosition.class, name = "vehicleposition"), +@JsonSubTypes({@JsonSubTypes.Type(value = VehiclePosition.class, name = "vehicleposition"), @JsonSubTypes.Type(value = LightPriorityEvent.class, name = "lightpriorityevent"), @JsonSubTypes.Type(value = OtherEvent.class, name = "otherevent"), @JsonSubTypes.Type(value = StopEvent.class, name = "stopevent"), - @JsonSubTypes.Type(value = UnsignedEvent.class, name = "unsignedevent") -}) + @JsonSubTypes.Type(value = UnsignedEvent.class, name = "unsignedevent")}) @Data @Slf4j public abstract class Event { @@ -91,7 +89,8 @@ public Event(Hfp.Topic topic, Hfp.Payload payload) { this.route_id = topic.hasRouteId() ? topic.getRouteId() : null; this.direction_id = topic.hasDirectionId() ? topic.getDirectionId() : null; this.headsign = topic.hasHeadsign() ? topic.getHeadsign() : null; - Optional