Skip to content

Commit

Permalink
DevUI: Split the client and service lists into separate cards, add li…
Browse files Browse the repository at this point in the history 
…nks to their WSDLs quarkiverse#1015
  • Loading branch information
@ppalaga
ppalaga committed Jan 2, 2024
1 parent 6c3fb7a commit 6d9202b
Show file tree
Hide file tree
Showing 10 changed files with 407 additions and 159 deletions.
72 changes: 46 additions & 26 deletions ...sions/core/deployment/src/main/java/io/quarkiverse/cxf/deployment/CxfClientProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Disposes;
Expand All @@ -35,6 +36,7 @@
import io.quarkiverse.cxf.CXFClientData;
import io.quarkiverse.cxf.CXFClientInfo;
import io.quarkiverse.cxf.CXFRecorder;
import io.quarkiverse.cxf.ClientInjectionPoint;
import io.quarkiverse.cxf.CxfClientConfig.HTTPConduitImpl;
import io.quarkiverse.cxf.CxfClientProducer;
import io.quarkiverse.cxf.CxfFixedConfig;
Expand Down Expand Up @@ -178,34 +180,52 @@ private static AnnotationInstance findWebServiceClientAnnotation(IndexView index
return null;
}

public static Stream<ClientInjectionPoint> findClientInjectionPoints(IndexView index) {
return index.getAnnotations(CxfDotNames.CXFCLIENT_ANNOTATION).stream()
.map(annotationInstance -> {
final AnnotationTarget target = annotationInstance.target();
Type type;
switch (target.kind()) {
case FIELD:
type = target.asField().type();
break;
case METHOD_PARAMETER:
MethodParameterInfo paramInfo = target.asMethodParameter();
MethodInfo method = paramInfo.method();
type = method.parameterTypes().get(paramInfo.position());
break;
default:
type = null;
break;
}
if (type != null) {
type = type.name().equals(CxfDotNames.INJECT_INSTANCE) ? type.asParameterizedType().arguments().get(0)
: type;
final String typeName = type.name().toString();
try {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
final Class<?> sei = Class.forName(typeName, true, cl);
return new ClientInjectionPoint(annotationInstance.value().asString(), sei);
} catch (ClassNotFoundException e) {
throw new RuntimeException("Could not load Service Endpoint Interface " + typeName);
}
} else {
return null;
}
})
.filter(ip -> ip != null)
.distinct();
}

