Skip to content

Commit 48c4008

Browse files
committed
removed 2kcache driver
1 parent 8fa286a commit 48c4008

5 files changed

Lines changed: 14 additions & 20 deletions

File tree

pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111
<groupId>net.chainside.webpossdk</groupId>
1212
<artifactId>webpos-sdk-java</artifactId>
13-
<version>1.4.1</version>
13+
<version>1.4.2</version>
1414

1515
<properties>
1616
<java.version>1.7</java.version>
@@ -41,12 +41,6 @@
4141
<version>4.12</version>
4242
<scope>test</scope>
4343
</dependency>
44-
<dependency>
45-
<groupId>org.cache2k</groupId>
46-
<artifactId>cache2k-base-bom</artifactId>
47-
<version>1.2.1.Final</version>
48-
<type>pom</type>
49-
</dependency>
5044
<dependency>
5145
<groupId>com.fasterxml.jackson.core</groupId>
5246
<artifactId>jackson-databind</artifactId>

src/main/java/net/webpossdk/api/ChainsideApiContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class ChainsideApiContext extends ApiContext {
1010
public ChainsideApiContext(HashMap<String, Object> config) throws ConfigurationException {
1111
super(Hostnames.get(config.get("mode").toString()),
1212
ChainsideApiContext.fillConfig(config),
13-
CacheAdapterFactory.make(config.get("cacheDriver") == null ? "2k" : config.get("cacheDriver").toString()));
13+
CacheAdapterFactory.make(config.get("cacheDriver") == null ? "memory" : config.get("cacheDriver").toString()));
1414

1515
}
1616

@@ -19,7 +19,7 @@ private static HashMap<String, Object> fillConfig(HashMap<String, Object> config
1919
if (config.get("accessTokenKey") == null) config.put("accessTokenKey", "___chainside.access.token___");
2020
if (config.get("timeout") == null) config.put("timeout", 10);
2121
if (config.get("verifySSL") == null) config.put("verifySSL", true);
22-
if (config.get("cacheDriver") == null) config.put("cacheDriver", "2k");
22+
if (config.get("cacheDriver") == null) config.put("cacheDriver", "memory");
2323
return config;
2424
}
2525
}

src/main/java/net/webpossdk/lib/CacheAdapterFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
public class CacheAdapterFactory {
66
public static CacheAdapter make(String type) {
7-
return new TwoKCacheAdapter();
7+
return new MemoryCacheAdapter();
88
}
99
}

src/main/java/net/webpossdk/lib/TwoKCacheAdapter.java renamed to src/main/java/net/webpossdk/lib/MemoryCacheAdapter.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package net.webpossdk.lib;
22

33
import it.sdkboilerplate.cache.CacheAdapter;
4-
import org.cache2k.Cache;
5-
import org.cache2k.Cache2kBuilder;
64

7-
public class TwoKCacheAdapter extends CacheAdapter {
8-
private Cache<String, String> cache;
5+
import java.util.HashMap;
6+
7+
8+
public class MemoryCacheAdapter extends CacheAdapter {
9+
private HashMap<String, String> cache;
910

1011
@Override
1112
public String get(String value) {
@@ -22,8 +23,7 @@ public void delete(String key) {
2223
this.cache.remove(key);
2324
}
2425

25-
public TwoKCacheAdapter() {
26-
this.cache = new Cache2kBuilder<String, String>() {
27-
}.build();
26+
public MemoryCacheAdapter() {
27+
this.cache = new HashMap();
2828
}
2929
}

src/test/java/TestCallbackHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import com.fasterxml.jackson.databind.ObjectMapper;
22
import it.sdkboilerplate.exceptions.CallbackVerificationException;
33
import net.webpossdk.api.ChainsideApiContext;
4-
import net.webpossdk.api.ChainsideClient;
54
import net.webpossdk.api.ChainsideHeaders;
65
import net.webpossdk.callbacks.ChainsideCallbackHandler;
76
import net.webpossdk.lib.Hashers;
8-
import net.webpossdk.objects.*;
7+
import net.webpossdk.objects.CallbackPaymentOrder;
8+
import net.webpossdk.objects.PaymentCompletedCallback;
9+
import net.webpossdk.objects.TransactionCollection;
910
import org.apache.commons.codec.binary.Base64;
1011
import org.junit.Assert;
1112
import org.junit.Test;
@@ -105,5 +106,4 @@ public void testCallbackParsing() throws Exception {
105106
}
106107

107108

108-
109109
}

0 commit comments

Comments
 (0)