Configured which CacheContainerProvider should be used

Author: Holmistr

my-maps-webapp/src/main/java/cz/muni/fi/pv243/mymaps/webapp/session/DefaultCacheContainerProvider.java

@@ -7,6 +7,7 @@
 import java.io.IOException;
 import javax.annotation.PreDestroy;
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Alternative;
 import org.infinispan.api.BasicCacheContainer;
 import org.infinispan.manager.DefaultCacheManager;
 
@@ -15,29 +16,30 @@
  * @author Jiri Holusa
  */
 @ApplicationScoped
+@Alternative
 public class DefaultCacheContainerProvider implements CacheContainerProvider {
-    
+
     private BasicCacheContainer manager;
 
-   @Override
-   public BasicCacheContainer getCacheContainer(){
-     if (manager == null) {         
-         try {  
-             //TODO: change to file cache manager
-             manager = new DefaultCacheManager("infinispan.xml");
-         } catch (IOException ex) {
-             //TODO: do something
-         }
-         manager.start();           
-      }
-      
-      return manager;
-   }
+    @Override
+    public BasicCacheContainer getCacheContainer() {        
+        if (manager == null) {
+            try {
+                //TODO: change to file cache manager
+                manager = new DefaultCacheManager("infinispan.xml");
+            } catch (IOException ex) {
+                //TODO: do something
+            }
+            manager.start();
+        }
+
+
+        return manager;
+    }
 
-   @PreDestroy
-   public void cleanUp() {
-      manager.stop();
-      manager = null;
-   }
-    
+    @PreDestroy
+    public void cleanUp() {
+        manager.stop();
+        manager = null;
+    }
 }

my-maps-webapp/src/main/java/cz/muni/fi/pv243/mymaps/webapp/session/FileCacheContainerProvider.java

@@ -1,41 +1,39 @@
 package cz.muni.fi.pv243.mymaps.webapp.session;
 
-
 import java.io.IOException;
 import javax.annotation.PreDestroy;
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Alternative;
 import org.infinispan.api.BasicCacheContainer;
 import org.infinispan.manager.DefaultCacheManager;
 
-
-/** 
+/**
  * @author Jiri Holusa
  */
 @ApplicationScoped
-public abstract class FileCacheContainerProvider implements CacheContainerProvider {
-   
-   private BasicCacheContainer manager;
+@Alternative
+public class FileCacheContainerProvider implements CacheContainerProvider {
+
+    private BasicCacheContainer manager;
 
-   @Override
-   public BasicCacheContainer getCacheContainer(){
-     if (manager == null) {         
-         try {  
-             //TODO: change to file cache manager
-             manager = new DefaultCacheManager("infinispan.xml");
-         } catch (IOException ex) {
-             //TODO: do something
-         }
-         manager.start();           
-      }
-      
-      return manager;
-   }
+    @Override
+    public BasicCacheContainer getCacheContainer() {        
+        if (manager == null) {
+            try {
+                //TODO: change to file cache manager
+                manager = new DefaultCacheManager("infinispan.xml");
+            } catch (IOException ex) {
+                //TODO: do something
+            }
+            manager.start();
+        }
 
-   @PreDestroy
-   public void cleanUp() {
-      manager.stop();
-      manager = null;
-   }
+        return manager;
+    }
 
-   
+    @PreDestroy
+    public void cleanUp() {
+        manager.stop();
+        manager = null;
+    }
 }

my-maps-webapp/src/main/webapp/WEB-INF/beans.xml

@@ -5,4 +5,8 @@
       http://java.sun.com/xml/ns/javaee 
       http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
 
+    <alternatives>
+        <class>cz.muni.fi.pv243.mymaps.webapp.session.FileCacheContainerProvider</class>
+    </alternatives>
+    
 </beans>

my-maps-webapp/src/test/java/cz/muni/fi/pv243/mymaps/dao/PointDaoImplTest.java

@@ -5,17 +5,14 @@
 import cz.muni.fi.pv243.mymaps.dao.impl.PointDaoImpl;
 import cz.muni.fi.pv243.mymaps.entities.PointEntity;
 import cz.muni.fi.pv243.mymaps.webapp.session.DefaultCacheContainerProvider;
-import java.io.IOException;
+import cz.muni.fi.pv243.mymaps.webapp.session.FileCacheContainerProvider;
 import java.math.BigDecimal;
 import javax.inject.Inject;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -30,9 +27,12 @@ public class PointDaoImplTest {
     public static WebArchive createDeployment(){                
         return ShrinkWrap.create(WebArchive.class, "test.war")
                 .addClasses(PointDaoImpl.class,                                                        
-                            DefaultCacheContainerProvider.class                                                       
+                            DefaultCacheContainerProvider.class                            
                             )
-                .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));                
+                 .addAsWebInfResource(new StringAsset("<beans><alternatives>" +
+                                                        "<class>cz.muni.fi.pv243.mymaps.webapp.session.DefaultCacheContainerProvider</class>\n" +
+                                                        "</alternatives></beans>"), 
+                                                      "beans.xml");                
     }    
 
     @Inject