Support underscores in names (jboss-fuse#66)

Signed-off-by: Aurélien Pupier <[email protected]>

Author: apupier

impl/src/main/java/org/jboss/fuse/wsdl2rest/impl/codegen/CamelContextGenerator.java

@@ -98,7 +98,8 @@ public void process(List<EndpointInfo> clazzDefs, JavaModel javaModel) throws IO
 
     private void addTypeMapping(EndpointInfo epinfo, JavaModel javaModel) {
         IllegalArgumentAssertion.assertTrue(javaModel.getInterfaces().size() == 1, "Multiple interfaces not supported");
-        JavaInterface javaIntrf = javaModel.getInterfaces().get(epinfo.getClassName());
+        // the keys used have removed the underscores
+        JavaInterface javaIntrf = javaModel.getInterfaces().get(epinfo.getClassName().replaceAll("_", ""));
         for (MethodInfo method : epinfo.getMethods()) {
             if ("document".equals(method.getStyle())) {
                 JavaMethod javaMethod = getJavaMethod(javaIntrf, method.getMethodName());
@@ -125,8 +126,7 @@ private String normalize(String typeName) {
     private JavaMethod getJavaMethod(JavaInterface intrf, String methodName) {
         JavaMethod result = null;
         for (JavaMethod method : intrf.getMethods()) {
-        	// sometimes the method name and the operation name differ by case, so default to case insensitive
-            if (method.getName().equalsIgnoreCase(methodName))
+            if (method.getOperationName().equalsIgnoreCase(methodName))
                 result = method;
         }
         IllegalStateAssertion.assertNotNull(result, "Cannot obtain java method for: " + methodName);

impl/src/main/java/org/jboss/fuse/wsdl2rest/impl/service/MethodInfoImpl.java

@@ -121,8 +121,11 @@ public String getPath() {
     }
 
     private boolean hasPathParam(ParamInfo pinfo) {
-        String httpMethod = getHttpMethod();
-        boolean pathParam = httpMethod.equals("GET") || httpMethod.equals("DELETE");
+        boolean pathParam =
+        		//null httpMethod is supposed to default to GET based on ResourceMapperImpl.mapResources(String)
+        		httpMethod == null
+        		|| "GET".equals(httpMethod)
+        		|| "DELETE".equals(httpMethod);
         return pathParam && pinfo.getParamType() != null;
     }
 

pom.xml

@@ -19,6 +19,7 @@
         <version.javaparser>2.5.1</version.javaparser>
         <version.javax.ws.rs.api>2.1</version.javax.ws.rs.api>
         <version.junit>4.12</version.junit>
+        <version.assertj>3.11.1</version.assertj>
         <version.wsdl4j>1.6.3</version.wsdl4j>
 
         <!-- Plugin versions -->
@@ -69,6 +70,11 @@
                 <artifactId>junit</artifactId>
                 <version>${version.junit}</version>
             </dependency>
+            <dependency>
+                <groupId>org.assertj</groupId>
+                <artifactId>assertj-core</artifactId>
+                <version>${version.assertj}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-parent</artifactId>

tests/spring/pom.xml

@@ -63,6 +63,10 @@
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+        	<groupId>org.assertj</groupId>
+        	<artifactId>assertj-core</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

tests/spring/src/test/java/org/jboss/fuse/wsdl2rest/test/WithUnderscoreTest.java

@@ -0,0 +1,52 @@
+/**
+ * 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.jboss.fuse.wsdl2rest.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+import org.jboss.fuse.wsdl2rest.EndpointInfo;
+import org.jboss.fuse.wsdl2rest.MethodInfo;
+import org.jboss.fuse.wsdl2rest.impl.Wsdl2Rest;
+import org.junit.Test;
+
+public class WithUnderscoreTest {
+	
+	 @Test
+	    public void testJavaClient() throws Exception {
+	        File wsdlFile = new File("src/test/resources/A_NAME_WITH_UNDERSCORE_SRV.1.wsdl");
+	        assertThat(wsdlFile).exists();
+	        
+	        Path outpath = Paths.get("target/wsdl2rest/A_NAME_WITH_UNDERSCORE_SRV.1");
+	        Wsdl2Rest wsdl2Rest = new Wsdl2Rest(wsdlFile.toURI().toURL(), outpath);
+
+	        List<EndpointInfo> clazzDefs = wsdl2Rest.process();
+	        assertThat(clazzDefs).hasSize(1);
+	        EndpointInfo clazzDef = clazzDefs.get(0);
+	        assertThat(clazzDef.getPackageName()).isEqualTo("1.com/Enterprise/HCM/services/A_NAME_WITH_UNDERSCORE_SRV.oracle.xmlns");
+	        assertThat(clazzDef.getClassName()).isEqualTo("A_NAME_WITH_UNDERSCORE_SRV_PortType");
+	        MethodInfo method = clazzDef.getMethod("A_SECOND_NAME_WITH_UNDERSCORE_EMAIL_OPR_SRV");
+	        assertThat(method.getPath()).isEqualTo("/{arg0}");
+	        
+	        File cctxFile = outpath.resolve(Paths.get("camel", "wsdl2rest-camel-context.xml")).toFile();
+	        assertThat(cctxFile).exists();
+	    }
+}