Skip to content
This repository has been archived by the owner on Sep 13, 2022. It is now read-only.

Commit

Permalink
RHBPMS-4836 - Classes from external POJO project not listed in variab…
Browse files Browse the repository at this point in the history 
…le definitions dropdown of the process modeler (#653)

[6.5.x] RHBPMS-4836 - Classes from external POJO project not listed in variab…
  • Loading branch information
Tihomir Surdilovic committed Sep 1, 2017
1 parent aa32868 commit 7731eb6
Show file tree
Hide file tree
Showing 3 changed files with 190 additions and 98 deletions.
20 changes: 18 additions & 2 deletions jbpm-designer-backend/pom.xml
View file
Expand Up @@ -438,11 +438,27 @@
<artifactId>uberfire-nio2-model</artifactId>
</dependency>

<!-- Common services -->
<!-- Datamodel -->
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-workbench-models-commons</artifactId>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-workbench-models-datamodel-api</artifactId>
</dependency>
<dependency>
<groupId>org.kie.workbench.services</groupId>
<artifactId>kie-wb-common-services-backend</artifactId>
</dependency>
<dependency>
<groupId>org.kie.workbench.services</groupId>
<artifactId>kie-wb-common-datamodel-backend</artifactId>
</dependency>
<dependency>
<groupId>org.kie.workbench.services</groupId>
<artifactId>kie-wb-common-datamodel-api</artifactId>
</dependency>

<!-- Logging -->
<dependency>
Expand Down Expand Up @@ -520,4 +536,4 @@
</plugins>
</build>

</project>
</project>
198 changes: 107 additions & 91 deletions jbpm-designer-backend/src/main/java/org/jbpm/designer/web/server/CalledElementServlet.java
View file
Expand Up @@ -3,7 +3,7 @@
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
Expand All @@ -17,11 +17,16 @@

import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.inject.Inject;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
Expand All @@ -30,28 +35,30 @@
import javax.servlet.http.HttpServletResponse;

import org.apache.commons.codec.binary.Base64;
import org.drools.workbench.models.datamodel.oracle.PackageDataModelOracle;
import org.jbpm.designer.repository.Asset;
import org.jbpm.designer.util.Base64Backport;
import org.jbpm.designer.util.Utils;
import org.jbpm.designer.web.profile.IDiagramProfile;
import org.jbpm.designer.web.profile.IDiagramProfileService;
import org.json.JSONObject;
import org.kie.workbench.common.services.datamodel.backend.server.DataModelOracleUtilities;
import org.kie.workbench.common.services.datamodel.backend.server.service.DataModelService;
import org.kie.workbench.common.services.refactoring.model.index.terms.valueterms.ValueIndexTerm;
import org.kie.workbench.common.services.refactoring.model.index.terms.valueterms.ValueRuleAttributeIndexTerm;
import org.kie.workbench.common.services.refactoring.model.index.terms.valueterms.ValueRuleAttributeValueIndexTerm;
import org.kie.workbench.common.services.refactoring.model.index.terms.valueterms.ValueTypeIndexTerm;
import org.kie.workbench.common.services.refactoring.model.query.RefactoringPageRow;
import org.kie.workbench.common.services.refactoring.service.RefactoringQueryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.uberfire.backend.vfs.Path;
import org.uberfire.backend.vfs.VFSService;

/**
* Sevlet for resolving called elements.
*
* @author Tihomir Surdilovic
*/
public class CalledElementServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
private static final Logger logger = LoggerFactory.getLogger(CalledElementServlet.class);


Expand All @@ -62,38 +69,44 @@ public class CalledElementServlet extends HttpServlet {

@Inject
private RefactoringQueryService queryService;

@Override

@Inject
private VFSService vfsServices;

@Inject
private DataModelService dataModelService;

@Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
}
@Override

@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
String profileName = Utils.getDefaultProfileName(req.getParameter("profile"));
String processPackage = req.getParameter("ppackage");
String processId = req.getParameter("pid");
String action = req.getParameter("action");

if(profile == null) {
profile = _profileService.findProfile(req, profileName);
}
if(action != null && action.equals("openprocessintab")) {
String retValue = "";
List<String> allPackageNames = ServletUtil.getPackageNamesFromRepository(profile);
if(allPackageNames != null && allPackageNames.size() > 0) {
for(String packageName : allPackageNames) {
List<String> allProcessesInPackage = ServletUtil.getAllProcessesInPackage(packageName, profile);
if(allProcessesInPackage != null && allProcessesInPackage.size() > 0) {
for(String p : allProcessesInPackage) {
Asset<String> processContent = ServletUtil.getProcessSourceContent(p, profile);
Pattern idPattern = Pattern.compile("<\\S*process[^\"]+id=\"([^\"]+)\"", Pattern.MULTILINE);
Matcher idMatcher = idPattern.matcher(processContent.getAssetContent());
if(idMatcher.find()) {
String pid = idMatcher.group(1);
String pidcontent = ServletUtil.getProcessImageContent(packageName, pid, profile);
if(pid != null && pid.equals(processId)) {
String retValue = "";
List<String> allPackageNames = ServletUtil.getPackageNamesFromRepository(profile);
if(allPackageNames != null && allPackageNames.size() > 0) {
for(String packageName : allPackageNames) {
List<String> allProcessesInPackage = ServletUtil.getAllProcessesInPackage(packageName, profile);
if(allProcessesInPackage != null && allProcessesInPackage.size() > 0) {
for(String p : allProcessesInPackage) {
Asset<String> processContent = ServletUtil.getProcessSourceContent(p, profile);
Pattern idPattern = Pattern.compile("<\\S*process[^\"]+id=\"([^\"]+)\"", Pattern.MULTILINE);
Matcher idMatcher = idPattern.matcher(processContent.getAssetContent());
if(idMatcher.find()) {
String pid = idMatcher.group(1);
String pidcontent = ServletUtil.getProcessImageContent(packageName, pid, profile);
if(pid != null && pid.equals(processId)) {
String uniqueId = processContent.getUniqueId();
if (Base64Backport.isBase64(uniqueId)) {
byte[] decoded = Base64.decodeBase64(uniqueId);
Expand All @@ -104,24 +117,24 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
}
}
retValue = processContent.getName() + "." +processContent.getAssetType() + "|" + uniqueId;
break;
}
}
}
}
}
}
resp.setCharacterEncoding("UTF-8");
resp.setContentType("text/plain");
resp.getWriter().write(retValue);
break;
}
}
}
}
}
}
resp.setCharacterEncoding("UTF-8");
resp.setContentType("text/plain");
resp.getWriter().write(retValue);
} else if(action != null && action.equals("showruleflowgroups")) {
//Query for RuleFlowGroups
final List<RefactoringPageRow> results = queryService.query("FindRuleFlowNamesQuery",
new HashSet<ValueIndexTerm>() {{
add(new ValueRuleAttributeIndexTerm("ruleflow-group"));
add(new ValueRuleAttributeValueIndexTerm("*"));
}},
true);
new HashSet<ValueIndexTerm>() {{
add(new ValueRuleAttributeIndexTerm("ruleflow-group"));
add(new ValueRuleAttributeValueIndexTerm("*"));
}},
true);

