Commit 605a1205 authored by Komal Makkar's avatar Komal Makkar
Browse files

Merge branch 'users/nikhil/ConditionalHeader' into 'master'

Conditional Header for Non Request Scopes

See merge request !99
parents 80d0d54f ff0a26fa
Pipeline #57216 failed with stages
in 19 minutes and 37 seconds
This diff is collapsed.
......@@ -21,6 +21,7 @@ import org.opengroup.osdu.core.common.util.IServiceAccountJwtClient;
import org.opengroup.osdu.notification.provider.interfaces.IPubsubRequestBodyExtractor;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component;
......@@ -33,8 +34,9 @@ import org.springframework.web.context.annotation.RequestScope;
import javax.servlet.http.HttpServletRequest;
@Component
@Primary
@RequestScope
@ConditionalOnProperty(value = "requestScope.enabled", havingValue = "true", matchIfMissing = true)
@Primary
public class CredentialHeadersProvider implements FactoryBean<DpsHeaders> {
@Autowired
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment