Extract GSON/Jackson config to inner classes
Update JsonTestersAutoConfiguration so that GSON and Jackson specific configuration are inner classes. This should prevent ClassNotFound exception when the libraries are not on the classpath. Fixes gh-6502
This commit is contained in:
		
							parent
							
								
									80a1897ccb
								
							
						
					
					
						commit
						f38bd7af37
					
				|  | @ -66,27 +66,36 @@ public class JsonTestersAutoConfiguration { | ||||||
| 				null); | 				null); | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	@Bean |  | ||||||
| 	@Scope("prototype") |  | ||||||
| 	@ConditionalOnClass(ObjectMapper.class) | 	@ConditionalOnClass(ObjectMapper.class) | ||||||
| 	@ConditionalOnBean(ObjectMapper.class) | 	private static class JacksonJsonTestersConfiguration { | ||||||
| 	public FactoryBean<JacksonTester<?>> jacksonTesterFactoryBean(ObjectMapper mapper) { | 
 | ||||||
| 		return new JsonTesterFactoryBean<JacksonTester<?>, ObjectMapper>( | 		@Bean | ||||||
| 				JacksonTester.class, mapper); | 		@Scope("prototype") | ||||||
|  | 		@ConditionalOnBean(ObjectMapper.class) | ||||||
|  | 		public FactoryBean<JacksonTester<?>> jacksonTesterFactoryBean( | ||||||
|  | 				ObjectMapper mapper) { | ||||||
|  | 			return new JsonTesterFactoryBean<JacksonTester<?>, ObjectMapper>( | ||||||
|  | 					JacksonTester.class, mapper); | ||||||
|  | 		} | ||||||
|  | 
 | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	@Bean |  | ||||||
| 	@Scope("prototype") |  | ||||||
| 	@ConditionalOnClass(Gson.class) | 	@ConditionalOnClass(Gson.class) | ||||||
| 	@ConditionalOnBean(Gson.class) | 	private static class GsonJsonTestersConfiguration { | ||||||
| 	public FactoryBean<GsonTester<?>> gsonTesterFactoryBean(Gson gson) { | 
 | ||||||
| 		return new JsonTesterFactoryBean<GsonTester<?>, Gson>(GsonTester.class, gson); | 		@Bean | ||||||
|  | 		@Scope("prototype") | ||||||
|  | 		@ConditionalOnBean(Gson.class) | ||||||
|  | 		public FactoryBean<GsonTester<?>> gsonTesterFactoryBean(Gson gson) { | ||||||
|  | 			return new JsonTesterFactoryBean<GsonTester<?>, Gson>(GsonTester.class, gson); | ||||||
|  | 		} | ||||||
|  | 
 | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	/** | 	/** | ||||||
| 	 * {@link FactoryBean} used to create JSON Tester instances. | 	 * {@link FactoryBean} used to create JSON Tester instances. | ||||||
| 	 */ | 	 */ | ||||||
| 	private class JsonTesterFactoryBean<T, M> implements FactoryBean<T> { | 	private static class JsonTesterFactoryBean<T, M> implements FactoryBean<T> { | ||||||
| 
 | 
 | ||||||
| 		private final Class<?> objectType; | 		private final Class<?> objectType; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue