Skip to content

Commit 50b1883

Browse files
gd-tmagrysgd-tmagrys
committed
Implement automated tests for plugin API HTTP Client
Implement automated tests for plugin API HTTP resource Add Mockito and Power Mock dependency Implement automated tests for ConfigurationsManager. Implement additional tests for HTTP Client and HTTP resource Exclude artifacts forbidden by maven enforce plugin
1 parent af01346 commit 50b1883

14 files changed

Lines changed: 578 additions & 73 deletions

‎pom.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,31 @@
146146
<artifactId>lombok</artifactId>
147147
<version>1.16.4</version>
148148
</dependency>
149+
150+
<dependency>
151+
<groupId>org.mockito</groupId>
152+
<artifactId>mockito-core</artifactId>
153+
<version>1.10.19</version>
154+
<scope>test</scope>
155+
<exclusions>
156+
<exclusion>
157+
<groupId>org.hamcrest</groupId>
158+
<artifactId>hamcrest-core</artifactId>
159+
</exclusion>
160+
</exclusions>
161+
</dependency>
162+
<dependency>
163+
<groupId>org.powermock</groupId>
164+
<artifactId>powermock-api-mockito</artifactId>
165+
<version>1.6.2</version>
166+
<scope>test</scope>
167+
<exclusions>
168+
<exclusion>
169+
<groupId>org.mockito</groupId>
170+
<artifactId>mockito-all</artifactId>
171+
</exclusion>
172+
</exclusions>
173+
</dependency>
149174
</dependencies>
150175

151176
<build>

‎src/main/java/com/griddynamics/cd/nrp/internal/model/config/NexusServer.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616
package com.griddynamics.cd.nrp.internal.model.config;
1717

18-
import lombok.*;
18+
import lombok.NoArgsConstructor;
19+
import lombok.NonNull;
20+
import lombok.RequiredArgsConstructor;
1921

2022
import javax.xml.bind.annotation.XmlAccessType;
2123
import javax.xml.bind.annotation.XmlAccessorType;

‎src/main/java/com/griddynamics/cd/nrp/internal/model/config/ReplicationPluginConfiguration.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import javax.xml.bind.annotation.XmlElement;
2525
import javax.xml.bind.annotation.XmlElementWrapper;
2626
import javax.xml.bind.annotation.XmlRootElement;
27-
import java.util.HashSet;
27+
import java.util.LinkedHashSet;
2828
import java.util.Set;
2929

3030
/**
@@ -36,26 +36,24 @@
3636
public class ReplicationPluginConfiguration {
3737
@XmlElement(name = "server")
3838
@XmlElementWrapper(name = "servers")
39-
private final Set<NexusServer> servers = new HashSet<>();
39+
private final Set<NexusServer> servers = new LinkedHashSet<>();
4040
@Getter
4141
@NonNull
4242
@XmlAttribute(name = "myUrl")
4343
private String myUrl;
44+
@Getter
4445
@XmlAttribute(name = "requestsQueueSize")
4546
private Integer requestsQueueSize = 500;
4647
@XmlAttribute(name = "requestsSendingThreadsCount")
4748
private Integer requestsSendingThreadsCount = 1;
4849
@XmlAttribute(name = "queueDumpFileName")
50+
@NonNull
4951
private String queueDumpFileName;
5052

5153
public void addServer(NexusServer server) {
5254
servers.add(server);
5355
}
5456

55-
public Integer getRequestsQueueSize() {
56-
return requestsQueueSize;
57-
}
58-
5957
public String getQueueDumpFileName() {
6058
return queueDumpFileName;
6159
}

‎src/main/java/com/griddynamics/cd/nrp/internal/uploading/impl/ArtifactUpdateApiClientImpl.java‎

Lines changed: 14 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,21 @@
1616
package com.griddynamics.cd.nrp.internal.uploading.impl;
1717

1818
import com.griddynamics.cd.nrp.internal.model.api.ArtifactMetaInfo;
19-
import com.griddynamics.cd.nrp.internal.model.internal.ArtifactMetaInfoQueueDump;
2019
import com.griddynamics.cd.nrp.internal.model.api.RestResponse;
2120
import com.griddynamics.cd.nrp.internal.model.config.NexusServer;
21+
import com.griddynamics.cd.nrp.internal.model.internal.ArtifactMetaInfoQueueDump;
2222
import com.griddynamics.cd.nrp.internal.uploading.ArtifactUpdateApiClient;
2323
import com.griddynamics.cd.nrp.internal.uploading.ConfigurationsManager;
24+
import com.griddynamics.cd.nrp.internal.uploading.impl.factories.AsyncWebResourceBuilderFactory;
25+
import com.griddynamics.cd.nrp.internal.uploading.impl.factories.FileBlockingQueueFactory;
2426
import com.sun.jersey.api.client.AsyncWebResource;
25-
import com.sun.jersey.api.client.Client;
2627
import com.sun.jersey.api.client.GenericType;
2728
import com.sun.jersey.api.client.async.ITypeListener;
28-
import com.sun.jersey.api.client.config.ClientConfig;
29-
import com.sun.jersey.api.client.config.DefaultClientConfig;
30-
import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
3129
import org.sonatype.sisu.goodies.common.ComponentSupport;
3230

3331
import javax.inject.Inject;
3432
import javax.inject.Named;
3533
import javax.inject.Singleton;
36-
import javax.ws.rs.core.MediaType;
37-
import javax.ws.rs.core.UriBuilder;
3834
import javax.xml.bind.JAXBContext;
3935
import javax.xml.bind.Unmarshaller;
4036
import java.io.File;
@@ -50,25 +46,21 @@ public class ArtifactUpdateApiClientImpl extends ComponentSupport implements Art
5046
* Provides access to the plugin configurations
5147
*/
5248
private final ConfigurationsManager configurationsManager;
53-
49+
private final FileBlockingQueueFactory fileBlockingQueueFactory;
50+
private final AsyncWebResourceBuilderFactory asyncWebResourceBuilderFactory;
5451
/**
5552
* ExecutorService shares between clients. All treads are created in the same executor
5653
*/
57-
private final ExecutorService jerseyHttpClientExecutor;
5854
private final FileBlockingQueue fileBlockingQueue;
5955

