Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B335F19DD9 for ; Thu, 14 Apr 2016 15:35:33 +0000 (UTC) Received: (qmail 31269 invoked by uid 500); 14 Apr 2016 15:35:33 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 31230 invoked by uid 500); 14 Apr 2016 15:35:33 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 31221 invoked by uid 99); 14 Apr 2016 15:35:33 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Apr 2016 15:35:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 28E3CC0A2D for ; Thu, 14 Apr 2016 15:35:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.804 X-Spam-Level: X-Spam-Status: No, score=0.804 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.996] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id p-x4gHWEfXyR for ; Thu, 14 Apr 2016 15:35:32 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id 2A24D5F1F0 for ; Thu, 14 Apr 2016 15:35:32 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id C8DB8E0054 for ; Thu, 14 Apr 2016 15:35:30 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 5BC083A0216 for ; Thu, 14 Apr 2016 15:35:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1739126 - in /felix/trunk/converter/src: main/java/org/apache/felix/converter/impl/ConvertingImpl.java test/java/org/apache/felix/converter/impl/ConverterTest.java Date: Thu, 14 Apr 2016 15:35:29 -0000 To: commits@felix.apache.org From: davidb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160414153530.5BC083A0216@svn01-us-west.apache.org> Author: davidb Date: Thu Apr 14 15:35:29 2016 New Revision: 1739126 URL: http://svn.apache.org/viewvc?rev=1739126&view=rev Log: Felix Converter Service - support Enums. Modified: felix/trunk/converter/src/main/java/org/apache/felix/converter/impl/ConvertingImpl.java felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/ConverterTest.java Modified: felix/trunk/converter/src/main/java/org/apache/felix/converter/impl/ConvertingImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/converter/src/main/java/org/apache/felix/converter/impl/ConvertingImpl.java?rev=1739126&r1=1739125&r2=1739126&view=diff ============================================================================== --- felix/trunk/converter/src/main/java/org/apache/felix/converter/impl/ConvertingImpl.java (original) +++ felix/trunk/converter/src/main/java/org/apache/felix/converter/impl/ConvertingImpl.java Thu Apr 14 15:35:29 2016 @@ -102,6 +102,8 @@ public class ConvertingImpl implements C return false; } else if (cls.equals(Class.class)) { return null; + } else if (Enum.class.isAssignableFrom(cls)) { + return null; } else { return 0; } @@ -154,6 +156,24 @@ public class ConvertingImpl implements C throw new RuntimeException(e); } } + } else if (Enum.class.isAssignableFrom(targetCls)) { + if (object instanceof Boolean) { + try { + Method m = targetCls.getMethod("valueOf", String.class); + return m.invoke(null, object.toString().toUpperCase()); + } catch (Exception e) { + throw new RuntimeException(e); + } + } else if (object instanceof Number) { + try { + Method m = targetCls.getMethod("values"); + Object[] values = (Object[]) m.invoke(null); + return values[((Number) object).intValue()]; + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } return null; } @@ -163,7 +183,7 @@ public class ConvertingImpl implements C try { Method m = cls.getDeclaredMethod("valueOf", String.class); if (m != null) { - return (T) m.invoke(null, object); + return (T) m.invoke(null, object.toString()); } } catch (Exception e) { return null; Modified: felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/ConverterTest.java URL: http://svn.apache.org/viewvc/felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/ConverterTest.java?rev=1739126&r1=1739125&r2=1739126&view=diff ============================================================================== --- felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/ConverterTest.java (original) +++ felix/trunk/converter/src/test/java/org/apache/felix/converter/impl/ConverterTest.java Thu Apr 14 15:35:29 2016 @@ -92,6 +92,17 @@ public class ConverterTest { assertEquals(Double.valueOf("12.3"), converter.convert("12.3").to(Double.class)); } + enum TestEnum { FOO, BAR, BLAH, FALSE, X}; + @Test + public void testEnums() { + assertEquals(TestEnum.BLAH, converter.convert("BLAH").to(TestEnum.class)); + assertEquals(TestEnum.X, converter.convert('X').to(TestEnum.class)); + assertEquals(TestEnum.FALSE, converter.convert(false).to(TestEnum.class)); + assertEquals(TestEnum.BAR, converter.convert(1).to(TestEnum.class)); + assertNull(converter.convert(null).to(TestEnum.class)); + assertNull(converter.convert(Collections.emptySet()).to(TestEnum.class)); + } + @Test public void testIdentialTarget() { Object o = new Object();