diff --git a/packages/hawtio/src/plugins/springboot/Health.tsx b/packages/hawtio/src/plugins/springboot/Health.tsx
index 7d215ac43..de28d98b6 100644
--- a/packages/hawtio/src/plugins/springboot/Health.tsx
+++ b/packages/hawtio/src/plugins/springboot/Health.tsx
@@ -11,8 +11,8 @@ import {
PageSection,
Title,
} from '@patternfly/react-core'
-import { springbootService } from '@hawtiosrc/plugins/springboot/springboot-service'
-import { HealthComponentDetail, HealthData } from '@hawtiosrc/plugins/springboot/types'
+import { springbootService } from './springboot-service'
+import { HealthComponentDetail, HealthData } from './types'
import { TableComposable, Tbody, Td, Tr } from '@patternfly/react-table'
import { humanizeLabels } from '@hawtiosrc/util/strings'
import { ChartDonutUtilization } from '@patternfly/react-charts'
diff --git a/packages/hawtio/src/plugins/springboot/Info.tsx b/packages/hawtio/src/plugins/springboot/Info.tsx
index a51e257f1..dccc83c6e 100644
--- a/packages/hawtio/src/plugins/springboot/Info.tsx
+++ b/packages/hawtio/src/plugins/springboot/Info.tsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react'
import { FormGroup, PageSection } from '@patternfly/react-core'
-import { springbootService } from '@hawtiosrc/plugins/springboot/springboot-service'
+import { springbootService } from './springboot-service'
import { TableComposable, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table'
export const Info: React.FunctionComponent = () => {
diff --git a/packages/hawtio/src/plugins/springboot/Loggers.tsx b/packages/hawtio/src/plugins/springboot/Loggers.tsx
index 46e5971f4..5b78ba476 100644
--- a/packages/hawtio/src/plugins/springboot/Loggers.tsx
+++ b/packages/hawtio/src/plugins/springboot/Loggers.tsx
@@ -19,10 +19,10 @@ import {
ToolbarGroup,
ToolbarItem,
} from '@patternfly/react-core'
-import { springbootService } from '@hawtiosrc/plugins/springboot/springboot-service'
+import { springbootService } from './springboot-service'
import { TableComposable, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table'
import { SearchIcon } from '@patternfly/react-icons'
-import { Logger } from '@hawtiosrc/plugins/springboot/types'
+import { Logger } from './types'
const SetLogDropdown: React.FunctionComponent<{
currentLevel: string
diff --git a/packages/hawtio/src/plugins/springboot/SpringBoot.tsx b/packages/hawtio/src/plugins/springboot/SpringBoot.tsx
index 9ed9a7899..c8545f2bd 100644
--- a/packages/hawtio/src/plugins/springboot/SpringBoot.tsx
+++ b/packages/hawtio/src/plugins/springboot/SpringBoot.tsx
@@ -2,11 +2,11 @@ import { Nav, NavItem, NavList, PageGroup, PageNavigation, PageSection, Title }
import React, { useEffect, useState } from 'react'
import { Navigate, NavLink, Route, Routes, useLocation } from 'react-router-dom'
-import { Health } from '@hawtiosrc/plugins/springboot/Health'
-import { Info } from '@hawtiosrc/plugins/springboot/Info'
-import { Loggers } from '@hawtiosrc/plugins/springboot/Loggers'
-import { TraceView } from '@hawtiosrc/plugins/springboot/TraceView'
-import { springbootService } from '@hawtiosrc/plugins/springboot/springboot-service'
+import { Health } from './Health'
+import { Info } from './Info'
+import { Loggers } from './Loggers'
+import { TraceView } from './TraceView'
+import { springbootService } from './springboot-service'
type NavItem = {
id: string
@@ -33,12 +33,12 @@ export const SpringBoot: React.FunctionComponent = () => {
}
if (await springbootService.hasEndpoint('Httptrace')) {
- springbootService.setisSb3(false)
+ springbootService.setIsSpringBoot3(false)
nav.push({ id: 'trace', title: 'Trace', component: })
}
if (await springbootService.hasEndpoint('Httpexchanges')) {
- springbootService.setisSb3(true)
+ springbootService.setIsSpringBoot3(true)
nav.push({ id: 'trace', title: 'Trace', component: })
}
diff --git a/packages/hawtio/src/plugins/springboot/TraceView.tsx b/packages/hawtio/src/plugins/springboot/TraceView.tsx
index d5616ced6..042848078 100644
--- a/packages/hawtio/src/plugins/springboot/TraceView.tsx
+++ b/packages/hawtio/src/plugins/springboot/TraceView.tsx
@@ -29,8 +29,8 @@ import { Trace } from './types'
import { springbootService } from './springboot-service'
const HttpStatusIcon: React.FunctionComponent<{ code: number }> = ({ code }) => {
- if (code < 400) return
- else return
+ if (code < 400) return
+ else return
}
const HttpMethodLabel: React.FunctionComponent<{ method: string }> = ({ method }) => {
@@ -108,12 +108,13 @@ export const TraceView: React.FunctionComponent = () => {
case 'HTTP Status':
filtered = filtered.filter(trace => trace.httpStatusCode.toString().includes(searchTerm))
break
- case 'Path':
- filtered = filtered.filter(trace => trace.path.includes(searchTerm))
- break
case 'Time Taken':
filtered = filtered.filter(trace => trace.timeTaken.includes(searchTerm))
break
+ case 'Path':
+ default:
+ filtered = filtered.filter(trace => trace.path.includes(searchTerm))
+ break
}
})
setFilteredTraces([...filtered])
diff --git a/packages/hawtio/src/plugins/springboot/index.ts b/packages/hawtio/src/plugins/springboot/index.ts
index 205d5b2c0..2533a339b 100644
--- a/packages/hawtio/src/plugins/springboot/index.ts
+++ b/packages/hawtio/src/plugins/springboot/index.ts
@@ -1,7 +1,7 @@
import { hawtio, HawtioPlugin } from '@hawtiosrc/core'
import { helpRegistry } from '@hawtiosrc/help'
-import { SpringBoot } from '@hawtiosrc/plugins/springboot/SpringBoot'
+import { SpringBoot } from './SpringBoot'
import { pluginId, pluginPath } from './globals'
import help from './help.md'
import { springbootService } from './springboot-service'
diff --git a/packages/hawtio/src/plugins/springboot/springboot-service.ts b/packages/hawtio/src/plugins/springboot/springboot-service.ts
index ca6d455d9..28e756287 100644
--- a/packages/hawtio/src/plugins/springboot/springboot-service.ts
+++ b/packages/hawtio/src/plugins/springboot/springboot-service.ts
@@ -1,15 +1,15 @@
import { jolokiaService, workspace } from '@hawtiosrc/plugins'
-import { HealthComponent, HealthData, JmXTrace, JolokiaHealthData, Logger, LoggerConfiguration, Trace } from './types'
+import { HealthComponent, HealthData, JmxTrace, JolokiaHealthData, Logger, LoggerConfiguration, Trace } from './types'
-class SpringbootService {
- isSb3 = true
+class SpringBootService {
+ isSpringBoot3 = true
isActive(): Promise {
return workspace.treeContainsDomainAndProperties('org.springframework.boot')
}
- setisSb3(is: boolean) {
- this.isSb3 = is
+ setIsSpringBoot3(is: boolean) {
+ this.isSpringBoot3 = is
}
async loadHealth(): Promise {
@@ -115,8 +115,8 @@ class SpringbootService {
const traces: Trace[] = []
let mbeanName = 'Httpexchanges'
let mbeanOperation = 'httpExchanges'
- let jmxTraces: JmXTrace[] = []
- if (!this.isSb3) {
+ let jmxTraces: JmxTrace[] = []
+ if (!this.isSpringBoot3) {
mbeanName = 'Httptrace'
mbeanOperation = 'traces'
}
@@ -124,10 +124,10 @@ class SpringbootService {
`org.springframework.boot:type=Endpoint,name=${mbeanName}`,
mbeanOperation,
)
- if (this.isSb3) {
- jmxTraces = (data as { exchanges: JmXTrace[] }).exchanges
+ if (this.isSpringBoot3) {
+ jmxTraces = (data as { exchanges: JmxTrace[] }).exchanges
} else {
- jmxTraces = (data as { traces: JmXTrace[] }).traces
+ jmxTraces = (data as { traces: JmxTrace[] }).traces
}
jmxTraces
@@ -143,4 +143,4 @@ class SpringbootService {
}
}
-export const springbootService = new SpringbootService()
+export const springbootService = new SpringBootService()
diff --git a/packages/hawtio/src/plugins/springboot/types.ts b/packages/hawtio/src/plugins/springboot/types.ts
index 956ed9dd2..265b4393d 100644
--- a/packages/hawtio/src/plugins/springboot/types.ts
+++ b/packages/hawtio/src/plugins/springboot/types.ts
@@ -46,8 +46,7 @@ export class Trace {
timeTaken: string = '-1'
info: string = ''
- constructor(traceData: unknown) {
- const trace = traceData as JmXTrace
+ constructor(trace: JmxTrace) {
this.timestamp = trace.timestamp
if (trace.info) {
@@ -78,7 +77,7 @@ export class Trace {
}
}
-export type JmXTrace = {
+export type JmxTrace = {
timestamp: string
info?: {
method: string