6056
@Inject
61-
public ArtifactUpdateApiClientImpl(ConfigurationsManager configurationsManager) {
57+
public ArtifactUpdateApiClientImpl(ConfigurationsManager configurationsManager,
58+
FileBlockingQueueFactory fileBlockingQueueFactory,
59+
AsyncWebResourceBuilderFactory asyncWebResourceBuilderFactory) {
6260
this.configurationsManager = configurationsManager;
61+
this.fileBlockingQueueFactory = fileBlockingQueueFactory;
62+
this.asyncWebResourceBuilderFactory = asyncWebResourceBuilderFactory;
6363
this.fileBlockingQueue = initFileBlockingQueue(configurationsManager);
64-
this.jerseyHttpClientExecutor = new ThreadPoolExecutor(
65-
configurationsManager.getConfiguration().getRequestsSendingThreadsCount(),
66-
configurationsManager.getConfiguration().getRequestsSendingThreadsCount(),
67-
30,
68-
TimeUnit.SECONDS,
69-
new LinkedBlockingQueue<Runnable>(
70-
configurationsManager.getConfiguration().getRequestsQueueSize())
71-
);
7264
initBackgroundWorkers(configurationsManager);
7365
}
7466

@@ -95,12 +87,8 @@ public void run() {
9587
}
9688

9789
private FileBlockingQueue initFileBlockingQueue(ConfigurationsManager configurationsManager) {
98-
BlockingQueue<ArtifactMetaInfo> blockingQueue =
99-
new LinkedBlockingQueue<>(configurationsManager.
100-
getConfiguration().getRequestsQueueSize());
10190
String blockingQueueDumpFileName = configurationsManager.getConfiguration().getQueueDumpFileName();
102-
FileBlockingQueue retVal = new FileBlockingQueue(blockingQueue,
103-
blockingQueueDumpFileName);
91+
FileBlockingQueue retVal = fileBlockingQueueFactory.getFileBlockingQueue();
10492
try {
10593
File blockingQueueInputFile = new File(blockingQueueDumpFileName);
10694
if (blockingQueueInputFile.exists()) {
@@ -133,7 +121,9 @@ public void offerRequest(ArtifactMetaInfo artifactMetaInfo) {
133121
*/
134122
public void sendRequest(ArtifactMetaInfo metaInfo) {
135123
for (NexusServer server : configurationsManager.getConfiguration().getServers()) {
136-
AsyncWebResource.Builder service = getService(server.getUrl(), server.getUser(), server.getPassword());
124+
AsyncWebResource.Builder service =
125+
asyncWebResourceBuilderFactory.getAsyncWebResourceBuilder(
126+
server.getUrl(), server.getUser(), server.getPassword());
137127
try {
138128
service.post(new ITypeListener<RestResponse>() {
139129
@Override
@@ -166,40 +156,4 @@ public GenericType<RestResponse> getGenericType() {
166156
}
167157
}
168158

169-
/**
170-
* Returns jersey HTTP resource to access to the remote replication servers
171-
*
172-
* @param nexusUrl URL of the remote server
173-
* @param login Username on the remote server
174-
* @param password User's password
175-
* @return Jersey HTTP client
176-
*/
177-
private AsyncWebResource.Builder getService(String nexusUrl, String login, String password) {
178-
Client client = getClient(login, password);
179-
client.setExecutorService(jerseyHttpClientExecutor);
180-
AsyncWebResource webResource = client.asyncResource(UriBuilder.fromUri(nexusUrl).build());
181-
webResource = webResource.path("service").path("local").path("artifact").path("maven").path("update");
182-
return webResource.accept(MediaType.APPLICATION_XML_TYPE)
183-
.type(MediaType.APPLICATION_XML_TYPE);
184-
}
185-
186-
/**
187-
* Creates jersey HTTP client
188-
*
189-
* @param login Username on the remote server
190-
* @param password User's password
191-
* @return HTTP client
192-
*/
193-
private Client getClient(String login, String password) {
194-
ClientConfig config = new DefaultClientConfig();
195-
Client client = Client.create(config);
196-
client.setExecutorService(jerseyHttpClientExecutor);
197-
if (login != null && !login.isEmpty() && password != null) {
198-
log.debug("Creating HTTP client with authorized HTTPBasicAuthFilter.");
199-
client.addFilter(new HTTPBasicAuthFilter(login, password));
200-
} else {
201-
log.debug("Creating HTTP client with anonymous HTTPBasicAuthFilter.");
202-
}
203-
return client;
204-
}
205159
}

‎src/main/java/com/griddynamics/cd/nrp/internal/uploading/impl/ConfigurationsManagerImpl.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public ConfigurationsManagerImpl(NexusConfiguration nexusConfiguration) {
6666
@PostConstruct
6767
public void init() {
6868
log.trace("Initializing plugin configurations");
69-
reloadConfigurations();
69+
reloadConfigurations(CONFIG_FILENAME);
7070
}
7171

7272
/**
@@ -78,7 +78,7 @@ public ReplicationPluginConfiguration getConfiguration() {
7878
if (config == null) {
7979
synchronized (this) {
8080
if (config == null) {
81-
reloadConfigurations();
81+
reloadConfigurations(CONFIG_FILENAME);
8282
}
8383
}
8484
}
@@ -89,8 +89,8 @@ public ReplicationPluginConfiguration getConfiguration() {
8989
* Reloads {@link ConfigurationsManagerImpl#config}
9090
* from XML plugin configurations file
9191
*/
92-
public void reloadConfigurations() {
93-
File file = getConfigurationFile();
92+
public void reloadConfigurations(String filename) {
93+
File file = getConfigurationFile(filename);
9494
try {
9595
JAXBContext jaxbContext = JAXBContext.newInstance(ReplicationPluginConfiguration.class);
9696

@@ -104,7 +104,7 @@ public void reloadConfigurations() {
104104
/**
105105
* Returns plugin configurations XML file
106106
*/
107-
private File getConfigurationFile() {
108-
return new File(nexusConfiguration.getConfigurationDirectory(), CONFIG_FILENAME);
107+
private File getConfigurationFile(String filename) {
108+
return new File(nexusConfiguration.getConfigurationDirectory(), filename);
109109
}
110110
}

‎src/main/java/com/griddynamics/cd/nrp/internal/uploading/impl/factories/AsyncWebResourceBuilderFactory.java‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package com.griddynamics.cd.nrp.internal.uploading.impl.factories;
2+
3+
import com.sun.jersey.api.client.AsyncWebResource;
4+
import com.sun.jersey.api.client.Client;
5+
6+
import javax.inject.Inject;
7+
import javax.inject.Singleton;
8+
import javax.ws.rs.core.MediaType;
9+
import javax.ws.rs.core.UriBuilder;
10+
11+
@Singleton
12+
public class AsyncWebResourceBuilderFactory {
13+
14+
private final JerseyClientFactory jerseyClientFactory;
15+
16+
@Inject
17+
public AsyncWebResourceBuilderFactory(JerseyClientFactory jerseyClientFactory) {
18+
this.jerseyClientFactory = jerseyClientFactory;
19+
}
20+
21+
22+
/**
23+
* Returns jersey HTTP resource to access to the remote replication servers
24+
*
25+
* @param nexusUrl URL of the remote server
26+
* @param login Username on the remote server
27+
* @param password User's password
28+
* @return Jersey HTTP client
29+
*/
30+
public AsyncWebResource.Builder getAsyncWebResourceBuilder(String nexusUrl, String login, String password) {
31+
Client client = jerseyClientFactory.getClient(login, password);
32+
AsyncWebResource webResource = client.asyncResource(UriBuilder.fromUri(nexusUrl).build());
33+
webResource = webResource.path("service").path("local").path("artifact").path("maven").path("update");
34+
return webResource.accept(MediaType.APPLICATION_XML_TYPE)
35+
.type(MediaType.APPLICATION_XML_TYPE);
36+
}
37+
38+
}

‎src/main/java/com/griddynamics/cd/nrp/internal/uploading/impl/factories/FileBlockingQueueFactory.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.griddynamics.cd.nrp.internal.uploading.impl.factories;
2+
3+
import com.griddynamics.cd.nrp.internal.model.api.ArtifactMetaInfo;
4+
import com.griddynamics.cd.nrp.internal.uploading.ConfigurationsManager;
5+
import com.griddynamics.cd.nrp.internal.uploading.impl.FileBlockingQueue;
6+
7+
import javax.inject.Inject;
8+
import javax.inject.Singleton;
9+
import java.util.concurrent.BlockingQueue;
10+
import java.util.concurrent.LinkedBlockingQueue;
11+
12+
@Singleton
13+
public class FileBlockingQueueFactory {
14+
15+
private final ConfigurationsManager configurationsManager;
16+
17+
@Inject
18+
public FileBlockingQueueFactory(ConfigurationsManager configurationsManager) {
19+
this.configurationsManager = configurationsManager;
20+
}
21+
22+
public FileBlockingQueue getFileBlockingQueue() {
23+
BlockingQueue<ArtifactMetaInfo> blockingQueue =
24+
new LinkedBlockingQueue<>(configurationsManager.
25+
getConfiguration().getRequestsQueueSize());
26+
String blockingQueueDumpFileName = configurationsManager.getConfiguration().getQueueDumpFileName();
27+
28+
return new FileBlockingQueue(blockingQueue,
29+
blockingQueueDumpFileName);
30+
}
31+
32+
}

‎src/main/java/com/griddynamics/cd/nrp/internal/uploading/impl/factories/JerseyClientFactory.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package com.griddynamics.cd.nrp.internal.uploading.impl.factories;
2+
3+
import com.griddynamics.cd.nrp.internal.uploading.ConfigurationsManager;
4+
import com.sun.jersey.api.client.Client;
5+
import com.sun.jersey.api.client.config.ClientConfig;
6+
import com.sun.jersey.api.client.config.DefaultClientConfig;
7+
import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
8+
import org.slf4j.Logger;
9+
import org.slf4j.LoggerFactory;
10+
11+
import javax.inject.Inject;
12+
import javax.inject.Singleton;
13+
import java.util.concurrent.ExecutorService;
14+
import java.util.concurrent.LinkedBlockingQueue;
15+
import java.util.concurrent.ThreadPoolExecutor;
16+
import java.util.concurrent.TimeUnit;
17+
18+
@Singleton
19+
public class JerseyClientFactory {
20+
21+
private Logger log = LoggerFactory.getLogger(JerseyClientFactory.class);
22+
23+
private final ExecutorService executorService;
24+
25+
@Inject
26+
public JerseyClientFactory(ConfigurationsManager configurationsManager) {
27+
this.executorService = new ThreadPoolExecutor(
28+
configurationsManager.getConfiguration().getRequestsSendingThreadsCount(),
29+
configurationsManager.getConfiguration().getRequestsSendingThreadsCount(),
30+
30,
31+
TimeUnit.SECONDS,
32+
new LinkedBlockingQueue<Runnable>(
33+
configurationsManager.getConfiguration().getRequestsQueueSize()));
34+
}
35+
36+
public Client getClient(String login, String password) {
37+
ClientConfig config = new DefaultClientConfig();
38+
Client client = Client.create(config);
39+
client.setExecutorService(executorService);
40+
if (login != null && !login.isEmpty() && password != null) {
41+
log.debug("Creating HTTP client with authorized HTTPBasicAuthFilter.");
42+
client.addFilter(new HTTPBasicAuthFilter(login, password));
43+
} else {
44+
log.debug("Creating HTTP client with anonymous HTTPBasicAuthFilter.");
45+
}
46+
return client;
47+
}
48+
49+
}

0 commit comments

Comments
 (0)