Return-Path: X-Original-To: apmail-deltaspike-commits-archive@www.apache.org Delivered-To: apmail-deltaspike-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 C73551089E for ; Sat, 19 Oct 2013 08:57:42 +0000 (UTC) Received: (qmail 51642 invoked by uid 500); 19 Oct 2013 08:57:42 -0000 Delivered-To: apmail-deltaspike-commits-archive@deltaspike.apache.org Received: (qmail 51603 invoked by uid 500); 19 Oct 2013 08:57:38 -0000 Mailing-List: contact commits-help@deltaspike.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltaspike.apache.org Delivered-To: mailing list commits@deltaspike.apache.org Received: (qmail 51592 invoked by uid 99); 19 Oct 2013 08:57:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Oct 2013 08:57:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 06E0344304; Sat, 19 Oct 2013 08:57:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gpetracek@apache.org To: commits@deltaspike.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: DELTASPIKE-426 removed serializable check Date: Sat, 19 Oct 2013 08:57:37 +0000 (UTC) Updated Branches: refs/heads/master dc0e5f556 -> 709f1edf5 DELTASPIKE-426 removed serializable check Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/709f1edf Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/709f1edf Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/709f1edf Branch: refs/heads/master Commit: 709f1edf59ec3e2963d34c0cdca25f0ffcc9ffe8 Parents: dc0e5f5 Author: gpetracek Authored: Sat Oct 19 10:55:41 2013 +0200 Committer: gpetracek Committed: Sat Oct 19 10:55:41 2013 +0200 ---------------------------------------------------------------------- .../impl/injection/ManagedArtifactResolver.java | 12 +-------- .../injection/RequestDependentBeanStorage.java | 1 + .../injection/ViewDependentBeanStorage.java | 28 -------------------- 3 files changed, 2 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/709f1edf/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/ManagedArtifactResolver.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/ManagedArtifactResolver.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/ManagedArtifactResolver.java index 417b724..70567fe 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/ManagedArtifactResolver.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/ManagedArtifactResolver.java @@ -28,7 +28,6 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import javax.faces.convert.Converter; import javax.faces.validator.Validator; -import java.io.Serializable; import java.util.Set; @Typed() @@ -82,16 +81,7 @@ public abstract class ManagedArtifactResolver if (bean.getScope().equals(Dependent.class)) { - AbstractBeanStorage beanStorage; - - if (Serializable.class.isAssignableFrom(bean.getBeanClass())) - { - beanStorage = BeanProvider.getContextualReference(ViewDependentBeanStorage.class); - } - else - { - beanStorage = BeanProvider.getContextualReference(RequestDependentBeanStorage.class); - } + AbstractBeanStorage beanStorage = BeanProvider.getContextualReference(RequestDependentBeanStorage.class); //noinspection unchecked beanStorage.add(new DependentBeanEntry(result, bean, creationalContext)); http://git-wip-us.apache.org/repos/asf/deltaspike/blob/709f1edf/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/RequestDependentBeanStorage.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/RequestDependentBeanStorage.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/RequestDependentBeanStorage.java index 93a7299..55c4b97 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/RequestDependentBeanStorage.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/RequestDependentBeanStorage.java @@ -20,6 +20,7 @@ package org.apache.deltaspike.jsf.impl.injection; import javax.enterprise.context.RequestScoped; +//TODO merge with AbstractBeanStorage if ViewDependentBeanStorage isn't needed (see MYFACES-3805) @RequestScoped public class RequestDependentBeanStorage extends AbstractBeanStorage { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/709f1edf/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/ViewDependentBeanStorage.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/ViewDependentBeanStorage.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/ViewDependentBeanStorage.java deleted file mode 100644 index 1a62f40..0000000 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/ViewDependentBeanStorage.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.deltaspike.jsf.impl.injection; - -import javax.faces.bean.ViewScoped; -import java.io.Serializable; - -@ViewScoped -public class ViewDependentBeanStorage extends AbstractBeanStorage implements Serializable -{ - private static final long serialVersionUID = 4500399024267716556L; -}