Projects >> OpenID-Connect-Java-Spring-Server >>c51bb72fe5dd1601d3fbdcbe06735ed1ec0cae5f

Chunk
Conflicting content
public class JwtSigningAndValidationServiceDefault implements
		JwtSigningAndValidationService, InitializingBean {

<<<<<<< HEAD
	@Autowired
	private ConfigurationPropertiesBean configBean;
	
	private List signers = new ArrayList();
=======
	// map of identifier to signer
	private Map signers = new HashMap();
>>>>>>> 6c011340957356203de0ab0e7b8b7da01d457b1d

	private static Log logger = LogFactory
			.getLog(JwtSigningAndValidationServiceDefault.class);
Solution content
public class JwtSigningAndValidationServiceDefault implements
		JwtSigningAndValidationService, InitializingBean {

	@Autowired
	private ConfigurationPropertiesBean configBean;
	
	// map of identifier to signer
	private Map signers = new HashMap();

	private static Log logger = LogFactory
			.getLog(JwtSigningAndValidationServiceDefault.class);
File
JwtSigningAndValidationServiceDefault.java
Developer's decision
Combination
Kind of conflict
Annotation
Attribute
Comment
Method invocation