Skip to content

Commit 269ab9c

Browse files
author
Derek Wasinger
committed
dependency clean up
1 parent ae9f5cc commit 269ab9c

File tree

3 files changed

+53
-93
lines changed

3 files changed

+53
-93
lines changed

‎pom.xml‎

Lines changed: 30 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<maven.compiler.target>1.8</maven.compiler.target>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
18-
<quarkus-plugin.version>1.2.0.Final</quarkus-plugin.version>
18+
<quarkus-plugin.version>1.3.0.Final</quarkus-plugin.version>
1919
<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
2020
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
21-
<quarkus.platform.version>1.2.0.Final</quarkus.platform.version>
21+
<quarkus.platform.version>1.3.0.Final</quarkus.platform.version>
2222
<surefire-plugin.version>2.22.1</surefire-plugin.version>
2323
<lombok.version>1.18.12</lombok.version>
2424
</properties>
@@ -34,6 +34,7 @@
3434
</dependencies>
3535
</dependencyManagement>
3636
<dependencies>
37+
<!-- Web -->
3738
<dependency>
3839
<groupId>io.quarkus</groupId>
3940
<artifactId>quarkus-resteasy</artifactId>
@@ -44,94 +45,65 @@
4445
</dependency>
4546
<dependency>
4647
<groupId>io.quarkus</groupId>
47-
<artifactId>quarkus-junit5</artifactId>
48-
<scope>test</scope>
49-
</dependency>
50-
<dependency>
51-
<groupId>io.rest-assured</groupId>
52-
<artifactId>rest-assured</artifactId>
53-
<scope>test</scope>
48+
<artifactId>quarkus-resteasy-jsonb</artifactId>
5449
</dependency>
50+
<!-- REST Client -->
5551
<dependency>
5652
<groupId>io.quarkus</groupId>
5753
<artifactId>quarkus-rest-client</artifactId>
5854
</dependency>
59-
<dependency>
60-
<groupId>io.quarkus</groupId>
61-
<artifactId>quarkus-resteasy-jsonb</artifactId>
62-
</dependency>
55+
<!-- Templates -->
6356
<dependency>
6457
<groupId>io.quarkus</groupId>
6558
<artifactId>quarkus-resteasy-qute</artifactId>
6659
</dependency>
60+
<!-- Events -->
6761
<dependency>
6862
<groupId>io.quarkus</groupId>
6963
<artifactId>quarkus-vertx</artifactId>
7064
</dependency>
65+
<!-- Cache -->
7166
<dependency>
7267
<groupId>io.quarkus</groupId>
7368
<artifactId>quarkus-infinispan-client</artifactId>
7469
</dependency>
70+
<!-- Health Checks -->
7571
<dependency>
7672
<groupId>io.quarkus</groupId>
77-
<artifactId>quarkus-logging-json</artifactId>
78-
</dependency>
79-
<dependency>
80-
<groupId>io.vertx</groupId>
81-
<artifactId>vertx-junit5</artifactId>
82-
<scope>test</scope>
83-
</dependency>
84-
<dependency>
85-
<groupId>org.mockito</groupId>
86-
<artifactId>mockito-core</artifactId>
87-
<version>3.2.4</version>
88-
<scope>test</scope>
89-
</dependency>
90-
<dependency>
91-
<groupId>org.mockito</groupId>
92-
<artifactId>mockito-junit-jupiter</artifactId>
93-
<version>3.2.4</version>
94-
<scope>test</scope>
95-
</dependency>
96-
<dependency>
97-
<groupId>org.infinispan</groupId>
98-
<artifactId>infinispan-junit-5</artifactId>
99-
<version>0.1</version>
100-
</dependency>
101-
<dependency>
102-
<groupId>com.fasterxml.jackson.core</groupId>
103-
<artifactId>jackson-core</artifactId>
104-
<version>${jackson.version}</version>
73+
<artifactId>quarkus-smallrye-health</artifactId>
10574
</dependency>
75+
<!-- OpenApi/Swagger -->
10676
<dependency>
107-
<groupId>com.fasterxml.jackson.core</groupId>
108-
<artifactId>jackson-databind</artifactId>
109-
<version>${jackson.version}</version>
77+
<groupId>io.quarkus</groupId>
78+
<artifactId>quarkus-smallrye-openapi</artifactId>
11079
</dependency>
80+
<!-- Metrics -->
11181
<dependency>
112-
<groupId>com.fasterxml.jackson.core</groupId>
113-
<artifactId>jackson-annotations</artifactId>
114-
<version>${jackson.version}</version>
82+
<groupId>org.eclipse.microprofile.metrics</groupId>
83+
<artifactId>microprofile-metrics-api</artifactId>
11584
</dependency>
85+
<!-- Other -->
11686
<dependency>
117-
<groupId>com.fasterxml.jackson.dataformat</groupId>
118-
<artifactId>jackson-dataformat-yaml</artifactId>
119-
<version>${jackson.version}</version>
87+
<groupId>org.projectlombok</groupId>
88+
<artifactId>lombok</artifactId>
89+
<version>${lombok.version}</version>
90+
<scope>provided</scope>
12091
</dependency>
92+
<!-- Test -->
12193
<dependency>
12294
<groupId>io.quarkus</groupId>
123-
<artifactId>quarkus-smallrye-health</artifactId>
95+
<artifactId>quarkus-junit5</artifactId>
96+
<scope>test</scope>
12497
</dependency>
12598
<dependency>
126-
<groupId>io.quarkus</groupId>
127-
<artifactId>quarkus-smallrye-openapi</artifactId>
99+
<groupId>io.rest-assured</groupId>
100+
<artifactId>rest-assured</artifactId>
101+
<scope>test</scope>
128102
</dependency>
129-
<!-- Other -->
130103
<dependency>
131-
<groupId>org.projectlombok</groupId>
132-
<artifactId>lombok</artifactId>
133-
<version>${lombok.version}</version>
134-
<scope>provided</scope>
104+
<groupId>io.vertx</groupId>
105+
<artifactId>vertx-junit5</artifactId>
106+
<scope>test</scope>
135107
</dependency>
136108
</dependencies>
137109
<build>

