[14/46] ambari git commit: AMBARI-22325 Fix repository versions (benyoka)

2017-12-08 Thread adoroszlai 
AMBARI-22325 Fix repository versions (benyoka)


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

Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2
Commit: c3cea8218df8fbf3031f1fd93ef1ae28e3c4ba31
Parents: fd61401
Author: Balazs Bence Sari 
Authored: Thu Nov 16 12:09:19 2017 +0100
Committer: Doroszlai, Attila 
Committed: Fri Dec 8 20:24:24 2017 +0100

--
 .../AmbariManagementControllerImpl.java |  9 ++--
 .../ambari/server/controller/AmbariServer.java  |  8 ++--
 .../server/controller/RepositoryResponse.java   | 10 +
 .../server/controller/StackV2Factory.java   | 30 +
 .../internal/BlueprintV2ResourceProvider.java   | 10 ++---
 .../ambari/server/orm/entities/StackEntity.java | 11 -
 .../server/topology/BlueprintV2Factory.java | 44 +++-
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  1 -
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 -
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  1 -
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  1 -
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  1 -
 .../validators/BlueprintImplV2Test.java |  4 +-
 13 files changed, 60 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c3cea821/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 59e6622..ca68a92 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -4595,11 +4595,8 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 
 // !!! when asking for Repository responses for a versionDefinition, it is 
either for
 // an established repo version (a Long) OR from the in-memory generated 
ones (a String)
-if (null == repositoryVersionId && null != versionDefinitionId) {
-
-  if (NumberUtils.isDigits(versionDefinitionId)) {
-repositoryVersionId = Long.valueOf(versionDefinitionId);
-  }
+if (null == repositoryVersionId && 
NumberUtils.isDigits(versionDefinitionId)) {
+  repositoryVersionId = Long.valueOf(versionDefinitionId);
 }
 
 Set responses = new HashSet<>();
@@ -4621,7 +4618,7 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
   }
   response.setStackName(repositoryVersion.getStackName());
   response.setStackVersion(repositoryVersion.getStackVersion());
-
+  response.setRepoVersion(repositoryVersion.getVersion());
   responses.add(response);
 }
 break;

http://git-wip-us.apache.org/repos/asf/ambari/blob/c3cea821/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index ed8a17d..5b3d79e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -91,6 +91,7 @@ import org.apache.ambari.server.orm.dao.MetainfoDAO;
 import org.apache.ambari.server.orm.dao.PermissionDAO;
 import org.apache.ambari.server.orm.dao.PrincipalDAO;
 import org.apache.ambari.server.orm.dao.PrivilegeDAO;
+import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
 import org.apache.ambari.server.orm.dao.ResourceDAO;
 import org.apache.ambari.server.orm.dao.UserDAO;
 import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
@@ -926,16 +927,15 @@ public class AmbariServer {
 
BlueprintResourceProvider.init(injector.getInstance(BlueprintFactory.class),
 injector.getInstance(BlueprintDAO.class), 
injector.getInstance(SecurityConfigurationFactory.class),
 injector.getInstance(Gson.class), ambariMetaInfo);
-
BlueprintV2ResourceProvider.init(injector.getInstance(BlueprintV2Factory.class),
-  injector.getInstance(BlueprintV2DAO.class), 
injector.getInstance(SecurityConfigurationFactory.class),
-  ambariMetaInfo);
+

[13/50] [abbrv] ambari git commit: AMBARI-22325 Fix repository versions (benyoka)

2017-12-06 Thread adoroszlai 
AMBARI-22325 Fix repository versions (benyoka)


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

Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2
Commit: b163e244cd522094ced60f49fe1895eac2994511
Parents: 0c9f28b
Author: Balazs Bence Sari 
Authored: Thu Nov 16 12:09:19 2017 +0100
Committer: Doroszlai, Attila 
Committed: Tue Dec 5 23:55:56 2017 +0100

--
 .../AmbariManagementControllerImpl.java |  9 ++--
 .../ambari/server/controller/AmbariServer.java  |  8 ++--
 .../server/controller/RepositoryResponse.java   | 10 +
 .../server/controller/StackV2Factory.java   | 30 +
 .../internal/BlueprintV2ResourceProvider.java   | 10 ++---
 .../ambari/server/orm/entities/StackEntity.java | 11 -
 .../server/topology/BlueprintV2Factory.java | 44 +++-
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  1 -
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 -
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  1 -
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  1 -
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  1 -
 .../validators/BlueprintImplV2Test.java |  4 +-
 13 files changed, 60 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b163e244/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 59e6622..ca68a92 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -4595,11 +4595,8 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 
 // !!! when asking for Repository responses for a versionDefinition, it is 
either for
 // an established repo version (a Long) OR from the in-memory generated 
ones (a String)
-if (null == repositoryVersionId && null != versionDefinitionId) {
-
-  if (NumberUtils.isDigits(versionDefinitionId)) {
-repositoryVersionId = Long.valueOf(versionDefinitionId);
-  }
+if (null == repositoryVersionId && 
NumberUtils.isDigits(versionDefinitionId)) {
+  repositoryVersionId = Long.valueOf(versionDefinitionId);
 }
 
 Set responses = new HashSet<>();
@@ -4621,7 +4618,7 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
   }
   response.setStackName(repositoryVersion.getStackName());
   response.setStackVersion(repositoryVersion.getStackVersion());
-
+  response.setRepoVersion(repositoryVersion.getVersion());
   responses.add(response);
 }
 break;

