Skip to content

Commit 267d562

Browse files
diemoldiemol
committed
[grid] Removing NewSessionRejectedEvent.java
No component except some tests listen to it.
1 parent 514319c commit 267d562

3 files changed

Lines changed: 10 additions & 112 deletions

File tree

‎java/src/org/openqa/selenium/grid/data/NewSessionRejectedEvent.java‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

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

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import org.openqa.selenium.events.EventBus;
1111
import org.openqa.selenium.grid.config.Config;
1212
import org.openqa.selenium.grid.data.CreateSessionResponse;
13-
import org.openqa.selenium.grid.data.NewSessionErrorResponse;
14-
import org.openqa.selenium.grid.data.NewSessionRejectedEvent;
1513
import org.openqa.selenium.grid.data.RequestId;
1614
import org.openqa.selenium.grid.data.SessionRequest;
1715
import org.openqa.selenium.grid.data.SessionRequestCapability;
@@ -68,10 +66,8 @@
6866
* <li>User adds an item on to the queue using {@link #addToQueue(SessionRequest)}. This
6967
* will block until the request completes in some way.
7068
* <li>If the session request is completed, then {@link #complete(RequestId, Either)} must
71-
* be called. This will not only ensure that {@link #addToQueue(SessionRequest)}
72-
* returns, but will also fire a {@link NewSessionRejectedEvent} if the session was
73-
* rejected. Positive completions of events are assumed to be notified on the event bus
74-
* by other listeners.
69+
* be called. This will ensure that {@link #addToQueue(SessionRequest)}
70+
* returns.
7571
* <li>If the request cannot be handled right now, call
7672
* {@link #retryAddToQueue(SessionRequest)} to return the session request to the front
7773
* of the queue.
@@ -86,7 +82,6 @@
8682
public class LocalNewSessionQueue extends NewSessionQueue implements Closeable {
8783

8884
private static final String NAME = "Local New Session Queue";
89-
private final EventBus bus;
9085
private final SlotMatcher slotMatcher;
9186
private final Duration requestTimeout;
9287
private final Map<RequestId, Data> requests;
@@ -110,7 +105,7 @@ public LocalNewSessionQueue(
110105
super(tracer, registrationSecret);
111106

112107
this.slotMatcher = Require.nonNull("Slot matcher", slotMatcher);
113-
this.bus = Require.nonNull("Event bus", bus);
108+
Require.nonNull("Event bus", bus);
114109
Require.nonNegative("Retry period", retryPeriod);
115110

116111
this.requestTimeout = Require.positive("Request timeout", requestTimeout);
@@ -342,9 +337,6 @@ public void complete(RequestId reqId, Either<SessionNotCreatedException, CreateS
342337
writeLock.unlock();
343338
}
344339

345-
if (result.isLeft()) {
346-
bus.fire(new NewSessionRejectedEvent(new NewSessionErrorResponse(reqId, result.left().getMessage())));
347-
}
348340
data.setResult(result);
349341
}
350342
}
@@ -357,11 +349,9 @@ public int clearQueue() {
357349
try {
358350
int size = queue.size();
359351
queue.clear();
360-
requests.forEach((reqId, data) -> {
361-
data.setResult(Either.left(new SessionNotCreatedException("Request queue was cleared")));
362-
bus.fire(new NewSessionRejectedEvent(
363-
new NewSessionErrorResponse(reqId, "New session queue was forcibly cleared")));
364-
});
352+
requests.forEach(
353+
(reqId, data) ->
354+
data.setResult(Either.left(new SessionNotCreatedException("Request queue was cleared"))));
365355
requests.clear();
366356
return size;
367357
} finally {

‎java/test/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueueTest.java‎

Lines changed: 4 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.openqa.selenium.events.local.GuavaEventBus;
3333
import org.openqa.selenium.grid.data.CreateSessionResponse;
3434
import org.openqa.selenium.grid.data.DefaultSlotMatcher;
35-
import org.openqa.selenium.grid.data.NewSessionRejectedEvent;
3635
import org.openqa.selenium.grid.data.RequestId;
3736
import org.openqa.selenium.grid.data.Session;
3837
import org.openqa.selenium.grid.data.SessionRequest;
@@ -64,15 +63,13 @@
6463
import java.util.Set;
6564
import java.util.UUID;
6665
import java.util.concurrent.Callable;
67-
import java.util.concurrent.CountDownLatch;
6866
import java.util.concurrent.ExecutionException;
6967
import java.util.concurrent.ExecutorService;
7068
import java.util.concurrent.Executors;
7169
import java.util.concurrent.Future;
7270
import java.util.concurrent.TimeoutException;
7371
import java.util.concurrent.atomic.AtomicBoolean;
7472
import java.util.concurrent.atomic.AtomicInteger;
75-
import java.util.concurrent.atomic.AtomicReference;
7673
import java.util.function.Supplier;
7774
import java.util.stream.Collectors;
7875

@@ -103,12 +100,10 @@ public class LocalNewSessionQueueTest {
103100
public static Timeout classTimeout = new Timeout(60, SECONDS);
104101
private final NewSessionQueue queue;
105102
private final LocalNewSessionQueue localQueue;
106-
private final EventBus bus;
107103
private final SessionRequest sessionRequest;
108104

109105
public LocalNewSessionQueueTest(Supplier<TestData> supplier) {
110106
TestData testData = supplier.get();
111-
this.bus = testData.bus;
112107
this.queue = testData.queue;
113108
this.localQueue = testData.localQueue;
114109

@@ -141,7 +136,7 @@ public static Collection<Supplier<TestData>> createQueues() {
141136
Duration.ofSeconds(1),
142137
Duration.ofSeconds(Debug.isDebugging() ? 9999 : 5),
143138
REGISTRATION_SECRET);
144-
return new TestData(bus, local, local);
139+
return new TestData(local, local);
145140
});
146141

147142
toReturn.add(() -> {
@@ -155,7 +150,7 @@ public static Collection<Supplier<TestData>> createQueues() {
155150
REGISTRATION_SECRET);
156151

157152
HttpClient client = new PassthroughHttpClient(local);
158-
return new TestData(bus, local, new RemoteNewSessionQueue(tracer, client, REGISTRATION_SECRET));
153+
return new TestData(local, new RemoteNewSessionQueue(tracer, client, REGISTRATION_SECRET));
159154
});
160155

161156
return toReturn;
@@ -257,27 +252,15 @@ public void shouldBeAbleToGetQueueContents() {
257252
}
258253

259254
@Test
260-
public void shouldBeClearQueueAndFireRejectedEvent() throws InterruptedException {
261-
AtomicBoolean result = new AtomicBoolean(false);
262-
255+
public void queueCountShouldBeReturnedWhenQueueIsCleared() {
263256
RequestId requestId = sessionRequest.getRequestId();
264-
CountDownLatch latch = new CountDownLatch(1);
265-
bus.addListener(
266-
NewSessionRejectedEvent.listener(
267-
response -> {
268-
result.set(response.getRequestId().equals(requestId));
269-
latch.countDown();
270-
}));
271-
272257
localQueue.injectIntoQueue(sessionRequest);
273258
queue.remove(requestId);
274259

275260
queue.retryAddToQueue(sessionRequest);
276261

277262
int count = queue.clearQueue();
278263

279-
assertThat(latch.await(2, SECONDS)).isTrue();
280-
assertThat(result.get()).isTrue();
281264
assertEquals(count, 1);
282265
assertFalse(queue.remove(requestId).isPresent());
283266
}
@@ -443,44 +426,11 @@ public void shouldBeAbleToTimeoutARequestOnRetry() {
443426
Map.of(),
444427
Map.of());
445428

446-
AtomicInteger count = new AtomicInteger();
447-
448-
bus.addListener(NewSessionRejectedEvent.listener(reqId -> {
449-
count.incrementAndGet();
450-
}));
451-
452429
HttpResponse httpResponse = queue.addToQueue(request);
453430

454-
assertEquals(1, count.get());
455431
assertEquals(HTTP_INTERNAL_ERROR, httpResponse.getStatus());
456432
}
457433

458-
@Test(timeout = 10000)
459-
public void shouldBeAbleToTimeoutARequestOnRemove() throws InterruptedException {
460-
AtomicReference<RequestId> isPresent = new AtomicReference<>();
461-
CountDownLatch latch = new CountDownLatch(1);
462-
bus.addListener(
463-
NewSessionRejectedEvent.listener(
464-
response -> {
465-
isPresent.set(response.getRequestId());
466-
latch.countDown();
467-
}));
468-
469-
SessionRequest sessionRequest = new SessionRequest(
470-
new RequestId(UUID.randomUUID()),
471-
LONG_AGO,
472-
Set.of(W3C),
473-
Set.of(CAPS),
474-
Map.of(),
475-
Map.of());
476-
localQueue.injectIntoQueue(sessionRequest);
477-
478-
queue.remove(sessionRequest.getRequestId());
479-
480-
assertThat(latch.await(4, SECONDS)).isTrue();
481-
assertThat(isPresent.get()).isEqualTo(sessionRequest.getRequestId());
482-
}
483-
484434
@Test(timeout = 5000)
485435
public void shouldBeAbleToClearQueueAndRejectMultipleRequests() {
486436
ExecutorService executor = Executors.newFixedThreadPool(2);
@@ -574,12 +524,10 @@ public void shouldNotReturnANextAvailableEntryThatDoesNotMatchTheStereotypes() {
574524

575525
static class TestData {
576526

577-
public final EventBus bus;
578527
public final LocalNewSessionQueue localQueue;
579528
public final NewSessionQueue queue;
580529

581-
public TestData(EventBus bus, LocalNewSessionQueue localQueue, NewSessionQueue queue) {
582-
this.bus = bus;
530+
public TestData(LocalNewSessionQueue localQueue, NewSessionQueue queue) {
583531
this.localQueue = localQueue;
584532
this.queue = queue;
585533
}

0 commit comments

Comments
 (0)