Skip to content

Commit fef0d03

Browse files
Jonas-IsrJonas-Isr
committed
Remove unnecessary .contentType
1 parent 0f935d8 commit fef0d03

File tree

5 files changed

+22
-53
lines changed

5 files changed

+22
-53
lines changed

‎sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/ConfigurationController.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.sap.ai.sdk.core.client.ConfigurationApi;
44
import com.sap.ai.sdk.core.model.AiConfiguration;
55
import java.util.stream.Collectors;
6-
import org.springframework.http.MediaType;
76
import org.springframework.http.ResponseEntity;
87
import org.springframework.web.bind.annotation.GetMapping;
98
import org.springframework.web.bind.annotation.RequestHeader;
@@ -27,7 +26,7 @@ ResponseEntity<Object> getConfigurations(
2726
@RequestHeader(value = "accept", required = false) final String accept) {
2827
final var configList = CLIENT.query("default");
2928
if ("application/json".equals(accept)) {
30-
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(configList);
29+
return ResponseEntity.ok().body(configList);
3130
}
3231
final var items =
3332
configList.getResources().stream()

‎sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/DeploymentController.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import javax.annotation.Nonnull;
2020
import javax.annotation.Nullable;
2121
import lombok.extern.slf4j.Slf4j;
22-
import org.springframework.http.MediaType;
2322
import org.springframework.http.ResponseEntity;
2423
import org.springframework.web.bind.annotation.GetMapping;
2524
import org.springframework.web.bind.annotation.PathVariable;
@@ -67,7 +66,7 @@ ResponseEntity<Object> createAndDeleteDeploymentByConfigId(
6766
@RequestHeader(value = "accept", required = false) final String accept) {
6867
final var response = createAndDeleteDeploymentByConfigId(configId);
6968
if ("application/json".equals(accept)) {
70-
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(response);
69+
return ResponseEntity.ok().body(response);
7170
}
7271
return ResponseEntity.ok("Deployment created and will be deleted.");
7372
}
@@ -98,7 +97,7 @@ ResponseEntity<Object> stopByConfigId(
9897
.toList();
9998

10099
if ("application/json".equals(accept)) {
101-
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(stoppedDeployments);
100+
return ResponseEntity.ok().body(stoppedDeployments);
102101
}
103102
return ResponseEntity.ok("Deployments under the given config ID stopped.");
104103
}
@@ -126,7 +125,7 @@ ResponseEntity<Object> deleteByConfigId(
126125
.map(deployment -> CLIENT.delete(RESOURCE_GROUP, deployment.getId()))
127126
.toList();
128127
if ("application/json".equals(accept)) {
129-
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(responseList);
128+
return ResponseEntity.ok().body(responseList);
130129
}
131130
return ResponseEntity.ok("Deployments under the given config ID deleted.");
132131
}
@@ -144,7 +143,7 @@ ResponseEntity<Object> getAllByConfigId(
144143
@RequestHeader(value = "accept", required = false) final String accept) {
145144
final var deployments = getAllByConfigId(configId);
146145
if ("application/json".equals(accept)) {
147-
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(deployments);
146+
return ResponseEntity.ok().body(deployments);
148147
}
149148
final var items =
150149
deployments.stream().map(AiDeployment::getId).collect(Collectors.joining(", "));
@@ -179,7 +178,7 @@ ResponseEntity<Object> getAll(
179178
@RequestHeader(value = "accept", required = false) final String accept) {
180179
final var deployments = getAll();
181180
if ("application/json".equals(accept)) {
182-
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(deployments);
181+
return ResponseEntity.ok().body(deployments);
183182
}
184183
final var items =
185184
deployments != null

‎sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OpenAiController.java‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ ResponseEntity<String> chatCompletion(
4141
throws JsonProcessingException {
4242
final var response = service.chatCompletion("Who is the prettiest");
4343
if ("application/json".equals(accept)) {
44-
return ResponseEntity.ok()
45-
.contentType(MediaType.APPLICATION_JSON)
46-
.body(MAPPER.writeValueAsString(response));
44+
return ResponseEntity.ok().body(MAPPER.writeValueAsString(response));
4745
}
4846
return ResponseEntity.ok(response.getContent());
4947
}
@@ -149,9 +147,7 @@ ResponseEntity<String> chatCompletionImage(
149147
service.chatCompletionImage(
150148
"https://upload.wikimedia.org/wikipedia/commons/thumb/5/59/SAP_2011_logo.svg/440px-SAP_2011_logo.svg.png");
151149
if ("application/json".equals(accept)) {
152-
return ResponseEntity.ok()
153-
.contentType(MediaType.APPLICATION_JSON)
154-
.body(MAPPER.writeValueAsString(response));
150+
return ResponseEntity.ok().body(MAPPER.writeValueAsString(response));
155151
}
156152
return ResponseEntity.ok(response.getContent());
157153
}
@@ -169,9 +165,7 @@ ResponseEntity<String> chatCompletionTools(
169165
final var response =
170166
service.chatCompletionTools("Calculate the Fibonacci number for given sequence index.");
171167
if ("application/json".equals(accept)) {
172-
return ResponseEntity.ok()
173-
.contentType(MediaType.APPLICATION_JSON)
174-
.body(MAPPER.writeValueAsString(response));
168+
return ResponseEntity.ok().body(MAPPER.writeValueAsString(response));
175169
}
176170
return ResponseEntity.ok(response.getContent());
177171
}
@@ -185,9 +179,7 @@ ResponseEntity<String> chatCompletionTools(
185179
@Nonnull
186180
ResponseEntity<String> embedding() throws JsonProcessingException {
187181
final var response = service.embedding("Hello world");
188-
return ResponseEntity.ok()
189-
.contentType(MediaType.APPLICATION_JSON)
190-
.body(MAPPER.writeValueAsString(response));
182+
return ResponseEntity.ok().body(MAPPER.writeValueAsString(response));
191183
}
192184

193185
/**
@@ -205,9 +197,7 @@ ResponseEntity<String> chatCompletionWithResource(
205197
final var response =
206198
service.chatCompletionWithResource(resourceGroup, "Where is the nearest coffee shop?");
207199
if ("application/json".equals(accept)) {
208-
return ResponseEntity.ok()
209-
.contentType(MediaType.APPLICATION_JSON)
210-
.body(MAPPER.writeValueAsString(response));
200+
return ResponseEntity.ok().body(MAPPER.writeValueAsString(response));
211201
}
212202
return ResponseEntity.ok(response.getContent());
213203
}

‎sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/OrchestrationController.java‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ ResponseEntity<String> completion(
4646
throws JsonProcessingException {
4747
final var response = service.completion("HelloWorld!");
4848
if ("application/json".equals(accept)) {
49-
return ResponseEntity.ok()
50-
.contentType(MediaType.APPLICATION_JSON)
51-
.body(MAPPER.writeValueAsString(response));
49+
return ResponseEntity.ok().body(MAPPER.writeValueAsString(response));
5250
}
5351
return ResponseEntity.ok(response.getContent());
5452
}
@@ -96,9 +94,7 @@ ResponseEntity<Object> template(
9694
throws JsonProcessingException {
9795
final var response = service.template("German");
9896
if ("application/json".equals(accept)) {
99-
return ResponseEntity.ok()
100-
.contentType(MediaType.APPLICATION_JSON)
101-
.body(MAPPER.writeValueAsString(response));
97+
return ResponseEntity.ok().body(MAPPER.writeValueAsString(response));
10298
}
10399
return ResponseEntity.ok(response.getContent());
104100
}
@@ -115,9 +111,7 @@ ResponseEntity<String> messagesHistory(
115111
throws JsonProcessingException {
116112
final var response = service.messagesHistory("What is the capital of France?");
117113
if ("application/json".equals(accept)) {
118-
return ResponseEntity.ok()
119-
.contentType(MediaType.APPLICATION_JSON)
120-
.body(MAPPER.writeValueAsString(response));
114+
return ResponseEntity.ok().body(MAPPER.writeValueAsString(response));
121115
}
122116
return ResponseEntity.ok(response.getContent());
123117
}
@@ -153,9 +147,7 @@ ResponseEntity<String> inputFiltering(
153147
}
154148

155149
if (accept.equals("application/json")) {
156-
return ResponseEntity.ok()
157-
.contentType(MediaType.APPLICATION_JSON)
158-
.body(MAPPER.writeValueAsString(response));
150+
return ResponseEntity.ok().body(MAPPER.writeValueAsString(response));
159151
}
160152
return ResponseEntity.ok().body(response.getContent());
161153
}
@@ -185,9 +177,7 @@ ResponseEntity<String> outputFiltering(
185177
final var response = service.outputFiltering(policy);
186178
try {
187179
if (accept.equals("application/json")) {
188-
return ResponseEntity.ok()
189-
.contentType(MediaType.APPLICATION_JSON)
190-
.body(MAPPER.writeValueAsString(response));
180+
return ResponseEntity.ok().body(MAPPER.writeValueAsString(response));
191181
}
192182
return ResponseEntity.ok().body(response.getContent());
193183
} catch (OrchestrationClientException e) {
@@ -214,9 +204,7 @@ ResponseEntity<String> maskingAnonymization(
214204
throws JsonProcessingException {
215205
final var response = service.maskingAnonymization(DPIEntities.PERSON);
216206
if ("application/json".equals(accept)) {
217-
return ResponseEntity.ok()
218-
.contentType(MediaType.APPLICATION_JSON)
219-
.body(MAPPER.writeValueAsString(response));
207+
return ResponseEntity.ok().body(MAPPER.writeValueAsString(response));
220208
}
221209
return ResponseEntity.ok(response.getContent());
222210
}
@@ -234,9 +222,7 @@ public ResponseEntity<String> completionWithResourceGroup(
234222
throws JsonProcessingException {
235223
final var response = service.completionWithResourceGroup(resourceGroup, "Hello world!");
236224
if ("application/json".equals(accept)) {
237-
return ResponseEntity.ok()
238-
.contentType(MediaType.APPLICATION_JSON)
239-
.body(MAPPER.writeValueAsString(response));
225+
return ResponseEntity.ok().body(MAPPER.writeValueAsString(response));
240226
}
241227
return ResponseEntity.ok(response.getContent());
242228
}
@@ -257,9 +243,7 @@ ResponseEntity<String> maskingPseudonymization(
257243
throws JsonProcessingException {
258244
final var response = service.maskingPseudonymization(DPIEntities.PERSON);
259245
if ("application/json".equals(accept)) {
260-
return ResponseEntity.ok()
261-
.contentType(MediaType.APPLICATION_JSON)
262-
.body(MAPPER.writeValueAsString(response));
246+
return ResponseEntity.ok().body(MAPPER.writeValueAsString(response));
263247
}
264248
return ResponseEntity.ok(response.getContent());
265249
}
@@ -278,9 +262,7 @@ ResponseEntity<String> grounding(
278262
throws JsonProcessingException {
279263
final var response = service.grounding("What does Joule do?");
280264
if ("application/json".equals(accept)) {
281-
return ResponseEntity.ok()
282-
.contentType(MediaType.APPLICATION_JSON)
283-
.body(MAPPER.writeValueAsString(response));
265+
return ResponseEntity.ok().body(MAPPER.writeValueAsString(response));
284266
}
285267
return ResponseEntity.ok(response.getContent());
286268
}

‎sample-code/spring-app/src/main/java/com/sap/ai/sdk/app/controllers/ScenarioController.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.sap.ai.sdk.core.model.AiScenario;
77
import java.util.stream.Collectors;
88
import javax.annotation.Nonnull;
9-
import org.springframework.http.MediaType;
109
import org.springframework.http.ResponseEntity;
1110
import org.springframework.web.bind.annotation.GetMapping;
1211
import org.springframework.web.bind.annotation.RequestHeader;
@@ -31,7 +30,7 @@ ResponseEntity<Object> getScenarios(
3130
@RequestHeader(value = "accept", required = false) final String accept) {
3231
final var scenarioList = CLIENT.query("default");
3332
if ("application/json".equals(accept)) {
34-
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(scenarioList);
33+
return ResponseEntity.ok().body(scenarioList);
3534
}
3635
final var items =
3736
scenarioList.getResources().stream()
@@ -62,7 +61,7 @@ ResponseEntity<Object> getModels(
6261
@RequestHeader(value = "accept", required = false) final String accept) {
6362
final var modelList = getModels();
6463
if ("application/json".equals(accept)) {
65-
return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(modelList);
64+
return ResponseEntity.ok().body(modelList);
6665
}
6766
final var items =
6867
modelList.getResources().stream()

0 commit comments

Comments
 (0)