final List<String> ruleFlowGroupNames = new ArrayList<String>();
for ( RefactoringPageRow row : results ) {
Expand All @@ -134,49 +147,47 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
resp.getWriter().write(getRuleFlowGroupsInfoAsJSON(ruleFlowGroupNames).toString());

} else if(action != null && action.equals("showdatatypes")) {
final List<RefactoringPageRow> results2 = queryService.query("DesignerFindTypesQuery",
new HashSet<ValueIndexTerm>() {{
add(new ValueTypeIndexTerm("*"));
}},
true);
final List<String> dataTypeNames = new ArrayList<String>();
for ( RefactoringPageRow row : results2 ) {
dataTypeNames.add( (String) row.getValue() );
}
Collections.sort( dataTypeNames );
String uuid = Utils.getUUID(req);
Path myPath = vfsServices.get(uuid.replaceAll("\\s", "%20"));

PackageDataModelOracle oracle = dataModelService.getDataModel( myPath );

List<String> fullyQualifiedClassNames = getJavaTypeNames(oracle);

Collections.sort( fullyQualifiedClassNames );
resp.setCharacterEncoding("UTF-8");
resp.setContentType("application/json");
resp.getWriter().write(getDataTypesInfoAsJSON(dataTypeNames).toString());
resp.getWriter().write(getDataTypesInfoAsJSON(fullyQualifiedClassNames).toString());
} else {
String retValue = "false";
List<String> allPackageNames = ServletUtil.getPackageNamesFromRepository(profile);
Map<String, String> processInfo = new HashMap<String, String>();
if(allPackageNames != null && allPackageNames.size() > 0) {
for(String packageName : allPackageNames) {
List<String> allProcessesInPackage = ServletUtil.getAllProcessesInPackage(packageName, profile);
if(allProcessesInPackage != null && allProcessesInPackage.size() > 0) {
for(String p : allProcessesInPackage) {
Asset<String> processContent = ServletUtil.getProcessSourceContent(p, profile);
Pattern idPattern = Pattern.compile("<\\S*process[^\"]+id=\"([^\"]+)\"", Pattern.MULTILINE);
Matcher idMatcher = idPattern.matcher(processContent.getAssetContent());
if(idMatcher.find()) {
String pid = idMatcher.group(1);
String pidcontent = ServletUtil.getProcessImageContent(processContent.getAssetLocation(), pid, profile);
if(pid != null && !(packageName.equals(processPackage) && pid.equals(processId))) {
processInfo.put(pid+"|"+processContent.getAssetLocation(), pidcontent != null ? pidcontent : "");
}
}
}

}
}
}
String retValue = "false";
List<String> allPackageNames = ServletUtil.getPackageNamesFromRepository(profile);
Map<String, String> processInfo = new HashMap<String, String>();
if(allPackageNames != null && allPackageNames.size() > 0) {
for(String packageName : allPackageNames) {
List<String> allProcessesInPackage = ServletUtil.getAllProcessesInPackage(packageName, profile);
if(allProcessesInPackage != null && allProcessesInPackage.size() > 0) {
for(String p : allProcessesInPackage) {
Asset<String> processContent = ServletUtil.getProcessSourceContent(p, profile);
Pattern idPattern = Pattern.compile("<\\S*process[^\"]+id=\"([^\"]+)\"", Pattern.MULTILINE);
Matcher idMatcher = idPattern.matcher(processContent.getAssetContent());
if(idMatcher.find()) {
String pid = idMatcher.group(1);
String pidcontent = ServletUtil.getProcessImageContent(processContent.getAssetLocation(), pid, profile);
if(pid != null && !(packageName.equals(processPackage) && pid.equals(processId))) {
processInfo.put(pid+"|"+processContent.getAssetLocation(), pidcontent != null ? pidcontent : "");
}
}
}

}
}
}
retValue = getProcessInfoAsJSON(processInfo).toString();
resp.setCharacterEncoding("UTF-8");
resp.setContentType("application/json");
resp.getWriter().write(retValue);
resp.setCharacterEncoding("UTF-8");
resp.setContentType("application/json");
resp.getWriter().write(retValue);
}
}
}

