From 0f710d9c2af35a3b609852a6b096ef4b87631c86 Mon Sep 17 00:00:00 2001
From: Moises Macero <mechero@users.noreply.github.com>
Date: Fri, 12 Mar 2021 14:30:45 +0100
Subject: [PATCH] Cleaning up a feature toggle after it's no longer applicable

---
 src/main/java/io/tpd/dadjokes/jokes/DadJoke.java      |  6 ------
 .../java/io/tpd/dadjokes/jokes/DadJokeController.java | 11 +----------
 .../tpd/dadjokes/jokes/DadJokesAppConfiguration.java  |  4 ----
 .../java/io/tpd/dadjokes/jokes/DadJokesResponse.java  |  8 --------
 4 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 src/main/java/io/tpd/dadjokes/jokes/DadJoke.java
 delete mode 100644 src/main/java/io/tpd/dadjokes/jokes/DadJokesResponse.java

diff --git a/src/main/java/io/tpd/dadjokes/jokes/DadJoke.java b/src/main/java/io/tpd/dadjokes/jokes/DadJoke.java
deleted file mode 100644
index 7d8315e..0000000
--- a/src/main/java/io/tpd/dadjokes/jokes/DadJoke.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package io.tpd.dadjokes.jokes;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public record DadJoke(@JsonProperty("joke") String joke) {
-}
diff --git a/src/main/java/io/tpd/dadjokes/jokes/DadJokeController.java b/src/main/java/io/tpd/dadjokes/jokes/DadJokeController.java
index f3ac98f..de2fa11 100644
--- a/src/main/java/io/tpd/dadjokes/jokes/DadJokeController.java
+++ b/src/main/java/io/tpd/dadjokes/jokes/DadJokeController.java
@@ -1,8 +1,5 @@
 package io.tpd.dadjokes.jokes;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,16 +24,10 @@ public ResponseEntity getDadJokes() {
             var dadJokes = dadJokesRepository.getDadJokes(
                     appConfiguration.premiumJokesPermission()
             );
-            return appConfiguration.dadJokesV2Enabled() ?
-                    ResponseEntity.ok(dadJokes) :
-                    ResponseEntity.ok(mapToV1(dadJokes));
+            return ResponseEntity.ok(dadJokes);
         } else {
             return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).build();
         }
     }
 
-    private List<DadJoke> mapToV1(final List<DadJokeV2> dadJokes) {
-        return dadJokes.stream().map(j2 -> new DadJoke(j2.joke()))
-                .collect(Collectors.toList());
-    }
 }
diff --git a/src/main/java/io/tpd/dadjokes/jokes/DadJokesAppConfiguration.java b/src/main/java/io/tpd/dadjokes/jokes/DadJokesAppConfiguration.java
index 3a0f599..cd49971 100644
--- a/src/main/java/io/tpd/dadjokes/jokes/DadJokesAppConfiguration.java
+++ b/src/main/java/io/tpd/dadjokes/jokes/DadJokesAppConfiguration.java
@@ -17,10 +17,6 @@ public boolean dadJokesFunctionalityEnabled() {
         return unleash.isEnabled("DadJokesFunctionalityToggle");
     }
 
-    public boolean dadJokesV2Enabled() {
-        return unleash.isEnabled("DadJokesModelV2Toggle");
-    }
-
     public boolean premiumJokesPermission() {
         return unleash.isEnabled("PremiumJokesToggle");
     }
diff --git a/src/main/java/io/tpd/dadjokes/jokes/DadJokesResponse.java b/src/main/java/io/tpd/dadjokes/jokes/DadJokesResponse.java
deleted file mode 100644
index eabe898..0000000
--- a/src/main/java/io/tpd/dadjokes/jokes/DadJokesResponse.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.tpd.dadjokes.jokes;
-
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public record DadJokesResponse(@JsonProperty("jokes") List<DadJoke> dadJokes) {
-}