Skip to content

Commit e7190bf

Browse files
committed
PR 3.2 — Extract: Create segment-commons module
- New segment-commons module with 16 files moved from client: - engine/segments: SegmentFetcher, SegmentChangeFetcher, SegmentFetcherImp, SegmentImp, SegmentSynchronizationTask, SegmentSynchronizationTaskImp, ExecutorFactory, TelemetryListener - storages: SegmentCache, SegmentCacheCommons, SegmentCacheConsumer, SegmentCacheProducer, DefinitionsCacheConsumer - storages/memory: SegmentCacheInMemoryImpl - client/dtos: SegmentChange - engine/common: FetchOptions - engine/experiments: SyncTask - Remove Guava from SegmentCacheInMemoryImpl and FetchOptions - Add segment-commons dependency to client/pom.xml
1 parent 45065b0 commit e7190bf

21 files changed

+54
-7
lines changed

client/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@
182182
<artifactId>storage-commons</artifactId>
183183
<version>${project.version}</version>
184184
</dependency>
185+
<dependency>
186+
<groupId>io.split.client</groupId>
187+
<artifactId>segment-commons</artifactId>
188+
<version>${project.version}</version>
189+
</dependency>
185190
<dependency>
186191
<groupId>io.split.client</groupId>
187192
<artifactId>pluggable-storage</artifactId>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<module>targeting-engine</module>
6868
<module>parsing-commons</module>
6969
<module>storage-commons</module>
70+
<module>segment-commons</module>
7071
<module>pluggable-storage</module>
7172
<module>redis-wrapper</module>
7273
<module>testing</module>

segment-commons/pom.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>io.split.client</groupId>
9+
<artifactId>java-client-parent</artifactId>
10+
<version>4.18.3</version>
11+
</parent>
12+
13+
<version>4.18.3</version>
14+
<artifactId>segment-commons</artifactId>
15+
<packaging>jar</packaging>
16+
<name>Segment Commons</name>
17+
18+
<dependencies>
19+
<dependency>
20+
<groupId>io.split.client</groupId>
21+
<artifactId>storage-commons</artifactId>
22+
<version>${project.version}</version>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.slf4j</groupId>
26+
<artifactId>slf4j-api</artifactId>
27+
<version>1.7.36</version>
28+
</dependency>
29+
30+
<!-- Test -->
31+
<dependency>
32+
<groupId>junit</groupId>
33+
<artifactId>junit</artifactId>
34+
<version>4.13.1</version>
35+
<scope>test</scope>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.mockito</groupId>
39+
<artifactId>mockito-core</artifactId>
40+
<version>5.14.2</version>
41+
<scope>test</scope>
42+
</dependency>
43+
</dependencies>
44+
</project>

client/src/main/java/io/split/client/dtos/SegmentChange.java renamed to segment-commons/src/main/java/io/split/client/dtos/SegmentChange.java

File renamed without changes.

client/src/main/java/io/split/engine/common/FetchOptions.java renamed to segment-commons/src/main/java/io/split/engine/common/FetchOptions.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ public boolean equals(Object obj) {
8787

8888
@Override
8989
public int hashCode() {
90-
return com.google.common.base.Objects.hashCode(_cacheControlHeaders,
91-
_targetCN, _flagSetsFilter);
90+
return java.util.Objects.hash(_cacheControlHeaders, _targetCN, _flagSetsFilter);
9291
}
9392

9493
private final boolean _cacheControlHeaders;

client/src/main/java/io/split/engine/experiments/SyncTask.java renamed to segment-commons/src/main/java/io/split/engine/experiments/SyncTask.java

File renamed without changes.

client/src/main/java/io/split/engine/segments/ExecutorFactory.java renamed to segment-commons/src/main/java/io/split/engine/segments/ExecutorFactory.java

File renamed without changes.

client/src/main/java/io/split/engine/segments/SegmentChangeFetcher.java renamed to segment-commons/src/main/java/io/split/engine/segments/SegmentChangeFetcher.java

File renamed without changes.

client/src/main/java/io/split/engine/segments/SegmentFetcher.java renamed to segment-commons/src/main/java/io/split/engine/segments/SegmentFetcher.java

File renamed without changes.

client/src/main/java/io/split/engine/segments/SegmentFetcherImp.java renamed to segment-commons/src/main/java/io/split/engine/segments/SegmentFetcherImp.java

File renamed without changes.

0 commit comments

Comments
 (0)