feat: Multiple parent classes support

.gitignore

@@ -25,3 +25,6 @@
 /docs/package-lock.json
 .project
 /javadoc
+
+
+.vscode/

cla/Fabccc

@@ -0,0 +1,138 @@
+Hash: SHA256
+
+*** Individual Contributor License Agreement ***
+
+Speedment, Inc.
+
+
+In order to clarify the intellectual property license granted with Contributions from any
+person or entity to Speedment Projects (each, a “Contributor”), Speedment, Inc. (“Speedment”)
+must have a Contributor License Agreement ("CLA" or “Agreement”)) on file that has been
+signed by each Contributor, indicating agreement to the license terms below. This license is for
+Your protection as a Contributor as well as the protection of Speedment and its users; it does not
+change Your rights to use Your own Contributions for any other purpose. If You have not
+already done so, copy this file to the directory `/cla`, fill in the data below and rename the file
+to your GitHub handle name and include the file in your first pull request.
+
+Alternately, please complete and send an original, signed Agreement to:
+
+Speedment, Inc.
+470 Ramona Street
+Palo Alto, CA 94301
+
+OR
+
+sign, scan and send the Agreement by e-mail to:
+
+[email protected]
+
+
+
+Please read this document carefully before signing, and keep a copy for Your records.
+
+
+GitHub Id:       Fabccc
+
+Full name:       Fabien CAYRE
+
+Mailing Address: [email protected]
+
+Country:         France
+
+Telephone:       ________________________________
+
+E-Mail:          [email protected]
+
+
+In consideration of the opportunity to participate in the community of Speedment
+Contributors, You accept and agree to the following terms and conditions for Your present and
+future Contributions submitted to Speedment. Except for the license granted herein to Speedment
+and recipients of software distributed by Speedment, You reserve all right, title, and interest
+in and to Your Contributions.
+
+1. Definitions. “You" (or "Your") shall mean the copyright owner or legal entity authorized
+by the copyright owner that is making this Agreement with Speedment. For legal entities,
+the entity making a Contribution and all other entities that control, are controlled by, or
+are under common control with that entity are considered to be a single Contributor. For
+the purposes of this definition, "control" means (i) the power, direct or indirect, to cause
+the direction or management of such entity, whether by contract or otherwise, or (ii)
+ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial
+ownership of such entity. "Contribution" shall mean any original work of authorship,
+including any modifications or additions to an existing work, that is intentionally
+submitted by You to Speedment for inclusion in, or documentation of, any of the projects
+owned or managed by Speedment (the "Project"). For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent to
+Speedment or its representatives, including but not limited to communication on electronic
+mailing lists, source code control systems, and issue tracking systems that are managed
+by, or on behalf of, Speedment for the purpose of discussing and improving the Project,
+but excluding communication that is conspicuously marked or otherwise designated in
+writing by You as "Not a Contribution."
+
+1. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You
+hereby grant to Speedment a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable, sub-licensable, through multiple tiers, copyright license to reproduce,
+prepare derivative works of, publicly display, publicly perform, sublicense, and distribute
+Your Contributions and such derivative works.
+
+1. Grant of Patent License. Subject to the terms and conditions of this Agreement, You
+hereby grant to Speedment and to recipients of software distributed by Speedment a
+perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as
+stated in this section), sub-licensable, through multiple tiers, patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Project, where such
+license applies only to those patent claims licensable by You that are necessarily
+infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with
+the Project to which such Contribution(s) was submitted. If any entity institutes patent
+litigation against You or any other entity (including a cross-claim or counterclaim in a
+lawsuit) alleging that Your Contribution, or the Project to which You have contributed,
+constitutes direct or contributory patent infringement, then any patent licenses granted to
+that entity under this Agreement for that Contribution or Project shall terminate as of the
+date such litigation is filed.
+
+1. You represent that You are legally entitled to grant the above license. If Your
+employer(s) has rights to intellectual property that You create that includes Your
+Contributions, You represent that You have received permission to make Contributions
+on behalf of that employer, that Your employer has waived such rights for Your
+Contributions to Speedment, or that Your employer has executed a separate Corporate
+CLA with Speedment.
+
+1. You represent that each of Your Contributions is Your original creation (see section 7 for
+submissions on behalf of others). You represent that Your Contribution submissions
+include complete details of any third-party license or other restriction (including, but not
+limited to, related patents and trademarks) of which You are personally aware and which
+are associated with any part of Your Contributions.
+
+1. You are not expected to provide support for Your Contributions, except to the extent You
+desire to provide support. You may provide support for free, for a fee, or not at all.
+UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, YOU
+PROVIDE YOUR CONTRIBUTIONS ON AN "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
+CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR
+FITNESS FOR A PARTICULAR PURPOSE.
+
+1. Should You wish to submit work that is not Your original creation, You may submit it to
+Speedment separately from any Contribution, identifying the complete details of its source
+and of any license or other restriction (including, but not limited to, related patents,
+trademarks, and license agreements) of which You are personally aware, and
+conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".
+
+1. You agree to notify Speedment of any facts or circumstances of which You become aware
+that would make these representations inaccurate in any respect.
+
+1. This Agreement will be governed by and shall be construed in accordance with the laws
+of the United States and the State of California. ANY DISPUTE REGARDING THE
+INTERPRETATION, THE CONCLUSION, THE PERFORMANCE OR THE
+TERMINATION OF THIS AGREEMENT WHICH IS NOT RESOLVED AMICABLY
+BY THE PARTIES SHALL BE SUBJECT TO THE EXCLUSIVE JURISDICTION OF
+THE FEDERAL AND STATE COURTS LOCATED IN SANTA CLARA COUNTY,
+CALIFORNIA. The parties hereby irrevocably waive any and all claims and defenses
+either might otherwise have in any such action or proceeding in any of such courts based
+upon any alleged lack of personal jurisdiction, improper venue, forum non conveniens or
+any similar claim or defense. This Agreement sets forth the entire understanding and
+agreement between the parties, and supersedes any previous communications,
+representations or agreements, whether oral or written, regarding the subject matter
+herein.
+
+
+
+Please sign: Fabien CAYRE___________________ Date: 23 / 01 / 2025__________________

integration-tests/pom.xml

@@ -12,10 +12,10 @@
     See: https://github.com/speedment/jpa-streamer/blob/master/LICENSE
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>jpastreamer-parent</artifactId>
         <groupId>com.speedment.jpastreamer</groupId>
         <version>3.0.5-SNAPSHOT</version>
     </parent>
@@ -26,7 +26,7 @@
     <name>Maven</name>
     <url>http://maven.apache.org/</url>
     <inceptionYear>2001</inceptionYear>
-    
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -74,7 +74,7 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -85,4 +85,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

integration-tests/src/test/java/com/speedment/jpastreamer/integration/test/inheritance/InheritanceTest.java

@@ -93,5 +93,20 @@ void inheritanceTest3() {
         assertEquals(expected, actual);
     }
 
-
+    @Test
+    void inheritanceTest4(){
+        final List<BlogPost> collect = jpaStreamer.stream(BlogPost.class)
+                .collect(Collectors.toList());
+
+        final long expected = collect.stream()
+                .filter(b -> b.getVersion() == 3)
+                .count();
+
+        final long actual = jpaStreamer.stream(BlogPost.class)
+                .filter(BlogPost$.version.equal(3))
+                .count();
+
+        assertEquals(expected, actual);
+    }
+
 }

integration-tests/src/test/java/com/speedment/jpastreamer/integration/test/inheritance/model/Publication.java

@@ -17,7 +17,7 @@
 import java.time.LocalDateTime;
 
 @MappedSuperclass
-public abstract class Publication {
+public abstract class Publication extends Versionable{
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -30,10 +30,6 @@ public abstract class Publication {
     @Column(name = "title", nullable = false, updatable = false, columnDefinition = "varchar(255)")
     private String title;
 
-    @Version
-    @Column(name = "version", nullable = false, updatable = false, columnDefinition = "int(6)")
-    private Integer version;
-
     public Integer getId() {
         return id;
     }
@@ -58,11 +54,4 @@ public void setTitle(String title) {
         this.title = title;
     }
 
-    public Integer getVersion() {
-        return version;
-    }
-
-    public void setVersion(Integer version) {
-        this.version = version;
-    }
 }

integration-tests/src/test/java/com/speedment/jpastreamer/integration/test/inheritance/model/Versionable.java

@@ -0,0 +1,22 @@
+package com.speedment.jpastreamer.integration.test.inheritance.model;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Version;
+
+@MappedSuperclass
+public abstract class Versionable {
+
+    @Version
+    @Column(name = "version", nullable = false, updatable = false, columnDefinition = "int(6)")
+    private Integer version;
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+}

integration-tests/src/test/java/com/speedment/jpastreamer/integration/test/inheritance/scripts/data.sql

@@ -23,7 +23,8 @@ VALUES  (1, '2008-7-04', 'Book 1', 2, 213),
         (9, '2016-7-04', 'Book 9', 2, 523),
         (10, '2017-7-04', 'Book 10', 2, 432),
         (11, '2018-7-04', 'Book 11', 2, 322),
-        (12, '2019-7-04', 'Book 12', 2, 121);
+        (12, '2019-7-04', 'Book 12', 2, 121),
+        (13, '2020-7-04', 'Book 13', 3, 148);
 
 INSERT INTO blogposts (id, publishing_date, title, version, url)
 VALUES  (1, '2008-7-04', 'Blog Post 1', 2, 'http://speedment.com'),
@@ -38,11 +39,14 @@ VALUES  (1, '2008-7-04', 'Blog Post 1', 2, 'http://speedment.com'),
         (10, '2017-7-04', 'Blog Post 10', 2, 'http://speedment.com'),
         (11, '2018-7-04', 'Blog Post 11', 2, 'http://speedment.com'),
         (12, '2019-7-04', 'Blog Post 12', 2, 'http://speedment.com'),
+        (13, '2020-7-04', 'Blog Post 13', 3, 'http://speedment.com');
+
 
 INSERT INTO author (id, firstname, lastname, version)
         (1, 'Author 1', 'Lastname', 2),
         (2, 'Author 2', 'Blog Post 2', 2),
         (3, 'Author 3', 'Blog Post 3', 2),
         (4, 'Author 5', 'Blog Post 4', 2),
-        (5, 'Author 6', 'Blog Post 5', 2);
+        (5, 'Author 6', 'Blog Post 5', 2),
+        (6, 'Author 7', 'Blog Post 6', 3);