@@ -5,13 +5,33 @@
 @title: Design Patterns with Java 9
 @link: https://premaseem.wordpress.com/category/computers/design-patterns/
 */
-public class ChocolateIceCream {
-String brand = "un branded";
-Integer cost = 3;
-Integer calories = 200;
+public class ChocolateIceCream implements IceCream {
+
+public ChocolateIceCream (Integer cost, Integer calories){
+this.cost =cost;
+this.calories =calories;
+}
+
+String brand = "";
+Integer cost = 0;
+Integer calories = 0;
 
-@Override
 public String toString () {
-return this.getClass().getName() + " with " + calories + " and cost: $" + cost;
+return this.getClass().getSimpleName() + " with Calories: " + getCalories() + " and cost: $" + getCost();
+}
+
+@Override
+public Integer getCalories () {
+return calories;
+}
+
+@Override
+public Integer getCost () {
+return cost;
+}
+
+@Override
+public String getIceCreamName () {
+return this.getClass().getSimpleName();
 }
 }

@@ -0,0 +1,16 @@
+package com.premaseem.icecreams;
+
+/*
+@author: Aseem Jain
+@title: Design Patterns with Java 9
+@link: https://premaseem.wordpress.com/category/computers/design-patterns/
+*/
+public interface IceCream {
+
+Integer getCalories();
+Integer getCost();
+String getIceCreamName();
+
+
+
+}

@@ -5,13 +5,33 @@
 @title: Design Patterns with Java 9
 @link: https://premaseem.wordpress.com/category/computers/design-patterns/
 */
-public class StrawberryIceCream {
-String brand = "un branded";
-Integer cost = 2;
-Integer calories = 200;
+public class StrawberryIceCream implements IceCream {
+
+public StrawberryIceCream(Integer cost,Integer calories){
+this.cost =cost;
+this.calories =calories;
+}
+
+String brand = "";
+Integer cost = 0;
+Integer calories = 0;
 
-@Override
 public String toString () {
-return this.getClass().getSimpleName() + " with Calories: " + calories + " and cost: $" + cost;
+return this.getClass().getSimpleName() + " with Calories: " + getCalories() + " and cost: $" + getCost();
+}
+
+@Override
+public Integer getCalories () {
+return calories;
+}
+
+@Override
+public Integer getCost () {
+return cost;
+}
+
+@Override
+public String getIceCreamName () {
+return this.getClass().getSimpleName();
 }
 }