replaced integers with more meaningful Strings

thombergs · thombergs · commit c347841a3c9a · 2021-10-04T07:56:33.000+11:00
diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/ifelse/Service.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/ifelse/Service.java
@@ -12,11 +12,11 @@ public Service(FeatureFlagService featureFlagService) {
         this.featureFlagService = featureFlagService;
     }
 
-    public int doSomething() {
+    public String doSomething() {
         if (featureFlagService.isNewServiceEnabled()) {
-            return 42;
+            return "new value";
         } else {
-            return 1;
+            return "old value";
         }
     }
 }
diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/NewService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/NewService.java
@@ -2,7 +2,7 @@
 
 class NewService implements Service {
     @Override
-    public int doSomething() {
-        return 42;
+    public String doSomething() {
+        return "new value";
     }
 }
diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/OldService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/OldService.java
@@ -2,7 +2,7 @@
 
 class OldService implements Service {
     @Override
-    public int doSomething() {
-        return 1;
+    public String doSomething() {
+        return "old value";
     }
 }
diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/Service.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacebean/Service.java
@@ -2,6 +2,6 @@
 
 interface Service {
 
-    int doSomething();
+    String doSomething();
 
 }
diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/FeatureFlaggedService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/FeatureFlaggedService.java
@@ -19,7 +19,7 @@ public FeatureFlaggedService(FeatureFlagService featureFlagService, NewService n
     }
 
     @Override
-    public int doSomething() {
+    public String doSomething() {
         if (featureFlagService.isNewServiceEnabled()) {
             return newService.doSomething();
         } else {
diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/NewService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/NewService.java
@@ -5,8 +5,8 @@
 @Component
 class NewService implements Service {
     @Override
-    public int doSomething() {
-        return 42;
+    public String doSomething() {
+        return "new value";
     }
 
 }
diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/OldService.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/OldService.java
@@ -5,8 +5,8 @@
 @Component
 class OldService implements Service {
     @Override
-    public int doSomething() {
-        return 1;
+    public String doSomething() {
+        return "old value";
     }
 
     public int doSomethingElse(){
diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/Service.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemethod/Service.java
@@ -2,6 +2,6 @@
 
 interface Service {
 
-    int doSomething();
+    String doSomething();
 
 }
diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/Service1.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/Service1.java
@@ -2,6 +2,6 @@
 
 public interface Service1 {
 
-    int doSomething();
+    String doSomething();
 
 }
diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/Service2.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/Service2.java
@@ -2,6 +2,6 @@
 
 public interface Service2 {
 
-    int doSomethingElse();
+    String doSomethingElse();
 
 }
diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/newmodule/NewService1.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/newmodule/NewService1.java
@@ -6,7 +6,7 @@
 @Component
 public class NewService1 implements Service1 {
     @Override
-    public int doSomething() {
-        return 42;
+    public String doSomething() {
+        return "new value";
     }
 }
diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/newmodule/NewService2.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/newmodule/NewService2.java
@@ -7,7 +7,7 @@
 public class NewService2 implements Service2 {
 
     @Override
-    public int doSomethingElse() {
-        return 42;
+    public String doSomethingElse() {
+        return "another nwe value";
     }
 }
diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/oldmodule/OldService1.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/oldmodule/OldService1.java
@@ -6,7 +6,7 @@
 @Component
 public class OldService1 implements Service1 {
     @Override
-    public int doSomething() {
-        return 1;
+    public String doSomething() {
+        return "old value";
     }
 }
diff --git a/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/oldmodule/OldService2.java b/spring-boot/feature-flags/src/main/java/io/reflectoring/featureflags/patterns/replacemodule/oldmodule/OldService2.java
@@ -7,7 +7,7 @@
 public class OldService2 implements Service2 {
 
     @Override
-    public int doSomethingElse() {
-        return 1;
+    public String doSomethingElse() {
+        return "another old value";
     }
 }
diff --git a/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacebean/ReplaceBeanTest.java b/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacebean/ReplaceBeanTest.java
@@ -28,13 +28,13 @@ void resetMocks() {
     @Test
     void oldServiceTest() {
         given(featureFlagService.isNewServiceEnabled()).willReturn(false);
-        assertThat(service.doSomething()).isEqualTo(1);
+        assertThat(service.doSomething()).isEqualTo("old value");
     }
 
     @Test
     void newServiceTest() {
         given(featureFlagService.isNewServiceEnabled()).willReturn(true);
-        assertThat(service.doSomething()).isEqualTo(42);
+        assertThat(service.doSomething()).isEqualTo("new value");
     }
 
 }
diff --git a/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacemethod/ReplaceMethodTest.java b/spring-boot/feature-flags/src/test/java/io/reflectoring/featureflags/patterns/replacemethod/ReplaceMethodTest.java
@@ -31,14 +31,14 @@ void resetMocks() {
     @Test
     void oldServiceTest() {
         given(featureFlagService.isNewServiceEnabled()).willReturn(false);
-        assertThat(service.doSomething()).isEqualTo(1);
+        assertThat(service.doSomething()).isEqualTo("old value");
         assertThat(oldService.doSomethingElse()).isEqualTo(2);
     }
 
     @Test
     void newServiceTest() {
         given(featureFlagService.isNewServiceEnabled()).willReturn(true);
-        assertThat(service.doSomething()).isEqualTo(42);
+        assertThat(service.doSomething()).isEqualTo("new value");
         // doSomethingElse() is not behind a feature flag, so it should return the same value independant of the feature flag
         assertThat(oldService.doSomethingElse()).isEqualTo(2);
     }

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@ public Service(FeatureFlagService featureFlagService) {`
`12`	`12`	`this.featureFlagService = featureFlagService;`
`13`	`13`	`}`
`14`	`14`
`15`		`- public int doSomething() {`
	`15`	`+ public String doSomething() {`
`16`	`16`	`if (featureFlagService.isNewServiceEnabled()) {`
`17`		`- return 42;`
	`17`	`+ return "new value";`
`18`	`18`	`} else {`
`19`		`- return 1;`
	`19`	`+ return "old value";`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`class NewService implements Service {`
`4`	`4`	`@Override`
`5`		`- public int doSomething() {`
`6`		`- return 42;`
	`5`	`+ public String doSomething() {`
	`6`	`+ return "new value";`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`class OldService implements Service {`
`4`	`4`	`@Override`
`5`		`- public int doSomething() {`
`6`		`- return 1;`
	`5`	`+ public String doSomething() {`
	`6`	`+ return "old value";`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`
`3`	`3`	`interface Service {`
`4`	`4`
`5`		`- int doSomething();`
	`5`	`+ String doSomething();`
`6`	`6`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public FeatureFlaggedService(FeatureFlagService featureFlagService, NewService n`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`
`22`		`- public int doSomething() {`
	`22`	`+ public String doSomething() {`
`23`	`23`	`if (featureFlagService.isNewServiceEnabled()) {`
`24`	`24`	`return newService.doSomething();`
`25`	`25`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`@Component`
`6`	`6`	`class NewService implements Service {`
`7`	`7`	`@Override`
`8`		`- public int doSomething() {`
`9`		`- return 42;`
	`8`	`+ public String doSomething() {`
	`9`	`+ return "new value";`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`
`3`	`3`	`public interface Service1 {`
`4`	`4`
`5`		`- int doSomething();`
	`5`	`+ String doSomething();`
`6`	`6`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`
`3`	`3`	`public interface Service2 {`
`4`	`4`
`5`		`- int doSomethingElse();`
	`5`	`+ String doSomethingElse();`
`6`	`6`
`7`	`7`	`}`