Skip to content

merge develop to feature branch and update locks #107

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jul 24, 2018
Merged

merge develop to feature branch and update locks #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7aa9f98
update bintray to 1.8.4 (#102)
qinfchen Jul 23, 2018
48c5bf7
use JsonAlias for kabab case support (#106)
qinfchen Jul 24, 2018
d0a767e
Merge branch 'develop' into feature-conjure
qinfchen Jul 24, 2018
a3f8c35
merge develop and update locks
qinfchen Jul 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions errors/versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
{
"compileClasspath": {
"com.fasterxml.jackson.core:jackson-annotations": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind"
]
},
"com.fasterxml.jackson.core:jackson-core": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind"
]
},
"com.fasterxml.jackson.core:jackson-databind": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.google.code.findbugs:jsr305": {
"locked": "3.0.1"
},
"com.palantir.safe-logging:safe-logging": {
"locked": "1.3.0"
"locked": "1.5.0"
},
"javax.ws.rs:javax.ws.rs-api": {
"locked": "2.0.1"
}
},
"runtime": {
"com.fasterxml.jackson.core:jackson-annotations": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind"
]
},
"com.fasterxml.jackson.core:jackson-core": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind"
]
},
"com.fasterxml.jackson.core:jackson-databind": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.google.code.findbugs:jsr305": {
"locked": "3.0.1"
},
"com.palantir.safe-logging:safe-logging": {
"locked": "1.3.0"
"locked": "1.5.0"
},
"javax.ws.rs:javax.ws.rs-api": {
"locked": "2.0.1"
Expand Down
42 changes: 22 additions & 20 deletions extras/jackson-support/versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"compileClasspath": {
"com.fasterxml.jackson.core:jackson-annotations": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind"
"com.fasterxml.jackson.core:jackson-databind",
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
]
},
"com.fasterxml.jackson.core:jackson-core": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind",
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor",
Expand All @@ -18,7 +19,7 @@
]
},
"com.fasterxml.jackson.core:jackson-databind": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.datatype:jackson-datatype-guava",
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
Expand All @@ -27,36 +28,37 @@
]
},
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.datatype:jackson-datatype-guava": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.module:jackson-module-afterburner": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.google.guava:guava": {
"locked": "15.0",
"locked": "18.0",
"transitive": [
"com.fasterxml.jackson.datatype:jackson-datatype-guava"
]
}
},
"runtime": {
"com.fasterxml.jackson.core:jackson-annotations": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind"
"com.fasterxml.jackson.core:jackson-databind",
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
]
},
"com.fasterxml.jackson.core:jackson-core": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.core:jackson-databind",
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor",
Expand All @@ -67,7 +69,7 @@
]
},
"com.fasterxml.jackson.core:jackson-databind": {
"locked": "2.6.7",
"locked": "2.9.5",
"transitive": [
"com.fasterxml.jackson.datatype:jackson-datatype-guava",
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
Expand All @@ -76,22 +78,22 @@
]
},
"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.datatype:jackson-datatype-guava": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.fasterxml.jackson.module:jackson-module-afterburner": {
"locked": "2.6.7"
"locked": "2.9.5"
},
"com.google.guava:guava": {
"locked": "15.0",
"locked": "18.0",
"transitive": [
"com.fasterxml.jackson.datatype:jackson-datatype-guava"
]
Expand Down
54 changes: 10 additions & 44 deletions ...c/main/java/com/palantir/conjure/java/api/config/service/PartialServiceConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.palantir.conjure.java.api.config.service;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
Expand All @@ -32,6 +32,7 @@
public interface PartialServiceConfiguration {

/** The API token to be used to interact with the service. */
@JsonAlias("api-token")
Optional<BearerToken> apiToken();

/** The SSL configuration needed to interact with the service. */
Expand All @@ -41,27 +42,34 @@ public interface PartialServiceConfiguration {
List<String> uris();

/** Connect timeout for requests. */
@JsonAlias("connect-timeout")
Optional<HumanReadableDuration> connectTimeout();

/** Read timeout for requests. */
@JsonAlias("read-timeout")
Optional<HumanReadableDuration> readTimeout();

/** Write timeout for requests. */
@JsonAlias("write-timeout")
Optional<HumanReadableDuration> writeTimeout();

/** The maximum number of times a failed RPC call should be retried. */
@JsonAlias("max-num-retries")
Optional<Integer> maxNumRetries();

/**
* The size of one backoff time slot for call retries. For example, an exponential backoff retry algorithm may
* choose a backoff time in {@code [0, backoffSlotSize * 2^c]} for the c-th retry.
*/
@JsonAlias("backoff-slot-size")
Optional<HumanReadableDuration> backoffSlotSize();

/** Enables slower, but more standard cipher suite support, defaults to false. */
@JsonAlias("enable-gcm-cipher-suites")
Optional<Boolean> enableGcmCipherSuites();

/** Proxy configuration for connecting to the service. If absent, uses system proxy configuration. */
@JsonAlias("proxy-configuration")
Optional<ProxyConfiguration> proxyConfiguration();

static PartialServiceConfiguration of(List<String> uris, Optional<SslConfiguration> sslConfig) {
Expand All @@ -75,47 +83,5 @@ static Builder builder() {
return new Builder();
}

// TODO(jnewman): #317 - remove kebab-case methods when Jackson 2.7 is picked up
class Builder extends ImmutablePartialServiceConfiguration.Builder {

@JsonProperty("api-token")
Builder apiTokenKebabCase(Optional<BearerToken> apiToken) {
return apiToken(apiToken);
}

@JsonProperty("connect-timeout")
Builder connectTimeoutKebabCase(Optional<HumanReadableDuration> connectTimeout) {
return connectTimeout(connectTimeout);
}

@JsonProperty("read-timeout")
Builder readTimeoutKebabCase(Optional<HumanReadableDuration> readTimeout) {
return readTimeout(readTimeout);
}

@JsonProperty("write-timeout")
Builder writeTimeoutKebabCase(Optional<HumanReadableDuration> writeTimeout) {
return writeTimeout(writeTimeout);
}

@JsonProperty("max-num-retries")
Builder maxNumRetriesKebabCase(Optional<Integer> maxNumRetries) {
return maxNumRetries(maxNumRetries);
}

@JsonProperty("backoff-slot-size")
Builder backoffSlotSizeKebabCase(Optional<HumanReadableDuration> backoffSlotSize) {
return backoffSlotSize(backoffSlotSize);
}

@JsonProperty("proxy-configuration")
Builder proxyConfigurationKebabCase(Optional<ProxyConfiguration> proxyConfiguration) {
return proxyConfiguration(proxyConfiguration);
}

@JsonProperty("enable-gcm-cipher-suites")
Builder enableGcmCipherSuitesKebabCase(Optional<Boolean> enableGcmCipherSuites) {
return enableGcmCipherSuites(enableGcmCipherSuites);
}
}
class Builder extends ImmutablePartialServiceConfiguration.Builder { }
}
11 changes: 3 additions & 8 deletions ...config/src/main/java/com/palantir/conjure/java/api/config/service/ProxyConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.palantir.conjure.java.api.config.service;

import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
Expand Down Expand Up @@ -56,6 +57,7 @@ public enum Type {
* com.google.common.net.HostAndPort}, for instance {@code foo.com:80}, {@code 192.168.3.100:8080}, etc.
*/
@JsonProperty("hostAndPort")
@JsonAlias("host-and-port")
public abstract Optional<String> hostAndPort();

/**
Expand Down Expand Up @@ -115,12 +117,5 @@ public static Builder builder() {
return new Builder();
}

// TODO(jnewman): #317 - remove kebab-case methods when Jackson 2.7 is picked up
static final class Builder extends ImmutableProxyConfiguration.Builder {

@JsonProperty("host-and-port")
Builder hostAndPortKebabCase(String hostAndPort) {
return hostAndPort(hostAndPort);
}
}
static final class Builder extends ImmutableProxyConfiguration.Builder {}
}
Loading