[jboss-cvs] JBossAS SVN: r66156 - projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2007-10-16 02:24:09 -0400 (Tue, 16 Oct 2007)
New Revision: 66156

Added:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/InvokerProxyBindingsMetaDataWrapper.java
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java
Log:
Combine the jboss/standardjboss invoker proxy settings

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/InvokerProxyBindingsMetaDataWrapper.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/InvokerProxyBindingsMetaDataWrapper.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/InvokerProxyBindingsMetaDataWrapper.java	2007-10-16 06:24:09 UTC (rev 66156)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.ejb.jboss;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+/**
+ * InvokerProxyBindingsMetaData wrapper.
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class InvokerProxyBindingsMetaDataWrapper extends InvokerProxyBindingsMetaData
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 1;
+   private InvokerProxyBindingsMetaData primary;
+   private InvokerProxyBindingsMetaData defaults;
+
+   InvokerProxyBindingsMetaDataWrapper(InvokerProxyBindingsMetaData primary,
+         InvokerProxyBindingsMetaData defaults)
+   {
+      if(primary == null)
+         primary = new InvokerProxyBindingsMetaData();
+      if(defaults == null)
+         defaults = new InvokerProxyBindingsMetaData();
+      this.primary = primary;
+      this.defaults = defaults;
+   }
+
+   @Override
+   public boolean containsKey(String key)
+   {
+      boolean containsKey = primary.containsKey(key);
+      if(containsKey == false)
+         containsKey = defaults.containsKey(key);
+      return containsKey;
+   }
+
+   @Override
+   public InvokerProxyBindingMetaData get(String key)
+   {
+      InvokerProxyBindingMetaData entry = primary.get(key);
+      if(entry == null)
+         entry = defaults.get(key);
+      return entry;
+   }
+
+   @Override
+   public boolean isEmpty()
+   {
+      return size() > 0;
+   }
+
+   @Override
+   public Iterator<InvokerProxyBindingMetaData> iterator()
+   {
+      return getMergedList().iterator();
+   }
+
+   @Override
+   public Set<String> keySet()
+   {
+      HashSet<String> keySet = new HashSet<String>();
+      keySet.addAll(primary.keySet());
+      keySet.addAll(defaults.keySet());
+      return keySet;
+   }
+
+   @Override
+   public int size()
+   {
+      return primary.size() + defaults.size();
+   }
+
+   @Override
+   public Object[] toArray()
+   {
+      return getMergedList().toArray();
+   }
+
+   @Override
+   public <X> X[] toArray(X[] a)
+   {
+      return getMergedList().toArray(a);
+   }
+
+   private ArrayList<InvokerProxyBindingMetaData> getMergedList()
+   {
+      ArrayList<InvokerProxyBindingMetaData> list = new ArrayList<InvokerProxyBindingMetaData>();
+      list.addAll(primary);
+      list.addAll(defaults);
+      return list;
+   }
+}


Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/InvokerProxyBindingsMetaDataWrapper.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java	2007-10-16 06:23:37 UTC (rev 66155)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaDataWrapper.java	2007-10-16 06:24:09 UTC (rev 66156)
@@ -38,6 +38,7 @@
 import org.jboss.metadata.ejb.spec.EjbJarMetaData;
 import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
 import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.javaee.support.JavaEEMetaDataUtil;
 
 /**
  * Read only wrapper that combines a primary and standardjboss.xml defaults into
@@ -54,6 +55,7 @@
    private ContainerConfigurationsMetaData configurationsWrapper;
    /** The merged enterprise beans */
    private transient JBossEnterpriseBeansMetaData mergedEnterpriseBeans;
+   private transient InvokerProxyBindingsMetaData mergedInvokerBindings;
    
 
    public JBossMetaDataWrapper(JBossMetaData primary, JBossMetaData defaults)
@@ -108,7 +110,13 @@
    @Override
    public InvokerProxyBindingsMetaData getInvokerProxyBindings()
    {
-      return primary.getInvokerProxyBindings();
+      if(mergedInvokerBindings == null)
+      {
+         mergedInvokerBindings = new InvokerProxyBindingsMetaDataWrapper(
+               this.primary.getInvokerProxyBindings(),
+               this.defaults.getInvokerProxyBindings());
+      }
+      return mergedInvokerBindings;
    }
 
    @Override