‎src/main/java/com/redhat/labs/cache/cacheStore/ResidencyDataCache.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
import org.infinispan.client.hotrod.RemoteCache;
1212
import org.infinispan.client.hotrod.RemoteCacheManager;
13-
import org.infinispan.configuration.cache.Configuration;
14-
import org.infinispan.configuration.cache.ConfigurationBuilder;
1513
import org.slf4j.Logger;
1614
import org.slf4j.LoggerFactory;
1715

@@ -81,7 +79,6 @@ public void cleanCache() {
8179

8280
private void createCache() {
8381
LOGGER.info("Create OMP cache");
84-
Configuration config = new ConfigurationBuilder().build();
85-
cache = cacheManager.administration().createCache("omp", config);
82+
cache = cacheManager.administration().getOrCreateCache("omp", "default");
8683
}
8784
}

‎src/test/java/com/redhat/labs/omp/mocks/MockHotRodServer.java‎

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,27 @@
11
package com.redhat.labs.omp.mocks;
22

3-
import org.infinispan.configuration.cache.ConfigurationBuilder;
4-
import org.infinispan.configuration.global.GlobalConfigurationBuilder;
5-
import org.infinispan.manager.EmbeddedCacheManager;
6-
import org.infinispan.query.remote.client.ProtobufMetadataManagerConstants;
7-
import org.infinispan.server.hotrod.HotRodServer;
8-
import org.infinispan.server.hotrod.test.HotRodTestingUtil;
9-
import org.infinispan.test.fwk.TestCacheManagerFactory;
10-
import org.infinispan.test.fwk.TestResourceTracker;
11-
123
public class MockHotRodServer {
134

14-
private MockHotRodServer() {}
15-
16-
/**
17-
* Not a singleton
18-
*/
19-
public static HotRodServer getHotRod() {
20-
TestResourceTracker.setThreadTestName("InfinispanServer");
21-
22-
EmbeddedCacheManager ecm = TestCacheManagerFactory.createCacheManager(
23-
new GlobalConfigurationBuilder().nonClusteredDefault().defaultCacheName("default"),
24-
new ConfigurationBuilder());
25-
ecm.createCache(ProtobufMetadataManagerConstants.PROTOBUF_METADATA_CACHE_NAME, new ConfigurationBuilder().indexing().build());
26-
27-
ecm.getCache().put("a", "domedata");
28-
29-
ecm.createCache("omp", new ConfigurationBuilder().indexing().build());
30-
31-
HotRodServer hs = HotRodTestingUtil.startHotRodServer(ecm, 11222);
32-
hs.setMarshaller(new org.infinispan.commons.marshall.JavaSerializationMarshaller());
33-
34-
return hs;
35-
}
5+
// private MockHotRodServer() {}
6+
//
7+
// /**
8+
// * Not a singleton
9+
// */
10+
// public static HotRodServer getHotRod() {
11+
// TestResourceTracker.setThreadTestName("InfinispanServer");
12+
//
13+
// EmbeddedCacheManager ecm = TestCacheManagerFactory.createCacheManager(
14+
// new GlobalConfigurationBuilder().nonClusteredDefault().defaultCacheName("default"),
15+
// new ConfigurationBuilder());
16+
// ecm.createCache(ProtobufMetadataManagerConstants.PROTOBUF_METADATA_CACHE_NAME, new ConfigurationBuilder().indexing().build());
17+
//
18+
// ecm.getCache().put("a", "domedata");
19+
//
20+
// ecm.createCache("omp", new ConfigurationBuilder().indexing().build());
21+
//
22+
// HotRodServer hs = HotRodTestingUtil.startHotRodServer(ecm, 11222);
23+
// hs.setMarshaller(new org.infinispan.commons.marshall.JavaSerializationMarshaller());
24+
//
25+
// return hs;
26+
// }
3627
}

0 commit comments

Comments
 (0)