Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ For more information, see - [Java Install Guide](https://docs.ditto.live/sdk/lat
## Additional Resources

- [Java Roadmap and Support Policy](https://docs.ditto.live/sdk/latest/install-guides/java/roadmap)
- [API Reference](https://software.ditto.live/java/ditto-java/4.11.0-preview.1/api-reference/)
- [API Reference](https://software.ditto.live/java/ditto-java/5.0.0/api-reference/)

10 changes: 5 additions & 5 deletions java-server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,29 @@ spotbugs {

dependencies {
// ditto-java artifact includes the Java API for Ditto
implementation("com.ditto:ditto-java:5.0.0-java")
implementation("com.ditto:ditto-java:5.0.0")

// This will include binaries for all the supported platforms and architectures
implementation("com.ditto:ditto-binaries:5.0.0-java")
implementation("com.ditto:ditto-binaries:5.0.0")

// To reduce your module artifact's size, consider including just the necessary platforms and architectures
/*
// macOS Apple Silicon
implementation("com.ditto:ditto-binaries:5.0.0-java") {
implementation("com.ditto:ditto-binaries:5.0.0") {
capabilities {
requireCapability("com.ditto:ditto-binaries-macos-arm64")
}
}

// Windows x86_64
implementation("com.ditto:ditto-binaries:5.0.0-java") {
implementation("com.ditto:ditto-binaries:5.0.0") {
capabilities {
requireCapability("com.ditto:ditto-binaries-windows-x64")
}
}

// Linux x86_64
implementation("com.ditto:ditto-binaries:5.0.0-java") {
implementation("com.ditto:ditto-binaries:5.0.0") {
capabilities {
requireCapability("com.ditto:ditto-binaries-linux-x64")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import java.io.File;
import java.util.List;
import java.util.concurrent.CompletionStage;

@Component
public class DittoService implements DisposableBean {
Expand Down Expand Up @@ -104,7 +103,7 @@ private DittoAsyncCancellable observePeersPresence() {

private DittoStoreObserver setupAndObserveSyncState() {
try {
boolean hasNoSyncState = ditto.getStore().execute(
boolean hasNoSyncState = ditto.getStore().executeRaw(
"SELECT * FROM %s".formatted(DITTO_SYNC_STATE_COLLECTION)
).toCompletableFuture().join().getItems().isEmpty();
if (hasNoSyncState) {
Expand Down Expand Up @@ -140,12 +139,12 @@ private DittoStoreObserver setupAndObserveSyncState() {

if (newSyncState) {
try {
ditto.startSync();
ditto.getSync().start();
} catch (DittoException e) {
throw new RuntimeException(e);
}
} else {
ditto.stopSync();
ditto.getSync().stop();
}

mutableSyncStatePublisher.tryEmitNext(newSyncState);
Expand All @@ -156,17 +155,11 @@ private DittoStoreObserver setupAndObserveSyncState() {
}

private void setSyncStateIntoDittoStore(boolean newState) {
CompletionStage<DittoQueryResult> future = ditto.getStore().execute(
ditto.getStore().execute(
"UPDATE %s SET %s = :syncState".formatted(DITTO_SYNC_STATE_COLLECTION, DITTO_SYNC_STATE_ID),
DittoCborSerializable.buildDictionary()
.put("syncState", newState)
.build()
);

try {
future.toCompletableFuture().join().close();
} catch (DittoException e) {
throw new RuntimeException(e);
}
).toCompletableFuture().join();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void addTask(@Nonnull String title) {

public void toggleTaskDone(@Nonnull String taskId) {
try {
DittoQueryResult tasks = dittoService.getDitto().getStore().execute(
DittoQueryResult tasks = dittoService.getDitto().getStore().executeRaw(
"SELECT * FROM %s WHERE _id = :taskId".formatted(TASKS_COLLECTION_NAME),
DittoCborSerializable.Dictionary.buildDictionary()
.put("taskId", taskId)
Expand Down
Loading