Skip to content

Instantly share code, notes, and snippets.

@renner
Last active August 29, 2015 14:27
Show Gist options
  • Save renner/6384c04933bd73285b2c to your computer and use it in GitHub Desktop.
Save renner/6384c04933bd73285b2c to your computer and use it in GitHub Desktop.
Patch to make the https://github.com/SUSE/saltstack-netapi-client-java code compile with Eclipse 4.5
diff --git a/src/main/java/com/suse/saltstack/netapi/client/SaltStackClient.java b/src/main/java/com/suse/saltstack/netapi/client/SaltStackClient.java
index 5d326b4..6fbd1c9 100644
--- a/src/main/java/com/suse/saltstack/netapi/client/SaltStackClient.java
+++ b/src/main/java/com/suse/saltstack/netapi/client/SaltStackClient.java
@@ -163,7 +163,7 @@ public class SaltStackClient {
* @return true if the logout was successful, otherwise false
* @throws SaltStackException if anything goes wrong
*/
- public boolean logout() throws SaltStackException {
+ public Boolean logout() throws SaltStackException {
Result<String> stringResult = connectionFactory
.create("/logout", JsonParser.STRING, config).getResult("");
String logoutMessage = "Your token has been cleared";
@@ -525,6 +525,6 @@ public class SaltStackClient {
* triggering the event.
*/
public Future<Boolean> sendEventAsync(final String eventTag, final String eventData) {
- return executor.submit(() -> sendEvent(eventTag, eventData));
+ return executor.submit(() -> { return sendEvent(eventTag, eventData); });
}
}
diff --git a/src/main/java/com/suse/saltstack/netapi/event/EventStream.java b/src/main/java/com/suse/saltstack/netapi/event/EventStream.java
index 37d3171..5a565b2 100644
--- a/src/main/java/com/suse/saltstack/netapi/event/EventStream.java
+++ b/src/main/java/com/suse/saltstack/netapi/event/EventStream.java
@@ -84,7 +84,7 @@ public class EventStream implements AutoCloseable {
synchronized (websocketContainer) {
this.session = websocketContainer.connectToServer(this, uri);
this.session.setMaxIdleTimeout(
- config.get(ClientConfig.SOCKET_TIMEOUT));
+ (long) config.get(ClientConfig.SOCKET_TIMEOUT));
}
}
@@ -98,7 +98,7 @@ public class EventStream implements AutoCloseable {
uri.getSchemeSpecificPart(), uri.getFragment())
.resolve("/ws/" + config.get(ClientConfig.TOKEN));
websocketContainer.setDefaultMaxSessionIdleTimeout(
- config.get(ClientConfig.SOCKET_TIMEOUT));
+ (long) config.get(ClientConfig.SOCKET_TIMEOUT));
processEvents(uri, config);
} catch (URISyntaxException | DeploymentException | IOException e) {
throw new SaltStackException(e);
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment