Skip to content

Commit a2a60d7

Browse files
pujaganidiemol
pujagani
and
diemol
authored
[grid] Fix indentation for New Session Queuer classes. (#9033)
Co-authored-by: Diego Molina <[email protected]>
1 parent b147269 commit a2a60d7

10 files changed

+72
-72
lines changed

‎java/server/src/org/openqa/selenium/grid/sessionqueue/AddBackToSessionQueue.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public HttpResponse execute(HttpRequest req) {
5555

5656
span.setAttribute("request.retry", value);
5757

58-
HttpResponse response = new HttpResponse().setContent(
59-
asJson(ImmutableMap.of("value", value)));
58+
HttpResponse response = new HttpResponse()
59+
.setContent(asJson(ImmutableMap.of("value", value)));
6060

6161
HTTP_RESPONSE.accept(span, response);
6262

‎java/server/src/org/openqa/selenium/grid/sessionqueue/ClearSessionQueue.java

+11-9
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,26 @@ public HttpResponse execute(HttpRequest req) {
5454
HttpResponse response = new HttpResponse();
5555
if (value != 0) {
5656
response.setContent(
57-
asJson(ImmutableMap.of("value", value,
58-
"message", "Cleared the new session request queue",
59-
"cleared_requests", value)));
57+
asJson(ImmutableMap.of(
58+
"value", value,
59+
"message", "Cleared the new session request queue",
60+
"cleared_requests", value)));
6061
} else {
6162
response.setContent(
62-
asJson(ImmutableMap.of("value", value,
63-
"message",
64-
"New session request queue empty. Nothing to clear.")));
63+
asJson(ImmutableMap.of(
64+
"value", value,
65+
"message",
66+
"New session request queue empty. Nothing to clear.")));
6567
}
6668

6769
span.setAttribute("requests.cleared", value);
6870
HTTP_RESPONSE.accept(span, response);
6971
return response;
7072
} catch (Exception e) {
7173
HttpResponse response = new HttpResponse().setStatus((HTTP_INTERNAL_ERROR)).setContent(
72-
asJson(ImmutableMap.of("value", 0,
73-
"message",
74-
"Error while clearing the queue. Full queue may not have been cleared.")));
74+
asJson(ImmutableMap.of(
75+
"value", 0,
76+
"message", "Error while clearing the queue. Full queue may not have been cleared.")));
7577

7678
HTTP_RESPONSE.accept(span, response);
7779
return response;

‎java/server/src/org/openqa/selenium/grid/sessionqueue/GetNewSessionResponse.java

+14-15
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ private void setResponse(NewSessionResponse sessionResponse) {
8282
if (sessionRequest.isPresent()) {
8383
NewSessionRequest request = sessionRequest.get();
8484
request.setSessionResponse(
85-
new HttpResponse().setContent(bytes(sessionResponse.getDownstreamEncodedResponse())));
85+
new HttpResponse().setContent(bytes(sessionResponse.getDownstreamEncodedResponse())));
8686
request.getLatch().countDown();
8787
}
8888
}
@@ -99,11 +99,9 @@ private void setErrorResponse(NewSessionErrorResponse sessionResponse) {
9999

100100
if (sessionRequest.isPresent()) {
101101
NewSessionRequest request = sessionRequest.get();
102-
request
103-
.setSessionResponse(new HttpResponse()
104-
.setStatus(HTTP_INTERNAL_ERROR)
105-
.setContent(asJson(
106-
ImmutableMap.of("message", sessionResponse.getMessage()))));
102+
request.setSessionResponse(new HttpResponse()
103+
.setStatus(HTTP_INTERNAL_ERROR)
104+
.setContent(asJson(ImmutableMap.of("message", sessionResponse.getMessage()))));
107105
request.getLatch().countDown();
108106
}
109107
}
@@ -119,26 +117,27 @@ public HttpResponse add(HttpRequest request) {
119117

120118
if (!sessionRequests.offerLast(request, requestId)) {
121119
return new HttpResponse()
122-
.setStatus(HTTP_INTERNAL_ERROR)
123-
.setContent(asJson(ImmutableMap.of("message",
124-
"Session request could not be created. Error while adding to the session queue.")));
120+
.setStatus(HTTP_INTERNAL_ERROR)
121+
.setContent(asJson(ImmutableMap.of(
122+
"message",
123+
"Session request could not be created. Error while adding to the session queue.")));
125124
}
126125

127126
try {
128127
// Block until response is received.
129128
// This will not wait indefinitely due to request timeout handled by the LocalDistributor.
130129
latch.await();
131-
HttpResponse res = requestIdentifier.getSessionResponse();
132-
return res;
130+
return requestIdentifier.getSessionResponse();
133131
} catch (InterruptedException e) {
134132
LOG.log(Level.WARNING, "The thread waiting for new session response interrupted. {0}",
135-
e.getMessage());
133+
e.getMessage());
136134
Thread.currentThread().interrupt();
137135

138136
return new HttpResponse()
139-
.setStatus(HTTP_INTERNAL_ERROR)
140-
.setContent(asJson(ImmutableMap.of("message",
141-
"Session request could not be created. Error while processing the session request.")));
137+
.setStatus(HTTP_INTERNAL_ERROR)
138+
.setContent(asJson(ImmutableMap.of(
139+
"message",
140+
"Session request could not be created. Error while processing the session request.")));
142141
} finally {
143142
removeRequest(requestId);
144143
}

