Compare commits

...

34 Commits

Author SHA1 Message Date
Denis Sergent
6ad9e8cb44 TESB-24920 Default endpoint URI not added to endpoint with cRest
This commit improves the way endpoint URL is displayed in console when a
Route/Dataservice is ran in Studio (in case context variables are used).
2019-02-26 14:47:52 +01:00
Denis Sergent
06ea39a75a Revert "TESB-24920 Default endpoint URI not added to endpoint with cRest"
This reverts commit 0f43b7d406.
2019-02-26 14:43:24 +01:00
Denis Sergent
c94a29c881 Merge branch 'master' of github.com:Talend/tdi-studio-se into talend/master 2019-02-26 09:32:22 +01:00
Denis Sergent
ca543e0c3d Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git into talend/master 2019-02-26 08:34:11 +01:00
Denis Sergent
0f43b7d406 TESB-24920 Default endpoint URI not added to endpoint with cRest
This commit improves the way endpoint URL is displayed in console when a
Route/Dataservice is ran in Studio (in case context variables are used).
2019-02-26 08:33:47 +01:00
Denis Sergent
43ebc4c8e7 Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git into talend/master 2019-02-04 15:29:41 +01:00
Denis Sergent
d260c574a5 Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git into talend/master 2018-12-06 15:29:45 +01:00
Denis Sergent
8ab86a4b01 Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git into talend/master 2018-11-29 11:14:24 +01:00
Denis Sergent
08038fc8f6 Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git into talend/master 2018-11-27 14:40:05 +01:00
Denis Sergent
468242d847 Merge branch 'master' of github.com:Talend/tdi-studio-se into talend/master 2018-11-19 14:35:36 +01:00
Denis Sergent
b0eb31155f Merge branch 'master' of github.com:dsergent/tdi-studio-se into talend/master 2018-11-19 14:32:59 +01:00
Denis Sergent
b977c40a0d Merge branch 'master' of git@github.com:dsergent/tdi-studio-se.git 2018-08-02 08:17:36 +02:00
Denis Sergent
310b8f602f Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git 2018-08-01 18:07:30 +02:00
Denis Sergent
b3b9e7b486 Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git 2018-07-12 14:42:52 +02:00
Denis Sergent
b58b6e86d0 Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git into dsergent/master 2018-07-12 08:33:38 +02:00
Denis Sergent
b4767b0937 Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git 2018-07-04 11:09:16 +02:00
Denis Sergent
b50afb5ca7 Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git 2018-07-04 09:34:28 +02:00
Denis Sergent
ca8a5896bc Merge branch 'master' of github.com:Talend/tdi-studio-se 2018-06-07 11:18:39 +02:00
Denis Sergent
f19d3cc1c7 Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git 2018-06-04 17:19:28 +02:00
Denis Sergent
d7aa622257 Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git 2018-05-28 09:38:21 +02:00
Denis Sergent
6249c874fe Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git 2018-05-23 16:39:17 +02:00
Denis Sergent
efe61bce98 TESB-22230 NPE in build item wizard when changing build type 2018-05-23 16:38:12 +02:00
Denis Sergent
f2e35533f3 TESB-22230 NPE in build item wizard when changing build type 2018-05-23 14:30:38 +02:00
Denis Sergent
c7fd8a63e7 TESB-22230 NPE in build item wizard when changing build type 2018-05-23 11:54:34 +02:00
Denis Sergent
a2be9b5782 Merge branch 'master' of github.com:Talend/tdi-studio-se 2018-05-22 09:26:44 +02:00
Denis Sergent
f5ffc14434 Merge branch 'master' of github.com:Talend/tdi-studio-se 2018-05-14 08:39:50 +02:00
Denis Sergent
a837e57bba Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git 2018-05-11 11:44:55 +02:00
Denis Sergent
a13303909f Studio graphical improvements
Fixed some graphical inconsistencies in Studio (borders, margins...)
2018-05-09 12:03:05 +02:00
Denis Sergent
566ac1f619 Merge branch 'master' of git@github.com:Talend/tdi-studio-se.git 2018-05-09 10:39:19 +02:00
Denis Sergent
2c6100fe94 Merge branch 'master' of github.com:Talend/tdi-studio-se 2018-05-04 08:52:18 +02:00
Denis Sergent
f6e010dfc0 Merge branch 'master' of github.com:Talend/tdi-studio-se 2018-05-02 11:52:06 +02:00
Denis Sergent
924f25a5a8 Merge branch 'master' of github.com:Talend/tdi-studio-se 2018-04-27 11:13:29 +02:00
Denis Sergent
70aae754fb Merge branch 'master' of github.com:Talend/tdi-studio-se 2018-04-23 09:46:04 +02:00
Denis Sergent
27d17ba5ba TESB-21832 Problems with job/route exec. with local runtime in Studio
Local runtime for Studio job/routes execution should not be used in some
cases: build type has to be checked to define the best execution
processor. As execution processor must change when build type is updated
in deployment tab, processor can not be persisted anymore.
2018-04-20 11:20:55 +02:00

