Skip to content

Commit f49bb45

Browse files
fyrnagafyrnaga
authored
Merge pull request #12 from cloudops/devel
Merge devel
2 parents cdf8f11 + df9529e commit f49bb45

24 files changed

Lines changed: 722 additions & 47 deletions

File tree

‎connectors/http-connector/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.github.openstack4j.core.connectors</groupId>
66
<artifactId>openstack4j-connectors</artifactId>
7-
<version>3.12</version>
7+
<version>co-3.12.4</version>
88
</parent>
99
<name>OpenStack4j HttpURL Connector</name>
1010
<artifactId>openstack4j-http-connector</artifactId>

‎connectors/httpclient/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>com.github.openstack4j.core.connectors</groupId>
44
<artifactId>openstack4j-connectors</artifactId>
5-
<version>3.12</version>
5+
<version>co-3.12.4</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<artifactId>openstack4j-httpclient</artifactId>

‎connectors/jersey2-jakarta/pom.xml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<parent>
3+
<groupId>com.github.openstack4j.core.connectors</groupId>
4+
<artifactId>openstack4j-connectors</artifactId>
5+
<version>co-3.12.4</version>
6+
</parent>
7+
<modelVersion>4.0.0</modelVersion>
8+
<artifactId>openstack4j-jersey2-jakarta</artifactId>
9+
<name>OpenStack4j Jersey2 Jakarta Connector</name>
10+
<url>https://github.com/openstack4j/openstack4j/</url>
11+
<packaging>jar</packaging>
12+
13+
<properties>
14+
<jersey-version>3.1.10</jersey-version>
15+
</properties>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.glassfish.jersey.core</groupId>
20+
<artifactId>jersey-client</artifactId>
21+
<version>${jersey-version}</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.glassfish.jersey.media</groupId>
25+
<artifactId>jersey-media-json-jackson</artifactId>
26+
<version>${jersey-version}</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>com.fasterxml.jackson.core</groupId>
30+
<artifactId>jackson-databind</artifactId>
31+
<version>${jackson.version}</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>jakarta.ws.rs</groupId>
35+
<artifactId>jakarta.ws.rs-api</artifactId>
36+
<version>4.0.0</version>
37+
</dependency>
38+
</dependencies>
39+
40+
<build>
41+
<plugins>
42+
<plugin>
43+
<groupId>org.apache.felix</groupId>
44+
<artifactId>maven-bundle-plugin</artifactId>
45+
<extensions>true</extensions>
46+
<configuration>
47+
<instructions>
48+
<Bundle-Name>${project.name}</Bundle-Name>
49+
<Export-Package>
50+
org.openstack4j.connectors.jersey2
51+
</Export-Package>
52+
<Import-Package>
53+
!org.openstack4j.connectors.jersey2,
54+
*
55+
</Import-Package>
56+
<!--
57+
Required for SPI in OSGi:
58+
http://aries.apache.org/modules/spi-fly.html#specconf
59+
60+
This bundle defines an implementation for following services in META-INF-services:
61+
org.openstack4j.core.transport.HttpExecutorService
62+
-->
63+
<Require-Capability>
64+
osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
65+
</Require-Capability>
66+
<Provide-Capability>
67+
osgi.serviceloader; osgi.serviceloader=org.openstack4j.core.transport.HttpExecutorService
68+
</Provide-Capability>
69+
</instructions>
70+
</configuration>
71+
</plugin>
72+
</plugins>
73+
</build>
74+
</project>

