Skip to content

Commit 36eca7a

Browse files
Merge conflicts
1 parent 223ab51 commit 36eca7a

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

orchestration/src/main/java/com/sap/ai/sdk/orchestration/OrchestrationJacksonConfiguration.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import static com.sap.ai.sdk.core.JacksonConfiguration.getDefaultObjectMapper;
44

5+
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
6+
import com.fasterxml.jackson.annotation.PropertyAccessor;
57
import com.fasterxml.jackson.databind.ObjectMapper;
68
import com.fasterxml.jackson.databind.module.SimpleModule;
79
import com.google.common.annotations.Beta;
@@ -49,6 +51,7 @@ public static ObjectMapper getOrchestrationObjectMapper() {
4951
PolymorphicFallbackDeserializer.fromJsonSubTypes(ChatMessage.class))
5052
.setMixInAnnotation(ChatMessage.class, JacksonMixins.NoneTypeInfoMixin.class);
5153
jackson.registerModule(module);
54+
jackson.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
5255
return jackson;
5356
}
5457
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,9 @@ Object outputFiltering(
126126

127127
@GetMapping("/llamaGuardFilter/{enabled}")
128128
@Nonnull
129-
ResponseEntity<String> llamaGuardInputFiltering(
129+
Object llamaGuardInputFiltering(
130130
@Nullable @RequestParam(value = "format", required = false) final String format,
131-
@PathVariable("enabled") final boolean enabled)
132-
throws JsonProcessingException {
131+
@PathVariable("enabled") final boolean enabled) {
133132

134133
final OrchestrationChatResponse response;
135134
try {

0 commit comments

Comments
 (0)