summaryrefslogtreecommitdiffstats
path: root/vespa-http-client
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2019-03-14 11:11:35 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2019-03-14 11:11:35 +0100
commit062a151d63eab1e3826d6784d368394e237cfa30 (patch)
treec5bbbdc32125620dbaebdfbe2257bfcc424edf06 /vespa-http-client
parentff201447a3e3d1ef22232742c99ea0aa7ab72718 (diff)
Ignore fields that are not serializable
Diffstat (limited to 'vespa-http-client')
-rw-r--r--vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/ConnectionParams.java3
-rw-r--r--vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationStats.java2
2 files changed, 2 insertions, 3 deletions
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/ConnectionParams.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/ConnectionParams.java
index 9e34d4d1747..3747f37eb00 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/ConnectionParams.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/config/ConnectionParams.java
@@ -2,7 +2,6 @@
package com.yahoo.vespa.http.client.config;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.google.common.annotations.Beta;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import net.jcip.annotations.Immutable;
@@ -343,7 +342,7 @@ public final class ConnectionParams {
public Collection<Map.Entry<String, String>> getHeaders() {
return Collections.unmodifiableCollection(headers.entries());
}
-
+ @JsonIgnore
public Map<String, HeaderProvider> getDynamicHeaders() {
return Collections.unmodifiableMap(headerProviders);
}
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationStats.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationStats.java
index 014bcf41951..22bc34f7dbe 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationStats.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationStats.java
@@ -32,7 +32,7 @@ public class OperationStats {
StringWriter stringWriter = new StringWriter();
try {
JsonGenerator jsonGenerator = jsonFactory.createGenerator(stringWriter);
- objectMapper.writeValue(jsonGenerator, sessionParams);
+ objectMapper.writeValue(jsonGenerator, sessionParams); // TODO SessionParams should not be blindly serialized. This may serialize objects that are not really serializable.
return stringWriter.toString();
} catch (IOException e) {
return e.getMessage();