Skip to content

Commit 353a136

Browse files
committed
Fixing the search API pivot and stats response format
1 parent 217f80e commit 353a136

16 files changed

+2299
-1407
lines changed

bin/touch.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ touch ~/.local/src/computate-vertx/src/main/java/org/computate/vertx/model/user/
1010
touch ~/.local/src/computate-vertx/src/main/java/org/computate/vertx/openapi/OpenApi3Generator.java
1111
touch ~/.local/src/computate-vertx/src/main/java/org/computate/vertx/openapi/Swagger2Generator.java
1212
touch ~/.local/src/computate-vertx/src/main/java/org/computate/vertx/request/ComputateSiteRequest.java
13+
touch ~/.local/src/computate-vertx/src/main/java/org/computate/vertx/result/java/ComputateJavaClass.java
1314
touch ~/.local/src/computate-vertx/src/main/java/org/computate/vertx/search/list/SearchList.java
1415
touch ~/.local/src/computate-vertx/src/main/java/org/computate/vertx/search/list/SearchResult.java
1516
touch ~/.local/src/computate-vertx/src/main/java/org/computate/vertx/serialize/pgclient/PgClientPointDeserializer.java

src/gen/java/org/computate/vertx/api/ApiRequestGen.java

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,20 @@
6262
import io.vertx.core.Future;
6363

