more for loops and expression lambdas

apereo · Feb 2, 2016 · 04a84e0 · 04a84e0
1 parent 87ea539
commit 04a84e0
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 36 deletions.
diff --git a/cas-server-core-monitor/src/test/java/org/jasig/cas/monitor/SessionMonitorTests.java b/cas-server-core-monitor/src/test/java/org/jasig/cas/monitor/SessionMonitorTests.java
@@ -74,14 +74,8 @@ private void addTicketsToRegistry(final TicketRegistry registry, final int tgtCo
         });
 
         if (ticket[0] != null) {
-            IntStream.range(0, stCount).forEach(i -> {
-                registry.addTicket(ticket[0].grantServiceTicket(
-                        GENERATOR.getNewTicketId("ST"),
-                        new MockService("junit"),
-                        TEST_EXP_POLICY,
-                        false,
-                        true));
-            });
+            IntStream.range(0, stCount).forEach(i -> registry.addTicket(ticket[0].grantServiceTicket(GENERATOR.getNewTicketId("ST"),
+                                    new MockService("junit"), TEST_EXP_POLICY, false, true)));
         }
     }
 }
diff --git a/...s/src/test/java/org/jasig/cas/authentication/support/DefaultCasAttributeEncoderTests.java b/...s/src/test/java/org/jasig/cas/authentication/support/DefaultCasAttributeEncoderTests.java
@@ -37,9 +37,7 @@ public class DefaultCasAttributeEncoderTests {
     @Before
     public void before() {
         this.attributes = new HashMap<>();
-        IntStream.range(0, 3).forEach(i -> {
-            this.attributes.put("attr" + i, newSingleAttribute("value" + i));
-        });
+        IntStream.range(0, 3).forEach(i -> this.attributes.put("attr" + i, newSingleAttribute("value" + i)));
         this.attributes.put(CasViewConstants.MODEL_ATTRIBUTE_NAME_PROXY_GRANTING_TICKET, newSingleAttribute("PGT-1234567"));
         this.attributes.put(CasViewConstants.MODEL_ATTRIBUTE_NAME_PRINCIPAL_CREDENTIAL, newSingleAttribute("PrincipalPassword"));
     }

diff --git a/...rc/test/java/org/jasig/cas/ticket/support/MultiTimeUseOrTimeoutExpirationPolicyTests.java b/...rc/test/java/org/jasig/cas/ticket/support/MultiTimeUseOrTimeoutExpirationPolicyTests.java
@@ -55,10 +55,9 @@ public void verifyTicketIsExpiredByTime() throws InterruptedException {
 
     @Test
     public void verifyTicketIsExpiredByCount() {
-        IntStream.range(0, NUMBER_OF_USES).forEach(i -> {
-            this.ticket.grantServiceTicket("test", org.jasig.cas.services.TestUtils.getService(),
-                new NeverExpiresExpirationPolicy(), false, true);
-        });
+        IntStream.range(0, NUMBER_OF_USES)
+                .forEach(i -> this.ticket.grantServiceTicket("test", org.jasig.cas.services.TestUtils.getService(),
+                        new NeverExpiresExpirationPolicy(), false, true));
         assertTrue(this.ticket.isExpired());
     }
 }
diff --git a/cas-server-core-util/src/main/java/org/jasig/cas/util/EncodingUtils.java b/cas-server-core-util/src/main/java/org/jasig/cas/util/EncodingUtils.java
@@ -26,9 +26,7 @@ private EncodingUtils() {
     public static String hexEncode(final byte[] data) {
         final StringBuilder sb = new StringBuilder();
         final Formatter f = new Formatter(sb);
-        IntStream.range(0, data.length).forEach(i -> {
-            f.format("%02x", data[i]);
-        });
+        IntStream.range(0, data.length).forEach(i -> f.format("%02x", data[i]));
         return sb.toString();
     }
 

diff --git a/...er-core/src/test/java/org/jasig/cas/CentralAuthenticationServiceImplWithMockitoTests.java b/...er-core/src/test/java/org/jasig/cas/CentralAuthenticationServiceImplWithMockitoTests.java
@@ -214,9 +214,8 @@ public void verifyChainedAuthenticationsOnValidation() throws Exception {
         assertEquals(assertion.getService(), svc);
         assertEquals(assertion.getPrimaryAuthentication().getPrincipal().getId(), PRINCIPAL);
         assertTrue(assertion.getChainedAuthentications().size()  == 2);
-        IntStream.range(0, assertion.getChainedAuthentications().size()).forEach(i -> {
-            assertEquals(assertion.getChainedAuthentications().get(i), authentication);
-        });
+        IntStream.range(0, assertion.getChainedAuthentications().size())
+                .forEach(i -> assertEquals(assertion.getChainedAuthentications().get(i), authentication));
     }
 
     private TicketGrantingTicket createRootTicketGrantingTicket() {

diff --git a/...clearpass/src/test/java/org/jasig/cas/extension/clearpass/EncryptedMapDecoratorTests.java b/...clearpass/src/test/java/org/jasig/cas/extension/clearpass/EncryptedMapDecoratorTests.java
@@ -55,9 +55,7 @@ public void addItem() {
     public void addManyItems() {
         final int totalItems = 100;
 
-        IntStream.range(0, totalItems).forEach(i -> {
-            this.decorator.put("key" + i, "value" + i);
-        });
+        IntStream.range(0, totalItems).forEach(i -> this.decorator.put("key" + i, "value" + i));
 
         assertEquals(this.decorator.size(), totalItems);
 

diff --git a/...ntegration-ehcache/src/main/java/org/jasig/cas/ticket/registry/EhCacheTicketRegistry.java b/...ntegration-ehcache/src/main/java/org/jasig/cas/ticket/registry/EhCacheTicketRegistry.java
@@ -154,13 +154,9 @@ public Collection<Ticket> getTickets() {
 
         final Collection<Ticket> allTickets = new HashSet<>(serviceTickets.size() + tgtTicketsTickets.size());
 
-        serviceTickets.stream().forEach(ticket -> {
-            allTickets.add(getProxiedTicketInstance((Ticket) ticket.getObjectValue()));
-        });
+        serviceTickets.stream().forEach(ticket -> allTickets.add(getProxiedTicketInstance((Ticket) ticket.getObjectValue())));
 
-        tgtTicketsTickets.stream().forEach(ticket -> {
-            allTickets.add(getProxiedTicketInstance((Ticket) ticket.getObjectValue()));
-        });
+        tgtTicketsTickets.stream().forEach(ticket -> allTickets.add(getProxiedTicketInstance((Ticket) ticket.getObjectValue())));
 
         return decodeTickets(allTickets);
     }

diff --git a/...ederation/src/main/java/org/jasig/cas/support/wsfederation/WsFederationConfiguration.java b/...ederation/src/main/java/org/jasig/cas/support/wsfederation/WsFederationConfiguration.java
@@ -16,9 +16,9 @@
 import java.io.Serializable;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * This class gathers configuration information for the WS Federation Identity Provider.
@@ -190,11 +190,7 @@ public void setSigningCertificateFiles(final Resource... signingCertificateFiles
     }
 
     private void createSigningWallet(final List<Resource> signingCertificateFiles) {
-        final List<Credential> signingCerts = new ArrayList<>();
-        for (final Resource file : signingCertificateFiles) {
-            signingCerts.add(getSigningCredential(file));
-        }
-        this.signingWallet = signingCerts;
+        this.signingWallet = signingCertificateFiles.stream().map(this::getSigningCredential).collect(Collectors.toList());
     }
 
     /**