nheron/kie-platform
nheron/kie-platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #180 from pymma/kafka

Browse source 
Kafka
This commit is contained in:
Nicolas Héron 2020-11-12 14:14:25 +01:00 • committed by GitHub
commit 39fa454442
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drools-framework-admin-console-parent/drools-framework-admin-console/pom.xml
View file

@ -12,7 +12,7 @@
<artifactId>drools-framework-admin-console</artifactId>
<properties>
<vaadin.version>12.0.5</vaadin.version>
<vaadin.version>12.0.7</vaadin.version>
<spring-boot.version>${spring.boot.version}</spring-boot.version>
<spring-version>${spring.version}</spring-version>
<webapp.directory>src/main/webapp</webapp.directory>

17
drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/vaadincomponent/componentview/GridRuntime.java
View file

@ -1,7 +1,9 @@
package org.chtijbug.drools.console.vaadincomponent.componentview;
import com.vaadin.flow.component.grid.Grid;
import com.vaadin.flow.component.grid.GridSelectionModel;
import com.vaadin.flow.component.html.Label;
import com.vaadin.flow.component.notification.Notification;
import com.vaadin.flow.component.textfield.TextField;
import com.vaadin.flow.data.provider.ConfigurableFilterDataProvider;
import com.vaadin.flow.data.provider.ListDataProvider;
@ -48,6 +50,7 @@ public class GridRuntime extends Grid<RuntimePersist> {
private ConfigurableFilterDataProvider<RuntimePersist, Void, SerializablePredicate<RuntimePersist>> filterDataProvider;
private ProjectPersist projectPersist = null;
private GridSelectionModel<RuntimePersist> selectionModel;
public GridRuntime(ProjectPersist projectPersist) {
this.projectPersist = projectPersist;
@ -66,8 +69,8 @@ public class GridRuntime extends Grid<RuntimePersist> {
runtimeService = AppContext.getApplicationContext().getBean(RuntimeService.class);
setClassName("deployment-grid-perso");
setSelectionMode(Grid.SelectionMode.MULTI);
selectionModel = setSelectionMode(SelectionMode.MULTI);
selectionModel.deselectAll();
Grid.Column<RuntimePersist> runtimeNameCo = addColumn(runtimePersist -> runtimePersist.getServerName());
runtimeName = new TextField(strRuntimeName);
runtimeName.setValueChangeMode(ValueChangeMode.EAGER);
@ -116,7 +119,6 @@ public class GridRuntime extends Grid<RuntimePersist> {
return label;
})).setHeader("associated projects");
setDataProvider();
}
@ -158,7 +160,7 @@ public class GridRuntime extends Grid<RuntimePersist> {
if (projectPersist != null) {
runtimeToShow.add(runtimePersist1);
if (projectPersist.getServerNames().contains(runtimePersist1.getServerName())) {
getSelectionModel().select(runtimePersist1);
selectionModel.select(runtimePersist1);
}
} else {
runtimeToShow.add(runtimePersist1);
@ -169,10 +171,17 @@ public class GridRuntime extends Grid<RuntimePersist> {
dataProvider = new ListDataProvider<>(runtimeToShow);
filterDataProvider = dataProvider.withConfigurableFilter();
setDataProvider(filterDataProvider);
for (RuntimePersist runtimePersist : dataProvider.getItems()) {
if (projectPersist.getServerNames().contains(runtimePersist.getServerName())) {
selectionModel.select(runtimePersist);
}
}
reinitFilter();
}
}
public void reinitFilter() {

2
drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/vaadincomponent/leftMenu/Action/DeploymentAction.java
View file

@ -61,7 +61,7 @@ public class DeploymentAction extends VerticalLayout {
}
});
deployer =new Button("Déployer", VaadinIcon.EXTERNAL_LINK.create());
deployer =new Button("Deploy", VaadinIcon.EXTERNAL_LINK.create());
deployer.setClassName("leftMenu-global-button");
deployer.setEnabled(false);
add(deployer);

2
drools-framework-business-proxy-parent/drools-framework-business-reverse-proxy/src/main/java/org/chtijbug/drools/reverseproxy/service/UpdateService.java
View file

@ -63,7 +63,7 @@ public class UpdateService {
}
if (!found) {
MappingProperties newMappingProperties = new MappingProperties();
newMappingProperties.setPath(update.getPath());
newMappingProperties.setPath(UpdateService.removeSlach(update.getPath()));
logger.info("Creating path {}",update.getPath());
for (String destination : update.getServerNames()) {
newMappingProperties.getDestinations().add(destination);

2
pom.xml
View file

@ -18,7 +18,7 @@
<properties>
<fabri8.plugin.version>0.34.1</fabri8.plugin.version>
<jbpm.version>7.44.0.Final</jbpm.version>
<jbpm.version>7.45.0.Final</jbpm.version>
<node.version>v10.16.3</node.version>
<npm.version>6.11.3</npm.version>
<frontend-maven-plugin.version>1.8.0</frontend-maven-plugin.version>