Remove the usage of Env.name() using Env.getName()

ZhangJian He · nobodyiam · commit 3ef13f8b5333 · 2023-03-28T09:48:56.000+08:00
diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/config/PortalConfig.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/config/PortalConfig.java
@@ -180,7 +180,7 @@ public String portalAddress() {
   }
 
   public boolean isEmergencyPublishAllowed(Env env) {
-    String targetEnv = env.name();
+    String targetEnv = env.getName();
 
     String[] emergencyPublishSupportedEnvs = getArrayProperty("emergencyPublish.supported.envs", new String[0]);
 
diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ItemController.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ItemController.java
@@ -183,7 +183,7 @@ public List<ItemDiffs> diff(@RequestBody NamespaceSyncModel model) {
       }
 
       if (permissionValidator
-          .shouldHideConfigToCurrentUser(namespace.getAppId(), namespace.getEnv().name(), namespace.getNamespaceName())) {
+          .shouldHideConfigToCurrentUser(namespace.getAppId(), namespace.getEnv().getName(), namespace.getNamespaceName())) {
         diff.setDiffs(new ItemChangeSets());
         diff.setExtInfo("You are not this project's administrator, nor you have edit or release permission for the namespace in environment: " + namespace.getEnv());
       }
diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/environment/Env.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/environment/Env.java
@@ -227,16 +227,6 @@ public String toString() {
     return name;
   }
 
-  /**
-   * Backward compatibility with enum's name method
-   *
-   * @Deprecated please use {@link #getName()} instead of
-   */
-  @Deprecated
-  public String name() {
-    return name;
-  }
-
   public String getName() {
     return name;
   }
diff --git a/apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/environment/EnvTest.java b/apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/environment/EnvTest.java
@@ -91,7 +91,7 @@ public void testToString() {
 
   @Test
   public void name() {
-    assertEquals("DEV", Env.DEV.name());
+    assertEquals("DEV", Env.DEV.getName());
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public String portalAddress() {`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`public boolean isEmergencyPublishAllowed(Env env) {`
`183`		`- String targetEnv = env.name();`
	`183`	`+ String targetEnv = env.getName();`
`184`	`184`
`185`	`185`	`String[] emergencyPublishSupportedEnvs = getArrayProperty("emergencyPublish.supported.envs", new String[0]);`
`186`	`186`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public List<ItemDiffs> diff(@RequestBody NamespaceSyncModel model) {`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`if (permissionValidator`
`186`		`- .shouldHideConfigToCurrentUser(namespace.getAppId(), namespace.getEnv().name(), namespace.getNamespaceName())) {`
	`186`	`+ .shouldHideConfigToCurrentUser(namespace.getAppId(), namespace.getEnv().getName(), namespace.getNamespaceName())) {`
`187`	`187`	`diff.setDiffs(new ItemChangeSets());`
`188`	`188`	`diff.setExtInfo("You are not this project's administrator, nor you have edit or release permission for the namespace in environment: " + namespace.getEnv());`
`189`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public void testToString() {`
`91`	`91`
`92`	`92`	`@Test`
`93`	`93`	`public void name() {`
`94`		`- assertEquals("DEV", Env.DEV.name());`
	`94`	`+ assertEquals("DEV", Env.DEV.getName());`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`@Test`