Skip to content

Commit 699e985

Browse files
author
Mikalai Alimenkou
committed
moved some default config to DEV profile, updated PostgreSQL, switched to Docker Compose in DEV profile, added docs to config properties
1 parent d197df5 commit 699e985

File tree

6 files changed

+26
-8
lines changed

6 files changed

+26
-8
lines changed

pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@
117117
<dependency>
118118
<groupId>org.projectlombok</groupId>
119119
<artifactId>lombok</artifactId>
120-
<scope>provided</scope>
121120
<optional>true</optional>
122121
</dependency>
123122
<dependency>
@@ -270,8 +269,11 @@
270269
<groupId>org.projectlombok</groupId>
271270
<artifactId>lombok</artifactId>
272271
</path>
272+
<path>
273+
<groupId>org.springframework.boot</groupId>
274+
<artifactId>spring-boot-configuration-processor</artifactId>
275+
</path>
273276
</annotationProcessorPaths>
274-
<parameters>true</parameters>
275277
</configuration>
276278
</plugin>
277279
<plugin>

src/main/java/com/xpinjection/library/config/LibrarySettings.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@
1212
@ConfigurationProperties(prefix = "library")
1313
public class LibrarySettings {
1414
@Min(0)
15+
/**
16+
* Initial size of the library
17+
*/
1518
private int size;
1619
}

src/main/resources/application-admin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ management:
1616
export:
1717
enabled: false
1818
tracing:
19-
endpoint: http://localhost:4318/v1/traces
19+
endpoint: # define Jaeger endpoint
2020
export:
2121
enabled: true
2222
logging:

src/main/resources/application-dev.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,19 @@ spring:
1212
ddl-auto: none
1313
main:
1414
lazy-initialization: true
15-
banner-mode: off
15+
banner-mode: off
16+
docker:
17+
compose:
18+
enabled: true
19+
lifecycle-management: start_and_stop
20+
21+
management:
22+
otlp:
23+
tracing:
24+
endpoint: http://localhost:4318/v1/traces
25+
26+
logging:
27+
level:
28+
web: DEBUG
29+
include-application-group: false
30+
include-application-name: false

src/main/resources/application.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spring:
4747
cache: true
4848
suffix: .ftl
4949
datasource:
50-
url: jdbc:postgresql://localhost/library
50+
url: # define PostgreSQL DB URL
5151
username:
5252
password:
5353
driver-class-name: org.postgresql.Driver
@@ -77,8 +77,6 @@ library:
7777
size: 0
7878

7979
logging:
80-
include-application-group: false
81-
include-application-name: false
8280
file:
8381
name: library.log
8482

src/test/java/com/xpinjection/library/RuntimeDependencies.java

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

66
public interface RuntimeDependencies {
77
@ServiceConnection
8-
PostgreSQLContainer<?> POSTGRE_SQL = new PostgreSQLContainer<>("postgres:11")
8+
PostgreSQLContainer<?> POSTGRE_SQL = new PostgreSQLContainer<>("postgres:17.6")
99
.withDatabaseName("library")
1010
.withUsername("test")
1111
.withPassword("test");

0 commit comments

Comments
 (0)