Marijan Milicevic pushed to branch master at cms-community / hippo-essentials-components
Commits: 68c91670 by Bert Leunis at 2017-02-23T15:34:19+01:00 ESSCOM-16 deprecated the static method - - - - - e0b08500 by Marijan Milicevic at 2017-05-09T15:33:13+02:00 ESSCOM-16 Method org.onehippo.cms7.essentials.components.CommonComponent#getScopeBean is static - add deprecated annotation - - - - - c4eda7f4 by Marijan Milicevic at 2017-05-09T15:34:08+02:00 ESSCOM-16 Reintegrate feature/ESSCOM-16 - - - - - 3 changed files: - hst/src/main/java/org/onehippo/cms7/essentials/components/CommonComponent.java - hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsBlogAuthorPostsComponent.java - hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsListComponent.java Changes: ===================================== hst/src/main/java/org/onehippo/cms7/essentials/components/CommonComponent.java ===================================== --- a/hst/src/main/java/org/onehippo/cms7/essentials/components/CommonComponent.java +++ b/hst/src/main/java/org/onehippo/cms7/essentials/components/CommonComponent.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com) + * Copyright 2014-2017 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -223,6 +223,7 @@ public abstract class CommonComponent extends BaseHstComponent { * * @param path document (or folder) path relative to site-root * @return bean identified by path. Site root bean if path empty or no corresponding bean. + * @deprecated use the non-static {@code doGetScopeBean()} instead. */ public static HippoBean getScopeBean(final String path) { final HstRequestContext context = RequestContextProvider.get(); @@ -240,6 +241,28 @@ public abstract class CommonComponent extends BaseHstComponent { return siteBean; } + /** + * Find HippoBean for given path. If path is null or empty, site root bean will be returned. + * + * @param path document (or folder) path relative to site-root. + * @return bean identified by path. Site root bean if path empty or no corresponding bean. + */ + public HippoBean doGetScopeBean(final String path) { + final HstRequestContext context = RequestContextProvider.get(); + final HippoBean siteBean = context.getSiteContentBaseBean(); + + if (!Strings.isNullOrEmpty(path)) { + final String myPath = PathUtils.normalizePath(path); + log.debug("Looking for bean {}", myPath); + HippoBean scope = siteBean.getBean(myPath); + if (scope != null) { + return scope; + } + log.warn("Bean was null for selected path: {}", myPath); + } + return siteBean; + } + public int getAnyIntParameter(HstRequest request, String parameter, int defaultValue) { return SiteUtils.getAnyIntParameter(request, parameter, defaultValue, this); } ===================================== hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsBlogAuthorPostsComponent.java ===================================== --- a/hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsBlogAuthorPostsComponent.java +++ b/hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsBlogAuthorPostsComponent.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com) + * Copyright 2014-2017 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -69,7 +69,7 @@ public class EssentialsBlogAuthorPostsComponent extends EssentialsListComponent if (scopePath != null && scopePath.startsWith("/")) { scopePath = SiteUtils.relativePathFrom(scopePath, context); } - final HippoBean scopeBean = getScopeBean(scopePath); + final HippoBean scopeBean = doGetScopeBean(scopePath); try { for (AuthorEntry author : authors) { final HstQuery hstQuery = ContentBeanUtils.createIncomingBeansQuery(author, scopeBean, getSearchDepth(), clazz, true); ===================================== hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsListComponent.java ===================================== --- a/hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsListComponent.java +++ b/hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsListComponent.java @@ -120,7 +120,7 @@ public class EssentialsListComponent extends CommonComponent { } if (scope == null) { - scope = getScopeBean(path); + scope = doGetScopeBean(path); } return scope; } View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials-components/compare/79be27c710156fd98d8f800a1509224a342ecde5...c4eda7f4f27ac5a69026b1ec27e11b4a4cf030ef
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
