Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: eclipse-passage/passage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 52aad55a8ab0f2ef5e0efba826e64d72aebc1802
Choose a base ref
..
head repository: eclipse-passage/passage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c9ba9c67f2573fd47a60884d3c543a5d0256c1e2
Choose a head ref
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
import org.eclipse.jetty.server.Server;
import org.eclipse.passage.lic.internal.jetty.i18n.Messages;
import org.eclipse.passage.lic.internal.net.connect.Port;
import org.eclipse.passage.lic.internal.net.connect.Listen;
import org.eclipse.passage.lic.internal.net.connect.BindAddress;

public final class JettyServer {

@@ -35,7 +35,7 @@ public JettyServer(Supplier<JettyHandler> handler) {
this.handler = handler;
}

public void launch(Listen listen, Port port) throws JettyException {
public void launch(BindAddress listen, Port port) throws JettyException {
try {
InetSocketAddress address = InetSocketAddress.createUnresolved(listen.get().get(),
port.get().get());
Original file line number Diff line number Diff line change
@@ -21,20 +21,20 @@
import org.eclipse.passage.lic.internal.jetty.JettyException;
import org.eclipse.passage.lic.internal.jetty.JettyServer;
import org.eclipse.passage.lic.internal.net.connect.Port;
import org.eclipse.passage.lic.internal.net.connect.Listen;
import org.eclipse.passage.lic.internal.net.connect.BindAddress;

final class ServerHandles extends Command {

private final Logger log = LogManager.getLogger(getClass());
private final JettyServer server;
private final LicenseProtection license = new LicenseProtection();
private final Listen listen;
private final BindAddress listen;
private final Port port;

ServerHandles(JettyServer server, String name) {
super(new Scope.Of(name), new Handlers().get());
this.server = server;
this.listen = new Listen("0.0.0.0"); //$NON-NLS-1$
this.listen = new BindAddress("0.0.0.0"); //$NON-NLS-1$
this.port = new Port(8090);
}

@@ -65,15 +65,15 @@ public void restart() {

public void state() {
try {
String usedListen = listen.get().orElse("-"); //$NON-NLS-1$
String usedBindAddress = listen.get().orElse("-"); //$NON-NLS-1$
String usedPort = port.get().map(i -> i.toString()).orElse("-"); //$NON-NLS-1$
System.out.println(server.state() + " listen on " + usedListen + " on port " + usedPort); //$NON-NLS-1$ //$NON-NLS-2$
System.out.println(server.state() + " listen on " + usedBindAddress + " on port " + usedPort); //$NON-NLS-1$ //$NON-NLS-2$
} catch (JettyException e) {
log.error("failed to report state of Jetty server", e); //$NON-NLS-1$
}
}

public ServerHandles(Scope scope, String[] names, JettyServer server, Listen listen,
public ServerHandles(Scope scope, String[] names, JettyServer server, BindAddress listen,
Port port) {
super(scope, names);
this.server = server;
Original file line number Diff line number Diff line change
@@ -14,24 +14,23 @@

import java.util.Optional;

//FIXME: correct since versions
/**
* @since 2.4
* @since 2.5
*/
public final class Listen extends CliParameter<String> {
public final class BindAddress extends CliParameter<String> {

/**
* @since 2.4
* @since 2.5
*/
public Listen() {
public BindAddress() {
super("0.0.0.0"); //$NON-NLS-1$
}

public Listen(String lazy) {
public BindAddress(String lazy) {
super(lazy);
}

public Listen(String[] sources, String lazy) {
public BindAddress(String[] sources, String lazy) {
super(sources, lazy);
}