enhanced future update type

Author: Malah

src/main/java/fr/istic/gm/aodp/activeobject/ObserverGeneratorAsync.java

@@ -15,5 +15,5 @@ public interface ObserverGeneratorAsync {
      * @param generator the generator observed
      * @return the future
      */
-    Future update(GeneratorDiffusion generator);
+    Future<?> update(GeneratorDiffusion generator);
 }

src/main/java/fr/istic/gm/aodp/activeobject/impl/Canal.java

@@ -26,7 +26,7 @@ public class Canal implements GeneratorAsync, ObserverGeneratorAsync {
     private GeneratorDiffusion generator;
 
     @Override
-    public Future update(GeneratorDiffusion generator) {
+    public Future<?> update(GeneratorDiffusion generator) {
 
         this.generator = generator;
         UpdateRunnable mi = new UpdateRunnableImpl(this, observerGenerator);

src/main/java/fr/istic/gm/aodp/diffusion/Diffusion.java

@@ -16,7 +16,7 @@ public interface Diffusion {
      * @param generator the generator to diffuse
      * @return the future
      */
-    List<Future<Integer>> execute(GeneratorDiffusion generator);
+    List<Future<?>> execute(GeneratorDiffusion generator);
 
     /**
      * Retrieve the generator value

src/main/java/fr/istic/gm/aodp/diffusion/impl/AtomicDiffusion.java

@@ -31,7 +31,7 @@ public class AtomicDiffusion implements Diffusion {
     private int observerNumber;
 
     @Override
-    public List<Future<Integer>> execute(GeneratorDiffusion generator) {
+    public List<Future<?>> execute(GeneratorDiffusion generator) {
         if (generatorAsyncs != null && generatorAsyncs.size() != observerNumber) {
             throw new DiffusionException(FORBIDDEN);
         } else {
@@ -40,7 +40,7 @@ public List<Future<Integer>> execute(GeneratorDiffusion generator) {
             this.observerNumber = generator.getObservers().size();
         }
 
-        List<Future<Integer>> futures = new ArrayList<>();
+        List<Future<?>> futures = new ArrayList<>();
         generator.getObservers().forEach(o -> futures.add(o.update(generator)));
         return futures;
     }

src/main/java/fr/istic/gm/aodp/diffusion/impl/CausalDiffusion.java

@@ -13,9 +13,9 @@ public class CausalDiffusion implements Diffusion {
     private Integer value;
 
     @Override
-    public List<Future<Integer>> execute(GeneratorDiffusion generator) {
+    public List<Future<?>> execute(GeneratorDiffusion generator) {
         this.value = generator.getValue();
-        List<Future<Integer>> futures = new ArrayList<>();
+        List<Future<?>> futures = new ArrayList<>();
         generator.getObservers().forEach(o -> futures.add(o.update(generator)));
         return futures;
     }

src/main/java/fr/istic/gm/aodp/diffusion/impl/SequentialDiffusion.java

@@ -25,9 +25,9 @@ public class SequentialDiffusion extends CaretakerImpl<Integer> implements Diffu
     private final MementoFactory<Integer> mementoFactory;
 
     @Override
-    public List<Future<Integer>> execute(GeneratorDiffusion generator) {
+    public List<Future<?>> execute(GeneratorDiffusion generator) {
         addMemento(mementoFactory.create(generator.getValue()));
-        List<Future<Integer>> futures = new ArrayList<>();
+        List<Future<?>> futures = new ArrayList<>();
         generator.getObservers().forEach(o -> futures.add(o.update(generator)));
         return futures;
     }

src/test/java/fr/istic/gm/aodp/diffusion/impl/AtomicDiffusionTest.java

@@ -39,7 +39,7 @@ public class AtomicDiffusionTest {
     private GeneratorDiffusion mockGenerator;
 
     @Mock
-    private Future<Integer> mockFuture;
+    private Future mockFuture;
 
     @Mock
     private GeneratorAsync mockGeneratorAsync;
@@ -59,7 +59,7 @@ public void shouldExecuteAtomicDiffusion() {
         when(mockCanal.update(any())).thenReturn(mockFuture);
         when(mockGenerator.getValue()).thenReturn(10);
 
-        List<Future<Integer>> result = atomicDiffusion.execute(mockGenerator);
+        List<Future<?>> result = atomicDiffusion.execute(mockGenerator);
 
         verify(mockCanal).update(mockGenerator);
 

src/test/java/fr/istic/gm/aodp/diffusion/impl/CausalDiffusionTest.java

@@ -34,7 +34,7 @@ public class CausalDiffusionTest {
     private GeneratorDiffusion mockGenerator;
 
     @Mock
-    private Future<Integer> mockFuture;
+    private Future mockFuture;
 
     @Rule
     public ExpectedException thrown = ExpectedException.none();
@@ -51,7 +51,7 @@ public void shouldExecuteAtomicDiffusion() {
         when(mockCanal.update(any())).thenReturn(mockFuture);
         when(mockGenerator.getValue()).thenReturn(10);
 
-        List<Future<Integer>> result = causalDiffusion.execute(mockGenerator);
+        List<Future<?>> result = causalDiffusion.execute(mockGenerator);
 
         verify(mockCanal).update(mockGenerator);
 

src/test/java/fr/istic/gm/aodp/diffusion/impl/SequentialDiffusionTest.java

@@ -37,7 +37,7 @@ public class SequentialDiffusionTest {
     private GeneratorDiffusion mockGenerator;
 
     @Mock
-    private Future<Integer> mockFuture;
+    private Future mockFuture;
 
     @Mock
     private GeneratorAsync mockGeneratorAsync;
@@ -61,7 +61,7 @@ public void shouldExecuteDiffusion() {
         when(mockGenerator.getValue()).thenReturn(10);
         when(mockMementoFactory.create(any())).thenReturn(new IntMemento(10));
 
-        List<Future<Integer>> result = sequentialDiffusion.execute(mockGenerator);
+        List<Future<?>> result = sequentialDiffusion.execute(mockGenerator);
 
         verify(mockMementoFactory).create(10);
         verify(mockCanal).update(mockGenerator);