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.

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

Merge main to java-spi #114

Merged
merged 19 commits into from
Dec 19, 2024
Merged

Merge main to java-spi #114

merged 19 commits into from
Dec 19, 2024

Conversation

patriknw
Copy link
Member

DO NOT SQUASH

rasummer and others added 19 commits November 25, 2024 15:24
* chore: removing 'it' profile

ci, parent pom and moving samples 'it' to 'test'

* renaming '*IntegrationTest' to

* updating docs and updating class names (updating file names wan't enough)

* adding missing failsafe plugin

* Update akka-javasdk-maven/akka-javasdk-parent/pom.xml

Co-authored-by: Renato Cavalcanti <[email protected]>

* Update akka-javasdk-maven/akka-javasdk-parent/pom.xml

Co-authored-by: Renato Cavalcanti <[email protected]>

* Update docs/src/modules/java/pages/event-sourced-entities.adoc

Co-authored-by: Renato Cavalcanti <[email protected]>

* Update docs/src/modules/java/pages/key-value-entities.adoc

Co-authored-by: Renato Cavalcanti <[email protected]>

* Update .github/workflows/ci.yml

Co-authored-by: Renato Cavalcanti <[email protected]>

* docs: add local console to getting started guide (#58)

* docs: review support pages (#64)

* addressing comments

.+ back to IntegrationTest suffix

* Revert "docs: review support pages (#64)"

This reverts commit 493648d.

* Revert "docs: add local console to getting started guide (#58)"

This reverts commit 29311bf.

* fixing import

* removing snapshot version used when testing

* renaming class

---------

Co-authored-by: Renato Cavalcanti <[email protected]>
Co-authored-by: Brent Eritou <[email protected]>
Co-authored-by: Enno Runne <[email protected]>
@github-actions github-actions bot added documentation documentation related java-sdk labels Dec 19, 2024
@@ -167,7 +167,8 @@ class SdkRunner private (dependencyProvider: Option[DependencyProvider]) extends
startContext.remoteIdentification,
startContext.tracerFactory,
dependencyProvider,
startedPromise)
startedPromise,
getSettings.devMode.map(_.serviceName))
Copy link
Member Author

Choose a reason for hiding this comment

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

This ...

@@ -617,7 +619,7 @@ private final class Sdk(

override val serviceInfo: SpiServiceInfo =
new SpiServiceInfo(
serviceName = sdkSettings.devModeSettings.map(_.serviceName).getOrElse(""),
serviceName = serviceNameOverride.orElse(sdkSettings.devModeSettings.map(_.serviceName)).getOrElse(""),
Copy link
Member Author

Choose a reason for hiding this comment

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

... and this changed in 898ec6f#diff-26d7c802dc1ff7174ab9cbed72a852b5d31ce32af07c96b7686aa89a67fc328cR447

@efgpinto pls confirm that this is correct

Copy link
Contributor

Choose a reason for hiding this comment

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

Yup, correct. looks good. 👍

Copy link
Contributor

@efgpinto efgpinto left a comment

Choose a reason for hiding this comment

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

LGTM

@patriknw patriknw merged commit 303d940 into java-spi Dec 19, 2024
24 checks passed
@patriknw patriknw deleted the wip-merge-main-patriknw branch December 19, 2024 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation documentation related java-sdk
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants