Repository: incubator-ignite Updated Branches: refs/heads/ignite-556 0eadc45e1 -> 86e765503
#ignite-556: Add excludedProperties to IgniteSpringProcessorImpl Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/86e76550 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/86e76550 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/86e76550 Branch: refs/heads/ignite-556 Commit: 86e765503c120f62ed7eb73a2d79454c24040427 Parents: 0eadc45 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Mar 23 14:43:57 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Mar 23 14:43:57 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/spring/IgniteSpringProcessor.java | 3 ++- .../internal/processors/spring/IgniteSpringProcessorImpl.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86e76550/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java index 82ec0ac..93993df 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessor.java @@ -56,12 +56,13 @@ public interface IgniteSpringProcessor { * * @param cfgUrl Configuration file path or URL. This cannot be {@code null}. * @param cl Required type of configuration. + * @param excludedProps Properties to exclude. * @return Tuple containing all loaded configurations and Spring context used to load them. * @throws IgniteCheckedException If configuration could not be * read. */ public <T> IgniteBiTuple<Collection<T>, ? extends GridSpringResourceContext> loadConfigurations( - URL cfgUrl, Class<T> cl) throws IgniteCheckedException; + URL cfgUrl, Class<T> cl, String... excludedProps) throws IgniteCheckedException; /** * Loads bean instances that match the given types from given configuration file. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86e76550/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java b/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java index 263ae17..4e7dcd5 100644 --- a/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java +++ b/modules/spring/src/main/java/org/apache/ignite/internal/processors/spring/IgniteSpringProcessorImpl.java @@ -78,13 +78,13 @@ public class IgniteSpringProcessorImpl implements IgniteSpringProcessor { /** {@inheritDoc} */ @Override public IgniteBiTuple<Collection<IgniteConfiguration>, ? extends GridSpringResourceContext> loadConfigurations( URL cfgUrl, String... excludedProps) throws IgniteCheckedException { - return loadConfigurations(cfgUrl, IgniteConfiguration.class); + return loadConfigurations(cfgUrl, IgniteConfiguration.class, excludedProps); } /** {@inheritDoc} */ @Override public <T> IgniteBiTuple<Collection<T>, ? extends GridSpringResourceContext> loadConfigurations( - URL cfgUrl, Class<T> cl) throws IgniteCheckedException { - ApplicationContext springCtx = applicationContext(cfgUrl); + URL cfgUrl, Class<T> cl, String... excludedProps) throws IgniteCheckedException { + ApplicationContext springCtx = applicationContext(cfgUrl, excludedProps); Map<String, T> cfgMap; try {
