From 81877a6524d8721ec30debb771e050886c37c861 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Fri, 24 Nov 2023 12:17:22 +0000
Subject: [PATCH] ContextTypeHelper: do account for the "Accept" header (per CAS specs)
---
src/main/java/org/keycloak/protocol/cas/utils/ServiceResponseMarshaller.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/utils/ServiceResponseMarshaller.java b/src/main/java/org/keycloak/protocol/cas/utils/ServiceResponseMarshaller.java
index a5aa6ac..cb872ef 100644
--- a/src/main/java/org/keycloak/protocol/cas/utils/ServiceResponseMarshaller.java
+++ b/src/main/java/org/keycloak/protocol/cas/utils/ServiceResponseMarshaller.java
@@ -5,11 +5,11 @@
import com.fasterxml.jackson.core.util.DefaultIndenter;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.keycloak.protocol.cas.representations.CasServiceResponse;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import org.keycloak.protocol.cas.representations.CASServiceResponse;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
@@ -23,9 +23,9 @@
private ServiceResponseMarshaller() {
}
- public static String marshalXml(CasServiceResponse serviceResponse) {
+ public static String marshalXml(CASServiceResponse serviceResponse) {
try {
- JAXBContext jaxbContext = JAXBContext.newInstance(CasServiceResponse.class);
+ JAXBContext jaxbContext = JAXBContext.newInstance(CASServiceResponse.class);
Marshaller marshaller = jaxbContext.createMarshaller();
//disable xml header
marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
@@ -39,7 +39,7 @@
}
}
- public static String marshalJson(CasServiceResponse serviceResponse) {
+ public static String marshalJson(CASServiceResponse serviceResponse) {
ObjectMapper mapper = new ObjectMapper();
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
//Force newlines to be LF (default is system dependent)
--
Gitblit v1.9.1