diff --git a/mule-http-connector/pom.xml b/mule-http-connector/pom.xml index 3628453e3..0a4f7b200 100644 --- a/mule-http-connector/pom.xml +++ b/mule-http-connector/pom.xml @@ -225,6 +225,64 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + ISO-8859-1 + 1.8 + 1.8 + 8 + none + true + + + + org.bsc.maven + maven-processor-plugin + 2.2.4 + + + + process + + process + + compile + + target/classes/META-INF + + + org.mule.runtime.ast.extension.api.loader.ASTExtensionResourcesGeneratorAnnotationProcessor + + + + ${project.version} + + + + + + + + org.mule.runtime + mule-extension-ast-loader + 1.7.0 + + + org.mule.runtime + mule-module-extensions-spring-support + 4.6.0 + + + org.mule.runtime + mule-module-extensions-soap-support + 4.6.0 + + + diff --git a/mule-http-connector/src/main/java/org/mule/extension/http/api/HttpRequestAttributes.java b/mule-http-connector/src/main/java/org/mule/extension/http/api/HttpRequestAttributes.java index 7a0425236..6ff30c87d 100644 --- a/mule-http-connector/src/main/java/org/mule/extension/http/api/HttpRequestAttributes.java +++ b/mule-http-connector/src/main/java/org/mule/extension/http/api/HttpRequestAttributes.java @@ -6,7 +6,10 @@ */ package org.mule.extension.http.api; +import static org.mule.runtime.api.util.MultiMap.emptyMultiMap; + import static java.lang.System.lineSeparator; +import static java.util.Collections.emptyMap; import org.mule.extension.http.api.certificate.CertificateData; import org.mule.extension.http.internal.certificate.CertificateProvider; @@ -16,6 +19,7 @@ import org.mule.runtime.extension.api.annotation.param.Parameter; import java.security.cert.Certificate; +import java.util.Collections; import java.util.Map; import java.util.function.Supplier; @@ -147,6 +151,14 @@ public HttpRequestAttributes(MultiMap headers, String listenerPa uriParams, "", remoteAddress, () -> clientCertificate); } + @Deprecated + public HttpRequestAttributes() { + this(emptyMultiMap(), "/", null, "HTTP/1.1", + "http", "GET", "/", null, "", + emptyMultiMap(), emptyMap(), "/", + null); + } + HttpRequestAttributes(MultiMap headers, String listenerPath, String relativePath, String maskedRequestPath, String version, String scheme, String method, String requestPath, String rawRequestPath, String requestUri, String rawRequestUri, String queryString, MultiMap queryParams, diff --git a/mule-http-connector/src/main/java/org/mule/extension/http/api/request/HttpConnectivityValidator.java b/mule-http-connector/src/main/java/org/mule/extension/http/api/request/HttpConnectivityValidator.java index b0b0c4600..692d7672f 100644 --- a/mule-http-connector/src/main/java/org/mule/extension/http/api/request/HttpConnectivityValidator.java +++ b/mule-http-connector/src/main/java/org/mule/extension/http/api/request/HttpConnectivityValidator.java @@ -50,6 +50,7 @@ import javax.inject.Inject; import java.net.CookieManager; import java.util.List; +import java.util.Objects; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -258,4 +259,28 @@ private static HttpAuthentication resolveAuthentication(HttpExtensionClient clie return null; } } + + @Override + public boolean equals(Object o) { + if (this == o) + return true; + if (null == o || getClass() != o.getClass()) + return false; + HttpConnectivityValidator that = (HttpConnectivityValidator) o; + return followRedirects == that.followRedirects && Objects.equals(requestPath, that.requestPath) + && Objects.equals(requestMethod, that.requestMethod) && Objects.equals(responseTimeout, that.responseTimeout) + && responseTimeoutUnit == that.responseTimeoutUnit && Objects.equals(requestBody, that.requestBody) + && Objects.equals(requestHeaders, that.requestHeaders) && Objects.equals(requestQueryParams, that.requestQueryParams) + && Objects.equals(requestUriParams, that.requestUriParams) && Objects.equals(responseValidator, that.responseValidator) + && Objects.equals(expressionManager, that.expressionManager) && Objects.equals(requestBuilder, that.requestBuilder) + && Objects.equals(defaultStatusCodeValidator, that.defaultStatusCodeValidator) + && Objects.equals(muleContext, that.muleContext); + } + + @Override + public int hashCode() { + return Objects.hash(requestPath, requestMethod, followRedirects, responseTimeout, responseTimeoutUnit, requestBody, + requestHeaders, requestQueryParams, requestUriParams, responseValidator, expressionManager, + requestBuilder, defaultStatusCodeValidator, muleContext); + } } diff --git a/mule-http-connector/src/main/java/org/mule/extension/http/internal/request/profiling/HttpRequestResponseProfilingDataProducerAdaptor.java b/mule-http-connector/src/main/java/org/mule/extension/http/internal/request/profiling/HttpRequestResponseProfilingDataProducerAdaptor.java index 8a654d1da..78d945b19 100644 --- a/mule-http-connector/src/main/java/org/mule/extension/http/internal/request/profiling/HttpRequestResponseProfilingDataProducerAdaptor.java +++ b/mule-http-connector/src/main/java/org/mule/extension/http/internal/request/profiling/HttpRequestResponseProfilingDataProducerAdaptor.java @@ -24,9 +24,9 @@ */ public class HttpRequestResponseProfilingDataProducerAdaptor { - ProfilingDataProducer profilingDataProducer; + ProfilingDataProducer profilingDataProducer; - public HttpRequestResponseProfilingDataProducerAdaptor(ProfilingDataProducer profilingDataProducer) { + public HttpRequestResponseProfilingDataProducerAdaptor(ProfilingDataProducer profilingDataProducer) { this.profilingDataProducer = profilingDataProducer; }