Fixed minor issues in rx-client-java8-webapp example.

Change-Id: I83e918265dc013a3962cc44658685b498382cd60
Signed-off-by: Michal Gajdos <[email protected]>

Author: Michal Gajdos

examples/rx-client-java8-webapp/src/main/java/org/glassfish/jersey/examples/rx/RxApplication.java

@@ -68,10 +68,11 @@ public RxApplication() {
         register(DestinationResource.class);
         register(CalculationResource.class);
         register(ForecastResource.class);
+
         // Agent (Client) Resources.
-        register(ObservableAgentResource.class);
         register(SyncAgentResource.class);
         register(AsyncAgentResource.class);
+        register(ObservableAgentResource.class);
         register(ListenableFutureAgentResource.class);
         register(CompletionStageAgentResource.class);
 

examples/rx-client-java8-webapp/src/main/java/org/glassfish/jersey/examples/rx/agent/AsyncAgentResource.java

@@ -171,20 +171,21 @@ public void failed(final Throwable throwable) {
 
                         final Map<String, Calculation> calculations = new HashMap<>();
                         while (futures.size() > 0) {
-                            Iterator<Future<Calculation>> iterator = futures.iterator();
+                            final Iterator<Future<Calculation>> iterator = futures.iterator();
+
                             while (iterator.hasNext()) {
-                                Future<Calculation> f = iterator.next();
+                                final Future<Calculation> f = iterator.next();
                                 if (f.isDone()) {
                                     try {
                                         final Calculation calculation = f.get();
                                         calculations.put(calculation.getTo(), calculation);
 
-                                        iterator.remove();
-
                                         innerLatch.countDown();
                                     } catch (final Throwable t) {
                                         errors.offer("Calculation: " + t.getMessage());
                                         innerLatch.countDown();
+                                    } finally {
+                                        iterator.remove();
                                     }
                                 }
                             }

examples/rx-client-java8-webapp/src/main/java/org/glassfish/jersey/examples/rx/agent/ObservableAgentResource.java

@@ -46,7 +46,6 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.client.WebTarget;
@@ -67,10 +66,6 @@
 import org.glassfish.jersey.server.Uri;
 
 import rx.Observable;
-import rx.functions.Action1;
-import rx.functions.Func1;
-import rx.functions.Func2;
-import rx.functions.Func3;
 import rx.schedulers.Schedulers;
 
 /**

examples/rx-client-java8-webapp/src/main/java/org/glassfish/jersey/examples/rx/agent/SyncAgentResource.java

@@ -92,9 +92,8 @@ public AgentResponse sync() {
             response.setVisited(destination.path("visited").request()
                     // Identify the user.
                     .header("Rx-User", "Sync")
-                            // Return a list of destinations
-                    .get(new GenericType<List<Destination>>() {
-                    }));
+                    // Return a list of destinations
+                    .get(new GenericType<List<Destination>>() {}));
         } catch (final Throwable throwable) {
             errors.offer("Visited: " + throwable.getMessage());
         }
@@ -106,8 +105,7 @@ public AgentResponse sync() {
                     // Identify the user.
                     .header("Rx-User", "Sync")
                     // Return a list of destinations.
-                    .get(new GenericType<List<Destination>>() {
-                    });
+                    .get(new GenericType<List<Destination>>() {});
         } catch (final Throwable throwable) {
             errors.offer("Recommended: " + throwable.getMessage());
         }

examples/rx-client-java8-webapp/src/main/java/org/glassfish/jersey/examples/rx/remote/DestinationResource.java

@@ -57,7 +57,6 @@
 import org.glassfish.jersey.examples.rx.domain.Destination;
 import org.glassfish.jersey.server.ManagedAsync;
 
-import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 
 /**
@@ -91,12 +90,7 @@ public List<Destination> visited(@HeaderParam("Rx-User") @DefaultValue("KO") fin
             VISITED.put(user, Helper.getCountries(5));
         }
 
-        return Lists.transform(VISITED.get(user), new Function<String, Destination>() {
-            @Override
-            public Destination apply(final String input) {
-                return new Destination(input);
-            }
-        });
+        return Lists.transform(VISITED.get(user), Destination::new);
     }
 
     @GET
@@ -111,11 +105,6 @@ public List<Destination> recommended(@HeaderParam("Rx-User") @DefaultValue("KO")
             VISITED.put(user, Helper.getCountries(5));
         }
 
-        return Lists.transform(Helper.getCountries(limit, VISITED.get(user)), new Function<String, Destination>() {
-            @Override
-            public Destination apply(final String input) {
-                return new Destination(input);
-            }
-        });
+        return Lists.transform(Helper.getCountries(limit, VISITED.get(user)), Destination::new);
     }
 }