You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/11/04 15:30:03 UTC
[09/18] git commit: Merge remote-tracking branch 'apache-gh/pr/274'
into misc4
Merge remote-tracking branch 'apache-gh/pr/274' into misc4
Conflicts:
utils/common/src/main/java/brooklyn/util/text/Strings.java - unambiguous new methods added at end
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e832ee46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e832ee46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e832ee46
Branch: refs/heads/master
Commit: e832ee462c981ed2b056c0aaa9e39a64e99cc73b
Parents: 83011fe 0eb6763
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Nov 3 18:56:16 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Nov 3 18:56:16 2014 +0000
----------------------------------------------------------------------
.../basic/AbstractBrooklynObjectSpec.java | 11 +
.../java/brooklyn/basic/ApiObjectsFactory.java | 41 +++
.../java/brooklyn/basic/BrooklynObject.java | 5 +
.../mementos/BrooklynMementoManifest.java | 17 +-
.../main/java/brooklyn/mementos/Memento.java | 2 +
.../brooklyn/basic/AbstractBrooklynObject.java | 13 +
.../brooklyn/basic/ApiObjectsFactoryImpl.java | 41 +++
.../catalog/internal/BasicBrooklynCatalog.java | 19 +-
.../catalog/internal/CatalogItemDo.java | 7 +-
.../brooklyn/catalog/internal/CatalogUtils.java | 18 +-
.../brooklyn/entity/basic/AbstractEntity.java | 4 +
.../entity/proxying/InternalEntityFactory.java | 4 +
.../proxying/InternalLocationFactory.java | 5 +
.../entity/proxying/InternalPolicyFactory.java | 9 +
.../AbstractBrooklynObjectRebindSupport.java | 1 +
.../entity/rebind/RebindManagerImpl.java | 257 +++++++++++--------
.../entity/rebind/dto/AbstractMemento.java | 13 +
.../rebind/dto/BrooklynMementoManifestImpl.java | 52 ++--
.../rebind/dto/EntityMementoManifestImpl.java | 56 ++++
.../entity/rebind/dto/MementosGenerators.java | 1 +
.../AbstractBrooklynMementoPersister.java | 4 +-
.../BrooklynMementoPersisterInMemory.java | 6 +-
.../BrooklynMementoPersisterToMultiFile.java | 5 +-
.../BrooklynMementoPersisterToObjectStore.java | 22 +-
.../OsgiBrooklynClassLoadingContext.java | 15 +-
.../policy/basic/AbstractEntityAdjunct.java | 3 +
...ApiObjectsFactory$ApiObjectsFactoryInterface | 19 ++
.../entity/rebind/RebindPolicyTest.java | 2 +-
.../BrooklynAssemblyTemplateInstantiator.java | 2 +
.../BrooklynComponentTemplateResolver.java | 11 +-
.../lookup/AbstractTemplateBrooklynLookup.java | 2 +-
.../lookup/AssemblyTemplateBrooklynLookup.java | 2 +-
...PlatformComponentTemplateBrooklynLookup.java | 2 +-
.../main/java/brooklyn/util/text/Strings.java | 10 +
34 files changed, 522 insertions(+), 159 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e832ee46/core/src/main/java/brooklyn/catalog/internal/CatalogUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e832ee46/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e832ee46/core/src/main/java/brooklyn/entity/proxying/InternalEntityFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e832ee46/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e832ee46/utils/common/src/main/java/brooklyn/util/text/Strings.java
----------------------------------------------------------------------
diff --cc utils/common/src/main/java/brooklyn/util/text/Strings.java
index a52dcc9,6e3ec06..03b7c67
--- a/utils/common/src/main/java/brooklyn/util/text/Strings.java
+++ b/utils/common/src/main/java/brooklyn/util/text/Strings.java
@@@ -833,9 -833,14 +833,19 @@@ public class Strings
return replaceAllRegex(x, "\\s+", whitespaceReplacement);
}
+ public static String toLowerCase(String value) {
+ if (value==null || value.length()==0) return value;
+ return value.toLowerCase(Locale.ENGLISH);
+ }
+
+ /**
+ * @return null if var is null or empty string, otherwise return var
+ */
+ public static String emptyToNull(String var) {
+ if (isNonEmpty(var)) {
+ return var;
+ } else {
+ return null;
+ }
+ }
}