‎connectors/jersey2-jakarta/src/main/java/org/openstack4j/connectors/jersey2/ClientFactory.java‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
package org.openstack4j.connectors.jersey2;
2+
3+
import java.io.IOException;
4+
import java.net.HttpURLConnection;
5+
import java.net.InetSocketAddress;
6+
import java.net.Proxy;
7+
import java.net.Proxy.Type;
8+
import java.net.URL;
9+
import java.util.concurrent.ExecutionException;
10+
import java.util.concurrent.TimeUnit;
11+
12+
import com.fasterxml.jackson.databind.ObjectMapper;
13+
import com.google.common.cache.CacheBuilder;
14+
import com.google.common.cache.CacheLoader;
15+
import com.google.common.cache.LoadingCache;
16+
import jakarta.ws.rs.client.Client;
17+
import jakarta.ws.rs.client.ClientBuilder;
18+
import jakarta.ws.rs.client.ClientRequestContext;
19+
import jakarta.ws.rs.client.ClientRequestFilter;
20+
import jakarta.ws.rs.ext.ContextResolver;
21+
import org.glassfish.jersey.client.ClientConfig;
22+
import org.glassfish.jersey.client.ClientProperties;
23+
import org.glassfish.jersey.client.HttpUrlConnectorProvider;
24+
import org.glassfish.jersey.client.HttpUrlConnectorProvider.ConnectionFactory;
25+
import org.glassfish.jersey.jackson.JacksonFeature;
26+
import org.openstack4j.api.exceptions.ConnectionException;
27+
import org.openstack4j.core.transport.ClientConstants;
28+
import org.openstack4j.core.transport.Config;
29+
import org.openstack4j.core.transport.ObjectMapperSingleton;
30+
import org.openstack4j.core.transport.UntrustedSSL;
31+
32+
/**
33+
* A factory for creating a rest Client which is mapped to Jackson for JSON processing.
34+
*
35+
* @author Jeremy Unruh
36+
*/
37+
class ClientFactory {
38+
39+
private static final CustomContextResolver RESOLVER = new CustomContextResolver();
40+
private static LoadingCache<Config, Client> CACHE = CacheBuilder.newBuilder()
41+
.expireAfterAccess(20, TimeUnit.MINUTES)
42+
.build(new CacheLoader<Config, Client>() {
43+
@Override
44+
public Client load(Config config) throws Exception {
45+
return buildClientFromConfig(config);
46+
}
47+
});
48+
49+
/**
50+
* Creates or Returns a Client
51+
*
52+
* @param config the configuration to use for the given client
53+
* @return the client
54+
*/
55+
static Client create(Config config) {
56+
try {
57+
return CACHE.get(config);
58+
} catch (ExecutionException e) {
59+
throw new ConnectionException("Issue creating Jersey 2 Client: " + e.getMessage(), 0, e);
60+
}
61+
}
62+
63+
private static Client buildClientFromConfig(Config config) {
64+
ClientConfig clientConfig = new ClientConfig();
65+
66+
if (config.getProxy() != null) {
67+
addProxy(clientConfig, config);
68+
}
69+
70+
ClientBuilder cb = ClientBuilder.newBuilder()
71+
.withConfig(clientConfig)
72+
.property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, "true")
73+
.register(JacksonFeature.class)
74+
.register(RESOLVER)
75+
.register(new RequestFilter());
76+
77+
if (config.getSslContext() != null) {
78+
cb.sslContext(config.getSslContext());
79+
} else if (config.isIgnoreSSLVerification()) {
80+
cb.sslContext(UntrustedSSL.getSSLContext());
81+
}
82+
83+
if (config.getHostNameVerifier() != null) {
84+
cb.hostnameVerifier(config.getHostNameVerifier());
85+
} else if (config.isIgnoreSSLVerification()) {
86+
cb.hostnameVerifier(UntrustedSSL.getHostnameVerifier());
87+
}
88+
89+
if (config.getReadTimeout() > 0) {
90+
cb.property(ClientProperties.READ_TIMEOUT, config.getReadTimeout());
91+
}
92+
93+
if (config.getConnectTimeout() > 0) {
94+
cb.property(ClientProperties.CONNECT_TIMEOUT, config.getConnectTimeout());
95+
}
96+
97+
return cb.build();
98+
}
99+
100+
private static void addProxy(ClientConfig cc, Config config) {
101+
if (config.getProxy() != null) {
102+
HttpUrlConnectorProvider cp = new HttpUrlConnectorProvider();
103+
cc.connectorProvider(cp);
104+
final Proxy proxy = new Proxy(Type.HTTP,
105+
new InetSocketAddress(config.getProxy().getRawHost(), config.getProxy().getPort()));
106+
107+
cp.connectionFactory(new ConnectionFactory() {
108+
109+
@Override
110+
public HttpURLConnection getConnection(URL url) throws IOException {
111+
return (HttpURLConnection) url.openConnection(proxy);
112+
}
113+
});
114+
}
115+
}
116+
117+
private static final class RequestFilter implements ClientRequestFilter {
118+
119+
/**
120+
* {@inheritDoc}
121+
*/
122+
@Override
123+
public void filter(ClientRequestContext requestContext) throws IOException {
124+
requestContext.getHeaders().remove(ClientConstants.HEADER_CONTENT_LANGUAGE);
125+
requestContext.getHeaders().remove(ClientConstants.HEADER_CONTENT_ENCODING);
126+
}
127+
}
128+
129+
private static final class CustomContextResolver implements ContextResolver<ObjectMapper> {
130+
131+
/**
132+
* {@inheritDoc}
133+
*/
134+
@Override
135+
public ObjectMapper getContext(Class<?> type) {
136+
return ObjectMapperSingleton.getContext(type);
137+
}
138+
139+
}
140+
}

