Spring/spring-data-examples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Java 16 migration for Geode examples.

Browse Source 
See #606.
This commit is contained in:
Mark Paluch
2021-04-29 11:16:44 +02:00
parent 88aabe89e2
commit 6913f7ec5f
29 changed files with 74 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
geode/security/src/main/java/example/springdata/geode/client/security/User.java
View File

@@ -84,7 +84,7 @@ public class User implements Comparable<User>, Cloneable, Principal, Serializabl
* @see ResourcePermission
*/
public boolean hasPermission(ResourcePermission permission) {
for (Role role : roles) {
for (var role : roles) {
if (role.hasPermission(permission)) {
return true;
}

2
geode/security/src/main/java/example/springdata/geode/client/security/server/CachingSecurityRepository.java
View File

@@ -48,7 +48,7 @@ public abstract class CachingSecurityRepository implements SecurityRepository {
@Override
public User save(User user) {
User putUser = users.put(user.getName(), user);
var putUser = users.put(user.getName(), user);
return putUser != null ? putUser : user;
}
}

6
geode/security/src/main/java/example/springdata/geode/client/security/server/JdbcSecurityRepository.java
View File

@@ -54,8 +54,8 @@ public class JdbcSecurityRepository extends CachingSecurityRepository implements
public void afterPropertiesSet() {
List<Role> roles = this.jdbcTemplate.query(ROLES_QUERY, (resultSet, i) -> Role.newRole(resultSet.getString(1)));
HashMap<String, Role> roleMapping = new HashMap<>(roles.size());
var roles = this.jdbcTemplate.query(ROLES_QUERY, (resultSet, i) -> Role.newRole(resultSet.getString(1)));
var roleMapping = new HashMap<String, Role>(roles.size());
roles.forEach((role) -> {
this.jdbcTemplate.query(ROLE_PERMISSIONS_QUERY, Collections.singleton(role.getName()).toArray(),
@@ -65,7 +65,7 @@ public class JdbcSecurityRepository extends CachingSecurityRepository implements
roleMapping.put(role.getName(), role);
});
List<User> users = this.jdbcTemplate.query(USERS_QUERY,
var users = this.jdbcTemplate.query(USERS_QUERY,
(resultSet, i) -> createUser(resultSet.getString(1)).withCredentials(resultSet.getString(2)));
users.forEach((role) -> {

12
geode/security/src/main/java/example/springdata/geode/client/security/server/SecurityRepository.java
View File

@@ -64,9 +64,9 @@ public interface SecurityRepository {
/* (non-Javadoc) */
default int count() {
int count = 0;
Iterable<User> users = findAll();
for (User user : users) {
var count = 0;
var users = findAll();
for (var user : users) {
count++;
}
return count;
@@ -79,7 +79,7 @@ public interface SecurityRepository {
/* (non-Javadoc) */
default boolean delete(String username) {
User user = findBy(username);
var user = findBy(username);
if (user != null) {
return delete(user);
}
@@ -98,7 +98,7 @@ public interface SecurityRepository {
/* (non-Javadoc) */
default boolean deleteAll(Iterable<User> users) {
for (User user : users) {
for (var user : users) {
if (!delete(user)) {
return false;
}
@@ -134,7 +134,7 @@ public interface SecurityRepository {
/* (non-Javadoc) */
default User findBy(String username) {
for (User user : findAll()) {
for (var user : findAll()) {
if (user.getName().equals(username)) {
return user;
}

8
geode/security/src/main/java/example/springdata/geode/client/security/server/SimpleSecurityManager.java
View File

@@ -53,12 +53,12 @@ public class SimpleSecurityManager extends SecurityManagerSupport {
*/
@Override
public Object authenticate(Properties securityProperties) {
String username = getUsername(securityProperties);
String password = getPassword(securityProperties);
var username = getUsername(securityProperties);
var password = getPassword(securityProperties);
logDebug("User with name [{}] is attempting to login with password [{}]", username, password);
User user = securityRepository.findBy(username);
var user = securityRepository.findBy(username);
if (isNotAuthentic(user, password)) {
throw new AuthenticationFailedException(String.format("Failed to authenticate user [%s]", username));
@@ -90,7 +90,7 @@ public class SimpleSecurityManager extends SecurityManagerSupport {
/* (non-Javadoc) */
protected boolean isAuthorized(Object principal, ResourcePermission permission) {
User user = resolveUser(principal);
var user = resolveUser(principal);
return user != null && isAuthorized(user, permission);
}

8
geode/security/src/test/java/example/springdata/geode/client/security/client/SecurityEnabledClientShiroTests.java
View File

@@ -61,9 +61,9 @@ public class SecurityEnabledClientShiroTests extends ForkingClientServerIntegrat
log.info("Inserting 3 entries for keys: 1, 2, 3");
Customer john = new Customer(1L, new EmailAddress("2@2.com"), "John", "Smith");
Customer frank = new Customer(2L, new EmailAddress("3@3.com"), "Frank", "Lamport");
Customer jude = new Customer(3L, new EmailAddress("5@5.com"), "Jude", "Simmons");
var john = new Customer(1L, new EmailAddress("2@2.com"), "John", "Smith");
var frank = new Customer(2L, new EmailAddress("3@3.com"), "Frank", "Lamport");
var jude = new Customer(3L, new EmailAddress("5@5.com"), "Jude", "Simmons");
customerRepository.save(john);
customerRepository.save(frank);
@@ -72,7 +72,7 @@ public class SecurityEnabledClientShiroTests extends ForkingClientServerIntegrat
assertThat(customers.keySetOnServer().size()).isEqualTo(3);
log.info("Customers saved on server:");
List<Customer> customerList = customerRepository.findAll();
var customerList = customerRepository.findAll();
assertThat(customerList.size()).isEqualTo(3);
assertThat(customerList.contains(john)).isTrue();

8
geode/security/src/test/java/example/springdata/geode/client/security/client/SecurityEnabledClientTests.java
View File

@@ -61,9 +61,9 @@ public class SecurityEnabledClientTests extends ForkingClientServerIntegrationTe
log.info("Inserting 3 entries for keys: 1, 2, 3");
Customer john = new Customer(1L, new EmailAddress("2@2.com"), "John", "Smith");
Customer frank = new Customer(2L, new EmailAddress("3@3.com"), "Frank", "Lamport");
Customer jude = new Customer(3L, new EmailAddress("5@5.com"), "Jude", "Simmons");
var john = new Customer(1L, new EmailAddress("2@2.com"), "John", "Smith");
var frank = new Customer(2L, new EmailAddress("3@3.com"), "Frank", "Lamport");
var jude = new Customer(3L, new EmailAddress("5@5.com"), "Jude", "Simmons");
customerRepository.save(john);
customerRepository.save(frank);
@@ -73,7 +73,7 @@ public class SecurityEnabledClientTests extends ForkingClientServerIntegrationTe
log.info("Customers saved on server:");
List<Customer> customerList = customerRepository.findAll();
var customerList = customerRepository.findAll();
assertThat(customerList.size()).isEqualTo(3);
assertThat(customerList.contains(john)).isTrue();