Skip to content

Commit 2aa60a0

Browse files
authored
move local conf to a local profile (#16)
1 parent 4221e59 commit 2aa60a0

File tree

5 files changed

+18
-17
lines changed

5 files changed

+18
-17
lines changed

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<gridsuite-dependencies.version>10</gridsuite-dependencies.version>
3939
<string-template.version>4.3.1</string-template.version>
4040
<commons-lang3.version>3.9</commons-lang3.version>
41+
<jib.container.environment>SPRING_PROFILES_ACTIVE=default</jib.container.environment>
4142
</properties>
4243

4344
<build>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
server:
2+
port: 5036
3+
4+
backing-services:
5+
case:
6+
base-uri: http://localhost:5000
7+
network-conversion:
8+
base-uri: http://localhost:5003
9+
10+
network-store-server:
11+
base-uri: http://localhost:8080/
12+

src/main/resources/application.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
server:
2-
port: 5036
32
forward-headers-strategy: framework
43

54
spring:
5+
profiles:
6+
active: default,local
7+
68
servlet:
79
multipart:
810
max-file-size: 100MB
@@ -43,16 +45,8 @@ logging:
4345
level:
4446
ROOT: INFO
4547

46-
47-
backing-services:
48-
case:
49-
base-uri: http://localhost:5000
50-
network-conversion:
51-
base-uri: http://localhost:5003
52-
5348
network-store-server:
5449
preloading-strategy: COLLECTION
55-
base-uri: http://localhost:8080/
5650

5751
# this structure is shared among all microservices, if you change it, change it everywhere.
5852
# customQuery allows a microservice to set query parameters specific to itself.

src/test/java/org/gridsuite/mapping/server/NetworkControllerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ public void setUp() {
8484
mockServer = MockRestServiceServer.createServer(restTemplate);
8585
}
8686

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

9090
@Test
9191
public void fileTest() throws Exception {

src/test/resources/application-default.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,3 @@ logging:
1717
dbVendor: h2:mem
1818
query: ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
1919
hostPort: ":"
20-
21-
backing-services:
22-
case:
23-
base-uri: http://case-server/
24-
network-conversion:
25-
base-uri: http://network-conversion-server/

0 commit comments

Comments
 (0)