From 4e13c9696103adc9b485d0951fab82d1ea4ad5ab Mon Sep 17 00:00:00 2001 From: MaxKey Date: Mon, 15 Mar 2021 11:02:25 +0800 Subject: [PATCH] Constants For http --- .../src/main/java/org/maxkey/web/HttpResponseAdapter.java | 2 +- ...{ResponseConstants.java => HttpResponseConstants.java} | 2 +- .../maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java | 8 ++++---- .../maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java | 8 ++++---- .../org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java | 4 ++-- .../authz/cas/endpoint/response/CasServiceResponse.java | 4 ++-- .../endpoint/response/ProxyServiceResponseBuilder.java | 4 ++-- .../cas/endpoint/response/ServiceResponseBuilder.java | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) rename maxkey-core/src/main/java/org/maxkey/web/{ResponseConstants.java => HttpResponseConstants.java} (96%) diff --git a/maxkey-core/src/main/java/org/maxkey/web/HttpResponseAdapter.java b/maxkey-core/src/main/java/org/maxkey/web/HttpResponseAdapter.java index fb12e299..1cb01784 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/HttpResponseAdapter.java +++ b/maxkey-core/src/main/java/org/maxkey/web/HttpResponseAdapter.java @@ -31,7 +31,7 @@ public class HttpResponseAdapter { HttpServletResponse response, String format) { - if(format == null || format.equalsIgnoreCase("") || format.equalsIgnoreCase(ResponseConstants.FORMAT_TYPE.XML)) { + if(format == null || format.equalsIgnoreCase("") || format.equalsIgnoreCase(HttpResponseConstants.FORMAT_TYPE.XML)) { response.setContentType(ContentType.APPLICATION_XML_UTF8); }else { response.setContentType(ContentType.APPLICATION_JSON_UTF8); diff --git a/maxkey-core/src/main/java/org/maxkey/web/ResponseConstants.java b/maxkey-core/src/main/java/org/maxkey/web/HttpResponseConstants.java similarity index 96% rename from maxkey-core/src/main/java/org/maxkey/web/ResponseConstants.java rename to maxkey-core/src/main/java/org/maxkey/web/HttpResponseConstants.java index 5c0fb524..d9f1fdfd 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/ResponseConstants.java +++ b/maxkey-core/src/main/java/org/maxkey/web/HttpResponseConstants.java @@ -17,7 +17,7 @@ package org.maxkey.web; -public class ResponseConstants { +public class HttpResponseConstants { public static final class FORMAT_TYPE { /** diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java index 7461235f..707ead87 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java @@ -34,7 +34,7 @@ import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.Boolean; import org.maxkey.domain.UserInfo; import org.maxkey.util.Instance; -import org.maxkey.web.ResponseConstants; +import org.maxkey.web.HttpResponseConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.MediaType; @@ -180,7 +180,7 @@ For all error codes, it is RECOMMENDED that CAS provide a more detailed message @RequestParam(value = CasConstants.PARAMETER.SERVICE) String service, @RequestParam(value = CasConstants.PARAMETER.PROXY_CALLBACK_URL,required=false) String pgtUrl, @RequestParam(value = CasConstants.PARAMETER.RENEW,required=false) String renew, - @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=ResponseConstants.FORMAT_TYPE.XML) String format){ + @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=HttpResponseConstants.FORMAT_TYPE.XML) String format){ _logger.debug("serviceValidate " + " ticket " + ticket +" , service " + service @@ -303,7 +303,7 @@ Response on ticket validation failure: @RequestParam(value = CasConstants.PARAMETER.SERVICE) String service, @RequestParam(value = CasConstants.PARAMETER.PROXY_CALLBACK_URL,required=false) String pgtUrl, @RequestParam(value = CasConstants.PARAMETER.RENEW,required=false) String renew, - @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=ResponseConstants.FORMAT_TYPE.XML) String format){ + @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=HttpResponseConstants.FORMAT_TYPE.XML) String format){ _logger.debug("proxyValidate " + " ticket " + ticket +" , service " + service @@ -402,7 +402,7 @@ For all error codes, it is RECOMMENDED that CAS provide a more detailed message HttpServletResponse response, @RequestParam(value = CasConstants.PARAMETER.PROXY_GRANTING_TICKET) String pgt, @RequestParam(value = CasConstants.PARAMETER.TARGET_SERVICE) String targetService, - @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=ResponseConstants.FORMAT_TYPE.XML) String format){ + @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=HttpResponseConstants.FORMAT_TYPE.XML) String format){ _logger.debug("proxy " + " pgt " + pgt +" , targetService " + targetService diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java index 6adaf493..7fd42799 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java @@ -35,7 +35,7 @@ import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; import org.maxkey.constants.Boolean; import org.maxkey.domain.UserInfo; import org.maxkey.util.Instance; -import org.maxkey.web.ResponseConstants; +import org.maxkey.web.HttpResponseConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -63,7 +63,7 @@ public class Cas30AuthorizeEndpoint extends CasBaseAuthorizeEndpoint{ @RequestParam(value = CasConstants.PARAMETER.SERVICE) String service, @RequestParam(value = CasConstants.PARAMETER.PROXY_CALLBACK_URL,required=false) String pgtUrl, @RequestParam(value = CasConstants.PARAMETER.RENEW,required=false) String renew, - @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=ResponseConstants.FORMAT_TYPE.XML) String format){ + @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=HttpResponseConstants.FORMAT_TYPE.XML) String format){ _logger.debug("serviceValidate " + " ticket " + ticket +" , service " + service @@ -122,7 +122,7 @@ public class Cas30AuthorizeEndpoint extends CasBaseAuthorizeEndpoint{ HttpServletResponse response, @RequestParam(value = CasConstants.PARAMETER.PROXY_GRANTING_TICKET) String pgt, @RequestParam(value = CasConstants.PARAMETER.TARGET_SERVICE) String targetService, - @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=ResponseConstants.FORMAT_TYPE.XML) String format){ + @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=HttpResponseConstants.FORMAT_TYPE.XML) String format){ _logger.debug("proxy " + " pgt " + pgt +" , targetService " + targetService @@ -150,7 +150,7 @@ public class Cas30AuthorizeEndpoint extends CasBaseAuthorizeEndpoint{ @RequestParam(value = CasConstants.PARAMETER.SERVICE) String service, @RequestParam(value = CasConstants.PARAMETER.PROXY_CALLBACK_URL,required=false) String pgtUrl, @RequestParam(value = CasConstants.PARAMETER.RENEW,required=false) String renew, - @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=ResponseConstants.FORMAT_TYPE.XML) String format){ + @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=HttpResponseConstants.FORMAT_TYPE.XML) String format){ _logger.debug("proxyValidate " + " ticket " + ticket +" , service " + service diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java index 9c0a64ab..4abe0a83 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java @@ -31,7 +31,7 @@ import org.maxkey.authz.cas.endpoint.ticket.ServiceTicketImpl; import org.maxkey.authz.cas.endpoint.ticket.TicketGrantingTicketImpl; import org.maxkey.domain.UserInfo; import org.maxkey.domain.apps.AppsCasDetails; -import org.maxkey.web.ResponseConstants; +import org.maxkey.web.HttpResponseConstants; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -196,7 +196,7 @@ public class CasRestV1Endpoint extends CasBaseAuthorizeEndpoint{ HttpHeaders headers = new HttpHeaders(); headers.add("location", location); ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder(); - serviceResponseBuilder.setFormat(ResponseConstants.FORMAT_TYPE.JSON); + serviceResponseBuilder.setFormat(HttpResponseConstants.FORMAT_TYPE.JSON); //for user serviceResponseBuilder.setAttribute("uid", userInfo.getId()); serviceResponseBuilder.setAttribute("displayName",userInfo.getDisplayName()); diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/CasServiceResponse.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/CasServiceResponse.java index b37d6393..eed96330 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/CasServiceResponse.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/CasServiceResponse.java @@ -19,7 +19,7 @@ package org.maxkey.authz.cas.endpoint.response; import java.util.ArrayList; import java.util.HashMap; -import org.maxkey.web.ResponseConstants; +import org.maxkey.web.HttpResponseConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ public class CasServiceResponse { protected boolean result=false; protected String user; protected String ticket; - protected String format=ResponseConstants.FORMAT_TYPE.XML; + protected String format=HttpResponseConstants.FORMAT_TYPE.XML; protected ArrayListproxies=new ArrayList(); protected HashMap>casAttributes=new HashMap>(); diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java index 7607f4a1..9af3cf00 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/ProxyServiceResponseBuilder.java @@ -17,7 +17,7 @@ package org.maxkey.authz.cas.endpoint.response; -import org.maxkey.web.ResponseConstants; +import org.maxkey.web.HttpResponseConstants; public class ProxyServiceResponseBuilder extends ServiceResponseBuilder{ @@ -28,7 +28,7 @@ public class ProxyServiceResponseBuilder extends ServiceResponseBuilder{ @Override public String serviceResponseBuilder() { String responseString = ""; - if(format.equalsIgnoreCase(ResponseConstants.FORMAT_TYPE.XML)){ + if(format.equalsIgnoreCase(HttpResponseConstants.FORMAT_TYPE.XML)){ responseString = serviceResponseXmlBuilder(); }else{ responseString =serviceResponseJsonBuilder(); diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java index faac53e1..95e293bc 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/response/ServiceResponseBuilder.java @@ -19,7 +19,7 @@ package org.maxkey.authz.cas.endpoint.response; import java.util.ArrayList; import java.util.Iterator; -import org.maxkey.web.ResponseConstants; +import org.maxkey.web.HttpResponseConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +29,7 @@ public class ServiceResponseBuilder extends CasServiceResponse { @Override public String serviceResponseBuilder() { String responseString = ""; - if(format.equalsIgnoreCase(ResponseConstants.FORMAT_TYPE.XML)){ + if(format.equalsIgnoreCase(HttpResponseConstants.FORMAT_TYPE.XML)){ responseString= serviceResponseXmlBuilder(); }else{ responseString= serviceResponseJsonBuilder();