Support websocket URLs #21

dominikl · 2019-08-19T13:43:26Z

Websocket connection works in principle, but at the moment you'll get a "Failed to get inet address...." warning when the gateway tries to get the IP of the server. This PR just fixes the issue.

Test with something like this, e.g. against idr next ( this would implicitly also test ome/omero-blitz#66 ):

public static void main(String... args) throws Exception {
        LoginCredentials cred = new LoginCredentials("USERNAME",
                "PASSWORD",
                "wss://[OMERO SERVER]/omero-ws", 443);
        Gateway gateway = new Gateway(new SimpleLogger());
        ExperimenterData user = gateway.connect(cred);
        System.out.println("Logged in as "+user.getUserName());
        gateway.disconnect();
    }

Then also test the 'normal' login via hostname only, and hostname + port.

jburel · 2019-08-20T09:35:56Z

tested in a notebook with today's gateway build.
I can connect to idr-next.
Few difference with the Python connection: ws is used instead of wss. Port did not have to be specified.
It did not work if I use ws or if the port is not specified.
cc @manics

src/main/java/omero/gateway/Gateway.java

jburel · 2019-08-20T09:40:18Z

i also tested using R and I could connect to idr-next too

dominikl · 2019-08-20T15:05:33Z

Sorry @jburel , I pretty much overhauled the ServerInformation class again, would have to test again. So basically there are now two methods: The previous getHostname() which now really only returns the hostname (even if a websocket URL was specified) and getHost() which either returns a websocket address or the hostname (if only a hostname was specified), as intended to be used to create the omero.client.
This should be backwards compatible, because the behaviour of setHostname() and getHostname() doesn't change when used with hostnames like it used to be (only for the new websocket URLs it will be different).

src/main/java/omero/gateway/ServerInformation.java

src/main/java/omero/gateway/LoginCredentials.java

src/main/java/omero/gateway/ServerInformation.java

manics

One minor comment, but based on testing ome/omero-insight#66 this works well.

src/main/java/omero/gateway/LoginCredentials.java

joshmoore

Two minor comments that can easily be handled in a follow-up. They are more general guidelines that we could apply to all Java classes. Otherwise, 👍

src/main/java/omero/gateway/LoginCredentials.java

src/main/java/omero/gateway/ServerInformation.java

joshmoore

Seems like the final-related issues I saw previously have been taken care of.

One thing outwith this PR to discuss: the addition of methods would suggest this be released as 5.6, for example, if someone has previously subclassed.

dominikl · 2019-10-22T10:28:22Z

I'm not sure what that means with respect to merging the PR: Can't be merged until we plan to release a 5.6 version?

manics · 2019-10-22T10:31:40Z

I vote for getting this in, I've tested the merge build in a Docker container on mybinder.org and it's worked!

joshmoore · 2019-10-22T10:32:13Z

I'd put it the other way around. I don't see anything blocking the release of this PR, but we should discuss the version number.

manics · 2019-10-22T12:34:57Z

Noticed an issue on Linux when no preferences are set:

$ rm -rf ~/.java ~/omero
$ ./OMERO.insight-5.5.7-SNAPSHOT/bin/omero-insight

Oct 22, 2019 12:28:39 PM java.util.prefs.FileSystemPreferences$1 run
INFO: Created user preferences directory.
Abnormal termination due to an uncaught exception.
java.lang.NullPointerException
	at org.openmicroscopy.shoola.util.ui.login.ServerEditor.initComponents(ServerEditor.java:182)
	at org.openmicroscopy.shoola.util.ui.login.ServerEditor.<init>(ServerEditor.java:378)
	at org.openmicroscopy.shoola.util.ui.login.ServerEditor.<init>(ServerEditor.java:365)
	at org.openmicroscopy.shoola.util.ui.login.ScreenLogin.<init>(ScreenLogin.java:835)
	at org.openmicroscopy.shoola.env.ui.SplashScreenManager.initializedView(SplashScreenManager.java:172)
	at org.openmicroscopy.shoola.env.ui.SplashScreenManager.<init>(SplashScreenManager.java:236)
	at org.openmicroscopy.shoola.env.ui.SplashScreenProxy.<init>(SplashScreenProxy.java:123)
	at org.openmicroscopy.shoola.env.ui.UIFactory.makeSplashScreen(UIFactory.java:59)
	at org.openmicroscopy.shoola.env.init.SplashScreenInit.execute(SplashScreenInit.java:86)
	at org.openmicroscopy.shoola.env.init.Initializer.doInit(Initializer.java:275)
	at org.openmicroscopy.shoola.env.Container.runStartupProcedure(Container.java:118)
	at org.openmicroscopy.shoola.env.Container.access$000(Container.java:68)
	at org.openmicroscopy.shoola.env.Container$1.run(Container.java:164)
	at java.lang.Thread.run(Thread.java:748)
Abnormal termination due to an uncaught exception.
java.lang.NullPointerException
	at org.openmicroscopy.shoola.util.ui.login.ServerEditor.initComponents(ServerEditor.java:182)
	at org.openmicroscopy.shoola.util.ui.login.ServerEditor.<init>(ServerEditor.java:378)
	at org.openmicroscopy.shoola.util.ui.login.ServerEditor.<init>(ServerEditor.java:365)
	at org.openmicroscopy.shoola.util.ui.login.ScreenLogin.<init>(ScreenLogin.java:835)
	at org.openmicroscopy.shoola.env.ui.SplashScreenManager.initializedView(SplashScreenManager.java:172)
	at org.openmicroscopy.shoola.env.ui.SplashScreenManager.<init>(SplashScreenManager.java:236)
	at org.openmicroscopy.shoola.env.ui.SplashScreenProxy.<init>(SplashScreenProxy.java:123)
	at org.openmicroscopy.shoola.env.ui.UIFactory.makeSplashScreen(UIFactory.java:59)
	at org.openmicroscopy.shoola.env.init.SplashScreenInit.execute(SplashScreenInit.java:86)
	at org.openmicroscopy.shoola.env.init.Initializer.doInit(Initializer.java:275)
	at org.openmicroscopy.shoola.env.Container.runStartupProcedure(Container.java:118)
	at org.openmicroscopy.shoola.env.Container.access$000(Container.java:68)
	at org.openmicroscopy.shoola.env.Container$1.run(Container.java:164)
	at java.lang.Thread.run(Thread.java:748)
Exception in thread "Initializer"

dominikl · 2019-10-22T13:01:17Z

Thanks, good point, I never tested this case. Rather refers to ome/omero-insight#66 I think.

sbesson · 2019-10-23T09:37:07Z

Re version numbers, reading the difference between master and the last tag. I see #22 #18 both introduce backwards-compatible API and deprecate some methods. My vote also goes towards calling this a day, merging and releasing all features since 5.5.4 as org.openmicroscopy:omero-gateway:5.6.0

dominikl · 2019-10-23T15:50:23Z

Sorry, had to add one more commit to bump the blitz version to 5.5.4 so that ome/omero-blitz#66 is included. On that occassion also rebased to latest master branch.

jburel · 2019-12-17T13:35:30Z

src/main/java/omero/gateway/ServerInformation.java

+                this.uri = new URI(null,null, hostname,
+                        port, null, null, null);
+            }
+        } catch (URISyntaxException e) {


Do you want to log the error?

Thought about it. But at that point I don't have any reference to the Gateway, which has the Logger.

ok understood

dominikl mentioned this pull request Aug 19, 2019

Increase IceSSL.VerifyDepthMax ome/omero-blitz#66

Merged

sbesson reviewed Aug 20, 2019

View reviewed changes

src/main/java/omero/gateway/Gateway.java Outdated Show resolved Hide resolved

dominikl mentioned this pull request Aug 21, 2019

Make Insight login work with websocket URLs ome/omero-insight#66

Merged

jburel reviewed Aug 22, 2019

View reviewed changes

src/main/java/omero/gateway/ServerInformation.java Show resolved Hide resolved

jburel reviewed Aug 22, 2019

View reviewed changes

src/main/java/omero/gateway/ServerInformation.java Show resolved Hide resolved

jburel reviewed Sep 3, 2019

View reviewed changes

src/main/java/omero/gateway/LoginCredentials.java Outdated Show resolved Hide resolved

src/main/java/omero/gateway/LoginCredentials.java Outdated Show resolved Hide resolved

src/main/java/omero/gateway/ServerInformation.java Outdated Show resolved Hide resolved

manics mentioned this pull request Sep 5, 2019

Support wss external websocket connections to demo ome/prod-playbooks#204

Merged

manics reviewed Sep 9, 2019

View reviewed changes

src/main/java/omero/gateway/LoginCredentials.java Outdated Show resolved Hide resolved

dominikl changed the title ~~Get hostname in case URL was given~~ Support websocket URLs Sep 12, 2019

joshmoore reviewed Sep 13, 2019

View reviewed changes

src/main/java/omero/gateway/LoginCredentials.java Outdated Show resolved Hide resolved

src/main/java/omero/gateway/ServerInformation.java Show resolved Hide resolved

joshmoore approved these changes Sep 25, 2019

View reviewed changes

manics approved these changes Oct 22, 2019

View reviewed changes

dominikl added 9 commits October 23, 2019 16:29

Get hostname in case URL was given

d7d8be5

Only use URI in ServerInformation

51019d2

Add hashCode and equals again

d638161

Just clarified method doc a bit

51ebd15

Adjust LoginCredentials for URLs

51295b1

Fixed issue and comment

fa791c4

Deprecate setHostname method

3151fad

Handle case where port is specified as part of host string

2d8b899

Just some minor code formatting

6c24ff4

dominikl added 6 commits October 23, 2019 16:29

Set port 80 in case of ws:/ URL

c6ade33

Replace Map with enum

dfae1b3

Fix pot. issue: don't clear port on setHost call

154e8ac

Remove unneccessary override of equals/hashcode

00acc68

Remove unused import

592bc0e

Bump blitz version to 5.5.4

8f44078

dominikl force-pushed the wss branch from fb7f692 to 8f44078 Compare October 23, 2019 15:48

jburel reviewed Dec 17, 2019

View reviewed changes

jburel merged commit c40c55a into ome:master Dec 17, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support websocket URLs #21

Support websocket URLs #21

dominikl commented Aug 19, 2019 •

edited

Loading

jburel commented Aug 20, 2019 •

edited

Loading

jburel commented Aug 20, 2019

dominikl commented Aug 20, 2019 •

edited

Loading

manics left a comment

joshmoore left a comment

joshmoore left a comment

dominikl commented Oct 22, 2019

manics commented Oct 22, 2019

joshmoore commented Oct 22, 2019

manics commented Oct 22, 2019

dominikl commented Oct 22, 2019

sbesson commented Oct 23, 2019

dominikl commented Oct 23, 2019

jburel Dec 17, 2019

dominikl Dec 17, 2019

jburel Dec 17, 2019

Support websocket URLs #21

Support websocket URLs #21

Conversation

dominikl commented Aug 19, 2019 • edited Loading

jburel commented Aug 20, 2019 • edited Loading

jburel commented Aug 20, 2019

dominikl commented Aug 20, 2019 • edited Loading

manics left a comment

Choose a reason for hiding this comment

joshmoore left a comment

Choose a reason for hiding this comment

joshmoore left a comment

Choose a reason for hiding this comment

dominikl commented Oct 22, 2019

manics commented Oct 22, 2019

joshmoore commented Oct 22, 2019

manics commented Oct 22, 2019

dominikl commented Oct 22, 2019

sbesson commented Oct 23, 2019

dominikl commented Oct 23, 2019

jburel Dec 17, 2019

Choose a reason for hiding this comment

dominikl Dec 17, 2019

Choose a reason for hiding this comment

jburel Dec 17, 2019

Choose a reason for hiding this comment

dominikl commented Aug 19, 2019 •

edited

Loading

jburel commented Aug 20, 2019 •

edited

Loading

dominikl commented Aug 20, 2019 •

edited

Loading