Skip to content

Commit 9007263

Browse files
committed
Update
1 parent 08400cb commit 9007263

File tree

9 files changed

+77
-75
lines changed

9 files changed

+77
-75
lines changed

bin/builds/sap-afc-sdk-0.9.0.jar

5 Bytes
Binary file not shown.

java/plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<java.version>17</java.version>
2424
<maven.compiler.release>${java.version}</maven.compiler.release>
2525
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26-
<cds.services.version>4.5.0</cds.services.version>
26+
<cds.services.version>4.5.1</cds.services.version>
2727
<spring.boot.version>3.5.8</spring.boot.version>
2828
<spring.cloud.version>4.5.0</spring.cloud.version>
2929
<spring.doc.version>2.8.14</spring.doc.version>

java/project/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

java/project/pom.xml

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

1818
<!-- DEPENDENCIES VERSION -->
1919
<jdk.version>17</jdk.version>
20-
<cds.services.version>4.5.0</cds.services.version>
20+
<cds.services.version>4.5.1</cds.services.version>
2121
<spring.boot.version>3.5.8</spring.boot.version>
2222
<spring.cloud.version>4.5.0</spring.cloud.version>
2323
<spring.doc.version>2.8.14</spring.doc.version>

java/project/srv/sap-afc-sdk.iml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,11 @@
55
<sourceFolder url="file://$MODULE_DIR$/src/gen/java" isTestSource="false" generated="true" />
66
</content>
77
</component>
8+
<component name="FacetManager">
9+
<facet type="web" name="Web">
10+
<configuration>
11+
<webroots />
12+
</configuration>
13+
</facet>
14+
</component>
815
</module>

java/project/srv/src/test/java/com/github/capjscommunity/sapafcsdk/scheduling/controllers/SchedulingProviderControllerTest.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void getOpenAPI() throws Exception {
7171
public void getCapabilities() throws Exception {
7272
mockMvc
7373
.perform(get("/api/job-scheduling/v1/Capabilities"))
74-
//.andExpect(header().string("Content-Type", "application/json"))
74+
.andExpect(header().string("Content-Type", "application/json"))
7575
.andExpect(status().isOk())
7676
.andExpect(jsonPath("$.supportsNotification").value(true))
7777
.andExpect(jsonPath("$.applicationUrl").value("http://localhost:8080/launchpad.html"));
@@ -82,7 +82,7 @@ public void getCapabilities() throws Exception {
8282
public void getJobDefinitions() throws Exception {
8383
MvcResult result = mockMvc
8484
.perform(get("/api/job-scheduling/v1/JobDefinition"))
85-
//.andExpect(header().string("Content-Type", "application/json"))
85+
.andExpect(header().string("Content-Type", "application/json"))
8686
.andExpect(status().isOk())
8787
.andReturn();
8888

@@ -308,7 +308,7 @@ public void getJobs() throws Exception {
308308

309309
MvcResult result = mockMvc
310310
.perform(get("/api/job-scheduling/v1/Job"))
311-
//.andExpect(header().string("Content-Type", "application/json"))
311+
.andExpect(header().string("Content-Type", "application/json"))
312312
.andExpect(status().isOk())
313313
.andReturn();
314314

@@ -1068,8 +1068,7 @@ public void createJobWithTranslation() throws Exception {
10681068
resultMessage = resultMessages.getJSONObject(0);
10691069
assertEquals("jobBasicMock", resultMessage.getString("code"));
10701070
assertEquals(MessageSeverityCode.INFO, resultMessage.getString("severity"));
1071-
// assertEquals(messageProvider.get("jobBasicMock", null, Locale.GERMAN), resultMessage.getString("text"));
1072-
assertEquals("Job läuft im einfachen Mock-Modus.", resultMessage.getString("text"));
1071+
assertEquals(messageProvider.get("jobBasicMock", null, Locale.GERMAN), resultMessage.getString("text"));
10731072

10741073
jobResult = resultsArray.getJSONObject(1);
10751074
assertEquals("Data", jobResult.get("name"));
@@ -1129,8 +1128,7 @@ public void createJobWithTranslation() throws Exception {
11291128
resultMessage = resultMessages.getJSONObject(0);
11301129
assertEquals("jobTestRun", resultMessage.getString("code"));
11311130
assertEquals(MessageSeverityCode.INFO, resultMessage.getString("severity"));
1132-
// assertEquals(messageProvider.get("jobTestRun", null, Locale.GERMAN), resultMessage.getString("text"));
1133-
assertEquals("Job läuft im Testmodus.", resultMessage.getString("text"));
1131+
assertEquals(messageProvider.get("jobTestRun", null, Locale.GERMAN), resultMessage.getString("text"));
11341132

11351133
persistenceService.run(Delete.from(JOB).where(j -> j.ID().eq(ID)));
11361134
}
@@ -1727,8 +1725,8 @@ void createJobWithWrongData() throws Exception {
17271725
)
17281726
.andExpect(status().isBadRequest());
17291727
// .andExpect(
1730-
// jsonPath("$.message").value("Cannot parse value for sapafcsdk.scheduling.ProviderService.Job:startDateTime")
1731-
// );
1728+
// jsonPath("$.message").value("Cannot parse value for sapafcsdk.scheduling.ProviderService.Job:startDateTime")
1729+
//);
17321730
job = new JSONObject(Map.of("name", "JOB_1", "referenceID", "c1253940-5f25-4a0b-8585-f62bd085b327", "x", "y"));
17331731
mockMvc
17341732
.perform(
@@ -1738,7 +1736,6 @@ void createJobWithWrongData() throws Exception {
17381736
.locale(Locale.ENGLISH)
17391737
)
17401738
.andExpect(status().isBadRequest());
1741-
// .andExpect(jsonPath("$.code").value("parserError"))
17421739
// .andExpect(jsonPath("$.message").value("No element with name 'x' in 'sapafcsdk.scheduling.ProviderService.Job'"));
17431740
job = new JSONObject(
17441741
Map.of(

java/project/srv/src/test/java/com/github/capjscommunity/sapafcsdk/scheduling/handlers/SchedulingProcessingHandlerTest.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,17 +211,15 @@ void updateJobWithTranslation() throws Exception {
211211
jsonPath("$[0].text").value(messageProvider.get("invalidJobStatus", List.of("xxx").toArray(), Locale.FRENCH))
212212
)
213213
.andExpect(jsonPath("$[1].code").value("jobCompleted"))
214-
// .andExpect(jsonPath("$[0].text").value(messageProvider.get("jobCompleted", null, Locale.FRENCH)));
215-
.andExpect(jsonPath("$[1].text").value("Job terminé"));
214+
.andExpect(jsonPath("$[1].text").value(messageProvider.get("jobCompleted", null, Locale.FRENCH)));
216215

217216
mockMvc
218217
.perform(get("/api/job-scheduling/v1/JobResult/" + resultIDs.get(0) + "/messages").locale(Locale.GERMAN))
219218
.andExpect(status().isOk())
220219
.andExpect(jsonPath("$[0].code").value("invalidJobStatus"))
221-
// .andExpect(
222-
// jsonPath("$[0].text").value(messageProvider.get("invalidJobStatus", List.of("xxx").toArray(), Locale.GERMAN))
223-
// )
224-
.andExpect(jsonPath("$[0].text").value("Jobstatus 'xxx' ist nicht gültig."))
220+
.andExpect(
221+
jsonPath("$[0].text").value(messageProvider.get("invalidJobStatus", List.of("xxx").toArray(), Locale.GERMAN))
222+
)
225223
.andExpect(jsonPath("$[1].code").value("jobCompleted"))
226224
.andExpect(jsonPath("$[1].text").value("Job abgeschlossen"));
227225

package-lock.json

Lines changed: 55 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"@cap-js-community/sap-afc-sdk": "./",
9696
"@cap-js/cds-test": "^0.4.1",
9797
"@cap-js/sqlite": "^2.1.0",
98-
"@sap/cds": "^9.5.1",
98+
"@sap/cds": "^9.5.2",
9999
"@sap/cds-dk": "^9.5.0",
100100
"@sap/cds-lsp": "^9.5.1",
101101
"eslint": "^9.39.1",

0 commit comments

Comments
 (0)