#248 Remove optional features from samples. Add an optional package to demo which shows their use.

Author: gregrluck

src/test/java/javax/cache/CacheDemos.java renamed to src/test/java/javax/cache/core/CacheDemos.java

@@ -1,7 +1,10 @@
-package javax.cache;
+package javax.cache.core;
 
 import org.junit.Test;
 
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+import javax.cache.Caching;
 import javax.cache.configuration.MutableConfiguration;
 import javax.cache.expiry.AccessedExpiryPolicy;
 import javax.cache.spi.CachingProvider;
@@ -12,6 +15,7 @@
 
 
 /**
+ *
  * @author Greg Luck
  */
 public class CacheDemos {
@@ -26,7 +30,7 @@ public void simpleAPITypeEnforcement() {
 
     //configure the cache
     MutableConfiguration<String, Integer> config = new MutableConfiguration<>();
-    config.setStoreByValue(false)
+    config.setStoreByValue(true)
         .setTypes(String.class, Integer.class)
         .setExpiryPolicyFactory(AccessedExpiryPolicy.factoryOf(ONE_HOUR))
         .setStatisticsEnabled(true);
@@ -59,8 +63,7 @@ public void simpleAPITypeEnforcementUsingCaching() {
 
     //configure the cache
     MutableConfiguration<String, Integer> config = new MutableConfiguration<>();
-    config.setStoreByValue(false)
-        .setTypes(String.class, Integer.class)
+    config.setTypes(String.class, Integer.class)
         .setExpiryPolicyFactory(AccessedExpiryPolicy.factoryOf(ONE_HOUR))
         .setStatisticsEnabled(true);
 
@@ -91,8 +94,7 @@ public void simpleAPIWithGenericsAndNoTypeEnforcement() {
     //configure the cache
     String cacheName = "sampleCache3";
     MutableConfiguration config = new MutableConfiguration<String, Integer>();
-    config.setStoreByValue(false)
-        .setExpiryPolicyFactory(AccessedExpiryPolicy.factoryOf(ONE_HOUR))
+    config.setExpiryPolicyFactory(AccessedExpiryPolicy.factoryOf(ONE_HOUR))
         .setStatisticsEnabled(true);
 
     //create the cache
@@ -125,8 +127,7 @@ public void simpleAPINoGenericsAndNoTypeEnforcement() {
     //configure the cache
     String cacheName = "sampleCache";
     MutableConfiguration config = new MutableConfiguration();
-    config.setStoreByValue(false)
-        .setExpiryPolicyFactory(AccessedExpiryPolicy.factoryOf(ONE_HOUR))
+    config.setExpiryPolicyFactory(AccessedExpiryPolicy.factoryOf(ONE_HOUR))
     .setStatisticsEnabled(true);
 
     //create the cache
@@ -161,8 +162,7 @@ public void simpleAPITypeEnforcementObject() {
 
         //configure the cache
         MutableConfiguration<Object, Object> config = new MutableConfiguration<>();
-        config.setStoreByValue(false)
-                .setTypes(Object.class, Object.class)
+        config.setTypes(Object.class, Object.class)
                 .setExpiryPolicyFactory(AccessedExpiryPolicy.factoryOf(ONE_HOUR))
                 .setStatisticsEnabled(true);
 

src/test/java/javax/cache/CompletionListenerExamples.java renamed to src/test/java/javax/cache/core/CompletionListenerExamples.java

@@ -1,5 +1,8 @@
-package javax.cache;
+package javax.cache.core;
 
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+import javax.cache.Caching;
 import javax.cache.configuration.MutableConfiguration;
 import javax.cache.expiry.AccessedExpiryPolicy;
 import javax.cache.integration.CompletionListenerFuture;
@@ -22,8 +25,7 @@ public void completionListenerExample() {
     CacheManager cacheManager = cachingProvider.getCacheManager();
 
     MutableConfiguration<String, Integer> config = new MutableConfiguration<>();
-    config.setStoreByValue(false)
-        .setTypes(String.class, Integer.class)
+    config.setTypes(String.class, Integer.class)
         .setExpiryPolicyFactory(AccessedExpiryPolicy.factoryOf(ONE_HOUR))
         .setStatisticsEnabled(true);
 

src/test/java/javax/cache/EntryProcessorExamples.java renamed to src/test/java/javax/cache/core/EntryProcessorExamples.java

@@ -1,7 +1,10 @@
-package javax.cache;
+package javax.cache.core;
 
 import org.junit.Test;
 
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+import javax.cache.Caching;
 import javax.cache.configuration.MutableConfiguration;
 import javax.cache.processor.EntryProcessor;
 import javax.cache.processor.MutableEntry;
@@ -16,7 +19,7 @@
 public class EntryProcessorExamples {
 
   /**
-   * Demonstrates incrementing a value in a {@link Cache} using
+   * Demonstrates incrementing a value in a {@link javax.cache.Cache} using
    * an {@link EntryProcessor}.
    */
   @Test

src/test/java/javax/cache/StatisticsExample.java renamed to src/test/java/javax/cache/core/StatisticsExample.java

@@ -1,5 +1,8 @@
-package javax.cache;
+package javax.cache.core;
 
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+import javax.cache.Caching;
 import javax.cache.configuration.MutableConfiguration;
 import javax.cache.expiry.AccessedExpiryPolicy;
 import javax.cache.spi.CachingProvider;
@@ -26,8 +29,7 @@ public void accessStatistics() throws MalformedObjectNameException,
 
     MutableConfiguration<String, Integer> config =
         new MutableConfiguration<String, Integer>();
-    config.setStoreByValue(false)
-        .setTypes(String.class, Integer.class)
+    config.setTypes(String.class, Integer.class)
         .setExpiryPolicyFactory(AccessedExpiryPolicy.factoryOf(ONE_HOUR))
         .setStatisticsEnabled(true);
 

src/test/java/javax/cache/TypeSafety.java renamed to src/test/java/javax/cache/core/TypeSafety.java

@@ -1,7 +1,10 @@
-package javax.cache;
+package javax.cache.core;
 
 import org.junit.Test;
 
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+import javax.cache.Caching;
 import javax.cache.configuration.MutableConfiguration;
 import javax.cache.spi.CachingProvider;
 

src/test/java/javax/cache/core/package-info.java

@@ -0,0 +1,17 @@
+/**
+ *  Copyright (c) 2011-2013 Terracotta, Inc.
+ *  Copyright (c) 2011-2013 Oracle and/or its affiliates.
+ *
+ *  All rights reserved. Use is subject to license terms.
+ */
+
+/**
+ * <p/>
+ * This package contains sample code for javax.cache set up as JUnit tests.
+ * <p/>
+ * It only uses required features of the specification.
+ *
+ * @author Greg Luck
+ * @since 1.0
+ */
+package javax.cache.core;

src/test/java/javax/cache/optional/CacheDemos.java

@@ -0,0 +1,60 @@
+package javax.cache.optional;
+
+import org.junit.Test;
+
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+import javax.cache.Caching;
+import javax.cache.configuration.MutableConfiguration;
+import javax.cache.expiry.AccessedExpiryPolicy;
+import javax.cache.spi.CachingProvider;
+
+import static javax.cache.expiry.Duration.ONE_HOUR;
+import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
+
+
+/**
+ *
+ * @author Greg Luck
+ */
+public class CacheDemos {
+
+
+  @Test
+  public void simpleAPITypeEnforcement() {
+
+    //resolve a cache manager
+    CachingProvider cachingProvider = Caching.getCachingProvider();
+    CacheManager cacheManager = cachingProvider.getCacheManager();
+
+    //configure the cache
+    MutableConfiguration<String, Integer> config = new MutableConfiguration<>();
+    //uses store by reference
+    config.setStoreByValue(false)
+        .setTypes(String.class, Integer.class)
+        .setExpiryPolicyFactory(AccessedExpiryPolicy.factoryOf(ONE_HOUR))
+        .setStatisticsEnabled(true);
+
+    //create the cache
+    cacheManager.createCache("simpleOptionalCache", config);
+
+    //... and then later to get the cache
+    Cache<String, Integer> cache = Caching.getCache("simpleOptionalCache",
+        String.class, Integer.class);
+
+    //use the cache
+    String key = "key";
+    Integer value1 = 1;
+    cache.put("key", value1);
+    Integer value2 = cache.get(key);
+    assertEquals(value1, value2);
+
+    cache.remove("key");
+    assertNull(cache.get("key"));
+  }
+
+
+
+
+}

src/test/java/javax/cache/optional/package-info.java

@@ -0,0 +1,17 @@
+/**
+ *  Copyright (c) 2011-2013 Terracotta, Inc.
+ *  Copyright (c) 2011-2013 Oracle and/or its affiliates.
+ *
+ *  All rights reserved. Use is subject to license terms.
+ */
+
+/**
+ * <p/>
+ * This package contains sample code for javax.cache set up as JUnit tests.
+ * <p/>
+ * It uses required and optional features of the specification.
+ *
+ * @author Greg Luck
+ * @since 1.0
+ */
+package javax.cache.optional;