Fixing bugs with Solr SSL

computate-org · Jun 8, 2023 · de1f1c4 · de1f1c4
1 parent 190496c
commit de1f1c4
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 19 deletions.
diff --git a/src/main/java/org/computate/vertx/config/ComputateConfigKeys.java b/src/main/java/org/computate/vertx/config/ComputateConfigKeys.java
@@ -18,6 +18,16 @@
  */
 public class ComputateConfigKeys {
 
+	/**
+	 * API counter fetch SitePage
+	 */
+	public static final String API_COUNTER_FETCH_SitePage = "API_COUNTER_FETCH_SitePage";
+
+	/**
+	 * API counter fetch SiteHtm
+	 */
+	public static final String API_COUNTER_FETCH_SiteHtm = "API_COUNTER_FETCH_SiteHtm";
+
 	/**
 	 * 
 	 **/
@@ -379,10 +389,25 @@ public class ComputateConfigKeys {
 	public static final String SOLR_SSL = "SOLR_SSL";
 
 	/**
-	 * The Solr computate collection. 
+	 * The hostname to the computate SOLR search engine. 
+	 **/
+	public static final String SOLR_HOST_NAME_COMPUTATE = "SOLR_HOST_NAME_COMPUTATE";
+
+	/**
+	 * The port to the computate SOLR search engine. 
+	 **/
+	public static final String SOLR_PORT_COMPUTATE = "SOLR_PORT_COMPUTATE";
+
+	/**
+	 * The computate Solr collection. 
 	 **/
 	public static final String SOLR_COLLECTION_COMPUTATE = "SOLR_COLLECTION_COMPUTATE";
 
+	/**
+	 * Whether computate Solr uses SSL. 
+	 **/
+	public static final String SOLR_SSL_COMPUTATE = "SOLR_SSL_COMPUTATE";
+
 	/**
 	 * The path to the computate source code. 
 	 **/
@@ -574,6 +599,11 @@ public class ComputateConfigKeys {
 	 **/
 	public static final String VERTX_MAX_EVENT_LOOP_EXECUTE_TIME = "VERTX_MAX_EVENT_LOOP_EXECUTE_TIME";
 
+	/**
+	 * 
+	 **/
+	public static final String VERTX_MAX_WORKER_EXECUTE_TIME = "VERTX_MAX_WORKER_EXECUTE_TIME";
+
 	/**
 	 * 
 	 **/

diff --git a/src/main/java/org/computate/vertx/openapi/Swagger2Generator.java b/src/main/java/org/computate/vertx/openapi/Swagger2Generator.java
@@ -302,10 +302,10 @@ public Future<Void> loadClasses() {
 			searchClasses.sortAsc("partNumero_indexed_int");
 			searchClasses.initDeepForClass(siteRequest_);
 
-			String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME);
-			Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT);
+			String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME_COMPUTATE);
+			Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT_COMPUTATE);
 			String solrCollection = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_COLLECTION_COMPUTATE);
-			Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL);
+			Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL_COMPUTATE);
 			String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, searchClasses.getQueryString());
 			siteRequest_.getWebClient().get(solrPort, solrHostName, solrRequestUri).ssl(solrSsl).send().onSuccess(a -> {
 				try {
@@ -394,10 +394,10 @@ public Future<List<SolrResponse.Doc>> loadEntities(ComputateEnUSClass classDoc,
 			searchEntities.sortAsc("partNumero_indexed_int");
 			searchEntities.initDeepForClass(siteRequest_);
 
-			String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME);
-			Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT);
+			String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME_COMPUTATE);
+			Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT_COMPUTATE);
 			String solrCollection = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_COLLECTION_COMPUTATE);
-			Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL);
+			Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL_COMPUTATE);
 			String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, searchEntities.getQueryString());
 			siteRequest_.getWebClient().get(solrPort, solrHostName, solrRequestUri).ssl(solrSsl).send().onSuccess(a -> {
 				try {
@@ -448,10 +448,10 @@ public Future<Void> loadSql1() {
 			searchClasses.sortAsc("sqlSort_indexed_int");
 			searchClasses.initDeepForClass(siteRequest_);
 
-			String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME);
-			Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT);
+			String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME_COMPUTATE);
+			Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT_COMPUTATE);
 			String solrCollection = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_COLLECTION_COMPUTATE);
