You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by tb...@apache.org on 2014/11/14 20:38:45 UTC
ambari git commit: AMBARI-8329 - Views: Unable to delete view
(tbeerbower)
Repository: ambari
Updated Branches:
refs/heads/trunk 692d14819 -> c7aea4b32
AMBARI-8329 - Views: Unable to delete view (tbeerbower)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c7aea4b3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c7aea4b3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c7aea4b3
Branch: refs/heads/trunk
Commit: c7aea4b32bd0bf2a92cbe8f76547a67eb2965202
Parents: 692d148
Author: tbeerbower <tb...@hortonworks.com>
Authored: Fri Nov 14 14:38:23 2014 -0500
Committer: tbeerbower <tb...@hortonworks.com>
Committed: Fri Nov 14 14:38:35 2014 -0500
----------------------------------------------------------------------
.../apache/ambari/server/view/ViewRegistry.java | 1 +
.../ambari/server/view/ViewRegistryTest.java | 19 +++++++++++++++++++
2 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c7aea4b3/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
index 0dbf32c..77c7c60 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
@@ -1152,6 +1152,7 @@ public class ViewRegistry {
instance.setResource(persistedInstance.getResource());
instance.setViewInstanceId(persistedInstance.getViewInstanceId());
instance.setData(persistedInstance.getData());
+ instance.setEntities(persistedInstance.getEntities());
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/c7aea4b3/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
index 66e2392..e956826 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java
@@ -67,6 +67,7 @@ import org.apache.ambari.server.orm.entities.PrivilegeEntity;
import org.apache.ambari.server.orm.entities.ResourceEntity;
import org.apache.ambari.server.orm.entities.ResourceTypeEntity;
import org.apache.ambari.server.orm.entities.ViewEntity;
+import org.apache.ambari.server.orm.entities.ViewEntityEntity;
import org.apache.ambari.server.orm.entities.ViewEntityTest;
import org.apache.ambari.server.orm.entities.ViewInstanceDataEntity;
import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
@@ -206,6 +207,18 @@ public class ViewRegistryTest {
for (ViewInstanceEntity viewInstanceEntity : viewInstanceEntities) {
viewInstanceEntity.putInstanceData("p1", "v1");
+
+ Collection<ViewEntityEntity> entities = new HashSet<ViewEntityEntity>();
+ ViewEntityEntity viewEntityEntity = new ViewEntityEntity();
+ viewEntityEntity.setId(99L);
+ viewEntityEntity.setIdProperty("id");
+ viewEntityEntity.setViewName("MY_VIEW{1.0.0}");
+ viewEntityEntity.setClassName("class");
+ viewEntityEntity.setViewInstanceName(viewInstanceEntity.getName());
+ viewEntityEntity.setViewInstance(viewInstanceEntity);
+ entities.add(viewEntityEntity);
+
+ viewInstanceEntity.setEntities(entities);
}
viewDefinition.setInstances(viewInstanceEntities);
@@ -314,6 +327,12 @@ public class ViewRegistryTest {
for (ViewInstanceEntity viewInstanceEntity : instanceDefinitions) {
Assert.assertEquals("v1", viewInstanceEntity.getInstanceData("p1").getValue());
+
+ Collection<ViewEntityEntity> entities = viewInstanceEntity.getEntities();
+ Assert.assertEquals(1, entities.size());
+ ViewEntityEntity viewEntityEntity = entities.iterator().next();
+ Assert.assertEquals(99L, (long) viewEntityEntity.getId());
+ Assert.assertEquals(viewInstanceEntity.getName(), viewEntityEntity.getViewInstanceName());
}
// verify mocks