Skip to content

test(cli): retry SiteAPIIT.create on transient 'Language cannot be null' (#35780) #35803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsolistorres wants to merge 1 commit into
base: main
Choose a base branch
from
+53 −4
Open

test(cli): retry SiteAPIIT.create on transient 'Language cannot be null' (#35780) #35803

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 53 additions & 4 deletions tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/SiteAPIIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.io.IOException;
import java.net.URL;
import java.util.List;
import java.util.function.Supplier;
import jakarta.inject.Inject;
import jakarta.ws.rs.NotFoundException;
import org.eclipse.microprofile.config.inject.ConfigProperty;
Expand Down Expand Up @@ -97,6 +98,50 @@ private void warmLanguageCacheIfNeeded() {
}
}

/**
* Retries the supplied Site create call when the server returns HTTP 500
* "Language cannot be null". The {@link #warmLanguageCacheIfNeeded()} warmup
* covers the most common race but the underlying server-side defect (POST
* {@code /api/v1/site} does not default the Host contentlet's
* {@code languageId} from {@code getDefaultLanguage()}, so unique-field
* validation NPEs in {@code UniqueFieldCriteria}) can still surface on a
* fresh dotCMS startup. This wrapper is a test-side mitigation; the real
* fix is server-side. See issue #35780.
*/
private <T> T retryOnLanguageNull(final Supplier<T> call) {
final int maxAttempts = 3;
final long backoffMs = 250L;
RuntimeException lastError = null;
for (int attempt = 1; attempt <= maxAttempts; attempt++) {
try {
return call.get();
} catch (RuntimeException e) {
if (!isLanguageNullError(e)) {
throw e;
}
lastError = e;
try {
Thread.sleep(backoffMs);
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
throw e;
}
}
}
throw lastError;
}

private static boolean isLanguageNullError(Throwable t) {
while (t != null) {
final String msg = t.getMessage();
if (msg != null && msg.contains("Language cannot be null")) {
return true;
}
t = t.getCause();
}
return false;
}

@Test
void Test_Get_Sites() {

Expand Down Expand Up @@ -137,7 +182,8 @@ void Test_Create_New_Site_Then_Update_Then_Delete() {

final String newSiteName = String.format("newSiteName-%d",System.currentTimeMillis());
CreateUpdateSiteRequest newSiteRequest = CreateUpdateSiteRequest.builder().siteName(newSiteName).build();
ResponseEntityView<SiteView> createSiteResponse = clientFactory.getClient(SiteAPI.class).create(newSiteRequest);
ResponseEntityView<SiteView> createSiteResponse = retryOnLanguageNull(
() -> clientFactory.getClient(SiteAPI.class).create(newSiteRequest));
Assertions.assertNotNull(createSiteResponse);
Assertions.assertFalse(createSiteResponse.entity().isDefault());
String identifier = createSiteResponse.entity().identifier();
Expand Down Expand Up @@ -167,7 +213,8 @@ void Test_Archive_Unarchive() {

final String newSiteName = String.format("newSiteName-%d",System.currentTimeMillis());
CreateUpdateSiteRequest newSiteRequest = CreateUpdateSiteRequest.builder().siteName(newSiteName).build();
ResponseEntityView<SiteView> createSiteResponse = clientFactory.getClient(SiteAPI.class).create(newSiteRequest);
ResponseEntityView<SiteView> createSiteResponse = retryOnLanguageNull(
() -> clientFactory.getClient(SiteAPI.class).create(newSiteRequest));
Assertions.assertNotNull(createSiteResponse);
Assertions.assertFalse(createSiteResponse.entity().isDefault());
final String identifier = createSiteResponse.entity().identifier();
Expand All @@ -189,7 +236,8 @@ void Test_Publish_UnPublish_Site() {

final String newSiteName = String.format("newSiteName-%d",System.currentTimeMillis());
CreateUpdateSiteRequest newSiteRequest = CreateUpdateSiteRequest.builder().siteName(newSiteName).build();
ResponseEntityView<SiteView> createSiteResponse = clientFactory.getClient(SiteAPI.class).create(newSiteRequest);
ResponseEntityView<SiteView> createSiteResponse = retryOnLanguageNull(
() -> clientFactory.getClient(SiteAPI.class).create(newSiteRequest));
Assertions.assertNotNull(createSiteResponse);
Assertions.assertFalse(createSiteResponse.entity().isDefault());
final String identifier = createSiteResponse.entity().identifier();
Expand All @@ -211,7 +259,8 @@ void Test_Publish_UnPublish_Site() {
void Test_Copy_Site() {
final String newSiteName = String.format("newSiteName-%d",System.currentTimeMillis());
CreateUpdateSiteRequest newSiteRequest = CreateUpdateSiteRequest.builder().siteName(newSiteName).build();
ResponseEntityView<SiteView> createSiteResponse = clientFactory.getClient(SiteAPI.class).create(newSiteRequest);
ResponseEntityView<SiteView> createSiteResponse = retryOnLanguageNull(
() -> clientFactory.getClient(SiteAPI.class).create(newSiteRequest));
Assertions.assertNotNull(createSiteResponse);

final String copySiteName = String.format("newSiteName-%d",System.currentTimeMillis());
Expand Down
Loading