Remove deprecated method.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/66e9f56b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/66e9f56b Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/66e9f56b Branch: refs/heads/master Commit: 66e9f56be3584d12a2c0a201b2a9556d11172f60 Parents: 9720743 Author: Svetoslav Neykov <[email protected]> Authored: Tue Apr 5 17:46:39 2016 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Tue Apr 5 17:46:39 2016 +0300 ---------------------------------------------------------------------- .../org/apache/brooklyn/core/internal/BrooklynProperties.java | 7 +------ .../brooklyn/core/config/BrooklynPropertiesBuilderTest.java | 4 ++-- .../core/mgmt/internal/LocalManagementContextTest.java | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/66e9f56b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java index 75b7b34..ea7cd07 100644 --- a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java +++ b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java @@ -79,12 +79,7 @@ public interface BrooklynProperties extends Map, StringConfigMap { private String globalPropertiesFile = null; private String localPropertiesFile = null; private BrooklynProperties originalProperties = null; - - /** @deprecated since 0.7.0 use static methods in {@link Factory} to create */ - public Builder() { - this(true); - } - + private Builder(boolean setGlobalFileDefaults) { resetDefaultLocationMetadataUrl(); if (setGlobalFileDefaults) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/66e9f56b/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesBuilderTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesBuilderTest.java b/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesBuilderTest.java index 613f405..bc57824 100644 --- a/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesBuilderTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesBuilderTest.java @@ -54,7 +54,7 @@ public class BrooklynPropertiesBuilderTest { String globalPropertiesContents = "brooklyn.mykey=myval"; Files.write(globalPropertiesContents, globalPropertiesFile, Charsets.UTF_8); - BrooklynProperties props = new BrooklynProperties.Factory.Builder() + BrooklynProperties props = BrooklynProperties.Factory.builderDefault() .globalPropertiesFile(globalPropertiesFile.getAbsolutePath()) .build(); @@ -71,7 +71,7 @@ public class BrooklynPropertiesBuilderTest { "brooklyn.mykeyLocal=myvallocal2"+"\n"; Files.write(localPropertiesContents, localPropertiesFile, Charsets.UTF_8); - BrooklynProperties props = new BrooklynProperties.Factory.Builder() + BrooklynProperties props = BrooklynProperties.Factory.builderDefault() .globalPropertiesFile(globalPropertiesFile.getAbsolutePath()) .localPropertiesFile(localPropertiesFile.getAbsolutePath()) .build(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/66e9f56b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java index 98f5823..3e7d613 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java @@ -60,7 +60,7 @@ public class LocalManagementContextTest { public void testReloadPropertiesFromBuilder() throws IOException { String globalPropertiesContents = "brooklyn.location.localhost.displayName=myname"; Files.write(globalPropertiesContents, globalPropertiesFile, Charsets.UTF_8); - Builder propsBuilder = new BrooklynProperties.Factory.Builder() + Builder propsBuilder = BrooklynProperties.Factory.builderDefault() .globalPropertiesFile(globalPropertiesFile.getAbsolutePath()); // no builder support in LocalManagementContextForTests (we are testing that the builder's files are reloaded so we need it here) context = new LocalManagementContext(propsBuilder); @@ -78,7 +78,7 @@ public class LocalManagementContextTest { public void testReloadPropertiesFromProperties() throws IOException { String globalPropertiesContents = "brooklyn.location.localhost.displayName=myname"; Files.write(globalPropertiesContents, globalPropertiesFile, Charsets.UTF_8); - BrooklynProperties brooklynProperties = new BrooklynProperties.Factory.Builder() + BrooklynProperties brooklynProperties = BrooklynProperties.Factory.builderDefault() .globalPropertiesFile(globalPropertiesFile.getAbsolutePath()) .build(); context = LocalManagementContextForTests.builder(true).useProperties(brooklynProperties).build();
