Refactor NotFoundException、BadRequestException

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/AppController.java

@@ -20,8 +20,8 @@
 import com.ctrip.framework.apollo.biz.service.AppService;
 import com.ctrip.framework.apollo.common.dto.AppDTO;
 import com.ctrip.framework.apollo.common.entity.App;
+import com.ctrip.framework.apollo.common.exception.AppNotFountException;
 import com.ctrip.framework.apollo.common.exception.BadRequestException;
-import com.ctrip.framework.apollo.common.exception.NotFoundException;
 import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.core.utils.StringUtils;
 import org.springframework.data.domain.Pageable;
@@ -66,7 +66,7 @@ public AppDTO create(@Valid @RequestBody AppDTO dto) {
   public void delete(@PathVariable("appId") String appId, @RequestParam String operator) {
     App entity = appService.findOne(appId);
     if (entity == null) {
-      throw new NotFoundException("app not found for appId " + appId);
+      throw new AppNotFountException(appId);
     }
     adminService.deleteApp(entity, operator);
   }
@@ -96,7 +96,7 @@ public List<AppDTO> find(@RequestParam(value = "name", required = false) String
   public AppDTO get(@PathVariable("appId") String appId) {
     App app = appService.findOne(appId);
     if (app == null) {
-      throw new NotFoundException("app not found for appId " + appId);
+      throw new AppNotFountException(appId);
     }
     return BeanUtils.transform(AppDTO.class, app);
   }

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ClusterController.java

@@ -20,7 +20,7 @@
 import com.ctrip.framework.apollo.biz.service.ClusterService;
 import com.ctrip.framework.apollo.common.dto.ClusterDTO;
 import com.ctrip.framework.apollo.common.exception.BadRequestException;
-import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.exception.ClusterNotFoundException;
 import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.core.ConfigConsts;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -69,7 +69,7 @@ public void delete(@PathVariable("appId") String appId,
     Cluster entity = clusterService.findOne(appId, clusterName);
 
     if (entity == null) {
-      throw new NotFoundException("cluster not found for clusterName " + clusterName);
+      throw new ClusterNotFoundException(appId, clusterName);
     }
 
     if(ConfigConsts.CLUSTER_NAME_DEFAULT.equals(entity.getName())){
@@ -90,7 +90,7 @@ public ClusterDTO get(@PathVariable("appId") String appId,
                         @PathVariable("clusterName") String clusterName) {
     Cluster cluster = clusterService.findOne(appId, clusterName);
     if (cluster == null) {
-      throw new NotFoundException("cluster not found for name " + clusterName);
+      throw new ClusterNotFoundException(appId, clusterName);
     }
     return BeanUtils.transform(ClusterDTO.class, cluster);
   }

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/InstanceConfigController.java

@@ -25,7 +25,7 @@
 import com.ctrip.framework.apollo.common.dto.InstanceDTO;
 import com.ctrip.framework.apollo.common.dto.PageDTO;
 import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
-import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.exception.ReleaseNotFoundException;
 import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
@@ -70,7 +70,7 @@ public PageDTO<InstanceDTO> getByRelease(@RequestParam("releaseId") long release
                                            Pageable pageable) {
     Release release = releaseService.findOne(releaseId);
     if (release == null) {
-      throw new NotFoundException("release not found for %s", releaseId);
+      throw new ReleaseNotFoundException(releaseId);
     }
     Page<InstanceConfig> instanceConfigsPage = instanceService.findActiveInstanceConfigsByReleaseKey
         (release.getReleaseKey(), pageable);
@@ -123,7 +123,7 @@ public List<InstanceDTO> getByReleasesNotIn(@RequestParam("appId") String appId,
     List<Release> releases = releaseService.findByReleaseIds(releaseIdSet);
 
     if (CollectionUtils.isEmpty(releases)) {
-      throw new NotFoundException("releases not found for %s", releaseIds);
+      throw new ReleaseNotFoundException(releaseIds);
     }
 
     Set<String> releaseKeys = releases.stream().map(Release::getReleaseKey).collect(Collectors

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/NamespaceController.java

@@ -22,6 +22,7 @@
 import com.ctrip.framework.apollo.common.dto.PageDTO;
 import com.ctrip.framework.apollo.common.exception.BadRequestException;
 import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.exception.NamespaceNotFoundException;
 import com.ctrip.framework.apollo.common.utils.BeanUtils;
 
 import org.springframework.data.domain.Page;
@@ -68,8 +69,7 @@ public void delete(@PathVariable("appId") String appId,
                      @PathVariable("namespaceName") String namespaceName, @RequestParam String operator) {
     Namespace entity = namespaceService.findOne(appId, clusterName, namespaceName);
     if (entity == null) {
-      throw new NotFoundException("namespace not found for %s %s %s", appId, clusterName,
-          namespaceName);
+      throw new NamespaceNotFoundException(appId, clusterName, namespaceName);
     }
 
     namespaceService.deleteNamespace(entity, operator);
@@ -86,7 +86,7 @@ public List<NamespaceDTO> find(@PathVariable("appId") String appId,
   public NamespaceDTO get(@PathVariable("namespaceId") Long namespaceId) {
     Namespace namespace = namespaceService.findOne(namespaceId);
     if (namespace == null) {
-        throw new NotFoundException("namespace not found for %s", namespaceId);
+        throw new NamespaceNotFoundException(namespaceId);
     }
     return BeanUtils.transform(NamespaceDTO.class, namespace);
   }
@@ -109,8 +109,7 @@ public NamespaceDTO get(@PathVariable("appId") String appId,
                           @PathVariable("namespaceName") String namespaceName) {
     Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
     if (namespace == null) {
-      throw new NotFoundException("namespace not found for %s %s %s", appId, clusterName,
-          namespaceName);
+      throw new NamespaceNotFoundException(appId, clusterName, namespaceName);
     }
     return BeanUtils.transform(NamespaceDTO.class, namespace);
   }

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseController.java

@@ -28,7 +28,8 @@
 import com.ctrip.framework.apollo.common.constants.NamespaceBranchStatus;
 import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
 import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
-import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.exception.NamespaceNotFoundException;
+import com.ctrip.framework.apollo.common.exception.ReleaseNotFoundException;
 import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.google.common.base.Splitter;
 import org.springframework.data.domain.Pageable;
@@ -72,7 +73,7 @@ public ReleaseController(
   public ReleaseDTO get(@PathVariable("releaseId") long releaseId) {
     Release release = releaseService.findOne(releaseId);
     if (release == null) {
-      throw new NotFoundException("release not found for %s", releaseId);
+      throw new ReleaseNotFoundException(releaseId);
     }
     return BeanUtils.transform(ReleaseDTO.class, release);
   }
@@ -125,8 +126,7 @@ public ReleaseDTO publish(@PathVariable("appId") String appId,
                             @RequestParam(name = "isEmergencyPublish", defaultValue = "false") boolean isEmergencyPublish) {
     Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
     if (namespace == null) {
-      throw new NotFoundException("Could not find namespace for %s %s %s", appId, clusterName,
-          namespaceName);
+      throw new NamespaceNotFoundException(appId, clusterName, namespaceName);
     }
     Release release = releaseService.publish(namespace, releaseName, releaseComment, operator, isEmergencyPublish);
 
@@ -162,8 +162,7 @@ public ReleaseDTO updateAndPublish(@PathVariable("appId") String appId,
                                      @RequestBody ItemChangeSets changeSets) {
     Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
     if (namespace == null) {
-      throw new NotFoundException("Could not find namespace for %s %s %s", appId, clusterName,
-          namespaceName);
+      throw new NamespaceNotFoundException(appId, clusterName, namespaceName);
     }
 
     Release release = releaseService.mergeBranchChangeSetsAndRelease(namespace, branchName, releaseName,
@@ -214,11 +213,10 @@ public ReleaseDTO publish(@PathVariable("appId") String appId,
                             @RequestParam(name = "grayDelKeys") Set<String> grayDelKeys){
     Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
     if (namespace == null) {
-      throw new NotFoundException("Could not find namespace for %s %s %s", appId, clusterName, 
-          namespaceName);
+      throw new NamespaceNotFoundException(appId, clusterName, namespaceName);
     }
 
-    Release release = releaseService.grayDeletionPublish(namespace, releaseName, releaseComment, 
+    Release release = releaseService.grayDeletionPublish(namespace, releaseName, releaseComment,
         operator, isEmergencyPublish, grayDelKeys);
 
     //send release message

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemService.java

@@ -23,7 +23,7 @@
 import com.ctrip.framework.apollo.biz.entity.Namespace;
 import com.ctrip.framework.apollo.biz.repository.ItemRepository;
 import com.ctrip.framework.apollo.common.exception.BadRequestException;
-import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.exception.NamespaceNotFoundException;
 import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.core.utils.StringUtils;
 
@@ -256,8 +256,7 @@ private Namespace findNamespaceByAppIdAndClusterNameAndNamespaceName(String appI
                                                                        String namespaceName) {
     Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
     if (namespace == null) {
-      throw new NotFoundException("namespace not found for appId:%s clusterName:%s namespaceName:%s",
-              appId, clusterName, namespaceName);
+      throw new NamespaceNotFoundException(appId, clusterName, namespaceName);
     }
     return namespace;
   }

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemSetService.java

@@ -25,6 +25,7 @@
 import com.ctrip.framework.apollo.common.dto.ItemDTO;
 import com.ctrip.framework.apollo.common.exception.BadRequestException;
 import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.exception.NamespaceNotFoundException;
 import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import java.util.List;
 import org.springframework.stereotype.Service;
@@ -62,7 +63,7 @@ public ItemChangeSets updateSet(String appId, String clusterName,
     Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
 
     if (namespace == null) {
-      throw new NotFoundException("Namespace %s not found", namespaceName);
+      throw new NamespaceNotFoundException(appId, clusterName, namespaceName);
     }
 
     String operator = changeSet.getDataChangeLastModifiedBy();

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseService.java

@@ -31,6 +31,7 @@
 import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
 import com.ctrip.framework.apollo.common.exception.BadRequestException;
 import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.exception.ReleaseNotFoundException;
 import com.ctrip.framework.apollo.common.utils.GrayReleaseRuleItemTransformer;
 import com.ctrip.framework.apollo.core.utils.StringUtils;
 import com.google.common.base.Strings;
@@ -460,7 +461,7 @@ private Release createRelease(Namespace namespace, String name, String comment,
   public Release rollback(long releaseId, String operator) {
     Release release = findOne(releaseId);
     if (release == null) {
-      throw new NotFoundException("release not found");
+      throw new ReleaseNotFoundException(releaseId);
     }
     if (release.isAbandoned()) {
       throw new BadRequestException("release is not active");
@@ -503,8 +504,12 @@ public Release rollbackTo(long releaseId, long toReleaseId, String operator) {
 
     Release release = findOne(releaseId);
     Release toRelease = findOne(toReleaseId);
-    if (release == null || toRelease == null) {
-      throw new NotFoundException("release not found");
+
+    if (release == null) {
+      throw new ReleaseNotFoundException(releaseId);
+    }
+    if (toRelease == null) {
+      throw new ReleaseNotFoundException(toReleaseId);
     }
     if (release.isAbandoned() || toRelease.isAbandoned()) {
       throw new BadRequestException("release is not active");

apollo-common/src/main/java/com/ctrip/framework/apollo/common/exception/AppNotFountException.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023 Apollo Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.ctrip.framework.apollo.common.exception;
+
+/**
+ * @author kl (http://kailing.pub)
+ * @since 2023/3/21
+ */
+public class AppNotFountException extends NotFoundException{
+
+  public AppNotFountException(String appId) {
+      super("app not found for appId:%s", appId);
+  }
+}

apollo-common/src/main/java/com/ctrip/framework/apollo/common/exception/ClusterNotFoundException.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023 Apollo Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.ctrip.framework.apollo.common.exception;
+
+/**
+ * @author kl (http://kailing.pub)
+ * @since 2023/3/21
+ */
+public class ClusterNotFoundException extends NotFoundException{
+
+  public ClusterNotFoundException(String appId, String clusterName) {
+    super("cluster not found for appId:%s clusterName:%s", appId, clusterName);
+  }
+}

apollo-common/src/main/java/com/ctrip/framework/apollo/common/exception/NamespaceNotFoundException.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2023 Apollo Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.ctrip.framework.apollo.common.exception;
+
+/**
+ * @author kl (http://kailing.pub)
+ * @since 2023/3/21
+ */
+public class NamespaceNotFoundException extends NotFoundException{
+
+  public NamespaceNotFoundException(String appId, String clusterName, String namespaceName) {
+    super("namespace not found for appId:%s clusterName:%s namespaceName:%s", appId, clusterName, namespaceName);
+  }
+
+  public NamespaceNotFoundException(long namespaceId) {
+    super("namespace not found for namespaceId:%s", namespaceId);
+  }
+}

apollo-common/src/main/java/com/ctrip/framework/apollo/common/exception/ReleaseNotFoundException.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023 Apollo Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.ctrip.framework.apollo.common.exception;
+
+/**
+ * @author kl (http://kailing.pub)
+ * @since 2023/3/21
+ */
+public class ReleaseNotFoundException extends NotFoundException{
+
+  public ReleaseNotFoundException(Object releaseId) {
+    super("release not found for releaseId:%s", releaseId);
+  }
+}