Skip to content

Commit d269481

Browse files
TcharlTcharl
authored
Merge pull request #168 from OsgiliathEnterprise/bumpspring
bump spring boot, datafaker and snakeyaml version
2 parents eaccc56 + 65caceb commit d269481

File tree

11 files changed

+68
-25
lines changed

11 files changed

+68
-25
lines changed

‎bom/pom.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>net.osgiliath.datamigrator</groupId>
@@ -78,7 +79,7 @@
7879
<dependency>
7980
<groupId>org.yaml</groupId>
8081
<artifactId>snakeyaml</artifactId>
81-
<version>2.2</version>
82+
<version>2.4</version>
8283
</dependency>
8384
<dependency>
8485
<groupId>org.testcontainers</groupId>
@@ -157,7 +158,7 @@
157158
<dependency>
158159
<groupId>net.datafaker</groupId>
159160
<artifactId>datafaker</artifactId>
160-
<version>2.2.2</version>
161+
<version>2.4.4</version>
161162
</dependency>
162163
</dependencies>
163164
</dependencyManagement>

‎modules/faker/src/main/java/net/osgiliath/migrator/modules/config/FakerBeanFactory.java‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package net.osgiliath.migrator.modules.config;
2+
3+
/*-
4+
* #%L
5+
* datamigrator-modules-faker
6+
* %%
7+
* Copyright (C) 2024 - 2025 Osgiliath Inc.
8+
* %%
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
* #L%
21+
*/
22+
23+
import net.datafaker.Faker;
24+
import org.springframework.context.annotation.Bean;
25+
import org.springframework.context.annotation.Configuration;
26+
27+
@Configuration
28+
public class FakerBeanFactory {
29+
30+
@Bean
31+
public Faker faker() {
32+
return new Faker().getFaker();
33+
}
34+
}

‎modules/faker/src/main/java/net/osgiliath/migrator/modules/faker/AbstractFaker.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,13 @@ public abstract class AbstractFaker<T> extends ModelElementColumnTransformer<T>
5555
private static final Random RANDOM = new Random();
5656
private static Map<String, String> fakedKeys = new HashMap<>();
5757
private static final Collection<String> alreadyFakedValues = new ArrayList<>();
58+
private final Faker faker;
5859

