Skip to content
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
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<gridsuite-dependencies.version>10</gridsuite-dependencies.version>
<string-template.version>4.3.1</string-template.version>
<commons-lang3.version>3.9</commons-lang3.version>
<jib.container.environment>SPRING_PROFILES_ACTIVE=default</jib.container.environment>
</properties>

<build>
Expand Down
12 changes: 12 additions & 0 deletions src/main/resources/application-local.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
server:
port: 5036

backing-services:
case:
base-uri: http://localhost:5000
network-conversion:
base-uri: http://localhost:5003

network-store-server:
base-uri: http://localhost:8080/

12 changes: 3 additions & 9 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
server:
port: 5036
forward-headers-strategy: framework

spring:
profiles:
active: default,local

servlet:
multipart:
max-file-size: 100MB
Expand Down Expand Up @@ -43,16 +45,8 @@ logging:
level:
ROOT: INFO


backing-services:
case:
base-uri: http://localhost:5000
network-conversion:
base-uri: http://localhost:5003

network-store-server:
preloading-strategy: COLLECTION
base-uri: http://localhost:8080/

# this structure is shared among all microservices, if you change it, change it everywhere.
# customQuery allows a microservice to set query parameters specific to itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ public void setUp() {
mockServer = MockRestServiceServer.createServer(restTemplate);
}

String caseApiUri = "http://case-server/";
String networkConversionApiUri = "http://network-conversion-server/";
String caseApiUri = "http://localhost:5000/";
String networkConversionApiUri = "http://localhost:5003/";

@Test
public void fileTest() throws Exception {
Expand Down
6 changes: 0 additions & 6 deletions src/test/resources/application-default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,3 @@ logging:
dbVendor: h2:mem
query: ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
hostPort: ":"

backing-services:
case:
base-uri: http://case-server/
network-conversion:
base-uri: http://network-conversion-server/