Merge branch 'v2' of https://github.com/moosetechnology/VerveineJ int…

…o v2
moosetechnology · Jan 7, 2022 · 2ab5e93 · 2ab5e93
2 parents 356b6a9 + 45bb54b
commit 2ab5e93
Show file tree

Hide file tree

Showing 32 changed files with 412 additions and 316 deletions.
diff --git a/.classpath b/.classpath
@@ -23,11 +23,11 @@
 	<classpathentry kind="lib" path="lib/org.eclipse.jdt.core_3.13.50.v20171007-0855.jar"/>
 	<classpathentry kind="lib" path="lib/org.eclipse.osgi_3.12.50.v20170928-1321.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
+	<classpathentry kind="lib" path="lib/fame.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/FameJava"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,7 +6,7 @@ name: CI
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ v* ]
+    branches: [ v*, java-17 ]
   pull_request:
     branches: [ v* ]
 
@@ -23,9 +23,10 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Setup Java JDK
-        uses: actions/setup-java@v1.4.3
+        uses: actions/setup-java@v2
         with:
-          java-version: 10 
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: Build with Ant
         run: ant -noinput -buildfile build.xml junit
diff --git a/.project b/.project
@@ -16,7 +16,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1641566397301</id>
+			<id>1636986252232</id>
 			<name></name>
 			<type>30</type>
 			<matcher>

diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # VerveineJ
 
