[ 
https://issues.apache.org/jira/browse/CXF-6324?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16431867#comment-16431867
 ] 

ASF GitHub Bot commented on CXF-6324:
-------------------------------------

ffang closed pull request #402: [CXF-6324]ensure cxf-codegen-plugin can handle 
multiple wsdl with different classifier
URL: https://github.com/apache/cxf/pull/402
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index 7a4f797456c..88f6019455f 100644
--- 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
+++ 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
@@ -894,22 +894,34 @@ private Artifact resolveArbitraryWsdl(Artifact artifact) {
     }
 
     private Artifact findWsdlArtifact(Artifact targetArtifact, 
Collection<Artifact> artifactSet) {
+        boolean artifactMatched = false;
         if (artifactSet != null && !artifactSet.isEmpty()) {
             for (Artifact pArtifact : artifactSet) {
-                if (targetArtifact.getGroupId().equals(pArtifact.getGroupId())
-                        && 
targetArtifact.getArtifactId().equals(pArtifact.getArtifactId())
-                        && 
targetArtifact.getVersion().equals(pArtifact.getVersion()) 
-                        && ("wsdl".equals(pArtifact.getType()) 
-                        || (
-                                targetArtifact.getClassifier() != null
-                                        && pArtifact.getType() != null
-                                        && (targetArtifact.getClassifier() + 
".wsdl").equals(pArtifact.getType())
-                        ))) {
+                artifactMatched = isArtifactMatched(targetArtifact, pArtifact);
+                if (targetArtifact.getClassifier() != null && 
pArtifact.getClassifier() != null 
+                        && 
targetArtifact.getClassifier().equals(pArtifact.getClassifier()) 
+                        && artifactMatched) {
+                       //handle multile classifiers
+                    return pArtifact;
+                } else if (artifactMatched && targetArtifact.getClassifier() 
== null) {
                     return pArtifact;
                 }
             }
         }
         return null;
     }
+    
+    private boolean isArtifactMatched(Artifact targetArtifact, Artifact 
pArtifact) {
+        return targetArtifact.getGroupId().equals(pArtifact.getGroupId())
+                && 
targetArtifact.getArtifactId().equals(pArtifact.getArtifactId())
+                && targetArtifact.getVersion().equals(pArtifact.getVersion())
+                && ("wsdl".equals(pArtifact.getType()) 
+                || (
+                        targetArtifact.getClassifier() != null
+                                && pArtifact.getType() != null
+                                && (targetArtifact.getClassifier() + 
".wsdl").equals(pArtifact.getType())
+                ));
+    }
 
 }
+


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> cxf-codegen-plugin|cxf-java2ws-plugin: classifier ignored when there are more 
> then one wsdl with different classifier is involved
> ---------------------------------------------------------------------------------------------------------------------------------
>
>                 Key: CXF-6324
>                 URL: https://issues.apache.org/jira/browse/CXF-6324
>             Project: CXF
>          Issue Type: Bug
>          Components: Tooling
>    Affects Versions: 3.0.4, 2.7.15
>            Reporter: Fabrizio Giovannetti
>            Assignee: Freeman Fang
>            Priority: Major
>
> Given this project structure:
> parent
> - client1
> - client2
> and
> client1 with this configuration
>   <plugin>
>         <groupId>org.apache.cxf</groupId>
>         <artifactId>cxf-codegen-plugin</artifactId>
>         <version>3.0.4</version>
>         <executions>
>           <execution>
>             <id>generate-sources</id>
>             <phase>generate-sources</phase>
>             <configuration>
>               
> <sourceRoot>${project.build.directory}/generated-sources/cxf</sourceRoot>
>               <wsdlOptions>
>                 <wsdlOption>
>                    <wsdlArtifact>
>                     <groupId>com.company</groupId>
>                     <artifactId>company-services</artifactId>
>                     <version>1.0</version>
>                     <classifier>catService</classifier>
>                    </wsdlArtifact>
>                 </wsdlOption>
>               </wsdlOptions>
>               <defaultOptions>
>                 <faultSerialVersionUID>FQCN</faultSerialVersionUID>
>               </defaultOptions>
>             </configuration>
>             <goals>
>               <goal>wsdl2java</goal>
>             </goals>
>           </execution>
>         </executions>
>       </plugin>
> and client 2 with this configuration
> <plugin>
>         <groupId>org.apache.cxf</groupId>
>         <artifactId>cxf-codegen-plugin</artifactId>
>         <version>3.0.4</version>
>         <executions>
>           <execution>
>             <id>generate-sources</id>
>             <phase>generate-sources</phase>
>             <configuration>
>               
> <sourceRoot>${project.build.directory}/generated-sources/cxf</sourceRoot>
>               <wsdlOptions>
>                 <wsdlOption>
>                    <wsdlArtifact>
>                     <groupId>com.company</groupId>
>                     <artifactId>company-services</artifactId>
>                     <version>1.0</version>
>                     <classifier>dogService</classifier>
>                    </wsdlArtifact>
>                 </wsdlOption>
>               </wsdlOptions>
>               <defaultOptions>
>                 <faultSerialVersionUID>FQCN</faultSerialVersionUID>
>               </defaultOptions>
>             </configuration>
>             <goals>
>               <goal>wsdl2java</goal>
>             </goals>
>           </execution>
>         </executions>
>       </plugin>
> When the the build is executed of the parent project
>  
> then:
> cxf-codegen-plugin in client1 fetch correctly the 
> com.company:company-services:1.0:catService from the repository to generate 
> the artifacts
> BUT
> cxf-codegen-plugin in client2 fetch 
> com.company:company-services:1.0:catService
> instead of
> com.company:company-services:1.0:dogService
> In other words, the classifier of the second client project is ignored and 
> the plugin uses for that the classifier present in the configuration of the 
> first client.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Reply via email to