From 0102736d4cebf3568b5816bcac2b764acd06504a Mon Sep 17 00:00:00 2001
From: tbuckinx <timoer.buckinx@ixor.be>
Date: Thu, 23 Nov 2023 22:50:12 +0100
Subject: [PATCH] Final cleanup

---
 .../main/java/com/gildedrose/GildedRose.java  |  1 -
 .../java/com/gildedrose/domain/AgedBrie.java  |  6 ++----
 .../com/gildedrose/domain/BackstagePass.java  | 19 ++++++++-----------
 .../com/gildedrose/domain/ConjuredItem.java   |  3 +--
 .../com/gildedrose/domain/DefaultItem.java    |  3 +--
 .../com/gildedrose/domain/InventoryItem.java  |  6 ++----
 .../java/com/gildedrose/domain/Legendary.java |  1 -
 7 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/Java/src/main/java/com/gildedrose/GildedRose.java b/Java/src/main/java/com/gildedrose/GildedRose.java
index c486d9e7..ccbb5fe3 100644
--- a/Java/src/main/java/com/gildedrose/GildedRose.java
+++ b/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;
 
diff --git a/Java/src/main/java/com/gildedrose/domain/AgedBrie.java b/Java/src/main/java/com/gildedrose/domain/AgedBrie.java
index a1a7eef5..8c107e7b 100644
--- a/Java/src/main/java/com/gildedrose/domain/AgedBrie.java
+++ b/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 quality;
+        return increaseQualityBelowMaximum();
     }
 
     @Override
@@ -23,7 +22,6 @@ public class AgedBrie extends InventoryItem {
 
     @Override
     public int handleQualityAfterSellIn() {
-        quality = increaseQualityBelowMaximum();
-        return quality;
+        return increaseQualityBelowMaximum();
     }
 }
diff --git a/Java/src/main/java/com/gildedrose/domain/BackstagePass.java b/Java/src/main/java/com/gildedrose/domain/BackstagePass.java
index 4975322d..db5d6e8a 100644
--- a/Java/src/main/java/com/gildedrose/domain/BackstagePass.java
+++ b/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 quality;
+        return increaseQualityBelowMaximum();
     }
 
     @Override
@@ -23,31 +22,29 @@ public class BackstagePass extends InventoryItem {
 
     @Override
     public int handleQualityAfterSellIn() {
-        quality = 0;
-        return quality;
+        return 0;
     }
 
     @Override
     public int increaseQualityBelowMaximum() {
-        quality = increaseQualityIfNotMaximum();
+        increaseQualityIfNotMaximum();
 
         // increase backstage pass further when sellIn date approaches
-        quality = increaseBackstagePass();
-        return quality;
+        return increaseBackstagePass();
     }
 
     private int increaseBackstagePass() {
         if (sellIn < 10) {
-            quality = increaseQualityIfNotMaximum();
+            increaseQualityIfNotMaximum();
 
             if (sellIn < 5) {
-                quality = increaseQualityIfNotMaximum();
+                increaseQualityIfNotMaximum();
             }
         }
         return quality;
     }
 
-    private int increaseQualityIfNotMaximum() {
-        return super.increaseQualityBelowMaximum();
+    private void increaseQualityIfNotMaximum() {
+        quality = super.increaseQualityBelowMaximum();
     }
 }
diff --git a/Java/src/main/java/com/gildedrose/domain/ConjuredItem.java b/Java/src/main/java/com/gildedrose/domain/ConjuredItem.java
index 7b3a530c..8a00bc3b 100644
--- a/Java/src/main/java/com/gildedrose/domain/ConjuredItem.java
+++ b/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 quality;
+        return decreaseQualityAboveZero();
     }
 }
diff --git a/Java/src/main/java/com/gildedrose/domain/DefaultItem.java b/Java/src/main/java/com/gildedrose/domain/DefaultItem.java
index 6372c790..faebe22d 100644
--- a/Java/src/main/java/com/gildedrose/domain/DefaultItem.java
+++ b/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 quality;
+        return decreaseQualityAboveZero();
     }
 }
diff --git a/Java/src/main/java/com/gildedrose/domain/InventoryItem.java b/Java/src/main/java/com/gildedrose/domain/InventoryItem.java
index 2714d6b8..7cfc1a3a 100644
--- a/Java/src/main/java/com/gildedrose/domain/InventoryItem.java
+++ b/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;
+        return quality > 0 ? quality - 1 : 0;
     }
 
     public int increaseQualityBelowMaximum() {
@@ -31,8 +30,7 @@ public abstract class InventoryItem {
     }
 
     public int reduceSellIn() {
-        sellIn--;
-        return sellIn;
+        return --sellIn;
     }
 
     public int handleQuality() {
diff --git a/Java/src/main/java/com/gildedrose/domain/Legendary.java b/Java/src/main/java/com/gildedrose/domain/Legendary.java
index f81d96a5..437f2d02 100644
--- a/Java/src/main/java/com/gildedrose/domain/Legendary.java
+++ b/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);