Skip to content

Commit 3933f97

Browse files
author
Dennis Labordus
authored
Merge pull request #269 from com-pas/develop
New release
2 parents aaaacf2 + e43fcca commit 3933f97

File tree

41 files changed

+814
-793
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+814
-793
lines changed

‎app/pom.xml‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ SPDX-License-Identifier: Apache-2.0
138138
<artifactId>openpojo</artifactId>
139139
<scope>test</scope>
140140
</dependency>
141+
<dependency>
142+
<groupId>org.slf4j</groupId>
143+
<artifactId>slf4j-simple</artifactId>
144+
<scope>test</scope>
145+
</dependency>
141146
</dependencies>
142147

143148
<build>
@@ -156,44 +161,44 @@ SPDX-License-Identifier: Apache-2.0
156161
</goals>
157162
</execution>
158163
<execution>
159-
<id>build-postgresql</id>
164+
<id>build-basex</id>
160165
<goals>
161166
<goal>build</goal>
162167
</goals>
163168
<configuration>
164169
<properties>
165-
<quarkus.profile>prod-postgresql</quarkus.profile>
166-
<quarkus.package.output-directory>postgresql-quarkus-app
167-
</quarkus.package.output-directory>
168-
<quarkus.docker.dockerfile-jvm-path>src/main/docker/Dockerfile-postgresql.jvm
170+
<quarkus.profile>prod-basex</quarkus.profile>
171+
<quarkus.package.output-directory>basex-quarkus-app</quarkus.package.output-directory>
172+
<quarkus.docker.dockerfile-jvm-path>src/main/docker/Dockerfile-basex.jvm
169173
</quarkus.docker.dockerfile-jvm-path>
170-
<quarkus.docker.dockerfile-native-path>src/main/docker/Dockerfile-postgresql.native
174+
<quarkus.docker.dockerfile-native-path>src/main/docker/Dockerfile-basex.native
171175
</quarkus.docker.dockerfile-native-path>
172-
<quarkus.container-image.tag>${project.version}-postgresql</quarkus.container-image.tag>
173-
<quarkus.container-image.additional-tags>latest-postgresql
176+
<quarkus.container-image.tag>${project.version}-basex</quarkus.container-image.tag>
177+
<quarkus.container-image.additional-tags>latest-basex
174178
</quarkus.container-image.additional-tags>
175179
</properties>
176180
</configuration>
177181
</execution>
178182
<!-- Put this build execution as last, because we will use this image to do a basic native check (NativeHealthCheckIT).
179183
This information is written in "target\quarkus-artifact.properties" and used by the integration tests (failsafe).
180-
Sadly there is only 1 file create, so this build overwrites the one from postgresql.
184+
Sadly there is only 1 file create, so this build overwrites the one from basex.
181185
-->
182186
<execution>
183-
<id>build-basex</id>
187+
<id>build-postgresql</id>
184188
<goals>
185189
<goal>build</goal>
186190
</goals>
187191
<configuration>
188192
<properties>
189-
<quarkus.profile>prod-basex</quarkus.profile>
190-
<quarkus.package.output-directory>basex-quarkus-app</quarkus.package.output-directory>
191-
<quarkus.docker.dockerfile-jvm-path>src/main/docker/Dockerfile-basex.jvm
193+
<quarkus.profile>prod-postgresql</quarkus.profile>
194+
<quarkus.package.output-directory>postgresql-quarkus-app
195+
</quarkus.package.output-directory>
196+
<quarkus.docker.dockerfile-jvm-path>src/main/docker/Dockerfile-postgresql.jvm
192197
</quarkus.docker.dockerfile-jvm-path>
193-
<quarkus.docker.dockerfile-native-path>src/main/docker/Dockerfile-basex.native
198+
<quarkus.docker.dockerfile-native-path>src/main/docker/Dockerfile-postgresql.native
194199
</quarkus.docker.dockerfile-native-path>
195-
<quarkus.container-image.tag>${project.version}-basex</quarkus.container-image.tag>
196-
<quarkus.container-image.additional-tags>latest-basex
200+
<quarkus.container-image.tag>${project.version}-postgresql</quarkus.container-image.tag>
201+
<quarkus.container-image.additional-tags>latest-postgresql
197202
</quarkus.container-image.additional-tags>
198203
</properties>
199204
</configuration>

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/CompasSclDataServiceBaseXConfiguration.java‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/CompasSclDataServiceCommonConfiguration.java‎ renamed to ‎app/src/main/java/org/lfenergy/compas/scl/data/rest/CompasSclDataServiceConfiguration.java‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55

66
import io.quarkus.runtime.annotations.RegisterForReflection;
77
import org.lfenergy.compas.core.commons.ElementConverter;
8-
import org.lfenergy.compas.scl.data.repository.CompasSclDataRepository;
9-
import org.lfenergy.compas.scl.data.service.CompasSclDataService;
10-
import org.lfenergy.compas.scl.data.service.impl.CompasSclDataServiceImpl;
118
import org.lfenergy.compas.scl.data.util.SclDataModelMarshaller;
12-
import org.lfenergy.compas.scl.data.util.SclElementProcessor;
139