59-
protected AbstractFaker(ModelElementProcessor modelElementProcessor, MetamodelVertex metamodel, ColumnTransformationDefinition columnTransformationDefinition, RawElementProcessor rawElementProcessor) {
60+
protected AbstractFaker(ModelElementProcessor modelElementProcessor, MetamodelVertex metamodel, ColumnTransformationDefinition columnTransformationDefinition, RawElementProcessor rawElementProcessor, Faker faker) {
6061
super(modelElementProcessor, metamodel, columnTransformationDefinition.getColumnName());
6162
this.columnTransformationDefinition = columnTransformationDefinition;
6263
this.rawElementProcessor = rawElementProcessor;
64+
this.faker = faker;
6365
}
6466

6567
protected String fake(String value) {
@@ -83,7 +85,6 @@ private Optional<String> getCachedKey(String originalValue) {
8385
}
8486

8587
private String getRandomString() {
86-
Faker faker = new Faker().getFaker();
8788
String fakerAlg = columnTransformationDefinition.getOptions().getOrDefault(FAKER, "dragon_ball.characters");
8889
if (rawElementProcessor.isUnique(getMetamodel(), columnTransformationDefinition.getColumnName())) {
8990
log.debug("Using unique faker algorithm: {}", fakerAlg);

‎modules/faker/src/main/java/net/osgiliath/migrator/modules/faker/ColumnFaker.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* #L%
2121
*/
2222

23+
import net.datafaker.Faker;
2324
import net.osgiliath.migrator.core.api.metamodel.model.MetamodelVertex;
2425
import net.osgiliath.migrator.core.configuration.ColumnTransformationDefinition;
2526
import net.osgiliath.migrator.core.graph.ModelElementProcessor;
@@ -34,8 +35,8 @@ public class ColumnFaker extends AbstractFaker<Object> {
3435
* @param metamodel the Vertex metamodel (class)
3536
* @param columnTransformationDefinition the column transformation definition
3637
*/
37-
public ColumnFaker(ModelElementProcessor modelElementProcessor, MetamodelVertex metamodel, ColumnTransformationDefinition columnTransformationDefinition, RawElementProcessor rawElementProcessor) {
38-
super(modelElementProcessor, metamodel, columnTransformationDefinition, rawElementProcessor);
38+
public ColumnFaker(ModelElementProcessor modelElementProcessor, MetamodelVertex metamodel, ColumnTransformationDefinition columnTransformationDefinition, RawElementProcessor rawElementProcessor, Faker faker) {
39+
super(modelElementProcessor, metamodel, columnTransformationDefinition, rawElementProcessor, faker);
3940
}
4041

4142
/**

‎modules/faker/src/main/java/net/osgiliath/migrator/modules/faker/ColumnFakerFactorySequencer.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* #L%
2121
*/
2222

23+
import net.datafaker.Faker;
2324
import net.osgiliath.migrator.core.api.metamodel.model.FieldEdge;
2425
import net.osgiliath.migrator.core.api.metamodel.model.MetamodelVertex;
2526
import net.osgiliath.migrator.core.api.model.ModelElement;
@@ -36,11 +37,13 @@ public class ColumnFakerFactorySequencer implements FactorySequencer {
3637

3738
private final ModelElementProcessor modelElementProcessor;
3839
private final RawElementProcessor rawElementProcessor;
40+
private final Faker faker;
3941

40-
public ColumnFakerFactorySequencer(ModelElementProcessor modelElementProcessor, RawElementProcessor rawElementProcessor) {
42+
public ColumnFakerFactorySequencer(ModelElementProcessor modelElementProcessor, RawElementProcessor rawElementProcessor, Faker faker) {
4143

4244
this.modelElementProcessor = modelElementProcessor;
4345
this.rawElementProcessor = rawElementProcessor;
46+
this.faker = faker;
4447
}
4548

4649
@Override
@@ -50,6 +53,6 @@ public boolean canHandle(Class beanClass) {
5053

5154
@Override
5255
public Object createSequencerBean(Class beanClass, SequencerDefinition definition, Graph<MetamodelVertex, FieldEdge<MetamodelVertex>> graph, MetamodelVertex metamodelVertex, ModelElement entity, ColumnTransformationDefinition columnTransformationDefinition) {
53-
return new ColumnFaker(modelElementProcessor, metamodelVertex, columnTransformationDefinition, rawElementProcessor);
56+
return new ColumnFaker(modelElementProcessor, metamodelVertex, columnTransformationDefinition, rawElementProcessor, faker);
5457
}
5558
}

‎modules/faker/src/test/java/net/osgiliath/migrator/modules/faker/ColumnFakerTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import jakarta.persistence.Column;
2424
import jakarta.persistence.Id;
25+
import net.datafaker.Faker;
2526
import net.osgiliath.migrator.core.api.metamodel.model.MetamodelVertex;
2627
import net.osgiliath.migrator.core.api.model.ModelElement;
2728
import net.osgiliath.migrator.core.configuration.ColumnTransformationDefinition;
@@ -67,7 +68,7 @@ void setup() {
6768
@Test
6869
void testFieldIsFaked() {
6970
when(columnTransformationDefinition.getColumnName()).thenReturn("columnToFake");
70-
columnFaker = new ColumnFaker(modelElementProcessor, metamodelVertex, columnTransformationDefinition, rawElementProcessor);
71+
columnFaker = new ColumnFaker(modelElementProcessor, metamodelVertex, columnTransformationDefinition, rawElementProcessor, new Faker().getFaker());
7172
String fieldValue = "originalValue";
7273
ModelElement modelElement = createModelElement(fieldValue, false);
7374

@@ -85,7 +86,7 @@ void testFieldIsFaked() {
8586
void testFieldIsFakedConsistently() {
8687
when(columnTransformationDefinition.getColumnName()).thenReturn("columnToFake");
8788
when(columnTransformationDefinition.getConsistentKey()).thenReturn(true);
88-
columnFaker = new ColumnFaker(modelElementProcessor, metamodelVertex, columnTransformationDefinition, rawElementProcessor);
89+
columnFaker = new ColumnFaker(modelElementProcessor, metamodelVertex, columnTransformationDefinition, rawElementProcessor, new Faker().getFaker());
8990

9091
String fieldValue = "originalValue";
9192
ModelElement modelElement = createModelElement(fieldValue, false);
@@ -108,7 +109,7 @@ void testFieldIsFakedConsistently() {
108109
void testFieldIsFakedUnique() {
109110
when(columnTransformationDefinition.getColumnName()).thenReturn("columnToFake");
110111
when(columnTransformationDefinition.getConsistentKey()).thenReturn(false);
111-
columnFaker = new ColumnFaker(modelElementProcessor, metamodelVertex, columnTransformationDefinition, rawElementProcessor);
112+
columnFaker = new ColumnFaker(modelElementProcessor, metamodelVertex, columnTransformationDefinition, rawElementProcessor, new Faker().getFaker());
112113

113114
String fieldValue = "originalValue";
114115
List<ModelElement> modelElements = new ArrayList<>();

‎pom.xml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.springframework.boot</groupId>
67
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>3.5.3</version>
8+
<version>3.5.4</version>
89
</parent>
910
<groupId>net.osgiliath.datamigrator</groupId>
1011
<artifactId>data-migrator</artifactId>
@@ -76,7 +77,7 @@
7677
<asciidoctor-maven-plugin.version>1.5.7</asciidoctor-maven-plugin.version>
7778
<asciidoctor.skip>false</asciidoctor.skip>
7879
<liquibase.version>4.33.0</liquibase.version>
79-
<spring-boot.version>3.5.3</spring-boot.version>
80+
<spring-boot.version>3.5.4</spring-boot.version>
8081
<jdbc.h2.version>2.3.232</jdbc.h2.version>
8182
<jdbc.postgresql.version>42.7.7</jdbc.postgresql.version>
8283
<jdbc.mysql.version>9.3.0</jdbc.mysql.version>
@@ -168,7 +169,7 @@
168169
<id>enforce-dependencyConvergence</id>
169170
<configuration>
170171
<rules>
171-
<DependencyConvergence />
172+
<DependencyConvergence/>
172173
</rules>
173174
<fail>false</fail>
174175
</configuration>
@@ -380,13 +381,14 @@
380381
<phase>generate-sources</phase>
381382
<configuration>
382383
<target>
383-
<mkdir dir="${project.build.directory}/generated-sources/repositories" />
384+
<mkdir dir="${project.build.directory}/generated-sources/repositories"/>
384385
<move todir="${project.build.directory}/generated-sources/repositories">
385-
<fileset dir="${project.basedir}/src/main/java" includes="**/repository/*.java" />
386+
<fileset dir="${project.basedir}/src/main/java"
387+
includes="**/repository/*.java"/>
386388
</move>
387-
<property name="maven.project.build.directory" value="${project.build.directory}" />
388-
<property name="maven.project.basedir" value="${project.basedir}" />
389-
<ant antfile="build.xml" target="amendEntities" />
389+
<property name="maven.project.build.directory" value="${project.build.directory}"/>
390+
<property name="maven.project.basedir" value="${project.basedir}"/>
391+
<ant antfile="build.xml" target="amendEntities"/>
390392
</target>
391393
</configuration>
392394
<goals>

‎report-aggregate/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>net.osgiliath.datamigrator</groupId>
88
<artifactId>data-migrator</artifactId>
9-
<version>1.109-SNAPSHOT</version>
9+
<version>1.110-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>report-aggregate</artifactId>
1212
<name>datamigrator-report-aggregate</name>

‎report-aggregate/src/main/bruno/Delete artefacts to deployment repository.bru‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ meta {
55
}
66

77
delete {
8-
url: https://ossrh-staging-api.central.sonatype.com/manual/upload/repository/IBDbUP/68.220.61.179/net.osgiliath--default-repository
8+
url: https://ossrh-staging-api.central.sonatype.com/manual/drop/repository/IBDbUP/52.173.108.22/net.osgiliath--default-repository
99
body: none
1010
auth: basic
1111
}

‎report-aggregate/src/main/bruno/Push artefacts to deploiement.bru‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ meta {
55
}
66

77
post {
8-
url: https://ossrh-staging-api.central.sonatype.com/manual/upload/repository/IBDbUP/135.232.200.64/net.osgiliath--default-repository
8+
url: https://ossrh-staging-api.central.sonatype.com/manual/upload/repository/IBDbUP/4.236.173.20/net.osgiliath--default-repository
99
body: none
1010
auth: basic
1111
}

0 commit comments

Comments
 (0)