Skip to content
Snippets Groups Projects
Commit 7d9b10ab authored by Arnaud LABOUREL's avatar Arnaud LABOUREL
Browse files

Changed method name for StorageService.java

parent b19af8db
No related branches found
No related tags found
No related merge requests found
...@@ -3,5 +3,5 @@ package fr.univ_amu.m1info.service; ...@@ -3,5 +3,5 @@ package fr.univ_amu.m1info.service;
import java.util.Optional; import java.util.Optional;
public interface StorageService { public interface StorageService {
Optional<String> get(int key); Optional<String> getResource(int key);
} }
...@@ -28,7 +28,7 @@ public class SimpleAccessService implements AccessService { ...@@ -28,7 +28,7 @@ public class SimpleAccessService implements AccessService {
return new Response(null, Response.HttpCode.UNAUTHORIZED); return new Response(null, Response.HttpCode.UNAUTHORIZED);
if (!securityPolicyService.accessIsGrantedForResource(authToken.get(), key)) if (!securityPolicyService.accessIsGrantedForResource(authToken.get(), key))
return new Response(null, Response.HttpCode.FORBIDDEN); return new Response(null, Response.HttpCode.FORBIDDEN);
Optional<String> resource = storageService.get(key); Optional<String> resource = storageService.getResource(key);
return resource.map(s -> new Response(s, Response.HttpCode.OK)) return resource.map(s -> new Response(s, Response.HttpCode.OK))
.orElseGet(() -> new Response(null, Response.HttpCode.NOT_FOUND)); .orElseGet(() -> new Response(null, Response.HttpCode.NOT_FOUND));
} }
......
...@@ -16,7 +16,7 @@ public class SimpleStorageService implements StorageService { ...@@ -16,7 +16,7 @@ public class SimpleStorageService implements StorageService {
} }
@Override @Override
public Optional<String> get(int key) { public Optional<String> getResource(int key) {
return resourcesById.containsKey(key) ? Optional.of(resourcesById.get(key)) : Optional.empty(); return resourcesById.containsKey(key) ? Optional.of(resourcesById.get(key)) : Optional.empty();
} }
} }
...@@ -26,7 +26,7 @@ public class SimpleAccessService implements AccessService { ...@@ -26,7 +26,7 @@ public class SimpleAccessService implements AccessService {
return new Response(null, Response.HttpCode.UNAUTHORIZED); return new Response(null, Response.HttpCode.UNAUTHORIZED);
if (!securityPolicyService.accessIsGrantedForResource(authToken.get(), key)) if (!securityPolicyService.accessIsGrantedForResource(authToken.get(), key))
return new Response(null, Response.HttpCode.FORBIDDEN); return new Response(null, Response.HttpCode.FORBIDDEN);
Optional<String> resource = storageService.get(key); Optional<String> resource = storageService.getResource(key);
return resource.map(s -> new Response(s, Response.HttpCode.OK)) return resource.map(s -> new Response(s, Response.HttpCode.OK))
.orElseGet(() -> new Response(null, Response.HttpCode.NOT_FOUND)); .orElseGet(() -> new Response(null, Response.HttpCode.NOT_FOUND));
} }
......
...@@ -38,12 +38,12 @@ public class MockitoSimpleAccessServiceTest { ...@@ -38,12 +38,12 @@ public class MockitoSimpleAccessServiceTest {
Mockito.doReturn(Boolean.TRUE).when(policy) Mockito.doReturn(Boolean.TRUE).when(policy)
.accessIsGrantedForResource(authToken, KEY); .accessIsGrantedForResource(authToken, KEY);
Mockito.doReturn(Optional.of(RESOURCE)).when(storage) Mockito.doReturn(Optional.of(RESOURCE)).when(storage)
.get(KEY); .getResource(KEY);
assertThat(accessService.getResource(LOGIN, PASSWORD, KEY)) assertThat(accessService.getResource(LOGIN, PASSWORD, KEY))
.isEqualTo(new Response(RESOURCE, Response.HttpCode.OK)); .isEqualTo(new Response(RESOURCE, Response.HttpCode.OK));
Mockito.verify(authentication).getAuthToken(LOGIN, PASSWORD); Mockito.verify(authentication).getAuthToken(LOGIN, PASSWORD);
Mockito.verify(policy).accessIsGrantedForResource(authToken, KEY); Mockito.verify(policy).accessIsGrantedForResource(authToken, KEY);
Mockito.verify(storage).get(KEY); Mockito.verify(storage).getResource(KEY);
} }
@Test @Test
...@@ -58,7 +58,7 @@ public class MockitoSimpleAccessServiceTest { ...@@ -58,7 +58,7 @@ public class MockitoSimpleAccessServiceTest {
.isEqualTo(new Response(null, Response.HttpCode.UNAUTHORIZED)); .isEqualTo(new Response(null, Response.HttpCode.UNAUTHORIZED));
Mockito.verify(authentication, Mockito.never()).getAuthToken(Mockito.any(String.class), Mockito.any(String.class)); Mockito.verify(authentication, Mockito.never()).getAuthToken(Mockito.any(String.class), Mockito.any(String.class));
Mockito.verify(policy, Mockito.never()).accessIsGrantedForResource(Mockito.any(AuthToken.class), Mockito.anyInt()); Mockito.verify(policy, Mockito.never()).accessIsGrantedForResource(Mockito.any(AuthToken.class), Mockito.anyInt());
Mockito.verify(storage, Mockito.never()).get(Mockito.anyInt()); Mockito.verify(storage, Mockito.never()).getResource(Mockito.anyInt());
} }
@Test @Test
public void testNoAuthentication() { public void testNoAuthentication() {
...@@ -71,7 +71,7 @@ public class MockitoSimpleAccessServiceTest { ...@@ -71,7 +71,7 @@ public class MockitoSimpleAccessServiceTest {
.isEqualTo(new Response(null, Response.HttpCode.FORBIDDEN)); .isEqualTo(new Response(null, Response.HttpCode.FORBIDDEN));
Mockito.verify(authentication).getAuthToken(LOGIN, PASSWORD); Mockito.verify(authentication).getAuthToken(LOGIN, PASSWORD);
Mockito.verify(policy).accessIsGrantedForResource(authToken, KEY); Mockito.verify(policy).accessIsGrantedForResource(authToken, KEY);
Mockito.verify(storage, Mockito.never()).get(Mockito.anyInt()); Mockito.verify(storage, Mockito.never()).getResource(Mockito.anyInt());
} }
@Test @Test
...@@ -82,12 +82,12 @@ public class MockitoSimpleAccessServiceTest { ...@@ -82,12 +82,12 @@ public class MockitoSimpleAccessServiceTest {
Mockito.doReturn(Boolean.TRUE).when(policy) Mockito.doReturn(Boolean.TRUE).when(policy)
.accessIsGrantedForResource(authToken, KEY); .accessIsGrantedForResource(authToken, KEY);
Mockito.doReturn(Optional.empty()).when(storage) Mockito.doReturn(Optional.empty()).when(storage)
.get(KEY); .getResource(KEY);
assertThat(accessService.getResource(LOGIN, PASSWORD, KEY)) assertThat(accessService.getResource(LOGIN, PASSWORD, KEY))
.isEqualTo(new Response(null, Response.HttpCode.NOT_FOUND)); .isEqualTo(new Response(null, Response.HttpCode.NOT_FOUND));
Mockito.verify(authentication).getAuthToken(LOGIN, PASSWORD); Mockito.verify(authentication).getAuthToken(LOGIN, PASSWORD);
Mockito.verify(policy).accessIsGrantedForResource(authToken, KEY); Mockito.verify(policy).accessIsGrantedForResource(authToken, KEY);
Mockito.verify(storage).get(KEY); Mockito.verify(storage).getResource(KEY);
} }
@Test @Test
...@@ -98,7 +98,7 @@ public class MockitoSimpleAccessServiceTest { ...@@ -98,7 +98,7 @@ public class MockitoSimpleAccessServiceTest {
.isEqualTo(new Response(null, Response.HttpCode.UNAUTHORIZED)); .isEqualTo(new Response(null, Response.HttpCode.UNAUTHORIZED));
Mockito.verify(authentication).getAuthToken(LOGIN, PASSWORD); Mockito.verify(authentication).getAuthToken(LOGIN, PASSWORD);
Mockito.verify(policy, Mockito.never()).accessIsGrantedForResource(Mockito.any(AuthToken.class), Mockito.anyInt()); Mockito.verify(policy, Mockito.never()).accessIsGrantedForResource(Mockito.any(AuthToken.class), Mockito.anyInt());
Mockito.verify(storage, Mockito.never()).get(Mockito.anyInt()); Mockito.verify(storage, Mockito.never()).getResource(Mockito.anyInt());
} }
@AfterEach @AfterEach
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment