You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/11/01 16:06:33 UTC
[2/8] camel git commit: Fix checkstyle.
Fix checkstyle.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/61fc55fb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/61fc55fb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/61fc55fb
Branch: refs/heads/master
Commit: 61fc55fb85d5e969b59b2f3b13ad51a7033f3731
Parents: 0b057b1
Author: lionel-bonitasoft <li...@bonitasoft.com>
Authored: Sun Oct 30 17:04:50 2016 -0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Nov 1 12:42:38 2016 +0100
----------------------------------------------------------------------
.../camel/component/bonita/BonitaComponent.java | 8 +-
.../component/bonita/BonitaConfiguration.java | 132 ++++-----
.../camel/component/bonita/BonitaEndpoint.java | 26 +-
.../camel/component/bonita/api/BonitaAPI.java | 120 ++++----
.../component/bonita/api/BonitaAPIBuilder.java | 25 +-
.../bonita/api/filter/BonitaAuthFilter.java | 55 ++--
.../bonita/api/filter/JsonClientFilter.java | 38 ++-
.../bonita/api/model/CaseCreationResponse.java | 21 +-
.../component/bonita/api/model/FileInput.java | 65 +++--
.../api/model/ProcessDefinitionResponse.java | 274 +++++++++----------
.../bonita/api/model/UploadFileResponse.java | 72 +++--
.../bonita/api/util/BonitaAPIConfig.java | 105 +++----
.../bonita/api/util/BonitaAPIUtil.java | 132 ++++-----
.../bonita/consumer/BonitaConsumer.java | 21 +-
.../bonita/exception/BonitaException.java | 17 +-
.../bonita/producer/BonitaProducer.java | 1 +
.../bonita/producer/BonitaStartProducer.java | 33 ++-
.../component/bonita/util/BonitaOperation.java | 3 +-
.../bonita/BonitaConfigurationTest.java | 63 +++--
.../bonita/api/BonitaAPIBuilderTest.java | 26 +-
.../component/bonita/api/BonitaAPITest.java | 48 ++--
.../BonitaAuthFilterAlreadyConnectedTest.java | 40 ++-
.../api/BonitaAuthFilterConnectionTest.java | 66 ++---
.../bonita/api/BonitaAuthFilterTest.java | 70 +++--
.../bonita/api/util/BonitaAPIConfigTest.java | 16 +-
.../util/BonitaAPIUtilPrepareInputsTest.java | 157 ++++++-----
26 files changed, 884 insertions(+), 750 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaComponent.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaComponent.java
index ccff314..e22f183 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaComponent.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaComponent.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita;
import java.util.Map;
@@ -27,7 +28,7 @@ import org.apache.camel.impl.UriEndpointComponent;
* Represents the component that manages {@link BonitaEndpoint}.
*/
public class BonitaComponent extends UriEndpointComponent {
-
+
public BonitaComponent() {
super(BonitaEndpoint.class);
}
@@ -36,9 +37,10 @@ public class BonitaComponent extends UriEndpointComponent {
super(context, BonitaEndpoint.class);
}
- protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters)
+ throws Exception {
BonitaConfiguration configuration = new BonitaConfiguration();
-// configuration.setParameters(parameters);
+ // configuration.setParameters(parameters);
setProperties(configuration, parameters);
configuration.setOperation(BonitaOperation.valueOf(remaining));
Endpoint endpoint = new BonitaEndpoint(uri, this, configuration);
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.java
index fe77d2d..70b615f 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita;
import java.util.Map;
@@ -26,66 +27,69 @@ import org.apache.camel.spi.UriPath;
@UriParams
public class BonitaConfiguration implements Cloneable {
-
-
- @UriPath(enums = "startCase") @Metadata(required = "true")
+
+ @UriPath(
+ enums = "startCase")
+ @Metadata(
+ required = "true")
private BonitaOperation operation;
-
- @UriParam(defaultValue = "localhost")
+
+ @UriParam(
+ defaultValue = "localhost")
private String hostname = "localhost";
-
- @UriParam(defaultValue = "8080")
- private String port = "8080";
-
+
+ @UriParam(
+ defaultValue = "8080")
+ private String port = "8080";
+
@UriParam
private String processName;
-
- @UriParam(label = "security")
+
+ @UriParam(
+ label = "security")
private String username;
-
- @UriParam(label = "security")
+
+ @UriParam(
+ label = "security")
private String password;
-
-
+
public String getHostname() {
- return hostname;
- }
+ return hostname;
+ }
- /**
+ /**
* Hostname where Bonita engine runs
*/
- public void setHostname(String hostname) {
- this.hostname = hostname;
- }
-
- public String getPort() {
- return port;
- }
+ public void setHostname(String hostname) {
+ this.hostname = hostname;
+ }
- /**
- * Port of the server hosting Bonita engine
- */
- public void setPort(String port) {
- this.port = port;
- }
+ public String getPort() {
+ return port;
+ }
- public String getProcessName() {
- return processName;
- }
+ /**
+ * Port of the server hosting Bonita engine
+ */
+ public void setPort(String port) {
+ this.port = port;
+ }
- /**
- * Name of the process involved in the operation
- */
- public void setProcessName(String processName) {
- this.processName = processName;
- }
+ public String getProcessName() {
+ return processName;
+ }
+ /**
+ * Name of the process involved in the operation
+ */
+ public void setProcessName(String processName) {
+ this.processName = processName;
+ }
public BonitaOperation getOperation() {
return operation;
}
-
/**
* Operation to use
*/
@@ -93,35 +97,39 @@ public class BonitaConfiguration implements Cloneable {
this.operation = operation;
}
+ public void setParameters(Map<String, Object> parameters) {
+ if (parameters.get("hostname") != null) {
+ this.hostname = (String) parameters.get("hostname");
+ }
+ if (parameters.get("port") != null) {
+ this.port = (String) parameters.get("port");
+ }
+ if (parameters.get("processName") != null) {
+ this.processName = (String) parameters.get("processName");
+ }
+ }
- public void setParameters(Map<String, Object> parameters) {
- if (parameters.get("hostname") != null) this.hostname = (String) parameters.get("hostname");
- if (parameters.get("port") != null) this.port = (String) parameters.get("port");
- if (parameters.get("processName") != null) this.processName = (String) parameters.get("processName");
-
- }
-
- public String getUsername() {
- return username;
- }
+ public String getUsername() {
+ return username;
+ }
- /**
+ /**
* Username to authenticate to Bonita engine.
*/
- public void setUsername(String username) {
- this.username = username;
- }
+ public void setUsername(String username) {
+ this.username = username;
+ }
- public String getPassword() {
- return password;
- }
+ public String getPassword() {
+ return password;
+ }
- /**
+ /**
* Password to authenticate to Bonita engine.
*/
- public void setPassword(String password) {
- this.password = password;
- }
+ public void setPassword(String password) {
+ this.password = password;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaEndpoint.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaEndpoint.java
index 62c3603..b3ca00b 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaEndpoint.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaEndpoint.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita;
import org.apache.camel.Consumer;
@@ -26,26 +27,30 @@ import org.apache.camel.component.bonita.util.BonitaOperation;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriPath;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Represents a bonita endpoint.
*/
-@UriEndpoint(scheme = "bonita", title = "bonita", syntax="bonita:operation", consumerClass = BonitaConsumer.class, label = "bonita")
+@UriEndpoint(
+ scheme = "bonita",
+ title = "bonita",
+ syntax = "bonita:operation",
+ consumerClass = BonitaConsumer.class,
+ label = "bonita")
public class BonitaEndpoint extends DefaultEndpoint {
private static final transient Logger LOG = LoggerFactory.getLogger(BonitaEndpoint.class);
-
-
+
@UriParam
private BonitaConfiguration configuration;
public BonitaEndpoint() {
}
-
- public BonitaEndpoint(String uri, BonitaComponent component, BonitaConfiguration configuration) {
+
+ public BonitaEndpoint(String uri, BonitaComponent component,
+ BonitaConfiguration configuration) {
super(uri, component);
this.configuration = configuration;
}
@@ -56,9 +61,9 @@ public class BonitaEndpoint extends DefaultEndpoint {
public Producer createProducer() throws Exception {
if (configuration.getOperation() == BonitaOperation.startCase) {
- return new BonitaStartProducer(this, configuration);
+ return new BonitaStartProducer(this, configuration);
} else {
- throw new BonitaException("Operation specified is not supported.");
+ throw new BonitaException("Operation specified is not supported.");
}
}
@@ -69,10 +74,9 @@ public class BonitaEndpoint extends DefaultEndpoint {
public boolean isSingleton() {
return true;
}
-
+
public BonitaConfiguration getConfiguration() {
- return configuration;
+ return configuration;
}
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
index fce5ac8..0d3ec4f 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
@@ -14,82 +14,82 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.bonita.api;
-import static javax.ws.rs.client.Entity.entity;
+package org.apache.camel.component.bonita.api;
import java.io.Serializable;
-import java.net.URL;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
-import javax.net.ssl.HttpsURLConnection;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.MediaType;
+import static javax.ws.rs.client.Entity.entity;
+
import org.apache.camel.component.bonita.api.model.CaseCreationResponse;
-import org.apache.camel.component.bonita.api.model.FileInput;
import org.apache.camel.component.bonita.api.model.ProcessDefinitionResponse;
import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
import org.apache.camel.component.bonita.api.util.BonitaAPIUtil;
import org.apache.camel.util.ObjectHelper;
+
+
public class BonitaAPI {
- private BonitaAPIConfig bonitaApiConfig;
- private WebTarget webTarget;
-
- protected BonitaAPI(BonitaAPIConfig bonitaApiConfig, WebTarget webTarget) {
- super();
- this.bonitaApiConfig = bonitaApiConfig;
- this.webTarget = webTarget;
-
- }
-
- private WebTarget getBaseResource() {
- return webTarget;
- }
-
- public ProcessDefinitionResponse getProcessDefinition(String processName) {
- if (ObjectHelper.isEmpty(processName)) {
- throw new IllegalArgumentException("processName is empty.");
- }
- WebTarget resource = getBaseResource().path("process").queryParam("s", processName);
- List<ProcessDefinitionResponse> listProcess = resource.request().accept(MediaType.APPLICATION_JSON)
- .get(new GenericType<List<ProcessDefinitionResponse>>() {
- });
- if (listProcess.size() > 0) {
- return listProcess.get(0);
- } else {
- throw new RuntimeException("The process with name " + processName + " has not been retrieved");
- }
- }
-
- public CaseCreationResponse startCase(ProcessDefinitionResponse processDefinition, Map<String, Serializable> rawInputs) {
- if (processDefinition == null) {
- throw new IllegalArgumentException("ProcessDefinition is null");
- }
- if (rawInputs == null) {
- throw new IllegalArgumentException("The contract input is null");
- }
- Map<String, Serializable> inputs = BonitaAPIUtil.getInstance(bonitaApiConfig).prepareInputs(processDefinition, rawInputs);
- WebTarget resource = getBaseResource().path("process/{processId}/instantiation").resolveTemplate("processId",
- processDefinition.getId());
- return resource.request().accept(MediaType.APPLICATION_JSON).post(entity(inputs, MediaType.APPLICATION_JSON),
- CaseCreationResponse.class);
- }
-
- public BonitaAPIConfig getBonitaApiConfig() {
- return bonitaApiConfig;
- }
-
- public void setBonitaApiConfig(BonitaAPIConfig bonitaApiConfig) {
- this.bonitaApiConfig = bonitaApiConfig;
- }
-
-
-
+ private BonitaAPIConfig bonitaApiConfig;
+ private WebTarget webTarget;
+
+ protected BonitaAPI(BonitaAPIConfig bonitaApiConfig, WebTarget webTarget) {
+ super();
+ this.bonitaApiConfig = bonitaApiConfig;
+ this.webTarget = webTarget;
+
+ }
+
+ private WebTarget getBaseResource() {
+ return webTarget;
+ }
+
+ public ProcessDefinitionResponse getProcessDefinition(String processName) {
+ if (ObjectHelper.isEmpty(processName)) {
+ throw new IllegalArgumentException("processName is empty.");
+ }
+ WebTarget resource = getBaseResource().path("process").queryParam("s", processName);
+ List<ProcessDefinitionResponse> listProcess =
+ resource.request().accept(MediaType.APPLICATION_JSON)
+ .get(new GenericType<List<ProcessDefinitionResponse>>() {
+ });
+ if (listProcess.size() > 0) {
+ return listProcess.get(0);
+ } else {
+ throw new RuntimeException(
+ "The process with name " + processName + " has not been retrieved");
+ }
+ }
+
+ public CaseCreationResponse startCase(ProcessDefinitionResponse processDefinition,
+ Map<String, Serializable> rawInputs) {
+ if (processDefinition == null) {
+ throw new IllegalArgumentException("ProcessDefinition is null");
+ }
+ if (rawInputs == null) {
+ throw new IllegalArgumentException("The contract input is null");
+ }
+ Map<String, Serializable> inputs = BonitaAPIUtil.getInstance(bonitaApiConfig)
+ .prepareInputs(processDefinition, rawInputs);
+ WebTarget resource = getBaseResource().path("process/{processId}/instantiation")
+ .resolveTemplate("processId", processDefinition.getId());
+ return resource.request().accept(MediaType.APPLICATION_JSON)
+ .post(entity(inputs, MediaType.APPLICATION_JSON), CaseCreationResponse.class);
+ }
+
+ public BonitaAPIConfig getBonitaApiConfig() {
+ return bonitaApiConfig;
+ }
+
+ public void setBonitaApiConfig(BonitaAPIConfig bonitaApiConfig) {
+ this.bonitaApiConfig = bonitaApiConfig;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
index 6b70297..5d1051f 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
@@ -14,31 +14,36 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita.api;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+
import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
import org.glassfish.jersey.client.ClientConfig;
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-
public class BonitaAPIBuilder {
-
- public static BonitaAPI build(BonitaAPIConfig bonitaAPIConfig) {
- if (bonitaAPIConfig == null) { throw new IllegalArgumentException("bonitaApiConfig is null"); }
- ClientConfig clientConfig = new ClientConfig();
+
+ protected BonitaAPIBuilder() {
+
+ }
+
+ public static BonitaAPI build(BonitaAPIConfig bonitaAPIConfig) {
+ if (bonitaAPIConfig == null) {
+ throw new IllegalArgumentException("bonitaApiConfig is null");
+ }
+ ClientConfig clientConfig = new ClientConfig();
clientConfig.register(JacksonJsonProvider.class);
ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig);
Client client = clientBuilder.build();
client.register(new BonitaAuthFilter(bonitaAPIConfig));
WebTarget webTarget = client.target(bonitaAPIConfig.getBaseBonitaURI()).path("/API/bpm");
- return new BonitaAPI(bonitaAPIConfig, webTarget);
- }
-
-
+ return new BonitaAPI(bonitaAPIConfig, webTarget);
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
index 3edf1ee..68deba8 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita.api.filter;
import java.io.IOException;
@@ -35,47 +36,49 @@ import javax.ws.rs.core.Response;
import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
import org.apache.camel.util.ObjectHelper;
-public class BonitaAuthFilter implements ClientRequestFilter {
-
- private BonitaAPIConfig bonitaApiConfig;
-
- public BonitaAuthFilter(BonitaAPIConfig bonitaApiConfig) {
- this.bonitaApiConfig = bonitaApiConfig;
- }
-
- @Override
+public class BonitaAuthFilter implements ClientRequestFilter {
+
+ private BonitaAPIConfig bonitaApiConfig;
+
+ public BonitaAuthFilter(BonitaAPIConfig bonitaApiConfig) {
+ this.bonitaApiConfig = bonitaApiConfig;
+ }
+
+ @Override
public void filter(ClientRequestContext requestContext) throws IOException {
if (requestContext.getCookies().get("JSESSIONID") == null) {
- String username = bonitaApiConfig.getUsername();
- String password = bonitaApiConfig.getPassword();
- if (ObjectHelper.isEmpty(username)) {
- throw new IllegalArgumentException("Username provided is null or empty.");
- }
- if (ObjectHelper.isEmpty(password)) {
- throw new IllegalArgumentException("Password provided is null or empty.");
- }
+ String username = bonitaApiConfig.getUsername();
+ String password = bonitaApiConfig.getPassword();
+ if (ObjectHelper.isEmpty(username)) {
+ throw new IllegalArgumentException("Username provided is null or empty.");
+ }
+ if (ObjectHelper.isEmpty(password)) {
+ throw new IllegalArgumentException("Password provided is null or empty.");
+ }
ClientBuilder clientBuilder = ClientBuilder.newBuilder();
Client client = clientBuilder.build();
- WebTarget webTarget = client.target(bonitaApiConfig.getBaseBonitaURI()).path("loginservice");
+ WebTarget webTarget =
+ client.target(bonitaApiConfig.getBaseBonitaURI()).path("loginservice");
MultivaluedMap<String, String> form = new MultivaluedHashMap<String, String>();
form.add("username", username);
form.add("password", password);
form.add("redirect", "false");
- Response response = webTarget.request().accept(MediaType.APPLICATION_FORM_URLENCODED).post(Entity.form(form));
+ Response response = webTarget.request().accept(MediaType.APPLICATION_FORM_URLENCODED)
+ .post(Entity.form(form));
Map<String, NewCookie> cr = response.getCookies();
ArrayList<Object> cookies = new ArrayList<>();
for (NewCookie cookie : cr.values()) {
- cookies.add(cookie.toCookie());
+ cookies.add(cookie.toCookie());
}
requestContext.getHeaders().put("Cookie", cookies);
}
}
- public BonitaAPIConfig getBonitaApiConfig() {
- return bonitaApiConfig;
- }
+ public BonitaAPIConfig getBonitaApiConfig() {
+ return bonitaApiConfig;
+ }
- public void setBonitaApiConfig(BonitaAPIConfig bonitaApiConfig) {
- this.bonitaApiConfig = bonitaApiConfig;
- }
+ public void setBonitaApiConfig(BonitaAPIConfig bonitaApiConfig) {
+ this.bonitaApiConfig = bonitaApiConfig;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java
index 1a1baed..c67170f 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.component.bonita.api.filter;
import java.io.IOException;
@@ -7,15 +23,15 @@ import javax.ws.rs.client.ClientResponseContext;
import javax.ws.rs.client.ClientResponseFilter;
public class JsonClientFilter implements ClientResponseFilter {
-
-
- @Override
- public void filter(ClientRequestContext request, ClientResponseContext response) throws IOException {
- String contentType = response.getHeaders().getFirst("Content-Type");
- if (contentType.startsWith("text/plain")) {
- String newContentType = "application/json" + contentType.substring(10);
- response.getHeaders().putSingle("Content-Type", newContentType);
- }
- }
-
+
+ @Override
+ public void filter(ClientRequestContext request, ClientResponseContext response)
+ throws IOException {
+ String contentType = response.getHeaders().getFirst("Content-Type");
+ if (contentType.startsWith("text/plain")) {
+ String newContentType = "application/json" + contentType.substring(10);
+ response.getHeaders().putSingle("Content-Type", newContentType);
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/CaseCreationResponse.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/CaseCreationResponse.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/CaseCreationResponse.java
index c7c7326..7826647 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/CaseCreationResponse.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/CaseCreationResponse.java
@@ -14,23 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita.api.model;
import com.fasterxml.jackson.annotation.JsonProperty;
public class CaseCreationResponse {
-
- @JsonProperty("caseId")
- private String caseId;
- public String getCaseId() {
- return caseId;
- }
+ @JsonProperty("caseId")
+ private String caseId;
+
+ public String getCaseId() {
+ return caseId;
+ }
- public void setCaseId(String caseId) {
- this.caseId = caseId;
- }
-
-
+ public void setCaseId(String caseId) {
+ this.caseId = caseId;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/FileInput.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/FileInput.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/FileInput.java
index 84cd648..477114a 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/FileInput.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/FileInput.java
@@ -1,29 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.component.bonita.api.model;
import java.io.Serializable;
public class FileInput implements Serializable {
-
- private String filename;
- private byte[] content;
- public String getFilename() {
- return filename;
- }
- public void setFilename(String filename) {
- this.filename = filename;
- }
- public byte[] getContent() {
- return content;
- }
- public void setContent(byte[] content) {
- this.content = content;
- }
- public FileInput(String filename, byte[] content) {
- super();
- this.filename = filename;
- this.content = content;
- }
-
-
+
+ private String filename;
+ private byte[] content;
+
+ public FileInput(String filename, byte[] content) {
+ super();
+ this.filename = filename;
+ this.content = content;
+ }
+
+ public String getFilename() {
+ return filename;
+ }
+
+ public void setFilename(String filename) {
+ this.filename = filename;
+ }
+
+ public byte[] getContent() {
+ return content;
+ }
+
+ public void setContent(byte[] content) {
+ this.content = content;
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/ProcessDefinitionResponse.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/ProcessDefinitionResponse.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/ProcessDefinitionResponse.java
index 9169c4a..f6e08da 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/ProcessDefinitionResponse.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/ProcessDefinitionResponse.java
@@ -14,147 +14,147 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita.api.model;
import com.fasterxml.jackson.annotation.JsonProperty;
public class ProcessDefinitionResponse {
- @JsonProperty("id")
- private String id;
-
- @JsonProperty("displayDescription")
- private String displayDescription;
-
- @JsonProperty("deploymentDate")
- private String deploymentDate;
-
- @JsonProperty("description")
- private String description;
-
- @JsonProperty("activationState")
- private String activationState;
-
- @JsonProperty("name")
- private String name;
-
- @JsonProperty("deployedBy")
- private String deployedBy;
-
- @JsonProperty("displayName")
- private String displayName;
-
- @JsonProperty("actorinitiatorid")
- private String actorInitiatorId;
-
- @JsonProperty("last_update_date")
- private String lastUpdateDate;
-
- @JsonProperty("configurationState")
- private String configurationState;
-
- @JsonProperty("version")
- private String version;
-
- public ProcessDefinitionResponse() {
- super();
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getDisplayDescription() {
- return displayDescription;
- }
-
- public void setDisplayDescription(String displayDescription) {
- this.displayDescription = displayDescription;
- }
-
- public String getDeploymentDate() {
- return deploymentDate;
- }
-
- public void setDeploymentDate(String deploymentDate) {
- this.deploymentDate = deploymentDate;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getActivationState() {
- return activationState;
- }
-
- public void setActivationState(String activationState) {
- this.activationState = activationState;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDeployedBy() {
- return deployedBy;
- }
-
- public void setDeployedBy(String deployedBy) {
- this.deployedBy = deployedBy;
- }
-
- public String getDisplayName() {
- return displayName;
- }
-
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
-
- public String getActorInitiatorId() {
- return actorInitiatorId;
- }
-
- public void setActorInitiatorId(String actorInitiatorId) {
- this.actorInitiatorId = actorInitiatorId;
- }
-
- public String getLastUpdateDate() {
- return lastUpdateDate;
- }
-
- public void setLastUpdateDate(String lastUpdateDate) {
- this.lastUpdateDate = lastUpdateDate;
- }
-
- public String getConfigurationState() {
- return configurationState;
- }
-
- public void setConfigurationState(String configurationState) {
- this.configurationState = configurationState;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
-
+ @JsonProperty("id")
+ private String id;
+
+ @JsonProperty("displayDescription")
+ private String displayDescription;
+
+ @JsonProperty("deploymentDate")
+ private String deploymentDate;
+
+ @JsonProperty("description")
+ private String description;
+
+ @JsonProperty("activationState")
+ private String activationState;
+
+ @JsonProperty("name")
+ private String name;
+
+ @JsonProperty("deployedBy")
+ private String deployedBy;
+
+ @JsonProperty("displayName")
+ private String displayName;
+
+ @JsonProperty("actorinitiatorid")
+ private String actorInitiatorId;
+
+ @JsonProperty("last_update_date")
+ private String lastUpdateDate;
+
+ @JsonProperty("configurationState")
+ private String configurationState;
+
+ @JsonProperty("version")
+ private String version;
+
+ public ProcessDefinitionResponse() {
+ super();
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getDisplayDescription() {
+ return displayDescription;
+ }
+
+ public void setDisplayDescription(String displayDescription) {
+ this.displayDescription = displayDescription;
+ }
+
+ public String getDeploymentDate() {
+ return deploymentDate;
+ }
+
+ public void setDeploymentDate(String deploymentDate) {
+ this.deploymentDate = deploymentDate;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getActivationState() {
+ return activationState;
+ }
+
+ public void setActivationState(String activationState) {
+ this.activationState = activationState;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDeployedBy() {
+ return deployedBy;
+ }
+
+ public void setDeployedBy(String deployedBy) {
+ this.deployedBy = deployedBy;
+ }
+
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
+
+ public String getActorInitiatorId() {
+ return actorInitiatorId;
+ }
+
+ public void setActorInitiatorId(String actorInitiatorId) {
+ this.actorInitiatorId = actorInitiatorId;
+ }
+
+ public String getLastUpdateDate() {
+ return lastUpdateDate;
+ }
+
+ public void setLastUpdateDate(String lastUpdateDate) {
+ this.lastUpdateDate = lastUpdateDate;
+ }
+
+ public String getConfigurationState() {
+ return configurationState;
+ }
+
+ public void setConfigurationState(String configurationState) {
+ this.configurationState = configurationState;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/UploadFileResponse.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/UploadFileResponse.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/UploadFileResponse.java
index 9acae81..1f51eeb 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/UploadFileResponse.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/model/UploadFileResponse.java
@@ -1,32 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.component.bonita.api.model;
import com.fasterxml.jackson.annotation.JsonProperty;
public class UploadFileResponse {
-
- @JsonProperty("filename")
- private String filename;
- @JsonProperty("tempPath")
- private String tempPath;
- @JsonProperty("contentType")
- private String contentType;
- public String getFilename() {
- return filename;
- }
- public void setFilename(String filename) {
- this.filename = filename;
- }
- public String getTempPath() {
- return tempPath;
- }
- public void setTempPath(String tempPath) {
- this.tempPath = tempPath;
- }
- public String getContentType() {
- return contentType;
- }
- public void setContentType(String contentType) {
- this.contentType = contentType;
- }
+
+ @JsonProperty("filename")
+ private String filename;
+ @JsonProperty("tempPath")
+ private String tempPath;
+ @JsonProperty("contentType")
+ private String contentType;
+
+ public String getFilename() {
+ return filename;
+ }
+
+ public void setFilename(String filename) {
+ this.filename = filename;
+ }
+
+ public String getTempPath() {
+ return tempPath;
+ }
+
+ public void setTempPath(String tempPath) {
+ this.tempPath = tempPath;
+ }
+
+ public String getContentType() {
+ return contentType;
+ }
+
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfig.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfig.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfig.java
index 0ce81b7..94cea2c 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfig.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfig.java
@@ -14,58 +14,63 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita.api.util;
public class BonitaAPIConfig {
-
- private String hostname;
- private String port;
- private String username;
- private String password;
-
-
- public BonitaAPIConfig(String hostname, String port, String username, String password) {
- super();
- this.hostname = hostname;
- this.port = port;
- this.username = username;
- this.password = password;
- }
-
- public String getBaseBonitaURI() {
- return "http://" + hostname + ":" + port + "/bonita";
- }
-
-
- public String getProcessFileUploadBaseURI(String processName, String processVersion) {
- return getBaseBonitaURI() + "portal/resource/process/"+ processName + "/" +processVersion + "/API/formFileUpload";
- }
-
- public String getHostname() {
- return hostname;
- }
- public void setHostname(String hostname) {
- this.hostname = hostname;
- }
- public String getPort() {
- return port;
- }
- public void setPort(String port) {
- this.port = port;
- }
- public String getUsername() {
- return username;
- }
- public void setUsername(String username) {
- this.username = username;
- }
- public String getPassword() {
- return password;
- }
- public void setPassword(String password) {
- this.password = password;
- }
-
-
+
+ private String hostname;
+ private String port;
+ private String username;
+ private String password;
+
+ public BonitaAPIConfig(String hostname, String port, String username, String password) {
+ super();
+ this.hostname = hostname;
+ this.port = port;
+ this.username = username;
+ this.password = password;
+ }
+
+ public String getBaseBonitaURI() {
+ return "http://" + hostname + ":" + port + "/bonita";
+ }
+
+ public String getProcessFileUploadBaseURI(String processName, String processVersion) {
+ return getBaseBonitaURI() + "portal/resource/process/" + processName + "/" + processVersion
+ + "/API/formFileUpload";
+ }
+
+ public String getHostname() {
+ return hostname;
+ }
+
+ public void setHostname(String hostname) {
+ this.hostname = hostname;
+ }
+
+ public String getPort() {
+ return port;
+ }
+
+ public void setPort(String port) {
+ this.port = port;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
index ab8f15c..2f6ac14 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.bonita.api.util;
-import static javax.ws.rs.client.Entity.entity;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.Serializable;
@@ -33,6 +31,10 @@ import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Feature;
import javax.ws.rs.core.MediaType;
+import static javax.ws.rs.client.Entity.entity;
+
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+
import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
import org.apache.camel.component.bonita.api.filter.JsonClientFilter;
import org.apache.camel.component.bonita.api.model.FileInput;
@@ -45,77 +47,75 @@ import org.glassfish.jersey.media.multipart.MultiPart;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-
public class BonitaAPIUtil {
- private static BonitaAPIUtil instance;
- private WebTarget webTarget;
-
- public static BonitaAPIUtil getInstance(BonitaAPIConfig bonitaAPIConfig) {
- if (instance == null) {
- instance = new BonitaAPIUtil();
- ClientConfig clientConfig = new ClientConfig();
- clientConfig.register(MultiPartFeature.class);
- clientConfig.register(JacksonJsonProvider.class);
- Logger logger = Logger.getLogger("org.bonitasoft.camel.bonita.api.util.BonitaAPIUtil");
+ private static BonitaAPIUtil instance;
+ private WebTarget webTarget;
+
+ public static BonitaAPIUtil getInstance(BonitaAPIConfig bonitaAPIConfig) {
+ if (instance == null) {
+ instance = new BonitaAPIUtil();
+ ClientConfig clientConfig = new ClientConfig();
+ clientConfig.register(MultiPartFeature.class);
+ clientConfig.register(JacksonJsonProvider.class);
+ Logger logger = Logger.getLogger("org.bonitasoft.camel.bonita.api.util.BonitaAPIUtil");
- Feature feature = new LoggingFeature(logger, Level.INFO, null, null);
- clientConfig.register(feature);
- ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig);
- Client client = clientBuilder.build();
- client.register(new JsonClientFilter());
- client.register(new BonitaAuthFilter(bonitaAPIConfig));
- instance.setWebTarget(client.target(bonitaAPIConfig.getBaseBonitaURI()));
- }
- return instance;
- }
-
-
- public UploadFileResponse uploadFile(ProcessDefinitionResponse processDefinition, FileInput file) {
- WebTarget resource = webTarget.path("portal/resource/process/{processName}/{processVersion}/API/formFileUpload").resolveTemplate("processName",
- processDefinition.getName()).resolveTemplate("processVersion", processDefinition.getVersion());
- try {
- File tempFile = File.createTempFile("tempFile",".tmp");
- FileOutputStream fos = new FileOutputStream(tempFile);
- fos.write(file.getContent());
- fos.close();
- final FileDataBodyPart filePart = new FileDataBodyPart("file", tempFile, MediaType.APPLICATION_OCTET_STREAM_TYPE);
- final MultiPart multipart = new FormDataMultiPart().bodyPart(filePart);
-// resource.request().header("ContentType", "application/json");
- return resource.request().accept(MediaType.APPLICATION_JSON).post(entity(multipart, MediaType.MULTIPART_FORM_DATA),
- UploadFileResponse.class);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
-
-
- }
+ Feature feature = new LoggingFeature(logger, Level.INFO, null, null);
+ clientConfig.register(feature);
+ ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig);
+ Client client = clientBuilder.build();
+ client.register(new JsonClientFilter());
+ client.register(new BonitaAuthFilter(bonitaAPIConfig));
+ instance.setWebTarget(client.target(bonitaAPIConfig.getBaseBonitaURI()));
+ }
+ return instance;
+ }
+ public UploadFileResponse uploadFile(ProcessDefinitionResponse processDefinition,
+ FileInput file) {
+ WebTarget resource = webTarget
+ .path("portal/resource/process/{processName}/{processVersion}/API/formFileUpload")
+ .resolveTemplate("processName", processDefinition.getName())
+ .resolveTemplate("processVersion", processDefinition.getVersion());
+ try {
+ File tempFile = File.createTempFile("tempFile", ".tmp");
+ FileOutputStream fos = new FileOutputStream(tempFile);
+ fos.write(file.getContent());
+ fos.close();
+ final FileDataBodyPart filePart =
+ new FileDataBodyPart("file", tempFile, MediaType.APPLICATION_OCTET_STREAM_TYPE);
+ final MultiPart multipart = new FormDataMultiPart().bodyPart(filePart);
+ // resource.request().header("ContentType", "application/json");
+ return resource.request().accept(MediaType.APPLICATION_JSON).post(
+ entity(multipart, MediaType.MULTIPART_FORM_DATA), UploadFileResponse.class);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
- public Map<String, Serializable> prepareInputs(ProcessDefinitionResponse processDefinition, Map<String,Serializable> inputs) {
- for (Entry<String, Serializable> entry : inputs.entrySet()) {
- if (entry.getValue() instanceof FileInput) {
- FileInput file = (FileInput) entry.getValue();
- String tmpFile = uploadFile(processDefinition, file).getTempPath();
- HashMap<String,Serializable> fileInput = new HashMap<String,Serializable>();
- fileInput.put("filename", file.getFilename());
- fileInput.put("tempPath", tmpFile);
- entry.setValue(fileInput);
- }
- }
- return inputs;
- }
+ }
+ public Map<String, Serializable> prepareInputs(ProcessDefinitionResponse processDefinition,
+ Map<String, Serializable> inputs) {
+ for (Entry<String, Serializable> entry : inputs.entrySet()) {
+ if (entry.getValue() instanceof FileInput) {
+ FileInput file = (FileInput) entry.getValue();
+ String tmpFile = uploadFile(processDefinition, file).getTempPath();
+ HashMap<String, Serializable> fileInput = new HashMap<String, Serializable>();
+ fileInput.put("filename", file.getFilename());
+ fileInput.put("tempPath", tmpFile);
+ entry.setValue(fileInput);
+ }
+ }
+ return inputs;
+ }
- public WebTarget getWebTarget() {
- return webTarget;
- }
+ public WebTarget getWebTarget() {
+ return webTarget;
+ }
+ public void setWebTarget(WebTarget webTarget) {
+ this.webTarget = webTarget;
+ }
- public void setWebTarget(WebTarget webTarget) {
- this.webTarget = webTarget;
- }
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/consumer/BonitaConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/consumer/BonitaConsumer.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/consumer/BonitaConsumer.java
index e9c216c..a6cd712 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/consumer/BonitaConsumer.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/consumer/BonitaConsumer.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita.consumer;
import org.apache.camel.Processor;
@@ -27,17 +28,17 @@ import org.slf4j.LoggerFactory;
*/
public class BonitaConsumer extends ScheduledPollConsumer {
- protected static final transient Logger LOG = LoggerFactory.getLogger(BonitaConsumer.class);
+ protected static final transient Logger LOG = LoggerFactory.getLogger(BonitaConsumer.class);
- protected BonitaEndpoint endpoint;
+ protected BonitaEndpoint endpoint;
- public BonitaConsumer(BonitaEndpoint endpoint, Processor processor) {
- super(endpoint, processor);
- this.endpoint = endpoint;
- }
+ public BonitaConsumer(BonitaEndpoint endpoint, Processor processor) {
+ super(endpoint, processor);
+ this.endpoint = endpoint;
+ }
- @Override
- protected int poll() throws Exception {
- return 0;
- }
+ @Override
+ protected int poll() throws Exception {
+ return 0;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/exception/BonitaException.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/exception/BonitaException.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/exception/BonitaException.java
index d21e70e..6881bbb 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/exception/BonitaException.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/exception/BonitaException.java
@@ -14,18 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita.exception;
public class BonitaException extends Exception {
-
- private static final long serialVersionUID = 1L;
- public BonitaException(String message) {
- super(message);
- }
+ private static final long serialVersionUID = 1L;
+
+ public BonitaException(String message) {
+ super(message);
+ }
- public BonitaException(Throwable throwable) {
- super(throwable);
- }
+ public BonitaException(Throwable throwable) {
+ super(throwable);
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/producer/BonitaProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/producer/BonitaProducer.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/producer/BonitaProducer.java
index c80f786..5ef411a 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/producer/BonitaProducer.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/producer/BonitaProducer.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita.producer;
import org.apache.camel.component.bonita.BonitaConfiguration;
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/producer/BonitaStartProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/producer/BonitaStartProducer.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/producer/BonitaStartProducer.java
index 8bf39b7..1dee99a 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/producer/BonitaStartProducer.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/producer/BonitaStartProducer.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita.producer;
-import java.io.Serializable;
import java.util.Map;
import org.apache.camel.Exchange;
@@ -26,25 +26,24 @@ import org.apache.camel.component.bonita.api.BonitaAPI;
import org.apache.camel.component.bonita.api.BonitaAPIBuilder;
import org.apache.camel.component.bonita.api.model.ProcessDefinitionResponse;
import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
-import org.apache.camel.model.ProcessDefinition;
public class BonitaStartProducer extends BonitaProducer {
- public BonitaStartProducer(BonitaEndpoint endpoint, BonitaConfiguration configuration) {
- super(endpoint, configuration);
- }
+ public BonitaStartProducer(BonitaEndpoint endpoint, BonitaConfiguration configuration) {
+ super(endpoint, configuration);
+ }
- public void process(Exchange exchange) throws Exception {
- // Setup access type (HTTP on local host)
- String hostname = this.configuration.getHostname();
- String port = this.configuration.getPort();
- String processName = this.configuration.getProcessName();
- String username = this.configuration.getUsername();
- String password = this.configuration.getPassword();
- BonitaAPIConfig bonitaAPIConfig = new BonitaAPIConfig(hostname, port, username, password);
- BonitaAPI bonitaApi = BonitaAPIBuilder.build(bonitaAPIConfig);
- ProcessDefinitionResponse processDefinition = bonitaApi.getProcessDefinition(processName);
- bonitaApi.startCase(processDefinition, exchange.getIn().getBody(Map.class));
- }
+ public void process(Exchange exchange) throws Exception {
+ // Setup access type (HTTP on local host)
+ String hostname = this.configuration.getHostname();
+ String port = this.configuration.getPort();
+ String processName = this.configuration.getProcessName();
+ String username = this.configuration.getUsername();
+ String password = this.configuration.getPassword();
+ BonitaAPIConfig bonitaAPIConfig = new BonitaAPIConfig(hostname, port, username, password);
+ BonitaAPI bonitaApi = BonitaAPIBuilder.build(bonitaAPIConfig);
+ ProcessDefinitionResponse processDefinition = bonitaApi.getProcessDefinition(processName);
+ bonitaApi.startCase(processDefinition, exchange.getIn().getBody(Map.class));
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/util/BonitaOperation.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/util/BonitaOperation.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/util/BonitaOperation.java
index e28f8d0..0dd3fdd 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/util/BonitaOperation.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/util/BonitaOperation.java
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita.util;
public enum BonitaOperation {
- startCase("startCase");
+ startCase("startCase");
private final String text;
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java
index dea6575..7539edd 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/BonitaConfigurationTest.java
@@ -14,43 +14,46 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita;
import org.apache.camel.ResolveEndpointFailedException;
-import org.apache.camel.component.bonita.BonitaConfiguration;
-import org.apache.camel.component.bonita.BonitaEndpoint;
import org.apache.camel.component.bonita.util.BonitaOperation;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class BonitaConfigurationTest extends CamelTestSupport {
-
- @Test
- public void testBonitaConfigurationDefaults() {
- BonitaEndpoint bonitaEndpoint = context.getEndpoint("bonita:startCase", BonitaEndpoint.class);
- BonitaConfiguration configuration = bonitaEndpoint.getConfiguration();
-
- assertEquals("localhost", configuration.getHostname());
- assertEquals("8080", configuration.getPort());
- }
-
- @Test
- public void testBonitaConfigurationCustom() {
- BonitaEndpoint bonitaEndpoint = context.getEndpoint("bonita:startCase?hostname=host&port=port&processName=processName&username=username&password=password", BonitaEndpoint.class);
- BonitaConfiguration configuration = bonitaEndpoint.getConfiguration();
-
-
- assertEquals("host", configuration.getHostname());
- assertEquals("port", configuration.getPort());
- assertEquals("processName", configuration.getProcessName());
- assertEquals("username", configuration.getUsername());
- assertEquals("password", configuration.getPassword());
- assertEquals(0,configuration.getOperation().compareTo(BonitaOperation.startCase));
- }
-
- @Test(expected=ResolveEndpointFailedException.class)
- public void testBonitaConfigurationWrongOperation() {
- BonitaEndpoint bonitaEndpoint = context.getEndpoint("bonita:wrongOperation", BonitaEndpoint.class);
- }
+
+ @Test
+ public void testBonitaConfigurationDefaults() {
+ BonitaEndpoint bonitaEndpoint =
+ context.getEndpoint("bonita:startCase", BonitaEndpoint.class);
+ BonitaConfiguration configuration = bonitaEndpoint.getConfiguration();
+
+ assertEquals("localhost", configuration.getHostname());
+ assertEquals("8080", configuration.getPort());
+ }
+
+ @Test
+ public void testBonitaConfigurationCustom() {
+ BonitaEndpoint bonitaEndpoint = context.getEndpoint(
+ "bonita:startCase?hostname=host&port=port&processName=processName&username=username&password=password",
+ BonitaEndpoint.class);
+ BonitaConfiguration configuration = bonitaEndpoint.getConfiguration();
+
+ assertEquals("host", configuration.getHostname());
+ assertEquals("port", configuration.getPort());
+ assertEquals("processName", configuration.getProcessName());
+ assertEquals("username", configuration.getUsername());
+ assertEquals("password", configuration.getPassword());
+ assertEquals(0, configuration.getOperation().compareTo(BonitaOperation.startCase));
+ }
+
+ @Test(
+ expected = ResolveEndpointFailedException.class)
+ public void testBonitaConfigurationWrongOperation() {
+ BonitaEndpoint bonitaEndpoint =
+ context.getEndpoint("bonita:wrongOperation", BonitaEndpoint.class);
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPIBuilderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPIBuilderTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPIBuilderTest.java
index 690e6c5..79a86af 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPIBuilderTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPIBuilderTest.java
@@ -1,12 +1,28 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.component.bonita.api;
-import org.apache.camel.component.bonita.api.BonitaAPIBuilder;
import org.junit.Test;
public class BonitaAPIBuilderTest {
- @Test(expected=IllegalArgumentException.class)
- public void testNullBuilderInput() {
- BonitaAPIBuilder.build(null);
- }
+ @Test(
+ expected = IllegalArgumentException.class)
+ public void testNullBuilderInput() {
+ BonitaAPIBuilder.build(null);
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPITest.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPITest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPITest.java
index cfbe2a5..6dc7aff 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPITest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAPITest.java
@@ -14,38 +14,40 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita.api;
import java.io.Serializable;
import java.util.HashMap;
-import java.util.Map;
-import org.apache.camel.component.bonita.api.BonitaAPI;
-import org.apache.camel.component.bonita.api.BonitaAPIBuilder;
import org.apache.camel.component.bonita.api.model.ProcessDefinitionResponse;
import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
import org.junit.Test;
public class BonitaAPITest {
- @Test(expected=IllegalArgumentException.class)
- public void testGetProcessDefinitionEmptyInput() {
- BonitaAPI bonitaApi = BonitaAPIBuilder.build(new BonitaAPIConfig("hostname","port","username","password"));
- bonitaApi.getProcessDefinition("");
- }
-
- @Test(expected=IllegalArgumentException.class)
- public void testStartCaseEmptyProcessDefinitionId() {
- BonitaAPI bonitaApi = BonitaAPIBuilder.build(new BonitaAPIConfig("hostname","port","username","password"));
- bonitaApi.startCase(null, new HashMap<String,Serializable>());
- }
-
- @Test(expected=IllegalArgumentException.class)
- public void testStartCaseNUllContractInput() {
- BonitaAPI bonitaApi = BonitaAPIBuilder.build(new BonitaAPIConfig("hostname","port","username","password"));
- ProcessDefinitionResponse processDefinition = new ProcessDefinitionResponse();
- bonitaApi.startCase(processDefinition, null);
- }
-
-
+ @Test(
+ expected = IllegalArgumentException.class)
+ public void testGetProcessDefinitionEmptyInput() {
+ BonitaAPI bonitaApi = BonitaAPIBuilder
+ .build(new BonitaAPIConfig("hostname", "port", "username", "password"));
+ bonitaApi.getProcessDefinition("");
+ }
+
+ @Test(
+ expected = IllegalArgumentException.class)
+ public void testStartCaseEmptyProcessDefinitionId() {
+ BonitaAPI bonitaApi = BonitaAPIBuilder
+ .build(new BonitaAPIConfig("hostname", "port", "username", "password"));
+ bonitaApi.startCase(null, new HashMap<String, Serializable>());
+ }
+
+ @Test(
+ expected = IllegalArgumentException.class)
+ public void testStartCaseNUllContractInput() {
+ BonitaAPI bonitaApi = BonitaAPIBuilder
+ .build(new BonitaAPIConfig("hostname", "port", "username", "password"));
+ ProcessDefinitionResponse processDefinition = new ProcessDefinitionResponse();
+ bonitaApi.startCase(processDefinition, null);
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
index 06b7c07..7188ec0 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita.api;
import java.util.HashMap;
@@ -34,25 +35,22 @@ import org.powermock.modules.junit4.PowerMockRunner;
@RunWith(PowerMockRunner.class)
public class BonitaAuthFilterAlreadyConnectedTest {
-
- @Mock
- private ClientRequestContext requestContext;
-
-
-
- @Before
- public void setup() {
- Map<String,Cookie> resultCookies = new HashMap<>();
- resultCookies.put("JSESSIONID", new Cookie("JSESSIONID","something"));
- Mockito.when(requestContext.getCookies()).thenReturn(resultCookies);
-
- }
-
-
- @Test
- public void testAlreadyConnected() throws Exception{
- BonitaAPIConfig bonitaApiConfig = new BonitaAPIConfig("hostname", "port", "username", "password");
- BonitaAuthFilter bonitaAuthFilter = new BonitaAuthFilter(bonitaApiConfig);
- bonitaAuthFilter.filter(requestContext);
- }
+ @Mock
+ private ClientRequestContext requestContext;
+
+ @Before
+ public void setup() {
+ Map<String, Cookie> resultCookies = new HashMap<>();
+ resultCookies.put("JSESSIONID", new Cookie("JSESSIONID", "something"));
+ Mockito.when(requestContext.getCookies()).thenReturn(resultCookies);
+
+ }
+
+ @Test
+ public void testAlreadyConnected() throws Exception {
+ BonitaAPIConfig bonitaApiConfig =
+ new BonitaAPIConfig("hostname", "port", "username", "password");
+ BonitaAuthFilter bonitaAuthFilter = new BonitaAuthFilter(bonitaApiConfig);
+ bonitaAuthFilter.filter(requestContext);
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
index 7781d716..0b2a860 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
@@ -16,17 +16,14 @@
*/
package org.apache.camel.component.bonita.api;
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-
import java.util.HashMap;
import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.MultivaluedHashMap;
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
import org.junit.Before;
@@ -37,36 +34,41 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.modules.junit4.PowerMockRunner;
-import static org.junit.Assert.*;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+
+import static org.junit.Assert.assertEquals;
@RunWith(PowerMockRunner.class)
@PowerMockIgnore("javax.net.ssl.*")
public class BonitaAuthFilterConnectionTest {
-
- @Rule
- public WireMockRule wireMockRule = new WireMockRule(0);
-
- @Mock
- private ClientRequestContext requestContext;
-
- @Before
- public void setup() {
- Mockito.when(requestContext.getCookies()).thenReturn(new HashMap<String,Cookie>());
- Mockito.when(requestContext.getHeaders()).thenReturn(new MultivaluedHashMap());
- }
- @Test
- public void testConnection() throws Exception{
- String port = wireMockRule.port() + "";
- stubFor(post(urlEqualTo("/bonita/loginservice"))
- .willReturn(aResponse()
- .withHeader("Set-Cookie", "JSESSIONID=something")));
-
- BonitaAPIConfig bonitaApiConfig = new BonitaAPIConfig("localhost", port, "username", "password");
- BonitaAuthFilter bonitaAuthFilter = new BonitaAuthFilter(bonitaApiConfig);
- bonitaAuthFilter.filter(requestContext);
- assertEquals(1, requestContext.getHeaders().size());
- }
-
+ @Rule
+ public WireMockRule wireMockRule = new WireMockRule(0);
+
+ @Mock
+ private ClientRequestContext requestContext;
+
+ @Before
+ public void setup() {
+ Mockito.when(requestContext.getCookies()).thenReturn(new HashMap<String, Cookie>());
+ Mockito.when(requestContext.getHeaders()).thenReturn(new MultivaluedHashMap());
+ }
+
+ @Test
+ public void testConnection() throws Exception {
+ String port = wireMockRule.port() + "";
+ stubFor(post(urlEqualTo("/bonita/loginservice"))
+ .willReturn(aResponse().withHeader("Set-Cookie", "JSESSIONID=something")));
+
+ BonitaAPIConfig bonitaApiConfig =
+ new BonitaAPIConfig("localhost", port, "username", "password");
+ BonitaAuthFilter bonitaAuthFilter = new BonitaAuthFilter(bonitaApiConfig);
+ bonitaAuthFilter.filter(requestContext);
+ assertEquals(1, requestContext.getHeaders().size());
+ }
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
index ad633cd..44d2ec7 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.component.bonita.api;
import java.io.IOException;
@@ -6,7 +22,6 @@ import java.util.Map;
import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.MultivaluedHashMap;
import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
@@ -19,31 +34,32 @@ import org.powermock.modules.junit4.PowerMockRunner;
@RunWith(PowerMockRunner.class)
public class BonitaAuthFilterTest {
-
- @Mock
- private ClientRequestContext requestContext;
-
- @Before
- public void setup() {
- Map<String,Cookie> resultCookies = new HashMap<>();
- Mockito.when(requestContext.getCookies()).thenReturn(resultCookies);
-
- }
-
-
- @Test(expected=IllegalArgumentException.class)
- public void testBonitaAuthFilterUsernameEmpty() throws IOException {
- BonitaAPIConfig bonitaApiConfig = new BonitaAPIConfig("localhost", "port", "", "password");
- BonitaAuthFilter bonitaAuthFilter = new BonitaAuthFilter(bonitaApiConfig);
- bonitaAuthFilter.filter(requestContext);
-
- }
-
- @Test(expected=IllegalArgumentException.class)
- public void testBonitaAuthFilterPasswordEmpty() throws IOException {
- BonitaAPIConfig bonitaApiConfig = new BonitaAPIConfig("localhost", "port", "username", "");
- BonitaAuthFilter bonitaAuthFilter = new BonitaAuthFilter(bonitaApiConfig);
- bonitaAuthFilter.filter(requestContext);
- }
+
+ @Mock
+ private ClientRequestContext requestContext;
+
+ @Before
+ public void setup() {
+ Map<String, Cookie> resultCookies = new HashMap<>();
+ Mockito.when(requestContext.getCookies()).thenReturn(resultCookies);
+
+ }
+
+ @Test(
+ expected = IllegalArgumentException.class)
+ public void testBonitaAuthFilterUsernameEmpty() throws IOException {
+ BonitaAPIConfig bonitaApiConfig = new BonitaAPIConfig("localhost", "port", "", "password");
+ BonitaAuthFilter bonitaAuthFilter = new BonitaAuthFilter(bonitaApiConfig);
+ bonitaAuthFilter.filter(requestContext);
+
+ }
+
+ @Test(
+ expected = IllegalArgumentException.class)
+ public void testBonitaAuthFilterPasswordEmpty() throws IOException {
+ BonitaAPIConfig bonitaApiConfig = new BonitaAPIConfig("localhost", "port", "username", "");
+ BonitaAuthFilter bonitaAuthFilter = new BonitaAuthFilter(bonitaApiConfig);
+ bonitaAuthFilter.filter(requestContext);
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/61fc55fb/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfigTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfigTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfigTest.java
index 8e26c0d..3dd17a3 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfigTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/util/BonitaAPIConfigTest.java
@@ -14,19 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.camel.component.bonita.api.util;
+
import org.junit.Test;
-import static org.junit.Assert.*;
-import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
+import static org.junit.Assert.assertEquals;
+
public class BonitaAPIConfigTest {
- @Test
- public void testBaseBonitaURL() {
- BonitaAPIConfig config = new BonitaAPIConfig("host", "port", "username", "password");
- assertEquals("http://host:port/bonita", config.getBaseBonitaURI());
- }
+ @Test
+ public void testBaseBonitaURL() {
+ BonitaAPIConfig config = new BonitaAPIConfig("host", "port", "username", "password");
+ assertEquals("http://host:port/bonita", config.getBaseBonitaURI());
+ }
}