Remove guava usages (fixes gh-154)

spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfiguration.java

@@ -16,6 +16,8 @@
 
 package org.springframework.cloud.netflix.eureka.server;
 
+import java.util.Collections;
+
 import javax.servlet.Filter;
 
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -30,7 +32,6 @@ import org.springframework.context.annotation.Import;
 import org.springframework.core.Ordered;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
-import com.google.common.collect.Lists;
 import com.sun.jersey.spi.container.servlet.ServletContainer;
 
 /**
@@ -57,8 +58,8 @@ public class EurekaServerConfiguration extends WebMvcConfigurerAdapter {
 				EurekaServerConfigBean.DEFAULT_PREFIX + "/(fonts|images|css|js)/.*");
 		bean.addInitParameter("com.sun.jersey.config.property.packages",
 				"com.netflix.discovery;com.netflix.eureka");
-		bean.setUrlPatterns(Lists.newArrayList(EurekaServerConfigBean.DEFAULT_PREFIX
-				+ "/*"));
+		bean.setUrlPatterns(Collections
+				.singletonList(EurekaServerConfigBean.DEFAULT_PREFIX + "/*"));
 		return bean;
 	}
 

spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/LeaseManagerMessageBroker.java

@@ -18,22 +18,17 @@ package org.springframework.cloud.netflix.eureka.server.event;
 
 import java.util.List;
 
-import javax.annotation.Nullable;
-
 import lombok.extern.apachecommons.CommonsLog;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.netflix.eureka.server.advice.LeaseManagerLite;
 import org.springframework.context.ApplicationContext;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.shared.Application;
 import com.netflix.eureka.PeerAwareInstanceRegistry;
 import com.netflix.eureka.lease.Lease;
 
-import static com.google.common.collect.Iterables.tryFind;
-
 /**
  * @author Spencer Gibb
  */
@@ -73,22 +68,19 @@ public class LeaseManagerMessageBroker implements LeaseManagerLite<InstanceInfo>
 				+ isReplication);
 		List<Application> applications = PeerAwareInstanceRegistry.getInstance()
 				.getSortedApplications();
-		Optional<Application> app = tryFind(applications, new Predicate<Application>() {
-			@Override
-			public boolean apply(@Nullable Application input) {
-				return input.getName().equals(appName);
+		for (Application input : applications) {
+			if (input.getName().equals(appName)) {
+				InstanceInfo instance = null;
+				for (InstanceInfo info : input.getInstances()) {
+					if (info.getHostName().equals(serverId)) {
+						instance = info;
+						break;
+					}
+				}
+				this.ctxt.publishEvent(new EurekaInstanceRenewedEvent(this, appName,
+						serverId, instance, isReplication));
+				break;
 			}
-		});
-		if (app.isPresent()) {
-			Optional<InstanceInfo> info = tryFind(app.get().getInstances(),
-					new Predicate<InstanceInfo>() {
-						@Override
-						public boolean apply(@Nullable InstanceInfo input) {
-							return input.getHostName().equals(serverId);
-						}
-					});
-			this.ctxt.publishEvent(new EurekaInstanceRenewedEvent(this, appName,
-					serverId, info.orNull(), isReplication));
 		}
 		return false;
 	}