diff --git a/Java/pom.xml b/Java/pom.xml
index bd07e975..a86447f1 100644
--- a/Java/pom.xml
+++ b/Java/pom.xml
@@ -57,8 +57,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>18</source>
+                    <target>18</target>
                     <compilerArgs>--enable-preview</compilerArgs>
                 </configuration>
             </plugin>
diff --git a/Java/src/main/java/com/gildedrose/StorageItem.java b/Java/src/main/java/com/gildedrose/StorageItem.java
index 0fc8a8c7..c3c0aa81 100644
--- a/Java/src/main/java/com/gildedrose/StorageItem.java
+++ b/Java/src/main/java/com/gildedrose/StorageItem.java
@@ -4,19 +4,18 @@ public class StorageItem {
     protected Item item;
 
     public static StorageItem createItem(Item item) {
-        if (item.name.equals(AgeddBrie.NAME)) {
-            return new AgeddBrie(item);
+        switch (item.name) {
+            case AgeddBrie.NAME:
+                return new AgeddBrie(item);
+            case BackstagePasses.NAME:
+                return new BackstagePasses(item);
+            case Sulfuras.NAME:
+                return new Sulfuras(item);
+            case Conjured.NAME:
+                return new Conjured(item);
+            case default:
+                return new StorageItem(item);
         }
-        if (item.name.equals(BackstagePasses.NAME)) {
-            return new BackstagePasses(item);
-        }
-        if (item.name.equals(Sulfuras.NAME)) {
-            return new Sulfuras(item);
-        }
-        if (item.name.equals(Conjured.NAME)) {
-            return new Conjured(item);
-        }
-        return new StorageItem(item);
     }
 
     public StorageItem(Item item) {