http://git-wip-us.apache.org/repos/asf/ambari/blob/b163e244/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index ed8a17d..5b3d79e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -91,6 +91,7 @@ import org.apache.ambari.server.orm.dao.MetainfoDAO;
 import org.apache.ambari.server.orm.dao.PermissionDAO;
 import org.apache.ambari.server.orm.dao.PrincipalDAO;
 import org.apache.ambari.server.orm.dao.PrivilegeDAO;
+import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
 import org.apache.ambari.server.orm.dao.ResourceDAO;
 import org.apache.ambari.server.orm.dao.UserDAO;
 import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
@@ -926,16 +927,15 @@ public class AmbariServer {
 
BlueprintResourceProvider.init(injector.getInstance(BlueprintFactory.class),
 injector.getInstance(BlueprintDAO.class), 
injector.getInstance(SecurityConfigurationFactory.class),
 injector.getInstance(Gson.class), ambariMetaInfo);
-
BlueprintV2ResourceProvider.init(injector.getInstance(BlueprintV2Factory.class),
-  injector.getInstance(BlueprintV2DAO.class), 
injector.getInstance(SecurityConfigurationFactory.class),
-  ambariMetaInfo);
+

[20/39] ambari git commit: AMBARI-22325 Fix repository versions (benyoka)

2017-11-24 Thread adoroszlai 
AMBARI-22325 Fix repository versions (benyoka)


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

Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2
Commit: 3d0619a34b6d877db551332f46f749917f682907
Parents: 734f178
Author: Balazs Bence Sari 
Authored: Thu Nov 16 12:09:19 2017 +0100
Committer: Doroszlai, Attila 
Committed: Fri Nov 24 13:30:45 2017 +0100

--
 .../AmbariManagementControllerImpl.java |  8 ++--
 .../ambari/server/controller/AmbariServer.java  |  8 ++--
 .../server/controller/RepositoryResponse.java   | 10 +
 .../server/controller/StackV2Factory.java   | 30 +
 .../internal/BlueprintV2ResourceProvider.java   | 10 ++---
 .../ambari/server/orm/entities/StackEntity.java | 11 -
 .../server/topology/BlueprintV2Factory.java | 44 +++-
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  1 -
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 -
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  1 -
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  1 -
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  1 -
 .../validators/BlueprintImplV2Test.java |  4 +-
 13 files changed, 60 insertions(+), 70 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3d0619a3/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 875d9b6..37eb613 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -4634,11 +4634,8 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 
 // !!! when asking for Repository responses for a versionDefinition, it is 
either for
 // an established repo version (a Long) OR from the in-memory generated 
ones (a String)
-if (null == repositoryVersionId && null != versionDefinitionId) {
-
-  if (NumberUtils.isDigits(versionDefinitionId)) {
-repositoryVersionId = Long.valueOf(versionDefinitionId);
-  }
+if (null == repositoryVersionId && 
NumberUtils.isDigits(versionDefinitionId)) {
+  repositoryVersionId = Long.valueOf(versionDefinitionId);
 }
 
 Set responses = new HashSet<>();
@@ -4658,6 +4655,7 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
   }
   response.setStackName(repositoryVersion.getStackName());
   response.setStackVersion(repositoryVersion.getStackVersion());
+  response.setRepoVersion(repositoryVersion.getVersion());
   responses.add(response);
 }
 break;

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d0619a3/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 970fb56..4377f04 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -91,6 +91,7 @@ import org.apache.ambari.server.orm.dao.MetainfoDAO;
 import org.apache.ambari.server.orm.dao.PermissionDAO;
 import org.apache.ambari.server.orm.dao.PrincipalDAO;
 import org.apache.ambari.server.orm.dao.PrivilegeDAO;
