Skip to content
This repository was archived by the owner on Jun 11, 2024. It is now read-only.

Commit 5c091c0

Browse files
dpowelldpowell
authored
Merge pull request #58 from browserup/dependabot/gradle/com.google.sitebricks-sitebricks-0.8.11
Bump sitebricks from 0.8.10 to 0.8.11
2 parents 394a5fc + 1928c0d commit 5c091c0

File tree

5 files changed

+40
-40
lines changed

5 files changed

+40
-40
lines changed

‎browserup-proxy-dist/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dependencies {
6666
implementation 'com.google.inject:guice:4.2.2'
6767
implementation 'com.google.inject.extensions:guice-servlet:4.2.2'
6868
implementation 'com.google.inject.extensions:guice-multibindings:4.2.2'
69-
implementation 'com.google.sitebricks:sitebricks:0.8.10'
69+
implementation 'com.google.sitebricks:sitebricks:0.8.11'
7070
implementation 'org.apache.logging.log4j:log4j-api:2.11.2'
7171
implementation 'org.apache.logging.log4j:log4j-core:2.11.2'
7272
implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.2'

‎browserup-proxy-rest/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ dependencies {
6363
implementation 'com.google.inject:guice:4.2.2'
6464
implementation 'com.google.inject.extensions:guice-servlet:4.2.2'
6565
implementation 'com.google.inject.extensions:guice-multibindings:4.2.2'
66-
implementation 'com.google.sitebricks:sitebricks:0.8.10'
66+
implementation 'com.google.sitebricks:sitebricks:0.8.11'
6767
implementation 'io.netty:netty-all:4.1.36.Final'
6868
implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
6969
implementation 'org.eclipse.jetty:jetty-server:7.3.0.v20110203'

‎browserup-proxy-rest/src/main/java/com/browserup/bup/proxy/bricks/ProxyResource.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public Reply<?> getProxies() {
7272
}
7373

7474
@Post
75-
public Reply<?> newProxy(Request<String> request) {
75+
public Reply<?> newProxy(Request request) {
7676
LOG.info("POST /");
7777
LOG.info(request.params().toString());
7878
String systemProxyHost = System.getProperty("http.proxyHost");
@@ -134,7 +134,7 @@ public Reply<?> getHar(@Named("port") int port) {
134134

135135
@Get
136136
@At("/:port/har/mostRecentEntry")
137-
public Reply<?> findMostRecentEntry(@Named("port") int port, Request<String> request) {
137+
public Reply<?> findMostRecentEntry(@Named("port") int port, Request request) {
138138
LOG.info("GET /" + port + "/har/entry");
139139
BrowserUpProxyServer proxy = proxyManager.get(port);
140140
if (proxy == null) {
@@ -154,7 +154,7 @@ public Reply<?> findMostRecentEntry(@Named("port") int port, Request<String> req
154154

155155
@Get
156156
@At("/:port/har/mostRecentEntry/assertResponseTimeWithin")
157-
public Reply<?> mostRecentEntryAssertResponseTimeWithin(@Named("port") int port, Request<String> request) {
157+
public Reply<?> mostRecentEntryAssertResponseTimeWithin(@Named("port") int port, Request request) {
158158
LOG.info("GET /" + port + "/har/mostRecentEntry/assertResponseTimeWithin");
159159
BrowserUpProxyServer proxy = proxyManager.get(port);
160160
if (proxy == null) {
@@ -179,7 +179,7 @@ public Reply<?> mostRecentEntryAssertResponseTimeWithin(@Named("port") int port,
179179

180180
@Get
181181
@At("/:port/har/entries")
182-
public Reply<?> findEntries(@Named("port") int port, Request<String> request) {
182+
public Reply<?> findEntries(@Named("port") int port, Request request) {
183183
LOG.info("GET /" + port + "/har/entries");
184184
BrowserUpProxyServer proxy = proxyManager.get(port);
185185
if (proxy == null) {
@@ -198,7 +198,7 @@ public Reply<?> findEntries(@Named("port") int port, Request<String> request) {
198198

199199
@Put
200200
@At("/:port/har")
201-
public Reply<?> newHar(@Named("port") int port, Request<String> request) {
201+
public Reply<?> newHar(@Named("port") int port, Request request) {
202202
LOG.info("PUT /" + port + "/har");
203203
LOG.info(request.params().toString());
204204
BrowserUpProxyServer proxy = proxyManager.get(port);
@@ -240,7 +240,7 @@ public Reply<?> newHar(@Named("port") int port, Request<String> request) {
240240

241241
@Put
242242
@At("/:port/har/pageRef")
243-
public Reply<?> setPage(@Named("port") int port, Request<String> request) {
243+
public Reply<?> setPage(@Named("port") int port, Request request) {
244244
LOG.info("PUT /" + port + "/har/pageRef");
245245
LOG.info(request.params().toString());
246246
BrowserUpProxyServer proxy = proxyManager.get(port);
@@ -257,7 +257,7 @@ public Reply<?> setPage(@Named("port") int port, Request<String> request) {
257257

258258
@Post
259259
@At("/:port/har/commands/endPage")
260-
public Reply<?> endPage(@Named("port") int port, Request<String> request) {
260+
public Reply<?> endPage(@Named("port") int port, Request request) {
261261
LOG.info("POST /" + port + "/commands/endPage");
262262
BrowserUpProxyServer proxy = proxyManager.get(port);
263263
if (proxy == null) {
@@ -271,7 +271,7 @@ public Reply<?> endPage(@Named("port") int port, Request<String> request) {
271271

272272
@Post
273273
@At("/:port/har/commands/endHar")
274-
public Reply<?> endHar(@Named("port") int port, Request<String> request) {
274+
public Reply<?> endHar(@Named("port") int port, Request request) {
275275
LOG.info("POST /" + port + "/commands/endHar");
276276
BrowserUpProxyServer proxy = proxyManager.get(port);
277277
if (proxy == null) {
@@ -285,7 +285,7 @@ public Reply<?> endHar(@Named("port") int port, Request<String> request) {
285285

286286
@Get
287287
@At("/:port/blacklist")
288-
public Reply<?> getBlacklist(@Named("port") int port, Request<String> request) {
288+
public Reply<?> getBlacklist(@Named("port") int port, Request request) {
289289
LOG.info("GET /" + port + "/blacklist");
290290
BrowserUpProxyServer proxy = proxyManager.get(port);
291291
if (proxy == null) {
@@ -297,7 +297,7 @@ public Reply<?> getBlacklist(@Named("port") int port, Request<String> request) {
297297

298298
@Put
299299
@At("/:port/blacklist")
300-
public Reply<?> blacklist(@Named("port") int port, Request<String> request) {
300+
public Reply<?> blacklist(@Named("port") int port, Request request) {
301301
LOG.info("PUT /" + port + "/blacklist");
302302
LOG.info(request.params().toString());
303303
BrowserUpProxyServer proxy = proxyManager.get(port);
@@ -315,7 +315,7 @@ public Reply<?> blacklist(@Named("port") int port, Request<String> request) {
315315

316316
@Delete
317317
@At("/:port/blacklist")
318-
public Reply<?> clearBlacklist(@Named("port") int port, Request<String> request) {
318+
public Reply<?> clearBlacklist(@Named("port") int port, Request request) {
319319
LOG.info("DELETE /" + port + "/blacklist");
320320
BrowserUpProxyServer proxy = proxyManager.get(port);
321321
if (proxy == null) {
@@ -328,7 +328,7 @@ public Reply<?> clearBlacklist(@Named("port") int port, Request<String> request)
328328

329329
@Get
330330
@At("/:port/whitelist")
331-
public Reply<?> getWhitelist(@Named("port") int port, Request<String> request) {
331+
public Reply<?> getWhitelist(@Named("port") int port, Request request) {
332332
LOG.info("GET /" + port + "/whitelist");
333333
BrowserUpProxyServer proxy = proxyManager.get(port);
334334
if (proxy == null) {
@@ -340,7 +340,7 @@ public Reply<?> getWhitelist(@Named("port") int port, Request<String> request) {
340340

341341
@Put
342342
@At("/:port/whitelist")
343-
public Reply<?> whitelist(@Named("port") int port, Request<String> request) {
343+
public Reply<?> whitelist(@Named("port") int port, Request request) {
344344
LOG.info("PUT /" + port + "/whitelist");
345345
LOG.info(request.params().toString());
346346
BrowserUpProxyServer proxy = proxyManager.get(port);
@@ -357,7 +357,7 @@ public Reply<?> whitelist(@Named("port") int port, Request<String> request) {
357357

358358
@Delete
359359
@At("/:port/whitelist")
360-
public Reply<?> clearWhitelist(@Named("port") int port, Request<String> request) {
360+
public Reply<?> clearWhitelist(@Named("port") int port, Request request) {
361361
LOG.info("DELETE /" + port + "/whitelist");
362362
BrowserUpProxyServer proxy = proxyManager.get(port);
363363
if (proxy == null) {
@@ -370,7 +370,7 @@ public Reply<?> clearWhitelist(@Named("port") int port, Request<String> request)
370370

371371
@Post
372372
@At("/:port/auth/basic/:domain")
373-
public Reply<?> autoBasicAuth(@Named("port") int port, @Named("domain") String domain, Request<String> request) {
373+
public Reply<?> autoBasicAuth(@Named("port") int port, @Named("domain") String domain, Request request) {
374374
LOG.info("POST /" + port + "/auth/basic/" + domain);
375375
BrowserUpProxyServer proxy = proxyManager.get(port);
376376
if (proxy == null) {
@@ -385,7 +385,7 @@ public Reply<?> autoBasicAuth(@Named("port") int port, @Named("domain") String d
385385

386386
@Post
387387
@At("/:port/headers")
388-
public Reply<?> updateHeaders(@Named("port") int port, Request<String> request) {
388+
public Reply<?> updateHeaders(@Named("port") int port, Request request) {
389389
LOG.info("POST /" + port + "/headers");
390390

391391
BrowserUpProxyServer proxy = proxyManager.get(port);
@@ -400,7 +400,7 @@ public Reply<?> updateHeaders(@Named("port") int port, Request<String> request)
400400

401401
@Post
402402
@At("/:port/filter/request")
403-
public Reply<?> addRequestFilter(@Named("port") int port, Request<String> request) throws IOException, ScriptException {
403+
public Reply<?> addRequestFilter(@Named("port") int port, Request request) throws IOException, ScriptException {
404404
LOG.info("POST /" + port + "/filter/request");
405405
BrowserUpProxyServer proxy = proxyManager.get(port);
406406
if (proxy == null) {
@@ -419,7 +419,7 @@ public Reply<?> addRequestFilter(@Named("port") int port, Request<String> reques
419419

420420
@Post
421421
@At("/:port/filter/response")
422-
public Reply<?> addResponseFilter(@Named("port") int port, Request<String> request) throws IOException, ScriptException {
422+
public Reply<?> addResponseFilter(@Named("port") int port, Request request) throws IOException, ScriptException {
423423
LOG.info("POST /" + port + "/filter/response");
424424
BrowserUpProxyServer proxy = proxyManager.get(port);
425425
if (proxy == null) {
@@ -438,7 +438,7 @@ public Reply<?> addResponseFilter(@Named("port") int port, Request<String> reque
438438

439439
@Put
440440
@At("/:port/limit")
441-
public Reply<?> limit(@Named("port") int port, Request<String> request) {
441+
public Reply<?> limit(@Named("port") int port, Request request) {
442442
LOG.info("PUT /" + port + "/limit");
443443
BrowserUpProxyServer proxy = proxyManager.get(port);
444444
if (proxy == null) {
@@ -523,7 +523,7 @@ public Reply<?> limit(@Named("port") int port, Request<String> request) {
523523

524524
@Put
525525
@At("/:port/timeout")
526-
public Reply<?> timeout(@Named("port") int port, Request<String> request) {
526+
public Reply<?> timeout(@Named("port") int port, Request request) {
527527
LOG.info("PUT /" + port + "/timeout");
528528
BrowserUpProxyServer proxy = proxyManager.get(port);
529529
if (proxy == null) {
@@ -585,7 +585,7 @@ public Reply<?> delete(@Named("port") int port) {
585585

586586
@Post
587587
@At("/:port/hosts")
588-
public Reply<?> remapHosts(@Named("port") int port, Request<String> request) {
588+
public Reply<?> remapHosts(@Named("port") int port, Request request) {
589589
LOG.info("POST /" + port + "/hosts");
590590
LOG.info(request.params().toString());
591591
BrowserUpProxyServer proxy = proxyManager.get(port);
@@ -608,7 +608,7 @@ public Reply<?> remapHosts(@Named("port") int port, Request<String> request) {
608608

609609
@Put
610610
@At("/:port/wait")
611-
public Reply<?> wait(@Named("port") int port, Request<String> request) {
611+
public Reply<?> wait(@Named("port") int port, Request request) {
612612
LOG.info("PUT /" + port + "/wait");
613613
LOG.info(request.params().toString());
614614
BrowserUpProxyServer proxy = proxyManager.get(port);
@@ -637,7 +637,7 @@ public Reply<?> clearDnsCache(@Named("port") int port) {
637637

638638
@Put
639639
@At("/:port/rewrite")
640-
public Reply<?> rewriteUrl(@Named("port") int port, Request<String> request) {
640+
public Reply<?> rewriteUrl(@Named("port") int port, Request request) {
641641
LOG.info("PUT /" + port + "/rewrite");
642642
BrowserUpProxyServer proxy = proxyManager.get(port);
643643
if (proxy == null) {
@@ -652,7 +652,7 @@ public Reply<?> rewriteUrl(@Named("port") int port, Request<String> request) {
652652

653653
@Delete
654654
@At("/:port/rewrite")
655-
public Reply<?> clearRewriteRules(@Named("port") int port, Request<String> request) {
655+
public Reply<?> clearRewriteRules(@Named("port") int port, Request request) {
656656
LOG.info("DELETE /" + port + "/rewrite");
657657
BrowserUpProxyServer proxy = proxyManager.get(port);
658658
if (proxy == null) {
@@ -665,7 +665,7 @@ public Reply<?> clearRewriteRules(@Named("port") int port, Request<String> reque
665665

666666
@Put
667667
@At("/:port/retry")
668-
public Reply<?> retryCount(@Named("port") int port, Request<String> request) {
668+
public Reply<?> retryCount(@Named("port") int port, Request request) {
669669
LOG.warn("/port/retry API is no longer supported");
670670
return Reply.saying().badRequest();
671671
}
@@ -719,7 +719,7 @@ public void setProxyList(Collection<ProxyDescriptor> proxyList) {
719719
}
720720
}
721721

722-
private String getEntityBodyFromRequest(Request<String> request) throws IOException {
722+
private String getEntityBodyFromRequest(Request request) throws IOException {
723723
String contentTypeHeader = request.header("Content-Type");
724724
Charset charset = null;
725725
try {
@@ -741,7 +741,7 @@ private String getEntityBodyFromRequest(Request<String> request) throws IOExcept
741741
return new String(entityBodyBytes.toByteArray(), charset);
742742
}
743743

744-
private Pattern getUrlPatternFromRequest(Request<String> request) throws IllegalArgumentException {
744+
private Pattern getUrlPatternFromRequest(Request request) throws IllegalArgumentException {
745745
String urlParam = request.param("urlPattern");
746746
if (StringUtils.isEmpty(urlParam)) {
747747
LOG.warn("Url parameter not present");
@@ -758,7 +758,7 @@ private Pattern getUrlPatternFromRequest(Request<String> request) throws Illegal
758758
return urlPattern;
759759
}
760760

761-
private Optional<Long> getAssertionTimeFromRequest(Request<String> request) {
761+
private Optional<Long> getAssertionTimeFromRequest(Request request) {
762762
String timeParam = request.param("milliseconds");
763763
if (StringUtils.isEmpty(timeParam)) {
764764
LOG.warn("Time parameter not present");

‎browserup-proxy-rest/src/test/groovy/com/browserup/bup/proxy/FilterTest.groovy‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class FilterTest extends ProxyResourceTest {
4141
request.headers().add('User-Agent', 'My-Custom-User-Agent-String 1.0');
4242
'''
4343

44-
Request<String> mockRestRequest = createMockRestRequestWithEntity(requestFilterJavaScript)
44+
Request mockRestRequest = createMockRestRequestWithEntity(requestFilterJavaScript)
4545

4646
proxyResource.addRequestFilter(proxyPort, mockRestRequest)
4747

@@ -79,7 +79,7 @@ class FilterTest extends ProxyResourceTest {
7979
}
8080
'''
8181

82-
Request<String> mockRestRequest = createMockRestRequestWithEntity(requestFilterJavaScript)
82+
Request mockRestRequest = createMockRestRequestWithEntity(requestFilterJavaScript)
8383

8484
proxyResource.addRequestFilter(proxyPort, mockRestRequest)
8585

@@ -117,7 +117,7 @@ class FilterTest extends ProxyResourceTest {
117117
}
118118
'''
119119

120-
Request<String> mockRestRequest = createMockRestRequestWithEntity(responseFilterJavaScript)
120+
Request mockRestRequest = createMockRestRequestWithEntity(responseFilterJavaScript)
121121

122122
proxyResource.addResponseFilter(proxyPort, mockRestRequest)
123123

@@ -150,14 +150,14 @@ class FilterTest extends ProxyResourceTest {
150150
}
151151
'''
152152

153-
Request<String> mockRestAddReqFilterRequest = createMockRestRequestWithEntity(requestFilterJavaScript)
153+
Request mockRestAddReqFilterRequest = createMockRestRequestWithEntity(requestFilterJavaScript)
154154
proxyResource.addRequestFilter(proxyPort, mockRestAddReqFilterRequest)
155155

156156
final String responseFilterJavaScript =
157157
'''
158158
contents.setTextContents(messageInfo.getOriginalRequest().getUri());
159159
'''
160-
Request<String> mockRestAddRespFilterRequest = createMockRestRequestWithEntity(responseFilterJavaScript)
160+
Request mockRestAddRespFilterRequest = createMockRestRequestWithEntity(responseFilterJavaScript)
161161
proxyResource.addResponseFilter(proxyPort, mockRestAddRespFilterRequest)
162162

163163
mockServer.when(request()
@@ -187,7 +187,7 @@ class FilterTest extends ProxyResourceTest {
187187
this javascript won't compile!
188188
'''
189189

190-
Request<String> mockRestAddReqFilterRequest = createMockRestRequestWithEntity(requestFilterJavaScript)
190+
Request mockRestAddReqFilterRequest = createMockRestRequestWithEntity(requestFilterJavaScript)
191191

192192
// mock the proxy so we can verify the addRequestFilter() method is never called
193193
def mockProxy = mock(BrowserUpProxyServer)
@@ -219,7 +219,7 @@ class FilterTest extends ProxyResourceTest {
219219
this javascript won't compile!
220220
'''
221221

222-
Request<String> mockRestAddRespFilterRequest = createMockRestRequestWithEntity(responseFilterJavaScript)
222+
Request mockRestAddRespFilterRequest = createMockRestRequestWithEntity(responseFilterJavaScript)
223223

224224
// mock the proxy so we can verify the addResponseFilter() method is never called
225225
def mockProxy = mock(BrowserUpProxyServer)
@@ -267,7 +267,7 @@ class FilterTest extends ProxyResourceTest {
267267
shortCircuitRequest;
268268
'''
269269

270-
Request<String> mockRestRequest = createMockRestRequestWithEntity(requestFilterJavaScript)
270+
Request mockRestRequest = createMockRestRequestWithEntity(requestFilterJavaScript)
271271

272272
proxyResource.addRequestFilter(proxyPort, mockRestRequest)
273273

‎browserup-proxy-rest/src/test/groovy/com/browserup/bup/proxy/test/util/ProxyResourceTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ abstract class ProxyResourceTest extends ProxyManagerTest {
5757
/**
5858
* Creates a mock sitebricks REST request with the specified entity body.
5959
*/
60-
static Request<String> createMockRestRequestWithEntity(String entityBody) {
61-
Request<String> mockRestRequest = mock(Request)
60+
static Request createMockRestRequestWithEntity(String entityBody) {
61+
Request mockRestRequest = mock(Request)
6262
when(mockRestRequest.header("Content-Type")).thenReturn("text/plain; charset=utf-8")
6363
when(mockRestRequest.readTo(any(OutputStream))).then(new Answer<Object>() {
6464
@Override

0 commit comments

Comments
 (0)