Skip to content

Commit f8583bb

Browse files
vpavicvpavic
committed
Add missing @Override 
1 parent 5df555c commit f8583bb

File tree

49 files changed

+273
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+273
-0
lines changed

‎docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ static class SecuritySessionDestroyedListener
8282
* @see org.springframework.context.ApplicationListener#onApplicationEvent(org.
8383
* springframework.context.ApplicationEvent)
8484
*/
85+
@Override
8586
public void onApplicationEvent(SessionDestroyedEvent event) {
8687
this.event = event;
8788
}

‎docs/src/test/java/docs/websocket/WebSocketConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
@EnableWebSocketMessageBroker
3333
public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
3434

35+
@Override
3536
public void registerStompEndpoints(StompEndpointRegistry registry) {
3637
registry.addEndpoint("/messages").withSockJS();
3738
}

‎samples/boot/findbyusername/src/main/java/sample/config/SecurityConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
public class SecurityConfig extends WebSecurityConfigurerAdapter {
3636

3737
@Bean
38+
@Override
3839
public UserDetailsService userDetailsService() {
3940
InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
4041
manager.createUser(

‎samples/boot/findbyusername/src/main/java/sample/session/SessionDetailsFilter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public SessionDetailsFilter(DatabaseReader reader) {
5757
}
5858

5959
// tag::dofilterinternal[]
60+
@Override
6061
public void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
6162
FilterChain chain) throws IOException, ServletException {
6263
chain.doFilter(request, response);

‎samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
public class SecurityConfig extends WebSecurityConfigurerAdapter {
3737

3838
@Bean
39+
@Override
3940
public UserDetailsService userDetailsService() {
4041
InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
4142
manager.createUser(

‎samples/boot/redis-json/src/main/java/sample/config/SecurityConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
public class SecurityConfig extends WebSecurityConfigurerAdapter {
3636

3737
@Bean
38+
@Override
3839
public UserDetailsService userDetailsService() {
3940
InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
4041
manager.createUser(

‎samples/boot/redis-json/src/main/java/sample/config/SessionConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ private ObjectMapper objectMapper() {
5656
* org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang
5757
* .ClassLoader)
5858
*/
59+
@Override
5960
public void setBeanClassLoader(ClassLoader classLoader) {
6061
this.loader = classLoader;
6162
}

‎samples/boot/redis/src/main/java/sample/config/SecurityConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
public class SecurityConfig extends WebSecurityConfigurerAdapter {
3636

3737
@Bean
38+
@Override
3839
public UserDetailsService userDetailsService() {
3940
InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
4041
manager.createUser(

‎samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
3636

3737
@Bean
38+
@Override
3839
public UserDetailsService userDetailsService() {
3940
InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
4041
manager.createUser(

‎samples/boot/websocket/src/main/java/sample/config/WebSocketConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@
3131
public class WebSocketConfig
3232
extends AbstractSessionWebSocketMessageBrokerConfigurer<Session> { // <1>
3333

34+
@Override
3435
protected void configureStompEndpoints(StompEndpointRegistry registry) { // <2>
3536
registry.addEndpoint("/messages").withSockJS();
3637
}
3738

39+
@Override
3840
public void configureMessageBroker(MessageBrokerRegistry registry) {
3941
registry.enableSimpleBroker("/queue/", "/topic/");
4042
registry.setApplicationDestinationPrefixes("/app");

‎samples/boot/websocket/src/main/java/sample/security/UserRepositoryUserDetailsService.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public UserRepositoryUserDetailsService(UserRepository userRepository) {
4949
* org.springframework.security.core.userdetails.UserDetailsService#loadUserByUsername
5050
* (java.lang.String)
5151
*/
52+
@Override
5253
public UserDetails loadUserByUsername(String username)
5354
throws UsernameNotFoundException {
5455
User user = this.userRepository.findByEmail(username);
@@ -64,26 +65,32 @@ private CustomUserDetails(User user) {
6465
super(user);
6566
}
6667

68+
@Override
6769
public Collection<? extends GrantedAuthority> getAuthorities() {
6870
return AuthorityUtils.createAuthorityList("ROLE_USER");
6971
}
7072

73+
@Override
7174
public String getUsername() {
7275
return getEmail();
7376
}
7477

78+
@Override
7579
public boolean isAccountNonExpired() {
7680
return true;
7781
}
7882

83+
@Override
7984
public boolean isAccountNonLocked() {
8085
return true;
8186
}
8287

88+
@Override
8389
public boolean isCredentialsNonExpired() {
8490
return true;
8591
}
8692

93+
@Override
8794
public boolean isEnabled() {
8895
return true;
8996
}

‎samples/boot/websocket/src/main/java/sample/websocket/WebSocketConnectHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public WebSocketConnectHandler(SimpMessageSendingOperations messagingTemplate,
4141
this.repository = repository;
4242
}
4343

44+
@Override
4445
public void onApplicationEvent(SessionConnectEvent event) {
4546
MessageHeaders headers = event.getMessage().getHeaders();
4647
Principal user = SimpMessageHeaderAccessor.getUser(headers);

‎samples/boot/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public WebSocketDisconnectHandler(SimpMessageSendingOperations messagingTemplate
3636
this.repository = repository;
3737
}
3838

39+
@Override
3940
public void onApplicationEvent(SessionDisconnectEvent event) {
4041
String id = event.getSessionId();
4142
if (id == null) {

‎samples/javaconfig/hazelcast/src/main/java/sample/ObjectStreamSerializer.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,20 @@
3636
*
3737
*/
3838
public class ObjectStreamSerializer implements StreamSerializer<Object> {
39+
@Override
3940
public int getTypeId() {
4041
return 2;
4142
}
4243

44+
@Override
4345
public void write(ObjectDataOutput objectDataOutput, Object object)
4446
throws IOException {
4547
ObjectOutputStream out = new ObjectOutputStream((OutputStream) objectDataOutput);
4648
out.writeObject(object);
4749
out.flush();
4850
}
4951

52+
@Override
5053
public Object read(ObjectDataInput objectDataInput) throws IOException {
5154
ObjectInputStream in = new ObjectInputStream((InputStream) objectDataInput);
5255
try {
@@ -57,6 +60,7 @@ public Object read(ObjectDataInput objectDataInput) throws IOException {
5760
}
5861
}
5962

63+
@Override
6064
public void destroy() {
6165
}
6266

‎samples/javaconfig/jdbc/src/main/java/sample/H2ConsoleInitializer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
public class H2ConsoleInitializer implements WebApplicationInitializer {
2626

27+
@Override
2728
public void onStartup(ServletContext servletContext) throws ServletException {
2829
servletContext.addServlet("h2Console", new WebServlet()).addMapping("/h2-console/*");
2930
}

‎samples/misc/hazelcast/src/main/java/sample/Initializer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public class Initializer implements ServletContextListener {
4343

4444
private HazelcastInstance instance;
4545

46+
@Override
4647
public void contextInitialized(ServletContextEvent sce) {
4748
this.instance = createHazelcastInstance();
4849
Map<String, Session> sessions = this.instance.getMap(SESSION_MAP_NAME);
@@ -55,6 +56,7 @@ public void contextInitialized(ServletContextEvent sce) {
5556
fr.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
5657
}
5758

59+
@Override
5860
public void contextDestroyed(ServletContextEvent sce) {
5961
this.instance.shutdown();
6062
}

‎spring-session-core/src/main/java/org/springframework/session/MapReactiveSessionRepository.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public void setDefaultMaxInactiveInterval(int defaultMaxInactiveInterval) {
7171
this.defaultMaxInactiveInterval = defaultMaxInactiveInterval;
7272
}
7373

74+
@Override
7475
public Mono<Void> save(MapSession session) {
7576
return Mono.fromRunnable(() -> {
7677
if (!session.getId().equals(session.getOriginalId())) {
@@ -81,6 +82,7 @@ public Mono<Void> save(MapSession session) {
8182
});
8283
}
8384

85+
@Override
8486
public Mono<MapSession> findById(String id) {
8587
// @formatter:off
8688
return Mono.defer(() -> Mono.justOrEmpty(this.sessions.get(id))
@@ -90,10 +92,12 @@ public Mono<MapSession> findById(String id) {
9092
// @formatter:on
9193
}
9294

95+
@Override
9396
public Mono<Void> deleteById(String id) {
9497
return Mono.fromRunnable(() -> this.sessions.remove(id));
9598
}
9699

100+
@Override
97101
public Mono<MapSession> createSession() {
98102
return Mono.defer(() -> {
99103
MapSession result = new MapSession();

‎spring-session-core/src/main/java/org/springframework/session/MapSession.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,17 @@ public MapSession(Session session) {
107107
this.maxInactiveInterval = session.getMaxInactiveInterval();
108108
}
109109

110+
@Override
110111
public void setLastAccessedTime(Instant lastAccessedTime) {
111112
this.lastAccessedTime = lastAccessedTime;
112113
}
113114

115+
@Override
114116
public Instant getCreationTime() {
115117
return this.creationTime;
116118
}
117119

120+
@Override
118121
public String getId() {
119122
return this.id;
120123
}
@@ -127,24 +130,29 @@ void setOriginalId(String originalId) {
127130
this.originalId = originalId;
128131
}
129132

133+
@Override
130134
public String changeSessionId() {
131135
String changedId = generateId();
132136
setId(changedId);
133137
return changedId;
134138
}
135139

140+
@Override
136141
public Instant getLastAccessedTime() {
137142
return this.lastAccessedTime;
138143
}
139144

145+
@Override
140146
public void setMaxInactiveInterval(Duration interval) {
141147
this.maxInactiveInterval = interval;
142148
}
143149

150+
@Override
144151
public Duration getMaxInactiveInterval() {
145152
return this.maxInactiveInterval;
146153
}
147154

155+
@Override
148156
public boolean isExpired() {
149157
return isExpired(Instant.now());
150158
}
@@ -156,15 +164,18 @@ boolean isExpired(Instant now) {
156164
return now.minus(this.maxInactiveInterval).compareTo(this.lastAccessedTime) >= 0;
157165
}
158166

167+
@Override
159168
@SuppressWarnings("unchecked")
160169
public <T> T getAttribute(String attributeName) {
161170
return (T) this.sessionAttrs.get(attributeName);
162171
}
163172

173+
@Override
164174
public Set<String> getAttributeNames() {
165175
return this.sessionAttrs.keySet();
166176
}
167177

178+
@Override
168179
public void setAttribute(String attributeName, Object attributeValue) {
169180
if (attributeValue == null) {
170181
removeAttribute(attributeName);
@@ -174,6 +185,7 @@ public void setAttribute(String attributeName, Object attributeValue) {
174185
}
175186
}
176187

188+
@Override
177189
public void removeAttribute(String attributeName) {
178190
this.sessionAttrs.remove(attributeName);
179191
}
@@ -198,10 +210,12 @@ public void setId(String id) {
198210
this.id = id;
199211
}
200212

213+
@Override
201214
public boolean equals(Object obj) {
202215
return obj instanceof Session && this.id.equals(((Session) obj).getId());
203216
}
204217

218+
@Override
205219
public int hashCode() {
206220
return this.id.hashCode();
207221
}

‎spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public void setDefaultMaxInactiveInterval(int defaultMaxInactiveInterval) {
6969
this.defaultMaxInactiveInterval = defaultMaxInactiveInterval;
7070
}
7171

72+
@Override
7273
public void save(MapSession session) {
7374
if (!session.getId().equals(session.getOriginalId())) {
7475
this.sessions.remove(session.getOriginalId());
@@ -77,6 +78,7 @@ public void save(MapSession session) {
7778
this.sessions.put(session.getId(), new MapSession(session));
7879
}
7980

81+
@Override
8082
public MapSession findById(String id) {
8183
Session saved = this.sessions.get(id);
8284
if (saved == null) {
@@ -89,10 +91,12 @@ public MapSession findById(String id) {
8991
return new MapSession(saved);
9092
}
9193

94+
@Override
9295
public void deleteById(String id) {
9396
this.sessions.remove(id);
9497
}
9598

99+
@Override
96100
public MapSession createSession() {
97101
MapSession result = new MapSession();
98102
if (this.defaultMaxInactiveInterval != null) {

‎spring-session-core/src/main/java/org/springframework/session/security/SpringSessionBackedSessionRegistry.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,14 @@ public SpringSessionBackedSessionRegistry(
5555
this.sessionRepository = sessionRepository;
5656
}
5757

58+
@Override
5859
public List<Object> getAllPrincipals() {
5960
throw new UnsupportedOperationException("SpringSessionBackedSessionRegistry does "
6061
+ "not support retrieving all principals, since Spring Session provides "
6162
+ "no way to obtain that information");
6263
}
6364

65+
@Override
6466
public List<SessionInformation> getAllSessions(Object principal,
6567
boolean includeExpiredSessions) {
6668
Collection<S> sessions = this.sessionRepository.findByIndexNameAndIndexValue(
@@ -77,6 +79,7 @@ public List<SessionInformation> getAllSessions(Object principal,
7779
return infos;
7880
}
7981

82+
@Override
8083
public SessionInformation getSessionInformation(String sessionId) {
8184
S session = this.sessionRepository.findById(sessionId);
8285
if (session != null) {
@@ -89,18 +92,21 @@ public SessionInformation getSessionInformation(String sessionId) {
8992
/*
9093
* This is a no-op, as we don't administer sessions ourselves.
9194
*/
95+
@Override
9296
public void refreshLastRequest(String sessionId) {
9397
}
9498

9599
/*
96100
* This is a no-op, as we don't administer sessions ourselves.
97101
*/
102+
@Override
98103
public void registerNewSession(String sessionId, Object principal) {
99104
}
100105

101106
/*
102107
* This is a no-op, as we don't administer sessions ourselves.
103108
*/
109+
@Override
104110
public void removeSessionInformation(String sessionId) {
105111
}
106112

0 commit comments

Comments
 (0)