Skip to content

Commit 276fefc

Browse files
committed
Update regarding ActorReservedTag
1 parent 59d972a commit 276fefc

File tree

10 files changed

+24
-20
lines changed

10 files changed

+24
-20
lines changed

actor4j-data/src/main/java/io/actor4j/core/reactive/streams/ReactiveStreamsTag.java renamed to actor4j-data/src/main/java/io/actor4j/core/reactive/streams/ActorReactiveStreamsTag.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import static io.actor4j.core.messages.ActorReservedTag.*;
1919

20-
public final class ReactiveStreamsTag {
20+
public final class ActorReactiveStreamsTag {
2121
public static final int SUBSCRIPTION_REQUEST = RESERVED_REACTIVE_STREAMS_SUBSCRIPTION_REQUEST;
2222
public static final int SUBSCRIPTION_REQUEST_RESET = RESERVED_REACTIVE_STREAMS_SUBSCRIPTION_REQUEST_RESET;
2323
public static final int SUBSCRIPTION_CANCEL = RESERVED_REACTIVE_STREAMS_SUBSCRIPTION_CANCEL;

actor4j-data/src/main/java/io/actor4j/core/reactive/streams/PublisherImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package io.actor4j.core.reactive.streams;
1717

18-
import static io.actor4j.core.reactive.streams.ReactiveStreamsTag.*;
18+
import static io.actor4j.core.reactive.streams.ActorReactiveStreamsTag.*;
1919

2020
import java.util.HashMap;
2121
import java.util.Iterator;

actor4j-data/src/main/java/io/actor4j/core/reactive/streams/SubscriberImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import io.actor4j.core.function.Procedure;
2020
import io.actor4j.core.messages.ActorMessage;
2121

22-
import static io.actor4j.core.reactive.streams.ReactiveStreamsTag.*;
22+
import static io.actor4j.core.reactive.streams.ActorReactiveStreamsTag.*;
2323

2424
import java.util.HashMap;
2525
import java.util.Map;

actor4j-streams/src/main/java/io/actor4j/streams/core/ActorStreamManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package io.actor4j.streams.core;
1717

18-
import static io.actor4j.streams.core.runtime.ActorMessageTag.DATA;
18+
import static io.actor4j.streams.core.runtime.ActorStreamsTag.DATA;
1919

2020
import java.util.Arrays;
2121
import java.util.List;

actor4j-streams/src/main/java/io/actor4j/streams/core/runtime/ActorMessageTag.java renamed to actor4j-streams/src/main/java/io/actor4j/streams/core/runtime/ActorStreamsTag.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
*/
1616
package io.actor4j.streams.core.runtime;
1717

18-
public final class ActorMessageTag {
19-
public static final int DATA = 1;
20-
public static final int TASK = 2;
21-
public static final int REDUCE = 3;
22-
public static final int RESULT = 4;
23-
public static final int SHUTDOWN = 5;
18+
import static io.actor4j.core.messages.ActorReservedTag.*;
19+
20+
public final class ActorStreamsTag {
21+
public static final int DATA = RESERVED_STREAMS_DATA;
22+
public static final int TASK = RESERVED_STREAMS_TASK;
23+
public static final int REDUCE = RESERVED_STREAMS_REDUCE;
24+
public static final int RESULT = RESERVED_STREAMS_RESULT;
25+
public static final int SHUTDOWN = RESERVED_STREAMS_SHUTDOWN;
2426
}

actor4j-streams/src/main/java/io/actor4j/streams/core/runtime/StreamDecompActor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import io.actor4j.streams.core.exceptions.ActorStreamDataException;
3636

3737
import static io.actor4j.core.utils.CommPattern.*;
38-
import static io.actor4j.streams.core.runtime.ActorMessageTag.*;
38+
import static io.actor4j.streams.core.runtime.ActorStreamsTag.*;
3939

4040
public class StreamDecompActor<T, R> extends Actor {
4141
protected final ActorStreamDecompNode<T, R> node;

actor4j-streams/src/main/java/io/actor4j/streams/core/runtime/StreamMapReduceTaskActor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import io.actor4j.core.utils.ActorGroupList;
2727

2828
import static io.actor4j.core.utils.CommPattern.*;
29-
import static io.actor4j.streams.core.runtime.ActorMessageTag.*;
29+
import static io.actor4j.streams.core.runtime.ActorStreamsTag.*;
3030
//import static io.actor4j.core.logging.ActorLogger.*;
3131

3232
public class StreamMapReduceTaskActor<T, R> extends StreamDecompTaskActor<T, R> {

actor4j-streams/src/main/java/io/actor4j/streams/core/runtime/StreamRecursiveTaskActor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package io.actor4j.streams.core.runtime;
1717

1818
import static io.actor4j.core.utils.CommPattern.broadcast;
19-
import static io.actor4j.streams.core.runtime.ActorMessageTag.TASK;
20-
import static io.actor4j.streams.core.runtime.ActorMessageTag.RESULT;
19+
import static io.actor4j.streams.core.runtime.ActorStreamsTag.TASK;
20+
import static io.actor4j.streams.core.runtime.ActorStreamsTag.RESULT;
2121

2222
import java.util.ArrayList;
2323
import java.util.HashSet;

actor4j-web/actor4j-web-amqp/src/main/java/io/actor4j/web/amqp/AMQPResourceActor.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,16 @@
3131

3232
import io.actor4j.core.actors.ResourceActor;
3333
import io.actor4j.core.messages.ActorMessage;
34+
import static io.actor4j.core.messages.ActorReservedTag.*;
3435

3536
/*
3637
* MQTT compatible implementation (MQTT topics use a topic exchange (amq.topic by default))
3738
* @See https://www.rabbitmq.com/mqtt.html
3839
*/
3940
public abstract class AMQPResourceActor extends ResourceActor {
40-
public static final int PUBLISH = 1;
41-
public static final int SUBSCRIBE = 2;
42-
public static final int UNSUBSCRIBE = 3;
41+
public static final int PUBLISH = RESERVED_PUBSUB_PUBLISH;
42+
public static final int SUBSCRIBE = RESERVED_PUBSUB_SUBSCRIBE;
43+
public static final int UNSUBSCRIBE = RESERVED_PUBSUB_UNSUBSCRIBE;
4344

4445
protected volatile Connection connection;
4546
protected final String host;

actor4j-web/actor4j-web-mqtt/src/main/java/io/actor4j/web/mqtt/MQTTResourceActor.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@
2727

2828
import io.actor4j.core.actors.ResourceActor;
2929
import io.actor4j.core.messages.ActorMessage;
30+
import static io.actor4j.core.messages.ActorReservedTag.*;
3031

3132
public abstract class MQTTResourceActor extends ResourceActor {
32-
public static final int PUBLISH = 1;
33-
public static final int SUBSCRIBE = 2;
34-
public static final int UNSUBSCRIBE = 3;
33+
public static final int PUBLISH = RESERVED_PUBSUB_PUBLISH;
34+
public static final int SUBSCRIBE = RESERVED_PUBSUB_SUBSCRIBE;
35+
public static final int UNSUBSCRIBE = RESERVED_PUBSUB_UNSUBSCRIBE;
3536

3637
protected volatile MqttClient client;
3738
protected final String broker;

0 commit comments

Comments
 (0)