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 8DDF3200BD9 for ; Fri, 9 Dec 2016 17:17:47 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8C877160B1D; Fri, 9 Dec 2016 16:17:47 +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 D338A160AFD for ; Fri, 9 Dec 2016 17:17:46 +0100 (CET) Received: (qmail 36816 invoked by uid 500); 9 Dec 2016 16:17:46 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 36805 invoked by uid 99); 9 Dec 2016 16:17:46 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Dec 2016 16:17:46 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 817DE18BB65 for ; Fri, 9 Dec 2016 16:17:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id DSyE1jvYpwR8 for ; Fri, 9 Dec 2016 16:17:44 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 668545FCA2 for ; Fri, 9 Dec 2016 16:17:44 +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 9B84BE0955 for ; Fri, 9 Dec 2016 16:17:40 +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 3FA9F3A002C for ; Fri, 9 Dec 2016 16:17:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1773424 - /openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java Date: Fri, 09 Dec 2016 16:17:39 -0000 To: commits@openwebbeans.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161209161740.3FA9F3A002C@svn01-us-west.apache.org> archived-at: Fri, 09 Dec 2016 16:17:47 -0000 Author: rmannibucau Date: Fri Dec 9 16:17:39 2016 New Revision: 1773424 URL: http://svn.apache.org/viewvc?rev=1773424&view=rev Log: using application/json for default providers, not sure why i used the old johnzon value Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java?rev=1773424&r1=1773423&r2=1773424&view=diff ============================================================================== --- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java (original) +++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/cxf/MeecrowaveBus.java Fri Dec 9 16:17:39 2016 @@ -24,6 +24,7 @@ import javax.json.stream.JsonGenerator; import javax.servlet.ServletContext; import javax.ws.rs.Consumes; import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; import java.util.Collection; import java.util.HashMap; @@ -173,16 +174,8 @@ public class MeecrowaveBus implements Bu } @Provider - @Produces({ - "application/json", "*/json", - "*/*+json", "*/x-json", - "*/javascript", "*/x-javascript" - }) - @Consumes({ - "application/json", "*/json", - "*/*+json", "*/x-json", - "*/javascript", "*/x-javascript" - }) + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) public static class ConfiguredJsonbJaxrsProvider extends JsonbJaxrsProvider { private ConfiguredJsonbJaxrsProvider(final String encoding, final boolean nulls, @@ -202,16 +195,8 @@ public class MeecrowaveBus implements Bu } @Provider - @Produces({ - "application/json", "*/json", - "*/*+json", "*/x-json", - "*/javascript", "*/x-javascript" - }) - @Consumes({ - "application/json", "*/json", - "*/*+json", "*/x-json", - "*/javascript", "*/x-javascript" - }) + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) public static class ConfiguredJsrProvider extends DelegateProvider { // TODO: probably wire the encoding in johnzon private ConfiguredJsrProvider(final String bufferStrategy, final int maxStringLen, final int maxReadBufferLen, final int maxWriteBufferLen,