Merge pull request #106 from Dafodils/main

Fix/issue 103 reduce cognitive complexity of AnnotationChangeRefactor#removeMembersFromAnnotation
alfasoftware · Jun 22, 2022 · 4e14d17 · 4e14d17
2 parents f9615bb + 32078e1
commit 4e14d17
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/.../alfasoftware/astra/core/refactoring/operations/annotations/AnnotationChangeRefactor.java b/.../alfasoftware/astra/core/refactoring/operations/annotations/AnnotationChangeRefactor.java
@@ -214,25 +214,25 @@ private Annotation addNewMembersToAnnotation(CompilationUnit compilationUnit, AS
 
 
   private Annotation removeMembersFromAnnotation(ASTRewrite rewriter, Annotation annotation) {
-    if (!namesForMembersToRemove.isEmpty()){
-      if (annotation.isSingleMemberAnnotation() && namesForMembersToRemove.contains(VALUE)) {
-        return convertAnnotationToMarkerAnnotation(rewriter, annotation);
-      } else if(annotation.isNormalAnnotation()) {
-        NormalAnnotation normalAnnotation = (NormalAnnotation) annotation;
-        final ListRewrite listRewrite = rewriter.getListRewrite(normalAnnotation, NormalAnnotation.VALUES_PROPERTY);
-        @SuppressWarnings("unchecked")
-        final List<MemberValuePair> rewrittenList = listRewrite.getRewrittenList();
-        for (MemberValuePair memberValuePair : rewrittenList) {
-          if(namesForMembersToRemove.contains(memberValuePair.getName().getIdentifier())){
-            listRewrite.remove(memberValuePair, null);
-          }
-        }
-        if (listRewrite.getRewrittenList().isEmpty()) {
-          return convertAnnotationToMarkerAnnotation(rewriter, annotation);
-        } else {
-          return normalAnnotation;
+    if (namesForMembersToRemove.isEmpty()){
+      return annotation;
+    } else if ( annotation.isSingleMemberAnnotation() && namesForMembersToRemove.contains(VALUE)) {
+      return convertAnnotationToMarkerAnnotation(rewriter, annotation);
+    } else if (annotation.isNormalAnnotation()) {
+      NormalAnnotation normalAnnotation = (NormalAnnotation) annotation;
+      final ListRewrite listRewrite = rewriter.getListRewrite(normalAnnotation, NormalAnnotation.VALUES_PROPERTY);
+      @SuppressWarnings("unchecked")
+      final List<MemberValuePair> rewrittenList = listRewrite.getRewrittenList();
+      for (MemberValuePair memberValuePair : rewrittenList) {
+        if(namesForMembersToRemove.contains(memberValuePair.getName().getIdentifier())){
+          listRewrite.remove(memberValuePair, null);
         }
       }
+      if (listRewrite.getRewrittenList().isEmpty()) {
+        return convertAnnotationToMarkerAnnotation(rewriter, annotation);
+      } else {
+        return normalAnnotation;
+      }
     }
     return annotation;
   }