♻️ Reformat + Update .editorconfig

This commit is contained in:
Alexander Söderberg 2020-10-06 22:48:30 +02:00 committed by Alexander Söderberg
parent 8bdec87a74
commit 2aac3980d5
169 changed files with 4261 additions and 2448 deletions

View file

@ -67,22 +67,31 @@ public class ServicesTest {
final SecondaryMockService secondaryMockService = new SecondaryMockService();
servicePipeline
.registerServiceImplementation(TypeToken.get(MockService.class), secondaryMockService,
Collections.singleton(secondaryMockService));
servicePipeline.registerServiceImplementation(MockService.class,
Collections.singleton(secondaryMockService)
);
servicePipeline.registerServiceImplementation(
MockService.class,
mockContext -> new MockService.MockResult(-91),
Collections.singleton(mockContext -> mockContext.getString().startsWith("-91")));
Assertions.assertEquals(32,
Collections.singleton(mockContext -> mockContext.getString().startsWith("-91"))
);
Assertions.assertEquals(
32,
servicePipeline.pump(new MockService.MockContext("Hello")).through(MockService.class)
.getResult().getInteger());
.getResult().getInteger()
);
servicePipeline.pump(new MockService.MockContext("Hello")).through(MockService.class)
.getResult(
(mockResult, throwable) -> Assertions.assertEquals(32, mockResult.getInteger()));
Assertions.assertEquals(999,
Assertions.assertEquals(
999,
servicePipeline.pump(new MockService.MockContext("potato")).through(MockService.class)
.getResult().getInteger());
Assertions.assertEquals(-91,
.getResult().getInteger()
);
Assertions.assertEquals(
-91,
servicePipeline.pump(new MockService.MockContext("-91")).through(MockService.class)
.getResult().getInteger());
.getResult().getInteger()
);
Assertions.assertNotNull(
servicePipeline.pump(new MockService.MockContext("oi")).through(MockService.class)
.getResultAsynchronously().get());
@ -92,66 +101,98 @@ public class ServicesTest {
@Test
public void testSideEffectServices() {
final ServicePipeline servicePipeline = ServicePipeline.builder().build();
servicePipeline.registerServiceType(TypeToken.get(MockSideEffectService.class),
new DefaultSideEffectService());
servicePipeline.registerServiceType(
TypeToken.get(MockSideEffectService.class),
new DefaultSideEffectService()
);
final MockSideEffectService.MockPlayer mockPlayer =
new MockSideEffectService.MockPlayer(20);
Assertions.assertEquals(20, mockPlayer.getHealth());
Assertions.assertEquals(State.ACCEPTED,
servicePipeline.pump(mockPlayer).through(MockSideEffectService.class).getResult());
Assertions.assertEquals(
State.ACCEPTED,
servicePipeline.pump(mockPlayer).through(MockSideEffectService.class).getResult()
);
Assertions.assertEquals(0, mockPlayer.getHealth());
mockPlayer.setHealth(20);
servicePipeline.registerServiceImplementation(MockSideEffectService.class,
new SecondaryMockSideEffectService(), Collections.emptyList());
Assertions.assertThrows(IllegalStateException.class,
new SecondaryMockSideEffectService(), Collections.emptyList()
);
Assertions.assertThrows(
IllegalStateException.class,
() -> servicePipeline.pump(mockPlayer).through(MockSideEffectService.class)
.getResult());
.getResult()
);
}
@Test
public void testForwarding() throws Exception {
final ServicePipeline servicePipeline = ServicePipeline.builder().build()
.registerServiceType(TypeToken.get(MockService.class), new DefaultMockService())
.registerServiceType(TypeToken.get(MockResultConsumer.class), new MockResultConsumer());
Assertions.assertEquals(State.ACCEPTED,
.registerServiceType(
TypeToken.get(MockService.class),
new DefaultMockService()
)
.registerServiceType(
TypeToken.get(MockResultConsumer.class),
new MockResultConsumer()
);
Assertions.assertEquals(
State.ACCEPTED,
servicePipeline.pump(new MockService.MockContext("huh")).through(MockService.class)
.forward().through(MockResultConsumer.class).getResult());
Assertions.assertEquals(State.ACCEPTED,
.forward().through(MockResultConsumer.class).getResult()
);
Assertions.assertEquals(
State.ACCEPTED,
servicePipeline.pump(new MockService.MockContext("Something"))
.through(MockService.class).forwardAsynchronously()
.thenApply(pump -> pump.through(MockResultConsumer.class))
.thenApply(ServiceSpigot::getResult).get());
.thenApply(ServiceSpigot::getResult).get()
);
}
@Test
public void testSorting() {
final ServicePipeline servicePipeline = ServicePipeline.builder().build()
.registerServiceType(TypeToken.get(MockService.class), new DefaultMockService());
.registerServiceType(
TypeToken.get(MockService.class),
new DefaultMockService()
);
servicePipeline.registerServiceImplementation(MockService.class, new MockOrderedFirst(),
Collections.emptyList());
Collections.emptyList()
);
servicePipeline.registerServiceImplementation(MockService.class, new MockOrderedLast(),
Collections.emptyList());
Collections.emptyList()
);
// Test that the annotations worked
Assertions.assertEquals(1,
Assertions.assertEquals(
1,
servicePipeline.pump(new MockService.MockContext("")).through(MockService.class)
.getResult().getInteger());
.getResult().getInteger()
);
}
@Test
public void testRecognisedTypes() {
final ServicePipeline servicePipeline = ServicePipeline.builder().build()
.registerServiceType(TypeToken.get(MockService.class), new DefaultMockService());
.registerServiceType(
TypeToken.get(MockService.class),
new DefaultMockService()
);
Assertions.assertEquals(1, servicePipeline.getRecognizedTypes().size());
}
@Test
public void testImplementationGetters() {
final ServicePipeline servicePipeline = ServicePipeline.builder().build()
.registerServiceType(TypeToken.get(MockService.class), new DefaultMockService());
.registerServiceType(
TypeToken.get(MockService.class),
new DefaultMockService()
);
servicePipeline.registerServiceImplementation(MockService.class, new MockOrderedFirst(),
Collections.emptyList());
Collections.emptyList()
);
servicePipeline.registerServiceImplementation(MockService.class, new MockOrderedLast(),
Collections.emptyList());
Collections.emptyList()
);
final TypeToken<? extends Service<?, ?>> first = TypeToken.get(MockOrderedFirst.class),
last = TypeToken.get(MockOrderedLast.class);
final TypeToken<MockService> mockServiceType = TypeToken.get(MockService.class);
@ -171,21 +212,31 @@ public class ServicesTest {
@Test
public void testAnnotatedMethods() throws Exception {
final ServicePipeline servicePipeline = ServicePipeline.builder().build()
.registerServiceType(TypeToken.get(MockService.class), new DefaultMockService())
.registerServiceType(
TypeToken.get(MockService.class),
new DefaultMockService()
)
.registerMethods(new AnnotatedMethodTest());
final String testString = UUID.randomUUID().toString();
Assertions.assertEquals(testString.length(),
Assertions.assertEquals(
testString.length(),
servicePipeline.pump(new MockService.MockContext(testString)).through(MockService.class)
.getResult().getInteger());
.getResult().getInteger()
);
}
@Test
public void testConsumerServices() {
final ServicePipeline servicePipeline = ServicePipeline.builder().build()
.registerServiceType(TypeToken.get(MockConsumerService.class),
new StateSettingConsumerService())
.registerServiceImplementation(MockConsumerService.class,
new InterruptingMockConsumer(), Collections.emptyList());
.registerServiceType(
TypeToken.get(MockConsumerService.class),
new StateSettingConsumerService()
)
.registerServiceImplementation(
MockConsumerService.class,
new InterruptingMockConsumer(),
Collections.emptyList()
);
final MockService.MockContext context = new MockService.MockContext("");
servicePipeline.pump(context).through(MockConsumerService.class).getResult();
Assertions.assertEquals("", context.getState());
@ -194,10 +245,15 @@ public class ServicesTest {
@Test
public void testPartialResultServices() {
final ServicePipeline servicePipeline = ServicePipeline.builder().build()
.registerServiceType(TypeToken.get(MockPartialResultService.class),
new DefaultPartialRequestService())
.registerServiceImplementation(MockPartialResultService.class,
new CompletingPartialResultService(), Collections.emptyList());
.registerServiceType(
TypeToken.get(MockPartialResultService.class),
new DefaultPartialRequestService()
)
.registerServiceImplementation(
MockPartialResultService.class,
new CompletingPartialResultService(),
Collections.emptyList()
);
final MockChunkedRequest.Animal cow = new MockChunkedRequest.Animal("cow");
final MockChunkedRequest.Animal dog = new MockChunkedRequest.Animal("dog");
final MockChunkedRequest.Animal cat = new MockChunkedRequest.Animal("cat");
@ -215,16 +271,22 @@ public class ServicesTest {
Assertions.assertNotNull(servicePipeline);
servicePipeline
.registerServiceType(TypeToken.get(MockService.class), new DefaultMockService());
final PipelineException pipelineException = Assertions.assertThrows(PipelineException.class,
final PipelineException pipelineException = Assertions.assertThrows(
PipelineException.class,
() -> servicePipeline.pump(new MockService.MockContext("pls throw exception"))
.through(MockService.class).getResult());
Assertions.assertEquals(DefaultMockService.TotallyIntentionalException.class,
pipelineException.getCause().getClass());
.through(MockService.class).getResult()
);
Assertions.assertEquals(
DefaultMockService.TotallyIntentionalException.class,
pipelineException.getCause().getClass()
);
servicePipeline.pump(new MockService.MockContext("pls throw exception"))
.through(MockService.class).getResult((result, throwable) -> {
Assertions.assertNotNull(throwable);
Assertions.assertEquals(DefaultMockService.TotallyIntentionalException.class,
throwable.getClass());
Assertions.assertEquals(
DefaultMockService.TotallyIntentionalException.class,
throwable.getClass()
);
Assertions.assertNull(result);
});
}

View file

@ -29,17 +29,17 @@ import java.util.Map;
public class CompletingPartialResultService implements MockPartialResultService {
@Override
public Map<MockChunkedRequest.Animal, MockChunkedRequest.Sound> handleRequests(List<MockChunkedRequest.Animal> requests) {
final Map<MockChunkedRequest.Animal, MockChunkedRequest.Sound> map = new HashMap<>();
for (final MockChunkedRequest.Animal animal : requests) {
if (animal.getName().equals("cow")) {
map.put(animal, new MockChunkedRequest.Sound("moo"));
} else if (animal.getName().equals("dog")) {
map.put(animal, new MockChunkedRequest.Sound("woof"));
}
@Override
public Map<MockChunkedRequest.Animal, MockChunkedRequest.Sound> handleRequests(List<MockChunkedRequest.Animal> requests) {
final Map<MockChunkedRequest.Animal, MockChunkedRequest.Sound> map = new HashMap<>();
for (final MockChunkedRequest.Animal animal : requests) {
if (animal.getName().equals("cow")) {
map.put(animal, new MockChunkedRequest.Sound("moo"));
} else if (animal.getName().equals("dog")) {
map.put(animal, new MockChunkedRequest.Sound("woof"));
}
}
return map;
}
return map;
}
}

View file

@ -25,19 +25,19 @@ package cloud.commandframework.services.mock;
public class DefaultMockService implements MockService {
@Override
public MockResult handle(final MockContext mockContext)
throws Exception {
if (mockContext.getString().equals("pls throw exception")) {
throw new TotallyIntentionalException();
@Override
public MockResult handle(final MockContext mockContext)
throws Exception {
if (mockContext.getString().equals("pls throw exception")) {
throw new TotallyIntentionalException();
}
return new MockResult(32);
}
return new MockResult(32);
}
public static class TotallyIntentionalException extends Exception {
public static class TotallyIntentionalException extends Exception {
}
}
}

View file

@ -29,14 +29,14 @@ import java.util.Map;
public class DefaultPartialRequestService implements MockPartialResultService {
@Override
public Map<MockChunkedRequest.Animal, MockChunkedRequest.Sound> handleRequests(final List<MockChunkedRequest.Animal> requests) {
final Map<MockChunkedRequest.Animal, MockChunkedRequest.Sound> map =
new HashMap<>(requests.size());
for (final MockChunkedRequest.Animal animal : requests) {
map.put(animal, new MockChunkedRequest.Sound("unknown"));
@Override
public Map<MockChunkedRequest.Animal, MockChunkedRequest.Sound> handleRequests(final List<MockChunkedRequest.Animal> requests) {
final Map<MockChunkedRequest.Animal, MockChunkedRequest.Sound> map =
new HashMap<>(requests.size());
for (final MockChunkedRequest.Animal animal : requests) {
map.put(animal, new MockChunkedRequest.Sound("unknown"));
}
return map;
}
return map;
}
}

View file

@ -27,10 +27,10 @@ import cloud.commandframework.services.State;
public class DefaultSideEffectService implements MockSideEffectService {
@Override
public State handle(final MockPlayer mockPlayer) {
mockPlayer.setHealth(0);
return State.ACCEPTED;
}
@Override
public State handle(final MockPlayer mockPlayer) {
mockPlayer.setHealth(0);
return State.ACCEPTED;
}
}

View file

@ -27,9 +27,9 @@ import cloud.commandframework.services.types.ConsumerService;
public class InterruptingMockConsumer implements MockConsumerService {
@Override
public void accept(final MockService.MockContext mockContext) {
ConsumerService.interrupt();
}
@Override
public void accept(final MockService.MockContext mockContext) {
ConsumerService.interrupt();
}
}

View file

@ -28,37 +28,39 @@ import cloud.commandframework.services.ChunkedRequestContext;
import java.util.Collection;
public class MockChunkedRequest
extends ChunkedRequestContext<MockChunkedRequest.Animal, MockChunkedRequest.Sound> {
extends ChunkedRequestContext<MockChunkedRequest.Animal, MockChunkedRequest.Sound> {
public MockChunkedRequest(final Collection<Animal> requests) {
super(requests);
}
public static class Animal {
private final String name;
public Animal(final String name) {
this.name = name;
public MockChunkedRequest(final Collection<Animal> requests) {
super(requests);
}
public String getName() {
return this.name;
}
}
public static class Animal {
private final String name;
public static class Sound {
public Animal(final String name) {
this.name = name;
}
private final String sound;
public String getName() {
return this.name;
}
public Sound(final String sound) {
this.sound = sound;
}
public String getSound() {
return this.sound;
public static class Sound {
private final String sound;
public Sound(final String sound) {
this.sound = sound;
}
public String getSound() {
return this.sound;
}
}
}
}

View file

@ -29,9 +29,9 @@ import cloud.commandframework.services.annotations.Order;
@Order(ExecutionOrder.FIRST)
public class MockOrderedFirst implements MockService {
@Override
public MockResult handle(final MockContext mockContext) {
return new MockResult(1);
}
@Override
public MockResult handle(final MockContext mockContext) {
return new MockResult(1);
}
}

View file

@ -29,9 +29,9 @@ import cloud.commandframework.services.annotations.Order;
@Order(ExecutionOrder.LAST)
public class MockOrderedLast implements MockService {
@Override
public MockResult handle(final MockContext mockContext) {
return new MockResult(2);
}
@Override
public MockResult handle(final MockContext mockContext) {
return new MockResult(2);
}
}

View file

@ -26,6 +26,6 @@ package cloud.commandframework.services.mock;
import cloud.commandframework.services.types.PartialResultService;
public interface MockPartialResultService extends
PartialResultService<MockChunkedRequest.Animal, MockChunkedRequest.Sound, MockChunkedRequest> {
PartialResultService<MockChunkedRequest.Animal, MockChunkedRequest.Sound, MockChunkedRequest> {
}

View file

@ -28,9 +28,9 @@ import cloud.commandframework.services.types.SideEffectService;
public class MockResultConsumer implements SideEffectService<MockService.MockResult> {
@Override
public State handle(final MockService.MockResult mockResultConsumer) {
return State.ACCEPTED;
}
@Override
public State handle(final MockService.MockResult mockResultConsumer) {
return State.ACCEPTED;
}
}

View file

@ -29,24 +29,24 @@ public interface MockService extends Service<MockService.MockContext, MockServic
class MockContext {
private final String string;
private String state = "";
private final String string;
private String state = "";
public MockContext( final String string) {
this.string = string;
}
public MockContext(final String string) {
this.string = string;
}
public String getString() {
return this.string;
}
public String getString() {
return this.string;
}
public String getState() {
return this.state;
}
public String getState() {
return this.state;
}
public void setState( final String state) {
this.state = state;
}
public void setState(final String state) {
this.state = state;
}
}

View file

@ -27,14 +27,14 @@ import java.util.function.Predicate;
public class SecondaryMockService implements MockService, Predicate<MockService.MockContext> {
@Override
public MockResult handle(final MockContext mockContext) {
return new MockResult(999);
}
@Override
public MockResult handle(final MockContext mockContext) {
return new MockResult(999);
}
@Override
public boolean test(final MockContext mockContext) {
return mockContext.getString().equalsIgnoreCase("potato");
}
@Override
public boolean test(final MockContext mockContext) {
return mockContext.getString().equalsIgnoreCase("potato");
}
}

View file

@ -27,9 +27,9 @@ import cloud.commandframework.services.State;
public class SecondaryMockSideEffectService implements MockSideEffectService {
@Override
public State handle(final MockPlayer mockPlayer) {
return null;
}
@Override
public State handle(final MockPlayer mockPlayer) {
return null;
}
}

View file

@ -25,9 +25,9 @@ package cloud.commandframework.services.mock;
public class StateSettingConsumerService implements MockConsumerService {
@Override
public void accept(final MockService.MockContext mockContext) {
mockContext.setState("");
}
@Override
public void accept(final MockService.MockContext mockContext) {
mockContext.setState("");
}
}