1410
import javax.enterprise.context.ApplicationScoped;
1511
import javax.enterprise.inject.Produces;
@@ -21,30 +17,16 @@
2117
org.lfenergy.compas.core.jaxrs.model.ErrorResponse.class,
2218
org.lfenergy.compas.core.jaxrs.model.ErrorMessage.class
2319
})
24-
public class CompasSclDataServiceCommonConfiguration {
20+
public class CompasSclDataServiceConfiguration {
2521
@Produces
2622
@ApplicationScoped
2723
public ElementConverter createElementConverter() {
2824
return new ElementConverter();
2925
}
3026

31-
@Produces
32-
@ApplicationScoped
33-
public SclElementProcessor creatSclElementProcessor() {
34-
return new SclElementProcessor();
35-
}
36-
3727
@Produces
3828
@ApplicationScoped
3929
public SclDataModelMarshaller createSclDataModelMarshaller() {
4030
return new SclDataModelMarshaller();
4131
}
42-
43-
@Produces
44-
@ApplicationScoped
45-
public CompasSclDataService createCompasSclDataService(CompasSclDataRepository repository,
46-
ElementConverter converter,
47-
SclElementProcessor sclElementProcessor) {
48-
return new CompasSclDataServiceImpl(repository, converter, sclElementProcessor);
49-
}
5032
}

‎app/src/main/java/org/lfenergy/compas/scl/data/rest/CompasSclDataServicePostgreSQLConfiguration.java‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎app/src/main/resources/application-dev-basex.properties‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ quarkus.log.category."org.lfenergy.compas.scl.data".level = DEBUG
1414
quarkus.http.auth.permission.develop-quarkus-services.paths = /compas-scl-data-service/q/swagger-ui/*,/compas-scl-data-service/index.html
1515
quarkus.http.auth.permission.develop-quarkus-services.policy = permit
1616

17+
# Exclude the other repository implementations from being scanned
18+
quarkus.arc.exclude-dependency.postgresql-repository.group-id = org.lfenergy.compas.scl.data
19+
quarkus.arc.exclude-dependency.postgresql-repository.artifact-id = repository-postgresql
20+
1721
# Datasource configuration for BaseX (none)
1822
quarkus.datasource.jdbc = false
1923
quarkus.datasource.devservices.enabled = false

‎app/src/main/resources/application-dev-postgresql.properties‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ quarkus.log.category."org.lfenergy.compas.scl.data".level = DEBUG
1414
quarkus.http.auth.permission.develop-quarkus-services.paths = /compas-scl-data-service/q/swagger-ui/*,/compas-scl-data-service/index.html
1515
quarkus.http.auth.permission.develop-quarkus-services.policy = permit
1616

17+
# Exclude the other repository implementations from being scanned
18+
quarkus.arc.exclude-dependency.basex-repository.group-id = org.lfenergy.compas.scl.data
19+
quarkus.arc.exclude-dependency.basex-repository.artifact-id = repository-basex
20+
1721
# Datasource configuration for PostgreSQL
1822
quarkus.datasource.devservices.enabled = false
1923
quarkus.datasource.db-kind = postgresql

‎app/src/main/resources/application-prod-basex.properties‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@
44

55
# Production BaseX configuration.
66

7+
# Exclude the other repository implementations from being scanned
8+
quarkus.arc.exclude-dependency.postgresql-repository.group-id = org.lfenergy.compas.scl.data
9+
quarkus.arc.exclude-dependency.postgresql-repository.artifact-id = repository-postgresql
10+
711
# Add scanning these dependencies for scanning, also used by native compilation.
8-
quarkus.index-dependency.scl-data-repository.group-id = org.lfenergy.compas.scl.data
9-
quarkus.index-dependency.scl-data-repository.artifact-id = repository-basex
12+
quarkus.index-dependency.basex-repository.group-id = org.lfenergy.compas.scl.data
13+
quarkus.index-dependency.basex-repository.artifact-id = repository-basex
1014

1115
# Datasource configuration for BaseX (none)
1216
quarkus.datasource.jdbc = false

‎app/src/main/resources/application-prod-postgresql.properties‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@
44

55
# Production PostgreSQL configuration.
66

7+
# Exclude the other repository implementations from being scanned
8+
quarkus.arc.exclude-dependency.basex-repository.group-id = org.lfenergy.compas.scl.data
9+
quarkus.arc.exclude-dependency.basex-repository.artifact-id = repository-basex
10+
711
# Add scanning these dependencies for scanning, also used by native compilation.
8-
quarkus.index-dependency.scl-data-repository.group-id = org.lfenergy.compas.scl.data
9-
quarkus.index-dependency.scl-data-repository.artifact-id = repository-postgresql
12+
quarkus.index-dependency.postgresql-repository.group-id = org.lfenergy.compas.scl.data
13+
quarkus.index-dependency.postgresql-repository.artifact-id = repository-postgresql
1014

1115
# Datasource configuration for PostgreSQL
1216
quarkus.datasource.db-kind = postgresql

‎app/src/main/resources/application-test.properties‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@
44

55
# Test configuration.
66

7-
# Datasource configuration for BaseX (none)
8-
quarkus.datasource.jdbc = false
9-
quarkus.datasource.devservices.enabled = false
7+
# Exclude the other repository implementations from being scanned
8+
quarkus.arc.exclude-dependency.basex-repository.group-id = org.lfenergy.compas.scl.data
9+
quarkus.arc.exclude-dependency.basex-repository.artifact-id = repository-basex
1010

11-
# Flyway configuration for BaseX (none)
12-
quarkus.flyway.migrate-at-start = false
11+
# Datasource configuration for PostgreSQL
12+
quarkus.datasource.devservices.enabled = true
13+
quarkus.datasource.db-kind = postgresql
14+
15+
# Flyway configuration for PostgreSQL
16+
quarkus.flyway.migrate-at-start = true
17+
quarkus.flyway.locations = classpath:org/lfenergy/compas/scl/data/repository/postgresql/db/migration
1318

‎app/src/main/resources/reflection-config.json.license‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)