Skip to content

[JENKINS-52693] - Make Build Data and ElasticSearchDao serializable #78

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

Open
oleg-nenashev wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[JENKINS-52693] - Make Build Data and ElasticSearchDao serializable #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4e9732
[JENKINS-52693] - Make Build Data and ElasticSearchDao serializable
oleg-nenashev Jul 23, 2018
7db2342
Merge branch 'master' into ext-logging-api
jakub-bochenski Nov 22, 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
3 changes: 2 additions & 1 deletion src/main/java/jenkins/plugins/logstash/persistence/BuildData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import hudson.tasks.test.TestResult;
import jenkins.plugins.logstash.LogstashConfiguration;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
Expand All @@ -62,7 +63,7 @@
* @author Rusty Gerard
* @since 1.0.0
*/
public class BuildData {
public class BuildData implements Serializable {
// ISO 8601 date format
private final static Logger LOGGER = Logger.getLogger(MethodHandles.lookup().lookupClass().getCanonicalName());
public static class TestData {
Expand Down
17 changes: 14 additions & 3 deletions src/main/java/jenkins/plugins/logstash/persistence/ElasticSearchDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URI;
Expand All @@ -54,16 +55,19 @@

import jenkins.plugins.logstash.utils.SSLHelper;

import javax.annotation.CheckForNull;


/**
* Elastic Search Data Access Object.
*
* @author Liam Newman
* @since 1.0.4
*/
public class ElasticSearchDao extends AbstractLogstashIndexerDao {
public class ElasticSearchDao extends AbstractLogstashIndexerDao implements Serializable {

private final HttpClientBuilder clientBuilder;
@CheckForNull
private transient HttpClientBuilder clientBuilder;
private final URI uri;
private final String auth;
private final Range<Integer> successCodes = closedOpen(200,300);
Expand Down Expand Up @@ -106,7 +110,14 @@ public ElasticSearchDao(URI uri, String username, String password) {
auth = null;
}

clientBuilder = factory == null ? HttpClientBuilder.create() : factory;
clientBuilder = factory;
}

HttpClientBuilder clientBuilder() {
Copy link

@jakub-bochenski jakub-bochenski Nov 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instances of this class need to be thread safe, so I think it would be better to override readObject() instead

if (clientBuilder == null) {
clientBuilder = HttpClientBuilder.create();
}
return clientBuilder;
}


Expand Down