Skip to content

Commit

Permalink
Additional fixes to no longer hard code class API address
Browse files Browse the repository at this point in the history 
rh-pre-commit.version: 2.0.3
rh-pre-commit.check-secrets: ENABLED
  • Loading branch information
@computate
computate committed Dec 19, 2023
1 parent 9bf5101 commit d6f31c3
Show file tree
Hide file tree
Showing 10 changed files with 110 additions and 85 deletions.
2 changes: 1 addition & 1 deletion src/gen/java/org/computate/smartvillage/enus/model/htm/SiteHtmGen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2148,7 +2148,7 @@ public void apiRequestSiteHtm() {
public static final String[] SiteHtmVals = new String[] { text_markdown1_enUS };

public static final String CLASS_SIMPLE_NAME = "SiteHtm";
public static final String CLASS_API_ADDRESS_SiteHtm = "smartvillage-platform-enUS-SiteHtm";
public static final String CLASS_API_ADDRESS_SiteHtm = "smartvillage-platform-enUS-SiteHtm";
public static String getClassApiAddress() {
return CLASS_API_ADDRESS_SiteHtm;
}
Expand Down
2 changes: 1 addition & 1 deletion src/gen/java/org/computate/smartvillage/enus/model/page/SitePageGen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2211,7 +2211,7 @@ public void apiRequestSitePage() {
}

public static final String CLASS_SIMPLE_NAME = "SitePage";
public static final String CLASS_API_ADDRESS_SitePage = "smartvillage-platform-enUS-SitePage";
public static final String CLASS_API_ADDRESS_SitePage = "smartvillage-platform-enUS-SitePage";
public static String getClassApiAddress() {
return CLASS_API_ADDRESS_SitePage;
}
Expand Down
2 changes: 1 addition & 1 deletion src/gen/java/org/computate/smartvillage/enus/model/system/event/SystemEventGen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3118,7 +3118,7 @@ public void apiRequestSystemEvent() {
public static final String[] SystemEventVals = new String[] { statusStarted1_enUS, statusCompleted1_enUS, statusError1_enUS };

public static final String CLASS_SIMPLE_NAME = "SystemEvent";
public static final String CLASS_API_ADDRESS_SystemEvent = "smartvillage-platform-enUS-SystemEvent";
public static final String CLASS_API_ADDRESS_SystemEvent = "smartvillage-platform-enUS-SystemEvent";
public static String getClassApiAddress() {
return CLASS_API_ADDRESS_SystemEvent;
}
Expand Down
2 changes: 1 addition & 1 deletion src/gen/java/org/computate/smartvillage/enus/model/user/SiteUserGen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,7 @@ public void apiRequestSiteUser() {
}

public static final String CLASS_SIMPLE_NAME = "SiteUser";
public static final String CLASS_API_ADDRESS_SiteUser = "smartvillage-platform-enUS-SiteUser";
public static final String CLASS_API_ADDRESS_SiteUser = "smartvillage-platform-enUS-SiteUser";
public static String getClassApiAddress() {
return CLASS_API_ADDRESS_SiteUser;
}
Expand Down
2 changes: 1 addition & 1 deletion src/gen/java/org/computate/smartvillage/enus/result/map/MapResultGen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ public void apiRequestMapResult() {
}

public static final String CLASS_SIMPLE_NAME = "MapResult";
public static final String CLASS_API_ADDRESS_MapResult = "smartvillage-platform-enUS-MapResult";
public static final String CLASS_API_ADDRESS_MapResult = "smartvillage-platform-enUS-MapResult";
public static String getClassApiAddress() {
return CLASS_API_ADDRESS_MapResult;
}
Expand Down
23 changes: 14 additions & 9 deletions src/main/java/org/computate/smartvillage/enus/model/htm/SiteHtmEnUSGenApiServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public SiteHtmEnUSGenApiServiceImpl(EventBus eventBus, JsonObject config, Worker

@Override
public void searchSiteHtm(ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {

authorizationProvider.getAuthorizations(siteRequest.getUser()).onFailure(ex -> {
String msg = String.format("401 UNAUTHORIZED user %s to %s %s", siteRequest.getUser().attributes().getJsonObject("accessToken").getString("preferred_username"), serviceRequest.getExtra().getString("method"), serviceRequest.getExtra().getString("uri"));
Expand Down Expand Up @@ -279,7 +279,7 @@ public void responsePivotSearchSiteHtm(List<SolrResponse.Pivot> pivots, JsonArra

@Override
public void getSiteHtm(ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {

authorizationProvider.getAuthorizations(siteRequest.getUser()).onFailure(ex -> {
String msg = String.format("401 UNAUTHORIZED user %s to %s %s", siteRequest.getUser().attributes().getJsonObject("accessToken").getString("preferred_username"), serviceRequest.getExtra().getString("method"), serviceRequest.getExtra().getString("uri"));
Expand Down Expand Up @@ -374,7 +374,7 @@ public Future<ServiceResponse> response200GETSiteHtm(SearchList<SiteHtm> listSit
@Override
public void postSiteHtm(JsonObject body, ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
LOG.debug(String.format("postSiteHtm started. "));
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {

authorizationProvider.getAuthorizations(siteRequest.getUser()).onFailure(ex -> {
String msg = String.format("401 UNAUTHORIZED user %s to %s %s", siteRequest.getUser().attributes().getJsonObject("accessToken").getString("preferred_username"), serviceRequest.getExtra().getString("method"), serviceRequest.getExtra().getString("uri"));
Expand Down Expand Up @@ -475,7 +475,7 @@ public void postSiteHtm(JsonObject body, ServiceRequest serviceRequest, Handler<

@Override
public void postSiteHtmFuture(JsonObject body, ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
ApiRequest apiRequest = new ApiRequest();
apiRequest.setRows(1L);
apiRequest.setNumFound(1L);
Expand Down Expand Up @@ -558,7 +558,7 @@ public Future<ServiceResponse> response200POSTSiteHtm(SiteHtm o) {
@Override
public void patchSiteHtm(JsonObject body, ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
LOG.debug(String.format("patchSiteHtm started. "));
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {

authorizationProvider.getAuthorizations(siteRequest.getUser()).onFailure(ex -> {
String msg = String.format("401 UNAUTHORIZED user %s to %s %s", siteRequest.getUser().attributes().getJsonObject("accessToken").getString("preferred_username"), serviceRequest.getExtra().getString("method"), serviceRequest.getExtra().getString("uri"));
Expand Down Expand Up @@ -706,7 +706,7 @@ public Future<Void> listPATCHSiteHtm(ApiRequest apiRequest, SearchList<SiteHtm>

@Override
public void patchSiteHtmFuture(JsonObject body, ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
try {
siteRequest.setJsonObject(body);
serviceRequest.getParams().getJsonObject("query").put("rows", 1);
Expand Down Expand Up @@ -790,7 +790,7 @@ public Future<ServiceResponse> response200PATCHSiteHtm(SiteRequestEnUS siteReque
@Override
public void putimportSiteHtm(JsonObject body, ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
LOG.debug(String.format("putimportSiteHtm started. "));
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {

authorizationProvider.getAuthorizations(siteRequest.getUser()).onFailure(ex -> {
String msg = String.format("401 UNAUTHORIZED user %s to %s %s", siteRequest.getUser().attributes().getJsonObject("accessToken").getString("preferred_username"), serviceRequest.getExtra().getString("method"), serviceRequest.getExtra().getString("uri"));
Expand Down Expand Up @@ -929,7 +929,7 @@ public Future<Void> listPUTImportSiteHtm(ApiRequest apiRequest, SiteRequestEnUS

@Override
public void putimportSiteHtmFuture(JsonObject body, ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
try {
ApiRequest apiRequest = new ApiRequest();
apiRequest.setRows(1L);
Expand Down Expand Up @@ -1075,7 +1075,7 @@ public void searchpageSiteHtmId(ServiceRequest serviceRequest, Handler<AsyncResu

@Override
public void searchpageSiteHtm(ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {

authorizationProvider.getAuthorizations(siteRequest.getUser()).onFailure(ex -> {
String msg = String.format("401 UNAUTHORIZED user %s to %s %s", siteRequest.getUser().attributes().getJsonObject("accessToken").getString("preferred_username"), serviceRequest.getExtra().getString("method"), serviceRequest.getExtra().getString("uri"));
Expand Down Expand Up @@ -1582,4 +1582,9 @@ else if(softCommit == null)
public String searchVar(String varIndexed) {
return SiteHtm.searchVarSiteHtm(varIndexed);
}

@Override
public String getClassApiAddress() {
return SiteHtm.CLASS_API_ADDRESS_SiteHtm;
}
}
23 changes: 14 additions & 9 deletions src/main/java/org/computate/smartvillage/enus/model/page/SitePageEnUSGenApiServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public SitePageEnUSGenApiServiceImpl(EventBus eventBus, JsonObject config, Worke

@Override
public void searchSitePage(ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
{
try {
searchSitePageList(siteRequest, false, true, false).onSuccess(listSitePage -> {
Expand Down Expand Up @@ -249,7 +249,7 @@ public void responsePivotSearchSitePage(List<SolrResponse.Pivot> pivots, JsonArr

@Override
public void getSitePage(ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
{
try {
searchSitePageList(siteRequest, false, true, false).onSuccess(listSitePage -> {
Expand Down Expand Up @@ -314,7 +314,7 @@ public Future<ServiceResponse> response200GETSitePage(SearchList<SitePage> listS
@Override
public void postSitePage(JsonObject body, ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
LOG.debug(String.format("postSitePage started. "));
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {

authorizationProvider.getAuthorizations(siteRequest.getUser()).onFailure(ex -> {
String msg = String.format("401 UNAUTHORIZED user %s to %s %s", siteRequest.getUser().attributes().getJsonObject("accessToken").getString("preferred_username"), serviceRequest.getExtra().getString("method"), serviceRequest.getExtra().getString("uri"));
Expand Down Expand Up @@ -415,7 +415,7 @@ public void postSitePage(JsonObject body, ServiceRequest serviceRequest, Handler

@Override
public void postSitePageFuture(JsonObject body, ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
ApiRequest apiRequest = new ApiRequest();
apiRequest.setRows(1L);
apiRequest.setNumFound(1L);
Expand Down Expand Up @@ -498,7 +498,7 @@ public Future<ServiceResponse> response200POSTSitePage(SitePage o) {
@Override
public void patchSitePage(JsonObject body, ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
LOG.debug(String.format("patchSitePage started. "));
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {

authorizationProvider.getAuthorizations(siteRequest.getUser()).onFailure(ex -> {
String msg = String.format("401 UNAUTHORIZED user %s to %s %s", siteRequest.getUser().attributes().getJsonObject("accessToken").getString("preferred_username"), serviceRequest.getExtra().getString("method"), serviceRequest.getExtra().getString("uri"));
Expand Down Expand Up @@ -646,7 +646,7 @@ public Future<Void> listPATCHSitePage(ApiRequest apiRequest, SearchList<SitePage

@Override
public void patchSitePageFuture(JsonObject body, ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
try {
siteRequest.setJsonObject(body);
serviceRequest.getParams().getJsonObject("query").put("rows", 1);
Expand Down Expand Up @@ -730,7 +730,7 @@ public Future<ServiceResponse> response200PATCHSitePage(SiteRequestEnUS siteRequ
@Override
public void putimportSitePage(JsonObject body, ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
LOG.debug(String.format("putimportSitePage started. "));
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {

authorizationProvider.getAuthorizations(siteRequest.getUser()).onFailure(ex -> {
String msg = String.format("401 UNAUTHORIZED user %s to %s %s", siteRequest.getUser().attributes().getJsonObject("accessToken").getString("preferred_username"), serviceRequest.getExtra().getString("method"), serviceRequest.getExtra().getString("uri"));
Expand Down Expand Up @@ -869,7 +869,7 @@ public Future<Void> listPUTImportSitePage(ApiRequest apiRequest, SiteRequestEnUS

@Override
public void putimportSitePageFuture(JsonObject body, ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
try {
ApiRequest apiRequest = new ApiRequest();
apiRequest.setRows(1L);
Expand Down Expand Up @@ -1015,7 +1015,7 @@ public void searchpageSitePageId(ServiceRequest serviceRequest, Handler<AsyncRes

@Override
public void searchpageSitePage(ServiceRequest serviceRequest, Handler<AsyncResult<ServiceResponse>> eventHandler) {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.CLASS_API_ADDRESS, "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
user(serviceRequest, SiteRequestEnUS.class, SiteUser.class, SiteUser.getClassApiAddress(), "postSiteUserFuture", "patchSiteUserFuture").onSuccess(siteRequest -> {
{
try {
searchSitePageList(siteRequest, false, true, false).onSuccess(listSitePage -> {
Expand Down Expand Up @@ -1493,4 +1493,9 @@ else if(softCommit == null)
public String searchVar(String varIndexed) {
return SitePage.searchVarSitePage(varIndexed);
}

@Override
public String getClassApiAddress() {
return SitePage.CLASS_API_ADDRESS_SitePage;
}
}
Loading

0 comments on commit d6f31c3

Please sign in to comment.