Last git commit of 2016
This commit is contained in:
@@ -46,7 +46,7 @@ public abstract class Aggregate<E extends Event, ID extends Serializable> extend
|
||||
@JsonIgnore
|
||||
protected <T extends Action<A>, A extends Aggregate> T getAction(
|
||||
Class<T> actionType) throws IllegalArgumentException {
|
||||
Module provider = getProvider();
|
||||
Module provider = getModule();
|
||||
Service service = provider.getDefaultService();
|
||||
return (T) service.getAction(actionType);
|
||||
}
|
||||
@@ -59,8 +59,8 @@ public abstract class Aggregate<E extends Event, ID extends Serializable> extend
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
@JsonIgnore
|
||||
public <T extends Module<A>, A extends Aggregate<E, ID>> T getProvider() throws IllegalArgumentException {
|
||||
return getProvider((Class<T>) ResolvableType
|
||||
public <T extends Module<A>, A extends Aggregate<E, ID>> T getModule() throws IllegalArgumentException {
|
||||
return getModule((Class<T>) ResolvableType
|
||||
.forClassWithGenerics(Module.class, ResolvableType.forInstance(this))
|
||||
.getRawClass());
|
||||
}
|
||||
@@ -72,7 +72,7 @@ public abstract class Aggregate<E extends Event, ID extends Serializable> extend
|
||||
* @throws IllegalArgumentException if the application context is unavailable or the provider does not exist
|
||||
*/
|
||||
@JsonIgnore
|
||||
public <T extends Module<A>, A extends Aggregate<E, ID>> T getProvider(Class<T> providerType) throws
|
||||
public <T extends Module<A>, A extends Aggregate<E, ID>> T getModule(Class<T> providerType) throws
|
||||
IllegalArgumentException {
|
||||
Assert.notNull(applicationContext, "The application context is unavailable");
|
||||
T provider = applicationContext.getBean(providerType);
|
||||
@@ -167,13 +167,13 @@ public abstract class Aggregate<E extends Event, ID extends Serializable> extend
|
||||
@SuppressWarnings("unchecked")
|
||||
@JsonIgnore
|
||||
protected Service<Aggregate<E, ID>, ID> getEntityService() {
|
||||
return (Service<Aggregate<E, ID>, ID>) getProvider().getDefaultService();
|
||||
return (Service<Aggregate<E, ID>, ID>) getModule().getDefaultService();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@JsonIgnore
|
||||
protected EventService<E, ID> getEventService() {
|
||||
return (EventService<E, ID>) getProvider().getDefaultEventService();
|
||||
return (EventService<E, ID>) getModule().getDefaultEventService();
|
||||
}
|
||||
|
||||
public static class CommandResources extends ResourceSupport {
|
||||
|
||||
@@ -42,18 +42,18 @@ public class ProviderTests {
|
||||
|
||||
@Test
|
||||
public void testGetProviderReturnsProvider() {
|
||||
assertNotNull(new EmptyAggregate().getProvider(EmptyProvider.class));
|
||||
assertNotNull(new EmptyAggregate().getModule(EmptyProvider.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetServiceReturnsService() {
|
||||
EmptyProvider provider = new EmptyAggregate().getProvider(EmptyProvider.class);
|
||||
EmptyProvider provider = new EmptyAggregate().getModule(EmptyProvider.class);
|
||||
assertNotNull(provider.getEmptyService());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetActionReturnsAction() {
|
||||
EmptyProvider provider = new EmptyAggregate().getProvider(EmptyProvider.class);
|
||||
EmptyProvider provider = new EmptyAggregate().getModule(EmptyProvider.class);
|
||||
EmptyService service = provider.getEmptyService();
|
||||
assertNotNull(service.getAction(EmptyAction.class));
|
||||
}
|
||||
@@ -61,7 +61,7 @@ public class ProviderTests {
|
||||
@Test
|
||||
public void testProcessCommandChangesStatus() {
|
||||
EmptyAggregate aggregate = new EmptyAggregate(0L, AggregateStatus.CREATED);
|
||||
EmptyProvider provider = new EmptyAggregate().getProvider(EmptyProvider.class);
|
||||
EmptyProvider provider = new EmptyAggregate().getModule(EmptyProvider.class);
|
||||
EmptyService service = provider.getEmptyService();
|
||||
EmptyAction emptyAction = service.getAction(EmptyAction.class);
|
||||
emptyAction.getConsumer().accept(aggregate);
|
||||
@@ -107,7 +107,7 @@ public class ProviderTests {
|
||||
|
||||
@Command(controller = EmptyController.class, method = "emptyAction")
|
||||
public void emptyAction() {
|
||||
EmptyProvider emptyProvider = this.getProvider();
|
||||
EmptyProvider emptyProvider = this.getModule();
|
||||
emptyProvider.getEmptyService()
|
||||
.getAction(EmptyAction.class)
|
||||
.getConsumer()
|
||||
|
||||
Reference in New Issue
Block a user