View File

@@ -54,6 +54,7 @@ import org.talend.core.model.components.ComponentCategory;
import org.talend.core.model.components.ComponentUtilities;
import org.talend.core.model.process.IConnection;
import org.talend.core.model.process.IContext;
import org.talend.core.model.process.IContextParameter;
import org.talend.core.model.process.IElementParameter;
import org.talend.core.model.process.INode;
import org.talend.core.model.process.IPerformance;
@@ -66,7 +67,6 @@ import org.talend.core.model.properties.ProcessItem;
import org.talend.core.model.properties.Property;
import org.talend.core.model.runprocess.IEclipseProcessor;
import org.talend.core.model.runprocess.data.PerformanceData;
import org.talend.core.model.utils.ContextParameterUtils;
import org.talend.core.model.utils.TalendTextUtils;
import org.talend.core.runtime.process.TalendProcessArgumentConstant;
import org.talend.designer.core.model.components.EParameterName;
@@ -1913,37 +1913,61 @@ public class RunProcessContext {
* Foe ESB related processes, add a message to the console indicating the endpoint (domain + port) currently used.
*/
private void addEndpointURL() {
String defaultRestUri = Platform
.getPreferencesService()
.getString("org.talend.designer.esb.components.rs.provider", "restServiceDefaultUri",
"http://127.0.0.1:8090/", null);
Collection<NodeType> restComponents = EmfModelUtils
.getComponentsByName((ProcessItem) process.getProperty().getItem(), "cREST", "tRESTRequest");
if (!restComponents.isEmpty() && running) {
NodeType restComponent = restComponents.iterator().next();
String endpoint;
String url = null;
if ("cREST".equals(restComponent.getComponentName()))
endpoint = ComponentUtilities.getNodePropertyValue(restComponent, "URL");
else
endpoint = ComponentUtilities.getNodePropertyValue(restComponent, "REST_ENDPOINT");
String decodedEndpoint = "";
if (!StringUtils.isEmpty(endpoint)) {
if (TalendTextUtils.removeQuotes(endpoint).startsWith("http"))
url = TalendTextUtils.removeQuotes(endpoint);
else if (ContextParameterUtils.containContextVariables(endpoint)) {
String variable = ContextParameterUtils.getVariableFromCode(endpoint);
if (selectedContext != null) {
url = TalendTextUtils.removeQuotes(selectedContext.getContextParameter(variable).getValue());
String[] allStrings = endpoint.split("[\\+]");
for (String endpointElement : allStrings) {
endpointElement = endpointElement.trim();
if (endpointElement.startsWith("context.")) {
// Context parameter
String contextParamId = endpointElement.replaceFirst("context.", "");
for (IContextParameter param : selectedContext.getContextParameterList()) {
if (param.getName().equals(contextParamId)) {
decodedEndpoint += TalendTextUtils
.removeQuotes(selectedContext.getContextParameter(param.getName()).getValue());
break;
}
}
} else {
decodedEndpoint += TalendTextUtils.removeQuotes(endpointElement);
}
}
if (decodedEndpoint.startsWith("http")) {
url = decodedEndpoint;
} else {
String defaultRestUri = Platform
.getPreferencesService()
.getString("org.talend.designer.esb.components.rs.provider", "restServiceDefaultUri",
"http://127.0.0.1:8090/", null);
endpoint = TalendTextUtils.removeQuotes(endpoint);
if (endpoint.startsWith("/"))
endpoint = endpoint.substring(1);
String fullURL = defaultRestUri + endpoint;
String fullURL = defaultRestUri + decodedEndpoint;
url = fullURL.replaceAll("(?<!(http:|https:))//", "/");
}
if (url != null)
addMessage(new ProcessMessage(MsgType.CORE_OUT, "Endpoint deployed at: " + url));
addMessage(new ProcessMessage(MsgType.STD_OUT, "Endpoint deployed at: " + url));
}
}