Skip to content
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.

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

Issue 16333 vanity urls adding improvements2 #16413

Merged
merged 12 commits into from Apr 23, 2019

Conversation

Projects
None yet
5 participants
@jdotcms
Copy link
Contributor

commented Apr 16, 2019

No description provided.

dsilvam and others added some commits Mar 26, 2019

#16252 format source. Introduce format checker on build. Alter style … (
#16288)

* #16252 format source. Introduce format checker on build. Alter style files

* #16252 remove unwanted file

* #16252 remove unwanted file
#16333 : When initializing Vanity URLs upon startup or cache flush, r…
…ead from DB instead of reading from the ES index as it may be not fully updated yet.
#16333 when the secondary cache is repopulate, the previous elements …
…on the primary cache were orphan, now the elements on the current secondary cache are removed before override the secondary cache
includeSystemHost) {
List<Contentlet> contentlets = new ArrayList<>();
final StringBuilder query = new StringBuilder();
query.append("SELECT cvi.live_inode FROM contentlet c ");
} else {
query.append("= ? ");
}
query.append("INNER JOIN contentlet_version_info cvi ON c.identifier = cvi.identifier AND c.inode = cvi" +
} catch (final DotDataException e) {
Logger.error(this, String.format("An error occurred when retrieving Vanity URLs: siteId=[%s], " +
"languageId=[%s], includeSystemHost=[%s]", siteId, languageId, includeSystemHost), e);
} catch (final DotSecurityException e) {

This comment has been minimized.

includeSystemHost) {
List<Contentlet> contentlets = new ArrayList<>();
final StringBuilder query = new StringBuilder();
query.append("SELECT cvi.live_inode FROM contentlet c ");
this.checkSiteLanguageVanities
(siteId, languageId, includeSystemHost);
}
} catch (final Exception e) {
Merge remote-tracking branch 'remotes/origin/master' into issue-16333…
…-vanity-urls-adding-improvements2

# Conflicts:
#	src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java

@jgambarios jgambarios merged commit b82f474 into master Apr 23, 2019

1 of 3 checks passed

Build Summary
Details
jenkins/tests Build started
Details
license/cla Contributor License Agreement is signed.
Details

@jgambarios jgambarios deleted the issue-16333-vanity-urls-adding-improvements2 branch Apr 23, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.