Skip to content

Commit 2621bfe

Browse files
authored
Homogenize keys backing services (#73)
Homogenize keys backing services Replace backing-services conf scope by powsybl|gridsuite.services Signed-off-by: sBouzols <[email protected]>
1 parent 4dc9970 commit 2621bfe

File tree

4 files changed

+96
-92
lines changed

4 files changed

+96
-92
lines changed

src/main/java/org/gridsuite/gateway/ServiceURIsConfig.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,70 +21,70 @@
2121
@Setter
2222
@ConfigurationProperties(prefix = "gateway")
2323
public class ServiceURIsConfig {
24-
@Value("${backing-services.case.base-uri:http://case-server/}")
24+
@Value("${powsybl.services.case-server.base-uri:http://case-server/}")
2525
String caseServerBaseUri;
2626

27-
@Value("${backing-services.study-server.base-uri:http://study-server/}")
27+
@Value("${gridsuite.services.study-server.base-uri:http://study-server/}")
2828
String studyServerBaseUri;
2929

30-
@Value("${backing-services.merge-orchestrator-server.base-uri:http://merge-orchestrator-server/}")
30+
@Value("${gridsuite.services.merge-orchestrator-server.base-uri:http://merge-orchestrator-server/}")
3131
String mergeOrchestratorServerBaseUri;
3232

33-
@Value("${backing-services.study-notification-server.base-uri:http://study-notification-server/}")
33+
@Value("${gridsuite.services.study-notification-server.base-uri:http://study-notification-server/}")
3434
String studyNotificationServerBaseUri;
3535

36-
@Value("${backing-services.merge-notification-server.base-uri:http://merge-notification-server/}")
36+
@Value("${gridsuite.services.merge-notification-server.base-uri:http://merge-notification-server/}")
3737
String mergeNotificationServerBaseUri;
3838

39-
@Value("${backing-services.actions-server.base-uri:http://actions-server/}")
39+
@Value("${gridsuite.services.actions-server.base-uri:http://actions-server/}")
4040
String actionsServerBaseUri;
4141

42-
@Value("${backing-services.config-server.base-uri:http://config-server/}")
42+
@Value("${gridsuite.services.config-server.base-uri:http://config-server/}")
4343
String configServerBaseUri;
4444

45-
@Value("${backing-services.config-notification-server.base-uri:http://config-notification-server/}")
45+
@Value("${gridsuite.services.config-notification-server.base-uri:http://config-notification-server/}")
4646
String configNotificationServerBaseUri;
4747

48-
@Value("${backing-services.directory-server.base-uri:http://directory-server/}")
48+
@Value("${gridsuite.services.directory-server.base-uri:http://directory-server/}")
4949
String directoryServerBaseUri;
5050

51-
@Value("${backing-services.explore-server.base-uri:http://explore-server/}")
51+
@Value("${gridsuite.services.explore-server.base-uri:http://explore-server/}")
5252
String exploreServerBaseUri;
5353

54-
@Value("${backing-services.cgmes-boundary-server.base-uri:http://cgmes-boundary-server/}")
54+
@Value("${gridsuite.services.cgmes-boundary-server.base-uri:http://cgmes-boundary-server/}")
5555
String boundaryServerBaseUri;
5656

57-
@Value("${backing-services.dynamic-mapping-server.base-uri:http://dynamic-mapping-server/}")
57+
@Value("${gridsuite.services.dynamic-mapping-server.base-uri:http://dynamic-mapping-server/}")
5858
String dynamicMappingServerBaseUri;
5959

60-
@Value("${backing-services.filter-server.base-uri:http://filter-server/}")
60+
@Value("${gridsuite.services.filter-server.base-uri:http://filter-server/}")
6161
String filterServerBaseUri;
6262

63-
@Value("${backing-services.report-server.base-uri:http://report-server/}")
63+
@Value("${gridsuite.services.report-server.base-uri:http://report-server/}")
6464
String reportServerBaseUri;
6565

66-
@Value("${backing-services.directory-notification-server.base-uri:http://directory-notification-server/}")
66+
@Value("${gridsuite.services.directory-notification-server.base-uri:http://directory-notification-server/}")
6767
String directoryNotificationServerBaseUri;
6868

69-
@Value("${backing-services.network-modification-server.base-uri:http://network-modification-server/}")
69+
@Value("${gridsuite.services.network-modification-server.base-uri:http://network-modification-server/}")
7070
String networkModificationServerBaseUri;
7171

72-
@Value("${backing-services.network-conversion-server.base-uri:http://network-conversion-server/}")
72+
@Value("${powsybl.services.network-conversion-server.base-uri:http://network-conversion-server/}")
7373
String networkConversionServerBaseUri;
7474

75-
@Value("${backing-services.odre-server.base-uri:http://odre-server/}")
75+
@Value("${gridsuite.services.odre-server.base-uri:http://odre-server/}")
7676
String odreServerBaseUri;
7777

78-
@Value("${backing-services.geo-data-server.base-uri:http://geo-data-server/}")
78+
@Value("${gridsuite.services.geo-data-server.base-uri:http://geo-data-server/}")
7979
String geoDataServerBaseUri;
8080

81-
@Value("${backing-services.user-admin-server.base-uri:http://user-admin-server/}")
81+
@Value("${gridsuite.services.user-admin-server.base-uri:http://user-admin-server/}")
8282
String userAdminServerBaseUri;
8383

84-
@Value("${backing-services.cgmes-gl-server.base-uri:http://cgmes-gl-server/}")
84+
@Value("${gridsuite.services.cgmes-gl-server.base-uri:http://cgmes-gl-server/}")
8585
String cgmesGlServerBaseUri;
8686

87-
@Value("${backing-services.sensitivity-analysis-server.base-uri:http://sensitivity-analysis-server/}")
87+
@Value("${gridsuite.services.sensitivity-analysis-server.base-uri:http://sensitivity-analysis-server/}")
8888
String sensitivityAnalysisServerBaseUri;
8989

9090
}
Lines changed: 49 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,53 @@
11
server:
22
port: 9000
33

4-
backing-services:
5-
case:
6-
base-uri: http://localhost:5000
7-
study-server:
8-
base-uri: http://localhost:5001
9-
merge-orchestrator-server:
10-
base-uri: http://localhost:5020
11-
study-notification-server:
12-
base-uri: http://localhost:5009
13-
merge-notification-server:
14-
base-uri: http://localhost:5002
15-
directory-notification-server:
16-
base-uri: http://localhost:5004
17-
actions-server:
18-
base-uri: http://localhost:5022
19-
config-server:
20-
base-uri: http://localhost:5025
21-
config-notification-server:
22-
base-uri: http://localhost:5024
23-
directory-server:
24-
base-uri: http://localhost:5026
25-
cgmes-boundary-server:
26-
base-uri: http://localhost:5021
27-
dynamic-mapping-server:
28-
base-uri: http://localhost:5036
29-
filter-server:
30-
base-uri: http://localhost:5027
31-
report-server:
32-
base-uri: http://localhost:5028
33-
explore-server:
34-
base-uri: http://localhost:5029
35-
network-modification-server:
36-
base-uri: http://localhost:5007
37-
network-conversion-server:
38-
base-uri: http://localhost:5003
39-
odre-server:
40-
base-uri: http://localhost:8090
41-
geo-data-server:
42-
base-uri: http://localhost:8087
43-
user-admin-server:
44-
base-uri: http://localhost:5033
45-
cgmes-gl-server:
46-
base-uri: http://localhost:8095
47-
sensitivity-analysis-server:
48-
base-uri: http://localhost:5030
4+
powsybl:
5+
services:
6+
case-server:
7+
base-uri: http://localhost:5000
8+
network-conversion-server:
9+
base-uri: http://localhost:5003
10+
11+
gridsuite:
12+
services:
13+
study-server:
14+
base-uri: http://localhost:5001
15+
merge-orchestrator-server:
16+
base-uri: http://localhost:5020
17+
study-notification-server:
18+
base-uri: http://localhost:5009
19+
merge-notification-server:
20+
base-uri: http://localhost:5002
21+
directory-notification-server:
22+
base-uri: http://localhost:5004
23+
actions-server:
24+
base-uri: http://localhost:5022
25+
config-server:
26+
base-uri: http://localhost:5025
27+
config-notification-server:
28+
base-uri: http://localhost:5024
29+
directory-server:
30+
base-uri: http://localhost:5026
31+
cgmes-boundary-server:
32+
base-uri: http://localhost:5021
33+
dynamic-mapping-server:
34+
base-uri: http://localhost:5036
35+
filter-server:
36+
base-uri: http://localhost:5027
37+
report-server:
38+
base-uri: http://localhost:5028
39+
explore-server:
40+
base-uri: http://localhost:5029
41+
network-modification-server:
42+
base-uri: http://localhost:5007
43+
odre-server:
44+
base-uri: http://localhost:8090
45+
geo-data-server:
46+
base-uri: http://localhost:8087
47+
user-admin-server:
48+
base-uri: http://localhost:5033
49+
cgmes-gl-server:
50+
base-uri: http://localhost:8095
51+
sensitivity-analysis-server:
52+
base-uri: http://localhost:5030
4953

src/test/java/org/gridsuite/gateway/ElementAccessControlTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
@RunWith(SpringRunner.class)
4343
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
4444
properties = {
45-
"backing-services.directory-server.base-uri=http://localhost:${wiremock.server.port}",
46-
"backing-services.explore-server.base-uri=http://localhost:${wiremock.server.port}",
47-
"backing-services.study-server.base-uri=http://localhost:${wiremock.server.port}",
48-
"backing-services.actions-server.base-uri=http://localhost:${wiremock.server.port}",
49-
"backing-services.filter-server.base-uri=http://localhost:${wiremock.server.port}",
50-
"backing-services.user-admin-server.base-uri=http://localhost:${wiremock.server.port}",
51-
"backing-services.sensitivity-analysis-server.base-uri=http://localhost:${wiremock.server.port}",
45+
"gridsuite.services.directory-server.base-uri=http://localhost:${wiremock.server.port}",
46+
"gridsuite.services.explore-server.base-uri=http://localhost:${wiremock.server.port}",
47+
"gridsuite.services.study-server.base-uri=http://localhost:${wiremock.server.port}",
48+
"gridsuite.services.actions-server.base-uri=http://localhost:${wiremock.server.port}",
49+
"gridsuite.services.filter-server.base-uri=http://localhost:${wiremock.server.port}",
50+
"gridsuite.services.user-admin-server.base-uri=http://localhost:${wiremock.server.port}",
51+
"gridsuite.services.sensitivity-analysis-server.base-uri=http://localhost:${wiremock.server.port}",
5252
}
5353
)
5454
@AutoConfigureWireMock(port = 0)

