| Chunk |
|---|
| Conflicting content |
|---|
public class JwtSigningAndValidationServiceDefault implements
JwtSigningAndValidationService, InitializingBean {
<<<<<<< HEAD
@Autowired
private ConfigurationPropertiesBean configBean;
private List extends JwtSigner> signers = new ArrayList |
| Solution content |
|---|
public class JwtSigningAndValidationServiceDefault implements
JwtSigningAndValidationService, InitializingBean {
@Autowired
private ConfigurationPropertiesBean configBean;
// map of identifier to signer
private Map |
| File |
|---|
| JwtSigningAndValidationServiceDefault.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Annotation |
| Attribute |
| Comment |
| Method invocation |