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

Utilisation de PlatformProjectResponse pour avoir plus de detail sur la réponse

Browse source
This commit is contained in:
Nicolas Héron 2019-01-22 10:40:52 +01:00
commit c0387becb7
5 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/service/model/UserConnected.java
View file

@ -1,6 +1,6 @@
package org.chtijbug.drools.console.service.model; package org.chtijbug.drools.console.service.model;
import org.guvnor.rest.client.ProjectResponse; import org.chtijbug.guvnor.server.jaxrs.model.PlatformProjectResponse;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -10,7 +10,7 @@ public class UserConnected {
private String userPassword; private String userPassword;
private List<ProjectResponse> projectResponses = new ArrayList<>(); private List<PlatformProjectResponse> projectResponses = new ArrayList<>();
private List<String> roles = new ArrayList<>(); private List<String> roles = new ArrayList<>();
@ -41,11 +41,11 @@ public class UserConnected {
} }
public List<ProjectResponse> getProjectResponses() { public List<PlatformProjectResponse> getProjectResponses() {
return projectResponses; return projectResponses;
} }
public void setProjectResponses(List<ProjectResponse> projectResponses) { public void setProjectResponses(List<PlatformProjectResponse> projectResponses) {
this.projectResponses = projectResponses; this.projectResponses = projectResponses;
} }

7
drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/view/DeploymentView.java
View file