‎java/server/src/org/openqa/selenium/grid/sessionqueue/NewSessionQueuer.java

+10-11
Original file line numberDiff line numberDiff line change
@@ -86,29 +86,28 @@ public void validateSessionRequest(HttpRequest request) {
8686
try (Span span = tracer.getCurrentContext().createSpan("newsession_queuer.validate")) {
8787
Map<String, EventAttributeValue> attributeMap = new HashMap<>();
8888
try (
89-
Reader reader = reader(request);
90-
NewSessionPayload payload = NewSessionPayload.create(reader)) {
89+
Reader reader = reader(request);
90+
NewSessionPayload payload = NewSessionPayload.create(reader)) {
9191
Objects.requireNonNull(payload, "Requests to process must be set.");
9292
attributeMap.put("request.payload", EventAttribute.setValue(payload.toString()));
9393

9494
Iterator<Capabilities> iterator = payload.stream().iterator();
9595
if (!iterator.hasNext()) {
96-
SessionNotCreatedException
97-
exception =
98-
new SessionNotCreatedException("No capabilities found");
96+
SessionNotCreatedException exception =
97+
new SessionNotCreatedException("No capabilities found");
9998
EXCEPTION.accept(attributeMap, exception);
100-
attributeMap.put(AttributeKey.EXCEPTION_MESSAGE.getKey(),
101-
EventAttribute.setValue(exception.getMessage()));
99+
attributeMap.put(
100+
AttributeKey.EXCEPTION_MESSAGE.getKey(), EventAttribute.setValue(exception.getMessage()));
102101
span.addEvent(AttributeKey.EXCEPTION_EVENT.getKey(), attributeMap);
103102
throw exception;
104103
}
105104
} catch (IOException e) {
106105
SessionNotCreatedException exception = new SessionNotCreatedException(e.getMessage(), e);
107106
EXCEPTION.accept(attributeMap, exception);
108-
attributeMap.put(AttributeKey.EXCEPTION_MESSAGE.getKey(),
109-
EventAttribute.setValue(
110-
"IOException while reading the request payload. " + exception
111-
.getMessage()));
107+
String errorMessage = "IOException while reading the request payload. " +
108+
exception.getMessage();
109+
attributeMap.put(
110+
AttributeKey.EXCEPTION_MESSAGE.getKey(), EventAttribute.setValue(errorMessage));
112111
span.addEvent(AttributeKey.EXCEPTION_EVENT.getKey(), attributeMap);
113112
throw exception;
114113
}

‎java/server/src/org/openqa/selenium/grid/sessionqueue/RemoveFromSessionQueue.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public HttpResponse execute(HttpRequest req) {
5656
HttpRequest request = sessionRequest.get();
5757
response.setContent(request.getContent());
5858
response.setHeader(NewSessionQueue.SESSIONREQUEST_TIMESTAMP_HEADER,
59-
request.getHeader(NewSessionQueue.SESSIONREQUEST_TIMESTAMP_HEADER));
59+
request.getHeader(NewSessionQueue.SESSIONREQUEST_TIMESTAMP_HEADER));
6060
} else {
6161
response.setStatus(HTTP_NO_CONTENT);
6262
}

‎java/server/src/org/openqa/selenium/grid/sessionqueue/config/NewSessionQueuerOptions.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@ public URI getSessionQueuerUri() {
5858

5959
try {
6060
return new URI(
61-
"http",
62-
null,
63-
hostname.get(),
64-
port.get(),
65-
"",
66-
null,
67-
null);
61+
"http",
62+
null,
63+
hostname.get(),
64+
port.get(),
65+
"",
66+
null,
67+
null);
6868
} catch (URISyntaxException e) {
6969
throw new ConfigException(
70-
"Session queuer server uri configured through host (%s) and port (%d) is not a valid URI",
71-
hostname.get(),
72-
port.get());
70+
"Session queuer server uri configured through host (%s) and port (%d) is not a valid URI",
71+
hostname.get(),
72+
port.get());
7373
}
7474
}
7575

