[5/6] ambari git commit: AMBARI-21766 - When Matching New VDFs for Parent Repos only Consider STANDARD Types (jonathanhurley)

2017-08-23 Thread jonathanhurley 
AMBARI-21766 - When Matching New VDFs for Parent Repos only Consider STANDARD 
Types (jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/92d307c9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/92d307c9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/92d307c9

Branch: refs/heads/branch-2.6
Commit: 92d307c91ccfdfdabb505fbb454997374a2327e6
Parents: 4f6b67f
Author: Jonathan Hurley 
Authored: Mon Aug 21 11:52:03 2017 -0400
Committer: Jonathan Hurley 
Committed: Tue Aug 22 11:03:56 2017 -0400

--
 .../VersionDefinitionResourceProvider.java  |  4 +++-
 .../server/orm/dao/RepositoryVersionDAO.java| 20 
 .../orm/entities/RepositoryVersionEntity.java   |  3 +++
 .../orm/dao/RepositoryVersionDAOTest.java   | 12 
 4 files changed, 38 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/92d307c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
index ea592e5..e676056 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
@@ -433,7 +433,9 @@ public class VersionDefinitionResourceProvider extends 
AbstractAuthorizedResourc
   return;
 }
 
-List entities = 
s_repoVersionDAO.findByStack(entity.getStackId());
+List entities = 
s_repoVersionDAO.findByStackAndType(
+entity.getStackId(), RepositoryType.STANDARD);
+
 if (entities.isEmpty()) {
   throw new IllegalArgumentException(String.format("Patch %s was uploaded, 
but there are no repositories for %s",
   entity.getVersion(), entity.getStackId().toString()));

http://git-wip-us.apache.org/repos/asf/ambari/blob/92d307c9/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
index 40bbd07..d4497b6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
@@ -134,6 +134,26 @@ public class RepositoryVersionDAO extends 
CrudDAO
   }
 
   /**
+   * Retrieves repository version by stack.
+   *
+   * @param stackId
+   *  stack id stack with major version (like HDP-2.2)
+   * @param type
+   *  the repository type
+   *
+   * @return null if there is no suitable repository version
+   */
+  @RequiresSession
+  public List findByStackAndType(StackId stackId, 
RepositoryType type) {
+final TypedQuery query = 
entityManagerProvider.get().createNamedQuery(
+"repositoryVersionByStackAndType", RepositoryVersionEntity.class);
+query.setParameter("stackName", stackId.getStackName());
+query.setParameter("stackVersion", stackId.getStackVersion());
+query.setParameter("type", type);
+return daoUtils.selectList(query);
+  }
+
+  /**
* Gets the first repository which matches the specified version. There can 
be
* multiple repositories matching a single version as long as they have
* different stacks. This method is a fallback mechanism if the repository

http://git-wip-us.apache.org/repos/asf/ambari/blob/92d307c9/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
index aed0aaf..f84f3a4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
@@ -79,6 +79,9 @@ import com.google.inject.Provider;
 name = "repositoryVersionByStack",
 query = "SELECT repoversion FROM RepositoryVersionEntity repoversion 
WHERE repoversion.stack.stackName=:stackName

[30/35] ambari git commit: AMBARI-21766 - When Matching New VDFs for Parent Repos only Consider STANDARD Types (jonathanhurley)

2017-08-22 Thread ababiichuk 
AMBARI-21766 - When Matching New VDFs for Parent Repos only Consider STANDARD 
Types (jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d2e0c42a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d2e0c42a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d2e0c42a

Branch: refs/heads/branch-feature-logsearch-ui
Commit: d2e0c42a1d6f67ade14e867d069d73b2567d685b
Parents: 6f9f87c
Author: Jonathan Hurley 
Authored: Mon Aug 21 11:52:03 2017 -0400
Committer: Jonathan Hurley 
Committed: Tue Aug 22 11:34:06 2017 -0400

--
 .../VersionDefinitionResourceProvider.java  |  4 +++-
 .../server/orm/dao/RepositoryVersionDAO.java| 20 
 .../orm/entities/RepositoryVersionEntity.java   |  3 +++
 .../orm/dao/RepositoryVersionDAOTest.java   | 12 
 4 files changed, 38 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e0c42a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
index 162c8df..394a0bf 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
@@ -437,7 +437,9 @@ public class VersionDefinitionResourceProvider extends 
AbstractAuthorizedResourc
   return;
 }
 
-List entities = 
s_repoVersionDAO.findByStack(entity.getStackId());
+List entities = 
s_repoVersionDAO.findByStackAndType(
+entity.getStackId(), RepositoryType.STANDARD);
+
 if (entities.isEmpty()) {
   throw new IllegalArgumentException(String.format("Patch %s was uploaded, 
but there are no repositories for %s",
   entity.getVersion(), entity.getStackId().toString()));

http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e0c42a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
index d59d229..c83375b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
@@ -134,6 +134,26 @@ public class RepositoryVersionDAO extends 
CrudDAO
   }
 
   /**
+   * Retrieves repository version by stack.
+   *
+   * @param stackId
+   *  stack id stack with major version (like HDP-2.2)
+   * @param type
+   *  the repository type
+   *
+   * @return null if there is no suitable repository version
+   */
+  @RequiresSession
+  public List findByStackAndType(StackId stackId, 
RepositoryType type) {
+final TypedQuery query = 
entityManagerProvider.get().createNamedQuery(
+"repositoryVersionByStackAndType", RepositoryVersionEntity.class);
+query.setParameter("stackName", stackId.getStackName());
+query.setParameter("stackVersion", stackId.getStackVersion());
+query.setParameter("type", type);
+return daoUtils.selectList(query);
+  }
+  
+  /**
* Validates and creates an object.
* The version must be unique within this stack name (e.g., HDP, HDPWIN, 
BIGTOP).
* @param stackEntity Stack entity.

http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e0c42a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
index c746363..c7c6ff4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
@@ -80,6 +80,9 @@ import com.google.inject.Provider;
 name = "repositoryVersionByStack",
 query = "SELECT repoversion FROM RepositoryVersionEntity repoversion 
WHERE repoversion.stack.stackName=:stackName AND 
repoversion.stack.stackVersion=:stackVersion"),

ambari git commit: AMBARI-21766 - When Matching New VDFs for Parent Repos only Consider STANDARD Types (jonathanhurley)

2017-08-22 Thread jonathanhurley 
Repository: ambari
Updated Branches:
  refs/heads/trunk 6f9f87c66 -> d2e0c42a1


AMBARI-21766 - When Matching New VDFs for Parent Repos only Consider STANDARD 
Types (jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d2e0c42a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d2e0c42a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d2e0c42a

Branch: refs/heads/trunk
Commit: d2e0c42a1d6f67ade14e867d069d73b2567d685b
Parents: 6f9f87c
Author: Jonathan Hurley 
Authored: Mon Aug 21 11:52:03 2017 -0400
Committer: Jonathan Hurley 
Committed: Tue Aug 22 11:34:06 2017 -0400

--
 .../VersionDefinitionResourceProvider.java  |  4 +++-
 .../server/orm/dao/RepositoryVersionDAO.java| 20 
 .../orm/entities/RepositoryVersionEntity.java   |  3 +++
 .../orm/dao/RepositoryVersionDAOTest.java   | 12 
 4 files changed, 38 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e0c42a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
index 162c8df..394a0bf 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
@@ -437,7 +437,9 @@ public class VersionDefinitionResourceProvider extends 
AbstractAuthorizedResourc
   return;
 }
 
-List entities = 
s_repoVersionDAO.findByStack(entity.getStackId());
+List entities = 
s_repoVersionDAO.findByStackAndType(
+entity.getStackId(), RepositoryType.STANDARD);
+
 if (entities.isEmpty()) {
   throw new IllegalArgumentException(String.format("Patch %s was uploaded, 
but there are no repositories for %s",
   entity.getVersion(), entity.getStackId().toString()));

http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e0c42a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
index d59d229..c83375b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
@@ -134,6 +134,26 @@ public class RepositoryVersionDAO extends 
CrudDAO
   }
 
   /**
+   * Retrieves repository version by stack.
+   *
+   * @param stackId
+   *  stack id stack with major version (like HDP-2.2)
+   * @param type
+   *  the repository type
+   *
+   * @return null if there is no suitable repository version
+   */
+  @RequiresSession
+  public List findByStackAndType(StackId stackId, 
RepositoryType type) {
+final TypedQuery query = 
entityManagerProvider.get().createNamedQuery(
+"repositoryVersionByStackAndType", RepositoryVersionEntity.class);
+query.setParameter("stackName", stackId.getStackName());
+query.setParameter("stackVersion", stackId.getStackVersion());
+query.setParameter("type", type);
+return daoUtils.selectList(query);
+  }
+  
+  /**
* Validates and creates an object.
* The version must be unique within this stack name (e.g., HDP, HDPWIN, 
BIGTOP).
* @param stackEntity Stack entity.

http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e0c42a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
index c746363..c7c6ff4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
@@ -80,6 +80,9 @@ import com.google.inject.Provider;
 name = "repositoryVersionByStack",
 query = "SELECT repoversion FROM RepositoryVersionEntity repoversion 
WHERE

ambari git commit: AMBARI-21766 - When Matching New VDFs for Parent Repos only Consider STANDARD Types (jonathanhurley)

2017-08-22 Thread jonathanhurley 
Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-21450 4f6b67f84 -> 92d307c91


AMBARI-21766 - When Matching New VDFs for Parent Repos only Consider STANDARD 
Types (jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/92d307c9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/92d307c9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/92d307c9

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 92d307c91ccfdfdabb505fbb454997374a2327e6
Parents: 4f6b67f
Author: Jonathan Hurley 
Authored: Mon Aug 21 11:52:03 2017 -0400
Committer: Jonathan Hurley 
Committed: Tue Aug 22 11:03:56 2017 -0400

--
 .../VersionDefinitionResourceProvider.java  |  4 +++-
 .../server/orm/dao/RepositoryVersionDAO.java| 20 
 .../orm/entities/RepositoryVersionEntity.java   |  3 +++
 .../orm/dao/RepositoryVersionDAOTest.java   | 12 
 4 files changed, 38 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/92d307c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
index ea592e5..e676056 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
@@ -433,7 +433,9 @@ public class VersionDefinitionResourceProvider extends 
AbstractAuthorizedResourc
   return;
 }
 
-List entities = 
s_repoVersionDAO.findByStack(entity.getStackId());
+List entities = 
s_repoVersionDAO.findByStackAndType(
+entity.getStackId(), RepositoryType.STANDARD);
+
 if (entities.isEmpty()) {
   throw new IllegalArgumentException(String.format("Patch %s was uploaded, 
but there are no repositories for %s",
   entity.getVersion(), entity.getStackId().toString()));

http://git-wip-us.apache.org/repos/asf/ambari/blob/92d307c9/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
index 40bbd07..d4497b6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
@@ -134,6 +134,26 @@ public class RepositoryVersionDAO extends 
CrudDAO
   }
 
   /**
+   * Retrieves repository version by stack.
+   *
+   * @param stackId
+   *  stack id stack with major version (like HDP-2.2)
+   * @param type
+   *  the repository type
+   *
+   * @return null if there is no suitable repository version
+   */
+  @RequiresSession
+  public List findByStackAndType(StackId stackId, 
RepositoryType type) {
+final TypedQuery query = 
entityManagerProvider.get().createNamedQuery(
+"repositoryVersionByStackAndType", RepositoryVersionEntity.class);
+query.setParameter("stackName", stackId.getStackName());
+query.setParameter("stackVersion", stackId.getStackVersion());
+query.setParameter("type", type);
+return daoUtils.selectList(query);
+  }
+
+  /**
* Gets the first repository which matches the specified version. There can 
be
* multiple repositories matching a single version as long as they have
* different stacks. This method is a fallback mechanism if the repository

http://git-wip-us.apache.org/repos/asf/ambari/blob/92d307c9/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
index aed0aaf..f84f3a4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
@@ -79,6 +79,9 @@ import com.google.inject.Provider;
 name = "repositoryVersionByStack",