diff --git a/src/gen/java/org/computate/smartvillage/enus/page/HomePageGen.java b/src/gen/java/org/computate/smartvillage/enus/page/HomePageGen.java
deleted file mode 100644
index 545dd968..00000000
--- a/src/gen/java/org/computate/smartvillage/enus/page/HomePageGen.java
+++ /dev/null
@@ -1,1270 +0,0 @@
-/*
- * Copyright (c) 2018-2022 Computate Limited Liability Company in Utah, USA,
- * and the Smarta Byar Smart Village FIWARE IHub.
- *
- * This program and the accompanying materials are made available under the
- * terms of the GNU GENERAL PUBLIC LICENSE Version 3 which is available at
- *
- * https://www.gnu.org/licenses/gpl-3.0.en.html
- *
- * You may not propagate or modify a covered work except as expressly provided
- * under this License. Any attempt otherwise to propagate or modify it is void,
- * and will automatically terminate your rights under this License (including
- * any patent licenses granted under the third paragraph of section 11).
- */
-package org.computate.smartvillage.enus.page;
-
-import org.computate.smartvillage.enus.request.SiteRequestEnUS;
-import org.computate.smartvillage.enus.model.base.BaseModel;
-import org.computate.vertx.api.ApiRequest;
-import org.computate.smartvillage.enus.config.ConfigKeys;
-import java.util.Optional;
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.computate.search.serialize.ComputateLocalDateSerializer;
-import org.computate.search.serialize.ComputateLocalDateDeserializer;
-import org.computate.search.serialize.ComputateZonedDateTimeSerializer;
-import org.computate.search.serialize.ComputateZonedDateTimeDeserializer;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import java.math.MathContext;
-import org.apache.commons.lang3.math.NumberUtils;
-import java.text.NumberFormat;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.HashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.math.RoundingMode;
-import java.util.Map;
-import org.computate.smartvillage.enus.page.PageLayout;
-import org.computate.vertx.search.list.SearchList;
-import org.computate.smartvillage.enus.model.page.SitePage;
-import java.lang.String;
-import java.time.ZoneId;
-import java.util.Locale;
-import io.vertx.core.json.JsonArray;
-import org.computate.search.response.solr.SolrResponse.Stats;
-import org.computate.search.response.solr.SolrResponse.FacetCounts;
-import java.lang.Integer;
-import org.computate.search.wrap.Wrap;
-import io.vertx.core.Promise;
-import io.vertx.core.Future;
-
-/**
- *
-Suggestions that can generate more code for you: *
- * You can add a class comment "Api: true" if you wish to GET, POST, PATCH or PUT these HomePage objects in a RESTful API.
- * You can add a class comment "{@inheritDoc}" if you wish to inherit the helpful inherited class comments from class HomePageGen into the class HomePage.
- *
- * About the HomePage class and it's generated class HomePageGen<PageLayout>: extends HomePageGen
- *
- * This Java class extends a generated Java class HomePageGen built by the https://github.com/computate-org/computate project.
- * 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.
- * If you are running the service, you can see the indexed data about this Java Class here:
- *
- * Find the class HomePage in Solr.
- *
- * 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.
- * 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.
- *
- * extends HomePageGen
- * This class HomePage extends HomePageGen<PageLayout>, which means it extends a newly generated HomePageGen.
- * The generated class HomePageGen extends PageLayout which means that HomePage extends HomePageGen which extends PageLayout.
- * 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.
- *
- * Api: true
- * ApiTag.enUS: true
- * ApiUri.enUS: null
- * Color: null
- * IconGroup: null
- * IconName: null
- * Indexed: true
- * {@inheritDoc}
- * By adding a class comment "{@inheritDoc}", the HomePage class will inherit the helpful inherited class comments from the super class HomePageGen.
- *
- * Rows: null
- * Model: true
- * Page: true
- * SuperPage.enUS: null
- * Promise: true
- *
- * This class contains a comment "Promise: true"
- * Sometimes a Java class must be initialized asynchronously when it involves calling a blocking API.
- * This means that the HomePage Java class has promiseDeep methods which must be initialized asynchronously as a Vert.x Promise instead of initDeep methods which are a simple non-asynchronous method.
- *
- *
- * Adding protected void methods beginning with an underscore with a Promise as the only parameter will automatically set `Promise: true`.
- *
- *
- *
- *
- * protected void _promiseBefore(Promise<Void> promise) {
- * promise.complete();
- * }
- *
- *
- *
- * Java classes with the `Model: true` will automatically set `Promise: true`.
- *
- *
- * If a super class of this Java class with `Model: true`, then the child class will also inherit `Promise: true`.
- *
- * AName.enUS: null
- *
- * Delete the class HomePage in Solr:
- * 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 '<add><delete><query>classeNomCanonique_enUS_indexed_string:org.computate.smartvillage.enus.page.HomePage</query></delete></add>'
- *
- *
- * Delete the package org.computate.smartvillage.enus.page in Solr:
- * 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 '<add><delete><query>classeNomEnsemble_enUS_indexed_string:org.computate.smartvillage.enus.page</query></delete></add>'
- *
- *
- * Delete the project smartvillage-platform in Solr:
- * 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 '<add><delete><query>siteNom_indexed_string:smartvillage\-platform</query></delete></add>'
- *
- * Generated: true
- **/
-public abstract class HomePageGen extends PageLayout {
- protected static final Logger LOG = LoggerFactory.getLogger(HomePage.class);
-
- ////////////////////////
- // searchListSitePage //
- ////////////////////////
-
-
- /** The entity searchListSitePage
- * is defined as null before being initialized.
- */
- @JsonIgnore
- @JsonInclude(Include.NON_NULL)
- protected SearchList searchListSitePage;
-
- /** Find the entity searchListSitePage in Solr
- * > promise);
-
- public SearchList getSearchListSitePage() {
- return searchListSitePage;
- }
-
- public void setSearchListSitePage(SearchList searchListSitePage) {
- this.searchListSitePage = searchListSitePage;
- }
- public static SearchList staticSetSearchListSitePage(SiteRequestEnUS siteRequest_, String o) {
- return null;
- }
- protected Future> searchListSitePagePromise() {
- Promise> promise = Promise.promise();
- Promise> promise2 = Promise.promise();
- _searchListSitePage(promise2);
- promise2.future().onSuccess(o -> {
- if(o != null && searchListSitePage == null) {
- o.promiseDeepForClass(siteRequest_).onSuccess(a -> {
- setSearchListSitePage(o);
- promise.complete(o);
- }).onFailure(ex -> {
- promise.fail(ex);
- });
- } else {
- promise.complete(o);
- }
- }).onFailure(ex -> {
- promise.fail(ex);
- });
- return promise.future();
- }
-
- //////////////////
- // pageResponse //
- //////////////////
-
-
- /** The entity pageResponse
- * is defined as null before being initialized.
- */
- @JsonProperty
- @JsonInclude(Include.NON_NULL)
- protected String pageResponse;
-
- /** Find the entity pageResponse in Solr
- * w);
-
- public String getPageResponse() {
- return pageResponse;
- }
- public void setPageResponse(String o) {
- this.pageResponse = HomePage.staticSetPageResponse(siteRequest_, o);
- }
- public static String staticSetPageResponse(SiteRequestEnUS siteRequest_, String o) {
- return o;
- }
- protected HomePage pageResponseInit() {
- Wrap pageResponseWrap = new Wrap().var("pageResponse");
- if(pageResponse == null) {
- _pageResponse(pageResponseWrap);
- Optional.ofNullable(pageResponseWrap.getO()).ifPresent(o -> {
- setPageResponse(o);
- });
- }
- return (HomePage)this;
- }
-
- public static String staticSearchPageResponse(SiteRequestEnUS siteRequest_, String o) {
- return o;
- }
-
- public static String staticSearchStrPageResponse(SiteRequestEnUS siteRequest_, String o) {
- return o == null ? null : o.toString();
- }
-
- public static String staticSearchFqPageResponse(SiteRequestEnUS siteRequest_, String o) {
- return HomePage.staticSearchStrPageResponse(siteRequest_, HomePage.staticSearchPageResponse(siteRequest_, HomePage.staticSetPageResponse(siteRequest_, o)));
- }
-
- ///////////////////
- // defaultZoneId //
- ///////////////////
-
-
- /** The entity defaultZoneId
- * is defined as null before being initialized.
- */
- @JsonProperty
- @JsonInclude(Include.NON_NULL)
- protected String defaultZoneId;
-
- /** Find the entity defaultZoneId in Solr
- * w);
-
- public String getDefaultZoneId() {
- return defaultZoneId;
- }
- public void setDefaultZoneId(String o) {
- this.defaultZoneId = HomePage.staticSetDefaultZoneId(siteRequest_, o);
- }
- public static String staticSetDefaultZoneId(SiteRequestEnUS siteRequest_, String o) {
- return o;
- }
- protected HomePage defaultZoneIdInit() {
- Wrap defaultZoneIdWrap = new Wrap().var("defaultZoneId");
- if(defaultZoneId == null) {
- _defaultZoneId(defaultZoneIdWrap);
- Optional.ofNullable(defaultZoneIdWrap.getO()).ifPresent(o -> {
- setDefaultZoneId(o);
- });
- }
- return (HomePage)this;
- }
-
- public static String staticSearchDefaultZoneId(SiteRequestEnUS siteRequest_, String o) {
- return o;
- }
-
- public static String staticSearchStrDefaultZoneId(SiteRequestEnUS siteRequest_, String o) {
- return o == null ? null : o.toString();
- }
-
- public static String staticSearchFqDefaultZoneId(SiteRequestEnUS siteRequest_, String o) {
- return HomePage.staticSearchStrDefaultZoneId(siteRequest_, HomePage.staticSearchDefaultZoneId(siteRequest_, HomePage.staticSetDefaultZoneId(siteRequest_, o)));
- }
-
- /////////////////////
- // defaultTimeZone //
- /////////////////////
-
-
- /** The entity defaultTimeZone
- * is defined as null before being initialized.
- */
- @JsonIgnore
- @JsonInclude(Include.NON_NULL)
- protected ZoneId defaultTimeZone;
-
- /** Find the entity defaultTimeZone in Solr
- * w);
-
- public ZoneId getDefaultTimeZone() {
- return defaultTimeZone;
- }
-
- public void setDefaultTimeZone(ZoneId defaultTimeZone) {
- this.defaultTimeZone = defaultTimeZone;
- }
- public static ZoneId staticSetDefaultTimeZone(SiteRequestEnUS siteRequest_, String o) {
- return null;
- }
- protected HomePage defaultTimeZoneInit() {
- Wrap defaultTimeZoneWrap = new Wrap().var("defaultTimeZone");
- if(defaultTimeZone == null) {
- _defaultTimeZone(defaultTimeZoneWrap);
- Optional.ofNullable(defaultTimeZoneWrap.getO()).ifPresent(o -> {
- setDefaultTimeZone(o);
- });
- }
- return (HomePage)this;
- }
-
- /////////////////////
- // defaultLocaleId //
- /////////////////////
-
-
- /** The entity defaultLocaleId
- * is defined as null before being initialized.
- */
- @JsonProperty
- @JsonInclude(Include.NON_NULL)
- protected String defaultLocaleId;
-
- /** Find the entity defaultLocaleId in Solr
- * w);
-
- public String getDefaultLocaleId() {
- return defaultLocaleId;
- }
- public void setDefaultLocaleId(String o) {
- this.defaultLocaleId = HomePage.staticSetDefaultLocaleId(siteRequest_, o);
- }
- public static String staticSetDefaultLocaleId(SiteRequestEnUS siteRequest_, String o) {
- return o;
- }
- protected HomePage defaultLocaleIdInit() {
- Wrap defaultLocaleIdWrap = new Wrap().var("defaultLocaleId");
- if(defaultLocaleId == null) {
- _defaultLocaleId(defaultLocaleIdWrap);
- Optional.ofNullable(defaultLocaleIdWrap.getO()).ifPresent(o -> {
- setDefaultLocaleId(o);
- });
- }
- return (HomePage)this;
- }
-
- public static String staticSearchDefaultLocaleId(SiteRequestEnUS siteRequest_, String o) {
- return o;
- }
-
- public static String staticSearchStrDefaultLocaleId(SiteRequestEnUS siteRequest_, String o) {
- return o == null ? null : o.toString();
- }
-
- public static String staticSearchFqDefaultLocaleId(SiteRequestEnUS siteRequest_, String o) {
- return HomePage.staticSearchStrDefaultLocaleId(siteRequest_, HomePage.staticSearchDefaultLocaleId(siteRequest_, HomePage.staticSetDefaultLocaleId(siteRequest_, o)));
- }
-
- ///////////////////
- // defaultLocale //
- ///////////////////
-
-
- /** The entity defaultLocale
- * is defined as null before being initialized.
- */
- @JsonIgnore
- @JsonInclude(Include.NON_NULL)
- protected Locale defaultLocale;
-
- /** Find the entity defaultLocale in Solr
- * w);
-
- public Locale getDefaultLocale() {
- return defaultLocale;
- }
-
- public void setDefaultLocale(Locale defaultLocale) {
- this.defaultLocale = defaultLocale;
- }
- public static Locale staticSetDefaultLocale(SiteRequestEnUS siteRequest_, String o) {
- return null;
- }
- protected HomePage defaultLocaleInit() {
- Wrap defaultLocaleWrap = new Wrap().var("defaultLocale");
- if(defaultLocale == null) {
- _defaultLocale(defaultLocaleWrap);
- Optional.ofNullable(defaultLocaleWrap.getO()).ifPresent(o -> {
- setDefaultLocale(o);
- });
- }
- return (HomePage)this;
- }
-
- //////////////////////////
- // defaultFieldListVars //
- //////////////////////////
-
-
- /** The entity defaultFieldListVars
- * It is constructed before being initialized with the constructor by default.
- */
- @JsonProperty
- @JsonFormat(shape = JsonFormat.Shape.ARRAY)
- @JsonInclude(Include.NON_NULL)
- protected List defaultFieldListVars = new ArrayList();
-
- /** Find the entity defaultFieldListVars in Solr
- * l);
-
- public List getDefaultFieldListVars() {
- return defaultFieldListVars;
- }
-
- public void setDefaultFieldListVars(List defaultFieldListVars) {
- this.defaultFieldListVars = defaultFieldListVars;
- }
- public void setDefaultFieldListVars(String o) {
- String l = HomePage.staticSetDefaultFieldListVars(siteRequest_, o);
- if(l != null)
- addDefaultFieldListVars(l);
- }
- public static String staticSetDefaultFieldListVars(SiteRequestEnUS siteRequest_, String o) {
- return o;
- }
- public HomePage addDefaultFieldListVars(String...objects) {
- for(String o : objects) {
- addDefaultFieldListVars(o);
- }
- return (HomePage)this;
- }
- public HomePage addDefaultFieldListVars(String o) {
- if(o != null)
- this.defaultFieldListVars.add(o);
- return (HomePage)this;
- }
- @JsonIgnore
- public void setDefaultFieldListVars(JsonArray objects) {
- defaultFieldListVars.clear();
- if(objects == null)
- return;
- for(int i = 0; i < objects.size(); i++) {
- String o = objects.getString(i);
- addDefaultFieldListVars(o);
- }
- }
- protected HomePage defaultFieldListVarsInit() {
- _defaultFieldListVars(defaultFieldListVars);
- return (HomePage)this;
- }
-
- public static String staticSearchDefaultFieldListVars(SiteRequestEnUS siteRequest_, String o) {
- return o;
- }
-
- public static String staticSearchStrDefaultFieldListVars(SiteRequestEnUS siteRequest_, String o) {
- return o == null ? null : o.toString();
- }
-
- public static String staticSearchFqDefaultFieldListVars(SiteRequestEnUS siteRequest_, String o) {
- return HomePage.staticSearchStrDefaultFieldListVars(siteRequest_, HomePage.staticSearchDefaultFieldListVars(siteRequest_, HomePage.staticSetDefaultFieldListVars(siteRequest_, o)));
- }
-
- //////////////////////
- // defaultStatsVars //
- //////////////////////
-
-
- /** The entity defaultStatsVars
- * It is constructed before being initialized with the constructor by default.
- */
- @JsonProperty
- @JsonFormat(shape = JsonFormat.Shape.ARRAY)
- @JsonInclude(Include.NON_NULL)
- protected List defaultStatsVars = new ArrayList();
-
- /** Find the entity defaultStatsVars in Solr
- * l);
-
- public List getDefaultStatsVars() {
- return defaultStatsVars;
- }
-
- public void setDefaultStatsVars(List defaultStatsVars) {
- this.defaultStatsVars = defaultStatsVars;
- }
- public void setDefaultStatsVars(String o) {
- String l = HomePage.staticSetDefaultStatsVars(siteRequest_, o);
- if(l != null)
- addDefaultStatsVars(l);
- }
- public static String staticSetDefaultStatsVars(SiteRequestEnUS siteRequest_, String o) {
- return o;
- }
- public HomePage addDefaultStatsVars(String...objects) {
- for(String o : objects) {
- addDefaultStatsVars(o);
- }
- return (HomePage)this;
- }
- public HomePage addDefaultStatsVars(String o) {
- if(o != null)
- this.defaultStatsVars.add(o);
- return (HomePage)this;
- }
- @JsonIgnore
- public void setDefaultStatsVars(JsonArray objects) {
- defaultStatsVars.clear();
- if(objects == null)
- return;
- for(int i = 0; i < objects.size(); i++) {
- String o = objects.getString(i);
- addDefaultStatsVars(o);
- }
- }
- protected HomePage defaultStatsVarsInit() {
- _defaultStatsVars(defaultStatsVars);
- return (HomePage)this;
- }
-
- public static String staticSearchDefaultStatsVars(SiteRequestEnUS siteRequest_, String o) {
- return o;
- }
-
- public static String staticSearchStrDefaultStatsVars(SiteRequestEnUS siteRequest_, String o) {
- return o == null ? null : o.toString();
- }
-
- public static String staticSearchFqDefaultStatsVars(SiteRequestEnUS siteRequest_, String o) {
- return HomePage.staticSearchStrDefaultStatsVars(siteRequest_, HomePage.staticSearchDefaultStatsVars(siteRequest_, HomePage.staticSetDefaultStatsVars(siteRequest_, o)));
- }
-
- //////////////////////
- // defaultPivotVars //
- //////////////////////
-
-
- /** The entity defaultPivotVars
- * It is constructed before being initialized with the constructor by default.
- */
- @JsonProperty
- @JsonFormat(shape = JsonFormat.Shape.ARRAY)
- @JsonInclude(Include.NON_NULL)
- protected List defaultPivotVars = new ArrayList();
-
- /** Find the entity defaultPivotVars in Solr
- * l);
-
- public List getDefaultPivotVars() {
- return defaultPivotVars;
- }
-
- public void setDefaultPivotVars(List defaultPivotVars) {
- this.defaultPivotVars = defaultPivotVars;
- }
- public void setDefaultPivotVars(String o) {
- String l = HomePage.staticSetDefaultPivotVars(siteRequest_, o);
- if(l != null)
- addDefaultPivotVars(l);
- }
- public static String staticSetDefaultPivotVars(SiteRequestEnUS siteRequest_, String o) {
- return o;
- }
- public HomePage addDefaultPivotVars(String...objects) {
- for(String o : objects) {
- addDefaultPivotVars(o);
- }
- return (HomePage)this;
- }
- public HomePage addDefaultPivotVars(String o) {
- if(o != null)
- this.defaultPivotVars.add(o);
- return (HomePage)this;
- }
- @JsonIgnore
- public void setDefaultPivotVars(JsonArray objects) {
- defaultPivotVars.clear();
- if(objects == null)
- return;
- for(int i = 0; i < objects.size(); i++) {
- String o = objects.getString(i);
- addDefaultPivotVars(o);
- }
- }
- protected HomePage defaultPivotVarsInit() {
- _defaultPivotVars(defaultPivotVars);
- return (HomePage)this;
- }
-
- public static String staticSearchDefaultPivotVars(SiteRequestEnUS siteRequest_, String o) {
- return o;
- }
-
- public static String staticSearchStrDefaultPivotVars(SiteRequestEnUS siteRequest_, String o) {
- return o == null ? null : o.toString();
- }
-
- public static String staticSearchFqDefaultPivotVars(SiteRequestEnUS siteRequest_, String o) {
- return HomePage.staticSearchStrDefaultPivotVars(siteRequest_, HomePage.staticSearchDefaultPivotVars(siteRequest_, HomePage.staticSetDefaultPivotVars(siteRequest_, o)));
- }
-
- //////////////////
- // listSitePage //
- //////////////////
-
-
- /** The entity listSitePage
- * It is constructed before being initialized with the constructor by default.
- */
- @JsonProperty
- @JsonInclude(Include.NON_NULL)
- protected JsonArray listSitePage = new JsonArray();
-
- /** Find the entity listSitePage in Solr
- * Find the entity stats in Solr
- * w);
-
- public Stats getStats() {
- return stats;
- }
-
- public void setStats(Stats stats) {
- this.stats = stats;
- }
- public static Stats staticSetStats(SiteRequestEnUS siteRequest_, String o) {
- return null;
- }
- protected HomePage statsInit() {
- Wrap statsWrap = new Wrap().var("stats");
- if(stats == null) {
- _stats(statsWrap);
- Optional.ofNullable(statsWrap.getO()).ifPresent(o -> {
- setStats(o);
- });
- }
- return (HomePage)this;
- }
-
- /////////////////
- // facetCounts //
- /////////////////
-
-
- /** The entity facetCounts
- * is defined as null before being initialized.
- */
- @JsonProperty
- @JsonInclude(Include.NON_NULL)
- protected FacetCounts facetCounts;
-
- /** Find the entity facetCounts in Solr
- * w);
-
- public FacetCounts getFacetCounts() {
- return facetCounts;
- }
-
- public void setFacetCounts(FacetCounts facetCounts) {
- this.facetCounts = facetCounts;
- }
- public static FacetCounts staticSetFacetCounts(SiteRequestEnUS siteRequest_, String o) {
- return null;
- }
- protected HomePage facetCountsInit() {
- Wrap facetCountsWrap = new Wrap().var("facetCounts");
- if(facetCounts == null) {
- _facetCounts(facetCountsWrap);
- Optional.ofNullable(facetCountsWrap.getO()).ifPresent(o -> {
- setFacetCounts(o);
- });
- }
- return (HomePage)this;
- }
-
- ///////////////////
- // sitePageCount //
- ///////////////////
-
-
- /** The entity sitePageCount
- * is defined as null before being initialized.
- */
- @JsonProperty
- @JsonSerialize(using = ToStringSerializer.class)
- @JsonInclude(Include.NON_NULL)
- protected Integer sitePageCount;
-
- /** Find the entity sitePageCount in Solr
- * w);
-
- public Integer getSitePageCount() {
- return sitePageCount;
- }
-
- public void setSitePageCount(Integer sitePageCount) {
- this.sitePageCount = sitePageCount;
- }
- @JsonIgnore
- public void setSitePageCount(String o) {
- this.sitePageCount = HomePage.staticSetSitePageCount(siteRequest_, o);
- }
- public static Integer staticSetSitePageCount(SiteRequestEnUS siteRequest_, String o) {
- if(NumberUtils.isParsable(o))
- return Integer.parseInt(o);
- return null;
- }
- protected HomePage sitePageCountInit() {
- Wrap sitePageCountWrap = new Wrap().var("sitePageCount");
- if(sitePageCount == null) {
- _sitePageCount(sitePageCountWrap);
- Optional.ofNullable(sitePageCountWrap.getO()).ifPresent(o -> {
- setSitePageCount(o);
- });
- }
- return (HomePage)this;
- }
-
- public static Integer staticSearchSitePageCount(SiteRequestEnUS siteRequest_, Integer o) {
- return o;
- }
-
- public static String staticSearchStrSitePageCount(SiteRequestEnUS siteRequest_, Integer o) {
- return o == null ? null : o.toString();
- }
-
- public static String staticSearchFqSitePageCount(SiteRequestEnUS siteRequest_, String o) {
- return HomePage.staticSearchStrSitePageCount(siteRequest_, HomePage.staticSearchSitePageCount(siteRequest_, HomePage.staticSetSitePageCount(siteRequest_, o)));
- }
-
- ///////////////
- // sitePages //
- ///////////////
-
-
- /** The entity sitePages
- * is defined as null before being initialized.
- */
- @JsonProperty
- @JsonFormat(shape = JsonFormat.Shape.ARRAY)
- @JsonInclude(Include.NON_NULL)
- protected List sitePages;
-
- /** Find the entity sitePages in Solr
- * > w);
-
- public List getSitePages() {
- return sitePages;
- }
-
- public void setSitePages(List sitePages) {
- this.sitePages = sitePages;
- }
- public static SitePage staticSetSitePages(SiteRequestEnUS siteRequest_, String o) {
- return null;
- }
- public HomePage addSitePages(SitePage...objects) {
- for(SitePage o : objects) {
- addSitePages(o);
- }
- return (HomePage)this;
- }
- public HomePage addSitePages(SitePage o) {
- if(o != null)
- this.sitePages.add(o);
- return (HomePage)this;
- }
- protected HomePage sitePagesInit() {
- Wrap> sitePagesWrap = new Wrap>().var("sitePages");
- if(sitePages == null) {
- _sitePages(sitePagesWrap);
- Optional.ofNullable(sitePagesWrap.getO()).ifPresent(o -> {
- setSitePages(o);
- });
- }
- return (HomePage)this;
- }
-
- //////////////
- // initDeep //
- //////////////
-
- public Future promiseDeepHomePage(SiteRequestEnUS siteRequest_) {
- setSiteRequest_(siteRequest_);
- return promiseDeepHomePage();
- }
-
- public Future promiseDeepHomePage() {
- Promise promise = Promise.promise();
- Promise promise2 = Promise.promise();
- promiseHomePage(promise2);
- promise2.future().onSuccess(a -> {
- super.promiseDeepPageLayout(siteRequest_).onSuccess(b -> {
- promise.complete();
- }).onFailure(ex -> {
- promise.fail(ex);
- });
- }).onFailure(ex -> {
- promise.fail(ex);
- });
- return promise.future();
- }
-
- public Future promiseHomePage(Promise promise) {
- Future.future(a -> a.complete()).compose(a -> {
- Promise promise2 = Promise.promise();
- try {
- promise2.complete();
- } catch(Exception ex) {
- promise2.fail(ex);
- }
- return promise2.future();
- }).compose(a -> {
- Promise promise2 = Promise.promise();
- searchListSitePagePromise().onSuccess(searchListSitePage -> {
- promise2.complete();
- }).onFailure(ex -> {
- promise2.fail(ex);
- });
- return promise2.future();
- }).compose(a -> {
- Promise promise2 = Promise.promise();
- try {
- pageResponseInit();
- defaultZoneIdInit();
- defaultTimeZoneInit();
- defaultLocaleIdInit();
- defaultLocaleInit();
- defaultFieldListVarsInit();
- defaultStatsVarsInit();
- defaultPivotVarsInit();
- listSitePageInit();
- statsInit();
- facetCountsInit();
- sitePageCountInit();
- sitePagesInit();
- promise2.complete();
- } catch(Exception ex) {
- promise2.fail(ex);
- }
- return promise2.future();
- }).onSuccess(a -> {
- promise.complete();
- }).onFailure(ex -> {
- promise.fail(ex);
- });
- return promise.future();
- }
-
- @Override public Future promiseDeepForClass(SiteRequestEnUS siteRequest_) {
- return promiseDeepHomePage(siteRequest_);
- }
-
- /////////////////
- // siteRequest //
- /////////////////
-
- public void siteRequestHomePage(SiteRequestEnUS siteRequest_) {
- super.siteRequestPageLayout(siteRequest_);
- if(searchListSitePage != null)
- searchListSitePage.setSiteRequest_(siteRequest_);
- }
-
- public void siteRequestForClass(SiteRequestEnUS siteRequest_) {
- siteRequestHomePage(siteRequest_);
- }
-
- /////////////
- // obtain //
- /////////////
-
- @Override public Object obtainForClass(String var) {
- String[] vars = StringUtils.split(var, ".");
- Object o = null;
- for(String v : vars) {
- if(o == null)
- o = obtainHomePage(v);
- else if(o instanceof BaseModel) {
- BaseModel baseModel = (BaseModel)o;
- o = baseModel.obtainForClass(v);
- }
- else if(o instanceof Map) {
- Map map = (Map)o;
- o = map.get(v);
- }
- }
- return o;
- }
- public Object obtainHomePage(String var) {
- HomePage oHomePage = (HomePage)this;
- switch(var) {
- case "searchListSitePage":
- return oHomePage.searchListSitePage;
- case "pageResponse":
- return oHomePage.pageResponse;
- case "defaultZoneId":
- return oHomePage.defaultZoneId;
- case "defaultTimeZone":
- return oHomePage.defaultTimeZone;
- case "defaultLocaleId":
- return oHomePage.defaultLocaleId;
- case "defaultLocale":
- return oHomePage.defaultLocale;
- case "defaultFieldListVars":
- return oHomePage.defaultFieldListVars;
- case "defaultStatsVars":
- return oHomePage.defaultStatsVars;
- case "defaultPivotVars":
- return oHomePage.defaultPivotVars;
- case "listSitePage":
- return oHomePage.listSitePage;
- case "stats":
- return oHomePage.stats;
- case "facetCounts":
- return oHomePage.facetCounts;
- case "sitePageCount":
- return oHomePage.sitePageCount;
- case "sitePages":
- return oHomePage.sitePages;
- default:
- return super.obtainPageLayout(var);
- }
- }
-
- ///////////////
- // relate //
- ///////////////
-
- @Override public boolean relateForClass(String var, Object val) {
- String[] vars = StringUtils.split(var, ".");
- Object o = null;
- for(String v : vars) {
- if(o == null)
- o = relateHomePage(v, val);
- else if(o instanceof BaseModel) {
- BaseModel baseModel = (BaseModel)o;
- o = baseModel.relateForClass(v, val);
- }
- }
- return o != null;
- }
- public Object relateHomePage(String var, Object val) {
- HomePage oHomePage = (HomePage)this;
- switch(var) {
- default:
- return super.relatePageLayout(var, val);
- }
- }
-
- ///////////////
- // staticSet //
- ///////////////
-
- public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteRequest_, String o) {
- return staticSetHomePage(entityVar, siteRequest_, o);
- }
- public static Object staticSetHomePage(String entityVar, SiteRequestEnUS siteRequest_, String o) {
- switch(entityVar) {
- case "pageResponse":
- return HomePage.staticSetPageResponse(siteRequest_, o);
- case "defaultZoneId":
- return HomePage.staticSetDefaultZoneId(siteRequest_, o);
- case "defaultLocaleId":
- return HomePage.staticSetDefaultLocaleId(siteRequest_, o);
- case "defaultFieldListVars":
- return HomePage.staticSetDefaultFieldListVars(siteRequest_, o);
- case "defaultStatsVars":
- return HomePage.staticSetDefaultStatsVars(siteRequest_, o);
- case "defaultPivotVars":
- return HomePage.staticSetDefaultPivotVars(siteRequest_, o);
- case "listSitePage":
- return HomePage.staticSetListSitePage(siteRequest_, o);
- case "sitePageCount":
- return HomePage.staticSetSitePageCount(siteRequest_, o);
- default:
- return PageLayout.staticSetPageLayout(entityVar, siteRequest_, o);
- }
- }
-
- ////////////////
- // staticSearch //
- ////////////////
-
- public static Object staticSearchForClass(String entityVar, SiteRequestEnUS siteRequest_, Object o) {
- return staticSearchHomePage(entityVar, siteRequest_, o);
- }
- public static Object staticSearchHomePage(String entityVar, SiteRequestEnUS siteRequest_, Object o) {
- switch(entityVar) {
- case "pageResponse":
- return HomePage.staticSearchPageResponse(siteRequest_, (String)o);
- case "defaultZoneId":
- return HomePage.staticSearchDefaultZoneId(siteRequest_, (String)o);
- case "defaultLocaleId":
- return HomePage.staticSearchDefaultLocaleId(siteRequest_, (String)o);
- case "defaultFieldListVars":
- return HomePage.staticSearchDefaultFieldListVars(siteRequest_, (String)o);
- case "defaultStatsVars":
- return HomePage.staticSearchDefaultStatsVars(siteRequest_, (String)o);
- case "defaultPivotVars":
- return HomePage.staticSearchDefaultPivotVars(siteRequest_, (String)o);
- case "listSitePage":
- return HomePage.staticSearchListSitePage(siteRequest_, (JsonArray)o);
- case "sitePageCount":
- return HomePage.staticSearchSitePageCount(siteRequest_, (Integer)o);
- default:
- return PageLayout.staticSearchPageLayout(entityVar, siteRequest_, o);
- }
- }
-
- ///////////////////
- // staticSearchStr //
- ///////////////////
-
- public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS siteRequest_, Object o) {
- return staticSearchStrHomePage(entityVar, siteRequest_, o);
- }
- public static String staticSearchStrHomePage(String entityVar, SiteRequestEnUS siteRequest_, Object o) {
- switch(entityVar) {
- case "pageResponse":
- return HomePage.staticSearchStrPageResponse(siteRequest_, (String)o);
- case "defaultZoneId":
- return HomePage.staticSearchStrDefaultZoneId(siteRequest_, (String)o);
- case "defaultLocaleId":
- return HomePage.staticSearchStrDefaultLocaleId(siteRequest_, (String)o);
- case "defaultFieldListVars":
- return HomePage.staticSearchStrDefaultFieldListVars(siteRequest_, (String)o);
- case "defaultStatsVars":
- return HomePage.staticSearchStrDefaultStatsVars(siteRequest_, (String)o);
- case "defaultPivotVars":
- return HomePage.staticSearchStrDefaultPivotVars(siteRequest_, (String)o);
- case "listSitePage":
- return HomePage.staticSearchStrListSitePage(siteRequest_, (String)o);
- case "sitePageCount":
- return HomePage.staticSearchStrSitePageCount(siteRequest_, (Integer)o);
- default:
- return PageLayout.staticSearchStrPageLayout(entityVar, siteRequest_, o);
- }
- }
-
- //////////////////
- // staticSearchFq //
- //////////////////
-
- public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS siteRequest_, String o) {
- return staticSearchFqHomePage(entityVar, siteRequest_, o);
- }
- public static String staticSearchFqHomePage(String entityVar, SiteRequestEnUS siteRequest_, String o) {
- switch(entityVar) {
- case "pageResponse":
- return HomePage.staticSearchFqPageResponse(siteRequest_, o);
- case "defaultZoneId":
- return HomePage.staticSearchFqDefaultZoneId(siteRequest_, o);
- case "defaultLocaleId":
- return HomePage.staticSearchFqDefaultLocaleId(siteRequest_, o);
- case "defaultFieldListVars":
- return HomePage.staticSearchFqDefaultFieldListVars(siteRequest_, o);
- case "defaultStatsVars":
- return HomePage.staticSearchFqDefaultStatsVars(siteRequest_, o);
- case "defaultPivotVars":
- return HomePage.staticSearchFqDefaultPivotVars(siteRequest_, o);
- case "listSitePage":
- return HomePage.staticSearchFqListSitePage(siteRequest_, o);
- case "sitePageCount":
- return HomePage.staticSearchFqSitePageCount(siteRequest_, o);
- default:
- return PageLayout.staticSearchFqPageLayout(entityVar, siteRequest_, o);
- }
- }
-
- //////////////
- // toString //
- //////////////
-
- @Override public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(super.toString());
- return sb.toString();
- }
-
- public static final String CLASS_SIMPLE_NAME = "HomePage";
- public static final String CLASS_API_ADDRESS = "smartvillage-platform-enUS-HomePage";
- public static final String VAR_searchListSitePage = "searchListSitePage";
- public static final String VAR_pageResponse = "pageResponse";
- public static final String VAR_defaultZoneId = "defaultZoneId";
- public static final String VAR_defaultTimeZone = "defaultTimeZone";
- public static final String VAR_defaultLocaleId = "defaultLocaleId";
- public static final String VAR_defaultLocale = "defaultLocale";
- public static final String VAR_defaultFieldListVars = "defaultFieldListVars";
- public static final String VAR_defaultStatsVars = "defaultStatsVars";
- public static final String VAR_defaultPivotVars = "defaultPivotVars";
- public static final String VAR_listSitePage = "listSitePage";
- public static final String VAR_stats = "stats";
- public static final String VAR_facetCounts = "facetCounts";
- public static final String VAR_sitePageCount = "sitePageCount";
- public static final String VAR_sitePages = "sitePages";
-
- public static final String DISPLAY_NAME_searchListSitePage = "";
- public static final String DISPLAY_NAME_pageResponse = "";
- public static final String DISPLAY_NAME_defaultZoneId = "";
- public static final String DISPLAY_NAME_defaultTimeZone = "";
- public static final String DISPLAY_NAME_defaultLocaleId = "";
- public static final String DISPLAY_NAME_defaultLocale = "";
- public static final String DISPLAY_NAME_defaultFieldListVars = "";
- public static final String DISPLAY_NAME_defaultStatsVars = "";
- public static final String DISPLAY_NAME_defaultPivotVars = "";
- public static final String DISPLAY_NAME_listSitePage = "";
- public static final String DISPLAY_NAME_stats = "";
- public static final String DISPLAY_NAME_facetCounts = "";
- public static final String DISPLAY_NAME_sitePageCount = "";
- public static final String DISPLAY_NAME_sitePages = "";
-
- public static String displayNameForClass(String var) {
- return HomePage.displayNameHomePage(var);
- }
- public static String displayNameHomePage(String var) {
- switch(var) {
- case VAR_searchListSitePage:
- return DISPLAY_NAME_searchListSitePage;
- case VAR_pageResponse:
- return DISPLAY_NAME_pageResponse;
- case VAR_defaultZoneId:
- return DISPLAY_NAME_defaultZoneId;
- case VAR_defaultTimeZone:
- return DISPLAY_NAME_defaultTimeZone;
- case VAR_defaultLocaleId:
- return DISPLAY_NAME_defaultLocaleId;
- case VAR_defaultLocale:
- return DISPLAY_NAME_defaultLocale;
- case VAR_defaultFieldListVars:
- return DISPLAY_NAME_defaultFieldListVars;
- case VAR_defaultStatsVars:
- return DISPLAY_NAME_defaultStatsVars;
- case VAR_defaultPivotVars:
- return DISPLAY_NAME_defaultPivotVars;
- case VAR_listSitePage:
- return DISPLAY_NAME_listSitePage;
- case VAR_stats:
- return DISPLAY_NAME_stats;
- case VAR_facetCounts:
- return DISPLAY_NAME_facetCounts;
- case VAR_sitePageCount:
- return DISPLAY_NAME_sitePageCount;
- case VAR_sitePages:
- return DISPLAY_NAME_sitePages;
- default:
- return PageLayout.displayNamePageLayout(var);
- }
- }
-}
diff --git a/src/gen/java/org/computate/smartvillage/enus/result/base/BaseResultPageGen.java b/src/gen/java/org/computate/smartvillage/enus/result/base/BaseResultPageGen.java
index dfb21c13..e11e1741 100644
--- a/src/gen/java/org/computate/smartvillage/enus/result/base/BaseResultPageGen.java
+++ b/src/gen/java/org/computate/smartvillage/enus/result/base/BaseResultPageGen.java
@@ -143,7 +143,11 @@ public Future promiseDeepBaseResultPage() {
Promise promise2 = Promise.promise();
promiseBaseResultPage(promise2);
promise2.future().onSuccess(a -> {
- promise.complete();
+ super.promiseDeepBaseResultGenPage(siteRequest_).onSuccess(b -> {
+ promise.complete();
+ }).onFailure(ex -> {
+ promise.fail(ex);
+ });
}).onFailure(ex -> {
promise.fail(ex);
});
@@ -167,7 +171,7 @@ public Future promiseBaseResultPage(Promise promise) {
return promise.future();
}
- public Future promiseDeepForClass(SiteRequestEnUS siteRequest_) {
+ @Override public Future promiseDeepForClass(SiteRequestEnUS siteRequest_) {
return promiseDeepBaseResultPage(siteRequest_);
}
@@ -176,6 +180,7 @@ public Future promiseDeepForClass(SiteRequestEnUS siteRequest_) {
/////////////////
public void siteRequestBaseResultPage(SiteRequestEnUS siteRequest_) {
+ super.siteRequestBaseResultGenPage(siteRequest_);
}
public void siteRequestForClass(SiteRequestEnUS siteRequest_) {
@@ -186,7 +191,7 @@ public void siteRequestForClass(SiteRequestEnUS siteRequest_) {
// obtain //
/////////////
- public Object obtainForClass(String var) {
+ @Override public Object obtainForClass(String var) {
String[] vars = StringUtils.split(var, ".");
Object o = null;
for(String v : vars) {
@@ -207,7 +212,7 @@ public Object obtainBaseResultPage(String var) {
BaseResultPage oBaseResultPage = (BaseResultPage)this;
switch(var) {
default:
- return null;
+ return super.obtainBaseResultGenPage(var);
}
}
@@ -215,7 +220,7 @@ public Object obtainBaseResultPage(String var) {
// relate //
///////////////
- public boolean relateForClass(String var, Object val) {
+ @Override public boolean relateForClass(String var, Object val) {
String[] vars = StringUtils.split(var, ".");
Object o = null;
for(String v : vars) {
@@ -232,7 +237,7 @@ public Object relateBaseResultPage(String var, Object val) {
BaseResultPage oBaseResultPage = (BaseResultPage)this;
switch(var) {
default:
- return null;
+ return super.relateBaseResultGenPage(var, val);
}
}
@@ -246,7 +251,7 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq
public static Object staticSetBaseResultPage(String entityVar, SiteRequestEnUS siteRequest_, String o) {
switch(entityVar) {
default:
- return null;
+ return BaseResultGenPage.staticSetBaseResultGenPage(entityVar, siteRequest_, o);
}
}
@@ -260,7 +265,7 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site
public static Object staticSearchBaseResultPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) {
switch(entityVar) {
default:
- return null;
+ return BaseResultGenPage.staticSearchBaseResultGenPage(entityVar, siteRequest_, o);
}
}
@@ -274,7 +279,7 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s
public static String staticSearchStrBaseResultPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) {
switch(entityVar) {
default:
- return null;
+ return BaseResultGenPage.staticSearchStrBaseResultGenPage(entityVar, siteRequest_, o);
}
}
@@ -288,7 +293,7 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si
public static String staticSearchFqBaseResultPage(String entityVar, SiteRequestEnUS siteRequest_, String o) {
switch(entityVar) {
default:
- return null;
+ return BaseResultGenPage.staticSearchFqBaseResultGenPage(entityVar, siteRequest_, o);
}
}
@@ -298,6 +303,7 @@ public static String staticSearchFqBaseResultPage(String entityVar, SiteRequestE
@Override public String toString() {
StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
return sb.toString();
}
@@ -311,7 +317,7 @@ public static String displayNameForClass(String var) {
public static String displayNameBaseResultPage(String var) {
switch(var) {
default:
- return null;
+ return BaseResultGenPage.displayNameBaseResultGenPage(var);
}
}
}
diff --git a/src/gen/java/org/computate/smartvillage/enus/result/map/MapResultPageGen.java b/src/gen/java/org/computate/smartvillage/enus/result/map/MapResultPageGen.java
index 177a5da4..948c2f43 100644
--- a/src/gen/java/org/computate/smartvillage/enus/result/map/MapResultPageGen.java
+++ b/src/gen/java/org/computate/smartvillage/enus/result/map/MapResultPageGen.java
@@ -143,7 +143,11 @@ public Future promiseDeepMapResultPage() {
Promise promise2 = Promise.promise();
promiseMapResultPage(promise2);
promise2.future().onSuccess(a -> {
- promise.complete();
+ super.promiseDeepMapResultGenPage(siteRequest_).onSuccess(b -> {
+ promise.complete();
+ }).onFailure(ex -> {
+ promise.fail(ex);
+ });
}).onFailure(ex -> {
promise.fail(ex);
});
@@ -167,7 +171,7 @@ public Future promiseMapResultPage(Promise promise) {
return promise.future();
}
- public Future promiseDeepForClass(SiteRequestEnUS siteRequest_) {
+ @Override public Future promiseDeepForClass(SiteRequestEnUS siteRequest_) {
return promiseDeepMapResultPage(siteRequest_);
}
@@ -176,6 +180,7 @@ public Future promiseDeepForClass(SiteRequestEnUS siteRequest_) {
/////////////////
public void siteRequestMapResultPage(SiteRequestEnUS siteRequest_) {
+ super.siteRequestMapResultGenPage(siteRequest_);
}
public void siteRequestForClass(SiteRequestEnUS siteRequest_) {
@@ -186,7 +191,7 @@ public void siteRequestForClass(SiteRequestEnUS siteRequest_) {
// obtain //
/////////////
- public Object obtainForClass(String var) {
+ @Override public Object obtainForClass(String var) {
String[] vars = StringUtils.split(var, ".");
Object o = null;
for(String v : vars) {
@@ -207,7 +212,7 @@ public Object obtainMapResultPage(String var) {
MapResultPage oMapResultPage = (MapResultPage)this;
switch(var) {
default:
- return null;
+ return super.obtainMapResultGenPage(var);
}
}
@@ -215,7 +220,7 @@ public Object obtainMapResultPage(String var) {
// relate //
///////////////
- public boolean relateForClass(String var, Object val) {
+ @Override public boolean relateForClass(String var, Object val) {
String[] vars = StringUtils.split(var, ".");
Object o = null;
for(String v : vars) {
@@ -232,7 +237,7 @@ public Object relateMapResultPage(String var, Object val) {
MapResultPage oMapResultPage = (MapResultPage)this;
switch(var) {
default:
- return null;
+ return super.relateMapResultGenPage(var, val);
}
}
@@ -246,7 +251,7 @@ public static Object staticSetForClass(String entityVar, SiteRequestEnUS siteReq
public static Object staticSetMapResultPage(String entityVar, SiteRequestEnUS siteRequest_, String o) {
switch(entityVar) {
default:
- return null;
+ return MapResultGenPage.staticSetMapResultGenPage(entityVar, siteRequest_, o);
}
}
@@ -260,7 +265,7 @@ public static Object staticSearchForClass(String entityVar, SiteRequestEnUS site
public static Object staticSearchMapResultPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) {
switch(entityVar) {
default:
- return null;
+ return MapResultGenPage.staticSearchMapResultGenPage(entityVar, siteRequest_, o);
}
}
@@ -274,7 +279,7 @@ public static String staticSearchStrForClass(String entityVar, SiteRequestEnUS s
public static String staticSearchStrMapResultPage(String entityVar, SiteRequestEnUS siteRequest_, Object o) {
switch(entityVar) {
default:
- return null;
+ return MapResultGenPage.staticSearchStrMapResultGenPage(entityVar, siteRequest_, o);
}
}
@@ -288,7 +293,7 @@ public static String staticSearchFqForClass(String entityVar, SiteRequestEnUS si
public static String staticSearchFqMapResultPage(String entityVar, SiteRequestEnUS siteRequest_, String o) {
switch(entityVar) {
default:
- return null;
+ return MapResultGenPage.staticSearchFqMapResultGenPage(entityVar, siteRequest_, o);
}
}
@@ -298,6 +303,7 @@ public static String staticSearchFqMapResultPage(String entityVar, SiteRequestEn
@Override public String toString() {
StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
return sb.toString();
}
@@ -311,7 +317,7 @@ public static String displayNameForClass(String var) {
public static String displayNameMapResultPage(String var) {
switch(var) {
default:
- return null;
+ return MapResultGenPage.displayNameMapResultGenPage(var);
}
}
}
diff --git a/src/main/java/org/computate/smartvillage/enus/page/HomePage.java b/src/main/java/org/computate/smartvillage/enus/page/HomePage.java
deleted file mode 100644
index fcef6c77..00000000
--- a/src/main/java/org/computate/smartvillage/enus/page/HomePage.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2018-2022 Computate Limited Liability Company in Utah, USA,
- * and the Smarta Byar Smart Village FIWARE IHub.
- *
- * This program and the accompanying materials are made available under the
- * terms of the GNU GENERAL PUBLIC LICENSE Version 3 which is available at
- *
- * https://www.gnu.org/licenses/gpl-3.0.en.html
- *
- * You may not propagate or modify a covered work except as expressly provided
- * under this License. Any attempt otherwise to propagate or modify it is void,
- * and will automatically terminate your rights under this License (including
- * any patent licenses granted under the third paragraph of section 11).
- */
-package org.computate.smartvillage.enus.page;
-
-
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Optional;
-
-import org.apache.commons.lang3.StringUtils;
-import org.computate.search.response.solr.SolrResponse;
-import org.computate.search.wrap.Wrap;
-import org.computate.smartvillage.enus.config.ConfigKeys;
-import org.computate.smartvillage.enus.model.page.SitePage;
-import org.computate.smartvillage.enus.page.HomePageGen;
-import org.computate.smartvillage.enus.page.PageLayout;
-import org.computate.vertx.search.list.SearchList;
-
-import io.vertx.core.Promise;
-import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.JsonObject;
-
-/**
- * Promise: true
- */
-public class HomePage extends HomePageGen {
-
-
- /**
- * {@inheritDoc}
- * Ignore: true
- **/
- protected void _searchListSitePage(Promise> promise) {
- SearchList l = new SearchList<>();
- l.q("*:*");
- l.sortDesc("courseNum_docvalues_int desc, lessonNum_docvalues_int");
- l.fq(String.format("created_docvalues_date:[* TO %s]", ZonedDateTime.now().toInstant().atOffset(ZoneOffset.UTC).format(DateTimeFormatter.ISO_DATE_TIME)));
- l.setC(SitePage.class);
- l.setStore(true);
- promise.complete(l);
- }
-
- protected void _pageResponse(Wrap w) {
- if(searchListSitePage != null)
- w.o(JsonObject.mapFrom(searchListSitePage.getResponse()).toString());
- }
-
- protected void _defaultZoneId(Wrap w) {
- w.o(Optional.ofNullable(siteRequest_.getRequestVars().get(VAR_defaultZoneId)).orElse(siteRequest_.getConfig().getString(ConfigKeys.SITE_ZONE)));
- }
-
- /**
- * Ignore: true
- **/
- protected void _defaultTimeZone(Wrap w) {
- w.o(ZoneId.of(defaultZoneId));
- }
-
- protected void _defaultLocaleId(Wrap w) {
- w.o(Optional.ofNullable(siteRequest_.getRequestHeaders().get("Accept-Language")).map(acceptLanguage -> StringUtils.substringBefore(acceptLanguage, ",")).orElse(siteRequest_.getConfig().getString(ConfigKeys.SITE_LOCALE)));
- }
-
- /**
- * Ignore: true
- **/
- protected void _defaultLocale(Wrap w) {
- w.o(Locale.forLanguageTag(defaultLocaleId));
- }
-
- protected void _defaultFieldListVars(List l) {
- Optional.ofNullable(searchListSitePage.getFields()).orElse(Arrays.asList()).forEach(varStored -> {
- String varStored2 = varStored;
- if(StringUtils.contains(varStored2, "}"))
- varStored2 = StringUtils.substringAfterLast(varStored2, "}");
- String[] parts = varStored2.split(",");
- for(String part : parts) {
- if(StringUtils.isNotBlank(part)) {
- String var = SitePage.searchVarSitePage(part);
- if(StringUtils.isNotBlank(var))
- l.add(var);
- }
- }
- });
- }
-
- protected void _defaultStatsVars(List l) {
- Optional.ofNullable(searchListSitePage.getStatsFields()).orElse(Arrays.asList()).forEach(varIndexed -> {
- String varIndexed2 = varIndexed;
- if(StringUtils.contains(varIndexed2, "}"))
- varIndexed2 = StringUtils.substringAfterLast(varIndexed2, "}");
- String[] parts = varIndexed2.split(",");
- for(String part : parts) {
- if(StringUtils.isNotBlank(part)) {
- String var = SitePage.searchVarSitePage(part);
- if(StringUtils.isNotBlank(var))
- l.add(var);
- }
- }
- });
- }
-
- protected void _defaultPivotVars(List l) {
- Optional.ofNullable(searchListSitePage.getFacetPivots()).orElse(Arrays.asList()).forEach(facetPivot -> {
- String facetPivot2 = facetPivot;
- if(StringUtils.contains(facetPivot2, "}"))
- facetPivot2 = StringUtils.substringAfterLast(facetPivot2, "}");
- String[] parts = facetPivot2.split(",");
- for(String part : parts) {
- if(StringUtils.isNotBlank(part)) {
- String var = SitePage.searchVarSitePage(part);
- if(StringUtils.isNotBlank(var))
- l.add(var);
- }
- }
- });
- }
-
- /**
- * {@inheritDoc}
- **/
- protected void _listSitePage(JsonArray l) {
- Optional.ofNullable(searchListSitePage).map(o -> o.getList()).orElse(Arrays.asList()).stream().map(o -> JsonObject.mapFrom(o)).forEach(o -> l.add(o));
- }
-
- protected void _stats(Wrap w) {
- w.o(searchListSitePage.getResponse().getStats());
- }
-
- protected void _facetCounts(Wrap w) {
- w.o(searchListSitePage.getResponse().getFacetCounts());
- }
-
- protected void _sitePageCount(Wrap w) {
- w.o(searchListSitePage == null ? 0 : searchListSitePage.size());
- }
-
- protected void _sitePages(Wrap> w) {
- w.o(searchListSitePage.getList());
- }
-
- @Override
- protected void _pageImageUri(Wrap c) {
- c.o("/png/iot-node-999.png");
- }
-}
diff --git a/src/main/resources/templates/enUS/BaseResultGenPage.hbs b/src/main/resources/templates/enUS/BaseResultGenPage.hbs
index d6966e3b..eb095033 100644
--- a/src/main/resources/templates/enUS/BaseResultGenPage.hbs
+++ b/src/main/resources/templates/enUS/BaseResultGenPage.hbs
@@ -47,12 +47,30 @@
//calendar.render();
{{#block "websocket"}}{{/block}}
});
+
+ function jsWebsocketBaseResult(vars, $response) {
+{{#block "jsWebsocket"}}{{/block}}
+ }
+
+ function jsTooltipBaseResult(e, feature) {
+{{#block "jsTooltip"}}{{/block}}
+ }
+
+ function htmTooltipBaseResult(feature, layer) {
+ return `{{#block "htmTooltip"}}{{/block}}`;
+ }
{{/inline}}
{{#*inline "websocketBaseResultPage"}}
websocketBaseResult(websocketBaseResultInner);
{{/inline}}
+{{#*inline "jsWebsocketBaseResultPage"}}{{/inline}}
+{{#*inline "jsTooltipBaseResultPage"}}{{/inline}}
+{{#*inline "htmTooltipBaseResultPage"}}{{/inline}}
+{{#partial "jsWebsocket"}}{{> jsWebsocketBaseResultPage}}{{/partial}}
+{{#partial "jsTooltip"}}{{> jsTooltipBaseResultPage}}{{/partial}}
+{{#partial "htmTooltip"}}{{> htmTooltipBaseResultPage}}{{/partial}}
{{#*inline "htmUrlBaseResult"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}}
{{#*inline "htmHeadBaseResultPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}}
{{#*inline "htmBodySearchBaseResultPage"}}
@@ -713,14 +731,14 @@
placeholder="ID"
title="A URL friendly unique ID for this object" id="{{classApiMethodMethod}}_objectId"
{{#eq "Page" classApiMethodMethod}}
- class="setObjectId classBaseResult inputBaseResult{{id}}ObjectId w3-input w3-border "
+ class="{{classApiMethodMethod}}_objectId setObjectId classBaseResult inputBaseResult{{id}}ObjectId w3-input w3-border "
name="setObjectId"
{{else}}
{{#eq "PATCH" classApiMethodMethod}}
- class="setObjectId classBaseResult inputBaseResult{{id}}ObjectId w3-input w3-border "
+ class="{{classApiMethodMethod}}_objectId setObjectId classBaseResult inputBaseResult{{id}}ObjectId w3-input w3-border "
name="setObjectId"
{{else}}
- class="valueObjectId w3-input w3-border classBaseResult inputBaseResult{{id}}ObjectId w3-input w3-border "
+ {{classApiMethodMethod}}_objectId" class="valueObjectId w3-input w3-border classBaseResult inputBaseResult{{id}}ObjectId w3-input w3-border "
name="objectId"
{{/eq}}
{{/eq}}
@@ -770,19 +788,19 @@
id="{{classApiMethodMethod}}_archived"
{{/eq}}
{{#eq 'Page' classApiMethodMethod}}
- class="classBaseResult inputBaseResult{{id}}Archived w3-input w3-border "
+ class="{{classApiMethodMethod}}_archived classBaseResult inputBaseResult{{id}}Archived w3-input w3-border "
name="setArchived"
{{else}}
{{#eq 'Page' classApiMethodMethod}}
- class="classBaseResult inputBaseResult{{id}}Archived w3-input w3-border "
+ class="{{classApiMethodMethod}}_archived classBaseResult inputBaseResult{{id}}Archived w3-input w3-border "
name="setArchived"
{{else}}
- class="setArchived valueArchived classBaseResult inputBaseResult{{id}}Archived w3-input w3-border "
+ class="{{classApiMethodMethod}}_archived setArchived valueArchived classBaseResult inputBaseResult{{id}}Archived w3-input w3-border "
name="setArchived"
{{/eq}}
{{/eq}}
{{#eq 'Page' classApiMethodMethod}}
- onchange="var confirmResponse = confirm('Are you sure you want to archive that?'); if(confirmResponse) { patch{{classSimpleName}}Val([{ name: 'softCommit', value: 'true' }, { name: 'fq', value: 'id:{{id}}' }], 'setArchived', $(this).prop('checked'), function() { addGlow($('#{{classApiMethodMethod}}_archived')); }, function() { addError($('#{{classApiMethodMethod}}_archived')); }); }"
+ onchange="var confirmResponse = confirm('Are you sure you want to archive that?'); if(confirmResponse) { patch{{classSimpleName}}Val([{ name: 'softCommit', value: 'true' }, { name: 'fq', value: 'id:{{id}}' }], 'setArchived', $(this).prop('checked'), function() { addGlow($('.{{classApiMethodMethod}}_archived')); }, function() { addError($('.{{classApiMethodMethod}}_archived')); }); }"
{{/eq}}
{{#eq 'Page' classApiMethodMethod}}
{{#if baseResult_.archived}}
@@ -834,19 +852,19 @@
id="{{classApiMethodMethod}}_deleted"
{{/eq}}
{{#eq 'Page' classApiMethodMethod}}
- class="classBaseResult inputBaseResult{{id}}Deleted w3-input w3-border "
+ class="{{classApiMethodMethod}}_deleted classBaseResult inputBaseResult{{id}}Deleted w3-input w3-border "
name="setDeleted"
{{else}}
{{#eq 'Page' classApiMethodMethod}}
- class="classBaseResult inputBaseResult{{id}}Deleted w3-input w3-border "
+ class="{{classApiMethodMethod}}_deleted classBaseResult inputBaseResult{{id}}Deleted w3-input w3-border "
name="setDeleted"
{{else}}
- class="setDeleted valueDeleted classBaseResult inputBaseResult{{id}}Deleted w3-input w3-border "
+ class="{{classApiMethodMethod}}_deleted setDeleted valueDeleted classBaseResult inputBaseResult{{id}}Deleted w3-input w3-border "
name="setDeleted"
{{/eq}}
{{/eq}}
{{#eq 'Page' classApiMethodMethod}}
- onchange="var confirmResponse = confirm('Are you sure you want to delete that?'); if(confirmResponse) { patch{{classSimpleName}}Val([{ name: 'softCommit', value: 'true' }, { name: 'fq', value: 'id:{{id}}' }], 'setDeleted', $(this).prop('checked'), function() { addGlow($('#{{classApiMethodMethod}}_deleted')); }, function() { addError($('#{{classApiMethodMethod}}_deleted')); }); }"
+ onchange="var confirmResponse = confirm('Are you sure you want to delete that?'); if(confirmResponse) { patch{{classSimpleName}}Val([{ name: 'softCommit', value: 'true' }, { name: 'fq', value: 'id:{{id}}' }], 'setDeleted', $(this).prop('checked'), function() { addGlow($('.{{classApiMethodMethod}}_deleted')); }, function() { addError($('.{{classApiMethodMethod}}_deleted')); }); }"
{{/eq}}
{{#eq 'Page' classApiMethodMethod}}
{{#if baseResult_.deleted}}
diff --git a/src/main/resources/templates/enUS/MapResultGenPage.hbs b/src/main/resources/templates/enUS/MapResultGenPage.hbs
index 694ae930..15a90a2a 100644
--- a/src/main/resources/templates/enUS/MapResultGenPage.hbs
+++ b/src/main/resources/templates/enUS/MapResultGenPage.hbs
@@ -47,12 +47,30 @@
//calendar.render();
{{#block "websocket"}}{{/block}}
});
+
+ function jsWebsocketMapResult(vars, $response) {
+{{#block "jsWebsocket"}}{{/block}}
+ }
+
+ function jsTooltipMapResult(e, feature) {
+{{#block "jsTooltip"}}{{/block}}
+ }
+
+ function htmTooltipMapResult(feature, layer) {
+ return `{{#block "htmTooltip"}}{{/block}}`;
+ }
{{/inline}}
{{#*inline "websocketMapResultPage"}}
websocketMapResult(websocketMapResultInner);
{{/inline}}
+{{#*inline "jsWebsocketMapResultPage"}}{{/inline}}
+{{#*inline "jsTooltipMapResultPage"}}{{/inline}}
+{{#*inline "htmTooltipMapResultPage"}}{{/inline}}
+{{#partial "jsWebsocket"}}{{> jsWebsocketMapResultPage}}{{/partial}}
+{{#partial "jsTooltip"}}{{> jsTooltipMapResultPage}}{{/partial}}
+{{#partial "htmTooltip"}}{{> htmTooltipMapResultPage}}{{/partial}}
{{#*inline "htmUrlMapResult"}}{{pageUri}}?q={{query.q}}&rows={{#if rows}}{{rows}}{{else}}{{pagination.rows}}{{/if}}&rows={{#if start}}{{start}}{{else}}{{pagination.start}}{{/if}}{{#each query.fq}}{{#eq fq this}}{{else}}&fq={{fq}}:{{val}}{{/eq}}{{/each}}{{#each query.sort}}{{#eq sort this}}{{else}}&sort={{var}} {{order}}{{/eq}}{{/each}}{{/inline}}
{{#*inline "htmHeadMapResultPage"}}{{#block "htmTitle"}}{{/block}}{{#block "htmMeta"}}{{/block}}{{#block "htmStyle"}}{{/block}}{{#block "htmScripts"}}{{/block}}{{#block "htmScript"}}{{/block}}{{/inline}}
{{#*inline "htmBodySearchMapResultPage"}}
@@ -836,14 +854,14 @@
placeholder="ID"
title="A URL friendly unique ID for this object" id="{{classApiMethodMethod}}_objectId"
{{#eq "Page" classApiMethodMethod}}
- class="setObjectId classMapResult inputMapResult{{id}}ObjectId w3-input w3-border "
+ class="{{classApiMethodMethod}}_objectId setObjectId classMapResult inputMapResult{{id}}ObjectId w3-input w3-border "
name="setObjectId"
{{else}}
{{#eq "PATCH" classApiMethodMethod}}
- class="setObjectId classMapResult inputMapResult{{id}}ObjectId w3-input w3-border "
+ class="{{classApiMethodMethod}}_objectId setObjectId classMapResult inputMapResult{{id}}ObjectId w3-input w3-border "
name="setObjectId"
{{else}}
- class="valueObjectId w3-input w3-border classMapResult inputMapResult{{id}}ObjectId w3-input w3-border "
+ {{classApiMethodMethod}}_objectId" class="valueObjectId w3-input w3-border classMapResult inputMapResult{{id}}ObjectId w3-input w3-border "
name="objectId"
{{/eq}}
{{/eq}}
@@ -897,19 +915,19 @@
id="{{classApiMethodMethod}}_archived"
{{/eq}}
{{#eq 'Page' classApiMethodMethod}}
- class="classMapResult inputMapResult{{id}}Archived w3-input w3-border "
+ class="{{classApiMethodMethod}}_archived classMapResult inputMapResult{{id}}Archived w3-input w3-border "
name="setArchived"
{{else}}
{{#eq 'Page' classApiMethodMethod}}
- class="classMapResult inputMapResult{{id}}Archived w3-input w3-border "
+ class="{{classApiMethodMethod}}_archived classMapResult inputMapResult{{id}}Archived w3-input w3-border "
name="setArchived"
{{else}}
- class="setArchived valueArchived classMapResult inputMapResult{{id}}Archived w3-input w3-border "
+ class="{{classApiMethodMethod}}_archived setArchived valueArchived classMapResult inputMapResult{{id}}Archived w3-input w3-border "
name="setArchived"
{{/eq}}
{{/eq}}
{{#eq 'Page' classApiMethodMethod}}
- onchange="var confirmResponse = confirm('Are you sure you want to archive that?'); if(confirmResponse) { patch{{classSimpleName}}Val([{ name: 'softCommit', value: 'true' }, { name: 'fq', value: 'id:{{id}}' }], 'setArchived', $(this).prop('checked'), function() { addGlow($('#{{classApiMethodMethod}}_archived')); }, function() { addError($('#{{classApiMethodMethod}}_archived')); }); }"
+ onchange="var confirmResponse = confirm('Are you sure you want to archive that?'); if(confirmResponse) { patch{{classSimpleName}}Val([{ name: 'softCommit', value: 'true' }, { name: 'fq', value: 'id:{{id}}' }], 'setArchived', $(this).prop('checked'), function() { addGlow($('.{{classApiMethodMethod}}_archived')); }, function() { addError($('.{{classApiMethodMethod}}_archived')); }); }"
{{/eq}}
{{#eq 'Page' classApiMethodMethod}}
{{#if mapResult_.archived}}
@@ -965,19 +983,19 @@
id="{{classApiMethodMethod}}_deleted"
{{/eq}}
{{#eq 'Page' classApiMethodMethod}}
- class="classMapResult inputMapResult{{id}}Deleted w3-input w3-border "
+ class="{{classApiMethodMethod}}_deleted classMapResult inputMapResult{{id}}Deleted w3-input w3-border "
name="setDeleted"
{{else}}
{{#eq 'Page' classApiMethodMethod}}
- class="classMapResult inputMapResult{{id}}Deleted w3-input w3-border "
+ class="{{classApiMethodMethod}}_deleted classMapResult inputMapResult{{id}}Deleted w3-input w3-border "
name="setDeleted"
{{else}}
- class="setDeleted valueDeleted classMapResult inputMapResult{{id}}Deleted w3-input w3-border "
+ class="{{classApiMethodMethod}}_deleted setDeleted valueDeleted classMapResult inputMapResult{{id}}Deleted w3-input w3-border "
name="setDeleted"
{{/eq}}
{{/eq}}
{{#eq 'Page' classApiMethodMethod}}
- onchange="var confirmResponse = confirm('Are you sure you want to delete that?'); if(confirmResponse) { patch{{classSimpleName}}Val([{ name: 'softCommit', value: 'true' }, { name: 'fq', value: 'id:{{id}}' }], 'setDeleted', $(this).prop('checked'), function() { addGlow($('#{{classApiMethodMethod}}_deleted')); }, function() { addError($('#{{classApiMethodMethod}}_deleted')); }); }"
+ onchange="var confirmResponse = confirm('Are you sure you want to delete that?'); if(confirmResponse) { patch{{classSimpleName}}Val([{ name: 'softCommit', value: 'true' }, { name: 'fq', value: 'id:{{id}}' }], 'setDeleted', $(this).prop('checked'), function() { addGlow($('.{{classApiMethodMethod}}_deleted')); }, function() { addError($('.{{classApiMethodMethod}}_deleted')); }); }"
{{/eq}}
{{#eq 'Page' classApiMethodMethod}}
{{#if mapResult_.deleted}}
@@ -1028,14 +1046,14 @@
placeholder="Time in seconds"
title="The time in seconds. " id="{{classApiMethodMethod}}_time"
{{#eq "Page" classApiMethodMethod}}
- class="setTime classMapResult inputMapResult{{id}}Time w3-input w3-border "
+ class="{{classApiMethodMethod}}_time setTime classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="setTime"
{{else}}
{{#eq "PATCH" classApiMethodMethod}}
- class="setTime classMapResult inputMapResult{{id}}Time w3-input w3-border "
+ class="{{classApiMethodMethod}}_time setTime classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="setTime"
{{else}}
- class="valueTime w3-input w3-border classMapResult inputMapResult{{id}}Time w3-input w3-border "
+ {{classApiMethodMethod}}_time" class="valueTime w3-input w3-border classMapResult inputMapResult{{id}}Time w3-input w3-border "
name="time"
{{/eq}}
{{/eq}}
@@ -1081,7 +1099,7 @@
{{#eq roleForWriteBool "true"}}