AMBARI-22325 Fix compile issue (benyoka)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/259036f9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/259036f9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/259036f9 Branch: refs/heads/branch-feature-AMBARI-14714-ui Commit: 259036f9c2ae5e35566feca16f3f0c0ace4d8ed9 Parents: 93a6dbf Author: Balazs Bence Sari <[email protected]> Authored: Fri Oct 27 18:03:24 2017 +0200 Committer: Balazs Bence Sari <[email protected]> Committed: Fri Oct 27 18:03:24 2017 +0200 ---------------------------------------------------------------------- .../apache/ambari/server/orm/dao/BlueprintV2DAO.java | 12 ------------ 1 file changed, 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/259036f9/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/BlueprintV2DAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/BlueprintV2DAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/BlueprintV2DAO.java index 8a21dc1..267ae05 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/BlueprintV2DAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/BlueprintV2DAO.java @@ -25,7 +25,6 @@ import javax.persistence.TypedQuery; import org.apache.ambari.server.orm.RequiresSession; import org.apache.ambari.server.orm.entities.BlueprintV2Entity; -import org.apache.ambari.server.orm.entities.StackEntity; import com.google.inject.Inject; import com.google.inject.Provider; @@ -79,7 +78,6 @@ public class BlueprintV2DAO { */ @Transactional public void refresh(BlueprintV2Entity blueprintEntity) { - ensureStackIdSet(blueprintEntity); entityManagerProvider.get().refresh(blueprintEntity); } @@ -90,7 +88,6 @@ public class BlueprintV2DAO { */ @Transactional public void create(BlueprintV2Entity blueprintEntity) { - ensureStackIdSet(blueprintEntity); entityManagerProvider.get().persist(blueprintEntity); } @@ -102,7 +99,6 @@ public class BlueprintV2DAO { */ @Transactional public BlueprintV2Entity merge(BlueprintV2Entity blueprintEntity) { - ensureStackIdSet(blueprintEntity); return entityManagerProvider.get().merge(blueprintEntity); } @@ -113,7 +109,6 @@ public class BlueprintV2DAO { */ @Transactional public void remove(BlueprintV2Entity blueprintEntity) { - ensureStackIdSet(blueprintEntity); entityManagerProvider.get().remove(merge(blueprintEntity)); } @@ -126,11 +121,4 @@ public class BlueprintV2DAO { entityManagerProvider.get().remove(findByName(blueprint_name)); } - private void ensureStackIdSet(BlueprintV2Entity entity) { - StackEntity stack = entity.getStack(); - if (stack != null && stack.getStackId() == null) { - entity.setStack(stackDAO.find(stack.getStackName(), stack.getStackVersion())); - } - } - }
