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

Update to hapi-fhir 6.5.20-SNAPSHOT #530

Merged
merged 9 commits into from
May 17, 2023

Conversation

dotasek
Copy link
Contributor

@dotasek dotasek commented May 17, 2023

This fixes the following in order to get all tests running (smoke tests included)


ourClient.create().resource(topic).execute();

waitForSize(1, () -> ourClient.search().forResource(SubscriptionTopic.class).where(Subscription.STATUS.exactly().code("active")).cacheControl(new CacheControlDirective().setNoCache(true)).returnBundle(Bundle.class).execute().getEntry().size());
Copy link
Contributor

Choose a reason for hiding this comment

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

Nitpick: This is long and a bit hard to read without scrolling. I suggest breaking this down to one line per method call

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@@ -99,7 +114,8 @@ public void testWebsocketSubscription() throws Exception {
SocketImplementation mySocketImplementation = new SocketImplementation(mySubscriptionId.getIdPart(), EncodingEnum.JSON);

myWebSocketClient.start();
URI echoUri = new URI("ws://localhost:" + port + "/websocket");

URI echoUri = new URI(endpoint);
Copy link
Contributor

Choose a reason for hiding this comment

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

General comment: It seems our formatting (tabs) conflcts with jpa-serverstarter's formatting (spaces). It looks like your changes use tabs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think the lines with spaces are cruft from previous commits:

https://github.com/hapifhir/hapi-fhir-jpaserver-starter/blob/master/.editorconfig

My IntelliJ is picking .editorconfig up, and auto-formatting with tabs. I'm going to leave this alone for this PR so that the changes are clear-cut, but might do a reformat for this in a separate PR.

@KevinDougan KevinDougan merged commit 22722d8 into rel_6_5_tracking May 17, 2023
@patrick-werner patrick-werner deleted the do-20230516-fix-r5-subscription-it branch April 23, 2024 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants