Skip to content

Commit 43737a5

Browse files
larsgreferjzheaux
authored andcommitted
Use foreach where possible
1 parent 7dc28ff commit 43737a5

File tree

7 files changed

+24
-26
lines changed

7 files changed

+24
-26
lines changed

core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ private void testGetGrantedAuthorities(
129129
List<GrantedAuthority> result = mapper
130130
.getGrantedAuthorities(Arrays.asList(roles));
131131
Collection<String> resultColl = new ArrayList<>(result.size());
132-
for (int i = 0; i < result.size(); i++) {
133-
resultColl.add(result.get(i).getAuthority());
132+
for (GrantedAuthority grantedAuthority : result) {
133+
resultColl.add(grantedAuthority.getAuthority());
134134
}
135135
Collection<String> expectedColl = Arrays.asList(expectedGas);
136136
assertThat(expectedColl.containsAll(resultColl)

core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ public void testTwoSessionsOnePrincipalHandling() throws Exception {
180180
private boolean contains(String sessionId, Object principal) {
181181
List<SessionInformation> info = sessionRegistry.getAllSessions(principal, false);
182182

183-
for (int i = 0; i < info.size(); i++) {
184-
if (sessionId.equals(info.get(i).getSessionId())) {
183+
for (SessionInformation sessionInformation : info) {
184+
if (sessionId.equals(sessionInformation.getSessionId())) {
185185
return true;
186186
}
187187
}

crypto/src/main/java/org/springframework/security/crypto/codec/Hex.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ public static char[] encode(byte[] bytes) {
3434
char[] result = new char[2 * nBytes];
3535

3636
int j = 0;
37-
for (int i = 0; i < nBytes; i++) {
37+
for (byte aByte : bytes) {
3838
// Char for top 4 bits
39-
result[j++] = HEX[(0xF0 & bytes[i]) >>> 4];
39+
result[j++] = HEX[(0xF0 & aByte) >>> 4];
4040
// Bottom 4
41-
result[j++] = HEX[(0x0F & bytes[i])];
41+
result[j++] = HEX[(0x0F & aByte)];
4242
}
4343

4444
return result;

crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ private static void println(String s) {
122122
@Test
123123
public void testHashpw() {
124124
print("BCrypt.hashpw(): ");
125-
for (int i = 0; i < test_vectors.length; i++) {
126-
String plain = test_vectors[i][0];
127-
String salt = test_vectors[i][1];
128-
String expected = test_vectors[i][2];
125+
for (String[] test_vector : test_vectors) {
126+
String plain = test_vector[0];
127+
String salt = test_vector[1];
128+
String expected = test_vector[2];
129129
String hashed = BCrypt.hashpw(plain, salt);
130130
assertThat(expected).isEqualTo(hashed);
131131
print(".");
@@ -176,9 +176,9 @@ public void testGensalt() {
176176
@Test
177177
public void testCheckpw_success() {
178178
print("BCrypt.checkpw w/ good passwords: ");
179-
for (int i = 0; i < test_vectors.length; i++) {
180-
String plain = test_vectors[i][0];
181-
String expected = test_vectors[i][2];
179+
for (String[] test_vector : test_vectors) {
180+
String plain = test_vector[0];
181+
String expected = test_vector[2];
182182
assertThat(BCrypt.checkpw(plain, expected)).isTrue();
183183
print(".");
184184
}

samples/xml/dms/src/main/java/sample/dms/AbstractElement.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package sample.dms;
1717

1818
import java.util.ArrayList;
19-
import java.util.Iterator;
2019
import java.util.List;
2120

2221
import org.springframework.util.Assert;
@@ -88,8 +87,7 @@ public String getFullName() {
8887

8988
StringBuilder sb = new StringBuilder();
9089
String lastCharacter = null;
91-
for (Iterator<String> i = strings.iterator(); i.hasNext();) {
92-
String token = i.next();
90+
for (String token : strings) {
9391
if (!"/".equals(lastCharacter) && lastCharacter != null) {
9492
sb.append("/");
9593
}

samples/xml/dms/src/test/java/sample/DmsIntegrationTests.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ protected void process(String username, String password, boolean shouldBeFiltere
105105
assertThat(rootElements).hasSize(3);
106106
Directory homeDir = null;
107107
Directory nonHomeDir = null;
108-
for (int i = 0; i < rootElements.length; i++) {
109-
if (rootElements[i].getName().equals(username)) {
110-
homeDir = (Directory) rootElements[i];
108+
for (AbstractElement rootElement : rootElements) {
109+
if (rootElement.getName().equals(username)) {
110+
homeDir = (Directory) rootElement;
111111
}
112112
else {
113-
nonHomeDir = (Directory) rootElements[i];
113+
nonHomeDir = (Directory) rootElement;
114114
}
115115
}
116116
System.out.println("Home directory......: " + homeDir.getFullName());
@@ -135,9 +135,9 @@ protected void process(String username, String password, boolean shouldBeFiltere
135135
// Of course, we shouldn't find a "confidential" directory in the results if we're
136136
// filtering
137137
Directory nonHomeConfidentialDir = null;
138-
for (int i = 0; i < nonHomeElements.length; i++) {
139-
if (nonHomeElements[i].getName().equals("confidential")) {
140-
nonHomeConfidentialDir = (Directory) nonHomeElements[i];
138+
for (AbstractElement nonHomeElement : nonHomeElements) {
139+
if (nonHomeElement.getName().equals("confidential")) {
140+
nonHomeConfidentialDir = (Directory) nonHomeElement;
141141
}
142142
}
143143

web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ private void testDetails(String[] mappedRoles, String[] userRoles,
128128

129129
Collection<String> expectedRolesColl = Arrays.asList(expectedRoles);
130130
Collection<String> gasRolesSet = new HashSet<>();
131-
for (int i = 0; i < gas.size(); i++) {
132-
gasRolesSet.add(gas.get(i).getAuthority());
131+
for (GrantedAuthority grantedAuthority : gas) {
132+
gasRolesSet.add(grantedAuthority.getAuthority());
133133
}
134134
assertThat(expectedRolesColl.containsAll(gasRolesSet)
135135
&& gasRolesSet.containsAll(expectedRolesColl)).withFailMessage(

0 commit comments

Comments
 (0)