[jbossws-commits] JBossWS SVN: r13054 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata: wsdl and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2010-10-04 09:48:22 -0400 (Mon, 04 Oct 2010)
New Revision: 13054

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java
Log:
removing FIXME plus minor optimization

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java	2010-10-04 12:35:41 UTC (rev 13053)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java	2010-10-04 13:48:22 UTC (rev 13054)
@@ -1066,7 +1066,7 @@
       boolean webMethodFound = false;
       for (Method method : wsClass.getMethods())
       {
-         if (WSDLUtils.isWebMethod(method))
+         if (WSDLUtils.isWebMethod(method, wsClass.isInterface()))
          {
             processWebMethod(epMetaData, method);
             webMethodFound = true;

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java	2010-10-04 12:35:41 UTC (rev 13053)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java	2010-10-04 13:48:22 UTC (rev 13054)
@@ -261,7 +261,7 @@
       if (ignoredMethods == null)
       {
          ignoredMethods = new ArrayList<String>();
-         //Add the SessionBean Methods to the ignore list
+         //Add the SessionBean methods to the ignore list
          Method[] sbMethods = SessionBean.class.getMethods();
          for (int i = 0; i < sbMethods.length; i++)
          {
@@ -269,13 +269,7 @@
          }
       }
 
-      boolean ignoreMethod = ignoredMethods.contains(method.getName());
-
-      // FIXME: This code is a duplicate, it should read from the UMDM
-      if (!isWebMethod(method))
-         ignoreMethod = true;
-
-      return ignoreMethod;
+      return ignoredMethods.contains(method.getName());
    }
    
    /**
@@ -287,7 +281,7 @@
     * @param method to process
     * @return true if webmethod, false otherwise
     */
-   public static boolean isWebMethod(final Method method)
+   public static boolean isWebMethod(final Method method, final boolean definedInInterface)
    {
       if (!isWebMethodCandidate(method))
          return false;
@@ -298,6 +292,10 @@
       {
          return !webMethodAnnotation.exclude();
       }
+      if (definedInInterface)
+      {
+         return true;
+      }
       else
       {
          return method.getDeclaringClass().getAnnotation(WebService.class) != null;