Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3442E200B36 for ; Tue, 21 Jun 2016 13:00:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 32EDE160A36; Tue, 21 Jun 2016 11:00:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 78016160A4F for ; Tue, 21 Jun 2016 13:00:00 +0200 (CEST) Received: (qmail 90459 invoked by uid 500); 21 Jun 2016 10:59:59 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 90428 invoked by uid 99); 21 Jun 2016 10:59:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jun 2016 10:59:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6144ADFC15; Tue, 21 Jun 2016 10:59:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmitriusan@apache.org To: commits@ambari.apache.org Date: Tue, 21 Jun 2016 11:00:00 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ambari git commit: AMBARI-17334. Registering 2.5 HDP repo URLs throwing 500 error in the backend (dlysnichenko) archived-at: Tue, 21 Jun 2016 11:00:01 -0000 AMBARI-17334. Registering 2.5 HDP repo URLs throwing 500 error in the backend (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cc0478f2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cc0478f2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cc0478f2 Branch: refs/heads/trunk Commit: cc0478f2b3bd0724afbabe0c139af8663e9a00d6 Parents: 6c2a175 Author: Lisnichenko Dmitro Authored: Tue Jun 21 13:58:26 2016 +0300 Committer: Lisnichenko Dmitro Committed: Tue Jun 21 13:59:38 2016 +0300 ---------------------------------------------------------------------- .../ambari/server/orm/entities/RepositoryVersionEntity.java | 8 ++++++++ .../CompatibleRepositoryVersionResourceProviderTest.java | 9 +++++++++ 2 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/cc0478f2/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 db393b9..5e5a0a8 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 @@ -56,6 +56,8 @@ import org.slf4j.LoggerFactory; import com.google.inject.Inject; import com.google.inject.Provider; +import static java.util.Arrays.asList; + @Entity @Table(name = "repo_version", uniqueConstraints = { @UniqueConstraint(columnNames = {"display_name"}), @@ -77,6 +79,7 @@ import com.google.inject.Provider; @StaticallyInject public class RepositoryVersionEntity { + private static final List STACK_PREFIXES = asList(StackId.HDP_STACK, StackId.HDPWIN_STACK); private static Logger LOG = LoggerFactory.getLogger(RepositoryVersionEntity.class); @Inject @@ -387,6 +390,11 @@ public class RepositoryVersionEntity { */ public static boolean isVersionInStack(StackId stackId, String version) { if (null != version && !StringUtils.isBlank(version)) { + for (String stackPrefix : STACK_PREFIXES) { + if (version.startsWith(stackPrefix + "-")) { + version = version.substring(stackPrefix.length() + 1); + } + } // HDP Stack if (stackId.getStackName().equalsIgnoreCase(StackId.HDP_STACK) || stackId.getStackName().equalsIgnoreCase(StackId.HDPWIN_STACK)) { http://git-wip-us.apache.org/repos/asf/ambari/blob/cc0478f2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java index 066e0d0..78f0a48 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java @@ -247,6 +247,15 @@ public class CompatibleRepositoryVersionResourceProviderTest { } @Test + public void testVersionInStack() { + assertTrue(RepositoryVersionEntity.isVersionInStack(new StackId("HDP", "2.3"), "2.3.0.0")); + assertTrue(RepositoryVersionEntity.isVersionInStack(new StackId("HDPWIN", "2.3"), "2.3.0.0")); + + assertTrue(RepositoryVersionEntity.isVersionInStack(new StackId("HDP", "2.3"), "HDP-2.3.0.0")); + assertTrue(RepositoryVersionEntity.isVersionInStack(new StackId("HDPWIN", "2.3"), "HDPWIN-2.3.0.0")); + } + + @Test public void testGetResources() throws Exception { SecurityContextHolder.getContext().setAuthentication(TestAuthenticationFactory.createClusterAdministrator("admin", 2L));