Fixing bugs with MapResultPage

rh-pre-commit.version: 2.0.3 rh-pre-commit.check-secrets: ENABLED
computate-org · Nov 29, 2023 · 2c50a20 · 2c50a20
1 parent 57daf20
commit 2c50a20
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 1,492 deletions.
diff --git a/src/gen/java/org/computate/smartvillage/enus/page/HomePageGen.java b/src/gen/java/org/computate/smartvillage/enus/page/HomePageGen.java
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
@@ -143,7 +143,11 @@ public Future<Void> promiseDeepBaseResultPage() {
 		Promise<Void> 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<Void> promiseBaseResultPage(Promise<Void> promise) {
 		return promise.future();
 	}
 
-	public Future<Void> promiseDeepForClass(SiteRequestEnUS siteRequest_) {
+	@Override public Future<Void> promiseDeepForClass(SiteRequestEnUS siteRequest_) {
 		return promiseDeepBaseResultPage(siteRequest_);
 	}
 
@@ -176,6 +180,7 @@ public Future<Void> 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,15 +212,15 @@ public Object obtainBaseResultPage(String var) {
 		BaseResultPage oBaseResultPage = (BaseResultPage)this;
 		switch(var) {
 			default:
-				return null;
+				return super.obtainBaseResultGenPage(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
@@ -143,7 +143,11 @@ public Future<Void> promiseDeepMapResultPage() {
 		Promise<Void> 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<Void> promiseMapResultPage(Promise<Void> promise) {
 		return promise.future();
 	}
 
-	public Future<Void> promiseDeepForClass(SiteRequestEnUS siteRequest_) {
+	@Override public Future<Void> promiseDeepForClass(SiteRequestEnUS siteRequest_) {
 		return promiseDeepMapResultPage(siteRequest_);
 	}
 
@@ -176,6 +180,7 @@ public Future<Void> 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,15 +212,15 @@ public Object obtainMapResultPage(String var) {
 		MapResultPage oMapResultPage = (MapResultPage)this;
 		switch(var) {
 			default:
-				return null;
+				return super.obtainMapResultGenPage(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);
 		}
 	}
 }