Commitbc35f8b

authored

Merge pull requestHaehnchen#1685 from adamwojs/issue_1674

FixedHaehnchen#1674: duplicated route prefix in profiler urls

2 parents6ec4b13 +360a03c commitbc35f8bCopy full SHA for bc35f8b

File tree

+467

-1

lines changed

+467

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public static Collection<ProfilerRequestInterface> createRequestsFromIndexHtml(@`
`128`	`128`	`if(tokenLink !=null) {`
`129`	`129`	`Stringhref =tokenLink.getAttributeValue("href");`
`130`	`130`	`if(StringUtils.isNotBlank(href)) {`
`131`		`-profilerUrl =StringUtils.stripEnd(baseUrl,"/") +href;`
	`131`	`+profilerUrl =getProfilerAbsoluteUrl(baseUrl,href);`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
`@@ -153,6 +153,11 @@ public static Collection<ProfilerRequestInterface> createRequestsFromIndexHtml(@`
`153`	`153`	`returnrequests;`
`154`	`154`	`}`
`155`	`155`
	`156`	`+@NotNull`
	`157`	`+privatestaticStringgetProfilerAbsoluteUrl(@NotNullStringbaseUrl,@NotNullStringhref) {`
	`158`	`+returnStringUtils.stripEnd(baseUrl,"/") +href.substring(href.indexOf("/_profiler/"));`
	`159`	`+ }`
	`160`	`+`
`156`	`161`	`@NotNull`
`157`	`162`	`publicstaticCollection<ProfilerRequestInterface>collectHttpDataForRequest(@NotNullProjectproject,@NotNullCollection<ProfilerRequestInterface>requests) {`
`158`	`163`	`Collection<Callable<ProfilerRequestInterface>>callable =requests.stream().map(`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,22 @@ public void testCreateRequestsFromIndexHtml() {`
`39`	`39`	`assertEquals(404,request.getStatusCode());`
`40`	`40`	`}`
`41`	`41`
	`42`	`+/**`
	`43`	`+ * @see ProfilerUtil#createRequestsFromIndexHtml`
	`44`	`+ */`
	`45`	`+publicvoidtestCreateRequestsFromIndexHtmlRemovesProfilerRoutePrefixFromTokenLinks() {`
	`46`	`+PsiFilepsiFile =myFixture.configureByFile("profiler-index-with-route-prefix.html");`
	`47`	`+Collection<ProfilerRequestInterface>requests =ProfilerUtil.createRequestsFromIndexHtml(getProject(),psiFile.getText(),"http://127.0.0.1:8000/prefix/");`
	`48`	`+`
	`49`	`+ProfilerRequestInterfacerequest =requests.iterator().next();`
	`50`	`+`
	`51`	`+assertEquals("a9eaab",request.getHash());`
	`52`	`+assertEquals("GET",request.getMethod());`
	`53`	`+assertEquals("http://127.0.0.1:8000/prefix/_profiler/search/results?ip=&limit=10",request.getUrl());`
	`54`	`+assertEquals("http://127.0.0.1:8000/prefix/_profiler/a9eaab",request.getProfilerUrl());`
	`55`	`+assertEquals(404,request.getStatusCode());`
	`56`	`+ }`
	`57`	`+`
`42`	`58`	`/**`
`43`	`59`	`* @see ProfilerUtil#getRequestAttributes`
`44`	`60`	`*/`

Comments

(0)