From 94d45c7361daf473ab1a193a103b6272c046d4ce Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Fri, 17 Aug 2018 13:42:37 +0200 Subject: [PATCH 1/2] Start building against Spring Session Bean M2 snapshots See gh-14123 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 500a772cff..0c3cabfc5d 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -166,7 +166,7 @@ 2.0.2.RELEASE 1.2.2.RELEASE 5.1.0.BUILD-SNAPSHOT - Bean-M1 + Bean-BUILD-SNAPSHOT 3.0.3.RELEASE 3.23.1 3.1.0 From 644ab5f3e4319610632b60cbbc4f9141f3ba3470 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Fri, 17 Aug 2018 18:04:38 +0200 Subject: [PATCH 2/2] Align SessionsEndpoint with Spring Session API improvements This commit aligns SessionsEndpoint with FindByIndexNameSessionRepository API improvements that simplifies retrieval of sessions by principal name. Closes gh-14124 --- .../SessionsEndpointDocumentationTests.java | 4 +--- .../boot/actuate/session/SessionsEndpoint.java | 4 +--- .../boot/actuate/session/SessionsEndpointTests.java | 5 ++--- .../session/SessionsEndpointWebIntegrationTests.java | 11 ++++------- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java index 08293bde75..ad94c8ab7a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/SessionsEndpointDocumentationTests.java @@ -89,9 +89,7 @@ public class SessionsEndpointDocumentationTests sessions.put(sessionOne.getId(), sessionOne); sessions.put(sessionTwo.getId(), sessionTwo); sessions.put(sessionThree.getId(), sessionThree); - given(this.sessionRepository.findByIndexNameAndIndexValue( - FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, "alice")) - .willReturn(sessions); + given(this.sessionRepository.findByPrincipalName("alice")).willReturn(sessions); this.mockMvc.perform(get("/actuator/sessions").param("username", "alice")) .andExpect(status().isOk()) .andDo(document("sessions/username", diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/session/SessionsEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/session/SessionsEndpoint.java index 33e2ec43cf..a636429f12 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/session/SessionsEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/session/SessionsEndpoint.java @@ -52,9 +52,7 @@ public class SessionsEndpoint { @ReadOperation public SessionsReport sessionsForUsername(String username) { Map sessions = this.sessionRepository - .findByIndexNameAndIndexValue( - FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, - username); + .findByPrincipalName(username); return new SessionsReport(sessions); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointTests.java index a2d84eba2d..d033bfe336 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointTests.java @@ -48,9 +48,8 @@ public class SessionsEndpointTests { @Test public void sessionsForUsername() { - given(this.repository.findByIndexNameAndIndexValue( - FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, "user")) - .willReturn(Collections.singletonMap(session.getId(), session)); + given(this.repository.findByPrincipalName("user")) + .willReturn(Collections.singletonMap(session.getId(), session)); List result = this.endpoint.sessionsForUsername("user") .getSessions(); assertThat(result).hasSize(1); diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java index 6143118876..3ef535899b 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,9 +58,7 @@ public class SessionsEndpointWebIntegrationTests { @Test public void sessionsForUsernameNoResults() { - given(repository.findByIndexNameAndIndexValue( - FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, "user")) - .willReturn(Collections.emptyMap()); + given(repository.findByPrincipalName("user")).willReturn(Collections.emptyMap()); client.get() .uri((builder) -> builder.path("/actuator/sessions") .queryParam("username", "user").build()) @@ -70,9 +68,8 @@ public class SessionsEndpointWebIntegrationTests { @Test public void sessionsForUsernameFound() { - given(repository.findByIndexNameAndIndexValue( - FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, "user")) - .willReturn(Collections.singletonMap(session.getId(), session)); + given(repository.findByPrincipalName("user")) + .willReturn(Collections.singletonMap(session.getId(), session)); client.get() .uri((builder) -> builder.path("/actuator/sessions") .queryParam("username", "user").build())