[java-idp-testbed] branch master updated: checkstyle

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-idp-testbed.

The following commit(s) were added to refs/heads/master by this push:
       new  80e1c8e   checkstyle
80e1c8e is described below

commit 80e1c8e0df6b498fa1b5a18f68d94edc136f82c7
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Oct 9 16:52:07 2015 +0100

    checkstyle
---
 .settings/org.eclipse.core.resources.prefs                 | 1 -
 src/main/java/sp/SAML2Controller.java                      | 2 +-
 src/main/java/storage/StorageServiceWrapperController.java | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 29abf99..839d647 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -2,5 +2,4 @@ eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/src/main/java/sp/SAML2Controller.java b/src/main/java/sp/SAML2Controller.java
index 8248bf0..fe5b5ad 100644
--- a/src/main/java/sp/SAML2Controller.java
+++ b/src/main/java/sp/SAML2Controller.java
@@ -490,7 +490,7 @@ public class SAML2Controller extends BaseSAMLController {
         final String formattedMessage = builder.toString();
         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);
     }
 
 }
diff --git a/src/main/java/storage/StorageServiceWrapperController.java b/src/main/java/storage/StorageServiceWrapperController.java
index ab43acc..502facf 100644
--- a/src/main/java/storage/StorageServiceWrapperController.java
+++ b/src/main/java/storage/StorageServiceWrapperController.java
@@ -91,7 +91,7 @@ public class StorageServiceWrapperController {
 
     static protected ResponseEntity<String> seleniumFriendlyResponse(
             @Nonnull final HttpStatus status) {
-        return new ResponseEntity<String>(status.getReasonPhrase(), status);
+        return new ResponseEntity<>(status.getReasonPhrase(), status);
     }
 
     @Nullable
@@ -199,7 +199,7 @@ public class StorageServiceWrapperController {
                 final String serializedStorageRecord = serializer.serialize(record);
                 final HttpHeaders httpHeaders = new HttpHeaders();
                 httpHeaders.setContentType(MediaType.APPLICATION_JSON);
-                return new ResponseEntity<String>(serializedStorageRecord, httpHeaders, HttpStatus.OK);
+                return new ResponseEntity<>(serializedStorageRecord, httpHeaders, HttpStatus.OK);
             }
         } catch (IOException e) {
             log.debug("An error occurred", e);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.