Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Server bindings #17

Merged
merged 35 commits into from
Nov 9, 2023
Merged

Server bindings #17

merged 35 commits into from
Nov 9, 2023

Conversation

SirCipher
Copy link
Member

No description provided.

@SirCipher
Merge
01a107a
@SirCipher
Resolves merge issues
88e7973
@SirCipher
Adds server skeleton
c236dfe
@SirCipher
Server skeleton
46cddcf
@SirCipher
Merge branch 'cookbooks' of https://github.com/swimos/swim-rust-ffi i…
25e6ff8 
…nto server-bindings

# Conflicts:
#	rust-java-bridge/Cargo.toml
#	rust-java-bridge/swim_client/src/lib.rs
#	swim-java/settings.gradle
#	swim-java/swim-client/build.gradle
#	swim-java/swim-client/src/main/java/ai/swim/client/downlink/DownlinkConfig.java
#	swim-java/swim-client/src/main/java/ai/swim/client/downlink/TriConsumer.java
#	swim-java/swim-client/src/main/java/ai/swim/client/lifecycle/OnClear.java
#	swim-java/swim-client/src/main/java/ai/swim/client/lifecycle/OnRemove.java
#	swim-java/swim-client/src/test/java/ai/swim/client/downlink/value/ValueDownlinkTest.java
#	swim-java/swim-core/swim-concurrent/src/main/java/ai/swim/concurrent/Trigger.java
#	swim-java/swim-core/swim-structure/src/main/java/ai/swim/structure/recognizer/structural/PolymorphicRecognizer.java
#	swim-java/swim-ffi/swim.lang.ffi/src/main/java/ai/swim/lang/ffi/NativeResourceException.java
@SirCipher
Tidy up
65eb506
@SirCipher
Merge branch 'builder' of https://github.com/swimos/swim-rust-ffi int…
c699034 
…o server-bindings

# Conflicts:
#	swim-java/swim-client/src/main/java/ai/swim/client/SwimClient.java
#	swim-java/swim-client/src/test/java/ai/swim/client/downlink/value/ValueDownlinkTest.java
@SirCipher
Merge
8795a35
@SirCipher
Removes ignored files
013e308
@SirCipher
Adds server framework
8760931
@SirCipher
Fixes errors in codecs. Value lane responses are now sent to peers
c98a83d
@SirCipher
Adds lane syncing
fc91918
@SirCipher
Aborts vm when a failure is encountered in getting the JniEnv
5b09f1e
@SirCipher
Merge branch 'env' of https://github.com/swimos/swim-rust-ffi into se…
0130b41 
…rver-bindings

# Conflicts:
#	rust-java-bridge/Cargo.toml
#	rust-java-bridge/jvm_sys/Cargo.toml
#	rust-java-bridge/jvm_sys/jvm_sys_tests/src/lib.rs
#	rust-java-bridge/jvm_sys/src/lib.rs
#	rust-java-bridge/jvm_sys/src/vm/method.rs
#	rust-java-bridge/jvm_sys/src/vm/mod.rs
#	rust-java-bridge/jvm_sys/src/vm/utils.rs
#	rust-java-bridge/rust-java-bridge.iml
#	rust-java-bridge/swim_client/src/lib.rs
#	rust-java-bridge/swim_client/swim_client_core/src/downlink/map/lifecycle.rs
#	rust-java-bridge/swim_client/swim_client_core/src/downlink/map/mod.rs
#	rust-java-bridge/swim_client/swim_client_core/src/downlink/value/lifecycle.rs
#	rust-java-bridge/swim_client/swim_client_core/src/downlink/value/mod.rs
#	rust-java-bridge/swim_client/swim_client_core/src/downlink/vtable.rs
#	rust-java-bridge/swim_client/swim_client_core/src/lib.rs
#	rust-java-bridge/swim_client/swim_client_test/src/lib.rs
#	rust-java-bridge/swim_client/swim_client_test/src/value.rs
#	swim-java/swim-client/src/main/java/ai/swim/client/SwimClient.java
#	swim-java/swim-client/src/main/java/ai/swim/client/downlink/DownlinkConfig.java
#	swim-java/swim-client/src/test/java/ai/swim/client/downlink/map/MapDownlinkTest.java
#	swim-java/swim-client/src/test/java/ai/swim/client/downlink/value/ValueDownlinkTest.java
#	swim-java/swim-core/swim-structure/src/main/java/ai/swim/structure/recognizer/SimpleRecognizer.java
#	swim-rust
@SirCipher
Merges new env structure
eaf415b
@SirCipher
Adds some documentation to the Swim Java server
3ab0b97
@SirCipher
Changes ffi calls to operate on ints for laneUris instead of Strigns
b760560
@SirCipher
Shifts Java downlink logic to its own module
611a933
@SirCipher
Adds support for dynamic lane opening
1ceab0a
@SirCipher
Adds runtime spending for Rust->Java->Rust callbacks
5f95b1e
@SirCipher
Adds FFI agent test fixture
4817350
@SirCipher
Reworks encoding. Adds agent test fixture and tests
da29c51
@SirCipher
Merge branch 'env' of https://github.com/swimos/swim-rust-ffi into se…
1d28154 
…rver-bindings
@SirCipher SirCipher marked this pull request as ready for review September 25, 2023 15:36
@SirCipher
Merge branch 'main' of https://github.com/swimos/swim-rust-ffi into s…
c77f7cd 
…erver-bindings

