namespace refactoring

4 files changed, 0 insertions, 334 deletions

diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/CacheWitheIDASBackend.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/CacheWitheIDASBackend.java
deleted file mode 100644
index 7a62eca4..00000000
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/CacheWitheIDASBackend.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package at.gv.egiz.eidas.specific.connector.storage;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import eu.eidas.auth.commons.cache.ConcurrentMapService;
-import eu.eidas.auth.commons.tx.AbstractCorrelationMap;
-
-public class CacheWitheIDASBackend extends AbstractCorrelationMap<TransactionStoreElement> {
-
-	protected CacheWitheIDASBackend(ConcurrentMapService concurrentMapService) {
-		super(concurrentMapService);
-	}
-	
-	public List<String> clean(Date now, long dataTimeOut) {
-		List<String> result = new ArrayList<String>();
-		Iterator<String> iterator = map.keySet().iterator();
-		while (iterator.hasNext()) {
-			String key = iterator.next();			
-			if (map.containsKey(key)) {
-				TransactionStoreElement element = map.get(key);				
-				if (now.getTime() - element.getCreated().getTime() > dataTimeOut)
-					result.add(key);
-			}										
-		}
-		
-		return result;
-		
-	}
-
-}
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java
deleted file mode 100644
index 57697ef8..00000000
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.storage;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFStorageException;
-
-@Service("SimpleInMemoryTransactionStorage")
-public class SimpleInMemoryTransactionStorage implements ITransactionStorage{
-	private static final Logger log = LoggerFactory.getLogger(SimpleInMemoryTransactionStorage.class);
-	
-	private Map<String, TransactionStoreElement> storage = new ConcurrentHashMap<String, TransactionStoreElement>();
-	
-	@Override
-	public void changeKey(String oldKey, String newKey, Object value) throws EAAFException {
-		if (containsKey(oldKey)) {
-			TransactionStoreElement el = storage.get(oldKey);
-			el.setKey(newKey);
-			storage.put(newKey, el);
-			storage.remove(oldKey);
-			
-		} else
-			throw new EAAFStorageException("No element in TransactionStorage with key: " + oldKey);
-		
-	}
-
-	@Override
-	public List<String> clean(Date now, long dataTimeOut) {
-		List<String> result = new ArrayList<String>();
-		Iterator<String> iterator = storage.keySet().iterator();
-		while (iterator.hasNext()) {
-			String key = iterator.next();			
-			synchronized (storage) {
-				if (storage.containsKey(key)) {
-					TransactionStoreElement element = storage.get(key);				
-					if (now.getTime() - element.getCreated().getTime() > dataTimeOut)
-						result.add(key);
-				}
-			}										
-		}
-		
-		return result;
-		
-	}
-
-	@Override
-	public boolean containsKey(String key) {
-		if (key != null)
-			return storage.containsKey(key);
-		else
-			return false;
-		
-	}
-
-	@Override
-	public Object get(String key) throws EAAFException {
-		if (key != null && containsKey(key)) {
-			TransactionStoreElement element = storage.get(key);
-			return element.getData();
-			
-		} else
-			return null;	
-	}
-
-	@Override
-	public <T> T get(String key, Class<T> type) throws EAAFException {
-		return get(key, type, -1);
-		
-	}
-
-	@Override
-	public <T> T get(String key, Class<T> type, long dataTimeOut) throws EAAFException {
-		if (key != null && containsKey(key)) {
-			TransactionStoreElement value = storage.get(key); 
-			
-			if (dataTimeOut > -1) {
-				long now = new Date().getTime();				
-				if (now - value.getCreated().getTime() > dataTimeOut) {
-					log.info("Transaction-Data with key: " + key + " is out of time.");
-					throw new EAAFStorageException("Transaction-Data with key: " + key + " is out of time.");
-					
-				}	 				 
-			}
-			
-			if (type.isAssignableFrom(value.getData().getClass())) {
-				return (T) value.getData();
-				
-			} else
-				log.warn("Can NOT cast '" + value.getClass() + "' to '" + type + "'");
-			
-		}
-					
-		return null;
-	}
-
-	@Override
-	public Object getRaw(String key) throws EAAFException {
-		return storage.get(key);
-		
-	}
-
-	@Override
-	public void put(String key, Object value, int dataTimeOut) throws EAAFException {
-		TransactionStoreElement element = new TransactionStoreElement();
-		element.setKey(key);
-		element.setData(value);
-		storage.put(key, element);
-		
-	}
-
-	@Override
-	public void putRaw(String key, Object value) throws EAAFException {
-		if (value instanceof TransactionStoreElement)
-			storage.put(((TransactionStoreElement) value).getKey(), (TransactionStoreElement) value);		
-		else 
-			log.info(value.getClass().getName() + " is NOT a RAW element of " + ITransactionStorage.class.getName());
-					
-	}
-
-	@Override
-	public void remove(String key) {
-		if (containsKey(key)) {
-			log.debug("Remove element with key: " + key + " from " + ITransactionStorage.class.getName());
-			storage.remove(key);
-			
-		}
-	}
-
-}
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/TransactionStoreElement.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/TransactionStoreElement.java
deleted file mode 100644
index 25180292..00000000
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/TransactionStoreElement.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.storage;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class TransactionStoreElement  implements Serializable{
-	
-	private static final long serialVersionUID = 1L;
-	private String key = null;
-	private Object data = null;
-	private Date created;
-	
-	public String getKey() {
-		return key;
-	}
-	public void setKey(String key) {
-		this.key = key;
-	}
-	public Object getData() {
-		return data;
-	}
-	public void setData(Object data) {
-		this.data = data;
-	}
-	public Date getCreated() {
-		return created;
-	}
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-	
-	
-		
-}
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/eIDASCacheTransactionStoreDecorator.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/eIDASCacheTransactionStoreDecorator.java
deleted file mode 100644
index 6bc23073..00000000
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/eIDASCacheTransactionStoreDecorator.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package at.gv.egiz.eidas.specific.connector.storage;
-
-import java.util.Date;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFStorageException;
-
-public class eIDASCacheTransactionStoreDecorator implements ITransactionStorage{
-	private static final Logger log = LoggerFactory.getLogger(eIDASCacheTransactionStoreDecorator.class);
-	
-	@Autowired(required=true) private CacheWitheIDASBackend storage;
-	
-	@Override
-	public void changeKey(String oldKey, String newKey, Object value) throws EAAFException {
-		if (containsKey(oldKey)) {
-			TransactionStoreElement el = storage.get(oldKey);
-			el.setKey(newKey);
-			storage.put(newKey, el);
-			storage.remove(oldKey);
-			
-		} else
-			throw new EAAFStorageException("No element in TransactionStorage with key: " + oldKey);
-		
-	}
-
-	@Override
-	public List<String> clean(Date now, long dataTimeOut) {
-		return storage.clean(now, dataTimeOut);
-				
-	}
-
-	@Override
-	public boolean containsKey(String key) {
-		if (key != null) {
-			if (storage.get(key) != null)
-				return true;
-			
-		}
-			
-		return false;
-		
-	}
-
-	@Override
-	public Object get(String key) throws EAAFException {
-		if (key != null && containsKey(key)) {
-			TransactionStoreElement element = storage.get(key);
-			return element.getData();
-			
-		} else
-			return null;	
-	}
-
-	@Override
-	public <T> T get(String key, Class<T> type) throws EAAFException {
-		return get(key, type, -1);
-		
-	}
-
-	@Override
-	public <T> T get(String key, Class<T> type, long dataTimeOut) throws EAAFException {
-		if (key != null && containsKey(key)) {
-			TransactionStoreElement value = storage.get(key); 
-			
-			if (dataTimeOut > -1) {
-				long now = new Date().getTime();				
-				if (now - value.getCreated().getTime() > dataTimeOut) {
-					log.info("Transaction-Data with key: " + key + " is out of time.");
-					throw new EAAFStorageException("Transaction-Data with key: " + key + " is out of time.");
-					
-				}	 				 
-			}
-			
-			if (type.isAssignableFrom(value.getData().getClass())) {
-				return (T) value.getData();
-				
-			} else
-				log.warn("Can NOT cast '" + value.getClass() + "' to '" + type + "'");
-			
-		}
-					
-		return null;
-	}
-
-	@Override
-	public Object getRaw(String key) throws EAAFException {
-		return storage.get(key);
-		
-	}
-
-	@Override
-	public void put(String key, Object value, int dataTimeOut) throws EAAFException {
-		TransactionStoreElement element = new TransactionStoreElement();
-		element.setKey(key);
-		element.setData(value);
-		storage.put(key, element);
-		
-	}
-
-	@Override
-	public void putRaw(String key, Object value) throws EAAFException {
-		if (value instanceof TransactionStoreElement)
-			storage.put(((TransactionStoreElement) value).getKey(), (TransactionStoreElement) value);		
-		else 
-			log.info(value.getClass().getName() + " is NOT a RAW element of " + ITransactionStorage.class.getName());
-					
-	}
-
-	@Override
-	public void remove(String key) {
-		if (containsKey(key)) {
-			log.debug("Remove element with key: " + key + " from " + ITransactionStorage.class.getName());
-			storage.remove(key);
-			
-		}
-	}
-
-}