Skip to content

Commit b6793df

Browse files
authored
Merge pull request #1220 from ably/chore/refactor-object-package-name-to-liveobjects
[AIT-1037] Refactored `object` package name to `liveobjects`
2 parents 0f52cca + f45a93f commit b6793df

117 files changed

Lines changed: 437 additions & 440 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323
distribution: 'temurin'
2424
- name: Set up Gradle
2525
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3
26-
- run: ./gradlew checkWithCodenarc checkstyleMain checkstyleTest runUnitTests runLiveObjectUnitTests :uts:test
26+
- run: ./gradlew checkWithCodenarc checkstyleMain checkstyleTest runUnitTests runLiveObjectsUnitTests :uts:test

.github/workflows/integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,4 @@ jobs:
122122
- name: Set up Gradle
123123
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3
124124

125-
- run: ./gradlew runLiveObjectIntegrationTests
125+
- run: ./gradlew runLiveObjectsIntegrationTests

android/src/main/java/io/ably/lib/realtime/Channel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import io.ably.lib.types.AblyException;
44
import io.ably.lib.types.ChannelOptions;
55
import io.ably.lib.push.PushChannel;
6-
import io.ably.lib.objects.LiveObjectsPlugin;
6+
import io.ably.lib.liveobjects.LiveObjectsPlugin;
77

88

99
public class Channel extends ChannelBase {

java/src/main/java/io/ably/lib/realtime/Channel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.ably.lib.realtime;
22

3-
import io.ably.lib.object.LiveObjectsPlugin;
3+
import io.ably.lib.liveobjects.LiveObjectsPlugin;
44
import io.ably.lib.types.AblyException;
55
import io.ably.lib.types.ChannelOptions;
66
import org.jetbrains.annotations.Nullable;

lib/src/main/java/io/ably/lib/object/LiveObjectsPlugin.java renamed to lib/src/main/java/io/ably/lib/liveobjects/LiveObjectsPlugin.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package io.ably.lib.object;
1+
package io.ably.lib.liveobjects;
22

3-
import io.ably.lib.object.adapter.AblyClientAdapter;
4-
import io.ably.lib.object.adapter.Adapter;
3+
import io.ably.lib.liveobjects.adapter.AblyClientAdapter;
4+
import io.ably.lib.liveobjects.adapter.Adapter;
55
import io.ably.lib.realtime.AblyRealtime;
66
import io.ably.lib.realtime.ChannelState;
77
import io.ably.lib.types.ProtocolMessage;
@@ -81,12 +81,12 @@ static LiveObjectsPlugin tryInitialize(@NotNull AblyRealtime ablyRealtime) {
8181
/**
8282
* Reflectively constructs the LiveObjects plugin implementation. Lives in a nested class so the
8383
* implementation-class name stays {@code private} (interface fields are forced {@code public}),
84-
* mirroring {@link io.ably.lib.object.serialization.ObjectSerializer.Holder}. Unlike {@code Holder}
84+
* mirroring {@link io.ably.lib.liveobjects.serialization.ObjectSerializer.Holder}. Unlike {@code Holder}
8585
* this is stateless: {@link #create} returns a new instance on every call.
8686
*/
8787
final class Factory {
8888
private static final String TAG = LiveObjectsPlugin.Factory.class.getName();
89-
private static final String IMPLEMENTATION_CLASS = "io.ably.lib.object.DefaultLiveObjectsPlugin";
89+
private static final String IMPLEMENTATION_CLASS = "io.ably.lib.liveobjects.DefaultLiveObjectsPlugin";
9090

9191
private Factory() {}
9292

lib/src/main/java/io/ably/lib/object/RealtimeObject.java renamed to lib/src/main/java/io/ably/lib/liveobjects/RealtimeObject.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.ably.lib.object;
1+
package io.ably.lib.liveobjects;
22

3-
import io.ably.lib.object.path.types.LiveMapPathObject;
4-
import io.ably.lib.object.state.ObjectStateChange;
5-
import io.ably.lib.object.state.ObjectStateEvent;
3+
import io.ably.lib.liveobjects.path.types.LiveMapPathObject;
4+
import io.ably.lib.liveobjects.state.ObjectStateChange;
5+
import io.ably.lib.liveobjects.state.ObjectStateEvent;
66
import io.ably.lib.types.AblyException;
77
import io.ably.lib.types.ErrorInfo;
88
import org.jetbrains.annotations.NotNull;

lib/src/main/java/io/ably/lib/object/Subscription.java renamed to lib/src/main/java/io/ably/lib/liveobjects/Subscription.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.ably.lib.object;
1+
package io.ably.lib.liveobjects;
22

33
/**
44
* Represents a registration for receiving events from a subscribe operation.

lib/src/main/java/io/ably/lib/object/ValueType.java renamed to lib/src/main/java/io/ably/lib/liveobjects/ValueType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.ably.lib.object;
1+
package io.ably.lib.liveobjects;
22

33
/**
44
* The type of a value resolved by a {@code PathObject} or wrapped by an

lib/src/main/java/io/ably/lib/object/adapter/AblyClientAdapter.java renamed to lib/src/main/java/io/ably/lib/liveobjects/adapter/AblyClientAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.ably.lib.object.adapter;
1+
package io.ably.lib.liveobjects.adapter;
22

33
import io.ably.lib.realtime.ChannelBase;
44
import io.ably.lib.realtime.Connection;

lib/src/main/java/io/ably/lib/object/adapter/Adapter.java renamed to lib/src/main/java/io/ably/lib/liveobjects/adapter/Adapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.ably.lib.object.adapter;
1+
package io.ably.lib.liveobjects.adapter;
22

33
import io.ably.lib.realtime.AblyRealtime;
44
import io.ably.lib.realtime.Channel;

0 commit comments

Comments
 (0)