-[![Use Java 10](https://img.shields.io/badge/Java-10-brightgreen)](https://jdk.java.net/10/) ![CI](https://github.com/moosetechnology/VerveineJ/workflows/CI/badge.svg?branch=master)
+[![Use Java 17](https://img.shields.io/badge/Java-17-brightgreen)](https://adoptium.net/) ![CI](https://github.com/moosetechnology/VerveineJ/workflows/CI/badge.svg?branch=master)
 
-A Java to MSE parser
+A Java to JSON/MSE parser
 
 Based on JDT, it parser java code to export it in the MSE format used by the Moose data analysis platform.
 (Similar to the https://github.com/feenkcom/jdt2famix project, but more complete in what it extracts)
@@ -24,6 +24,6 @@ git clone git@github.com:moosetechnology/VerveineJ.git
 ## Developers
 
 To test the project, remember that you **must** disable the `assert` by removing (or not using) the -ea parameter.
-You also need to run test one by one (fork method in IntelliJ).
+You also need to run tests one by one (fork method in IntelliJ).
 
-> You can also use And or the pre-created IntelliJ build
+> You can also use Ant or the pre-created IntelliJ build
diff --git a/build.xml b/build.xml
@@ -26,7 +26,7 @@
 	</target>
 
 	<target name="compile" depends="clean, makedir">
-		<javac srcdir="${src.dir}" destdir="${build.dir}" source="1.9" target="1.9" includeantruntime="false" debug="true" debuglevel="lines,vars,source">
+		<javac srcdir="${src.dir}" destdir="${build.dir}" source="17" target="17" includeantruntime="false" debug="true" debuglevel="lines,vars,source">
 			<classpath>
 				<fileset dir="${dist.dir}">
   				  <include name="*.jar"/>
@@ -70,14 +70,15 @@
 
 	<!-- Run the JUnit Tests -->
 	<target name="junit" depends="jar">
-		<junit printsummary="on" fork="true" haltonfailure="true" haltonerror="true">
+		<junit fork="false" haltonfailure="true" haltonerror="true">
 			<classpath>
 				<fileset dir="${dist.dir}">
   				   <include name="*.jar"/>
 				</fileset>
 			</classpath>
+
+			<formatter type="plain" usefile="false" />
 			<formatter type="plain"/>
-			<formatter type="xml" />
 
 			 <batchtest fork="yes" todir="${test.report.dir}">
 			     <fileset dir="${testsrc.dir}">

diff --git a/docs/lanModel.drawio b/docs/lanModel.drawio
@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2022-01-05T14:01:07.982Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/15.8.7 Chrome/91.0.4472.164 Electron/13.6.2 Safari/537.36" etag="LnQ1Gj5u6Xcot0bu3CDD" version="15.8.7" type="device"><diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">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</diagram></mxfile>
diff --git a/lib/verveine.extractor.java.jar b/lib/verveine.extractor.java.jar
diff --git a/src/fr/inria/verveine/extractor/java/AbstractDictionary.java b/src/fr/inria/verveine/extractor/java/AbstractDictionary.java
@@ -557,7 +557,7 @@ public Invocation addFamixInvocation(Method sender, Method invoked, NamedEntity
 		Invocation invok = new Invocation();
 		invok.setReceiver(receiver);
 		invok.setSender(sender);
-		invok.setSignature((signature== null) ? invoked.getSignature() : signature);
+		invok.setSignature((signature == null) ? invoked.getSignature() : signature);
 		invok.addCandidates(invoked);
 		chainPrevNext(prev,invok);
 		famixRepoAdd(invok);

diff --git a/src/fr/inria/verveine/extractor/java/VerveineJOptions.java b/src/fr/inria/verveine/extractor/java/VerveineJOptions.java
@@ -48,7 +48,7 @@ public static AnchorOptions getValue(String option) {
 	 */
 	public final static String JSON_OUTPUT_FORMAT = "JSON";
 
-	public static final String DEFAULT_CODE_VERSION = JavaCore.VERSION_1_5;
+	public static final String DEFAULT_CODE_VERSION = JavaCore.VERSION_9;
 
 	/**
 	 * TODO remove ?

diff --git a/test_src/jws_basic/lib/javax.jws-api-1.1.jar b/test_src/jws_basic/lib/javax.jws-api-1.1.jar
diff --git a/...c/jws_basic/audi/AudiSupplierService.wsdl → ...s_basic/src/audi/AudiSupplierService.wsdl b/...c/jws_basic/audi/AudiSupplierService.wsdl → ...s_basic/src/audi/AudiSupplierService.wsdl
@@ -1,45 +1,45 @@
-<?xml version='1.0'?>
-<definitions name="AudiSupplierServiceDefinitions" targetNamespace="http://example.org" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:s0="java:audi.client" xmlns:s1="http://example.org" xmlns:s2="http://schemas.xmlsoap.org/wsdl/soap/">
-  <n1:types xmlns:n1="http://schemas.xmlsoap.org/wsdl/">
-    <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="java:audi.client" xmlns:n1="http://schemas.xmlsoap.org/wsdl/" xmlns:s0="java:audi.client" xmlns:s1="http://example.org" xmlns:s2="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:complexType name="OrderStruct">
-        <xs:sequence>
-          <xs:element minOccurs="0" name="Supplier" nillable="false" type="xs:string"/>
-          <xs:element minOccurs="0" name="PartName" nillable="true" type="xs:string"/>
-          <xs:element minOccurs="0" name="PartID" nillable="false" type="xs:string"/>
-          <xs:element minOccurs="0" name="Amount" nillable="false" type="xs:long"/>
-          <xs:element minOccurs="0" name="Notes" nillable="true" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-    </xs:schema>
-  </n1:types>
-  <n2:message xmlns:n2="http://schemas.xmlsoap.org/wsdl/" name="processOrderApp">
-    <n2:part name="orderRequest" type="s0:OrderStruct"/>
-  </n2:message>
-  <n3:message xmlns:n3="http://schemas.xmlsoap.org/wsdl/" name="processOrderAppResponse">
-    <n3:part name="return" type="s0:OrderStruct"/>
-  </n3:message>
-  <n4:portType xmlns:n4="http://schemas.xmlsoap.org/wsdl/" name="myPortType">
-    <n4:operation name="processOrderApp" parameterOrder="orderRequest">
-      <n4:input message="s1:processOrderApp"/>
-      <n4:output message="s1:processOrderAppResponse"/>
-    </n4:operation>
-  </n4:portType>
-  <n5:binding xmlns:n5="http://schemas.xmlsoap.org/wsdl/" name="AudiSupplierServiceSoapBinding" type="s1:myPortType">
-    <s2:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <n5:operation name="processOrderApp">
-      <s2:operation soapAction="http://example.orgprocessOrderApp" style="rpc"/>
-      <n5:input>
-        <s2:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://example.org" use="encoded"/>
-      </n5:input>
-      <n5:output>
-        <s2:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://example.org" use="encoded"/>
-      </n5:output>
-    </n5:operation>
-  </n5:binding>
-  <n6:service xmlns:n6="http://schemas.xmlsoap.org/wsdl/" name="AudiSupplierService">
-    <n6:port binding="s1:AudiSupplierServiceSoapBinding" name="helloPort">
-      <s2:address location="http://localhost:7001/audi_jws_basic_ejb/AudiSupplierSimpleBean"/>
-    </n6:port>
-  </n6:service>
-</definitions>
+<?xml version='1.0'?>
+<definitions name="AudiSupplierServiceDefinitions" targetNamespace="http://example.org" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:s0="java:audi.client" xmlns:s1="http://example.org" xmlns:s2="http://schemas.xmlsoap.org/wsdl/soap/">
+  <n1:types xmlns:n1="http://schemas.xmlsoap.org/wsdl/">
+    <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="java:audi.client" xmlns:n1="http://schemas.xmlsoap.org/wsdl/" xmlns:s0="java:audi.client" xmlns:s1="http://example.org" xmlns:s2="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+      <xs:complexType name="OrderStruct">
+        <xs:sequence>
+          <xs:element minOccurs="0" name="Supplier" nillable="false" type="xs:string"/>
+          <xs:element minOccurs="0" name="PartName" nillable="true" type="xs:string"/>
+          <xs:element minOccurs="0" name="PartID" nillable="false" type="xs:string"/>
+          <xs:element minOccurs="0" name="Amount" nillable="false" type="xs:long"/>
+          <xs:element minOccurs="0" name="Notes" nillable="true" type="xs:string"/>
+        </xs:sequence>
+      </xs:complexType>
+    </xs:schema>
+  </n1:types>
+  <n2:message xmlns:n2="http://schemas.xmlsoap.org/wsdl/" name="processOrderApp">
+    <n2:part name="orderRequest" type="s0:OrderStruct"/>
+  </n2:message>
+  <n3:message xmlns:n3="http://schemas.xmlsoap.org/wsdl/" name="processOrderAppResponse">
+    <n3:part name="return" type="s0:OrderStruct"/>
+  </n3:message>
+  <n4:portType xmlns:n4="http://schemas.xmlsoap.org/wsdl/" name="myPortType">
+    <n4:operation name="processOrderApp" parameterOrder="orderRequest">
+      <n4:input message="s1:processOrderApp"/>
+      <n4:output message="s1:processOrderAppResponse"/>
+    </n4:operation>
+  </n4:portType>
+  <n5:binding xmlns:n5="http://schemas.xmlsoap.org/wsdl/" name="AudiSupplierServiceSoapBinding" type="s1:myPortType">
+    <s2:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <n5:operation name="processOrderApp">
+      <s2:operation soapAction="http://example.orgprocessOrderApp" style="rpc"/>
+      <n5:input>
+        <s2:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://example.org" use="encoded"/>
+      </n5:input>
+      <n5:output>
+        <s2:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://example.org" use="encoded"/>
+      </n5:output>
+    </n5:operation>
+  </n5:binding>
+  <n6:service xmlns:n6="http://schemas.xmlsoap.org/wsdl/" name="AudiSupplierService">
+    <n6:port binding="s1:AudiSupplierServiceSoapBinding" name="helloPort">
+      <s2:address location="http://localhost:7001/audi_jws_basic_ejb/AudiSupplierSimpleBean"/>
+    </n6:port>
+  </n6:service>
+</definitions>
diff --git a/test_src/jws_basic/audi/SimpleBean.java → test_src/jws_basic/src/audi/SimpleBean.java b/test_src/jws_basic/audi/SimpleBean.java → test_src/jws_basic/src/audi/SimpleBean.java
diff --git a/test_src/jws_basic/audi/build.xml → test_src/jws_basic/src/audi/build.xml b/test_src/jws_basic/audi/build.xml → test_src/jws_basic/src/audi/build.xml
diff --git a/test_src/jws_basic/audi/client/Main.java → test_src/jws_basic/src/audi/client/Main.java b/test_src/jws_basic/audi/client/Main.java → test_src/jws_basic/src/audi/client/Main.java
diff --git a/...rc/jws_basic/audi/client/OrderStruct.java → ...ws_basic/src/audi/client/OrderStruct.java b/...rc/jws_basic/audi/client/OrderStruct.java → ...ws_basic/src/audi/client/OrderStruct.java