From d6b570e356d6adc9cab24cc8308a27afae9904c5 Mon Sep 17 00:00:00 2001 From: Igor Rogic Date: Mon, 9 Sep 2024 17:01:49 +0200 Subject: [PATCH] Rename RuntimeHelper methods to match their implementations closer --- .../aceinstaller/BaseAceBeanInstaller.java | 4 +-- .../actool/helper/runtime/RuntimeHelper.java | 4 +-- .../actool/history/impl/HistoryUtils.java | 4 +-- .../actool/impl/AcConfigChangeTracker.java | 4 +-- .../actool/installhook/AcToolInstallHook.java | 2 +- .../ExtendedSlingSettingsServiceImpl.java | 6 ++-- .../impl/AcToolStartupHookServiceImpl.java | 28 +++++++++---------- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/BaseAceBeanInstaller.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/BaseAceBeanInstaller.java index d39d629d..47e445ba 100644 --- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/BaseAceBeanInstaller.java +++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/BaseAceBeanInstaller.java @@ -111,8 +111,8 @@ public void installPathBasedACEs( private Set filterReadOnlyPaths(Set paths, InstallationLogger history, Session session) { - boolean isCompositeNodeStore = RuntimeHelper.isCompositeNodeStore(session); - if (isCompositeNodeStore) { + boolean isAppsReadOnly = RuntimeHelper.isAppsReadOnly(session); + if (isAppsReadOnly) { Set pathsToKeep = new TreeSet(); Set readOnlyPaths = new TreeSet(); for (final String path : paths) { diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/runtime/RuntimeHelper.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/runtime/RuntimeHelper.java index aec9ef85..52a11176 100644 --- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/runtime/RuntimeHelper.java +++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/runtime/RuntimeHelper.java @@ -30,7 +30,7 @@ public class RuntimeHelper { private static final String INSTALLER_CORE_BUNDLE_SYMBOLIC_ID = "org.apache.sling.installer.core"; - public static boolean isCompositeNodeStore(Session session) { + public static boolean isAppsReadOnly(Session session) { try { String pathToCheck = "/apps"; @@ -60,7 +60,7 @@ public static int getCurrentStartLevel(BundleContext bundleContext) { return bundleContext.getBundle(Constants.SYSTEM_BUNDLE_ID).adapt(FrameworkStartLevel.class).getStartLevel(); } - public static boolean isCloudReadyInstance() { + public static boolean isCompositeNodeStore() { boolean isCloudReadyInstance = true; Bundle[] bundles = FrameworkUtil.getBundle(RuntimeHelper.class).getBundleContext().getBundles(); diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/HistoryUtils.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/HistoryUtils.java index 2febe078..dbfc22d2 100644 --- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/HistoryUtils.java +++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/HistoryUtils.java @@ -127,8 +127,8 @@ public static Node persistHistory(final Session session, trigger = "startup_hook_pckmgr)"; } else { // if the history is not yet copied to apps, it's the image build - boolean isImageBuild = RuntimeHelper.isCloudReadyInstance() && !session.itemExists(AC_HISTORY_PATH_IN_APPS); - if(isImageBuild) { + boolean isCompositeNodeStore = RuntimeHelper.isCompositeNodeStore() && !session.itemExists(AC_HISTORY_PATH_IN_APPS); + if(isCompositeNodeStore) { trigger = "startup_hook_image_build"; } else { trigger = "startup_hook"; diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcConfigChangeTracker.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcConfigChangeTracker.java index 7700a11c..50d03fba 100644 --- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcConfigChangeTracker.java +++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcConfigChangeTracker.java @@ -66,10 +66,10 @@ public boolean configIsUnchangedComparedToLastExecution(Map conf } private String createExecutionKey(Map configFiles, String[] restrictedToPaths, Session session) { - boolean isCompositeNodeStore= RuntimeHelper.isCompositeNodeStore(session); + boolean isAppsReadOnly= RuntimeHelper.isAppsReadOnly(session); String restrictedToPathsKey = restrictedToPaths==null || restrictedToPaths.length==0 ? "ALL_PATHS" : StringUtils.join(restrictedToPaths, "+").replace("$", "").replace("^", ""); String effectiveRootPathOfConfigs = getEffectiveConfigRootPath(configFiles); - String executionKey = "hash("+StringUtils.removeEnd(effectiveRootPathOfConfigs, "/").replace('/', '\\') + "," + restrictedToPathsKey.replace('/', '\\').replace(':', '_')+","+(isCompositeNodeStore?"compNodeStore":"stdRepo")+")"; + String executionKey = "hash("+StringUtils.removeEnd(effectiveRootPathOfConfigs, "/").replace('/', '\\') + "," + restrictedToPathsKey.replace('/', '\\').replace(':', '_')+","+(isAppsReadOnly?"compNodeStore":"stdRepo")+")"; return executionKey; } diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/AcToolInstallHook.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/AcToolInstallHook.java index 288e5f78..74eaed0c 100644 --- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/AcToolInstallHook.java +++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/AcToolInstallHook.java @@ -72,7 +72,7 @@ private void install(InstallContext context) throws PackageException { } alreadyRan = true; - if (RuntimeHelper.isCloudReadyInstance()) { + if (RuntimeHelper.isCompositeNodeStore()) { log("InstallHook is skipped by default in cloud (use package property 'actool.forceInstallHookInCloud = true' to force run)", listener); return; diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsServiceImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsServiceImpl.java index 448e1a57..136439b0 100644 --- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsServiceImpl.java +++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsServiceImpl.java @@ -80,8 +80,8 @@ public void activate(Config config) { Set defaultRunmodes = slingSettingsService.getRunModes(); extendedRunmodes = new HashSet<>(); extendedRunmodes.addAll(defaultRunmodes); - boolean isCloudReady = RuntimeHelper.isCloudReadyInstance(); - if(isCloudReady) { + boolean isCompositeNodeStore = RuntimeHelper.isCompositeNodeStore(); + if(isCompositeNodeStore) { extendedRunmodes.add(ADDITIONAL_RUNMODE_CLOUD); } @@ -90,7 +90,7 @@ public void activate(Config config) { extendedRunmodes.addAll(additionalRunmodes); } - LOG.info("Default runmodes: {} Extended Runmodes: {} isCloudReady: {}", defaultRunmodes, extendedRunmodes, isCloudReady); + LOG.info("Default runmodes: {} Extended Runmodes: {} isCompositeNodeStore: {}", defaultRunmodes, extendedRunmodes, isCompositeNodeStore); } @Override diff --git a/accesscontroltool-startuphook-bundle/src/main/java/biz/netcentric/cq/tools/actool/startuphook/impl/AcToolStartupHookServiceImpl.java b/accesscontroltool-startuphook-bundle/src/main/java/biz/netcentric/cq/tools/actool/startuphook/impl/AcToolStartupHookServiceImpl.java index 35a32dad..a7da91c1 100644 --- a/accesscontroltool-startuphook-bundle/src/main/java/biz/netcentric/cq/tools/actool/startuphook/impl/AcToolStartupHookServiceImpl.java +++ b/accesscontroltool-startuphook-bundle/src/main/java/biz/netcentric/cq/tools/actool/startuphook/impl/AcToolStartupHookServiceImpl.java @@ -67,23 +67,23 @@ public enum StartupHookActivation { @Reference(policyOption = ReferencePolicyOption.GREEDY) private SlingRepository repository; - private boolean isCompositeNodeStore; + private boolean isAppsReadOnly; @Activate public void activate(BundleContext bundleContext, Config config) { - boolean isCloudReady = RuntimeHelper.isCloudReadyInstance(); + boolean isCompositeNodeStore = RuntimeHelper.isCompositeNodeStore(); Config.StartupHookActivation activationMode = config.activationMode(); boolean runAsyncForMutableConent = config.runAsyncForMutableConent(); int currentStartLevel = RuntimeHelper.getCurrentStartLevel(bundleContext); - LOG.info("AcTool Startup Hook (start level: {} isCloudReady: {} activationMode: {} runAsyncForMutableConent: {})", + LOG.info("AcTool Startup Hook (start level: {} isCompositeNodeStore: {} activationMode: {} runAsyncForMutableConent: {})", currentStartLevel, - isCloudReady, + isCompositeNodeStore, activationMode, runAsyncForMutableConent); boolean applyOnStartup = (activationMode == Config.StartupHookActivation.ALWAYS) - || (isCloudReady && activationMode == Config.StartupHookActivation.CLOUD_ONLY); + || (isCompositeNodeStore && activationMode == Config.StartupHookActivation.CLOUD_ONLY); if (applyOnStartup) { @@ -91,16 +91,16 @@ public void activate(BundleContext bundleContext, Config config) { LOG.info("Running AcTool with " + (relevantPathsForInstallation.isEmpty() ? "all paths" : "paths " + relevantPathsForInstallation) + "..."); - if (runAsyncForMutableConent && isCompositeNodeStore) { + if (runAsyncForMutableConent && isAppsReadOnly) { LOG.info( "Running AcTool asynchronously on mutable content of composite node store (config runAsyncForMutableConent=true)..."); - runAcToolAsync(relevantPathsForInstallation, currentStartLevel, isCloudReady); + runAcToolAsync(relevantPathsForInstallation, currentStartLevel, isCompositeNodeStore); } else { - runAcTool(relevantPathsForInstallation, currentStartLevel, isCloudReady); + runAcTool(relevantPathsForInstallation, currentStartLevel, isCompositeNodeStore); } } else { - LOG.debug("Skipping AcTool Startup Hook: activationMode: {} isCloudReady: {}", activationMode, isCloudReady); + LOG.debug("Skipping AcTool Startup Hook: activationMode: {} isCompositeNodeStore: {}", activationMode, isCompositeNodeStore); } } @@ -131,10 +131,10 @@ private List getRelevantPathsForInstallation() { try { session = repository.loginService(null, null); - isCompositeNodeStore = RuntimeHelper.isCompositeNodeStore(session); - LOG.info("Repo is running with Composite NodeStore: {}", isCompositeNodeStore); + isAppsReadOnly = RuntimeHelper.isAppsReadOnly(session); + LOG.info("Repo is running with Composite NodeStore: {}", isAppsReadOnly); - if(!isCompositeNodeStore) { + if(!isAppsReadOnly) { return Collections.emptyList(); } @@ -149,7 +149,7 @@ private List getRelevantPathsForInstallation() { AccessControlConstants.REP_REPO_POLICY).contains(node.getName())) { continue; } - if (isCompositeNodeStore && Arrays.asList("apps", "libs").contains(node.getName())) { + if (isAppsReadOnly && Arrays.asList("apps", "libs").contains(node.getName())) { continue; } relevantPathsForInstallation.add(node.getPath()); @@ -179,7 +179,7 @@ private void copyAcHistoryToOrFromApps(boolean isCloudReady) { try { session = repository.loginService(null, null); - if(isCompositeNodeStore) { + if(isAppsReadOnly) { LOG.info("Restoring history from /apps to /var"); if(session.nodeExists(HistoryUtils.AC_HISTORY_PATH_IN_APPS)) {