+import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
 import org.apache.ambari.server.orm.dao.ResourceDAO;
 import org.apache.ambari.server.orm.dao.UserDAO;
 import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
@@ -924,16 +925,15 @@ public class AmbariServer {
 
BlueprintResourceProvider.init(injector.getInstance(BlueprintFactory.class),
 injector.getInstance(BlueprintDAO.class), 
injector.getInstance(SecurityConfigurationFactory.class),
 injector.getInstance(Gson.class), ambariMetaInfo);
-
BlueprintV2ResourceProvider.init(injector.getInstance(BlueprintV2Factory.class),
-  injector.getInstance(BlueprintV2DAO.class), 
injector.getInstance(SecurityConfigurationFactory.class),
-  ambariMetaInfo);
+

ambari git commit: AMBARI-22325 Fix repository versions (benyoka)

2017-11-16 Thread benyoka 
Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-14714-blueprintv2 4065f35e6 -> f7d4d7322


AMBARI-22325 Fix repository versions (benyoka)


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

Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2
Commit: f7d4d73229b4d42864db3c8767494e1bceaf71dc
Parents: 4065f35
Author: Balazs Bence Sari 
Authored: Thu Nov 16 12:09:19 2017 +0100
Committer: Balazs Bence Sari 
Committed: Thu Nov 16 12:10:21 2017 +0100

--
 .../AmbariManagementControllerImpl.java |  8 ++--
 .../ambari/server/controller/AmbariServer.java  |  8 ++--
 .../server/controller/RepositoryResponse.java   | 10 +
 .../server/controller/StackV2Factory.java   | 30 +
 .../internal/BlueprintV2ResourceProvider.java   | 10 ++---
 .../ambari/server/orm/entities/StackEntity.java | 11 -
 .../server/topology/BlueprintV2Factory.java | 44 +++-
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  1 -
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 -
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  1 -
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  1 -
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  1 -
 .../validators/BlueprintImplV2Test.java |  4 +-
 13 files changed, 60 insertions(+), 70 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f7d4d732/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 875d9b6..37eb613 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -4634,11 +4634,8 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 
 // !!! when asking for Repository responses for a versionDefinition, it is 
either for
 // an established repo version (a Long) OR from the in-memory generated 
ones (a String)
-if (null == repositoryVersionId && null != versionDefinitionId) {
-
-  if (NumberUtils.isDigits(versionDefinitionId)) {
-repositoryVersionId = Long.valueOf(versionDefinitionId);
-  }
+if (null == repositoryVersionId && 
NumberUtils.isDigits(versionDefinitionId)) {
+  repositoryVersionId = Long.valueOf(versionDefinitionId);
 }
 
 Set responses = new HashSet<>();
@@ -4658,6 +4655,7 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
   }
   response.setStackName(repositoryVersion.getStackName());
   response.setStackVersion(repositoryVersion.getStackVersion());
+  response.setRepoVersion(repositoryVersion.getVersion());
   responses.add(response);
 }
 break;

http://git-wip-us.apache.org/repos/asf/ambari/blob/f7d4d732/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 970fb56..4377f04 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -91,6 +91,7 @@ import org.apache.ambari.server.orm.dao.MetainfoDAO;
 import org.apache.ambari.server.orm.dao.PermissionDAO;
 import org.apache.ambari.server.orm.dao.PrincipalDAO;
 import org.apache.ambari.server.orm.dao.PrivilegeDAO;
+import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
 import org.apache.ambari.server.orm.dao.ResourceDAO;
 import org.apache.ambari.server.orm.dao.UserDAO;
 import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
@@ -924,16 +925,15 @@ public class AmbariServer {
 
BlueprintResourceProvider.init(injector.getInstance(BlueprintFactory.class),
 injector.getInstance(BlueprintDAO.class), 
injector.getInstance(SecurityConfigurationFactory.class),
 injector.getInstance(Gson.class), ambariMetaInfo);
-
BlueprintV2ResourceProvider.init(injector.getInstance(BlueprintV2Factory.class),
-