[java-idp-testbed COMMIT] in /trunk/src/main/java/sp: SAML1Controller.java SAML2Controller.java

[noreply at shibboleth.net]

Author: rdw
Date: Wed Apr 15 06:36:09 2015
New Revision: 301

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=301&view=rev
Log:
checkstyle

Modified:
    trunk/src/main/java/sp/SAML1Controller.java
    trunk/src/main/java/sp/SAML2Controller.java

Modified: trunk/src/main/java/sp/SAML1Controller.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/sp/SAML1Controller.java?rev=301&r1=300&r2=301&view=diff
==============================================================================
--- trunk/src/main/java/sp/SAML1Controller.java (original)
+++ trunk/src/main/java/sp/SAML1Controller.java Wed Apr 15 06:36:09 2015
@@ -39,7 +39,7 @@
 @RequestMapping("/SAML1")
 public class SAML1Controller extends BaseSAMLController {
     
-    private Logger log = LoggerFactory.getLogger(SAML1Controller.class);
+    private final Logger log = LoggerFactory.getLogger(SAML1Controller.class);
     
     @RequestMapping(value="/POST/ACS", method=RequestMethod.POST)
     public ResponseEntity<String> handleSSOResponsePOST(HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws Exception {
@@ -48,7 +48,7 @@
         
         if (!(messageContext.getMessage() instanceof Response)) {
             log.error("Inbound message was not a SAML 1 Response");
-            return new ResponseEntity<String>("Inbound message was not a SAML 1 Response", HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>("Inbound message was not a SAML 1 Response", HttpStatus.BAD_REQUEST);
         }
         
         Response response = (Response) messageContext.getMessage();
@@ -60,7 +60,7 @@
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "text/plain");
         
-        return new ResponseEntity<String>(formattedMessage, headers, HttpStatus.OK);
+        return new ResponseEntity<>(formattedMessage, headers, HttpStatus.OK);
     }
 
 }

Modified: trunk/src/main/java/sp/SAML2Controller.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/java/sp/SAML2Controller.java?rev=301&r1=300&r2=301&view=diff
==============================================================================
--- trunk/src/main/java/sp/SAML2Controller.java (original)
+++ trunk/src/main/java/sp/SAML2Controller.java Wed Apr 15 06:36:09 2015
@@ -50,7 +50,7 @@
 @RequestMapping("/SAML2")
 public class SAML2Controller extends BaseSAMLController {
 	
-	private Logger log = LoggerFactory.getLogger(SAML2Controller.class);
+	private final Logger log = LoggerFactory.getLogger(SAML2Controller.class);
 
 	@RequestMapping(value="/InitSSO/Redirect", method=RequestMethod.GET)
 	public void initSSORequestRedirect(HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws Exception {
@@ -176,7 +176,7 @@
 		
 		if (!(messageContext.getMessage() instanceof Response)) {
 			log.error("Inbound message was not a SAML 2 Response");
-			return new ResponseEntity<String>("Inbound message was not a SAML 2 Response", HttpStatus.BAD_REQUEST);
+			return new ResponseEntity<>("Inbound message was not a SAML 2 Response", HttpStatus.BAD_REQUEST);
 		}
 		
 		final Response response = (Response) messageContext.getMessage();
@@ -188,7 +188,7 @@
 		final HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "text/plain");
 		
-		return new ResponseEntity<String>(formattedMessage, headers, HttpStatus.OK);
+		return new ResponseEntity<>(formattedMessage, headers, HttpStatus.OK);
 	}
 
     @RequestMapping(value="/Redirect/SLO", method=RequestMethod.GET)
@@ -197,7 +197,7 @@
         
         if (!(messageContext.getMessage() instanceof LogoutResponse)) {
             log.error("Inbound message was not a SAML 2 LogoutResponse");
-            return new ResponseEntity<String>("Inbound message was not a SAML 2 LogoutResponse", HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>("Inbound message was not a SAML 2 LogoutResponse", HttpStatus.BAD_REQUEST);
         }
         
         final LogoutResponse response = (LogoutResponse) messageContext.getMessage();
@@ -209,7 +209,7 @@
         final HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "text/plain");
         
-        return new ResponseEntity<String>(formattedMessage, headers, HttpStatus.OK);
+        return new ResponseEntity<>(formattedMessage, headers, HttpStatus.OK);
     }
 	
     @RequestMapping(value="/POST/SLO", method=RequestMethod.POST)
@@ -218,7 +218,7 @@
         
         if (!(messageContext.getMessage() instanceof LogoutResponse)) {
             log.error("Inbound message was not a SAML 2 LogoutResponse");
-            return new ResponseEntity<String>("Inbound message was not a SAML 2 LogoutResponse", HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>("Inbound message was not a SAML 2 LogoutResponse", HttpStatus.BAD_REQUEST);
         }
         
         final LogoutResponse response = (LogoutResponse) messageContext.getMessage();
@@ -230,7 +230,7 @@
         final HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "text/plain");

[... 7 lines stripped ...]