Final cleanup

Java/src/main/java/com/gildedrose/GildedRose.java

@@ -1,7 +1,6 @@
 package com.gildedrose;
 
 import com.gildedrose.domain.*;
-import com.gildedrose.domain.InventoryItem;
 
 import static java.util.stream.Stream.of;
 

Java/src/main/java/com/gildedrose/domain/AgedBrie.java

@@ -12,8 +12,7 @@ public class AgedBrie extends InventoryItem {
 
     @Override
     public int handleQuality() {
-        quality = increaseQualityBelowMaximum();
+        return increaseQualityBelowMaximum();
-        return quality;
     }
 
     @Override
@@ -23,7 +22,6 @@ public class AgedBrie extends InventoryItem {
 
     @Override
     public int handleQualityAfterSellIn() {
-        quality = increaseQualityBelowMaximum();
+        return increaseQualityBelowMaximum();
-        return quality;
     }
 }

Java/src/main/java/com/gildedrose/domain/BackstagePass.java

@@ -12,8 +12,7 @@ public class BackstagePass extends InventoryItem {
 
     @Override
     public int handleQuality() {
-        quality = increaseQualityBelowMaximum();
+        return increaseQualityBelowMaximum();
-        return quality;
     }
 
     @Override
@@ -23,31 +22,29 @@ public class BackstagePass extends InventoryItem {
 
     @Override
     public int handleQualityAfterSellIn() {
-        quality = 0;
+        return 0;
-        return quality;
     }
 
     @Override
     public int increaseQualityBelowMaximum() {
-        quality = increaseQualityIfNotMaximum();
+        increaseQualityIfNotMaximum();
 
         // increase backstage pass further when sellIn date approaches
-        quality = increaseBackstagePass();
+        return increaseBackstagePass();
-        return quality;
     }
 
     private int increaseBackstagePass() {
         if (sellIn < 10) {
-            quality = increaseQualityIfNotMaximum();
+            increaseQualityIfNotMaximum();
 
             if (sellIn < 5) {
-                quality = increaseQualityIfNotMaximum();
+                increaseQualityIfNotMaximum();
             }
         }
         return quality;
     }
 
-    private int increaseQualityIfNotMaximum() {
+    private void increaseQualityIfNotMaximum() {
-        return super.increaseQualityBelowMaximum();
+        quality = super.increaseQualityBelowMaximum();
     }
 }

Java/src/main/java/com/gildedrose/domain/ConjuredItem.java

@@ -17,7 +17,6 @@ public class ConjuredItem extends InventoryItem {
 
     @Override
     public int handleQualityAfterSellIn() {
-        quality = decreaseQualityAboveZero();
+        return decreaseQualityAboveZero();
-        return quality;
     }
 }

Java/src/main/java/com/gildedrose/domain/DefaultItem.java

@@ -17,7 +17,6 @@ public class DefaultItem extends InventoryItem {
 
     @Override
     public int handleQualityAfterSellIn() {
-        quality = decreaseQualityAboveZero();
+        return decreaseQualityAboveZero();
-        return quality;
     }
 }

Java/src/main/java/com/gildedrose/domain/InventoryItem.java

@@ -19,8 +19,7 @@ public abstract class InventoryItem {
     public abstract int handleQualityAfterSellIn();
 
     public int decreaseQualityAboveZero() {
-        quality = quality > 0 ? quality - 1 : 0;
+        return quality > 0 ? quality - 1 : 0;
-        return quality;
     }
 
     public int increaseQualityBelowMaximum() {
@@ -31,8 +30,7 @@ public abstract class InventoryItem {
     }
 
     public int reduceSellIn() {
-        sellIn--;
+        return --sellIn;
-        return sellIn;
     }
 
     public int handleQuality() {

Java/src/main/java/com/gildedrose/domain/Legendary.java

@@ -5,7 +5,6 @@ import com.gildedrose.Item;
 public class Legendary extends InventoryItem {
 
     public Legendary(Item item) {
-        super();
         setName(item.name);
         setSellIn(item.sellIn);
         setQuality(item.quality);