SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

formatting fixed + tests, fixes #1376

Browse Source
This commit is contained in:
Bartłomiej Słota
2016-10-08 00:15:47 +02:00
parent dd97b6a4b7
commit 151e021ef9
2 changed files with 204 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistry.java
View File

@@ -89,7 +89,7 @@ public class InstanceRegistry extends PeerAwareInstanceRegistryImpl
final int instanceLeaseDuration = resolveInstanceLeaseDuration(info);
logRegistration(info, isReplication, instanceLeaseDuration);
publishEurekaInstanceRegisteredEvent(info, instanceLeaseDuration, isReplication);
super.register(info, isReplication);
superRegister(info, isReplication);
}
@Override
@@ -128,29 +128,45 @@ public class InstanceRegistry extends PeerAwareInstanceRegistryImpl
protected boolean internalCancel(String appName, String id, boolean isReplication) {
logCancelation(appName, id, isReplication);
publishEurekaInstanceCanceledEvent(appName, id, isReplication);
return superInternalCancel(appName, id, isReplication);
}
protected boolean superInternalCancel(String appName, String id,
boolean isReplication) {
return super.internalCancel(appName, id, isReplication);
}
private void logRegistration(InstanceInfo info, boolean isReplication, int instanceLeaseDuration) {
protected void superRegister(InstanceInfo info, boolean isReplication) {
super.register(info, isReplication);
}
private void logRegistration(InstanceInfo info, boolean isReplication,
int instanceLeaseDuration) {
if (log.isDebugEnabled()) {
log.debug("register " + info.getAppName() + ", vip " + info.getVIPAddress()
+ ", leaseDuration " + instanceLeaseDuration + ", isReplication " + isReplication);
log.debug("register " + info.getAppName() + ", vip " + info.getVIPAddress()
+ ", leaseDuration " + instanceLeaseDuration + ", isReplication "
+ isReplication);
}
}
private void logCancelation(String appName, String serverId, boolean isReplication) {
if (log.isDebugEnabled()) {
log.debug("cancel " + appName + " serverId " + serverId + ", isReplication " + isReplication);
log.debug("cancel " + appName + " serverId " + serverId + ", isReplication "
+ isReplication);
}
}
private void publishEurekaInstanceRegisteredEvent(InstanceInfo info, int leaseDuration, boolean isReplication) {
private void publishEurekaInstanceRegisteredEvent(InstanceInfo info,
int leaseDuration, boolean isReplication) {
// TODO: what to publish from info (whole object?)
this.ctxt.publishEvent(new EurekaInstanceRegisteredEvent(this, info, leaseDuration, isReplication));
this.ctxt.publishEvent(new EurekaInstanceRegisteredEvent(this, info,
leaseDuration, isReplication));
}
private void publishEurekaInstanceCanceledEvent(String appName, String serverId, boolean isReplication) {
this.ctxt.publishEvent(new EurekaInstanceCanceledEvent(this, appName, serverId, isReplication));
private void publishEurekaInstanceCanceledEvent(String appName, String serverId,
boolean isReplication) {
this.ctxt.publishEvent(
new EurekaInstanceCanceledEvent(this, appName, serverId, isReplication));
}
private int resolveInstanceLeaseDuration(final InstanceInfo info) {

179
spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistryTest.java Normal file
View File

@@ -0,0 +1,179 @@
package org.springframework.cloud.netflix.eureka.server;
import static org.junit.Assert.*;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.*;
import java.util.LinkedList;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.cloud.netflix.eureka.server.InstanceRegistryTest.Application;
import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceCanceledEvent;
import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceRegisteredEvent;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import com.netflix.appinfo.InstanceInfo;
import com.netflix.appinfo.LeaseInfo;
import com.netflix.eureka.registry.PeerAwareInstanceRegistry;
/**
* @author Bartlomiej Slota
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = Application.class,
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
value = {"spring.application.name=eureka", "logging.level.org.springframework."
+ "cloud.netflix.eureka.server.InstanceRegistry=DEBUG"})
public class InstanceRegistryTest {
@SpyBean(PeerAwareInstanceRegistry.class)
private InstanceRegistry instanceRegistry;
@Autowired
private Listener eurekaEventListener;
@Before
public void setup() {
eurekaEventListener.getApplicationEvents().clear();
}
@Test
public void testRegister() throws Exception {
// stubbing superclass method invocation
doNothing().when(instanceRegistry)
.superRegister(any(InstanceInfo.class), anyBoolean());
// creating instance info
LeaseInfo leaseInfo = getLeaseInfo();
InstanceInfo instanceInfo = getInstanceInfo(leaseInfo);
// calling tested method
instanceRegistry.register(instanceInfo, false);
// event of proper type is registered
assertEquals(1, eurekaEventListener.getApplicationEvents().size());
assertTrue(eurekaEventListener.getApplicationEvents().get(0)
instanceof EurekaInstanceRegisteredEvent);
// event details are correct
EurekaInstanceRegisteredEvent registeredEvent = (EurekaInstanceRegisteredEvent)
(eurekaEventListener.getApplicationEvents().get(0));
assertEquals(instanceInfo, registeredEvent.getInstanceInfo());
assertEquals(leaseInfo.getDurationInSecs(), registeredEvent.getLeaseDuration());
assertEquals(instanceRegistry, registeredEvent.getSource());
assertFalse(registeredEvent.isReplication());
// superclass method wrapper was successfully invoked
verify(instanceRegistry).superRegister(instanceInfo, false);
}
@Test
public void testDefaultLeaseDurationRegisterEvent() throws Exception {
// stubbing superclass method invocation
doNothing().when(instanceRegistry)
.superRegister(any(InstanceInfo.class), anyBoolean());
// creating instance info
InstanceInfo instanceInfo = getInstanceInfo(null);
// calling tested method
instanceRegistry.register(instanceInfo, false);
// instance info duration is set to default
EurekaInstanceRegisteredEvent registeredEvent = (EurekaInstanceRegisteredEvent)
(eurekaEventListener.getApplicationEvents().get(0));
assertEquals(LeaseInfo.DEFAULT_LEASE_DURATION, registeredEvent.getLeaseDuration());
}
@Test
public void testInternalCancel() throws Exception {
// stubbing superclass method invocation
doReturn(Boolean.TRUE).when(instanceRegistry)
.superInternalCancel(anyString(), anyString(), anyBoolean());
// calling tested method
boolean cancellationResult = instanceRegistry
.internalCancel("my-app", "appId", false);
// event of proper type is registered
assertEquals(1, eurekaEventListener.getApplicationEvents().size());
assertTrue(eurekaEventListener.getApplicationEvents().get(0)
instanceof EurekaInstanceCanceledEvent);
// event details are correct
EurekaInstanceCanceledEvent registeredEvent = (EurekaInstanceCanceledEvent)
(eurekaEventListener.getApplicationEvents().get(0));
assertEquals("my-app", registeredEvent.getAppName());
assertEquals("appId", registeredEvent.getServerId());
assertEquals(instanceRegistry, registeredEvent.getSource());
assertFalse(registeredEvent.isReplication());
// superclass method wrapper was successfully invoked
verify(instanceRegistry).superInternalCancel("my-app", "appId", false);
assertTrue(cancellationResult);
}
@Configuration
@EnableAutoConfiguration
@EnableEurekaServer
protected static class Application {
public static void main(String[] args) {
new SpringApplicationBuilder(Application.class)
.properties("spring.application.name=eureka").run(args);
}
@Bean
public Listener eurekaEventsListener() {
return new Listener();
}
}
private LeaseInfo getLeaseInfo() {
LeaseInfo.Builder leaseBuilder = LeaseInfo.Builder.newBuilder();
leaseBuilder.setRenewalIntervalInSecs(10);
leaseBuilder.setDurationInSecs(15);
return leaseBuilder.build();
}
private InstanceInfo getInstanceInfo(LeaseInfo leaseInfo) {
InstanceInfo.Builder builder = InstanceInfo.Builder.newBuilder();
builder.setAppName("my-app-name");
builder.setHostName("my-host-name");
builder.setPort(8008);
builder.setLeaseInfo(leaseInfo);
return builder.build();
}
private static class Listener implements ApplicationListener {
private final List<ApplicationEvent> applicationEvents = new LinkedList<>();
@Override
public void onApplicationEvent(ApplicationEvent event) {
if (event instanceof EurekaInstanceCanceledEvent ||
event instanceof EurekaInstanceRegisteredEvent) {
applicationEvents.add(event);
}
}
public List<ApplicationEvent> getApplicationEvents() {
return applicationEvents;
}
}
}