private static Map<String, ClientFixedConfig> findClientSEIsInUse(IndexView index, CxfFixedConfig config) {
final Map<String, ClientFixedConfig> seiToClientConfig = new TreeMap<>();
index.getAnnotations(CxfDotNames.CXFCLIENT_ANNOTATION).forEach(annotationInstance -> {
final AnnotationTarget target = annotationInstance.target();
Type type;
switch (target.kind()) {
case FIELD:
type = target.asField().type();
break;
case METHOD_PARAMETER:
MethodParameterInfo paramInfo = target.asMethodParameter();
MethodInfo method = paramInfo.method();
type = method.parameterTypes().get(paramInfo.position());
break;
default:
type = null;
break;
}
if (type != null) {
type = type.name().equals(CxfDotNames.INJECT_INSTANCE) ? type.asParameterizedType().arguments().get(0)
: type;
final String typeName = type.name().toString();
final ClientFixedConfig clientConfig = findClientConfig(
config,
Optional.ofNullable(annotationInstance.value()).map(AnnotationValue::asString).orElse(null),
typeName);
seiToClientConfig.put(typeName, clientConfig);
}
findClientInjectionPoints(index).forEach(clientInjectionPoint -> {
String sei = clientInjectionPoint.getSei().getName();
final ClientFixedConfig clientConfig = findClientConfig(
config,
clientInjectionPoint.getConfigKey(),
sei);
seiToClientConfig.put(sei, clientConfig);
});
return seiToClientConfig;
}
Expand Down
34 changes: 26 additions & 8 deletions ...ons/core/deployment/src/main/java/io/quarkiverse/cxf/deployment/devui/DevUIProcessor.java
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,39 @@
package io.quarkiverse.cxf.deployment.devui;

import java.util.List;
import java.util.stream.Collectors;

import io.quarkiverse.cxf.deployment.CxfClientBuildItem;
import io.quarkiverse.cxf.deployment.CxfEndpointImplementationBuildItem;
import io.quarkiverse.cxf.ClientInjectionPoint;
import io.quarkiverse.cxf.deployment.CxfClientProcessor;
import io.quarkiverse.cxf.devui.CxfJsonRPCService;
import io.quarkiverse.cxf.devui.DevUiRecorder;
import io.quarkus.deployment.IsDevelopment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import io.quarkus.devui.spi.JsonRPCProvidersBuildItem;
import io.quarkus.devui.spi.page.CardPageBuildItem;
import io.quarkus.devui.spi.page.Page;

public class DevUIProcessor {

@BuildStep(onlyIf = IsDevelopment.class)
public CardPageBuildItem pages(List<CxfEndpointImplementationBuildItem> services,
List<CxfClientBuildItem> clients) {
public CardPageBuildItem pages() {

CardPageBuildItem cardPageBuildItem = new CardPageBuildItem();

int total = services.size() + clients.size();
cardPageBuildItem.addPage(Page.webComponentPageBuilder()
.title("Clients")
.icon("font-awesome-solid:message")
.componentLink("qwc-cxf-clients.js")
.dynamicLabelJsonRPCMethodName("getClientCount"));

cardPageBuildItem.addPage(Page.webComponentPageBuilder()
.title("List of SOAP WS")
.icon("font-awesome-solid:cubes")
.title("Service Endpoints")
.icon("font-awesome-solid:gears")
.componentLink("qwc-cxf-services.js")
.staticLabel(String.valueOf(total)));
.dynamicLabelJsonRPCMethodName("getServiceCount"));

return cardPageBuildItem;
}
Expand All @@ -34,4 +42,14 @@ public CardPageBuildItem pages(List<CxfEndpointImplementationBuildItem> services
JsonRPCProvidersBuildItem createJsonRPCServiceForCache() {
return new JsonRPCProvidersBuildItem(CxfJsonRPCService.class);
}

@BuildStep(onlyIf = IsDevelopment.class)
@Record(ExecutionTime.RUNTIME_INIT)
void collectClients(CombinedIndexBuildItem combinedIndexBuildItem, DevUiRecorder devuiRecorder) {
final List<ClientInjectionPoint> injectionPoints = CxfClientProcessor.findClientInjectionPoints(
combinedIndexBuildItem.getIndex())
.collect(Collectors.toList());
devuiRecorder.addClientInjectionPoints(injectionPoints);
}

}
114 changes: 114 additions & 0 deletions extensions/core/deployment/src/main/resources/dev-ui/qwc-cxf-clients.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
import { LitElement, html, css} from 'lit';
import 'qui-card';
import '@vaadin/progress-bar';
import '@vaadin/grid';
import { columnBodyRenderer } from '@vaadin/grid/lit.js';
import { JsonRpc } from 'jsonrpc';
import 'qui-ide-link';

/**
* This component shows the list of clients
*/
export class QwcCxfClients extends LitElement {
jsonRpc = new JsonRpc(this);

static styles = css`
.cxf-table {
height: 100%;
padding-bottom: 10px;
}
code {
font-size: 85%;
}
.annotation {
color: var(--lumo-contrast-50pct);
}
:host {
display: flex;
flex-direction:column;
gap: 20px;
padding-left: 10px;
padding-right: 10px;
}
.nothing-found {
padding: 5px;
}`;

static properties = {
_clients: {state: true}
};

constructor() {
super();
this._clients = null;
}

connectedCallback() {
super.connectedCallback();
this.jsonRpc.getClients().then(jsonRpcResponse => {
this._clients = jsonRpcResponse.result;
});
}

render() {
if (this._clients) {
if (this._clients.length > 0) {
return this._renderClientList();
} else {
return html`<div class="nothing-found">No clients found</div>`;
}
} else {
return html`<vaadin-progress-bar class="progress" indeterminate></vaadin-progress-bar>`;
}
}

_renderClientList(){
return html`<vaadin-grid .items="${this._clients}" class="cxf-table" theme="no-border" all-rows-visible>
<vaadin-grid-column auto-width
header="Service Endpoint Interface (SEI)"
${columnBodyRenderer(this._classNameRenderer, [])}
resizable>
</vaadin-grid-column>
<vaadin-grid-column auto-width
header="Address"
${columnBodyRenderer(this._addressRenderer, [])}
resizable>
</vaadin-grid-column>
<vaadin-grid-column auto-width
header="WSDL"
${columnBodyRenderer(this._wsdlRenderer, [])}
resizable>
</vaadin-grid-column>
</vaadin-grid>`;
}

_classNameRenderer(client){
return html`<vaadin-vertical-layout>
<code class="annotation">@CXFClient("${client.configKey}")</code>
<qui-ide-link title='Service Endpoint Interface (SEI)'
fileName='${client.sei}'
lineNumber=0><code>${client.sei}</code></qui-ide-link>
</vaadin-vertical-layout>`;
}

_addressRenderer(client) {
return html`<vaadin-vertical-layout>
<code class="annotation">&nbsp;</code>
<code><a href="${client.address}" target="_blank">${client.address}</a></code>
</vaadin-vertical-layout>`;
}

_wsdlRenderer(client) {
return html`<vaadin-vertical-layout>
<code class="annotation">&nbsp;</code>
<code><a href="${client.wsdl}" target="_blank">${client.wsdl}</a></code>
</vaadin-vertical-layout>`;
}

}
customElements.define('qwc-cxf-clients', QwcCxfClients);
Loading

0 comments on commit 6d9202b

Please sign in to comment.