You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2018/04/17 07:58:22 UTC
[camel] branch camel-2.21.x updated (b2600bf -> 5976ebd)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from b2600bf CAMEL-12445: spring-boot-rest-swagger example does not compile due to missing servlet-api dependendency
new 01527a8 CAMEL-12449: DefaultServiceLoadBalancer throws IndexOutOfBoundsException after applying ServiceFilter
new 5976ebd CAMEL-12449: Fixed CS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../impl/cloud/DefaultServiceLoadBalancer.java | 2 +-
.../apache/camel/impl/cloud/LoadBalancerTest.java | 31 +++++++++++++++++-----
2 files changed, 26 insertions(+), 7 deletions(-)
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.
[camel] 01/02: CAMEL-12449: DefaultServiceLoadBalancer throws
IndexOutOfBoundsException after applying ServiceFilter
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 01527a8f3a3fa95a44f4aa0816035f3483729370
Author: Vadim R <83...@users.noreply.github.com>
AuthorDate: Mon Apr 16 17:43:33 2018 +0300
CAMEL-12449: DefaultServiceLoadBalancer throws IndexOutOfBoundsException after applying ServiceFilter
---
.../impl/cloud/DefaultServiceLoadBalancer.java | 2 +-
.../apache/camel/impl/cloud/LoadBalancerTest.java | 31 +++++++++++++++++-----
2 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancer.java
index 19a55fa..51d33cd 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancer.java
@@ -136,7 +136,7 @@ public class DefaultServiceLoadBalancer
// filter services
services = serviceFilter.apply(services);
// let the client service chooser find which server to use
- service = services.size() > 1 ? serviceChooser.choose(services) : services.get(0);
+ service = services.isEmpty() ? null : services.size() > 1 ? serviceChooser.choose(services) : services.get(0);
if (service == null) {
throw new RejectedExecutionException("No active services with name " + serviceName);
}
diff --git a/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java b/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
index a78c291..1b30c29 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
@@ -16,22 +16,31 @@
*/
package org.apache.camel.impl.cloud;
+import java.util.concurrent.RejectedExecutionException;
import java.util.stream.Collectors;
-import org.apache.camel.ContextTestSupport;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.BeforeClass;
import org.junit.Test;
-public class LoadBalancerTest extends ContextTestSupport {
- @Test
- public void testLoadBalancer() throws Exception {
- StaticServiceDiscovery serviceDiscovery = new StaticServiceDiscovery();
+import static junit.framework.TestCase.assertEquals;
+
+public class LoadBalancerTest {
+
+ private static StaticServiceDiscovery serviceDiscovery = new StaticServiceDiscovery();
+
+ @BeforeClass
+ public static void setUp() {
serviceDiscovery.addServer("no-name", "127.0.0.1", 2001);
serviceDiscovery.addServer("no-name", "127.0.0.1", 2002);
serviceDiscovery.addServer("no-name", "127.0.0.1", 1001);
serviceDiscovery.addServer("no-name", "127.0.0.1", 1002);
+ }
+ @Test
+ public void testLoadBalancer() throws Exception {
DefaultServiceLoadBalancer loadBalancer = new DefaultServiceLoadBalancer();
- loadBalancer.setCamelContext(context);
+ loadBalancer.setCamelContext(new DefaultCamelContext());
loadBalancer.setServiceDiscovery(serviceDiscovery);
loadBalancer.setServiceFilter(services -> services.stream().filter(s -> s.getPort() < 2000).collect(Collectors.toList()));
loadBalancer.setServiceChooser(new RoundRobinServiceChooser());
@@ -44,4 +53,14 @@ public class LoadBalancerTest extends ContextTestSupport {
return false;
});
}
+
+ @Test(expected = RejectedExecutionException.class)
+ public void testNoActiveServices() throws Exception {
+ DefaultServiceLoadBalancer loadBalancer = new DefaultServiceLoadBalancer();
+ loadBalancer.setCamelContext(new DefaultCamelContext());
+ loadBalancer.setServiceDiscovery(serviceDiscovery);
+ loadBalancer.setServiceFilter(services -> services.stream().filter(s -> s.getPort() < 1000).collect(Collectors.toList()));
+ loadBalancer.setServiceChooser(new RoundRobinServiceChooser());
+ loadBalancer.process("no-name", service -> false);
+ }
}
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.
[camel] 02/02: CAMEL-12449: Fixed CS
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5976ebd95dc2290441ddcee12cad05fa0137db6f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Apr 17 09:57:11 2018 +0200
CAMEL-12449: Fixed CS
---
.../src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java b/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
index 1b30c29..219f7ae 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.junit.BeforeClass;
import org.junit.Test;
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertEquals;
public class LoadBalancerTest {
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.