Adding webClient and vertx to SitePage

Author: computate

src/main/java/org/computate/frFR/java/ConfigSite.java

@@ -679,19 +679,21 @@ protected void _solrUrlFiware() throws Exception {
 
 	public SolrClient clientSolrFiware;
 	protected void _clientSolrFiware() throws Exception {
-		SSLContextBuilder builder = new SSLContextBuilder();
-		builder.loadTrustMaterial(null, new TrustSelfSignedStrategy());
-		SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(builder.build(), NoopHostnameVerifier.INSTANCE);
-		UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(solrUtilisateur, solrMotDePasse);
-		CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-		PreemptiveAuth requestInterceptor = new PreemptiveAuth(new BasicScheme());
-		credentialsProvider.setCredentials(AuthScope.ANY, credentials);
-		CloseableHttpClient httpClient = HttpClients.custom()
-				.setSSLSocketFactory(sslsf)
-				.setDefaultCredentialsProvider(credentialsProvider)
-				.addInterceptorLast(requestInterceptor)
-				.build();
-		clientSolrFiware = new HttpSolrClient.Builder(solrUrlFiware).withHttpClient(httpClient).build();
+		if(StringUtils.isNotBlank(solrUrlFiware)) {
+			SSLContextBuilder builder = new SSLContextBuilder();
+			builder.loadTrustMaterial(null, new TrustSelfSignedStrategy());
+			SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(builder.build(), NoopHostnameVerifier.INSTANCE);
+			UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(solrUtilisateur, solrMotDePasse);
+			CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+			PreemptiveAuth requestInterceptor = new PreemptiveAuth(new BasicScheme());
+			credentialsProvider.setCredentials(AuthScope.ANY, credentials);
+			CloseableHttpClient httpClient = HttpClients.custom()
+					.setSSLSocketFactory(sslsf)
+					.setDefaultCredentialsProvider(credentialsProvider)
+					.addInterceptorLast(requestInterceptor)
+					.build();
+			clientSolrFiware = new HttpSolrClient.Builder(solrUrlFiware).withHttpClient(httpClient).build();
+		}
 	}
 
 	/**

src/main/java/org/computate/frFR/java/EcrireApiClasse.java

@@ -3697,6 +3697,8 @@ else if(classePageAvecTemplateMethode || classeApiMethode.contains(i18nGlobale.g
 								tl(3, "page.set", i18nGlobale.getString(I18n.var_ListeRecherche), classeApiClasseNomSimple, "_(", i18nGlobale.getString(I18n.var_liste), classeApiClasseNomSimple, ");");
 							tl(3, "page.set", i18nGlobale.getString(I18n.var_RequeteSite), "_(", i18nGlobale.getString(I18n.var_requeteSite), ");");
 							tl(3, "page.set", i18nGlobale.getString(I18n.var_RequeteService), "(", i18nGlobale.getString(I18n.var_requeteSite), ".get", i18nGlobale.getString(I18n.var_RequeteService), "()", ");");
+							tl(3, "page.setWebClient(webClient);");
+							tl(3, "page.setVertx(vertx);");
 							tl(3, "page.", i18nGlobale.getString(I18n.var_promesseLoin), classePageNomSimpleMethode, "(", i18nGlobale.getString(I18n.var_requeteSite), ").onSuccess(a -> {");
 							tl(4, "try {");
 							tl(5, "JsonObject ctx = ComputateConfigKeys.getPageContext(config);");