passage à version 7.16.0.final de drools
mise à jour service rest chtijbug kie wb pour ajouter liste des classes ajout de persistance pour kie-server ajout interface métier rest qui se crée quand on crée un conteneur
This commit is contained in:
Nicolas Héron
parent
ee34518b7d
commit
cd86135f98
6 changed files with 74 additions and 20 deletions
|
|
@ -7,7 +7,7 @@ import org.chtijbug.drools.console.service.model.UserConnected;
|
|||
import org.chtijbug.drools.console.service.model.kie.JobStatus;
|
||||
import org.chtijbug.guvnor.server.jaxrs.api.UserLoginInformation;
|
||||
import org.chtijbug.guvnor.server.jaxrs.jaxb.Asset;
|
||||
import org.guvnor.rest.client.ProjectResponse;
|
||||
import org.chtijbug.guvnor.server.jaxrs.model.PlatformProjectResponse;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
|
|
@ -55,22 +55,22 @@ public class KieRepositoryService {
|
|||
return reponseMoteur;
|
||||
}
|
||||
|
||||
public List<ProjectResponse> getListSpaces2(String url, String username, String password) {
|
||||
public List<PlatformProjectResponse> getListSpaces2(String url, String username, String password) {
|
||||
String completeurl = url + "/chtijbug/detailedSpaces";
|
||||
logger.info("url moteur reco : " + completeurl);
|
||||
ResponseEntity<List<ProjectResponse>> response = restTemplateKiewb
|
||||
ResponseEntity<List<PlatformProjectResponse>> response = restTemplateKiewb
|
||||
.execute(completeurl, HttpMethod.GET, requestCallback(null, username, password), clientHttpResponse -> {
|
||||
List<ProjectResponse> extractedResponse = null;
|
||||
List<PlatformProjectResponse> extractedResponse = null;
|
||||
if (clientHttpResponse.getBody() != null) {
|
||||
Scanner s = new Scanner(clientHttpResponse.getBody()).useDelimiter("\\A");
|
||||
String result = s.hasNext() ? s.next() : "";
|
||||
ProjectResponse[] values = mapper.readValue(result, ProjectResponse[].class);
|
||||
PlatformProjectResponse[] values = mapper.readValue(result, PlatformProjectResponse[].class);
|
||||
extractedResponse = Arrays.asList(values);
|
||||
}
|
||||
ResponseEntity<List<ProjectResponse>> extractedValue = new ResponseEntity<>(extractedResponse, clientHttpResponse.getHeaders(), clientHttpResponse.getStatusCode());
|
||||
ResponseEntity<List<PlatformProjectResponse>> extractedValue = new ResponseEntity<>(extractedResponse, clientHttpResponse.getHeaders(), clientHttpResponse.getStatusCode());
|
||||
return extractedValue;
|
||||
});
|
||||
List<ProjectResponse> reponseMoteur;
|
||||
List<PlatformProjectResponse> reponseMoteur;
|
||||
|
||||
reponseMoteur = response.getBody();
|
||||
return reponseMoteur;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
package org.chtijbug.guvnor.server.jaxrs.api;
|
||||
|
||||
|
||||
import org.guvnor.rest.client.ProjectResponse;
|
||||
import org.chtijbug.guvnor.server.jaxrs.model.PlatformProjectResponse;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
|
|
@ -30,17 +30,17 @@ import java.util.List;
|
|||
public class UserLoginInformation {
|
||||
|
||||
|
||||
private List<ProjectResponse> projects = new ArrayList<>();
|
||||
private List<PlatformProjectResponse> projects = new ArrayList<>();
|
||||
|
||||
private String username;
|
||||
|
||||
private List<String> roles = new ArrayList<>();
|
||||
|
||||
public List<ProjectResponse> getProjects() {
|
||||
public List<PlatformProjectResponse> getProjects() {
|
||||
return projects;
|
||||
}
|
||||
|
||||
public void setProjects(List<ProjectResponse> projects) {
|
||||
public void setProjects(List<PlatformProjectResponse> projects) {
|
||||
this.projects = projects;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
package org.chtijbug.guvnor.server.jaxrs.model;
|
||||
|
||||
import org.guvnor.rest.client.ProjectResponse;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class PlatformProjectResponse extends ProjectResponse {
|
||||
|
||||
private List<String> javaClasses = new ArrayList<>();
|
||||
|
||||
public PlatformProjectResponse() {
|
||||
super();
|
||||
}
|
||||
|
||||
public List<String> getJavaClasses() {
|
||||
return javaClasses;
|
||||
}
|
||||
|
||||
public void setJavaClasses(List<String> javaClasses) {
|
||||
this.javaClasses = javaClasses;
|
||||
}
|
||||
}
|
||||
|
|
@ -26,6 +26,15 @@
|
|||
<version>1.0.0.Final</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.kie.workbench.screens</groupId>
|
||||
<artifactId>kie-wb-common-data-modeller-api</artifactId>
|
||||
<version>${jbpm.version}</version>
|
||||
<scope>provided</scope>
|
||||
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.kie</groupId>
|
||||
<artifactId>kie-api</artifactId>
|
||||
|
|
|
|||
|
|
@ -4,15 +4,21 @@ package org.chtijbug.kie.rest.backend;
|
|||
import org.chtijbug.guvnor.server.jaxrs.api.UserLoginInformation;
|
||||
import org.chtijbug.guvnor.server.jaxrs.jaxb.Asset;
|
||||
import org.chtijbug.guvnor.server.jaxrs.jaxb.Package;
|
||||
import org.chtijbug.guvnor.server.jaxrs.model.PlatformProjectResponse;
|
||||
import org.guvnor.common.services.project.model.Module;
|
||||
import org.guvnor.common.services.project.model.WorkspaceProject;
|
||||
import org.guvnor.common.services.project.service.WorkspaceProjectService;
|
||||
import org.guvnor.rest.client.ProjectResponse;
|
||||
import org.guvnor.structure.organizationalunit.OrganizationalUnit;
|
||||
import org.guvnor.structure.organizationalunit.OrganizationalUnitService;
|
||||
import org.guvnor.structure.repositories.Branch;
|
||||
import org.guvnor.structure.repositories.PublicURI;
|
||||
import org.guvnor.structure.repositories.Repository;
|
||||
import org.guvnor.structure.repositories.RepositoryService;
|
||||
import org.kie.workbench.common.screens.datamodeller.model.EditorModelContent;
|
||||
import org.kie.workbench.common.screens.datamodeller.service.DataModelerService;
|
||||
import org.kie.workbench.common.services.datamodeller.core.DataObject;
|
||||
import org.kie.workbench.common.services.datamodeller.core.impl.DataModelImpl;
|
||||
import org.kie.workbench.common.services.shared.project.KieModule;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.uberfire.io.IOService;
|
||||
import org.uberfire.java.nio.base.options.CommentedOption;
|
||||
|
|
@ -61,6 +67,8 @@ public class PackageResource {
|
|||
private WorkspaceProjectService projectService;
|
||||
|
||||
private RestTypeDefinition dotFileFilter = new RestTypeDefinition();
|
||||
@Inject
|
||||
private DataModelerService dataModelerService;
|
||||
|
||||
@Inject
|
||||
private WorkspaceProjectService workspaceProjectService;
|
||||
|
|
@ -93,15 +101,15 @@ public class PackageResource {
|
|||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@Path("/detailedSpaces")
|
||||
// @RolesAllowed({REST_ROLE, REST_PROJECT_ROLE})
|
||||
public Collection<ProjectResponse> getProjects() {
|
||||
public Collection<PlatformProjectResponse> getProjects() {
|
||||
logger.debug("-----getSpaces--- ");
|
||||
|
||||
|
||||
return getAllProjects();
|
||||
}
|
||||
|
||||
private List<ProjectResponse> getAllProjects() {
|
||||
final List<ProjectResponse> spaces = new ArrayList<>();
|
||||
private List<PlatformProjectResponse> getAllProjects() {
|
||||
final List<PlatformProjectResponse> spaces = new ArrayList<>();
|
||||
for (OrganizationalUnit ou : organizationalUnitService.getOrganizationalUnits()) {
|
||||
spaces.addAll(getSpace(ou));
|
||||
}
|
||||
|
|
@ -109,22 +117,36 @@ public class PackageResource {
|
|||
return spaces;
|
||||
}
|
||||
|
||||
private List<ProjectResponse> getSpace(OrganizationalUnit ou) {
|
||||
private List<PlatformProjectResponse> getSpace(OrganizationalUnit ou) {
|
||||
|
||||
final List<ProjectResponse> repoNames = new ArrayList<>();
|
||||
final List<PlatformProjectResponse> repoNames = new ArrayList<>();
|
||||
for (WorkspaceProject workspaceProject : workspaceProjectService.getAllWorkspaceProjects(ou)) {
|
||||
repoNames.add(getProjectResponse(workspaceProject));
|
||||
}
|
||||
|
||||
return repoNames;
|
||||
}
|
||||
private void toto(){
|
||||
|
||||
private ProjectResponse getProjectResponse(WorkspaceProject workspaceProject) {
|
||||
final ProjectResponse projectResponse = new ProjectResponse();
|
||||
}
|
||||
|
||||
|
||||
private PlatformProjectResponse getProjectResponse(WorkspaceProject workspaceProject) {
|
||||
final PlatformProjectResponse projectResponse = new PlatformProjectResponse();
|
||||
projectResponse.setName(workspaceProject.getName());
|
||||
projectResponse.setSpaceName(workspaceProject.getOrganizationalUnit().getName());
|
||||
|
||||
if (workspaceProject.getMainModule() != null) {
|
||||
Module kmodule = workspaceProject.getMainModule();
|
||||
EditorModelContent econtent = dataModelerService.loadContent(((KieModule) kmodule).getImportsPath());
|
||||
DataModelImpl econtentDataModel = (DataModelImpl)econtent.getDataModel();
|
||||
List<DataObject> dataObjects = econtentDataModel.getExternalClasses();
|
||||
for (DataObject dataObject : dataObjects){
|
||||
System.out.println(dataObject.toString());
|
||||
String className="class="+dataObject.getPackageName()+"."+dataObject.getName();
|
||||
projectResponse.getJavaClasses().add(className);
|
||||
|
||||
}
|
||||
projectResponse.setGroupId(workspaceProject.getMainModule().getPom().getGav().getGroupId());
|
||||
projectResponse.setVersion(workspaceProject.getMainModule().getPom().getGav().getVersion());
|
||||
projectResponse.setDescription(workspaceProject.getMainModule().getPom().getDescription());
|
||||
|
|
|
|||
2
pom.xml
2
pom.xml
|
|
@ -19,7 +19,7 @@
|
|||
<packaging>pom</packaging>
|
||||
|
||||
<properties>
|
||||
<jbpm.version>7.15.0.Final</jbpm.version>
|
||||
<jbpm.version>7.16.0.Final</jbpm.version>
|
||||
<spring.boot.version>1.5.12.RELEASE</spring.boot.version>
|
||||
<spring.version>4.3.16.RELEASE</spring.version>
|
||||
<version.thorntail>2.2.1.Final</version.thorntail>
|
||||
|
|
|
|||
Loading…
Add table
editor.link_modal.header
Reference in a new issue