public JSONObject getRuleFlowGroupsInfoAsJSON(List<String> ruleFlowGroupsInfo) {
JSONObject jsonObject = new JSONObject();
Expand All @@ -202,15 +213,20 @@ public JSONObject getDataTypesInfoAsJSON(List<String> ruleFlowGroupsInfo) {
return jsonObject;
}

public JSONObject getProcessInfoAsJSON(Map<String, String> processInfo) {
JSONObject jsonObject = new JSONObject();
for (Entry<String,String> error: processInfo.entrySet()) {
try {
jsonObject.put(error.getKey(), error.getValue());
} catch (Exception e) {
e.printStackTrace();
}
}
return jsonObject;
}
}
public JSONObject getProcessInfoAsJSON(Map<String, String> processInfo) {
JSONObject jsonObject = new JSONObject();
for (Entry<String,String> error: processInfo.entrySet()) {
try {
jsonObject.put(error.getKey(), error.getValue());
} catch (Exception e) {
e.printStackTrace();
}
}
return jsonObject;
}

protected List<String> getJavaTypeNames(PackageDataModelOracle oracle) {
final String[] fullyQualifiedClassNames = DataModelOracleUtilities.getFactTypes( oracle );
return Arrays.asList(fullyQualifiedClassNames);
}
}

0 comments on commit 7731eb6

Please sign in to comment.