From 8e362d5feaf5535bb59bacc1be677d8f10d08f86 Mon Sep 17 00:00:00 2001 From: Christof Rabensteiner Date: Wed, 17 Apr 2019 15:22:18 +0200 Subject: Add Redis and InMemory Implementation of DeliveryRequestRepository - Deployer can choose which implementation to use (by activating - corresponding profile) - Add guava dependency - Extract DeliveryRequestRepository to Interface - Implement InMemory Repository using guava's cache --- .../java/at/gv/egiz/moazs/DeliveryRepository.java | 15 ++++++ .../at/gv/egiz/moazs/DeliveryRequestHandler.java | 3 +- .../gv/egiz/moazs/InMemoryDeliveryRepository.java | 40 ++++++++++++++ src/main/java/at/gv/egiz/moazs/RedisConfig.java | 10 ++-- .../at/gv/egiz/moazs/RedisDeliveryRepository.java | 61 +++++++++++++++++++++ .../java/at/gv/egiz/moazs/RedisRepository.java | 63 ---------------------- src/main/resources/application.properties | 2 + 7 files changed, 122 insertions(+), 72 deletions(-) create mode 100644 src/main/java/at/gv/egiz/moazs/DeliveryRepository.java create mode 100644 src/main/java/at/gv/egiz/moazs/InMemoryDeliveryRepository.java create mode 100644 src/main/java/at/gv/egiz/moazs/RedisDeliveryRepository.java delete mode 100644 src/main/java/at/gv/egiz/moazs/RedisRepository.java (limited to 'src/main') diff --git a/src/main/java/at/gv/egiz/moazs/DeliveryRepository.java b/src/main/java/at/gv/egiz/moazs/DeliveryRepository.java new file mode 100644 index 0000000..6df2829 --- /dev/null +++ b/src/main/java/at/gv/egiz/moazs/DeliveryRepository.java @@ -0,0 +1,15 @@ +package at.gv.egiz.moazs; + +import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.DeliveryRequestType; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface DeliveryRepository { + + void add(DeliveryRequestType request); + + Optional getDeliveryRequest(String appDeliveryID); + +} diff --git a/src/main/java/at/gv/egiz/moazs/DeliveryRequestHandler.java b/src/main/java/at/gv/egiz/moazs/DeliveryRequestHandler.java index 16235cf..7d8cb43 100644 --- a/src/main/java/at/gv/egiz/moazs/DeliveryRequestHandler.java +++ b/src/main/java/at/gv/egiz/moazs/DeliveryRequestHandler.java @@ -7,7 +7,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.xml.bind.JAXBElement; import java.util.function.Function; @Component @@ -16,7 +15,7 @@ public class DeliveryRequestHandler implements Function rep = CacheBuilder.newBuilder() + .expireAfterWrite(30, TimeUnit.MINUTES) + .build(); + + public InMemoryDeliveryRepository() { + logger.info("InMemoryDeliveryRepository()"); + } + + @Override + public void add(DeliveryRequestType request) { + String key = request.getMetaData().getAppDeliveryID(); + logger.info("Save DeliveryRequest with AppDeliveryId = {} to Cache.", key); + rep.put(key, request); + } + + @Override + public Optional getDeliveryRequest(String appDeliveryID) { + DeliveryRequestType deliveryRequestType = rep.getIfPresent(appDeliveryID); + return Optional.ofNullable(deliveryRequestType); + } +} diff --git a/src/main/java/at/gv/egiz/moazs/RedisConfig.java b/src/main/java/at/gv/egiz/moazs/RedisConfig.java index 758fbfd..321ec4a 100644 --- a/src/main/java/at/gv/egiz/moazs/RedisConfig.java +++ b/src/main/java/at/gv/egiz/moazs/RedisConfig.java @@ -3,20 +3,17 @@ package at.gv.egiz.moazs; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; import org.springframework.data.redis.connection.RedisStandaloneConfiguration; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.GenericToStringSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; -import org.springframework.oxm.jaxb.Jaxb2Marshaller; - -import java.util.HashMap; @Configuration -@PropertySource("classpath:application.properties") public class RedisConfig { + public RedisConfig() { + } + @Value("${spring.redis.host}") private String host; @@ -43,5 +40,4 @@ public class RedisConfig { template.setDefaultSerializer(stringRedisSerializer()); return template; } - } diff --git a/src/main/java/at/gv/egiz/moazs/RedisDeliveryRepository.java b/src/main/java/at/gv/egiz/moazs/RedisDeliveryRepository.java new file mode 100644 index 0000000..accae43 --- /dev/null +++ b/src/main/java/at/gv/egiz/moazs/RedisDeliveryRepository.java @@ -0,0 +1,61 @@ +package at.gv.egiz.moazs; + +import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.DeliveryRequestType; +import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.ObjectFactory; +import org.apache.tools.ant.filters.StringInputStream; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Profile; +import org.springframework.data.redis.core.HashOperations; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Repository; + +import javax.xml.bind.JAXBElement; +import java.util.Optional; + +@Repository +@Profile("cluster") +public class RedisDeliveryRepository implements DeliveryRepository { + + private static final Logger logger = LoggerFactory.getLogger(RedisDeliveryRepository.class); + + private static final String KEY = "MZS_DELIVERY_REQUEST"; + + private final RedisTemplate redisTemplate; + private final Marshaller marshaller; + private final HashOperations hashOperations; + private final ObjectFactory factory = new ObjectFactory(); + + @Autowired + public RedisDeliveryRepository(RedisTemplate redisTemplate, Marshaller marshaller){ + logger.info("RedisDeliveryRepository()"); + + this.redisTemplate = redisTemplate; + this.hashOperations = redisTemplate.opsForHash(); + this.marshaller = marshaller; + } + + @Override + public void add(DeliveryRequestType request) { + var hashKey = request.getMetaData().getAppDeliveryID(); + var serializedRequest = marshaller.marshallXml(factory.createDeliveryRequest(request)); + + logger.info("Save DeliveryRequest with AppDeliveryId = {} to redis.", hashKey); + hashOperations.put(KEY, hashKey, serializedRequest); + } + + @Override + public Optional getDeliveryRequest(String appDeliveryID) { + var serializedRequest = (String) hashOperations.get(KEY, appDeliveryID); + + if (serializedRequest == null) { + return Optional.empty(); + } + + var stream = new StringInputStream(serializedRequest); + var request = (JAXBElement) marshaller.unmarshallXml(stream); + return Optional.of(request.getValue()); + } + +} diff --git a/src/main/java/at/gv/egiz/moazs/RedisRepository.java b/src/main/java/at/gv/egiz/moazs/RedisRepository.java deleted file mode 100644 index db49b23..0000000 --- a/src/main/java/at/gv/egiz/moazs/RedisRepository.java +++ /dev/null @@ -1,63 +0,0 @@ -package at.gv.egiz.moazs; - -import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.DeliveryRequestType; -import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.ObjectFactory; -import org.apache.tools.ant.filters.StringInputStream; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.HashOperations; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Repository; - -import javax.annotation.PostConstruct; -import javax.xml.bind.JAXBElement; -import java.util.Optional; - -@Repository -public class RedisRepository { - - private static final Logger logger = LoggerFactory.getLogger(RedisRepository.class); - - private static final String KEY = "MZS_DELIVERY_REQUEST"; - - private final RedisTemplate redisTemplate; - - private final Marshaller marshaller; - - private HashOperations hashOperations; - - private final ObjectFactory factory = new ObjectFactory(); - - @Autowired - public RedisRepository(RedisTemplate redisTemplate, Marshaller marshaller){ - this.redisTemplate = redisTemplate; - this.marshaller = marshaller; - } - - @PostConstruct - private void init(){ - hashOperations = redisTemplate.opsForHash(); - } - - public void add(DeliveryRequestType request) { - var hashKey = request.getMetaData().getAppDeliveryID(); - var serializedRequest = marshaller.marshallXml(factory.createDeliveryRequest(request)); - - logger.info("Save DeliveryRequest with AppDeliveryId = {}", hashKey); - hashOperations.put(KEY, hashKey, serializedRequest); - } - - public Optional getDeliveryRequest(String appDeliveryID) { - var serializedRequest = (String) hashOperations.get(KEY, appDeliveryID); - - if (serializedRequest == null) { - return Optional.empty(); - } - - var stream = new StringInputStream(serializedRequest); - var request = (JAXBElement) marshaller.unmarshallXml(stream); - return Optional.of(request.getValue()); - } - -} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7cf70bd..7bd66e2 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,2 +1,4 @@ spring.redis.host=172.17.0.2 spring.redis.port=6379 +## activate cluster mode +# spring.profiles.active=cluster -- cgit v1.2.3