Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

FLPATH-274 enable spring-cloud-config #225

Merged
merged 1 commit into from
Apr 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions notification-service/src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ spring:
username: postgres
password: postgres

springdoc:
writer-with-order-by-keys: true
writer-with-default-pretty-printer: true

# ===================================================================
# Application specific properties
# Add your own application properties here, see the
Expand Down
10 changes: 5 additions & 5 deletions notification-service/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ===================================================================
# Spring Boot configuration for the "dev" profile.
# Spring Boot configuration for the "local" profile.
#
# This configuration overrides the application.yml file and should be
# only used for development purpose.
Expand Down Expand Up @@ -42,10 +42,10 @@ spring:
driverClassName: org.h2.Driver
username: postgres
password: postgres

springdoc:
writer-with-order-by-keys: true
writer-with-default-pretty-printer: true
Comment on lines -46 to -48
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are necessary to properly generate SDK files. Why do you delete them?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These properties are redundant, they are in application.yml so for local profile it will be inherited from the https://github.com/parodos-dev/parodos/blob/main/notification-service/src/main/resources/application.yml

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right! Thanks

cloud:
config:
enabled: true
import: optional:configserver:http://localhost:8888

# ===================================================================
# Application specific properties
Expand Down
3 changes: 3 additions & 0 deletions notification-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ spring:
default-property-inclusion: non_null
main:
lazy-initialization: true
cloud:
config:
enabled: false

springdoc:
writer-with-order-by-keys: true
Expand Down
22 changes: 22 additions & 0 deletions workflow-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@
<artifactId>spring-cloud-starter</artifactId>
</dependency>
<!-- END Web Dependencies -->
<!-- START Spring Cloud Dependencies -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
</dependency>
<!-- END Spring Cloud Dependencies -->
<!-- START Spring Security Dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -136,6 +146,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>com.vaadin.external.google</groupId>
<artifactId>android-json</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.modelmapper</groupId>
Expand All @@ -160,6 +176,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.vaadin.external.google</groupId>
<artifactId>android-json</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
Expand Down
4 changes: 1 addition & 3 deletions workflow-service/src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,4 @@ spring:
managerPassword: "admin"
lifecycle:
timeout-per-shutdown-phase: "25s"
springdoc:
writer-with-order-by-keys: true
writer-with-default-pretty-printer: true

19 changes: 16 additions & 3 deletions workflow-service/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@ spring:
managerPassword: null
lifecycle:
timeout-per-shutdown-phase: "25s"
springdoc:
writer-with-order-by-keys: true
writer-with-default-pretty-printer: true
cloud:
config:
enabled: true
import: optional:configserver:http://localhost:8888

logging:
level:
ROOT: INFO
com.redhat.parodos.workflow: DEBUG

# ===================================================================
# Application specific properties
# Add your own application properties here, see the
# ApplicationProperties class to have type-safe configuration
# ===================================================================

4 changes: 4 additions & 0 deletions workflow-service/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ spring:
lifecycle:
timeout-per-shutdown-phase: "25s"

cloud:
config:
enabled: false

management:
metrics:
export:
Expand Down