‎connectors/jersey2-jakarta/src/main/java/org/openstack4j/connectors/jersey2/HttpCommand.java‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
package org.openstack4j.connectors.jersey2;
2+
3+
import jakarta.ws.rs.client.Client;
4+
import jakarta.ws.rs.client.Entity;
5+
import jakarta.ws.rs.client.Invocation;
6+
import jakarta.ws.rs.client.WebTarget;
7+
import jakarta.ws.rs.core.MediaType;
8+
import jakarta.ws.rs.core.Response;
9+
10+
import java.io.InputStream;
11+
import java.util.List;
12+
import java.util.Map;
13+
import java.util.logging.Logger;
14+
15+
import org.glassfish.jersey.client.ClientProperties;
16+
import org.glassfish.jersey.client.HttpUrlConnectorProvider;
17+
import org.glassfish.jersey.client.RequestEntityProcessing;
18+
import org.glassfish.jersey.logging.LoggingFeature;
19+
import org.openstack4j.core.transport.ClientConstants;
20+
import org.openstack4j.core.transport.HttpRequest;
21+
import org.openstack4j.core.transport.internal.HttpLoggingFilter;
22+
23+
/**
24+
* HttpCommand is responsible for executing the actual request driven by the HttpExecutor.
25+
*/
26+
public final class HttpCommand<R> {
27+
28+
private HttpRequest<R> request;
29+
private Entity<?> entity;
30+
private Invocation.Builder invocation;
31+
private int retries;
32+
33+
private HttpCommand(HttpRequest<R> request) {
34+
this.request = request;
35+
}
36+
37+
/**
38+
* Creates a new HttpCommand from the given request
39+
*
40+
* @param request the request
41+
* @return the command
42+
*/
43+
public static <R> HttpCommand<R> create(HttpRequest<R> request) {
44+
HttpCommand<R> command = new HttpCommand<R>(request);
45+
command.initialize();
46+
return command;
47+
}
48+
49+
private void initialize() {
50+
Client client = ClientFactory.create(request.getConfig());
51+
//try to set unsupported HTTP method. In our case used for PATCH.
52+
if ("PATCH".equals(request.getMethod().name())) {
53+
client.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true);
54+
}
55+
56+
WebTarget target = client.target(request.getEndpoint()).path(request.getPath());
57+
58+
if (HttpLoggingFilter.isLoggingEnabled()) {
59+
target.register(new LoggingFeature(Logger.getLogger("os"), 10000));
60+
}
61+
62+
target = populateQueryParams(target, request);
63+
invocation = target.request(MediaType.APPLICATION_JSON);
64+
65+
populateHeaders(invocation, request);
66+
67+
entity = (request.getEntity() == null) ? null: Entity.entity(request.getEntity(), request.getContentType());
68+
}
69+
70+
/**
71+
* Executes the command and returns the Response
72+
*
73+
* @return the response
74+
*/
75+
public Response execute() {
76+
Response response = null;
77+
78+
if (hasEntity()) {
79+
if (isInputStreamEntity()) {
80+
// Issue #20 - Out of Memory in Jersey for large streams
81+
invocation.property(ClientProperties.CHUNKED_ENCODING_SIZE, 1024);
82+
invocation.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
83+
}
84+
response = invocation.method(request.getMethod().name(), getEntity());
85+
} else if (request.hasJson()) {
86+
response = invocation.method(request.getMethod().name(), Entity.entity(request.getJson(), ClientConstants.CONTENT_TYPE_JSON));
87+
} else {
88+
response = invocation.method(request.getMethod().name());
89+
}
90+
91+
return response;
92+
}
93+
94+
private boolean isInputStreamEntity() {
95+
return (hasEntity() && InputStream.class.isAssignableFrom(entity.getEntity().getClass()));
96+
}
97+
98+
/**
99+
* @return the request entity or null
100+
*/
101+
public Entity<?> getEntity() {
102+
return entity;
103+
}
104+
105+
/**
106+
* @return true if a request entity has been set
107+
*/
108+
public boolean hasEntity() {
109+
return entity != null;
110+
}
111+
112+
/**
113+
* @return current retry execution count for this command
114+
*/
115+
public int getRetries() {
116+
return retries;
117+
}
118+
119+
/**
120+
* @return incremement's the retry count and returns self
121+
*/
122+
public HttpCommand<R> incrementRetriesAndReturn() {
123+
initialize();
124+
retries++;
125+
return this;
126+
}
127+
128+
public HttpRequest<R> getRequest() {
129+
return request;
130+
}
131+
132+
private WebTarget populateQueryParams(WebTarget target, HttpRequest<R> request) {
133+
134+
if (!request.hasQueryParams()) {
135+
return target;
136+
}
137+
138+
for (Map.Entry<String, List<Object>> entry : request.getQueryParams().entrySet()) {
139+
for (Object o : entry.getValue()) {
140+
target = target.queryParam(entry.getKey(), o);
141+
}
142+
}
143+
return target;
144+
}
145+
146+
private void populateHeaders(Invocation.Builder invocation, HttpRequest<R> request) {
147+
148+
if (!request.hasHeaders()) {
149+
return;
150+
}
151+
152+
for (Map.Entry<String, Object> h : request.getHeaders().entrySet()) {
153+
invocation.header(h.getKey(), h.getValue());
154+
}
155+
}
156+
}

0 commit comments

Comments
 (0)