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/07/04 11:50:51 UTC
[09/45] git commit: Rename catalog context to libraries
Rename catalog context to libraries
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0263fa1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0263fa1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0263fa1c
Branch: refs/heads/master
Commit: 0263fa1ca53082f10f07031edad24a1b7a894e88
Parents: 45e1494
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Mon Jun 30 16:07:10 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Tue Jul 1 13:37:37 2014 +0100
----------------------------------------------------------------------
.../main/java/brooklyn/catalog/CatalogItem.java | 4 +--
.../catalog/internal/CatalogContextDo.java | 24 -------------
.../catalog/internal/CatalogContextDto.java | 20 -----------
.../catalog/internal/CatalogItemDo.java | 4 +--
.../internal/CatalogItemDtoAbstract.java | 38 ++++++++------------
.../catalog/internal/CatalogLibrariesDo.java | 22 ++++++++++++
.../catalog/internal/CatalogLibrariesDto.java | 20 +++++++++++
.../catalog/internal/CatalogXmlSerializer.java | 4 +--
.../catalog/internal/CatalogDtoTest.java | 4 +--
.../catalog/internal/CatalogLoadTest.java | 6 ++--
.../brooklyn/catalog/internal/osgi-catalog.xml | 4 +--
11 files changed, 69 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0263fa1c/api/src/main/java/brooklyn/catalog/CatalogItem.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/catalog/CatalogItem.java b/api/src/main/java/brooklyn/catalog/CatalogItem.java
index b9ae3c0..9888901 100644
--- a/api/src/main/java/brooklyn/catalog/CatalogItem.java
+++ b/api/src/main/java/brooklyn/catalog/CatalogItem.java
@@ -9,7 +9,7 @@ public interface CatalogItem<T> {
TEMPLATE, ENTITY, POLICY, CONFIGURATION
}
- public static interface CatalogItemContext {
+ public static interface CatalogItemLibraries {
List<String> getBundles();
}
@@ -24,7 +24,7 @@ public interface CatalogItem<T> {
public String getVersion();
@Nonnull
- public CatalogItemContext getContext();
+ public CatalogItemLibraries getLibraries();
public String toXmlString();
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0263fa1c/core/src/main/java/brooklyn/catalog/internal/CatalogContextDo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogContextDo.java b/core/src/main/java/brooklyn/catalog/internal/CatalogContextDo.java
deleted file mode 100644
index 6560b35..0000000
--- a/core/src/main/java/brooklyn/catalog/internal/CatalogContextDo.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package brooklyn.catalog.internal;
-
-import java.util.List;
-
-import com.google.common.base.Preconditions;
-
-import brooklyn.catalog.CatalogItem;
-
-public class CatalogContextDo implements CatalogItem.CatalogItemContext {
-
-// private final CatalogDo catalog;
- private final CatalogContextDto contextDto;
-
- public CatalogContextDo(/*CatalogDo catalog,*/ CatalogContextDto contextDto) {
-// this.catalog = Preconditions.checkNotNull(catalog, "catalog");
- this.contextDto = Preconditions.checkNotNull(contextDto, "contextDto");
- }
-
- @Override
- public List<String> getBundles() {
- return contextDto.getBundles();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0263fa1c/core/src/main/java/brooklyn/catalog/internal/CatalogContextDto.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogContextDto.java b/core/src/main/java/brooklyn/catalog/internal/CatalogContextDto.java
deleted file mode 100644
index ef4fefa..0000000
--- a/core/src/main/java/brooklyn/catalog/internal/CatalogContextDto.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package brooklyn.catalog.internal;
-
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import brooklyn.catalog.CatalogItem;
-
-public class CatalogContextDto implements CatalogItem.CatalogItemContext {
-
- List<String> bundles = new CopyOnWriteArrayList<String>();
-
- public void addBundle(String url) {
- bundles.add(url);
- }
-
- public List<String> getBundles() {
- return bundles;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0263fa1c/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java b/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java
index 91ed93a..d857c45 100644
--- a/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java
+++ b/core/src/main/java/brooklyn/catalog/internal/CatalogItemDo.java
@@ -65,8 +65,8 @@ public class CatalogItemDo<T> implements CatalogItem<T> {
@Nonnull
@Override
- public CatalogItemContext getContext() {
- return itemDto.getContext();
+ public CatalogItemLibraries getLibraries() {
+ return itemDto.getLibraries();
}
public Class<T> getJavaClass() {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0263fa1c/core/src/main/java/brooklyn/catalog/internal/CatalogItemDtoAbstract.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogItemDtoAbstract.java b/core/src/main/java/brooklyn/catalog/internal/CatalogItemDtoAbstract.java
index a774930..dcee2fa 100644
--- a/core/src/main/java/brooklyn/catalog/internal/CatalogItemDtoAbstract.java
+++ b/core/src/main/java/brooklyn/catalog/internal/CatalogItemDtoAbstract.java
@@ -1,28 +1,18 @@
package brooklyn.catalog.internal;
-import java.util.Collections;
-import java.util.List;
-
import javax.annotation.Nonnull;
import brooklyn.catalog.CatalogItem;
public abstract class CatalogItemDtoAbstract<T> implements CatalogItem<T> {
- private static final CatalogItemContext EMPTY_CONTEXT = new CatalogItemContext() {
- @Override
- public List<String> getBundles() {
- return Collections.emptyList();
- }
- };
-
String id;
String type;
String name;
String description;
String iconUrl;
String version;
- CatalogItemContext context;
+ CatalogLibrariesDto libraries;
public String getId() {
if (id!=null) return id;
@@ -51,48 +41,48 @@ public abstract class CatalogItemDtoAbstract<T> implements CatalogItem<T> {
@Nonnull
@Override
- public CatalogItemContext getContext() {
- return context;
+ public CatalogItemLibraries getLibraries() {
+ return libraries;
}
public static CatalogTemplateItemDto newTemplate(String type, String name) {
return newTemplate(null, type, name, null);
}
- public static CatalogTemplateItemDto newTemplate(String id, String type, String name, String description){
+ public static CatalogTemplateItemDto newTemplate(String id, String type, String name, String description) {
return newTemplate(id, type, name, description, null);
}
- public static CatalogTemplateItemDto newTemplate(String id, String type, String name, String description, CatalogContextDto context){
- return set(new CatalogTemplateItemDto(), id, type, name, description, context);
+ public static CatalogTemplateItemDto newTemplate(String id, String type, String name, String description, CatalogLibrariesDto libraries) {
+ return set(new CatalogTemplateItemDto(), id, type, name, description, libraries);
}
public static CatalogEntityItemDto newEntity(String type, String name) {
return newEntity(null, type, name, null);
}
- public static CatalogEntityItemDto newEntity(String id, String type, String name, String description){
+ public static CatalogEntityItemDto newEntity(String id, String type, String name, String description) {
return newEntity(id, type, name, description, null);
}
- public static CatalogEntityItemDto newEntity(String id, String type, String name, String description, CatalogContextDto context){
- return set(new CatalogEntityItemDto(), id, type, name, description, context);
+ public static CatalogEntityItemDto newEntity(String id, String type, String name, String description, CatalogLibrariesDto libraries) {
+ return set(new CatalogEntityItemDto(), id, type, name, description, libraries);
}
public static CatalogPolicyItemDto newPolicy(String type, String name) {
return newPolicy(null, type, name, null);
}
- public static CatalogPolicyItemDto newPolicy(String id, String type, String name, String description){
+ public static CatalogPolicyItemDto newPolicy(String id, String type, String name, String description) {
return newPolicy(id, type, name, description, null);
}
- public static CatalogPolicyItemDto newPolicy(String id, String type, String name, String description, CatalogContextDto context){
- return set(new CatalogPolicyItemDto(), id, type, name, description, context);
+ public static CatalogPolicyItemDto newPolicy(String id, String type, String name, String description, CatalogLibrariesDto libraries) {
+ return set(new CatalogPolicyItemDto(), id, type, name, description, libraries);
}
@SuppressWarnings({ "rawtypes", "unchecked" })
private static <T extends CatalogItemDtoAbstract> T set(T target, String id, String type, String name,
- String description, CatalogContextDto context) {
+ String description, CatalogLibrariesDto libraries) {
target.id = id;
target.type = type;
target.name = name;
target.description = description;
- target.context = context != null ? context : EMPTY_CONTEXT;
+ target.libraries = libraries != null ? libraries : new CatalogLibrariesDto();
return target;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0263fa1c/core/src/main/java/brooklyn/catalog/internal/CatalogLibrariesDo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogLibrariesDo.java b/core/src/main/java/brooklyn/catalog/internal/CatalogLibrariesDo.java
new file mode 100644
index 0000000..04a8f80
--- /dev/null
+++ b/core/src/main/java/brooklyn/catalog/internal/CatalogLibrariesDo.java
@@ -0,0 +1,22 @@
+package brooklyn.catalog.internal;
+
+import java.util.List;
+
+import com.google.common.base.Preconditions;
+
+import brooklyn.catalog.CatalogItem;
+
+public class CatalogLibrariesDo implements CatalogItem.CatalogItemLibraries {
+
+ private final CatalogLibrariesDto librariesDto;
+
+ public CatalogLibrariesDo(CatalogLibrariesDto librariesDto) {
+ this.librariesDto = Preconditions.checkNotNull(librariesDto, "librariesDto");
+ }
+
+ @Override
+ public List<String> getBundles() {
+ return librariesDto.getBundles();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0263fa1c/core/src/main/java/brooklyn/catalog/internal/CatalogLibrariesDto.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogLibrariesDto.java b/core/src/main/java/brooklyn/catalog/internal/CatalogLibrariesDto.java
new file mode 100644
index 0000000..2a49cfd
--- /dev/null
+++ b/core/src/main/java/brooklyn/catalog/internal/CatalogLibrariesDto.java
@@ -0,0 +1,20 @@
+package brooklyn.catalog.internal;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import brooklyn.catalog.CatalogItem;
+
+public class CatalogLibrariesDto implements CatalogItem.CatalogItemLibraries {
+
+ List<String> bundles = new CopyOnWriteArrayList<String>();
+
+ public void addBundle(String url) {
+ bundles.add(url);
+ }
+
+ public List<String> getBundles() {
+ return bundles;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0263fa1c/core/src/main/java/brooklyn/catalog/internal/CatalogXmlSerializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/CatalogXmlSerializer.java b/core/src/main/java/brooklyn/catalog/internal/CatalogXmlSerializer.java
index 63c2382..36949a8 100644
--- a/core/src/main/java/brooklyn/catalog/internal/CatalogXmlSerializer.java
+++ b/core/src/main/java/brooklyn/catalog/internal/CatalogXmlSerializer.java
@@ -34,8 +34,8 @@ public class CatalogXmlSerializer extends XmlSerializer<Object> {
xstream.addImplicitCollection(CatalogClasspathDto.class, "entries", "entry", String.class);
xstream.registerConverter(new EnumCaseForgivingSingleValueConverter(CatalogScanningModes.class));
- xstream.aliasType("context", CatalogContextDto.class);
- xstream.addImplicitCollection(CatalogContextDto.class, "bundles", "bundle", String.class);
+ xstream.aliasType("libraries", CatalogLibrariesDto.class);
+ xstream.addImplicitCollection(CatalogLibrariesDto.class, "bundles", "bundle", String.class);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0263fa1c/core/src/test/java/brooklyn/catalog/internal/CatalogDtoTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/catalog/internal/CatalogDtoTest.java b/core/src/test/java/brooklyn/catalog/internal/CatalogDtoTest.java
index c8e14ee..ba5a863 100644
--- a/core/src/test/java/brooklyn/catalog/internal/CatalogDtoTest.java
+++ b/core/src/test/java/brooklyn/catalog/internal/CatalogDtoTest.java
@@ -84,9 +84,9 @@ public class CatalogDtoTest {
root.addCatalog(cdhCatalog.dto);
CatalogDo osgiCatalog = new CatalogDo(CatalogDto.newNamedInstance("OSGi",
- "A catalog whose entries define their context as a list of OSGi bundles"));
+ "A catalog whose entries define their libraries as a list of OSGi bundles"));
osgiCatalog.setClasspathScanForEntities(CatalogScanningModes.NONE);
- CatalogContextDto m3Context = new CatalogContextDto();
+ CatalogLibrariesDto m3Context = new CatalogLibrariesDto();
m3Context.addBundle("file://~/.m2/repository/io/cloudsoft/brooklyn-mapr/1.0.0-SNAPSHOT/brooklyn-mapr.jar");
osgiCatalog.addEntry(CatalogItemDtoAbstract.newTemplate("M3App", "io.brooklyn.mapr.M3App", "M3 Application",
"Description", m3Context));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0263fa1c/core/src/test/java/brooklyn/catalog/internal/CatalogLoadTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/catalog/internal/CatalogLoadTest.java b/core/src/test/java/brooklyn/catalog/internal/CatalogLoadTest.java
index 46394c7..9961d3a 100644
--- a/core/src/test/java/brooklyn/catalog/internal/CatalogLoadTest.java
+++ b/core/src/test/java/brooklyn/catalog/internal/CatalogLoadTest.java
@@ -37,9 +37,9 @@ public class CatalogLoadTest {
assertEquals(template.getName(), "Entity name");
assertEquals(template.getVersion(), "9.1.3");
assertEquals(template.getJavaType(), "com.example.ExampleApp");
- assertEquals(template.getContext().getBundles().size(), 2,
- "Template bundles=" + Joiner.on(", ").join(template.getContext().getBundles()));
- assertEquals(Sets.newHashSet(template.getContext().getBundles()),
+ assertEquals(template.getLibraries().getBundles().size(), 2,
+ "Template bundles=" + Joiner.on(", ").join(template.getLibraries().getBundles()));
+ assertEquals(Sets.newHashSet(template.getLibraries().getBundles()),
Sets.newHashSet("file://path/to/bundle.jar", "http://www.url.com/for/bundle.jar"));
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0263fa1c/core/src/test/resources/brooklyn/catalog/internal/osgi-catalog.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/brooklyn/catalog/internal/osgi-catalog.xml b/core/src/test/resources/brooklyn/catalog/internal/osgi-catalog.xml
index c8ea685..6b40130 100644
--- a/core/src/test/resources/brooklyn/catalog/internal/osgi-catalog.xml
+++ b/core/src/test/resources/brooklyn/catalog/internal/osgi-catalog.xml
@@ -3,9 +3,9 @@
<template name="Entity name" version="9.1.3" type="com.example.ExampleApp">
<description>An example application</description>
- <context class="context">
+ <libraries>
<bundle>file://path/to/bundle.jar</bundle>
<bundle>http://www.url.com/for/bundle.jar</bundle>
- </context>
+ </libraries>
</template>
</catalog>