Skip to content

Rename RequestEventsJsonStream to HystrixRequestEventsJsonStream #1070

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 3 commits into from
Jan 26, 2016
Merged

Rename RequestEventsJsonStream to HystrixRequestEventsJsonStream #1070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9895fb9
Rename RequestEventsJsonStream to HystrixRequestEventsJsonStream
Jan 26, 2016
ef0b928
Added a JSON converter for a single request in HystrixRequestEventsJs…
Jan 26, 2016
ee79759
Missed changing a method name reference
Jan 26, 2016
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: 12 additions & 4 deletions ...uests/stream/RequestEventsJsonStream.java → ...tream/HystrixRequestEventsJsonStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,36 @@
import java.io.StringWriter;
import java.util.Collection;

public class RequestEventsJsonStream {
public class HystrixRequestEventsJsonStream {
private static final JsonFactory jsonFactory = new JsonFactory();

public Observable<HystrixRequestEvents> getStream() {
return HystrixRequestEventsStream.getInstance()
.observe();
}

public static String convertToJson(Collection<HystrixRequestEvents> requests) throws IOException {
public static String convertRequestsToJson(Collection<HystrixRequestEvents> requests) throws IOException {
StringWriter jsonString = new StringWriter();
JsonGenerator json = jsonFactory.createGenerator(jsonString);

json.writeStartArray();
for (HystrixRequestEvents request : requests) {
convertRequestToJson(json, request);
writeRequestAsJson(json, request);
}
json.writeEndArray();
json.close();
return jsonString.getBuffer().toString();
}

private static void convertRequestToJson(JsonGenerator json, HystrixRequestEvents request) throws IOException {
public static String convertRequestToJson(HystrixRequestEvents request) throws IOException {
StringWriter jsonString = new StringWriter();
JsonGenerator json = jsonFactory.createGenerator(jsonString);
writeRequestAsJson(json, request);
json.close();
return jsonString.getBuffer().toString();
}

private static void writeRequestAsJson(JsonGenerator json, HystrixRequestEvents request) throws IOException {
json.writeStartObject();
json.writeStringField("request", request.getRequestContext().toString());
json.writeObjectFieldStart("commands");
Expand Down
6 changes: 3 additions & 3 deletions ...main/java/com/netflix/hystrix/contrib/requests/stream/HystrixRequestEventsSseServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ public class HystrixRequestEventsSseServlet extends HttpServlet {
DynamicPropertyFactory.getInstance().getIntProperty("hystrix.requests.stream.maxConcurrentConnections", 5);

private final LinkedBlockingQueue<HystrixRequestEvents> requestQueue = new LinkedBlockingQueue<HystrixRequestEvents>(DEFAULT_QUEUE_DEPTH);
private final RequestEventsJsonStream requestEventsJsonStream;
private final HystrixRequestEventsJsonStream requestEventsJsonStream;

public HystrixRequestEventsSseServlet() {
requestEventsJsonStream = new RequestEventsJsonStream();
requestEventsJsonStream = new HystrixRequestEventsJsonStream();
}

/**
Expand Down Expand Up @@ -183,7 +183,7 @@ public void onNext(HystrixRequestEvents requestEvents) {
} else {
List<HystrixRequestEvents> l = new ArrayList<HystrixRequestEvents>();
requestQueue.drainTo(l);
String requestEventsAsStr = RequestEventsJsonStream.convertToJson(l);
String requestEventsAsStr = HystrixRequestEventsJsonStream.convertRequestsToJson(l);
if (requestEventsAsStr != null) {
try {
writer.print("data: " + requestEventsAsStr + "\n\n");
Expand Down