Spring/spring-plugin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#37, #38 - Move to Java 8 concepts in PluginRegistry API.

Browse Source 
Moved to Optional instead of null values in the API. Removed deprecated methods in favor of methods taking a Supplier for both exceptions to be thrown or plugin defaults.
This commit is contained in:
Oliver Gierke
2017-02-14 12:00:36 +01:00
parent 8f64dce90b
commit 605b22ed82
5 changed files with 65 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/test/java/org/springframework/plugin/core/OrderAwarePluginRegistryUnitTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008-2012 the original author or authors.
* Copyright 2008-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import static org.springframework.plugin.core.OrderAwarePluginRegistry.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import org.junit.Before;
import org.junit.Test;
@@ -53,8 +54,8 @@ public class OrderAwarePluginRegistryUnitTest extends SimplePluginRegistryUnitTe
@Test
public void honorsOrderOnAddPlugins() throws Exception {
PluginRegistry<TestPlugin, String> registry = OrderAwarePluginRegistry.create(Arrays.asList(firstPlugin,
secondPlugin));
PluginRegistry<TestPlugin, String> registry = OrderAwarePluginRegistry
.create(Arrays.asList(firstPlugin, secondPlugin));
assertOrder(registry, secondPlugin, firstPlugin);
}
@@ -68,14 +69,14 @@ public class OrderAwarePluginRegistryUnitTest extends SimplePluginRegistryUnitTe
assertThat(result.get(i), is(plugins[i]));
}
assertThat(registry.getPluginFor(null), is(plugins[0]));
assertThat(registry.getPluginFor(null), is(Optional.of(plugins[0])));
}
@Test
public void createsRevertedRegistryCorrectly() throws Exception {
OrderAwarePluginRegistry<TestPlugin, String> registry = OrderAwarePluginRegistry.create(Arrays.asList(firstPlugin,
secondPlugin));
OrderAwarePluginRegistry<TestPlugin, String> registry = OrderAwarePluginRegistry
.create(Arrays.asList(firstPlugin, secondPlugin));
PluginRegistry<TestPlugin, String> reverse = registry.reverse();
assertOrder(registry, secondPlugin, firstPlugin);
@@ -91,8 +92,8 @@ public class OrderAwarePluginRegistryUnitTest extends SimplePluginRegistryUnitTe
ThirdImplementation plugin = new ThirdImplementation();
TestPlugin thirdPlugin = (TestPlugin) new ProxyFactory(plugin).getProxy();
OrderAwarePluginRegistry<TestPlugin, String> registry = create(Arrays
.asList(firstPlugin, secondPlugin, thirdPlugin));
OrderAwarePluginRegistry<TestPlugin, String> registry = create(
Arrays.asList(firstPlugin, secondPlugin, thirdPlugin));
assertOrder(registry, secondPlugin, thirdPlugin, firstPlugin);
assertOrder(registry.reverse(), firstPlugin, thirdPlugin, secondPlugin);
}
@@ -104,8 +105,8 @@ public class OrderAwarePluginRegistryUnitTest extends SimplePluginRegistryUnitTe
@Test
public void defaultSetupUsesDefaultReverseComparator() {
OrderAwarePluginRegistry<Plugin<Object>, Object> registry = OrderAwarePluginRegistry.createReverse(Collections
.<Plugin<Object>> emptyList());
OrderAwarePluginRegistry<Plugin<Object>, Object> registry = OrderAwarePluginRegistry
.createReverse(Collections.<Plugin<Object>> emptyList());
Object field = ReflectionTestUtils.getField(registry, "comparator");
assertThat(field, is(ReflectionTestUtils.getField(registry, "DEFAULT_REVERSE_COMPARATOR")));
}

17
core/src/test/java/org/springframework/plugin/core/SimplePluginRegistryUnitTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008-2012 the original author or authors.
* Copyright 2008-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.springframework.plugin.core.PluginRegistry.Supplier;
/**
* Unit test for {@link SimplePluginRegistry}.
@@ -87,7 +86,7 @@ public class SimplePluginRegistryUnitTest {
@Test(expected = IllegalArgumentException.class)
public void throwsExceptionIfNoPluginFound() {
registry.getPluginFor("BAR", new IllegalArgumentException());
registry.getPluginFor("BAR", () -> new IllegalArgumentException());
}
/**
@@ -96,7 +95,7 @@ public class SimplePluginRegistryUnitTest {
@Test(expected = IllegalArgumentException.class)
public void throwsExceptionIfNoPluginsFound() {
registry.getPluginsFor("BAR", new IllegalArgumentException());
registry.getPluginsFor("BAR", () -> new IllegalArgumentException());
}
/**
@@ -107,7 +106,7 @@ public class SimplePluginRegistryUnitTest {
SamplePlugin defaultPlugin = new SamplePluginImplementation();
assertThat(registry.getPluginFor("BAR", defaultPlugin), is(defaultPlugin));
assertThat(registry.getPluginOrDefaultFor("BAR", defaultPlugin), is(defaultPlugin));
}
/**
@@ -141,12 +140,6 @@ public class SimplePluginRegistryUnitTest {
registry = SimplePluginRegistry.create(Collections.<SamplePlugin> emptyList());
registry.getPluginFor("FOO", new Supplier<Exception>() {
@Override
public Exception get() {
return new IllegalStateException();
}
});
registry.getPluginFor("FOO", () -> new IllegalStateException());
}
}