Issue-ID: DCAEGEN2-2145
Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: I6e9b733e4e49829778dc285979ee0405ea9da96e
aai.setUrl(environment.getProperty(ConfigBindingServiceConstants.AAIURL));
aai.setUsername(environment.getProperty(ConfigBindingServiceConstants.AAIUSERNAME));
aai.setPassword(environment.getProperty(ConfigBindingServiceConstants.AAIPASSWORD));
aai.setUrl(environment.getProperty(ConfigBindingServiceConstants.AAIURL));
aai.setUsername(environment.getProperty(ConfigBindingServiceConstants.AAIUSERNAME));
aai.setPassword(environment.getProperty(ConfigBindingServiceConstants.AAIPASSWORD));
- aai.setGenericVnfPath(ConfigBindingServiceConstants.AAIGENERICVNFPATH);
+ aai.setGenericVnfPath(environment.getProperty(ConfigBindingServiceConstants.AAIGENERICVNFPATH));
aai.setNodeQueryPath(environment.getProperty(ConfigBindingServiceConstants.AAINODEQUERYPATH));
tca.setAai(aai);
aai.setNodeQueryPath(environment.getProperty(ConfigBindingServiceConstants.AAINODEQUERYPATH));
tca.setAai(aai);
@Bean
public RestTemplate aaiRestTemplate(final TcaAaiRestClientPreferences aaiRestClientPreferences,
final RestTemplateBuilder restTemplateBuilder) {
@Bean
public RestTemplate aaiRestTemplate(final TcaAaiRestClientPreferences aaiRestClientPreferences,
final RestTemplateBuilder restTemplateBuilder) {
+ if(aaiRestClientPreferences == null) {
+ return null;
+ }
return restTemplateBuilder
.additionalCustomizers(new HttpClientPreferencesCustomizer<>(aaiRestClientPreferences))
.build();
return restTemplateBuilder
.additionalCustomizers(new HttpClientPreferencesCustomizer<>(aaiRestClientPreferences))
.build();
@Bean
public TcaAaiEnrichmentService aaiEnrichmentService(final TcaAppProperties tcaAppProperties,
final RestTemplate aaiRestTemplate) {
@Bean
public TcaAaiEnrichmentService aaiEnrichmentService(final TcaAppProperties tcaAppProperties,
final RestTemplate aaiRestTemplate) {
+ if (aaiRestTemplate == null) {
+ return null;
+ }
return new TcaAaiEnrichmentServiceImpl(tcaAppProperties, aaiRestTemplate);
}
return new TcaAaiEnrichmentServiceImpl(tcaAppProperties, aaiRestTemplate);
}