-			Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL);
+			Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL_COMPUTATE);
 			String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, searchClasses.getQueryString());
 			siteRequest_.getWebClient().get(solrPort, solrHostName, solrRequestUri).ssl(solrSsl).send().onSuccess(a -> {
 				try {
@@ -499,10 +499,10 @@ public Future<Void> loadSql1(List<SolrResponse.Doc> docs, Integer i) {
 				searchClasses.sortAsc("partNumero_indexed_int");
 				searchClasses.initDeepForClass(siteRequest_);
 
-				String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME);
-				Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT);
+				String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME_COMPUTATE);
+				Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT_COMPUTATE);
 				String solrCollection = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_COLLECTION_COMPUTATE);
-				Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL);
+				Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL_COMPUTATE);
 				String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, searchClasses.getQueryString());
 				siteRequest_.getWebClient().get(solrPort, solrHostName, solrRequestUri).ssl(solrSsl).send().onSuccess(a -> {
 					try {
@@ -561,10 +561,10 @@ public Future<Void> loadSql2() {
 			searchClasses.fq("entiteAttribuerTypeJson_indexed_string:array");
 			searchClasses.initDeepForClass(siteRequest_);
 
-			String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME);
-			Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT);
+			String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME_COMPUTATE);
+			Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT_COMPUTATE);
 			String solrCollection = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_COLLECTION_COMPUTATE);
-			Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL);
+			Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL_COMPUTATE);
 			String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, searchClasses.getQueryString());
 			siteRequest_.getWebClient().get(solrPort, solrHostName, solrRequestUri).ssl(solrSsl).send().onSuccess(a -> {
 				try {
@@ -666,10 +666,10 @@ public Future<Void> loadArticle() {
 			searchClasses.sortAsc("partNumero_indexed_int");
 			searchClasses.initDeepForClass(siteRequest_);
 
-			String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME);
-			Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT);
+			String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME_COMPUTATE);
+			Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT_COMPUTATE);
 			String solrCollection = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_COLLECTION_COMPUTATE);
-			Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL);
+			Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL_COMPUTATE);
 			String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, searchClasses.getQueryString());
 			siteRequest_.getWebClient().get(solrPort, solrHostName, solrRequestUri).ssl(solrSsl).send().onSuccess(a -> {
 				try {

diff --git a/src/main/java/org/computate/vertx/tool/VertxTool.java b/src/main/java/org/computate/vertx/tool/VertxTool.java
@@ -1,8 +1,10 @@
 package org.computate.vertx.tool;
 
+import java.text.Normalizer;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,4 +43,20 @@ public static Future<Void> importFutures(List<Future> futures, Long i, Long rows
 		}
 		return promise.future();
 	}
+
+	/**
+	 * Description: A helper method for generating a URL friendly unique ID for this object
+	 */
+	public String toId(String s) {
+		if(s != null) {
+			s = Normalizer.normalize(s, Normalizer.Form.NFD);
+			s = StringUtils.lowerCase(s);
+			s = StringUtils.trim(s);
+			s = StringUtils.replacePattern(s, "\\s{1,}", "-");
+			s = StringUtils.replacePattern(s, "[^\\w-]", "");
+			s = StringUtils.replacePattern(s, "-{2,}", "-");
+		}
+
+		return s;
+	}
 }
diff --git a/src/main/java/org/computate/vertx/writer/ApiWriter.java b/src/main/java/org/computate/vertx/writer/ApiWriter.java
@@ -321,6 +321,8 @@ public void  writeEntitySchema(Integer numberTabs, AllWriter w, String apiReques
 				w.tl(4 + tabsSchema + numberTabs, "set", entityVarCapitalized, ":");
 				w.tl(5 + tabsSchema + numberTabs, "type: ", entityJsonType);
 				w.tl(5 + tabsSchema + numberTabs, "nullable: true");
+				if(entityMin != null)
+				w.tl(5 + tabsSchema + numberTabs, String.format("minimum: %s", entityMin));
 				if(entityListJsonType == null && entityOptionsVar != null && entityOptionsDescription != null && entityOptionsVar.size() > 0 && entityOptionsDescription.size() == entityOptionsVar.size()) {
 					w.tl(5 + tabsSchema + numberTabs, "enum:");
 					for(String entiteOptionVar : entityOptionsVar) {