Skip to content

Commit 90bc2fd

Browse files
committed
Giving the o and var field of the Wrap a getter
1 parent 0e2167a commit 90bc2fd

18 files changed

+1816
-980
lines changed

bin/touch.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ touch ~/.local/src/computate-vertx/src/main/java/org/computate/vertx/verticle/Em
1919
touch ~/.local/src/computate-vertx/src/main/java/org/computate/vertx/writer/AllWriter.java
2020
touch ~/.local/src/computate-vertx/src/main/java/org/computate/vertx/writer/AllWriters.java
2121
touch ~/.local/src/computate-vertx/src/main/java/org/computate/vertx/writer/ApiWriter.java
22+
touch ~/.local/src/computate-vertx/src/main/java/org/computate/vertx/page/ComputatePageLayout.java

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

Lines changed: 63 additions & 35 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
* 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.
6060
* If you are running the service, you can see the indexed data about this Java Class here:
6161
* </p>
62-
* <p><a href="http://localhost:8983/solr/computate/select?q=*:*&fq=partEstClasse_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.openapi.OpenApi3Generator">Find the class OpenApi3Generator in Solr. </a></p>
62+
* <p><a href="https://solr-solr.apps-crc.testing/solr/computate/select?q=*:*&fq=partEstClasse_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.openapi.OpenApi3Generator">Find the class OpenApi3Generator in Solr. </a></p>
6363
* <p>
6464
* 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.
6565
* 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.
@@ -87,15 +87,15 @@
8787
* AName.enUS: null
8888
* <p>
8989
* Delete the class OpenApi3Generator in Solr:
90-
* 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;'
90+
* curl -k 'https://solr-solr.apps-crc.testing/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;'
9191
* </p>
9292
* <p>
9393
* Delete the package org.computate.vertx.openapi in Solr:
94-
* 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;classeNomEnsemble_enUS_indexed_string:org.computate.vertx.openapi&lt;/query&gt;&lt;/delete&gt;&lt;/add&gt;'
94+
* curl -k 'https://solr-solr.apps-crc.testing/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;classeNomEnsemble_enUS_indexed_string:org.computate.vertx.openapi&lt;/query&gt;&lt;/delete&gt;&lt;/add&gt;'
9595
* </p>
9696
* <p>
9797
* Delete the project computate-vertx in Solr:
98-
* 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;siteNom_indexed_string:computate\-vertx&lt;/query&gt;&lt;/delete&gt;&lt;/add&gt;'
98+
* curl -k 'https://solr-solr.apps-crc.testing/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;siteNom_indexed_string:computate\-vertx&lt;/query&gt;&lt;/delete&gt;&lt;/add&gt;'
9999
* </p>
100100
**/
101101
public abstract class OpenApi3GeneratorGen<DEV> extends Swagger2Generator {

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

Lines changed: 108 additions & 58 deletions
Large diffs are not rendered by default.

src/gen/java/org/computate/vertx/page/ComputatePageLayoutGen.java

Lines changed: 327 additions & 189 deletions
Large diffs are not rendered by default.

src/gen/java/org/computate/vertx/result/java/ComputateJavaClassGen.java

Lines changed: 853 additions & 343 deletions
Large diffs are not rendered by default.

src/gen/java/org/computate/vertx/result/java/ComputateJavaClassGenPageGen.java

Lines changed: 52 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
* 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.
5252
* If you are running the service, you can see the indexed data about this Java Class here:
5353
* </p>
54-
* <p><a href="http://localhost:8983/solr/computate/select?q=*:*&fq=partEstClasse_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.result.java.ComputateJavaClassGenPage">Find the class ComputateJavaClassGenPage in Solr. </a></p>
54+
* <p><a href="https://solr-solr.apps-crc.testing/solr/computate/select?q=*:*&fq=partEstClasse_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.result.java.ComputateJavaClassGenPage">Find the class ComputateJavaClassGenPage in Solr. </a></p>
5555
* <p>
5656
* 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.
5757
* 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.
@@ -101,15 +101,15 @@
101101
* AName.enUS: null
102102
* <p>
103103
* Delete the class ComputateJavaClassGenPage in Solr:
104-
* 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.result.java.ComputateJavaClassGenPage&lt;/query&gt;&lt;/delete&gt;&lt;/add&gt;'
104+
* curl -k 'https://solr-solr.apps-crc.testing/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.result.java.ComputateJavaClassGenPage&lt;/query&gt;&lt;/delete&gt;&lt;/add&gt;'
105105
* </p>
106106
* <p>
107107
* Delete the package org.computate.vertx.result.java in Solr:
108-
* 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;classeNomEnsemble_enUS_indexed_string:org.computate.vertx.result.java&lt;/query&gt;&lt;/delete&gt;&lt;/add&gt;'
108+
* curl -k 'https://solr-solr.apps-crc.testing/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;classeNomEnsemble_enUS_indexed_string:org.computate.vertx.result.java&lt;/query&gt;&lt;/delete&gt;&lt;/add&gt;'
109109
* </p>
110110
* <p>
111111
* Delete the project computate-vertx in Solr:
112-
* 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;siteNom_indexed_string:computate\-vertx&lt;/query&gt;&lt;/delete&gt;&lt;/add&gt;'
112+
* curl -k 'https://solr-solr.apps-crc.testing/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;siteNom_indexed_string:computate\-vertx&lt;/query&gt;&lt;/delete&gt;&lt;/add&gt;'
113113
* </p>
114114
**/
115115
public abstract class ComputateJavaClassGenPageGen<DEV> extends ComputatePageLayout {
@@ -129,7 +129,7 @@ public abstract class ComputateJavaClassGenPageGen<DEV> extends ComputatePageLay
129129

130130
/** <br> The entity searchListComputateJavaClass_
131131
* is defined as null before being initialized.
132-
* <br><a href="http://localhost:8983/solr/computate/select?q=*:*&fq=partEstEntite_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.result.java.ComputateJavaClassGenPage&fq=entiteVar_enUS_indexed_string:searchListComputateJavaClass_">Find the entity searchListComputateJavaClass_ in Solr</a>
132+
* <br><a href="https://solr-solr.apps-crc.testing/solr/computate/select?q=*:*&fq=partEstEntite_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.result.java.ComputateJavaClassGenPage&fq=entiteVar_enUS_indexed_string:searchListComputateJavaClass_">Find the entity searchListComputateJavaClass_ in Solr</a>
133133
* <br>
134134
* @param w is for wrapping a value to assign to this entity during initialization.
135135
**/
@@ -149,7 +149,9 @@ protected ComputateJavaClassGenPage searchListComputateJavaClass_Init() {
149149
Wrap<SearchList<ComputateJavaClass>> searchListComputateJavaClass_Wrap = new Wrap<SearchList<ComputateJavaClass>>().var("searchListComputateJavaClass_");
150150
if(searchListComputateJavaClass_ == null) {
151151
_searchListComputateJavaClass_(searchListComputateJavaClass_Wrap);
152-
setSearchListComputateJavaClass_(searchListComputateJavaClass_Wrap.o);
152+
Optional.ofNullable(searchListComputateJavaClass_Wrap.getO()).ifPresent(o -> {
153+
setSearchListComputateJavaClass_(o);
154+
});
153155
}
154156
return (ComputateJavaClassGenPage)this;
155157
}
@@ -168,7 +170,7 @@ protected ComputateJavaClassGenPage searchListComputateJavaClass_Init() {
168170

169171
/** <br> The entity listComputateJavaClass
170172
* It is constructed before being initialized with the constructor by default.
171-
* <br><a href="http://localhost:8983/solr/computate/select?q=*:*&fq=partEstEntite_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.result.java.ComputateJavaClassGenPage&fq=entiteVar_enUS_indexed_string:listComputateJavaClass">Find the entity listComputateJavaClass in Solr</a>
173+
* <br><a href="https://solr-solr.apps-crc.testing/solr/computate/select?q=*:*&fq=partEstEntite_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.result.java.ComputateJavaClassGenPage&fq=entiteVar_enUS_indexed_string:listComputateJavaClass">Find the entity listComputateJavaClass in Solr</a>
172174
* <br>
173175
* @param l is the entity already constructed.
174176
**/
@@ -181,14 +183,33 @@ public JsonArray getListComputateJavaClass() {
181183
public void setListComputateJavaClass(JsonArray listComputateJavaClass) {
182184
this.listComputateJavaClass = listComputateJavaClass;
183185
}
186+
@JsonIgnore
187+
public void setListComputateJavaClass(String o) {
188+
this.listComputateJavaClass = ComputateJavaClassGenPage.staticSetListComputateJavaClass(siteRequest_, o);
189+
}
184190
public static JsonArray staticSetListComputateJavaClass(ComputateSiteRequest siteRequest_, String o) {
191+
if(o != null) {
192+
return new JsonArray(o);
193+
}
185194
return null;
186195
}
187196
protected ComputateJavaClassGenPage listComputateJavaClassInit() {
188197
_listComputateJavaClass(listComputateJavaClass);
189198
return (ComputateJavaClassGenPage)this;
190199
}
191200

201+
public static String staticSearchListComputateJavaClass(ComputateSiteRequest siteRequest_, JsonArray o) {
202+
return o.toString();
203+
}
204+
205+
public static String staticSearchStrListComputateJavaClass(ComputateSiteRequest siteRequest_, String o) {
206+
return o == null ? null : o.toString();
207+
}
208+
209+
public static String staticSearchFqListComputateJavaClass(ComputateSiteRequest siteRequest_, String o) {
210+
return ComputateJavaClassGenPage.staticSearchStrListComputateJavaClass(siteRequest_, ComputateJavaClassGenPage.staticSearchListComputateJavaClass(siteRequest_, ComputateJavaClassGenPage.staticSetListComputateJavaClass(siteRequest_, o)));
211+
}
212+
192213
/////////////////////////////
193214
// computateJavaClassCount //
194215
/////////////////////////////
@@ -204,7 +225,7 @@ protected ComputateJavaClassGenPage listComputateJavaClassInit() {
204225

205226
/** <br> The entity computateJavaClassCount
206227
* is defined as null before being initialized.
207-
* <br><a href="http://localhost:8983/solr/computate/select?q=*:*&fq=partEstEntite_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.result.java.ComputateJavaClassGenPage&fq=entiteVar_enUS_indexed_string:computateJavaClassCount">Find the entity computateJavaClassCount in Solr</a>
228+
* <br><a href="https://solr-solr.apps-crc.testing/solr/computate/select?q=*:*&fq=partEstEntite_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.result.java.ComputateJavaClassGenPage&fq=entiteVar_enUS_indexed_string:computateJavaClassCount">Find the entity computateJavaClassCount in Solr</a>
208229
* <br>
209230
* @param w is for wrapping a value to assign to this entity during initialization.
210231
**/
@@ -230,7 +251,9 @@ protected ComputateJavaClassGenPage computateJavaClassCountInit() {
230251
Wrap<Integer> computateJavaClassCountWrap = new Wrap<Integer>().var("computateJavaClassCount");
231252
if(computateJavaClassCount == null) {
232253
_computateJavaClassCount(computateJavaClassCountWrap);
233-
setComputateJavaClassCount(computateJavaClassCountWrap.o);
254+
Optional.ofNullable(computateJavaClassCountWrap.getO()).ifPresent(o -> {
255+
setComputateJavaClassCount(o);
256+
});
234257
}
235258
return (ComputateJavaClassGenPage)this;
236259
}
@@ -261,7 +284,7 @@ public static String staticSearchFqComputateJavaClassCount(ComputateSiteRequest
261284

262285
/** <br> The entity computateJavaClass_
263286
* is defined as null before being initialized.
264-
* <br><a href="http://localhost:8983/solr/computate/select?q=*:*&fq=partEstEntite_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.result.java.ComputateJavaClassGenPage&fq=entiteVar_enUS_indexed_string:computateJavaClass_">Find the entity computateJavaClass_ in Solr</a>
287+
* <br><a href="https://solr-solr.apps-crc.testing/solr/computate/select?q=*:*&fq=partEstEntite_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.result.java.ComputateJavaClassGenPage&fq=entiteVar_enUS_indexed_string:computateJavaClass_">Find the entity computateJavaClass_ in Solr</a>
265288
* <br>
266289
* @param w is for wrapping a value to assign to this entity during initialization.
267290
**/
@@ -281,7 +304,9 @@ protected ComputateJavaClassGenPage computateJavaClass_Init() {
281304
Wrap<ComputateJavaClass> computateJavaClass_Wrap = new Wrap<ComputateJavaClass>().var("computateJavaClass_");
282305
if(computateJavaClass_ == null) {
283306
_computateJavaClass_(computateJavaClass_Wrap);
284-
setComputateJavaClass_(computateJavaClass_Wrap.o);
307+
Optional.ofNullable(computateJavaClass_Wrap.getO()).ifPresent(o -> {
308+
setComputateJavaClass_(o);
309+
});
285310
}
286311
return (ComputateJavaClassGenPage)this;
287312
}
@@ -300,7 +325,7 @@ protected ComputateJavaClassGenPage computateJavaClass_Init() {
300325

301326
/** <br> The entity id
302327
* is defined as null before being initialized.
303-
* <br><a href="http://localhost:8983/solr/computate/select?q=*:*&fq=partEstEntite_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.result.java.ComputateJavaClassGenPage&fq=entiteVar_enUS_indexed_string:id">Find the entity id in Solr</a>
328+
* <br><a href="https://solr-solr.apps-crc.testing/solr/computate/select?q=*:*&fq=partEstEntite_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.result.java.ComputateJavaClassGenPage&fq=entiteVar_enUS_indexed_string:id">Find the entity id in Solr</a>
304329
* <br>
305330
* @param w is for wrapping a value to assign to this entity during initialization.
306331
**/
@@ -319,7 +344,9 @@ protected ComputateJavaClassGenPage idInit() {
319344
Wrap<String> idWrap = new Wrap<String>().var("id");
320345
if(id == null) {
321346
_id(idWrap);
322-
setId(idWrap.o);
347+
Optional.ofNullable(idWrap.getO()).ifPresent(o -> {
348+
setId(o);
349+
});
323350
}
324351
return (ComputateJavaClassGenPage)this;
325352
}
@@ -350,7 +377,7 @@ public static String staticSearchFqId(ComputateSiteRequest siteRequest_, String
350377

351378
/** <br> The entity pageUriComputateJavaClass
352379
* is defined as null before being initialized.
353-
* <br><a href="http://localhost:8983/solr/computate/select?q=*:*&fq=partEstEntite_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.result.java.ComputateJavaClassGenPage&fq=entiteVar_enUS_indexed_string:pageUriComputateJavaClass">Find the entity pageUriComputateJavaClass in Solr</a>
380+
* <br><a href="https://solr-solr.apps-crc.testing/solr/computate/select?q=*:*&fq=partEstEntite_indexed_boolean:true&fq=classeNomCanonique_enUS_indexed_string:org.computate.vertx.result.java.ComputateJavaClassGenPage&fq=entiteVar_enUS_indexed_string:pageUriComputateJavaClass">Find the entity pageUriComputateJavaClass in Solr</a>
354381
* <br>
355382
* @param c is for wrapping a value to assign to this entity during initialization.
356383
**/
@@ -369,7 +396,9 @@ protected ComputateJavaClassGenPage pageUriComputateJavaClassInit() {
369396
Wrap<String> pageUriComputateJavaClassWrap = new Wrap<String>().var("pageUriComputateJavaClass");
370397
if(pageUriComputateJavaClass == null) {
371398
_pageUriComputateJavaClass(pageUriComputateJavaClassWrap);
372-
setPageUriComputateJavaClass(pageUriComputateJavaClassWrap.o);
399+
Optional.ofNullable(pageUriComputateJavaClassWrap.getO()).ifPresent(o -> {
400+
setPageUriComputateJavaClass(o);
401+
});
373402
}
374403
return (ComputateJavaClassGenPage)this;
375404
}
@@ -517,6 +546,8 @@ public static Object staticSetForClass(String entityVar, ComputateSiteRequest si
517546
}
518547
public static Object staticSetComputateJavaClassGenPage(String entityVar, ComputateSiteRequest siteRequest_, String o) {
519548
switch(entityVar) {
549+
case "listComputateJavaClass":
550+
return ComputateJavaClassGenPage.staticSetListComputateJavaClass(siteRequest_, o);
520551
case "computateJavaClassCount":
521552
return ComputateJavaClassGenPage.staticSetComputateJavaClassCount(siteRequest_, o);
522553
case "id":
@@ -537,6 +568,8 @@ public static Object staticSearchForClass(String entityVar, ComputateSiteRequest
537568
}
538569
public static Object staticSearchComputateJavaClassGenPage(String entityVar, ComputateSiteRequest siteRequest_, Object o) {
539570
switch(entityVar) {
571+
case "listComputateJavaClass":
572+
return ComputateJavaClassGenPage.staticSearchListComputateJavaClass(siteRequest_, (JsonArray)o);
540573
case "computateJavaClassCount":
541574
return ComputateJavaClassGenPage.staticSearchComputateJavaClassCount(siteRequest_, (Integer)o);
542575
case "id":
@@ -557,6 +590,8 @@ public static String staticSearchStrForClass(String entityVar, ComputateSiteRequ
557590
}
558591
public static String staticSearchStrComputateJavaClassGenPage(String entityVar, ComputateSiteRequest siteRequest_, Object o) {
559592
switch(entityVar) {
593+
case "listComputateJavaClass":
594+
return ComputateJavaClassGenPage.staticSearchStrListComputateJavaClass(siteRequest_, (String)o);
560595
case "computateJavaClassCount":
561596
return ComputateJavaClassGenPage.staticSearchStrComputateJavaClassCount(siteRequest_, (Integer)o);
562597
case "id":
@@ -577,6 +612,8 @@ public static String staticSearchFqForClass(String entityVar, ComputateSiteReque
577612
}
578613
public static String staticSearchFqComputateJavaClassGenPage(String entityVar, ComputateSiteRequest siteRequest_, String o) {
579614
switch(entityVar) {
615+
case "listComputateJavaClass":
616+
return ComputateJavaClassGenPage.staticSearchFqListComputateJavaClass(siteRequest_, o);
580617
case "computateJavaClassCount":
581618
return ComputateJavaClassGenPage.staticSearchFqComputateJavaClassCount(siteRequest_, o);
582619
case "id":

0 commit comments

Comments
 (0)