From d9c1f03b84b919e34d0920b23b2cb27d9ea6b5d6 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Fri, 9 Aug 2019 00:42:35 +0200 Subject: [PATCH] Unnecessary interface modifier --- .../security/access/annotation/Secured.java | 2 +- .../hierarchicalroles/RoleHierarchy.java | 2 +- .../method/MethodSecurityMetadataSource.java | 2 +- .../security/access/prepost/PostAuthorize.java | 2 +- .../security/access/prepost/PostFilter.java | 2 +- .../security/access/prepost/PreFilter.java | 4 ++-- .../security/core/ComparableVersion.java | 6 +++--- .../Attributes2GrantedAuthoritiesMapper.java | 2 +- .../servlet/preface/java-configuration.adoc | 18 ++++++------------ .../_includes/servlet/preface/namespace.adoc | 18 ++++++------------ .../security/integration/UserRepository.java | 2 +- .../integration/python/TestService.java | 2 +- .../security/openid/OpenIDConsumer.java | 6 +++--- .../security/remoting/dns/DnsResolver.java | 6 +++--- .../remoting/dns/InitialContextFactory.java | 2 +- .../main/java/sample/contact/ContactDao.java | 14 +++++++------- .../java/sample/contact/ContactManager.java | 16 ++++++++-------- .../src/main/java/sample/dms/DocumentDao.java | 8 ++++---- .../sample/dms/secured/SecureDocumentDao.java | 2 +- .../src/main/java/bigbank/BankDao.java | 6 +++--- .../src/main/java/bigbank/BankService.java | 6 +++--- .../WebInvocationPrivilegeEvaluator.java | 6 +++--- .../servletapi/HttpServletRequestFactory.java | 4 ++-- 23 files changed, 63 insertions(+), 75 deletions(-) diff --git a/core/src/main/java/org/springframework/security/access/annotation/Secured.java b/core/src/main/java/org/springframework/security/access/annotation/Secured.java index 5afc7c9880..28d509ed16 100644 --- a/core/src/main/java/org/springframework/security/access/annotation/Secured.java +++ b/core/src/main/java/org/springframework/security/access/annotation/Secured.java @@ -55,5 +55,5 @@ public @interface Secured { * * @return String[] The secure method attributes */ - public String[] value(); + String[] value(); } diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java index bd9915af0d..5ab09dda7b 100755 --- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java +++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java @@ -40,7 +40,7 @@ public interface RoleHierarchy { * @param authorities - List of the directly assigned authorities. * @return List of all reachable authorities given the assigned authorities. */ - public Collection getReachableGrantedAuthorities( + Collection getReachableGrantedAuthorities( Collection authorities); } diff --git a/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java index 4a47d183b5..adfc739ed7 100644 --- a/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java @@ -29,5 +29,5 @@ import org.springframework.security.access.SecurityMetadataSource; * @author Ben Alex */ public interface MethodSecurityMetadataSource extends SecurityMetadataSource { - public Collection getAttributes(Method method, Class targetClass); + Collection getAttributes(Method method, Class targetClass); } diff --git a/core/src/main/java/org/springframework/security/access/prepost/PostAuthorize.java b/core/src/main/java/org/springframework/security/access/prepost/PostAuthorize.java index 80936dd5d1..18e5abe644 100644 --- a/core/src/main/java/org/springframework/security/access/prepost/PostAuthorize.java +++ b/core/src/main/java/org/springframework/security/access/prepost/PostAuthorize.java @@ -38,5 +38,5 @@ public @interface PostAuthorize { * @return the Spring-EL expression to be evaluated after invoking the protected * method */ - public String value(); + String value(); } diff --git a/core/src/main/java/org/springframework/security/access/prepost/PostFilter.java b/core/src/main/java/org/springframework/security/access/prepost/PostFilter.java index 24c164f2b0..73efa4ad3b 100644 --- a/core/src/main/java/org/springframework/security/access/prepost/PostFilter.java +++ b/core/src/main/java/org/springframework/security/access/prepost/PostFilter.java @@ -38,5 +38,5 @@ public @interface PostFilter { * @return the Spring-EL expression to be evaluated after invoking the protected * method */ - public String value(); + String value(); } diff --git a/core/src/main/java/org/springframework/security/access/prepost/PreFilter.java b/core/src/main/java/org/springframework/security/access/prepost/PreFilter.java index 4343b0b562..0432936576 100644 --- a/core/src/main/java/org/springframework/security/access/prepost/PreFilter.java +++ b/core/src/main/java/org/springframework/security/access/prepost/PreFilter.java @@ -50,12 +50,12 @@ public @interface PreFilter { * @return the Spring-EL expression to be evaluated before invoking the protected * method */ - public String value(); + String value(); /** * @return the name of the parameter which should be filtered (must be a non-null * collection instance) If the method contains a single collection argument, then this * attribute can be omitted. */ - public String filterTarget() default ""; + String filterTarget() default ""; } diff --git a/core/src/main/java/org/springframework/security/core/ComparableVersion.java b/core/src/main/java/org/springframework/security/core/ComparableVersion.java index 9be62fc8e0..a55c511c17 100644 --- a/core/src/main/java/org/springframework/security/core/ComparableVersion.java +++ b/core/src/main/java/org/springframework/security/core/ComparableVersion.java @@ -92,9 +92,9 @@ class ComparableVersion implements Comparable { private ListItem items; private interface Item { - final int INTEGER_ITEM = 0; - final int STRING_ITEM = 1; - final int LIST_ITEM = 2; + int INTEGER_ITEM = 0; + int STRING_ITEM = 1; + int LIST_ITEM = 2; int compareTo(Item item); diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java index 4782038e13..a375df225d 100755 --- a/core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java +++ b/core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java @@ -37,6 +37,6 @@ public interface Attributes2GrantedAuthoritiesMapper { * @param attributes the attributes to be mapped * @return the collection of authorities created from the attributes */ - public Collection getGrantedAuthorities( + Collection getGrantedAuthorities( Collection attributes); } diff --git a/docs/manual/src/docs/asciidoc/_includes/servlet/preface/java-configuration.adoc b/docs/manual/src/docs/asciidoc/_includes/servlet/preface/java-configuration.adoc index 963de30584..05426f94b3 100644 --- a/docs/manual/src/docs/asciidoc/_includes/servlet/preface/java-configuration.adoc +++ b/docs/manual/src/docs/asciidoc/_includes/servlet/preface/java-configuration.adoc @@ -1165,14 +1165,11 @@ These will be passed to the AccessDecisionManager for it to make the actual deci ---- public interface BankService { -@Secured("IS_AUTHENTICATED_ANONYMOUSLY") -public Account readAccount(Long id); +@Secured("IS_AUTHENTICATED_ANONYMOUSLY") Account readAccount(Long id); -@Secured("IS_AUTHENTICATED_ANONYMOUSLY") -public Account[] findAccounts(); +@Secured("IS_AUTHENTICATED_ANONYMOUSLY") Account[] findAccounts(); -@Secured("ROLE_TELLER") -public Account post(Account account, double amount); +@Secured("ROLE_TELLER") Account post(Account account, double amount); } ---- @@ -1203,14 +1200,11 @@ and the equivalent Java code would be ---- public interface BankService { -@PreAuthorize("isAnonymous()") -public Account readAccount(Long id); +@PreAuthorize("isAnonymous()") Account readAccount(Long id); -@PreAuthorize("isAnonymous()") -public Account[] findAccounts(); +@PreAuthorize("isAnonymous()") Account[] findAccounts(); -@PreAuthorize("hasAuthority('ROLE_TELLER')") -public Account post(Account account, double amount); +@PreAuthorize("hasAuthority('ROLE_TELLER')") Account post(Account account, double amount); } ---- diff --git a/docs/manual/src/docs/asciidoc/_includes/servlet/preface/namespace.adoc b/docs/manual/src/docs/asciidoc/_includes/servlet/preface/namespace.adoc index ff49f69556..12d60be09d 100644 --- a/docs/manual/src/docs/asciidoc/_includes/servlet/preface/namespace.adoc +++ b/docs/manual/src/docs/asciidoc/_includes/servlet/preface/namespace.adoc @@ -763,14 +763,11 @@ These will be passed to the `AccessDecisionManager` for it to make the actual de ---- public interface BankService { -@Secured("IS_AUTHENTICATED_ANONYMOUSLY") -public Account readAccount(Long id); +@Secured("IS_AUTHENTICATED_ANONYMOUSLY") Account readAccount(Long id); -@Secured("IS_AUTHENTICATED_ANONYMOUSLY") -public Account[] findAccounts(); +@Secured("IS_AUTHENTICATED_ANONYMOUSLY") Account[] findAccounts(); -@Secured("ROLE_TELLER") -public Account post(Account account, double amount); +@Secured("ROLE_TELLER") Account post(Account account, double amount); } ---- @@ -795,14 +792,11 @@ and the equivalent Java code would be ---- public interface BankService { -@PreAuthorize("isAnonymous()") -public Account readAccount(Long id); +@PreAuthorize("isAnonymous()") Account readAccount(Long id); -@PreAuthorize("isAnonymous()") -public Account[] findAccounts(); +@PreAuthorize("isAnonymous()") Account[] findAccounts(); -@PreAuthorize("hasAuthority('ROLE_TELLER')") -public Account post(Account account, double amount); +@PreAuthorize("hasAuthority('ROLE_TELLER')") Account post(Account account, double amount); } ---- diff --git a/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java b/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java index 3a73424a97..4d76711c8e 100755 --- a/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java +++ b/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java @@ -17,6 +17,6 @@ package org.springframework.security.integration; public interface UserRepository { - public void doSomething(); + void doSomething(); } diff --git a/itest/context/src/main/java/org/springframework/security/integration/python/TestService.java b/itest/context/src/main/java/org/springframework/security/integration/python/TestService.java index 9aedc9ba44..7bc9b50628 100644 --- a/itest/context/src/main/java/org/springframework/security/integration/python/TestService.java +++ b/itest/context/src/main/java/org/springframework/security/integration/python/TestService.java @@ -20,6 +20,6 @@ import org.springframework.security.access.prepost.PreAuthorize; public interface TestService { @PreAuthorize("someMethod.py") - public void someMethod(); + void someMethod(); } diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java index aa70565ff6..ed57b1256c 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java @@ -36,10 +36,10 @@ public interface OpenIDConsumer { * @return String URI to redirect user to for authentication * @throws OpenIDConsumerException if anything bad happens */ - public String beginConsumption(HttpServletRequest req, String claimedIdentity, - String returnToUrl, String realm) throws OpenIDConsumerException; + String beginConsumption(HttpServletRequest req, String claimedIdentity, + String returnToUrl, String realm) throws OpenIDConsumerException; - public OpenIDAuthenticationToken endConsumption(HttpServletRequest req) + OpenIDAuthenticationToken endConsumption(HttpServletRequest req) throws OpenIDConsumerException; } diff --git a/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java b/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java index f5d689cc59..1bed997ea0 100644 --- a/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java +++ b/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java @@ -33,7 +33,7 @@ public interface DnsResolver { * @throws DnsEntryNotFoundException No record found * @throws DnsLookupException Unknown DNS error */ - public String resolveIpAddress(String hostname) throws DnsEntryNotFoundException, + String resolveIpAddress(String hostname) throws DnsEntryNotFoundException, DnsLookupException; /** @@ -65,7 +65,7 @@ public interface DnsResolver { * @throws DnsEntryNotFoundException No record found * @throws DnsLookupException Unknown DNS error */ - public String resolveServiceEntry(String serviceType, String domain) + String resolveServiceEntry(String serviceType, String domain) throws DnsEntryNotFoundException, DnsLookupException; /** @@ -80,7 +80,7 @@ public interface DnsResolver { * @see #resolveServiceEntry(String, String) * @see #resolveIpAddress(String) */ - public String resolveServiceIpAddress(String serviceType, String domain) + String resolveServiceIpAddress(String serviceType, String domain) throws DnsEntryNotFoundException, DnsLookupException; } diff --git a/remoting/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java b/remoting/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java index 42132a0c2a..4169c8a739 100644 --- a/remoting/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java +++ b/remoting/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java @@ -34,6 +34,6 @@ public interface InitialContextFactory { * Must return a DirContext which can be used for DNS queries * @return JNDI DirContext */ - public DirContext getCtx(); + DirContext getCtx(); } diff --git a/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java b/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java index cf311f421d..c882e2856b 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java +++ b/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java @@ -27,17 +27,17 @@ public interface ContactDao { // ~ Methods // ======================================================================================================== - public void create(Contact contact); + void create(Contact contact); - public void delete(Long contactId); + void delete(Long contactId); - public List findAll(); + List findAll(); - public List findAllPrincipals(); + List findAllPrincipals(); - public List findAllRoles(); + List findAllRoles(); - public Contact getById(Long id); + Contact getById(Long id); - public void update(Contact contact); + void update(Contact contact); } diff --git a/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java b/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java index 624f0f7503..924df446d2 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java +++ b/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java @@ -31,27 +31,27 @@ public interface ContactManager { // ~ Methods // ======================================================================================================== @PreAuthorize("hasPermission(#contact, admin)") - public void addPermission(Contact contact, Sid recipient, Permission permission); + void addPermission(Contact contact, Sid recipient, Permission permission); @PreAuthorize("hasPermission(#contact, admin)") - public void deletePermission(Contact contact, Sid recipient, Permission permission); + void deletePermission(Contact contact, Sid recipient, Permission permission); @PreAuthorize("hasRole('ROLE_USER')") - public void create(Contact contact); + void create(Contact contact); @PreAuthorize("hasPermission(#contact, 'delete') or hasPermission(#contact, admin)") - public void delete(Contact contact); + void delete(Contact contact); @PreAuthorize("hasRole('ROLE_USER')") @PostFilter("hasPermission(filterObject, 'read') or hasPermission(filterObject, admin)") - public List getAll(); + List getAll(); @PreAuthorize("hasRole('ROLE_USER')") - public List getAllRecipients(); + List getAllRecipients(); @PreAuthorize("hasPermission(#id, 'sample.contact.Contact', read) or " + "hasPermission(#id, 'sample.contact.Contact', admin)") - public Contact getById(Long id); + Contact getById(Long id); - public Contact getRandomContact(); + Contact getRandomContact(); } diff --git a/samples/xml/dms/src/main/java/sample/dms/DocumentDao.java b/samples/xml/dms/src/main/java/sample/dms/DocumentDao.java index 13b8938146..46d27f4f56 100755 --- a/samples/xml/dms/src/main/java/sample/dms/DocumentDao.java +++ b/samples/xml/dms/src/main/java/sample/dms/DocumentDao.java @@ -27,21 +27,21 @@ public interface DocumentDao { * @param element an unsaved element (the "id" will be updated after method is * invoked) */ - public void create(AbstractElement element); + void create(AbstractElement element); /** * Removes a file from the database for the specified element. * * @param file the file to remove (cannot be null) */ - public void delete(File file); + void delete(File file); /** * Modifies a file in the database. * * @param file the file to update (cannot be null) */ - public void update(File file); + void update(File file); /** * Locates elements in the database which appear under the presented directory @@ -51,5 +51,5 @@ public interface DocumentDao { * @return zero or more elements in the directory (an empty array may be returned - * never null) */ - public AbstractElement[] findElements(Directory directory); + AbstractElement[] findElements(Directory directory); } diff --git a/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDao.java b/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDao.java index 1f32b7fb6d..004e33c298 100755 --- a/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDao.java +++ b/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDao.java @@ -27,5 +27,5 @@ public interface SecureDocumentDao extends DocumentDao { /** * @return all the usernames existing in the system. */ - public String[] getUsers(); + String[] getUsers(); } diff --git a/samples/xml/tutorial/src/main/java/bigbank/BankDao.java b/samples/xml/tutorial/src/main/java/bigbank/BankDao.java index 0b7d9262bf..4411896ee2 100644 --- a/samples/xml/tutorial/src/main/java/bigbank/BankDao.java +++ b/samples/xml/tutorial/src/main/java/bigbank/BankDao.java @@ -16,9 +16,9 @@ package bigbank; public interface BankDao { - public Account readAccount(Long id); + Account readAccount(Long id); - public void createOrUpdateAccount(Account account); + void createOrUpdateAccount(Account account); - public Account[] findAccounts(); + Account[] findAccounts(); } diff --git a/samples/xml/tutorial/src/main/java/bigbank/BankService.java b/samples/xml/tutorial/src/main/java/bigbank/BankService.java index ed0eed0d29..d9558e27d3 100644 --- a/samples/xml/tutorial/src/main/java/bigbank/BankService.java +++ b/samples/xml/tutorial/src/main/java/bigbank/BankService.java @@ -19,11 +19,11 @@ import org.springframework.security.access.prepost.PreAuthorize; public interface BankService { - public Account readAccount(Long id); + Account readAccount(Long id); - public Account[] findAccounts(); + Account[] findAccounts(); @PreAuthorize("hasRole('supervisor') or " + "hasRole('teller') and (#account.balance + #amount >= -#account.overdraft)") - public Account post(Account account, double amount); + Account post(Account account, double amount); } diff --git a/web/src/main/java/org/springframework/security/web/access/WebInvocationPrivilegeEvaluator.java b/web/src/main/java/org/springframework/security/web/access/WebInvocationPrivilegeEvaluator.java index 851e1a54aa..15003a50e2 100644 --- a/web/src/main/java/org/springframework/security/web/access/WebInvocationPrivilegeEvaluator.java +++ b/web/src/main/java/org/springframework/security/web/access/WebInvocationPrivilegeEvaluator.java @@ -33,7 +33,7 @@ public interface WebInvocationPrivilegeEvaluator { * @param uri the URI excluding the context path (a default context path setting will * be used) */ - public boolean isAllowed(String uri, Authentication authentication); + boolean isAllowed(String uri, Authentication authentication); /** * Determines whether the user represented by the supplied Authentication @@ -52,6 +52,6 @@ public interface WebInvocationPrivilegeEvaluator { * be used in evaluation whether access should be granted. * @return true if access is allowed, false if denied */ - public boolean isAllowed(String contextPath, String uri, String method, - Authentication authentication); + boolean isAllowed(String contextPath, String uri, String method, + Authentication authentication); } diff --git a/web/src/main/java/org/springframework/security/web/servletapi/HttpServletRequestFactory.java b/web/src/main/java/org/springframework/security/web/servletapi/HttpServletRequestFactory.java index 48a38c6ff2..43b165685c 100644 --- a/web/src/main/java/org/springframework/security/web/servletapi/HttpServletRequestFactory.java +++ b/web/src/main/java/org/springframework/security/web/servletapi/HttpServletRequestFactory.java @@ -34,6 +34,6 @@ interface HttpServletRequestFactory { * @param response the original {@link HttpServletResponse}. Cannot be null. * @return a non-null HttpServletRequest */ - public HttpServletRequest create(HttpServletRequest request, - HttpServletResponse response); + HttpServletRequest create(HttpServletRequest request, + HttpServletResponse response); }