From 2eebb2b0bfc37fe6ed29b7c956b49b31e5c9c328 Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Wed, 25 Dec 2019 09:23:49 +0000 Subject: [PATCH] Polish build --- build.gradle | 4 +--- .../statemachine/ensemble/DistributedStateMachine.java | 5 +++-- .../statemachine/support/AbstractStateMachine.java | 2 ++ .../statemachine/access/StateMachineAccessTests.java | 4 ++++ .../support/StateContextExpressionMethodsTests.java | 4 ++++ .../zookeeper/ZookeeperStateMachineEnsembleTests.java | 4 ++++ 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 0742229c..b5b65779 100644 --- a/build.gradle +++ b/build.gradle @@ -77,7 +77,7 @@ configure(allprojects) { group = 'org.springframework.statemachine' - [compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:none'] + [compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:deprecation'] repositories { mavenCentral() @@ -626,7 +626,6 @@ configure(rootProject) { include 'index.adoc' } options doctype: 'book', eruby: 'erubis' - logDocuments = true attributes 'icons': 'font', 'sectanchors': '', 'toc': '', @@ -647,7 +646,6 @@ configure(rootProject) { } } options doctype: 'book', eruby: 'erubis' - logDocuments = true attributes 'docinfo': 'shared', toc: 'left', 'toc-levels': '4', diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/ensemble/DistributedStateMachine.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/ensemble/DistributedStateMachine.java index 1b7833f3..6ee92785 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/ensemble/DistributedStateMachine.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/ensemble/DistributedStateMachine.java @@ -103,7 +103,7 @@ public class DistributedStateMachine extends LifecycleObjectSupport implem } @Override - @SuppressWarnings("deprecation") + @SuppressWarnings({"all", "deprecation"}) public boolean sendEvent(Message event) { // adding state machine id to the message so that // listeners can know from where a state change originates @@ -111,6 +111,7 @@ public class DistributedStateMachine extends LifecycleObjectSupport implem } @Override + @SuppressWarnings({"all", "deprecation"}) public boolean sendEvent(E event) { return sendEvent(MessageBuilder.withPayload(event).build()); } @@ -319,7 +320,7 @@ public class DistributedStateMachine extends LifecycleObjectSupport implem public void stateChanged(StateMachineContext context) { // do not pass if state change was originated from this dist machine if (!ObjectUtils.nullSafeEquals(delegate.getUuid(), - context.getEventHeaders().get(StateMachineSystemConstants.STATEMACHINE_IDENTIFIER))) { + context.getEventHeaders().get(StateMachineSystemConstants.STATEMACHINE_IDENTIFIER))) { Message m = MessageBuilder.withPayload(context.getEvent()) .copyHeaders(context.getEventHeaders()) .build(); diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java index b0e22d9e..310c9e40 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java @@ -218,6 +218,7 @@ public abstract class AbstractStateMachine extends StateMachineObjectSuppo } @Override + @SuppressWarnings({"all", "deprecation"}) public boolean sendEvent(Message event) { return sendEvent(Mono.just(event)) .switchIfEmpty(Flux.just(StateMachineEventResult.from(this, event, ResultType.DENIED))) @@ -233,6 +234,7 @@ public abstract class AbstractStateMachine extends StateMachineObjectSuppo } @Override + @SuppressWarnings({"all", "deprecation"}) public boolean sendEvent(E event) { return sendEvent(MessageBuilder.withPayload(event).build()); } diff --git a/spring-statemachine-core/src/test/java/org/springframework/statemachine/access/StateMachineAccessTests.java b/spring-statemachine-core/src/test/java/org/springframework/statemachine/access/StateMachineAccessTests.java index b693da6a..c389ec5b 100644 --- a/spring-statemachine-core/src/test/java/org/springframework/statemachine/access/StateMachineAccessTests.java +++ b/spring-statemachine-core/src/test/java/org/springframework/statemachine/access/StateMachineAccessTests.java @@ -122,19 +122,23 @@ public class StateMachineAccessTests { } @Override + @SuppressWarnings({"all", "deprecation"}) public void start() { } @Override + @SuppressWarnings({"all", "deprecation"}) public void stop() { } @Override + @SuppressWarnings({"all", "deprecation"}) public boolean sendEvent(Message event) { return false; } @Override + @SuppressWarnings({"all", "deprecation"}) public boolean sendEvent(String event) { return false; } diff --git a/spring-statemachine-core/src/test/java/org/springframework/statemachine/support/StateContextExpressionMethodsTests.java b/spring-statemachine-core/src/test/java/org/springframework/statemachine/support/StateContextExpressionMethodsTests.java index 9a8bb67a..3f66a764 100644 --- a/spring-statemachine-core/src/test/java/org/springframework/statemachine/support/StateContextExpressionMethodsTests.java +++ b/spring-statemachine-core/src/test/java/org/springframework/statemachine/support/StateContextExpressionMethodsTests.java @@ -177,20 +177,24 @@ public class StateContextExpressionMethodsTests { } @Override + @SuppressWarnings({"all", "deprecation"}) public void start() { } @Override + @SuppressWarnings({"all", "deprecation"}) public void stop() { } @Override + @SuppressWarnings({"all", "deprecation"}) public boolean sendEvent(Message event) { events.add(event); return true; } @Override + @SuppressWarnings({"all", "deprecation"}) public boolean sendEvent(SpelEvents event) { return sendEvent(MessageBuilder.createMessage(event, new MessageHeaders(new HashMap()))); } diff --git a/spring-statemachine-zookeeper/src/test/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsembleTests.java b/spring-statemachine-zookeeper/src/test/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsembleTests.java index 926ed596..0e848cc3 100644 --- a/spring-statemachine-zookeeper/src/test/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsembleTests.java +++ b/spring-statemachine-zookeeper/src/test/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsembleTests.java @@ -717,19 +717,23 @@ public class ZookeeperStateMachineEnsembleTests extends AbstractZookeeperTests { } @Override + @SuppressWarnings({"all", "deprecation"}) public void start() { } @Override + @SuppressWarnings({"all", "deprecation"}) public void stop() { } @Override + @SuppressWarnings({"all", "deprecation"}) public boolean sendEvent(Message event) { return false; } @Override + @SuppressWarnings({"all", "deprecation"}) public boolean sendEvent(String event) { return false; }