# Conflicts:
#	rust-java-bridge/jvm_sys/Cargo.toml
#	rust-java-bridge/jvm_sys/src/env.rs
@SirCipher
Merges main
81cd166
@SirCipher
Removes unused code
46cd80f
@SirCipher
Reformats using checkstyle rules
7ff08a9
@SirCipher
Merge branch 'main' of https://github.com/swimos/swim-rust-ffi into s…
ce9f16f 
…erver-bindings

# Conflicts:
#	swim-java/checkstyle.xml
#	swim-java/cookbook/value_downlink/src/main/java/swim/cookbook/CustomClient.java
#	swim-java/swim-client/src/main/java/ai/swim/client/downlink/map/MapDownlinkBuilder.java
#	swim-java/swim-client/src/main/java/ai/swim/client/downlink/map/MapDownlinkModel.java
#	swim-java/swim-client/src/test/java/ai/swim/client/downlink/value/ValueDownlinkTest.java
@SirCipher
Resolves merge conflict with main
9c9c5d8
horned-sphere
horned-sphere reviewed Sep 27, 2023
View reviewed changes
Copy link

@horned-sphere horned-sphere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A lot of the new types (in Rust and Java) are very light on doc comments/comments at all.

Also, I checked it out to look more closely at a couple of things and cargo check on "rust-java-bridge" fails with:

error: failed to load manifest for workspace member `/Users/greg/projects/swim-rust-ffi/rust-java-bridge/swim_client`

Caused by:
  failed to load manifest for dependency `runtime`

Caused by:
  failed to read `/Users/greg/projects/swim-rust-ffi/swim-rust/client/runtime/Cargo.toml`

Caused by:
  No such file or directory (os error 2)

rust-java-bridge/bytebridge/bytebridge_derive/internals/src/lib.rs Show resolved Hide resolved
rust-java-bridge/jvm_sys/src/bridge.rs Show resolved Hide resolved
rust-java-bridge/jvm_sys/src/env.rs Show resolved Hide resolved
rust-java-bridge/jvm_sys/src/bridge.rs Outdated Show resolved Hide resolved
rust-java-bridge/jvm_sys/src/env.rs Outdated Show resolved Hide resolved
rust-java-bridge/jvm_sys/src/env.rs Outdated Show resolved Hide resolved
rust-java-bridge/jvm_sys/src/macros.rs Outdated Show resolved Hide resolved
rust-java-bridge/swim_server/swim_server_core/src/lib.rs Outdated Show resolved Hide resolved
rust-java-bridge/swim_server/swim_server_core/src/spec.rs Show resolved Hide resolved
swim-java/swim-server/src/main/java/ai/swim/server/codec/Bytes.java Show resolved Hide resolved
@SirCipher
Copy link
Member Author

@horned-sphere, you need to check out the swim-rust submodule that's in the repo - I should add some instructions.

I'll work on your other comments and add some documentation.

@SirCipher SirCipher merged commit e9c1f74 into main Nov 9, 2023
@SirCipher SirCipher deleted the server-bindings branch November 9, 2023 13:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@horned-sphere horned-sphere horned-sphere approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@SirCipher @horned-sphere