You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2013/10/19 10:57:37 UTC
git commit: DELTASPIKE-426 removed serializable check
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 <gp...@apache.org>
Authored: Sat Oct 19 10:55:41 2013 +0200
Committer: gpetracek <gp...@apache.org>
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;
-}