From 7d9b10abf8575f0b3ca233482a233a5f2eb0c0c4 Mon Sep 17 00:00:00 2001
From: Arnaud LABOUREL <arnaud.labourel@lis-lab.fr>
Date: Wed, 29 Jan 2025 08:38:36 +0100
Subject: [PATCH] Changed method name for StorageService.java

---
 .../fr/univ_amu/m1info/service/StorageService.java |  2 +-
 .../m1info/service/guice/SimpleAccessService.java  |  2 +-
 .../m1info/service/guice/SimpleStorageService.java |  2 +-
 .../service/mockito/SimpleAccessService.java       |  2 +-
 .../mockito/MockitoSimpleAccessServiceTest.java    | 14 +++++++-------
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/fr/univ_amu/m1info/service/StorageService.java b/src/main/java/fr/univ_amu/m1info/service/StorageService.java
index fb82cb3..65746cd 100644
--- a/src/main/java/fr/univ_amu/m1info/service/StorageService.java
+++ b/src/main/java/fr/univ_amu/m1info/service/StorageService.java
@@ -3,5 +3,5 @@ package fr.univ_amu.m1info.service;
 import java.util.Optional;
 
 public interface StorageService {
-    Optional<String> get(int key);
+    Optional<String> getResource(int key);
 }
diff --git a/src/main/java/fr/univ_amu/m1info/service/guice/SimpleAccessService.java b/src/main/java/fr/univ_amu/m1info/service/guice/SimpleAccessService.java
index e879ed6..96f2591 100644
--- a/src/main/java/fr/univ_amu/m1info/service/guice/SimpleAccessService.java
+++ b/src/main/java/fr/univ_amu/m1info/service/guice/SimpleAccessService.java
@@ -28,7 +28,7 @@ public class SimpleAccessService implements AccessService {
             return new Response(null, Response.HttpCode.UNAUTHORIZED);
         if (!securityPolicyService.accessIsGrantedForResource(authToken.get(), key))
             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))
                 .orElseGet(() -> new Response(null, Response.HttpCode.NOT_FOUND));
     }
diff --git a/src/main/java/fr/univ_amu/m1info/service/guice/SimpleStorageService.java b/src/main/java/fr/univ_amu/m1info/service/guice/SimpleStorageService.java
index eb59899..26e53be 100644
--- a/src/main/java/fr/univ_amu/m1info/service/guice/SimpleStorageService.java
+++ b/src/main/java/fr/univ_amu/m1info/service/guice/SimpleStorageService.java
@@ -16,7 +16,7 @@ public class SimpleStorageService implements StorageService {
     }
 
     @Override
-    public Optional<String> get(int key) {
+    public Optional<String> getResource(int key) {
         return resourcesById.containsKey(key) ? Optional.of(resourcesById.get(key)) : Optional.empty();
     }
 }
diff --git a/src/main/java/fr/univ_amu/m1info/service/mockito/SimpleAccessService.java b/src/main/java/fr/univ_amu/m1info/service/mockito/SimpleAccessService.java
index f984f18..af0463c 100644
--- a/src/main/java/fr/univ_amu/m1info/service/mockito/SimpleAccessService.java
+++ b/src/main/java/fr/univ_amu/m1info/service/mockito/SimpleAccessService.java
@@ -26,7 +26,7 @@ public class SimpleAccessService implements AccessService {
             return new Response(null, Response.HttpCode.UNAUTHORIZED);
         if (!securityPolicyService.accessIsGrantedForResource(authToken.get(), key))
             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))
                 .orElseGet(() -> new Response(null, Response.HttpCode.NOT_FOUND));
     }
diff --git a/src/test/java/fr/univ_amu/m1info/service/mockito/MockitoSimpleAccessServiceTest.java b/src/test/java/fr/univ_amu/m1info/service/mockito/MockitoSimpleAccessServiceTest.java
index c6d0bf4..798d47f 100644
--- a/src/test/java/fr/univ_amu/m1info/service/mockito/MockitoSimpleAccessServiceTest.java
+++ b/src/test/java/fr/univ_amu/m1info/service/mockito/MockitoSimpleAccessServiceTest.java
@@ -38,12 +38,12 @@ public class MockitoSimpleAccessServiceTest {
         Mockito.doReturn(Boolean.TRUE).when(policy)
                 .accessIsGrantedForResource(authToken, KEY);
         Mockito.doReturn(Optional.of(RESOURCE)).when(storage)
-                .get(KEY);
+                .getResource(KEY);
         assertThat(accessService.getResource(LOGIN, PASSWORD, KEY))
                 .isEqualTo(new Response(RESOURCE, Response.HttpCode.OK));
         Mockito.verify(authentication).getAuthToken(LOGIN, PASSWORD);
         Mockito.verify(policy).accessIsGrantedForResource(authToken, KEY);
-        Mockito.verify(storage).get(KEY);
+        Mockito.verify(storage).getResource(KEY);
     }
 
     @Test
@@ -58,7 +58,7 @@ public class MockitoSimpleAccessServiceTest {
                 .isEqualTo(new Response(null, Response.HttpCode.UNAUTHORIZED));
         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(storage, Mockito.never()).get(Mockito.anyInt());
+        Mockito.verify(storage, Mockito.never()).getResource(Mockito.anyInt());
     }
     @Test
     public void testNoAuthentication() {
@@ -71,7 +71,7 @@ public class MockitoSimpleAccessServiceTest {
                 .isEqualTo(new Response(null, Response.HttpCode.FORBIDDEN));
         Mockito.verify(authentication).getAuthToken(LOGIN, PASSWORD);
         Mockito.verify(policy).accessIsGrantedForResource(authToken, KEY);
-        Mockito.verify(storage, Mockito.never()).get(Mockito.anyInt());
+        Mockito.verify(storage, Mockito.never()).getResource(Mockito.anyInt());
     }
 
     @Test
@@ -82,12 +82,12 @@ public class MockitoSimpleAccessServiceTest {
         Mockito.doReturn(Boolean.TRUE).when(policy)
                 .accessIsGrantedForResource(authToken, KEY);
         Mockito.doReturn(Optional.empty()).when(storage)
-                .get(KEY);
+                .getResource(KEY);
         assertThat(accessService.getResource(LOGIN, PASSWORD, KEY))
                 .isEqualTo(new Response(null, Response.HttpCode.NOT_FOUND));
         Mockito.verify(authentication).getAuthToken(LOGIN, PASSWORD);
         Mockito.verify(policy).accessIsGrantedForResource(authToken, KEY);
-        Mockito.verify(storage).get(KEY);
+        Mockito.verify(storage).getResource(KEY);
     }
 
     @Test
@@ -98,7 +98,7 @@ public class MockitoSimpleAccessServiceTest {
                 .isEqualTo(new Response(null, Response.HttpCode.UNAUTHORIZED));
         Mockito.verify(authentication).getAuthToken(LOGIN, PASSWORD);
         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
-- 
GitLab