From 35009ad3c469e1dd4a5c8c95d8ca73206c7add4a Mon Sep 17 00:00:00 2001
From: Ante Pocedulic <ante003@users.noreply.github.com>
Date: Tue, 18 Oct 2016 16:54:54 +0200
Subject: [PATCH] - refactored CacheHelper class (#756)

---
 .../java/org/baeldung/ehcache/app/App.java    | 24 -------------------
 .../baeldung/ehcache/config/CacheHelper.java  |  8 +++++--
 2 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100755 spring-all/src/main/java/org/baeldung/ehcache/app/App.java

diff --git a/spring-all/src/main/java/org/baeldung/ehcache/app/App.java b/spring-all/src/main/java/org/baeldung/ehcache/app/App.java
deleted file mode 100755
index 99370186a3..0000000000
--- a/spring-all/src/main/java/org/baeldung/ehcache/app/App.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.baeldung.ehcache.app;
-
-import org.baeldung.ehcache.calculator.SquaredCalculator;
-import org.baeldung.ehcache.config.CacheHelper;
-
-public class App {
-
-    public static void main(String[] args) {
-
-        SquaredCalculator squaredCalculator = new SquaredCalculator();
-        CacheHelper cacheHelper = new CacheHelper();
-
-        squaredCalculator.setCache(cacheHelper);
-
-        calculate(squaredCalculator);
-        calculate(squaredCalculator);
-    }
-
-    private static void calculate(SquaredCalculator squaredCalculator) {
-        for (int i = 10; i < 15; i++) {
-            System.out.println("Square value of " + i + " is: " + squaredCalculator.getSquareValueOfNumber(i) + "\n");
-        }
-    }
-}
diff --git a/spring-all/src/main/java/org/baeldung/ehcache/config/CacheHelper.java b/spring-all/src/main/java/org/baeldung/ehcache/config/CacheHelper.java
index 387a57880b..7f59ad8cfb 100755
--- a/spring-all/src/main/java/org/baeldung/ehcache/config/CacheHelper.java
+++ b/spring-all/src/main/java/org/baeldung/ehcache/config/CacheHelper.java
@@ -12,14 +12,18 @@ public class CacheHelper {
     private Cache<Integer, Integer> squareNumberCache;
 
     public CacheHelper() {
-        cacheManager = CacheManagerBuilder.newCacheManagerBuilder().withCache("squaredNumber", CacheConfigurationBuilder.newCacheConfigurationBuilder(Integer.class, Integer.class, ResourcePoolsBuilder.heap(10))).build();
+        cacheManager = CacheManagerBuilder.newCacheManagerBuilder().build();
         cacheManager.init();
 
-        squareNumberCache = cacheManager.getCache("squaredNumber", Integer.class, Integer.class);
+        squareNumberCache = cacheManager.createCache("squaredNumber", CacheConfigurationBuilder.newCacheConfigurationBuilder(Integer.class, Integer.class, ResourcePoolsBuilder.heap(10)));
     }
 
     public Cache<Integer, Integer> getSquareNumberCache() {
         return squareNumberCache;
     }
 
+    public Cache<Integer, Integer> getSquareNumberCacheFromCacheManager() {
+        return cacheManager.getCache("squaredNumber", Integer.class, Integer.class);
+    }
+
 }