‎java/server/src/org/openqa/selenium/grid/sessionqueue/httpd/NewSessionQueuerServer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
public class NewSessionQueuerServer extends TemplateGridServerCommand {
5050

5151
private static final Logger LOG = Logger.getLogger(NewSessionQueuerServer.class.getName());
52-
private static final String
53-
LOCAL_NEWSESSION_QUEUER = "org.openqa.selenium.grid.sessionqueue.local.LocalNewSessionQueuer";
52+
private static final String LOCAL_NEWSESSION_QUEUER =
53+
"org.openqa.selenium.grid.sessionqueue.local.LocalNewSessionQueuer";
5454

5555
@Override
5656
public String getName() {

‎java/server/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueue.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public class LocalNewSessionQueue extends NewSessionQueue {
6363
private final EventBus bus;
6464
private final Deque<SessionRequest> sessionRequests = new ConcurrentLinkedDeque<>();
6565
private final ReadWriteLock lock = new ReentrantReadWriteLock(true);
66-
private final ScheduledExecutorService executorService = Executors
67-
.newSingleThreadScheduledExecutor();
66+
private final ScheduledExecutorService executorService =
67+
Executors.newSingleThreadScheduledExecutor();
6868
private final Thread shutdownHook = new Thread(this::callExecutorShutdown);
6969

7070
public LocalNewSessionQueue(Tracer tracer, EventBus bus, Duration retryInterval,
@@ -118,7 +118,7 @@ public boolean offerLast(HttpRequest request, RequestId requestId) {
118118
addRequestHeaders(request, requestId);
119119

120120
attributeMap.put(
121-
AttributeKey.REQUEST_ID.getKey(), EventAttribute.setValue(requestId.toString()));
121+
AttributeKey.REQUEST_ID.getKey(), EventAttribute.setValue(requestId.toString()));
122122
attributeMap.put("request.added", EventAttribute.setValue(added));
123123
span.addEvent("Add new session request to the queue", attributeMap);
124124

@@ -147,7 +147,7 @@ public boolean offerFirst(HttpRequest request, RequestId requestId) {
147147
writeLock.unlock();
148148
if (added) {
149149
executorService.schedule(() -> retryRequest(sessionRequest),
150-
super.retryInterval.getSeconds(), TimeUnit.SECONDS);
150+
super.retryInterval.getSeconds(), TimeUnit.SECONDS);
151151
}
152152
}
153153
}
@@ -164,12 +164,12 @@ private void retryRequest(SessionRequest sessionRequest) {
164164
} finally {
165165
writeLock.unlock();
166166
bus.fire(new NewSessionRejectedEvent(
167-
new NewSessionErrorResponse(requestId, "New session request timed out")));
167+
new NewSessionErrorResponse(requestId, "New session request timed out")));
168168
}
169169
} else {
170170
LOG.log(Level.INFO,
171-
"Adding request back to the queue. All slots are busy. Request: {0}",
172-
requestId);
171+
"Adding request back to the queue. All slots are busy. Request: {0}",
172+
requestId);
173173
bus.fire(new NewSessionRequestEvent(requestId));
174174
}
175175
}
@@ -182,17 +182,17 @@ public Optional<HttpRequest> remove(RequestId id) {
182182
// Peek the deque and check if the request-id matches. Most cases, it would.
183183
// If so poll the deque else iterate over the deque and find a match.
184184
Optional<SessionRequest> firstSessionRequest =
185-
Optional.ofNullable(sessionRequests.peekFirst());
185+
Optional.ofNullable(sessionRequests.peekFirst());
186186

187187
Optional<HttpRequest> httpRequest = Optional.empty();
188188
if (firstSessionRequest.isPresent()) {
189189
if (id.equals(firstSessionRequest.get().getRequestId())) {
190190
httpRequest = Optional.ofNullable(sessionRequests.pollFirst().getHttpRequest());
191191
} else {
192192
Optional<SessionRequest> matchedRequest = sessionRequests
193-
.stream()
194-
.filter(sessionRequest -> id.equals(sessionRequest.getRequestId()))
195-
.findFirst();
193+
.stream()
194+
.filter(sessionRequest -> id.equals(sessionRequest.getRequestId()))
195+
.findFirst();
196196

197197
if (matchedRequest.isPresent()) {
198198
SessionRequest sessionRequest = matchedRequest.get();
@@ -204,7 +204,7 @@ public Optional<HttpRequest> remove(RequestId id) {
204204

205205
if (httpRequest.isPresent() && hasRequestTimedOut(httpRequest.get())) {
206206
bus.fire(new NewSessionRejectedEvent(
207-
new NewSessionErrorResponse(id, "New session request timed out")));
207+
new NewSessionErrorResponse(id, "New session request timed out")));
208208
return Optional.empty();
209209
}
210210
return httpRequest;
@@ -224,8 +224,8 @@ public int clear() {
224224
sessionRequest = sessionRequests.poll()) {
225225
count++;
226226
NewSessionErrorResponse errorResponse =
227-
new NewSessionErrorResponse(sessionRequest.getRequestId(),
228-
"New session request cancelled.");
227+
new NewSessionErrorResponse(sessionRequest.getRequestId(),
228+
"New session request cancelled.");
229229

230230
bus.fire(new NewSessionRejectedEvent(errorResponse));
231231
}

‎java/server/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueuer.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ public static NewSessionQueuer create(Config config) {
5757
Duration retryInterval = new NewSessionQueueOptions(config).getSessionRequestRetryInterval();
5858
Duration requestTimeout = new NewSessionQueueOptions(config).getSessionRequestTimeout();
5959
NewSessionQueue sessionRequests = new LocalNewSessionQueue(
60-
tracer,
61-
bus,
62-
retryInterval,
63-
requestTimeout);
60+
tracer,
61+
bus,
62+
retryInterval,
63+
requestTimeout);
6464

6565
SecretOptions secretOptions = new SecretOptions(config);
6666
Secret registrationSecret = secretOptions.getRegistrationSecret();
@@ -71,8 +71,8 @@ public static NewSessionQueuer create(Config config) {
7171
@Override
7272
public HttpResponse addToQueue(HttpRequest request) {
7373
validateSessionRequest(request);
74-
GetNewSessionResponse
75-
getNewSessionResponse = new GetNewSessionResponse(tracer, bus, sessionRequests);
74+
GetNewSessionResponse getNewSessionResponse =
75+
new GetNewSessionResponse(tracer, bus, sessionRequests);
7676
return getNewSessionResponse.add(request);
7777
}
7878

‎java/server/src/org/openqa/selenium/grid/sessionqueue/remote/RemoteNewSessionQueuer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public HttpResponse addToQueue(HttpRequest request) {
9393
@Override
9494
public boolean retryAddToQueue(HttpRequest request, RequestId reqId) {
9595
HttpRequest upstream =
96-
new HttpRequest(POST, "/se/grid/newsessionqueuer/session/retry/" + reqId.toString());
96+
new HttpRequest(POST, "/se/grid/newsessionqueuer/session/retry/" + reqId.toString());
9797
HttpTracing.inject(tracer, tracer.getCurrentContext(), upstream);
9898
upstream.setContent(request.getContent());
9999
upstream.setHeader(timestampHeader, request.getHeader(timestampHeader));
@@ -105,7 +105,7 @@ public boolean retryAddToQueue(HttpRequest request, RequestId reqId) {
105105
@Override
106106
public Optional<HttpRequest> remove(RequestId reqId) {
107107
HttpRequest upstream =
108-
new HttpRequest(GET, "/se/grid/newsessionqueuer/session/" + reqId.toString());
108+
new HttpRequest(GET, "/se/grid/newsessionqueuer/session/" + reqId.toString());
109109
HttpTracing.inject(tracer, tracer.getCurrentContext(), upstream);
110110
HttpResponse response = client.with(addSecret).execute(upstream);
111111

0 commit comments

Comments
 (0)