src/test/java/org/gridsuite/gateway/TokenValidationTest.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,24 @@
5252
*/
5353
@RunWith(SpringRunner.class)
5454
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
55-
properties = {"backing-services.case.base-uri=http://localhost:${wiremock.server.port}",
56-
"backing-services.study-server.base-uri=http://localhost:${wiremock.server.port}",
57-
"backing-services.merge-orchestrator-server.base-uri=http://localhost:${wiremock.server.port}",
58-
"backing-services.merge-notification-server.base-uri=http://localhost:${wiremock.server.port}",
59-
"backing-services.directory-notification-server.base-uri=http://localhost:${wiremock.server.port}",
60-
"backing-services.actions-server.base-uri=http://localhost:${wiremock.server.port}",
61-
"backing-services.study-notification-server.base-uri=http://localhost:${wiremock.server.port}",
62-
"backing-services.config-server.base-uri=http://localhost:${wiremock.server.port}",
63-
"backing-services.config-notification-server.base-uri=http://localhost:${wiremock.server.port}",
64-
"backing-services.directory-server.base-uri=http://localhost:${wiremock.server.port}",
65-
"backing-services.explore-server.base-uri=http://localhost:${wiremock.server.port}",
66-
"backing-services.cgmes-boundary-server.base-uri=http://localhost:${wiremock.server.port}",
67-
"backing-services.dynamic-mapping-server.base-uri=http://localhost:${wiremock.server.port}",
68-
"backing-services.filter-server.base-uri=http://localhost:${wiremock.server.port}",
69-
"backing-services.report-server.base-uri=http://localhost:${wiremock.server.port}",
70-
"backing-services.network-modification-server.base-uri=http://localhost:${wiremock.server.port}",
71-
"backing-services.user-admin-server.base-uri=http://localhost:${wiremock.server.port}",
72-
"backing-services.sensitivity-analysis-server.base-uri=http://localhost:${wiremock.server.port}",
55+
properties = {"powsybl.services.case-server.base-uri=http://localhost:${wiremock.server.port}",
56+
"gridsuite.services.study-server.base-uri=http://localhost:${wiremock.server.port}",
57+
"gridsuite.services.merge-orchestrator-server.base-uri=http://localhost:${wiremock.server.port}",
58+
"gridsuite.services.merge-notification-server.base-uri=http://localhost:${wiremock.server.port}",
59+
"gridsuite.services.directory-notification-server.base-uri=http://localhost:${wiremock.server.port}",
60+
"gridsuite.services.actions-server.base-uri=http://localhost:${wiremock.server.port}",
61+
"gridsuite.services.study-notification-server.base-uri=http://localhost:${wiremock.server.port}",
62+
"gridsuite.services.config-server.base-uri=http://localhost:${wiremock.server.port}",
63+
"gridsuite.services.config-notification-server.base-uri=http://localhost:${wiremock.server.port}",
64+
"gridsuite.services.directory-server.base-uri=http://localhost:${wiremock.server.port}",
65+
"gridsuite.services.explore-server.base-uri=http://localhost:${wiremock.server.port}",
66+
"gridsuite.services.cgmes-boundary-server.base-uri=http://localhost:${wiremock.server.port}",
67+
"gridsuite.services.dynamic-mapping-server.base-uri=http://localhost:${wiremock.server.port}",
68+
"gridsuite.services.filter-server.base-uri=http://localhost:${wiremock.server.port}",
69+
"gridsuite.services.report-server.base-uri=http://localhost:${wiremock.server.port}",
70+
"gridsuite.services.network-modification-server.base-uri=http://localhost:${wiremock.server.port}",
71+
"gridsuite.services.user-admin-server.base-uri=http://localhost:${wiremock.server.port}",
72+
"gridsuite.services.sensitivity-analysis-server.base-uri=http://localhost:${wiremock.server.port}",
7373
})
7474

7575
@AutoConfigureWireMock(port = 0)

0 commit comments

Comments
 (0)