Release/update 2.x.x

.xmake.cfg

@@ -0,0 +1,6 @@
+[xmake]
+xmake-version=0.9.2-MS8
+[buildplugin]
+java-type=sapmachine
+alternate-path=jpa
+java-version=17.0.8

README.md

@@ -46,7 +46,7 @@ clone the repository, import the projects and declare a dependency to either the
 <dependency>
     <groupId>com.sap.olingo</groupId>
     <artifactId>odata-jpa-metadata</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1</version>
 </dependency>
 ```
 
@@ -56,7 +56,7 @@ Or to the complete processor:
 <dependency>
     <groupId>com.sap.olingo</groupId>
     <artifactId>odata-jpa-processor</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1</version>
 </dependency>
 ```
 
@@ -102,5 +102,14 @@ Detailed information including third-party components and their licensing/copyri
 |2.1.0| - Enhancement of annotation API<br>- Enhancement of API for server driven paging<br>- Optional support of IN operand <br>- Update to Olingo 5.0.0<br>- Rework $count implementation<br>- Fix problem with $count on collection properties|No|
 |2.1.1| - Fix for issue [#292](https://github.com/SAP/olingo-jpa-processor-v4/issues/292)|No|
 |2.1.3| - Fix for issue [#319](https://github.com/SAP/olingo-jpa-processor-v4/issues/319)<br> - Fix for issue [#325](https://github.com/SAP/olingo-jpa-processor-v4/issues/325)<br> - Fix for issue [#327](https://github.com/SAP/olingo-jpa-processor-v4/issues/327)<br> - Fix for issue [#331](https://github.com/SAP/olingo-jpa-processor-v4/issues/331)<br> - Fix of en issue with $orderby and _to one_ navigation properties |No|
+<<<<<<< HEAD
+<<<<<<< HEAD
+|2.2.0| - Fix for issue [#378](https://github.com/SAP/olingo-jpa-processor-v4/issues/378)<br> - Fix for issue [#361](https://github.com/SAP/olingo-jpa-processor-v4/issues/361)<br> - Fix for issue [#352](https://github.com/SAP/olingo-jpa-processor-v4/issues/352)<br> - Fix for issue [#307](https://github.com/SAP/olingo-jpa-processor-v4/issues/307) <br> - Enhancement according to [#314](https://github.com/SAP/olingo-jpa-processor-v4/issues/314)|No|
+|2.3.0| - Add support for handling multiple API version. Issue [#308](https://github.com/SAP/olingo-jpa-processor-v4/issues/308)<br>  - Fix for issue [#359](https://github.com/SAP/olingo-jpa-processor-v4/issues/359)<br> - Fix for issue [#406](https://github.com/SAP/olingo-jpa-processor-v4/issues/406)<br>  - Fix for issue [#397](https://github.com/SAP/olingo-jpa-processor-v4/issues/397)|No|
+|2.3.1| - Issue [#424](https://github.com/SAP/olingo-jpa-processor-v4/issues/424)<br>  - Issue [#407](https://github.com/SAP/olingo-jpa-processor-v4/issues/407)<br> - Issue [#285](https://github.com/SAP/olingo-jpa-processor-v4/issues/285)<br> |No|
+=======
+>>>>>>> refs/remotes/public/update-2.x.x
+=======
 |2.2.0| - Fix for issue [#378](https://github.com/SAP/olingo-jpa-processor-v4/issues/378)<br>  - Fix for issue [#378](https://github.com/SAP/olingo-jpa-processor-v4/issues/378)<br> - Fix for issue [#361](https://github.com/SAP/olingo-jpa-processor-v4/issues/361)<br> - Fix for issue [#352](https://github.com/SAP/olingo-jpa-processor-v4/issues/352)<br> - Fix for issue [#307](https://github.com/SAP/olingo-jpa-processor-v4/issues/307) <br> - Enhancement according to [#314](https://github.com/SAP/olingo-jpa-processor-v4/issues/314)|No|
 |2.3.0| - Add support for handling multiple API version. Issue [#308](https://github.com/SAP/olingo-jpa-processor-v4/issues/308)<br>  - Fix for issue [#359](https://github.com/SAP/olingo-jpa-processor-v4/issues/359)<br> - Fix for issue [#406](https://github.com/SAP/olingo-jpa-processor-v4/issues/406)<br>  - Fix for issue [#397](https://github.com/SAP/olingo-jpa-processor-v4/issues/397)|No|
+>>>>>>> refs/remotes/public/release/2.x.x

jpa-archetype/odata-jpa-archetype-spring/pom.xml

@@ -2,9 +2,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.sap.olingo</groupId>
+		<groupId>com.sap.olingo</groupId>
 		<artifactId>odata-jpa-archetype</artifactId>
-        <version>2.3.0</version>
+        <version>2.3.1</version>
 	</parent>
 	<artifactId>odata-jpa-archetype-spring</artifactId>
 	<name>Archetype - odata-jpa-archetype-spring</name>

jpa-archetype/odata-jpa-archetype-spring/src/main/resources/archetype-resources/pom.xml

@@ -15,9 +15,9 @@
 		<version>3.2.3</version>
 		<relativePath />
 	</parent>
-
-	<properties>
-		<processor.version>2.3.0</processor.version>
+
+	<properties>
+		<processor.version>2.3.1</processor.version>
 		<java.version>17</java.version>
 		<build.sourceEncoding>UTF-8</build.sourceEncoding>
 		<eclipselink.version>4.0.3</eclipselink.version>

jpa-archetype/pom.xml

@@ -2,13 +2,13 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.sap.olingo</groupId>
-    <artifactId>odata-jpa-archetype</artifactId>
-    <version>2.3.0</version>
+    <groupId>com.sap.olingo</groupId>
+    <artifactId>odata-jpa-archetype</artifactId>
+    <version>2.3.1</version>
     <packaging>pom</packaging>
     <url>https://github.com/SAP/olingo-jpa-processor-v4</url>
 
-    <properties>
+    <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.source>17</project.build.source>
     </properties>

jpa-tutorial/Questions/HowToHandleApiVersions.adoc

@@ -13,7 +13,7 @@ That is, a client needs to be adopted as well to be able to handle the change. T
 
 But even adding a non mandatory property can be incompatible in case a client can not handle unknown properties. 
 In all these cases the server has to provide two versions of the API till all clients have been adopted. 
-Starting with release 2.3.0 the JPA Processor supports multiple versions.
+Starting with release 2.3.1 the JPA Processor supports multiple versions.
 
 == Basic Idea
 
@@ -103,7 +103,7 @@ public abstract class EclipseLinkJpaConfiguration extends JpaBaseConfiguration {
 ----
 
 Then we need to create the version specific entity manager factories. 
-Please note that with each version of the entity manager factory we also have to create a transaction manager. 
+Please note that with each version of the entity manager factory we also have to create a transaction manager and must have an own persistence unit name. 
 It is also important that one of the beans for the factory has the name `entityManagerFactory`. 
 First the entity manager factory for the old version:
 
@@ -136,6 +136,7 @@ public class JpaConfigurationV1 extends EclipseLinkJpaConfiguration {
 
     return basicSettings(factoryBuilder)
         .packages(Trip.class, PlanItem.class, OffsetDateTimeConverter.class)
+        .persistenceUnit("TrippinV1")
         .build();
   }
 }
@@ -176,6 +177,7 @@ public class JpaConfigurationV2 extends EclipseLinkJpaConfiguration {
 
     return basicSettings(factoryBuilder)
         .packages(Trip.class, PlanItem.class, OffsetDateTimeConverter.class)
+        .persistenceUnit("TrippinV2")        
         .build();
   }
 }

jpa-tutorial/Questions/Preparation.adoc

@@ -290,7 +290,7 @@ insert into "Person" values ('keithpinckney', 'Keith', 'Pinckney', null, 0, null
 insert into "Person" values ('marshallgaray', 'Marshall', 'Garay', null, 0, null);
 insert into "Person" values ('ryantheriault', 'Ryan', 'Theriault', null, 0, null);
 insert into "Person" values ('elainestewart', 'Elaine', 'Stewart', null, 0, null);
-insert into "Person" values ('salliesampson', 'Sallie', 'Sampson', null, 1, null);
+insert into "Person" values ('sallysampson', 'Sally', 'Sampson', null, 1, null);
 insert into "Person" values ('jonirosales', 'Joni', 'Rosales', null, 2, null);
 insert into "Person" values ('georginabarlow', 'Georgina', 'Barlow', null, 1, null); 
 insert into "Person" values ('angelhuffman', 'Angel', 'Huffman', null, 1, null);
@@ -326,7 +326,7 @@ insert into "Trip" values (11, 'keithpinckney', 'a88f675d-9199-4392-9656-b08e3b4
 insert into "Trip" values (12, 'marshallgaray', 'a88f675d-9199-4392-9656-b08e3b46df8a', 'Study trip', 1550.3, 'This is a 2 weeks study trip', '2014-01-01T00:00:00Z', '2014-01-14T00:00:00Z');
 insert into "Trip" values (13, 'ryantheriault', 'a88f675d-9199-4392-9656-b08e3b46df8a', 'Study trip', 1550.3, 'This is a 2 weeks study trip', '2014-01-01T00:00:00Z', '2014-01-14T00:00:00Z');
 insert into "Trip" values (14, 'elainestewart', 'a88f675d-9199-4392-9656-b08e3b46df8a', 'Study trip', 1550.3, 'This is a 2 weeks study trip', '2014-01-01T00:00:00Z', '2014-01-14T00:00:00Z');
-insert into "Trip" values (15, 'salliesampson', 'a88f675d-9199-4392-9656-b08e3b46df8a', 'Study trip', 600, 'This is a 2 weeks study trip', '2014-01-01T00:00:00Z', '2014-01-14T00:00:00Z');
+insert into "Trip" values (15, 'sallysampson', 'a88f675d-9199-4392-9656-b08e3b46df8a', 'Study trip', 600, 'This is a 2 weeks study trip', '2014-01-01T00:00:00Z', '2014-01-14T00:00:00Z');
 insert into "Trip" values (16, 'jonirosales', 'a88f675d-9199-4392-9656-b08e3b46df8a', 'Study trip', 2000, 'This is a 2 weeks study trip', '2014-01-01T00:00:00Z', '2014-01-14T00:00:00Z');
 insert into "Trip" values (17, 'georginabarlow', 'a88f675d-9199-4392-9656-b08e3b46df8a', 'Study trip', 1150.3, 'This is a 2 weeks study trip', '2014-01-01T00:00:00Z', '2014-01-14T00:00:00Z');
 insert into "Trip" values (18, 'angelhuffman', 'cb0b8acb-79cb-4127-8316-772bc4302824', 'DIY Trip', 1500.3, 'This is a DIY trip', '2011-02-11T00:00:00Z', '2011-02-14T00:00:00Z');

jpa-tutorial/QuickStart/QuickStart.adoc

@@ -44,9 +44,9 @@ This should contain the information about archetype:
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/1.0.0 http://maven.apache.org/xsd/archetype-catalog-1.0.0.xsd">
   <archetypes>
     <archetype>
-        <groupId>com.sap.olingo</groupId>
-        <artifactId>odata-jpa-archetype-spring</artifactId>
-        <version>2.2.0</version>
+        <groupId>com.sap.olingo</groupId>
+        <artifactId>odata-jpa-archetype-spring</artifactId>
+        <version>2.3.1</version>
     </archetype>
   </archetypes>
 </archetype-catalog>

jpa/.dbeaver/credentials-config.json

@@ -0,0 +1 @@
+‚
:¬b69’4E«â˗¹ÆÏã»þJA8/gU‚ëÃáÀ{²~¾³=ìöeúVZ̘8a\ò;}qö»6+2¯›ö`‡kuNæˆ)ɪ¿W_=‡±/óŸŸ^šš;oƒ|sÝI´ž5½Ó':²€Ö%0·G©éfîRtì×ðÁ¯½f}¤ŽÕ:à\s:4n…[\âK$»ŸU•YGr¸’ÊÚUSªj3ô•à»?À®À÷òE×D™euΧ¥›ò,>‚\Á@#‹î´é7pÂZº‹Üý;,HªÎ>ŒWQÚàíÈÓyRªòϚ@ÙY`VqVÚ¹l£aÆuz¥õ-á\hDùö%_>”Cˆ«âi-âÇlp-š0?áWË`o؀‹g•jwg_©HV:Ë%†O¼—ͳ˜I@â$»âßl™Õþm¼‚Ð_÷Jã%ÐÂf­K¤x«âæôš1t ¬PCŸ–}‹c4hÀw;Eßøŋ”ìwg\·§V¢ñðŸêmš£ÜæðâãDõÀZ˜¨&ô`F™·¹@‚ñׅlKE’G‹i›E`tt›<€c!ˆ“3\>›Ú‰<À,œOºz)qznùuo³ W4»)[+i ýÙDèäÖ?„FY­“Å2(½[•üÊ]n¢É'Ú£’Õ&†¬

jpa/.dbeaver/data-sources.json

@@ -0,0 +1,116 @@
+{
+	"folders": {},
+	"connections": {
+		"postgres-jdbc-18d652c2b95-113570e0ec869f1d": {
+			"provider": "postgresql",
+			"driver": "postgres-jdbc",
+			"name": "postgres",
+			"save-password": true,
+			"configuration": {
+				"host": "localhost",
+				"port": "5432",
+				"database": "postgres",
+				"url": "jdbc:postgresql://localhost:5432/postgres",
+				"configurationType": "MANUAL",
+				"home": "postgresql-x64-16",
+				"type": "dev",
+				"closeIdleConnection": false,
+				"auth-model": "native"
+			}
+		},
+		"postgres-jdbc-18d7dab8ffc-6870c0ec5fa5f049": {
+			"provider": "postgresql",
+			"driver": "postgres-jdbc",
+			"name": "Olingo",
+			"save-password": true,
+			"configuration": {
+				"host": "localhost",
+				"port": "5432",
+				"database": "Olingo",
+				"url": "jdbc:postgresql://localhost:5432/Olingo",
+				"configurationType": "MANUAL",
+				"home": "postgresql-x64-16",
+				"type": "dev",
+				"closeIdleConnection": false,
+				"auth-model": "native"
+			}
+		},
+		"sap_hana-18d83921104-7dd425d3aee15bf1": {
+			"provider": "hana",
+			"driver": "sap_hana",
+			"name": "localhost",
+			"save-password": true,
+			"configuration": {
+				"host": "localhost",
+				"port": "30015",
+				"url": "jdbc:sap://localhost:30015",
+				"configurationType": "MANUAL",
+				"type": "dev",
+				"closeIdleConnection": false,
+				"provider-properties": {
+					"edition": "GENERIC"
+				},
+				"auth-model": "native"
+			}
+		},
+		"postgres-jdbc-18dec2e5845-6df665f2f5a08171": {
+			"provider": "postgresql",
+			"driver": "postgres-jdbc",
+			"name": "compass",
+			"save-password": true,
+			"configuration": {
+				"host": "localhost",
+				"port": "5432",
+				"database": "compass",
+				"url": "jdbc:postgresql://localhost:5432/compass",
+				"configurationType": "MANUAL",
+				"home": "postgresql-x64-16",
+				"type": "dev",
+				"closeIdleConnection": true,
+				"provider-properties": {
+					"@dbeaver-show-non-default-db@": "false"
+				},
+				"auth-model": "native"
+			}
+		},
+		"mysql8-18f81c6ea39-153fa1c6870708de": {
+			"provider": "mysql",
+			"driver": "mysql8",
+			"name": "MySql-Olingo",
+			"save-password": true,
+			"configuration": {
+				"host": "localhost",
+				"port": "3306",
+				"database": "Olingo",
+				"url": "jdbc:mysql://localhost:3306/Olingo?allowPublicKeyRetrieval=true&useSSL=false",
+				"configurationType": "URL",
+				"home": "mysql_client",
+				"type": "dev",
+				"closeIdleConnection": true,
+				"properties": {
+					"rewriteBatchedStatements": "true",
+					"connectTimeout": "20000",
+					"enabledTLSProtocols": "TLSv1,TLSv1.1,TLSv1.2,TLSv1.3"
+				},
+				"auth-model": "native",
+				"handlers": {}
+			}
+		}
+	},
+	"connection-types": {
+		"dev": {
+			"name": "Development",
+			"color": "255,255,255",
+			"description": "Regular development database",
+			"auto-commit": true,
+			"confirm-execute": false,
+			"confirm-data-change": false,
+			"smart-commit": false,
+			"smart-commit-recover": false,
+			"auto-close-transactions": true,
+			"close-transactions-period": 1800,
+			"auto-close-connections": true,
+			"close-connections-period": 14400
+		}
+	}
+}

jpa/.dbeaver/project-metadata.json

@@ -0,0 +1 @@
+{"resources":{"Scripts/Script-1.sql":{"default-schema":"OLINGO","default-datasource":"postgres-jdbc-18d7dab8ffc-6870c0ec5fa5f049","default-catalog":"Olingo"},"Scripts/Script-10.sql":{"default-schema":"OLINGO","default-datasource":"postgres-jdbc-18d7dab8ffc-6870c0ec5fa5f049","default-catalog":"Olingo"},"Scripts/Script-11.sql":{"default-schema":"OLINGO","default-datasource":"sap_hana-18d83921104-7dd425d3aee15bf1"},"Scripts/Script-12.sql":{"default-schema":"public","default-datasource":"postgres-jdbc-18dec2e5845-6df665f2f5a08171","default-catalog":"compass"},"Scripts/Script-13.sql":{"default-datasource":"sap_hana-18d83921104-7dd425d3aee15bf1","default-schema":"OLINGO"},"Scripts/Script-2.sql":{"default-schema":"OLINGO","default-datasource":"sap_hana-18d83921104-7dd425d3aee15bf1","default-catalog":"compass"},"Scripts/Script-3.sql":{"default-schema":"OLINGO","default-datasource":"sap_hana-18d83921104-7dd425d3aee15bf1","default-catalog":"Olingo"},"Scripts/Script-4.sql":{"default-schema":"OLINGO","default-datasource":"postgres-jdbc-18d7dab8ffc-6870c0ec5fa5f049","default-catalog":"Olingo"},"Scripts/Script-5.sql":{"default-schema":"OLINGO","default-datasource":"postgres-jdbc-18d7dab8ffc-6870c0ec5fa5f049","default-catalog":"Olingo"},"Scripts/Script-6.sql":{"default-schema":"public","default-datasource":"postgres-jdbc-18dec2e5845-6df665f2f5a08171","default-catalog":"compass"},"Scripts/Script-7.sql":{"default-schema":"public","default-datasource":"postgres-jdbc-18dec2e5845-6df665f2f5a08171","default-catalog":"compass"},"Scripts/Script-8.sql":{"default-schema":"public","default-datasource":"postgres-jdbc-18dec2e5845-6df665f2f5a08171","default-catalog":"compass"},"Scripts/Script-9.sql":{"default-schema":"public","default-datasource":"postgres-jdbc-18dec2e5845-6df665f2f5a08171","default-catalog":"compass"},"Scripts/Script.sql":{"default-schema":"OLINGO","default-datasource":"sap_hana-18d83921104-7dd425d3aee15bf1","default-catalog":"Olingo"}}}

jpa/.dbeaver/project-settings.json

@@ -0,0 +1 @@
+{"id":"1dc9dc18-395d-49be-a7b8-2ad9bb1a4481"}

jpa/.project

@@ -24,6 +24,7 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.jkiss.dbeaver.DBeaverNature</nature>
 	</natures>
 	<filteredResources>
 		<filter>

jpa/odata-jpa-annotation/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.sap.olingo</groupId>
 		<artifactId>odata-jpa</artifactId>
-		<version>2.3.0</version>
+		<version>2.3.1</version>
 	</parent>
 	<artifactId>odata-jpa-annotation</artifactId>
 	<name>odata-jpa-annotation</name>

jpa/odata-jpa-coverage/pom.xml

@@ -3,14 +3,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.sap.olingo</groupId>
-        <artifactId>odata-jpa</artifactId>
-        <version>2.3.0</version>
+        <artifactId>odata-jpa</artifactId>
+        <version>2.3.1</version>
     </parent>
 
     <artifactId>odata-jpa-coverage</artifactId>
     <name>odata-jpa-coverage</name>
     <url>https://github.com/SAP/olingo-jpa-processor-v4</url>
-
     <dependencies>
         <dependency>
             <groupId>com.sap.olingo</groupId>

jpa/odata-jpa-metadata/old.project

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jpa-metadata</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1634102235525</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

jpa/odata-jpa-metadata/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
         <groupId>com.sap.olingo</groupId>
         <artifactId>odata-jpa</artifactId>
-        <version>2.3.0</version>
+        <version>2.3.1</version>
 	</parent>
 
 	<artifactId>odata-jpa-metadata</artifactId>

jpa/odata-jpa-metadata/src/main/java/com/sap/olingo/jpa/metadata/core/edm/mapper/api/JPAEntityType.java

@@ -61,6 +61,12 @@ public interface JPAEntityType extends JPAStructuredType, JPAAnnotatable {
    */
   public boolean hasCompoundKey();
 
+  /**
+   * True in case the entity type has an EmbeddedId
+   * @return
+   */
+  public boolean hasEmbeddedKey();
+
   /**
    * @return a list of JPAPath to attributes marked with EdmSearchable
    * @throws ODataJPAModelException

jpa/odata-jpa-metadata/src/main/java/com/sap/olingo/jpa/metadata/core/edm/mapper/impl/IntermediateEntityType.java

@@ -295,6 +295,12 @@ public boolean hasCompoundKey() {
         || idType instanceof EmbeddableType;
   }
 
+  @Override
+  public boolean hasEmbeddedKey() {
+    return ((IdentifiableType<?>) jpaManagedType).hasSingleIdAttribute()
+        && hasCompoundKey();
+  }
+
   @Override
   public boolean hasEtag() throws ODataJPAModelException {
     buildEdmTypeIfEmpty();