6464
/**
65-
* <h1>Suggestions that can generate more code for you: </h1>
66-
* <ol>
67-
* <li>You can add a class comment "{@inheritDoc}" if you wish to inherit the helpful inherited class comments from class ApiRequestGen into the class ApiRequest.
68-
* </li>
65+
<ol>
66+
<li>You can add a class comment <b>"Api: true"</b> if you wish to GET, POST, PATCH or PUT these ApiRequest objects in a RESTful API.
67+
</li>
68+
<li>You can add a class comment "{@inheritDoc}" if you wish to inherit the helpful inherited class comments from class ApiRequestGen into the class ApiRequest.
69+
</li>
70+
0<h3>Suggestions that can generate more code for you: </h3></ol>
6971
* <li>You can add a class comment <b>"Api: true"</b> if you wish to GET, POST, PATCH or PUT these ApiRequest objects in a RESTful API.
7072
* </li>
71-
* </ol>
72-
* <h1>About the ApiRequest class and it's generated class ApiRequestGen&lt;Object&gt;: </h1>
73+
* <li>You can add a class comment "{@inheritDoc}" if you wish to inherit the helpful inherited class comments from class ApiRequestGen into the class ApiRequest.
74+
* </li>
75+
* 0<h3>Suggestions that can generate more code for you: </h3>
76+
* <h3>About the ApiRequest class and it's generated class ApiRequestGen&lt;Object&gt;: </h3>extends ApiRequestGen
7377
* <p>
74-
* This Java class extends a generated Java class built by the <a href="https://github.com/computate-org/computate">https://github.com/computate-org/computate</a> project.
78+
* This Java class extends a generated Java class ApiRequestGen built by the <a href="https://github.com/computate-org/computate">https://github.com/computate-org/computate</a> project.
7579
* Whenever this Java class is modified or touched, the watch service installed as described in the README, indexes all the information about this Java class in a local Apache Solr Search Engine.
7680
* If you are running the service, you can see the indexed data about this Java Class here:
7781
* </p>
@@ -80,6 +84,27 @@
8084
* The extended class ending with "Gen" did not exist at first, but was automatically created by the same watch service based on the data retrieved from the local Apache Server search engine.
8185
* The extended class contains many generated fields, getters, setters, initialization code, and helper methods to help build a website and API fast, reactive, and scalable.
8286
* </p>
87+
* extends ApiRequestGen<Object>
88+
* <p>This <code>class ApiRequest extends ApiRequestGen&lt;Object&gt;</code>, which means it extends a newly generated ApiRequestGen.
89+
* The generated <code>class ApiRequestGen extends Object</code> which means that ApiRequest extends ApiRequestGen which extends Object.
90+
* This generated inheritance is a powerful feature that allows a lot of boiler plate code to be created for you automatically while still preserving inheritance through the power of Java Generic classes.
91+
* </p>
92+
* Api: true
93+
* ApiTag.enUS: null
94+
* ApiUri.enUS: null
95+
* Color: null
96+
* IconGroup: null
97+
* IconName: null
98+
* Indexed: true
99+
* {@inheritDoc}
100+
* <p>By adding a class comment "{@inheritDoc}", the ApiRequest class will inherit the helpful inherited class comments from the super class ApiRequestGen.
101+
* </p>
102+
* Rows: null
103+
* Model: true
104+
* Page: true
105+
* SuperPage.enUS: null
106+
* Promise: true
107+
* AName: null
83108
* <p>
84109
* Delete the class ApiRequest in Solr:
85110
* curl 'http://localhost:8983/solr/computate/update?commitWithin=1000&overwrite=true&wt=json' -X POST -H 'Content-type: text/xml' --data-raw '&lt;add&gt;&lt;delete&gt;&lt;query&gt;classeNomCanonique_enUS_indexed_string:org.computate.vertx.api.ApiRequest&lt;/query&gt;&lt;/delete&gt;&lt;/add&gt;'
@@ -100,6 +125,7 @@ public abstract class ApiRequestGen<DEV> extends Object {
100125
// siteRequest_ //
101126
//////////////////
102127

128+
103129
/** The entity siteRequest_
104130
* is defined as null before being initialized.
105131
*/
@@ -138,6 +164,7 @@ protected ApiRequest siteRequest_Init() {
138164
// created //
139165
/////////////
140166

167+
141168
/** The entity created
142169
* is defined as null before being initialized.
143170
*/
@@ -211,6 +238,7 @@ public static String staticSearchFqCreated(ComputateSiteRequest siteRequest_, St
211238
// rows //
212239
//////////
213240

241+
214242
/** The entity rows
215243
* is defined as null before being initialized.
216244
*/
@@ -268,6 +296,7 @@ public static String staticSearchFqRows(ComputateSiteRequest siteRequest_, Strin
268296
// numFound //
269297
//////////////
270298

299+
271300
/** The entity numFound
272301
* is defined as null before being initialized.
273302
*/
@@ -325,6 +354,7 @@ public static String staticSearchFqNumFound(ComputateSiteRequest siteRequest_, S
325354
// numPATCH //
326355
//////////////
327356

357+
328358
/** The entity numPATCH
329359
* is defined as null before being initialized.
330360
*/
@@ -382,6 +412,7 @@ public static String staticSearchFqNumPATCH(ComputateSiteRequest siteRequest_, S
382412
// uuid //
383413
//////////
384414

415+
385416
/** The entity uuid
386417
* is defined as null before being initialized.
387418
*/
@@ -431,6 +462,7 @@ public static String staticSearchFqUuid(ComputateSiteRequest siteRequest_, Strin
431462
// id //
432463
////////
433464

465+
434466
/** The entity id
435467
* is defined as null before being initialized.
436468
*/
@@ -480,6 +512,7 @@ public static String staticSearchFqId(ComputateSiteRequest siteRequest_, String
480512
// pk //
481513
////////
482514

515+
483516
/** The entity pk
484517
* is defined as null before being initialized.
485518
*/
@@ -537,6 +570,7 @@ public static String staticSearchFqPk(ComputateSiteRequest siteRequest_, String
537570
// original //
538571
//////////////
539572

573+
540574
/** The entity original
541575
* is defined as null before being initialized.
542576
*/
@@ -575,6 +609,7 @@ protected ApiRequest originalInit() {
575609
// pks //
576610
/////////
577611

612+
578613
/** The entity pks
579614
* It is constructed before being initialized with the constructor by default.
580615
*/
@@ -657,6 +692,7 @@ public static String staticSearchFqPks(ComputateSiteRequest siteRequest_, String
657692
// classes //
658693
/////////////
659694

695+
660696
/** The entity classes
661697
* It is constructed before being initialized with the constructor by default.
662698
*/
@@ -723,6 +759,7 @@ public static String staticSearchFqClasses(ComputateSiteRequest siteRequest_, St
723759
// vars //
724760
//////////
725761

762+
726763
/** The entity vars
727764
* It is constructed before being initialized with the constructor by default.
728765
*/
@@ -789,6 +826,7 @@ public static String staticSearchFqVars(ComputateSiteRequest siteRequest_, Strin
789826
// timeRemaining //
790827
///////////////////
791828

829+
792830
/** The entity timeRemaining
793831
* is defined as null before being initialized.
794832
*/
@@ -834,6 +872,7 @@ public static String staticSearchFqTimeRemaining(ComputateSiteRequest siteReques
834872
return ApiRequest.staticSearchStrTimeRemaining(siteRequest_, ApiRequest.staticSearchTimeRemaining(siteRequest_, ApiRequest.staticSetTimeRemaining(siteRequest_, o)));
835873
}
836874

875+
837876
//////////////
838877
// initDeep //
839878
//////////////

src/gen/java/org/computate/vertx/openapi/OpenApi3GeneratorGen.java

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,16 @@
4949
import io.vertx.core.json.JsonArray;
5050

5151
/**
52-
* <h1>Suggestions that can generate more code for you: </h1>
53-
* <ol>
52+
<ol>
53+
<li>You can add a class comment <b>"Api: true"</b> if you wish to GET, POST, PATCH or PUT these OpenApi3Generator objects in a RESTful API.
54+
</li>
55+
0<h3>Suggestions that can generate more code for you: </h3></ol>
5456
* <li>You can add a class comment <b>"Api: true"</b> if you wish to GET, POST, PATCH or PUT these OpenApi3Generator objects in a RESTful API.
5557
* </li>
56-
* </ol>
57-
* <h1>About the OpenApi3Generator class and it's generated class OpenApi3GeneratorGen&lt;Swagger2Generator&gt;: </h1>
58+
* 0<h3>Suggestions that can generate more code for you: </h3>
59+
* <h3>About the OpenApi3Generator class and it's generated class OpenApi3GeneratorGen&lt;Swagger2Generator&gt;: </h3>extends OpenApi3GeneratorGen
5860
* <p>
59-
* This Java class extends a generated Java class built by the <a href="https://github.com/computate-org/computate">https://github.com/computate-org/computate</a> project.
61+
* This Java class extends a generated Java class OpenApi3GeneratorGen built by the <a href="https://github.com/computate-org/computate">https://github.com/computate-org/computate</a> project.
6062
* Whenever this Java class is modified or touched, the watch service installed as described in the README, indexes all the information about this Java class in a local Apache Solr Search Engine.
6163
* If you are running the service, you can see the indexed data about this Java Class here:
6264
* </p>
@@ -65,6 +67,27 @@
6567
* The extended class ending with "Gen" did not exist at first, but was automatically created by the same watch service based on the data retrieved from the local Apache Server search engine.
6668
* The extended class contains many generated fields, getters, setters, initialization code, and helper methods to help build a website and API fast, reactive, and scalable.
6769
* </p>
70+
* extends OpenApi3GeneratorGen<Swagger2Generator>
71+
* <p>This <code>class OpenApi3Generator extends OpenApi3GeneratorGen&lt;Swagger2Generator&gt;</code>, which means it extends a newly generated OpenApi3GeneratorGen.
72+
* The generated <code>class OpenApi3GeneratorGen extends Swagger2Generator</code> which means that OpenApi3Generator extends OpenApi3GeneratorGen which extends Swagger2Generator.
73+
* This generated inheritance is a powerful feature that allows a lot of boiler plate code to be created for you automatically while still preserving inheritance through the power of Java Generic classes.
74+
* </p>
75+
* Api: true
76+
* ApiTag.enUS: null
77+
* ApiUri.enUS: null
78+
* Color: null
79+
* IconGroup: null
80+
* IconName: null
81+
* Indexed: true
82+
* {@inheritDoc}
83+
* <p>By adding a class comment "{@inheritDoc}", the OpenApi3Generator class will inherit the helpful inherited class comments from the super class OpenApi3GeneratorGen.
84+
* </p>
85+
* Rows: null
86+
* Model: true
87+
* Page: true
88+
* SuperPage.enUS: null
89+
* Promise: true
90+
* AName: null
6891
* <p>
6992
* Delete the class OpenApi3Generator in Solr:
7093
* curl 'http://localhost:8983/solr/computate/update?commitWithin=1000&overwrite=true&wt=json' -X POST -H 'Content-type: text/xml' --data-raw '&lt;add&gt;&lt;delete&gt;&lt;query&gt;classeNomCanonique_enUS_indexed_string:org.computate.vertx.openapi.OpenApi3Generator&lt;/query&gt;&lt;/delete&gt;&lt;/add&gt;'
@@ -81,6 +104,7 @@
81104
public abstract class OpenApi3GeneratorGen<DEV> extends Swagger2Generator {
82105
protected static final Logger LOG = LoggerFactory.getLogger(OpenApi3Generator.class);
83106

107+
84108
//////////////
85109
// initDeep //
86110
//////////////

0 commit comments

Comments
 (0)