Extracting the core logic in a method

notification-core/src/main/java/org/opengroup/osdu/notification/di/CredentialHeadersProvider.java

@@ -57,27 +57,30 @@ public class CredentialHeadersProvider implements FactoryBean<DpsHeaders> {
         switch (requestMethod) {
             case POST:
             case PUT:
-            case PATCH: {
-                if(this.pubsubRequestBodyExtractor.isHandshakeRequest()) {
-                    // The headers are not needed for the handshake requests.
-                    return new DpsHeaders();
-                }
-
-                Map<String, String> attributes = this.pubsubRequestBodyExtractor.extractAttributesFromRequestBody();
-                try {
-                    //extract headers from pubsub message
-                    String dataPartitionId = attributes.get(DpsHeaders.DATA_PARTITION_ID);
-                    String authToken = this.serviceAccountJwtClient.getIdToken(dataPartitionId);
-                    attributes.put(DpsHeaders.AUTHORIZATION, authToken);
-                    return DpsHeaders.createFromMap(attributes);
-                } catch (AppException e) {
-                    throw new Exception("Failed to generate headers for register service.");
-                }
-            }
+            case PATCH:
+                return getDpsHeadersForPostPutPatch();
 
             default: {
                 return new DpsHeaders();
             }
         }
     }
+
+    private DpsHeaders getDpsHeadersForPostPutPatch() throws Exception {
+        if(this.pubsubRequestBodyExtractor.isHandshakeRequest()) {
+            // The headers are not needed for the handshake requests.
+            return new DpsHeaders();
+        }
+
+        Map<String, String> attributes = this.pubsubRequestBodyExtractor.extractAttributesFromRequestBody();
+        try {
+            //extract headers from pubsub message
+            String dataPartitionId = attributes.get(DpsHeaders.DATA_PARTITION_ID);
+            String authToken = this.serviceAccountJwtClient.getIdToken(dataPartitionId);
+            attributes.put(DpsHeaders.AUTHORIZATION, authToken);
+            return DpsHeaders.createFromMap(attributes);
+        } catch (AppException e) {
+            throw new Exception("Failed to generate headers for register service.");
+        }
+    }
 }
\ No newline at end of file