From 029a84fb1a01e9877736db2693b8a3013b1e72a1 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 16 Sep 2016 12:10:26 +0000 Subject: [PATCH] Rename utility git-svn-id: https://svn.argeo.org/commons/trunk@9183 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org/argeo/cms/ui/internal/Activator.java | 4 ++-- .../argeo/cms/internal/kernel/Activator.java | 2 +- .../cms/internal/kernel/CmsDeployment.java | 2 +- .../org/argeo/cms/internal/kernel/CmsState.java | 4 ++-- .../kernel/RepositoryServiceFactory.java | 2 +- .../src/org/argeo/util/LangUtils.java | 17 ++++++++--------- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java index 410498725..475a95122 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/internal/Activator.java @@ -20,8 +20,8 @@ public class Activator implements BundleActivator { public void start(BundleContext bc) throws Exception { // UI bc.registerService(ApplicationConfiguration.class, new MaintenanceUi(), - LangUtils.init(CONTEXT_NAME_PROP, "system")); - bc.registerService(ApplicationConfiguration.class, new UserUi(), LangUtils.init(CONTEXT_NAME_PROP, "user")); + LangUtils.dico(CONTEXT_NAME_PROP, "system")); + bc.registerService(ApplicationConfiguration.class, new UserUi(), LangUtils.dico(CONTEXT_NAME_PROP, "user")); nodeState = new ServiceTracker<>(bc, NodeState.class, null); nodeState.open(); diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java index 99d5dbb3e..7dd668c38 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java @@ -77,7 +77,7 @@ public class Activator implements BundleActivator { Files.write(stateUuidPath, stateUuid.getBytes()); } nodeState = new CmsState(stateUuid); - Dictionary regProps = LangUtils.init( + Dictionary regProps = LangUtils.dico( Constants.SERVICE_PID, NodeConstants.NODE_STATE_PID); regProps.put(NodeConstants.CN, stateUuid); bc.registerService(NodeState.class, nodeState, regProps); diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java index 20a899eca..d2d89522f 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java @@ -148,7 +148,7 @@ public class CmsDeployment implements NodeDeployment { CallbackHandler callbackHandler = bc.getService(reference); nodeKeyring.setDefaultCallbackHandler(callbackHandler); bc.registerService(LangUtils.names(CryptoKeyring.class, ManagedService.class), nodeKeyring, - LangUtils.init(Constants.SERVICE_PID, NodeConstants.NODE_KEYRING_PID)); + LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_KEYRING_PID)); return callbackHandler; } diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java index 9ff1540a7..7ed19d20c 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java @@ -92,7 +92,7 @@ public class CmsState implements NodeState { RepositoryServiceFactory repositoryServiceFactory = new RepositoryServiceFactory(); shutdownHooks.add(() -> repositoryServiceFactory.shutdown()); bc.registerService(ManagedServiceFactory.class, repositoryServiceFactory, - LangUtils.init(Constants.SERVICE_PID, NodeConstants.NODE_REPOS_FACTORY_PID)); + LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_REPOS_FACTORY_PID)); NodeRepositoryFactory repositoryFactory = new NodeRepositoryFactory(); bc.registerService(RepositoryFactory.class, repositoryFactory, null); @@ -101,7 +101,7 @@ public class CmsState implements NodeState { NodeUserAdmin userAdmin = new NodeUserAdmin(AuthConstants.ROLES_BASEDN); shutdownHooks.add(() -> userAdmin.destroy()); bc.registerService(ManagedServiceFactory.class, userAdmin, - LangUtils.init(Constants.SERVICE_PID, NodeConstants.NODE_USER_ADMIN_PID)); + LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_USER_ADMIN_PID)); } private void initTransactionManager() { diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java index f69c498e3..e6efa1e79 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/RepositoryServiceFactory.java @@ -45,7 +45,7 @@ class RepositoryServiceFactory implements ManagedServiceFactory { RepositoryBuilder repositoryBuilder = new RepositoryBuilder(); RepositoryContext repositoryContext = repositoryBuilder.createRepositoryContext(properties); repositories.put(pid, repositoryContext); - Dictionary props = LangUtils.init(Constants.SERVICE_PID, pid); + Dictionary props = LangUtils.dico(Constants.SERVICE_PID, pid); // props.put(ArgeoJcrConstants.JCR_REPOSITORY_URI, // properties.get(RepoConf.labeledUri.name())); Object cn = properties.get(NodeConstants.CN); diff --git a/org.argeo.util/src/org/argeo/util/LangUtils.java b/org.argeo.util/src/org/argeo/util/LangUtils.java index 8810d6463..fae631234 100644 --- a/org.argeo.util/src/org/argeo/util/LangUtils.java +++ b/org.argeo.util/src/org/argeo/util/LangUtils.java @@ -38,7 +38,7 @@ public class LangUtils { * Creates a new {@link Dictionary} with one key-value pair (neither key not * value should be null) */ - public static Dictionary init(String key, Object value) { + public static Dictionary dico(String key, Object value) { assert key != null; assert value != null; Hashtable props = new Hashtable<>(); @@ -54,11 +54,11 @@ public class LangUtils { return new DictionaryKeys(props); } - public static String toJson(Dictionary props) { + static String toJson(Dictionary props) { return toJson(props, false); } - public static String toJson(Dictionary props, boolean pretty) { + static String toJson(Dictionary props, boolean pretty) { StringBuilder sb = new StringBuilder(); sb.append('{'); if (pretty) @@ -83,7 +83,7 @@ public class LangUtils { return sb.toString(); } - public static void storeAsProperties(Dictionary props, Path path) throws IOException { + static void storeAsProperties(Dictionary props, Path path) throws IOException { if (props == null) throw new IllegalArgumentException("Props cannot be null"); Properties toStore = new Properties(); @@ -96,7 +96,7 @@ public class LangUtils { } } - public static void appendAsLdif(String dnBase, String dnKey, Dictionary props, Path path) + static void appendAsLdif(String dnBase, String dnKey, Dictionary props, Path path) throws IOException { if (props == null) throw new IllegalArgumentException("Props cannot be null"); @@ -126,7 +126,7 @@ public class LangUtils { } } - public static Dictionary loadFromProperties(Path path) throws IOException { + static Dictionary loadFromProperties(Path path) throws IOException { Properties toLoad = new Properties(); try (InputStream in = Files.newInputStream(path)) { toLoad.load(in); @@ -136,7 +136,7 @@ public class LangUtils { res.put(key.toString(), toLoad.get(key)); return res; } - + /* * EXCEPTIONS */ @@ -152,8 +152,7 @@ public class LangUtils { /** Recursive chaining of messages */ private static void chainCauseMessage(StringBuffer buf, Throwable t) { - buf.append('\n').append(' ').append(t.getClass().getCanonicalName()) - .append(": ").append(t.getMessage()); + buf.append('\n').append(' ').append(t.getClass().getCanonicalName()).append(": ").append(t.getMessage()); if (t.getCause() != null) chainCauseMessage(buf, t.getCause()); } -- 2.30.2