@ -15,6 +15,7 @@ import org.chtijbug.drools.console.service.UserConnectedService;
import org.chtijbug.drools.console.service.model.UserConnected; import org.chtijbug.drools.console.service.model.UserConnected;
import org.chtijbug.drools.console.service.model.kie.*; import org.chtijbug.drools.console.service.model.kie.*;
import org.chtijbug.drools.console.service.util.AppContext; import org.chtijbug.drools.console.service.util.AppContext;
import org.chtijbug.guvnor.server.jaxrs.model.PlatformProjectResponse;
import org.guvnor.rest.client.ProjectResponse; import org.guvnor.rest.client.ProjectResponse;
import org.kie.server.api.model.KieContainerResource; import org.kie.server.api.model.KieContainerResource;
import org.kie.server.api.model.ReleaseId; import org.kie.server.api.model.ReleaseId;
@ -30,7 +31,7 @@ public class DeploymentView extends DroolsAdminConsoleMainView implements AddLog
final private Grid<List<String>> gridLogging = new Grid(); final private Grid<List<String>> gridLogging = new Grid();
final private Button buttonDeployProject = new Button("Deploy project"); final private Button buttonDeployProject = new Button("Deploy project");
private KieConfigurationData config; private KieConfigurationData config;
private ComboBox<ProjectResponse> spaceSelection; private ComboBox<PlatformProjectResponse> spaceSelection;
final private TextField projectArtifactIDTextField = new TextField("Project Artifact ID"); final private TextField projectArtifactIDTextField = new TextField("Project Artifact ID");
final private TextField projectGroupIDTextField = new TextField("Project Group ID"); final private TextField projectGroupIDTextField = new TextField("Project Group ID");
@ -73,8 +74,8 @@ public class DeploymentView extends DroolsAdminConsoleMainView implements AddLog
spaceSelection = new ComboBox("Project", userConnected.getProjectResponses()); spaceSelection = new ComboBox("Project", userConnected.getProjectResponses());
spaceSelection.setItemLabelGenerator(ProjectResponse::getName); spaceSelection.setItemLabelGenerator(ProjectResponse::getName);
spaceSelection.addValueChangeListener(valueChangeEvent -> { spaceSelection.addValueChangeListener(valueChangeEvent -> {
ProjectResponse response = (ProjectResponse) spaceSelection.getValue(); PlatformProjectResponse response = spaceSelection.getValue();
projectArtifactIDTextField.setValue(response.getName()); projectArtifactIDTextField.setValue(response.getArtifactId());
projectGroupIDTextField.setValue(response.getGroupId()); projectGroupIDTextField.setValue(response.getGroupId());
projectVersionTextField.setValue(response.getVersion()); projectVersionTextField.setValue(response.getVersion());
refreshList(); refreshList();

10
drools-framework-admin-console-parent/drools-framework-admin-console/src/main/java/org/chtijbug/drools/console/view/TableLikeArtefactView.java
View file

@ -15,7 +15,7 @@ import org.chtijbug.drools.console.service.model.UserConnected;
import org.chtijbug.drools.console.service.model.kie.KieConfigurationData; import org.chtijbug.drools.console.service.model.kie.KieConfigurationData;
import org.chtijbug.drools.console.service.util.AppContext; import org.chtijbug.drools.console.service.util.AppContext;
import org.chtijbug.guvnor.server.jaxrs.jaxb.Asset; import org.chtijbug.guvnor.server.jaxrs.jaxb.Asset;
import org.guvnor.rest.client.ProjectResponse; import org.chtijbug.guvnor.server.jaxrs.model.PlatformProjectResponse;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.util.*; import java.util.*;
@ -36,7 +36,7 @@ public class TableLikeArtefactView extends DroolsAdminConsoleMainView {
private Grid<Map<String, String>> assetListGrid; private Grid<Map<String, String>> assetListGrid;
private ComboBox<ProjectResponse> spaceSelection; private ComboBox<PlatformProjectResponse> spaceSelection;
private Button deleteRow; private Button deleteRow;
private Button editRow; private Button editRow;
@ -61,9 +61,9 @@ public class TableLikeArtefactView extends DroolsAdminConsoleMainView {
}); });
verticalLayout.add(button); verticalLayout.add(button);
spaceSelection = new ComboBox("Project", userConnected.getProjectResponses()); spaceSelection = new ComboBox("Project", userConnected.getProjectResponses());
spaceSelection.setItemLabelGenerator(ProjectResponse::getName); spaceSelection.setItemLabelGenerator(PlatformProjectResponse::getName);
spaceSelection.addValueChangeListener(valueChangeEvent -> { spaceSelection.addValueChangeListener(valueChangeEvent -> {
ProjectResponse response = (ProjectResponse) spaceSelection.getValue(); PlatformProjectResponse response = (PlatformProjectResponse) spaceSelection.getValue();
//spaceSelection.setSelectedItem(response); //spaceSelection.setSelectedItem(response);
assetListGrid.addColumn(hashmap -> hashmap.get("title")); assetListGrid.addColumn(hashmap -> hashmap.get("title"));
List<Asset> assets = kieRepositoryService.getListAssets(config.getKiewbUrl(), userConnected.getUserName(), userConnected.getUserPassword(), response.getSpaceName(), response.getName()); List<Asset> assets = kieRepositoryService.getListAssets(config.getKiewbUrl(), userConnected.getUserName(), userConnected.getUserPassword(), response.getSpaceName(), response.getName());
@ -101,7 +101,7 @@ public class TableLikeArtefactView extends DroolsAdminConsoleMainView {
if (selectedElements.toArray().length > 0) { if (selectedElements.toArray().length > 0) {
String assetName = ((Map<String, String>) selectedElements.toArray()[0]).get("title"); String assetName = ((Map<String, String>) selectedElements.toArray()[0]).get("title");
if (assetName != null) { if (assetName != null) {
ProjectResponse response = (ProjectResponse) spaceSelection.getValue(); PlatformProjectResponse response = spaceSelection.getValue();
userConnectedService.addAssetToSession(assetName); userConnectedService.addAssetToSession(assetName);
userConnectedService.addProjectToSession(response.getName()); userConnectedService.addProjectToSession(response.getName());
userConnectedService.addSpaceToSession(response.getSpaceName()); userConnectedService.addSpaceToSession(response.getSpaceName());

10
drools-framework-base-tools-parent/drools-framework-kie-wb-parent/drools-framework-kie-wb-rest-pojo/src/main/java/org/chtijbug/guvnor/server/jaxrs/model/PlatformProjectResponse.java
View file

@ -7,6 +7,8 @@ import java.util.List;
public class PlatformProjectResponse extends ProjectResponse { public class PlatformProjectResponse extends ProjectResponse {
private String artifactId;
private List<String> javaClasses = new ArrayList<>(); private List<String> javaClasses = new ArrayList<>();
public PlatformProjectResponse() { public PlatformProjectResponse() {
@ -20,4 +22,12 @@ public class PlatformProjectResponse extends ProjectResponse {
public void setJavaClasses(List<String> javaClasses) { public void setJavaClasses(List<String> javaClasses) {
this.javaClasses = javaClasses; this.javaClasses = javaClasses;
} }
public String getArtifactId() {
return artifactId;
}
public void setArtifactId(String artifactId) {
this.artifactId = artifactId;
}
} }

1
drools-framework-base-tools-parent/drools-framework-kie-wb-parent/kie-drools-framework-rest-backend/src/main/java/org/chtijbug/kie/rest/backend/PackageResource.java
View file

@ -147,6 +147,7 @@ public class PackageResource {
projectResponse.getJavaClasses().add(className); projectResponse.getJavaClasses().add(className);
} }
projectResponse.setArtifactId(workspaceProject.getMainModule().getPom().getGav().getArtifactId());
projectResponse.setGroupId(workspaceProject.getMainModule().getPom().getGav().getGroupId()); projectResponse.setGroupId(workspaceProject.getMainModule().getPom().getGav().getGroupId());
projectResponse.setVersion(workspaceProject.getMainModule().getPom().getGav().getVersion()); projectResponse.setVersion(workspaceProject.getMainModule().getPom().getGav().getVersion());
projectResponse.setDescription(workspaceProject.getMainModule().getPom().getDescription()); projectResponse.setDescription(workspaceProject.getMainModule().getPom().getDescription());