minor changes

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

@@ -51,26 +51,27 @@ public class CredentialHeadersProvider implements FactoryBean<DpsHeaders> {
 
     @Override
     public DpsHeaders getObject() throws Exception {
+
+        if(this.pubsubRequestBodyExtractor.isHandshakeRequest()) {
+            // The headers are not needed for the handshake requests.
+            return new DpsHeaders();
+        }
+
         RequestMethod requestMethod = RequestMethod.valueOf(httpRequest.getMethod());
 
         switch (requestMethod) {
             case POST:
             case PUT:
             case PATCH: {
-                if(this.pubsubRequestBodyExtractor.isHandshakeRequest()) {
-                    // The headers are not needed for the handshake requests.
-                    return new DpsHeaders();
-                } else {
-                    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.");
-                    }
+                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.");
                 }
             }