Skip to content

Commit de1f1c4

Browse files
computatecomputate
committed
Fixing bugs with Solr SSL
1 parent 190496c commit de1f1c4

File tree

4 files changed

+69
-19
lines changed

4 files changed

+69
-19
lines changed

‎src/main/java/org/computate/vertx/config/ComputateConfigKeys.java‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@
1818
*/
1919
public class ComputateConfigKeys {
2020

21+
/**
22+
* API counter fetch SitePage
23+
*/
24+
public static final String API_COUNTER_FETCH_SitePage = "API_COUNTER_FETCH_SitePage";
25+
26+
/**
27+
* API counter fetch SiteHtm
28+
*/
29+
public static final String API_COUNTER_FETCH_SiteHtm = "API_COUNTER_FETCH_SiteHtm";
30+
2131
/**
2232
*
2333
**/
@@ -379,10 +389,25 @@ public class ComputateConfigKeys {
379389
public static final String SOLR_SSL = "SOLR_SSL";
380390

381391
/**
382-
* The Solr computate collection.
392+
* The hostname to the computate SOLR search engine.
393+
**/
394+
public static final String SOLR_HOST_NAME_COMPUTATE = "SOLR_HOST_NAME_COMPUTATE";
395+
396+
/**
397+
* The port to the computate SOLR search engine.
398+
**/
399+
public static final String SOLR_PORT_COMPUTATE = "SOLR_PORT_COMPUTATE";
400+
401+
/**
402+
* The computate Solr collection.
383403
**/
384404
public static final String SOLR_COLLECTION_COMPUTATE = "SOLR_COLLECTION_COMPUTATE";
385405

406+
/**
407+
* Whether computate Solr uses SSL.
408+
**/
409+
public static final String SOLR_SSL_COMPUTATE = "SOLR_SSL_COMPUTATE";
410+
386411
/**
387412
* The path to the computate source code.
388413
**/
@@ -574,6 +599,11 @@ public class ComputateConfigKeys {
574599
**/
575600
public static final String VERTX_MAX_EVENT_LOOP_EXECUTE_TIME = "VERTX_MAX_EVENT_LOOP_EXECUTE_TIME";
576601

602+
/**
603+
*
604+
**/
605+
public static final String VERTX_MAX_WORKER_EXECUTE_TIME = "VERTX_MAX_WORKER_EXECUTE_TIME";
606+
577607
/**
578608
*
579609
**/

‎src/main/java/org/computate/vertx/openapi/Swagger2Generator.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,10 @@ public Future<Void> loadClasses() {
302302
searchClasses.sortAsc("partNumero_indexed_int");
303303
searchClasses.initDeepForClass(siteRequest_);
304304

305-
String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME);
306-
Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT);
305+
String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME_COMPUTATE);
306+
Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT_COMPUTATE);
307307
String solrCollection = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_COLLECTION_COMPUTATE);
308-
Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL);
308+
Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL_COMPUTATE);
309309
String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, searchClasses.getQueryString());
310310
siteRequest_.getWebClient().get(solrPort, solrHostName, solrRequestUri).ssl(solrSsl).send().onSuccess(a -> {
311311
try {
@@ -394,10 +394,10 @@ public Future<List<SolrResponse.Doc>> loadEntities(ComputateEnUSClass classDoc,
394394
searchEntities.sortAsc("partNumero_indexed_int");
395395
searchEntities.initDeepForClass(siteRequest_);
396396

397-
String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME);
398-
Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT);
397+
String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME_COMPUTATE);
398+
Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT_COMPUTATE);
399399
String solrCollection = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_COLLECTION_COMPUTATE);
400-
Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL);
400+
Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL_COMPUTATE);
401401
String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, searchEntities.getQueryString());
402402
siteRequest_.getWebClient().get(solrPort, solrHostName, solrRequestUri).ssl(solrSsl).send().onSuccess(a -> {
403403
try {
@@ -448,10 +448,10 @@ public Future<Void> loadSql1() {
448448
searchClasses.sortAsc("sqlSort_indexed_int");
449449
searchClasses.initDeepForClass(siteRequest_);
450450

451-
String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME);
452-
Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT);
451+
String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME_COMPUTATE);
452+
Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT_COMPUTATE);
453453
String solrCollection = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_COLLECTION_COMPUTATE);
454-
Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL);
454+
Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL_COMPUTATE);
455455
String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, searchClasses.getQueryString());
456456
siteRequest_.getWebClient().get(solrPort, solrHostName, solrRequestUri).ssl(solrSsl).send().onSuccess(a -> {
457457
try {
@@ -499,10 +499,10 @@ public Future<Void> loadSql1(List<SolrResponse.Doc> docs, Integer i) {
499499
searchClasses.sortAsc("partNumero_indexed_int");
500500
searchClasses.initDeepForClass(siteRequest_);
501501

502-
String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME);
503-
Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT);
502+
String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME_COMPUTATE);
503+
Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT_COMPUTATE);
504504
String solrCollection = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_COLLECTION_COMPUTATE);
505-
Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL);
505+
Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL_COMPUTATE);
506506
String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, searchClasses.getQueryString());
507507
siteRequest_.getWebClient().get(solrPort, solrHostName, solrRequestUri).ssl(solrSsl).send().onSuccess(a -> {
508508
try {
@@ -561,10 +561,10 @@ public Future<Void> loadSql2() {
561561
searchClasses.fq("entiteAttribuerTypeJson_indexed_string:array");
562562
searchClasses.initDeepForClass(siteRequest_);
563563

564-
String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME);
565-
Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT);
564+
String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME_COMPUTATE);
565+
Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT_COMPUTATE);
566566
String solrCollection = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_COLLECTION_COMPUTATE);
567-
Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL);
567+
Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL_COMPUTATE);
568568
String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, searchClasses.getQueryString());
569569
siteRequest_.getWebClient().get(solrPort, solrHostName, solrRequestUri).ssl(solrSsl).send().onSuccess(a -> {
570570
try {
@@ -666,10 +666,10 @@ public Future<Void> loadArticle() {
666666
searchClasses.sortAsc("partNumero_indexed_int");
667667
searchClasses.initDeepForClass(siteRequest_);
668668

669-
String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME);
670-
Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT);
669+
String solrHostName = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_HOST_NAME_COMPUTATE);
670+
Integer solrPort = siteRequest_.getConfig().getInteger(ComputateConfigKeys.SOLR_PORT_COMPUTATE);
671671
String solrCollection = siteRequest_.getConfig().getString(ComputateConfigKeys.SOLR_COLLECTION_COMPUTATE);
672-
Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL);
672+
Boolean solrSsl = siteRequest_.getConfig().getBoolean(ComputateConfigKeys.SOLR_SSL_COMPUTATE);
673673
String solrRequestUri = String.format("/solr/%s/select%s", solrCollection, searchClasses.getQueryString());
674674
siteRequest_.getWebClient().get(solrPort, solrHostName, solrRequestUri).ssl(solrSsl).send().onSuccess(a -> {
675675
try {

‎src/main/java/org/computate/vertx/tool/VertxTool.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package org.computate.vertx.tool;
22

3+
import java.text.Normalizer;
34
import java.util.List;
45
import java.util.stream.Collectors;
56

7+
import org.apache.commons.lang3.StringUtils;
68
import org.slf4j.Logger;
79
import org.slf4j.LoggerFactory;
810

@@ -41,4 +43,20 @@ public static Future<Void> importFutures(List<Future> futures, Long i, Long rows
4143
}
4244
return promise.future();
4345
}
46+
47+
/**
48+
* Description: A helper method for generating a URL friendly unique ID for this object
49+
*/
50+
public String toId(String s) {
51+
if(s != null) {
52+
s = Normalizer.normalize(s, Normalizer.Form.NFD);
53+
s = StringUtils.lowerCase(s);
54+
s = StringUtils.trim(s);
55+
s = StringUtils.replacePattern(s, "\\s{1,}", "-");
56+
s = StringUtils.replacePattern(s, "[^\\w-]", "");
57+
s = StringUtils.replacePattern(s, "-{2,}", "-");
58+
}
59+
60+
return s;
61+
}
4462
}

‎src/main/java/org/computate/vertx/writer/ApiWriter.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,8 @@ public void writeEntitySchema(Integer numberTabs, AllWriter w, String apiReques
321321
w.tl(4 + tabsSchema + numberTabs, "set", entityVarCapitalized, ":");
322322
w.tl(5 + tabsSchema + numberTabs, "type: ", entityJsonType);
323323
w.tl(5 + tabsSchema + numberTabs, "nullable: true");
324+
if(entityMin != null)
325+
w.tl(5 + tabsSchema + numberTabs, String.format("minimum: %s", entityMin));
324326
if(entityListJsonType == null && entityOptionsVar != null && entityOptionsDescription != null && entityOptionsVar.size() > 0 && entityOptionsDescription.size() == entityOptionsVar.size()) {
325327
w.tl(5 + tabsSchema + numberTabs, "enum:");
326328
for(String entiteOptionVar : entityOptionsVar) {

0 commit comments

Comments
 (0)