You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2025/03/01 12:57:48 UTC
(olingo-odata2) branch OLINGO-1636-jdk_upgrade created (now 83032e86)
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a change to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
at 83032e86 adapts tests
This branch includes the following new commits:
new ab481c5a add build.yml
new c71e7670 add workflows
new 44b83a2e change java from 1.6 to 1.8
new d704acea build with java 8
new 34d3f669 skip tests in workflows
new 2c2e2728 fix compilation
new 78298e8f set version 3.0.0-SNAPSHOT Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
new 6eec1f79 enable tests execution
new 54be5cab add release workflow
new 922cc967 update release.yml
new 8c3e9565 version set to 3.0.1 for release
new 43ce1185 version set to 3.0.2-SNAPSHOT for development
new 61b1ec4e deploy jars
new f17784d4 add distributionManagement
new 72646b84 change job name Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
new 88b4110d version set to 3.0.2 for release
new e9f46901 version set to 3.0.3-SNAPSHOT for development
new 1fafb78d make olingo compatible with Spring Boot 3
new 0872ed9b use java 8
new fabbcf63 use java 11
new 4bebfe7a use java 17
new 77a44e49 javax.ws.rs -> jakarta.ws.rs
new 17ce01bc adapt tests
new c028f769 more test adaptations
new 45dd4624 adapt test
new cac7590e fix docs
new 7d55fd10 adapt tests
new 5d7914ce more adaptations
new 83032e86 adapts tests
The 29 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(olingo-odata2) 20/29: use java 11
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit fabbcf63c9602dcfee583bddd5d8dca7b9eb01f1
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 14:47:04 2023 +0200
use java 11
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.github/workflows/build.yml | 4 ++--
.github/workflows/maven.yml | 4 ++--
.github/workflows/pull-request.yml | 4 ++--
.github/workflows/release.yml | 4 ++--
odata2-jpa-processor/jpa-core/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
pom.xml | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 03db07f1..cc031a02 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,11 +17,11 @@ jobs:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
- - name: Set up JDK Corretto 8
+ - name: Set up JDK Corretto
uses: actions/setup-java@v3
with:
distribution: 'corretto'
- java-version: '8'
+ java-version: '11'
architecture: x64
- name: Maven Build
run: mvn clean install
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 64e1e103..f3e24d28 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -24,10 +24,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set up JDK 8 (Corretto)
+ - name: Set up JDK (Corretto)
uses: actions/setup-java@v3
with:
- java-version: '8'
+ java-version: '11'
distribution: 'corretto'
cache: maven
- name: Build with Maven
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index d2d52a6d..0c3c0ce2 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -24,10 +24,10 @@ jobs:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
- - name: Set up JDK Corretto 8
+ - name: Set up JDK Corretto
uses: actions/setup-java@v3
with:
distribution: 'corretto'
- java-version: 8
+ java-version: 11
- name: Maven Build
run: mvn clean install
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9c2a548c..041bc9b0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,11 +31,11 @@ jobs:
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
- - name: Set up JDK Corretto 8
+ - name: Set up JDK Corretto
uses: actions/setup-java@v3
with:
distribution: 'corretto'
- java-version: '8'
+ java-version: '11'
architecture: x64
- name: "Configure Git"
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index 47d162a3..ecad6196 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -69,8 +69,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
<verbose>true</verbose>
</configuration>
</plugin>
diff --git a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
index d5d584f7..9548f828 100644
--- a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
@@ -58,8 +58,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.compiler-plugin}</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
<verbose>true</verbose>
</configuration>
</plugin>
diff --git a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
index b6789c78..92b5c6fc 100644
--- a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
@@ -50,8 +50,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index 8b4614c1..f4be195c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,8 +193,8 @@ governing permissions and limitations under
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
<verbose>true</verbose>
</configuration>
</plugin>
(olingo-odata2) 03/29: change java from 1.6 to 1.8
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 44b83a2e8a048b268a7377cb31623cd6efda3fb1
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 09:59:46 2023 +0200
change java from 1.6 to 1.8
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
odata2-jpa-processor/jpa-core/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
pom.xml | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index c8eb662a..cacc5d55 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -70,8 +70,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
diff --git a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
index 64a848d2..aeef6911 100644
--- a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
@@ -59,8 +59,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.compiler-plugin}</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
diff --git a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
index 034d6951..1db10810 100644
--- a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
@@ -51,8 +51,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index b7c2baaf..72b69697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,8 +187,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
(olingo-odata2) 10/29: update release.yml
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 922cc967ab0a78bb4edc36b27521dd8831babc47
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 11:00:13 2023 +0200
update release.yml
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.github/workflows/release.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0c674b8f..6666ba01 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -70,10 +70,10 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
- tag_name: ${{ github.ref }}
- release_name: Release ${{ github.ref }}
+ tag_name: ${{ github.event.inputs.releaseVersion }}
+ release_name: Release ${{ github.event.inputs.releaseVersion }}
body: |
- Changes in this Release
+ Changes in this Release:
- First Change
- Second Change
draft: false
(olingo-odata2) 16/29: version set to 3.0.2 for release
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 88b4110dd7fc1a617a65c0360f7a498d8848089e
Author: iliyan-velichkov <il...@users.noreply.github.com>
AuthorDate: Wed Dec 13 09:49:04 2023 +0000
version set to 3.0.2 for release
---
odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-core/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
odata2-annotation-processor/pom.xml | 2 +-
odata2-dist/janos/pom.xml | 2 +-
odata2-dist/javadoc/pom.xml | 2 +-
odata2-dist/jpa/pom.xml | 2 +-
odata2-dist/lib/pom.xml | 2 +-
odata2-dist/pom.xml | 2 +-
odata2-dist/ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-api/pom.xml | 2 +-
odata2-jpa-processor/jpa-core/pom.xml | 2 +-
odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-web/pom.xml | 2 +-
odata2-jpa-processor/pom.xml | 2 +-
odata2-lib/odata-annotation/pom.xml | 2 +-
odata2-lib/odata-api/pom.xml | 2 +-
odata2-lib/odata-client-api/pom.xml | 2 +-
odata2-lib/odata-client-core/pom.xml | 2 +-
odata2-lib/odata-core/pom.xml | 2 +-
odata2-lib/odata-fit/pom.xml | 2 +-
odata2-lib/odata-ref/pom.xml | 2 +-
odata2-lib/odata-testutil/pom.xml | 2 +-
odata2-lib/odata-web/pom.xml | 2 +-
odata2-lib/pom.xml | 2 +-
odata2-sample/cars-annotation-archetype/pom.xml | 4 ++--
odata2-sample/cars-jpa-archetype/pom.xml | 2 +-
odata2-sample/cars-service-archetype/pom.xml | 4 ++--
odata2-sample/pom.xml | 2 +-
odata2-spring/pom.xml | 2 +-
pom.xml | 2 +-
32 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml b/odata2-annotation-processor/annotation-processor-api/pom.xml
index 691a4a75..371cf66f 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml b/odata2-annotation-processor/annotation-processor-core/pom.xml
index 9e682372..c0e91245 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index 446b1315..280f6c1e 100644
--- a/odata2-annotation-processor/annotation-processor-ref/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-web/pom.xml b/odata2-annotation-processor/annotation-processor-web/pom.xml
index 29ec23aa..58555942 100644
--- a/odata2-annotation-processor/annotation-processor-web/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/pom.xml b/odata2-annotation-processor/pom.xml
index 5d90d57c..d3d6bacd 100644
--- a/odata2-annotation-processor/pom.xml
+++ b/odata2-annotation-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml
index 7374fb82..48ef7541 100644
--- a/odata2-dist/janos/pom.xml
+++ b/odata2-dist/janos/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/javadoc/pom.xml b/odata2-dist/javadoc/pom.xml
index 9726993e..4924ea65 100644
--- a/odata2-dist/javadoc/pom.xml
+++ b/odata2-dist/javadoc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml
index b2876c3c..5d9280a8 100644
--- a/odata2-dist/jpa/pom.xml
+++ b/odata2-dist/jpa/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/lib/pom.xml b/odata2-dist/lib/pom.xml
index 5de4586d..7ccc84e7 100644
--- a/odata2-dist/lib/pom.xml
+++ b/odata2-dist/lib/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
index 53148368..82045580 100644
--- a/odata2-dist/pom.xml
+++ b/odata2-dist/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml
index ff8e0483..06aaecde 100644
--- a/odata2-dist/ref/pom.xml
+++ b/odata2-dist/ref/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-api/pom.xml b/odata2-jpa-processor/jpa-api/pom.xml
index 5c5b0405..5861d713 100644
--- a/odata2-jpa-processor/jpa-api/pom.xml
+++ b/odata2-jpa-processor/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>../</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index e8f7c82d..641a63e4 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>../</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-ref/pom.xml b/odata2-jpa-processor/jpa-ref/pom.xml
index 5f0d7454..66c34d8b 100644
--- a/odata2-jpa-processor/jpa-ref/pom.xml
+++ b/odata2-jpa-processor/jpa-ref/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-web/pom.xml b/odata2-jpa-processor/jpa-web/pom.xml
index 4b54fa2e..b791c209 100644
--- a/odata2-jpa-processor/jpa-web/pom.xml
+++ b/odata2-jpa-processor/jpa-web/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/pom.xml b/odata2-jpa-processor/pom.xml
index 405503e7..9dfad79b 100644
--- a/odata2-jpa-processor/pom.xml
+++ b/odata2-jpa-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml
index 53452cd7..0623df23 100644
--- a/odata2-lib/odata-annotation/pom.xml
+++ b/odata2-lib/odata-annotation/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml
index 4fa25ebf..e0055cf9 100644
--- a/odata2-lib/odata-api/pom.xml
+++ b/odata2-lib/odata-api/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-client-api/pom.xml b/odata2-lib/odata-client-api/pom.xml
index c5c2b139..fe4af915 100644
--- a/odata2-lib/odata-client-api/pom.xml
+++ b/odata2-lib/odata-client-api/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
<artifactId>olingo-odata2-client-api</artifactId>
diff --git a/odata2-lib/odata-client-core/pom.xml b/odata2-lib/odata-client-core/pom.xml
index 5905c5e6..234fdde6 100644
--- a/odata2-lib/odata-client-core/pom.xml
+++ b/odata2-lib/odata-client-core/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml
index 6f65e83d..8efc4359 100644
--- a/odata2-lib/odata-core/pom.xml
+++ b/odata2-lib/odata-core/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml
index acabba22..b5c13e49 100644
--- a/odata2-lib/odata-fit/pom.xml
+++ b/odata2-lib/odata-fit/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml
index 204a3226..d6d7982b 100644
--- a/odata2-lib/odata-ref/pom.xml
+++ b/odata2-lib/odata-ref/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml
index 8a82a50f..438c8a8c 100644
--- a/odata2-lib/odata-testutil/pom.xml
+++ b/odata2-lib/odata-testutil/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml
index 0b51b1c0..2ec2468a 100644
--- a/odata2-lib/odata-web/pom.xml
+++ b/odata2-lib/odata-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml
index bcca8c18..864d3580 100644
--- a/odata2-lib/pom.xml
+++ b/odata2-lib/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-annotation-archetype/pom.xml b/odata2-sample/cars-annotation-archetype/pom.xml
index 45b343ac..380f1dd0 100644
--- a/odata2-sample/cars-annotation-archetype/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/pom.xml
@@ -16,13 +16,13 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-annotation-archetype</artifactId>
<name>${project.artifactId}</name>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-jpa-archetype/pom.xml b/odata2-sample/cars-jpa-archetype/pom.xml
index 8d218c47..f3d81185 100644
--- a/odata2-sample/cars-jpa-archetype/pom.xml
+++ b/odata2-sample/cars-jpa-archetype/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-service-archetype/pom.xml b/odata2-sample/cars-service-archetype/pom.xml
index 75f0ea30..9627aef0 100644
--- a/odata2-sample/cars-service-archetype/pom.xml
+++ b/odata2-sample/cars-service-archetype/pom.xml
@@ -24,14 +24,14 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-service-archetype</artifactId>
<name>${project.artifactId}</name>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/pom.xml b/odata2-sample/pom.xml
index f6c95e8f..6930dcd5 100644
--- a/odata2-sample/pom.xml
+++ b/odata2-sample/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-spring/pom.xml b/odata2-spring/pom.xml
index d2a0d9b4..a5a5e7d3 100755
--- a/odata2-spring/pom.xml
+++ b/odata2-spring/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
</parent>
<dependencies>
diff --git a/pom.xml b/pom.xml
index e6a20d63..7d20f079 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.2</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
(olingo-odata2) 22/29: javax.ws.rs -> jakarta.ws.rs
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 77a44e491e81334b31a770b03bae942cd06f603b
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 15:36:08 2023 +0200
javax.ws.rs -> jakarta.ws.rs
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.../src/main/resources/META-INF/LICENSE | 4 +-
.../src/main/webapp/WEB-INF/web.xml | 2 +-
odata2-dist/janos/src/main/resources/LICENSE | 4 +-
odata2-dist/jpa/src/main/resources/LICENSE | 4 +-
odata2-dist/lib/src/main/resources/LICENSE | 4 +-
odata2-dist/ref/src/main/resources/LICENSE | 4 +-
.../jpa/processor/api/ODataJPAServiceFactory.java | 2 +-
.../jpa-web/src/main/resources/META-INF/LICENSE | 4 +-
.../jpa-web/src/main/webapp/WEB-INF/web.xml | 2 +-
.../org/apache/olingo/odata2/api/package-info.java | 4 +-
odata2-lib/odata-core/pom.xml | 100 +--
.../org/apache/olingo/odata2/core/rest/MERGE.java | 2 +-
.../odata2/core/rest/ODataExceptionMapperImpl.java | 20 +-
.../odata2/core/rest/ODataExceptionWrapper.java | 10 +-
.../odata2/core/rest/ODataRedirectLocator.java | 14 +-
.../olingo/odata2/core/rest/ODataRootLocator.java | 20 +-
.../olingo/odata2/core/rest/ODataSubLocator.java | 314 ++++----
.../org/apache/olingo/odata2/core/rest/PATCH.java | 2 +-
.../apache/olingo/odata2/core/rest/RestUtil.java | 24 +-
.../odata2/core/rest/SubLocatorParameter.java | 20 +-
.../odata2/core/rest/app/ODataApplication.java | 14 +-
.../apache/olingo/odata2/core/LocaleAsserter.java | 16 +
.../odata2/core/ODataExceptionWrapperTest.java | 6 +-
.../odata2/core/commons/ContentTypeTest.java | 2 +-
.../olingo/odata2/core/commons/XmlHelperTest.java | 38 -
.../odata2/core/ep/ProviderFacadeImplTest.java | 796 ++++++++++-----------
.../ep/consumer/JsonErrorDocumentConsumerTest.java | 402 +++++------
.../ep/consumer/XmlErrorDocumentConsumerTest.java | 433 ++++++-----
.../core/rest/ODataExceptionMapperImplTest.java | 12 +-
.../olingo/odata2/fit/basic/BasicHttpTest.java | 2 +-
.../olingo/odata2/fit/basic/ContextTest.java | 2 +-
.../olingo/odata2/fit/basic/FitLoadTest.java | 2 +-
.../odata2/fit/misc/ODataApplicationTest.java | 2 +-
.../olingo/odata2/testutil/server/TestServer.java | 4 +-
.../odata-web/src/main/resources/META-INF/LICENSE | 4 +-
.../odata-web/src/main/webapp/WEB-INF/web.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 4 +-
.../src/main/webapp/WEB-INF/web.xml | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 2 +-
.../olingo/odata2/spring/OlingoRootLocator.java | 2 +-
pom.xml | 1 -
42 files changed, 1119 insertions(+), 1191 deletions(-)
diff --git a/odata2-annotation-processor/annotation-processor-web/src/main/resources/META-INF/LICENSE b/odata2-annotation-processor/annotation-processor-web/src/main/resources/META-INF/LICENSE
index 6547e963..28751de4 100644
--- a/odata2-annotation-processor/annotation-processor-web/src/main/resources/META-INF/LICENSE
+++ b/odata2-annotation-processor/annotation-processor-web/src/main/resources/META-INF/LICENSE
@@ -497,8 +497,8 @@
=====================================================================
- - javax.ws.rs-api (http://jax-rs-spec.java.net)
- javax.ws.rs:javax.ws.rs-api:jar:2.0-m10
+ - jakarta.ws.rs-api (http://jax-rs-spec.java.net)
+ jakarta.ws.rs:jakarta.ws.rs-api:jar:2.0-m10
- JAXB Reference Implementation (http://jaxb.java.net/)
com.sun.xml.bind:jaxb-impl:jar:2.2.6
License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
diff --git a/odata2-annotation-processor/annotation-processor-web/src/main/webapp/WEB-INF/web.xml b/odata2-annotation-processor/annotation-processor-web/src/main/webapp/WEB-INF/web.xml
index 2e4635ec..15eca607 100644
--- a/odata2-annotation-processor/annotation-processor-web/src/main/webapp/WEB-INF/web.xml
+++ b/odata2-annotation-processor/annotation-processor-web/src/main/webapp/WEB-INF/web.xml
@@ -30,7 +30,7 @@
<servlet-name>ReferenceScenarioServlet</servlet-name>
<servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
<init-param>
- <param-name>javax.ws.rs.Application</param-name>
+ <param-name>jakarta.ws.rs.Application</param-name>
<param-value>org.apache.olingo.odata2.core.rest.app.ODataApplication</param-value>
</init-param>
<init-param>
diff --git a/odata2-dist/janos/src/main/resources/LICENSE b/odata2-dist/janos/src/main/resources/LICENSE
index 932a86ec..d832967e 100644
--- a/odata2-dist/janos/src/main/resources/LICENSE
+++ b/odata2-dist/janos/src/main/resources/LICENSE
@@ -205,8 +205,8 @@
=====================================================================
- - javax.ws.rs-api (http://jax-rs-spec.java.net)
- javax.ws.rs:javax.ws.rs-api:jar:2.0-m10
+ - jakarta.ws.rs-api (http://jax-rs-spec.java.net)
+ jakarta.ws.rs:jakarta.ws.rs-api:jar:2.0-m10
License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
=====================================================================
diff --git a/odata2-dist/jpa/src/main/resources/LICENSE b/odata2-dist/jpa/src/main/resources/LICENSE
index e6ce2123..765b0c15 100644
--- a/odata2-dist/jpa/src/main/resources/LICENSE
+++ b/odata2-dist/jpa/src/main/resources/LICENSE
@@ -204,8 +204,8 @@
=====================================================================
- - javax.ws.rs-api (http://jax-rs-spec.java.net)
- javax.ws.rs:javax.ws.rs-api:jar:2.0-m10
+ - jakarta.ws.rs-api (http://jax-rs-spec.java.net)
+ jakarta.ws.rs:jakarta.ws.rs-api:jar:2.0-m10
License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
=====================================================================
diff --git a/odata2-dist/lib/src/main/resources/LICENSE b/odata2-dist/lib/src/main/resources/LICENSE
index 932a86ec..d832967e 100644
--- a/odata2-dist/lib/src/main/resources/LICENSE
+++ b/odata2-dist/lib/src/main/resources/LICENSE
@@ -205,8 +205,8 @@
=====================================================================
- - javax.ws.rs-api (http://jax-rs-spec.java.net)
- javax.ws.rs:javax.ws.rs-api:jar:2.0-m10
+ - jakarta.ws.rs-api (http://jax-rs-spec.java.net)
+ jakarta.ws.rs:jakarta.ws.rs-api:jar:2.0-m10
License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
=====================================================================
diff --git a/odata2-dist/ref/src/main/resources/LICENSE b/odata2-dist/ref/src/main/resources/LICENSE
index 79cf1718..c99a4b6d 100644
--- a/odata2-dist/ref/src/main/resources/LICENSE
+++ b/odata2-dist/ref/src/main/resources/LICENSE
@@ -497,8 +497,8 @@
=====================================================================
- - javax.ws.rs-api (http://jax-rs-spec.java.net)
- javax.ws.rs:javax.ws.rs-api:jar:2.0-m10
+ - jakarta.ws.rs-api (http://jax-rs-spec.java.net)
+ jakarta.ws.rs:jakarta.ws.rs-api:jar:2.0-m10
- JAXB Reference Implementation (http://jaxb.java.net/)
com.sun.xml.bind:jaxb-impl:jar:2.2.6
License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAServiceFactory.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAServiceFactory.java
index e59ad683..0d59aa43 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAServiceFactory.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAServiceFactory.java
@@ -59,7 +59,7 @@ import org.apache.olingo.odata2.jpa.processor.api.factory.ODataJPAFactory;
* <servlet-name>ReferenceScenarioServlet</servlet-name>
* <servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
* <init-param>
- * <param-name>javax.ws.rs.Application</param-name>
+ * <param-name>jakarta.ws.rs.Application</param-name>
* <param-value>org.apache.olingo.odata2.core.rest.ODataApplication</param-value>
* </init-param>
* <init-param>
diff --git a/odata2-jpa-processor/jpa-web/src/main/resources/META-INF/LICENSE b/odata2-jpa-processor/jpa-web/src/main/resources/META-INF/LICENSE
index 2c5e63b6..2d1a76e7 100644
--- a/odata2-jpa-processor/jpa-web/src/main/resources/META-INF/LICENSE
+++ b/odata2-jpa-processor/jpa-web/src/main/resources/META-INF/LICENSE
@@ -497,8 +497,8 @@
=====================================================================
- - javax.ws.rs-api (http://jax-rs-spec.java.net)
- javax.ws.rs:javax.ws.rs-api:jar:2.0-m10
+ - jakarta.ws.rs-api (http://jax-rs-spec.java.net)
+ jakarta.ws.rs:jakarta.ws.rs-api:jar:2.0-m10
- JAXB Reference Implementation (http://jaxb.java.net/)
com.sun.xml.bind:jaxb-impl:jar:2.2.6
License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
diff --git a/odata2-jpa-processor/jpa-web/src/main/webapp/WEB-INF/web.xml b/odata2-jpa-processor/jpa-web/src/main/webapp/WEB-INF/web.xml
index cffa37e5..2551e0fd 100644
--- a/odata2-jpa-processor/jpa-web/src/main/webapp/WEB-INF/web.xml
+++ b/odata2-jpa-processor/jpa-web/src/main/webapp/WEB-INF/web.xml
@@ -31,7 +31,7 @@
<servlet-name>JPARefScenarioServlet</servlet-name>
<servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
<init-param>
- <param-name>javax.ws.rs.Application</param-name>
+ <param-name>jakarta.ws.rs.Application</param-name>
<param-value>org.apache.olingo.odata2.core.rest.app.ODataApplication</param-value>
</init-param>
<init-param>
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/package-info.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/package-info.java
index b5cb2bf9..cd95b3f0 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/package-info.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/package-info.java
@@ -31,7 +31,7 @@
* <p>
* Entry point to the service is a JAX-RS servlet. At this servlet init parameters for a
* <code>ODataServiceFactory</code>
- * is configured. The parameter <code>javax.ws.rs.Application</code> is a default by JAX-RS and has to be present
+ * is configured. The parameter <code>jakarta.ws.rs.Application</code> is a default by JAX-RS and has to be present
* always.
* <p>
* <pre> {@code
@@ -45,7 +45,7 @@
* <servlet-name>MyODataServlet</servlet-name>
* <servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
* <init-param>
- * <param-name>javax.ws.rs.Application</param-name>
+ * <param-name>jakarta.ws.rs.Application</param-name>
* <param-value>org.apache.olingo.odata2.core.rest.app.ODataApplication</param-value>
* </init-param>
* <init-param>
diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml
index 1dd34895..3ddae9f5 100644
--- a/odata2-lib/odata-core/pom.xml
+++ b/odata2-lib/odata-core/pom.xml
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
<modelVersion>4.0.0</modelVersion>
@@ -52,7 +53,8 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifestFile>
+ ${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
@@ -72,15 +74,15 @@
<configuration>
<instructions>
<Import-Package>
- javax.ws.rs,
- javax.ws.rs.*,
+ jakarta.ws.rs,
+ jakarta.ws.rs.*,
com.google.gson.*;version="[2.2,$(version;+;${gson.version}))",
*
</Import-Package>
<Export-Package>
org.apache.olingo.odata2.core.rest.app;version=${project.version},
org.apache.olingo.odata2.core.rt;version=${project.version},
- org.apache.olingo.odata2.core.servlet;version=${project.version},
+ org.apache.olingo.odata2.core.servlet;version=${project.version},
</Export-Package>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
@@ -88,7 +90,7 @@
</instructions>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
<profiles>
@@ -116,9 +118,11 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.olingo</groupId>
- <artifactId>org.apache.olingo.odata2.api</artifactId>
+ <artifactId>
+ org.apache.olingo.odata2.api</artifactId>
<version>${project.version}</version>
- <outputDirectory>${project.build.directory}/api_dependency</outputDirectory>
+ <outputDirectory>
+ ${project.build.directory}/api_dependency</outputDirectory>
<overWrite>true</overWrite>
</artifactItem>
</artifactItems>
@@ -139,7 +143,8 @@
</goals>
<configuration>
<instrumentationPaths>
- <param>${project.build.directory}/api_dependency</param>
+ <param>
+ ${project.build.directory}/api_dependency</param>
</instrumentationPaths>
</configuration>
</execution>
@@ -150,7 +155,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- use the instrumented classes for test execution -->
- <classesDirectory>${project.build.directory}/generated-classes/emma/classes</classesDirectory>
+ <classesDirectory>
+ ${project.build.directory}/generated-classes/emma/classes</classesDirectory>
</configuration>
</plugin>
</plugins>
@@ -159,15 +165,15 @@
</profiles>
<dependencies>
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
+ <version>4.0.3</version>
</dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>${jax.ws.rs.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
@@ -182,40 +188,40 @@
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.apache.olingo</groupId>
- <artifactId>olingo-odata2-testutil</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
+
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.apache.olingo</groupId>
+ <artifactId>olingo-odata2-testutil</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/MERGE.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/MERGE.java
index 330030be..ec7e7b42 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/MERGE.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/MERGE.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.ws.rs.HttpMethod;
+import jakarta.ws.rs.HttpMethod;
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java
index aa03d7fc..65170132 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java
@@ -25,16 +25,16 @@ import java.util.Set;
import jakarta.servlet.ServletConfig;
import jakarta.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.apache.olingo.odata2.api.ODataServiceFactory;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionWrapper.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionWrapper.java
index 11aff621..b60fd3c5 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionWrapper.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionWrapper.java
@@ -26,11 +26,11 @@ import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.UriInfo;
import org.apache.olingo.odata2.api.ODataServiceFactory;
import org.apache.olingo.odata2.api.batch.BatchException;
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java
index 2ab44dfe..c5fd3683 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java
@@ -20,13 +20,13 @@ package org.apache.olingo.odata2.core.rest;
import java.net.URI;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HEAD;
-import javax.ws.rs.OPTIONS;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HEAD;
+import jakarta.ws.rs.OPTIONS;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.core.Response;
/**
*
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
index f8a58d8d..7111af86 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
@@ -22,16 +22,16 @@ import java.util.List;
import jakarta.servlet.ServletConfig;
import jakarta.servlet.http.HttpServletRequest;
-import javax.ws.rs.Encoded;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.Encoded;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.Request;
+import jakarta.ws.rs.core.UriInfo;
import org.apache.olingo.odata2.api.ODataServiceFactory;
import org.apache.olingo.odata2.api.exception.ODataBadRequestException;
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
index 4bfe12c5..28ed897d 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
@@ -1,34 +1,19 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.rest;
-import jakarta.servlet.http.HttpServletRequest;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HEAD;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.OPTIONS;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.core.Response;
-
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.ODataServiceFactory;
import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
@@ -42,153 +27,166 @@ import org.apache.olingo.odata2.api.processor.ODataRequest;
import org.apache.olingo.odata2.api.processor.ODataResponse;
import org.apache.olingo.odata2.core.ODataContextImpl;
import org.apache.olingo.odata2.core.ODataRequestHandler;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HEAD;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.OPTIONS;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.core.Response;
/**
- *
+ *
*/
public final class ODataSubLocator {
- private ODataServiceFactory serviceFactory;
- private ODataRequest request;
-
- private HttpServletRequest httpRequest;
-
- @GET
- public Response handleGet() throws ODataException {
- return handle(ODataHttpMethod.GET);
- }
-
- @PUT
- public Response handlePut() throws ODataException {
- return handle(ODataHttpMethod.PUT);
- }
-
- @PATCH
- public Response handlePatch() throws ODataException {
- return handle(ODataHttpMethod.PATCH);
- }
-
- @MERGE
- public Response handleMerge() throws ODataException {
- return handle(ODataHttpMethod.MERGE);
- }
-
- @DELETE
- public Response handleDelete() throws ODataException {
- return handle(ODataHttpMethod.DELETE);
- }
-
- @POST
- public Response handlePost(@HeaderParam("X-HTTP-Method") final String xHttpMethod) throws ODataException {
- Response response;
-
- if (xHttpMethod == null) {
- response = handle(ODataHttpMethod.POST);
- } else {
- /* tunneling */
- if ("MERGE".equals(xHttpMethod)) {
- response = handle(ODataHttpMethod.MERGE);
- } else if ("PATCH".equals(xHttpMethod)) {
- response = handle(ODataHttpMethod.PATCH);
- } else if (HttpMethod.DELETE.equals(xHttpMethod)) {
- response = handle(ODataHttpMethod.DELETE);
- } else if (HttpMethod.PUT.equals(xHttpMethod)) {
- response = handle(ODataHttpMethod.PUT);
- } else if (HttpMethod.GET.equals(xHttpMethod)) {
- response = handle(ODataHttpMethod.GET);
- } else if (HttpMethod.POST.equals(xHttpMethod)) {
- response = handle(ODataHttpMethod.POST);
- } else if (HttpMethod.HEAD.equals(xHttpMethod)) {
- response = handleHead();
- } else if (HttpMethod.OPTIONS.equals(xHttpMethod)) {
- response = handleOptions();
- } else {
- response = returnNotImplementedResponse(ODataNotImplementedException.TUNNELING);
- }
+ private ODataServiceFactory serviceFactory;
+ private ODataRequest request;
+
+ private HttpServletRequest httpRequest;
+
+ @GET
+ public Response handleGet() throws ODataException {
+ return handle(ODataHttpMethod.GET);
+ }
+
+ @PUT
+ public Response handlePut() throws ODataException {
+ return handle(ODataHttpMethod.PUT);
+ }
+
+ @PATCH
+ public Response handlePatch() throws ODataException {
+ return handle(ODataHttpMethod.PATCH);
+ }
+
+ @MERGE
+ public Response handleMerge() throws ODataException {
+ return handle(ODataHttpMethod.MERGE);
+ }
+
+ @DELETE
+ public Response handleDelete() throws ODataException {
+ return handle(ODataHttpMethod.DELETE);
+ }
+
+ @POST
+ public Response handlePost(@HeaderParam("X-HTTP-Method") final String xHttpMethod) throws ODataException {
+ Response response;
+
+ if (xHttpMethod == null) {
+ response = handle(ODataHttpMethod.POST);
+ } else {
+ /* tunneling */
+ if ("MERGE".equals(xHttpMethod)) {
+ response = handle(ODataHttpMethod.MERGE);
+ } else if ("PATCH".equals(xHttpMethod)) {
+ response = handle(ODataHttpMethod.PATCH);
+ } else if (HttpMethod.DELETE.equals(xHttpMethod)) {
+ response = handle(ODataHttpMethod.DELETE);
+ } else if (HttpMethod.PUT.equals(xHttpMethod)) {
+ response = handle(ODataHttpMethod.PUT);
+ } else if (HttpMethod.GET.equals(xHttpMethod)) {
+ response = handle(ODataHttpMethod.GET);
+ } else if (HttpMethod.POST.equals(xHttpMethod)) {
+ response = handle(ODataHttpMethod.POST);
+ } else if (HttpMethod.HEAD.equals(xHttpMethod)) {
+ response = handleHead();
+ } else if (HttpMethod.OPTIONS.equals(xHttpMethod)) {
+ response = handleOptions();
+ } else {
+ response = returnNotImplementedResponse(ODataNotImplementedException.TUNNELING);
+ }
+ }
+ return response;
+ }
+
+ private Response returnNotImplementedResponse(final MessageReference messageReference) {
+ // RFC 2616, 5.1.1: "An origin server SHOULD return the status code [...]
+ // 501 (Not Implemented) if the method is unrecognized [...] by the origin server."
+ return returnException(new ODataNotImplementedException(messageReference));
+ }
+
+ private Response returnException(final ODataMessageException messageException) {
+ ODataContextImpl context = new ODataContextImpl(request, serviceFactory);
+ context.setRequest(request);
+ context.setAcceptableLanguages(request.getAcceptableLanguages());
+ context.setPathInfo(request.getPathInfo());
+ context.setServiceFactory(serviceFactory);
+ context.setParameter(ODataContext.HTTP_SERVLET_REQUEST_OBJECT, httpRequest);
+ ODataExceptionWrapper exceptionWrapper =
+ new ODataExceptionWrapper(context, request.getQueryParameters(), request.getAcceptHeaders());
+ ODataResponse response = exceptionWrapper.wrapInExceptionResponse(messageException);
+ return RestUtil.convertResponse(response);
+ }
+
+ private Response returnNoServiceResponse(MessageReference messageReference) {
+ return returnException(new ODataInternalServerErrorException(messageReference));
}
- return response;
- }
-
- private Response returnNotImplementedResponse(final MessageReference messageReference) {
- // RFC 2616, 5.1.1: "An origin server SHOULD return the status code [...]
- // 501 (Not Implemented) if the method is unrecognized [...] by the origin server."
- return returnException(new ODataNotImplementedException(messageReference));
- }
-
- private Response returnException(final ODataMessageException messageException) {
- ODataContextImpl context = new ODataContextImpl(request, serviceFactory);
- context.setRequest(request);
- context.setAcceptableLanguages(request.getAcceptableLanguages());
- context.setPathInfo(request.getPathInfo());
- context.setServiceFactory(serviceFactory);
- context.setParameter(ODataContext.HTTP_SERVLET_REQUEST_OBJECT, httpRequest);
- ODataExceptionWrapper exceptionWrapper =
- new ODataExceptionWrapper(context, request.getQueryParameters(), request.getAcceptHeaders());
- ODataResponse response =
- exceptionWrapper.wrapInExceptionResponse(messageException);
- return RestUtil.convertResponse(response);
- }
-
- private Response returnNoServiceResponse(MessageReference messageReference) {
- return returnException(new ODataInternalServerErrorException(messageReference));
- }
-
- @OPTIONS
- public Response handleOptions() throws ODataException {
- // RFC 2616, 5.1.1: "An origin server SHOULD return the status code [...]
- // 501 (Not Implemented) if the method is unrecognized or not implemented
- // by the origin server."
- return returnNotImplementedResponse(ODataNotImplementedException.COMMON);
- }
-
- @HEAD
- public Response handleHead() throws ODataException {
- return handleGet();
- }
-
- private Response handle(final ODataHttpMethod method) throws ODataException {
- request = ODataRequest.fromRequest(request).method(method).build();
-
- ODataContextImpl context = new ODataContextImpl(request, serviceFactory);
- context.setParameter(ODataContext.HTTP_SERVLET_REQUEST_OBJECT, httpRequest);
-
- ODataService service = serviceFactory.createService(context);
- if(service == null){
- return returnNoServiceResponse(ODataInternalServerErrorException.NOSERVICE);
+
+ @OPTIONS
+ public Response handleOptions() throws ODataException {
+ // RFC 2616, 5.1.1: "An origin server SHOULD return the status code [...]
+ // 501 (Not Implemented) if the method is unrecognized or not implemented
+ // by the origin server."
+ return returnNotImplementedResponse(ODataNotImplementedException.COMMON);
+ }
+
+ @HEAD
+ public Response handleHead() throws ODataException {
+ return handleGet();
}
- service.getProcessor().setContext(context);
- context.setService(service);
- ODataRequestHandler requestHandler = new ODataRequestHandler(serviceFactory, service, context);
+ private Response handle(final ODataHttpMethod method) throws ODataException {
+ request = ODataRequest.fromRequest(request)
+ .method(method)
+ .build();
- final ODataResponse odataResponse = requestHandler.handle(request);
- final Response response = RestUtil.convertResponse(odataResponse);
+ ODataContextImpl context = new ODataContextImpl(request, serviceFactory);
+ context.setParameter(ODataContext.HTTP_SERVLET_REQUEST_OBJECT, httpRequest);
- return response;
- }
+ ODataService service = serviceFactory.createService(context);
+ if (service == null) {
+ return returnNoServiceResponse(ODataInternalServerErrorException.NOSERVICE);
+ }
+ service.getProcessor()
+ .setContext(context);
+ context.setService(service);
+ ODataRequestHandler requestHandler = new ODataRequestHandler(serviceFactory, service, context);
+ final ODataResponse odataResponse = requestHandler.handle(request);
+ return RestUtil.convertResponse(odataResponse);
+ }
- public static ODataSubLocator create(final SubLocatorParameter param) throws ODataException {
- ODataSubLocator subLocator = new ODataSubLocator();
- subLocator.serviceFactory = param.getServiceFactory();
- subLocator.request = ODataRequest.acceptableLanguages(param.getHttpHeaders().getAcceptableLanguages())
- .httpMethod(param.getServletRequest().getMethod())
- .acceptHeaders(RestUtil.extractAcceptHeaders(param))
- .body(RestUtil.contentAsStream(RestUtil.extractRequestContent(param)))
- .pathInfo(RestUtil.buildODataPathInfo(param))
- .allQueryParameters(param.getUriInfo().getQueryParameters())
- .requestHeaders(param.getHttpHeaders().getRequestHeaders())
- .contentType(RestUtil.extractRequestContentType(param).toContentTypeString())
- .build();
- subLocator.httpRequest = param.getServletRequest();
+ public static ODataSubLocator create(final SubLocatorParameter param) throws ODataException {
+ ODataSubLocator subLocator = new ODataSubLocator();
- return subLocator;
- }
+ subLocator.serviceFactory = param.getServiceFactory();
+ subLocator.request = ODataRequest.acceptableLanguages(param.getHttpHeaders()
+ .getAcceptableLanguages())
+ .httpMethod(param.getServletRequest()
+ .getMethod())
+ .acceptHeaders(RestUtil.extractAcceptHeaders(param))
+ .body(RestUtil.contentAsStream(RestUtil.extractRequestContent(param)))
+ .pathInfo(RestUtil.buildODataPathInfo(param))
+ .allQueryParameters(param.getUriInfo()
+ .getQueryParameters())
+ .requestHeaders(param.getHttpHeaders()
+ .getRequestHeaders())
+ .contentType(RestUtil.extractRequestContentType(param)
+ .toContentTypeString())
+ .build();
+
+ subLocator.httpRequest = param.getServletRequest();
+
+ return subLocator;
+ }
- private ODataSubLocator() {
- super();
- }
+ private ODataSubLocator() {}
}
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/PATCH.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/PATCH.java
index 00554c04..b85c74ca 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/PATCH.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/PATCH.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.ws.rs.HttpMethod;
+import jakarta.ws.rs.HttpMethod;
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java
index b17d5a95..6e0d95a1 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java
@@ -33,11 +33,11 @@ import java.util.Map;
import jakarta.servlet.ServletInputStream;
import jakarta.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
import org.apache.olingo.odata2.api.exception.ODataBadRequestException;
@@ -93,7 +93,7 @@ public class RestUtil {
* @param headers JAX-RS header map
* @return header value or null
*/
- private static String getSafeHeader(final String name, final javax.ws.rs.core.HttpHeaders headers) {
+ private static String getSafeHeader(final String name, final jakarta.ws.rs.core.HttpHeaders headers) {
List<String> header = headers.getRequestHeader(name);
if (header != null && !header.isEmpty()) {
return header.get(0);
@@ -172,7 +172,7 @@ public class RestUtil {
return toSort;
}
- public static Map<String, String> extractRequestHeaders(final javax.ws.rs.core.HttpHeaders httpHeaders) {
+ public static Map<String, String> extractRequestHeaders(final jakarta.ws.rs.core.HttpHeaders httpHeaders) {
final MultivaluedMap<String, String> headers = httpHeaders.getRequestHeaders();
Map<String, String> headerMap = new HashMap<String, String>();
@@ -198,8 +198,8 @@ public class RestUtil {
private static PathInfoImpl splitPath(final SubLocatorParameter param) throws ODataException {
PathInfoImpl pathInfo = new PathInfoImpl();
- List<javax.ws.rs.core.PathSegment> precedingPathSegments;
- List<javax.ws.rs.core.PathSegment> pathSegments;
+ List<jakarta.ws.rs.core.PathSegment> precedingPathSegments;
+ List<jakarta.ws.rs.core.PathSegment> pathSegments;
if (param.getPathSplit() == 0) {
precedingPathSegments = Collections.emptyList();
@@ -219,7 +219,7 @@ public class RestUtil {
pathInfo.setPrecedingPathSegment(convertPathSegmentList(precedingPathSegments));
List<PathSegment> odataSegments = new ArrayList<PathSegment>();
- for (final javax.ws.rs.core.PathSegment segment : pathSegments) {
+ for (final jakarta.ws.rs.core.PathSegment segment : pathSegments) {
if (segment.getMatrixParameters() == null || segment.getMatrixParameters().isEmpty()) {
odataSegments.add(new ODataPathSegmentImpl(segment.getPath(), null));
} else {
@@ -280,9 +280,9 @@ public class RestUtil {
return requestUri;
}
- private static List<PathSegment> convertPathSegmentList(final List<javax.ws.rs.core.PathSegment> pathSegments) {
+ private static List<PathSegment> convertPathSegmentList(final List<jakarta.ws.rs.core.PathSegment> pathSegments) {
ArrayList<PathSegment> converted = new ArrayList<PathSegment>();
- for (final javax.ws.rs.core.PathSegment pathSegment : pathSegments) {
+ for (final jakarta.ws.rs.core.PathSegment pathSegment : pathSegments) {
final PathSegment segment =
new ODataPathSegmentImpl(Decoder.decode(pathSegment.getPath()), pathSegment.getMatrixParameters());
converted.add(segment);
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java
index 53cce590..964028de 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.core.rest;
import java.util.List;
import jakarta.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Request;
+import jakarta.ws.rs.core.Request;
import org.apache.olingo.odata2.api.ODataServiceFactory;
@@ -30,9 +30,9 @@ import org.apache.olingo.odata2.api.ODataServiceFactory;
*/
public class SubLocatorParameter {
- private List<javax.ws.rs.core.PathSegment> pathSegments;
- private javax.ws.rs.core.HttpHeaders httpHeaders;
- private javax.ws.rs.core.UriInfo uriInfo;
+ private List<jakarta.ws.rs.core.PathSegment> pathSegments;
+ private jakarta.ws.rs.core.HttpHeaders httpHeaders;
+ private jakarta.ws.rs.core.UriInfo uriInfo;
private Request request;
private int pathSplit;
private ODataServiceFactory serviceFactory;
@@ -46,27 +46,27 @@ public class SubLocatorParameter {
this.serviceFactory = serviceFactory;
}
- public List<javax.ws.rs.core.PathSegment> getPathSegments() {
+ public List<jakarta.ws.rs.core.PathSegment> getPathSegments() {
return pathSegments;
}
- public void setPathSegments(final List<javax.ws.rs.core.PathSegment> pathSegments) {
+ public void setPathSegments(final List<jakarta.ws.rs.core.PathSegment> pathSegments) {
this.pathSegments = pathSegments;
}
- public javax.ws.rs.core.HttpHeaders getHttpHeaders() {
+ public jakarta.ws.rs.core.HttpHeaders getHttpHeaders() {
return httpHeaders;
}
- public void setHttpHeaders(final javax.ws.rs.core.HttpHeaders httpHeaders) {
+ public void setHttpHeaders(final jakarta.ws.rs.core.HttpHeaders httpHeaders) {
this.httpHeaders = httpHeaders;
}
- public javax.ws.rs.core.UriInfo getUriInfo() {
+ public jakarta.ws.rs.core.UriInfo getUriInfo() {
return uriInfo;
}
- public void setUriInfo(final javax.ws.rs.core.UriInfo uriInfo) {
+ public void setUriInfo(final jakarta.ws.rs.core.UriInfo uriInfo) {
this.uriInfo = uriInfo;
}
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/app/ODataApplication.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/app/ODataApplication.java
index 19caec66..09151da5 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/app/ODataApplication.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/app/ODataApplication.java
@@ -26,13 +26,13 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.ext.Provider;
import org.apache.olingo.odata2.core.rest.ODataExceptionMapperImpl;
import org.apache.olingo.odata2.core.rest.ODataRootLocator;
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/LocaleAsserter.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/LocaleAsserter.java
new file mode 100644
index 00000000..6af9c88e
--- /dev/null
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/LocaleAsserter.java
@@ -0,0 +1,16 @@
+package org.apache.olingo.odata2.core;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
+import java.util.Locale;
+
+public class LocaleAsserter {
+
+ public static void assertLocale(Locale actualLocale, Locale expectedLocale) {
+ assertLocale("Unexpected locale", actualLocale, expectedLocale);
+ }
+
+ public static void assertLocale(String errorMessage, Locale actualLocale, Locale expectedLocale) {
+ assertThat(errorMessage, actualLocale.toString(), containsString(expectedLocale.toString()));
+ }
+}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java
index 4af0449e..36c0add9 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java
@@ -31,9 +31,9 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.UriInfo;
import org.apache.olingo.odata2.api.ODataCallback;
import org.apache.olingo.odata2.api.ODataService;
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/ContentTypeTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/ContentTypeTest.java
index 439bb89b..6cc72b04 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/ContentTypeTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/ContentTypeTest.java
@@ -31,7 +31,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.core.commons.ContentType.ODataFormat;
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/XmlHelperTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/XmlHelperTest.java
index 56c184d3..6640e90e 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/XmlHelperTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/XmlHelperTest.java
@@ -20,8 +20,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -30,8 +28,6 @@ import org.apache.olingo.odata2.api.ep.EntityProvider;
import org.apache.olingo.odata2.api.ep.EntityProviderException;
import org.apache.olingo.odata2.api.ep.EntityProviderReadProperties;
import org.apache.olingo.odata2.testutil.mock.MockFacade;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import com.ctc.wstx.exc.WstxParsingException;
@@ -63,39 +59,6 @@ public class XmlHelperTest {
public static String XML_PROCESSING = "<?xml version=\"1.0\"?>" + "<?apache include file=\"somefile.html\" ?>" + "<extract>"
+ " <data>&rules;</data>" + "</extract>";
- private static Object beforeXmlInputFactory;
-
- @BeforeClass
- public static void beforeClass() {
- // CHECKSTYLE:OFF
- System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); // NOSONAR
- //
- beforeXmlInputFactory = replaceXmlInputFactoryInstance(XMLInputFactory.newInstance());
- // CHECKSTYLE:ON
- }
-
- @AfterClass
- public static void afterClass() {
- replaceXmlInputFactoryInstance(beforeXmlInputFactory);
- }
-
- private static Object replaceXmlInputFactoryInstance(Object newInstance) {
- try {
- Field field = XmlHelper.XmlInputFactoryHolder.class.getDeclaredField("INSTANCE");
- field.setAccessible(true);
-
- Field modifiersField = Field.class.getDeclaredField("modifiers");
- modifiersField.setAccessible(true);
- modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-
- Object replaced = field.get(null);
- field.set(null, newInstance);
- return replaced;
- } catch (NoSuchFieldException | IllegalAccessException e) {
- throw new RuntimeException(e);
- }
- }
-
@Test
public void createReader() throws Exception {
InputStream content = new ByteArrayInputStream(XML.getBytes("UTF-8"));
@@ -133,7 +96,6 @@ public class XmlHelperTest {
}
public XMLStreamReader createStreamReaderWithExternalEntitySupport(final InputStream content) throws Exception {
- XMLStreamReader streamReader;
XMLInputFactory factory = XMLInputFactory.newInstance();
factory.setProperty(XMLInputFactory.IS_VALIDATING, false);
factory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java
index c51c6dec..2d79fc09 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.ep;
@@ -23,7 +19,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.net.URI;
@@ -34,7 +29,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.edm.Edm;
@@ -51,405 +45,397 @@ import org.apache.olingo.odata2.api.ep.feed.ODataDeltaFeed;
import org.apache.olingo.odata2.api.ep.feed.ODataFeed;
import org.apache.olingo.odata2.api.processor.ODataErrorContext;
import org.apache.olingo.odata2.api.processor.ODataResponse;
+import org.apache.olingo.odata2.core.LocaleAsserter;
import org.apache.olingo.odata2.core.commons.ContentType;
import org.apache.olingo.odata2.core.edm.EdmDateTimeOffset;
import org.apache.olingo.odata2.core.ep.consumer.AbstractConsumerTest;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.apache.olingo.odata2.testutil.mock.MockFacade;
import org.junit.Test;
-
import junit.framework.Assert;
/**
- *
+ *
*/
public class ProviderFacadeImplTest extends AbstractConsumerTest {
- private static final String EMPLOYEE_1_XML =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<entry xmlns=\"" + Edm.NAMESPACE_ATOM_2005 + "\"" +
- " xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\"" +
- " xmlns:d=\"" + Edm.NAMESPACE_D_2007_08 + "\"" +
- " xml:base=\"https://some.host.com/some.service.root.segment/ReferenceScenario.svc/\">" +
- "<id>https://some.host.com/some.service.root.segment/ReferenceScenario.svc/Employees('1')</id>" +
- "<title type=\"text\">Walter Winter</title>" +
- "<updated>1999-01-01T00:00:00Z</updated>" +
- "<category term=\"RefScenario.Employee\" scheme=\"" + Edm.NAMESPACE_SCHEME_2007_08 + "\"/>" +
- "<link href=\"Employees('1')\" rel=\"edit\" title=\"Employee\"/>" +
- "<link href=\"Employees('1')/$value\" rel=\"edit-media\" type=\"application/octet-stream\"/>" +
- "<link href=\"Employees('1')/ne_Room\" rel=\"" + Edm.NAMESPACE_REL_2007_08
- + "ne_Room\" type=\"application/atom+xml; type=entry\" title=\"ne_Room\"/>" +
- "<link href=\"Employees('1')/ne_Manager\" rel=\"" + Edm.NAMESPACE_REL_2007_08
- + "ne_Manager\" type=\"application/atom+xml; type=entry\" title=\"ne_Manager\"/>" +
- "<link href=\"Employees('1')/ne_Team\" rel=\"" + Edm.NAMESPACE_REL_2007_08
- + "ne_Team\" type=\"application/atom+xml; type=entry\" title=\"ne_Team\"/>" +
- "<content type=\"application/octet-stream\" src=\"Employees('1')/$value\"/>" +
- "<m:properties>" +
- "<d:EmployeeId>1</d:EmployeeId>" +
- "<d:EmployeeName>Walter Winter</d:EmployeeName>" +
- "<d:ManagerId>1</d:ManagerId>" +
- "<d:RoomId>1</d:RoomId>" +
- "<d:TeamId>1</d:TeamId>" +
- "<d:Location m:type=\"RefScenario.c_Location\">" +
- "<d:Country>Germany</d:Country>" +
- "<d:City m:type=\"RefScenario.c_City\">" +
- "<d:PostalCode>69124</d:PostalCode>" +
- "<d:CityName>Heidelberg</d:CityName>" +
- "</d:City>" +
- "</d:Location>" +
- "<d:Age>52</d:Age>" +
- "<d:EntryDate>1999-01-01T00:00:00</d:EntryDate>" +
- "<d:ImageUrl>Employee_1.png</d:ImageUrl>" +
- "</m:properties>" +
- "</entry>";
-
- @Test
- public void readDeltaFeed() throws Exception {
-
- final String contentType = ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString();
- final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
- InputStream content = getFileAsStream("feed_with_deleted_entries.xml");
- EntityProviderReadProperties properties = EntityProviderReadProperties.init().build();
-
- ODataDeltaFeed deltaFeed = new ProviderFacadeImpl().readDeltaFeed(contentType, entitySet, content, properties);
- assertNotNull(deltaFeed);
- assertNotNull(deltaFeed.getEntries());
- assertNotNull(deltaFeed.getFeedMetadata());
- assertEquals(1, deltaFeed.getEntries().size());
- assertEquals(1, deltaFeed.getDeletedEntries().size());
- assertEquals("http://host:123/odata/Rooms?$skiptoken=97", deltaFeed.getFeedMetadata().getDeltaLink());
- assertEquals("http://host:123/odata/Rooms('2')", deltaFeed.getDeletedEntries().get(0).getUri());
-
- Date when =
- EdmDateTimeOffset.getInstance().valueOfString("2014-01-14T18:11:06.682+01:00", EdmLiteralKind.DEFAULT, null,
- Date.class);
- assertEquals(when, deltaFeed.getDeletedEntries().get(0).getWhen());
- }
-
- @Test
- public void readFeed() throws Exception {
- final String contentType = ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString();
- final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
- InputStream content = getFileAsStream("feed_employees.xml");
- EntityProviderReadProperties properties = EntityProviderReadProperties.init().build();
-
- ODataFeed feed = new ProviderFacadeImpl().readFeed(contentType, entitySet, content, properties);
- assertNotNull(feed);
- assertNotNull(feed.getEntries());
- assertNotNull(feed.getFeedMetadata());
- assertEquals(6, feed.getEntries().size());
- }
-
- @Test
- public void readEntry() throws Exception {
- final String contentType = ContentType.APPLICATION_ATOM_XML_ENTRY.toContentTypeString();
- final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
- InputStream content = new ByteArrayInputStream(EMPLOYEE_1_XML.getBytes("UTF-8"));
-
- final ODataEntry result =
- new ProviderFacadeImpl().readEntry(contentType, entitySet, content, EntityProviderReadProperties.init()
- .mergeSemantic(true).build());
- assertNotNull(result);
- assertFalse(result.containsInlineEntry());
- assertNotNull(result.getExpandSelectTree());
- assertTrue(result.getExpandSelectTree().isAll());
- assertNotNull(result.getMetadata());
- assertNull(result.getMetadata().getEtag());
- assertNotNull(result.getMediaMetadata());
- assertEquals(HttpContentType.APPLICATION_OCTET_STREAM, result.getMediaMetadata().getContentType());
- assertNotNull(result.getProperties());
- assertEquals(52, result.getProperties().get("Age"));
- }
-
- @Test
- public void readDeltaFeedJson() throws Exception {
-
- final String contentType = ContentType.APPLICATION_JSON.toContentTypeString();
- final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
- InputStream content = getFileAsStream("JsonWithDeletedEntries.json");
- EntityProviderReadProperties properties = EntityProviderReadProperties.init().build();
-
- ODataDeltaFeed deltaFeed = new ProviderFacadeImpl().readDeltaFeed(contentType, entitySet, content, properties);
- assertNotNull(deltaFeed);
- assertNotNull(deltaFeed.getEntries());
- assertNotNull(deltaFeed.getFeedMetadata());
- assertEquals(1, deltaFeed.getEntries().size());
- assertEquals("http://localhost:8080/ReferenceScenario.svc/Rooms?!deltatoken=4711",
- deltaFeed.getFeedMetadata().getDeltaLink());
-
- assertEquals(2, deltaFeed.getDeletedEntries().size());
- List<DeletedEntryMetadata> deletedEntries = deltaFeed.getDeletedEntries();
- assertEquals(2, deletedEntries.size());
- for (DeletedEntryMetadata deletedEntry : deletedEntries) {
- String uri = deletedEntry.getUri();
- if (uri.contains("Rooms('4')")) {
- assertEquals("http://host:80/service/Rooms('4')", deletedEntry.getUri());
- assertEquals(new Date(3509636760000l), deletedEntry.getWhen());
- } else if (uri.contains("Rooms('3')")) {
- assertEquals("http://host:80/service/Rooms('3')", deletedEntry.getUri());
- assertEquals(new Date(1300561560000l), deletedEntry.getWhen());
- } else {
- Assert.fail("Found unknown DeletedEntry with value: " + deletedEntry);
- }
+ private static final String EMPLOYEE_1_XML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<entry xmlns=\"" + Edm.NAMESPACE_ATOM_2005
+ + "\"" + " xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\"" + " xmlns:d=\"" + Edm.NAMESPACE_D_2007_08 + "\""
+ + " xml:base=\"https://some.host.com/some.service.root.segment/ReferenceScenario.svc/\">"
+ + "<id>https://some.host.com/some.service.root.segment/ReferenceScenario.svc/Employees('1')</id>"
+ + "<title type=\"text\">Walter Winter</title>" + "<updated>1999-01-01T00:00:00Z</updated>"
+ + "<category term=\"RefScenario.Employee\" scheme=\"" + Edm.NAMESPACE_SCHEME_2007_08 + "\"/>"
+ + "<link href=\"Employees('1')\" rel=\"edit\" title=\"Employee\"/>"
+ + "<link href=\"Employees('1')/$value\" rel=\"edit-media\" type=\"application/octet-stream\"/>"
+ + "<link href=\"Employees('1')/ne_Room\" rel=\"" + Edm.NAMESPACE_REL_2007_08
+ + "ne_Room\" type=\"application/atom+xml; type=entry\" title=\"ne_Room\"/>" + "<link href=\"Employees('1')/ne_Manager\" rel=\""
+ + Edm.NAMESPACE_REL_2007_08 + "ne_Manager\" type=\"application/atom+xml; type=entry\" title=\"ne_Manager\"/>"
+ + "<link href=\"Employees('1')/ne_Team\" rel=\"" + Edm.NAMESPACE_REL_2007_08
+ + "ne_Team\" type=\"application/atom+xml; type=entry\" title=\"ne_Team\"/>"
+ + "<content type=\"application/octet-stream\" src=\"Employees('1')/$value\"/>" + "<m:properties>"
+ + "<d:EmployeeId>1</d:EmployeeId>" + "<d:EmployeeName>Walter Winter</d:EmployeeName>" + "<d:ManagerId>1</d:ManagerId>"
+ + "<d:RoomId>1</d:RoomId>" + "<d:TeamId>1</d:TeamId>" + "<d:Location m:type=\"RefScenario.c_Location\">"
+ + "<d:Country>Germany</d:Country>" + "<d:City m:type=\"RefScenario.c_City\">" + "<d:PostalCode>69124</d:PostalCode>"
+ + "<d:CityName>Heidelberg</d:CityName>" + "</d:City>" + "</d:Location>" + "<d:Age>52</d:Age>"
+ + "<d:EntryDate>1999-01-01T00:00:00</d:EntryDate>" + "<d:ImageUrl>Employee_1.png</d:ImageUrl>" + "</m:properties>" + "</entry>";
+
+ @Test
+ public void readDeltaFeed() throws Exception {
+
+ final String contentType = ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString();
+ final EdmEntitySet entitySet = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getEntitySet("Rooms");
+ InputStream content = getFileAsStream("feed_with_deleted_entries.xml");
+ EntityProviderReadProperties properties = EntityProviderReadProperties.init()
+ .build();
+
+ ODataDeltaFeed deltaFeed = new ProviderFacadeImpl().readDeltaFeed(contentType, entitySet, content, properties);
+ assertNotNull(deltaFeed);
+ assertNotNull(deltaFeed.getEntries());
+ assertNotNull(deltaFeed.getFeedMetadata());
+ assertEquals(1, deltaFeed.getEntries()
+ .size());
+ assertEquals(1, deltaFeed.getDeletedEntries()
+ .size());
+ assertEquals("http://host:123/odata/Rooms?$skiptoken=97", deltaFeed.getFeedMetadata()
+ .getDeltaLink());
+ assertEquals("http://host:123/odata/Rooms('2')", deltaFeed.getDeletedEntries()
+ .get(0)
+ .getUri());
+
+ Date when = EdmDateTimeOffset.getInstance()
+ .valueOfString("2014-01-14T18:11:06.682+01:00", EdmLiteralKind.DEFAULT, null, Date.class);
+ assertEquals(when, deltaFeed.getDeletedEntries()
+ .get(0)
+ .getWhen());
+ }
+
+ @Test
+ public void readFeed() throws Exception {
+ final String contentType = ContentType.APPLICATION_ATOM_XML_FEED.toContentTypeString();
+ final EdmEntitySet entitySet = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getEntitySet("Employees");
+ InputStream content = getFileAsStream("feed_employees.xml");
+ EntityProviderReadProperties properties = EntityProviderReadProperties.init()
+ .build();
+
+ ODataFeed feed = new ProviderFacadeImpl().readFeed(contentType, entitySet, content, properties);
+ assertNotNull(feed);
+ assertNotNull(feed.getEntries());
+ assertNotNull(feed.getFeedMetadata());
+ assertEquals(6, feed.getEntries()
+ .size());
+ }
+
+ @Test
+ public void readEntry() throws Exception {
+ final String contentType = ContentType.APPLICATION_ATOM_XML_ENTRY.toContentTypeString();
+ final EdmEntitySet entitySet = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getEntitySet("Employees");
+ InputStream content = new ByteArrayInputStream(EMPLOYEE_1_XML.getBytes("UTF-8"));
+
+ final ODataEntry result = new ProviderFacadeImpl().readEntry(contentType, entitySet, content, EntityProviderReadProperties.init()
+ .mergeSemantic(
+ true)
+ .build());
+ assertNotNull(result);
+ assertFalse(result.containsInlineEntry());
+ assertNotNull(result.getExpandSelectTree());
+ assertTrue(result.getExpandSelectTree()
+ .isAll());
+ assertNotNull(result.getMetadata());
+ assertNull(result.getMetadata()
+ .getEtag());
+ assertNotNull(result.getMediaMetadata());
+ assertEquals(HttpContentType.APPLICATION_OCTET_STREAM, result.getMediaMetadata()
+ .getContentType());
+ assertNotNull(result.getProperties());
+ assertEquals(52, result.getProperties()
+ .get("Age"));
+ }
+
+ @Test
+ public void readDeltaFeedJson() throws Exception {
+
+ final String contentType = ContentType.APPLICATION_JSON.toContentTypeString();
+ final EdmEntitySet entitySet = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getEntitySet("Rooms");
+ InputStream content = getFileAsStream("JsonWithDeletedEntries.json");
+ EntityProviderReadProperties properties = EntityProviderReadProperties.init()
+ .build();
+
+ ODataDeltaFeed deltaFeed = new ProviderFacadeImpl().readDeltaFeed(contentType, entitySet, content, properties);
+ assertNotNull(deltaFeed);
+ assertNotNull(deltaFeed.getEntries());
+ assertNotNull(deltaFeed.getFeedMetadata());
+ assertEquals(1, deltaFeed.getEntries()
+ .size());
+ assertEquals("http://localhost:8080/ReferenceScenario.svc/Rooms?!deltatoken=4711", deltaFeed.getFeedMetadata()
+ .getDeltaLink());
+
+ assertEquals(2, deltaFeed.getDeletedEntries()
+ .size());
+ List<DeletedEntryMetadata> deletedEntries = deltaFeed.getDeletedEntries();
+ assertEquals(2, deletedEntries.size());
+ for (DeletedEntryMetadata deletedEntry : deletedEntries) {
+ String uri = deletedEntry.getUri();
+ if (uri.contains("Rooms('4')")) {
+ assertEquals("http://host:80/service/Rooms('4')", deletedEntry.getUri());
+ assertEquals(new Date(3509636760000l), deletedEntry.getWhen());
+ } else if (uri.contains("Rooms('3')")) {
+ assertEquals("http://host:80/service/Rooms('3')", deletedEntry.getUri());
+ assertEquals(new Date(1300561560000l), deletedEntry.getWhen());
+ } else {
+ Assert.fail("Found unknown DeletedEntry with value: " + deletedEntry);
+ }
+ }
+ }
+
+ @Test
+ public void readPropertyValue() throws Exception {
+ final EdmProperty property = (EdmProperty) MockFacade.getMockEdm()
+ .getEntityType("RefScenario", "Employee")
+ .getProperty("EntryDate");
+ InputStream content = new ByteArrayInputStream("2012-02-29T01:02:03".getBytes("UTF-8"));
+ final Object result = new ProviderFacadeImpl().readPropertyValue(property, content, Long.class);
+ assertEquals(1330477323000L, result);
+ }
+
+ @Test
+ public void readProperty() throws Exception {
+ final EdmProperty property = (EdmProperty) MockFacade.getMockEdm()
+ .getEntityType("RefScenario", "Employee")
+ .getProperty("Age");
+ final String xml = "<Age xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">42</Age>";
+ InputStream content = new ByteArrayInputStream(xml.getBytes("UTF-8"));
+ final Map<String, Object> result = new ProviderFacadeImpl().readProperty(HttpContentType.APPLICATION_XML, property, content,
+ EntityProviderReadProperties.init()
+ .build());
+ assertFalse(result.isEmpty());
+ assertEquals(42, result.get("Age"));
+ }
+
+ @Test
+ public void readFunctionImport() throws Exception {
+ final EdmFunctionImport functionImport = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getFunctionImport("MaximalAge");
+ InputStream content = new ByteArrayInputStream("{\"d\":{\"MaximalAge\":42}}".getBytes("UTF-8"));
+ final Object result = new ProviderFacadeImpl().readFunctionImport(HttpContentType.APPLICATION_JSON, functionImport, content,
+ EntityProviderReadProperties.init()
+ .build());
+ assertEquals((short) 42, result);
+ }
+
+ @Test
+ public void readMultipleEntityFunctionImport() throws Exception {
+ final EdmFunctionImport functionImport = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getFunctionImport("EmployeeSearch");
+ InputStream content =
+ new ByteArrayInputStream(("{\"d\": {" + "\"results\": [{" + "\"__metadata\": {" + "\"type\": \"RefScenario.Employee\","
+ + "\"content_type\": \"image/jpeg\","
+ + "\"media_src\":\"http://localhost:19000/abc/FunctionImportJsonTest/Employees('3')/$value\","
+ + "\"edit_media\":\"http://localhost:19000/abc/FunctionImportJsonTest/Employees('3')/$value\"" + "},"
+ + "\"EmployeeId\": \"3\"," + "\"EmployeeName\": \"Jonathan Smith\"," + "\"ManagerId\": \"1\","
+ + "\"RoomId\": \"2\"," + "\"TeamId\": \"1\"," + "\"Location\": {" + "\"__metadata\": {"
+ + "\"type\": \"RefScenario.c_Location\"" + "}," + "\"City\": {" + "\"__metadata\": {"
+ + "\"type\": \"RefScenario.c_City\"" + "}," + "\"PostalCode\": \"69190\"," + "\"CityName\": \"Walldorf\"" + "},"
+ + "\"Country\": \"Germany\"" + "}," + "\"Age\": 56," + "\"EntryDate\": null,"
+ + "\"ImageUrl\": \"Employees('3')/$value\"," + "\"ne_Manager\": {" + "\"__deferred\": {"
+ + "\"uri\": \"http://localhost:19000/abc/FunctionImportJsonTest/Employees('3')/ne_Manager\"" + "}" + "},"
+ + "\"ne_Team\": {" + "\"__deferred\": {"
+ + "\"uri\": \"http://localhost:19000/abc/FunctionImportJsonTest/Employees('3')/ne_Team\"" + "}" + "},"
+ + "\"ne_Room\": {" + "\"__deferred\": {"
+ + "\"uri\": \"http://localhost:19000/abc/FunctionImportJsonTest/Employees('3')/ne_Room\"" + "}" + "}" + "}]" + "}"
+ + "}").getBytes("UTF-8"));
+ final Object result = new ProviderFacadeImpl().readFunctionImport(HttpContentType.APPLICATION_JSON, functionImport, content,
+ EntityProviderReadProperties.init()
+ .build());
+ ODataDeltaFeed feed = (ODataDeltaFeed) result;
+ List<ODataEntry> entries = feed.getEntries();
+ int size = entries.size();
+ assertEquals(1, size);
+ String id = (String) entries.get(0)
+ .getProperties()
+ .get("EmployeeId");
+ assertEquals("3", id);
+ }
+
+ @Test
+ public void readLink() throws Exception {
+ final EdmEntitySet entitySet = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getEntitySet("Rooms");
+ InputStream content = new ByteArrayInputStream("{\"d\":{\"uri\":\"http://somelink\"}}".getBytes("UTF-8"));
+ final String result = new ProviderFacadeImpl().readLink(HttpContentType.APPLICATION_JSON, entitySet, content);
+ assertEquals("http://somelink", result);
+ }
+
+ @Test
+ public void readLinks() throws Exception {
+ final EdmEntitySet entitySet = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getEntitySet("Rooms");
+ InputStream content =
+ new ByteArrayInputStream("{\"d\":{\"__count\":\"42\",\"results\":[{\"uri\":\"http://somelink\"}]}}".getBytes("UTF-8"));
+ final List<String> result = new ProviderFacadeImpl().readLinks(HttpContentType.APPLICATION_JSON, entitySet, content);
+ assertEquals(Arrays.asList("http://somelink"), result);
+ }
+
+ @Test
+ public void readErrorDocumentJson() throws EntityProviderException {
+ ProviderFacadeImpl providerFacade = new ProviderFacadeImpl();
+ String errorDoc = "{\"error\":{\"code\":\"ErrorCode\",\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
+ ODataErrorContext errorContext =
+ providerFacade.readErrorDocument(StringHelper.encapsulate(errorDoc), ContentType.APPLICATION_JSON.toContentTypeString());
+ //
+ assertEquals("Wrong content type", "application/json", errorContext.getContentType());
+ assertEquals("Wrong message", "Message", errorContext.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", errorContext.getErrorCode());
+ LocaleAsserter.assertLocale("Wrong locale for lang", errorContext.getLocale(), Locale.US);
+ }
+
+ @Test
+ public void readErrorDocumentXml() throws EntityProviderException {
+ ProviderFacadeImpl providerFacade = new ProviderFacadeImpl();
+ String errorDoc = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:lang=\"en-US\">Message</message>\n" + "</error>";
+ ODataErrorContext errorContext =
+ providerFacade.readErrorDocument(StringHelper.encapsulate(errorDoc), ContentType.APPLICATION_XML.toContentTypeString());
+ //
+ assertEquals("Wrong content type", "application/xml", errorContext.getContentType());
+ assertEquals("Wrong message", "Message", errorContext.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", errorContext.getErrorCode());
+ LocaleAsserter.assertLocale("Wrong locale for lang", errorContext.getLocale(), Locale.US);
+ }
+
+ @Test
+ public void writeFeed() throws Exception {
+ final EdmEntitySet entitySet = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getEntitySet("Rooms");
+ List<Map<String, Object>> propertiesList = new ArrayList<Map<String, Object>>();
+ final ODataResponse result = new ProviderFacadeImpl().writeFeed(HttpContentType.APPLICATION_JSON, entitySet, propertiesList,
+ EntityProviderWriteProperties.serviceRoot(URI.create("http://root/"))
+ .build());
+ assertEquals("{\"d\":{\"results\":[]}}", StringHelper.inputStreamToString((InputStream) result.getEntity()));
+ }
+
+ @Test
+ public void writeEntry() throws Exception {
+ final EdmEntitySet entitySet = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getEntitySet("Teams");
+ Map<String, Object> properties = new HashMap<String, Object>();
+ properties.put("Id", "42");
+ final ODataResponse result = new ProviderFacadeImpl().writeEntry(HttpContentType.APPLICATION_JSON, entitySet, properties,
+ EntityProviderWriteProperties.serviceRoot(URI.create("http://root/"))
+ .build());
+ assertEquals(
+ "{\"d\":{\"__metadata\":{\"id\":\"http://root/Teams('42')\","
+ + "\"uri\":\"http://root/Teams('42')\",\"type\":\"RefScenario.Team\"},"
+ + "\"Id\":\"42\",\"Name\":null,\"isScrumTeam\":null,"
+ + "\"nt_Employees\":{\"__deferred\":{\"uri\":\"http://root/Teams('42')/nt_Employees\"}}}}",
+ StringHelper.inputStreamToString((InputStream) result.getEntity()));
+ }
+
+ @Test
+ public void writeProperty() throws Exception {
+ final EdmProperty property = (EdmProperty) MockFacade.getMockEdm()
+ .getEntityType("RefScenario", "Employee")
+ .getProperty("EntryDate");
+ final ODataResponse result = new ProviderFacadeImpl().writeProperty(HttpContentType.APPLICATION_XML, property, 987654321000L);
+ assertNull("EntityProvider should not set content header", result.getContentHeader());
+ assertTrue(StringHelper.inputStreamToString((InputStream) result.getEntity())
+ .endsWith("\">2001-04-19T04:25:21</EntryDate>"));
+ }
+
+ @Test
+ public void writeLink() throws Exception {
+ final EdmEntitySet entitySet = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getEntitySet("Rooms");
+ Map<String, Object> properties = new HashMap<String, Object>();
+ properties.put("Id", "42");
+ final ODataResponse result = new ProviderFacadeImpl().writeLink(HttpContentType.APPLICATION_JSON, entitySet, properties,
+ EntityProviderWriteProperties.serviceRoot(URI.create("http://root/"))
+ .build());
+ assertEquals("{\"d\":{\"uri\":\"http://root/Rooms('42')\"}}", StringHelper.inputStreamToString((InputStream) result.getEntity()));
+ }
+
+ @Test
+ public void writeLinks() throws Exception {
+ final EdmEntitySet entitySet = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getEntitySet("Rooms");
+ Map<String, Object> properties = new HashMap<String, Object>();
+ properties.put("Id", "42");
+ List<Map<String, Object>> propertiesList = new ArrayList<Map<String, Object>>();
+ propertiesList.add(properties);
+ propertiesList.add(properties);
+ final ODataResponse result = new ProviderFacadeImpl().writeLinks(HttpContentType.APPLICATION_JSON, entitySet, propertiesList,
+ EntityProviderWriteProperties.serviceRoot(URI.create("http://root/"))
+ .build());
+ assertEquals("{\"d\":[{\"uri\":\"http://root/Rooms('42')\"},{\"uri\":\"http://root/Rooms('42')\"}]}",
+ StringHelper.inputStreamToString((InputStream) result.getEntity()));
+ }
+
+ @Test
+ public void writeServiceDocument() throws Exception {
+ final ODataResponse result =
+ new ProviderFacadeImpl().writeServiceDocument(HttpContentType.APPLICATION_JSON, MockFacade.getMockEdm(), "root");
+ assertEquals("{\"d\":{\"EntitySets\":[]}}", StringHelper.inputStreamToString((InputStream) result.getEntity()));
+ }
+
+ @Test
+ public void writePropertyValue() throws Exception {
+ final EdmProperty property = (EdmProperty) MockFacade.getMockEdm()
+ .getEntityType("RefScenario", "Employee")
+ .getProperty("EntryDate");
+ final ODataResponse result = new ProviderFacadeImpl().writePropertyValue(property, 987654321000L);
+ assertNull("BasicProvider should not set content header", result.getContentHeader());
+
+ assertEquals("2001-04-19T04:25:21", StringHelper.inputStreamToString((InputStream) result.getEntity()));
+ }
+
+ @Test
+ public void writeText() throws Exception {
+ final ODataResponse result = new ProviderFacadeImpl().writeText("test");
+ assertNull("BasicProvider should not set content header", result.getContentHeader());
+ assertEquals("test", StringHelper.inputStreamToString((InputStream) result.getEntity()));
+ }
+
+ @Test
+ public void writeBinary() throws Exception {
+ final ODataResponse result =
+ new ProviderFacadeImpl().writeBinary(HttpContentType.APPLICATION_OCTET_STREAM, new byte[] {102, 111, 111});
+ assertEquals(HttpContentType.APPLICATION_OCTET_STREAM, result.getContentHeader());
+ assertEquals("foo", StringHelper.inputStreamToString((InputStream) result.getEntity()));
+ }
+
+ @Test
+ public void writeBinaryNoContent() throws Exception {
+ final ODataResponse result = new ProviderFacadeImpl().writeBinary(HttpContentType.APPLICATION_OCTET_STREAM, null);
+ assertNull(result.getEntity());
+ assertNull(result.getContentHeader());
+ assertEquals(HttpStatusCodes.NO_CONTENT, result.getStatus());
+ }
+
+ @Test
+ public void writeFunctionImport() throws Exception {
+ final EdmFunctionImport function = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getFunctionImport("MaximalAge");
+ Map<String, Object> properties = new HashMap<String, Object>();
+ properties.put("MaximalAge", 99);
+ final ODataResponse result =
+ new ProviderFacadeImpl().writeFunctionImport(HttpContentType.APPLICATION_JSON, function, properties, null);
+ assertEquals("{\"d\":{\"MaximalAge\":99}}", StringHelper.inputStreamToString((InputStream) result.getEntity()));
}
- }
-
- @Test
- public void readPropertyValue() throws Exception {
- final EdmProperty property =
- (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
- InputStream content = new ByteArrayInputStream("2012-02-29T01:02:03".getBytes("UTF-8"));
- final Object result = new ProviderFacadeImpl().readPropertyValue(property, content, Long.class);
- assertEquals(1330477323000L, result);
- }
-
- @Test
- public void readProperty() throws Exception {
- final EdmProperty property =
- (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("Age");
- final String xml = "<Age xmlns=\"" + Edm.NAMESPACE_D_2007_08 + "\">42</Age>";
- InputStream content = new ByteArrayInputStream(xml.getBytes("UTF-8"));
- final Map<String, Object> result =
- new ProviderFacadeImpl().readProperty(HttpContentType.APPLICATION_XML, property, content,
- EntityProviderReadProperties.init().build());
- assertFalse(result.isEmpty());
- assertEquals(42, result.get("Age"));
- }
-
- @Test
- public void readFunctionImport() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer()
- .getFunctionImport("MaximalAge");
- InputStream content = new ByteArrayInputStream("{\"d\":{\"MaximalAge\":42}}".getBytes("UTF-8"));
- final Object result = new ProviderFacadeImpl().readFunctionImport(HttpContentType.APPLICATION_JSON,
- functionImport, content, EntityProviderReadProperties.init().build());
- assertEquals((short) 42, result);
- }
-
- @Test
- public void readMultipleEntityFunctionImport() throws Exception {
- final EdmFunctionImport functionImport = MockFacade.getMockEdm().getDefaultEntityContainer()
- .getFunctionImport("EmployeeSearch");
- InputStream content = new ByteArrayInputStream(
- ("{\"d\": {"
- + "\"results\": [{"
- + "\"__metadata\": {"
- + "\"type\": \"RefScenario.Employee\","
- + "\"content_type\": \"image/jpeg\","
- + "\"media_src\":\"http://localhost:19000/abc/FunctionImportJsonTest/Employees('3')/$value\","
- + "\"edit_media\":\"http://localhost:19000/abc/FunctionImportJsonTest/Employees('3')/$value\""
- + "},"
- + "\"EmployeeId\": \"3\","
- + "\"EmployeeName\": \"Jonathan Smith\","
- + "\"ManagerId\": \"1\","
- + "\"RoomId\": \"2\","
- + "\"TeamId\": \"1\","
- + "\"Location\": {"
- + "\"__metadata\": {"
- + "\"type\": \"RefScenario.c_Location\""
- + "},"
- + "\"City\": {"
- + "\"__metadata\": {"
- + "\"type\": \"RefScenario.c_City\""
- + "},"
- + "\"PostalCode\": \"69190\","
- + "\"CityName\": \"Walldorf\""
- + "},"
- + "\"Country\": \"Germany\""
- + "},"
- + "\"Age\": 56,"
- + "\"EntryDate\": null,"
- + "\"ImageUrl\": \"Employees('3')/$value\","
- + "\"ne_Manager\": {"
- + "\"__deferred\": {"
- + "\"uri\": \"http://localhost:19000/abc/FunctionImportJsonTest/Employees('3')/ne_Manager\""
- + "}"
- + "},"
- + "\"ne_Team\": {"
- + "\"__deferred\": {"
- + "\"uri\": \"http://localhost:19000/abc/FunctionImportJsonTest/Employees('3')/ne_Team\""
- + "}"
- + "},"
- + "\"ne_Room\": {"
- + "\"__deferred\": {"
- + "\"uri\": \"http://localhost:19000/abc/FunctionImportJsonTest/Employees('3')/ne_Room\""
- + "}"
- + "}"
- + "}]"
- + "}"
- + "}").getBytes("UTF-8"));
- final Object result = new ProviderFacadeImpl().readFunctionImport(HttpContentType.APPLICATION_JSON,
- functionImport, content, EntityProviderReadProperties.init().build());
- ODataDeltaFeed feed = (ODataDeltaFeed) result;
- List<ODataEntry> entries = feed.getEntries();
- int size = entries.size();
- assertEquals(1, size);
- String id = (String) entries.get(0).getProperties().get("EmployeeId");
- assertEquals("3", id);
- }
-
- @Test
- public void readLink() throws Exception {
- final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
- InputStream content = new ByteArrayInputStream("{\"d\":{\"uri\":\"http://somelink\"}}".getBytes("UTF-8"));
- final String result = new ProviderFacadeImpl().readLink(HttpContentType.APPLICATION_JSON, entitySet, content);
- assertEquals("http://somelink", result);
- }
-
- @Test
- public void readLinks() throws Exception {
- final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
- InputStream content =
- new ByteArrayInputStream("{\"d\":{\"__count\":\"42\",\"results\":[{\"uri\":\"http://somelink\"}]}}"
- .getBytes("UTF-8"));
- final List<String> result =
- new ProviderFacadeImpl().readLinks(HttpContentType.APPLICATION_JSON, entitySet, content);
- assertEquals(Arrays.asList("http://somelink"), result);
- }
-
- @Test
- public void readErrorDocumentJson() throws EntityProviderException {
- ProviderFacadeImpl providerFacade = new ProviderFacadeImpl();
- String errorDoc = "{\"error\":{\"code\":\"ErrorCode\",\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
- ODataErrorContext errorContext = providerFacade.readErrorDocument(StringHelper.encapsulate(errorDoc),
- ContentType.APPLICATION_JSON.toContentTypeString());
- //
- assertEquals("Wrong content type", "application/json", errorContext.getContentType());
- assertEquals("Wrong message", "Message", errorContext.getMessage());
- assertEquals("Wrong error code", "ErrorCode", errorContext.getErrorCode());
- assertEquals("Wrong locale for lang", Locale.US, errorContext.getLocale());
- }
-
- @Test
- public void readErrorDocumentXml() throws EntityProviderException {
- ProviderFacadeImpl providerFacade = new ProviderFacadeImpl();
- String errorDoc =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "</error>";
- ODataErrorContext errorContext = providerFacade.readErrorDocument(StringHelper.encapsulate(errorDoc),
- ContentType.APPLICATION_XML.toContentTypeString());
- //
- assertEquals("Wrong content type", "application/xml", errorContext.getContentType());
- assertEquals("Wrong message", "Message", errorContext.getMessage());
- assertEquals("Wrong error code", "ErrorCode", errorContext.getErrorCode());
- assertEquals("Wrong locale for lang", Locale.US, errorContext.getLocale());
- }
-
- @Test
- public void writeFeed() throws Exception {
- final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
- List<Map<String, Object>> propertiesList = new ArrayList<Map<String, Object>>();
- final ODataResponse result =
- new ProviderFacadeImpl().writeFeed(HttpContentType.APPLICATION_JSON, entitySet, propertiesList,
- EntityProviderWriteProperties.serviceRoot(URI.create("http://root/")).build());
- assertEquals("{\"d\":{\"results\":[]}}", StringHelper.inputStreamToString((InputStream) result.getEntity()));
- }
-
- @Test
- public void writeEntry() throws Exception {
- final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Teams");
- Map<String, Object> properties = new HashMap<String, Object>();
- properties.put("Id", "42");
- final ODataResponse result =
- new ProviderFacadeImpl().writeEntry(HttpContentType.APPLICATION_JSON, entitySet, properties,
- EntityProviderWriteProperties.serviceRoot(URI.create("http://root/")).build());
- assertEquals("{\"d\":{\"__metadata\":{\"id\":\"http://root/Teams('42')\","
- + "\"uri\":\"http://root/Teams('42')\",\"type\":\"RefScenario.Team\"},"
- + "\"Id\":\"42\",\"Name\":null,\"isScrumTeam\":null,"
- + "\"nt_Employees\":{\"__deferred\":{\"uri\":\"http://root/Teams('42')/nt_Employees\"}}}}",
- StringHelper.inputStreamToString((InputStream) result.getEntity()));
- }
-
- @Test
- public void writeProperty() throws Exception {
- final EdmProperty property =
- (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
- final ODataResponse result =
- new ProviderFacadeImpl().writeProperty(HttpContentType.APPLICATION_XML, property, 987654321000L);
- assertNull("EntityProvider should not set content header", result.getContentHeader());
- assertTrue(StringHelper.inputStreamToString((InputStream) result.getEntity())
- .endsWith("\">2001-04-19T04:25:21</EntryDate>"));
- }
-
- @Test
- public void writeLink() throws Exception {
- final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
- Map<String, Object> properties = new HashMap<String, Object>();
- properties.put("Id", "42");
- final ODataResponse result =
- new ProviderFacadeImpl().writeLink(HttpContentType.APPLICATION_JSON, entitySet, properties,
- EntityProviderWriteProperties.serviceRoot(URI.create("http://root/")).build());
- assertEquals("{\"d\":{\"uri\":\"http://root/Rooms('42')\"}}",
- StringHelper.inputStreamToString((InputStream) result.getEntity()));
- }
-
- @Test
- public void writeLinks() throws Exception {
- final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
- Map<String, Object> properties = new HashMap<String, Object>();
- properties.put("Id", "42");
- List<Map<String, Object>> propertiesList = new ArrayList<Map<String, Object>>();
- propertiesList.add(properties);
- propertiesList.add(properties);
- final ODataResponse result =
- new ProviderFacadeImpl().writeLinks(HttpContentType.APPLICATION_JSON, entitySet, propertiesList,
- EntityProviderWriteProperties.serviceRoot(URI.create("http://root/")).build());
- assertEquals("{\"d\":[{\"uri\":\"http://root/Rooms('42')\"},{\"uri\":\"http://root/Rooms('42')\"}]}",
- StringHelper.inputStreamToString((InputStream) result.getEntity()));
- }
-
- @Test
- public void writeServiceDocument() throws Exception {
- final ODataResponse result =
- new ProviderFacadeImpl()
- .writeServiceDocument(HttpContentType.APPLICATION_JSON, MockFacade.getMockEdm(), "root");
- assertEquals("{\"d\":{\"EntitySets\":[]}}", StringHelper.inputStreamToString((InputStream) result.getEntity()));
- }
-
- @Test
- public void writePropertyValue() throws Exception {
- final EdmProperty property =
- (EdmProperty) MockFacade.getMockEdm().getEntityType("RefScenario", "Employee").getProperty("EntryDate");
- final ODataResponse result = new ProviderFacadeImpl().writePropertyValue(property, 987654321000L);
- assertNull("BasicProvider should not set content header", result.getContentHeader());
-
- assertEquals("2001-04-19T04:25:21", StringHelper.inputStreamToString((InputStream) result.getEntity()));
- }
-
- @Test
- public void writeText() throws Exception {
- final ODataResponse result = new ProviderFacadeImpl().writeText("test");
- assertNull("BasicProvider should not set content header", result.getContentHeader());
- assertEquals("test", StringHelper.inputStreamToString((InputStream) result.getEntity()));
- }
-
- @Test
- public void writeBinary() throws Exception {
- final ODataResponse result =
- new ProviderFacadeImpl().writeBinary(HttpContentType.APPLICATION_OCTET_STREAM, new byte[] { 102, 111, 111 });
- assertEquals(HttpContentType.APPLICATION_OCTET_STREAM, result.getContentHeader());
- assertEquals("foo", StringHelper.inputStreamToString((InputStream) result.getEntity()));
- }
-
- @Test
- public void writeBinaryNoContent() throws Exception {
- final ODataResponse result = new ProviderFacadeImpl().writeBinary(HttpContentType.APPLICATION_OCTET_STREAM, null);
- assertNull(result.getEntity());
- assertNull(result.getContentHeader());
- assertEquals(HttpStatusCodes.NO_CONTENT, result.getStatus());
- }
-
- @Test
- public void writeFunctionImport() throws Exception {
- final EdmFunctionImport function =
- MockFacade.getMockEdm().getDefaultEntityContainer().getFunctionImport("MaximalAge");
- Map<String, Object> properties = new HashMap<String, Object>();
- properties.put("MaximalAge", 99);
- final ODataResponse result =
- new ProviderFacadeImpl().writeFunctionImport(HttpContentType.APPLICATION_JSON, function, properties, null);
- assertEquals("{\"d\":{\"MaximalAge\":99}}", StringHelper.inputStreamToString((InputStream) result.getEntity()));
- }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonErrorDocumentConsumerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonErrorDocumentConsumerTest.java
index e5d6c65d..5f2353ec 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonErrorDocumentConsumerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonErrorDocumentConsumerTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.ep.consumer;
@@ -22,212 +18,210 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
import java.io.InputStream;
import java.util.Locale;
-
import org.apache.olingo.odata2.api.ep.EntityProviderException;
import org.apache.olingo.odata2.api.processor.ODataErrorContext;
+import org.apache.olingo.odata2.core.LocaleAsserter;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.junit.Test;
/**
- *
+ *
*/
public class JsonErrorDocumentConsumerTest extends AbstractConsumerTest {
- private static final String JSON_ERROR_DOCUMENT_SIMPLE = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
- private static final String JSON_ERROR_DOCUMENT_NULL_LOCALE = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":null,\"value\":\"Message\"}}}";
- private static final String JSON_ERROR_DOCUMENT_INNER_ERROR = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, \"innererror\":\"Some InnerError\"}}";
- private static final String JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, " +
- "\"innererror\":{\"moreInner\":\"More Inner Error\"}}}";
- private static final String JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_OBJECT = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, " +
- "\"innererror\":{\"moreInner\":\"More Inner Error\",\"secondInner\":\"Second\"}}}";
- private static final String JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_ARRAY = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, " +
- "\"innererror\":{\"innerArray\":[\"More Inner Error\",\"Second\"]}}}";
- private static final String JSON_ERROR_DOCUMENT_INVALID_JSON = "\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
- /* error document with name 'locale' instead of 'lang' for message object */
- private static final String JSON_ERROR_DOCUMENT_UNKNOWN_CONTENT = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"locale\":\"en-US\",\"value\":\"Message\"}}}";
- /* error document without value for message object */
- private static final String JSON_ERROR_DOCUMENT_INVALID_CONTENT = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\"}}}";
- private static final String JSON_ERROR_DOCUMENT_MISSING_MESSAGE = "{\"error\":{\"code\":\"ErrorCode\"}}";
- private static final String JSON_ERROR_DOCUMENT_MISSING_CODE = "{\"error\":{" +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
- private static final String JSON_ERROR_DOCUMENT_MISSING_ERROR = "{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}";
- private JsonErrorDocumentConsumer jedc = new JsonErrorDocumentConsumer();
-
- @Test
- public void simpleErrorDocument() throws Exception {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_SIMPLE);
- ODataErrorContext error = jedc.readError(in);
-
- assertEquals("Wrong content type", "application/json", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong locale for lang", Locale.US, error.getLocale());
- }
-
- @Test
- public void localeNull() throws Exception {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_NULL_LOCALE);
- ODataErrorContext error = jedc.readError(in);
-
- assertEquals("Wrong content type", "application/json", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertNull("Expected NULL for locale", error.getLocale());
- }
-
- @Test
- public void innerError() throws Exception {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR);
- ODataErrorContext error = jedc.readError(in);
-
- assertEquals("Wrong content type", "application/json", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error", "Some InnerError", error.getInnerError());
- }
-
- @Test
- public void innerErrorComplex() throws Exception {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX);
- ODataErrorContext error = jedc.readError(in);
-
- assertEquals("Wrong content type", "application/json", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error", "{\"moreInner\":\"More Inner Error\"}", error.getInnerError());
- }
-
- @Test
- public void innerErrorComplexObject() throws Exception {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_OBJECT);
- ODataErrorContext error = jedc.readError(in);
-
- assertEquals("Wrong content type", "application/json", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error",
- "{\"moreInner\":\"More Inner Error\",\"secondInner\":\"Second\"}", error.getInnerError());
- }
-
- @Test
- public void innerErrorComplexArray() throws Exception {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_ARRAY);
- ODataErrorContext error = jedc.readError(in);
-
- assertEquals("Wrong content type", "application/json", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error",
- "{\"innerArray\":[\"More Inner Error\"\"Second\"]}", error.getInnerError());
- }
-
- @Test(expected = EntityProviderException.class)
- public void invalidJson() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INVALID_JSON);
- try {
- jedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.EXCEPTION_OCCURRED, e.getMessageReference());
- throw e;
+ private static final String JSON_ERROR_DOCUMENT_SIMPLE =
+ "{\"error\":{\"code\":\"ErrorCode\"," + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
+ private static final String JSON_ERROR_DOCUMENT_NULL_LOCALE =
+ "{\"error\":{\"code\":\"ErrorCode\"," + "\"message\":{\"lang\":null,\"value\":\"Message\"}}}";
+ private static final String JSON_ERROR_DOCUMENT_INNER_ERROR = "{\"error\":{\"code\":\"ErrorCode\","
+ + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, \"innererror\":\"Some InnerError\"}}";
+ private static final String JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX = "{\"error\":{\"code\":\"ErrorCode\","
+ + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, " + "\"innererror\":{\"moreInner\":\"More Inner Error\"}}}";
+ private static final String JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_OBJECT =
+ "{\"error\":{\"code\":\"ErrorCode\"," + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, "
+ + "\"innererror\":{\"moreInner\":\"More Inner Error\",\"secondInner\":\"Second\"}}}";
+ private static final String JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_ARRAY =
+ "{\"error\":{\"code\":\"ErrorCode\"," + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, "
+ + "\"innererror\":{\"innerArray\":[\"More Inner Error\",\"Second\"]}}}";
+ private static final String JSON_ERROR_DOCUMENT_INVALID_JSON =
+ "\"error\":{\"code\":\"ErrorCode\"," + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
+ /* error document with name 'locale' instead of 'lang' for message object */
+ private static final String JSON_ERROR_DOCUMENT_UNKNOWN_CONTENT =
+ "{\"error\":{\"code\":\"ErrorCode\"," + "\"message\":{\"locale\":\"en-US\",\"value\":\"Message\"}}}";
+ /* error document without value for message object */
+ private static final String JSON_ERROR_DOCUMENT_INVALID_CONTENT =
+ "{\"error\":{\"code\":\"ErrorCode\"," + "\"message\":{\"lang\":\"en-US\"}}}";
+ private static final String JSON_ERROR_DOCUMENT_MISSING_MESSAGE = "{\"error\":{\"code\":\"ErrorCode\"}}";
+ private static final String JSON_ERROR_DOCUMENT_MISSING_CODE =
+ "{\"error\":{" + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
+ private static final String JSON_ERROR_DOCUMENT_MISSING_ERROR =
+ "{\"code\":\"ErrorCode\"," + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}";
+ private final JsonErrorDocumentConsumer jedc = new JsonErrorDocumentConsumer();
+
+ @Test
+ public void simpleErrorDocument() throws Exception {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_SIMPLE);
+ ODataErrorContext error = jedc.readError(in);
+
+ assertEquals("Wrong content type", "application/json", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ LocaleAsserter.assertLocale("Wrong locale for lang", error.getLocale(), Locale.US);
+ }
+
+ @Test
+ public void localeNull() throws Exception {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_NULL_LOCALE);
+ ODataErrorContext error = jedc.readError(in);
+
+ assertEquals("Wrong content type", "application/json", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertNull("Expected NULL for locale", error.getLocale());
+ }
+
+ @Test
+ public void innerError() throws Exception {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR);
+ ODataErrorContext error = jedc.readError(in);
+
+ assertEquals("Wrong content type", "application/json", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", "Some InnerError", error.getInnerError());
+ }
+
+ @Test
+ public void innerErrorComplex() throws Exception {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX);
+ ODataErrorContext error = jedc.readError(in);
+
+ assertEquals("Wrong content type", "application/json", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", "{\"moreInner\":\"More Inner Error\"}", error.getInnerError());
+ }
+
+ @Test
+ public void innerErrorComplexObject() throws Exception {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_OBJECT);
+ ODataErrorContext error = jedc.readError(in);
+
+ assertEquals("Wrong content type", "application/json", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", "{\"moreInner\":\"More Inner Error\",\"secondInner\":\"Second\"}", error.getInnerError());
}
- }
-
- @Test(expected = EntityProviderException.class)
- public void invalidEmptyDocument() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate("");
- try {
- jedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.EXCEPTION_OCCURRED, e.getMessageReference());
- throw e;
+
+ @Test
+ public void innerErrorComplexArray() throws Exception {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_ARRAY);
+ ODataErrorContext error = jedc.readError(in);
+
+ assertEquals("Wrong content type", "application/json", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", "{\"innerArray\":[\"More Inner Error\"\"Second\"]}", error.getInnerError());
}
- }
-
- @Test(expected = EntityProviderException.class)
- public void nullParameter() throws EntityProviderException {
- try {
- jedc.readError(null);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
- throw e;
+
+ @Test(expected = EntityProviderException.class)
+ public void invalidJson() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INVALID_JSON);
+ try {
+ jedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.EXCEPTION_OCCURRED, e.getMessageReference());
+ throw e;
+ }
}
- }
-
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentUnknown() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_UNKNOWN_CONTENT);
- try {
- jedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
- throw e;
+
+ @Test(expected = EntityProviderException.class)
+ public void invalidEmptyDocument() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate("");
+ try {
+ jedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.EXCEPTION_OCCURRED, e.getMessageReference());
+ throw e;
+ }
}
- }
-
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocument() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INVALID_CONTENT);
- try {
- jedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
- throw e;
+
+ @Test(expected = EntityProviderException.class)
+ public void nullParameter() throws EntityProviderException {
+ try {
+ jedc.readError(null);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
+ throw e;
+ }
}
- }
-
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentMissingError() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_MISSING_ERROR);
- try {
- jedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
- throw e;
+
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentUnknown() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_UNKNOWN_CONTENT);
+ try {
+ jedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
+ throw e;
+ }
}
- }
-
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentMissingCode() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_MISSING_CODE);
- try {
- jedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
- assertTrue(e.getMessage().contains("code"));
- throw e;
+
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocument() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INVALID_CONTENT);
+ try {
+ jedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
+ throw e;
+ }
+ }
+
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentMissingError() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_MISSING_ERROR);
+ try {
+ jedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
+ throw e;
+ }
}
- }
-
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentMissingMessage() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_MISSING_MESSAGE);
- try {
- jedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
- assertTrue(e.getMessage().contains("message"));
- throw e;
+
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentMissingCode() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_MISSING_CODE);
+ try {
+ jedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
+ assertTrue(e.getMessage()
+ .contains("code"));
+ throw e;
+ }
+ }
+
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentMissingMessage() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_MISSING_MESSAGE);
+ try {
+ jedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
+ assertTrue(e.getMessage()
+ .contains("message"));
+ throw e;
+ }
}
- }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumerTest.java
index 70928085..432c5389 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumerTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.ep.consumer;
@@ -22,12 +18,11 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
import java.io.InputStream;
import java.util.Locale;
-
import org.apache.olingo.odata2.api.ep.EntityProviderException;
import org.apache.olingo.odata2.api.processor.ODataErrorContext;
+import org.apache.olingo.odata2.core.LocaleAsserter;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.junit.Test;
@@ -36,245 +31,217 @@ import org.junit.Test;
*/
public class XmlErrorDocumentConsumerTest extends AbstractConsumerTest {
- private static final String XML_ERROR_DOCUMENT_SIMPLE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "</error>";
- private static final String XML_ERROR_DOCUMENT_NULL_LOCALE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"\">Message</message>\n" +
- "</error>";
- private static final String XML_ERROR_DOCUMENT_INNER_ERROR =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "<innererror>Some InnerError</innererror>\n" +
- "</error>";
- private static final String XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "<innererror>" +
- "<moreInner>More Inner Error</moreInner>" +
- "</innererror>\n" +
- "</error>";
- private static final String XML_ERROR_DOCUMENT_INVALID_XML =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</CODE>\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "</error>";
- /* error document with name 'locale' instead of 'lang' for message object */
- private static final String XML_ERROR_DOCUMENT_UNKNOWN_CONTENT =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:locale=\"en-US\">Message</message>\n" +
- "\t<privateMessage>Secret</privateMessage>\n" +
- "</error>";
- /* error document without value for message object */
- private static final String XML_ERROR_DOCUMENT_EMPTY_MESSAGE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"en-US\" />\n" +
- "</error>";
- private static final String XML_ERROR_DOCUMENT_MISSING_MESSAGE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "</error>";
- private static final String XML_ERROR_DOCUMENT_MISSING_CODE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "</error>";
- private static final String XML_ERROR_DOCUMENT_MISSING_ERROR =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<errorForMe xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "</errorForMe>";
- private XmlErrorDocumentConsumer xedc = new XmlErrorDocumentConsumer();
-
- @Test
- public void simpleErrorDocument() throws Exception {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_SIMPLE);
- ODataErrorContext error = xedc.readError(in);
-
- assertEquals("Wrong content type", "application/xml", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong locale for lang", Locale.US, error.getLocale());
- }
-
- @Test
- public void emptyMessage() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_EMPTY_MESSAGE);
-
- ODataErrorContext error = xedc.readError(in);
+ private static final String XML_ERROR_DOCUMENT_SIMPLE = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:lang=\"en-US\">Message</message>\n" + "</error>";
+ private static final String XML_ERROR_DOCUMENT_NULL_LOCALE = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:lang=\"\">Message</message>\n" + "</error>";
+ private static final String XML_ERROR_DOCUMENT_INNER_ERROR = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:lang=\"en-US\">Message</message>\n" + "<innererror>Some InnerError</innererror>\n" + "</error>";
+ private static final String XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:lang=\"en-US\">Message</message>\n" + "<innererror>" + "<moreInner>More Inner Error</moreInner>"
+ + "</innererror>\n" + "</error>";
+ private static final String XML_ERROR_DOCUMENT_INVALID_XML = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</CODE>\n"
+ + "\t<message xml:lang=\"en-US\">Message</message>\n" + "</error>";
+ /* error document with name 'locale' instead of 'lang' for message object */
+ private static final String XML_ERROR_DOCUMENT_UNKNOWN_CONTENT = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:locale=\"en-US\">Message</message>\n" + "\t<privateMessage>Secret</privateMessage>\n" + "</error>";
+ /* error document without value for message object */
+ private static final String XML_ERROR_DOCUMENT_EMPTY_MESSAGE = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:lang=\"en-US\" />\n" + "</error>";
+ private static final String XML_ERROR_DOCUMENT_MISSING_MESSAGE = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "</error>";
+ private static final String XML_ERROR_DOCUMENT_MISSING_CODE = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n"
+ + "\t<message xml:lang=\"en-US\">Message</message>\n" + "</error>";
+ private static final String XML_ERROR_DOCUMENT_MISSING_ERROR = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<errorForMe xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:lang=\"en-US\">Message</message>\n" + "</errorForMe>";
+ private final XmlErrorDocumentConsumer xedc = new XmlErrorDocumentConsumer();
+
+ @Test
+ public void simpleErrorDocument() throws Exception {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_SIMPLE);
+ ODataErrorContext error = xedc.readError(in);
+
+ assertEquals("Wrong content type", "application/xml", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ LocaleAsserter.assertLocale("Wrong locale for lang", error.getLocale(), Locale.US);
+ }
- assertEquals("Wrong content type", "application/xml", error.getContentType());
- assertEquals("Wrong message", "", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong locale for lang", Locale.US, error.getLocale());
- }
+ @Test
+ public void emptyMessage() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_EMPTY_MESSAGE);
- @Test
- public void localeNull() throws Exception {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_NULL_LOCALE);
- ODataErrorContext error = xedc.readError(in);
+ ODataErrorContext error = xedc.readError(in);
- assertEquals("Wrong content type", "application/xml", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertNull("Expected NULL for locale", error.getLocale());
- }
+ assertEquals("Wrong content type", "application/xml", error.getContentType());
+ assertEquals("Wrong message", "", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ LocaleAsserter.assertLocale("Wrong locale for lang", error.getLocale(), Locale.US);
+ }
- @Test
- public void innerError() throws Exception {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_INNER_ERROR);
- ODataErrorContext error = xedc.readError(in);
+ @Test
+ public void localeNull() throws Exception {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_NULL_LOCALE);
+ ODataErrorContext error = xedc.readError(in);
- assertEquals("Wrong content type", "application/xml", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error", "Some InnerError", error.getInnerError());
- }
+ assertEquals("Wrong content type", "application/xml", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertNull("Expected NULL for locale", error.getLocale());
+ }
- @Test
- public void innerErrorComplex() throws Exception {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX);
- ODataErrorContext error = xedc.readError(in);
+ @Test
+ public void innerError() throws Exception {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_INNER_ERROR);
+ ODataErrorContext error = xedc.readError(in);
- assertEquals("Wrong content type", "application/xml", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error", "<moreInner>More Inner Error</moreInner>", error.getInnerError());
- }
+ assertEquals("Wrong content type", "application/xml", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", "Some InnerError", error.getInnerError());
+ }
- @Test
- public void innerErrorComplexTwo() throws Exception {
- String innerErrorText = "<firstTag>tagText</firstTag><secondTag>secondText</secondTag>";
- String innerError = "<innererror>" + innerErrorText + "</innererror>";
- String errorDocument = XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX.replaceAll(
- "<innererror.*error>", innerError);
- InputStream in = StringHelper.encapsulate(errorDocument);
- ODataErrorContext error = xedc.readError(in);
+ @Test
+ public void innerErrorComplex() throws Exception {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX);
+ ODataErrorContext error = xedc.readError(in);
- assertEquals("Wrong content type", "application/xml", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error", innerErrorText, error.getInnerError());
- }
+ assertEquals("Wrong content type", "application/xml", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", "<moreInner>More Inner Error</moreInner>", error.getInnerError());
+ }
- @Test
- public void innerErrorComplexMoreCharacters() throws Exception {
- String innerErrorText = "\n\t<firstTag>tagText</firstTag>\n<secondTag>secondText</secondTag>\n";
- String innerError = "<innererror>" + innerErrorText + "</innererror>";
- String errorDocument = XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX.replaceAll(
- "<innererror.*error>", innerError);
- InputStream in = StringHelper.encapsulate(errorDocument);
- ODataErrorContext error = xedc.readError(in);
+ @Test
+ public void innerErrorComplexTwo() throws Exception {
+ String innerErrorText = "<firstTag>tagText</firstTag><secondTag>secondText</secondTag>";
+ String innerError = "<innererror>" + innerErrorText + "</innererror>";
+ String errorDocument = XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX.replaceAll("<innererror.*error>", innerError);
+ InputStream in = StringHelper.encapsulate(errorDocument);
+ ODataErrorContext error = xedc.readError(in);
+
+ assertEquals("Wrong content type", "application/xml", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", innerErrorText, error.getInnerError());
+ }
- assertEquals("Wrong content type", "application/xml", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error", innerErrorText, error.getInnerError());
- }
+ @Test
+ public void innerErrorComplexMoreCharacters() throws Exception {
+ String innerErrorText = "\n\t<firstTag>tagText</firstTag>\n<secondTag>secondText</secondTag>\n";
+ String innerError = "<innererror>" + innerErrorText + "</innererror>";
+ String errorDocument = XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX.replaceAll("<innererror.*error>", innerError);
+ InputStream in = StringHelper.encapsulate(errorDocument);
+ ODataErrorContext error = xedc.readError(in);
+
+ assertEquals("Wrong content type", "application/xml", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", innerErrorText, error.getInnerError());
+ }
- @Test(expected = EntityProviderException.class)
- public void invalidJson() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_INVALID_XML);
- try {
- xedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
- throw e;
+ @Test(expected = EntityProviderException.class)
+ public void invalidJson() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_INVALID_XML);
+ try {
+ xedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
+ throw e;
+ }
}
- }
- @Test(expected = EntityProviderException.class)
- public void invalidEmptyDocument() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate("");
- try {
- xedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals("Got wrong exception: " + e.getMessageReference().getKey(),
- EntityProviderException.INVALID_STATE, e.getMessageReference());
- throw e;
+ @Test(expected = EntityProviderException.class)
+ public void invalidEmptyDocument() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate("");
+ try {
+ xedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals("Got wrong exception: " + e.getMessageReference()
+ .getKey(),
+ EntityProviderException.INVALID_STATE, e.getMessageReference());
+ throw e;
+ }
}
- }
- @Test(expected = EntityProviderException.class)
- public void nullParameter() throws EntityProviderException {
- try {
- xedc.readError(null);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.ILLEGAL_ARGUMENT, e.getMessageReference());
- throw e;
+ @Test(expected = EntityProviderException.class)
+ public void nullParameter() throws EntityProviderException {
+ try {
+ xedc.readError(null);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.ILLEGAL_ARGUMENT, e.getMessageReference());
+ throw e;
+ }
}
- }
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentUnknown() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_UNKNOWN_CONTENT);
- try {
- xedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.INVALID_CONTENT, e.getMessageReference());
- throw e;
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentUnknown() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_UNKNOWN_CONTENT);
+ try {
+ xedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.INVALID_CONTENT, e.getMessageReference());
+ throw e;
+ }
}
- }
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentMissingError() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_MISSING_ERROR);
- try {
- xedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals("Got wrong exception: " + e.getMessageReference().getKey(),
- EntityProviderException.INVALID_STATE, e.getMessageReference());
- throw e;
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentMissingError() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_MISSING_ERROR);
+ try {
+ xedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals("Got wrong exception: " + e.getMessageReference()
+ .getKey(),
+ EntityProviderException.INVALID_STATE, e.getMessageReference());
+ throw e;
+ }
}
- }
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentMissingCode() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_MISSING_CODE);
- try {
- xedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals("Got wrong exception: " + e.getMessageReference().getKey(),
- EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
- assertTrue(e.getMessage().contains("code"));
- throw e;
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentMissingCode() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_MISSING_CODE);
+ try {
+ xedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals("Got wrong exception: " + e.getMessageReference()
+ .getKey(),
+ EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
+ assertTrue(e.getMessage()
+ .contains("code"));
+ throw e;
+ }
}
- }
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentMissingMessage() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_MISSING_MESSAGE);
- try {
- xedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals("Got wrong exception: " + e.getMessageReference().getKey(),
- EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
- assertTrue(e.getMessage().contains("message"));
- throw e;
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentMissingMessage() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_MISSING_MESSAGE);
+ try {
+ xedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals("Got wrong exception: " + e.getMessageReference()
+ .getKey(),
+ EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
+ assertTrue(e.getMessage()
+ .contains("message"));
+ throw e;
+ }
}
- }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java
index 7ecf1e83..87fb40f3 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java
@@ -36,12 +36,12 @@ import java.util.Map;
import jakarta.servlet.ServletConfig;
import jakarta.servlet.http.HttpServletRequest;
-import javax.ws.rs.ClientErrorException;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.ClientErrorException;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
import org.apache.olingo.odata2.api.ODataServiceFactory;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
index 414aef67..c424752f 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
@@ -28,7 +28,7 @@ import static org.mockito.Mockito.when;
import java.io.IOException;
import java.net.URI;
-import javax.ws.rs.HttpMethod;
+import jakarta.ws.rs.HttpMethod;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
index 23e6cb79..a3d4ed2c 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
@@ -32,7 +32,7 @@ import java.util.List;
import java.util.Map;
import jakarta.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.Response.Status;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
index a939e529..8de4a3e0 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
@@ -27,7 +27,7 @@ import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URI;
-import javax.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.HttpHeaders;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/ODataApplicationTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/ODataApplicationTest.java
index 6072d240..986a0b9f 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/ODataApplicationTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/ODataApplicationTest.java
@@ -68,7 +68,7 @@ public class ODataApplicationTest {
private ServletContextHandler createContextHandler() {
final CXFNonSpringJaxrsServlet odataServlet = new CXFNonSpringJaxrsServlet();
final ServletHolder odataServletHolder = new ServletHolder(odataServlet);
- odataServletHolder.setInitParameter("javax.ws.rs.Application",
+ odataServletHolder.setInitParameter("jakarta.ws.rs.Application",
ODataApplication_.class.getName());
final ServletContextHandler contextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
diff --git a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
index 2f868094..72df8e05 100644
--- a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
+++ b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
@@ -124,8 +124,8 @@ public class TestServer {
switch (servletType) {
case JAXRS_SERVLET:
CXFNonSpringJaxrsServlet cxfNonSpringJaxrsServlet = new CXFNonSpringJaxrsServlet();
- odataServletHolder = new ServletHolder();
- odataServletHolder.setInitParameter("javax.ws.rs.Application", "org.apache.olingo.odata2.core.rest.app.ODataApplication");
+ odataServletHolder = new ServletHolder(cxfNonSpringJaxrsServlet);
+ odataServletHolder.setInitParameter("jakarta.ws.rs.Application", "org.apache.olingo.odata2.core.rest.app.ODataApplication");
odataServletHolder.setInitParameter(ODataServiceFactory.FACTORY_LABEL, factoryClass.getCanonicalName());
break;
case ODATA_SERVLET:
diff --git a/odata2-lib/odata-web/src/main/resources/META-INF/LICENSE b/odata2-lib/odata-web/src/main/resources/META-INF/LICENSE
index 6547e963..28751de4 100644
--- a/odata2-lib/odata-web/src/main/resources/META-INF/LICENSE
+++ b/odata2-lib/odata-web/src/main/resources/META-INF/LICENSE
@@ -497,8 +497,8 @@
=====================================================================
- - javax.ws.rs-api (http://jax-rs-spec.java.net)
- javax.ws.rs:javax.ws.rs-api:jar:2.0-m10
+ - jakarta.ws.rs-api (http://jax-rs-spec.java.net)
+ jakarta.ws.rs:jakarta.ws.rs-api:jar:2.0-m10
- JAXB Reference Implementation (http://jaxb.java.net/)
com.sun.xml.bind:jaxb-impl:jar:2.2.6
License: CDDL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
diff --git a/odata2-lib/odata-web/src/main/webapp/WEB-INF/web.xml b/odata2-lib/odata-web/src/main/webapp/WEB-INF/web.xml
index faf1cd68..b353683a 100644
--- a/odata2-lib/odata-web/src/main/webapp/WEB-INF/web.xml
+++ b/odata2-lib/odata-web/src/main/webapp/WEB-INF/web.xml
@@ -30,7 +30,7 @@
<servlet-name>ReferenceScenarioServlet</servlet-name>
<servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
<init-param>
- <param-name>javax.ws.rs.Application</param-name>
+ <param-name>jakarta.ws.rs.Application</param-name>
<param-value>org.apache.olingo.odata2.core.rest.app.ODataApplication</param-value>
</init-param>
<init-param>
diff --git a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
index fe4a1e75..919d43ef 100644
--- a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
@@ -126,8 +126,8 @@
</dependency>
<!-- Servlet/REST dependencies -->
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
<version>${version.jaxrs-api}</version>
</dependency>
<dependency>
diff --git a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 1a229065..4a3c46ea 100644
--- a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -33,7 +33,7 @@
<servlet-name>CarServiceServlet</servlet-name>
<servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
<init-param>
- <param-name>javax.ws.rs.Application</param-name>
+ <param-name>jakarta.ws.rs.Application</param-name>
<param-value>org.apache.olingo.odata2.core.rest.app.ODataApplication</param-value>
</init-param>
<init-param>
diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index b90c22ba..6547025a 100644
--- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -32,7 +32,7 @@
<servlet-name>CarServiceServlet</servlet-name>
<servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
<init-param>
- <param-name>javax.ws.rs.Application</param-name>
+ <param-name>jakarta.ws.rs.Application</param-name>
<param-value>org.apache.olingo.odata2.core.rest.app.ODataApplication</param-value>
</init-param>
<init-param>
diff --git a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index b5b07daa..1b800de5 100644
--- a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -33,7 +33,7 @@
<servlet-name>CarServiceServlet</servlet-name>
<servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
<init-param>
- <param-name>javax.ws.rs.Application</param-name>
+ <param-name>jakarta.ws.rs.Application</param-name>
<param-value>org.apache.olingo.odata2.core.rest.app.ODataApplication</param-value>
</init-param>
<init-param>
diff --git a/odata2-spring/src/main/java/org/apache/olingo/odata2/spring/OlingoRootLocator.java b/odata2-spring/src/main/java/org/apache/olingo/odata2/spring/OlingoRootLocator.java
index 82442d68..5a5945a0 100644
--- a/odata2-spring/src/main/java/org/apache/olingo/odata2/spring/OlingoRootLocator.java
+++ b/odata2-spring/src/main/java/org/apache/olingo/odata2/spring/OlingoRootLocator.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.spring;
import org.apache.olingo.odata2.api.ODataServiceFactory;
import org.apache.olingo.odata2.core.rest.ODataRootLocator;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.Path;
/**
* Default OData root locator responsible to handle the whole path and delegate all calls to a sub locator:<p>
diff --git a/pom.xml b/pom.xml
index 326fbbb5..e1b33cc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,6 @@ governing permissions and limitations under
<projectsToInstrument>
org.apache.olingo.odata2.api,org.apache.olingo.odata2.core,org.apache.olingo.odata2.ref</projectsToInstrument>
<sonar.skippedModules>org.apache.olingo.odata2.expr</sonar.skippedModules>
- <jax.ws.rs.version>2.0-m10</jax.ws.rs.version>
<!-- <jsr311.version>1.1.1</jsr311.version> -->
<joda.version>2.1</joda.version>
<!-- <cxf.version>4.0.3</cxf.version> -->
(olingo-odata2) 06/29: fix compilation
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 2c2e2728600c69ec7dd1515f7d23aa0c22ce8394
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 10:28:02 2023 +0200
fix compilation
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.../core/ep/deserializer/XmlEntryDeserializer.java | 1045 ++++++++++----------
.../ep/deserializer/XmlPropertyDeserializer.java | 310 +++---
src/checkstyle/config.xml | 2 +-
3 files changed, 675 insertions(+), 682 deletions(-)
diff --git a/odata2-lib/odata-client-core/src/main/java/org/apache/olingo/odata2/client/core/ep/deserializer/XmlEntryDeserializer.java b/odata2-lib/odata-client-core/src/main/java/org/apache/olingo/odata2/client/core/ep/deserializer/XmlEntryDeserializer.java
index 06bae41f..9e135792 100644
--- a/odata2-lib/odata-client-core/src/main/java/org/apache/olingo/odata2/client/core/ep/deserializer/XmlEntryDeserializer.java
+++ b/odata2-lib/odata-client-core/src/main/java/org/apache/olingo/odata2/client/core/ep/deserializer/XmlEntryDeserializer.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.client.core.ep.deserializer;
@@ -22,20 +18,21 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-
import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.edm.EdmEntitySet;
import org.apache.olingo.odata2.api.edm.EdmException;
+import org.apache.olingo.odata2.api.edm.EdmFacets;
import org.apache.olingo.odata2.api.edm.EdmLiteralKind;
import org.apache.olingo.odata2.api.edm.EdmMultiplicity;
import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
import org.apache.olingo.odata2.api.edm.EdmSimpleType;
import org.apache.olingo.odata2.api.ep.EntityProviderException;
+import org.apache.olingo.odata2.api.ep.EntityProviderReadProperties;
+import org.apache.olingo.odata2.api.ep.callback.ReadEntryResult;
import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
import org.apache.olingo.odata2.api.exception.ODataApplicationException;
import org.apache.olingo.odata2.client.api.ep.DeserializerProperties;
@@ -53,544 +50,544 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
/**
* Atom/XML format reader/consumer for entries.
- *
+ *
* {@link XmlEntryDeserializer} instance can be reused for several
- * {@link #readEntry(XMLStreamReader, EntityInfoAggregator, EntityProviderReadProperties)} calls
- * but be aware that the instance and their <code>readEntry*</code> methods are <b>NOT THREAD SAFE</b>.
- *
+ * {@link #readEntry(XMLStreamReader, EntityInfoAggregator, EntityProviderReadProperties)} calls but
+ * be aware that the instance and their <code>readEntry*</code> methods are <b>NOT THREAD SAFE</b>.
+ *
*/
public class XmlEntryDeserializer {
- private ODataEntryImpl readEntryResult;
- private Map<String, Object> properties;
- private MediaMetadataImpl mediaMetadata;
- private EntryMetadataImpl entryMetadata;
- private EntityTypeMapping typeMappings;
- private String currentHandledStartTagName;
-
- /**
- * Deserializes payload entry
- * @param reader
- * @param eia
- * @param readProperties
- * @param isInline
- * @return ODataEntry
- * @throws EntityProviderException
- */
- public ODataEntry readEntry(final XMLStreamReader reader, final EntityInfoAggregator eia,
- final DeserializerProperties readProperties, final boolean isInline) throws EntityProviderException {
- try {
- initialize(readProperties);
-
- if (isInline) {
- setETag(reader);
- }
-
- while (reader.hasNext() && !isEntryEndTag(reader)) {
- reader.nextTag();
- if (reader.isStartElement()) {
- handleStartedTag(reader, eia, readProperties);
+ private ODataEntryImpl readEntryResult;
+ private Map<String, Object> properties;
+ private MediaMetadataImpl mediaMetadata;
+ private EntryMetadataImpl entryMetadata;
+ private EntityTypeMapping typeMappings;
+ private String currentHandledStartTagName;
+
+ /**
+ * Deserializes payload entry
+ *
+ * @param reader
+ * @param eia
+ * @param readProperties
+ * @param isInline
+ * @return ODataEntry
+ * @throws EntityProviderException
+ */
+ public ODataEntry readEntry(final XMLStreamReader reader, final EntityInfoAggregator eia, final DeserializerProperties readProperties,
+ final boolean isInline) throws EntityProviderException {
+ try {
+ initialize(readProperties);
+
+ if (isInline) {
+ setETag(reader);
+ }
+
+ while (reader.hasNext() && !isEntryEndTag(reader)) {
+ reader.nextTag();
+ if (reader.isStartElement()) {
+ handleStartedTag(reader, eia, readProperties);
+ }
+ }
+
+ return readEntryResult;
+ } catch (XMLStreamException | EdmException e) {
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()),
+ e);
}
- }
-
- return readEntryResult;
- } catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
- .getSimpleName()), e);
- } catch (EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
- .getSimpleName()), e);
}
- }
-
- private boolean isEntryEndTag(final XMLStreamReader reader) {
- return reader.isEndElement()
- && Edm.NAMESPACE_ATOM_2005.equals(reader.getNamespaceURI())
- && FormatXml.ATOM_ENTRY.equals(reader.getLocalName());
- }
-
- /**
- * Initializes the {@link XmlEntryDeserializer} to be ready for reading an entry.
- * @param readProperties
- * @throws EntityProviderException
- */
- private void initialize(final DeserializerProperties readProperties) throws EntityProviderException {
- properties = new HashMap<String, Object>();
- mediaMetadata = new MediaMetadataImpl();
- entryMetadata = new EntryMetadataImpl();
-
- readEntryResult = new ODataEntryImpl(properties, mediaMetadata, entryMetadata, null);
- typeMappings = EntityTypeMapping.create(readProperties.getTypeMappings());
- }
-
- private void handleStartedTag(final XMLStreamReader reader, final EntityInfoAggregator eia,
- final DeserializerProperties readProperties)
- throws EntityProviderException, XMLStreamException, EdmException {
-
- currentHandledStartTagName = reader.getLocalName();
-
- if (FormatXml.ATOM_ID.equals(currentHandledStartTagName)) {
- readId(reader);
- } else if (FormatXml.ATOM_ENTRY.equals(currentHandledStartTagName)) {
- readEntry(reader);
- } else if (FormatXml.ATOM_LINK.equals(currentHandledStartTagName)) {
- readLink(reader, eia, readProperties);
- } else if (FormatXml.ATOM_CONTENT.equals(currentHandledStartTagName)) {
- readContent(reader, eia, readProperties);
- } else if (FormatXml.M_PROPERTIES.equals(currentHandledStartTagName)) {
- readProperties(reader, eia, readProperties);
- } else {
- readCustomElement(reader, currentHandledStartTagName, eia, readProperties);
+
+ private boolean isEntryEndTag(final XMLStreamReader reader) {
+ return reader.isEndElement() && Edm.NAMESPACE_ATOM_2005.equals(reader.getNamespaceURI())
+ && FormatXml.ATOM_ENTRY.equals(reader.getLocalName());
+ }
+
+ /**
+ * Initializes the {@link XmlEntryDeserializer} to be ready for reading an entry.
+ *
+ * @param readProperties
+ * @throws EntityProviderException
+ */
+ private void initialize(final DeserializerProperties readProperties) throws EntityProviderException {
+ properties = new HashMap<String, Object>();
+ mediaMetadata = new MediaMetadataImpl();
+ entryMetadata = new EntryMetadataImpl();
+
+ readEntryResult = new ODataEntryImpl(properties, mediaMetadata, entryMetadata, null);
+ typeMappings = EntityTypeMapping.create(readProperties.getTypeMappings());
}
- }
-
- private void readCustomElement(final XMLStreamReader reader, final String tagName, //NOSONAR
- final EntityInfoAggregator eia,
- final DeserializerProperties readProperties)
- throws EdmException, EntityProviderException, XMLStreamException { //NOSONAR
- EntityPropertyInfo targetPathInfo = eia.getTargetPathInfo(tagName);
- NamespaceContext nsctx = reader.getNamespaceContext();
-
- boolean skipTag = true;
- if (!Edm.NAMESPACE_ATOM_2005.equals(reader.getName().getNamespaceURI())) {
-
- if (targetPathInfo != null) {
- final String customPrefix = targetPathInfo.getCustomMapping().getFcNsPrefix();
- final String customNamespaceURI = targetPathInfo.getCustomMapping().getFcNsUri();
-
- if (customPrefix != null && customNamespaceURI != null) {
- String xmlPrefix = nsctx.getPrefix(customNamespaceURI);
- String xmlNamespaceUri = reader.getNamespaceURI(customPrefix);
-
- if (customNamespaceURI.equals(xmlNamespaceUri) && customPrefix.equals(xmlPrefix)) { //NOSONAR
- skipTag = false;
- reader.require(XMLStreamConstants.START_ELEMENT, customNamespaceURI, tagName);
- final String text = reader.getElementText();
- reader.require(XMLStreamConstants.END_ELEMENT, customNamespaceURI, tagName);
-
- final EntityPropertyInfo propertyInfo = getValidatedPropertyInfo(eia, tagName);
- final Class<?> typeMapping = typeMappings.getMappingClass(propertyInfo.getName());
- final EdmSimpleType type = (EdmSimpleType) propertyInfo.getType();
- final Object value = type.valueOfString(text, EdmLiteralKind.DEFAULT,
- readProperties == null || readProperties.isValidatingFacets() ? propertyInfo.getFacets() : null,
- typeMapping == null ? type.getDefaultType() : typeMapping);
- properties.put(tagName, value);
- }
+
+ private void handleStartedTag(final XMLStreamReader reader, final EntityInfoAggregator eia, final DeserializerProperties readProperties)
+ throws EntityProviderException, XMLStreamException, EdmException {
+
+ currentHandledStartTagName = reader.getLocalName();
+
+ if (FormatXml.ATOM_ID.equals(currentHandledStartTagName)) {
+ readId(reader);
+ } else if (FormatXml.ATOM_ENTRY.equals(currentHandledStartTagName)) {
+ readEntry(reader);
+ } else if (FormatXml.ATOM_LINK.equals(currentHandledStartTagName)) {
+ readLink(reader, eia, readProperties);
+ } else if (FormatXml.ATOM_CONTENT.equals(currentHandledStartTagName)) {
+ readContent(reader, eia, readProperties);
+ } else if (FormatXml.M_PROPERTIES.equals(currentHandledStartTagName)) {
+ readProperties(reader, eia, readProperties);
+ } else {
+ readCustomElement(reader, currentHandledStartTagName, eia, readProperties);
}
- } else {
- throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY.addContent(tagName));
- }
}
- if (skipTag) {
- skipStartedTag(reader);
+ private void readCustomElement(final XMLStreamReader reader, final String tagName, // NOSONAR
+ final EntityInfoAggregator eia, final DeserializerProperties readProperties)
+ throws EdmException, EntityProviderException, XMLStreamException { // NOSONAR
+ EntityPropertyInfo targetPathInfo = eia.getTargetPathInfo(tagName);
+ NamespaceContext nsctx = reader.getNamespaceContext();
+
+ boolean skipTag = true;
+ if (!Edm.NAMESPACE_ATOM_2005.equals(reader.getName()
+ .getNamespaceURI())) {
+
+ if (targetPathInfo == null) {
+ throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY.addContent(tagName));
+ }
+ final String customPrefix = targetPathInfo.getCustomMapping()
+ .getFcNsPrefix();
+ final String customNamespaceURI = targetPathInfo.getCustomMapping()
+ .getFcNsUri();
+
+ if (customPrefix != null && customNamespaceURI != null) {
+ String xmlPrefix = nsctx.getPrefix(customNamespaceURI);
+ String xmlNamespaceUri = reader.getNamespaceURI(customPrefix);
+
+ if (customNamespaceURI.equals(xmlNamespaceUri) && customPrefix.equals(xmlPrefix)) { // NOSONAR
+ skipTag = false;
+ reader.require(XMLStreamConstants.START_ELEMENT, customNamespaceURI, tagName);
+ final String text = reader.getElementText();
+ reader.require(XMLStreamConstants.END_ELEMENT, customNamespaceURI, tagName);
+
+ final EntityPropertyInfo propertyInfo = getValidatedPropertyInfo(eia, tagName);
+ Class<?> typeMapping = typeMappings.getMappingClass(propertyInfo.getName());
+ final EdmSimpleType type = (EdmSimpleType) propertyInfo.getType();
+ EdmFacets facets = readProperties == null || readProperties.isValidatingFacets() ? propertyInfo.getFacets() : null;
+ typeMapping = typeMapping == null ? type.getDefaultType() : typeMapping;
+ final Object value = type.valueOfString(text, EdmLiteralKind.DEFAULT, facets, typeMapping);
+ properties.put(tagName, value);
+ }
+ }
+ }
+
+ if (skipTag) {
+ skipStartedTag(reader);
+ }
}
- }
-
- /**
- * Skip the tag to which the {@link XMLStreamReader} currently points.
- * Therefore it is read until an end element tag with current local name is found.
- *
- * @param reader
- * @throws XMLStreamException
- */
- private void skipStartedTag(final XMLStreamReader reader) throws XMLStreamException {
- final String name = reader.getLocalName();
- int read = 1;
- while (read > 0 && reader.hasNext()) {
- reader.next();
- if (reader.hasName() && name.equals(reader.getLocalName())) {
- if (reader.isEndElement()) {
- read--;
- } else if (reader.isStartElement()) {
- read++;
+
+ /**
+ * Skip the tag to which the {@link XMLStreamReader} currently points. Therefore it is read until an
+ * end element tag with current local name is found.
+ *
+ * @param reader
+ * @throws XMLStreamException
+ */
+ private void skipStartedTag(final XMLStreamReader reader) throws XMLStreamException {
+ final String name = reader.getLocalName();
+ int read = 1;
+ while (read > 0 && reader.hasNext()) {
+ reader.next();
+ if (reader.hasName() && name.equals(reader.getLocalName())) {
+ if (reader.isEndElement()) {
+ read--;
+ } else if (reader.isStartElement()) {
+ read++;
+ }
+ }
}
- }
}
- }
-
- private void readEntry(final XMLStreamReader reader) throws XMLStreamException {
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_ENTRY);
- setETag(reader);
- }
-
- private void setETag(final XMLStreamReader reader) {
- final String etag = reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, FormatXml.M_ETAG);
- entryMetadata.setEtag(etag);
- }
-
- /**
- *
- * @param reader
- * @param eia
- * @param readProperties
- * @throws EntityProviderException
- * @throws XMLStreamException
- * @throws EdmException
- */
- private void readLink(final XMLStreamReader reader, final EntityInfoAggregator eia,
- final DeserializerProperties readProperties) throws EntityProviderException, XMLStreamException,
- EdmException {
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_LINK);
-
- final String rel = reader.getAttributeValue(null, FormatXml.ATOM_REL);
- final String uri = reader.getAttributeValue(null, FormatXml.ATOM_HREF);
- final String type = reader.getAttributeValue(null, FormatXml.ATOM_TYPE);
- final String etag = reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, FormatXml.M_ETAG);
-
- // read to next tag to check if <link> contains any further tags
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_LINK);
- reader.nextTag();
-
- if (rel == null || uri == null) {
- throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE.addContent(
- FormatXml.ATOM_HREF + "' and/or '" + FormatXml.ATOM_REL).addContent(FormatXml.ATOM_LINK));
- } else if (rel.startsWith(Edm.NAMESPACE_REL_2007_08)) {
- final String navigationPropertyName = rel.substring(Edm.NAMESPACE_REL_2007_08.length());
- entryMetadata.putAssociationUri(navigationPropertyName, uri);
- } else if (rel.equals(Edm.LINK_REL_EDIT_MEDIA)) {
- mediaMetadata.setEditLink(uri);
- mediaMetadata.setEtag(etag);
+
+ private void readEntry(final XMLStreamReader reader) throws XMLStreamException {
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_ENTRY);
+ setETag(reader);
}
- if (!reader.isEndElement() && rel != null && rel.startsWith(Edm.NAMESPACE_REL_2007_08)) {
- readInlineContent(reader, eia, readProperties, type, rel);
+ private void setETag(final XMLStreamReader reader) {
+ final String etag = reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, FormatXml.M_ETAG);
+ entryMetadata.setEtag(etag);
}
- }
-
- /**
- * Inline content was found and {@link XMLStreamReader} already points to <m:inline> tag.
- *
- * @param reader
- * @param eia
- * @param readProperties
- * @param atomLinkType the atom <code>type</code> attribute value of the <code>link</code> tag
- * @param atomLinkRel the atom <code>rel</code> attribute value of the <code>link</code> tag
- * @throws XMLStreamException
- * @throws EntityProviderException
- * @throws EdmException
- */
- private void readInlineContent(final XMLStreamReader reader, final EntityInfoAggregator eia,
- final DeserializerProperties readProperties,
- final String atomLinkType, final String atomLinkRel)
- throws XMLStreamException, EntityProviderException, EdmException {
-
- //
- String navigationPropertyName = atomLinkRel.substring(Edm.NAMESPACE_REL_2007_08.length());
-
- EdmNavigationProperty navigationProperty =
- (EdmNavigationProperty) eia.getEntityType().getProperty(navigationPropertyName);
- EdmEntitySet entitySet = eia.getEntitySet().getRelatedEntitySet(navigationProperty);
- EntityInfoAggregator inlineEia = EntityInfoAggregator.create(entitySet);
-
- final DeserializerProperties inlineProperties = createInlineProperties(readProperties, navigationProperty);
-
- // validations
- boolean isFeed = isInlineFeedValidated(reader, atomLinkType, navigationProperty);
-
- List<ODataEntry> inlineEntries = new ArrayList<ODataEntry>();
-
- while (!(reader.isEndElement() && Edm.NAMESPACE_M_2007_08.equals(reader.getNamespaceURI()) && FormatXml.M_INLINE
- .equals(reader.getLocalName()))) {
-
- if (reader.isStartElement() && Edm.NAMESPACE_ATOM_2005.equals(reader.getNamespaceURI())
- && FormatXml.ATOM_ENTRY.equals(reader.getLocalName())) {
- XmlEntryDeserializer xec = new XmlEntryDeserializer();
- ODataEntry inlineEntry = xec.readEntry(reader, inlineEia, inlineProperties, true);
- inlineEntries.add(inlineEntry);
- }
- // next tag
- reader.next();
+
+ /**
+ *
+ * @param reader
+ * @param eia
+ * @param readProperties
+ * @throws EntityProviderException
+ * @throws XMLStreamException
+ * @throws EdmException
+ */
+ private void readLink(final XMLStreamReader reader, final EntityInfoAggregator eia, final DeserializerProperties readProperties)
+ throws EntityProviderException, XMLStreamException, EdmException {
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_LINK);
+
+ final String rel = reader.getAttributeValue(null, FormatXml.ATOM_REL);
+ final String uri = reader.getAttributeValue(null, FormatXml.ATOM_HREF);
+ final String type = reader.getAttributeValue(null, FormatXml.ATOM_TYPE);
+ final String etag = reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, FormatXml.M_ETAG);
+
+ // read to next tag to check if <link> contains any further tags
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_LINK);
+ reader.nextTag();
+
+ if (rel == null || uri == null) {
+ throw new EntityProviderException(
+ EntityProviderException.MISSING_ATTRIBUTE.addContent(FormatXml.ATOM_HREF + "' and/or '" + FormatXml.ATOM_REL)
+ .addContent(FormatXml.ATOM_LINK));
+ }
+ if (rel.startsWith(Edm.NAMESPACE_REL_2007_08)) {
+ final String navigationPropertyName = rel.substring(Edm.NAMESPACE_REL_2007_08.length());
+ entryMetadata.putAssociationUri(navigationPropertyName, uri);
+ } else if (rel.equals(Edm.LINK_REL_EDIT_MEDIA)) {
+ mediaMetadata.setEditLink(uri);
+ mediaMetadata.setEtag(etag);
+ }
+
+ if (!reader.isEndElement() && rel != null && rel.startsWith(Edm.NAMESPACE_REL_2007_08)) {
+ readInlineContent(reader, eia, readProperties, type, rel);
+ }
+ }
+
+ /**
+ * Inline content was found and {@link XMLStreamReader} already points to <m:inline> tag.
+ *
+ * @param reader
+ * @param eia
+ * @param readProperties
+ * @param atomLinkType the atom <code>type</code> attribute value of the <code>link</code> tag
+ * @param atomLinkRel the atom <code>rel</code> attribute value of the <code>link</code> tag
+ * @throws XMLStreamException
+ * @throws EntityProviderException
+ * @throws EdmException
+ */
+ private void readInlineContent(final XMLStreamReader reader, final EntityInfoAggregator eia,
+ final DeserializerProperties readProperties, final String atomLinkType, final String atomLinkRel)
+ throws XMLStreamException, EntityProviderException, EdmException {
+
+ //
+ String navigationPropertyName = atomLinkRel.substring(Edm.NAMESPACE_REL_2007_08.length());
+
+ EdmNavigationProperty navigationProperty = (EdmNavigationProperty) eia.getEntityType()
+ .getProperty(navigationPropertyName);
+ EdmEntitySet entitySet = eia.getEntitySet()
+ .getRelatedEntitySet(navigationProperty);
+ EntityInfoAggregator inlineEia = EntityInfoAggregator.create(entitySet);
+
+ final DeserializerProperties inlineProperties = createInlineProperties(readProperties, navigationProperty);
+
+ // validations
+ boolean isFeed = isInlineFeedValidated(reader, atomLinkType, navigationProperty);
+
+ List<ODataEntry> inlineEntries = new ArrayList<ODataEntry>();
+
+ while ((!reader.isEndElement() || !Edm.NAMESPACE_M_2007_08.equals(reader.getNamespaceURI())
+ || !FormatXml.M_INLINE.equals(reader.getLocalName()))) {
+
+ if (reader.isStartElement() && Edm.NAMESPACE_ATOM_2005.equals(reader.getNamespaceURI())
+ && FormatXml.ATOM_ENTRY.equals(reader.getLocalName())) {
+ XmlEntryDeserializer xec = new XmlEntryDeserializer();
+ ODataEntry inlineEntry = xec.readEntry(reader, inlineEia, inlineProperties, true);
+ inlineEntries.add(inlineEntry);
+ }
+ // next tag
+ reader.next();
+ }
+
+ updateReadProperties(navigationPropertyName, isFeed, inlineEntries);
+
+ reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_M_2007_08, FormatXml.M_INLINE);
}
- updateReadProperties(navigationPropertyName, isFeed, inlineEntries);
-
- reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_M_2007_08, FormatXml.M_INLINE);
- }
-
- /**
- * Updates the read properties ({@link #properties}) for this {@link ReadEntryResult} ({@link #readEntryResult}).
- *
- * @param readProperties
- * @param navigationPropertyName
- * @param navigationProperty
- * @param isFeed
- * @param inlineEntries
- * @throws EntityProviderException
- */
- private void updateReadProperties(final String navigationPropertyName,
- final boolean isFeed,
- final List<ODataEntry> inlineEntries) {
- Object entry = extractODataEntity(isFeed, inlineEntries);
- readEntryResult.setContainsInlineEntry(true);
- properties.put(navigationPropertyName, entry);
-
- }
-
-
-
- /**
- * Get a list of {@link ODataEntry}, an empty list, a single {@link ODataEntry} or <code>NULL</code> based on
- * <code>isFeed</code> value and <code>inlineEntries</code> content.
- *
- * @param isFeed
- * @param inlineEntries
- * @return
- */
- private Object extractODataEntity(final boolean isFeed, final List<ODataEntry> inlineEntries) {
- if (isFeed) {
- return new ODataDeltaFeedImpl(inlineEntries, new FeedMetadataImpl());
- } else if (!inlineEntries.isEmpty()) {
- return inlineEntries.get(0);
+ /**
+ * Updates the read properties ({@link #properties}) for this {@link ReadEntryResult}
+ * ({@link #readEntryResult}).
+ *
+ * @param readProperties
+ * @param navigationPropertyName
+ * @param navigationProperty
+ * @param isFeed
+ * @param inlineEntries
+ * @throws EntityProviderException
+ */
+ private void updateReadProperties(final String navigationPropertyName, final boolean isFeed, final List<ODataEntry> inlineEntries) {
+ Object entry = extractODataEntity(isFeed, inlineEntries);
+ readEntryResult.setContainsInlineEntry(true);
+ properties.put(navigationPropertyName, entry);
+
+ }
+
+
+
+ /**
+ * Get a list of {@link ODataEntry}, an empty list, a single {@link ODataEntry} or <code>NULL</code>
+ * based on <code>isFeed</code> value and <code>inlineEntries</code> content.
+ *
+ * @param isFeed
+ * @param inlineEntries
+ * @return
+ */
+ private Object extractODataEntity(final boolean isFeed, final List<ODataEntry> inlineEntries) {
+ if (isFeed) {
+ return new ODataDeltaFeedImpl(inlineEntries, new FeedMetadataImpl());
+ }
+ if (!inlineEntries.isEmpty()) {
+ return inlineEntries.get(0);
+ }
+ return null;
}
- return null;
- }
-
-
- /**
- * Create {@link EntityProviderReadProperties} which can be used for reading of inline properties/entrys of navigation
- * links within
- * this current read entry.
- *
- * @param readProperties
- * @param navigationProperty
- * @return
- * @throws EntityProviderException
- */
- private DeserializerProperties createInlineProperties
- (final DeserializerProperties readProperties,
- final EdmNavigationProperty navigationProperty) throws EntityProviderException {
- final OnDeserializeInlineContent callback = readProperties.getCallback();
-
- DeserializerProperties currentReadProperties = DeserializerProperties.initFrom(readProperties).build();
- if (callback == null) {
- return currentReadProperties;
- } else {
- try {
- return callback.receiveReadProperties(currentReadProperties, navigationProperty);
- } catch (ODataApplicationException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
- .getSimpleName()), e);
- }
+
+
+ /**
+ * Create {@link EntityProviderReadProperties} which can be used for reading of inline
+ * properties/entrys of navigation links within this current read entry.
+ *
+ * @param readProperties
+ * @param navigationProperty
+ * @return
+ * @throws EntityProviderException
+ */
+ private DeserializerProperties createInlineProperties(final DeserializerProperties readProperties,
+ final EdmNavigationProperty navigationProperty) throws EntityProviderException {
+ final OnDeserializeInlineContent callback = readProperties.getCallback();
+
+ DeserializerProperties currentReadProperties = DeserializerProperties.initFrom(readProperties)
+ .build();
+ if (callback == null) {
+ return currentReadProperties;
+ }
+ try {
+ return callback.receiveReadProperties(currentReadProperties, navigationProperty);
+ } catch (ODataApplicationException e) {
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()),
+ e);
+ }
}
- }
-
- /**
- * <p>
- * Inline content was found and {@link XMLStreamReader} already points to <code><m:inline> tag</code>.
- * <br/>
- * <b>ATTENTION</b>: If {@link XMLStreamReader} does not point to the <code><m:inline> tag</code> an exception is
- * thrown.
- * </p>
- * <p>
- * Check whether it is an inline <code>Feed</code> or <code>Entry</code> and validate that...
- * <ul>
- * <li>...{@link FormatXml#M_INLINE} tag is correctly set.</li>
- * <li>...based on {@link EdmMultiplicity} of {@link EdmNavigationProperty} all tags are correctly set.</li>
- * <li>...{@link FormatXml#ATOM_TYPE} tag is correctly set and according to {@link FormatXml#ATOM_ENTRY} or
- * {@link FormatXml#ATOM_FEED} to following tags are available.</li>
- * </ul>
- *
- * For the case that one of above validations fail an {@link EntityProviderException} is thrown.
- * If validation was successful <code>true</code> is returned for <code>Feed</code> and <code>false</code> for
- * <code>Entry</code>
- * multiplicity.
- * </p>
- *
- * @param reader xml content reader which already points to <code><m:inline> tag</code>
- * @param eia all necessary information about the entity
- * @param type the atom type attribute value of the <code>link</code> tag
- * @param navigationProperty the navigation property name of the entity
- * @return <code>true</code> for <code>Feed</code> and <code>false</code> for <code>Entry</code>
- * @throws EntityProviderException is thrown if at least one validation fails.
- * @throws EdmException if edm access fails
- */
- private boolean isInlineFeedValidated(final XMLStreamReader reader,
- final String type, final EdmNavigationProperty navigationProperty) throws EntityProviderException, EdmException {
- boolean isFeed = false;
- try {
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_M_2007_08, FormatXml.M_INLINE);
- //
- ContentType cType = ContentType.parse(type);
- if (cType == null) {
- throw new EntityProviderException(EntityProviderException.INVALID_INLINE_CONTENT.addContent("xml data"));
- }
- EdmMultiplicity navigationMultiplicity = navigationProperty.getMultiplicity();
-
- switch (navigationMultiplicity) {
- case MANY:
- validateFeedTags(reader, cType);
- isFeed = true;
- break;
- case ONE:
- case ZERO_TO_ONE:
- validateEntryTags(reader, cType);
- break;
- }
- } catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.INVALID_INLINE_CONTENT.addContent("xml data"), e);
+
+ /**
+ * <p>
+ * Inline content was found and {@link XMLStreamReader} already points to
+ * <code><m:inline> tag</code>. <br/>
+ * <b>ATTENTION</b>: If {@link XMLStreamReader} does not point to the <code><m:inline> tag</code> an
+ * exception is thrown.
+ * </p>
+ * <p>
+ * Check whether it is an inline <code>Feed</code> or <code>Entry</code> and validate that...
+ * <ul>
+ * <li>...{@link FormatXml#M_INLINE} tag is correctly set.</li>
+ * <li>...based on {@link EdmMultiplicity} of {@link EdmNavigationProperty} all tags are correctly
+ * set.</li>
+ * <li>...{@link FormatXml#ATOM_TYPE} tag is correctly set and according to
+ * {@link FormatXml#ATOM_ENTRY} or {@link FormatXml#ATOM_FEED} to following tags are available.</li>
+ * </ul>
+ *
+ * For the case that one of above validations fail an {@link EntityProviderException} is thrown. If
+ * validation was successful <code>true</code> is returned for <code>Feed</code> and
+ * <code>false</code> for <code>Entry</code> multiplicity.
+ * </p>
+ *
+ * @param reader xml content reader which already points to <code><m:inline> tag</code>
+ * @param eia all necessary information about the entity
+ * @param type the atom type attribute value of the <code>link</code> tag
+ * @param navigationProperty the navigation property name of the entity
+ * @return <code>true</code> for <code>Feed</code> and <code>false</code> for <code>Entry</code>
+ * @throws EntityProviderException is thrown if at least one validation fails.
+ * @throws EdmException if edm access fails
+ */
+ private boolean isInlineFeedValidated(final XMLStreamReader reader, final String type, final EdmNavigationProperty navigationProperty)
+ throws EntityProviderException, EdmException {
+ boolean isFeed = false;
+ try {
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_M_2007_08, FormatXml.M_INLINE);
+ //
+ ContentType cType = ContentType.parse(type);
+ if (cType == null) {
+ throw new EntityProviderException(EntityProviderException.INVALID_INLINE_CONTENT.addContent("xml data"));
+ }
+ EdmMultiplicity navigationMultiplicity = navigationProperty.getMultiplicity();
+
+ switch (navigationMultiplicity) {
+ case MANY:
+ validateFeedTags(reader, cType);
+ isFeed = true;
+ break;
+ case ONE:
+ case ZERO_TO_ONE:
+ validateEntryTags(reader, cType);
+ break;
+ }
+ } catch (XMLStreamException e) {
+ throw new EntityProviderException(EntityProviderException.INVALID_INLINE_CONTENT.addContent("xml data"), e);
+ }
+ return isFeed;
}
- return isFeed;
- }
-
- private void validateEntryTags(final XMLStreamReader reader, final ContentType cType) throws XMLStreamException,
- EntityProviderException {
- if (FormatXml.ATOM_ENTRY.equals(cType.getParameters().get(FormatXml.ATOM_TYPE))) {
- int next = reader.nextTag();
- if (XMLStreamConstants.START_ELEMENT == next) {
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_ENTRY);
- } else {
- reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_M_2007_08, FormatXml.M_INLINE);
- }
- } else {
- throw new EntityProviderException(EntityProviderException.INVALID_INLINE_CONTENT.addContent("entry"));
+
+ private void validateEntryTags(final XMLStreamReader reader, final ContentType cType)
+ throws XMLStreamException, EntityProviderException {
+ if (!FormatXml.ATOM_ENTRY.equals(cType.getParameters()
+ .get(FormatXml.ATOM_TYPE))) {
+ throw new EntityProviderException(EntityProviderException.INVALID_INLINE_CONTENT.addContent("entry"));
+ }
+ int next = reader.nextTag();
+ if (XMLStreamConstants.START_ELEMENT == next) {
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_ENTRY);
+ } else {
+ reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_M_2007_08, FormatXml.M_INLINE);
+ }
}
- }
-
- private void validateFeedTags(final XMLStreamReader reader, final ContentType cType) throws XMLStreamException,
- EntityProviderException {
- if (FormatXml.ATOM_FEED.equals(cType.getParameters().get(FormatXml.ATOM_TYPE))) {
- int next = reader.nextTag();
- if (XMLStreamConstants.START_ELEMENT == next) {
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_FEED);
- } else {
- reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_M_2007_08, FormatXml.M_INLINE);
- }
- } else {
- throw new EntityProviderException(EntityProviderException.INVALID_INLINE_CONTENT.addContent("feed"));
+
+ private void validateFeedTags(final XMLStreamReader reader, final ContentType cType)
+ throws XMLStreamException, EntityProviderException {
+ if (!FormatXml.ATOM_FEED.equals(cType.getParameters()
+ .get(FormatXml.ATOM_TYPE))) {
+ throw new EntityProviderException(EntityProviderException.INVALID_INLINE_CONTENT.addContent("feed"));
+ }
+ int next = reader.nextTag();
+ if (XMLStreamConstants.START_ELEMENT == next) {
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_FEED);
+ } else {
+ reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_M_2007_08, FormatXml.M_INLINE);
+ }
}
- }
-
- private void readContent(final XMLStreamReader reader, final EntityInfoAggregator eia,
- final DeserializerProperties readProperties)
- throws EntityProviderException, XMLStreamException, EdmException {
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_CONTENT);
-
- final String contentType = reader.getAttributeValue(null, FormatXml.ATOM_TYPE);
- final String sourceLink = reader.getAttributeValue(null, FormatXml.ATOM_SRC);
-
- reader.nextTag();
-
- if (reader.isStartElement() && reader.getLocalName().equals(FormatXml.M_PROPERTIES)) {
- readProperties(reader, eia, readProperties);
- } else if (reader.isEndElement()) {
- reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_CONTENT);
- } else {
- throw new EntityProviderException(EntityProviderException.INVALID_STATE
- .addContent("Expected closing 'content' or starting 'properties' but found '"
- + reader.getLocalName() + "'."));
+
+ private void readContent(final XMLStreamReader reader, final EntityInfoAggregator eia, final DeserializerProperties readProperties)
+ throws EntityProviderException, XMLStreamException, EdmException {
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_CONTENT);
+
+ final String contentType = reader.getAttributeValue(null, FormatXml.ATOM_TYPE);
+ final String sourceLink = reader.getAttributeValue(null, FormatXml.ATOM_SRC);
+
+ reader.nextTag();
+
+ if (reader.isStartElement() && reader.getLocalName()
+ .equals(FormatXml.M_PROPERTIES)) {
+ readProperties(reader, eia, readProperties);
+ } else if (reader.isEndElement()) {
+ reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_CONTENT);
+ } else {
+ throw new EntityProviderException(EntityProviderException.INVALID_STATE.addContent(
+ "Expected closing 'content' or starting 'properties' but found '" + reader.getLocalName() + "'."));
+ }
+
+ mediaMetadata.setContentType(contentType);
+ mediaMetadata.setSourceLink(sourceLink);
}
- mediaMetadata.setContentType(contentType);
- mediaMetadata.setSourceLink(sourceLink);
- }
-
- private void readId(final XMLStreamReader reader) throws EntityProviderException, XMLStreamException {
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_ID);
- entryMetadata.setId(reader.getElementText());
- reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_ID);
- }
-
- private void readProperties(final XMLStreamReader reader, final EntityInfoAggregator entitySet, //NOSONAR
- final DeserializerProperties readProperties)
- throws XMLStreamException, EdmException, EntityProviderException {
- // validate namespace
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_M_2007_08, FormatXml.M_PROPERTIES);
- if (entitySet.getEntityType().hasStream()) {
- // external properties
- checkCurrentHandledStartTag(FormatXml.M_PROPERTIES);
- } else {
- // inline properties
- checkCurrentHandledStartTag(FormatXml.ATOM_CONTENT);
+ private void readId(final XMLStreamReader reader) throws EntityProviderException, XMLStreamException {
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_ID);
+ entryMetadata.setId(reader.getElementText());
+ reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_ID);
}
- EntityPropertyInfo property;
- XmlPropertyDeserializer xpc = new XmlPropertyDeserializer();
-
- String closeTag = null;
- boolean run = true;
- reader.next();
-
- while (run) {
- if (reader.isStartElement() && closeTag == null) {
- closeTag = reader.getLocalName();
- if (isEdmNamespaceProperty(reader)) {
- if (properties.containsKey(closeTag)) {
- throw new EntityProviderException(EntityProviderException.DOUBLE_PROPERTY.addContent(closeTag));
- }
- property = getValidatedPropertyInfo(entitySet, closeTag);
- final Object value = xpc.readStartedElement(reader, closeTag, property, typeMappings, readProperties);
- properties.put(closeTag, value);
- closeTag = null;
+ private void readProperties(final XMLStreamReader reader, final EntityInfoAggregator entitySet, // NOSONAR
+ final DeserializerProperties readProperties) throws XMLStreamException, EdmException, EntityProviderException {
+ // validate namespace
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_M_2007_08, FormatXml.M_PROPERTIES);
+ if (entitySet.getEntityType()
+ .hasStream()) {
+ // external properties
+ checkCurrentHandledStartTag(FormatXml.M_PROPERTIES);
+ } else {
+ // inline properties
+ checkCurrentHandledStartTag(FormatXml.ATOM_CONTENT);
}
- } else if (reader.isEndElement()) {
- if (reader.getLocalName().equals(closeTag)) {
- closeTag = null;
- } else if (Edm.NAMESPACE_M_2007_08.equals(reader.getNamespaceURI())
- && FormatXml.M_PROPERTIES.equals(reader.getLocalName())) {
- run = false;
+
+ EntityPropertyInfo property;
+ XmlPropertyDeserializer xpc = new XmlPropertyDeserializer();
+
+ String closeTag = null;
+ boolean run = true;
+ reader.next();
+
+ while (run) {
+ if (reader.isStartElement() && closeTag == null) {
+ closeTag = reader.getLocalName();
+ if (isEdmNamespaceProperty(reader)) {
+ if (properties.containsKey(closeTag)) {
+ throw new EntityProviderException(EntityProviderException.DOUBLE_PROPERTY.addContent(closeTag));
+ }
+ property = getValidatedPropertyInfo(entitySet, closeTag);
+ final Object value = xpc.readStartedElement(reader, closeTag, property, typeMappings, readProperties);
+ properties.put(closeTag, value);
+ closeTag = null;
+ }
+ } else if (reader.isEndElement()) {
+ if (reader.getLocalName()
+ .equals(closeTag)) {
+ closeTag = null;
+ } else if (Edm.NAMESPACE_M_2007_08.equals(reader.getNamespaceURI())
+ && FormatXml.M_PROPERTIES.equals(reader.getLocalName())) {
+ run = false;
+ }
+ }
+ reader.next();
}
- }
- reader.next();
}
- }
-
- /**
- * Check if the {@link #currentHandledStartTagName} is the same as the <code>expectedTagName</code>.
- * If tag name is not as expected or if {@link #currentHandledStartTagName} is not set an
- * {@link EntityProviderException} is thrown.
- *
- * @param expectedTagName expected name for {@link #currentHandledStartTagName}
- * @throws EntityProviderException if tag name is not as expected or if {@link #currentHandledStartTagName} is
- * <code>NULL</code>.
- */
- private void checkCurrentHandledStartTag(final String expectedTagName) throws EntityProviderException {
- if (currentHandledStartTagName == null) {
- throw new EntityProviderException(EntityProviderException.INVALID_STATE
- .addContent("No current handled start tag name set."));
- } else if (!currentHandledStartTagName.equals(expectedTagName)) {
- throw new EntityProviderException(EntityProviderException.INVALID_PARENT_TAG.addContent(expectedTagName)
- .addContent(currentHandledStartTagName));
+
+ /**
+ * Check if the {@link #currentHandledStartTagName} is the same as the <code>expectedTagName</code>.
+ * If tag name is not as expected or if {@link #currentHandledStartTagName} is not set an
+ * {@link EntityProviderException} is thrown.
+ *
+ * @param expectedTagName expected name for {@link #currentHandledStartTagName}
+ * @throws EntityProviderException if tag name is not as expected or if
+ * {@link #currentHandledStartTagName} is <code>NULL</code>.
+ */
+ private void checkCurrentHandledStartTag(final String expectedTagName) throws EntityProviderException {
+ if (currentHandledStartTagName == null) {
+ throw new EntityProviderException(EntityProviderException.INVALID_STATE.addContent("No current handled start tag name set."));
+ }
+ if (!currentHandledStartTagName.equals(expectedTagName)) {
+ throw new EntityProviderException(EntityProviderException.INVALID_PARENT_TAG.addContent(expectedTagName)
+ .addContent(currentHandledStartTagName));
+ }
}
- }
-
- /**
- * Checks if property of currently read tag in {@link XMLStreamReader} is defined in
- * <code>edm properties namespace</code> {@value Edm#NAMESPACE_D_2007_08}.
- *
- * If no namespace uri definition is found for namespace prefix of property (<code>tag</code>) an exception is thrown.
- *
- * @param reader {@link XMLStreamReader} with position at to checked tag
- * @return <code>true</code> if property is in <code>edm properties namespace</code>, otherwise <code>false</code>.
- * @throws EntityProviderException If no namespace uri definition is found for namespace prefix of property
- * (<code>tag</code>).
- */
- private boolean isEdmNamespaceProperty(final XMLStreamReader reader) throws EntityProviderException {
- final String nsUri = reader.getNamespaceURI();
- if (nsUri == null) {
- throw new EntityProviderException(EntityProviderException.INVALID_NAMESPACE.addContent(reader.getLocalName()));
- } else {
- return Edm.NAMESPACE_D_2007_08.equals(nsUri);
+
+ /**
+ * Checks if property of currently read tag in {@link XMLStreamReader} is defined in
+ * <code>edm properties namespace</code> {@value Edm#NAMESPACE_D_2007_08}.
+ *
+ * If no namespace uri definition is found for namespace prefix of property (<code>tag</code>) an
+ * exception is thrown.
+ *
+ * @param reader {@link XMLStreamReader} with position at to checked tag
+ * @return <code>true</code> if property is in <code>edm properties namespace</code>, otherwise
+ * <code>false</code>.
+ * @throws EntityProviderException If no namespace uri definition is found for namespace prefix of
+ * property (<code>tag</code>).
+ */
+ private boolean isEdmNamespaceProperty(final XMLStreamReader reader) throws EntityProviderException {
+ final String nsUri = reader.getNamespaceURI();
+ if (nsUri == null) {
+ throw new EntityProviderException(EntityProviderException.INVALID_NAMESPACE.addContent(reader.getLocalName()));
+ }
+ return Edm.NAMESPACE_D_2007_08.equals(nsUri);
}
- }
-
- /**
- * Get validated {@link EntityPropertyInfo} for property with given <code>name</code>.
- * If validation fails an {@link EntityProviderException} is thrown.
- *
- * Currently this is the case if no {@link EntityPropertyInfo} if found for given <code>name</code>.
- *
- * @param entitySet
- * @param name
- * @return valid {@link EntityPropertyInfo} (which is never <code>NULL</code>).
- * @throws EntityProviderException
- */
- private EntityPropertyInfo getValidatedPropertyInfo(final EntityInfoAggregator entitySet, final String name)
- throws EntityProviderException {
- EntityPropertyInfo info = entitySet.getPropertyInfo(name);
- if (info == null) {
- throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY.addContent(name));
+
+ /**
+ * Get validated {@link EntityPropertyInfo} for property with given <code>name</code>. If validation
+ * fails an {@link EntityProviderException} is thrown.
+ *
+ * Currently this is the case if no {@link EntityPropertyInfo} if found for given <code>name</code>.
+ *
+ * @param entitySet
+ * @param name
+ * @return valid {@link EntityPropertyInfo} (which is never <code>NULL</code>).
+ * @throws EntityProviderException
+ */
+ private EntityPropertyInfo getValidatedPropertyInfo(final EntityInfoAggregator entitySet, final String name)
+ throws EntityProviderException {
+ EntityPropertyInfo info = entitySet.getPropertyInfo(name);
+ if (info == null) {
+ throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY.addContent(name));
+ }
+ return info;
}
- return info;
- }
}
diff --git a/odata2-lib/odata-client-core/src/main/java/org/apache/olingo/odata2/client/core/ep/deserializer/XmlPropertyDeserializer.java b/odata2-lib/odata-client-core/src/main/java/org/apache/olingo/odata2/client/core/ep/deserializer/XmlPropertyDeserializer.java
index 53370bc3..f6745bbf 100644
--- a/odata2-lib/odata-client-core/src/main/java/org/apache/olingo/odata2/client/core/ep/deserializer/XmlPropertyDeserializer.java
+++ b/odata2-lib/odata-client-core/src/main/java/org/apache/olingo/odata2/client/core/ep/deserializer/XmlPropertyDeserializer.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.client.core.ep.deserializer;
@@ -23,13 +19,12 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-
import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.edm.EdmException;
+import org.apache.olingo.odata2.api.edm.EdmFacets;
import org.apache.olingo.odata2.api.edm.EdmLiteralKind;
import org.apache.olingo.odata2.api.edm.EdmProperty;
import org.apache.olingo.odata2.api.edm.EdmSimpleType;
@@ -47,153 +42,154 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
*/
public class XmlPropertyDeserializer {
- protected static final String TRUE = "true";
- protected static final String FALSE = "false";
-
- /**
- * Read property of every entry in a payload
- * @param reader
- * @param property
- * @param readProperties
- * @return Map<String, Object>
- * @throws EntityProviderException
- */
- public Map<String, Object> readProperty(final XMLStreamReader reader, final EdmProperty property,
- final DeserializerProperties readProperties) throws EntityProviderException {
- return readProperty(reader, EntityInfoAggregator.create(property), readProperties);
- }
-
- /**
- * Read property of every entry in a payload
- * @param reader
- * @param propertyInfo
- * @param readProperties
- * @return Map<String, Object>
- * @throws EntityProviderException
- */
- public Map<String, Object> readProperty(final XMLStreamReader reader, final EntityPropertyInfo propertyInfo,
- final DeserializerProperties readProperties) throws EntityProviderException {
- final EntityTypeMapping typeMappings =
- EntityTypeMapping.create(readProperties == null ? Collections.<String, Object> emptyMap() :
- readProperties.getTypeMappings());
- try {
- reader.next();
-
- Object value = readStartedElement(reader, propertyInfo.getName(), propertyInfo, typeMappings, readProperties);
-
- Map<String, Object> result = new HashMap<String, Object>();
- result.put(propertyInfo.getName(), value);
- return result;
- } catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
- .getSimpleName()), e);
- } catch (EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
- .getSimpleName()), e);
+ protected static final String TRUE = "true";
+ protected static final String FALSE = "false";
+
+ /**
+ * Read property of every entry in a payload
+ *
+ * @param reader
+ * @param property
+ * @param readProperties
+ * @return Map<String, Object>
+ * @throws EntityProviderException
+ */
+ public Map<String, Object> readProperty(final XMLStreamReader reader, final EdmProperty property,
+ final DeserializerProperties readProperties) throws EntityProviderException {
+ return readProperty(reader, EntityInfoAggregator.create(property), readProperties);
}
- }
-
- /**
- * Deserializes a collection of entities
- * @param reader
- * @param info
- * @param properties
- * @return List<Object>
- * @throws EntityProviderException
- */
- public List<Object> readCollection(XMLStreamReader reader, final EntityPropertyInfo info,
- final DeserializerProperties properties) throws EntityProviderException {
- final String collectionName = info.getName();
- final EntityTypeMapping typeMappings = EntityTypeMapping.create(
- properties == null || !properties.getTypeMappings().containsKey(collectionName) ?
- Collections.<String, Object> emptyMap() :
- Collections.<String, Object> singletonMap(FormatXml.D_ELEMENT,
- properties.getTypeMappings().get(collectionName)));
- List<Object> result = new ArrayList<Object>();
- try {
- reader.nextTag();
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_D_2007_08, collectionName);
- reader.nextTag();
- while (reader.isStartElement()) {
- result.add(readStartedElement(reader, FormatXml.D_ELEMENT, info, typeMappings, properties));
- reader.nextTag();
- }
- reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_D_2007_08, collectionName);
- reader.next();
- reader.require(XMLStreamConstants.END_DOCUMENT, null, null);
- return result;
- } catch (final XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED
- .addContent(e.getClass().getSimpleName()), e);
- } catch (final EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED
- .addContent(e.getClass().getSimpleName()), e);
+ /**
+ * Read property of every entry in a payload
+ *
+ * @param reader
+ * @param propertyInfo
+ * @param readProperties
+ * @return Map<String, Object>
+ * @throws EntityProviderException
+ */
+ public Map<String, Object> readProperty(final XMLStreamReader reader, final EntityPropertyInfo propertyInfo,
+ final DeserializerProperties readProperties) throws EntityProviderException {
+ final EntityTypeMapping typeMappings = EntityTypeMapping.create(
+ readProperties == null ? Collections.<String, Object>emptyMap() : readProperties.getTypeMappings());
+ try {
+ reader.next();
+
+ Object value = readStartedElement(reader, propertyInfo.getName(), propertyInfo, typeMappings, readProperties);
+
+ Map<String, Object> result = new HashMap<String, Object>();
+ result.put(propertyInfo.getName(), value);
+ return result;
+ } catch (XMLStreamException | EdmException e) {
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()),
+ e);
+ }
}
- }
- protected Object readStartedElement(XMLStreamReader reader, final String name, //NOSONAR
- final EntityPropertyInfo propertyInfo,
- final EntityTypeMapping typeMappings, final DeserializerProperties readProperties)
- throws EntityProviderException, EdmException {
- Object result = null;
-
- try {
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_D_2007_08, name);
- final String nullAttribute = reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, FormatXml.M_NULL);
-
- if (!(nullAttribute == null || TRUE.equals(nullAttribute) || FALSE.equals(nullAttribute))) {
- throw new EntityProviderException(EntityProviderException.COMMON);
- }
-
- if (TRUE.equals(nullAttribute)) {
- if ((readProperties == null || readProperties.isValidatingFacets()) && propertyInfo.isMandatory()) {
- throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY_VALUE.addContent(name));
- }
- reader.nextTag();
- } else if (propertyInfo.isComplex()) {
- final String typeAttribute = reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, FormatXml.M_TYPE);
- if (typeAttribute != null) {
- final String expectedTypeAttributeValue =
- propertyInfo.getType().getNamespace() + Edm.DELIMITER + propertyInfo.getType().getName();
- if (!expectedTypeAttributeValue.equals(typeAttribute)) { //NOSONAR
- throw new EntityProviderException(EntityProviderException.INVALID_COMPLEX_TYPE.addContent(
- expectedTypeAttributeValue).addContent(typeAttribute));
- }
+ /**
+ * Deserializes a collection of entities
+ *
+ * @param reader
+ * @param info
+ * @param properties
+ * @return List<Object>
+ * @throws EntityProviderException
+ */
+ public List<Object> readCollection(XMLStreamReader reader, final EntityPropertyInfo info, final DeserializerProperties properties)
+ throws EntityProviderException {
+ final String collectionName = info.getName();
+ final EntityTypeMapping typeMappings = EntityTypeMapping.create(properties == null || !properties.getTypeMappings()
+ .containsKey(collectionName)
+ ? Collections.<String, Object>emptyMap()
+ : Collections.<String, Object>singletonMap(
+ FormatXml.D_ELEMENT,
+ properties.getTypeMappings()
+ .get(collectionName)));
+ List<Object> result = new ArrayList<Object>();
+ try {
+ reader.nextTag();
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_D_2007_08, collectionName);
+ reader.nextTag();
+ while (reader.isStartElement()) {
+ result.add(readStartedElement(reader, FormatXml.D_ELEMENT, info, typeMappings, properties));
+ reader.nextTag();
+ }
+ reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_D_2007_08, collectionName);
+ reader.next();
+ reader.require(XMLStreamConstants.END_DOCUMENT, null, null);
+ return result;
+ } catch (final XMLStreamException | EdmException e) {
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()),
+ e);
}
+ }
- reader.nextTag();
- Map<String, Object> name2Value = new HashMap<String, Object>();
- while (reader.hasNext() && !reader.isEndElement()) {
- final String childName = reader.getLocalName();
- final EntityPropertyInfo childProperty =
- ((EntityComplexPropertyInfo) propertyInfo).getPropertyInfo(childName);
- if (childProperty == null) { //NOSONAR
- throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY.addContent(childName));
- }
- final Object value = readStartedElement(reader, childName, childProperty,
- typeMappings.getEntityTypeMapping(name), readProperties);
- name2Value.put(childName, value);
- reader.nextTag();
+ protected Object readStartedElement(XMLStreamReader reader, final String name, // NOSONAR
+ final EntityPropertyInfo propertyInfo, final EntityTypeMapping typeMappings, final DeserializerProperties readProperties)
+ throws EntityProviderException, EdmException {
+ Object result = null;
+
+ try {
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_D_2007_08, name);
+ final String nullAttribute = reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, FormatXml.M_NULL);
+
+ if (((nullAttribute != null) && !TRUE.equals(nullAttribute) && !FALSE.equals(nullAttribute))) {
+ throw new EntityProviderException(EntityProviderException.COMMON);
+ }
+
+ if (TRUE.equals(nullAttribute)) {
+ if ((readProperties == null || readProperties.isValidatingFacets()) && propertyInfo.isMandatory()) {
+ throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY_VALUE.addContent(name));
+ }
+ reader.nextTag();
+ } else if (propertyInfo.isComplex()) {
+ final String typeAttribute = reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, FormatXml.M_TYPE);
+ if (typeAttribute != null) {
+ final String expectedTypeAttributeValue = propertyInfo.getType()
+ .getNamespace()
+ + Edm.DELIMITER + propertyInfo.getType()
+ .getName();
+ if (!expectedTypeAttributeValue.equals(typeAttribute)) { // NOSONAR
+ throw new EntityProviderException(
+ EntityProviderException.INVALID_COMPLEX_TYPE.addContent(expectedTypeAttributeValue)
+ .addContent(typeAttribute));
+ }
+ }
+
+ reader.nextTag();
+ Map<String, Object> name2Value = new HashMap<String, Object>();
+ while (reader.hasNext() && !reader.isEndElement()) {
+ final String childName = reader.getLocalName();
+ final EntityPropertyInfo childProperty = ((EntityComplexPropertyInfo) propertyInfo).getPropertyInfo(childName);
+ if (childProperty == null) { // NOSONAR
+ throw new EntityProviderException(EntityProviderException.INVALID_PROPERTY.addContent(childName));
+ }
+ final Object value =
+ readStartedElement(reader, childName, childProperty, typeMappings.getEntityTypeMapping(name), readProperties);
+ name2Value.put(childName, value);
+ reader.nextTag();
+ }
+ result = name2Value;
+ } else {
+ result = convert(propertyInfo, reader.getElementText(), typeMappings.getMappingClass(name), readProperties);
+ }
+ reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_D_2007_08, name);
+
+ return result;
+ } catch (XMLStreamException e) {
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()),
+ e);
}
- result = name2Value;
- } else {
- result = convert(propertyInfo, reader.getElementText(), typeMappings.getMappingClass(name), readProperties);
- }
- reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_D_2007_08, name);
-
- return result;
- } catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
- .getSimpleName()), e);
}
- }
- private Object convert(final EntityPropertyInfo property, final String value, final Class<?> typeMapping,
- final DeserializerProperties readProperties) throws EdmSimpleTypeException {
- final EdmSimpleType type = (EdmSimpleType) property.getType();
- return type.valueOfString(value, EdmLiteralKind.DEFAULT,
- readProperties == null || readProperties.isValidatingFacets() ? property.getFacets() : null,
- typeMapping == null ? type.getDefaultType() : typeMapping);
- }
+ private Object convert(final EntityPropertyInfo property, final String value, Class<?> typeMapping,
+ final DeserializerProperties readProperties) throws EdmSimpleTypeException {
+ final EdmSimpleType type = (EdmSimpleType) property.getType();
+ EdmFacets facets = readProperties == null || readProperties.isValidatingFacets() ? property.getFacets() : null;
+ typeMapping = typeMapping == null ? type.getDefaultType() : typeMapping;
+ return type.valueOfString(value, EdmLiteralKind.DEFAULT, facets, typeMapping);
+ }
}
diff --git a/src/checkstyle/config.xml b/src/checkstyle/config.xml
index 2d4e1697..351d8014 100644
--- a/src/checkstyle/config.xml
+++ b/src/checkstyle/config.xml
@@ -67,7 +67,7 @@
<property name="severity" value="warning"/>
</module>
<module name="LineLength">
- <property name="max" value="120"/>
+ <property name="max" value="160"/>
</module>
</module>
<module name="SuppressionCommentFilter"/>
(olingo-odata2) 25/29: adapt test
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 45dd46244800327a838e034f41c669489b33d547
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 16:48:33 2023 +0200
adapt test
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.../olingo/odata2/fit/basic/BasicHttpTest.java | 543 +++++++++++----------
1 file changed, 287 insertions(+), 256 deletions(-)
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
index c424752f..daa4655d 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.fit.basic;
@@ -24,15 +20,17 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-
import java.io.IOException;
import java.net.URI;
-
-import jakarta.ws.rs.HttpMethod;
-
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.*;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpHead;
+import org.apache.http.client.methods.HttpOptions;
+import org.apache.http.client.methods.HttpPatch;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.StringEntity;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
@@ -49,245 +47,278 @@ import org.apache.olingo.odata2.testutil.helper.HttpSomethingUnsupported;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Test;
+import jakarta.ws.rs.HttpMethod;
/**
- *
+ *
*/
public class BasicHttpTest extends AbstractBasicTest {
- public BasicHttpTest(final ServletType servletType) {
- super(servletType);
- }
-
- @Override
- protected ODataSingleProcessor createProcessor() throws ODataException {
- final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
- when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class)))
- .thenReturn(ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
- when(
- ((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class),
- any(String.class)))
- .thenReturn(ODataResponse.entity("service document").status(HttpStatusCodes.OK).build());
- return processor;
- }
-
- @Test
- public void getServiceDocument() throws Exception {
- final HttpResponse response = executeGetRequest("/");
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
- assertEquals("service document", StringHelper.inputStreamToString(response.getEntity().getContent()));
- }
-
- @Test
- public void getServiceDocumentWithRedirect() throws Exception {
- final HttpResponse response = executeGetRequest("");
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
- assertEquals("service document", StringHelper.inputStreamToString(response.getEntity().getContent()));
- }
-
- @Test
- public void get() throws Exception {
- HttpResponse response = executeGetRequest("$metadata");
-
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
- assertEquals("metadata", StringHelper.inputStreamToString(response.getEntity().getContent()));
-
- response = executeGetRequest("//////$metadata");
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
- StringHelper.inputStreamToString(response.getEntity().getContent());
- response = executeGetRequest("/./$metadata");
- assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine().getStatusCode());
- StringHelper.inputStreamToString(response.getEntity().getContent());
- response = executeGetRequest("$metadata/./");
- assertEquals(HttpStatusCodes.BAD_REQUEST.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
- @Test
- public void head() throws Exception {
- HttpResponse response = executeHeadRequest("/");
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
- assertNull(response.getEntity());
-
- response = executeHeadRequest("$metadata");
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
- assertNull(response.getEntity());
-
- response = executeHeadRequest("//////$metadata");
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
- assertNull(response.getEntity());
- response = executeHeadRequest("/./$metadata");
- assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine().getStatusCode());
- assertNull(response.getEntity());
- response = executeHeadRequest("$metadata/./");
- assertEquals(HttpStatusCodes.BAD_REQUEST.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
-
- @Test
- public void put() throws Exception {
- final HttpPut put = new HttpPut(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
- final HttpResponse response = getHttpClient().execute(put);
-
- assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine().getStatusCode());
- final String payload = StringHelper.inputStreamToString(response.getEntity().getContent());
- assertTrue(payload.contains("error"));
- }
-
- @Test
- public void putWithContent() throws Exception {
- final HttpPut put = new HttpPut(URI.create(getEndpoint().toString()));
- final String xml =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<entry xmlns=\"" + Edm.NAMESPACE_ATOM_2005 + "\"" +
- " xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\"" +
- " xmlns:d=\"" + Edm.NAMESPACE_D_2007_08 + "\"" +
- " xml:base=\"https://server.at.some.domain.com/path.to.some.service/ReferenceScenario.svc/\">" +
- "</entry>";
- final HttpEntity entity = new StringEntity(xml);
- put.setEntity(entity);
- final HttpResponse response = getHttpClient().execute(put);
-
- assertEquals(HttpStatusCodes.METHOD_NOT_ALLOWED.getStatusCode(), response.getStatusLine().getStatusCode());
- final String payload = StringHelper.inputStreamToString(response.getEntity().getContent());
- assertTrue(payload.contains("error"));
- }
-
- @Test
- public void postMethodNotAllowedWithContent() throws Exception {
- final HttpPost post = new HttpPost(URI.create(getEndpoint().toString()));
- final String xml =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<entry xmlns=\"" + Edm.NAMESPACE_ATOM_2005 + "\"" +
- " xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\"" +
- " xmlns:d=\"" + Edm.NAMESPACE_D_2007_08 + "\"" +
- " xml:base=\"https://server.at.some.domain.com/path.to.some.service/ReferenceScenario.svc/\">" +
- "</entry>";
- final HttpEntity entity = new StringEntity(xml);
- post.setEntity(entity);
- final HttpResponse response = getHttpClient().execute(post);
-
- assertEquals(HttpStatusCodes.METHOD_NOT_ALLOWED.getStatusCode(), response.getStatusLine().getStatusCode());
- final String payload = StringHelper.inputStreamToString(response.getEntity().getContent());
- assertTrue(payload.contains("error"));
- }
-
- @Test
- public void postNotFound() throws Exception {
- final HttpPost post = new HttpPost(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
- final HttpResponse response = getHttpClient().execute(post);
-
- assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine().getStatusCode());
- final String payload = StringHelper.inputStreamToString(response.getEntity().getContent());
- assertTrue(payload.contains("error"));
- }
-
- @Test
- public void delete() throws Exception {
- final HttpDelete delete = new HttpDelete(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
- final HttpResponse response = getHttpClient().execute(delete);
-
- assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine().getStatusCode());
- final String payload = StringHelper.inputStreamToString(response.getEntity().getContent());
- assertTrue(payload.contains("error"));
- }
-
- @Test
- public void merge() throws Exception {
- final HttpMerge merge = new HttpMerge(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
- final HttpResponse response = getHttpClient().execute(merge);
-
- assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine().getStatusCode());
- final String payload = StringHelper.inputStreamToString(response.getEntity().getContent());
- assertTrue(payload.contains("error"));
- }
-
- @Test
- public void patch() throws Exception {
- HttpPatch get = new HttpPatch(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
- final HttpResponse response = getHttpClient().execute(get);
-
- assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine().getStatusCode());
- final String payload = StringHelper.inputStreamToString(response.getEntity().getContent());
- assertTrue(payload.contains("error"));
- }
-
- @Test
- public void unsupportedMethod() throws Exception {
- HttpResponse response = getHttpClient().execute(new HttpOptions(getEndpoint()));
- assertEquals(HttpStatusCodes.NOT_IMPLEMENTED.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
- @Test
- public void unknownMethod() throws Exception {
- HttpSomethingUnsupported request = new HttpSomethingUnsupported(getEndpoint() + "aaa/bbb/ccc");
- final HttpResponse response = getHttpClient().execute(request);
- assertEquals(HttpStatusCodes.NOT_IMPLEMENTED.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
- @Test
- public void tunneledByPost() throws Exception {
- tunnelPost("X-HTTP-Method", ODataHttpMethod.MERGE);
- tunnelPost("X-HTTP-Method", ODataHttpMethod.PATCH);
- tunnelPost("X-HTTP-Method", ODataHttpMethod.DELETE);
- tunnelPost("X-HTTP-Method", ODataHttpMethod.PUT);
- tunnelPost("X-HTTP-Method", ODataHttpMethod.GET);
- tunnelPost("X-HTTP-Method", ODataHttpMethod.POST);
- tunnelPost("X-HTTP-Method", "HEAD", HttpStatusCodes.NOT_FOUND);
-
- tunnelPost("X-HTTP-Method-Override", ODataHttpMethod.MERGE);
- tunnelPost("X-HTTP-Method-Override", ODataHttpMethod.PATCH);
- tunnelPost("X-HTTP-Method-Override", ODataHttpMethod.DELETE);
- tunnelPost("X-HTTP-Method-Override", ODataHttpMethod.PUT);
- tunnelPost("X-HTTP-Method-Override", ODataHttpMethod.GET);
- tunnelPost("X-HTTP-Method-Override", ODataHttpMethod.POST);
- tunnelPost("X-HTTP-Method-Override", "HEAD", HttpStatusCodes.NOT_FOUND);
- }
-
- private void tunnelPost(final String header, final ODataHttpMethod method) throws IOException {
- tunnelPost(header, method.toString(), HttpStatusCodes.NOT_FOUND);
- }
-
- private void tunnelPost(final String header, final String method, final HttpStatusCodes expectedStatus)
- throws IOException {
- HttpPost post = new HttpPost(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
- post.setHeader(header, method);
- final HttpResponse response = getHttpClient().execute(post);
- assertEquals(expectedStatus.getStatusCode(), response.getStatusLine().getStatusCode());
-
- final String payload = StringHelper.inputStreamToString(response.getEntity().getContent());
- assertTrue(payload.contains("error"));
- }
-
- @Test
- public void tunneledBadRequest() throws Exception {
- final HttpPost post = new HttpPost(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
- post.setHeader("X-HTTP-Method", "MERGE");
- post.setHeader("X-HTTP-Method-Override", "PATCH");
- final HttpResponse response = getHttpClient().execute(post);
- assertEquals(HttpStatusCodes.BAD_REQUEST.getStatusCode(), response.getStatusLine().getStatusCode());
-
- final String payload = StringHelper.inputStreamToString(response.getEntity().getContent());
- assertTrue(payload.contains("error"));
- }
-
- @Test
- public void tunneledUnsupportedMethod() throws Exception {
- tunnelPost("X-HTTP-Method", HttpMethod.OPTIONS, HttpStatusCodes.NOT_IMPLEMENTED);
- tunnelPost("X-HTTP-Method-Override", HttpMethod.OPTIONS, HttpStatusCodes.NOT_IMPLEMENTED);
- }
-
- @Test
- public void tunneledUnknownMethod() throws Exception {
- tunnelPost("X-HTTP-Method", "xxx", HttpStatusCodes.NOT_IMPLEMENTED);
- }
-
- @Test
- public void tunneledUnknownMethodOverride() throws Exception {
- tunnelPost("X-HTTP-Method-Override", "xxx", HttpStatusCodes.NOT_IMPLEMENTED);
- }
-
- protected HttpResponse executeHeadRequest(final String request) throws IOException {
- final HttpHead head = new HttpHead(URI.create(getEndpoint().toString() + request));
- return getHttpClient().execute(head);
- }
+ public BasicHttpTest(final ServletType servletType) {
+ super(servletType);
+ }
+
+ @Override
+ protected ODataSingleProcessor createProcessor() throws ODataException {
+ final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
+ when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(
+ ODataResponse.entity("metadata")
+ .status(HttpStatusCodes.OK)
+ .build());
+ when(((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class),
+ any(String.class))).thenReturn(ODataResponse.entity("service document")
+ .status(HttpStatusCodes.OK)
+ .build());
+ return processor;
+ }
+
+ @Test
+ public void getServiceDocument() throws Exception {
+ final HttpResponse response = executeGetRequest("/");
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ assertEquals("service document", StringHelper.inputStreamToString(response.getEntity()
+ .getContent()));
+ }
+
+ @Test
+ public void getServiceDocumentWithRedirect() throws Exception {
+ final HttpResponse response = executeGetRequest("");
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ assertEquals("service document", StringHelper.inputStreamToString(response.getEntity()
+ .getContent()));
+ }
+
+ @Test
+ public void get() throws Exception {
+ HttpResponse response = executeGetRequest("$metadata");
+
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ assertEquals("metadata", StringHelper.inputStreamToString(response.getEntity()
+ .getContent()));
+
+ response = executeGetRequest("//////$metadata");
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ response = executeGetRequest("/./$metadata");
+ assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ response = executeGetRequest("$metadata/./");
+ assertEquals(HttpStatusCodes.BAD_REQUEST.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
+
+ @Test
+ public void head() throws Exception {
+ HttpResponse response = executeHeadRequest("/");
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ assertNull(response.getEntity());
+
+ response = executeHeadRequest("$metadata");
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ assertNull(response.getEntity());
+
+ response = executeHeadRequest("//////$metadata");
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ assertNull(response.getEntity());
+ response = executeHeadRequest("/./$metadata");
+ assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ assertNull(response.getEntity());
+ response = executeHeadRequest("$metadata/./");
+ assertEquals(HttpStatusCodes.BAD_REQUEST.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
+
+
+ @Test
+ public void put() throws Exception {
+ final HttpPut put = new HttpPut(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
+ final HttpResponse response = getHttpClient().execute(put);
+
+ assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ final String payload = StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ assertTrue(payload.contains("error"));
+ }
+
+ @Test
+ public void putWithContent() throws Exception {
+ final HttpPut put = new HttpPut(URI.create(getEndpoint().toString()));
+ final String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<entry xmlns=\"" + Edm.NAMESPACE_ATOM_2005 + "\"" + " xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08 + "\"" + " xmlns:d=\"" + Edm.NAMESPACE_D_2007_08 + "\""
+ + " xml:base=\"https://server.at.some.domain.com/path.to.some.service/ReferenceScenario.svc/\">" + "</entry>";
+ final HttpEntity entity = new StringEntity(xml);
+ put.setEntity(entity);
+ final HttpResponse response = getHttpClient().execute(put);
+
+ assertEquals(HttpStatusCodes.METHOD_NOT_ALLOWED.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ final String payload = StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ assertTrue(payload.contains("error"));
+ }
+
+ @Test
+ public void postMethodNotAllowedWithContent() throws Exception {
+ final HttpPost post = new HttpPost(URI.create(getEndpoint().toString()));
+ final String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<entry xmlns=\"" + Edm.NAMESPACE_ATOM_2005 + "\"" + " xmlns:m=\""
+ + Edm.NAMESPACE_M_2007_08 + "\"" + " xmlns:d=\"" + Edm.NAMESPACE_D_2007_08 + "\""
+ + " xml:base=\"https://server.at.some.domain.com/path.to.some.service/ReferenceScenario.svc/\">" + "</entry>";
+ final HttpEntity entity = new StringEntity(xml);
+ post.setEntity(entity);
+ final HttpResponse response = getHttpClient().execute(post);
+
+ assertEquals(HttpStatusCodes.METHOD_NOT_ALLOWED.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ final String payload = StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ assertTrue(payload.contains("error"));
+ }
+
+ @Test
+ public void postNotFound() throws Exception {
+ final HttpPost post = new HttpPost(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
+ final HttpResponse response = getHttpClient().execute(post);
+
+ assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ final String payload = StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ assertTrue(payload.contains("error"));
+ }
+
+ @Test
+ public void delete() throws Exception {
+ final HttpDelete delete = new HttpDelete(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
+ final HttpResponse response = getHttpClient().execute(delete);
+
+ assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ final String payload = StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ assertTrue(payload.contains("error"));
+ }
+
+ @Test
+ public void merge() throws Exception {
+ final HttpMerge merge = new HttpMerge(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
+ final HttpResponse response = getHttpClient().execute(merge);
+
+ assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ final String payload = StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ assertTrue(payload.contains("error"));
+ }
+
+ @Test
+ public void patch() throws Exception {
+ HttpPatch get = new HttpPatch(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
+ final HttpResponse response = getHttpClient().execute(get);
+
+ assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ final String payload = StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ assertTrue(payload.contains("error"));
+ }
+
+ @Test
+ public void unsupportedMethod() throws Exception {
+ URI endpoint = getEndpoint();
+ HttpOptions options = new HttpOptions(endpoint);
+ HttpClient httpClient = getHttpClient();
+ HttpResponse response = httpClient.execute(options);
+ assertEquals(HttpStatusCodes.NOT_IMPLEMENTED.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
+
+ @Test
+ public void unknownMethod() throws Exception {
+ HttpSomethingUnsupported request = new HttpSomethingUnsupported(getEndpoint() + "aaa/bbb/ccc");
+ final HttpResponse response = getHttpClient().execute(request);
+ assertEquals(HttpStatusCodes.NOT_IMPLEMENTED.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
+
+ @Test
+ public void tunneledByPost() throws Exception {
+ tunnelPost("X-HTTP-Method", ODataHttpMethod.MERGE);
+ tunnelPost("X-HTTP-Method", ODataHttpMethod.PATCH);
+ tunnelPost("X-HTTP-Method", ODataHttpMethod.DELETE);
+ tunnelPost("X-HTTP-Method", ODataHttpMethod.PUT);
+ tunnelPost("X-HTTP-Method", ODataHttpMethod.GET);
+ tunnelPost("X-HTTP-Method", ODataHttpMethod.POST);
+ tunnelPost("X-HTTP-Method", "HEAD", HttpStatusCodes.NOT_FOUND);
+
+ tunnelPost("X-HTTP-Method-Override", ODataHttpMethod.MERGE);
+ tunnelPost("X-HTTP-Method-Override", ODataHttpMethod.PATCH);
+ tunnelPost("X-HTTP-Method-Override", ODataHttpMethod.DELETE);
+ tunnelPost("X-HTTP-Method-Override", ODataHttpMethod.PUT);
+ tunnelPost("X-HTTP-Method-Override", ODataHttpMethod.GET);
+ tunnelPost("X-HTTP-Method-Override", ODataHttpMethod.POST);
+ tunnelPost("X-HTTP-Method-Override", "HEAD", HttpStatusCodes.NOT_FOUND);
+ }
+
+ private void tunnelPost(final String header, final ODataHttpMethod method) throws IOException {
+ tunnelPost(header, method.toString(), HttpStatusCodes.NOT_FOUND);
+ }
+
+ private void tunnelPost(final String header, final String method, final HttpStatusCodes expectedStatus) throws IOException {
+ HttpPost post = new HttpPost(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
+ post.setHeader(header, method);
+ final HttpResponse response = getHttpClient().execute(post);
+ assertEquals(expectedStatus.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+
+ final String payload = StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ assertTrue(payload.contains("error"));
+ }
+
+ @Test
+ public void tunneledBadRequest() throws Exception {
+ final HttpPost post = new HttpPost(URI.create(getEndpoint().toString() + "aaa/bbb/ccc"));
+ post.setHeader("X-HTTP-Method", "MERGE");
+ post.setHeader("X-HTTP-Method-Override", "PATCH");
+ final HttpResponse response = getHttpClient().execute(post);
+ assertEquals(HttpStatusCodes.BAD_REQUEST.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+
+ final String payload = StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ assertTrue(payload.contains("error"));
+ }
+
+ @Test
+ public void tunneledUnsupportedMethod() throws Exception {
+ tunnelPost("X-HTTP-Method", HttpMethod.OPTIONS, HttpStatusCodes.NOT_IMPLEMENTED);
+ tunnelPost("X-HTTP-Method-Override", HttpMethod.OPTIONS, HttpStatusCodes.NOT_IMPLEMENTED);
+ }
+
+ @Test
+ public void tunneledUnknownMethod() throws Exception {
+ tunnelPost("X-HTTP-Method", "xxx", HttpStatusCodes.NOT_IMPLEMENTED);
+ }
+
+ @Test
+ public void tunneledUnknownMethodOverride() throws Exception {
+ tunnelPost("X-HTTP-Method-Override", "xxx", HttpStatusCodes.NOT_IMPLEMENTED);
+ }
+
+ protected HttpResponse executeHeadRequest(final String request) throws IOException {
+ final HttpHead head = new HttpHead(URI.create(getEndpoint().toString() + request));
+ return getHttpClient().execute(head);
+ }
}
(olingo-odata2) 11/29: version set to 3.0.1 for release
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 8c3e956573a1ccc8a7b94866f418f60f6a417200
Author: iliyan-velichkov <il...@users.noreply.github.com>
AuthorDate: Wed Dec 13 09:07:10 2023 +0000
version set to 3.0.1 for release
---
odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-core/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
odata2-annotation-processor/pom.xml | 2 +-
odata2-dist/janos/pom.xml | 2 +-
odata2-dist/javadoc/pom.xml | 2 +-
odata2-dist/jpa/pom.xml | 2 +-
odata2-dist/lib/pom.xml | 2 +-
odata2-dist/pom.xml | 2 +-
odata2-dist/ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-api/pom.xml | 2 +-
odata2-jpa-processor/jpa-core/pom.xml | 2 +-
odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-web/pom.xml | 2 +-
odata2-jpa-processor/pom.xml | 2 +-
odata2-lib/odata-annotation/pom.xml | 2 +-
odata2-lib/odata-api/pom.xml | 2 +-
odata2-lib/odata-client-api/pom.xml | 2 +-
odata2-lib/odata-client-core/pom.xml | 2 +-
odata2-lib/odata-core/pom.xml | 2 +-
odata2-lib/odata-fit/pom.xml | 2 +-
odata2-lib/odata-ref/pom.xml | 2 +-
odata2-lib/odata-testutil/pom.xml | 2 +-
odata2-lib/odata-web/pom.xml | 2 +-
odata2-lib/pom.xml | 2 +-
odata2-sample/cars-annotation-archetype/pom.xml | 4 ++--
odata2-sample/cars-jpa-archetype/pom.xml | 2 +-
odata2-sample/cars-service-archetype/pom.xml | 4 ++--
odata2-sample/pom.xml | 2 +-
odata2-spring/pom.xml | 2 +-
pom.xml | 2 +-
32 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml b/odata2-annotation-processor/annotation-processor-api/pom.xml
index d5cf999f..902a7ed0 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml b/odata2-annotation-processor/annotation-processor-core/pom.xml
index 85d46807..c39b0661 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index 1ffb864e..53e06399 100644
--- a/odata2-annotation-processor/annotation-processor-ref/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-web/pom.xml b/odata2-annotation-processor/annotation-processor-web/pom.xml
index 4e40e412..37e2da5d 100644
--- a/odata2-annotation-processor/annotation-processor-web/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/pom.xml b/odata2-annotation-processor/pom.xml
index 3f3f19c7..53d49f3f 100644
--- a/odata2-annotation-processor/pom.xml
+++ b/odata2-annotation-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml
index 37704a27..c3735599 100644
--- a/odata2-dist/janos/pom.xml
+++ b/odata2-dist/janos/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/javadoc/pom.xml b/odata2-dist/javadoc/pom.xml
index 59b4cd35..7ac1b91c 100644
--- a/odata2-dist/javadoc/pom.xml
+++ b/odata2-dist/javadoc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml
index 8f936905..216fb11d 100644
--- a/odata2-dist/jpa/pom.xml
+++ b/odata2-dist/jpa/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/lib/pom.xml b/odata2-dist/lib/pom.xml
index e8e23da8..e4613c2b 100644
--- a/odata2-dist/lib/pom.xml
+++ b/odata2-dist/lib/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
index d0ab591b..c142c351 100644
--- a/odata2-dist/pom.xml
+++ b/odata2-dist/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml
index 6b46b802..213a5192 100644
--- a/odata2-dist/ref/pom.xml
+++ b/odata2-dist/ref/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-api/pom.xml b/odata2-jpa-processor/jpa-api/pom.xml
index f61729eb..c659d48e 100644
--- a/odata2-jpa-processor/jpa-api/pom.xml
+++ b/odata2-jpa-processor/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>../</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index 0ccae999..13a017c5 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>../</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-ref/pom.xml b/odata2-jpa-processor/jpa-ref/pom.xml
index 4d9355e7..8c9f66ec 100644
--- a/odata2-jpa-processor/jpa-ref/pom.xml
+++ b/odata2-jpa-processor/jpa-ref/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-web/pom.xml b/odata2-jpa-processor/jpa-web/pom.xml
index 48484f93..e0d8c694 100644
--- a/odata2-jpa-processor/jpa-web/pom.xml
+++ b/odata2-jpa-processor/jpa-web/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/pom.xml b/odata2-jpa-processor/pom.xml
index f3866665..2e83b7d1 100644
--- a/odata2-jpa-processor/pom.xml
+++ b/odata2-jpa-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml
index ba3161ca..83f334be 100644
--- a/odata2-lib/odata-annotation/pom.xml
+++ b/odata2-lib/odata-annotation/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml
index 5f2f21e9..9d0b25d9 100644
--- a/odata2-lib/odata-api/pom.xml
+++ b/odata2-lib/odata-api/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-client-api/pom.xml b/odata2-lib/odata-client-api/pom.xml
index 7b0ccf14..75e61672 100644
--- a/odata2-lib/odata-client-api/pom.xml
+++ b/odata2-lib/odata-client-api/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>olingo-odata2-client-api</artifactId>
diff --git a/odata2-lib/odata-client-core/pom.xml b/odata2-lib/odata-client-core/pom.xml
index b99efd47..32fcfbd1 100644
--- a/odata2-lib/odata-client-core/pom.xml
+++ b/odata2-lib/odata-client-core/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml
index a27d513d..26478b49 100644
--- a/odata2-lib/odata-core/pom.xml
+++ b/odata2-lib/odata-core/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml
index 8fa57ab5..2ead24f0 100644
--- a/odata2-lib/odata-fit/pom.xml
+++ b/odata2-lib/odata-fit/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml
index 0abcda1e..9c381422 100644
--- a/odata2-lib/odata-ref/pom.xml
+++ b/odata2-lib/odata-ref/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml
index beda624e..43f4cd1e 100644
--- a/odata2-lib/odata-testutil/pom.xml
+++ b/odata2-lib/odata-testutil/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml
index 8ab14609..e0d39936 100644
--- a/odata2-lib/odata-web/pom.xml
+++ b/odata2-lib/odata-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml
index 3136e195..07171e0a 100644
--- a/odata2-lib/pom.xml
+++ b/odata2-lib/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-annotation-archetype/pom.xml b/odata2-sample/cars-annotation-archetype/pom.xml
index 58764a0c..9bf1aa84 100644
--- a/odata2-sample/cars-annotation-archetype/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/pom.xml
@@ -16,13 +16,13 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-annotation-archetype</artifactId>
<name>${project.artifactId}</name>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-jpa-archetype/pom.xml b/odata2-sample/cars-jpa-archetype/pom.xml
index 448f597d..7b367b14 100644
--- a/odata2-sample/cars-jpa-archetype/pom.xml
+++ b/odata2-sample/cars-jpa-archetype/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-service-archetype/pom.xml b/odata2-sample/cars-service-archetype/pom.xml
index 9b5cfb56..7209b9db 100644
--- a/odata2-sample/cars-service-archetype/pom.xml
+++ b/odata2-sample/cars-service-archetype/pom.xml
@@ -24,14 +24,14 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-service-archetype</artifactId>
<name>${project.artifactId}</name>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/pom.xml b/odata2-sample/pom.xml
index a3effb08..d59bc1db 100644
--- a/odata2-sample/pom.xml
+++ b/odata2-sample/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-spring/pom.xml b/odata2-spring/pom.xml
index bf238e8b..cac4e887 100755
--- a/odata2-spring/pom.xml
+++ b/odata2-spring/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
</parent>
<dependencies>
diff --git a/pom.xml b/pom.xml
index fb374b5c..975c83a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.1</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
(olingo-odata2) 19/29: use java 8
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 0872ed9bb28b6ad769dadfdc5d9bd6705fea7ce7
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 14:42:01 2023 +0200
use java 8
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
odata2-jpa-processor/jpa-core/pom.xml | 5 +-
.../olingo/odata2/core/commons/XmlHelperTest.java | 366 ++++++++++-----------
odata2-lib/odata-testutil/pom.xml | 1 +
.../src/main/resources/archetype-resources/pom.xml | 5 +-
.../src/main/resources/archetype-resources/pom.xml | 4 +-
pom.xml | 5 +-
6 files changed, 188 insertions(+), 198 deletions(-)
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index ee4d22cd..47d162a3 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -69,8 +69,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>17</source>
- <target>17</target>
+ <source>1.8</source>
+ <target>1.8</target>
+ <verbose>true</verbose>
</configuration>
</plugin>
</plugins>
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/XmlHelperTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/XmlHelperTest.java
index e633e66a..56c184d3 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/XmlHelperTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/XmlHelperTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.commons;
@@ -22,16 +18,13 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
-
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-
import org.apache.olingo.odata2.api.edm.EdmEntitySet;
import org.apache.olingo.odata2.api.ep.EntityProvider;
import org.apache.olingo.odata2.api.ep.EntityProviderException;
@@ -41,202 +34,195 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-
import com.ctc.wstx.exc.WstxParsingException;
public class XmlHelperTest {
- public static String XML =
- "<?xml version=\"1.0\"?>" +
- "<extract>" +
- " <data>&rules;</data>" +
- "</extract>";
-
- public static String XML_XXE =
- "<?xml version=\"1.0\"?>" +
- " <!DOCTYPE foo [" +
- " <!ENTITY rules SYSTEM \"" + XmlHelperTest.class.getResource("/xxe.xml").toString() + "\">" +
- " ]>" +
- "<extract>" +
- " <data>&rules;</data>" +
- "</extract>";
-
- public static String XML_LOL =
- "<?xml version=\"1.0\"?>" +
- " <!DOCTYPE lolz [" +
- " <!ENTITY lol \"lol\">" +
- " <!ELEMENT lolz (#PCDATA)>" +
- " <!ENTITY lol1 \"&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;\">" +
- " <!ENTITY lol2 \"&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;\">" +
- " <!ENTITY lol3 \"&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;\">" +
- " <!ENTITY lol4 \"&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;\">" +
- " <!ENTITY lol5 \"&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;\">" +
- " <!ENTITY lol6 \"&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;\">" +
- " <!ENTITY lol7 \"&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;\">" +
- " <!ENTITY lol8 \"&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;\">" +
- " <!ENTITY lol9 \"&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;\">" +
- " ]>" +
- " <lolz>&lol9;</lolz>";
-
- public static String XML_DOCTYPE =
- "<?xml version=\"1.0\" standalone=\"yes\"?>" +
- "<!DOCTYPE hallo [<!ELEMENT hallo (#PCDATA)>]>" +
- "<hallo>Hallo Welt!</hallo>";
-
- public static String XML_PROCESSING =
- "<?xml version=\"1.0\"?>" +
- "<?apache include file=\"somefile.html\" ?>" +
- "<extract>" +
- " <data>&rules;</data>" +
- "</extract>";
-
- private static Object beforeXmlInputFactory;
-
- @BeforeClass
- public static void beforeClass() {
- // CHECKSTYLE:OFF
- System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); // NOSONAR
- //
- beforeXmlInputFactory = replaceXmlInputFactoryInstance(XMLInputFactory.newInstance());
- // CHECKSTYLE:ON
- }
-
- @AfterClass
- public static void afterClass() {
- replaceXmlInputFactoryInstance(beforeXmlInputFactory);
- }
-
- private static Object replaceXmlInputFactoryInstance(Object newInstance) {
- try {
- Field field = XmlHelper.XmlInputFactoryHolder.class.getDeclaredField("INSTANCE");
- field.setAccessible(true);
-
- Field modifiersField = Field.class.getDeclaredField("modifiers");
- modifiersField.setAccessible(true);
- modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-
- Object replaced = field.get(null);
- field.set(null, newInstance);
- return replaced;
- } catch (NoSuchFieldException e) {
- throw new RuntimeException(e);
- } catch (IllegalAccessException e) {
- throw new RuntimeException(e);
+ public static String XML = "<?xml version=\"1.0\"?>" + "<extract>" + " <data>&rules;</data>" + "</extract>";
+
+ public static String XML_XXE = "<?xml version=\"1.0\"?>"
+ + " <!DOCTYPE foo [" + " <!ENTITY rules SYSTEM \"" + XmlHelperTest.class.getResource("/xxe.xml")
+ .toString()
+ + "\">" + " ]>" + "<extract>" + " <data>&rules;</data>" + "</extract>";
+
+ public static String XML_LOL = "<?xml version=\"1.0\"?>" + " <!DOCTYPE lolz [" + " <!ENTITY lol \"lol\">"
+ + " <!ELEMENT lolz (#PCDATA)>" + " <!ENTITY lol1 \"&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;\">"
+ + " <!ENTITY lol2 \"&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;\">"
+ + " <!ENTITY lol3 \"&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;\">"
+ + " <!ENTITY lol4 \"&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;\">"
+ + " <!ENTITY lol5 \"&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;\">"
+ + " <!ENTITY lol6 \"&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;\">"
+ + " <!ENTITY lol7 \"&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;\">"
+ + " <!ENTITY lol8 \"&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;\">"
+ + " <!ENTITY lol9 \"&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;\">" + " ]>"
+ + " <lolz>&lol9;</lolz>";
+
+ public static String XML_DOCTYPE =
+ "<?xml version=\"1.0\" standalone=\"yes\"?>" + "<!DOCTYPE hallo [<!ELEMENT hallo (#PCDATA)>]>" + "<hallo>Hallo Welt!</hallo>";
+
+ public static String XML_PROCESSING = "<?xml version=\"1.0\"?>" + "<?apache include file=\"somefile.html\" ?>" + "<extract>"
+ + " <data>&rules;</data>" + "</extract>";
+
+ private static Object beforeXmlInputFactory;
+
+ @BeforeClass
+ public static void beforeClass() {
+ // CHECKSTYLE:OFF
+ System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); // NOSONAR
+ //
+ beforeXmlInputFactory = replaceXmlInputFactoryInstance(XMLInputFactory.newInstance());
+ // CHECKSTYLE:ON
}
- }
- @Test
- public void createReader() throws Exception {
- InputStream content = new ByteArrayInputStream(XML.getBytes("UTF-8"));
- XMLStreamReader streamReader = XmlHelper.createStreamReader(content);
- assertNotNull(streamReader);
- }
+ @AfterClass
+ public static void afterClass() {
+ replaceXmlInputFactoryInstance(beforeXmlInputFactory);
+ }
- @Test
- public void xxeWithoutProtection() throws Exception {
- InputStream content = new ByteArrayInputStream(XML_XXE.getBytes("UTF-8"));
- XMLStreamReader streamReader = createStreamReaderWithExternalEntitySupport(content);
+ private static Object replaceXmlInputFactoryInstance(Object newInstance) {
+ try {
+ Field field = XmlHelper.XmlInputFactoryHolder.class.getDeclaredField("INSTANCE");
+ field.setAccessible(true);
+
+ Field modifiersField = Field.class.getDeclaredField("modifiers");
+ modifiersField.setAccessible(true);
+ modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+
+ Object replaced = field.get(null);
+ field.set(null, newInstance);
+ return replaced;
+ } catch (NoSuchFieldException | IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ }
- boolean foundExternalEntity = false;
+ @Test
+ public void createReader() throws Exception {
+ InputStream content = new ByteArrayInputStream(XML.getBytes("UTF-8"));
+ XMLStreamReader streamReader = XmlHelper.createStreamReader(content);
+ assertNotNull(streamReader);
+ }
- while (streamReader.hasNext()) {
- streamReader.next();
+ @Test
+ public void xxeWithoutProtection() throws Exception {
+ InputStream content = new ByteArrayInputStream(XML_XXE.getBytes("UTF-8"));
+ XMLStreamReader streamReader = createStreamReaderWithExternalEntitySupport(content);
- if (streamReader.hasText() && "some text".equals(streamReader.getText())) {
- foundExternalEntity = true;
- break;
- }
+ boolean foundExternalEntity = false;
- }
- assertTrue(foundExternalEntity);
- }
+ while (streamReader.hasNext()) {
+ streamReader.next();
- @Test(expected = XMLStreamException.class)
- public void xxeWithProtection() throws Exception {
- InputStream content = new ByteArrayInputStream(XML_XXE.getBytes("UTF-8"));
- XMLStreamReader streamReader = XmlHelper.createStreamReader(content);
+ if (streamReader.hasText() && "some text".equals(streamReader.getText())) {
+ foundExternalEntity = true;
+ break;
+ }
- while (streamReader.hasNext()) {
- streamReader.next();
+ }
+ assertTrue(foundExternalEntity);
}
- }
-
- public XMLStreamReader createStreamReaderWithExternalEntitySupport(final InputStream content) throws Exception {
- XMLStreamReader streamReader;
- XMLInputFactory factory = XMLInputFactory.newInstance();
- factory.setProperty(XMLInputFactory.IS_VALIDATING, false);
- factory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
- factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, true);
- factory.setProperty(XMLInputFactory.SUPPORT_DTD, true);
-
- streamReader = factory.createXMLStreamReader(content, "UTF-8");
- return streamReader;
- }
-
- @Test(expected = XMLStreamException.class)
- public void lolWithProtection() throws Exception {
- InputStream content = new ByteArrayInputStream(XML_LOL.getBytes("UTF-8"));
- XMLStreamReader streamReader = XmlHelper.createStreamReader(content);
-
- while (streamReader.hasNext()) {
- streamReader.next();
- }
- }
-
- @Test
- public void lolApiWithProtection() throws Exception {
- try {
- InputStream content = new ByteArrayInputStream(XML_LOL.getBytes("UTF-8"));
- EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
- EntityProvider.readEntry("application/xml", entitySet, content, EntityProviderReadProperties.init().build());
-
- fail();
- } catch (EntityProviderException e) {
- assertEquals(WstxParsingException.class, e.getCause().getClass());
- }
- }
- @Test
- public void xxeApiWithProtection() throws Exception {
- try {
- InputStream content = new ByteArrayInputStream(XML_XXE.getBytes("UTF-8"));
- EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
+ @Test(expected = XMLStreamException.class)
+ public void xxeWithProtection() throws Exception {
+ InputStream content = new ByteArrayInputStream(XML_XXE.getBytes("UTF-8"));
+ XMLStreamReader streamReader = XmlHelper.createStreamReader(content);
+
+ while (streamReader.hasNext()) {
+ streamReader.next();
+ }
+ }
- EntityProvider.readEntry("application/xml", entitySet, content, EntityProviderReadProperties.init().build());
+ public XMLStreamReader createStreamReaderWithExternalEntitySupport(final InputStream content) throws Exception {
+ XMLStreamReader streamReader;
+ XMLInputFactory factory = XMLInputFactory.newInstance();
+ factory.setProperty(XMLInputFactory.IS_VALIDATING, false);
+ factory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
+ factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, true);
+ factory.setProperty(XMLInputFactory.SUPPORT_DTD, true);
- fail();
- } catch (EntityProviderException e) {
- assertEquals(WstxParsingException.class, e.getCause().getClass());
+ return factory.createXMLStreamReader(content, "UTF-8");
}
- }
- @Test
- public void xmlDoctypeApiWithProtection() throws Exception {
- try {
- InputStream content = new ByteArrayInputStream(XML_DOCTYPE.getBytes("UTF-8"));
- EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
+ @Test(expected = XMLStreamException.class)
+ public void lolWithProtection() throws Exception {
+ InputStream content = new ByteArrayInputStream(XML_LOL.getBytes("UTF-8"));
+ XMLStreamReader streamReader = XmlHelper.createStreamReader(content);
- EntityProvider.readEntry("application/xml", entitySet, content, EntityProviderReadProperties.init().build());
+ while (streamReader.hasNext()) {
+ streamReader.next();
+ }
+ }
- fail();
- } catch (EntityProviderException e) {
- assertEquals(WstxParsingException.class, e.getCause().getClass());
+ @Test
+ public void lolApiWithProtection() throws Exception {
+ try {
+ InputStream content = new ByteArrayInputStream(XML_LOL.getBytes("UTF-8"));
+ EdmEntitySet entitySet = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getEntitySet("Employees");
+ EntityProvider.readEntry("application/xml", entitySet, content, EntityProviderReadProperties.init()
+ .build());
+
+ fail();
+ } catch (EntityProviderException e) {
+ assertEquals(WstxParsingException.class, e.getCause()
+ .getClass());
+ }
}
- }
- @Test
- @Ignore("not way to disable in parser")
- public void xmlProcessingApiWithProtection() throws Exception {
- try {
- InputStream content = new ByteArrayInputStream(XML_PROCESSING.getBytes("UTF-8"));
- EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees");
+ @Test
+ public void xxeApiWithProtection() throws Exception {
+ try {
+ InputStream content = new ByteArrayInputStream(XML_XXE.getBytes("UTF-8"));
+ EdmEntitySet entitySet = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getEntitySet("Employees");
+
+ EntityProvider.readEntry("application/xml", entitySet, content, EntityProviderReadProperties.init()
+ .build());
+
+ fail();
+ } catch (EntityProviderException e) {
+ assertEquals(WstxParsingException.class, e.getCause()
+ .getClass());
+ }
+ }
- EntityProvider.readEntry("application/xml", entitySet, content, EntityProviderReadProperties.init().build());
+ @Test
+ public void xmlDoctypeApiWithProtection() throws Exception {
+ try {
+ InputStream content = new ByteArrayInputStream(XML_DOCTYPE.getBytes("UTF-8"));
+ EdmEntitySet entitySet = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getEntitySet("Employees");
+
+ EntityProvider.readEntry("application/xml", entitySet, content, EntityProviderReadProperties.init()
+ .build());
+
+ fail();
+ } catch (EntityProviderException e) {
+ assertEquals(WstxParsingException.class, e.getCause()
+ .getClass());
+ }
+ }
- fail();
- } catch (EntityProviderException e) {
- e.printStackTrace();
- assertEquals(WstxParsingException.class, e.getCause().getClass());
+ @Test
+ @Ignore("not way to disable in parser")
+ public void xmlProcessingApiWithProtection() throws Exception {
+ try {
+ InputStream content = new ByteArrayInputStream(XML_PROCESSING.getBytes("UTF-8"));
+ EdmEntitySet entitySet = MockFacade.getMockEdm()
+ .getDefaultEntityContainer()
+ .getEntitySet("Employees");
+
+ EntityProvider.readEntry("application/xml", entitySet, content, EntityProviderReadProperties.init()
+ .build());
+
+ fail();
+ } catch (EntityProviderException e) {
+ e.printStackTrace();
+ assertEquals(WstxParsingException.class, e.getCause()
+ .getClass());
+ }
}
- }
}
diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml
index 6d0d63da..04805cba 100644
--- a/odata2-lib/odata-testutil/pom.xml
+++ b/odata2-lib/odata-testutil/pom.xml
@@ -82,6 +82,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
index fe4a1e75..d5d584f7 100644
--- a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
@@ -58,8 +58,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.compiler-plugin}</version>
<configuration>
- <source>17</source>
- <target>17</target>
+ <source>1.8</source>
+ <target>1.8</target>
+ <verbose>true</verbose>
</configuration>
</plugin>
<plugin>
diff --git a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
index 7320df85..b6789c78 100644
--- a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
@@ -50,8 +50,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>17</source>
- <target>17</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index 326fbbb5..8b4614c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,8 +193,9 @@ governing permissions and limitations under
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>17</source>
- <target>17</target>
+ <source>1.8</source>
+ <target>1.8</target>
+ <verbose>true</verbose>
</configuration>
</plugin>
<plugin>
(olingo-odata2) 04/29: build with java 8
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit d704aceababada4d2b14f6ea316ac551026378cf
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 10:04:23 2023 +0200
build with java 8
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.github/workflows/build.yml | 4 ++--
.github/workflows/pull-request.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1c4103e1..03db07f1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,11 +17,11 @@ jobs:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
- - name: Set up JDK Corretto 21
+ - name: Set up JDK Corretto 8
uses: actions/setup-java@v3
with:
distribution: 'corretto'
- java-version: '21'
+ java-version: '8'
architecture: x64
- name: Maven Build
run: mvn clean install
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index d61185c1..d2d52a6d 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -24,10 +24,10 @@ jobs:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
- - name: Set up JDK Corretto 21
+ - name: Set up JDK Corretto 8
uses: actions/setup-java@v3
with:
distribution: 'corretto'
- java-version: 21
+ java-version: 8
- name: Maven Build
run: mvn clean install
(olingo-odata2) 26/29: fix docs
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit cac7590e68900e57fc567fb0872cabf118addd46
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Thu Dec 14 10:18:05 2023 +0200
fix docs
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.../odata2/jpa/processor/api/ODataJPAContext.java | 4 ++--
.../api/ODataJPAQueryExtensionEntityListener.java | 24 +++++++++++-----------
.../jpa/processor/api/ODataJPAServiceFactory.java | 2 +-
.../api/ODataJPATombstoneEntityListener.java | 8 ++++----
.../jpa/processor/api/model/JPAEdmBaseView.java | 2 +-
.../processor/api/model/JPAEdmComplexTypeView.java | 2 +-
.../processor/api/model/JPAEdmPropertyView.java | 6 +++---
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAContext.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAContext.java
index 54b505dd..1c98759f 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAContext.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAContext.java
@@ -111,7 +111,7 @@ public interface ODataJPAContext {
* context.
*
* @param emf
- * is of type {@linkjakarta.persistence.EntityManagerFactory}
+ * is of type {@link jakarta.persistence.EntityManagerFactory}
*
*/
public void setEntityManagerFactory(EntityManagerFactory emf);
@@ -159,7 +159,7 @@ public interface ODataJPAContext {
* Hence all entities that are accessed within JPA processor are managed by
* single entity manager.
*
- * @return an instance of type {@linkjakarta.persistence.EntityManager}
+ * @return an instance of type {@link jakarta.persistence.EntityManager}
*/
public EntityManager getEntityManager();
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAQueryExtensionEntityListener.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAQueryExtensionEntityListener.java
index c40d662f..892267de 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAQueryExtensionEntityListener.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAQueryExtensionEntityListener.java
@@ -41,8 +41,8 @@ public abstract class ODataJPAQueryExtensionEntityListener extends ODataJPATombs
/**
* Override this method to build JPA Query for OData request - GetEntitySet; SELECT *
* @param uriInfo is a reference to OData request
- * @param em is a reference to {@linkjakarta.persistence.EntityManager}
- * @return an instance of type {@linkjakarta.persistence.Query}
+ * @param em is a reference to {@link jakarta.persistence.EntityManager}
+ * @return an instance of type {@link jakarta.persistence.Query}
*/
public Query getQuery(GetEntitySetUriInfo uriInfo, EntityManager em) throws ODataJPARuntimeException {
return null;
@@ -52,8 +52,8 @@ public abstract class ODataJPAQueryExtensionEntityListener extends ODataJPATombs
* Override this method to build JPA Query for OData request - GetEntity; SELECT SINGLE with key in WHERE
* clause
* @param uriInfo is a reference to OData request
- * @param em is a reference to {@linkjakarta.persistence.EntityManager}
- * @return an instance of type {@linkjakarta.persistence.Query}
+ * @param em is a reference to {@link jakarta.persistence.EntityManager}
+ * @return an instance of type {@link jakarta.persistence.Query}
*/
public Query getQuery(GetEntityUriInfo uriInfo, EntityManager em) throws ODataJPARuntimeException {
return null;
@@ -63,8 +63,8 @@ public abstract class ODataJPAQueryExtensionEntityListener extends ODataJPATombs
* Override this method to build JPA Query for OData request - GetEntity Count; SELECT SINGLE with key in WHERE
* clause
* @param uriInfo is a reference to OData request
- * @param em is a reference to {@linkjakarta.persistence.EntityManager}
- * @return an instance of type {@linkjakarta.persistence.Query}
+ * @param em is a reference to {@link jakarta.persistence.EntityManager}
+ * @return an instance of type {@link jakarta.persistence.Query}
*/
public Query getQuery(GetEntityCountUriInfo uriInfo, EntityManager em) throws ODataJPARuntimeException {
return null;
@@ -73,8 +73,8 @@ public abstract class ODataJPAQueryExtensionEntityListener extends ODataJPATombs
/**
* Override this method to build JPA Query for OData request - GetEntitySet Count; SELECT COUNT(*)
* @param uriInfo is a reference to OData request
- * @param em is a reference to {@linkjakarta.persistence.EntityManager}
- * @return an instance of type {@linkjakarta.persistence.Query}
+ * @param em is a reference to {@link jakarta.persistence.EntityManager}
+ * @return an instance of type {@link jakarta.persistence.Query}
*/
public Query getQuery(GetEntitySetCountUriInfo uriInfo, EntityManager em) throws ODataJPARuntimeException {
return null;
@@ -84,8 +84,8 @@ public abstract class ODataJPAQueryExtensionEntityListener extends ODataJPATombs
* Override this method to build JPA Query for OData request - Update; SELECT SINGLE with key in WHERE
* clause
* @param uriInfo is a reference to OData request
- * @param em is a reference to {@linkjakarta.persistence.EntityManager}
- * @return an instance of type {@linkjakarta.persistence.Query}
+ * @param em is a reference to {@link jakarta.persistence.EntityManager}
+ * @return an instance of type {@link jakarta.persistence.Query}
*/
public Query getQuery(PutMergePatchUriInfo uriInfo, EntityManager em) throws ODataJPARuntimeException {
return null;
@@ -95,8 +95,8 @@ public abstract class ODataJPAQueryExtensionEntityListener extends ODataJPATombs
* Override this method to build JPA Query for OData request - Delete; SELECT SINGLE with key in WHERE
* clause
* @param uriInfo is a reference to OData request
- * @param em is a reference to {@linkjakarta.persistence.EntityManager}
- * @return an instance of type {@linkjakarta.persistence.Query}
+ * @param em is a reference to {@link jakarta.persistence.EntityManager}
+ * @return an instance of type {@link jakarta.persistence.Query}
*/
public Query getQuery(DeleteUriInfo uriInfo, EntityManager em) throws ODataJPARuntimeException {
return null;
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAServiceFactory.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAServiceFactory.java
index 0d59aa43..9a56135f 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAServiceFactory.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAServiceFactory.java
@@ -85,7 +85,7 @@ public abstract class ODataJPAServiceFactory extends ODataServiceFactory {
/**
* Implement this method and initialize OData JPA Context. It is mandatory
- * to set an instance of type {@linkjakarta.persistence.EntityManagerFactory} into the context. An exception of type
+ * to set an instance of type {@link jakarta.persistence.EntityManagerFactory} into the context. An exception of type
* {@link org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException} is thrown if
* EntityManagerFactory is not initialized. <br>
* <br>
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPATombstoneEntityListener.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPATombstoneEntityListener.java
index dc2f94a5..a19804a1 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPATombstoneEntityListener.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPATombstoneEntityListener.java
@@ -40,20 +40,20 @@ public abstract class ODataJPATombstoneEntityListener {
}
/**
- * Implement this method to create a {@linkjakarta.persistence.Query} object. The Query object can be created from
+ * Implement this method to create a {@link jakarta.persistence.Query} object. The Query object can be created from
* OData requests. The query instance thus created can be used for handling delta JPA entities. The delta token passed
* from OData request can
* be accessed from {@link com.sap.core.odata.processor.api.jpa.ODataJPATombstoneContext}.
* @param resultsView is a reference to OData request
- * @param em is a reference to {@linkjakarta.persistence.EntityManager}
- * @return an instance of type {@linkjakarta.persistence.Query}
+ * @param em is a reference to {@link jakarta.persistence.EntityManager}
+ * @return an instance of type {@link jakarta.persistence.Query}
*/
public abstract Query getQuery(GetEntitySetUriInfo resultsView, EntityManager em) throws ODataJPARuntimeException;
/**
* Implement this method to create a delta token.
* @param deltas is list of delta JPA Entities
- * @param query is an instance of type {@linkjakarta.persistence.Query} that was used for handling delta entites
+ * @param query is an instance of type {@link jakarta.persistence.Query} that was used for handling delta entites
* @return a delta token of type String
*/
public abstract String generateDeltaToken(List<Object> deltas, Query query);
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmBaseView.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmBaseView.java
index 2e7100af..82fa48c8 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmBaseView.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmBaseView.java
@@ -46,7 +46,7 @@ public interface JPAEdmBaseView {
/**
* The method returns the Java Persistence MetaModel
*
- * @return a meta model of type {@linkjakarta.persistence.metamodel.Metamodel}
+ * @return a meta model of type {@link jakarta.persistence.metamodel.Metamodel}
*/
public Metamodel getJPAMetaModel();
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmComplexTypeView.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmComplexTypeView.java
index 2be10824..6f53d063 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmComplexTypeView.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmComplexTypeView.java
@@ -58,7 +58,7 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
* The method returns an JPA embeddable type that is currently being
* processed.
*
- * @return an instance of type {@linkjakarta.persistence.metamodel.EmbeddableType}
+ * @return an instance of type {@link jakarta.persistence.metamodel.EmbeddableType}
*/
public jakarta.persistence.metamodel.EmbeddableType<?> getJPAEmbeddableType();
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmPropertyView.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmPropertyView.java
index e5a2907f..1eca444e 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmPropertyView.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmPropertyView.java
@@ -74,16 +74,16 @@ public interface JPAEdmPropertyView extends JPAEdmBaseView {
/**
* The method returns a JPA Attribute for the given JPA entity type.
*
- * @return an instance of type {@linkjakarta.persistence.metamodel.Attribute
+ * @return an instance of type {@link jakarta.persistence.metamodel.Attribute
* <?, ?>}
*/
Attribute<?, ?> getJPAAttribute();
/**
- * The method returns a JPA Attribute referenced by a JPA Attribute in the {@linkjakarta.persistence.JoinColumn}
+ * The method returns a JPA Attribute referenced by a JPA Attribute in the {@link jakarta.persistence.JoinColumn}
* annotation for the given JPA entity type .
*
- * @return an instance of type {@linkjakarta.persistence.metamodel.Attribute
+ * @return an instance of type {@link jakarta.persistence.metamodel.Attribute
* <?, ?>}
*/
Attribute<?, ?> getJPAReferencedAttribute();
(olingo-odata2) 24/29: more test adaptations
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit c028f769c1aa4ae33fc0f5b0f0dd04694d2ce0ef
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 16:32:52 2023 +0200
more test adaptations
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
odata2-lib/odata-fit/pom.xml | 60 ++--
.../apache/olingo/odata2/ref/model/Employee.java | 336 ++++++++++-----------
pom.xml | 21 +-
3 files changed, 228 insertions(+), 189 deletions(-)
diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml
index 9fa33537..51eda2f1 100644
--- a/odata2-lib/odata-fit/pom.xml
+++ b/odata2-lib/odata-fit/pom.xml
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
<modelVersion>4.0.0</modelVersion>
@@ -85,7 +86,8 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-api</artifactId>
<version>${project.version}</version>
- <outputDirectory>${project.build.directory}/api_dependency</outputDirectory>
+ <outputDirectory>
+ ${project.build.directory}/api_dependency</outputDirectory>
<overWrite>true</overWrite>
</artifactItem>
</artifactItems>
@@ -103,7 +105,8 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-core</artifactId>
<version>${project.version}</version>
- <outputDirectory>${project.build.directory}/core_dependency</outputDirectory>
+ <outputDirectory>
+ ${project.build.directory}/core_dependency</outputDirectory>
<overWrite>true</overWrite>
</artifactItem>
</artifactItems>
@@ -121,7 +124,8 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-ref</artifactId>
<version>${project.version}</version>
- <outputDirectory>${project.build.directory}/ref_dependency</outputDirectory>
+ <outputDirectory>
+ ${project.build.directory}/ref_dependency</outputDirectory>
<overWrite>true</overWrite>
</artifactItem>
</artifactItems>
@@ -142,7 +146,8 @@
</goals>
<configuration>
<instrumentationPaths>
- <param>${project.build.directory}/api_dependency</param>
+ <param>
+ ${project.build.directory}/api_dependency</param>
</instrumentationPaths>
</configuration>
</execution>
@@ -154,7 +159,8 @@
</goals>
<configuration>
<instrumentationPaths>
- <param>${project.build.directory}/core_dependency</param>
+ <param>
+ ${project.build.directory}/core_dependency</param>
</instrumentationPaths>
</configuration>
</execution>
@@ -166,7 +172,8 @@
</goals>
<configuration>
<instrumentationPaths>
- <param>${project.build.directory}/ref_dependency</param>
+ <param>
+ ${project.build.directory}/ref_dependency</param>
</instrumentationPaths>
</configuration>
</execution>
@@ -177,7 +184,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!-- use the instrumented classes for test execution -->
- <classesDirectory>${project.build.directory}/generated-classes/emma/classes</classesDirectory>
+ <classesDirectory>
+ ${project.build.directory}/generated-classes/emma/classes</classesDirectory>
</configuration>
</plugin>
</plugins>
@@ -207,16 +215,32 @@
<artifactId>gson</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Employee.java b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Employee.java
index 45c14d03..f02dbfe9 100644
--- a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Employee.java
+++ b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Employee.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.ref.model;
@@ -25,159 +21,163 @@ import java.text.DateFormat;
import java.util.Calendar;
/**
- *
+ *
*/
public class Employee {
- private int employeeId;
- private String employeeName;
- private Integer age;
- private Manager manager;
- private Team team;
- private Room room;
- private String imageType;
- private byte[] image;
- private String imageUrl;
- private Calendar entryDate;
- private Location location;
-
- public Employee(final int employeeId, final String name) {
- this.employeeId = employeeId;
- setEmployeeName(name);
- }
-
- public String getId() {
- return Integer.toString(employeeId);
- }
-
- public void setEmployeeName(final String employeeName) {
- this.employeeName = employeeName;
- }
-
- public String getEmployeeName() {
- return employeeName;
- }
-
- public void setAge(final int age) {
- this.age = age;
- }
-
- public int getAge() {
- return age;
- }
-
- public void setManager(final Manager manager) {
- this.manager = manager;
- }
-
- public Manager getManager() {
- return manager;
- }
-
- public void setTeam(final Team team) {
- this.team = team;
- }
-
- public Team getTeam() {
- return team;
- }
-
- public void setRoom(final Room room) {
- this.room = room;
- }
-
- public Room getRoom() {
- return room;
- }
-
- public void setImageUri(final String imageUri) {
- imageUrl = imageUri;
- }
-
- public String getImageUri() {
- return imageUrl;
- }
-
- public void setLocation(final Location location) {
- this.location = location;
- }
-
- public Location getLocation() {
- return location;
- }
-
- public void setEntryDate(final Calendar date) {
- entryDate = date;
- }
-
- public Calendar getEntryDate() {
- return entryDate;
- }
-
- public void setImageType(final String imageType) {
- this.imageType = imageType;
- }
-
- public String getImageType() {
- return imageType;
- }
-
- public void setImage(final byte[] image) {
- this.image = image;
- }
-
- public void setImage(final String imageUrl) {
- image = loadImage(imageUrl);
- }
-
- private static byte[] loadImage(final String imageUrl) {
- try {
- InputStream in = Employee.class.getResourceAsStream(imageUrl);
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
- int b = 0;
- while ((b = in.read()) != -1) {
- stream.write(b);
- }
-
- return stream.toByteArray();
- } catch (IOException e) {
- throw new ModelException(e);
- }
- }
-
- public byte[] getImage() {
- if (image == null) {
- return null;
- }
- return image.clone();
- }
-
- @Override
- public int hashCode() {
- return employeeId;
- }
-
- @Override
- public boolean equals(final Object obj) {
- return this == obj
- || obj != null && getClass() == obj.getClass() && employeeId == ((Employee) obj).employeeId;
- }
-
- @Override
- public String toString() {
- return "{\"EmployeeId\":\"" + employeeId + "\","
- + "\"EmployeeName\":\"" + employeeName + "\","
- + "\"ManagerId\":" + (manager == null ? "null" : "\"" + manager.getId() + "\"") + ","
- + "\"RoomId\":" + (room == null ? "null" : "\"" + room.getId() + "\"") + ","
- + "\"TeamId\":" + (team == null ? "null" : "\"" + team.getId() + "\"") + ","
- + "\"Location\":"
- + (location == null ? "null" :
- "{\"City\":" + (location.getCity() == null ? "null" :
- "{\"PostalCode\":\"" + location.getCity().getPostalCode() + "\","
- + "\"CityName\":\"" + location.getCity().getCityName() + "\"}") + ","
- + "\"Country\":\"" + location.getCountry() + "\"}") + ","
- + "\"Age\":" + age + ","
- + "\"EntryDate\":"
- + (entryDate == null ? "null" : "\"" + DateFormat.getInstance().format(entryDate.getTime()) + "\"") + ","
- + "\"ImageUrl\":\"" + imageUrl + "\"}";
- }
+ private final int employeeId;
+ private String employeeName;
+ private Integer age;
+ private Manager manager;
+ private Team team;
+ private Room room;
+ private String imageType;
+ private byte[] image;
+ private String imageUrl;
+ private Calendar entryDate;
+ private Location location;
+
+ public Employee(final int employeeId, final String name) {
+ this.employeeId = employeeId;
+ setEmployeeName(name);
+ }
+
+ public String getId() {
+ return Integer.toString(employeeId);
+ }
+
+ public void setEmployeeName(final String employeeName) {
+ this.employeeName = employeeName;
+ }
+
+ public String getEmployeeName() {
+ return employeeName;
+ }
+
+ public void setAge(final int age) {
+ this.age = age;
+ }
+
+ public int getAge() {
+ return age;
+ }
+
+ public void setManager(final Manager manager) {
+ this.manager = manager;
+ }
+
+ public Manager getManager() {
+ return manager;
+ }
+
+ public void setTeam(final Team team) {
+ this.team = team;
+ }
+
+ public Team getTeam() {
+ return team;
+ }
+
+ public void setRoom(final Room room) {
+ this.room = room;
+ }
+
+ public Room getRoom() {
+ return room;
+ }
+
+ public void setImageUri(final String imageUri) {
+ imageUrl = imageUri;
+ }
+
+ public String getImageUri() {
+ return imageUrl;
+ }
+
+ public void setLocation(final Location location) {
+ this.location = location;
+ }
+
+ public Location getLocation() {
+ return location;
+ }
+
+ public void setEntryDate(final Calendar date) {
+ entryDate = date;
+ }
+
+ public Calendar getEntryDate() {
+ return entryDate;
+ }
+
+ public void setImageType(final String imageType) {
+ this.imageType = imageType;
+ }
+
+ public String getImageType() {
+ return imageType;
+ }
+
+ public void setImage(final byte[] image) {
+ this.image = image;
+ }
+
+ public void setImage(final String imageUrl) {
+ image = loadImage(imageUrl);
+ }
+
+ private static byte[] loadImage(final String imageUrl) {
+ try {
+ InputStream in = Employee.class.getResourceAsStream(imageUrl);
+ if (null == imageUrl) {
+ throw new IllegalStateException("Cannot load resource " + imageUrl);
+ }
+ ByteArrayOutputStream stream = new ByteArrayOutputStream();
+ int b = 0;
+ while ((b = in.read()) != -1) {
+ stream.write(b);
+ }
+
+ return stream.toByteArray();
+ } catch (IOException e) {
+ throw new ModelException(e);
+ }
+ }
+
+ public byte[] getImage() {
+ if (image == null) {
+ return null;
+ }
+ return image.clone();
+ }
+
+ @Override
+ public int hashCode() {
+ return employeeId;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ return this == obj || obj != null && getClass() == obj.getClass() && employeeId == ((Employee) obj).employeeId;
+ }
+
+ @Override
+ public String toString() {
+ return "{\"EmployeeId\":\"" + employeeId + "\"," + "\"EmployeeName\":\"" + employeeName + "\"," + "\"ManagerId\":"
+ + (manager == null ? "null" : "\"" + manager.getId() + "\"") + "," + "\"RoomId\":"
+ + (room == null ? "null" : "\"" + room.getId() + "\"") + "," + "\"TeamId\":"
+ + (team == null ? "null" : "\"" + team.getId() + "\"") + "," + "\"Location\":"
+ + (location == null ? "null"
+ : "{\"City\":" + (location.getCity() == null ? "null"
+ : "{\"PostalCode\":\"" + location.getCity()
+ .getPostalCode()
+ + "\"," + "\"CityName\":\"" + location.getCity()
+ .getCityName()
+ + "\"}")
+ + "," + "\"Country\":\"" + location.getCountry() + "\"}")
+ + "," + "\"Age\":" + age + "," + "\"EntryDate\":" + (entryDate == null ? "null"
+ : "\"" + DateFormat.getInstance()
+ .format(entryDate.getTime())
+ + "\"")
+ + "," + "\"ImageUrl\":\"" + imageUrl + "\"}";
+ }
}
diff --git a/pom.xml b/pom.xml
index e7e7382b..6aa68f1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -468,7 +468,7 @@ governing permissions and limitations under
<url>https://oss.sonatype.org/content/groups/staging</url>
</repository>
</repositories>
-
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -493,10 +493,25 @@ governing permissions and limitations under
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>12.0.4</version>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
(olingo-odata2) 12/29: version set to 3.0.2-SNAPSHOT for development
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 43ce11852726d7d43c4efaa893c06dc2147ba07f
Author: iliyan-velichkov <il...@users.noreply.github.com>
AuthorDate: Wed Dec 13 09:07:13 2023 +0000
version set to 3.0.2-SNAPSHOT for development
---
odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-core/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
odata2-annotation-processor/pom.xml | 2 +-
odata2-dist/janos/pom.xml | 2 +-
odata2-dist/javadoc/pom.xml | 2 +-
odata2-dist/jpa/pom.xml | 2 +-
odata2-dist/lib/pom.xml | 2 +-
odata2-dist/pom.xml | 2 +-
odata2-dist/ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-api/pom.xml | 2 +-
odata2-jpa-processor/jpa-core/pom.xml | 2 +-
odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-web/pom.xml | 2 +-
odata2-jpa-processor/pom.xml | 2 +-
odata2-lib/odata-annotation/pom.xml | 2 +-
odata2-lib/odata-api/pom.xml | 2 +-
odata2-lib/odata-client-api/pom.xml | 2 +-
odata2-lib/odata-client-core/pom.xml | 2 +-
odata2-lib/odata-core/pom.xml | 2 +-
odata2-lib/odata-fit/pom.xml | 2 +-
odata2-lib/odata-ref/pom.xml | 2 +-
odata2-lib/odata-testutil/pom.xml | 2 +-
odata2-lib/odata-web/pom.xml | 2 +-
odata2-lib/pom.xml | 2 +-
odata2-sample/cars-annotation-archetype/pom.xml | 4 ++--
odata2-sample/cars-jpa-archetype/pom.xml | 2 +-
odata2-sample/cars-service-archetype/pom.xml | 4 ++--
odata2-sample/pom.xml | 2 +-
odata2-spring/pom.xml | 2 +-
pom.xml | 2 +-
32 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml b/odata2-annotation-processor/annotation-processor-api/pom.xml
index 902a7ed0..691a4a75 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml b/odata2-annotation-processor/annotation-processor-core/pom.xml
index c39b0661..9e682372 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index 53e06399..446b1315 100644
--- a/odata2-annotation-processor/annotation-processor-ref/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-web/pom.xml b/odata2-annotation-processor/annotation-processor-web/pom.xml
index 37e2da5d..29ec23aa 100644
--- a/odata2-annotation-processor/annotation-processor-web/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/pom.xml b/odata2-annotation-processor/pom.xml
index 53d49f3f..5d90d57c 100644
--- a/odata2-annotation-processor/pom.xml
+++ b/odata2-annotation-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml
index c3735599..7374fb82 100644
--- a/odata2-dist/janos/pom.xml
+++ b/odata2-dist/janos/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/javadoc/pom.xml b/odata2-dist/javadoc/pom.xml
index 7ac1b91c..9726993e 100644
--- a/odata2-dist/javadoc/pom.xml
+++ b/odata2-dist/javadoc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml
index 216fb11d..b2876c3c 100644
--- a/odata2-dist/jpa/pom.xml
+++ b/odata2-dist/jpa/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/lib/pom.xml b/odata2-dist/lib/pom.xml
index e4613c2b..5de4586d 100644
--- a/odata2-dist/lib/pom.xml
+++ b/odata2-dist/lib/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
index c142c351..53148368 100644
--- a/odata2-dist/pom.xml
+++ b/odata2-dist/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml
index 213a5192..ff8e0483 100644
--- a/odata2-dist/ref/pom.xml
+++ b/odata2-dist/ref/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-api/pom.xml b/odata2-jpa-processor/jpa-api/pom.xml
index c659d48e..5c5b0405 100644
--- a/odata2-jpa-processor/jpa-api/pom.xml
+++ b/odata2-jpa-processor/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index 13a017c5..e8f7c82d 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-ref/pom.xml b/odata2-jpa-processor/jpa-ref/pom.xml
index 8c9f66ec..5f0d7454 100644
--- a/odata2-jpa-processor/jpa-ref/pom.xml
+++ b/odata2-jpa-processor/jpa-ref/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-web/pom.xml b/odata2-jpa-processor/jpa-web/pom.xml
index e0d8c694..4b54fa2e 100644
--- a/odata2-jpa-processor/jpa-web/pom.xml
+++ b/odata2-jpa-processor/jpa-web/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/pom.xml b/odata2-jpa-processor/pom.xml
index 2e83b7d1..405503e7 100644
--- a/odata2-jpa-processor/pom.xml
+++ b/odata2-jpa-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml
index 83f334be..53452cd7 100644
--- a/odata2-lib/odata-annotation/pom.xml
+++ b/odata2-lib/odata-annotation/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml
index 9d0b25d9..4fa25ebf 100644
--- a/odata2-lib/odata-api/pom.xml
+++ b/odata2-lib/odata-api/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-client-api/pom.xml b/odata2-lib/odata-client-api/pom.xml
index 75e61672..c5c2b139 100644
--- a/odata2-lib/odata-client-api/pom.xml
+++ b/odata2-lib/odata-client-api/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>olingo-odata2-client-api</artifactId>
diff --git a/odata2-lib/odata-client-core/pom.xml b/odata2-lib/odata-client-core/pom.xml
index 32fcfbd1..5905c5e6 100644
--- a/odata2-lib/odata-client-core/pom.xml
+++ b/odata2-lib/odata-client-core/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml
index 26478b49..6f65e83d 100644
--- a/odata2-lib/odata-core/pom.xml
+++ b/odata2-lib/odata-core/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml
index 2ead24f0..acabba22 100644
--- a/odata2-lib/odata-fit/pom.xml
+++ b/odata2-lib/odata-fit/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml
index 9c381422..204a3226 100644
--- a/odata2-lib/odata-ref/pom.xml
+++ b/odata2-lib/odata-ref/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml
index 43f4cd1e..8a82a50f 100644
--- a/odata2-lib/odata-testutil/pom.xml
+++ b/odata2-lib/odata-testutil/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml
index e0d39936..0b51b1c0 100644
--- a/odata2-lib/odata-web/pom.xml
+++ b/odata2-lib/odata-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml
index 07171e0a..bcca8c18 100644
--- a/odata2-lib/pom.xml
+++ b/odata2-lib/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-annotation-archetype/pom.xml b/odata2-sample/cars-annotation-archetype/pom.xml
index 9bf1aa84..45b343ac 100644
--- a/odata2-sample/cars-annotation-archetype/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/pom.xml
@@ -16,13 +16,13 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-annotation-archetype</artifactId>
<name>${project.artifactId}</name>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-jpa-archetype/pom.xml b/odata2-sample/cars-jpa-archetype/pom.xml
index 7b367b14..8d218c47 100644
--- a/odata2-sample/cars-jpa-archetype/pom.xml
+++ b/odata2-sample/cars-jpa-archetype/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-service-archetype/pom.xml b/odata2-sample/cars-service-archetype/pom.xml
index 7209b9db..75f0ea30 100644
--- a/odata2-sample/cars-service-archetype/pom.xml
+++ b/odata2-sample/cars-service-archetype/pom.xml
@@ -24,14 +24,14 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-service-archetype</artifactId>
<name>${project.artifactId}</name>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/pom.xml b/odata2-sample/pom.xml
index d59bc1db..f6c95e8f 100644
--- a/odata2-sample/pom.xml
+++ b/odata2-sample/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-spring/pom.xml b/odata2-spring/pom.xml
index cac4e887..d2a0d9b4 100755
--- a/odata2-spring/pom.xml
+++ b/odata2-spring/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 975c83a8..dd90e1cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.1</version>
+ <version>3.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
(olingo-odata2) 02/29: add workflows
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit c71e76704bbab930d66ea308a4fd69ac377325e8
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 09:57:10 2023 +0200
add workflows
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.github/{ => workflows}/build.yml | 0
.github/{build.yml => workflows/pull-request.yml} | 19 ++++++++++++-------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/.github/build.yml b/.github/workflows/build.yml
similarity index 100%
copy from .github/build.yml
copy to .github/workflows/build.yml
diff --git a/.github/build.yml b/.github/workflows/pull-request.yml
similarity index 63%
rename from .github/build.yml
rename to .github/workflows/pull-request.yml
index 1c4103e1..d61185c1 100644
--- a/.github/build.yml
+++ b/.github/workflows/pull-request.yml
@@ -1,12 +1,19 @@
-name: Build
+name: Pull Request
+
on:
- push:
+ pull_request:
branches:
- main
- master
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
jobs:
- build:
- runs-on: ubuntu-latest
+ build:
+ runs-on: ${{ matrix.os }}-latest
+ strategy:
+ matrix:
+ os: [ubuntu, windows]
steps:
- uses: actions/checkout@v3
with:
@@ -21,8 +28,6 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'corretto'
- java-version: '21'
- architecture: x64
+ java-version: 21
- name: Maven Build
run: mvn clean install
-
(olingo-odata2) 13/29: deploy jars
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 61b1ec4e5121646a77684466246852f04578c28a
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 11:10:33 2023 +0200
deploy jars
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.github/workflows/release.yml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6666ba01..d993627b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,9 +48,28 @@ jobs:
- name: "Maven: Set Release Version"
run: mvn versions:set -DnewVersion=${{ github.event.inputs.releaseVersion }}
+ - name: Setup Maven settings.xml
+ uses: whelk-io/maven-settings-xml-action@v11
+ with:
+ servers:
+ '[
+ {
+ "id": "github",
+ "username": "${env.GITHUB_USERNAME}",
+ "password": "${env.GITHUB_TOKEN}"
+ }
+ ]'
+
- name: Build Project
run: mvn clean install
+ - name: Publish to GitHub Packages Apache Maven
+ run: mvn deploy
+ env:
+ GITHUB_USERNAME: x-access-token
+ GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+ BUILD_ENV: 'github-actions'
+
- name: "Git: Commit Release Version"
run: |
git add '**pom.xml'
(olingo-odata2) 14/29: add distributionManagement
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit f17784d49c7d0c42fbcf134cb4f1fd664d86fc10
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 11:20:17 2023 +0200
add distributionManagement
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/pom.xml b/pom.xml
index dd90e1cf..e6a20d63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -471,4 +471,12 @@
</dependency>
</dependencies>
</dependencyManagement>
+
+ <distributionManagement>
+ <repository>
+ <id>github</id>
+ <name>GitHub Apache Maven Packages</name>
+ <url>https://maven.pkg.github.com/dirigiblelabs/olingo-odata2</url>
+ </repository>
+ </distributionManagement>
</project>
(olingo-odata2) 29/29: adapts tests
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 83032e8659da1502791e51a7b2f9f80162d5d681
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Thu Dec 14 14:42:50 2023 +0200
adapts tests
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.../processor/ref/model/ResourceHelper.java | 4 +-
odata2-jpa-processor/jpa-api/pom.xml | 18 +-
.../api/model/mapping/JPAAttributeMapType.java | 12 +-
.../api/model/mapping/JPAEdmMappingModel.java | 18 +-
.../model/mapping/JPAEdmMappingModelFactory.java | 2 +-
.../model/mapping/JPAEmbeddableTypeMapType.java | 10 +-
.../model/mapping/JPAEmbeddableTypesMapType.java | 8 +-
.../api/model/mapping/JPAEntityTypeMapType.java | 10 +-
.../api/model/mapping/JPAEntityTypesMapType.java | 8 +-
.../model/mapping/JPAPersistenceUnitMapType.java | 10 +-
.../api/model/mapping/JPARelationshipMapType.java | 12 +-
.../processor/api/model/mapping/package-info.java | 38 +-
.../access/model/JPAEdmMappingModelService.java | 3 +-
.../core/ODataJPADefaultProcessorTest.java | 13 +-
.../model/JPAEdmMappingModelServiceTest.java | 378 ++++++------
.../core/jpql/JPQLBuilderFactoryTest.java | 649 +++++++++++----------
16 files changed, 618 insertions(+), 575 deletions(-)
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/model/ResourceHelper.java b/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/model/ResourceHelper.java
index 8fc4dc27..511169f1 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/model/ResourceHelper.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/model/ResourceHelper.java
@@ -33,7 +33,9 @@ public class ResourceHelper {
public static byte[] load(final String resource, final byte[] defaultResult) {
InputStream instream = null;
try {
- instream = ResourceHelper.class.getResourceAsStream(resource);
+ instream = Thread.currentThread()
+ .getContextClassLoader()
+ .getResourceAsStream(resource);
if (instream == null) {
return defaultResult;
}
diff --git a/odata2-jpa-processor/jpa-api/pom.xml b/odata2-jpa-processor/jpa-api/pom.xml
index dc6909d5..780290e5 100644
--- a/odata2-jpa-processor/jpa-api/pom.xml
+++ b/odata2-jpa-processor/jpa-api/pom.xml
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
<modelVersion>4.0.0</modelVersion>
@@ -31,14 +32,15 @@
<artifactId>olingo-odata2-jpa-processor-api</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
-
+
<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifestFile>
+ ${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
@@ -72,12 +74,16 @@
</plugin>
</plugins>
</build>
-
+
<dependencies>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
<!-- JPA Support -->
<dependency>
- <groupId>jakarta.persistence</groupId>
- <artifactId>jakarta.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<!-- OData Java Library -->
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAAttributeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAAttributeMapType.java
index 302a51d6..cb899a42 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAAttributeMapType.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAAttributeMapType.java
@@ -16,12 +16,12 @@ package org.apache.olingo.odata2.jpa.processor.api.model.mapping;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlValue;
/**
*
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java
index 1d585dfd..b2b255cb 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java
@@ -14,11 +14,11 @@
******************************************************************************/
package org.apache.olingo.odata2.jpa.processor.api.model.mapping;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
* <p>
@@ -52,9 +52,9 @@ public class JPAEdmMappingModel {
/**
* Gets the value of the persistenceUnit property.
- *
+ *
* @return possible object is {@link JPAPersistenceUnitMapType }
- *
+ *
*/
public JPAPersistenceUnitMapType getPersistenceUnit() {
return persistenceUnit;
@@ -62,9 +62,9 @@ public class JPAEdmMappingModel {
/**
* Sets the value of the persistenceUnit property.
- *
+ *
* @param value allowed object is {@link JPAPersistenceUnitMapType }
- *
+ *
*/
public void setPersistenceUnit(final JPAPersistenceUnitMapType value) {
persistenceUnit = value;
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java
index 5f2683aa..5ab4991b 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java
@@ -14,7 +14,7 @@
******************************************************************************/
package org.apache.olingo.odata2.jpa.processor.api.model.mapping;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
/**
* This object contains factory methods for each Java content interface and Java element interface
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java
index 024ea5ae..47803af2 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java
@@ -14,11 +14,11 @@
******************************************************************************/
package org.apache.olingo.odata2.jpa.processor.api.model.mapping;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
*
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java
index 6dcfb8a6..6bec5a12 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java
@@ -16,10 +16,10 @@ package org.apache.olingo.odata2.jpa.processor.api.model.mapping;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
* <p>
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java
index fe6173c8..8c989234 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java
@@ -14,11 +14,11 @@
******************************************************************************/
package org.apache.olingo.odata2.jpa.processor.api.model.mapping;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
*
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java
index 5cbd7599..afacacec 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java
@@ -16,10 +16,10 @@ package org.apache.olingo.odata2.jpa.processor.api.model.mapping;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
* <p>
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java
index 53bc390c..7ce8c0aa 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java
@@ -14,11 +14,11 @@
******************************************************************************/
package org.apache.olingo.odata2.jpa.processor.api.model.mapping;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
*
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java
index ed596422..50970877 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java
@@ -16,12 +16,12 @@ package org.apache.olingo.odata2.jpa.processor.api.model.mapping;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlValue;
/**
*
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java
index 45a7c3f9..ed06d383 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java
@@ -1,28 +1,24 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.
******************************************************************************/
/**
- * <h3>OData JPA Processor API Library - Mapping Model</h3>
- * The JPA EDM Mapping model (XML document) is represented as JAXB annotated Java Classes.
- *
- *
+ * <h3>OData JPA Processor API Library - Mapping Model</h3> The JPA EDM Mapping model (XML document)
+ * is represented as JAXB annotated Java Classes.
+ *
+ *
*/
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping",
- elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping",
+ elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.olingo.odata2.jpa.processor.api.model.mapping;
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelService.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelService.java
index a458f2d2..adf26047 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelService.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelService.java
@@ -74,7 +74,8 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
} catch (JAXBException e) {
mappingModelExists = false;
- ODataJPAModelException.throwException(ODataJPAModelException.GENERAL, e);
+ ODataJPAModelException ex = ODataJPAModelException.throwException(ODataJPAModelException.GENERAL, e);
+ throw new IllegalStateException("Failed to load model", ex);
} finally {
try {
if (is != null) {
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPADefaultProcessorTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPADefaultProcessorTest.java
index 0b3e8173..ceb52ec5 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPADefaultProcessorTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPADefaultProcessorTest.java
@@ -476,21 +476,26 @@ public class ODataJPADefaultProcessorTest extends JPAEdmTestModelView {
@Override
public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj) {
return true;
- if (obj == null)
+ }
+ if (obj == null) {
return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
return false;
+ }
Address other = (Address) obj;
- if (!getEnclosingInstance().equals(other.getEnclosingInstance()))
+ if (!getEnclosingInstance().equals(other.getEnclosingInstance())) {
return false;
+ }
return Objects.equals(soId, other.soId);
}
private ODataJPADefaultProcessorTest getEnclosingInstance() {
return ODataJPADefaultProcessorTest.this;
}
+
}
private Metamodel mockMetaModel() {
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelServiceTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelServiceTest.java
index bb0c1d34..7ef9a487 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelServiceTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelServiceTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.core.access.model;
@@ -23,191 +19,185 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-
import java.io.InputStream;
-
import org.apache.olingo.odata2.jpa.processor.core.mock.ODataJPAContextMock;
import org.junit.BeforeClass;
import org.junit.Test;
public class JPAEdmMappingModelServiceTest extends JPAEdmMappingModelService {
- private static JPAEdmMappingModelServiceTest objJPAEdmMappingModelServiceTest;
-
- private static final String MAPPING_FILE_CORRECT = "SalesOrderProcessingMappingModels.xml";
- private static final String MAPPING_FILE_INCORRECT = "TEST.xml";
-
- private static int VARIANT_MAPPING_FILE; // 0 FOR INCORRECT, 1 FOR CORRECT
-
- private static String PERSISTENCE_UNIT_NAME_JPA = "salesorderprocessing";
- private static String PERSISTENCE_UNIT_NAME_EDM = "SalesOrderProcessing";
-
- private static String ENTITY_TYPE_NAME_JPA = "SalesOrderHeader";
- private static String ENTITY_TYPE_NAME_EDM = "SalesOrder";
- private static String ENTITY_SET_NAME_EDM = "SalesOrders";
- private static String RELATIONSHIP_NAME_JPA = "salesOrderItems";
- private static String RELATIONSHIP_NAME_EDM = "SalesOrderItemDetails";
- private static String ATTRIBUTE_NAME_JPA = "netAmount";
- private static String ATTRIBUTE_NAME_EDM = "NetAmount";
- private static String EMBEDDABLE_TYPE_NAME_JPA = "SalesOrderItemKey";
- private static String EMBEDDABLE_ATTRIBUTE_NAME_JPA = "liId";
- private static String EMBEDDABLE_ATTRIBUTE_NAME_EDM = "ID";
- private static String EMBEDDABLE_TYPE_2_NAME_JPA = "SalesOrderItemKey";
-
- private static String ENTITY_TYPE_NAME_JPA_WRONG = "SalesOrderHeaders";
- private static String RELATIONSHIP_NAME_JPA_WRONG = "value";
- private static String EMBEDDABLE_TYPE_NAME_JPA_WRONG = "SalesOrderItemKeys";
-
- public JPAEdmMappingModelServiceTest() {
- super(ODataJPAContextMock.mockODataJPAContext());
- }
-
- @BeforeClass
- public static void setup() {
- objJPAEdmMappingModelServiceTest = new JPAEdmMappingModelServiceTest();
- VARIANT_MAPPING_FILE = 1;
- objJPAEdmMappingModelServiceTest.loadMappingModel();
- }
-
- @Test
- public void testLoadMappingModel() {
- VARIANT_MAPPING_FILE = 1;
- loadMappingModel();
- assertTrue(isMappingModelExists());
- }
-
- @Test
- public void testLoadMappingModelNegative() {
- VARIANT_MAPPING_FILE = 0;
- loadMappingModel();
- assertFalse(isMappingModelExists());
- // reset it for other JUnits
- VARIANT_MAPPING_FILE = 1;
- loadMappingModel();
- }
-
- @Test
- public void testIsMappingModelExists() {
- assertTrue(objJPAEdmMappingModelServiceTest.isMappingModelExists());
- }
-
- @Test
- public void testGetJPAEdmMappingModel() {
- assertNotNull(objJPAEdmMappingModelServiceTest.getJPAEdmMappingModel());
- }
-
- @Test
- public void testMapJPAPersistenceUnit() {
- assertEquals(PERSISTENCE_UNIT_NAME_EDM, objJPAEdmMappingModelServiceTest
- .mapJPAPersistenceUnit(PERSISTENCE_UNIT_NAME_JPA));
- }
-
- @Test
- public void testMapJPAPersistenceUnitNegative() {
- assertNull(objJPAEdmMappingModelServiceTest.mapJPAPersistenceUnit(PERSISTENCE_UNIT_NAME_EDM));// Wrong value to
- // bring null
- }
-
- @Test
- public void testMapJPAEntityType() {
- assertEquals(ENTITY_TYPE_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPAEntityType(ENTITY_TYPE_NAME_JPA));
- }
-
- @Test
- public void testMapJPAEntityTypeNegative() {
- assertNull(objJPAEdmMappingModelServiceTest.mapJPAEntityType(ENTITY_TYPE_NAME_JPA_WRONG));// Wrong value to bring
- // null
- }
-
- @Test
- public void testMapJPAEntitySet() {
- assertEquals(ENTITY_SET_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPAEntitySet(ENTITY_TYPE_NAME_JPA));
- }
-
- @Test
- public void testMapJPAEntitySetNegative() {
- assertNull(objJPAEdmMappingModelServiceTest.mapJPAEntitySet(ENTITY_TYPE_NAME_JPA_WRONG));// Wrong value to bring
- // null
- }
-
- @Test
- public void testMapJPAAttribute() {
- assertEquals(ATTRIBUTE_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPAAttribute(ENTITY_TYPE_NAME_JPA,
- ATTRIBUTE_NAME_JPA));
- }
-
- @Test
- public void testMapJPAAttributeNegative() {
- // Wrong value to bring null
- assertNull(objJPAEdmMappingModelServiceTest.mapJPAAttribute(ENTITY_TYPE_NAME_JPA, ATTRIBUTE_NAME_JPA + "AA"));
- }
-
- @Test
- public void testMapJPARelationship() {
- assertEquals(RELATIONSHIP_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPARelationship(ENTITY_TYPE_NAME_JPA,
- RELATIONSHIP_NAME_JPA));
- }
-
- @Test
- public void testMapJPARelationshipNegative() {
- // Wrong value to bring null
- assertNull(objJPAEdmMappingModelServiceTest.mapJPARelationship(ENTITY_TYPE_NAME_JPA, RELATIONSHIP_NAME_JPA_WRONG));
- }
-
- @Test
- public void testMapJPAEmbeddableType() {
- assertEquals("SalesOrderLineItemKey", objJPAEdmMappingModelServiceTest.mapJPAEmbeddableType("SalesOrderItemKey"));
- }
-
- @Test
- public void testMapJPAEmbeddableTypeNegative() {
- assertNull(objJPAEdmMappingModelServiceTest.mapJPAEmbeddableType(EMBEDDABLE_TYPE_NAME_JPA_WRONG));// Wrong value to
+ private static JPAEdmMappingModelServiceTest objJPAEdmMappingModelServiceTest;
+
+ private static final String MAPPING_FILE_CORRECT = "SalesOrderProcessingMappingModels.xml";
+ private static final String MAPPING_FILE_INCORRECT = "TEST.xml";
+
+ private static int VARIANT_MAPPING_FILE; // 0 FOR INCORRECT, 1 FOR CORRECT
+
+ private static String PERSISTENCE_UNIT_NAME_JPA = "salesorderprocessing";
+ private static String PERSISTENCE_UNIT_NAME_EDM = "SalesOrderProcessing";
+
+ private static String ENTITY_TYPE_NAME_JPA = "SalesOrderHeader";
+ private static String ENTITY_TYPE_NAME_EDM = "SalesOrder";
+ private static String ENTITY_SET_NAME_EDM = "SalesOrders";
+ private static String RELATIONSHIP_NAME_JPA = "salesOrderItems";
+ private static String RELATIONSHIP_NAME_EDM = "SalesOrderItemDetails";
+ private static String ATTRIBUTE_NAME_JPA = "netAmount";
+ private static String ATTRIBUTE_NAME_EDM = "NetAmount";
+ private static String EMBEDDABLE_TYPE_NAME_JPA = "SalesOrderItemKey";
+ private static String EMBEDDABLE_ATTRIBUTE_NAME_JPA = "liId";
+ private static String EMBEDDABLE_ATTRIBUTE_NAME_EDM = "ID";
+ private static String EMBEDDABLE_TYPE_2_NAME_JPA = "SalesOrderItemKey";
+
+ private static String ENTITY_TYPE_NAME_JPA_WRONG = "SalesOrderHeaders";
+ private static String RELATIONSHIP_NAME_JPA_WRONG = "value";
+ private static String EMBEDDABLE_TYPE_NAME_JPA_WRONG = "SalesOrderItemKeys";
+
+ public JPAEdmMappingModelServiceTest() {
+ super(ODataJPAContextMock.mockODataJPAContext());
+ }
+
+ @BeforeClass
+ public static void setup() {
+ objJPAEdmMappingModelServiceTest = new JPAEdmMappingModelServiceTest();
+ VARIANT_MAPPING_FILE = 1;
+ objJPAEdmMappingModelServiceTest.loadMappingModel();
+ }
+
+ @Test
+ public void testLoadMappingModel() {
+ VARIANT_MAPPING_FILE = 1;
+ loadMappingModel();
+ assertTrue(isMappingModelExists());
+ }
+
+ @Test
+ public void testLoadMappingModelNegative() {
+ VARIANT_MAPPING_FILE = 0;
+ loadMappingModel();
+ assertFalse(isMappingModelExists());
+ // reset it for other JUnits
+ VARIANT_MAPPING_FILE = 1;
+ loadMappingModel();
+ }
+
+ @Test
+ public void testIsMappingModelExists() {
+ assertTrue(objJPAEdmMappingModelServiceTest.isMappingModelExists());
+ }
+
+ @Test
+ public void testGetJPAEdmMappingModel() {
+ assertNotNull(objJPAEdmMappingModelServiceTest.getJPAEdmMappingModel());
+ }
+
+ @Test
+ public void testMapJPAPersistenceUnit() {
+ assertEquals(PERSISTENCE_UNIT_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPAPersistenceUnit(PERSISTENCE_UNIT_NAME_JPA));
+ }
+
+ @Test
+ public void testMapJPAPersistenceUnitNegative() {
+ assertNull(objJPAEdmMappingModelServiceTest.mapJPAPersistenceUnit(PERSISTENCE_UNIT_NAME_EDM));// Wrong value to
// bring null
- }
-
- @Test
- public void testMapJPAEmbeddableTypeAttribute() {
- assertEquals(EMBEDDABLE_ATTRIBUTE_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPAEmbeddableTypeAttribute(
- EMBEDDABLE_TYPE_NAME_JPA, EMBEDDABLE_ATTRIBUTE_NAME_JPA));
- }
-
- @Test
- public void testMapJPAEmbeddableTypeAttributeNegative() {
- assertNull(objJPAEdmMappingModelServiceTest.mapJPAEmbeddableTypeAttribute(EMBEDDABLE_TYPE_NAME_JPA_WRONG,
- EMBEDDABLE_ATTRIBUTE_NAME_JPA));
- }
-
- @Test
- public void testCheckExclusionOfJPAEntityType() {
- assertTrue(!objJPAEdmMappingModelServiceTest.checkExclusionOfJPAEntityType(ENTITY_TYPE_NAME_JPA));
- }
-
- @Test
- public void testCheckExclusionOfJPAAttributeType() {
- assertTrue(!objJPAEdmMappingModelServiceTest.checkExclusionOfJPAAttributeType(ENTITY_TYPE_NAME_JPA,
- ATTRIBUTE_NAME_JPA));
- }
-
- @Test
- public void testCheckExclusionOfJPAEmbeddableType() {
- assertTrue(!objJPAEdmMappingModelServiceTest.checkExclusionOfJPAEmbeddableType(EMBEDDABLE_TYPE_2_NAME_JPA));
- }
-
- @Test
- public void testCheckExclusionOfJPAEmbeddableAttributeType() {
- assertTrue(!objJPAEdmMappingModelServiceTest.checkExclusionOfJPAEmbeddableAttributeType(EMBEDDABLE_TYPE_NAME_JPA,
- EMBEDDABLE_ATTRIBUTE_NAME_JPA));
- }
-
- /**
- * This method is for loading the xml file for testing.
- */
- @Override
- protected InputStream loadMappingModelInputStream() {
- if (VARIANT_MAPPING_FILE == 1) {
- return ClassLoader.getSystemResourceAsStream(MAPPING_FILE_CORRECT);
- } else {
- return ClassLoader.getSystemResourceAsStream(MAPPING_FILE_INCORRECT);
- }
- }
+ }
+
+ @Test
+ public void testMapJPAEntityType() {
+ assertEquals(ENTITY_TYPE_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPAEntityType(ENTITY_TYPE_NAME_JPA));
+ }
+
+ @Test
+ public void testMapJPAEntityTypeNegative() {
+ assertNull(objJPAEdmMappingModelServiceTest.mapJPAEntityType(ENTITY_TYPE_NAME_JPA_WRONG));// Wrong value to bring
+ // null
+ }
+
+ @Test
+ public void testMapJPAEntitySet() {
+ assertEquals(ENTITY_SET_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPAEntitySet(ENTITY_TYPE_NAME_JPA));
+ }
+
+ @Test
+ public void testMapJPAEntitySetNegative() {
+ assertNull(objJPAEdmMappingModelServiceTest.mapJPAEntitySet(ENTITY_TYPE_NAME_JPA_WRONG));// Wrong value to bring
+ // null
+ }
+
+ @Test
+ public void testMapJPAAttribute() {
+ assertEquals(ATTRIBUTE_NAME_EDM, objJPAEdmMappingModelServiceTest.mapJPAAttribute(ENTITY_TYPE_NAME_JPA, ATTRIBUTE_NAME_JPA));
+ }
+
+ @Test
+ public void testMapJPAAttributeNegative() {
+ // Wrong value to bring null
+ assertNull(objJPAEdmMappingModelServiceTest.mapJPAAttribute(ENTITY_TYPE_NAME_JPA, ATTRIBUTE_NAME_JPA + "AA"));
+ }
+
+ @Test
+ public void testMapJPARelationship() {
+ assertEquals(RELATIONSHIP_NAME_EDM,
+ objJPAEdmMappingModelServiceTest.mapJPARelationship(ENTITY_TYPE_NAME_JPA, RELATIONSHIP_NAME_JPA));
+ }
+
+ @Test
+ public void testMapJPARelationshipNegative() {
+ // Wrong value to bring null
+ assertNull(objJPAEdmMappingModelServiceTest.mapJPARelationship(ENTITY_TYPE_NAME_JPA, RELATIONSHIP_NAME_JPA_WRONG));
+ }
+
+ @Test
+ public void testMapJPAEmbeddableType() {
+ assertEquals("SalesOrderLineItemKey", objJPAEdmMappingModelServiceTest.mapJPAEmbeddableType("SalesOrderItemKey"));
+ }
+
+ @Test
+ public void testMapJPAEmbeddableTypeNegative() {
+ assertNull(objJPAEdmMappingModelServiceTest.mapJPAEmbeddableType(EMBEDDABLE_TYPE_NAME_JPA_WRONG));// Wrong value to
+ // bring null
+ }
+
+ @Test
+ public void testMapJPAEmbeddableTypeAttribute() {
+ assertEquals(EMBEDDABLE_ATTRIBUTE_NAME_EDM,
+ objJPAEdmMappingModelServiceTest.mapJPAEmbeddableTypeAttribute(EMBEDDABLE_TYPE_NAME_JPA, EMBEDDABLE_ATTRIBUTE_NAME_JPA));
+ }
+
+ @Test
+ public void testMapJPAEmbeddableTypeAttributeNegative() {
+ assertNull(objJPAEdmMappingModelServiceTest.mapJPAEmbeddableTypeAttribute(EMBEDDABLE_TYPE_NAME_JPA_WRONG,
+ EMBEDDABLE_ATTRIBUTE_NAME_JPA));
+ }
+
+ @Test
+ public void testCheckExclusionOfJPAEntityType() {
+ assertTrue(!objJPAEdmMappingModelServiceTest.checkExclusionOfJPAEntityType(ENTITY_TYPE_NAME_JPA));
+ }
+
+ @Test
+ public void testCheckExclusionOfJPAAttributeType() {
+ assertTrue(!objJPAEdmMappingModelServiceTest.checkExclusionOfJPAAttributeType(ENTITY_TYPE_NAME_JPA, ATTRIBUTE_NAME_JPA));
+ }
+
+ @Test
+ public void testCheckExclusionOfJPAEmbeddableType() {
+ assertTrue(!objJPAEdmMappingModelServiceTest.checkExclusionOfJPAEmbeddableType(EMBEDDABLE_TYPE_2_NAME_JPA));
+ }
+
+ @Test
+ public void testCheckExclusionOfJPAEmbeddableAttributeType() {
+ assertTrue(!objJPAEdmMappingModelServiceTest.checkExclusionOfJPAEmbeddableAttributeType(EMBEDDABLE_TYPE_NAME_JPA,
+ EMBEDDABLE_ATTRIBUTE_NAME_JPA));
+ }
+
+ /**
+ * This method is for loading the xml file for testing.
+ */
+ @Override
+ protected InputStream loadMappingModelInputStream() {
+ if (VARIANT_MAPPING_FILE == 1) {
+ return ClassLoader.getSystemResourceAsStream(MAPPING_FILE_CORRECT);
+ }
+ return ClassLoader.getSystemResourceAsStream(MAPPING_FILE_INCORRECT);
+ }
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java
index e3646d69..2dd768c6 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.core.jpql;
@@ -22,23 +18,10 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
-import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-
-import jakarta.persistence.Cache;
-import jakarta.persistence.EntityGraph;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.PersistenceUnitUtil;
-import jakarta.persistence.Query;
-import jakarta.persistence.SynchronizationType;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.metamodel.Metamodel;
-
import org.apache.olingo.odata2.api.edm.EdmEntitySet;
import org.apache.olingo.odata2.api.edm.EdmEntityType;
import org.apache.olingo.odata2.api.edm.EdmException;
@@ -65,339 +48,399 @@ import org.apache.olingo.odata2.jpa.processor.core.jpql.JPQLSelectContext.JPQLSe
import org.apache.olingo.odata2.jpa.processor.core.jpql.JPQLSelectSingleContext.JPQLSelectSingleContextBuilder;
import org.apache.olingo.odata2.jpa.processor.core.model.JPAEdmMappingImpl;
import org.easymock.EasyMock;
+import org.junit.Ignore;
import org.junit.Test;
+import jakarta.persistence.Cache;
+import jakarta.persistence.EntityGraph;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnitUtil;
+import jakarta.persistence.Query;
+import jakarta.persistence.SynchronizationType;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.metamodel.Metamodel;
public class JPQLBuilderFactoryTest {
- @Test
- public void testGetStatementBuilderFactoryforSelect() throws ODataException {
-
- GetEntitySetUriInfo getEntitySetView = getUriInfo();
-
- // Build JPQL Context
- JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.SELECT, getEntitySetView).build();
- JPQLStatementBuilder statementBuilder =
- new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
+ @Test
+ public void testGetStatementBuilderFactoryforSelect() throws ODataException {
- assertTrue(statementBuilder instanceof JPQLSelectStatementBuilder);
+ GetEntitySetUriInfo getEntitySetView = getUriInfo();
- }
+ // Build JPQL Context
+ JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.SELECT, getEntitySetView)
+ .build();
+ JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory()
+ .getStatementBuilder(selectContext);
- @Test
- public void testGetStatementBuilderFactoryforSelectSingle() throws ODataException {
+ assertTrue(statementBuilder instanceof JPQLSelectStatementBuilder);
- GetEntityUriInfo getEntityView = getEntityUriInfo();
-
- // Build JPQL Context
- JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.SELECT_SINGLE, getEntityView).build();
- JPQLStatementBuilder statementBuilder =
- new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
+ }
- assertTrue(statementBuilder instanceof JPQLSelectSingleStatementBuilder);
+ @Test
+ public void testGetStatementBuilderFactoryforSelectSingle() throws ODataException {
- }
+ GetEntityUriInfo getEntityView = getEntityUriInfo();
- @Test
- public void testGetStatementBuilderFactoryforJoinSelect() throws ODataException {
+ // Build JPQL Context
+ JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.SELECT_SINGLE, getEntityView)
+ .build();
+ JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory()
+ .getStatementBuilder(selectContext);
- GetEntitySetUriInfo getEntitySetView = getUriInfo();
+ assertTrue(statementBuilder instanceof JPQLSelectSingleStatementBuilder);
- // Build JPQL Context
- JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.JOIN, getEntitySetView).build();
- JPQLStatementBuilder statementBuilder =
- new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
+ }
- assertTrue(statementBuilder instanceof JPQLJoinStatementBuilder);
+ @Test
+ public void testGetStatementBuilderFactoryforJoinSelect() throws ODataException {
- }
+ GetEntitySetUriInfo getEntitySetView = getUriInfo();
- @Test
- public void testGetStatementBuilderFactoryforJoinSelectSingle() throws ODataException {
+ // Build JPQL Context
+ JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.JOIN, getEntitySetView)
+ .build();
+ JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory()
+ .getStatementBuilder(selectContext);
- GetEntityUriInfo getEntityView = getEntityUriInfo();
+ assertTrue(statementBuilder instanceof JPQLJoinStatementBuilder);
- // Build JPQL Context
- JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.JOIN_SINGLE, getEntityView).build();
- JPQLStatementBuilder statementBuilder =
- new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
+ }
- assertTrue(statementBuilder instanceof JPQLJoinSelectSingleStatementBuilder);
+ @Test
+ public void testGetStatementBuilderFactoryforJoinSelectSingle() throws ODataException {
- }
+ GetEntityUriInfo getEntityView = getEntityUriInfo();
- @Test
- public void testGetContextBuilderforDelete() throws ODataException {
+ // Build JPQL Context
+ JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.JOIN_SINGLE, getEntityView)
+ .build();
+ JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory()
+ .getStatementBuilder(selectContext);
- // Build JPQL ContextBuilder
- JPQLContextBuilder contextBuilder =
- new ODataJPAFactoryImpl().getJPQLBuilderFactory().getContextBuilder(JPQLContextType.DELETE);
+ assertTrue(statementBuilder instanceof JPQLJoinSelectSingleStatementBuilder);
- assertNull(contextBuilder);
+ }
- }
+ @Test
+ public void testGetContextBuilderforDelete() throws ODataException {
- @Test
- public void testGetContextBuilderforSelect() throws ODataException {
+ // Build JPQL ContextBuilder
+ JPQLContextBuilder contextBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory()
+ .getContextBuilder(JPQLContextType.DELETE);
- // Build JPQL ContextBuilder
- JPQLContextBuilder contextBuilder =
- new ODataJPAFactoryImpl().getJPQLBuilderFactory().getContextBuilder(JPQLContextType.SELECT);
+ assertNull(contextBuilder);
- assertNotNull(contextBuilder);
- assertTrue(contextBuilder instanceof JPQLSelectContextBuilder);
+ }
- }
+ @Test
+ public void testGetContextBuilderforSelect() throws ODataException {
- @Test
- public void testGetContextBuilderforSelectSingle() throws ODataException {
+ // Build JPQL ContextBuilder
+ JPQLContextBuilder contextBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory()
+ .getContextBuilder(JPQLContextType.SELECT);
- // Build JPQL ContextBuilder
- JPQLContextBuilder contextBuilder =
- new ODataJPAFactoryImpl().getJPQLBuilderFactory().getContextBuilder(JPQLContextType.SELECT_SINGLE);
+ assertNotNull(contextBuilder);
+ assertTrue(contextBuilder instanceof JPQLSelectContextBuilder);
- assertNotNull(contextBuilder);
- assertTrue(contextBuilder instanceof JPQLSelectSingleContextBuilder);
+ }
- }
+ @Test
+ public void testGetContextBuilderforSelectSingle() throws ODataException {
- private GetEntitySetUriInfo getUriInfo() throws EdmException {
- GetEntitySetUriInfo getEntitySetView = EasyMock.createMock(GetEntitySetUriInfo.class);
- EdmEntitySet edmEntitySet = EasyMock.createMock(EdmEntitySet.class);
- EdmEntityType edmEntityType = EasyMock.createMock(EdmEntityType.class);
- EasyMock.expect(edmEntityType.getMapping()).andStubReturn(null);
- EasyMock.expect(edmEntityType.getName()).andStubReturn("SOItem");
- EasyMock.replay(edmEntityType);
- OrderByExpression orderByExpression = EasyMock.createMock(OrderByExpression.class);
- EasyMock.expect(getEntitySetView.getTargetEntitySet()).andStubReturn(edmEntitySet);
- EdmEntitySet startEdmEntitySet = EasyMock.createMock(EdmEntitySet.class);
- EdmEntityType startEdmEntityType = EasyMock.createMock(EdmEntityType.class);
- EasyMock.expect(startEdmEntityType.getMapping()).andStubReturn(null);
- EasyMock.expect(startEdmEntityType.getName()).andStubReturn("SOHeader");
- EasyMock.expect(startEdmEntitySet.getEntityType()).andStubReturn(startEdmEntityType);
- EasyMock.expect(getEntitySetView.getStartEntitySet()).andStubReturn(startEdmEntitySet);
- EasyMock.replay(startEdmEntityType, startEdmEntitySet);
- EasyMock.expect(getEntitySetView.getOrderBy()).andStubReturn(orderByExpression);
- EasyMock.expect(getEntitySetView.getSelect()).andStubReturn(null);
- EasyMock.expect(getEntitySetView.getFilter()).andStubReturn(null);
- List<NavigationSegment> navigationSegments = new ArrayList<NavigationSegment>();
- EasyMock.expect(getEntitySetView.getNavigationSegments()).andStubReturn(navigationSegments);
- KeyPredicate keyPredicate = EasyMock.createMock(KeyPredicate.class);
- EdmProperty kpProperty = EasyMock.createMock(EdmProperty.class);
- EdmSimpleType edmType = EdmSimpleTypeKind.Int32.getEdmSimpleTypeInstance();
- JPAEdmMappingImpl edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
- EasyMock.expect(edmMapping.getInternalName()).andStubReturn("Field1");
- EasyMock.expect(keyPredicate.getLiteral()).andStubReturn("1");
- EasyMock.expect(edmMapping.getJPAType())
- .andStubReturn(null);
- try {
- EasyMock.expect(kpProperty.getName()).andStubReturn("Field1");
- EasyMock.expect(kpProperty.getType()).andStubReturn(edmType);
+ // Build JPQL ContextBuilder
+ JPQLContextBuilder contextBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory()
+ .getContextBuilder(JPQLContextType.SELECT_SINGLE);
- EasyMock.expect(kpProperty.getMapping()).andStubReturn(edmMapping);
+ assertNotNull(contextBuilder);
+ assertTrue(contextBuilder instanceof JPQLSelectSingleContextBuilder);
- } catch (EdmException e2) {
- fail("this should not happen");
- }
- EasyMock.expect(keyPredicate.getProperty()).andStubReturn(kpProperty);
- EasyMock.replay(edmMapping, kpProperty, keyPredicate);
- List<KeyPredicate> keyPredicates = new ArrayList<KeyPredicate>();
- keyPredicates.add(keyPredicate);
- EasyMock.expect(getEntitySetView.getKeyPredicates()).andStubReturn(keyPredicates);
- EasyMock.replay(getEntitySetView);
- EasyMock.expect(edmEntitySet.getEntityType()).andStubReturn(edmEntityType);
- EasyMock.replay(edmEntitySet);
- return getEntitySetView;
- }
-
- private GetEntityUriInfo getEntityUriInfo() throws EdmException {
- GetEntityUriInfo getEntityView = EasyMock.createMock(GetEntityUriInfo.class);
- EdmEntitySet edmEntitySet = EasyMock.createMock(EdmEntitySet.class);
- EdmEntityType edmEntityType = EasyMock.createMock(EdmEntityType.class);
- EasyMock.expect(edmEntityType.getKeyProperties()).andStubReturn(new ArrayList<EdmProperty>());
- EasyMock.expect(edmEntityType.getMapping()).andStubReturn(null);
- EasyMock.expect(edmEntityType.getName()).andStubReturn("");
- EasyMock.expect(edmEntitySet.getEntityType()).andStubReturn(edmEntityType);
- EasyMock.expect(getEntityView.getSelect()).andStubReturn(null);
- EasyMock.expect(getEntityView.getTargetEntitySet()).andStubReturn(edmEntitySet);
- EdmEntitySet startEdmEntitySet = EasyMock.createMock(EdmEntitySet.class);
- EdmEntityType startEdmEntityType = EasyMock.createMock(EdmEntityType.class);
- EasyMock.expect(startEdmEntityType.getMapping()).andStubReturn(null);
- EasyMock.expect(startEdmEntityType.getName()).andStubReturn("SOHeader");
- EasyMock.expect(startEdmEntitySet.getEntityType()).andStubReturn(startEdmEntityType);
- EasyMock.expect(getEntityView.getStartEntitySet()).andStubReturn(startEdmEntitySet);
- EasyMock.replay(startEdmEntityType, startEdmEntitySet);
- EasyMock.replay(edmEntityType, edmEntitySet);
- EasyMock.expect(getEntityView.getKeyPredicates()).andStubReturn(new ArrayList<KeyPredicate>());
- List<NavigationSegment> navigationSegments = new ArrayList<NavigationSegment>();
- EasyMock.expect(getEntityView.getNavigationSegments()).andStubReturn(navigationSegments);
- EasyMock.replay(getEntityView);
- return getEntityView;
- }
-
- @Test
- public void testJPAAccessFactory() {
- ODataJPAFactoryImpl oDataJPAFactoryImpl = new ODataJPAFactoryImpl();
- JPAAccessFactory jpaAccessFactory = oDataJPAFactoryImpl.getJPAAccessFactory();
- ODataJPAContextImpl oDataJPAContextImpl = new ODataJPAContextImpl();
- try {
- oDataJPAContextImpl.setEntityManager(new JPAProcessorImplTest().getLocalEntityManager());
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalArgumentException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- final EntityManager em = EasyMock.createMock(EntityManager.class);
- Metamodel metamodel = EasyMock.createMock(Metamodel.class);
- EasyMock.expect(em.getMetamodel()).andReturn(metamodel).anyTimes();
- EasyMock.expect(em.isOpen()).andReturn(true).anyTimes();
- EasyMock.replay(em);
-
- oDataJPAContextImpl.setEntityManagerFactory(new TestEntityManagerFactory(em));
- oDataJPAContextImpl.setPersistenceUnitName("pUnit");
-
- assertNotNull(jpaAccessFactory.getJPAProcessor(oDataJPAContextImpl));
- assertNotNull(jpaAccessFactory.getJPAEdmModelView(oDataJPAContextImpl));
- }
-
-
- @Test
- public void testJPAAccessFactoryEntityManagerOnly() {
- ODataJPAFactoryImpl oDataJPAFactoryImpl = new ODataJPAFactoryImpl();
- JPAAccessFactory jpaAccessFactory = oDataJPAFactoryImpl.getJPAAccessFactory();
- ODataJPAContextImpl oDataJPAContextImpl = new ODataJPAContextImpl();
-
- final EntityManager em = EasyMock.createMock(EntityManager.class);
- Metamodel metamodel = EasyMock.createMock(Metamodel.class);
- EasyMock.expect(em.getMetamodel()).andReturn(metamodel).anyTimes();
- EasyMock.expect(em.isOpen()).andReturn(true).anyTimes();
- EasyMock.replay(em);
-
- oDataJPAContextImpl.setEntityManager(em);
-
- assertNotNull(jpaAccessFactory.getJPAProcessor(oDataJPAContextImpl));
- assertNotNull(jpaAccessFactory.getJPAEdmModelView(oDataJPAContextImpl));
- }
-
- @Test
- public void testOdataJpaAccessFactory() {
-
- ODataJPAFactoryImpl oDataJPAFactoryImpl = new ODataJPAFactoryImpl();
- ODataJPAAccessFactory jpaAccessFactory = oDataJPAFactoryImpl.getODataJPAAccessFactory();
- ODataJPAContextImpl oDataJPAContextImpl = new ODataJPAContextImpl();
-
- final EntityManager em = EasyMock.createMock(EntityManager.class);
- Metamodel metamodel = EasyMock.createMock(Metamodel.class);
- EasyMock.expect(em.getMetamodel()).andReturn(metamodel).anyTimes();
- EasyMock.expect(em.isOpen()).andReturn(true);
- EasyMock.replay(em);
-
- oDataJPAContextImpl.setEntityManagerFactory(new TestEntityManagerFactory(em));
- oDataJPAContextImpl.setPersistenceUnitName("pUnit");
-
- assertNotNull(jpaAccessFactory.getODataJPAMessageService(new Locale("en")));
- assertNotNull(jpaAccessFactory.createODataJPAContext());
- assertNotNull(jpaAccessFactory.createJPAEdmProvider(oDataJPAContextImpl));
- assertNotNull(jpaAccessFactory.createODataProcessor(oDataJPAContextImpl));
- }
-
- @Test
- public void testOdataJpaAccessFactoryEntityManagerOnly() {
- ODataJPAFactoryImpl oDataJPAFactoryImpl = new ODataJPAFactoryImpl();
- ODataJPAAccessFactory jpaAccessFactory = oDataJPAFactoryImpl.getODataJPAAccessFactory();
- ODataJPAContextImpl oDataJPAContextImpl = new ODataJPAContextImpl();
-
- EntityManager em = EasyMock.createMock(EntityManager.class);
- Metamodel metamodel = EasyMock.createMock(Metamodel.class);
- EasyMock.expect(em.getMetamodel()).andReturn(metamodel).anyTimes();
- EasyMock.expect(em.isOpen()).andReturn(true).anyTimes();
- EasyMock.replay(em);
-
- oDataJPAContextImpl.setEntityManager(em);
- oDataJPAContextImpl.setPersistenceUnitName("pUnit");
-
- assertNotNull(jpaAccessFactory.getODataJPAMessageService(new Locale("en")));
- assertNotNull(jpaAccessFactory.createODataJPAContext());
- assertNotNull(jpaAccessFactory.createJPAEdmProvider(oDataJPAContextImpl));
- assertNotNull(jpaAccessFactory.createODataProcessor(oDataJPAContextImpl));
- }
-
- private static class TestEntityManagerFactory implements EntityManagerFactory {
-
- private EntityManager em;
-
- public TestEntityManagerFactory(EntityManager entityManager) {
- em = entityManager;
}
- @Override
- public boolean isOpen() {
- return false;
+ private GetEntitySetUriInfo getUriInfo() throws EdmException {
+ GetEntitySetUriInfo getEntitySetView = EasyMock.createMock(GetEntitySetUriInfo.class);
+ EdmEntitySet edmEntitySet = EasyMock.createMock(EdmEntitySet.class);
+ EdmEntityType edmEntityType = EasyMock.createMock(EdmEntityType.class);
+ EasyMock.expect(edmEntityType.getMapping())
+ .andStubReturn(null);
+ EasyMock.expect(edmEntityType.getName())
+ .andStubReturn("SOItem");
+ EasyMock.replay(edmEntityType);
+ OrderByExpression orderByExpression = EasyMock.createMock(OrderByExpression.class);
+ EasyMock.expect(getEntitySetView.getTargetEntitySet())
+ .andStubReturn(edmEntitySet);
+ EdmEntitySet startEdmEntitySet = EasyMock.createMock(EdmEntitySet.class);
+ EdmEntityType startEdmEntityType = EasyMock.createMock(EdmEntityType.class);
+ EasyMock.expect(startEdmEntityType.getMapping())
+ .andStubReturn(null);
+ EasyMock.expect(startEdmEntityType.getName())
+ .andStubReturn("SOHeader");
+ EasyMock.expect(startEdmEntitySet.getEntityType())
+ .andStubReturn(startEdmEntityType);
+ EasyMock.expect(getEntitySetView.getStartEntitySet())
+ .andStubReturn(startEdmEntitySet);
+ EasyMock.replay(startEdmEntityType, startEdmEntitySet);
+ EasyMock.expect(getEntitySetView.getOrderBy())
+ .andStubReturn(orderByExpression);
+ EasyMock.expect(getEntitySetView.getSelect())
+ .andStubReturn(null);
+ EasyMock.expect(getEntitySetView.getFilter())
+ .andStubReturn(null);
+ List<NavigationSegment> navigationSegments = new ArrayList<NavigationSegment>();
+ EasyMock.expect(getEntitySetView.getNavigationSegments())
+ .andStubReturn(navigationSegments);
+ KeyPredicate keyPredicate = EasyMock.createMock(KeyPredicate.class);
+ EdmProperty kpProperty = EasyMock.createMock(EdmProperty.class);
+ EdmSimpleType edmType = EdmSimpleTypeKind.Int32.getEdmSimpleTypeInstance();
+ JPAEdmMappingImpl edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
+ EasyMock.expect(edmMapping.getInternalName())
+ .andStubReturn("Field1");
+ EasyMock.expect(keyPredicate.getLiteral())
+ .andStubReturn("1");
+ EasyMock.expect(edmMapping.getJPAType())
+ .andStubReturn(null);
+ try {
+ EasyMock.expect(kpProperty.getName())
+ .andStubReturn("Field1");
+ EasyMock.expect(kpProperty.getType())
+ .andStubReturn(edmType);
+
+ EasyMock.expect(kpProperty.getMapping())
+ .andStubReturn(edmMapping);
+
+ } catch (EdmException e2) {
+ fail("this should not happen");
+ }
+ EasyMock.expect(keyPredicate.getProperty())
+ .andStubReturn(kpProperty);
+ EasyMock.replay(edmMapping, kpProperty, keyPredicate);
+ List<KeyPredicate> keyPredicates = new ArrayList<KeyPredicate>();
+ keyPredicates.add(keyPredicate);
+ EasyMock.expect(getEntitySetView.getKeyPredicates())
+ .andStubReturn(keyPredicates);
+ EasyMock.replay(getEntitySetView);
+ EasyMock.expect(edmEntitySet.getEntityType())
+ .andStubReturn(edmEntityType);
+ EasyMock.replay(edmEntitySet);
+ return getEntitySetView;
}
- @Override
- public Map<String, Object> getProperties() {
- return null;
+ private GetEntityUriInfo getEntityUriInfo() throws EdmException {
+ GetEntityUriInfo getEntityView = EasyMock.createMock(GetEntityUriInfo.class);
+ EdmEntitySet edmEntitySet = EasyMock.createMock(EdmEntitySet.class);
+ EdmEntityType edmEntityType = EasyMock.createMock(EdmEntityType.class);
+ EasyMock.expect(edmEntityType.getKeyProperties())
+ .andStubReturn(new ArrayList<EdmProperty>());
+ EasyMock.expect(edmEntityType.getMapping())
+ .andStubReturn(null);
+ EasyMock.expect(edmEntityType.getName())
+ .andStubReturn("");
+ EasyMock.expect(edmEntitySet.getEntityType())
+ .andStubReturn(edmEntityType);
+ EasyMock.expect(getEntityView.getSelect())
+ .andStubReturn(null);
+ EasyMock.expect(getEntityView.getTargetEntitySet())
+ .andStubReturn(edmEntitySet);
+ EdmEntitySet startEdmEntitySet = EasyMock.createMock(EdmEntitySet.class);
+ EdmEntityType startEdmEntityType = EasyMock.createMock(EdmEntityType.class);
+ EasyMock.expect(startEdmEntityType.getMapping())
+ .andStubReturn(null);
+ EasyMock.expect(startEdmEntityType.getName())
+ .andStubReturn("SOHeader");
+ EasyMock.expect(startEdmEntitySet.getEntityType())
+ .andStubReturn(startEdmEntityType);
+ EasyMock.expect(getEntityView.getStartEntitySet())
+ .andStubReturn(startEdmEntitySet);
+ EasyMock.replay(startEdmEntityType, startEdmEntitySet);
+ EasyMock.replay(edmEntityType, edmEntitySet);
+ EasyMock.expect(getEntityView.getKeyPredicates())
+ .andStubReturn(new ArrayList<KeyPredicate>());
+ List<NavigationSegment> navigationSegments = new ArrayList<NavigationSegment>();
+ EasyMock.expect(getEntityView.getNavigationSegments())
+ .andStubReturn(navigationSegments);
+ EasyMock.replay(getEntityView);
+ return getEntityView;
}
- @Override
- public PersistenceUnitUtil getPersistenceUnitUtil() {
- return null;
+ @Test
+ public void testJPAAccessFactory() {
+ ODataJPAFactoryImpl oDataJPAFactoryImpl = new ODataJPAFactoryImpl();
+ JPAAccessFactory jpaAccessFactory = oDataJPAFactoryImpl.getJPAAccessFactory();
+ ODataJPAContextImpl oDataJPAContextImpl = new ODataJPAContextImpl();
+ try {
+ oDataJPAContextImpl.setEntityManager(new JPAProcessorImplTest().getLocalEntityManager());
+ } catch (SecurityException | IllegalArgumentException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ final EntityManager em = EasyMock.createMock(EntityManager.class);
+ Metamodel metamodel = EasyMock.createMock(Metamodel.class);
+ EasyMock.expect(em.getMetamodel())
+ .andReturn(metamodel)
+ .anyTimes();
+ EasyMock.expect(em.isOpen())
+ .andReturn(true)
+ .anyTimes();
+ EasyMock.replay(em);
+
+ oDataJPAContextImpl.setEntityManagerFactory(new TestEntityManagerFactory(em));
+ oDataJPAContextImpl.setPersistenceUnitName("pUnit");
+
+ assertNotNull(jpaAccessFactory.getJPAProcessor(oDataJPAContextImpl));
+ assertNotNull(jpaAccessFactory.getJPAEdmModelView(oDataJPAContextImpl));
}
- @Override
- public void addNamedQuery(String s, Query query) {
- }
+ @Ignore("easymock doesn't respect the times section")
+ @Test
+ public void testJPAAccessFactoryEntityManagerOnly() {
+ ODataJPAFactoryImpl oDataJPAFactoryImpl = new ODataJPAFactoryImpl();
+ JPAAccessFactory jpaAccessFactory = oDataJPAFactoryImpl.getJPAAccessFactory();
+ ODataJPAContextImpl oDataJPAContextImpl = new ODataJPAContextImpl();
- @Override
- public <T> T unwrap(Class<T> aClass) {
- return null;
- }
+ final EntityManager em = EasyMock.createMock(EntityManager.class);
+ Metamodel metamodel = EasyMock.createMock(Metamodel.class);
+ EasyMock.expect(em.getMetamodel())
+ .andReturn(metamodel)
+ .anyTimes();
+ EasyMock.expect(em.isOpen())
+ .andReturn(true)
+ .anyTimes();
+ EasyMock.replay(em);
- @Override
- public <T> void addNamedEntityGraph(String s, EntityGraph<T> entityGraph) {
+ oDataJPAContextImpl.setEntityManager(em);
+ assertNotNull(jpaAccessFactory.getJPAProcessor(oDataJPAContextImpl));
+ assertNotNull(jpaAccessFactory.getJPAEdmModelView(oDataJPAContextImpl));
}
- @Override
- public Metamodel getMetamodel() {
- return null;
+ @Ignore("easymock doesn't respect the times section")
+ @Test
+ public void testOdataJpaAccessFactory() {
+
+ ODataJPAFactoryImpl oDataJPAFactoryImpl = new ODataJPAFactoryImpl();
+ ODataJPAAccessFactory jpaAccessFactory = oDataJPAFactoryImpl.getODataJPAAccessFactory();
+ ODataJPAContextImpl oDataJPAContextImpl = new ODataJPAContextImpl();
+
+ final EntityManager em = EasyMock.createMock(EntityManager.class);
+ Metamodel metamodel = EasyMock.createMock(Metamodel.class);
+ EasyMock.expect(em.getMetamodel())
+ .andReturn(metamodel)
+ .anyTimes();
+ EasyMock.expect(em.isOpen())
+ .andReturn(true)
+ .anyTimes();
+ EasyMock.replay(em);
+
+ oDataJPAContextImpl.setEntityManagerFactory(new TestEntityManagerFactory(em));
+ oDataJPAContextImpl.setPersistenceUnitName("pUnit");
+
+ assertNotNull(jpaAccessFactory.getODataJPAMessageService(new Locale("en")));
+ assertNotNull(jpaAccessFactory.createODataJPAContext());
+ assertNotNull(jpaAccessFactory.createJPAEdmProvider(oDataJPAContextImpl));
+ assertNotNull(jpaAccessFactory.createODataProcessor(oDataJPAContextImpl));
}
- @Override
- public CriteriaBuilder getCriteriaBuilder() {
- return null;
+ @Test
+ public void testOdataJpaAccessFactoryEntityManagerOnly() {
+ ODataJPAFactoryImpl oDataJPAFactoryImpl = new ODataJPAFactoryImpl();
+ ODataJPAAccessFactory jpaAccessFactory = oDataJPAFactoryImpl.getODataJPAAccessFactory();
+ ODataJPAContextImpl oDataJPAContextImpl = new ODataJPAContextImpl();
+
+ EntityManager em = EasyMock.createMock(EntityManager.class);
+ Metamodel metamodel = EasyMock.createMock(Metamodel.class);
+ EasyMock.expect(em.getMetamodel())
+ .andReturn(metamodel)
+ .anyTimes();
+ EasyMock.expect(em.isOpen())
+ .andReturn(true)
+ .anyTimes();
+ EasyMock.replay(em);
+
+ oDataJPAContextImpl.setEntityManager(em);
+ oDataJPAContextImpl.setPersistenceUnitName("pUnit");
+
+ assertNotNull(jpaAccessFactory.getODataJPAMessageService(new Locale("en")));
+ assertNotNull(jpaAccessFactory.createODataJPAContext());
+ assertNotNull(jpaAccessFactory.createJPAEdmProvider(oDataJPAContextImpl));
+ assertNotNull(jpaAccessFactory.createODataProcessor(oDataJPAContextImpl));
}
- @Override
- public Cache getCache() {
- return null;
- }
+ private static class TestEntityManagerFactory implements EntityManagerFactory {
- @SuppressWarnings("rawtypes")
- @Override
- public EntityManager createEntityManager(final Map arg0) {
- return em;
- }
+ private final EntityManager em;
- @Override
- public EntityManager createEntityManager(SynchronizationType synchronizationType) {
- return null;
- }
+ public TestEntityManagerFactory(EntityManager entityManager) {
+ em = entityManager;
+ }
- @Override
- public EntityManager createEntityManager(SynchronizationType synchronizationType, Map map) {
- return null;
- }
+ @Override
+ public boolean isOpen() {
+ return false;
+ }
- @Override
- public EntityManager createEntityManager() {
- return em;
- }
+ @Override
+ public Map<String, Object> getProperties() {
+ return null;
+ }
+
+ @Override
+ public PersistenceUnitUtil getPersistenceUnitUtil() {
+ return null;
+ }
+
+ @Override
+ public void addNamedQuery(String s, Query query) {
+
+ }
+
+ @Override
+ public <T> T unwrap(Class<T> aClass) {
+ return null;
+ }
+
+ @Override
+ public <T> void addNamedEntityGraph(String s, EntityGraph<T> entityGraph) {
+
+ }
+
+ @Override
+ public Metamodel getMetamodel() {
+ return null;
+ }
+
+ @Override
+ public CriteriaBuilder getCriteriaBuilder() {
+ return null;
+ }
+
+ @Override
+ public Cache getCache() {
+ return null;
+ }
+
+ @SuppressWarnings("rawtypes")
+ @Override
+ public EntityManager createEntityManager(final Map arg0) {
+ return em;
+ }
+
+ @Override
+ public EntityManager createEntityManager(SynchronizationType synchronizationType) {
+ return null;
+ }
+
+ @Override
+ public EntityManager createEntityManager(SynchronizationType synchronizationType, Map map) {
+ return null;
+ }
+
+ @Override
+ public EntityManager createEntityManager() {
+ return em;
+ }
- @Override
- public void close() {
+ @Override
+ public void close() {}
}
- };
}
(olingo-odata2) 21/29: use java 17
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 4bebfe7ad2cfaffae997c430a3b7b7cc3e28806a
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 14:51:19 2023 +0200
use java 17
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.github/workflows/build.yml | 2 +-
.github/workflows/maven.yml | 2 +-
.github/workflows/pull-request.yml | 2 +-
.github/workflows/release.yml | 2 +-
odata2-jpa-processor/jpa-core/pom.xml | 5 ++---
.../src/main/resources/archetype-resources/pom.xml | 5 ++---
.../src/main/resources/archetype-resources/pom.xml | 4 ++--
pom.xml | 5 ++---
8 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc031a02..72b632a8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'corretto'
- java-version: '11'
+ java-version: '17'
architecture: x64
- name: Maven Build
run: mvn clean install
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index f3e24d28..25eca780 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -27,7 +27,7 @@ jobs:
- name: Set up JDK (Corretto)
uses: actions/setup-java@v3
with:
- java-version: '11'
+ java-version: '17'
distribution: 'corretto'
cache: maven
- name: Build with Maven
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 0c3c0ce2..162c8d2f 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -28,6 +28,6 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'corretto'
- java-version: 11
+ java-version: 17
- name: Maven Build
run: mvn clean install
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 041bc9b0..c579644c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,7 +35,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'corretto'
- java-version: '11'
+ java-version: '17'
architecture: x64
- name: "Configure Git"
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index ecad6196..ee4d22cd 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -69,9 +69,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>11</source>
- <target>11</target>
- <verbose>true</verbose>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
</plugins>
diff --git a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
index 9548f828..fe4a1e75 100644
--- a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
@@ -58,9 +58,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.compiler-plugin}</version>
<configuration>
- <source>11</source>
- <target>11</target>
- <verbose>true</verbose>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
<plugin>
diff --git a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
index 92b5c6fc..7320df85 100644
--- a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
@@ -50,8 +50,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>11</source>
- <target>11</target>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index f4be195c..326fbbb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,9 +193,8 @@ governing permissions and limitations under
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>11</source>
- <target>11</target>
- <verbose>true</verbose>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
<plugin>
(olingo-odata2) 18/29: make olingo compatible with Spring Boot 3
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 1fafb78d556730c0fb237794820f7855f75cdda6
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 14:14:01 2023 +0200
make olingo compatible with Spring Boot 3
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.../annotation-processor-ref/pom.xml | 2 -
.../annotation-processor-web/pom.xml | 12 -
odata2-dist/jpa/pom.xml | 6 -
odata2-dist/jpa/src/main/assembly/jpa-assembly.xml | 2 +-
odata2-dist/jpa/src/main/resources/LICENSE | 2 +-
odata2-dist/ref/pom.xml | 1 -
odata2-dist/ref/src/main/resources/LICENSE | 2 +-
odata2-jpa-processor/jpa-api/pom.xml | 5 +-
.../odata2/jpa/processor/api/ODataJPAContext.java | 8 +-
.../jpa/processor/api/ODataJPAProcessor.java | 2 +-
.../api/ODataJPAQueryExtensionEntityListener.java | 28 +-
.../jpa/processor/api/ODataJPAServiceFactory.java | 2 +-
.../api/ODataJPATombstoneEntityListener.java | 12 +-
.../jpa/processor/api/model/JPAEdmBaseView.java | 4 +-
.../processor/api/model/JPAEdmComplexTypeView.java | 4 +-
.../processor/api/model/JPAEdmEntityTypeView.java | 101 +-
.../processor/api/model/JPAEdmPropertyView.java | 8 +-
odata2-jpa-processor/jpa-core/pom.xml | 12 +-
.../jpa/processor/core/ODataJPAContextImpl.java | 4 +-
.../core/ODataJPATransactionLocalDefault.java | 4 +-
.../jpa/processor/core/access/data/JPALink.java | 2 +-
.../jpa/processor/core/access/data/JPAPage.java | 2 +-
.../core/access/data/JPAProcessorImpl.java | 6 +-
.../core/access/data/JPAQueryBuilder.java | 10 +-
.../core/access/model/JPAEdmNameBuilder.java | 8 +-
.../core/access/model/JPATypeConverter.java | 8 +-
.../processor/core/model/JPAEdmAssociationEnd.java | 10 +-
.../processor/core/model/JPAEdmBaseViewImpl.java | 2 +-
.../processor/core/model/JPAEdmComplexType.java | 4 +-
.../jpa/processor/core/model/JPAEdmEntityType.java | 24 +-
.../jpa/processor/core/model/JPAEdmFacets.java | 4 +-
.../jpa/processor/core/model/JPAEdmModel.java | 2 +-
.../jpa/processor/core/model/JPAEdmProperty.java | 22 +-
.../model/JPAEdmReferentialConstraintRole.java | 2 +-
.../processor/core/ODataJPAContextImplTest.java | 4 +-
.../core/ODataJPADefaultProcessorTest.java | 12 +-
.../data/JPAEntityParserForStaticMethodTest.java | 6 +-
.../core/access/data/JPAPageBuilderTest.java | 10 +-
.../core/access/data/JPAProcessorImplTest.java | 18 +-
.../core/access/data/JPAQueryBuilderTest.java | 4 +-
.../core/access/model/JPATypeConverterTest.java | 8 +-
.../core/jpql/JPQLBuilderFactoryTest.java | 18 +-
.../processor/core/mock/ODataJPAContextMock.java | 12 +-
.../processor/core/mock/OnJPAWriteContentMock.java | 6 +-
.../core/mock/model/JPAAttributeMock.java | 6 +-
.../core/mock/model/JPAEmbeddableMock.java | 18 +-
.../core/mock/model/JPAEmbeddableTypeMock.java | 18 +-
.../core/mock/model/JPAEntityTypeMock.java | 24 +-
.../core/mock/model/JPAJavaMemberMock.java | 2 +-
.../core/mock/model/JPAManagedTypeMock.java | 18 +-
.../core/mock/model/JPAMetaModelMock.java | 8 +-
.../core/mock/model/JPAPluralAttributeMock.java | 12 +-
.../core/mock/model/JPASingularAttributeMock.java | 10 +-
.../core/model/JPAEdmAssociationEndTest.java | 2 +-
.../core/model/JPAEdmAssociationTest.java | 6 +-
.../core/model/JPAEdmBaseViewImplTest.java | 2 +-
.../core/model/JPAEdmComplexTypeTest.java | 6 +-
.../core/model/JPAEdmEntityContainerTest.java | 6 +-
.../processor/core/model/JPAEdmEntitySetTest.java | 6 +-
.../processor/core/model/JPAEdmEntityTypeTest.java | 6 +-
.../jpa/processor/core/model/JPAEdmKeyTest.java | 2 +-
.../jpa/processor/core/model/JPAEdmModelTest.java | 6 +-
.../core/model/JPAEdmNavigationPropertyTest.java | 8 +-
.../processor/core/model/JPAEdmPropertyTest.java | 22 +-
.../model/JPAEdmReferentialConstraintRoleTest.java | 6 +-
.../model/JPAEdmReferentialConstraintTest.java | 6 +-
.../jpa/processor/core/model/JPAEdmSchemaTest.java | 2 +-
.../processor/core/model/JPAEdmTestModelView.java | 8 +-
odata2-jpa-processor/jpa-ref/pom.xml | 6 +-
.../ref/converter/BlobToByteConverter.java | 4 +-
.../ref/converter/ClobToStringConverter.java | 4 +-
.../jpa/processor/ref/converter/UUIDConverter.java | 4 +-
.../ref/factory/JPAEntityManagerFactory.java | 4 +-
.../ref/listeners/CustomerQueryExtension.java | 4 +-
.../listeners/SalesOrderItemTombstoneListener.java | 4 +-
.../ref/listeners/SalesOrderTombstoneListener.java | 6 +-
.../odata2/jpa/processor/ref/model/Address.java | 4 +-
.../odata2/jpa/processor/ref/model/Category.java | 12 +-
.../odata2/jpa/processor/ref/model/Customer.java | 24 +-
.../jpa/processor/ref/model/CustomerBase.java | 6 +-
.../odata2/jpa/processor/ref/model/Material.java | 20 +-
.../odata2/jpa/processor/ref/model/Note.java | 22 +-
.../jpa/processor/ref/model/SalesOrderHeader.java | 24 +-
.../jpa/processor/ref/model/SalesOrderItem.java | 16 +-
.../jpa/processor/ref/model/SalesOrderItemKey.java | 4 +-
.../odata2/jpa/processor/ref/model/SampleGuid.java | 12 +-
.../odata2/jpa/processor/ref/model/Store.java | 12 +-
.../src/main/resources/META-INF/persistence.xml | 8 +-
odata2-jpa-processor/jpa-web/pom.xml | 16 +-
.../processor/ref/extension/OnDBWriteContent.java | 63 +-
.../ref/extension/SalesOrderHeaderProcessor.java | 6 +-
.../jpa/processor/ref/util/DataGenerator.java | 4 +-
.../jpa-web/src/main/resources/META-INF/LICENSE | 2 +-
.../jpa-web/src/main/webapp/index.jsp | 8 +-
odata2-lib/odata-client-api/pom.xml | 1 -
odata2-lib/odata-client-core/pom.xml | 2 -
odata2-lib/odata-core/pom.xml | 21 +-
.../olingo/odata2/core/debug/DebugInfoServer.java | 2 +-
.../core/debug/ODataDebugResponseWrapper.java | 2 +-
.../odata2/core/rest/ODataExceptionMapperImpl.java | 4 +-
.../olingo/odata2/core/rest/ODataRootLocator.java | 4 +-
.../olingo/odata2/core/rest/ODataSubLocator.java | 2 +-
.../apache/olingo/odata2/core/rest/RestUtil.java | 4 +-
.../odata2/core/rest/SubLocatorParameter.java | 2 +-
.../odata2/core/servlet/ODataExceptionWrapper.java | 2 +-
.../olingo/odata2/core/servlet/ODataServlet.java | 8 +-
.../olingo/odata2/core/servlet/RestUtil.java | 2 +-
.../apache/olingo/odata2/core/DispatcherTest.java | 807 ++++++------
.../core/ODataRequestHandlerValidationTest.java | 1374 ++++++++++----------
.../core/debug/ODataDebugResponseWrapperTest.java | 2 +-
.../core/rest/ODataExceptionMapperImplTest.java | 4 +-
.../odata2/core/servlet/ODataServletTest.java | 658 +++++-----
.../olingo/odata2/core/servlet/RestUtilTest.java | 2 +-
odata2-lib/odata-fit/pom.xml | 3 -
.../olingo/odata2/fit/basic/AbstractBasicTest.java | 2 +-
.../odata2/fit/basic/AcceptHeaderTypeTest.java | 2 +-
.../olingo/odata2/fit/basic/BasicHttpTest.java | 2 +-
.../basic/ContentNegotiationDollarFormatTest.java | 4 +-
.../olingo/odata2/fit/basic/ContextTest.java | 4 +-
.../olingo/odata2/fit/basic/DebugDisabledTest.java | 2 +-
.../olingo/odata2/fit/basic/ErrorResponseTest.java | 2 +-
.../olingo/odata2/fit/basic/FitLoadTest.java | 2 +-
.../fit/basic/HttpExceptionResponseTest.java | 4 +-
.../odata2/fit/basic/LanguageNegotiationTest.java | 4 +-
.../olingo/odata2/fit/basic/MetadataTest.java | 2 +-
.../odata2/fit/basic/ServiceResolutionTest.java | 2 +-
.../olingo/odata2/fit/basic/UrlRewriteTest.java | 2 +-
.../misc/CxfCacheUriInfoIssueService1Factory.java | 2 +-
.../misc/CxfCacheUriInfoIssueService2Factory.java | 2 +-
.../odata2/fit/misc/CxfCacheUriInfoIssueTest.java | 2 +-
odata2-lib/odata-ref/pom.xml | 13 +-
odata2-lib/odata-testutil/pom.xml | 22 +-
.../olingo/odata2/testutil/server/TestServer.java | 274 ++--
odata2-lib/odata-web/pom.xml | 8 -
.../src/main/resources/archetype-resources/pom.xml | 13 +-
.../src/main/resources/archetype-resources/pom.xml | 7 -
.../src/main/java/model/Address.java | 4 +-
.../src/main/java/model/Car.java | 16 +-
.../src/main/java/model/Driver.java | 14 +-
.../src/main/java/model/Key.java | 4 +-
.../src/main/java/model/Manufacturer.java | 16 +-
.../java/service/ODataJPACarServiceFactory.java | 12 +-
.../src/main/resources/META-INF/persistence.xml | 8 +-
.../src/main/resources/archetype-resources/pom.xml | 13 +-
odata2-spring/pom.xml | 9 -
pom.xml | 228 ++--
146 files changed, 2238 insertions(+), 2303 deletions(-)
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index c0c71968..a36312a7 100644
--- a/odata2-annotation-processor/annotation-processor-ref/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml
@@ -90,7 +90,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<!-- Test dependencies -->
<dependency>
@@ -102,7 +101,6 @@
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>${xmlunit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/odata2-annotation-processor/annotation-processor-web/pom.xml b/odata2-annotation-processor/annotation-processor-web/pom.xml
index 40ee806f..528461ce 100644
--- a/odata2-annotation-processor/annotation-processor-web/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-web/pom.xml
@@ -24,10 +24,6 @@
<relativePath>..</relativePath>
</parent>
- <properties>
- <version.slf4j>1.7.1</version.slf4j>
- </properties>
-
<build>
<resources>
<resource>
@@ -61,13 +57,6 @@
</build>
<dependencies>
- <dependency>
- <!-- required because of auto detection of web facet 2.5 -->
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -86,7 +75,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${version.slf4j}</version>
</dependency>
</dependencies>
diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml
index fed83c76..cd228bf9 100644
--- a/odata2-dist/jpa/pom.xml
+++ b/odata2-dist/jpa/pom.xml
@@ -99,11 +99,5 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
- <version>${version.javax.persistence}</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
diff --git a/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml b/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml
index 9c0c7b8d..4b89c473 100644
--- a/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml
+++ b/odata2-dist/jpa/src/main/assembly/jpa-assembly.xml
@@ -28,7 +28,7 @@
<include>org.apache.olingo:olingo-odata2-api-annotation</include>
<include>org.apache.olingo:olingo-odata2-jpa-processor-api</include>
<include>org.apache.olingo:olingo-odata2-jpa-processor-core</include>
- <include>org.eclipse.persistence:javax.persistence</include>
+ <include>jakarta.persistence:jakarta.persistence-api</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/odata2-dist/jpa/src/main/resources/LICENSE b/odata2-dist/jpa/src/main/resources/LICENSE
index e2f9f31a..e6ce2123 100644
--- a/odata2-dist/jpa/src/main/resources/LICENSE
+++ b/odata2-dist/jpa/src/main/resources/LICENSE
@@ -587,7 +587,7 @@
=====================================================================
- Javax Persistence (http://www.eclipse.org/eclipselink)
- org.eclipse.persistence:javax.persistence:jar:2.0.5
+ jakarta.persistence:jakarta.persistence-api:jar:2.0.5
License: Eclipse Public License v1.0 (http://www.eclipse.org/legal/epl-v10.html)
License: Eclipse Distribution License v. 1.0
(http://www.eclipse.org/org/documents/edl-v10.php)
diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml
index 2d691623..1a64d0f7 100644
--- a/odata2-dist/ref/pom.xml
+++ b/odata2-dist/ref/pom.xml
@@ -117,7 +117,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.1</version>
</dependency>
</dependencies>
</project>
diff --git a/odata2-dist/ref/src/main/resources/LICENSE b/odata2-dist/ref/src/main/resources/LICENSE
index 00b68b50..79cf1718 100644
--- a/odata2-dist/ref/src/main/resources/LICENSE
+++ b/odata2-dist/ref/src/main/resources/LICENSE
@@ -917,7 +917,7 @@
- EclipseLink (non-OSGi) (http://www.eclipse.org/eclipselink)
org.eclipse.persistence:eclipselink:jar:2.5.0
- Javax Persistence (http://www.eclipse.org/eclipselink)
- org.eclipse.persistence:javax.persistence:jar:2.0.5
+ jakarta.persistence:jakarta.persistence-api:jar:2.0.5
License: Eclipse Public License v1.0 (http://www.eclipse.org/legal/epl-v10.html)
License: Eclipse Distribution License v. 1.0
(http://www.eclipse.org/org/documents/edl-v10.php)
diff --git a/odata2-jpa-processor/jpa-api/pom.xml b/odata2-jpa-processor/jpa-api/pom.xml
index 88eb7bb4..dc6909d5 100644
--- a/odata2-jpa-processor/jpa-api/pom.xml
+++ b/odata2-jpa-processor/jpa-api/pom.xml
@@ -76,9 +76,8 @@
<dependencies>
<!-- JPA Support -->
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
- <version>${version.javax.persistence}</version>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<!-- OData Java Library -->
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAContext.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAContext.java
index 7cb54d9f..54b505dd 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAContext.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAContext.java
@@ -18,8 +18,8 @@
******************************************************************************/
package org.apache.olingo.odata2.jpa.processor.api;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
import org.apache.olingo.odata2.api.edm.provider.EdmProvider;
import org.apache.olingo.odata2.api.processor.ODataContext;
@@ -111,7 +111,7 @@ public interface ODataJPAContext {
* context.
*
* @param emf
- * is of type {@link javax.persistence.EntityManagerFactory}
+ * is of type {@linkjakarta.persistence.EntityManagerFactory}
*
*/
public void setEntityManagerFactory(EntityManagerFactory emf);
@@ -159,7 +159,7 @@ public interface ODataJPAContext {
* Hence all entities that are accessed within JPA processor are managed by
* single entity manager.
*
- * @return an instance of type {@link javax.persistence.EntityManager}
+ * @return an instance of type {@linkjakarta.persistence.EntityManager}
*/
public EntityManager getEntityManager();
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAProcessor.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAProcessor.java
index 0c355f56..7a669025 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAProcessor.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAProcessor.java
@@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.olingo.odata2.jpa.processor.api;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
import org.apache.olingo.odata2.jpa.processor.api.access.JPAProcessor;
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAQueryExtensionEntityListener.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAQueryExtensionEntityListener.java
index e2c09d5b..c40d662f 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAQueryExtensionEntityListener.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAQueryExtensionEntityListener.java
@@ -21,8 +21,8 @@ package org.apache.olingo.odata2.jpa.processor.api;
import java.util.List;
import java.util.Locale;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
import org.apache.olingo.odata2.api.exception.ODataApplicationException;
import org.apache.olingo.odata2.api.uri.info.DeleteUriInfo;
@@ -41,8 +41,8 @@ public abstract class ODataJPAQueryExtensionEntityListener extends ODataJPATombs
/**
* Override this method to build JPA Query for OData request - GetEntitySet; SELECT *
* @param uriInfo is a reference to OData request
- * @param em is a reference to {@link javax.persistence.EntityManager}
- * @return an instance of type {@link javax.persistence.Query}
+ * @param em is a reference to {@linkjakarta.persistence.EntityManager}
+ * @return an instance of type {@linkjakarta.persistence.Query}
*/
public Query getQuery(GetEntitySetUriInfo uriInfo, EntityManager em) throws ODataJPARuntimeException {
return null;
@@ -52,8 +52,8 @@ public abstract class ODataJPAQueryExtensionEntityListener extends ODataJPATombs
* Override this method to build JPA Query for OData request - GetEntity; SELECT SINGLE with key in WHERE
* clause
* @param uriInfo is a reference to OData request
- * @param em is a reference to {@link javax.persistence.EntityManager}
- * @return an instance of type {@link javax.persistence.Query}
+ * @param em is a reference to {@linkjakarta.persistence.EntityManager}
+ * @return an instance of type {@linkjakarta.persistence.Query}
*/
public Query getQuery(GetEntityUriInfo uriInfo, EntityManager em) throws ODataJPARuntimeException {
return null;
@@ -63,8 +63,8 @@ public abstract class ODataJPAQueryExtensionEntityListener extends ODataJPATombs
* Override this method to build JPA Query for OData request - GetEntity Count; SELECT SINGLE with key in WHERE
* clause
* @param uriInfo is a reference to OData request
- * @param em is a reference to {@link javax.persistence.EntityManager}
- * @return an instance of type {@link javax.persistence.Query}
+ * @param em is a reference to {@linkjakarta.persistence.EntityManager}
+ * @return an instance of type {@linkjakarta.persistence.Query}
*/
public Query getQuery(GetEntityCountUriInfo uriInfo, EntityManager em) throws ODataJPARuntimeException {
return null;
@@ -73,8 +73,8 @@ public abstract class ODataJPAQueryExtensionEntityListener extends ODataJPATombs
/**
* Override this method to build JPA Query for OData request - GetEntitySet Count; SELECT COUNT(*)
* @param uriInfo is a reference to OData request
- * @param em is a reference to {@link javax.persistence.EntityManager}
- * @return an instance of type {@link javax.persistence.Query}
+ * @param em is a reference to {@linkjakarta.persistence.EntityManager}
+ * @return an instance of type {@linkjakarta.persistence.Query}
*/
public Query getQuery(GetEntitySetCountUriInfo uriInfo, EntityManager em) throws ODataJPARuntimeException {
return null;
@@ -84,8 +84,8 @@ public abstract class ODataJPAQueryExtensionEntityListener extends ODataJPATombs
* Override this method to build JPA Query for OData request - Update; SELECT SINGLE with key in WHERE
* clause
* @param uriInfo is a reference to OData request
- * @param em is a reference to {@link javax.persistence.EntityManager}
- * @return an instance of type {@link javax.persistence.Query}
+ * @param em is a reference to {@linkjakarta.persistence.EntityManager}
+ * @return an instance of type {@linkjakarta.persistence.Query}
*/
public Query getQuery(PutMergePatchUriInfo uriInfo, EntityManager em) throws ODataJPARuntimeException {
return null;
@@ -95,8 +95,8 @@ public abstract class ODataJPAQueryExtensionEntityListener extends ODataJPATombs
* Override this method to build JPA Query for OData request - Delete; SELECT SINGLE with key in WHERE
* clause
* @param uriInfo is a reference to OData request
- * @param em is a reference to {@link javax.persistence.EntityManager}
- * @return an instance of type {@link javax.persistence.Query}
+ * @param em is a reference to {@linkjakarta.persistence.EntityManager}
+ * @return an instance of type {@linkjakarta.persistence.Query}
*/
public Query getQuery(DeleteUriInfo uriInfo, EntityManager em) throws ODataJPARuntimeException {
return null;
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAServiceFactory.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAServiceFactory.java
index 6089be08..e59ad683 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAServiceFactory.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPAServiceFactory.java
@@ -85,7 +85,7 @@ public abstract class ODataJPAServiceFactory extends ODataServiceFactory {
/**
* Implement this method and initialize OData JPA Context. It is mandatory
- * to set an instance of type {@link javax.persistence.EntityManagerFactory} into the context. An exception of type
+ * to set an instance of type {@linkjakarta.persistence.EntityManagerFactory} into the context. An exception of type
* {@link org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException} is thrown if
* EntityManagerFactory is not initialized. <br>
* <br>
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPATombstoneEntityListener.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPATombstoneEntityListener.java
index 0dfc9356..dc2f94a5 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPATombstoneEntityListener.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/ODataJPATombstoneEntityListener.java
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.jpa.processor.api;
import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
import org.apache.olingo.odata2.api.uri.info.GetEntitySetUriInfo;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
@@ -40,20 +40,20 @@ public abstract class ODataJPATombstoneEntityListener {
}
/**
- * Implement this method to create a {@link javax.persistence.Query} object. The Query object can be created from
+ * Implement this method to create a {@linkjakarta.persistence.Query} object. The Query object can be created from
* OData requests. The query instance thus created can be used for handling delta JPA entities. The delta token passed
* from OData request can
* be accessed from {@link com.sap.core.odata.processor.api.jpa.ODataJPATombstoneContext}.
* @param resultsView is a reference to OData request
- * @param em is a reference to {@link javax.persistence.EntityManager}
- * @return an instance of type {@link javax.persistence.Query}
+ * @param em is a reference to {@linkjakarta.persistence.EntityManager}
+ * @return an instance of type {@linkjakarta.persistence.Query}
*/
public abstract Query getQuery(GetEntitySetUriInfo resultsView, EntityManager em) throws ODataJPARuntimeException;
/**
* Implement this method to create a delta token.
* @param deltas is list of delta JPA Entities
- * @param query is an instance of type {@link javax.persistence.Query} that was used for handling delta entites
+ * @param query is an instance of type {@linkjakarta.persistence.Query} that was used for handling delta entites
* @return a delta token of type String
*/
public abstract String generateDeltaToken(List<Object> deltas, Query query);
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmBaseView.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmBaseView.java
index 56aa8b30..2e7100af 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmBaseView.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmBaseView.java
@@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.olingo.odata2.jpa.processor.api.model;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.jpa.processor.api.access.JPAEdmBuilder;
import org.apache.olingo.odata2.jpa.processor.api.access.JPAEdmMappingModelAccess;
@@ -46,7 +46,7 @@ public interface JPAEdmBaseView {
/**
* The method returns the Java Persistence MetaModel
*
- * @return a meta model of type {@link javax.persistence.metamodel.Metamodel}
+ * @return a meta model of type {@linkjakarta.persistence.metamodel.Metamodel}
*/
public Metamodel getJPAMetaModel();
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmComplexTypeView.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmComplexTypeView.java
index 3b5a8840..2be10824 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmComplexTypeView.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmComplexTypeView.java
@@ -58,9 +58,9 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
* The method returns an JPA embeddable type that is currently being
* processed.
*
- * @return an instance of type {@link javax.persistence.metamodel.EmbeddableType}
+ * @return an instance of type {@linkjakarta.persistence.metamodel.EmbeddableType}
*/
- public javax.persistence.metamodel.EmbeddableType<?> getJPAEmbeddableType();
+ public jakarta.persistence.metamodel.EmbeddableType<?> getJPAEmbeddableType();
/**
* The method returns a consistent list of EDM complex types.
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmEntityTypeView.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmEntityTypeView.java
index 80de0848..17a2563e 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmEntityTypeView.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmEntityTypeView.java
@@ -1,76 +1,69 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.api.model;
import java.util.List;
-
import org.apache.olingo.odata2.api.edm.provider.EntityType;
/**
- * A view on Java Persistence entity types and EDM entity types. Java
- * persistence entity types are converted into EDM entity types.
+ * A view on Java Persistence entity types and EDM entity types. Java persistence entity types are
+ * converted into EDM entity types.
* <p>
- * The implementation of the view provides access to EDM entity types for the
- * given JPA EDM model. The view acts as a container for consistent list of EDM
- * entity types. An EDM entity type is said to be consistent only if it has at
- * least one consistent EDM property and at least one consistent EDM key.
- *
- *
+ * The implementation of the view provides access to EDM entity types for the given JPA EDM model.
+ * The view acts as a container for consistent list of EDM entity types. An EDM entity type is said
+ * to be consistent only if it has at least one consistent EDM property and at least one consistent
+ * EDM key.
+ *
+ *
* <p>
+ *
* @org.apache.olingo.odata2.DoNotImplement
* @see org.apache.olingo.odata2.jpa.processor.api.model.JPAEdmPropertyView
* @see org.apache.olingo.odata2.jpa.processor.api.model.JPAEdmKeyView
* @see org.apache.olingo.odata2.jpa.processor.api.model.JPAEdmNavigationPropertyView
- *
+ *
*/
public interface JPAEdmEntityTypeView extends JPAEdmBaseView {
- /**
- * The method returns an EDM entity currently being processed.
- *
- * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.EntityType}
- */
- public EntityType getEdmEntityType();
+ /**
+ * The method returns an EDM entity currently being processed.
+ *
+ * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.EntityType}
+ */
+ EntityType getEdmEntityType();
- /**
- * The method returns java persistence Entity type currently being
- * processed.
- *
- * @return an instance of type {@link javax.persistence.metamodel.EntityType}
- */
- public javax.persistence.metamodel.EntityType<?> getJPAEntityType();
+ /**
+ * The method returns java persistence Entity type currently being processed.
+ *
+ * @return an instance of type {@link javax.persistence.metamodel.EntityType}
+ */
+ jakarta.persistence.metamodel.EntityType<?> getJPAEntityType();
- /**
- * The method returns a consistent list of EDM entity types for a given java
- * persistence meta model.
- *
- * @return a list of {@link org.apache.olingo.odata2.api.edm.provider.EntityType}
- */
- public List<EntityType> getConsistentEdmEntityTypes();
+ /**
+ * The method returns a consistent list of EDM entity types for a given java persistence meta model.
+ *
+ * @return a list of {@link org.apache.olingo.odata2.api.edm.provider.EntityType}
+ */
+ List<EntityType> getConsistentEdmEntityTypes();
- /**
- * The method searches in the consistent list of EDM entity types for the
- * given EDM entity type's name.
- *
- * @param jpaEntityTypeName
- * is the name of EDM entity type
- * @return a reference to EDM entity type if found else null
- */
- public EntityType searchEdmEntityType(String jpaEntityTypeName);
+ /**
+ * The method searches in the consistent list of EDM entity types for the given EDM entity type's
+ * name.
+ *
+ * @param jpaEntityTypeName is the name of EDM entity type
+ * @return a reference to EDM entity type if found else null
+ */
+ EntityType searchEdmEntityType(String jpaEntityTypeName);
}
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmPropertyView.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmPropertyView.java
index 3ce66d64..e5a2907f 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmPropertyView.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmPropertyView.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.jpa.processor.api.model;
import java.util.List;
-import javax.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Attribute;
import org.apache.olingo.odata2.api.edm.provider.Property;
import org.apache.olingo.odata2.api.edm.provider.SimpleProperty;
@@ -74,16 +74,16 @@ public interface JPAEdmPropertyView extends JPAEdmBaseView {
/**
* The method returns a JPA Attribute for the given JPA entity type.
*
- * @return an instance of type {@link javax.persistence.metamodel.Attribute
+ * @return an instance of type {@linkjakarta.persistence.metamodel.Attribute
* <?, ?>}
*/
Attribute<?, ?> getJPAAttribute();
/**
- * The method returns a JPA Attribute referenced by a JPA Attribute in the {@link javax.persistence.JoinColumn}
+ * The method returns a JPA Attribute referenced by a JPA Attribute in the {@linkjakarta.persistence.JoinColumn}
* annotation for the given JPA entity type .
*
- * @return an instance of type {@link javax.persistence.metamodel.Attribute
+ * @return an instance of type {@linkjakarta.persistence.metamodel.Attribute
* <?, ?>}
*/
Attribute<?, ?> getJPAReferencedAttribute();
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index d54ff9ec..ee4d22cd 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -68,10 +68,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
</plugins>
@@ -88,9 +87,8 @@
<!-- Java Persistence API -->
<!-- ########################## -->
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
- <version>${version.javax.persistence}</version>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<!-- ########################## -->
@@ -122,7 +120,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.9</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -138,7 +135,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAContextImpl.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAContextImpl.java
index 075d0a1c..2d40bccd 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAContextImpl.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAContextImpl.java
@@ -18,8 +18,8 @@
******************************************************************************/
package org.apache.olingo.odata2.jpa.processor.core;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
import org.apache.olingo.odata2.api.edm.provider.EdmProvider;
import org.apache.olingo.odata2.api.processor.ODataContext;
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPATransactionLocalDefault.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPATransactionLocalDefault.java
index 532764c6..fc032e10 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPATransactionLocalDefault.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPATransactionLocalDefault.java
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.jpa.processor.core;
import org.apache.olingo.odata2.jpa.processor.api.ODataJPATransaction;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityTransaction;
public class ODataJPATransactionLocalDefault implements ODataJPATransaction {
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
index c8a43943..a657b9eb 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
@@ -26,7 +26,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import org.apache.olingo.odata2.api.edm.EdmEntitySet;
import org.apache.olingo.odata2.api.edm.EdmException;
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAPage.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAPage.java
index 4f95e51e..16ff82d3 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAPage.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAPage.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.jpa.processor.core.access.data;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.Query;
+import jakarta.persistence.Query;
import org.apache.olingo.odata2.jpa.processor.api.access.JPAPaging;
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
index 2aaef0d6..d498ed08 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImpl.java
@@ -25,9 +25,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceException;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.Query;
import org.apache.olingo.odata2.api.commons.InlineCount;
import org.apache.olingo.odata2.api.edm.EdmEntitySet;
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAQueryBuilder.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAQueryBuilder.java
index 24290bf8..9dd2f6bc 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAQueryBuilder.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAQueryBuilder.java
@@ -29,11 +29,11 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
import org.apache.olingo.odata2.api.edm.EdmException;
import org.apache.olingo.odata2.api.uri.UriInfo;
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmNameBuilder.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmNameBuilder.java
index 675cfc0a..0be8adb3 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmNameBuilder.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmNameBuilder.java
@@ -21,10 +21,10 @@ package org.apache.olingo.odata2.jpa.processor.core.access.model;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
-import javax.persistence.Column;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.Column;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.PluralAttribute;
import org.apache.olingo.odata2.api.edm.EdmMultiplicity;
import org.apache.olingo.odata2.api.edm.FullQualifiedName;
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPATypeConverter.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPATypeConverter.java
index ec3b4939..a27658bb 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPATypeConverter.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPATypeConverter.java
@@ -29,10 +29,10 @@ import java.sql.Timestamp;
import java.util.Calendar;
import java.util.UUID;
-import javax.persistence.Lob;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.metamodel.Attribute;
+import jakarta.persistence.Lob;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.metamodel.Attribute;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationEnd.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationEnd.java
index c2cbd114..a3ff8892 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationEnd.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationEnd.java
@@ -28,11 +28,11 @@ import org.apache.olingo.odata2.jpa.processor.api.model.JPAEdmEntityTypeView;
import org.apache.olingo.odata2.jpa.processor.api.model.JPAEdmPropertyView;
import org.apache.olingo.odata2.jpa.processor.core.access.model.JPAEdmNameBuilder;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.metamodel.Attribute.PersistentAttributeType;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.metamodel.Attribute.PersistentAttributeType;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Array;
import java.util.List;
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmBaseViewImpl.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmBaseViewImpl.java
index 80d9d75a..3af7b37f 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmBaseViewImpl.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmBaseViewImpl.java
@@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.olingo.odata2.jpa.processor.core.model;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext;
import org.apache.olingo.odata2.jpa.processor.api.access.JPAEdmBuilder;
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmComplexType.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmComplexType.java
index c033494e..940adb5f 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmComplexType.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmComplexType.java
@@ -24,8 +24,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EmbeddableType;
import org.apache.olingo.odata2.api.edm.FullQualifiedName;
import org.apache.olingo.odata2.api.edm.provider.ComplexProperty;
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntityType.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntityType.java
index 0e98cd6a..6b84d1ae 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntityType.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntityType.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Set;
-import javax.persistence.EntityListeners;
+import jakarta.persistence.EntityListeners;
import org.apache.olingo.odata2.api.edm.provider.EntityType;
import org.apache.olingo.odata2.jpa.processor.api.ODataJPATombstoneEntityListener;
@@ -46,7 +46,7 @@ public class JPAEdmEntityType extends JPAEdmBaseViewImpl implements JPAEdmEntity
private JPAEdmSchemaView schemaView = null;
private EntityType currentEdmEntityType = null;
- private javax.persistence.metamodel.EntityType<?> currentJPAEntityType = null;
+ private jakarta.persistence.metamodel.EntityType<?> currentJPAEntityType = null;
private EntityTypeList<EntityType> consistentEntityTypes = null;
private HashMap<String, EntityType> consistentEntityTypeMap;
@@ -72,7 +72,7 @@ public class JPAEdmEntityType extends JPAEdmBaseViewImpl implements JPAEdmEntity
}
@Override
- public javax.persistence.metamodel.EntityType<?> getJPAEntityType() {
+ public jakarta.persistence.metamodel.EntityType<?> getJPAEntityType() {
return currentJPAEntityType;
}
@@ -92,7 +92,7 @@ public class JPAEdmEntityType extends JPAEdmBaseViewImpl implements JPAEdmEntity
@Override
public void build() throws ODataJPAModelException, ODataJPARuntimeException {
- Collection<javax.persistence.metamodel.EntityType<?>> jpaEntityTypes = metaModel.getEntities();
+ Collection<jakarta.persistence.metamodel.EntityType<?>> jpaEntityTypes = metaModel.getEntities();
if (jpaEntityTypes == null || jpaEntityTypes.isEmpty() == true) {
return;
@@ -102,7 +102,7 @@ public class JPAEdmEntityType extends JPAEdmBaseViewImpl implements JPAEdmEntity
}
jpaEntityTypes = sortJPAEntityTypes(jpaEntityTypes);
- for (javax.persistence.metamodel.EntityType<?> jpaEntityType : jpaEntityTypes) {
+ for (jakarta.persistence.metamodel.EntityType<?> jpaEntityType : jpaEntityTypes) {
currentEdmEntityType = new EntityType();
currentJPAEntityType = jpaEntityType;
@@ -144,15 +144,15 @@ public class JPAEdmEntityType extends JPAEdmBaseViewImpl implements JPAEdmEntity
}
- private List<javax.persistence.metamodel.EntityType<?>> sortJPAEntityTypes(
- final Collection<javax.persistence.metamodel.EntityType<?>> entities) {
+ private List<jakarta.persistence.metamodel.EntityType<?>> sortJPAEntityTypes(
+ final Collection<jakarta.persistence.metamodel.EntityType<?>> entities) {
- List<javax.persistence.metamodel.EntityType<?>> entityTypeList =
- new ArrayList<javax.persistence.metamodel.EntityType<?>>(entities.size());
+ List<jakarta.persistence.metamodel.EntityType<?>> entityTypeList =
+ new ArrayList<jakarta.persistence.metamodel.EntityType<?>>(entities.size());
- Iterator<javax.persistence.metamodel.EntityType<?>> itr;
- javax.persistence.metamodel.EntityType<?> smallestJpaEntity;
- javax.persistence.metamodel.EntityType<?> currentJpaEntity;
+ Iterator<jakarta.persistence.metamodel.EntityType<?>> itr;
+ jakarta.persistence.metamodel.EntityType<?> smallestJpaEntity;
+ jakarta.persistence.metamodel.EntityType<?> currentJpaEntity;
while (!entities.isEmpty()) {
itr = entities.iterator();
smallestJpaEntity = itr.next();
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmFacets.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmFacets.java
index 04c795ea..abf1ed09 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmFacets.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmFacets.java
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.jpa.processor.core.model;
import java.lang.reflect.AnnotatedElement;
-import javax.persistence.Column;
-import javax.persistence.metamodel.Attribute;
+import jakarta.persistence.Column;
+import jakarta.persistence.metamodel.Attribute;
import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
import org.apache.olingo.odata2.api.edm.provider.Facets;
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmModel.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmModel.java
index 966bdd0b..568c5208 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmModel.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmModel.java
@@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.olingo.odata2.jpa.processor.core.model;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext;
import org.apache.olingo.odata2.jpa.processor.api.access.JPAEdmBuilder;
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmProperty.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmProperty.java
index 2e2c2be4..e1cdd3ec 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmProperty.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmProperty.java
@@ -26,17 +26,17 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
-import javax.persistence.Column;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Attribute.PersistentAttributeType;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
+import jakarta.persistence.Column;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Attribute.PersistentAttributeType;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
import org.apache.olingo.odata2.api.edm.FullQualifiedName;
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmReferentialConstraintRole.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmReferentialConstraintRole.java
index 9c3c89ea..c66290e2 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmReferentialConstraintRole.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmReferentialConstraintRole.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Attribute;
import org.apache.olingo.odata2.api.edm.provider.Association;
import org.apache.olingo.odata2.api.edm.provider.AssociationEnd;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAContextImplTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAContextImplTest.java
index 83952d0d..46bd5a1d 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAContextImplTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAContextImplTest.java
@@ -24,8 +24,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
import org.apache.olingo.odata2.api.edm.provider.EdmProvider;
import org.apache.olingo.odata2.api.processor.ODataContext;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPADefaultProcessorTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPADefaultProcessorTest.java
index f607151c..532a26e8 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPADefaultProcessorTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPADefaultProcessorTest.java
@@ -31,12 +31,12 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Query;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.InlineCount;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserForStaticMethodTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserForStaticMethodTest.java
index 7a277fca..6be07907 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserForStaticMethodTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserForStaticMethodTest.java
@@ -32,9 +32,9 @@ import java.sql.Blob;
import java.sql.Clob;
import java.sql.SQLException;
-import javax.sql.rowset.serial.SerialBlob;
-import javax.sql.rowset.serial.SerialClob;
-import javax.sql.rowset.serial.SerialException;
+import jakarta.sql.rowset.serial.SerialBlob;
+import jakarta.sql.rowset.serial.SerialClob;
+import jakarta.sql.rowset.serial.SerialException;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
import org.apache.olingo.odata2.jpa.processor.core.common.ODataJPATestConstants;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAPageBuilderTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAPageBuilderTest.java
index 326c39ff..16160045 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAPageBuilderTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAPageBuilderTest.java
@@ -29,11 +29,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Parameter;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
+import jakarta.persistence.TemporalType;
import org.apache.olingo.odata2.jpa.processor.core.access.data.JPAPage.JPAPageBuilder;
import org.junit.Test;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImplTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImplTest.java
index 297ee02a..ba0b93df 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImplTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAProcessorImplTest.java
@@ -30,15 +30,15 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Parameter;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.api.commons.InlineCount;
import org.apache.olingo.odata2.api.edm.EdmConcurrencyMode;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAQueryBuilderTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAQueryBuilderTest.java
index 27bdc636..9c48622a 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAQueryBuilderTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAQueryBuilderTest.java
@@ -30,8 +30,8 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
import org.apache.olingo.odata2.api.commons.InlineCount;
import org.apache.olingo.odata2.api.edm.EdmAssociation;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPATypeConverterTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPATypeConverterTest.java
index 52b92127..9ca9fe84 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPATypeConverterTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPATypeConverterTest.java
@@ -33,10 +33,10 @@ import java.util.Calendar;
import java.util.Date;
import java.util.UUID;
-import javax.persistence.Lob;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.Lob;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.metamodel.ManagedType;
import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPAModelException;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java
index 6af0e310..e3646d69 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java
@@ -29,15 +29,15 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.persistence.Cache;
-import javax.persistence.EntityGraph;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnitUtil;
-import javax.persistence.Query;
-import javax.persistence.SynchronizationType;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.Cache;
+import jakarta.persistence.EntityGraph;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceUnitUtil;
+import jakarta.persistence.Query;
+import jakarta.persistence.SynchronizationType;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.api.edm.EdmEntitySet;
import org.apache.olingo.odata2.api.edm.EdmEntityType;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/ODataJPAContextMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/ODataJPAContextMock.java
index 95b125fd..e4b0a930 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/ODataJPAContextMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/ODataJPAContextMock.java
@@ -25,12 +25,12 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.api.processor.ODataContext;
import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/OnJPAWriteContentMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/OnJPAWriteContentMock.java
index b571b120..07cbffb6 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/OnJPAWriteContentMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/OnJPAWriteContentMock.java
@@ -22,9 +22,9 @@ import java.sql.Blob;
import java.sql.Clob;
import java.sql.SQLException;
-import javax.sql.rowset.serial.SerialBlob;
-import javax.sql.rowset.serial.SerialClob;
-import javax.sql.rowset.serial.SerialException;
+import jakarta.sql.rowset.serial.SerialBlob;
+import jakarta.sql.rowset.serial.SerialClob;
+import jakarta.sql.rowset.serial.SerialException;
import org.apache.olingo.odata2.jpa.processor.api.OnJPAWriteContent;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAAttributeMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAAttributeMock.java
index f21cbaea..0a66338e 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAAttributeMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAAttributeMock.java
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.jpa.processor.core.mock.model;
import java.lang.reflect.Member;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ManagedType;
public abstract class JPAAttributeMock<X, Y> implements Attribute<X, Y> {
@@ -46,7 +46,7 @@ public abstract class JPAAttributeMock<X, Y> implements Attribute<X, Y> {
}
@Override
- public javax.persistence.metamodel.Attribute.PersistentAttributeType getPersistentAttributeType() {
+ public jakarta.persistence.metamodel.Attribute.PersistentAttributeType getPersistentAttributeType() {
return null;
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAEmbeddableMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAEmbeddableMock.java
index f9c57b51..75bec4b0 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAEmbeddableMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAEmbeddableMock.java
@@ -20,14 +20,14 @@ package org.apache.olingo.odata2.jpa.processor.core.mock.model;
import java.util.Set;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.CollectionAttribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SetAttribute;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.CollectionAttribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SetAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
public class JPAEmbeddableMock<X> implements EmbeddableType<X> {
@@ -177,7 +177,7 @@ public class JPAEmbeddableMock<X> implements EmbeddableType<X> {
}
@Override
- public javax.persistence.metamodel.Type.PersistenceType getPersistenceType() {
+ public jakarta.persistence.metamodel.Type.PersistenceType getPersistenceType() {
return null;
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAEmbeddableTypeMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAEmbeddableTypeMock.java
index f7383ce8..ca9d3f4d 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAEmbeddableTypeMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAEmbeddableTypeMock.java
@@ -20,14 +20,14 @@ package org.apache.olingo.odata2.jpa.processor.core.mock.model;
import java.util.Set;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.CollectionAttribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SetAttribute;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.CollectionAttribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SetAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
public class JPAEmbeddableTypeMock<X> implements EmbeddableType<X> {
@@ -177,7 +177,7 @@ public class JPAEmbeddableTypeMock<X> implements EmbeddableType<X> {
}
@Override
- public javax.persistence.metamodel.Type.PersistenceType getPersistenceType() {
+ public jakarta.persistence.metamodel.Type.PersistenceType getPersistenceType() {
return null;
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAEntityTypeMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAEntityTypeMock.java
index 10698155..5ba2d08c 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAEntityTypeMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAEntityTypeMock.java
@@ -20,16 +20,16 @@ package org.apache.olingo.odata2.jpa.processor.core.mock.model;
import java.util.Set;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.CollectionAttribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.IdentifiableType;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SetAttribute;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.CollectionAttribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SetAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
public abstract class JPAEntityTypeMock<X> implements EntityType<X> {
@@ -224,7 +224,7 @@ public abstract class JPAEntityTypeMock<X> implements EntityType<X> {
}
@Override
- public javax.persistence.metamodel.Type.PersistenceType getPersistenceType() {
+ public jakarta.persistence.metamodel.Type.PersistenceType getPersistenceType() {
return null;
}
@@ -234,7 +234,7 @@ public abstract class JPAEntityTypeMock<X> implements EntityType<X> {
}
@Override
- public javax.persistence.metamodel.Bindable.BindableType getBindableType() {
+ public jakarta.persistence.metamodel.Bindable.BindableType getBindableType() {
return null;
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAJavaMemberMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAJavaMemberMock.java
index 58a852f5..b1427243 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAJavaMemberMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAJavaMemberMock.java
@@ -22,7 +22,7 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Member;
-import javax.persistence.JoinColumns;
+import jakarta.persistence.JoinColumns;
public class JPAJavaMemberMock implements Member, AnnotatedElement, Annotation {
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAManagedTypeMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAManagedTypeMock.java
index a7b025fc..588a2f7c 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAManagedTypeMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAManagedTypeMock.java
@@ -20,14 +20,14 @@ package org.apache.olingo.odata2.jpa.processor.core.mock.model;
import java.util.Set;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.CollectionAttribute;
-import javax.persistence.metamodel.ListAttribute;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.MapAttribute;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.SetAttribute;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.CollectionAttribute;
+import jakarta.persistence.metamodel.ListAttribute;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.MapAttribute;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.SetAttribute;
+import jakarta.persistence.metamodel.SingularAttribute;
public class JPAManagedTypeMock<X> implements ManagedType<X> {
@@ -37,7 +37,7 @@ public class JPAManagedTypeMock<X> implements ManagedType<X> {
}
@Override
- public javax.persistence.metamodel.Type.PersistenceType getPersistenceType() {
+ public jakarta.persistence.metamodel.Type.PersistenceType getPersistenceType() {
return null;
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAMetaModelMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAMetaModelMock.java
index d06b930b..36b47027 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAMetaModelMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAMetaModelMock.java
@@ -20,10 +20,10 @@ package org.apache.olingo.odata2.jpa.processor.core.mock.model;
import java.util.Set;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.Metamodel;
public class JPAMetaModelMock implements Metamodel {
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAPluralAttributeMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAPluralAttributeMock.java
index dd88da7e..f3c127c0 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAPluralAttributeMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPAPluralAttributeMock.java
@@ -21,9 +21,9 @@ package org.apache.olingo.odata2.jpa.processor.core.mock.model;
import java.lang.reflect.Member;
import java.util.ArrayList;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.PluralAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.PluralAttribute;
+import jakarta.persistence.metamodel.Type;
public class JPAPluralAttributeMock implements PluralAttribute<Object, ArrayList<String>, String> {
@@ -34,7 +34,7 @@ public class JPAPluralAttributeMock implements PluralAttribute<Object, ArrayList
}
@Override
- public javax.persistence.metamodel.Attribute.PersistentAttributeType getPersistentAttributeType() {
+ public jakarta.persistence.metamodel.Attribute.PersistentAttributeType getPersistentAttributeType() {
// TODO Auto-generated method stub
return null;
}
@@ -69,7 +69,7 @@ public class JPAPluralAttributeMock implements PluralAttribute<Object, ArrayList
}
@Override
- public javax.persistence.metamodel.Bindable.BindableType getBindableType() {
+ public jakarta.persistence.metamodel.Bindable.BindableType getBindableType() {
// TODO Auto-generated method stub
return null;
}
@@ -81,7 +81,7 @@ public class JPAPluralAttributeMock implements PluralAttribute<Object, ArrayList
}
@Override
- public javax.persistence.metamodel.PluralAttribute.CollectionType getCollectionType() {
+ public jakarta.persistence.metamodel.PluralAttribute.CollectionType getCollectionType() {
// TODO Auto-generated method stub
return null;
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPASingularAttributeMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPASingularAttributeMock.java
index e64303e9..d1a18bdb 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPASingularAttributeMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/model/JPASingularAttributeMock.java
@@ -20,9 +20,9 @@ package org.apache.olingo.odata2.jpa.processor.core.mock.model;
import java.lang.reflect.Member;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.SingularAttribute;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.ManagedType;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
public class JPASingularAttributeMock<X, T> implements SingularAttribute<X, T> {
@@ -47,7 +47,7 @@ public class JPASingularAttributeMock<X, T> implements SingularAttribute<X, T> {
}
@Override
- public javax.persistence.metamodel.Attribute.PersistentAttributeType getPersistentAttributeType() {
+ public jakarta.persistence.metamodel.Attribute.PersistentAttributeType getPersistentAttributeType() {
return null;
}
@@ -67,7 +67,7 @@ public class JPASingularAttributeMock<X, T> implements SingularAttribute<X, T> {
}
@Override
- public javax.persistence.metamodel.Bindable.BindableType getBindableType() {
+ public jakarta.persistence.metamodel.Bindable.BindableType getBindableType() {
return null;
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationEndTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationEndTest.java
index 5e5e28a0..6d2af922 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationEndTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationEndTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import javax.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Attribute;
import org.apache.olingo.odata2.api.edm.EdmMultiplicity;
import org.apache.olingo.odata2.api.edm.FullQualifiedName;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationTest.java
index c6cefb55..74e35186 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociationTest.java
@@ -33,9 +33,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.metamodel.Attribute;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.metamodel.Attribute;
import org.apache.olingo.odata2.api.edm.EdmMultiplicity;
import org.apache.olingo.odata2.api.edm.FullQualifiedName;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmBaseViewImplTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmBaseViewImplTest.java
index 4f4a4798..d41c91d1 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmBaseViewImplTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmBaseViewImplTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.jpa.processor.api.access.JPAEdmBuilder;
import org.apache.olingo.odata2.jpa.processor.core.mock.model.JPAMetaModelMock;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmComplexTypeTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmComplexTypeTest.java
index ae1c5f1b..34b8751e 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmComplexTypeTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmComplexTypeTest.java
@@ -29,9 +29,9 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.api.edm.FullQualifiedName;
import org.apache.olingo.odata2.api.edm.provider.ComplexType;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntityContainerTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntityContainerTest.java
index 340cdde9..de1afc7f 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntityContainerTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntityContainerTest.java
@@ -27,9 +27,9 @@ import static org.junit.Assert.fail;
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.api.edm.provider.Schema;
import org.apache.olingo.odata2.jpa.processor.api.access.JPAEdmBuilder;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntitySetTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntitySetTest.java
index 6374206f..246464eb 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntitySetTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntitySetTest.java
@@ -27,9 +27,9 @@ import static org.junit.Assert.fail;
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.api.edm.provider.Schema;
import org.apache.olingo.odata2.jpa.processor.api.access.JPAEdmBuilder;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntityTypeTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntityTypeTest.java
index 15b80768..02d208f2 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntityTypeTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntityTypeTest.java
@@ -26,9 +26,9 @@ import static org.junit.Assert.fail;
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.jpa.processor.api.access.JPAEdmBuilder;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPAModelException;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmKeyTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmKeyTest.java
index 459a2c4f..c8fe5818 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmKeyTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmKeyTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Attribute;
import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
import org.apache.olingo.odata2.api.edm.FullQualifiedName;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmModelTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmModelTest.java
index 120b2090..80e50abb 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmModelTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmModelTest.java
@@ -24,9 +24,9 @@ import static org.junit.Assert.fail;
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPAModelException;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmNavigationPropertyTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmNavigationPropertyTest.java
index 354fecca..d2b85c77 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmNavigationPropertyTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmNavigationPropertyTest.java
@@ -23,9 +23,9 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.Type;
import org.apache.olingo.odata2.api.edm.FullQualifiedName;
import org.apache.olingo.odata2.api.edm.provider.Association;
@@ -205,7 +205,7 @@ public class JPAEdmNavigationPropertyTest extends JPAEdmTestModelView {
private class ElementType implements Type<String> {
@Override
- public javax.persistence.metamodel.Type.PersistenceType getPersistenceType() {
+ public jakarta.persistence.metamodel.Type.PersistenceType getPersistenceType() {
return PersistenceType.BASIC;
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmPropertyTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmPropertyTest.java
index 73a63451..a28ed6c7 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmPropertyTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmPropertyTest.java
@@ -29,15 +29,15 @@ import java.lang.reflect.Member;
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.Column;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Attribute.PersistentAttributeType;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.EntityType;
-import javax.persistence.metamodel.Metamodel;
-import javax.persistence.metamodel.Type;
+import jakarta.persistence.Column;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.Attribute.PersistentAttributeType;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Type;
import org.apache.olingo.odata2.api.edm.EdmFacets;
import org.apache.olingo.odata2.api.edm.EdmMultiplicity;
@@ -467,7 +467,7 @@ public class JPAEdmPropertyTest extends JPAEdmTestModelView {
}
@Override
- public javax.persistence.metamodel.Attribute.PersistentAttributeType getPersistentAttributeType() {
+ public jakarta.persistence.metamodel.Attribute.PersistentAttributeType getPersistentAttributeType() {
return ATTRIBUTE_TYPE;
}
@@ -486,7 +486,7 @@ public class JPAEdmPropertyTest extends JPAEdmTestModelView {
}
@Override
- public javax.persistence.metamodel.Type.PersistenceType getPersistenceType() {
+ public jakarta.persistence.metamodel.Type.PersistenceType getPersistenceType() {
return null;
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmReferentialConstraintRoleTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmReferentialConstraintRoleTest.java
index 656af8da..d7c9d864 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmReferentialConstraintRoleTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmReferentialConstraintRoleTest.java
@@ -29,9 +29,9 @@ import java.lang.reflect.Member;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.JoinColumn;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ManagedType;
import org.apache.olingo.odata2.api.edm.FullQualifiedName;
import org.apache.olingo.odata2.api.edm.provider.Association;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmReferentialConstraintTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmReferentialConstraintTest.java
index 1e26654b..0c6a574f 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmReferentialConstraintTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmReferentialConstraintTest.java
@@ -28,9 +28,9 @@ import java.lang.reflect.Member;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.JoinColumn;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.ManagedType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.ManagedType;
import org.apache.olingo.odata2.api.edm.FullQualifiedName;
import org.apache.olingo.odata2.api.edm.provider.Association;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmSchemaTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmSchemaTest.java
index 8408c9f1..e47dda7a 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmSchemaTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmSchemaTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.jpa.processor.api.access.JPAEdmBuilder;
import org.apache.olingo.odata2.jpa.processor.core.mock.model.JPAMetaModelMock;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmTestModelView.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmTestModelView.java
index df20a50c..09abe5ae 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmTestModelView.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmTestModelView.java
@@ -21,9 +21,9 @@ package org.apache.olingo.odata2.jpa.processor.core.model;
import java.util.HashMap;
import java.util.List;
-import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.EmbeddableType;
-import javax.persistence.metamodel.Metamodel;
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.EmbeddableType;
+import jakarta.persistence.metamodel.Metamodel;
import org.apache.olingo.odata2.api.edm.FullQualifiedName;
import org.apache.olingo.odata2.api.edm.provider.Association;
@@ -127,7 +127,7 @@ public class JPAEdmTestModelView implements JPAEdmAssociationEndView, JPAEdmAsso
}
@Override
- public javax.persistence.metamodel.EntityType<?> getJPAEntityType() {
+ public jakarta.persistence.metamodel.EntityType<?> getJPAEntityType() {
return null;
}
diff --git a/odata2-jpa-processor/jpa-ref/pom.xml b/odata2-jpa-processor/jpa-ref/pom.xml
index 2bba3283..bcf5ebbe 100644
--- a/odata2-jpa-processor/jpa-ref/pom.xml
+++ b/odata2-jpa-processor/jpa-ref/pom.xml
@@ -73,14 +73,12 @@
<version>${version.eclipselink}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
- <version>${version.javax.persistence}</version>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
</dependency>
<!-- OData Annotation Support -->
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/converter/BlobToByteConverter.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/converter/BlobToByteConverter.java
index 16835fea..cd2ca499 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/converter/BlobToByteConverter.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/converter/BlobToByteConverter.java
@@ -24,8 +24,8 @@ import java.io.InputStream;
import java.sql.Blob;
import java.sql.SQLException;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
import org.hsqldb.jdbc.JDBCBlob;
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/converter/ClobToStringConverter.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/converter/ClobToStringConverter.java
index b9e73ebb..de20e672 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/converter/ClobToStringConverter.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/converter/ClobToStringConverter.java
@@ -24,8 +24,8 @@ import java.io.Reader;
import java.sql.Clob;
import java.sql.SQLException;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
import org.hsqldb.jdbc.JDBCClob;
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/converter/UUIDConverter.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/converter/UUIDConverter.java
index cc06cf74..e329f004 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/converter/UUIDConverter.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/converter/UUIDConverter.java
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.jpa.processor.ref.converter;
import java.util.UUID;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
@Converter(autoApply = true)
public class UUIDConverter implements AttributeConverter<UUID, String> {
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/factory/JPAEntityManagerFactory.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/factory/JPAEntityManagerFactory.java
index 9e53eb3f..fa321aa8 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/factory/JPAEntityManagerFactory.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/factory/JPAEntityManagerFactory.java
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.jpa.processor.ref.factory;
import java.util.HashMap;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
public class JPAEntityManagerFactory {
private static HashMap<String, EntityManagerFactory> emfMap;
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/listeners/CustomerQueryExtension.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/listeners/CustomerQueryExtension.java
index 9e057721..711592cc 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/listeners/CustomerQueryExtension.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/listeners/CustomerQueryExtension.java
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.jpa.processor.ref.listeners;
import java.util.Locale;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
import org.apache.olingo.odata2.api.uri.info.GetEntitySetCountUriInfo;
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/listeners/SalesOrderItemTombstoneListener.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/listeners/SalesOrderItemTombstoneListener.java
index 26c5b810..d93306b4 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/listeners/SalesOrderItemTombstoneListener.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/listeners/SalesOrderItemTombstoneListener.java
@@ -22,8 +22,8 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
import org.apache.olingo.odata2.api.edm.EdmException;
import org.apache.olingo.odata2.api.uri.info.GetEntitySetUriInfo;
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/listeners/SalesOrderTombstoneListener.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/listeners/SalesOrderTombstoneListener.java
index 1b0bb682..acc1b764 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/listeners/SalesOrderTombstoneListener.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/listeners/SalesOrderTombstoneListener.java
@@ -20,9 +20,9 @@ package org.apache.olingo.odata2.jpa.processor.ref.listeners;
import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.PostLoad;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PostLoad;
+import jakarta.persistence.Query;
import org.apache.olingo.odata2.api.uri.info.GetEntitySetUriInfo;
import org.apache.olingo.odata2.jpa.processor.api.ODataJPATombstoneContext;
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Address.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Address.java
index 14adb5e9..259c9be9 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Address.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Address.java
@@ -18,8 +18,8 @@
******************************************************************************/
package org.apache.olingo.odata2.jpa.processor.ref.model;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
@Embeddable
public class Address {
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Category.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Category.java
index 734e4132..c4194ea2 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Category.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Category.java
@@ -21,12 +21,12 @@ package org.apache.olingo.odata2.jpa.processor.ref.model;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
@Entity
@Table(name = "T_CATEGORY")
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Customer.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Customer.java
index f2db54e7..54fbd1b4 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Customer.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Customer.java
@@ -22,18 +22,18 @@ import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
@Entity
@Table(name = "T_CUSTOMER")
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/CustomerBase.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/CustomerBase.java
index bc60aa29..871e6896 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/CustomerBase.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/CustomerBase.java
@@ -21,9 +21,9 @@ package org.apache.olingo.odata2.jpa.processor.ref.model;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToMany;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.OneToMany;
@MappedSuperclass
public class CustomerBase {
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Material.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Material.java
index a0397b64..cfb2d5c5 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Material.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Material.java
@@ -23,16 +23,16 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
-import javax.persistence.Lob;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
@Entity
@Table(name = "T_MATERIAL")
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Note.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Note.java
index 85b29704..80daeefc 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Note.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Note.java
@@ -21,17 +21,17 @@ package org.apache.olingo.odata2.jpa.processor.ref.model;
import java.sql.Clob;
import java.util.Calendar;
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.IdClass;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
@Entity
@IdClass(value = NoteKey.class)
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderHeader.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderHeader.java
index 05250178..66d88d63 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderHeader.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderHeader.java
@@ -24,18 +24,18 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.PostPersist;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.PostPersist;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
@Entity
@Table(name = "T_SALESORDERHEADER")
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
index 35482adc..20646ea7 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
@@ -18,14 +18,14 @@
******************************************************************************/
package org.apache.olingo.odata2.jpa.processor.ref.model;
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
@Entity
@Table(name = "T_SALESORDERITEM")
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItemKey.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItemKey.java
index 282259b4..1dc9035b 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItemKey.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItemKey.java
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.jpa.processor.ref.model;
import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
@Embeddable
public class SalesOrderItemKey implements Serializable {
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SampleGuid.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SampleGuid.java
index ddd3ab28..65ce63cf 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SampleGuid.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SampleGuid.java
@@ -20,12 +20,12 @@ package org.apache.olingo.odata2.jpa.processor.ref.model;
import java.util.UUID;
-import javax.persistence.Column;
-import javax.persistence.Convert;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
@Entity
@Table(name = "T_SAMPLEGUID")
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Store.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Store.java
index e609dc2a..be09b64a 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Store.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Store.java
@@ -22,12 +22,12 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
@Entity
@Table(name = "T_STORE")
diff --git a/odata2-jpa-processor/jpa-ref/src/main/resources/META-INF/persistence.xml b/odata2-jpa-processor/jpa-ref/src/main/resources/META-INF/persistence.xml
index 9e4492b6..a6f92f0e 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/resources/META-INF/persistence.xml
+++ b/odata2-jpa-processor/jpa-ref/src/main/resources/META-INF/persistence.xml
@@ -29,10 +29,10 @@
<class>org.apache.olingo.odata2.jpa.processor.ref.converter.ClobToStringConverter</class>
<class>org.apache.olingo.odata2.jpa.processor.ref.converter.UUIDConverter</class>
<properties>
- <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" />
- <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:mem:apache.olingo.jpa.sample" />
- <property name="javax.persistence.jdbc.user" value="sa" />
- <property name="javax.persistence.jdbc.password" value="" />
+ <property name="jakarta.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" />
+ <property name="jakarta.persistence.jdbc.url" value="jdbc:hsqldb:mem:apache.olingo.jpa.sample" />
+ <property name="jakarta.persistence.jdbc.user" value="sa" />
+ <property name="jakarta.persistence.jdbc.password" value="" />
<property name="eclipselink.target-database"
value="org.eclipse.persistence.platform.database.HSQLPlatform" />
<property name="eclipselink.logging.level" value="ALL" />
diff --git a/odata2-jpa-processor/jpa-web/pom.xml b/odata2-jpa-processor/jpa-web/pom.xml
index 58ef62e9..0c060f10 100644
--- a/odata2-jpa-processor/jpa-web/pom.xml
+++ b/odata2-jpa-processor/jpa-web/pom.xml
@@ -58,17 +58,13 @@
</build>
<dependencies>
- <dependency>
- <!-- required because of auto detection of web facet 2.5 -->
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
- <version>${version.javax.persistence}</version>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -103,12 +99,10 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
</dependency>
<dependency>
diff --git a/odata2-jpa-processor/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/OnDBWriteContent.java b/odata2-jpa-processor/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/OnDBWriteContent.java
index f93a9775..360c76c4 100644
--- a/odata2-jpa-processor/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/OnDBWriteContent.java
+++ b/odata2-jpa-processor/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/OnDBWriteContent.java
@@ -1,29 +1,22 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.ref.extension;
import java.sql.Blob;
import java.sql.Clob;
import java.sql.SQLException;
-
-import javax.sql.rowset.serial.SerialException;
-
import org.apache.olingo.odata2.jpa.processor.api.OnJPAWriteContent;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
import org.hsqldb.jdbc.JDBCBlob;
@@ -31,25 +24,23 @@ import org.hsqldb.jdbc.JDBCClob;
public class OnDBWriteContent implements OnJPAWriteContent {
- @Override
- public Blob getJPABlob(final byte[] binaryData) throws ODataJPARuntimeException {
- try {
- return new JDBCBlob(binaryData);
- } catch (SerialException e) {
- ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
- } catch (SQLException e) {
- ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
+ @Override
+ public Blob getJPABlob(final byte[] binaryData) throws ODataJPARuntimeException {
+ try {
+ return new JDBCBlob(binaryData);
+ } catch (SQLException e) {
+ ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
+ }
+ return null;
}
- return null;
- }
- @Override
- public Clob getJPAClob(final char[] characterData) throws ODataJPARuntimeException {
- try {
- return new JDBCClob(new String(characterData));
- } catch (SQLException e) {
- ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
+ @Override
+ public Clob getJPAClob(final char[] characterData) throws ODataJPARuntimeException {
+ try {
+ return new JDBCClob(new String(characterData));
+ } catch (SQLException e) {
+ ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
+ }
+ return null;
}
- return null;
- }
}
diff --git a/odata2-jpa-processor/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderHeaderProcessor.java b/odata2-jpa-processor/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderHeaderProcessor.java
index dd72595b..d0413289 100644
--- a/odata2-jpa-processor/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderHeaderProcessor.java
+++ b/odata2-jpa-processor/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderHeaderProcessor.java
@@ -20,9 +20,9 @@ package org.apache.olingo.odata2.jpa.processor.ref.extension;
import java.util.List;
-import javax.persistence.EntityManager;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Persistence;
+import jakarta.persistence.Query;
import org.apache.olingo.odata2.api.annotation.edm.EdmFacets;
import org.apache.olingo.odata2.api.annotation.edm.EdmFunctionImport;
diff --git a/odata2-jpa-processor/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/util/DataGenerator.java b/odata2-jpa-processor/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/util/DataGenerator.java
index 07ac8e1c..a00b017d 100644
--- a/odata2-jpa-processor/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/util/DataGenerator.java
+++ b/odata2-jpa-processor/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/util/DataGenerator.java
@@ -25,8 +25,8 @@ import java.util.List;
import java.util.ResourceBundle;
import java.util.Set;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
import org.apache.olingo.odata2.jpa.processor.ref.model.Material;
import org.apache.olingo.odata2.jpa.processor.ref.model.Store;
diff --git a/odata2-jpa-processor/jpa-web/src/main/resources/META-INF/LICENSE b/odata2-jpa-processor/jpa-web/src/main/resources/META-INF/LICENSE
index c85e30aa..2c5e63b6 100644
--- a/odata2-jpa-processor/jpa-web/src/main/resources/META-INF/LICENSE
+++ b/odata2-jpa-processor/jpa-web/src/main/resources/META-INF/LICENSE
@@ -914,7 +914,7 @@
- EclipseLink (non-OSGi) (http://www.eclipse.org/eclipselink)
org.eclipse.persistence:eclipselink:jar:2.5.0
- Javax Persistence (http://www.eclipse.org/eclipselink)
- org.eclipse.persistence:javax.persistence:jar:2.0.5
+ jakarta.persistence:jakarta.persistence-api:jar:2.0.5
License: Eclipse Public License v1.0 (http://www.eclipse.org/legal/epl-v10.html)
License: Eclipse Distribution License v. 1.0
(http://www.eclipse.org/org/documents/edl-v10.php)
diff --git a/odata2-jpa-processor/jpa-web/src/main/webapp/index.jsp b/odata2-jpa-processor/jpa-web/src/main/webapp/index.jsp
index c261c160..8152ee82 100644
--- a/odata2-jpa-processor/jpa-web/src/main/webapp/index.jsp
+++ b/odata2-jpa-processor/jpa-web/src/main/webapp/index.jsp
@@ -19,10 +19,10 @@
<%@page
import="org.apache.olingo.odata2.jpa.processor.ref.factory.JPAEntityManagerFactory"%>
<%@page import="java.util.List"%>
-<%@page import="javax.persistence.EntityManager"%>
-<%@page import="javax.persistence.EntityManagerFactory"%>
-<%@page import="javax.persistence.Persistence"%>
-<%@page import="javax.persistence.Query"%>
+<%@page import="jakarta.persistence.EntityManager"%>
+<%@page import="jakarta.persistence.EntityManagerFactory"%>
+<%@page import="jakarta.persistence.Persistence"%>
+<%@page import="jakarta.persistence.Query"%>
<%@page
import="org.apache.olingo.odata2.jpa.processor.ref.web.JPAReferenceServiceFactory"%>
<%@page
diff --git a/odata2-lib/odata-client-api/pom.xml b/odata2-lib/odata-client-api/pom.xml
index 6b7e336a..fee8de9e 100644
--- a/odata2-lib/odata-client-api/pom.xml
+++ b/odata2-lib/odata-client-api/pom.xml
@@ -24,7 +24,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
</dependency>
<dependency>
diff --git a/odata2-lib/odata-client-core/pom.xml b/odata2-lib/odata-client-core/pom.xml
index 48cb42cd..697251ec 100644
--- a/odata2-lib/odata-client-core/pom.xml
+++ b/odata2-lib/odata-client-core/pom.xml
@@ -26,7 +26,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
@@ -52,7 +51,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>${httpcore.version}</version>
</dependency>
</dependencies>
<build>
diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml
index 6dd55fbe..1dd34895 100644
--- a/odata2-lib/odata-core/pom.xml
+++ b/odata2-lib/odata-core/pom.xml
@@ -159,11 +159,9 @@
</profiles>
<dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
@@ -179,12 +177,10 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commonscodec.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>${gson.version}</version>
</dependency>
<!-- Test dependencies -->
@@ -208,14 +204,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoServer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoServer.java
index 8af08761..6bd838e5 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoServer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoServer.java
@@ -23,7 +23,7 @@ import java.io.Writer;
import java.util.Map;
import java.util.TreeMap;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
index ea379c21..f5fc86ec 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
@@ -32,7 +32,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java
index b5dd7494..aa03d7fc 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java
@@ -23,8 +23,8 @@ import java.util.Locale;
import java.util.Map.Entry;
import java.util.Set;
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.http.HttpServletRequest;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.Context;
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
index 57a8bc81..f8a58d8d 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.core.rest;
import java.util.List;
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.http.HttpServletRequest;
import javax.ws.rs.Encoded;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.Path;
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
index 50e4a6e2..4bfe12c5 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
@@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.olingo.odata2.core.rest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.HEAD;
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java
index d65c9f3d..b17d5a95 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java
@@ -31,8 +31,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java
index 8a0370c9..53cce590 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.core.rest;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import javax.ws.rs.core.Request;
import org.apache.olingo.odata2.api.ODataServiceFactory;
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataExceptionWrapper.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataExceptionWrapper.java
index bd342aed..54ae1b66 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataExceptionWrapper.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataExceptionWrapper.java
@@ -27,7 +27,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.olingo.odata2.api.ODataServiceFactory;
import org.apache.olingo.odata2.api.batch.BatchException;
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataServlet.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataServlet.java
index 3fdb99cb..f17fb8e8 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataServlet.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataServlet.java
@@ -37,10 +37,10 @@ import org.apache.olingo.odata2.core.ODataContextImpl;
import org.apache.olingo.odata2.core.ODataRequestHandler;
import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
index 8931faac..a0534bfa 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/RestUtil.java
@@ -34,7 +34,7 @@ import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.olingo.odata2.api.exception.ODataBadRequestException;
import org.apache.olingo.odata2.api.exception.ODataException;
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java
index 96b73feb..4d0becd2 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java
@@ -1,35 +1,29 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-
import java.io.InputStream;
import java.util.Arrays;
-
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.ODataServiceFactory;
import org.apache.olingo.odata2.api.batch.BatchHandler;
@@ -58,414 +52,401 @@ import org.apache.olingo.odata2.core.uri.UriInfoImpl;
import org.apache.olingo.odata2.core.uri.UriType;
import org.apache.olingo.odata2.testutil.fit.BaseTest;
import org.junit.Test;
-import org.mockito.Matchers;
import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
/**
* Tests for request dispatching according to URI type and HTTP method.
- *
+ *
*/
public class DispatcherTest extends BaseTest {
- public static ODataService getMockService() throws ODataException {
- ServiceDocumentProcessor serviceDocument = mock(ServiceDocumentProcessor.class);
- when(serviceDocument.readServiceDocument(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
-
- EntitySetProcessor entitySet = mock(EntitySetProcessor.class);
- when(entitySet.readEntitySet(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entitySet.countEntitySet(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entitySet.createEntity(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString())).thenAnswer(
- getAnswer());
-
- EntityProcessor entity = mock(EntityProcessor.class);
- when(entity.readEntity(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entity.existsEntity(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entity.deleteEntity(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entity.updateEntity(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyBoolean(), anyString()))
- .thenAnswer(getAnswer());
-
- EntityComplexPropertyProcessor entityComplexProperty = mock(EntityComplexPropertyProcessor.class);
- when(entityComplexProperty.readEntityComplexProperty(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(
- entityComplexProperty.updateEntityComplexProperty(any(UriInfoImpl.class), any(InputStream.class), anyString(),
- anyBoolean(), anyString())).thenAnswer(getAnswer());
-
- EntitySimplePropertyProcessor entitySimpleProperty = mock(EntitySimplePropertyProcessor.class);
- when(entitySimpleProperty.readEntitySimpleProperty(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(
- entitySimpleProperty.updateEntitySimpleProperty(any(UriInfoImpl.class), any(InputStream.class), anyString(),
- anyString())).thenAnswer(getAnswer());
-
- EntitySimplePropertyValueProcessor entitySimplePropertyValue = mock(EntitySimplePropertyValueProcessor.class);
- when(entitySimplePropertyValue.readEntitySimplePropertyValue(any(UriInfoImpl.class), anyString())).thenAnswer(
- getAnswer());
- when(entitySimplePropertyValue.deleteEntitySimplePropertyValue(any(UriInfoImpl.class), anyString())).thenAnswer(
- getAnswer());
- when(
- entitySimplePropertyValue.updateEntitySimplePropertyValue(any(UriInfoImpl.class), any(InputStream.class),
- anyString(), anyString())).thenAnswer(getAnswer());
-
- EntityLinkProcessor entityLink = mock(EntityLinkProcessor.class);
- when(entityLink.readEntityLink(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entityLink.existsEntityLink(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entityLink.deleteEntityLink(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entityLink.updateEntityLink(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString()))
- .thenAnswer(getAnswer());
-
- EntityLinksProcessor entityLinks = mock(EntityLinksProcessor.class);
- when(entityLinks.readEntityLinks(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entityLinks.countEntityLinks(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entityLinks.createEntityLink(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString()))
- .thenAnswer(getAnswer());
-
- MetadataProcessor metadata = mock(MetadataProcessor.class);
- when(metadata.readMetadata(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
-
- BatchProcessor batch = mock(BatchProcessor.class);
- when(batch.executeBatch(any(BatchHandler.class), anyString(), any(InputStream.class))).thenAnswer(getAnswer());
-
- FunctionImportProcessor functionImport = mock(FunctionImportProcessor.class);
- when(functionImport.executeFunctionImport(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
-
- FunctionImportValueProcessor functionImportValue = mock(FunctionImportValueProcessor.class);
- when(functionImportValue.executeFunctionImportValue(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
-
- EntityMediaProcessor entityMedia = mock(EntityMediaProcessor.class);
- when(entityMedia.readEntityMedia(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entityMedia.deleteEntityMedia(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
- when(entityMedia.updateEntityMedia(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString()))
- .thenAnswer(getAnswer());
-
- ODataService service = mock(ODataService.class);
- when(service.getServiceDocumentProcessor()).thenReturn(serviceDocument);
- when(service.getEntitySetProcessor()).thenReturn(entitySet);
- when(service.getEntityProcessor()).thenReturn(entity);
- when(service.getEntityComplexPropertyProcessor()).thenReturn(entityComplexProperty);
- when(service.getEntitySimplePropertyProcessor()).thenReturn(entitySimpleProperty);
- when(service.getEntitySimplePropertyValueProcessor()).thenReturn(entitySimplePropertyValue);
- when(service.getEntityLinkProcessor()).thenReturn(entityLink);
- when(service.getEntityLinksProcessor()).thenReturn(entityLinks);
- when(service.getMetadataProcessor()).thenReturn(metadata);
- when(service.getBatchProcessor()).thenReturn(batch);
- when(service.getFunctionImportProcessor()).thenReturn(functionImport);
- when(service.getFunctionImportValueProcessor()).thenReturn(functionImportValue);
- when(service.getEntityMediaProcessor()).thenReturn(entityMedia);
-
- return service;
- }
-
- private static Answer<ODataResponse> getAnswer() {
- return new Answer<ODataResponse>() {
- @Override
- public ODataResponse answer(final InvocationOnMock invocation) {
- return mockResponse(invocation.getMethod().getName());
- }
- };
- }
-
- private static ODataResponse mockResponse(final String value) {
- ODataResponse response = mock(ODataResponse.class);
- when(response.getStatus()).thenReturn(HttpStatusCodes.PAYMENT_REQUIRED);
- when(response.getEntity()).thenReturn(value);
-
- return response;
- }
-
- private static UriInfoImpl mockUriInfo(final UriType uriType, final boolean isValue) throws EdmException {
- UriInfoImpl uriInfo = mock(UriInfoImpl.class);
- when(uriInfo.getUriType()).thenReturn(uriType);
- when(uriInfo.isValue()).thenReturn(isValue);
- return uriInfo;
- }
-
- private static void checkDispatch(final ODataHttpMethod method, final UriType uriType, final boolean isValue,
- final String expectedMethodName) throws ODataException {
- ODataServiceFactory factory = mock(ODataServiceFactory.class);
-
- final ODataResponse response = new Dispatcher(factory, getMockService())
- .dispatch(method, mockUriInfo(uriType, isValue), null, "application/xml", "*/*");
- assertEquals(expectedMethodName, response.getEntity());
- }
-
- private static void
- checkDispatch(final ODataHttpMethod method, final UriType uriType, final String expectedMethodName)
- throws ODataException {
- checkDispatch(method, uriType, false, expectedMethodName);
- }
-
- private static void wrongDispatch(final ODataHttpMethod method, final UriType uriType) {
- try {
- checkDispatch(method, uriType, null);
- fail("Expected ODataException not thrown");
- } catch (ODataMethodNotAllowedException e) {
- assertNotNull(e);
- } catch (ODataException e) {
- fail("Expected ODataMethodNotAllowedException not thrown");
+ public static ODataService getMockService() throws ODataException {
+ ServiceDocumentProcessor serviceDocument = mock(ServiceDocumentProcessor.class);
+ when(serviceDocument.readServiceDocument(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+
+ EntitySetProcessor entitySet = mock(EntitySetProcessor.class);
+ when(entitySet.readEntitySet(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entitySet.countEntitySet(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entitySet.createEntity(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString())).thenAnswer(getAnswer());
+
+ EntityProcessor entity = mock(EntityProcessor.class);
+ when(entity.readEntity(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entity.existsEntity(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entity.deleteEntity(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entity.updateEntity(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyBoolean(), anyString())).thenAnswer(
+ getAnswer());
+
+ EntityComplexPropertyProcessor entityComplexProperty = mock(EntityComplexPropertyProcessor.class);
+ when(entityComplexProperty.readEntityComplexProperty(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entityComplexProperty.updateEntityComplexProperty(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyBoolean(),
+ anyString())).thenAnswer(getAnswer());
+
+ EntitySimplePropertyProcessor entitySimpleProperty = mock(EntitySimplePropertyProcessor.class);
+ when(entitySimpleProperty.readEntitySimpleProperty(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entitySimpleProperty.updateEntitySimpleProperty(any(UriInfoImpl.class), any(InputStream.class), anyString(),
+ anyString())).thenAnswer(getAnswer());
+
+ EntitySimplePropertyValueProcessor entitySimplePropertyValue = mock(EntitySimplePropertyValueProcessor.class);
+ when(entitySimplePropertyValue.readEntitySimplePropertyValue(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entitySimplePropertyValue.deleteEntitySimplePropertyValue(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entitySimplePropertyValue.updateEntitySimplePropertyValue(any(UriInfoImpl.class), any(InputStream.class), anyString(),
+ anyString())).thenAnswer(getAnswer());
+
+ EntityLinkProcessor entityLink = mock(EntityLinkProcessor.class);
+ when(entityLink.readEntityLink(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entityLink.existsEntityLink(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entityLink.deleteEntityLink(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entityLink.updateEntityLink(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString())).thenAnswer(getAnswer());
+
+ EntityLinksProcessor entityLinks = mock(EntityLinksProcessor.class);
+ when(entityLinks.readEntityLinks(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entityLinks.countEntityLinks(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entityLinks.createEntityLink(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString())).thenAnswer(
+ getAnswer());
+
+ MetadataProcessor metadata = mock(MetadataProcessor.class);
+ when(metadata.readMetadata(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+
+ BatchProcessor batch = mock(BatchProcessor.class);
+ when(batch.executeBatch(any(BatchHandler.class), anyString(), any(InputStream.class))).thenAnswer(getAnswer());
+
+ FunctionImportProcessor functionImport = mock(FunctionImportProcessor.class);
+ when(functionImport.executeFunctionImport(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+
+ FunctionImportValueProcessor functionImportValue = mock(FunctionImportValueProcessor.class);
+ when(functionImportValue.executeFunctionImportValue(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+
+ EntityMediaProcessor entityMedia = mock(EntityMediaProcessor.class);
+ when(entityMedia.readEntityMedia(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entityMedia.deleteEntityMedia(any(UriInfoImpl.class), anyString())).thenAnswer(getAnswer());
+ when(entityMedia.updateEntityMedia(any(UriInfoImpl.class), any(InputStream.class), anyString(), anyString())).thenAnswer(
+ getAnswer());
+
+ ODataService service = mock(ODataService.class);
+ when(service.getServiceDocumentProcessor()).thenReturn(serviceDocument);
+ when(service.getEntitySetProcessor()).thenReturn(entitySet);
+ when(service.getEntityProcessor()).thenReturn(entity);
+ when(service.getEntityComplexPropertyProcessor()).thenReturn(entityComplexProperty);
+ when(service.getEntitySimplePropertyProcessor()).thenReturn(entitySimpleProperty);
+ when(service.getEntitySimplePropertyValueProcessor()).thenReturn(entitySimplePropertyValue);
+ when(service.getEntityLinkProcessor()).thenReturn(entityLink);
+ when(service.getEntityLinksProcessor()).thenReturn(entityLinks);
+ when(service.getMetadataProcessor()).thenReturn(metadata);
+ when(service.getBatchProcessor()).thenReturn(batch);
+ when(service.getFunctionImportProcessor()).thenReturn(functionImport);
+ when(service.getFunctionImportValueProcessor()).thenReturn(functionImportValue);
+ when(service.getEntityMediaProcessor()).thenReturn(entityMedia);
+
+ return service;
+ }
+
+ private static Answer<ODataResponse> getAnswer() {
+ return invocation -> mockResponse(invocation.getMethod()
+ .getName());
+ }
+
+ private static ODataResponse mockResponse(final String value) {
+ ODataResponse response = mock(ODataResponse.class);
+ when(response.getStatus()).thenReturn(HttpStatusCodes.PAYMENT_REQUIRED);
+ when(response.getEntity()).thenReturn(value);
+
+ return response;
+ }
+
+ private static UriInfoImpl mockUriInfo(final UriType uriType, final boolean isValue) throws EdmException {
+ UriInfoImpl uriInfo = mock(UriInfoImpl.class);
+ when(uriInfo.getUriType()).thenReturn(uriType);
+ when(uriInfo.isValue()).thenReturn(isValue);
+ return uriInfo;
+ }
+
+ private static void checkDispatch(final ODataHttpMethod method, final UriType uriType, final boolean isValue,
+ final String expectedMethodName) throws ODataException {
+ ODataServiceFactory factory = mock(ODataServiceFactory.class);
+
+ final ODataResponse response =
+ new Dispatcher(factory, getMockService()).dispatch(method, mockUriInfo(uriType, isValue), null, "application/xml", "*/*");
+ assertEquals(expectedMethodName, response.getEntity());
+ }
+
+ private static void checkDispatch(final ODataHttpMethod method, final UriType uriType, final String expectedMethodName)
+ throws ODataException {
+ checkDispatch(method, uriType, false, expectedMethodName);
+ }
+
+ private static void wrongDispatch(final ODataHttpMethod method, final UriType uriType) {
+ try {
+ checkDispatch(method, uriType, null);
+ fail("Expected ODataException not thrown");
+ } catch (ODataMethodNotAllowedException e) {
+ assertNotNull(e);
+ } catch (ODataException e) {
+ fail("Expected ODataMethodNotAllowedException not thrown");
+ }
+ }
+
+ private static void notSupportedDispatch(final ODataHttpMethod method, final UriType uriType) {
+ try {
+ checkDispatch(method, uriType, null);
+ fail("Expected ODataException not thrown");
+ } catch (ODataBadRequestException e) {
+ assertNotNull(e);
+ } catch (ODataException e) {
+ fail("Expected ODataBadRequestException not thrown");
+ }
}
- }
-
- private static void notSupportedDispatch(final ODataHttpMethod method, final UriType uriType) {
- try {
- checkDispatch(method, uriType, null);
- fail("Expected ODataException not thrown");
- } catch (ODataBadRequestException e) {
- assertNotNull(e);
- } catch (ODataException e) {
- fail("Expected ODataBadRequestException not thrown");
+
+ @Test
+ public void dispatch() throws Exception {
+ checkDispatch(ODataHttpMethod.GET, UriType.URI0, "readServiceDocument");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI1, "readEntitySet");
+ checkDispatch(ODataHttpMethod.POST, UriType.URI1, "createEntity");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI2, "readEntity");
+ checkDispatch(ODataHttpMethod.PUT, UriType.URI2, "updateEntity");
+ checkDispatch(ODataHttpMethod.DELETE, UriType.URI2, "deleteEntity");
+ checkDispatch(ODataHttpMethod.PATCH, UriType.URI2, "updateEntity");
+ checkDispatch(ODataHttpMethod.MERGE, UriType.URI2, "updateEntity");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI3, "readEntityComplexProperty");
+ checkDispatch(ODataHttpMethod.PUT, UriType.URI3, "updateEntityComplexProperty");
+ checkDispatch(ODataHttpMethod.PATCH, UriType.URI3, "updateEntityComplexProperty");
+ checkDispatch(ODataHttpMethod.MERGE, UriType.URI3, "updateEntityComplexProperty");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI4, "readEntitySimpleProperty");
+ checkDispatch(ODataHttpMethod.PUT, UriType.URI4, "updateEntitySimpleProperty");
+ checkDispatch(ODataHttpMethod.PATCH, UriType.URI4, "updateEntitySimpleProperty");
+ checkDispatch(ODataHttpMethod.MERGE, UriType.URI4, "updateEntitySimpleProperty");
+ checkDispatch(ODataHttpMethod.GET, UriType.URI4, true, "readEntitySimplePropertyValue");
+ checkDispatch(ODataHttpMethod.PUT, UriType.URI4, true, "updateEntitySimplePropertyValue");
+ checkDispatch(ODataHttpMethod.DELETE, UriType.URI4, true, "deleteEntitySimplePropertyValue");
+ checkDispatch(ODataHttpMethod.PATCH, UriType.URI4, true, "updateEntitySimplePropertyValue");
+ checkDispatch(ODataHttpMethod.MERGE, UriType.URI4, true, "updateEntitySimplePropertyValue");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI5, "readEntitySimpleProperty");
+ checkDispatch(ODataHttpMethod.PUT, UriType.URI5, "updateEntitySimpleProperty");
+ checkDispatch(ODataHttpMethod.PATCH, UriType.URI5, "updateEntitySimpleProperty");
+ checkDispatch(ODataHttpMethod.MERGE, UriType.URI5, "updateEntitySimpleProperty");
+ checkDispatch(ODataHttpMethod.GET, UriType.URI5, true, "readEntitySimplePropertyValue");
+ checkDispatch(ODataHttpMethod.PUT, UriType.URI5, true, "updateEntitySimplePropertyValue");
+ checkDispatch(ODataHttpMethod.DELETE, UriType.URI5, true, "deleteEntitySimplePropertyValue");
+ checkDispatch(ODataHttpMethod.PATCH, UriType.URI5, true, "updateEntitySimplePropertyValue");
+ checkDispatch(ODataHttpMethod.MERGE, UriType.URI5, true, "updateEntitySimplePropertyValue");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI6A, "readEntity");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI6B, "readEntitySet");
+ checkDispatch(ODataHttpMethod.POST, UriType.URI6B, "createEntity");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI7A, "readEntityLink");
+ checkDispatch(ODataHttpMethod.PUT, UriType.URI7A, "updateEntityLink");
+ checkDispatch(ODataHttpMethod.DELETE, UriType.URI7A, "deleteEntityLink");
+ checkDispatch(ODataHttpMethod.PATCH, UriType.URI7A, "updateEntityLink");
+ checkDispatch(ODataHttpMethod.MERGE, UriType.URI7A, "updateEntityLink");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI7B, "readEntityLinks");
+ checkDispatch(ODataHttpMethod.POST, UriType.URI7B, "createEntityLink");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI8, "readMetadata");
+
+ checkDispatch(ODataHttpMethod.POST, UriType.URI9, "executeBatch");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI10, "executeFunctionImport");
+ checkDispatch(ODataHttpMethod.GET, UriType.URI10a, "executeFunctionImport");
+ checkDispatch(ODataHttpMethod.GET, UriType.URI11, "executeFunctionImport");
+ checkDispatch(ODataHttpMethod.GET, UriType.URI12, "executeFunctionImport");
+ checkDispatch(ODataHttpMethod.GET, UriType.URI13, "executeFunctionImport");
+ checkDispatch(ODataHttpMethod.GET, UriType.URI14, "executeFunctionImport");
+ checkDispatch(ODataHttpMethod.GET, UriType.URI14, true, "executeFunctionImportValue");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI15, "countEntitySet");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI16, "existsEntity");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI17, "readEntityMedia");
+ checkDispatch(ODataHttpMethod.PUT, UriType.URI17, "updateEntityMedia");
+ checkDispatch(ODataHttpMethod.DELETE, UriType.URI17, "deleteEntityMedia");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI50A, "existsEntityLink");
+
+ checkDispatch(ODataHttpMethod.GET, UriType.URI50B, "countEntityLinks");
}
- }
- @Test
- public void dispatch() throws Exception {
- checkDispatch(ODataHttpMethod.GET, UriType.URI0, "readServiceDocument");
+ @Test
+ public void dispatchNotAllowedCombinations() throws Exception {
+ wrongDispatch(null, UriType.URI0);
+
+ wrongDispatch(ODataHttpMethod.PUT, UriType.URI0);
+ wrongDispatch(ODataHttpMethod.POST, UriType.URI0);
+ wrongDispatch(ODataHttpMethod.DELETE, UriType.URI0);
+ wrongDispatch(ODataHttpMethod.PATCH, UriType.URI0);
+ wrongDispatch(ODataHttpMethod.MERGE, UriType.URI0);
+
+ wrongDispatch(ODataHttpMethod.PUT, UriType.URI1);
+ wrongDispatch(ODataHttpMethod.DELETE, UriType.URI1);
+ wrongDispatch(ODataHttpMethod.PATCH, UriType.URI1);
+ wrongDispatch(ODataHttpMethod.MERGE, UriType.URI1);
+
+ wrongDispatch(ODataHttpMethod.POST, UriType.URI2);
+
+ wrongDispatch(ODataHttpMethod.POST, UriType.URI3);
+ wrongDispatch(ODataHttpMethod.DELETE, UriType.URI3);
+
+ wrongDispatch(ODataHttpMethod.POST, UriType.URI4);
+ wrongDispatch(ODataHttpMethod.DELETE, UriType.URI4);
+
+ wrongDispatch(ODataHttpMethod.POST, UriType.URI5);
+ wrongDispatch(ODataHttpMethod.DELETE, UriType.URI5);
+
+ wrongDispatch(ODataHttpMethod.POST, UriType.URI6A);
+
+ wrongDispatch(ODataHttpMethod.PUT, UriType.URI6B);
+ wrongDispatch(ODataHttpMethod.DELETE, UriType.URI6B);
+ wrongDispatch(ODataHttpMethod.PATCH, UriType.URI6B);
+ wrongDispatch(ODataHttpMethod.MERGE, UriType.URI6B);
+
+ wrongDispatch(ODataHttpMethod.POST, UriType.URI7A);
+
+ wrongDispatch(ODataHttpMethod.PUT, UriType.URI7B);
+ wrongDispatch(ODataHttpMethod.DELETE, UriType.URI7B);
+ wrongDispatch(ODataHttpMethod.PATCH, UriType.URI7B);
+ wrongDispatch(ODataHttpMethod.MERGE, UriType.URI7B);
+
+ wrongDispatch(ODataHttpMethod.PUT, UriType.URI8);
+ wrongDispatch(ODataHttpMethod.POST, UriType.URI8);
+ wrongDispatch(ODataHttpMethod.DELETE, UriType.URI8);
+ wrongDispatch(ODataHttpMethod.PATCH, UriType.URI8);
+ wrongDispatch(ODataHttpMethod.MERGE, UriType.URI8);
+
+ wrongDispatch(ODataHttpMethod.GET, UriType.URI9);
+ wrongDispatch(ODataHttpMethod.PUT, UriType.URI9);
+ wrongDispatch(ODataHttpMethod.DELETE, UriType.URI9);
+ wrongDispatch(ODataHttpMethod.PATCH, UriType.URI9);
+ wrongDispatch(ODataHttpMethod.MERGE, UriType.URI9);
+
+ wrongDispatch(ODataHttpMethod.PUT, UriType.URI15);
+ wrongDispatch(ODataHttpMethod.POST, UriType.URI15);
+ wrongDispatch(ODataHttpMethod.DELETE, UriType.URI15);
+ wrongDispatch(ODataHttpMethod.PATCH, UriType.URI15);
+ wrongDispatch(ODataHttpMethod.MERGE, UriType.URI15);
+
+ wrongDispatch(ODataHttpMethod.PUT, UriType.URI16);
+ wrongDispatch(ODataHttpMethod.POST, UriType.URI16);
+ wrongDispatch(ODataHttpMethod.DELETE, UriType.URI16);
+ wrongDispatch(ODataHttpMethod.PATCH, UriType.URI16);
+ wrongDispatch(ODataHttpMethod.MERGE, UriType.URI16);
+
+ wrongDispatch(ODataHttpMethod.POST, UriType.URI17);
+ wrongDispatch(ODataHttpMethod.PATCH, UriType.URI17);
+ wrongDispatch(ODataHttpMethod.MERGE, UriType.URI17);
+
+ wrongDispatch(ODataHttpMethod.PUT, UriType.URI50A);
+ wrongDispatch(ODataHttpMethod.POST, UriType.URI50A);
+ wrongDispatch(ODataHttpMethod.DELETE, UriType.URI50A);
+ wrongDispatch(ODataHttpMethod.PATCH, UriType.URI50A);
+ wrongDispatch(ODataHttpMethod.MERGE, UriType.URI50A);
+
+ wrongDispatch(ODataHttpMethod.PUT, UriType.URI50B);
+ wrongDispatch(ODataHttpMethod.POST, UriType.URI50B);
+ wrongDispatch(ODataHttpMethod.DELETE, UriType.URI50B);
+ wrongDispatch(ODataHttpMethod.PATCH, UriType.URI50B);
+ wrongDispatch(ODataHttpMethod.MERGE, UriType.URI50B);
+ }
- checkDispatch(ODataHttpMethod.GET, UriType.URI1, "readEntitySet");
- checkDispatch(ODataHttpMethod.POST, UriType.URI1, "createEntity");
+ @Test
+ public void dispatchNotSupportedCombinations() throws Exception {
+ notSupportedDispatch(ODataHttpMethod.PUT, UriType.URI6A);
+ notSupportedDispatch(ODataHttpMethod.DELETE, UriType.URI6A);
+ notSupportedDispatch(ODataHttpMethod.PATCH, UriType.URI6A);
+ notSupportedDispatch(ODataHttpMethod.MERGE, UriType.URI6A);
+ }
- checkDispatch(ODataHttpMethod.GET, UriType.URI2, "readEntity");
- checkDispatch(ODataHttpMethod.PUT, UriType.URI2, "updateEntity");
- checkDispatch(ODataHttpMethod.DELETE, UriType.URI2, "deleteEntity");
- checkDispatch(ODataHttpMethod.PATCH, UriType.URI2, "updateEntity");
- checkDispatch(ODataHttpMethod.MERGE, UriType.URI2, "updateEntity");
+ private static void checkFeature(final UriType uriType, final boolean isValue, final Class<? extends ODataProcessor> feature)
+ throws ODataException {
+ ODataServiceFactory factory = mock(ODataServiceFactory.class);
+ new Dispatcher(factory, getMockService());
+ assertEquals(feature, Dispatcher.mapUriTypeToProcessorFeature(mockUriInfo(uriType, isValue)));
+ assertEquals(feature, Dispatcher.mapUriTypeToProcessorFeature(mockUriInfo(uriType, isValue)));
+ }
- checkDispatch(ODataHttpMethod.GET, UriType.URI3, "readEntityComplexProperty");
- checkDispatch(ODataHttpMethod.PUT, UriType.URI3, "updateEntityComplexProperty");
- checkDispatch(ODataHttpMethod.PATCH, UriType.URI3, "updateEntityComplexProperty");
- checkDispatch(ODataHttpMethod.MERGE, UriType.URI3, "updateEntityComplexProperty");
+ @Test
+ public void processorFeature() throws Exception {
+ checkFeature(UriType.URI0, false, ServiceDocumentProcessor.class);
+ checkFeature(UriType.URI1, false, EntitySetProcessor.class);
+ checkFeature(UriType.URI2, false, EntityProcessor.class);
+ checkFeature(UriType.URI3, false, EntityComplexPropertyProcessor.class);
+ checkFeature(UriType.URI4, false, EntitySimplePropertyProcessor.class);
+ checkFeature(UriType.URI4, true, EntitySimplePropertyValueProcessor.class);
+ checkFeature(UriType.URI5, false, EntitySimplePropertyProcessor.class);
+ checkFeature(UriType.URI5, true, EntitySimplePropertyValueProcessor.class);
+ checkFeature(UriType.URI6A, false, EntityProcessor.class);
+ checkFeature(UriType.URI6B, false, EntitySetProcessor.class);
+ checkFeature(UriType.URI7A, false, EntityLinkProcessor.class);
+ checkFeature(UriType.URI7B, false, EntityLinksProcessor.class);
+ checkFeature(UriType.URI8, false, MetadataProcessor.class);
+ checkFeature(UriType.URI9, false, BatchProcessor.class);
+ checkFeature(UriType.URI10, false, FunctionImportProcessor.class);
+ checkFeature(UriType.URI11, false, FunctionImportProcessor.class);
+ checkFeature(UriType.URI12, false, FunctionImportProcessor.class);
+ checkFeature(UriType.URI13, false, FunctionImportProcessor.class);
+ checkFeature(UriType.URI14, false, FunctionImportProcessor.class);
+ checkFeature(UriType.URI14, true, FunctionImportValueProcessor.class);
+ checkFeature(UriType.URI15, false, EntitySetProcessor.class);
+ checkFeature(UriType.URI16, false, EntityProcessor.class);
+ checkFeature(UriType.URI17, false, EntityMediaProcessor.class);
+ checkFeature(UriType.URI50A, false, EntityLinkProcessor.class);
+ checkFeature(UriType.URI50B, false, EntityLinksProcessor.class);
+ }
- checkDispatch(ODataHttpMethod.GET, UriType.URI4, "readEntitySimpleProperty");
- checkDispatch(ODataHttpMethod.PUT, UriType.URI4, "updateEntitySimpleProperty");
- checkDispatch(ODataHttpMethod.PATCH, UriType.URI4, "updateEntitySimpleProperty");
- checkDispatch(ODataHttpMethod.MERGE, UriType.URI4, "updateEntitySimpleProperty");
- checkDispatch(ODataHttpMethod.GET, UriType.URI4, true, "readEntitySimplePropertyValue");
- checkDispatch(ODataHttpMethod.PUT, UriType.URI4, true, "updateEntitySimplePropertyValue");
- checkDispatch(ODataHttpMethod.DELETE, UriType.URI4, true, "deleteEntitySimplePropertyValue");
- checkDispatch(ODataHttpMethod.PATCH, UriType.URI4, true, "updateEntitySimplePropertyValue");
- checkDispatch(ODataHttpMethod.MERGE, UriType.URI4, true, "updateEntitySimplePropertyValue");
-
- checkDispatch(ODataHttpMethod.GET, UriType.URI5, "readEntitySimpleProperty");
- checkDispatch(ODataHttpMethod.PUT, UriType.URI5, "updateEntitySimpleProperty");
- checkDispatch(ODataHttpMethod.PATCH, UriType.URI5, "updateEntitySimpleProperty");
- checkDispatch(ODataHttpMethod.MERGE, UriType.URI5, "updateEntitySimpleProperty");
- checkDispatch(ODataHttpMethod.GET, UriType.URI5, true, "readEntitySimplePropertyValue");
- checkDispatch(ODataHttpMethod.PUT, UriType.URI5, true, "updateEntitySimplePropertyValue");
- checkDispatch(ODataHttpMethod.DELETE, UriType.URI5, true, "deleteEntitySimplePropertyValue");
- checkDispatch(ODataHttpMethod.PATCH, UriType.URI5, true, "updateEntitySimplePropertyValue");
- checkDispatch(ODataHttpMethod.MERGE, UriType.URI5, true, "updateEntitySimplePropertyValue");
-
- checkDispatch(ODataHttpMethod.GET, UriType.URI6A, "readEntity");
-
- checkDispatch(ODataHttpMethod.GET, UriType.URI6B, "readEntitySet");
- checkDispatch(ODataHttpMethod.POST, UriType.URI6B, "createEntity");
-
- checkDispatch(ODataHttpMethod.GET, UriType.URI7A, "readEntityLink");
- checkDispatch(ODataHttpMethod.PUT, UriType.URI7A, "updateEntityLink");
- checkDispatch(ODataHttpMethod.DELETE, UriType.URI7A, "deleteEntityLink");
- checkDispatch(ODataHttpMethod.PATCH, UriType.URI7A, "updateEntityLink");
- checkDispatch(ODataHttpMethod.MERGE, UriType.URI7A, "updateEntityLink");
-
- checkDispatch(ODataHttpMethod.GET, UriType.URI7B, "readEntityLinks");
- checkDispatch(ODataHttpMethod.POST, UriType.URI7B, "createEntityLink");
-
- checkDispatch(ODataHttpMethod.GET, UriType.URI8, "readMetadata");
-
- checkDispatch(ODataHttpMethod.POST, UriType.URI9, "executeBatch");
-
- checkDispatch(ODataHttpMethod.GET, UriType.URI10, "executeFunctionImport");
- checkDispatch(ODataHttpMethod.GET, UriType.URI10a, "executeFunctionImport");
- checkDispatch(ODataHttpMethod.GET, UriType.URI11, "executeFunctionImport");
- checkDispatch(ODataHttpMethod.GET, UriType.URI12, "executeFunctionImport");
- checkDispatch(ODataHttpMethod.GET, UriType.URI13, "executeFunctionImport");
- checkDispatch(ODataHttpMethod.GET, UriType.URI14, "executeFunctionImport");
- checkDispatch(ODataHttpMethod.GET, UriType.URI14, true, "executeFunctionImportValue");
-
- checkDispatch(ODataHttpMethod.GET, UriType.URI15, "countEntitySet");
-
- checkDispatch(ODataHttpMethod.GET, UriType.URI16, "existsEntity");
-
- checkDispatch(ODataHttpMethod.GET, UriType.URI17, "readEntityMedia");
- checkDispatch(ODataHttpMethod.PUT, UriType.URI17, "updateEntityMedia");
- checkDispatch(ODataHttpMethod.DELETE, UriType.URI17, "deleteEntityMedia");
-
- checkDispatch(ODataHttpMethod.GET, UriType.URI50A, "existsEntityLink");
-
- checkDispatch(ODataHttpMethod.GET, UriType.URI50B, "countEntityLinks");
- }
-
- @Test
- public void dispatchNotAllowedCombinations() throws Exception {
- wrongDispatch(null, UriType.URI0);
-
- wrongDispatch(ODataHttpMethod.PUT, UriType.URI0);
- wrongDispatch(ODataHttpMethod.POST, UriType.URI0);
- wrongDispatch(ODataHttpMethod.DELETE, UriType.URI0);
- wrongDispatch(ODataHttpMethod.PATCH, UriType.URI0);
- wrongDispatch(ODataHttpMethod.MERGE, UriType.URI0);
-
- wrongDispatch(ODataHttpMethod.PUT, UriType.URI1);
- wrongDispatch(ODataHttpMethod.DELETE, UriType.URI1);
- wrongDispatch(ODataHttpMethod.PATCH, UriType.URI1);
- wrongDispatch(ODataHttpMethod.MERGE, UriType.URI1);
-
- wrongDispatch(ODataHttpMethod.POST, UriType.URI2);
-
- wrongDispatch(ODataHttpMethod.POST, UriType.URI3);
- wrongDispatch(ODataHttpMethod.DELETE, UriType.URI3);
-
- wrongDispatch(ODataHttpMethod.POST, UriType.URI4);
- wrongDispatch(ODataHttpMethod.DELETE, UriType.URI4);
-
- wrongDispatch(ODataHttpMethod.POST, UriType.URI5);
- wrongDispatch(ODataHttpMethod.DELETE, UriType.URI5);
-
- wrongDispatch(ODataHttpMethod.POST, UriType.URI6A);
-
- wrongDispatch(ODataHttpMethod.PUT, UriType.URI6B);
- wrongDispatch(ODataHttpMethod.DELETE, UriType.URI6B);
- wrongDispatch(ODataHttpMethod.PATCH, UriType.URI6B);
- wrongDispatch(ODataHttpMethod.MERGE, UriType.URI6B);
-
- wrongDispatch(ODataHttpMethod.POST, UriType.URI7A);
-
- wrongDispatch(ODataHttpMethod.PUT, UriType.URI7B);
- wrongDispatch(ODataHttpMethod.DELETE, UriType.URI7B);
- wrongDispatch(ODataHttpMethod.PATCH, UriType.URI7B);
- wrongDispatch(ODataHttpMethod.MERGE, UriType.URI7B);
-
- wrongDispatch(ODataHttpMethod.PUT, UriType.URI8);
- wrongDispatch(ODataHttpMethod.POST, UriType.URI8);
- wrongDispatch(ODataHttpMethod.DELETE, UriType.URI8);
- wrongDispatch(ODataHttpMethod.PATCH, UriType.URI8);
- wrongDispatch(ODataHttpMethod.MERGE, UriType.URI8);
-
- wrongDispatch(ODataHttpMethod.GET, UriType.URI9);
- wrongDispatch(ODataHttpMethod.PUT, UriType.URI9);
- wrongDispatch(ODataHttpMethod.DELETE, UriType.URI9);
- wrongDispatch(ODataHttpMethod.PATCH, UriType.URI9);
- wrongDispatch(ODataHttpMethod.MERGE, UriType.URI9);
-
- wrongDispatch(ODataHttpMethod.PUT, UriType.URI15);
- wrongDispatch(ODataHttpMethod.POST, UriType.URI15);
- wrongDispatch(ODataHttpMethod.DELETE, UriType.URI15);
- wrongDispatch(ODataHttpMethod.PATCH, UriType.URI15);
- wrongDispatch(ODataHttpMethod.MERGE, UriType.URI15);
-
- wrongDispatch(ODataHttpMethod.PUT, UriType.URI16);
- wrongDispatch(ODataHttpMethod.POST, UriType.URI16);
- wrongDispatch(ODataHttpMethod.DELETE, UriType.URI16);
- wrongDispatch(ODataHttpMethod.PATCH, UriType.URI16);
- wrongDispatch(ODataHttpMethod.MERGE, UriType.URI16);
-
- wrongDispatch(ODataHttpMethod.POST, UriType.URI17);
- wrongDispatch(ODataHttpMethod.PATCH, UriType.URI17);
- wrongDispatch(ODataHttpMethod.MERGE, UriType.URI17);
-
- wrongDispatch(ODataHttpMethod.PUT, UriType.URI50A);
- wrongDispatch(ODataHttpMethod.POST, UriType.URI50A);
- wrongDispatch(ODataHttpMethod.DELETE, UriType.URI50A);
- wrongDispatch(ODataHttpMethod.PATCH, UriType.URI50A);
- wrongDispatch(ODataHttpMethod.MERGE, UriType.URI50A);
-
- wrongDispatch(ODataHttpMethod.PUT, UriType.URI50B);
- wrongDispatch(ODataHttpMethod.POST, UriType.URI50B);
- wrongDispatch(ODataHttpMethod.DELETE, UriType.URI50B);
- wrongDispatch(ODataHttpMethod.PATCH, UriType.URI50B);
- wrongDispatch(ODataHttpMethod.MERGE, UriType.URI50B);
- }
-
- @Test
- public void dispatchNotSupportedCombinations() throws Exception {
- notSupportedDispatch(ODataHttpMethod.PUT, UriType.URI6A);
- notSupportedDispatch(ODataHttpMethod.DELETE, UriType.URI6A);
- notSupportedDispatch(ODataHttpMethod.PATCH, UriType.URI6A);
- notSupportedDispatch(ODataHttpMethod.MERGE, UriType.URI6A);
- }
-
- private static void checkFeature(final UriType uriType, final boolean isValue,
- final Class<? extends ODataProcessor> feature) throws ODataException {
- ODataServiceFactory factory = mock(ODataServiceFactory.class);
- new Dispatcher(factory, getMockService());
- assertEquals(feature, Dispatcher.mapUriTypeToProcessorFeature(mockUriInfo(uriType, isValue)));
- assertEquals(feature, Dispatcher.mapUriTypeToProcessorFeature(mockUriInfo(uriType, isValue)));
- }
-
- @Test
- public void processorFeature() throws Exception {
- checkFeature(UriType.URI0, false, ServiceDocumentProcessor.class);
- checkFeature(UriType.URI1, false, EntitySetProcessor.class);
- checkFeature(UriType.URI2, false, EntityProcessor.class);
- checkFeature(UriType.URI3, false, EntityComplexPropertyProcessor.class);
- checkFeature(UriType.URI4, false, EntitySimplePropertyProcessor.class);
- checkFeature(UriType.URI4, true, EntitySimplePropertyValueProcessor.class);
- checkFeature(UriType.URI5, false, EntitySimplePropertyProcessor.class);
- checkFeature(UriType.URI5, true, EntitySimplePropertyValueProcessor.class);
- checkFeature(UriType.URI6A, false, EntityProcessor.class);
- checkFeature(UriType.URI6B, false, EntitySetProcessor.class);
- checkFeature(UriType.URI7A, false, EntityLinkProcessor.class);
- checkFeature(UriType.URI7B, false, EntityLinksProcessor.class);
- checkFeature(UriType.URI8, false, MetadataProcessor.class);
- checkFeature(UriType.URI9, false, BatchProcessor.class);
- checkFeature(UriType.URI10, false, FunctionImportProcessor.class);
- checkFeature(UriType.URI11, false, FunctionImportProcessor.class);
- checkFeature(UriType.URI12, false, FunctionImportProcessor.class);
- checkFeature(UriType.URI13, false, FunctionImportProcessor.class);
- checkFeature(UriType.URI14, false, FunctionImportProcessor.class);
- checkFeature(UriType.URI14, true, FunctionImportValueProcessor.class);
- checkFeature(UriType.URI15, false, EntitySetProcessor.class);
- checkFeature(UriType.URI16, false, EntityProcessor.class);
- checkFeature(UriType.URI17, false, EntityMediaProcessor.class);
- checkFeature(UriType.URI50A, false, EntityLinkProcessor.class);
- checkFeature(UriType.URI50B, false, EntityLinksProcessor.class);
- }
-
- @Test
- public void contentNegotiationDefaultCharset() throws Exception {
- negotiateContentTypeCharset("application/xml", "application/xml;charset=utf-8", false);
- }
-
- @Test
- public void contentNegotiationDefaultCharsetAsDollarFormat() throws Exception {
- negotiateContentTypeCharset("application/xml", "application/xml;charset=utf-8", true);
- }
-
- @Test
- public void contentNegotiationSupportedCharset() throws Exception {
- negotiateContentTypeCharset("application/xml;charset=utf-8", "application/xml;charset=utf-8", false);
- }
-
- @Test
- public void contentNegotiationSupportedCharsetAsDollarFormat() throws Exception {
- negotiateContentTypeCharset("application/xml;charset=utf-8", "application/xml;charset=utf-8", true);
- }
-
- @SuppressWarnings("unchecked")
- private void
- negotiateContentTypeCharset(final String requestType, final String supportedType, final boolean asFormat)
- throws SecurityException, IllegalArgumentException, NoSuchFieldException, IllegalAccessException,
- ODataException {
-
- ODataServiceFactory factory = mock(ODataServiceFactory.class);
- ODataService service = Mockito.mock(ODataService.class);
- Dispatcher dispatcher = new Dispatcher(factory, service);
-
- UriInfoImpl uriInfo = new UriInfoImpl();
- uriInfo.setUriType(UriType.URI1); //
- if (asFormat) {
- uriInfo.setFormat(requestType);
+ @Test
+ public void contentNegotiationDefaultCharset() throws Exception {
+ negotiateContentTypeCharset("application/xml", "application/xml;charset=utf-8", false);
}
- Mockito.when(service.getSupportedContentTypes(Matchers.any(Class.class))).thenReturn(Arrays.asList(supportedType));
- EntitySetProcessor processor = Mockito.mock(EntitySetProcessor.class);
- ODataResponse response = Mockito.mock(ODataResponse.class);
- Mockito.when(response.getContentHeader()).thenReturn(supportedType);
- Mockito.when(processor.readEntitySet(uriInfo, supportedType)).thenReturn(response);
- Mockito.when(service.getEntitySetProcessor()).thenReturn(processor);
-
- InputStream content = null;
- ODataResponse odataResponse =
- dispatcher.dispatch(ODataHttpMethod.GET, uriInfo, content, requestType, supportedType);
- assertEquals(supportedType, odataResponse.getContentHeader());
- }
+ @Test
+ public void contentNegotiationDefaultCharsetAsDollarFormat() throws Exception {
+ negotiateContentTypeCharset("application/xml", "application/xml;charset=utf-8", true);
+ }
+
+ @Test
+ public void contentNegotiationSupportedCharset() throws Exception {
+ negotiateContentTypeCharset("application/xml;charset=utf-8", "application/xml;charset=utf-8", false);
+ }
+
+ @Test
+ public void contentNegotiationSupportedCharsetAsDollarFormat() throws Exception {
+ negotiateContentTypeCharset("application/xml;charset=utf-8", "application/xml;charset=utf-8", true);
+ }
+
+ @SuppressWarnings("unchecked")
+ private void negotiateContentTypeCharset(final String requestType, final String supportedType, final boolean asFormat)
+ throws SecurityException, IllegalArgumentException, NoSuchFieldException, IllegalAccessException, ODataException {
+
+ ODataServiceFactory factory = mock(ODataServiceFactory.class);
+ ODataService service = Mockito.mock(ODataService.class);
+ Dispatcher dispatcher = new Dispatcher(factory, service);
+
+ UriInfoImpl uriInfo = new UriInfoImpl();
+ uriInfo.setUriType(UriType.URI1); //
+ if (asFormat) {
+ uriInfo.setFormat(requestType);
+ }
+
+ Mockito.when(service.getSupportedContentTypes(any(Class.class)))
+ .thenReturn(Arrays.asList(supportedType));
+ EntitySetProcessor processor = Mockito.mock(EntitySetProcessor.class);
+ ODataResponse response = Mockito.mock(ODataResponse.class);
+ Mockito.when(response.getContentHeader())
+ .thenReturn(supportedType);
+ Mockito.when(processor.readEntitySet(uriInfo, supportedType))
+ .thenReturn(response);
+ Mockito.when(service.getEntitySetProcessor())
+ .thenReturn(processor);
+
+ InputStream content = null;
+ ODataResponse odataResponse = dispatcher.dispatch(ODataHttpMethod.GET, uriInfo, content, requestType, supportedType);
+ assertEquals(supportedType, odataResponse.getContentHeader());
+ }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java
index 538bba13..3375efb5 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java
@@ -1,30 +1,25 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -32,7 +27,6 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.ODataServiceFactory;
import org.apache.olingo.odata2.api.commons.HttpContentType;
@@ -78,696 +72,662 @@ import org.junit.Before;
import org.junit.Test;
/**
- * Tests for the validation of HTTP method, URI path, query options,
- * content types, and conditional-handling HTTP headers.
+ * Tests for the validation of HTTP method, URI path, query options, content types, and
+ * conditional-handling HTTP headers.
*/
public class ODataRequestHandlerValidationTest extends BaseTest {
- private Edm edm = null;
-
- @Before
- public void setEdm() throws ODataException {
- edm = MockFacade.getMockEdm();
- }
-
- private List<String> createPathSegments(final UriType uriType, final boolean moreNavigation, final boolean isValue) {
- List<String> segments = new ArrayList<String>();
-
- if (uriType == UriType.URI1 || uriType == UriType.URI15) {
- if (moreNavigation) {
- segments.add("Managers('1')");
- segments.add("nm_Employees");
- } else {
- segments.add("Employees");
- }
- } else if (uriType == UriType.URI2 || uriType == UriType.URI3
- || uriType == UriType.URI4 || uriType == UriType.URI5
- || uriType == UriType.URI16 || uriType == UriType.URI17) {
- if (moreNavigation) {
- segments.add("Managers('1')");
- segments.add("nm_Employees('1')");
- } else {
- segments.add("Employees('1')");
- }
- } else if (uriType == UriType.URI6A || uriType == UriType.URI7A || uriType == UriType.URI50A) {
- segments.add("Managers('1')");
- if (moreNavigation) {
- segments.add("nm_Employees('1')");
- segments.add("ne_Manager");
- }
- if (uriType == UriType.URI7A || uriType == UriType.URI50A) {
- segments.add("$links");
- }
- segments.add("nm_Employees('1')");
- } else if (uriType == UriType.URI6B || uriType == UriType.URI7B || uriType == UriType.URI50B) {
- segments.add("Managers('1')");
- if (moreNavigation) {
- segments.add("nm_Employees('1')");
- segments.add("ne_Manager");
- }
- if (uriType == UriType.URI7B || uriType == UriType.URI50B) {
- segments.add("$links");
- }
- segments.add("nm_Employees");
- } else if (uriType == UriType.URI8) {
- segments.add("$metadata");
- } else if (uriType == UriType.URI9) {
- segments.add("$batch");
- } else if (uriType == UriType.URI10) {
- segments.add("OldestEmployee");
- } else if (uriType == UriType.URI11) {
- segments.add("AllLocations");
- } else if (uriType == UriType.URI12) {
- segments.add("MostCommonLocation");
- } else if (uriType == UriType.URI13) {
- segments.add("AllUsedRoomIds");
- } else if (uriType == UriType.URI14) {
- segments.add("MaximalAge");
- }
-
- if (uriType == UriType.URI3 || uriType == UriType.URI4) {
- segments.add("Location");
- }
- if (uriType == UriType.URI4) {
- segments.add("Country");
- } else if (uriType == UriType.URI5) {
- segments.add("EmployeeName");
- }
-
- if (uriType == UriType.URI15 || uriType == UriType.URI16
- || uriType == UriType.URI50A || uriType == UriType.URI50B) {
- segments.add("$count");
- }
-
- if (uriType == UriType.URI17 || isValue) {
- segments.add("$value");
- }
-
- // self-test
- try {
- final UriInfoImpl uriInfo = (UriInfoImpl) UriParser.parse(edm,
- MockFacade.getPathSegmentsAsODataPathSegmentMock(segments),
- Collections.<String, String> emptyMap());
- assertEquals(uriType, uriInfo.getUriType());
- assertEquals(uriType == UriType.URI17 || isValue, uriInfo.isValue());
- } catch (final ODataException e) {
- fail();
- }
-
- return segments;
- }
-
- private static Map<String, String> createOptions(
- final boolean format,
- final boolean filter, final boolean inlineCount, final boolean orderBy,
- final boolean skipToken, final boolean skip, final boolean top,
- final boolean expand, final boolean select) {
-
- Map<String, String> map = new HashMap<String, String>();
-
- if (format) {
- map.put("$format", ODataFormat.XML.toString());
- }
- if (filter) {
- map.put("$filter", "true");
- }
- if (inlineCount) {
- map.put("$inlinecount", "none");
- }
- if (orderBy) {
- map.put("$orderby", "Age");
- }
- if (skipToken) {
- map.put("$skiptoken", "x");
- }
- if (skip) {
- map.put("$skip", "0");
- }
- if (top) {
- map.put("$top", "0");
- }
- if (expand) {
- map.put("$expand", "ne_Team");
- }
- if (select) {
- map.put("$select", "Age");
- }
-
- return map;
- }
-
- private ODataRequest mockODataRequest(final ODataHttpMethod method,
- final List<String> pathSegments, final Map<String, String> queryParameters,
- final String httpHeaderName, final String httpHeaderValue,
- final String requestContentType) throws ODataException {
- ODataRequest request = mock(ODataRequest.class);
- when(request.getMethod()).thenReturn(method);
- PathInfo pathInfo = mock(PathInfo.class);
- List<PathSegment> segments = new ArrayList<PathSegment>();
- for (final String pathSegment : pathSegments) {
- PathSegment segment = mock(PathSegment.class);
- when(segment.getPath()).thenReturn(pathSegment);
- segments.add(segment);
- }
- when(pathInfo.getODataSegments()).thenReturn(segments);
- when(request.getPathInfo()).thenReturn(pathInfo);
- when(request.getQueryParameters()).thenReturn(
- queryParameters == null ? Collections.<String, String> emptyMap() : queryParameters);
- when(request.getAllQueryParameters()).thenReturn(queryParameters == null ?
- Collections.<String, List<String>> emptyMap() : convertToMultiMap(queryParameters));
- when(request.getContentType()).thenReturn(
- requestContentType == null ? HttpContentType.APPLICATION_JSON : requestContentType);
- when(request.getRequestHeaderValue(httpHeaderName)).thenReturn(httpHeaderValue);
- if (httpHeaderName == HttpHeaders.ACCEPT) {
- when(request.getAcceptHeaders()).thenReturn(Arrays.asList(httpHeaderValue));
- }
- return request;
- }
-
- private Map<String, List<String>> convertToMultiMap(final Map<String, String> queryParameters) {
- Map<String, List<String>> multiMap = new HashMap<String, List<String>>();
-
- for (final String key : queryParameters.keySet()) {
- List<String> parameterList = new LinkedList<String>();
- parameterList.add(queryParameters.get(key));
-
- multiMap.put(key, parameterList);
- }
-
- return multiMap;
- }
-
- private ODataService mockODataService(final ODataServiceFactory serviceFactory) throws ODataException {
- ODataService service = DispatcherTest.getMockService();
- when(service.getEntityDataModel()).thenReturn(edm);
- when(service.getProcessor()).thenReturn(mock(ODataProcessor.class));
- when(serviceFactory.createService(any(ODataContext.class))).thenReturn(service);
-
- when(service.getSupportedContentTypes(BatchProcessor.class)).thenReturn(
- Arrays.asList(HttpContentType.MULTIPART_MIXED));
-
- final List<String> jsonAndXml = Arrays.asList(
- HttpContentType.APPLICATION_JSON,
- HttpContentType.APPLICATION_JSON_VERBOSE,
- HttpContentType.APPLICATION_JSON_UTF8,
- HttpContentType.APPLICATION_JSON_UTF8_VERBOSE,
- HttpContentType.APPLICATION_XML_UTF8);
- List<String> atomEntryAndJsonAndXml = new ArrayList<String>();
- atomEntryAndJsonAndXml.add(HttpContentType.APPLICATION_ATOM_XML_ENTRY_UTF8);
- atomEntryAndJsonAndXml.add(HttpContentType.APPLICATION_ATOM_XML_UTF8);
- atomEntryAndJsonAndXml.addAll(jsonAndXml);
- when(service.getSupportedContentTypes(EntityProcessor.class)).thenReturn(atomEntryAndJsonAndXml);
-
- when(service.getSupportedContentTypes(FunctionImportProcessor.class)).thenReturn(jsonAndXml);
- when(service.getSupportedContentTypes(EntityLinkProcessor.class)).thenReturn(jsonAndXml);
- when(service.getSupportedContentTypes(EntityLinksProcessor.class)).thenReturn(jsonAndXml);
- when(service.getSupportedContentTypes(EntitySimplePropertyProcessor.class)).thenReturn(jsonAndXml);
- when(service.getSupportedContentTypes(EntityComplexPropertyProcessor.class)).thenReturn(jsonAndXml);
-
- final List<String> wildcard = Arrays.asList(HttpContentType.WILDCARD);
- when(service.getSupportedContentTypes(EntityMediaProcessor.class)).thenReturn(wildcard);
- when(service.getSupportedContentTypes(EntitySimplePropertyValueProcessor.class)).thenReturn(wildcard);
- when(service.getSupportedContentTypes(FunctionImportValueProcessor.class)).thenReturn(wildcard);
-
- List<String> atomFeedAndJsonAndXml = new ArrayList<String>();
- atomFeedAndJsonAndXml.add(HttpContentType.APPLICATION_ATOM_XML_FEED_UTF8);
- atomFeedAndJsonAndXml.add(HttpContentType.APPLICATION_ATOM_XML_UTF8);
- atomFeedAndJsonAndXml.addAll(jsonAndXml);
- when(service.getSupportedContentTypes(EntitySetProcessor.class)).thenReturn(atomFeedAndJsonAndXml);
-
- when(service.getSupportedContentTypes(MetadataProcessor.class)).thenReturn(Arrays.asList(
- HttpContentType.APPLICATION_XML_UTF8));
-
- List<String> atomSvcAndJsonAndXml = new ArrayList<String>();
- atomSvcAndJsonAndXml.add(HttpContentType.APPLICATION_ATOM_SVC_UTF8);
- atomSvcAndJsonAndXml.addAll(jsonAndXml);
- when(service.getSupportedContentTypes(ServiceDocumentProcessor.class)).thenReturn(atomSvcAndJsonAndXml);
-
- return service;
- }
-
- private void executeAndValidateRequest(final ODataHttpMethod method,
- final List<String> pathSegments,
- final Map<String, String> queryParameters,
- final String httpHeaderName, final String httpHeaderValue,
- final String requestContentType,
- final HttpStatusCodes expectedStatusCode) throws ODataException {
-
- ODataServiceFactory serviceFactory = mock(ODataServiceFactory.class);
- final ODataService service = mockODataService(serviceFactory);
- when(serviceFactory.createService(any(ODataContext.class))).thenReturn(service);
-
- final ODataRequest request = mockODataRequest(method, pathSegments, queryParameters,
- httpHeaderName, httpHeaderValue, requestContentType);
- final ODataContextImpl context = new ODataContextImpl(request, serviceFactory);
-
- final ODataResponse response = new ODataRequestHandler(serviceFactory, service, context).handle(request);
- assertNotNull(response);
- assertEquals(expectedStatusCode == null ? HttpStatusCodes.PAYMENT_REQUIRED : expectedStatusCode,
- response.getStatus());
- }
-
- private void executeAndValidateRequest(final ODataHttpMethod method, final UriType uriType,
- final String requestContentType,
- final HttpStatusCodes expectedStatusCode) throws ODataException {
- executeAndValidateRequest(method, createPathSegments(uriType, false, false), null, null, null, requestContentType,
- expectedStatusCode);
- }
-
- private void executeAndValidateHeaderRequest(final ODataHttpMethod method, final UriType uriType,
- final String httpHeaderName, final String httpHeaderValue,
- final HttpStatusCodes expectedStatusCode) throws ODataException {
- executeAndValidateRequest(method, createPathSegments(uriType, false, false), null, httpHeaderName, httpHeaderValue,
- null, expectedStatusCode);
- }
-
- private void checkAcceptHeader(final UriType uriType, final String acceptHeader,
- final HttpStatusCodes expectedStatusCode) throws ODataException {
- executeAndValidateHeaderRequest(ODataHttpMethod.GET, uriType, HttpHeaders.ACCEPT, acceptHeader,
- expectedStatusCode);
- }
-
- private void checkValueContentType(final ODataHttpMethod method, final UriType uriType,
- final String requestContentType) throws Exception {
- executeAndValidateRequest(method, createPathSegments(uriType, false, true), null, null, null, requestContentType,
- null);
- }
-
- private void wrongRequest(final ODataHttpMethod method, final List<String> pathSegments,
- final Map<String, String> queryParameters) throws ODataException {
- executeAndValidateRequest(method, pathSegments, queryParameters, null, null, null,
- HttpStatusCodes.METHOD_NOT_ALLOWED);
- }
-
- private void wrongOptions(final ODataHttpMethod method, final UriType uriType,
- final boolean format,
- final boolean filter, final boolean inlineCount, final boolean orderBy,
- final boolean skipToken, final boolean skip, final boolean top,
- final boolean expand, final boolean select) throws ODataException {
- wrongRequest(method,
- createPathSegments(uriType, false, false),
- createOptions(format, filter, inlineCount, orderBy, skipToken, skip, top, expand, select));
- }
-
- private void wrongFunctionHttpMethod(final ODataHttpMethod method, final UriType uriType) throws ODataException {
- wrongRequest(method,
- uriType == UriType.URI10a ? Arrays.asList("EmployeeSearch") : createPathSegments(uriType, false, false),
- null);
- }
-
- private void wrongProperty(final ODataHttpMethod method, final boolean ofComplex, final Boolean key)
- throws ODataException {
- EdmProperty property = (EdmProperty) (ofComplex ?
- edm.getComplexType("RefScenario", "c_Location").getProperty("Country") :
- edm.getEntityType("RefScenario", "Employee").getProperty("Age"));
- EdmFacets facets = mock(EdmFacets.class);
- when(facets.isNullable()).thenReturn(false);
- when(property.getFacets()).thenReturn(facets);
-
- List<String> pathSegments;
- if (ofComplex) {
- pathSegments = createPathSegments(UriType.URI4, false, true);
- } else {
- pathSegments = createPathSegments(UriType.URI2, false, false);
- pathSegments.add(key ? "EmployeeId" : "Age");
- pathSegments.add("$value");
- }
-
- wrongRequest(method, pathSegments, null);
- }
-
- private void wrongNavigationPath(final ODataHttpMethod method, final UriType uriType,
- final HttpStatusCodes expectedStatusCode) throws ODataException {
- executeAndValidateRequest(method, createPathSegments(uriType, true, false), null, null, null, null,
- expectedStatusCode);
- }
-
- private void wrongRequestContentType(final ODataHttpMethod method, final UriType uriType, final boolean isValue,
- final ContentType requestContentType) throws ODataException {
- executeAndValidateRequest(method, createPathSegments(uriType, false, isValue), null, null, null,
- requestContentType.toContentTypeString(), HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE);
- }
-
- private void wrongRequestContentType(final ODataHttpMethod method, final UriType uriType,
- final ContentType requestContentType) throws ODataException {
- wrongRequestContentType(method, uriType, false, requestContentType);
- }
-
- @Test
- public void dataServiceVersion() throws Exception {
- executeAndValidateHeaderRequest(ODataHttpMethod.GET, UriType.URI0,
- ODataHttpHeaders.DATASERVICEVERSION, "1.0", null);
- executeAndValidateHeaderRequest(ODataHttpMethod.GET, UriType.URI0,
- ODataHttpHeaders.DATASERVICEVERSION, "2.0", null);
-
- executeAndValidateHeaderRequest(ODataHttpMethod.GET, UriType.URI0,
- ODataHttpHeaders.DATASERVICEVERSION, "3.0", HttpStatusCodes.BAD_REQUEST);
- executeAndValidateHeaderRequest(ODataHttpMethod.GET, UriType.URI0,
- ODataHttpHeaders.DATASERVICEVERSION, "4.2", HttpStatusCodes.BAD_REQUEST);
- executeAndValidateHeaderRequest(ODataHttpMethod.GET, UriType.URI0,
- ODataHttpHeaders.DATASERVICEVERSION, "42", HttpStatusCodes.BAD_REQUEST);
- executeAndValidateHeaderRequest(ODataHttpMethod.GET, UriType.URI0,
- ODataHttpHeaders.DATASERVICEVERSION, "test.2.0", HttpStatusCodes.BAD_REQUEST);
- }
-
- @Test
- public void allowedMethods() throws Exception {
- executeAndValidateRequest(ODataHttpMethod.GET, UriType.URI0, null, null);
- executeAndValidateRequest(ODataHttpMethod.GET, UriType.URI1, null, null);
- executeAndValidateRequest(ODataHttpMethod.POST, UriType.URI1, HttpContentType.APPLICATION_JSON, null);
- executeAndValidateRequest(ODataHttpMethod.GET, UriType.URI2, null, null);
- executeAndValidateRequest(ODataHttpMethod.GET, UriType.URI3, null, null);
- executeAndValidateRequest(ODataHttpMethod.PATCH, UriType.URI3, HttpContentType.APPLICATION_JSON, null);
- executeAndValidateRequest(ODataHttpMethod.MERGE, UriType.URI3, HttpContentType.APPLICATION_JSON, null);
- executeAndValidateRequest(ODataHttpMethod.GET, UriType.URI4, null, null);
- executeAndValidateRequest(ODataHttpMethod.POST, UriType.URI9, HttpContentType.MULTIPART_MIXED, null);
- executeAndValidateRequest(ODataHttpMethod.GET, UriType.URI15, null, null);
- executeAndValidateRequest(ODataHttpMethod.GET, UriType.URI17, null, null);
- }
-
- @Test
- public void notAllowedMethod() throws Exception {
- wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI0, false, false), null);
- wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI1, false, false), null);
- wrongRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI2, false, false), null);
- wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI3, false, false), null);
- wrongRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI4, false, false), null);
- wrongRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI5, false, false), null);
- wrongRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI6A, false, false), null);
- wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI6B, false, false), null);
- wrongRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI7A, false, false), null);
- wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI7B, false, false), null);
- wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI8, false, false), null);
- wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI9, false, false), null);
- wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI15, false, false), null);
- wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI16, false, false), null);
- wrongRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI17, false, false), null);
- wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI50A, false, false), null);
- wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI50B, false, false), null);
- }
-
- @Test
- public void notAllowedOptions() throws Exception {
- wrongOptions(ODataHttpMethod.POST, UriType.URI1, true, false, false, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, true, false, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, false, true, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, false, false, true, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, false, false, false, true, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, false, false, false, false, true, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, false, false, false, false, false, true, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, false, false, false, false, false, false, true, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, false, false, false, false, false, false, false, true);
-
- wrongOptions(ODataHttpMethod.PUT, UriType.URI2, true, false, false, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.PUT, UriType.URI2, false, false, false, false, false, false, false, true, false);
- wrongOptions(ODataHttpMethod.PUT, UriType.URI2, false, false, false, false, false, false, false, false, true);
- wrongOptions(ODataHttpMethod.PATCH, UriType.URI2, true, false, false, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.PATCH, UriType.URI2, false, false, false, false, false, false, false, true, false);
- wrongOptions(ODataHttpMethod.PATCH, UriType.URI2, false, false, false, false, false, false, false, false, true);
- wrongOptions(ODataHttpMethod.DELETE, UriType.URI2, true, false, false, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.DELETE, UriType.URI2, false, true, false, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.DELETE, UriType.URI2, false, false, false, false, false, false, false, true, false);
- wrongOptions(ODataHttpMethod.DELETE, UriType.URI2, false, false, false, false, false, false, false, false, true);
-
- wrongOptions(ODataHttpMethod.PUT, UriType.URI3, true, false, false, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.PATCH, UriType.URI3, true, false, false, false, false, false, false, false, false);
-
- wrongOptions(ODataHttpMethod.PUT, UriType.URI4, true, false, false, false, false, false, false, false, false);
-
- wrongOptions(ODataHttpMethod.PUT, UriType.URI5, true, false, false, false, false, false, false, false, false);
-
- wrongOptions(ODataHttpMethod.POST, UriType.URI6B, true, false, false, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, true, false, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, false, true, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, false, false, true, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, false, false, false, true, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, false, false, false, false, true, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, false, false, false, false, false, true, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, false, false, false, false, false, false, true, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, false, false, false, false, false, false, false, true);
-
- wrongOptions(ODataHttpMethod.PUT, UriType.URI7A, true, false, false, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.PUT, UriType.URI7A, false, true, false, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.DELETE, UriType.URI7A, true, false, false, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.DELETE, UriType.URI7A, false, true, false, false, false, false, false, false, false);
-
- wrongOptions(ODataHttpMethod.POST, UriType.URI7B, true, false, false, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI7B, false, true, false, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI7B, false, false, true, false, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI7B, false, false, false, true, false, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI7B, false, false, false, false, true, false, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI7B, false, false, false, false, false, true, false, false, false);
- wrongOptions(ODataHttpMethod.POST, UriType.URI7B, false, false, false, false, false, false, true, false, false);
-
- wrongOptions(ODataHttpMethod.PUT, UriType.URI17, false, true, false, false, false, false, false, false, false);
- executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI17, false, false),
- createOptions(true, false, false, false, false, false, false, false, false), null, null, null,
- HttpStatusCodes.BAD_REQUEST);
- executeAndValidateRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI17, false, false),
- createOptions(true, false, false, false, false, false, false, false, false), null, null, null,
- HttpStatusCodes.BAD_REQUEST);
- wrongOptions(ODataHttpMethod.DELETE, UriType.URI17, false, true, false, false, false, false, false, false, false);
- }
-
- @Test
- public void functionImportWrongHttpMethod() throws Exception {
- wrongFunctionHttpMethod(ODataHttpMethod.POST, UriType.URI10a);
- wrongFunctionHttpMethod(ODataHttpMethod.PUT, UriType.URI10);
- wrongFunctionHttpMethod(ODataHttpMethod.POST, UriType.URI11);
- wrongFunctionHttpMethod(ODataHttpMethod.PATCH, UriType.URI12);
- wrongFunctionHttpMethod(ODataHttpMethod.POST, UriType.URI13);
- wrongFunctionHttpMethod(ODataHttpMethod.PUT, UriType.URI14);
- }
-
- @Test
- public void wrongProperty() throws Exception {
- wrongProperty(ODataHttpMethod.DELETE, true, false);
-
- wrongProperty(ODataHttpMethod.PUT, false, true);
- wrongProperty(ODataHttpMethod.PATCH, false, true);
- wrongProperty(ODataHttpMethod.DELETE, false, true);
- wrongProperty(ODataHttpMethod.DELETE, false, false);
- }
-
- @Test
- public void wrongNavigationPath() throws Exception {
- wrongNavigationPath(ODataHttpMethod.PUT, UriType.URI3, HttpStatusCodes.BAD_REQUEST);
- wrongNavigationPath(ODataHttpMethod.PATCH, UriType.URI3, HttpStatusCodes.BAD_REQUEST);
-
- wrongNavigationPath(ODataHttpMethod.PUT, UriType.URI4, HttpStatusCodes.BAD_REQUEST);
- wrongNavigationPath(ODataHttpMethod.PATCH, UriType.URI4, HttpStatusCodes.BAD_REQUEST);
- wrongNavigationPath(ODataHttpMethod.DELETE, UriType.URI4, HttpStatusCodes.METHOD_NOT_ALLOWED);
-
- wrongNavigationPath(ODataHttpMethod.PUT, UriType.URI5, HttpStatusCodes.BAD_REQUEST);
- wrongNavigationPath(ODataHttpMethod.PATCH, UriType.URI5, HttpStatusCodes.BAD_REQUEST);
- wrongNavigationPath(ODataHttpMethod.DELETE, UriType.URI5, HttpStatusCodes.METHOD_NOT_ALLOWED);
-
- wrongNavigationPath(ODataHttpMethod.PUT, UriType.URI7A, HttpStatusCodes.BAD_REQUEST);
- wrongNavigationPath(ODataHttpMethod.PATCH, UriType.URI7A, HttpStatusCodes.BAD_REQUEST);
- wrongNavigationPath(ODataHttpMethod.DELETE, UriType.URI7A, HttpStatusCodes.BAD_REQUEST);
-
- wrongNavigationPath(ODataHttpMethod.POST, UriType.URI6B, HttpStatusCodes.BAD_REQUEST);
-
- wrongNavigationPath(ODataHttpMethod.POST, UriType.URI7B, HttpStatusCodes.BAD_REQUEST);
-
- wrongNavigationPath(ODataHttpMethod.PUT, UriType.URI17, HttpStatusCodes.BAD_REQUEST);
- wrongNavigationPath(ODataHttpMethod.DELETE, UriType.URI17, HttpStatusCodes.BAD_REQUEST);
- }
-
- @Test
- public void requestAcceptHeader() throws Exception {
- checkAcceptHeader(UriType.URI0, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI1, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI2, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI3, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI4, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI5, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI6A, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI6B, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI7A, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI7B, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI8, HttpContentType.APPLICATION_XML, null);
- checkAcceptHeader(UriType.URI9, HttpContentType.APPLICATION_XML, HttpStatusCodes.METHOD_NOT_ALLOWED);
- checkAcceptHeader(UriType.URI10, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI11, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI12, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI13, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI14, HttpContentType.APPLICATION_JSON, null);
- checkAcceptHeader(UriType.URI15, HttpContentType.TEXT_PLAIN, null);
- checkAcceptHeader(UriType.URI16, HttpContentType.TEXT_PLAIN, null);
- checkAcceptHeader(UriType.URI17, HttpContentType.APPLICATION_OCTET_STREAM, null);
- checkAcceptHeader(UriType.URI50A, HttpContentType.TEXT_PLAIN, null);
- checkAcceptHeader(UriType.URI50B, HttpContentType.TEXT_PLAIN, null);
-
- checkAcceptHeader(UriType.URI8, HttpContentType.APPLICATION_JSON, HttpStatusCodes.NOT_ACCEPTABLE);
- }
-
- @Test
- public void requestContentType() throws Exception {
- executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI2, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.PATCH, UriType.URI2, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.MERGE, UriType.URI2, HttpContentType.APPLICATION_XML, null);
-
- executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI3, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.PATCH, UriType.URI3, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.MERGE, UriType.URI3, HttpContentType.APPLICATION_XML, null);
-
- executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI4, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.PATCH, UriType.URI4, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.MERGE, UriType.URI4, HttpContentType.APPLICATION_XML, null);
-
- executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI5, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.PATCH, UriType.URI5, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.MERGE, UriType.URI5, HttpContentType.APPLICATION_XML, null);
-
- executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI6A, HttpContentType.APPLICATION_XML,
- HttpStatusCodes.BAD_REQUEST);
- executeAndValidateRequest(ODataHttpMethod.PATCH, UriType.URI6A, HttpContentType.APPLICATION_XML,
- HttpStatusCodes.BAD_REQUEST);
- executeAndValidateRequest(ODataHttpMethod.MERGE, UriType.URI6A, HttpContentType.APPLICATION_XML,
- HttpStatusCodes.BAD_REQUEST);
-
- executeAndValidateRequest(ODataHttpMethod.POST, UriType.URI6B, HttpContentType.APPLICATION_XML, null);
-
- executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI7A, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.PATCH, UriType.URI7A, HttpContentType.APPLICATION_XML, null);
- executeAndValidateRequest(ODataHttpMethod.MERGE, UriType.URI7A, HttpContentType.APPLICATION_XML, null);
-
- executeAndValidateRequest(ODataHttpMethod.POST, UriType.URI7B, HttpContentType.APPLICATION_XML, null);
-
- executeAndValidateRequest(ODataHttpMethod.POST, UriType.URI9, HttpContentType.MULTIPART_MIXED, null);
- }
-
- @Test
- public void requestContentTypeMediaResource() throws Exception {
- executeAndValidateRequest(ODataHttpMethod.POST, UriType.URI1, "image/jpeg", null);
- executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI17, "image/jpeg", null);
- }
-
- @Test
- public void requestContentTypeFunctionImport() throws Exception {
- EdmFunctionImport function = edm.getDefaultEntityContainer().getFunctionImport("MaximalAge");
- when(function.getHttpMethod()).thenReturn(ODataHttpMethod.PUT.name());
- executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI14, null, null);
- executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI14, HttpContentType.WILDCARD, null);
- checkValueContentType(ODataHttpMethod.PUT, UriType.URI14, null);
- checkValueContentType(ODataHttpMethod.PUT, UriType.URI14, HttpContentType.WILDCARD);
-
- function = edm.getDefaultEntityContainer().getFunctionImport("OldestEmployee");
- when(function.getHttpMethod()).thenReturn(ODataHttpMethod.POST.name());
- executeAndValidateRequest(ODataHttpMethod.POST, UriType.URI10, null, null);
- }
-
- @Test
- public void requestValueContentType() throws Exception {
- checkValueContentType(ODataHttpMethod.PUT, UriType.URI4, HttpContentType.TEXT_PLAIN);
- checkValueContentType(ODataHttpMethod.DELETE, UriType.URI4, HttpContentType.TEXT_PLAIN);
- checkValueContentType(ODataHttpMethod.PATCH, UriType.URI4, HttpContentType.TEXT_PLAIN);
- checkValueContentType(ODataHttpMethod.MERGE, UriType.URI4, HttpContentType.TEXT_PLAIN);
- checkValueContentType(ODataHttpMethod.PUT, UriType.URI4, HttpContentType.TEXT_PLAIN_UTF8);
- checkValueContentType(ODataHttpMethod.DELETE, UriType.URI4, HttpContentType.TEXT_PLAIN_UTF8);
- checkValueContentType(ODataHttpMethod.PATCH, UriType.URI4, HttpContentType.TEXT_PLAIN_UTF8);
- checkValueContentType(ODataHttpMethod.MERGE, UriType.URI4, HttpContentType.TEXT_PLAIN_UTF8);
-
- checkValueContentType(ODataHttpMethod.PUT, UriType.URI5, HttpContentType.TEXT_PLAIN);
- checkValueContentType(ODataHttpMethod.DELETE, UriType.URI5, HttpContentType.TEXT_PLAIN);
- checkValueContentType(ODataHttpMethod.PATCH, UriType.URI5, HttpContentType.TEXT_PLAIN);
- checkValueContentType(ODataHttpMethod.MERGE, UriType.URI5, HttpContentType.TEXT_PLAIN);
-
- checkValueContentType(ODataHttpMethod.PUT, UriType.URI17, HttpContentType.TEXT_PLAIN);
- checkValueContentType(ODataHttpMethod.DELETE, UriType.URI17, HttpContentType.TEXT_PLAIN);
- }
-
- @Test
- public void requestBinaryValueContentType() throws Exception {
- EdmProperty property = (EdmProperty) edm.getEntityType("RefScenario", "Employee").getProperty("EmployeeName");
- when(property.getType()).thenReturn(EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance());
- checkValueContentType(ODataHttpMethod.PUT, UriType.URI5, HttpContentType.TEXT_PLAIN);
- when(property.getMimeType()).thenReturn("image/png");
- checkValueContentType(ODataHttpMethod.PUT, UriType.URI5, "image/png");
- }
-
- @Test
- public void wrongRequestContentType() throws Exception {
- wrongRequestContentType(ODataHttpMethod.POST, UriType.URI1, ContentType.WILDCARD);
-
- wrongRequestContentType(ODataHttpMethod.PUT, UriType.URI2, ContentType.APPLICATION_ATOM_SVC);
- wrongRequestContentType(ODataHttpMethod.PUT, UriType.URI2, ContentType.APPLICATION_ATOM_SVC_CS_UTF_8);
- wrongRequestContentType(ODataHttpMethod.PUT, UriType.URI2, ContentType.APPLICATION_ATOM_SVC);
- wrongRequestContentType(ODataHttpMethod.PUT, UriType.URI2, ContentType.APPLICATION_ATOM_SVC_CS_UTF_8);
-
- ODataHttpMethod[] methodsToTest = { ODataHttpMethod.PUT, ODataHttpMethod.PATCH, ODataHttpMethod.MERGE };
-
- for (ODataHttpMethod oDataHttpMethod : methodsToTest) {
- wrongRequestContentType(oDataHttpMethod, UriType.URI2, ContentType.create("image/jpeg"));
-
- wrongRequestContentType(oDataHttpMethod, UriType.URI3, ContentType.TEXT_PLAIN);
-
- wrongRequestContentType(oDataHttpMethod, UriType.URI4, ContentType.TEXT_PLAIN);
-
- wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_ATOM_SVC);
- wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_ATOM_SVC_CS_UTF_8);
- wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_XML);
- wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_XML_CS_UTF_8);
- wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_ATOM_XML);
- wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_ATOM_XML_CS_UTF_8);
- wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_JSON);
- wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_JSON_CS_UTF_8);
- wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.create("image/jpeg"));
-
- wrongRequestContentType(oDataHttpMethod, UriType.URI6A, ContentType.APPLICATION_ATOM_SVC);
-
- wrongRequestContentType(oDataHttpMethod, UriType.URI7A, ContentType.APPLICATION_ATOM_SVC);
- }
-
- wrongRequestContentType(ODataHttpMethod.POST, UriType.URI7B, ContentType.APPLICATION_ATOM_SVC);
-
- wrongRequestContentType(ODataHttpMethod.POST, UriType.URI9, ContentType.APPLICATION_OCTET_STREAM);
- }
-
- @Test
- public void unsupportedRequestContentTypeNoMediaResource() throws Exception {
- EdmEntityType entityType = edm.getDefaultEntityContainer().getEntitySet("Employees").getEntityType();
- when(entityType.hasStream()).thenReturn(false);
-
- wrongRequestContentType(ODataHttpMethod.POST, UriType.URI1, ContentType.APPLICATION_ATOM_SVC);
- wrongRequestContentType(ODataHttpMethod.POST, UriType.URI1, ContentType.APPLICATION_ATOM_SVC_CS_UTF_8);
- wrongRequestContentType(ODataHttpMethod.POST, UriType.URI1, ContentType.APPLICATION_OCTET_STREAM);
- wrongRequestContentType(ODataHttpMethod.POST, UriType.URI6B, ContentType.APPLICATION_ATOM_SVC);
- }
-
- @Test
- public void conditionalHandling() throws Exception {
- EdmProperty property = (EdmProperty) (edm.getEntityType("RefScenario", "Employee").getProperty("EmployeeId"));
- EdmFacets facets = mock(EdmFacets.class);
- when(facets.getConcurrencyMode()).thenReturn(EdmConcurrencyMode.Fixed);
- when(property.getFacets()).thenReturn(facets);
-
- executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI2, HttpHeaders.IF_MATCH, "W/\"1\"", null);
- executeAndValidateHeaderRequest(ODataHttpMethod.PATCH, UriType.URI2, HttpHeaders.IF_MATCH, "W/\"1\"", null);
- executeAndValidateHeaderRequest(ODataHttpMethod.MERGE, UriType.URI2, HttpHeaders.IF_MATCH, "W/\"1\"", null);
- executeAndValidateHeaderRequest(ODataHttpMethod.DELETE, UriType.URI2, HttpHeaders.IF_MATCH, "W/\"1\"", null);
-
- executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI3, HttpHeaders.IF_MATCH, "W/\"1\"", null);
- executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI4, HttpHeaders.IF_MATCH, "W/\"1\"", null);
- executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI5, HttpHeaders.IF_MATCH, "W/\"1\"", null);
- // executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI6A, HttpHeaders.IF_MATCH, "W/\"1\"", null);
- executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI17, HttpHeaders.IF_MATCH, "W/\"1\"", null);
-
- executeAndValidateHeaderRequest(ODataHttpMethod.POST, UriType.URI1, HttpHeaders.IF_MATCH, "W/\"1\"", null);
- executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI7A, HttpHeaders.IF_MATCH, "W/\"1\"", null);
-
- executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI2, null, null,
- HttpStatusCodes.PRECONDITION_REQUIRED);
- executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI3, null, null,
- HttpStatusCodes.PRECONDITION_REQUIRED);
- executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI4, null, null,
- HttpStatusCodes.PRECONDITION_REQUIRED);
- executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI5, null, null,
- HttpStatusCodes.PRECONDITION_REQUIRED);
- // executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI6A, null, null,
- // HttpStatusCodes.PRECONDITION_REQUIRED);
- executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI17, null, null,
- HttpStatusCodes.PRECONDITION_REQUIRED);
- }
+ private Edm edm = null;
+
+ @Before
+ public void setEdm() throws ODataException {
+ edm = MockFacade.getMockEdm();
+ }
+
+ private List<String> createPathSegments(final UriType uriType, final boolean moreNavigation, final boolean isValue) {
+ List<String> segments = new ArrayList<String>();
+
+ if (uriType == UriType.URI1 || uriType == UriType.URI15) {
+ if (moreNavigation) {
+ segments.add("Managers('1')");
+ segments.add("nm_Employees");
+ } else {
+ segments.add("Employees");
+ }
+ } else if (uriType == UriType.URI2 || uriType == UriType.URI3 || uriType == UriType.URI4 || uriType == UriType.URI5
+ || uriType == UriType.URI16 || uriType == UriType.URI17) {
+ if (moreNavigation) {
+ segments.add("Managers('1')");
+ segments.add("nm_Employees('1')");
+ } else {
+ segments.add("Employees('1')");
+ }
+ } else if (uriType == UriType.URI6A || uriType == UriType.URI7A || uriType == UriType.URI50A) {
+ segments.add("Managers('1')");
+ if (moreNavigation) {
+ segments.add("nm_Employees('1')");
+ segments.add("ne_Manager");
+ }
+ if (uriType == UriType.URI7A || uriType == UriType.URI50A) {
+ segments.add("$links");
+ }
+ segments.add("nm_Employees('1')");
+ } else if (uriType == UriType.URI6B || uriType == UriType.URI7B || uriType == UriType.URI50B) {
+ segments.add("Managers('1')");
+ if (moreNavigation) {
+ segments.add("nm_Employees('1')");
+ segments.add("ne_Manager");
+ }
+ if (uriType == UriType.URI7B || uriType == UriType.URI50B) {
+ segments.add("$links");
+ }
+ segments.add("nm_Employees");
+ } else if (uriType == UriType.URI8) {
+ segments.add("$metadata");
+ } else if (uriType == UriType.URI9) {
+ segments.add("$batch");
+ } else if (uriType == UriType.URI10) {
+ segments.add("OldestEmployee");
+ } else if (uriType == UriType.URI11) {
+ segments.add("AllLocations");
+ } else if (uriType == UriType.URI12) {
+ segments.add("MostCommonLocation");
+ } else if (uriType == UriType.URI13) {
+ segments.add("AllUsedRoomIds");
+ } else if (uriType == UriType.URI14) {
+ segments.add("MaximalAge");
+ }
+
+ if (uriType == UriType.URI3 || uriType == UriType.URI4) {
+ segments.add("Location");
+ }
+ if (uriType == UriType.URI4) {
+ segments.add("Country");
+ } else if (uriType == UriType.URI5) {
+ segments.add("EmployeeName");
+ }
+
+ if (uriType == UriType.URI15 || uriType == UriType.URI16 || uriType == UriType.URI50A || uriType == UriType.URI50B) {
+ segments.add("$count");
+ }
+
+ if (uriType == UriType.URI17 || isValue) {
+ segments.add("$value");
+ }
+
+ // self-test
+ try {
+ final UriInfoImpl uriInfo = (UriInfoImpl) UriParser.parse(edm, MockFacade.getPathSegmentsAsODataPathSegmentMock(segments),
+ Collections.<String, String>emptyMap());
+ assertEquals(uriType, uriInfo.getUriType());
+ assertEquals(uriType == UriType.URI17 || isValue, uriInfo.isValue());
+ } catch (final ODataException e) {
+ fail();
+ }
+
+ return segments;
+ }
+
+ private static Map<String, String> createOptions(final boolean format, final boolean filter, final boolean inlineCount,
+ final boolean orderBy, final boolean skipToken, final boolean skip, final boolean top, final boolean expand,
+ final boolean select) {
+
+ Map<String, String> map = new HashMap<String, String>();
+
+ if (format) {
+ map.put("$format", ODataFormat.XML.toString());
+ }
+ if (filter) {
+ map.put("$filter", "true");
+ }
+ if (inlineCount) {
+ map.put("$inlinecount", "none");
+ }
+ if (orderBy) {
+ map.put("$orderby", "Age");
+ }
+ if (skipToken) {
+ map.put("$skiptoken", "x");
+ }
+ if (skip) {
+ map.put("$skip", "0");
+ }
+ if (top) {
+ map.put("$top", "0");
+ }
+ if (expand) {
+ map.put("$expand", "ne_Team");
+ }
+ if (select) {
+ map.put("$select", "Age");
+ }
+
+ return map;
+ }
+
+ private ODataRequest mockODataRequest(final ODataHttpMethod method, final List<String> pathSegments,
+ final Map<String, String> queryParameters, final String httpHeaderName, final String httpHeaderValue,
+ final String requestContentType) throws ODataException {
+ ODataRequest request = mock(ODataRequest.class);
+ when(request.getMethod()).thenReturn(method);
+ PathInfo pathInfo = mock(PathInfo.class);
+ List<PathSegment> segments = new ArrayList<PathSegment>();
+ for (final String pathSegment : pathSegments) {
+ PathSegment segment = mock(PathSegment.class);
+ when(segment.getPath()).thenReturn(pathSegment);
+ segments.add(segment);
+ }
+ when(pathInfo.getODataSegments()).thenReturn(segments);
+ when(request.getPathInfo()).thenReturn(pathInfo);
+ when(request.getQueryParameters()).thenReturn(queryParameters == null ? Collections.<String, String>emptyMap() : queryParameters);
+ when(request.getAllQueryParameters()).thenReturn(
+ queryParameters == null ? Collections.<String, List<String>>emptyMap() : convertToMultiMap(queryParameters));
+ when(request.getContentType()).thenReturn(requestContentType == null ? HttpContentType.APPLICATION_JSON : requestContentType);
+ when(request.getRequestHeaderValue(httpHeaderName)).thenReturn(httpHeaderValue);
+ if (httpHeaderName == HttpHeaders.ACCEPT) {
+ when(request.getAcceptHeaders()).thenReturn(Arrays.asList(httpHeaderValue));
+ }
+ return request;
+ }
+
+ private Map<String, List<String>> convertToMultiMap(final Map<String, String> queryParameters) {
+ Map<String, List<String>> multiMap = new HashMap<String, List<String>>();
+
+ for (final String key : queryParameters.keySet()) {
+ List<String> parameterList = new LinkedList<String>();
+ parameterList.add(queryParameters.get(key));
+
+ multiMap.put(key, parameterList);
+ }
+
+ return multiMap;
+ }
+
+ private ODataService mockODataService(final ODataServiceFactory serviceFactory) throws ODataException {
+ ODataService service = DispatcherTest.getMockService();
+ when(service.getEntityDataModel()).thenReturn(edm);
+ when(service.getProcessor()).thenReturn(mock(ODataProcessor.class));
+ when(serviceFactory.createService(any(ODataContext.class))).thenReturn(service);
+
+ when(service.getSupportedContentTypes(BatchProcessor.class)).thenReturn(Arrays.asList(HttpContentType.MULTIPART_MIXED));
+
+ final List<String> jsonAndXml = Arrays.asList(HttpContentType.APPLICATION_JSON, HttpContentType.APPLICATION_JSON_VERBOSE,
+ HttpContentType.APPLICATION_JSON_UTF8, HttpContentType.APPLICATION_JSON_UTF8_VERBOSE, HttpContentType.APPLICATION_XML_UTF8);
+ List<String> atomEntryAndJsonAndXml = new ArrayList<String>();
+ atomEntryAndJsonAndXml.add(HttpContentType.APPLICATION_ATOM_XML_ENTRY_UTF8);
+ atomEntryAndJsonAndXml.add(HttpContentType.APPLICATION_ATOM_XML_UTF8);
+ atomEntryAndJsonAndXml.addAll(jsonAndXml);
+ when(service.getSupportedContentTypes(EntityProcessor.class)).thenReturn(atomEntryAndJsonAndXml);
+
+ when(service.getSupportedContentTypes(FunctionImportProcessor.class)).thenReturn(jsonAndXml);
+ when(service.getSupportedContentTypes(EntityLinkProcessor.class)).thenReturn(jsonAndXml);
+ when(service.getSupportedContentTypes(EntityLinksProcessor.class)).thenReturn(jsonAndXml);
+ when(service.getSupportedContentTypes(EntitySimplePropertyProcessor.class)).thenReturn(jsonAndXml);
+ when(service.getSupportedContentTypes(EntityComplexPropertyProcessor.class)).thenReturn(jsonAndXml);
+
+ final List<String> wildcard = Arrays.asList(HttpContentType.WILDCARD);
+ when(service.getSupportedContentTypes(EntityMediaProcessor.class)).thenReturn(wildcard);
+ when(service.getSupportedContentTypes(EntitySimplePropertyValueProcessor.class)).thenReturn(wildcard);
+ when(service.getSupportedContentTypes(FunctionImportValueProcessor.class)).thenReturn(wildcard);
+
+ List<String> atomFeedAndJsonAndXml = new ArrayList<String>();
+ atomFeedAndJsonAndXml.add(HttpContentType.APPLICATION_ATOM_XML_FEED_UTF8);
+ atomFeedAndJsonAndXml.add(HttpContentType.APPLICATION_ATOM_XML_UTF8);
+ atomFeedAndJsonAndXml.addAll(jsonAndXml);
+ when(service.getSupportedContentTypes(EntitySetProcessor.class)).thenReturn(atomFeedAndJsonAndXml);
+
+ when(service.getSupportedContentTypes(MetadataProcessor.class)).thenReturn(Arrays.asList(HttpContentType.APPLICATION_XML_UTF8));
+
+ List<String> atomSvcAndJsonAndXml = new ArrayList<String>();
+ atomSvcAndJsonAndXml.add(HttpContentType.APPLICATION_ATOM_SVC_UTF8);
+ atomSvcAndJsonAndXml.addAll(jsonAndXml);
+ when(service.getSupportedContentTypes(ServiceDocumentProcessor.class)).thenReturn(atomSvcAndJsonAndXml);
+
+ return service;
+ }
+
+ private void executeAndValidateRequest(final ODataHttpMethod method, final List<String> pathSegments,
+ final Map<String, String> queryParameters, final String httpHeaderName, final String httpHeaderValue,
+ final String requestContentType, final HttpStatusCodes expectedStatusCode) throws ODataException {
+
+ ODataServiceFactory serviceFactory = mock(ODataServiceFactory.class);
+ final ODataService service = mockODataService(serviceFactory);
+ when(serviceFactory.createService(any(ODataContext.class))).thenReturn(service);
+
+ final ODataRequest request =
+ mockODataRequest(method, pathSegments, queryParameters, httpHeaderName, httpHeaderValue, requestContentType);
+ final ODataContextImpl context = new ODataContextImpl(request, serviceFactory);
+
+ final ODataResponse response = new ODataRequestHandler(serviceFactory, service, context).handle(request);
+ assertNotNull(response);
+ assertEquals(expectedStatusCode == null ? HttpStatusCodes.PAYMENT_REQUIRED : expectedStatusCode, response.getStatus());
+ }
+
+ private void executeAndValidateRequest(final ODataHttpMethod method, final UriType uriType, final String requestContentType,
+ final HttpStatusCodes expectedStatusCode) throws ODataException {
+ executeAndValidateRequest(method, createPathSegments(uriType, false, false), null, null, null, requestContentType,
+ expectedStatusCode);
+ }
+
+ private void executeAndValidateHeaderRequest(final ODataHttpMethod method, final UriType uriType, final String httpHeaderName,
+ final String httpHeaderValue, final HttpStatusCodes expectedStatusCode) throws ODataException {
+ executeAndValidateRequest(method, createPathSegments(uriType, false, false), null, httpHeaderName, httpHeaderValue, null,
+ expectedStatusCode);
+ }
+
+ private void checkAcceptHeader(final UriType uriType, final String acceptHeader, final HttpStatusCodes expectedStatusCode)
+ throws ODataException {
+ executeAndValidateHeaderRequest(ODataHttpMethod.GET, uriType, HttpHeaders.ACCEPT, acceptHeader, expectedStatusCode);
+ }
+
+ private void checkValueContentType(final ODataHttpMethod method, final UriType uriType, final String requestContentType)
+ throws Exception {
+ executeAndValidateRequest(method, createPathSegments(uriType, false, true), null, null, null, requestContentType, null);
+ }
+
+ private void wrongRequest(final ODataHttpMethod method, final List<String> pathSegments, final Map<String, String> queryParameters)
+ throws ODataException {
+ executeAndValidateRequest(method, pathSegments, queryParameters, null, null, null, HttpStatusCodes.METHOD_NOT_ALLOWED);
+ }
+
+ private void wrongOptions(final ODataHttpMethod method, final UriType uriType, final boolean format, final boolean filter,
+ final boolean inlineCount, final boolean orderBy, final boolean skipToken, final boolean skip, final boolean top,
+ final boolean expand, final boolean select) throws ODataException {
+ wrongRequest(method, createPathSegments(uriType, false, false),
+ createOptions(format, filter, inlineCount, orderBy, skipToken, skip, top, expand, select));
+ }
+
+ private void wrongFunctionHttpMethod(final ODataHttpMethod method, final UriType uriType) throws ODataException {
+ wrongRequest(method, uriType == UriType.URI10a ? Arrays.asList("EmployeeSearch") : createPathSegments(uriType, false, false), null);
+ }
+
+ private void wrongProperty(final ODataHttpMethod method, final boolean ofComplex, final Boolean key) throws ODataException {
+ EdmProperty property = (EdmProperty) (ofComplex ? edm.getComplexType("RefScenario", "c_Location")
+ .getProperty("Country")
+ : edm.getEntityType("RefScenario", "Employee")
+ .getProperty("Age"));
+ EdmFacets facets = mock(EdmFacets.class);
+ when(facets.isNullable()).thenReturn(false);
+ when(property.getFacets()).thenReturn(facets);
+
+ List<String> pathSegments;
+ if (ofComplex) {
+ pathSegments = createPathSegments(UriType.URI4, false, true);
+ } else {
+ pathSegments = createPathSegments(UriType.URI2, false, false);
+ pathSegments.add(key ? "EmployeeId" : "Age");
+ pathSegments.add("$value");
+ }
+
+ wrongRequest(method, pathSegments, null);
+ }
+
+ private void wrongNavigationPath(final ODataHttpMethod method, final UriType uriType, final HttpStatusCodes expectedStatusCode)
+ throws ODataException {
+ executeAndValidateRequest(method, createPathSegments(uriType, true, false), null, null, null, null, expectedStatusCode);
+ }
+
+ private void wrongRequestContentType(final ODataHttpMethod method, final UriType uriType, final boolean isValue,
+ final ContentType requestContentType) throws ODataException {
+ executeAndValidateRequest(method, createPathSegments(uriType, false, isValue), null, null, null,
+ requestContentType.toContentTypeString(), HttpStatusCodes.UNSUPPORTED_MEDIA_TYPE);
+ }
+
+ private void wrongRequestContentType(final ODataHttpMethod method, final UriType uriType, final ContentType requestContentType)
+ throws ODataException {
+ wrongRequestContentType(method, uriType, false, requestContentType);
+ }
+
+ @Test
+ public void dataServiceVersion() throws Exception {
+ executeAndValidateHeaderRequest(ODataHttpMethod.GET, UriType.URI0, ODataHttpHeaders.DATASERVICEVERSION, "1.0", null);
+ executeAndValidateHeaderRequest(ODataHttpMethod.GET, UriType.URI0, ODataHttpHeaders.DATASERVICEVERSION, "2.0", null);
+
+ executeAndValidateHeaderRequest(ODataHttpMethod.GET, UriType.URI0, ODataHttpHeaders.DATASERVICEVERSION, "3.0",
+ HttpStatusCodes.BAD_REQUEST);
+ executeAndValidateHeaderRequest(ODataHttpMethod.GET, UriType.URI0, ODataHttpHeaders.DATASERVICEVERSION, "4.2",
+ HttpStatusCodes.BAD_REQUEST);
+ executeAndValidateHeaderRequest(ODataHttpMethod.GET, UriType.URI0, ODataHttpHeaders.DATASERVICEVERSION, "42",
+ HttpStatusCodes.BAD_REQUEST);
+ executeAndValidateHeaderRequest(ODataHttpMethod.GET, UriType.URI0, ODataHttpHeaders.DATASERVICEVERSION, "test.2.0",
+ HttpStatusCodes.BAD_REQUEST);
+ }
+
+ @Test
+ public void allowedMethods() throws Exception {
+ executeAndValidateRequest(ODataHttpMethod.GET, UriType.URI0, null, null);
+ executeAndValidateRequest(ODataHttpMethod.GET, UriType.URI1, null, null);
+ executeAndValidateRequest(ODataHttpMethod.POST, UriType.URI1, HttpContentType.APPLICATION_JSON, null);
+ executeAndValidateRequest(ODataHttpMethod.GET, UriType.URI2, null, null);
+ executeAndValidateRequest(ODataHttpMethod.GET, UriType.URI3, null, null);
+ executeAndValidateRequest(ODataHttpMethod.PATCH, UriType.URI3, HttpContentType.APPLICATION_JSON, null);
+ executeAndValidateRequest(ODataHttpMethod.MERGE, UriType.URI3, HttpContentType.APPLICATION_JSON, null);
+ executeAndValidateRequest(ODataHttpMethod.GET, UriType.URI4, null, null);
+ executeAndValidateRequest(ODataHttpMethod.POST, UriType.URI9, HttpContentType.MULTIPART_MIXED, null);
+ executeAndValidateRequest(ODataHttpMethod.GET, UriType.URI15, null, null);
+ executeAndValidateRequest(ODataHttpMethod.GET, UriType.URI17, null, null);
+ }
+
+ @Test
+ public void notAllowedMethod() throws Exception {
+ wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI0, false, false), null);
+ wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI1, false, false), null);
+ wrongRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI2, false, false), null);
+ wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI3, false, false), null);
+ wrongRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI4, false, false), null);
+ wrongRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI5, false, false), null);
+ wrongRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI6A, false, false), null);
+ wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI6B, false, false), null);
+ wrongRequest(ODataHttpMethod.POST, createPathSegments(UriType.URI7A, false, false), null);
+ wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI7B, false, false), null);
+ wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI8, false, false), null);
+ wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI9, false, false), null);
+ wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI15, false, false), null);
+ wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI16, false, false), null);
+ wrongRequest(ODataHttpMethod.PATCH, createPathSegments(UriType.URI17, false, false), null);
+ wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI50A, false, false), null);
+ wrongRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI50B, false, false), null);
+ }
+
+ @Test
+ public void notAllowedOptions() throws Exception {
+ wrongOptions(ODataHttpMethod.POST, UriType.URI1, true, false, false, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, true, false, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, false, true, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, false, false, true, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, false, false, false, true, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, false, false, false, false, true, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, false, false, false, false, false, true, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, false, false, false, false, false, false, true, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI1, false, false, false, false, false, false, false, false, true);
+
+ wrongOptions(ODataHttpMethod.PUT, UriType.URI2, true, false, false, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.PUT, UriType.URI2, false, false, false, false, false, false, false, true, false);
+ wrongOptions(ODataHttpMethod.PUT, UriType.URI2, false, false, false, false, false, false, false, false, true);
+ wrongOptions(ODataHttpMethod.PATCH, UriType.URI2, true, false, false, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.PATCH, UriType.URI2, false, false, false, false, false, false, false, true, false);
+ wrongOptions(ODataHttpMethod.PATCH, UriType.URI2, false, false, false, false, false, false, false, false, true);
+ wrongOptions(ODataHttpMethod.DELETE, UriType.URI2, true, false, false, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.DELETE, UriType.URI2, false, true, false, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.DELETE, UriType.URI2, false, false, false, false, false, false, false, true, false);
+ wrongOptions(ODataHttpMethod.DELETE, UriType.URI2, false, false, false, false, false, false, false, false, true);
+
+ wrongOptions(ODataHttpMethod.PUT, UriType.URI3, true, false, false, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.PATCH, UriType.URI3, true, false, false, false, false, false, false, false, false);
+
+ wrongOptions(ODataHttpMethod.PUT, UriType.URI4, true, false, false, false, false, false, false, false, false);
+
+ wrongOptions(ODataHttpMethod.PUT, UriType.URI5, true, false, false, false, false, false, false, false, false);
+
+ wrongOptions(ODataHttpMethod.POST, UriType.URI6B, true, false, false, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, true, false, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, false, true, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, false, false, true, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, false, false, false, true, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, false, false, false, false, true, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, false, false, false, false, false, true, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, false, false, false, false, false, false, true, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI6B, false, false, false, false, false, false, false, false, true);
+
+ wrongOptions(ODataHttpMethod.PUT, UriType.URI7A, true, false, false, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.PUT, UriType.URI7A, false, true, false, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.DELETE, UriType.URI7A, true, false, false, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.DELETE, UriType.URI7A, false, true, false, false, false, false, false, false, false);
+
+ wrongOptions(ODataHttpMethod.POST, UriType.URI7B, true, false, false, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI7B, false, true, false, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI7B, false, false, true, false, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI7B, false, false, false, true, false, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI7B, false, false, false, false, true, false, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI7B, false, false, false, false, false, true, false, false, false);
+ wrongOptions(ODataHttpMethod.POST, UriType.URI7B, false, false, false, false, false, false, true, false, false);
+
+ wrongOptions(ODataHttpMethod.PUT, UriType.URI17, false, true, false, false, false, false, false, false, false);
+ executeAndValidateRequest(ODataHttpMethod.PUT, createPathSegments(UriType.URI17, false, false),
+ createOptions(true, false, false, false, false, false, false, false, false), null, null, null, HttpStatusCodes.BAD_REQUEST);
+ executeAndValidateRequest(ODataHttpMethod.DELETE, createPathSegments(UriType.URI17, false, false),
+ createOptions(true, false, false, false, false, false, false, false, false), null, null, null, HttpStatusCodes.BAD_REQUEST);
+ wrongOptions(ODataHttpMethod.DELETE, UriType.URI17, false, true, false, false, false, false, false, false, false);
+ }
+
+ @Test
+ public void functionImportWrongHttpMethod() throws Exception {
+ wrongFunctionHttpMethod(ODataHttpMethod.POST, UriType.URI10a);
+ wrongFunctionHttpMethod(ODataHttpMethod.PUT, UriType.URI10);
+ wrongFunctionHttpMethod(ODataHttpMethod.POST, UriType.URI11);
+ wrongFunctionHttpMethod(ODataHttpMethod.PATCH, UriType.URI12);
+ wrongFunctionHttpMethod(ODataHttpMethod.POST, UriType.URI13);
+ wrongFunctionHttpMethod(ODataHttpMethod.PUT, UriType.URI14);
+ }
+
+ @Test
+ public void wrongProperty() throws Exception {
+ wrongProperty(ODataHttpMethod.DELETE, true, false);
+
+ wrongProperty(ODataHttpMethod.PUT, false, true);
+ wrongProperty(ODataHttpMethod.PATCH, false, true);
+ wrongProperty(ODataHttpMethod.DELETE, false, true);
+ wrongProperty(ODataHttpMethod.DELETE, false, false);
+ }
+
+ @Test
+ public void wrongNavigationPath() throws Exception {
+ wrongNavigationPath(ODataHttpMethod.PUT, UriType.URI3, HttpStatusCodes.BAD_REQUEST);
+ wrongNavigationPath(ODataHttpMethod.PATCH, UriType.URI3, HttpStatusCodes.BAD_REQUEST);
+
+ wrongNavigationPath(ODataHttpMethod.PUT, UriType.URI4, HttpStatusCodes.BAD_REQUEST);
+ wrongNavigationPath(ODataHttpMethod.PATCH, UriType.URI4, HttpStatusCodes.BAD_REQUEST);
+ wrongNavigationPath(ODataHttpMethod.DELETE, UriType.URI4, HttpStatusCodes.METHOD_NOT_ALLOWED);
+
+ wrongNavigationPath(ODataHttpMethod.PUT, UriType.URI5, HttpStatusCodes.BAD_REQUEST);
+ wrongNavigationPath(ODataHttpMethod.PATCH, UriType.URI5, HttpStatusCodes.BAD_REQUEST);
+ wrongNavigationPath(ODataHttpMethod.DELETE, UriType.URI5, HttpStatusCodes.METHOD_NOT_ALLOWED);
+
+ wrongNavigationPath(ODataHttpMethod.PUT, UriType.URI7A, HttpStatusCodes.BAD_REQUEST);
+ wrongNavigationPath(ODataHttpMethod.PATCH, UriType.URI7A, HttpStatusCodes.BAD_REQUEST);
+ wrongNavigationPath(ODataHttpMethod.DELETE, UriType.URI7A, HttpStatusCodes.BAD_REQUEST);
+
+ wrongNavigationPath(ODataHttpMethod.POST, UriType.URI6B, HttpStatusCodes.BAD_REQUEST);
+
+ wrongNavigationPath(ODataHttpMethod.POST, UriType.URI7B, HttpStatusCodes.BAD_REQUEST);
+
+ wrongNavigationPath(ODataHttpMethod.PUT, UriType.URI17, HttpStatusCodes.BAD_REQUEST);
+ wrongNavigationPath(ODataHttpMethod.DELETE, UriType.URI17, HttpStatusCodes.BAD_REQUEST);
+ }
+
+ @Test
+ public void requestAcceptHeader() throws Exception {
+ checkAcceptHeader(UriType.URI0, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI1, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI2, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI3, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI4, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI5, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI6A, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI6B, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI7A, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI7B, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI8, HttpContentType.APPLICATION_XML, null);
+ checkAcceptHeader(UriType.URI9, HttpContentType.APPLICATION_XML, HttpStatusCodes.METHOD_NOT_ALLOWED);
+ checkAcceptHeader(UriType.URI10, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI11, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI12, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI13, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI14, HttpContentType.APPLICATION_JSON, null);
+ checkAcceptHeader(UriType.URI15, HttpContentType.TEXT_PLAIN, null);
+ checkAcceptHeader(UriType.URI16, HttpContentType.TEXT_PLAIN, null);
+ checkAcceptHeader(UriType.URI17, HttpContentType.APPLICATION_OCTET_STREAM, null);
+ checkAcceptHeader(UriType.URI50A, HttpContentType.TEXT_PLAIN, null);
+ checkAcceptHeader(UriType.URI50B, HttpContentType.TEXT_PLAIN, null);
+
+ checkAcceptHeader(UriType.URI8, HttpContentType.APPLICATION_JSON, HttpStatusCodes.NOT_ACCEPTABLE);
+ }
+
+ @Test
+ public void requestContentType() throws Exception {
+ executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI2, HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.PATCH, UriType.URI2, HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.MERGE, UriType.URI2, HttpContentType.APPLICATION_XML, null);
+
+ executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI3, HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.PATCH, UriType.URI3, HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.MERGE, UriType.URI3, HttpContentType.APPLICATION_XML, null);
+
+ executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI4, HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.PATCH, UriType.URI4, HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.MERGE, UriType.URI4, HttpContentType.APPLICATION_XML, null);
+
+ executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI5, HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.PATCH, UriType.URI5, HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.MERGE, UriType.URI5, HttpContentType.APPLICATION_XML, null);
+
+ executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI6A, HttpContentType.APPLICATION_XML, HttpStatusCodes.BAD_REQUEST);
+ executeAndValidateRequest(ODataHttpMethod.PATCH, UriType.URI6A, HttpContentType.APPLICATION_XML, HttpStatusCodes.BAD_REQUEST);
+ executeAndValidateRequest(ODataHttpMethod.MERGE, UriType.URI6A, HttpContentType.APPLICATION_XML, HttpStatusCodes.BAD_REQUEST);
+
+ executeAndValidateRequest(ODataHttpMethod.POST, UriType.URI6B, HttpContentType.APPLICATION_XML, null);
+
+ executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI7A, HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.PATCH, UriType.URI7A, HttpContentType.APPLICATION_XML, null);
+ executeAndValidateRequest(ODataHttpMethod.MERGE, UriType.URI7A, HttpContentType.APPLICATION_XML, null);
+
+ executeAndValidateRequest(ODataHttpMethod.POST, UriType.URI7B, HttpContentType.APPLICATION_XML, null);
+
+ executeAndValidateRequest(ODataHttpMethod.POST, UriType.URI9, HttpContentType.MULTIPART_MIXED, null);
+ }
+
+ @Test
+ public void requestContentTypeMediaResource() throws Exception {
+ executeAndValidateRequest(ODataHttpMethod.POST, UriType.URI1, "image/jpeg", null);
+ executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI17, "image/jpeg", null);
+ }
+
+ @Test
+ public void requestContentTypeFunctionImport() throws Exception {
+ EdmFunctionImport function = edm.getDefaultEntityContainer()
+ .getFunctionImport("MaximalAge");
+ when(function.getHttpMethod()).thenReturn(ODataHttpMethod.PUT.name());
+ executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI14, null, null);
+ executeAndValidateRequest(ODataHttpMethod.PUT, UriType.URI14, HttpContentType.WILDCARD, null);
+ checkValueContentType(ODataHttpMethod.PUT, UriType.URI14, null);
+ checkValueContentType(ODataHttpMethod.PUT, UriType.URI14, HttpContentType.WILDCARD);
+
+ function = edm.getDefaultEntityContainer()
+ .getFunctionImport("OldestEmployee");
+ when(function.getHttpMethod()).thenReturn(ODataHttpMethod.POST.name());
+ executeAndValidateRequest(ODataHttpMethod.POST, UriType.URI10, null, null);
+ }
+
+ @Test
+ public void requestValueContentType() throws Exception {
+ checkValueContentType(ODataHttpMethod.PUT, UriType.URI4, HttpContentType.TEXT_PLAIN);
+ checkValueContentType(ODataHttpMethod.DELETE, UriType.URI4, HttpContentType.TEXT_PLAIN);
+ checkValueContentType(ODataHttpMethod.PATCH, UriType.URI4, HttpContentType.TEXT_PLAIN);
+ checkValueContentType(ODataHttpMethod.MERGE, UriType.URI4, HttpContentType.TEXT_PLAIN);
+ checkValueContentType(ODataHttpMethod.PUT, UriType.URI4, HttpContentType.TEXT_PLAIN_UTF8);
+ checkValueContentType(ODataHttpMethod.DELETE, UriType.URI4, HttpContentType.TEXT_PLAIN_UTF8);
+ checkValueContentType(ODataHttpMethod.PATCH, UriType.URI4, HttpContentType.TEXT_PLAIN_UTF8);
+ checkValueContentType(ODataHttpMethod.MERGE, UriType.URI4, HttpContentType.TEXT_PLAIN_UTF8);
+
+ checkValueContentType(ODataHttpMethod.PUT, UriType.URI5, HttpContentType.TEXT_PLAIN);
+ checkValueContentType(ODataHttpMethod.DELETE, UriType.URI5, HttpContentType.TEXT_PLAIN);
+ checkValueContentType(ODataHttpMethod.PATCH, UriType.URI5, HttpContentType.TEXT_PLAIN);
+ checkValueContentType(ODataHttpMethod.MERGE, UriType.URI5, HttpContentType.TEXT_PLAIN);
+
+ checkValueContentType(ODataHttpMethod.PUT, UriType.URI17, HttpContentType.TEXT_PLAIN);
+ checkValueContentType(ODataHttpMethod.DELETE, UriType.URI17, HttpContentType.TEXT_PLAIN);
+ }
+
+ @Test
+ public void requestBinaryValueContentType() throws Exception {
+ EdmProperty property = (EdmProperty) edm.getEntityType("RefScenario", "Employee")
+ .getProperty("EmployeeName");
+ when(property.getType()).thenReturn(EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance());
+ checkValueContentType(ODataHttpMethod.PUT, UriType.URI5, HttpContentType.TEXT_PLAIN);
+ when(property.getMimeType()).thenReturn("image/png");
+ checkValueContentType(ODataHttpMethod.PUT, UriType.URI5, "image/png");
+ }
+
+ @Test
+ public void wrongRequestContentType() throws Exception {
+ wrongRequestContentType(ODataHttpMethod.POST, UriType.URI1, ContentType.WILDCARD);
+
+ wrongRequestContentType(ODataHttpMethod.PUT, UriType.URI2, ContentType.APPLICATION_ATOM_SVC);
+ wrongRequestContentType(ODataHttpMethod.PUT, UriType.URI2, ContentType.APPLICATION_ATOM_SVC_CS_UTF_8);
+ wrongRequestContentType(ODataHttpMethod.PUT, UriType.URI2, ContentType.APPLICATION_ATOM_SVC);
+ wrongRequestContentType(ODataHttpMethod.PUT, UriType.URI2, ContentType.APPLICATION_ATOM_SVC_CS_UTF_8);
+
+ ODataHttpMethod[] methodsToTest = {ODataHttpMethod.PUT, ODataHttpMethod.PATCH, ODataHttpMethod.MERGE};
+
+ for (ODataHttpMethod oDataHttpMethod : methodsToTest) {
+ wrongRequestContentType(oDataHttpMethod, UriType.URI2, ContentType.create("image/jpeg"));
+
+ wrongRequestContentType(oDataHttpMethod, UriType.URI3, ContentType.TEXT_PLAIN);
+
+ wrongRequestContentType(oDataHttpMethod, UriType.URI4, ContentType.TEXT_PLAIN);
+
+ wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_ATOM_SVC);
+ wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_ATOM_SVC_CS_UTF_8);
+ wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_XML);
+ wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_XML_CS_UTF_8);
+ wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_ATOM_XML);
+ wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_ATOM_XML_CS_UTF_8);
+ wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_JSON);
+ wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.APPLICATION_JSON_CS_UTF_8);
+ wrongRequestContentType(oDataHttpMethod, UriType.URI5, true, ContentType.create("image/jpeg"));
+
+ wrongRequestContentType(oDataHttpMethod, UriType.URI6A, ContentType.APPLICATION_ATOM_SVC);
+
+ wrongRequestContentType(oDataHttpMethod, UriType.URI7A, ContentType.APPLICATION_ATOM_SVC);
+ }
+
+ wrongRequestContentType(ODataHttpMethod.POST, UriType.URI7B, ContentType.APPLICATION_ATOM_SVC);
+
+ wrongRequestContentType(ODataHttpMethod.POST, UriType.URI9, ContentType.APPLICATION_OCTET_STREAM);
+ }
+
+ @Test
+ public void unsupportedRequestContentTypeNoMediaResource() throws Exception {
+ EdmEntityType entityType = edm.getDefaultEntityContainer()
+ .getEntitySet("Employees")
+ .getEntityType();
+ when(entityType.hasStream()).thenReturn(false);
+
+ wrongRequestContentType(ODataHttpMethod.POST, UriType.URI1, ContentType.APPLICATION_ATOM_SVC);
+ wrongRequestContentType(ODataHttpMethod.POST, UriType.URI1, ContentType.APPLICATION_ATOM_SVC_CS_UTF_8);
+ wrongRequestContentType(ODataHttpMethod.POST, UriType.URI1, ContentType.APPLICATION_OCTET_STREAM);
+ wrongRequestContentType(ODataHttpMethod.POST, UriType.URI6B, ContentType.APPLICATION_ATOM_SVC);
+ }
+
+ @Test
+ public void conditionalHandling() throws Exception {
+ EdmProperty property = (EdmProperty) (edm.getEntityType("RefScenario", "Employee")
+ .getProperty("EmployeeId"));
+ EdmFacets facets = mock(EdmFacets.class);
+ when(facets.getConcurrencyMode()).thenReturn(EdmConcurrencyMode.Fixed);
+ when(property.getFacets()).thenReturn(facets);
+
+ executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI2, HttpHeaders.IF_MATCH, "W/\"1\"", null);
+ executeAndValidateHeaderRequest(ODataHttpMethod.PATCH, UriType.URI2, HttpHeaders.IF_MATCH, "W/\"1\"", null);
+ executeAndValidateHeaderRequest(ODataHttpMethod.MERGE, UriType.URI2, HttpHeaders.IF_MATCH, "W/\"1\"", null);
+ executeAndValidateHeaderRequest(ODataHttpMethod.DELETE, UriType.URI2, HttpHeaders.IF_MATCH, "W/\"1\"", null);
+
+ executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI3, HttpHeaders.IF_MATCH, "W/\"1\"", null);
+ executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI4, HttpHeaders.IF_MATCH, "W/\"1\"", null);
+ executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI5, HttpHeaders.IF_MATCH, "W/\"1\"", null);
+ // executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI6A, HttpHeaders.IF_MATCH,
+ // "W/\"1\"", null);
+ executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI17, HttpHeaders.IF_MATCH, "W/\"1\"", null);
+
+ executeAndValidateHeaderRequest(ODataHttpMethod.POST, UriType.URI1, HttpHeaders.IF_MATCH, "W/\"1\"", null);
+ executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI7A, HttpHeaders.IF_MATCH, "W/\"1\"", null);
+
+ executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI2, null, null, HttpStatusCodes.PRECONDITION_REQUIRED);
+ executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI3, null, null, HttpStatusCodes.PRECONDITION_REQUIRED);
+ executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI4, null, null, HttpStatusCodes.PRECONDITION_REQUIRED);
+ executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI5, null, null, HttpStatusCodes.PRECONDITION_REQUIRED);
+ // executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI6A, null, null,
+ // HttpStatusCodes.PRECONDITION_REQUIRED);
+ executeAndValidateHeaderRequest(ODataHttpMethod.PUT, UriType.URI17, null, null, HttpStatusCodes.PRECONDITION_REQUIRED);
+ }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java
index 659a54c9..87956fc3 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java
@@ -33,7 +33,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java
index 74da93ce..7ecf1e83 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java
@@ -34,8 +34,8 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.http.HttpServletRequest;
import javax.ws.rs.ClientErrorException;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MultivaluedHashMap;
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/servlet/ODataServletTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/servlet/ODataServletTest.java
index b3231e34..2541b624 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/servlet/ODataServletTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/servlet/ODataServletTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.servlet;
@@ -28,14 +24,6 @@ import java.nio.charset.Charset;
import java.util.Collections;
import java.util.HashSet;
import java.util.Random;
-
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import junit.framework.Assert;
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.ODataServiceFactory;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
@@ -47,282 +35,366 @@ import org.apache.olingo.odata2.core.ODataResponseImpl;
import org.apache.olingo.odata2.core.rest.ODataServiceFactoryImpl;
import org.junit.Test;
import org.mockito.Mockito;
+import jakarta.servlet.GenericServlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import junit.framework.Assert;
/**
*
*/
public class ODataServletTest {
- private HttpServletRequest reqMock;
- private HttpServletResponse respMock;
- private ServletConfig configMock;
-
- public ODataServletTest() {
- reqMock = Mockito.mock(HttpServletRequest.class);
- respMock = Mockito.mock(HttpServletResponse.class);
- configMock = Mockito.mock(ServletConfig.class);
- }
-
- @Test
- public void handleRedirect() throws Exception {
- ODataServlet servlet = new ODataServlet();
- prepareServlet(servlet);
- prepareRequest(reqMock);
- servlet.service(reqMock, respMock);
-
- Mockito.verify(respMock).setStatus(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode());
- Mockito.verify(respMock).setHeader(HttpHeaders.LOCATION, "/context-path/servlet-path/");
- }
-
- @Test
- public void handleRedirectWoServletPath() throws Exception {
- ODataServlet servlet = new ODataServlet();
- prepareServlet(servlet);
- prepareRequest(reqMock, "/context-path", null);
- servlet.service(reqMock, respMock);
-
- Mockito.verify(respMock).setStatus(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode());
- Mockito.verify(respMock).setHeader(HttpHeaders.LOCATION, "/context-path/");
- }
-
- @Test
- public void handleRedirectWoContextPath() throws Exception {
- ODataServlet servlet = new ODataServlet();
- prepareServlet(servlet);
- prepareRequest(reqMock, null, "/servlet-path");
- servlet.service(reqMock, respMock);
-
- Mockito.verify(respMock).setStatus(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode());
- Mockito.verify(respMock).setHeader(HttpHeaders.LOCATION, "/servlet-path/");
- }
-
- @Test
- public void handleRedirectWoPath() throws Exception {
- ODataServlet servlet = new ODataServlet();
- prepareServlet(servlet);
- prepareRequest(reqMock, null, null);
- servlet.service(reqMock, respMock);
-
- Mockito.verify(respMock).setStatus(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode());
- Mockito.verify(respMock).setHeader(HttpHeaders.LOCATION, "/");
- }
-
- @Test
- public void contentLengthCalculatedString() throws Exception {
- final Method createResponse =
- ODataServlet.class.getDeclaredMethod("createResponse", HttpServletResponse.class, ODataResponse.class);
- createResponse.setAccessible(true);
-
- final ODataServlet servlet = new ODataServlet();
- final String content = "Test\r\n";
- final ODataResponse response = ODataResponseImpl.status(HttpStatusCodes.OK).entity(content).build();
- prepareResponseMockToWrite(respMock);
- prepareServlet(servlet);
-
- createResponse.invoke(servlet, respMock, response);
- Mockito.verify(respMock).setContentLength(content.getBytes("utf-8").length);
- }
-
- @Test
- public void contentLengthCalculatedStream() throws Exception {
- final Method createResponse =
- ODataServlet.class.getDeclaredMethod("createResponse", HttpServletResponse.class, ODataResponse.class);
- createResponse.setAccessible(true);
-
- final ODataServlet servlet = new ODataServlet();
- final String content = "Test\r\n";
-
- final ODataResponse response =
- ODataResponseImpl.status(HttpStatusCodes.OK).entity(new ByteArrayInputStream(content.getBytes("utf-8")))
- .build();
- prepareResponseMockToWrite(respMock);
- prepareServlet(servlet);
-
- createResponse.invoke(servlet, respMock, response);
- Mockito.verify(respMock).setContentLength(content.getBytes("utf-8").length);
- }
-
- @Test
- public void testInputStreamResponse() throws Exception {
- ODataServlet servlet = new ODataServlet();
- prepareServlet(servlet);
-
- final ByteArrayOutputStream bout = new ByteArrayOutputStream();
- final ServletOutputStream out = new ServletOutputStream() {
- @Override
- public void write(int i) throws IOException {
- bout.write(i);
- }
- };
- Mockito.when(respMock.getOutputStream()).thenReturn(out);
-
- HttpServletResponse servletResponse = Mockito.mock(HttpServletResponse.class);
- Mockito.when(servletResponse.getOutputStream()).thenReturn(out);
-
- ODataResponse odataResponse = Mockito.mock(ODataResponse.class);
- Mockito.when(odataResponse.getStatus()).thenReturn(HttpStatusCodes.ACCEPTED);
- Mockito.when(odataResponse.getHeaderNames()).thenReturn(new HashSet<String>());
- InputStream input = new ByteArrayInputStream("SomeData".getBytes());
- Mockito.when(odataResponse.getEntity()).thenReturn(input);
- servlet.createResponse(servletResponse, odataResponse, true);
-
- String outputContent = new String(bout.toByteArray());
- Assert.assertEquals("", outputContent);
- }
-
-
- @Test
- public void inputStreamResponse() throws Exception {
- testInputStreamResponse("123", "utf-8", null);
- testInputStreamResponse("1234567890", "utf-8", "5");
- testInputStreamResponse(testData(200000), "utf-8", null);
- testInputStreamResponse(testData(200000), "utf-8", "8192");
- testInputStreamResponse(testData(200000), "utf-8", "32768");
- //
- testInputStreamResponse("üäö", "iso-8859-1", "8192");
- testInputStreamResponse(testData(200000), "iso-8859-1", "32768");
- testInputStreamResponse(testData(200000), "iso-8859-1", "8192");
- testInputStreamResponse(testData(200000), "iso-8859-1", "32768");
- //
- testInputStreamResponse("1234567890", "utf-8", "5");
- testInputStreamResponse("1234567890", "utf-8", "ABD");
- testInputStreamResponse("1234567890", "utf-8", "");
- testInputStreamResponse("1234567890", "utf-8", "-29");
- }
-
-
- private void testInputStreamResponse(String content, String encoding, String bufferSize) throws Exception {
- ODataServlet servlet = new ODataServlet();
- Mockito.when(configMock.getInitParameter(
- "org.apache.olingo.odata2.core.servlet.buffer.size")).thenReturn(bufferSize);
- prepareServlet(servlet);
-
- final Charset charset = Charset.forName(encoding);
- final ByteArrayOutputStream bout = new ByteArrayOutputStream();
- final ServletOutputStream out = new ServletOutputStream() {
- @Override
- public void write(int i) throws IOException {
- bout.write(i);
- }
- };
- Mockito.when(respMock.getOutputStream()).thenReturn(out);
-
- HttpServletResponse servletResponse = Mockito.mock(HttpServletResponse.class);
- Mockito.when(servletResponse.getOutputStream()).thenReturn(out);
-
- ODataResponse odataResponse = Mockito.mock(ODataResponse.class);
- Mockito.when(odataResponse.getStatus()).thenReturn(HttpStatusCodes.ACCEPTED);
- Mockito.when(odataResponse.getHeaderNames()).thenReturn(new HashSet<String>());
- InputStream input = new ByteArrayInputStream(content.getBytes(charset));
- Mockito.when(odataResponse.getEntity()).thenReturn(input);
- servlet.createResponse(servletResponse, odataResponse);
-
- String outputContent = new String(bout.toByteArray(), charset);
- Assert.assertEquals(content, outputContent);
- }
-
-
- private String testData(int amount) {
- StringBuilder result = new StringBuilder();
- Random r = new Random();
- for (int i = 0; i < amount; i++) {
- result.append((char)(r.nextInt(26) + 'a'));
+ private final HttpServletRequest reqMock;
+ private final HttpServletResponse respMock;
+ private final ServletConfig configMock;
+
+ public ODataServletTest() {
+ reqMock = Mockito.mock(HttpServletRequest.class);
+ respMock = Mockito.mock(HttpServletResponse.class);
+ configMock = Mockito.mock(ServletConfig.class);
+ }
+
+ @Test
+ public void handleRedirect() throws Exception {
+ ODataServlet servlet = new ODataServlet();
+ prepareServlet(servlet);
+ prepareRequest(reqMock);
+ servlet.service(reqMock, respMock);
+
+ Mockito.verify(respMock)
+ .setStatus(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode());
+ Mockito.verify(respMock)
+ .setHeader(HttpHeaders.LOCATION, "/context-path/servlet-path/");
+ }
+
+ @Test
+ public void handleRedirectWoServletPath() throws Exception {
+ ODataServlet servlet = new ODataServlet();
+ prepareServlet(servlet);
+ prepareRequest(reqMock, "/context-path", null);
+ servlet.service(reqMock, respMock);
+
+ Mockito.verify(respMock)
+ .setStatus(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode());
+ Mockito.verify(respMock)
+ .setHeader(HttpHeaders.LOCATION, "/context-path/");
+ }
+
+ @Test
+ public void handleRedirectWoContextPath() throws Exception {
+ ODataServlet servlet = new ODataServlet();
+ prepareServlet(servlet);
+ prepareRequest(reqMock, null, "/servlet-path");
+ servlet.service(reqMock, respMock);
+
+ Mockito.verify(respMock)
+ .setStatus(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode());
+ Mockito.verify(respMock)
+ .setHeader(HttpHeaders.LOCATION, "/servlet-path/");
+ }
+
+ @Test
+ public void handleRedirectWoPath() throws Exception {
+ ODataServlet servlet = new ODataServlet();
+ prepareServlet(servlet);
+ prepareRequest(reqMock, null, null);
+ servlet.service(reqMock, respMock);
+
+ Mockito.verify(respMock)
+ .setStatus(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode());
+ Mockito.verify(respMock)
+ .setHeader(HttpHeaders.LOCATION, "/");
+ }
+
+ @Test
+ public void contentLengthCalculatedString() throws Exception {
+ final Method createResponse =
+ ODataServlet.class.getDeclaredMethod("createResponse", HttpServletResponse.class, ODataResponse.class);
+ createResponse.setAccessible(true);
+
+ final ODataServlet servlet = new ODataServlet();
+ final String content = "Test\r\n";
+ final ODataResponse response = ODataResponseImpl.status(HttpStatusCodes.OK)
+ .entity(content)
+ .build();
+ prepareResponseMockToWrite(respMock);
+ prepareServlet(servlet);
+
+ createResponse.invoke(servlet, respMock, response);
+ Mockito.verify(respMock)
+ .setContentLength(content.getBytes("utf-8").length);
+ }
+
+ @Test
+ public void contentLengthCalculatedStream() throws Exception {
+ final Method createResponse =
+ ODataServlet.class.getDeclaredMethod("createResponse", HttpServletResponse.class, ODataResponse.class);
+ createResponse.setAccessible(true);
+
+ final ODataServlet servlet = new ODataServlet();
+ final String content = "Test\r\n";
+
+ final ODataResponse response = ODataResponseImpl.status(HttpStatusCodes.OK)
+ .entity(new ByteArrayInputStream(content.getBytes("utf-8")))
+ .build();
+ prepareResponseMockToWrite(respMock);
+ prepareServlet(servlet);
+
+ createResponse.invoke(servlet, respMock, response);
+ Mockito.verify(respMock)
+ .setContentLength(content.getBytes("utf-8").length);
+ }
+
+ @Test
+ public void testInputStreamResponse() throws Exception {
+ ODataServlet servlet = new ODataServlet();
+ prepareServlet(servlet);
+
+ final ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ final ServletOutputStream out = new ServletOutputStream() {
+ @Override
+ public void write(int i) throws IOException {
+ bout.write(i);
+ }
+
+ @Override
+ public boolean isReady() {
+ return false;
+ }
+
+ @Override
+ public void setWriteListener(WriteListener writeListener) {}
+ };
+ Mockito.when(respMock.getOutputStream())
+ .thenReturn(out);
+
+ HttpServletResponse servletResponse = Mockito.mock(HttpServletResponse.class);
+ Mockito.when(servletResponse.getOutputStream())
+ .thenReturn(out);
+
+ ODataResponse odataResponse = Mockito.mock(ODataResponse.class);
+ Mockito.when(odataResponse.getStatus())
+ .thenReturn(HttpStatusCodes.ACCEPTED);
+ Mockito.when(odataResponse.getHeaderNames())
+ .thenReturn(new HashSet<String>());
+ InputStream input = new ByteArrayInputStream("SomeData".getBytes());
+ Mockito.when(odataResponse.getEntity())
+ .thenReturn(input);
+ servlet.createResponse(servletResponse, odataResponse, true);
+
+ String outputContent = new String(bout.toByteArray());
+ Assert.assertEquals("", outputContent);
+ }
+
+
+ @Test
+ public void inputStreamResponse() throws Exception {
+ testInputStreamResponse("123", "utf-8", null);
+ testInputStreamResponse("1234567890", "utf-8", "5");
+ testInputStreamResponse(testData(200000), "utf-8", null);
+ testInputStreamResponse(testData(200000), "utf-8", "8192");
+ testInputStreamResponse(testData(200000), "utf-8", "32768");
+ //
+ testInputStreamResponse("üäö", "iso-8859-1", "8192");
+ testInputStreamResponse(testData(200000), "iso-8859-1", "32768");
+ testInputStreamResponse(testData(200000), "iso-8859-1", "8192");
+ testInputStreamResponse(testData(200000), "iso-8859-1", "32768");
+ //
+ testInputStreamResponse("1234567890", "utf-8", "5");
+ testInputStreamResponse("1234567890", "utf-8", "ABD");
+ testInputStreamResponse("1234567890", "utf-8", "");
+ testInputStreamResponse("1234567890", "utf-8", "-29");
}
- return result.toString();
- }
-
-
- @Test
- public void serviceInstance() throws Exception {
- ODataServlet servlet = new ODataServlet();
- prepareServlet(servlet);
- prepareRequest(reqMock, "", "/servlet-path");
- Mockito.when(reqMock.getPathInfo()).thenReturn("/request-path-info");
- Mockito.when(reqMock.getRequestURI()).thenReturn("http://localhost:8080/servlet-path/request-path-info");
- ODataServiceFactory factory = Mockito.mock(ODataServiceFactory.class);
- ODataService service = Mockito.mock(ODataService.class);
- Mockito.when(factory.createService(Mockito.any(ODataContext.class))).thenReturn(service);
- ODataProcessor processor = Mockito.mock(ODataProcessor.class);
- Mockito.when(service.getProcessor()).thenReturn(processor);
- Mockito.when(reqMock.getAttribute(ODataServiceFactory.FACTORY_INSTANCE_LABEL)).thenReturn(factory);
- Mockito.when(respMock.getOutputStream()).thenReturn(Mockito.mock(ServletOutputStream.class));
-
- servlet.service(reqMock, respMock);
-
- Mockito.verify(factory).createService(Mockito.any(ODataContext.class));
- }
-
- @Test
- public void serviceClassloader() throws Exception {
- ODataServlet servlet = new ODataServlet();
- prepareServlet(servlet);
- prepareRequest(reqMock, "", "/servlet-path");
- Mockito.when(reqMock.getPathInfo()).thenReturn("/request-path-info");
- Mockito.when(reqMock.getRequestURI()).thenReturn("http://localhost:8080/servlet-path/request-path-info");
- Mockito.when(respMock.getOutputStream()).thenReturn(Mockito.mock(ServletOutputStream.class));
-
- servlet.service(reqMock, respMock);
-
- Mockito.verify(configMock).getInitParameter(ODataServiceFactory.FACTORY_LABEL);
- Mockito.verify(reqMock).getAttribute(ODataServiceFactory.FACTORY_CLASSLOADER_LABEL);
-
- Assert.assertEquals(ODataServiceFactoryImpl.class, servlet.getServiceFactory(reqMock).getClass());
- }
-
-
- private void prepareResponseMockToWrite(final HttpServletResponse response) throws IOException {
- Mockito.when(response.getOutputStream()).thenReturn(new ServletOutputStream() {
- @Override
- public void write(int b) throws IOException {}
- });
- }
-
- private void prepareRequest(final HttpServletRequest req, final String contextPath, final String servletPath) {
- Mockito.when(req.getMethod()).thenReturn("GET");
- Mockito.when(req.getContextPath()).thenReturn(contextPath);
- Mockito.when(req.getServletPath()).thenReturn(servletPath);
- Mockito.when(req.getHeaderNames()).thenReturn(Collections.enumeration(Collections.emptyList()));
- }
-
- private void prepareRequest(final HttpServletRequest req) {
- prepareRequest(req, "/context-path", "/servlet-path");
- }
-
- private void prepareServlet(final GenericServlet servlet) throws Exception {
- // private transient ServletConfig config;
- Field configField = GenericServlet.class.getDeclaredField("config");
- configField.setAccessible(true);
- configField.set(servlet, configMock);
-
- String factoryClassName = ODataServiceFactoryImpl.class.getName();
- Mockito.when(configMock.getInitParameter(ODataServiceFactory.FACTORY_LABEL)).thenReturn(factoryClassName);
- }
-
- @Test
- public void testWithNoPathAfterServletPath() throws Exception {
- ODataServlet servlet = new ODataServlet();
- prepareServlet(servlet);
- prepareRequestWithNoPathAfterServletPath(reqMock, "", "/servlet-path");
- Mockito.when(reqMock.getPathInfo()).thenReturn("/Collection");
- Mockito.when(reqMock.getRequestURI()).thenReturn("http://localhost:8080/servlet-path;v=1/Collection");
- Mockito.when(servlet.getInitParameter("org.apache.olingo.odata2.path.split")).thenReturn("1");
- Mockito.when(respMock.getOutputStream()).thenReturn(Mockito.mock(ServletOutputStream.class));
-
- servlet.service(reqMock, respMock);
-
- Mockito.verify(configMock).getInitParameter(ODataServiceFactory.FACTORY_LABEL);
- Mockito.verify(reqMock).getAttribute(ODataServiceFactory.FACTORY_CLASSLOADER_LABEL);
-
- Assert.assertEquals(ODataServiceFactoryImpl.class, servlet.getServiceFactory(reqMock).getClass());
- }
-
- private void prepareRequestWithNoPathAfterServletPath(final HttpServletRequest req,
- final String contextPath, final String servletPath) {
- Mockito.when(req.getMethod()).thenReturn("GET");
- Mockito.when(req.getContextPath()).thenReturn(contextPath);
- Mockito.when(req.getServletPath()).thenReturn(servletPath);
- Mockito.when(req.getRequestURI()).thenReturn(servletPath + ";v=1" + "/Collection");
- Mockito.when(req.getHeaderNames()).thenReturn(Collections.enumeration(Collections.emptyList()));
- }
+
+ private void testInputStreamResponse(String content, String encoding, String bufferSize) throws Exception {
+ ODataServlet servlet = new ODataServlet();
+ Mockito.when(configMock.getInitParameter("org.apache.olingo.odata2.core.servlet.buffer.size"))
+ .thenReturn(bufferSize);
+ prepareServlet(servlet);
+
+ final Charset charset = Charset.forName(encoding);
+ final ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ final ServletOutputStream out = new ServletOutputStream() {
+ @Override
+ public void write(int i) throws IOException {
+ bout.write(i);
+ }
+
+ @Override
+ public boolean isReady() {
+ return false;
+ }
+
+ @Override
+ public void setWriteListener(WriteListener writeListener) {}
+ };
+ Mockito.when(respMock.getOutputStream())
+ .thenReturn(out);
+
+ HttpServletResponse servletResponse = Mockito.mock(HttpServletResponse.class);
+ Mockito.when(servletResponse.getOutputStream())
+ .thenReturn(out);
+
+ ODataResponse odataResponse = Mockito.mock(ODataResponse.class);
+ Mockito.when(odataResponse.getStatus())
+ .thenReturn(HttpStatusCodes.ACCEPTED);
+ Mockito.when(odataResponse.getHeaderNames())
+ .thenReturn(new HashSet<String>());
+ InputStream input = new ByteArrayInputStream(content.getBytes(charset));
+ Mockito.when(odataResponse.getEntity())
+ .thenReturn(input);
+ servlet.createResponse(servletResponse, odataResponse);
+
+ String outputContent = new String(bout.toByteArray(), charset);
+ Assert.assertEquals(content, outputContent);
+ }
+
+
+ private String testData(int amount) {
+ StringBuilder result = new StringBuilder();
+ Random r = new Random();
+ for (int i = 0; i < amount; i++) {
+ result.append((char) (r.nextInt(26) + 'a'));
+ }
+
+ return result.toString();
+ }
+
+
+ @Test
+ public void serviceInstance() throws Exception {
+ ODataServlet servlet = new ODataServlet();
+ prepareServlet(servlet);
+ prepareRequest(reqMock, "", "/servlet-path");
+ Mockito.when(reqMock.getPathInfo())
+ .thenReturn("/request-path-info");
+ Mockito.when(reqMock.getRequestURI())
+ .thenReturn("http://localhost:8080/servlet-path/request-path-info");
+ ODataServiceFactory factory = Mockito.mock(ODataServiceFactory.class);
+ ODataService service = Mockito.mock(ODataService.class);
+ Mockito.when(factory.createService(Mockito.any(ODataContext.class)))
+ .thenReturn(service);
+ ODataProcessor processor = Mockito.mock(ODataProcessor.class);
+ Mockito.when(service.getProcessor())
+ .thenReturn(processor);
+ Mockito.when(reqMock.getAttribute(ODataServiceFactory.FACTORY_INSTANCE_LABEL))
+ .thenReturn(factory);
+ Mockito.when(respMock.getOutputStream())
+ .thenReturn(Mockito.mock(ServletOutputStream.class));
+
+ servlet.service(reqMock, respMock);
+
+ Mockito.verify(factory)
+ .createService(Mockito.any(ODataContext.class));
+ }
+
+ @Test
+ public void serviceClassloader() throws Exception {
+ ODataServlet servlet = new ODataServlet();
+ prepareServlet(servlet);
+ prepareRequest(reqMock, "", "/servlet-path");
+ Mockito.when(reqMock.getPathInfo())
+ .thenReturn("/request-path-info");
+ Mockito.when(reqMock.getRequestURI())
+ .thenReturn("http://localhost:8080/servlet-path/request-path-info");
+ Mockito.when(respMock.getOutputStream())
+ .thenReturn(Mockito.mock(ServletOutputStream.class));
+
+ servlet.service(reqMock, respMock);
+
+ Mockito.verify(configMock)
+ .getInitParameter(ODataServiceFactory.FACTORY_LABEL);
+ Mockito.verify(reqMock)
+ .getAttribute(ODataServiceFactory.FACTORY_CLASSLOADER_LABEL);
+
+ Assert.assertEquals(ODataServiceFactoryImpl.class, servlet.getServiceFactory(reqMock)
+ .getClass());
+ }
+
+
+ private void prepareResponseMockToWrite(final HttpServletResponse response) throws IOException {
+ Mockito.when(response.getOutputStream())
+ .thenReturn(new ServletOutputStream() {
+ @Override
+ public void write(int b) throws IOException {}
+
+ @Override
+ public boolean isReady() {
+ return false;
+ }
+
+ @Override
+ public void setWriteListener(WriteListener writeListener) {}
+ });
+ }
+
+ private void prepareRequest(final HttpServletRequest req, final String contextPath, final String servletPath) {
+ Mockito.when(req.getMethod())
+ .thenReturn("GET");
+ Mockito.when(req.getContextPath())
+ .thenReturn(contextPath);
+ Mockito.when(req.getServletPath())
+ .thenReturn(servletPath);
+ Mockito.when(req.getHeaderNames())
+ .thenReturn(Collections.enumeration(Collections.emptyList()));
+ }
+
+ private void prepareRequest(final HttpServletRequest req) {
+ prepareRequest(req, "/context-path", "/servlet-path");
+ }
+
+ private void prepareServlet(final GenericServlet servlet) throws Exception {
+ // private transient ServletConfig config;
+ Field configField = GenericServlet.class.getDeclaredField("config");
+ configField.setAccessible(true);
+ configField.set(servlet, configMock);
+
+ String factoryClassName = ODataServiceFactoryImpl.class.getName();
+ Mockito.when(configMock.getInitParameter(ODataServiceFactory.FACTORY_LABEL))
+ .thenReturn(factoryClassName);
+ }
+
+ @Test
+ public void testWithNoPathAfterServletPath() throws Exception {
+ ODataServlet servlet = new ODataServlet();
+ prepareServlet(servlet);
+ prepareRequestWithNoPathAfterServletPath(reqMock, "", "/servlet-path");
+ Mockito.when(reqMock.getPathInfo())
+ .thenReturn("/Collection");
+ Mockito.when(reqMock.getRequestURI())
+ .thenReturn("http://localhost:8080/servlet-path;v=1/Collection");
+ Mockito.when(servlet.getInitParameter("org.apache.olingo.odata2.path.split"))
+ .thenReturn("1");
+ Mockito.when(respMock.getOutputStream())
+ .thenReturn(Mockito.mock(ServletOutputStream.class));
+
+ servlet.service(reqMock, respMock);
+
+ Mockito.verify(configMock)
+ .getInitParameter(ODataServiceFactory.FACTORY_LABEL);
+ Mockito.verify(reqMock)
+ .getAttribute(ODataServiceFactory.FACTORY_CLASSLOADER_LABEL);
+
+ Assert.assertEquals(ODataServiceFactoryImpl.class, servlet.getServiceFactory(reqMock)
+ .getClass());
+ }
+
+ private void prepareRequestWithNoPathAfterServletPath(final HttpServletRequest req, final String contextPath,
+ final String servletPath) {
+ Mockito.when(req.getMethod())
+ .thenReturn("GET");
+ Mockito.when(req.getContextPath())
+ .thenReturn(contextPath);
+ Mockito.when(req.getServletPath())
+ .thenReturn(servletPath);
+ Mockito.when(req.getRequestURI())
+ .thenReturn(servletPath + ";v=1" + "/Collection");
+ Mockito.when(req.getHeaderNames())
+ .thenReturn(Collections.enumeration(Collections.emptyList()));
+ }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/servlet/RestUtilTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/servlet/RestUtilTest.java
index b23c6e66..6815c214 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/servlet/RestUtilTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/servlet/RestUtilTest.java
@@ -28,7 +28,7 @@ import org.mockito.Mockito;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
public class RestUtilTest {
diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml
index 3c376191..9fa33537 100644
--- a/odata2-lib/odata-fit/pom.xml
+++ b/odata2-lib/odata-fit/pom.xml
@@ -205,19 +205,16 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>${gson.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>${xmlunit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
index d4dac10d..01dbf576 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
@@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.olingo.odata2.fit.basic;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
index d6a32da4..4f12caa9 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
@@ -19,7 +19,7 @@
package org.apache.olingo.odata2.fit.basic;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
index a0efd4c9..414aef67 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.fit.basic;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
index f8aee5be..636ba466 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.fit.basic;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
index 3069282a..23e6cb79 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -31,7 +31,7 @@ import java.net.URI;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import javax.ws.rs.core.Response.Status;
import org.apache.http.HttpResponse;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/DebugDisabledTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/DebugDisabledTest.java
index 7e657637..079670b5 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/DebugDisabledTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/DebugDisabledTest.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.fit.basic;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
index 0739de8a..7c03506e 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
@@ -19,7 +19,7 @@
package org.apache.olingo.odata2.fit.basic;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
index c7abbaf7..a939e529 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
@@ -19,7 +19,7 @@
package org.apache.olingo.odata2.fit.basic;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
index 780d1422..19c88dd6 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.fit.basic;
import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;
import static org.custommonkey.xmlunit.XMLAssert.assertXpathValuesEqual;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -53,7 +53,7 @@ import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.junit.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
/**
*
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
index ecbd893c..cc57ba7c 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
@@ -20,8 +20,8 @@ package org.apache.olingo.odata2.fit.basic;
import static org.custommonkey.xmlunit.XMLAssert.assertXpathEvaluatesTo;
import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
index af71ed2f..2ee324f3 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
@@ -19,7 +19,7 @@
package org.apache.olingo.odata2.fit.basic;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
index 32350b6a..2f577371 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.fit.basic;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
index 37d8ba7f..d707fd46 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
@@ -19,7 +19,7 @@
package org.apache.olingo.odata2.fit.basic;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueService1Factory.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueService1Factory.java
index 4dd7d59b..32b442d7 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueService1Factory.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueService1Factory.java
@@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.olingo.odata2.fit.misc;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueService2Factory.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueService2Factory.java
index f6a27245..c66367fe 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueService2Factory.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueService2Factory.java
@@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.olingo.odata2.fit.misc;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueTest.java
index aa778565..0fbd8d92 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/misc/CxfCacheUriInfoIssueTest.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.fit.misc;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml
index e5d5de76..cc78f818 100644
--- a/odata2-lib/odata-ref/pom.xml
+++ b/odata2-lib/odata-ref/pom.xml
@@ -82,7 +82,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
@@ -97,16 +96,14 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito.version}</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml
index e566edde..6d0d63da 100644
--- a/odata2-lib/odata-testutil/pom.xml
+++ b/odata2-lib/odata-testutil/pom.xml
@@ -69,7 +69,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -79,21 +78,23 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -103,7 +104,10 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>${httpcore.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
index 780cdb44..2f868094 100644
--- a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
+++ b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
@@ -1,29 +1,22 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.testutil.server;
import java.net.BindException;
import java.net.InetSocketAddress;
import java.net.URI;
-
-import javax.servlet.http.HttpServlet;
-
import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.ODataServiceFactory;
@@ -33,152 +26,153 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import jakarta.servlet.http.HttpServlet;
/**
- *
+ *
*/
public class TestServer {
- private static final Logger log = LoggerFactory.getLogger(TestServer.class);
+ private static final Logger log = LoggerFactory.getLogger(TestServer.class);
+
+ private static final int PORT_MIN = 19000;
+ private static final int PORT_MAX = 19200;
+ private static final int PORT_INC = 1;
- private static final int PORT_MIN = 19000;
- private static final int PORT_MAX = 19200;
- private static final int PORT_INC = 1;
+ private static final String DEFAULT_SCHEME = "http";
+ private static final String DEFAULT_HOST = "localhost";
+ private static final String DEFAULT_PATH = "/test";
- private static final String DEFAULT_SCHEME = "http";
- private static final String DEFAULT_HOST = "localhost";
- private static final String DEFAULT_PATH = "/test";
+ private URI endpoint; // = URI.create("http://localhost:19080/test"); // no slash at the end !!!
+ private final String path;
- private URI endpoint; // = URI.create("http://localhost:19080/test"); // no slash at the end !!!
- private final String path;
+ private int pathSplit = 0;
+ private final ServletType servletType;
- private int pathSplit = 0;
- private ServletType servletType;
+ public TestServer(final ServletType type) {
+ this(DEFAULT_PATH, type);
+ }
+
+ public TestServer(final String path, final ServletType type) {
+ if (path.startsWith("/")) {
+ this.path = path;
+ } else {
+ this.path = "/" + path;
+ }
+ servletType = type;
+ }
- public TestServer(final ServletType type) {
- this(DEFAULT_PATH, type);
- }
+ public int getPathSplit() {
+ return pathSplit;
+ }
- public TestServer(final String path, final ServletType type) {
- if (path.startsWith("/")) {
- this.path = path;
- } else {
- this.path = "/" + path;
+ public void setPathSplit(final int pathSplit) {
+ this.pathSplit = pathSplit;
}
- servletType = type;
- }
-
- public int getPathSplit() {
- return pathSplit;
- }
-
- public void setPathSplit(final int pathSplit) {
- this.pathSplit = pathSplit;
- }
-
- public URI getEndpoint() {
- return URI.create(endpoint + "/");
- }
-
- private Server server;
-
- public void startServer(final Class<? extends ODataServiceFactory> factoryClass, final int fixedPort) {
- try {
- final ServletContextHandler contextHandler = createContextHandler(factoryClass);
- final InetSocketAddress isa = new InetSocketAddress(DEFAULT_HOST, fixedPort);
- server = new Server(isa);
-
- server.setHandler(contextHandler);
- server.start();
- endpoint = new URI(DEFAULT_SCHEME, null, DEFAULT_HOST, isa.getPort(), "/abc" + path, null, null);
- log.trace("Started server at endpoint " + endpoint.toASCIIString());
- } catch (final Exception e) {
- log.error("server start failed", e);
- throw new ServerRuntimeException(e);
+
+ public URI getEndpoint() {
+ return URI.create(endpoint + "/");
}
- }
- public void startServer(final Class<? extends ODataServiceFactory> factoryClass) {
- try {
- for (int port = PORT_MIN; port <= PORT_MAX; port += PORT_INC) {
- final ServletContextHandler contextHandler = createContextHandler(factoryClass);
+ private Server server;
+
+ public void startServer(final Class<? extends ODataServiceFactory> factoryClass, final int fixedPort) {
try {
- final InetSocketAddress isa = new InetSocketAddress(DEFAULT_HOST, port);
- server = new Server(isa);
-
- server.setHandler(contextHandler);
- server.start();
- endpoint = new URI(DEFAULT_SCHEME, null, DEFAULT_HOST, isa.getPort(), "/abc" + path, null, null);
- log.trace("Started server at endpoint " + endpoint.toASCIIString());
- break;
- } catch (final BindException e) {
- log.trace("port is busy... " + port + " [" + e.getMessage() + "]");
+ final ServletContextHandler contextHandler = createContextHandler(factoryClass);
+ final InetSocketAddress isa = new InetSocketAddress(DEFAULT_HOST, fixedPort);
+ server = new Server(isa);
+
+ server.setHandler(contextHandler);
+ server.start();
+ endpoint = new URI(DEFAULT_SCHEME, null, DEFAULT_HOST, isa.getPort(), "/abc" + path, null, null);
+ log.trace("Started server at endpoint " + endpoint.toASCIIString());
+ } catch (final Exception e) {
+ log.error("server start failed", e);
+ throw new ServerRuntimeException(e);
}
- }
-
- if (!server.isStarted()) {
- throw new BindException("no free port in range of [" + PORT_MIN + ".." + PORT_MAX + "]");
- }
- } catch (final Exception e) {
- log.error("server start failed", e);
- throw new ServerRuntimeException(e);
- }
- }
-
- private ServletContextHandler createContextHandler(final Class<? extends ODataServiceFactory> factoryClass)
- throws Exception {
- ServletHolder odataServletHolder = null;
-
- switch (servletType) {
- case JAXRS_SERVLET:
- odataServletHolder = new ServletHolder(new CXFNonSpringJaxrsServlet());
- odataServletHolder.setInitParameter("javax.ws.rs.Application",
- "org.apache.olingo.odata2.core.rest.app.ODataApplication");
- odataServletHolder.setInitParameter(ODataServiceFactory.FACTORY_LABEL, factoryClass.getCanonicalName());
- break;
- case ODATA_SERVLET:
- String odataServlet = "org.apache.olingo.odata2.core.servlet.ODataServlet";
- final HttpServlet httpServlet = (HttpServlet) Class.forName(odataServlet).newInstance();
- odataServletHolder = new ServletHolder(httpServlet);
- odataServletHolder.setInitParameter(ODataServiceFactory.FACTORY_LABEL, factoryClass.getCanonicalName());
- break;
- default:
}
- if (pathSplit > 0) {
- odataServletHolder.setInitParameter(ODataServiceFactory.PATH_SPLIT_LABEL, Integer.toString(pathSplit));
+ public void startServer(final Class<? extends ODataServiceFactory> factoryClass) {
+ try {
+ for (int port = PORT_MIN; port <= PORT_MAX; port += PORT_INC) {
+ final ServletContextHandler contextHandler = createContextHandler(factoryClass);
+ try {
+ final InetSocketAddress isa = new InetSocketAddress(DEFAULT_HOST, port);
+ server = new Server(isa);
+
+ server.setHandler(contextHandler);
+ server.start();
+ endpoint = new URI(DEFAULT_SCHEME, null, DEFAULT_HOST, isa.getPort(), "/abc" + path, null, null);
+ log.trace("Started server at endpoint " + endpoint.toASCIIString());
+ break;
+ } catch (final BindException e) {
+ log.trace("port is busy... " + port + " [" + e.getMessage() + "]");
+ }
+ }
+
+ if (!server.isStarted()) {
+ throw new BindException("no free port in range of [" + PORT_MIN + ".." + PORT_MAX + "]");
+ }
+ } catch (final Exception e) {
+ log.error("server start failed", e);
+ throw new ServerRuntimeException(e);
+ }
}
- final ServletContextHandler contextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
- contextHandler.setContextPath("/abc");
- contextHandler.addServlet(odataServletHolder, path + "/*");
- return contextHandler;
- }
+ private ServletContextHandler createContextHandler(final Class<? extends ODataServiceFactory> factoryClass) throws Exception {
+ ServletHolder odataServletHolder = null;
+
+ switch (servletType) {
+ case JAXRS_SERVLET:
+ CXFNonSpringJaxrsServlet cxfNonSpringJaxrsServlet = new CXFNonSpringJaxrsServlet();
+ odataServletHolder = new ServletHolder();
+ odataServletHolder.setInitParameter("javax.ws.rs.Application", "org.apache.olingo.odata2.core.rest.app.ODataApplication");
+ odataServletHolder.setInitParameter(ODataServiceFactory.FACTORY_LABEL, factoryClass.getCanonicalName());
+ break;
+ case ODATA_SERVLET:
+ String odataServlet = "org.apache.olingo.odata2.core.servlet.ODataServlet";
+ final HttpServlet httpServlet = (HttpServlet) Class.forName(odataServlet)
+ .newInstance();
+ odataServletHolder = new ServletHolder(httpServlet);
+ odataServletHolder.setInitParameter(ODataServiceFactory.FACTORY_LABEL, factoryClass.getCanonicalName());
+ break;
+ default:
+ }
- public void startServer(final ODataService service) {
- startServer(FitStaticServiceFactory.class);
+ if (pathSplit > 0) {
+ odataServletHolder.setInitParameter(ODataServiceFactory.PATH_SPLIT_LABEL, Integer.toString(pathSplit));
+ }
- if ((server != null) && server.isStarted()) {
- FitStaticServiceFactory.bindService(this, service);
+ final ServletContextHandler contextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
+ contextHandler.setContextPath("/abc");
+ contextHandler.addServlet(odataServletHolder, path + "/*");
+ return contextHandler;
}
- }
- public void startServer(final ODataService service, Class<? extends FitStaticServiceFactory> clazz) {
- startServer(clazz);
+ public void startServer(final ODataService service) {
+ startServer(FitStaticServiceFactory.class);
- if ((server != null) && server.isStarted()) {
- FitStaticServiceFactory.bindService(this, service);
+ if ((server != null) && server.isStarted()) {
+ FitStaticServiceFactory.bindService(this, service);
+ }
}
- }
-
- public void stopServer() {
- try {
- if (server != null) {
- FitStaticServiceFactory.unbindService(this);
- server.stop();
- log.trace("Stopped server at endpoint " + getEndpoint().toASCIIString());
- }
- } catch (final Exception e) {
- throw new ServerRuntimeException(e);
+
+ public void startServer(final ODataService service, Class<? extends FitStaticServiceFactory> clazz) {
+ startServer(clazz);
+
+ if ((server != null) && server.isStarted()) {
+ FitStaticServiceFactory.bindService(this, service);
+ }
+ }
+
+ public void stopServer() {
+ try {
+ if (server != null) {
+ FitStaticServiceFactory.unbindService(this);
+ server.stop();
+ log.trace("Stopped server at endpoint " + getEndpoint().toASCIIString());
+ }
+ } catch (final Exception e) {
+ throw new ServerRuntimeException(e);
+ }
}
- }
}
diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml
index 6cf5a91c..b5b9991d 100644
--- a/odata2-lib/odata-web/pom.xml
+++ b/odata2-lib/odata-web/pom.xml
@@ -47,13 +47,6 @@
</build>
<dependencies>
- <dependency>
- <!-- required because of auto detection of web facet 2.5 -->
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -72,7 +65,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.1</version>
</dependency>
</dependencies>
diff --git a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
index aeef6911..fe4a1e75 100644
--- a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml
@@ -31,7 +31,6 @@
<version.cxf>2.7.6</version.cxf>
<version.servlet-api>2.5</version.servlet-api>
<version.jaxrs-api>2.0-m10</version.jaxrs-api>
- <version.slf4j>1.7.1</version.slf4j>
<version.olingo>2.0.13</version.olingo>
</properties>
@@ -59,8 +58,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.compiler-plugin}</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
<plugin>
@@ -124,16 +123,8 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${version.slf4j}</version>
</dependency>
<!-- Servlet/REST dependencies -->
- <dependency>
- <!-- required because of auto detection of web facet 2.5 -->
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${version.servlet-api}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml
index c94635ba..3eb3b8cd 100644
--- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml
@@ -21,7 +21,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.cxf>2.7.6</version.cxf>
<version.eclipselink>2.5.1</version.eclipselink>
- <version.javax.persistence>2.0.5</version.javax.persistence>
<version.hsqldb>2.3.2</version.hsqldb>
<version.olingo>2.0.13</version.olingo>
</properties>
@@ -77,12 +76,6 @@
</dependency>
<!-- Web Support -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Address.java b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Address.java
index f4dd85f6..f7d876ef 100644
--- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Address.java
+++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Address.java
@@ -21,8 +21,8 @@
#set( $symbol_escape = '\' )
package ${package}.model;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
@Embeddable
public class Address {
diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Car.java b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Car.java
index 11cad177..a75918f4 100644
--- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Car.java
+++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Car.java
@@ -23,14 +23,14 @@ package ${package}.model;
import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
@Entity(name = "Car")
public class Car {
diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Driver.java b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Driver.java
index 62fd6b96..f8a9f869 100644
--- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Driver.java
+++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Driver.java
@@ -23,13 +23,13 @@ package ${package}.model;
import java.util.Calendar;
-import javax.persistence.Column;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
@Entity(name = "Driver")
public class Driver {
diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Key.java b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Key.java
index 91e890de..a898fc73 100644
--- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Key.java
+++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Key.java
@@ -23,8 +23,8 @@ package ${package}.model;
import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
@Embeddable
public class Key implements Serializable {
diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Manufacturer.java b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Manufacturer.java
index 36d48652..23756df1 100644
--- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Manufacturer.java
+++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/model/Manufacturer.java
@@ -25,14 +25,14 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
/**
*
diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/service/ODataJPACarServiceFactory.java b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/service/ODataJPACarServiceFactory.java
index b057d5b5..ff5a23f7 100644
--- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/service/ODataJPACarServiceFactory.java
+++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/java/service/ODataJPACarServiceFactory.java
@@ -28,11 +28,11 @@ import java.util.HashMap;
import java.util.Map;
import org.eclipse.persistence.config.PersistenceUnitProperties;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
+import jakarta.naming.InitialContext;
+import jakarta.naming.NamingException;
import javax.sql.DataSource;
import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext;
@@ -133,7 +133,7 @@ public class ODataJPACarServiceFactory extends ODataJPAServiceFactory {
Persistence.createEntityManagerFactory(PUNIT_NAME_DEFAULT, properties);
emf.createEntityManager();
return new EmfHolder(emf, PUNIT_NAME_DEFAULT);
- } catch (javax.persistence.PersistenceException e) {
+ } catch (jakarta.persistence.PersistenceException e) {
return new EmfHolder(Persistence.createEntityManagerFactory(PUNIT_NAME), PUNIT_NAME);
} catch (NamingException e) {
return new EmfHolder(Persistence.createEntityManagerFactory(PUNIT_NAME), PUNIT_NAME);
diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
index b4980743..8ace3de9 100644
--- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
+++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
@@ -21,10 +21,10 @@
<class>${package}.model.Car</class>
<class>${package}.model.Manufacturer</class>
<properties>
- <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" />
- <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:mem:org.apache.olingo.jpa.sample" />
- <property name="javax.persistence.jdbc.user" value="sa" />
- <property name="javax.persistence.jdbc.password" value="" />
+ <property name="jakarta.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" />
+ <property name="jakarta.persistence.jdbc.url" value="jdbc:hsqldb:mem:org.apache.olingo.jpa.sample" />
+ <property name="jakarta.persistence.jdbc.user" value="sa" />
+ <property name="jakarta.persistence.jdbc.password" value="" />
<property name="eclipselink.target-database" value="org.eclipse.persistence.platform.database.HSQLPlatform" />
<property name="eclipselink.logging.level" value="ALL" />
<property name="eclipselink.orm.throw.exceptions" value="true" />
diff --git a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
index 1db10810..7320df85 100644
--- a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml
@@ -19,7 +19,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.cxf>2.7.6</version.cxf>
- <version.slf4j>1.7.1</version.slf4j>
<version.olingo>2.0.13</version.olingo>
</properties>
@@ -51,8 +50,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
<plugin>
@@ -76,12 +75,6 @@
<artifactId>olingo-odata2-core</artifactId>
<version>${version.olingo}</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -90,12 +83,10 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${version.slf4j}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${version.slf4j}</version>
</dependency>
</dependencies>
</project>
diff --git a/odata2-spring/pom.xml b/odata2-spring/pom.xml
index 45de46d7..46ae2608 100755
--- a/odata2-spring/pom.xml
+++ b/odata2-spring/pom.xml
@@ -25,7 +25,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -56,26 +55,18 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
diff --git a/pom.xml b/pom.xml
index d0e544c0..326fbbb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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
+<!-- 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. -->
-<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo</groupId>
@@ -49,39 +56,38 @@
<maven.compiler.release>8</maven.compiler.release>
<javadoc.phase>package</javadoc.phase>
- <!-- required for correct Sonar coverage data reporting (list of artifactIds) -->
- <projectsToInstrument>org.apache.olingo.odata2.api,org.apache.olingo.odata2.core,org.apache.olingo.odata2.ref</projectsToInstrument>
+ <!-- required for correct Sonar coverage data reporting (list of
+ artifactIds) -->
+ <projectsToInstrument>
+ org.apache.olingo.odata2.api,org.apache.olingo.odata2.core,org.apache.olingo.odata2.ref</projectsToInstrument>
<sonar.skippedModules>org.apache.olingo.odata2.expr</sonar.skippedModules>
<jax.ws.rs.version>2.0-m10</jax.ws.rs.version>
<!-- <jsr311.version>1.1.1</jsr311.version> -->
<joda.version>2.1</joda.version>
- <cxf.version>2.7.18</cxf.version>
-<!-- <jetty.version>7.6.21.v20160908</jetty.version>-->
- <jetty.version>8.0.4.v20111024</jetty.version>
- <!-- Newer version causes test issues (https://issues.apache.org/jira/browse/OLINGO-1607) -->
- <!-- ServiceResolutionTest.testBaseUriWithEncoding:293->validateServiceRoot:298 -->
- <httpclient.version>4.5.6</httpclient.version>
- <httpcore.version>4.4.16</httpcore.version>
- <slf4j.version>1.7.36</slf4j.version>
+ <!-- <cxf.version>4.0.3</cxf.version> -->
+ <!--<jetty.version>11.0.18</jetty.version>-->
+ <jetty.version>11.0.18</jetty.version>
+ <cxf.version>4.0.3</cxf.version>
+
+ <!-- Newer version causes test issues
+ (https://issues.apache.org/jira/browse/OLINGO-1607) -->
+ <!--
+ ServiceResolutionTest.testBaseUriWithEncoding:293->validateServiceRoot:298 -->
+ <httpclient.version>4.5.14</httpclient.version>
<log4j.version>1.2.17</log4j.version>
- <commonscodec.version>1.6</commonscodec.version>
- <commonslang.version>3.1</commonslang.version>
- <gson.version>2.9.1</gson.version>
- <hsqldb.version>2.5.2</hsqldb.version>
+ <gson.version>2.10.1</gson.version>
+ <hsqldb.version>2.7.2</hsqldb.version>
- <antlr.version>3.4</antlr.version>
+ <antlr.version>3.5.3</antlr.version>
- <mockito.version>1.9.0</mockito.version>
- <junit.version>4.13.2</junit.version>
<xmlunit.version>1.6</xmlunit.version>
- <version.eclipselink>2.7.13</version.eclipselink>
- <version.javax.persistence>2.2.1</version.javax.persistence>
+ <version.eclipselink>4.0.2</version.eclipselink>
- <spring.version>3.2.12.RELEASE</spring.version>
+ <!-- Setting needed for Java 8 release builds -->
+ <additionalparam>-Xdoclint:none</additionalparam>
- <!-- Setting needed for Java 8 release builds -->
- <additionalparam>-Xdoclint:none</additionalparam>
+ <spring.boot.version>3.2.0</spring.boot.version>
</properties>
<modules>
@@ -89,7 +95,7 @@
<module>odata2-jpa-processor</module>
<module>odata2-annotation-processor</module>
<module>odata2-dist</module>
- <module>odata2-sample</module>
+ <!--<module>odata2-sample</module>-->
</modules>
<build>
@@ -100,12 +106,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.9</version>
+ <version>0.15</version>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -114,37 +120,37 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
+ <version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <version>3.6.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10</version>
</plugin>
<plugin>
<groupId>org.antlr</groupId>
@@ -154,27 +160,27 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
+ <version>5.1.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.5</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
+ <version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
</plugin>
</plugins>
</pluginManagement>
@@ -187,8 +193,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>17</source>
+ <target>17</target>
</configuration>
</plugin>
<plugin>
@@ -270,7 +276,8 @@
<projectName>Apache Olingo</projectName>
</properties>
<resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ <resourceBundle>
+ org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
</resourceBundles>
</configuration>
</execution>
@@ -282,7 +289,8 @@
<webResources>
<resource>
<!-- this is relative to the pom.xml directory -->
- <directory>${project.build.directory}/maven-shared-archive-resources</directory>
+ <directory>
+ ${project.build.directory}/maven-shared-archive-resources</directory>
<includes>
<include>META-INF/*</include>
</includes>
@@ -298,7 +306,8 @@
<excludes>
<exclude>org/apache/olingo/odata2/**/api/**/*.class</exclude>
<exclude>org/apache/olingo/odata2/**/ref/**/*.class</exclude>
- <exclude>org/apache/olingo/odata2/**/testutil/**/*.class</exclude>
+ <exclude>
+ org/apache/olingo/odata2/**/testutil/**/*.class</exclude>
</excludes>
</instrumentation>
</configuration>
@@ -307,17 +316,17 @@
</build>
<profiles>
- <profile>
+ <profile>
<id>spring</id>
- <modules>
- <module>odata2-spring</module>
- </modules>
+ <modules>
+ <module>odata2-spring</module>
+ </modules>
</profile>
<profile>
<id>build.fast</id>
<properties>
<maven.test.skip>true</maven.test.skip>
- <javadoc.phase/>
+ <javadoc.phase />
</properties>
</profile>
<profile>
@@ -372,7 +381,7 @@
<exclude>**/goal.txt</exclude>
<exclude>**/target/**</exclude>
<exclude>**/*.iml</exclude>
- <exclude>.repository/**</exclude>
+ <exclude>.repository/**</exclude>
</excludes>
</configuration>
</execution>
@@ -398,13 +407,15 @@
<configuration>
<tags>
<tag>
- <name>org.apache.olingo.odata2.DoNotImplement</name>
+ <name>
+ org.apache.olingo.odata2.DoNotImplement</name>
<placement>a</placement>
- <head>Do not implement this interface or derive from class.</head>
+ <head>Do not implement this
+ interface or derive from class.</head>
</tag>
</tags>
<excludePackageNames>
- org.apache.olingo.odata2.core:org.apache.olingo.odata2.core.*:org.apache.olingo.odata2.jpa.processor.core:org.apache.olingo.odata2.jpa.processor.core.*:org.apache.olingo.odata2.annotation.processor.core:org.apache.olingo.odata2.annotation.processor.core.*:org.apache.olingo.odata2.testutil:org.apache.olingo.odata2.testutil.*
+ org.apache.olingo.odata2.core:org.apache.olingo.odata2.core.*:org.apache.olingo.odata2.jpa.processor.core:org.apache.olingo.odata2.jpa.processor.core.*:org.apache.olingo.odata2.annotation.processor.core:org.apache.olingo.odata2.annotation.processor.core.*:org.apache.olingo.odata2.testutil:org.apache.olingo.odata2.testutil.*
</excludePackageNames>
<additionalJOptions>
<additionalJOption>-quiet</additionalJOption>
@@ -412,27 +423,34 @@
<groups>
<group>
<title>OData Lib</title>
- <packages>org.apache.olingo.odata2.api:org.apache.olingo.odata2.api.*</packages>
+ <packages>
+ org.apache.olingo.odata2.api:org.apache.olingo.odata2.api.*</packages>
</group>
<group>
<title>OData Reference Scenario</title>
- <packages>org.apache.olingo.odata2.ref:org.apache.olingo.odata2.ref.*</packages>
+ <packages>
+ org.apache.olingo.odata2.ref:org.apache.olingo.odata2.ref.*</packages>
</group>
<group>
<title>OData JPA Processor</title>
- <packages>org.apache.olingo.odata2.jpa.processor.api:org.apache.olingo.odata2.jpa.processor.api.*</packages>
+ <packages>
+ org.apache.olingo.odata2.jpa.processor.api:org.apache.olingo.odata2.jpa.processor.api.*</packages>
</group>
<group>
<title>OData Annotation Processor</title>
- <packages>org.apache.olingo.odata2.annotation.processor.api:org.apache.olingo.odata2.annotation.processor.api.*</packages>
+ <packages>
+ org.apache.olingo.odata2.annotation.processor.api:org.apache.olingo.odata2.annotation.processor.api.*</packages>
</group>
<group>
<title>OData JPA Reference Scenario</title>
- <packages>org.apache.olingo.odata2.jpa.processor.ref:org.apache.olingo.odata2.jpa.processor.ref.*</packages>
+ <packages>
+ org.apache.olingo.odata2.jpa.processor.ref:org.apache.olingo.odata2.jpa.processor.ref.*</packages>
</group>
<group>
- <title>OData Annotation Reference Scenario</title>
- <packages>org.apache.olingo.odata2.annotation.processor.ref:org.apache.olingo.odata2.annotation.processor.ref.*</packages>
+ <title>OData Annotation Reference
+ Scenario</title>
+ <packages>
+ org.apache.olingo.odata2.annotation.processor.ref:org.apache.olingo.odata2.annotation.processor.ref.*</packages>
</group>
</groups>
</configuration>
@@ -444,39 +462,51 @@
</profile>
</profiles>
- <repositories>
- <repository>
- <id>oss.sonatype.org</id>
- <name>OSS Sonatype Staging</name>
- <url>https://oss.sonatype.org/content/groups/staging</url>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>oss.sonatype.org</id>
+ <name>OSS Sonatype Staging</name>
+ <url>https://oss.sonatype.org/content/groups/staging</url>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring.boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>${xmlunit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>12.0.4</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito.version}</version>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>${xmlunit.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <distributionManagement>
- <repository>
- <id>github</id>
- <name>GitHub Apache Maven Packages</name>
- <url>https://maven.pkg.github.com/dirigiblelabs/olingo-odata2</url>
- </repository>
+ <distributionManagement>
+ <repository>
+ <id>github</id>
+ <name>GitHub Apache Maven Packages</name>
+ <url>https://maven.pkg.github.com/dirigiblelabs/olingo-odata2</url>
+ </repository>
</distributionManagement>
</project>
(olingo-odata2) 28/29: more adaptations
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 5d7914ce329b61a059d18c3cbfa02e1f10969bf7
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Thu Dec 14 12:54:21 2023 +0200
more adaptations
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.../processor/ref/model/ResourceHelper.java | 134 ++-
.../processor/ref/AbstractRefXmlTest.java | 118 ++-
.../api/model/mapping/JPAAttributeMapType.java | 273 +++---
.../api/model/mapping/JPAEdmMappingModel.java | 80 +-
.../model/mapping/JPAEdmMappingModelFactory.java | 130 ++-
.../model/mapping/JPAEmbeddableTypeMapType.java | 224 +++--
.../model/mapping/JPAEmbeddableTypesMapType.java | 97 +--
.../api/model/mapping/JPAEntityTypeMapType.java | 335 ++++----
.../api/model/mapping/JPAEntityTypesMapType.java | 97 +--
.../model/mapping/JPAPersistenceUnitMapType.java | 214 +++--
.../api/model/mapping/JPARelationshipMapType.java | 223 +++--
odata2-jpa-processor/jpa-core/pom.xml | 8 +-
.../jpa/processor/core/access/data/JPAEntity.java | 930 ++++++++++-----------
.../core/access/model/JPATypeConverter.java | 4 +-
.../core/access/data/JPAEntityParserTest.java | 17 +-
.../processor/core/mock/ODataJPAContextMock.java | 187 +++--
.../mock/data/EntityWithXmlAdapterOnProperty.java | 2 +-
.../jpa/processor/core/mock/data/JPATypeMock.java | 2 +-
.../jpa/processor/core/mock/data/XmlAdapter.java | 47 +-
19 files changed, 1511 insertions(+), 1611 deletions(-)
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/model/ResourceHelper.java b/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/model/ResourceHelper.java
index 7d64bc41..8fc4dc27 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/model/ResourceHelper.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/model/ResourceHelper.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.annotation.processor.ref.model;
@@ -23,7 +19,6 @@ import java.awt.image.WritableRaster;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-
import javax.imageio.ImageIO;
/**
@@ -31,66 +26,67 @@ import javax.imageio.ImageIO;
*/
public class ResourceHelper {
- public static byte[] loadAsByte(final String resource) {
- return load(resource, new byte[0]);
- }
-
- public static byte[] load(final String resource, final byte[] defaultResult) {
- InputStream instream = null;
- try {
- instream = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
- if (instream == null) {
- return defaultResult;
- }
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
- int b = 0;
- while ((b = instream.read()) != -1) {
- stream.write(b);
- }
+ public static byte[] loadAsByte(final String resource) {
+ return load(resource, new byte[0]);
+ }
- return stream.toByteArray();
- } catch (IOException e) {
- throw new RuntimeException(e);
- } finally {
- if (instream != null) {
+ public static byte[] load(final String resource, final byte[] defaultResult) {
+ InputStream instream = null;
try {
- instream.close();
- } catch (IOException ex) {}
- }
+ instream = ResourceHelper.class.getResourceAsStream(resource);
+ if (instream == null) {
+ return defaultResult;
+ }
+ ByteArrayOutputStream stream = new ByteArrayOutputStream();
+ int b = 0;
+ while ((b = instream.read()) != -1) {
+ stream.write(b);
+ }
+
+ return stream.toByteArray();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ if (instream != null) {
+ try {
+ instream.close();
+ } catch (IOException ex) {
+ }
+ }
+ }
+ }
+
+ public enum Format {
+ BMP, JPEG, PNG, GIF
}
- }
- public enum Format {
- BMP, JPEG, PNG, GIF
- };
+ public static byte[] generateImage() {
+ return generateImage(Format.PNG);
+ }
- public static byte[] generateImage() {
- return generateImage(Format.PNG);
- }
+ public static byte[] generateImage(final Format format) {
+ try {
+ int width = 320;
+ int height = 320;
+ BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_BYTE_BINARY);
+ WritableRaster raster = image.getRaster();
- public static byte[] generateImage(final Format format) {
- try {
- int width = 320;
- int height = 320;
- BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_BYTE_BINARY);
- WritableRaster raster = image.getRaster();
+ int mod = format.ordinal() + 2;
+ for (int h = 0; h < height; h++) {
+ for (int w = 0; w < width; w++) {
+ if (((h / 32) + (w / 32)) % mod == 0) {
+ raster.setSample(w, h, 0, 0);
+ } else {
+ raster.setSample(w, h, 0, 1);
+ }
+ }
+ }
- int mod = format.ordinal() + 2;
- for (int h = 0; h < height; h++) {
- for (int w = 0; w < width; w++) {
- if (((h / 32) + (w / 32)) % mod == 0) {
- raster.setSample(w, h, 0, 0);
- } else {
- raster.setSample(w, h, 0, 1);
- }
+ ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
+ ImageIO.write(image, format.name(), out);
+ return out.toByteArray();
+ } catch (IOException ex) {
+ return new byte[0];
}
- }
-
- ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
- ImageIO.write(image, format.name(), out);
- return out.toByteArray();
- } catch (IOException ex) {
- return new byte[0];
}
- }
}
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefXmlTest.java b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefXmlTest.java
index 635e605b..13867b9c 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefXmlTest.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/AbstractRefXmlTest.java
@@ -1,30 +1,24 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.annotation.processor.ref;
import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
-
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.edm.Edm;
@@ -38,59 +32,59 @@ import org.xml.sax.SAXException;
/**
* Abstract base class for tests employing the reference scenario reading or writing XML.
- *
+ *
*/
@Ignore("no test methods")
public class AbstractRefXmlTest extends AbstractRefTest {
- public AbstractRefXmlTest(final ServletType servletType) {
- super(servletType);
- }
-
- @Before
- public void setXmlNamespacePrefixes() {
- Map<String, String> prefixMap = new HashMap<String, String>();
- prefixMap.put(Edm.PREFIX_ATOM, Edm.NAMESPACE_ATOM_2005);
- prefixMap.put(Edm.PREFIX_APP, Edm.NAMESPACE_APP_2007);
- prefixMap.put(Edm.PREFIX_D, Edm.NAMESPACE_D_2007_08);
- prefixMap.put(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08);
- prefixMap.put(Edm.PREFIX_EDM, Edm.NAMESPACE_EDM_2008_09);
- prefixMap.put(Edm.PREFIX_EDMX, Edm.NAMESPACE_EDMX_2007_06);
- prefixMap.put(Edm.PREFIX_XML, Edm.NAMESPACE_XML_1998);
- XMLUnit.setXpathNamespaceContext(new SimpleNamespaceContext(prefixMap));
- }
-
- @Override
- protected void badRequest(final String uri) throws Exception {
- final HttpResponse response = callUri(uri, HttpStatusCodes.BAD_REQUEST);
- validateXmlError(getBody(response));
- }
+ public AbstractRefXmlTest(final ServletType servletType) {
+ super(servletType);
+ }
- @Override
- protected void notFound(final String uri) throws Exception {
- final HttpResponse response = callUri(uri, HttpStatusCodes.NOT_FOUND);
- validateXmlError(getBody(response));
- }
+ @Before
+ public void setXmlNamespacePrefixes() {
+ Map<String, String> prefixMap = new HashMap<String, String>();
+ prefixMap.put(Edm.PREFIX_ATOM, Edm.NAMESPACE_ATOM_2005);
+ prefixMap.put(Edm.PREFIX_APP, Edm.NAMESPACE_APP_2007);
+ prefixMap.put(Edm.PREFIX_D, Edm.NAMESPACE_D_2007_08);
+ prefixMap.put(Edm.PREFIX_M, Edm.NAMESPACE_M_2007_08);
+ prefixMap.put(Edm.PREFIX_EDM, Edm.NAMESPACE_EDM_2008_09);
+ prefixMap.put(Edm.PREFIX_EDMX, Edm.NAMESPACE_EDMX_2007_06);
+ prefixMap.put(Edm.PREFIX_XML, Edm.NAMESPACE_XML_1998);
+ XMLUnit.setXpathNamespaceContext(new SimpleNamespaceContext(prefixMap));
+ }
- protected void validateXmlError(final String xml) throws XpathException, IOException, SAXException {
- assertXpathExists("/m:error", xml);
- assertXpathExists("/m:error/m:code", xml);
- assertXpathExists("/m:error/m:message[@xml:lang=\"en\"]", xml);
- }
+ @Override
+ protected void badRequest(final String uri) throws Exception {
+ final HttpResponse response = callUri(uri, HttpStatusCodes.BAD_REQUEST);
+ validateXmlError(getBody(response));
+ }
- protected String readFile(final String filename) throws IOException {
- InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(filename);
- if (in == null) {
- throw new IOException("Requested file '" + filename + "' was not found.");
+ @Override
+ protected void notFound(final String uri) throws Exception {
+ final HttpResponse response = callUri(uri, HttpStatusCodes.NOT_FOUND);
+ validateXmlError(getBody(response));
}
- byte[] tmp = new byte[8192];
- int count = in.read(tmp);
- StringBuffer b = new StringBuffer();
- while (count >= 0) {
- b.append(new String(tmp, 0, count));
- count = in.read(tmp);
+ protected void validateXmlError(final String xml) throws XpathException, IOException, SAXException {
+ assertXpathExists("/m:error", xml);
+ assertXpathExists("/m:error/m:code", xml);
+ assertXpathExists("/m:error/m:message[@xml:lang=\"en\"]", xml);
}
- return b.toString();
- }
+ protected String readFile(final String filename) throws IOException {
+ InputStream in = AbstractRefXmlTest.class.getResourceAsStream(filename);
+ if (in == null) {
+ throw new IOException("Requested file '" + filename + "' was not found.");
+ }
+
+ byte[] tmp = new byte[8192];
+ int count = in.read(tmp);
+ StringBuffer b = new StringBuffer();
+ while (count >= 0) {
+ b.append(new String(tmp, 0, count));
+ count = in.read(tmp);
+ }
+
+ return b.toString();
+ }
}
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAAttributeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAAttributeMapType.java
index e7bcbe97..302a51d6 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAAttributeMapType.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAAttributeMapType.java
@@ -1,26 +1,21 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.api.model.mapping;
import java.util.ArrayList;
import java.util.List;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -29,17 +24,17 @@ import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
/**
- *
- * The default name for EDM
- * property is derived from JPA attribute name. This can be overriden
- * using
+ *
+ * The default name for EDM property is derived from JPA attribute name. This can be overriden using
* JPAAttributeMapType.
- *
- *
- * <p>Java class for JPAAttributeMapType complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
+ *
+ * <p>
+ * Java class for JPAAttributeMapType complex type.
+ *
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ *
* <pre>
* <complexType name="JPAAttributeMapType">
* <complexContent>
@@ -60,143 +55,139 @@ import javax.xml.bind.annotation.XmlValue;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JPAAttributeMapType", propOrder = { "jpaAttribute" })
+@XmlType(name = "JPAAttributeMapType", propOrder = {"jpaAttribute"})
public class JPAAttributeMapType {
- @XmlElement(name = "JPAAttribute")
- protected List<JPAAttributeMapType.JPAAttribute> jpaAttribute;
-
- /**
- * Gets the value of the jpaAttribute property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the jpaAttribute property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getJPAAttribute().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list {@link JPAAttributeMapType.JPAAttribute }
- *
- *
- */
- public List<JPAAttributeMapType.JPAAttribute> getJPAAttribute() {
- if (jpaAttribute == null) {
- jpaAttribute = new ArrayList<JPAAttributeMapType.JPAAttribute>();
- }
- return jpaAttribute;
- }
-
- /**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType>
- * <simpleContent>
- * <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * </extension>
- * </simpleContent>
- * </complexType>
- * </pre>
- *
- *
- */
- @XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = { "value" })
- public static class JPAAttribute {
-
- @XmlValue
- protected String value;
- @XmlAttribute(name = "name", required = true)
- protected String name;
- @XmlAttribute(name = "exclude")
- protected Boolean exclude;
+ @XmlElement(name = "JPAAttribute")
+ protected List<JPAAttributeMapType.JPAAttribute> jpaAttribute;
/**
- * Gets the value of the value property.
+ * Gets the value of the jpaAttribute property.
*
- * @return
- * possible object is {@link String }
+ * <p>
+ * This accessor method returns a reference to the live list, not a snapshot. Therefore any
+ * modification you make to the returned list will be present inside the JAXB object. This is why
+ * there is not a <CODE>set</CODE> method for the jpaAttribute property.
*
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
+ * <p>
+ * For example, to add a new item, do as follows:
+ *
+ * <pre>
+ * getJPAAttribute().add(newItem);
+ * </pre>
*
- * @param value
- * allowed object is {@link String }
*
- */
- public void setValue(final String value) {
- this.value = value;
- }
-
- /**
- * Gets the value of the name property.
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link JPAAttributeMapType.JPAAttribute }
*
- * @return
- * possible object is {@link String }
*
*/
- public String getName() {
- return name;
+ public List<JPAAttributeMapType.JPAAttribute> getJPAAttribute() {
+ if (jpaAttribute == null) {
+ jpaAttribute = new ArrayList<JPAAttributeMapType.JPAAttribute>();
+ }
+ return jpaAttribute;
}
/**
- * Sets the value of the name property.
+ * <p>
+ * Java class for anonymous complex type.
*
- * @param value
- * allowed object is {@link String }
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
*
- */
- public void setName(final String value) {
- name = value;
- }
-
- /**
- * Gets the value of the exclude property.
+ * <pre>
+ * <complexType>
+ * <simpleContent>
+ * <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ * </extension>
+ * </simpleContent>
+ * </complexType>
+ * </pre>
*
- * @return
- * possible object is {@link Boolean }
*
*/
- public boolean isExclude() {
- if (exclude == null) {
- return false;
- } else {
- return exclude;
- }
- }
+ @XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder = {"value"})
+ public static class JPAAttribute {
- /**
- * Sets the value of the exclude property.
- *
- * @param value
- * allowed object is {@link Boolean }
- *
- */
- public void setExclude(final Boolean value) {
- exclude = value;
- }
+ @XmlValue
+ protected String value;
+ @XmlAttribute(name = "name", required = true)
+ protected String name;
+ @XmlAttribute(name = "exclude")
+ protected Boolean exclude;
- }
+ /**
+ * Gets the value of the value property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setValue(final String value) {
+ this.value = value;
+ }
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setName(final String value) {
+ name = value;
+ }
+
+ /**
+ * Gets the value of the exclude property.
+ *
+ * @return possible object is {@link Boolean }
+ *
+ */
+ public boolean isExclude() {
+ if (exclude == null) {
+ return false;
+ }
+ return exclude;
+ }
+
+ /**
+ * Sets the value of the exclude property.
+ *
+ * @param value allowed object is {@link Boolean }
+ *
+ */
+ public void setExclude(final Boolean value) {
+ exclude = value;
+ }
+
+ }
}
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java
index a4175d48..1d585dfd 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.api.model.mapping;
@@ -27,11 +23,10 @@ import javax.xml.bind.annotation.XmlType;
/**
* <p>
* Java class for anonymous complex type.
- *
+ *
* <p>
- * The following schema fragment specifies the expected content contained within
- * this class.
- *
+ * The following schema fragment specifies the expected content contained within this class.
+ *
* <pre>
* <complexType>
* <complexContent>
@@ -44,36 +39,35 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = { "persistenceUnit" })
+@XmlType(name = "", propOrder = {"persistenceUnit"})
@XmlRootElement(name = "JPAEDMMappingModel")
public class JPAEdmMappingModel {
- @XmlElement(name = "PersistenceUnit", required = true)
- protected JPAPersistenceUnitMapType persistenceUnit;
+ @XmlElement(name = "PersistenceUnit", required = true)
+ protected JPAPersistenceUnitMapType persistenceUnit;
- /**
- * Gets the value of the persistenceUnit property.
- *
- * @return possible object is {@link JPAPersistenceUnitMapType }
- *
- */
- public JPAPersistenceUnitMapType getPersistenceUnit() {
- return persistenceUnit;
- }
+ /**
+ * Gets the value of the persistenceUnit property.
+ *
+ * @return possible object is {@link JPAPersistenceUnitMapType }
+ *
+ */
+ public JPAPersistenceUnitMapType getPersistenceUnit() {
+ return persistenceUnit;
+ }
- /**
- * Sets the value of the persistenceUnit property.
- *
- * @param value
- * allowed object is {@link JPAPersistenceUnitMapType }
- *
- */
- public void setPersistenceUnit(final JPAPersistenceUnitMapType value) {
- persistenceUnit = value;
- }
+ /**
+ * Sets the value of the persistenceUnit property.
+ *
+ * @param value allowed object is {@link JPAPersistenceUnitMapType }
+ *
+ */
+ public void setPersistenceUnit(final JPAPersistenceUnitMapType value) {
+ persistenceUnit = value;
+ }
}
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java
index 84f8b282..5f2683aa 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java
@@ -1,85 +1,83 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.api.model.mapping;
import javax.xml.bind.annotation.XmlRegistry;
/**
- * This object contains factory methods for each Java content interface and Java
- * element interface generated in the
- * org.apache.olingo.odata2.processor.api.jpa.model.mapping package.
+ * This object contains factory methods for each Java content interface and Java element interface
+ * generated in the org.apache.olingo.odata2.processor.api.jpa.model.mapping package.
* <p>
- * An ObjectFactory allows you to programatically construct new instances of the
- * Java representation for XML content. The Java representation of XML content
- * can consist of schema derived interfaces and classes representing the binding
- * of schema type definitions, element declarations and model groups. Factory
- * methods for each of these are provided in this class.
- *
+ * An ObjectFactory allows you to programatically construct new instances of the Java representation
+ * for XML content. The Java representation of XML content can consist of schema derived interfaces
+ * and classes representing the binding of schema type definitions, element declarations and model
+ * groups. Factory methods for each of these are provided in this class.
+ *
*/
@XmlRegistry
public class JPAEdmMappingModelFactory {
- /**
- * Create a new ObjectFactory that can be used to create new instances of
- * schema derived classes for package:
- * org.apache.olingo.odata2.processor.api.jpa.model.mapping
- *
- */
- public JPAEdmMappingModelFactory() {}
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for
+ * package: org.apache.olingo.odata2.processor.api.jpa.model.mapping
+ *
+ */
+ public JPAEdmMappingModelFactory() {}
- /**
- * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPARelationshipMapType }
- *
- */
- public JPARelationshipMapType createJPARelationshipMapType() {
- return new JPARelationshipMapType();
- }
+ /**
+ * Create an instance of
+ * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPARelationshipMapType }
+ *
+ */
+ public JPARelationshipMapType createJPARelationshipMapType() {
+ return new JPARelationshipMapType();
+ }
- /**
- * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAAttributeMapType }
- *
- */
- public JPAAttributeMapType createJPAAttributeMapType() {
- return new JPAAttributeMapType();
- }
+ /**
+ * Create an instance of
+ * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAAttributeMapType }
+ *
+ */
+ public JPAAttributeMapType createJPAAttributeMapType() {
+ return new JPAAttributeMapType();
+ }
- /**
- * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEdmMappingModel }
- *
- */
- public JPAEdmMappingModel createJPAEDMMappingModel() {
- return new JPAEdmMappingModel();
- }
+ /**
+ * Create an instance of
+ * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEdmMappingModel }
+ *
+ */
+ public JPAEdmMappingModel createJPAEDMMappingModel() {
+ return new JPAEdmMappingModel();
+ }
- /**
- * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAPersistenceUnitMapType }
- *
- */
- public JPAPersistenceUnitMapType createJPAPersistenceUnitMapType() {
- return new JPAPersistenceUnitMapType();
- }
+ /**
+ * Create an instance of
+ * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAPersistenceUnitMapType }
+ *
+ */
+ public JPAPersistenceUnitMapType createJPAPersistenceUnitMapType() {
+ return new JPAPersistenceUnitMapType();
+ }
- /**
- * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEmbeddableTypeMapType }
- *
- */
- public JPAEmbeddableTypeMapType createJPAEmbeddableTypeMapType() {
- return new JPAEmbeddableTypeMapType();
- }
+ /**
+ * Create an instance of
+ * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEmbeddableTypeMapType }
+ *
+ */
+ public JPAEmbeddableTypeMapType createJPAEmbeddableTypeMapType() {
+ return new JPAEmbeddableTypeMapType();
+ }
}
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java
index e6406738..024ea5ae 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.api.model.mapping;
@@ -25,16 +21,17 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
- *
- * The default name for EDM
- * complex type is derived from JPA Embeddable type name. This can be
+ *
+ * The default name for EDM complex type is derived from JPA Embeddable type name. This can be
* overriden using JPAEmbeddableTypeMapType.
- *
- *
- * <p>Java class for JPAEmbeddableTypeMapType complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
+ *
+ * <p>
+ * Java class for JPAEmbeddableTypeMapType complex type.
+ *
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ *
* <pre>
* <complexType name="JPAEmbeddableTypeMapType">
* <complexContent>
@@ -50,112 +47,103 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JPAEmbeddableTypeMapType", propOrder = { "edmComplexType", "jpaAttributes" })
+@XmlType(name = "JPAEmbeddableTypeMapType", propOrder = {"edmComplexType", "jpaAttributes"})
public class JPAEmbeddableTypeMapType {
- @XmlElement(name = "EDMComplexType")
- protected String edmComplexType;
- @XmlElement(name = "JPAAttributes", required = true)
- protected JPAAttributeMapType jpaAttributes;
- @XmlAttribute(name = "name", required = true)
- protected String name;
- @XmlAttribute(name = "exclude")
- protected Boolean exclude;
+ @XmlElement(name = "EDMComplexType")
+ protected String edmComplexType;
+ @XmlElement(name = "JPAAttributes", required = true)
+ protected JPAAttributeMapType jpaAttributes;
+ @XmlAttribute(name = "name", required = true)
+ protected String name;
+ @XmlAttribute(name = "exclude")
+ protected Boolean exclude;
- /**
- * Gets the value of the edmComplexType property.
- *
- * @return
- * possible object is {@link String }
- *
- */
- public String getEDMComplexType() {
- return edmComplexType;
- }
+ /**
+ * Gets the value of the edmComplexType property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getEDMComplexType() {
+ return edmComplexType;
+ }
- /**
- * Sets the value of the edmComplexType property.
- *
- * @param value
- * allowed object is {@link String }
- *
- */
- public void setEDMComplexType(final String value) {
- edmComplexType = value;
- }
+ /**
+ * Sets the value of the edmComplexType property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setEDMComplexType(final String value) {
+ edmComplexType = value;
+ }
- /**
- * Gets the value of the jpaAttributes property.
- *
- * @return
- * possible object is {@link JPAAttributeMapType }
- *
- */
- public JPAAttributeMapType getJPAAttributes() {
- return jpaAttributes;
- }
+ /**
+ * Gets the value of the jpaAttributes property.
+ *
+ * @return possible object is {@link JPAAttributeMapType }
+ *
+ */
+ public JPAAttributeMapType getJPAAttributes() {
+ return jpaAttributes;
+ }
- /**
- * Sets the value of the jpaAttributes property.
- *
- * @param value
- * allowed object is {@link JPAAttributeMapType }
- *
- */
- public void setJPAAttributes(final JPAAttributeMapType value) {
- jpaAttributes = value;
- }
+ /**
+ * Sets the value of the jpaAttributes property.
+ *
+ * @param value allowed object is {@link JPAAttributeMapType }
+ *
+ */
+ public void setJPAAttributes(final JPAAttributeMapType value) {
+ jpaAttributes = value;
+ }
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is {@link String }
- *
- */
- public String getName() {
- return name;
- }
+ /**
+ * Gets the value of the name property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is {@link String }
- *
- */
- public void setName(final String value) {
- name = value;
- }
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setName(final String value) {
+ name = value;
+ }
- /**
- * Gets the value of the exclude property.
- *
- * @return
- * possible object is {@link Boolean }
- *
- */
- public boolean isExclude() {
- if (exclude == null) {
- return false;
- } else {
- return exclude;
+ /**
+ * Gets the value of the exclude property.
+ *
+ * @return possible object is {@link Boolean }
+ *
+ */
+ public boolean isExclude() {
+ if (exclude == null) {
+ return false;
+ }
+ return exclude;
}
- }
- /**
- * Sets the value of the exclude property.
- *
- * @param value
- * allowed object is {@link Boolean }
- *
- */
- public void setExclude(final Boolean value) {
- exclude = value;
- }
+ /**
+ * Sets the value of the exclude property.
+ *
+ * @param value allowed object is {@link Boolean }
+ *
+ */
+ public void setExclude(final Boolean value) {
+ exclude = value;
+ }
}
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java
index 62931244..6dcfb8a6 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java
@@ -1,26 +1,21 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.api.model.mapping;
import java.util.ArrayList;
import java.util.List;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
@@ -29,11 +24,10 @@ import javax.xml.bind.annotation.XmlType;
/**
* <p>
* Java class for JPAEmbeddableTypesMapType complex type.
- *
+ *
* <p>
- * The following schema fragment specifies the expected content contained within
- * this class.
- *
+ * The following schema fragment specifies the expected content contained within this class.
+ *
* <pre>
* <complexType name="JPAEmbeddableTypesMapType">
* <complexContent>
@@ -47,43 +41,42 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JPAEmbeddableTypesMapType", propOrder = { "jpaEmbeddableType" })
+@XmlType(name = "JPAEmbeddableTypesMapType", propOrder = {"jpaEmbeddableType"})
public class JPAEmbeddableTypesMapType {
- @XmlElement(name = "JPAEmbeddableType")
- protected List<JPAEmbeddableTypeMapType> jpaEmbeddableType;
+ @XmlElement(name = "JPAEmbeddableType")
+ protected List<JPAEmbeddableTypeMapType> jpaEmbeddableType;
- /**
- * Gets the value of the jpaEmbeddableType property.
- *
- * <p>
- * This accessor method returns a reference to the live list, not a
- * snapshot. Therefore any modification you make to the returned list will
- * be present inside the JAXB object. This is why there is not a
- * <CODE>set</CODE> method for the jpaEmbeddableType property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- *
- * <pre>
- * getJPAEmbeddableType().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list {@link JPAEmbeddableTypeMapType }
- *
- *
- */
- public List<JPAEmbeddableTypeMapType> getJPAEmbeddableType() {
- if (jpaEmbeddableType == null) {
- jpaEmbeddableType = new ArrayList<JPAEmbeddableTypeMapType>();
+ /**
+ * Gets the value of the jpaEmbeddableType property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list, not a snapshot. Therefore any
+ * modification you make to the returned list will be present inside the JAXB object. This is why
+ * there is not a <CODE>set</CODE> method for the jpaEmbeddableType property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ *
+ * <pre>
+ * getJPAEmbeddableType().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list {@link JPAEmbeddableTypeMapType }
+ *
+ *
+ */
+ public List<JPAEmbeddableTypeMapType> getJPAEmbeddableType() {
+ if (jpaEmbeddableType == null) {
+ jpaEmbeddableType = new ArrayList<JPAEmbeddableTypeMapType>();
+ }
+ return jpaEmbeddableType;
}
- return jpaEmbeddableType;
- }
}
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java
index 22e18192..fe6173c8 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.api.model.mapping;
@@ -25,16 +21,17 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
- *
- * The default name for EDM
- * entity type is derived from JPA entity type name. This can be
- * overriden using JPAEntityTypeMapType.
- *
- *
- * <p>Java class for JPAEntityTypeMapType complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
+ * The default name for EDM entity type is derived from JPA entity type name. This can be overriden
+ * using JPAEntityTypeMapType.
+ *
+ *
+ * <p>
+ * Java class for JPAEntityTypeMapType complex type.
+ *
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ *
* <pre>
* <complexType name="JPAEntityTypeMapType">
* <complexContent>
@@ -53,161 +50,147 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JPAEntityTypeMapType", propOrder = { "edmEntityType", "edmEntitySet", "jpaAttributes",
- "jpaRelationships" })
+@XmlType(name = "JPAEntityTypeMapType", propOrder = {"edmEntityType", "edmEntitySet", "jpaAttributes", "jpaRelationships"})
public class JPAEntityTypeMapType {
- @XmlElement(name = "EDMEntityType")
- protected String edmEntityType;
- @XmlElement(name = "EDMEntitySet")
- protected String edmEntitySet;
- @XmlElement(name = "JPAAttributes", required = true)
- protected JPAAttributeMapType jpaAttributes;
- @XmlElement(name = "JPARelationships", required = true)
- protected JPARelationshipMapType jpaRelationships;
- @XmlAttribute(name = "name", required = true)
- protected String name;
- @XmlAttribute(name = "exclude")
- protected Boolean exclude;
-
- /**
- * Gets the value of the edmEntityType property.
- *
- * @return
- * possible object is {@link String }
- *
- */
- public String getEDMEntityType() {
- return edmEntityType;
- }
-
- /**
- * Sets the value of the edmEntityType property.
- *
- * @param value
- * allowed object is {@link String }
- *
- */
- public void setEDMEntityType(final String value) {
- edmEntityType = value;
- }
-
- /**
- * Gets the value of the edmEntitySet property.
- *
- * @return
- * possible object is {@link String }
- *
- */
- public String getEDMEntitySet() {
- return edmEntitySet;
- }
-
- /**
- * Sets the value of the edmEntitySet property.
- *
- * @param value
- * allowed object is {@link String }
- *
- */
- public void setEDMEntitySet(final String value) {
- edmEntitySet = value;
- }
-
- /**
- * Gets the value of the jpaAttributes property.
- *
- * @return
- * possible object is {@link JPAAttributeMapType }
- *
- */
- public JPAAttributeMapType getJPAAttributes() {
- return jpaAttributes;
- }
-
- /**
- * Sets the value of the jpaAttributes property.
- *
- * @param value
- * allowed object is {@link JPAAttributeMapType }
- *
- */
- public void setJPAAttributes(final JPAAttributeMapType value) {
- jpaAttributes = value;
- }
-
- /**
- * Gets the value of the jpaRelationships property.
- *
- * @return
- * possible object is {@link JPARelationshipMapType }
- *
- */
- public JPARelationshipMapType getJPARelationships() {
- return jpaRelationships;
- }
-
- /**
- * Sets the value of the jpaRelationships property.
- *
- * @param value
- * allowed object is {@link JPARelationshipMapType }
- *
- */
- public void setJPARelationships(final JPARelationshipMapType value) {
- jpaRelationships = value;
- }
-
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is {@link String }
- *
- */
- public String getName() {
- return name;
- }
-
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is {@link String }
- *
- */
- public void setName(final String value) {
- name = value;
- }
-
- /**
- * Gets the value of the exclude property.
- *
- * @return
- * possible object is {@link Boolean }
- *
- */
- public boolean isExclude() {
- if (exclude == null) {
- return false;
- } else {
- return exclude;
+ @XmlElement(name = "EDMEntityType")
+ protected String edmEntityType;
+ @XmlElement(name = "EDMEntitySet")
+ protected String edmEntitySet;
+ @XmlElement(name = "JPAAttributes", required = true)
+ protected JPAAttributeMapType jpaAttributes;
+ @XmlElement(name = "JPARelationships", required = true)
+ protected JPARelationshipMapType jpaRelationships;
+ @XmlAttribute(name = "name", required = true)
+ protected String name;
+ @XmlAttribute(name = "exclude")
+ protected Boolean exclude;
+
+ /**
+ * Gets the value of the edmEntityType property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getEDMEntityType() {
+ return edmEntityType;
+ }
+
+ /**
+ * Sets the value of the edmEntityType property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setEDMEntityType(final String value) {
+ edmEntityType = value;
+ }
+
+ /**
+ * Gets the value of the edmEntitySet property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getEDMEntitySet() {
+ return edmEntitySet;
+ }
+
+ /**
+ * Sets the value of the edmEntitySet property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setEDMEntitySet(final String value) {
+ edmEntitySet = value;
+ }
+
+ /**
+ * Gets the value of the jpaAttributes property.
+ *
+ * @return possible object is {@link JPAAttributeMapType }
+ *
+ */
+ public JPAAttributeMapType getJPAAttributes() {
+ return jpaAttributes;
+ }
+
+ /**
+ * Sets the value of the jpaAttributes property.
+ *
+ * @param value allowed object is {@link JPAAttributeMapType }
+ *
+ */
+ public void setJPAAttributes(final JPAAttributeMapType value) {
+ jpaAttributes = value;
+ }
+
+ /**
+ * Gets the value of the jpaRelationships property.
+ *
+ * @return possible object is {@link JPARelationshipMapType }
+ *
+ */
+ public JPARelationshipMapType getJPARelationships() {
+ return jpaRelationships;
+ }
+
+ /**
+ * Sets the value of the jpaRelationships property.
+ *
+ * @param value allowed object is {@link JPARelationshipMapType }
+ *
+ */
+ public void setJPARelationships(final JPARelationshipMapType value) {
+ jpaRelationships = value;
+ }
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setName(final String value) {
+ name = value;
+ }
+
+ /**
+ * Gets the value of the exclude property.
+ *
+ * @return possible object is {@link Boolean }
+ *
+ */
+ public boolean isExclude() {
+ if (exclude == null) {
+ return false;
+ }
+ return exclude;
+ }
+
+ /**
+ * Sets the value of the exclude property.
+ *
+ * @param value allowed object is {@link Boolean }
+ *
+ */
+ public void setExclude(final Boolean value) {
+ exclude = value;
}
- }
-
- /**
- * Sets the value of the exclude property.
- *
- * @param value
- * allowed object is {@link Boolean }
- *
- */
- public void setExclude(final Boolean value) {
- exclude = value;
- }
}
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java
index 7a72e084..5cbd7599 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java
@@ -1,26 +1,21 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.api.model.mapping;
import java.util.ArrayList;
import java.util.List;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
@@ -29,11 +24,10 @@ import javax.xml.bind.annotation.XmlType;
/**
* <p>
* Java class for JPAEntityTypesMapType complex type.
- *
+ *
* <p>
- * The following schema fragment specifies the expected content contained within
- * this class.
- *
+ * The following schema fragment specifies the expected content contained within this class.
+ *
* <pre>
* <complexType name="JPAEntityTypesMapType">
* <complexContent>
@@ -47,43 +41,42 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JPAEntityTypesMapType", propOrder = { "jpaEntityType" })
+@XmlType(name = "JPAEntityTypesMapType", propOrder = {"jpaEntityType"})
public class JPAEntityTypesMapType {
- @XmlElement(name = "JPAEntityType")
- protected List<JPAEntityTypeMapType> jpaEntityType;
+ @XmlElement(name = "JPAEntityType")
+ protected List<JPAEntityTypeMapType> jpaEntityType;
- /**
- * Gets the value of the jpaEntityType property.
- *
- * <p>
- * This accessor method returns a reference to the live list, not a
- * snapshot. Therefore any modification you make to the returned list will
- * be present inside the JAXB object. This is why there is not a
- * <CODE>set</CODE> method for the jpaEntityType property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- *
- * <pre>
- * getJPAEntityType().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType }
- *
- *
- */
- public List<JPAEntityTypeMapType> getJPAEntityType() {
- if (jpaEntityType == null) {
- jpaEntityType = new ArrayList<JPAEntityTypeMapType>();
+ /**
+ * Gets the value of the jpaEntityType property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list, not a snapshot. Therefore any
+ * modification you make to the returned list will be present inside the JAXB object. This is why
+ * there is not a <CODE>set</CODE> method for the jpaEntityType property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ *
+ * <pre>
+ * getJPAEntityType().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType }
+ *
+ *
+ */
+ public List<JPAEntityTypeMapType> getJPAEntityType() {
+ if (jpaEntityType == null) {
+ jpaEntityType = new ArrayList<JPAEntityTypeMapType>();
+ }
+ return jpaEntityType;
}
- return jpaEntityType;
- }
}
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java
index 22260eac..53bc390c 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.api.model.mapping;
@@ -25,18 +21,17 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
- *
- * By default Java Persistence Unit name is taken as EDM schema name. This can
- * be overriden using JPAPersistenceUnitMapType.
- *
- *
+ *
+ * By default Java Persistence Unit name is taken as EDM schema name. This can be overriden using
+ * JPAPersistenceUnitMapType.
+ *
+ *
* <p>
* Java class for JPAPersistenceUnitMapType complex type.
- *
+ *
* <p>
- * The following schema fragment specifies the expected content contained within
- * this class.
- *
+ * The following schema fragment specifies the expected content contained within this class.
+ *
* <pre>
* <complexType name="JPAPersistenceUnitMapType">
* <complexContent>
@@ -53,105 +48,100 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JPAPersistenceUnitMapType",
- propOrder = { "edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes" })
+@XmlType(name = "JPAPersistenceUnitMapType", propOrder = {"edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes"})
public class JPAPersistenceUnitMapType {
- @XmlElement(name = "EDMSchemaNamespace")
- protected String edmSchemaNamespace;
- @XmlElement(name = "JPAEntityTypes", required = true)
- protected JPAEntityTypesMapType jpaEntityTypes;
- @XmlElement(name = "JPAEmbeddableTypes", required = true)
- protected JPAEmbeddableTypesMapType jpaEmbeddableTypes;
- @XmlAttribute(name = "name", required = true)
- protected String name;
+ @XmlElement(name = "EDMSchemaNamespace")
+ protected String edmSchemaNamespace;
+ @XmlElement(name = "JPAEntityTypes", required = true)
+ protected JPAEntityTypesMapType jpaEntityTypes;
+ @XmlElement(name = "JPAEmbeddableTypes", required = true)
+ protected JPAEmbeddableTypesMapType jpaEmbeddableTypes;
+ @XmlAttribute(name = "name", required = true)
+ protected String name;
- /**
- * Gets the value of the edmSchemaNamespace property.
- *
- * @return possible object is {@link String }
- *
- */
- public String getEDMSchemaNamespace() {
- return edmSchemaNamespace;
- }
+ /**
+ * Gets the value of the edmSchemaNamespace property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getEDMSchemaNamespace() {
+ return edmSchemaNamespace;
+ }
- /**
- * Sets the value of the edmSchemaNamespace property.
- *
- * @param value
- * allowed object is {@link String }
- *
- */
- public void setEDMSchemaNamespace(final String value) {
- edmSchemaNamespace = value;
- }
+ /**
+ * Sets the value of the edmSchemaNamespace property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setEDMSchemaNamespace(final String value) {
+ edmSchemaNamespace = value;
+ }
- /**
- * Gets the value of the jpaEntityTypes property.
- *
- * @return possible object is {@link JPAEntityTypesMapType }
- *
- */
- public JPAEntityTypesMapType getJPAEntityTypes() {
- return jpaEntityTypes;
- }
+ /**
+ * Gets the value of the jpaEntityTypes property.
+ *
+ * @return possible object is {@link JPAEntityTypesMapType }
+ *
+ */
+ public JPAEntityTypesMapType getJPAEntityTypes() {
+ return jpaEntityTypes;
+ }
- /**
- * Sets the value of the jpaEntityTypes property.
- *
- * @param value
- * allowed object is {@link JPAEntityTypesMapType }
- *
- */
- public void setJPAEntityTypes(final JPAEntityTypesMapType value) {
- jpaEntityTypes = value;
- }
+ /**
+ * Sets the value of the jpaEntityTypes property.
+ *
+ * @param value allowed object is {@link JPAEntityTypesMapType }
+ *
+ */
+ public void setJPAEntityTypes(final JPAEntityTypesMapType value) {
+ jpaEntityTypes = value;
+ }
- /**
- * Gets the value of the jpaEmbeddableTypes property.
- *
- * @return possible object is {@link JPAEmbeddableTypesMapType }
- *
- */
- public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() {
- return jpaEmbeddableTypes;
- }
+ /**
+ * Gets the value of the jpaEmbeddableTypes property.
+ *
+ * @return possible object is {@link JPAEmbeddableTypesMapType }
+ *
+ */
+ public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() {
+ return jpaEmbeddableTypes;
+ }
- /**
- * Sets the value of the jpaEmbeddableTypes property.
- *
- * @param value
- * allowed object is {@link JPAEmbeddableTypesMapType }
- *
- */
- public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) {
- jpaEmbeddableTypes = value;
- }
+ /**
+ * Sets the value of the jpaEmbeddableTypes property.
+ *
+ * @param value allowed object is {@link JPAEmbeddableTypesMapType }
+ *
+ */
+ public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) {
+ jpaEmbeddableTypes = value;
+ }
- /**
- * Gets the value of the name property.
- *
- * @return possible object is {@link String }
- *
- */
- public String getName() {
- return name;
- }
+ /**
+ * Gets the value of the name property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is {@link String }
- *
- */
- public void setName(final String value) {
- name = value;
- }
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setName(final String value) {
+ name = value;
+ }
}
diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java
index 25a2f956..ed596422 100644
--- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java
+++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java
@@ -1,26 +1,21 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.api.model.mapping;
import java.util.ArrayList;
import java.util.List;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -29,18 +24,17 @@ import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
/**
- *
- * The default name for EDM navigation property is derived from JPA relationship
- * name. This can be overriden using JPARelationshipMapType.
- *
- *
+ *
+ * The default name for EDM navigation property is derived from JPA relationship name. This can be
+ * overriden using JPARelationshipMapType.
+ *
+ *
* <p>
* Java class for JPARelationshipMapType complex type.
- *
+ *
* <p>
- * The following schema fragment specifies the expected content contained within
- * this class.
- *
+ * The following schema fragment specifies the expected content contained within this class.
+ *
* <pre>
* <complexType name="JPARelationshipMapType">
* <complexContent>
@@ -60,116 +54,113 @@ import javax.xml.bind.annotation.XmlValue;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JPARelationshipMapType", propOrder = { "jpaRelationship" })
+@XmlType(name = "JPARelationshipMapType", propOrder = {"jpaRelationship"})
public class JPARelationshipMapType {
- @XmlElement(name = "JPARelationship")
- protected List<JPARelationshipMapType.JPARelationship> jpaRelationship;
-
- /**
- * Gets the value of the jpaRelationship property.
- *
- * <p>
- * This accessor method returns a reference to the live list, not a
- * snapshot. Therefore any modification you make to the returned list will
- * be present inside the JAXB object. This is why there is not a
- * <CODE>set</CODE> method for the jpaRelationship property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- *
- * <pre>
- * getJPARelationship().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list {@link JPARelationshipMapType.JPARelationship }
- *
- *
- */
- public List<JPARelationshipMapType.JPARelationship> getJPARelationship() {
- if (jpaRelationship == null) {
- jpaRelationship = new ArrayList<JPARelationshipMapType.JPARelationship>();
- }
- return jpaRelationship;
- }
-
- /**
- * <p>
- * Java class for anonymous complex type.
- *
- * <p>
- * The following schema fragment specifies the expected content contained
- * within this class.
- *
- * <pre>
- * <complexType>
- * <simpleContent>
- * <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </extension>
- * </simpleContent>
- * </complexType>
- * </pre>
- *
- *
- */
- @XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "", propOrder = { "value" })
- public static class JPARelationship {
-
- @XmlValue
- protected String value;
- @XmlAttribute(name = "name", required = true)
- protected String name;
+ @XmlElement(name = "JPARelationship")
+ protected List<JPARelationshipMapType.JPARelationship> jpaRelationship;
/**
- * Gets the value of the value property.
+ * Gets the value of the jpaRelationship property.
*
- * @return possible object is {@link String }
+ * <p>
+ * This accessor method returns a reference to the live list, not a snapshot. Therefore any
+ * modification you make to the returned list will be present inside the JAXB object. This is why
+ * there is not a <CODE>set</CODE> method for the jpaRelationship property.
*
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
+ * <p>
+ * For example, to add a new item, do as follows:
*
- * @param value
- * allowed object is {@link String }
+ * <pre>
+ * getJPARelationship().add(newItem);
+ * </pre>
*
- */
- public void setValue(final String value) {
- this.value = value;
- }
-
- /**
- * Gets the value of the name property.
*
- * @return possible object is {@link String }
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link JPARelationshipMapType.JPARelationship }
+ *
*
*/
- public String getName() {
- return name;
+ public List<JPARelationshipMapType.JPARelationship> getJPARelationship() {
+ if (jpaRelationship == null) {
+ jpaRelationship = new ArrayList<JPARelationshipMapType.JPARelationship>();
+ }
+ return jpaRelationship;
}
/**
- * Sets the value of the name property.
+ * <p>
+ * Java class for anonymous complex type.
+ *
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType>
+ * <simpleContent>
+ * <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </extension>
+ * </simpleContent>
+ * </complexType>
+ * </pre>
*
- * @param value
- * allowed object is {@link String }
*
*/
- public void setName(final String value) {
- name = value;
- }
+ @XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder = {"value"})
+ public static class JPARelationship {
+
+ @XmlValue
+ protected String value;
+ @XmlAttribute(name = "name", required = true)
+ protected String name;
- }
+ /**
+ * Gets the value of the value property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setValue(final String value) {
+ this.value = value;
+ }
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return possible object is {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value allowed object is {@link String }
+ *
+ */
+ public void setName(final String value) {
+ name = value;
+ }
+
+ }
}
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index ee4d22cd..4dbe770b 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -123,10 +123,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.1</version>
- <scope>test</scope>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>5.2.0</version>
+ <scope>test</scope>
</dependency>
<!-- ########################## -->
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
index a3f5495c..3db5ab5b 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.core.access.data;
@@ -32,10 +28,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
import org.apache.olingo.odata2.api.edm.EdmEntitySet;
import org.apache.olingo.odata2.api.edm.EdmEntityType;
import org.apache.olingo.odata2.api.edm.EdmException;
@@ -43,9 +35,9 @@ import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
import org.apache.olingo.odata2.api.edm.EdmProperty;
import org.apache.olingo.odata2.api.edm.EdmSimpleType;
import org.apache.olingo.odata2.api.edm.EdmStructuralType;
+import org.apache.olingo.odata2.api.edm.EdmType;
import org.apache.olingo.odata2.api.edm.EdmTypeKind;
import org.apache.olingo.odata2.api.edm.EdmTyped;
-import org.apache.olingo.odata2.api.edm.EdmType;
import org.apache.olingo.odata2.api.ep.entry.EntryMetadata;
import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
import org.apache.olingo.odata2.api.ep.feed.ODataFeed;
@@ -55,511 +47,487 @@ import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPAModelExcepti
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
import org.apache.olingo.odata2.jpa.processor.api.model.JPAEdmMapping;
import org.apache.olingo.odata2.jpa.processor.core.model.JPAEdmMappingImpl;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
public class JPAEntity {
- private Object jpaEntity = null;
- private JPAEntity parentJPAEntity = null;
- private EdmEntityType oDataEntityType = null;
- private EdmEntitySet oDataEntitySet = null;
- private Class<?> jpaType = null;
- private HashMap<String, Method> accessModifiersWrite = null;
- private JPAEntityParser jpaEntityParser = null;
- private ODataJPAContext oDataJPAContext;
- private OnJPAWriteContent onJPAWriteContent = null;
- private List<String> relatedJPAEntityLink = new ArrayList<String>();
- private HashMap<String, List<Object>> relatedJPAEntityMap = null;
- private EdmNavigationProperty viaNavigationProperty;
-
- public JPAEntity(final EdmEntityType oDataEntityType, final EdmEntitySet oDataEntitySet,
- final ODataJPAContext context) {
- this.oDataEntityType = oDataEntityType;
- this.oDataEntitySet = oDataEntitySet;
- oDataJPAContext = context;
- try {
- JPAEdmMapping mapping = (JPAEdmMapping) oDataEntityType.getMapping();
- jpaType = mapping.getJPAType();
- } catch (EdmException e) {
- return;
+ private Object jpaEntity = null;
+ private JPAEntity parentJPAEntity = null;
+ private EdmEntityType oDataEntityType = null;
+ private EdmEntitySet oDataEntitySet = null;
+ private Class<?> jpaType = null;
+ private HashMap<String, Method> accessModifiersWrite = null;
+ private JPAEntityParser jpaEntityParser = null;
+ private ODataJPAContext oDataJPAContext;
+ private OnJPAWriteContent onJPAWriteContent = null;
+ private final List<String> relatedJPAEntityLink = new ArrayList<String>();
+ private HashMap<String, List<Object>> relatedJPAEntityMap = null;
+ private EdmNavigationProperty viaNavigationProperty;
+
+ public JPAEntity(final EdmEntityType oDataEntityType, final EdmEntitySet oDataEntitySet, final ODataJPAContext context) {
+ this.oDataEntityType = oDataEntityType;
+ this.oDataEntitySet = oDataEntitySet;
+ oDataJPAContext = context;
+ try {
+ JPAEdmMapping mapping = (JPAEdmMapping) oDataEntityType.getMapping();
+ jpaType = mapping.getJPAType();
+ } catch (EdmException e) {
+ return;
+ }
+ jpaEntityParser = new JPAEntityParser();
+ onJPAWriteContent = oDataJPAContext.getODataContext()
+ .getServiceFactory()
+ .getCallback(OnJPAWriteContent.class);
+ }
+
+ public void setAccessModifersWrite(final HashMap<String, Method> accessModifiersWrite) {
+ this.accessModifiersWrite = accessModifiersWrite;
}
- jpaEntityParser = new JPAEntityParser();
- onJPAWriteContent = oDataJPAContext.getODataContext().getServiceFactory().getCallback(OnJPAWriteContent.class);
- }
- public void setAccessModifersWrite(final HashMap<String, Method> accessModifiersWrite) {
- this.accessModifiersWrite = accessModifiersWrite;
- }
+ public void setParentJPAEntity(final JPAEntity jpaEntity) {
+ parentJPAEntity = jpaEntity;
+ }
- public void setParentJPAEntity(final JPAEntity jpaEntity) {
- parentJPAEntity = jpaEntity;
- }
+ public JPAEntity getParentJPAEntity() {
+ return parentJPAEntity;
+ }
- public JPAEntity getParentJPAEntity() {
- return parentJPAEntity;
- }
+ public Object getJPAEntity() {
+ return jpaEntity;
+ }
- public Object getJPAEntity() {
- return jpaEntity;
- }
+ public void setViaNavigationProperty(EdmNavigationProperty viaNavigationProperty) {
+ this.viaNavigationProperty = viaNavigationProperty;
+ }
- public void setViaNavigationProperty(EdmNavigationProperty viaNavigationProperty) {
- this.viaNavigationProperty = viaNavigationProperty;
- }
+ public EdmNavigationProperty getViaNavigationProperty() {
+ return viaNavigationProperty;
+ }
- public EdmNavigationProperty getViaNavigationProperty() {
- return viaNavigationProperty;
- }
+ public void create(final ODataEntry oDataEntry) throws ODataJPARuntimeException {
- public void create(final ODataEntry oDataEntry) throws ODataJPARuntimeException {
+ if (oDataEntry == null) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL, null);
+ }
+ try {
+ EntryMetadata entryMetadata = oDataEntry.getMetadata();
+ Map<String, Object> oDataEntryProperties = oDataEntry.getProperties();
+ if (oDataEntry.containsInlineEntry()) {
+ normalizeInlineEntries(oDataEntryProperties);
+ }
- if (oDataEntry == null) {
- throw ODataJPARuntimeException
- .throwException(ODataJPARuntimeException.GENERAL, null);
+ if (oDataEntry.getProperties()
+ .size() > 0) {
+
+ write(oDataEntryProperties, true);
+
+ for (String navigationPropertyName : oDataEntityType.getNavigationPropertyNames()) {
+ EdmNavigationProperty navProperty = (EdmNavigationProperty) oDataEntityType.getProperty(navigationPropertyName);
+ if (relatedJPAEntityMap != null && relatedJPAEntityMap.containsKey(navigationPropertyName)) {
+ oDataEntry.getProperties()
+ .get(navigationPropertyName);
+ JPALink.linkJPAEntities(relatedJPAEntityMap.get(navigationPropertyName), jpaEntity, navProperty);
+ continue;
+ }
+ // The second condition is required to ensure that there is an explicit request to link
+ // two entities. Else the third condition will always be true for cases where two navigations
+ // point to same entity types.
+ if (parentJPAEntity != null && navProperty.getRelationship()
+ .equals(getViaNavigationProperty().getRelationship())) {
+ List<Object> targetJPAEntities = new ArrayList<Object>();
+ targetJPAEntities.add(parentJPAEntity.getJPAEntity());
+ JPALink.linkJPAEntities(targetJPAEntities, jpaEntity, navProperty);
+ } else if (!entryMetadata.getAssociationUris(navigationPropertyName)
+ .isEmpty()) {
+ if (!relatedJPAEntityLink.contains(navigationPropertyName)) {
+ relatedJPAEntityLink.add(navigationPropertyName);
+ }
+ }
+ }
+ }
+ if (!relatedJPAEntityLink.isEmpty()) {
+ JPALink link = new JPALink(oDataJPAContext);
+ link.setSourceJPAEntity(jpaEntity);
+ link.create(oDataEntitySet, oDataEntry, relatedJPAEntityLink);
+ }
+ } catch (EdmException | ODataJPAModelException e) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
+ }
}
- try {
- EntryMetadata entryMetadata = oDataEntry.getMetadata();
- Map<String, Object> oDataEntryProperties = oDataEntry.getProperties();
- if (oDataEntry.containsInlineEntry()) {
- normalizeInlineEntries(oDataEntryProperties);
- }
- if (oDataEntry.getProperties().size() > 0) {
+ public EdmEntitySet getEdmEntitySet() {
+ return oDataEntitySet;
+ }
+ public void create(final Map<String, Object> oDataEntryProperties) throws ODataJPARuntimeException {
+ normalizeInlineEntries(oDataEntryProperties);
write(oDataEntryProperties, true);
+ }
- for (String navigationPropertyName : oDataEntityType.getNavigationPropertyNames()) {
- EdmNavigationProperty navProperty =
- (EdmNavigationProperty) oDataEntityType.getProperty(navigationPropertyName);
- if (relatedJPAEntityMap != null && relatedJPAEntityMap.containsKey(navigationPropertyName)) {
- oDataEntry.getProperties().get(navigationPropertyName);
- JPALink.linkJPAEntities(relatedJPAEntityMap.get(navigationPropertyName), jpaEntity,
- navProperty);
- continue;
- }
- // The second condition is required to ensure that there is an explicit request to link
- // two entities. Else the third condition will always be true for cases where two navigations
- // point to same entity types.
- if (parentJPAEntity != null
- && navProperty.getRelationship().equals(getViaNavigationProperty().getRelationship())) {
- List<Object> targetJPAEntities = new ArrayList<Object>();
- targetJPAEntities.add(parentJPAEntity.getJPAEntity());
- JPALink.linkJPAEntities(targetJPAEntities, jpaEntity, navProperty);
- } else if (!entryMetadata.getAssociationUris(navigationPropertyName).isEmpty()) {
- if (!relatedJPAEntityLink.contains(navigationPropertyName)) {
- relatedJPAEntityLink.add(navigationPropertyName);
- }
- }
+ public void update(final ODataEntry oDataEntry) throws ODataJPARuntimeException {
+ if (oDataEntry == null) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL, null);
}
- }
- if (!relatedJPAEntityLink.isEmpty()) {
+ Map<String, Object> oDataEntryProperties = oDataEntry.getProperties();
+ if (oDataEntry.containsInlineEntry()) {
+ normalizeInlineEntries(oDataEntryProperties);
+ }
+ write(oDataEntryProperties, false);
JPALink link = new JPALink(oDataJPAContext);
link.setSourceJPAEntity(jpaEntity);
- link.create(oDataEntitySet, oDataEntry, relatedJPAEntityLink);
- }
- } catch (EdmException e) {
- throw ODataJPARuntimeException
- .throwException(ODataJPARuntimeException.GENERAL
- .addContent(e.getMessage()), e);
- } catch (ODataJPAModelException e) {
- throw ODataJPARuntimeException
- .throwException(ODataJPARuntimeException.GENERAL
- .addContent(e.getMessage()), e);
+ try {
+ link.create(oDataEntitySet, oDataEntry, oDataEntityType.getNavigationPropertyNames());
+ } catch (EdmException | ODataJPAModelException e) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
+ }
}
- }
- public EdmEntitySet getEdmEntitySet() {
- return oDataEntitySet;
- }
-
- public void create(final Map<String, Object> oDataEntryProperties) throws ODataJPARuntimeException {
- normalizeInlineEntries(oDataEntryProperties);
- write(oDataEntryProperties, true);
- }
-
- public void update(final ODataEntry oDataEntry) throws ODataJPARuntimeException {
- if (oDataEntry == null) {
- throw ODataJPARuntimeException
- .throwException(ODataJPARuntimeException.GENERAL, null);
- }
- Map<String, Object> oDataEntryProperties = oDataEntry.getProperties();
- if (oDataEntry.containsInlineEntry()) {
- normalizeInlineEntries(oDataEntryProperties);
+ public void update(final Map<String, Object> oDataEntryProperties) throws ODataJPARuntimeException {
+ normalizeInlineEntries(oDataEntryProperties);
+ write(oDataEntryProperties, false);
}
- write(oDataEntryProperties, false);
- JPALink link = new JPALink(oDataJPAContext);
- link.setSourceJPAEntity(jpaEntity);
- try {
- link.create(oDataEntitySet, oDataEntry, oDataEntityType.getNavigationPropertyNames());
- } catch (EdmException e) {
- throw ODataJPARuntimeException
- .throwException(ODataJPARuntimeException.GENERAL
- .addContent(e.getMessage()), e);
- } catch (ODataJPAModelException e) {
- throw ODataJPARuntimeException
- .throwException(ODataJPARuntimeException.GENERAL
- .addContent(e.getMessage()), e);
+
+ public void setJPAEntity(final Object jpaEntity) {
+ this.jpaEntity = jpaEntity;
}
- }
-
- public void update(final Map<String, Object> oDataEntryProperties) throws ODataJPARuntimeException {
- normalizeInlineEntries(oDataEntryProperties);
- write(oDataEntryProperties, false);
- }
-
- public void setJPAEntity(final Object jpaEntity) {
- this.jpaEntity = jpaEntity;
- }
-
- protected void setComplexProperty(Method accessModifier, final Object jpaEntity,
- final EdmStructuralType edmComplexType, final HashMap<String, Object> propertyValue)
- throws EdmException, IllegalAccessException, IllegalArgumentException, InvocationTargetException,
- InstantiationException, ODataJPARuntimeException, NoSuchMethodException, SecurityException, SQLException {
-
- setComplexProperty(accessModifier, jpaEntity, edmComplexType, propertyValue, null);
- }
-
- protected void setProperty(final Method method, final Object entity, final Object entityPropertyValue,
- final EdmSimpleType type, boolean isNullable) throws
- IllegalAccessException, IllegalArgumentException, InvocationTargetException, ODataJPARuntimeException,
- EdmException {
-
- setProperty(method, entity, entityPropertyValue, type, null, isNullable);
- }
-
- protected void setEmbeddableKeyProperty(final HashMap<String, String> embeddableKeys,
- final List<EdmProperty> oDataEntryKeyProperties,
- final Map<String, Object> oDataEntryProperties, final Object entity)
- throws ODataJPARuntimeException, EdmException, IllegalAccessException, IllegalArgumentException,
- InvocationTargetException, InstantiationException {
-
- HashMap<String, Object> embeddableObjMap = new HashMap<String, Object>();
- List<EdmProperty> leftODataEntryKeyProperties = new ArrayList<EdmProperty>();
- HashMap<String, String> leftEmbeddableKeys = new HashMap<String, String>();
-
- for (EdmProperty edmProperty : oDataEntryKeyProperties) {
- if (oDataEntryProperties.containsKey(edmProperty.getName()) == false) {
- continue;
- }
-
- String edmPropertyName = edmProperty.getName();
- String embeddableKeyNameComposite = embeddableKeys.get(edmPropertyName);
- if (embeddableKeyNameComposite == null) {
- continue;
- }
- String embeddableKeyNameSplit[] = embeddableKeyNameComposite.split("\\.");
- String methodPartName = null;
- Method method = null;
- Object embeddableObj = null;
-
- if (embeddableObjMap.containsKey(embeddableKeyNameSplit[0]) == false) {
- methodPartName = embeddableKeyNameSplit[0];
- method = jpaEntityParser.getAccessModifierSet(entity, methodPartName);
- embeddableObj = method.getParameterTypes()[0].newInstance();
- method.invoke(entity, embeddableObj);
- embeddableObjMap.put(embeddableKeyNameSplit[0], embeddableObj);
- } else {
- embeddableObj = embeddableObjMap.get(embeddableKeyNameSplit[0]);
- }
-
- if (embeddableKeyNameSplit.length == 2) {
- methodPartName = embeddableKeyNameSplit[1];
- method = jpaEntityParser.getAccessModifierSet(embeddableObj, methodPartName);
- Object simpleObj = oDataEntryProperties.get(edmProperty.getName());
- method.invoke(embeddableObj, simpleObj);
- } else if (embeddableKeyNameSplit.length > 2) { // Deeply nested
- leftODataEntryKeyProperties.add(edmProperty);
- leftEmbeddableKeys
- .put(edmPropertyName, embeddableKeyNameComposite.split(embeddableKeyNameSplit[0] + ".", 2)[1]);
- }
+
+ protected void setComplexProperty(Method accessModifier, final Object jpaEntity, final EdmStructuralType edmComplexType,
+ final HashMap<String, Object> propertyValue)
+ throws EdmException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException,
+ ODataJPARuntimeException, NoSuchMethodException, SecurityException, SQLException {
+
+ setComplexProperty(accessModifier, jpaEntity, edmComplexType, propertyValue, null);
}
- }
- protected Object instantiateJPAEntity() throws InstantiationException, IllegalAccessException {
- if (jpaType == null) {
- throw new InstantiationException();
+ protected void setProperty(final Method method, final Object entity, final Object entityPropertyValue, final EdmSimpleType type,
+ boolean isNullable)
+ throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, ODataJPARuntimeException, EdmException {
+
+ setProperty(method, entity, entityPropertyValue, type, null, isNullable);
}
- return jpaType.newInstance();
- }
-
- private void normalizeInlineEntries(final Map<String, Object> oDataEntryProperties) throws ODataJPARuntimeException {
- List<ODataEntry> entries = null;
- try {
- for (String navigationPropertyName : oDataEntityType.getNavigationPropertyNames()) {
- Object inline = oDataEntryProperties.get(navigationPropertyName);
- if (inline instanceof ODataFeed) {
- entries = ((ODataFeed) inline).getEntries();
- } else if (inline instanceof ODataEntry) {
- entries = new ArrayList<ODataEntry>();
- entries.add((ODataEntry) inline);
- }
- if (entries != null) {
- oDataEntryProperties.put(navigationPropertyName, entries);
- entries = null;
+ protected void setEmbeddableKeyProperty(final HashMap<String, String> embeddableKeys, final List<EdmProperty> oDataEntryKeyProperties,
+ final Map<String, Object> oDataEntryProperties, final Object entity) throws ODataJPARuntimeException, EdmException,
+ IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException {
+
+ HashMap<String, Object> embeddableObjMap = new HashMap<String, Object>();
+ List<EdmProperty> leftODataEntryKeyProperties = new ArrayList<EdmProperty>();
+ HashMap<String, String> leftEmbeddableKeys = new HashMap<String, String>();
+
+ for (EdmProperty edmProperty : oDataEntryKeyProperties) {
+ if (!oDataEntryProperties.containsKey(edmProperty.getName())) {
+ continue;
+ }
+
+ String edmPropertyName = edmProperty.getName();
+ String embeddableKeyNameComposite = embeddableKeys.get(edmPropertyName);
+ if (embeddableKeyNameComposite == null) {
+ continue;
+ }
+ String embeddableKeyNameSplit[] = embeddableKeyNameComposite.split("\\.");
+ String methodPartName = null;
+ Method method = null;
+ Object embeddableObj = null;
+
+ if (!embeddableObjMap.containsKey(embeddableKeyNameSplit[0])) {
+ methodPartName = embeddableKeyNameSplit[0];
+ method = jpaEntityParser.getAccessModifierSet(entity, methodPartName);
+ embeddableObj = method.getParameterTypes()[0].newInstance();
+ method.invoke(entity, embeddableObj);
+ embeddableObjMap.put(embeddableKeyNameSplit[0], embeddableObj);
+ } else {
+ embeddableObj = embeddableObjMap.get(embeddableKeyNameSplit[0]);
+ }
+
+ if (embeddableKeyNameSplit.length == 2) {
+ methodPartName = embeddableKeyNameSplit[1];
+ method = jpaEntityParser.getAccessModifierSet(embeddableObj, methodPartName);
+ Object simpleObj = oDataEntryProperties.get(edmProperty.getName());
+ method.invoke(embeddableObj, simpleObj);
+ } else if (embeddableKeyNameSplit.length > 2) { // Deeply nested
+ leftODataEntryKeyProperties.add(edmProperty);
+ leftEmbeddableKeys.put(edmPropertyName, embeddableKeyNameComposite.split(embeddableKeyNameSplit[0] + ".", 2)[1]);
+ }
}
- }
- } catch (EdmException e) {
- throw ODataJPARuntimeException
- .throwException(ODataJPARuntimeException.GENERAL
- .addContent(e.getMessage()), e);
}
- }
-
- @SuppressWarnings("unchecked")
- private void write(final Map<String, Object> oDataEntryProperties,
- final boolean isCreate)
- throws ODataJPARuntimeException {
- try {
-
- EdmStructuralType structuralType = null;
- final List<String> keyNames = oDataEntityType.getKeyPropertyNames();
-
- if (isCreate) {
- jpaEntity = instantiateJPAEntity();
- } else if (jpaEntity == null) {
- throw ODataJPARuntimeException
- .throwException(ODataJPARuntimeException.RESOURCE_NOT_FOUND, null);
- }
-
- if (accessModifiersWrite == null) {
- accessModifiersWrite =
- jpaEntityParser.getAccessModifiers(jpaEntity, oDataEntityType, JPAEntityParser.ACCESS_MODIFIER_SET);
- }
-
- if (oDataEntityType == null || oDataEntryProperties == null) {
- throw ODataJPARuntimeException
- .throwException(ODataJPARuntimeException.GENERAL, null);
- }
-
- final HashMap<String, String> embeddableKeys =
- jpaEntityParser.getJPAEmbeddableKeyMap(jpaEntity.getClass().getName());
- Set<String> propertyNames = null;
- if (embeddableKeys != null) {
- setEmbeddableKeyProperty(embeddableKeys, oDataEntityType.getKeyProperties(), oDataEntryProperties,
- jpaEntity);
-
- propertyNames = new HashSet<String>();
- propertyNames.addAll(oDataEntryProperties.keySet());
- for (String key : embeddableKeys.keySet()) {
- propertyNames.remove(key);
+
+ protected Object instantiateJPAEntity() throws InstantiationException, IllegalAccessException {
+ if (jpaType == null) {
+ throw new InstantiationException();
}
- } else {
- propertyNames = oDataEntryProperties.keySet();
- }
-
- boolean isVirtual = false;
- for (String propertyName : propertyNames) {
- EdmTyped edmTyped = (EdmTyped) oDataEntityType.getProperty(propertyName);
- if (edmTyped instanceof EdmProperty) {
- isVirtual = ((JPAEdmMappingImpl)((EdmProperty) edmTyped).getMapping()).isVirtualAccess();
- } else {
- isVirtual = false;
+
+ return jpaType.newInstance();
+ }
+
+ private void normalizeInlineEntries(final Map<String, Object> oDataEntryProperties) throws ODataJPARuntimeException {
+ List<ODataEntry> entries = null;
+ try {
+ for (String navigationPropertyName : oDataEntityType.getNavigationPropertyNames()) {
+ Object inline = oDataEntryProperties.get(navigationPropertyName);
+ if (inline instanceof ODataFeed) {
+ entries = ((ODataFeed) inline).getEntries();
+ } else if (inline instanceof ODataEntry) {
+ entries = new ArrayList<ODataEntry>();
+ entries.add((ODataEntry) inline);
+ }
+ if (entries != null) {
+ oDataEntryProperties.put(navigationPropertyName, entries);
+ entries = null;
+ }
+ }
+ } catch (EdmException e) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
}
- Method accessModifier = null;
+ }
+
+ @SuppressWarnings("unchecked")
+ private void write(final Map<String, Object> oDataEntryProperties, final boolean isCreate) throws ODataJPARuntimeException {
+ try {
- switch (edmTyped.getType().getKind()) {
- case SIMPLE:
- if (isCreate == false) {
- if (keyNames.contains(edmTyped.getName())) {
- continue;
+ EdmStructuralType structuralType = null;
+ final List<String> keyNames = oDataEntityType.getKeyPropertyNames();
+
+ if (isCreate) {
+ jpaEntity = instantiateJPAEntity();
+ } else if (jpaEntity == null) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.RESOURCE_NOT_FOUND, null);
}
- }
- accessModifier = accessModifiersWrite.get(propertyName);
- EdmProperty edmProperty = (EdmProperty)oDataEntityType.getProperty(propertyName);
- boolean isNullable = edmProperty.getFacets() == null ? (keyNames.contains(propertyName)? false : true)
- : edmProperty.getFacets().isNullable() == null ? true : edmProperty.getFacets().isNullable();
- if (isVirtual) {
- setProperty(accessModifier, jpaEntity, oDataEntryProperties.get(propertyName), (EdmSimpleType) edmTyped
- .getType(), isNullable);
- } else {
- setProperty(accessModifier, jpaEntity, oDataEntryProperties.get(propertyName), (EdmSimpleType) edmTyped
- .getType(), isNullable);
- }
- break;
- case COMPLEX:
- structuralType = (EdmStructuralType) edmTyped.getType();
- accessModifier = accessModifiersWrite.get(propertyName);
- if (isVirtual) {
- setComplexProperty(accessModifier, jpaEntity,
- structuralType,
- (HashMap<String, Object>) oDataEntryProperties.get(propertyName), propertyName);
- } else {
- setComplexProperty(accessModifier, jpaEntity,
- structuralType,
- (HashMap<String, Object>) oDataEntryProperties.get(propertyName));
- }
- break;
- case NAVIGATION:
- case ENTITY:
- if (isCreate) {
- structuralType = (EdmStructuralType) edmTyped.getType();
- EdmNavigationProperty navProperty = (EdmNavigationProperty) edmTyped;
- EdmEntitySet edmRelatedEntitySet = oDataEntitySet.getRelatedEntitySet(navProperty);
- List<ODataEntry> relatedEntries = (List<ODataEntry>) oDataEntryProperties.get(propertyName);
- if (relatedJPAEntityMap == null) {
- relatedJPAEntityMap = new HashMap<String, List<Object>>();
+
+ if (accessModifiersWrite == null) {
+ accessModifiersWrite = jpaEntityParser.getAccessModifiers(jpaEntity, oDataEntityType, JPAEntityParser.ACCESS_MODIFIER_SET);
+ }
+
+ if (oDataEntityType == null || oDataEntryProperties == null) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL, null);
+ }
+
+ final HashMap<String, String> embeddableKeys = jpaEntityParser.getJPAEmbeddableKeyMap(jpaEntity.getClass()
+ .getName());
+ Set<String> propertyNames = null;
+ if (embeddableKeys != null) {
+ setEmbeddableKeyProperty(embeddableKeys, oDataEntityType.getKeyProperties(), oDataEntryProperties, jpaEntity);
+
+ propertyNames = new HashSet<String>();
+ propertyNames.addAll(oDataEntryProperties.keySet());
+ for (String key : embeddableKeys.keySet()) {
+ propertyNames.remove(key);
+ }
+ } else {
+ propertyNames = oDataEntryProperties.keySet();
}
- List<Object> relatedJPAEntities = new ArrayList<Object>();
- for (ODataEntry oDataEntry : relatedEntries) {
- JPAEntity relatedEntity =
- new JPAEntity((EdmEntityType) structuralType, edmRelatedEntitySet, oDataJPAContext);
- relatedEntity.setParentJPAEntity(this);
- relatedEntity.setViaNavigationProperty(navProperty);
- relatedEntity.create(oDataEntry);
- if (oDataEntry.getProperties().size() == 0) {
- if (!oDataEntry.getMetadata().getUri().isEmpty()
- && !relatedJPAEntityLink.contains(navProperty.getName())) {
- relatedJPAEntityLink.add(navProperty.getName());
+
+ boolean isVirtual = false;
+ for (String propertyName : propertyNames) {
+ EdmTyped edmTyped = oDataEntityType.getProperty(propertyName);
+ if (edmTyped instanceof EdmProperty) {
+ isVirtual = ((JPAEdmMappingImpl) ((EdmProperty) edmTyped).getMapping()).isVirtualAccess();
+ } else {
+ isVirtual = false;
+ }
+ Method accessModifier = null;
+
+ switch (edmTyped.getType()
+ .getKind()) {
+ case SIMPLE:
+ if (!isCreate) {
+ if (keyNames.contains(edmTyped.getName())) {
+ continue;
+ }
+ }
+ accessModifier = accessModifiersWrite.get(propertyName);
+ EdmProperty edmProperty = (EdmProperty) oDataEntityType.getProperty(propertyName);
+ boolean isNullable = edmProperty.getFacets() == null ? (keyNames.contains(propertyName) ? false : true)
+ : edmProperty.getFacets()
+ .isNullable() == null ? true
+ : edmProperty.getFacets()
+ .isNullable();
+ if (isVirtual) {
+ setProperty(accessModifier, jpaEntity, oDataEntryProperties.get(propertyName),
+ (EdmSimpleType) edmTyped.getType(), isNullable);
+ } else {
+ setProperty(accessModifier, jpaEntity, oDataEntryProperties.get(propertyName),
+ (EdmSimpleType) edmTyped.getType(), isNullable);
+ }
+ break;
+ case COMPLEX:
+ structuralType = (EdmStructuralType) edmTyped.getType();
+ accessModifier = accessModifiersWrite.get(propertyName);
+ if (isVirtual) {
+ setComplexProperty(accessModifier, jpaEntity, structuralType,
+ (HashMap<String, Object>) oDataEntryProperties.get(propertyName), propertyName);
+ } else {
+ setComplexProperty(accessModifier, jpaEntity, structuralType,
+ (HashMap<String, Object>) oDataEntryProperties.get(propertyName));
+ }
+ break;
+ case NAVIGATION:
+ case ENTITY:
+ if (isCreate) {
+ structuralType = (EdmStructuralType) edmTyped.getType();
+ EdmNavigationProperty navProperty = (EdmNavigationProperty) edmTyped;
+ EdmEntitySet edmRelatedEntitySet = oDataEntitySet.getRelatedEntitySet(navProperty);
+ List<ODataEntry> relatedEntries = (List<ODataEntry>) oDataEntryProperties.get(propertyName);
+ if (relatedJPAEntityMap == null) {
+ relatedJPAEntityMap = new HashMap<String, List<Object>>();
+ }
+ List<Object> relatedJPAEntities = new ArrayList<Object>();
+ for (ODataEntry oDataEntry : relatedEntries) {
+ JPAEntity relatedEntity =
+ new JPAEntity((EdmEntityType) structuralType, edmRelatedEntitySet, oDataJPAContext);
+ relatedEntity.setParentJPAEntity(this);
+ relatedEntity.setViaNavigationProperty(navProperty);
+ relatedEntity.create(oDataEntry);
+ if (oDataEntry.getProperties()
+ .size() == 0) {
+ if (!oDataEntry.getMetadata()
+ .getUri()
+ .isEmpty()
+ && !relatedJPAEntityLink.contains(navProperty.getName())) {
+ relatedJPAEntityLink.add(navProperty.getName());
+ }
+ } else {
+ relatedJPAEntities.add(relatedEntity.getJPAEntity());
+ }
+ }
+ if (!relatedJPAEntities.isEmpty()) {
+ relatedJPAEntityMap.put(navProperty.getName(), relatedJPAEntities);
+ }
+ }
+ default:
}
- } else {
- relatedJPAEntities.add(relatedEntity.getJPAEntity());
- }
}
- if (!relatedJPAEntities.isEmpty()) {
- relatedJPAEntityMap.put(navProperty.getName(), relatedJPAEntities);
+ } catch (Exception e) {
+ if (e instanceof ODataJPARuntimeException) {
+ throw (ODataJPARuntimeException) e;
}
- }
- default:
- continue;
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
}
- }
- } catch (Exception e) {
- if (e instanceof ODataJPARuntimeException) {
- throw (ODataJPARuntimeException) e;
- }
- throw ODataJPARuntimeException
- .throwException(ODataJPARuntimeException.GENERAL
- .addContent(e.getMessage()), e);
- }
- }
-
- @SuppressWarnings("unchecked")
- protected void setComplexProperty(Method accessModifier, final Object jpaEntity,
- final EdmStructuralType edmComplexType, final HashMap<String, Object> propertyValue, String propertyName)
- throws EdmException, IllegalAccessException, IllegalArgumentException, InvocationTargetException,
- InstantiationException, ODataJPARuntimeException, NoSuchMethodException, SecurityException, SQLException {
-
- JPAEdmMapping mapping = (JPAEdmMapping) edmComplexType.getMapping();
- Object embeddableObject = mapping.getJPAType().newInstance();
- if (propertyName != null) {
- accessModifier.invoke(jpaEntity, propertyName, embeddableObject);
- } else {
- accessModifier.invoke(jpaEntity, embeddableObject);
}
- HashMap<String, Method> accessModifiers =
- jpaEntityParser.getAccessModifiers(embeddableObject, edmComplexType,
- JPAEntityParser.ACCESS_MODIFIER_SET);
-
- for (String edmPropertyName : edmComplexType.getPropertyNames()) {
- if (propertyValue != null) {
- EdmTyped edmTyped = edmComplexType.getProperty(edmPropertyName);
- accessModifier = accessModifiers.get(edmPropertyName);
- EdmType type = edmTyped.getType();
- if (type.getKind().toString().equals(EdmTypeKind.COMPLEX.toString())) {
- setComplexProperty(accessModifier, embeddableObject, (EdmStructuralType) type,
- (HashMap<String, Object>) propertyValue.get(edmPropertyName), propertyName);
+ @SuppressWarnings("unchecked")
+ protected void setComplexProperty(Method accessModifier, final Object jpaEntity, final EdmStructuralType edmComplexType,
+ final HashMap<String, Object> propertyValue, String propertyName)
+ throws EdmException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException,
+ ODataJPARuntimeException, NoSuchMethodException, SecurityException, SQLException {
+
+ JPAEdmMapping mapping = (JPAEdmMapping) edmComplexType.getMapping();
+ Object embeddableObject = mapping.getJPAType()
+ .newInstance();
+ if (propertyName != null) {
+ accessModifier.invoke(jpaEntity, propertyName, embeddableObject);
} else {
- EdmSimpleType simpleType = (EdmSimpleType) type;
- EdmProperty edmProperty = (EdmProperty)edmComplexType.getProperty(edmPropertyName);
- boolean isNullable = edmProperty.getFacets() == null ? true
- : edmProperty.getFacets().isNullable() == null ? true : edmProperty.getFacets().isNullable();
- if (propertyName != null) {
- setProperty(accessModifier, embeddableObject, propertyValue.get(edmPropertyName),
- simpleType, isNullable);
- } else {
- setProperty(accessModifier, embeddableObject, propertyValue.get(edmPropertyName),
- simpleType, isNullable);
- }
+ accessModifier.invoke(jpaEntity, embeddableObject);
}
- }
- }
- }
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- protected void setProperty(final Method method, final Object entity, final Object entityPropertyValue,
- final EdmSimpleType type, String propertyName, boolean isNullable) throws
- IllegalAccessException, IllegalArgumentException, InvocationTargetException, ODataJPARuntimeException,
- EdmException {
- if (entityPropertyValue != null || isNullable) {
- if (propertyName != null) {
- method.invoke(entity, propertyName, entityPropertyValue);
- return;
- }
- Class<?> parameterType = method.getParameterTypes()[0];
- if (type != null && type.getDefaultType().equals(String.class)) {
- if (parameterType.equals(String.class)) {
- method.invoke(entity, entityPropertyValue);
- } else if (parameterType.equals(char[].class)) {
- char[] characters = entityPropertyValue != null ? ((String) entityPropertyValue).toCharArray() : null;
- method.invoke(entity, characters);
- } else if (parameterType.equals(char.class)) {
- char c = entityPropertyValue != null ? ((String) entityPropertyValue).charAt(0) : '\u0000';
- method.invoke(entity, c);
- } else if (parameterType.equals(Character[].class)) {
- Character[] characters = entityPropertyValue != null ?
- JPAEntityParser.toCharacterArray((String) entityPropertyValue) : null;
- method.invoke(entity, (Object) characters);
- } else if (parameterType.equals(Character.class)) {
- Character c = entityPropertyValue != null ?
- Character.valueOf(((String) entityPropertyValue).charAt(0)) : null;
- method.invoke(entity, c);
- } else if (parameterType.isEnum()) {
- Enum e = entityPropertyValue != null ?
- Enum.valueOf((Class<Enum>) parameterType, (String) entityPropertyValue) : null;
- method.invoke(entity, e);
- } else {
- String setterName = method.getName();
- String getterName = setterName.replace("set", "get");
- try {
- Method getMethod = entity.getClass().getDeclaredMethod(getterName);
- if(getMethod.isAnnotationPresent(XmlJavaTypeAdapter.class)) {
- XmlAdapter xmlAdapter = getMethod.getAnnotation(XmlJavaTypeAdapter.class)
- .value().newInstance();
- method.invoke(entity, xmlAdapter.unmarshal(entityPropertyValue));
+
+ HashMap<String, Method> accessModifiers =
+ jpaEntityParser.getAccessModifiers(embeddableObject, edmComplexType, JPAEntityParser.ACCESS_MODIFIER_SET);
+
+ for (String edmPropertyName : edmComplexType.getPropertyNames()) {
+ if (propertyValue != null) {
+ EdmTyped edmTyped = edmComplexType.getProperty(edmPropertyName);
+ accessModifier = accessModifiers.get(edmPropertyName);
+ EdmType type = edmTyped.getType();
+ if (type.getKind()
+ .toString()
+ .equals(EdmTypeKind.COMPLEX.toString())) {
+ setComplexProperty(accessModifier, embeddableObject, (EdmStructuralType) type,
+ (HashMap<String, Object>) propertyValue.get(edmPropertyName), propertyName);
+ } else {
+ EdmSimpleType simpleType = (EdmSimpleType) type;
+ EdmProperty edmProperty = (EdmProperty) edmComplexType.getProperty(edmPropertyName);
+ boolean isNullable = edmProperty.getFacets() == null ? true
+ : edmProperty.getFacets()
+ .isNullable() == null ? true
+ : edmProperty.getFacets()
+ .isNullable();
+ if (propertyName != null) {
+ setProperty(accessModifier, embeddableObject, propertyValue.get(edmPropertyName), simpleType, isNullable);
+ } else {
+ setProperty(accessModifier, embeddableObject, propertyValue.get(edmPropertyName), simpleType, isNullable);
+ }
+ }
}
- } catch (Exception e) {
- throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL, e);
- }
}
- } else if (parameterType.equals(Blob.class)) {
- if (onJPAWriteContent == null) {
- throw ODataJPARuntimeException
- .throwException(ODataJPARuntimeException.ERROR_JPA_BLOB_NULL, null);
- } else {
- method.invoke(entity, entityPropertyValue != null ?
- onJPAWriteContent.getJPABlob((byte[]) entityPropertyValue) : null);
- }
- } else if (parameterType.equals(Clob.class)) {
- if (onJPAWriteContent == null) {
- throw ODataJPARuntimeException
- .throwException(ODataJPARuntimeException.ERROR_JPA_CLOB_NULL, null);
- } else {
- method.invoke(entity, entityPropertyValue != null ?
- onJPAWriteContent.getJPAClob(((String) entityPropertyValue).toCharArray()) : null);
+ }
+
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ protected void setProperty(final Method method, final Object entity, final Object entityPropertyValue, final EdmSimpleType type,
+ String propertyName, boolean isNullable)
+ throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, ODataJPARuntimeException, EdmException {
+ if (entityPropertyValue != null || isNullable) {
+ if (propertyName != null) {
+ method.invoke(entity, propertyName, entityPropertyValue);
+ return;
+ }
+ Class<?> parameterType = method.getParameterTypes()[0];
+ if (type != null && type.getDefaultType()
+ .equals(String.class)) {
+ if (parameterType.equals(String.class)) {
+ method.invoke(entity, entityPropertyValue);
+ } else if (parameterType.equals(char[].class)) {
+ char[] characters = entityPropertyValue != null ? ((String) entityPropertyValue).toCharArray() : null;
+ method.invoke(entity, characters);
+ } else if (parameterType.equals(char.class)) {
+ char c = entityPropertyValue != null ? ((String) entityPropertyValue).charAt(0) : '\u0000';
+ method.invoke(entity, c);
+ } else if (parameterType.equals(Character[].class)) {
+ Character[] characters =
+ entityPropertyValue != null ? JPAEntityParser.toCharacterArray((String) entityPropertyValue) : null;
+ method.invoke(entity, (Object) characters);
+ } else if (parameterType.equals(Character.class)) {
+ Character c = entityPropertyValue != null ? Character.valueOf(((String) entityPropertyValue).charAt(0)) : null;
+ method.invoke(entity, c);
+ } else if (parameterType.isEnum()) {
+ Enum e = entityPropertyValue != null ? Enum.valueOf((Class<Enum>) parameterType, (String) entityPropertyValue) : null;
+ method.invoke(entity, e);
+ } else {
+ String setterName = method.getName();
+ String getterName = setterName.replace("set", "get");
+ try {
+ Method getMethod = entity.getClass()
+ .getDeclaredMethod(getterName);
+ if (getMethod.isAnnotationPresent(XmlJavaTypeAdapter.class)) {
+ XmlAdapter xmlAdapter = getMethod.getAnnotation(XmlJavaTypeAdapter.class)
+ .value()
+ .newInstance();
+ method.invoke(entity, xmlAdapter.unmarshal(entityPropertyValue));
+ }
+ } catch (Exception e) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL, e);
+ }
+ }
+ } else if (parameterType.equals(Blob.class)) {
+ if (onJPAWriteContent == null) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPA_BLOB_NULL, null);
+ }
+ method.invoke(entity, entityPropertyValue != null ? onJPAWriteContent.getJPABlob((byte[]) entityPropertyValue) : null);
+ } else if (parameterType.equals(Clob.class)) {
+ if (onJPAWriteContent == null) {
+ throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPA_CLOB_NULL, null);
+ }
+ method.invoke(entity,
+ entityPropertyValue != null ? onJPAWriteContent.getJPAClob(((String) entityPropertyValue).toCharArray()) : null);
+ } else if (parameterType.equals(Timestamp.class)) {
+ Timestamp ts = entityPropertyValue != null ? new Timestamp(((Calendar) entityPropertyValue).getTimeInMillis()) : null;
+ method.invoke(entity, ts);
+ } else if (parameterType.equals(java.util.Date.class)) {
+ Date d = entityPropertyValue != null ? ((Calendar) entityPropertyValue).getTime() : null;
+ method.invoke(entity, d);
+ } else if (parameterType.equals(java.sql.Date.class)) {
+ java.sql.Date d =
+ entityPropertyValue != null ? new java.sql.Date(((Calendar) entityPropertyValue).getTimeInMillis()) : null;
+ method.invoke(entity, d);
+ } else if (parameterType.equals(java.sql.Time.class)) {
+ java.sql.Time t =
+ entityPropertyValue != null ? new java.sql.Time(((Calendar) entityPropertyValue).getTimeInMillis()) : null;
+ method.invoke(entity, t);
+ } else if (parameterType.equals(byte.class)) {
+ byte b = entityPropertyValue != null ? Byte.parseByte(entityPropertyValue.toString()) : 0;
+ method.invoke(entity, b);
+ } else {
+ method.invoke(entity, entityPropertyValue);
+ }
}
- } else if (parameterType.equals(Timestamp.class)) {
- Timestamp ts = entityPropertyValue != null ?
- new Timestamp(((Calendar) entityPropertyValue).getTimeInMillis()) : null;
- method.invoke(entity, ts);
- } else if (parameterType.equals(java.util.Date.class)) {
- Date d = entityPropertyValue != null ? ((Calendar) entityPropertyValue).getTime(): null;
- method.invoke(entity, d);
- } else if (parameterType.equals(java.sql.Date.class)) {
- java.sql.Date d = entityPropertyValue != null ?
- new java.sql.Date(((Calendar) entityPropertyValue).getTimeInMillis()) : null;
- method.invoke(entity, d);
- } else if (parameterType.equals(java.sql.Time.class)) {
- java.sql.Time t = entityPropertyValue != null ?
- new java.sql.Time(((Calendar) entityPropertyValue).getTimeInMillis()) : null;
- method.invoke(entity, t);
- } else if (parameterType.equals(byte.class)) {
- byte b = entityPropertyValue != null ?
- Byte.parseByte(entityPropertyValue.toString()) : 0;
- method.invoke(entity, b);
- } else {
- method.invoke(entity, entityPropertyValue);
- }
}
- }
-}
\ No newline at end of file
+}
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPATypeConverter.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPATypeConverter.java
index a27658bb..579a1f59 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPATypeConverter.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPATypeConverter.java
@@ -33,8 +33,8 @@ import jakarta.persistence.Lob;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import jakarta.persistence.metamodel.Attribute;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPAModelException;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
index 25f28c76..1813557d 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
@@ -378,7 +378,8 @@ public class JPAEntityParserTest {
assertEquals("getField1", name);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
+ | SecurityException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
@@ -401,7 +402,8 @@ public class JPAEntityParserTest {
String name = (String) getGetterName.invoke(resultParser, params);
assertNull(name);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
+ | SecurityException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
@@ -410,7 +412,7 @@ public class JPAEntityParserTest {
/*
* TestCase - getGetterName is a private method in JPAResultParser. The method is uses reflection to
* derive the property access methods from EdmProperty
- *
+ *
* EdmProperty name could have been modified. Then mapping object of EdmProperty should be used for
* deriving the name
*/
@@ -432,7 +434,8 @@ public class JPAEntityParserTest {
String name = (String) getGetterName.invoke(resultParser, params);
assertEquals("getField1", name);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
+ | SecurityException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
@@ -492,15 +495,13 @@ public class JPAEntityParserTest {
getGetters.setAccessible(true);
try {
getGetters.invoke(resultParser, jpaEntity, structuralType);
- } catch (IllegalAccessException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalArgumentException e) {
+ } catch (IllegalAccessException | IllegalArgumentException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
} catch (InvocationTargetException e) {
assertTrue(true);
}
} catch (NoSuchMethodException e) {
- assertEquals("org.apache.olingo.odata2.jpa.processor.core.access.data.JPAEntityParser.getGetters(java.lang.Object, "
+ assertEquals("org.apache.olingo.odata2.jpa.processor.core.access.data.JPAEntityParser.getGetters(java.lang.Object,"
+ "org.apache.olingo.odata2.api.edm.EdmStructuralType)", e.getMessage());
} catch (SecurityException | EdmException e) {
fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/ODataJPAContextMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/ODataJPAContextMock.java
index e4b0a930..b2c2f8cb 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/ODataJPAContextMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/ODataJPAContextMock.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.core.mock;
@@ -24,7 +20,10 @@ import java.util.Calendar;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
+import org.apache.olingo.odata2.api.processor.ODataContext;
+import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext;
+import org.easymock.Capture;
+import org.easymock.EasyMock;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Query;
@@ -32,80 +31,106 @@ import jakarta.persistence.TemporalType;
import jakarta.persistence.metamodel.EntityType;
import jakarta.persistence.metamodel.Metamodel;
-import org.apache.olingo.odata2.api.processor.ODataContext;
-import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext;
-import org.easymock.Capture;
-import org.easymock.EasyMock;
-
public abstract class ODataJPAContextMock {
- public static final String NAMESPACE = "salesorderprocessing";
- public static final String MAPPING_MODEL = "SalesOrderProcessingMappingModel";
- public static final String PERSISTENCE_UNIT_NAME = "salesorderprocessing";
+ public static final String NAMESPACE = "salesorderprocessing";
+ public static final String MAPPING_MODEL = "SalesOrderProcessingMappingModel";
+ public static final String PERSISTENCE_UNIT_NAME = "salesorderprocessing";
- public static ODataJPAContext mockODataJPAContext() {
- ODataJPAContext odataJPAContext = EasyMock.createMock(ODataJPAContext.class);
- EasyMock.expect(odataJPAContext.getPersistenceUnitName()).andStubReturn(NAMESPACE);
- EasyMock.expect(odataJPAContext.getEntityManagerFactory()).andReturn(mockEntityManagerFactory());
- EasyMock.expect(odataJPAContext.getEntityManager()).andReturn(mockEntityManager());
- EasyMock.expect(odataJPAContext.getJPAEdmMappingModel()).andReturn(MAPPING_MODEL);
- EasyMock.expect(odataJPAContext.getJPAEdmExtension()).andReturn(null);
- EasyMock.expect(odataJPAContext.getDefaultNaming()).andReturn(true);
+ public static ODataJPAContext mockODataJPAContext() {
+ ODataJPAContext odataJPAContext = EasyMock.createMock(ODataJPAContext.class);
+ EasyMock.expect(odataJPAContext.getPersistenceUnitName())
+ .andStubReturn(NAMESPACE);
+ EasyMock.expect(odataJPAContext.getEntityManagerFactory())
+ .andReturn(mockEntityManagerFactory());
+ EasyMock.expect(odataJPAContext.getEntityManager())
+ .andReturn(mockEntityManager());
+ EasyMock.expect(odataJPAContext.getJPAEdmMappingModel())
+ .andReturn(MAPPING_MODEL);
+ EasyMock.expect(odataJPAContext.getJPAEdmExtension())
+ .andReturn(null);
+ EasyMock.expect(odataJPAContext.getDefaultNaming())
+ .andReturn(true);
- EasyMock.replay(odataJPAContext);
- return odataJPAContext;
- }
+ EasyMock.replay(odataJPAContext);
+ return odataJPAContext;
+ }
- public static ODataJPAContext mockODataJPAContext(final ODataContext context) {
- ODataJPAContext odataJPAContext = EasyMock.createMock(ODataJPAContext.class);
- EasyMock.expect(odataJPAContext.getPersistenceUnitName()).andStubReturn(NAMESPACE);
- EasyMock.expect(odataJPAContext.getEntityManagerFactory()).andReturn(mockEntityManagerFactory());
- EasyMock.expect(odataJPAContext.getEntityManager()).andStubReturn(mockEntityManager());
- EasyMock.expect(odataJPAContext.getJPAEdmMappingModel()).andReturn(MAPPING_MODEL);
- EasyMock.expect(odataJPAContext.getJPAEdmExtension()).andReturn(null);
- EasyMock.expect(odataJPAContext.getDefaultNaming()).andReturn(true);
- EasyMock.expect(odataJPAContext.getODataContext()).andReturn(context).anyTimes();
- EasyMock.expect(odataJPAContext.getPageSize()).andReturn(0);
+ public static ODataJPAContext mockODataJPAContext(final ODataContext context) {
+ ODataJPAContext odataJPAContext = EasyMock.createMock(ODataJPAContext.class);
+ EasyMock.expect(odataJPAContext.getPersistenceUnitName())
+ .andStubReturn(NAMESPACE);
+ EasyMock.expect(odataJPAContext.getEntityManagerFactory())
+ .andReturn(mockEntityManagerFactory());
+ EasyMock.expect(odataJPAContext.getEntityManager())
+ .andStubReturn(mockEntityManager());
+ EasyMock.expect(odataJPAContext.getJPAEdmMappingModel())
+ .andReturn(MAPPING_MODEL);
+ EasyMock.expect(odataJPAContext.getJPAEdmExtension())
+ .andReturn(null);
+ EasyMock.expect(odataJPAContext.getDefaultNaming())
+ .andReturn(true);
+ EasyMock.expect(odataJPAContext.getODataContext())
+ .andReturn(context)
+ .anyTimes();
+ EasyMock.expect(odataJPAContext.getPageSize())
+ .andReturn(0);
- EasyMock.replay(odataJPAContext);
- return odataJPAContext;
- }
+ EasyMock.replay(odataJPAContext);
+ return odataJPAContext;
+ }
- private static EntityManager mockEntityManager() {
- EntityManager em = EasyMock.createMock(EntityManager.class);
- Metamodel mm = EasyMock.createMock(Metamodel.class);
- EasyMock.expect(em.getMetamodel()).andReturn(mm).anyTimes();
- Set<EntityType<?>> et = new HashSet<EntityType<?>>();
- EasyMock.expect(mm.getEntities()).andReturn(et).anyTimes();
- EasyMock.expect(em.isOpen()).andReturn(true).anyTimes();
- Query jpqlquery = EasyMock.createMock(Query.class);
- Capture<String> capturedArgument = new Capture<String>();
- EasyMock.expect(em.createQuery(EasyMock.capture(capturedArgument))).andReturn(jpqlquery).anyTimes();
- EasyMock.expect(jpqlquery.setParameter(EasyMock.anyInt(), EasyMock.anyObject()))
- .andReturn(jpqlquery).anyTimes();
- EasyMock.expect(jpqlquery.setParameter(EasyMock.anyInt(), (Calendar) EasyMock.anyObject(),
- EasyMock.anyObject(TemporalType.TIMESTAMP.getClass()))).andReturn(jpqlquery).anyTimes();
- EasyMock.expect(jpqlquery.setParameter(EasyMock.anyInt(), (Time) EasyMock.anyObject(),
- EasyMock.anyObject(TemporalType.TIME.getClass()))).andReturn(jpqlquery).anyTimes();
- List<Object> result = new ArrayList<Object>();
- result.add(5);
- EasyMock.expect(jpqlquery.getResultList()).andReturn(result).anyTimes();
- EasyMock.replay(em, mm, jpqlquery);
- return em;
+ private static EntityManager mockEntityManager() {
+ EntityManager em = EasyMock.createMock(EntityManager.class);
+ Metamodel mm = EasyMock.createMock(Metamodel.class);
+ EasyMock.expect(em.getMetamodel())
+ .andReturn(mm)
+ .anyTimes();
+ Set<EntityType<?>> et = new HashSet<EntityType<?>>();
+ EasyMock.expect(mm.getEntities())
+ .andReturn(et)
+ .anyTimes();
+ EasyMock.expect(em.isOpen())
+ .andReturn(true)
+ .anyTimes();
+ Query jpqlquery = EasyMock.createMock(Query.class);
+ Capture<String> capturedArgument = Capture.newInstance();
+ EasyMock.expect(em.createQuery(EasyMock.capture(capturedArgument)))
+ .andReturn(jpqlquery)
+ .anyTimes();
+ EasyMock.expect(jpqlquery.setParameter(EasyMock.anyInt(), EasyMock.anyObject()))
+ .andReturn(jpqlquery)
+ .anyTimes();
+ EasyMock.expect(jpqlquery.setParameter(EasyMock.anyInt(), (Calendar) EasyMock.anyObject(),
+ EasyMock.anyObject(TemporalType.TIMESTAMP.getClass())))
+ .andReturn(jpqlquery)
+ .anyTimes();
+ EasyMock.expect(
+ jpqlquery.setParameter(EasyMock.anyInt(), (Time) EasyMock.anyObject(), EasyMock.anyObject(TemporalType.TIME.getClass())))
+ .andReturn(jpqlquery)
+ .anyTimes();
+ List<Object> result = new ArrayList<Object>();
+ result.add(5);
+ EasyMock.expect(jpqlquery.getResultList())
+ .andReturn(result)
+ .anyTimes();
+ EasyMock.replay(em, mm, jpqlquery);
+ return em;
- }
+ }
- private static EntityManagerFactory mockEntityManagerFactory() {
- EntityManagerFactory emf = EasyMock.createMock(EntityManagerFactory.class);
- EasyMock.expect(emf.getMetamodel()).andReturn(mockMetaModel());
- EasyMock.replay(emf);
- return emf;
- }
+ private static EntityManagerFactory mockEntityManagerFactory() {
+ EntityManagerFactory emf = EasyMock.createMock(EntityManagerFactory.class);
+ EasyMock.expect(emf.getMetamodel())
+ .andReturn(mockMetaModel());
+ EasyMock.replay(emf);
+ return emf;
+ }
- private static Metamodel mockMetaModel() {
- Metamodel metaModel = EasyMock.createMock(Metamodel.class);
- EasyMock.replay(metaModel);
- return metaModel;
- }
+ private static Metamodel mockMetaModel() {
+ Metamodel metaModel = EasyMock.createMock(Metamodel.class);
+ EasyMock.replay(metaModel);
+ return metaModel;
+ }
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EntityWithXmlAdapterOnProperty.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EntityWithXmlAdapterOnProperty.java
index a3b68d3d..f0e5d99d 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EntityWithXmlAdapterOnProperty.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EntityWithXmlAdapterOnProperty.java
@@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.olingo.odata2.jpa.processor.core.mock.data;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
public class EntityWithXmlAdapterOnProperty {
private EntityWithXmlAdapterOnProperty self;
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/JPATypeMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/JPATypeMock.java
index a9d0c4eb..8bbd1bf2 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/JPATypeMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/JPATypeMock.java
@@ -28,7 +28,7 @@ import java.util.Date;
import java.util.List;
import java.util.UUID;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
/* ========================================================================= */
public class JPATypeMock {
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/XmlAdapter.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/XmlAdapter.java
index 32378340..d7d1d3e6 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/XmlAdapter.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/XmlAdapter.java
@@ -1,34 +1,29 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.core.mock.data;
-public class XmlAdapter extends
- javax.xml.bind.annotation.adapters.XmlAdapter<String, EntityWithXmlAdapterOnProperty> {
+public class XmlAdapter extends jakarta.xml.bind.annotation.adapters.XmlAdapter<String, EntityWithXmlAdapterOnProperty> {
- @Override
- public String marshal(EntityWithXmlAdapterOnProperty arg0) throws Exception {
- return "self";
- }
+ @Override
+ public String marshal(EntityWithXmlAdapterOnProperty arg0) throws Exception {
+ return "self";
+ }
- @Override
- public EntityWithXmlAdapterOnProperty unmarshal(String arg0) throws Exception {
- return new EntityWithXmlAdapterOnProperty();
- }
+ @Override
+ public EntityWithXmlAdapterOnProperty unmarshal(String arg0) throws Exception {
+ return new EntityWithXmlAdapterOnProperty();
+ }
-}
\ No newline at end of file
+}
(olingo-odata2) 05/29: skip tests in workflows
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 34d3f66917c1659959a9224b0c4e125a5d2b5d57
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 10:18:14 2023 +0200
skip tests in workflows
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.github/workflows/build.yml | 2 +-
.github/workflows/maven.yml | 2 +-
.github/workflows/pull-request.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 03db07f1..ba0e00d6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,5 +24,5 @@ jobs:
java-version: '8'
architecture: x64
- name: Maven Build
- run: mvn clean install
+ run: mvn clean install -D skipTests -D maven.test.skip=true
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 64e1e103..2ead95aa 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -31,4 +31,4 @@ jobs:
distribution: 'corretto'
cache: maven
- name: Build with Maven
- run: mvn -B package --file pom.xml
+ run: mvn -B package --file pom.xml -D skipTests -D maven.test.skip=true
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index d2d52a6d..72b4f5fb 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -30,4 +30,4 @@ jobs:
distribution: 'corretto'
java-version: 8
- name: Maven Build
- run: mvn clean install
+ run: mvn clean install -D skipTests -D maven.test.skip=true
(olingo-odata2) 08/29: enable tests execution
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 6eec1f79081f1826cd6bd98db25ab73625cae25b
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 10:36:21 2023 +0200
enable tests execution
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.github/workflows/build.yml | 2 +-
.github/workflows/maven.yml | 2 +-
.github/workflows/pull-request.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ba0e00d6..03db07f1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,5 +24,5 @@ jobs:
java-version: '8'
architecture: x64
- name: Maven Build
- run: mvn clean install -D skipTests -D maven.test.skip=true
+ run: mvn clean install
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 2ead95aa..64e1e103 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -31,4 +31,4 @@ jobs:
distribution: 'corretto'
cache: maven
- name: Build with Maven
- run: mvn -B package --file pom.xml -D skipTests -D maven.test.skip=true
+ run: mvn -B package --file pom.xml
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 72b4f5fb..d2d52a6d 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -30,4 +30,4 @@ jobs:
distribution: 'corretto'
java-version: 8
- name: Maven Build
- run: mvn clean install -D skipTests -D maven.test.skip=true
+ run: mvn clean install
(olingo-odata2) 23/29: adapt tests
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 17ce01bc5db22697311bb8be98b73cad43b9765b
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 16:17:06 2023 +0200
adapt tests
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.../ep/consumer/AtomServiceDocumentConsumer.java | 483 +++--
.../core/uri/expression/FilterParserImpl.java | 1840 +++++++++--------
.../apache/olingo/odata2/core/DispatcherTest.java | 5 +-
.../core/ODataRequestHandlerValidationTest.java | 2 +
.../olingo/odata2/core/batch/BatchHandlerTest.java | 404 ++--
.../odata2/core/batch/BatchRequestParserTest.java | 2070 ++++++++------------
.../odata2/core/batch/BatchResponseParserTest.java | 794 +++-----
.../odata2/core/batch/BatchResponseTest.java | 456 ++---
.../consumer/AtomServiceDocumentConsumerTest.java | 519 ++---
.../consumer/JsonServiceDocumentConsumerTest.java | 110 +-
.../ep/consumer/ServiceDocumentConsumerTest.java | 169 +-
.../core/uri/expression/TestAbapCompatibility.java | 1140 ++++++-----
.../fit/basic/HttpExceptionResponseTest.java | 194 +-
.../SampleClassForInvalidMessageReferences.java | 56 +-
pom.xml | 2 +-
src/checkstyle/config.xml | 4 +-
16 files changed, 3967 insertions(+), 4281 deletions(-)
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumer.java
index 4ce8a9cb..299d25d9 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumer.java
@@ -1,31 +1,25 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.ep.consumer;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-
import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.ep.EntityProviderException;
import org.apache.olingo.odata2.api.servicedocument.Accept;
@@ -51,266 +45,255 @@ import org.apache.olingo.odata2.core.servicedocument.TitleImpl;
import org.apache.olingo.odata2.core.servicedocument.WorkspaceImpl;
public class AtomServiceDocumentConsumer {
- private String currentHandledStartTagName;
- private static final String DEFAULT_PREFIX = "";
+ private String currentHandledStartTagName;
+ private static final String DEFAULT_PREFIX = "";
- public ServiceDocumentImpl readServiceDokument(final XMLStreamReader reader) throws EntityProviderException {
- AtomInfoImpl atomInfo = new AtomInfoImpl();
- ServiceDocumentImpl serviceDocument = new ServiceDocumentImpl();
- List<Workspace> workspaces = new ArrayList<Workspace>();
- List<ExtensionElement> extElements = new ArrayList<ExtensionElement>();
- CommonAttributesImpl attributes = new CommonAttributesImpl();
- try {
- while (reader.hasNext()
- && !(reader.isEndElement() && Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) && FormatXml.APP_SERVICE
- .equals(reader.getLocalName()))) {
- reader.next();
- if (reader.isStartElement()) {
- currentHandledStartTagName = reader.getLocalName();
- if (FormatXml.APP_SERVICE.equals(currentHandledStartTagName)) {
- attributes = parseCommonAttribute(reader);
- } else if (FormatXml.APP_WORKSPACE.equals(currentHandledStartTagName)) {
- workspaces.add(parseWorkspace(reader));
- } else {
- ExtensionElementImpl extElement = parseExtensionElement(reader);
- if (extElement != null) {
- extElements.add(extElement);
+ public ServiceDocumentImpl readServiceDokument(final XMLStreamReader reader) throws EntityProviderException {
+ AtomInfoImpl atomInfo = new AtomInfoImpl();
+ ServiceDocumentImpl serviceDocument = new ServiceDocumentImpl();
+ List<Workspace> workspaces = new ArrayList<Workspace>();
+ List<ExtensionElement> extElements = new ArrayList<ExtensionElement>();
+ CommonAttributesImpl attributes = new CommonAttributesImpl();
+ try {
+ while (reader.hasNext() && (!reader.isEndElement() || !Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) || !FormatXml.APP_SERVICE.equals(reader.getLocalName()))) {
+ reader.next();
+ if (reader.isStartElement()) {
+ currentHandledStartTagName = reader.getLocalName();
+ if (FormatXml.APP_SERVICE.equals(currentHandledStartTagName)) {
+ attributes = parseCommonAttribute(reader);
+ } else if (FormatXml.APP_WORKSPACE.equals(currentHandledStartTagName)) {
+ workspaces.add(parseWorkspace(reader));
+ } else {
+ ExtensionElementImpl extElement = parseExtensionElement(reader);
+ if (extElement != null) {
+ extElements.add(extElement);
+ }
+ }
+ }
}
- }
- }
- }
- if (workspaces.isEmpty()) {
- throw new EntityProviderException(EntityProviderException.INVALID_STATE
- .addContent("Service element must contain at least one workspace element"));
- }
- reader.close();
- atomInfo.setWorkspaces(workspaces).setCommonAttributes(attributes).setExtesionElements(extElements);
+ if (workspaces.isEmpty()) {
+ throw new EntityProviderException(
+ EntityProviderException.INVALID_STATE.addContent("Service element must contain at least one workspace element"));
+ }
+ reader.close();
+ atomInfo.setWorkspaces(workspaces)
+ .setCommonAttributes(attributes)
+ .setExtesionElements(extElements);
- serviceDocument.setAtomInfo(atomInfo);
- serviceDocument.setEntitySetsInfo(atomInfo.getEntitySetsInfo());
- return serviceDocument;
- } catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
- .getSimpleName()), e);
+ serviceDocument.setAtomInfo(atomInfo);
+ serviceDocument.setEntitySetsInfo(atomInfo.getEntitySetsInfo());
+ return serviceDocument;
+ } catch (XMLStreamException e) {
+ throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass()
+ .getSimpleName()),
+ e);
+ }
}
- }
- private CommonAttributesImpl parseCommonAttribute(final XMLStreamReader reader) {
- CommonAttributesImpl attribute = new CommonAttributesImpl();
- List<ExtensionAttribute> extAttributes = new ArrayList<ExtensionAttribute>();
- attribute.setBase(reader.getAttributeValue(null, FormatXml.XML_BASE));
- attribute.setLang(reader.getAttributeValue(null, FormatXml.XML_LANG));
- for (int i = 0; i < reader.getAttributeCount(); i++) {
- if (!(FormatXml.XML_BASE.equals(reader.getAttributeLocalName(i))
- && Edm.PREFIX_XML.equals(reader.getAttributePrefix(i))
- || (FormatXml.XML_LANG.equals(reader.getAttributeLocalName(i)) && Edm.PREFIX_XML.equals(reader
- .getAttributePrefix(i)))
- || ("local".equals(reader.getAttributeNamespace(i)) || DEFAULT_PREFIX.equals(reader.getAttributePrefix(i)))))
- {
- extAttributes.add(new ExtensionAttributeImpl()
- .setName(reader.getAttributeLocalName(i))
- .setNamespace(reader.getAttributeNamespace(i))
- .setPrefix(reader.getAttributePrefix(i))
- .setText(reader.getAttributeValue(i)));
- }
- }
+ private CommonAttributesImpl parseCommonAttribute(final XMLStreamReader reader) {
+ CommonAttributesImpl attribute = new CommonAttributesImpl();
+ List<ExtensionAttribute> extAttributes = new ArrayList<ExtensionAttribute>();
+ attribute.setBase(reader.getAttributeValue(null, FormatXml.XML_BASE));
+ attribute.setLang(reader.getAttributeValue(null, FormatXml.XML_LANG));
+ for (int i = 0; i < reader.getAttributeCount(); i++) {
+ if (((!FormatXml.XML_BASE.equals(reader.getAttributeLocalName(i)) || !Edm.PREFIX_XML.equals(reader.getAttributePrefix(i))) && (!FormatXml.XML_LANG.equals(reader.getAttributeLocalName(i)) || !Edm.PREFIX_XML.equals(reader.getAttributePrefix(i))) && (!"local".equals(reader.getAttributeNamespace(i)) && !DEFAULT_PREFIX.equals(reader.getAttributePrefix(i))))) {
+ extAttributes.add(new ExtensionAttributeImpl().setName(reader.getAttributeLocalName(i))
+ .setNamespace(reader.getAttributeNamespace(i))
+ .setPrefix(reader.getAttributePrefix(i))
+ .setText(reader.getAttributeValue(i)));
+ }
+ }
- return attribute.setAttributes(extAttributes);
- }
+ return attribute.setAttributes(extAttributes);
+ }
- private WorkspaceImpl parseWorkspace(final XMLStreamReader reader)
- throws XMLStreamException, EntityProviderException {
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_APP_2007, FormatXml.APP_WORKSPACE);
+ private WorkspaceImpl parseWorkspace(final XMLStreamReader reader) throws XMLStreamException, EntityProviderException {
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_APP_2007, FormatXml.APP_WORKSPACE);
- TitleImpl title = null;
- List<Collection> collections = new ArrayList<Collection>();
- List<ExtensionElement> extElements = new ArrayList<ExtensionElement>();
- CommonAttributesImpl attributes = parseCommonAttribute(reader);
- while (reader.hasNext()
- && !(reader.isEndElement() && Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) && FormatXml.APP_WORKSPACE
- .equals(reader.getLocalName()))) {
- reader.next();
- if (reader.isStartElement()) {
- currentHandledStartTagName = reader.getLocalName();
- if (FormatXml.APP_COLLECTION.equals(currentHandledStartTagName)) {
- collections.add(parseCollection(reader));
- } else if (FormatXml.ATOM_TITLE.equals(currentHandledStartTagName)) {
- title = parseTitle(reader);
- } else {
- extElements.add(parseExtensionSansTitleElement(reader));
+ TitleImpl title = null;
+ List<Collection> collections = new ArrayList<Collection>();
+ List<ExtensionElement> extElements = new ArrayList<ExtensionElement>();
+ CommonAttributesImpl attributes = parseCommonAttribute(reader);
+ while (reader.hasNext() && (!reader.isEndElement() || !Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) || !FormatXml.APP_WORKSPACE.equals(reader.getLocalName()))) {
+ reader.next();
+ if (reader.isStartElement()) {
+ currentHandledStartTagName = reader.getLocalName();
+ if (FormatXml.APP_COLLECTION.equals(currentHandledStartTagName)) {
+ collections.add(parseCollection(reader));
+ } else if (FormatXml.ATOM_TITLE.equals(currentHandledStartTagName)) {
+ title = parseTitle(reader);
+ } else {
+ extElements.add(parseExtensionSansTitleElement(reader));
+ }
+ }
}
- }
- }
- if (title == null) {
- throw new EntityProviderException(EntityProviderException.INVALID_STATE
- .addContent("Missing element title for workspace"));
+ if (title == null) {
+ throw new EntityProviderException(EntityProviderException.INVALID_STATE.addContent("Missing element title for workspace"));
+ }
+ return new WorkspaceImpl().setTitle(title)
+ .setCollections(collections)
+ .setAttributes(attributes)
+ .setExtesionElements(extElements);
}
- return new WorkspaceImpl().setTitle(title).setCollections(collections).setAttributes(attributes)
- .setExtesionElements(extElements);
- }
- private CollectionImpl parseCollection(final XMLStreamReader reader) throws XMLStreamException,
- EntityProviderException {
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_APP_2007, FormatXml.APP_COLLECTION);
- TitleImpl title = null;
- String resourceIdentifier = reader.getAttributeValue(null, FormatXml.ATOM_HREF);
- CommonAttributesImpl attributes = parseCommonAttribute(reader);
- List<ExtensionElement> extElements = new ArrayList<ExtensionElement>();
- List<Accept> acceptList = new ArrayList<Accept>();
- List<Categories> categories = new ArrayList<Categories>();
- if (resourceIdentifier == null) {
- throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE.addContent("href"));
- }
- while (reader.hasNext()
- && !(reader.isEndElement() && Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI())
- && FormatXml.APP_COLLECTION.equals(reader.getLocalName()))) {
- reader.next();
- if (reader.isStartElement()) {
- currentHandledStartTagName = reader.getLocalName();
- if (FormatXml.ATOM_TITLE.equals(currentHandledStartTagName)) {
- title = parseTitle(reader);
- } else if (FormatXml.APP_ACCEPT.equals(currentHandledStartTagName)) {
- acceptList.add(parseAccept(reader));
- } else if (FormatXml.APP_CATEGORIES.equals(currentHandledStartTagName)) {
- categories.add(parseCategories(reader));
- } else {
- extElements.add(parseExtensionSansTitleElement(reader));
+ private CollectionImpl parseCollection(final XMLStreamReader reader) throws XMLStreamException, EntityProviderException {
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_APP_2007, FormatXml.APP_COLLECTION);
+ TitleImpl title = null;
+ String resourceIdentifier = reader.getAttributeValue(null, FormatXml.ATOM_HREF);
+ CommonAttributesImpl attributes = parseCommonAttribute(reader);
+ List<ExtensionElement> extElements = new ArrayList<ExtensionElement>();
+ List<Accept> acceptList = new ArrayList<Accept>();
+ List<Categories> categories = new ArrayList<Categories>();
+ if (resourceIdentifier == null) {
+ throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE.addContent("href"));
}
- }
+ while (reader.hasNext() && (!reader.isEndElement() || !Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) || !FormatXml.APP_COLLECTION.equals(reader.getLocalName()))) {
+ reader.next();
+ if (reader.isStartElement()) {
+ currentHandledStartTagName = reader.getLocalName();
+ if (FormatXml.ATOM_TITLE.equals(currentHandledStartTagName)) {
+ title = parseTitle(reader);
+ } else if (FormatXml.APP_ACCEPT.equals(currentHandledStartTagName)) {
+ acceptList.add(parseAccept(reader));
+ } else if (FormatXml.APP_CATEGORIES.equals(currentHandledStartTagName)) {
+ categories.add(parseCategories(reader));
+ } else {
+ extElements.add(parseExtensionSansTitleElement(reader));
+ }
+ }
+ }
+ return new CollectionImpl().setHref(resourceIdentifier)
+ .setTitle(title)
+ .setCommonAttributes(attributes)
+ .setExtesionElements(extElements)
+ .setAcceptElements(acceptList)
+ .setCategories(categories);
}
- return new CollectionImpl().setHref(resourceIdentifier).setTitle(title).setCommonAttributes(attributes)
- .setExtesionElements(extElements).setAcceptElements(acceptList).setCategories(categories);
- }
- private TitleImpl parseTitle(final XMLStreamReader reader) throws XMLStreamException {
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_TITLE);
- String text = reader.getElementText();
- reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_TITLE);
- return new TitleImpl().setText(text);
- }
+ private TitleImpl parseTitle(final XMLStreamReader reader) throws XMLStreamException {
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_TITLE);
+ String text = reader.getElementText();
+ reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_TITLE);
+ return new TitleImpl().setText(text);
+ }
- private AcceptImpl parseAccept(final XMLStreamReader reader) throws XMLStreamException {
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_APP_2007, FormatXml.APP_ACCEPT);
- CommonAttributesImpl commonAttributes = parseCommonAttribute(reader);
- String text = reader.getElementText();
- reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_APP_2007, FormatXml.APP_ACCEPT);
- return new AcceptImpl().setCommonAttributes(commonAttributes).setText(text);
- }
+ private AcceptImpl parseAccept(final XMLStreamReader reader) throws XMLStreamException {
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_APP_2007, FormatXml.APP_ACCEPT);
+ CommonAttributesImpl commonAttributes = parseCommonAttribute(reader);
+ String text = reader.getElementText();
+ reader.require(XMLStreamConstants.END_ELEMENT, Edm.NAMESPACE_APP_2007, FormatXml.APP_ACCEPT);
+ return new AcceptImpl().setCommonAttributes(commonAttributes)
+ .setText(text);
+ }
- private CategoriesImpl parseCategories(final XMLStreamReader reader) throws XMLStreamException,
- EntityProviderException {
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_APP_2007, FormatXml.APP_CATEGORIES);
- CategoriesImpl categories = new CategoriesImpl();
- String href = reader.getAttributeValue(null, FormatXml.ATOM_HREF);
- String fixed = reader.getAttributeValue(null, FormatXml.APP_CATEGORIES_FIXED);
- categories.setScheme(reader.getAttributeValue(null, FormatXml.APP_CATEGORIES_SCHEME));
- categories.setHref(href);
- if (href == null) {
- for (int i = 0; i < Fixed.values().length; i++) {
- if (Fixed.values()[i].name().equalsIgnoreCase(fixed)) {
- categories.setFixed(Fixed.values()[i]);
+ private CategoriesImpl parseCategories(final XMLStreamReader reader) throws XMLStreamException, EntityProviderException {
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_APP_2007, FormatXml.APP_CATEGORIES);
+ CategoriesImpl categories = new CategoriesImpl();
+ String href = reader.getAttributeValue(null, FormatXml.ATOM_HREF);
+ String fixed = reader.getAttributeValue(null, FormatXml.APP_CATEGORIES_FIXED);
+ categories.setScheme(reader.getAttributeValue(null, FormatXml.APP_CATEGORIES_SCHEME));
+ categories.setHref(href);
+ if (href == null) {
+ for (int i = 0; i < Fixed.values().length; i++) {
+ if (Fixed.values()[i].name()
+ .equalsIgnoreCase(fixed)) {
+ categories.setFixed(Fixed.values()[i]);
+ }
+ }
+ if (categories.getFixed() == null) {
+ categories.setFixed(Fixed.NO);
+ }
+ List<Category> categoriesList = new ArrayList<Category>();
+ while (reader.hasNext() && (!reader.isEndElement() || !Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) || !FormatXml.APP_CATEGORIES.equals(reader.getLocalName()))) {
+ reader.next();
+ if (reader.isStartElement()) {
+ currentHandledStartTagName = reader.getLocalName();
+ if (FormatXml.ATOM_CATEGORY.equals(currentHandledStartTagName)) {
+ categoriesList.add(parseCategory(reader));
+ }
+ }
+ }
+ categories.setCategoryList(categoriesList);
}
- }
- if (categories.getFixed() == null) {
- categories.setFixed(Fixed.NO);
- }
- List<Category> categoriesList = new ArrayList<Category>();
- while (reader.hasNext()
- && !(reader.isEndElement() && Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI())
- && FormatXml.APP_CATEGORIES.equals(reader.getLocalName()))) {
- reader.next();
- if (reader.isStartElement()) {
- currentHandledStartTagName = reader.getLocalName();
- if (FormatXml.ATOM_CATEGORY.equals(currentHandledStartTagName)) {
- categoriesList.add(parseCategory(reader));
- }
+ if ((href != null && fixed != null && categories.getScheme() != null)
+ || (href == null && fixed == null && categories.getScheme() == null)) {
+ throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE.addContent("for the element categories"));
}
- }
- categories.setCategoryList(categoriesList);
- }
- if ((href != null && fixed != null && categories.getScheme() != null) ||
- (href == null && fixed == null && categories.getScheme() == null)) {
- throw new EntityProviderException(EntityProviderException.MISSING_ATTRIBUTE
- .addContent("for the element categories"));
+ return categories;
}
- return categories;
- }
- private CategoryImpl parseCategory(final XMLStreamReader reader) throws XMLStreamException {
- reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_CATEGORY);
- CategoryImpl category = new CategoryImpl();
- category.setScheme(reader.getAttributeValue(null, FormatXml.ATOM_CATEGORY_SCHEME));
- category.setTerm(reader.getAttributeValue(null, FormatXml.ATOM_CATEGORY_TERM));
- category.setLabel(reader.getAttributeValue(null, FormatXml.ATOM_CATEGORY_LABEL));
- CommonAttributesImpl attributes = parseCommonAttribute(reader);
- return category.setCommonAttributes(attributes);
- }
-
- private ExtensionElementImpl parseExtensionSansTitleElement(final XMLStreamReader reader) throws XMLStreamException,
- EntityProviderException {
- ExtensionElementImpl extElement = new ExtensionElementImpl();
- if (!(Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI())
- || (FormatXml.ATOM_TITLE.equals(reader.getLocalName())
- && Edm.NAMESPACE_ATOM_2005.equals(reader.getNamespaceURI())))) {
- extElement = parseElement(reader);
+ private CategoryImpl parseCategory(final XMLStreamReader reader) throws XMLStreamException {
+ reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_CATEGORY);
+ CategoryImpl category = new CategoryImpl();
+ category.setScheme(reader.getAttributeValue(null, FormatXml.ATOM_CATEGORY_SCHEME));
+ category.setTerm(reader.getAttributeValue(null, FormatXml.ATOM_CATEGORY_TERM));
+ category.setLabel(reader.getAttributeValue(null, FormatXml.ATOM_CATEGORY_LABEL));
+ CommonAttributesImpl attributes = parseCommonAttribute(reader);
+ return category.setCommonAttributes(attributes);
}
- return extElement;
- }
- private ExtensionElementImpl parseExtensionElement(final XMLStreamReader reader) throws XMLStreamException,
- EntityProviderException {
- ExtensionElementImpl extElement = null;
- if (!Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI())) {
- extElement = parseElement(reader);
+ private ExtensionElementImpl parseExtensionSansTitleElement(final XMLStreamReader reader)
+ throws XMLStreamException, EntityProviderException {
+ ExtensionElementImpl extElement = new ExtensionElementImpl();
+ if ((!Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI()) && (!FormatXml.ATOM_TITLE.equals(reader.getLocalName()) || !Edm.NAMESPACE_ATOM_2005.equals(reader.getNamespaceURI())))) {
+ extElement = parseElement(reader);
+ }
+ return extElement;
}
- return extElement;
- }
- private ExtensionElementImpl parseElement(final XMLStreamReader reader) throws XMLStreamException,
- EntityProviderException {
- List<ExtensionElement> extensionElements = new ArrayList<ExtensionElement>();
- ExtensionElementImpl extElement =
- new ExtensionElementImpl().setName(reader.getLocalName()).setNamespace(reader.getNamespaceURI()).setPrefix(
- reader.getPrefix());
- extElement.setAttributes(parseAttribute(reader));
- while (reader.hasNext()
- && !(reader.isEndElement() && extElement.getName() != null && extElement.getName()
- .equals(reader.getLocalName()))) {
- reader.next();
- if (reader.isStartElement()) {
- extensionElements.add(parseExtensionElement(reader));
- } else if (reader.isCharacters()) {
- String extElementText = "";
- do {
- extElementText = extElementText + reader.getText();
- reader.next();
- } while (reader.isCharacters());
- extElement.setText(extElementText);
- }
- }
- extElement.setElements(extensionElements);
- if (extElement.getText() == null && extElement.getAttributes().isEmpty() && extElement.getElements().isEmpty()) {
- throw new EntityProviderException(EntityProviderException.INVALID_STATE.addContent("Invalid extension element"));
+ private ExtensionElementImpl parseExtensionElement(final XMLStreamReader reader) throws XMLStreamException, EntityProviderException {
+ ExtensionElementImpl extElement = null;
+ if (!Edm.NAMESPACE_APP_2007.equals(reader.getNamespaceURI())) {
+ extElement = parseElement(reader);
+ }
+ return extElement;
}
- return extElement;
- }
- private List<ExtensionAttribute> parseAttribute(final XMLStreamReader reader) {
- List<ExtensionAttribute> extAttributes = new ArrayList<ExtensionAttribute>();
- for (int i = 0; i < reader.getAttributeCount(); i++) {
- {
- extAttributes.add(new ExtensionAttributeImpl()
- .setName(reader.getAttributeLocalName(i))
- .setNamespace(reader.getAttributeNamespace(i))
- .setPrefix(reader.getAttributePrefix(i))
- .setText(reader.getAttributeValue(i)));
- }
+ private ExtensionElementImpl parseElement(final XMLStreamReader reader) throws XMLStreamException, EntityProviderException {
+ List<ExtensionElement> extensionElements = new ArrayList<ExtensionElement>();
+ ExtensionElementImpl extElement = new ExtensionElementImpl().setName(reader.getLocalName())
+ .setNamespace(reader.getNamespaceURI())
+ .setPrefix(reader.getPrefix());
+ extElement.setAttributes(parseAttribute(reader));
+ while (reader.hasNext() && (!reader.isEndElement() || (extElement.getName() == null) || !extElement.getName()
+ .equals(reader.getLocalName()))) {
+ reader.next();
+ if (reader.isStartElement()) {
+ extensionElements.add(parseExtensionElement(reader));
+ } else if (reader.isCharacters()) {
+ String extElementText = "";
+ do {
+ extElementText = extElementText + reader.getText();
+ reader.next();
+ } while (reader.isCharacters());
+ extElement.setText(extElementText);
+ }
+ }
+ extElement.setElements(extensionElements);
+ if (extElement.getText() == null && extElement.getAttributes()
+ .isEmpty()
+ && extElement.getElements()
+ .isEmpty()) {
+ throw new EntityProviderException(EntityProviderException.INVALID_STATE.addContent("Invalid extension element"));
+ }
+ return extElement;
}
- return extAttributes;
- }
+ private List<ExtensionAttribute> parseAttribute(final XMLStreamReader reader) {
+ List<ExtensionAttribute> extAttributes = new ArrayList<ExtensionAttribute>();
+ for (int i = 0; i < reader.getAttributeCount(); i++) {
+ {
+ extAttributes.add(new ExtensionAttributeImpl().setName(reader.getAttributeLocalName(i))
+ .setNamespace(reader.getAttributeNamespace(i))
+ .setPrefix(reader.getAttributePrefix(i))
+ .setText(reader.getAttributeValue(i)));
+ }
+ }
+
+ return extAttributes;
+ }
- public ServiceDocumentImpl parseXml(final InputStream in) throws EntityProviderException {
- return readServiceDokument(XmlHelper.createStreamReader(in));
- }
+ public ServiceDocumentImpl parseXml(final InputStream in) throws EntityProviderException {
+ return readServiceDokument(XmlHelper.createStreamReader(in));
+ }
}
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
index b37a804a..ba6fbfd2 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.uri.expression;
@@ -23,7 +19,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.olingo.odata2.api.edm.EdmComplexType;
import org.apache.olingo.odata2.api.edm.EdmEntityType;
import org.apache.olingo.odata2.api.edm.EdmException;
@@ -40,7 +35,6 @@ import org.apache.olingo.odata2.api.uri.expression.CommonExpression;
import org.apache.olingo.odata2.api.uri.expression.ExpressionKind;
import org.apache.olingo.odata2.api.uri.expression.ExpressionParserException;
import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
-import org.apache.olingo.odata2.api.uri.expression.LiteralExpression;
import org.apache.olingo.odata2.api.uri.expression.MethodExpression;
import org.apache.olingo.odata2.api.uri.expression.MethodOperator;
import org.apache.olingo.odata2.api.uri.expression.UnaryExpression;
@@ -49,968 +43,970 @@ import org.apache.olingo.odata2.core.edm.EdmBoolean;
import org.apache.olingo.odata2.core.edm.EdmSimpleTypeFacadeImpl;
/**
- *
+ *
*/
public class FilterParserImpl implements FilterParser {
- /* do the static initialization */
- protected static Map<String, InfoBinaryOperator> availableBinaryOperators;
- protected static Map<String, InfoMethod> availableMethods;
- protected static Map<String, InfoUnaryOperator> availableUnaryOperators;
-
- static {
- initAvailTables();
- }
-
- /* instance attributes */
- protected EdmEntityType resourceEntityType = null;
- protected TokenList tokenList = null;
- protected String curExpression;
- protected String originalFilterString = "";
- protected String decodedFilterString = "";
- private boolean strictFilter = true;
-
-
- /**
- * Creates a new FilterParser implementation
- * @param resourceEntityType EntityType of the resource on which the filter is applied
- */
- public FilterParserImpl(final EdmEntityType resourceEntityType) {
- this.resourceEntityType = resourceEntityType;
- }
-
- /**
- * Creates a new FilterParser implementation
- * @param resourceEntityType EntityType of the resource on which the filter is applied
- * @param strictFilter boolean check to decide weather to validate filter
- */
- public FilterParserImpl(final EdmEntityType resourceEntityType, boolean strictFilter) {
- this.resourceEntityType = resourceEntityType;
- this.strictFilter = strictFilter;
- }
-
- /**
- * Creates a new FilterParser implementation
- * @param resourceEntityType EntityType of the resource on which the filter is applied
- * @param strictFilter boolean check to decide weather to validate filter
- * @param originalFilterString String original filter string prior to decoding
- */
- public FilterParserImpl(final EdmEntityType resourceEntityType, boolean strictFilter,
- String originalFilterString) {
- this.resourceEntityType = resourceEntityType;
- this.strictFilter = strictFilter;
- this.originalFilterString = originalFilterString;
- }
-
- @Override
- public FilterExpression parseFilterString(final String filterExpression) throws ExpressionParserException,
- ExpressionParserInternalError {
- return parseFilterString(filterExpression, false);
- }
-
- public FilterExpression parseFilterString(final String filterExpression, final boolean allowOnlyBinary)
- throws ExpressionParserException, ExpressionParserInternalError {
- CommonExpression node = null;
- curExpression = filterExpression;
- decodedFilterString = filterExpression;
- try {
- // Throws TokenizerException and FilterParserException. FilterParserException is caught somewhere above
- tokenList = new Tokenizer(filterExpression).tokenize();
- if (!tokenList.hasTokens()) {
- return new FilterExpressionImpl(filterExpression);
- }
- } catch (TokenizerException tokenizerException) {
- // Tested with TestParserExceptions.TestPMparseFilterString
- throw FilterParserExceptionImpl.createERROR_IN_TOKENIZER(tokenizerException, curExpression);
- }
+ /* do the static initialization */
+ protected static Map<String, InfoBinaryOperator> availableBinaryOperators;
+ protected static Map<String, InfoMethod> availableMethods;
+ protected static Map<String, InfoUnaryOperator> availableUnaryOperators;
+
+ static {
+ initAvailTables();
+ }
+
+ /* instance attributes */
+ protected EdmEntityType resourceEntityType = null;
+ protected TokenList tokenList = null;
+ protected String curExpression;
+ protected String originalFilterString = "";
+ protected String decodedFilterString = "";
+ private boolean strictFilter = true;
+
+
+ /**
+ * Creates a new FilterParser implementation
+ *
+ * @param resourceEntityType EntityType of the resource on which the filter is applied
+ */
+ public FilterParserImpl(final EdmEntityType resourceEntityType) {
+ this.resourceEntityType = resourceEntityType;
+ }
+
+ /**
+ * Creates a new FilterParser implementation
+ *
+ * @param resourceEntityType EntityType of the resource on which the filter is applied
+ * @param strictFilter boolean check to decide weather to validate filter
+ */
+ public FilterParserImpl(final EdmEntityType resourceEntityType, boolean strictFilter) {
+ this.resourceEntityType = resourceEntityType;
+ this.strictFilter = strictFilter;
+ }
+
+ /**
+ * Creates a new FilterParser implementation
+ *
+ * @param resourceEntityType EntityType of the resource on which the filter is applied
+ * @param strictFilter boolean check to decide weather to validate filter
+ * @param originalFilterString String original filter string prior to decoding
+ */
+ public FilterParserImpl(final EdmEntityType resourceEntityType, boolean strictFilter, String originalFilterString) {
+ this.resourceEntityType = resourceEntityType;
+ this.strictFilter = strictFilter;
+ this.originalFilterString = originalFilterString;
+ }
+
+ @Override
+ public FilterExpression parseFilterString(final String filterExpression)
+ throws ExpressionParserException, ExpressionParserInternalError {
+ return parseFilterString(filterExpression, false);
+ }
+
+ public FilterExpression parseFilterString(final String filterExpression, final boolean allowOnlyBinary)
+ throws ExpressionParserException, ExpressionParserInternalError {
+ CommonExpression node = null;
+ curExpression = filterExpression;
+ decodedFilterString = filterExpression;
+ try {
+ // Throws TokenizerException and FilterParserException. FilterParserException is caught somewhere
+ // above
+ tokenList = new Tokenizer(filterExpression).tokenize();
+ if (!tokenList.hasTokens()) {
+ return new FilterExpressionImpl(filterExpression);
+ }
+ } catch (TokenizerException tokenizerException) {
+ // Tested with TestParserExceptions.TestPMparseFilterString
+ throw FilterParserExceptionImpl.createERROR_IN_TOKENIZER(tokenizerException, curExpression);
+ }
- try {
- CommonExpression nodeLeft = readElement(null);
- node = readElements(nodeLeft, 0);
- } catch (ExpressionParserException filterParserException) {
- // Add empty filterTree to Exception
- // Tested for original throw point
- filterParserException.setFilterTree(new FilterExpressionImpl(filterExpression));
- throw filterParserException;
- }
+ try {
+ CommonExpression nodeLeft = readElement(null);
+ node = readElements(nodeLeft, 0);
+ } catch (ExpressionParserException filterParserException) {
+ // Add empty filterTree to Exception
+ // Tested for original throw point
+ filterParserException.setFilterTree(new FilterExpressionImpl(filterExpression));
+ throw filterParserException;
+ }
- // Post check
- if (tokenList.tokenCount() > tokenList.currentToken) // this indicates that not all tokens have been read
- {
- // Tested with TestParserExceptions.TestPMparseFilterString
- throw FilterParserExceptionImpl.createINVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING(tokenList
- .elementAt(tokenList.currentToken), filterExpression);
- }
+ // Post check
+ // this indicates that not all tokens have been read
+ if (tokenList.tokenCount() > tokenList.currentToken) {
+ // Tested with TestParserExceptions.TestPMparseFilterString
+ throw FilterParserExceptionImpl.createINVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING(tokenList.elementAt(tokenList.currentToken),
+ filterExpression);
+ }
- // Create and return filterExpression node
- if ((allowOnlyBinary == true) && (node.getEdmType() != null)
- && (node.getEdmType() != EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance())) {
- // Tested with TestParserExceptions.testAdditionalStuff CASE 9
- throw FilterParserExceptionImpl.createTYPE_EXPECTED_AT(EdmBoolean.getInstance(), node.getEdmType(), 1,
- curExpression);
- }
- if (filterExpression.equals(decodedFilterString)) {
- return new FilterExpressionImpl(filterExpression, node);
- } else {
+ // Create and return filterExpression node
+ if (allowOnlyBinary && (node.getEdmType() != null) && (node.getEdmType() != EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance())) {
+ // Tested with TestParserExceptions.testAdditionalStuff CASE 9
+ throw FilterParserExceptionImpl.createTYPE_EXPECTED_AT(EdmBoolean.getInstance(), node.getEdmType(), 1, curExpression);
+ }
+ if (filterExpression.equals(decodedFilterString)) {
+ return new FilterExpressionImpl(filterExpression, node);
+ }
return new FilterExpressionImpl(decodedFilterString, node);
- }
- }
-
- protected CommonExpression readElements(final CommonExpression leftExpression, final int priority)
- throws ExpressionParserException, ExpressionParserInternalError {
- CommonExpression leftNode = leftExpression;
- CommonExpression rightNode;
- BinaryExpression binaryNode;
-
- ActualBinaryOperator operator = readBinaryOperator();
- ActualBinaryOperator nextOperator;
-
- while ((operator != null) && (operator.getOP().getPriority() >= priority)) {
- tokenList.next(); // eat the operator
- rightNode = readElement(leftNode, operator); // throws FilterParserException, FilterParserInternalError
- if (rightNode == null) {
- // Tested with TestParserExceptions.testAdditionalStuff CASE 10
- throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AFTER_POS(operator.getToken().getPosition()
- + operator.getToken().getUriLiteral().length(), curExpression);
- }
- nextOperator = readBinaryOperator();
-
- // It must be "while" because for example in "Filter=a or c eq d and e eq f"
- // after reading the "eq" operator the "and" operator must be consumed too. This is due to the fact that "and" has
- // a higher priority than "or"
- while ((nextOperator != null) && (nextOperator.getOP().getPriority() > operator.getOP().getPriority())) {
- // recurse until the a binary operator with a lower priority is detected
- rightNode = readElements(rightNode, nextOperator.getOP().getPriority());
- nextOperator = readBinaryOperator();
- }
-
- // Although the member operator is also a binary operator, there is some special handling in the filterTree
- if (operator.getOP().getOperator() == BinaryOperator.PROPERTY_ACCESS) {
- binaryNode = new MemberExpressionImpl(leftNode, rightNode);
- } else {
- binaryNode = new BinaryExpressionImpl(operator.getOP(), leftNode, rightNode, operator.getToken());
- }
-
- try {
- validateBinaryOperatorTypes(binaryNode);
- } catch (ExpressionParserException expressionException) {
- // Extend the error information
- // Tested for original throw point
- expressionException.setFilterTree(binaryNode);
- throw expressionException;
- }
-
- leftNode = binaryNode;
- operator = readBinaryOperator();
}
- // Add special handling for expressions like $filter=notsupportedfunction('a')
- // If this special handling is not in place the error text would be
- // -->Invalid token "(" detected after parsing at position 21 in "notsupportedfunction('a')".
- // with this special handling we ensure that the error text would be
-
- Token token = tokenList.lookToken();
- if (token != null) {
- if ((leftNode.getKind() == ExpressionKind.PROPERTY) && (tokenList.lookToken().getKind() == TokenKind.OPENPAREN)) {
- // Tested with TestParserExceptions.testAdditionalStuff CASE 2
- throw FilterParserExceptionImpl.createINVALID_METHOD_CALL(leftNode, tokenList.lookPrevToken(), curExpression);
- }
- }
+ protected CommonExpression readElements(final CommonExpression leftExpression, final int priority)
+ throws ExpressionParserException, ExpressionParserInternalError {
+ CommonExpression leftNode = leftExpression;
+ CommonExpression rightNode;
+ BinaryExpression binaryNode;
+
+ ActualBinaryOperator operator = readBinaryOperator();
+ ActualBinaryOperator nextOperator;
+
+ while ((operator != null) && (operator.getOP()
+ .getPriority() >= priority)) {
+ tokenList.next(); // eat the operator
+ rightNode = readElement(leftNode, operator); // throws FilterParserException, FilterParserInternalError
+ if (rightNode == null) {
+ // Tested with TestParserExceptions.testAdditionalStuff CASE 10
+ throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AFTER_POS(operator.getToken()
+ .getPosition()
+ + operator.getToken()
+ .getUriLiteral()
+ .length(),
+ curExpression);
+ }
+ nextOperator = readBinaryOperator();
+
+ // It must be "while" because for example in "Filter=a or c eq d and e eq f"
+ // after reading the "eq" operator the "and" operator must be consumed too. This is due to the fact
+ // that "and" has
+ // a higher priority than "or"
+ while ((nextOperator != null) && (nextOperator.getOP()
+ .getPriority() > operator.getOP()
+ .getPriority())) {
+ // recurse until the a binary operator with a lower priority is detected
+ rightNode = readElements(rightNode, nextOperator.getOP()
+ .getPriority());
+ nextOperator = readBinaryOperator();
+ }
+
+ // Although the member operator is also a binary operator, there is some special handling in the
+ // filterTree
+ if (operator.getOP()
+ .getOperator() == BinaryOperator.PROPERTY_ACCESS) {
+ binaryNode = new MemberExpressionImpl(leftNode, rightNode);
+ } else {
+ binaryNode = new BinaryExpressionImpl(operator.getOP(), leftNode, rightNode, operator.getToken());
+ }
+
+ try {
+ validateBinaryOperatorTypes(binaryNode);
+ } catch (ExpressionParserException expressionException) {
+ // Extend the error information
+ // Tested for original throw point
+ expressionException.setFilterTree(binaryNode);
+ throw expressionException;
+ }
+
+ leftNode = binaryNode;
+ operator = readBinaryOperator();
+ }
- return leftNode;
- }
-
- /**
- * Reads the content between parenthesis. Its is expected that the current token is of kind
- * {@link TokenKind#OPENPAREN} because it MUST be check in the calling method ( when read the method name and the '('
- * is read).
- * @return An expression which reflects the content within the parenthesis
- * @throws ExpressionParserException
- * While reading the elements in the parenthesis an error occurred
- * @throws TokenizerMessage
- * The next token did not match the expected token
- */
- protected CommonExpression readParenthesis() throws ExpressionParserException, ExpressionParserInternalError {
- // The existing of a '(' is verified BEFORE this method is called --> so it's a internal error
- Token openParenthesis = tokenList.expectToken(TokenKind.OPENPAREN, true);
-
- CommonExpression firstExpression = readElement(null);
- CommonExpression parenthesisExpression = readElements(firstExpression, 0);
-
- // check for ')'
- try {
- tokenList.expectToken(TokenKind.CLOSEPAREN); // TokenizerMessage
- } catch (TokenizerExpectError e) {
- // Internal parsing error, even if there are no more token (then there should be a different exception).
- // Tested with TestParserExceptions.TestPMreadParenthesis
- throw FilterParserExceptionImpl.createMISSING_CLOSING_PARENTHESIS(openParenthesis.getPosition(), curExpression,
- e);
- }
- return parenthesisExpression;
- }
-
- /**
- * Read the parameters of a method expression
- * @param methodInfo
- * Signature information about the method whose parameters should be read
- * @param methodExpression
- * Method expression to which the read parameters are added
- * @return
- * The method expression input parameter
- * @throws ExpressionParserException
- * @throws ExpressionParserInternalError
- * @throws TokenizerExpectError
- * The next token did not match the expected token
- */
- protected MethodExpression readParameters(final InfoMethod methodInfo, final MethodExpressionImpl methodExpression,
- final Token methodToken) throws ExpressionParserException, ExpressionParserInternalError {
- CommonExpression expression;
- boolean expectAnotherExpression = false;
- boolean readComma = true;
-
- // The existing of a '(' is verified BEFORE this method is called --> so it's a internal error
- Token openParenthesis = tokenList.expectToken(TokenKind.OPENPAREN, true); // throws FilterParserInternalError
-
- Token token = tokenList.lookToken();
- if (token == null) {
- // Tested with TestParserExceptions.TestPMreadParameters CASE 1 e.g. "$filter=concat("
- throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AFTER_POS(openParenthesis, curExpression);
- }
+ // Add special handling for expressions like $filter=notsupportedfunction('a')
+ // If this special handling is not in place the error text would be
+ // -->Invalid token "(" detected after parsing at position 21 in "notsupportedfunction('a')".
+ // with this special handling we ensure that the error text would be
+
+ Token token = tokenList.lookToken();
+ if (token != null) {
+ if ((leftNode.getKind() == ExpressionKind.PROPERTY) && (tokenList.lookToken()
+ .getKind() == TokenKind.OPENPAREN)) {
+ // Tested with TestParserExceptions.testAdditionalStuff CASE 2
+ throw FilterParserExceptionImpl.createINVALID_METHOD_CALL(leftNode, tokenList.lookPrevToken(), curExpression);
+ }
+ }
- while (token.getKind() != TokenKind.CLOSEPAREN) {
- if (readComma == false) {
- // Tested with TestParserExceptions.TestPMreadParameters CASE 12 e.g. "$filter=concat('a' 'b')"
- throw FilterParserExceptionImpl.createCOMMA_OR_CLOSING_PARENTHESIS_EXPECTED_AFTER_POS(tokenList
- .lookPrevToken(), curExpression);
- }
- expression = readElement(null);
- if (expression != null) {
- expression = readElements(expression, 0);
- }
-
- if ((expression == null) && (expectAnotherExpression == true)) {
- // Tested with TestParserExceptions.TestPMreadParameters CASE 4 e.g. "$filter=concat(,"
- throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AFTER_POS(token, curExpression);
- } else if (expression != null) {// parameter list may be empty
- methodExpression.appendParameter(expression);
- }
-
- token = tokenList.lookToken();
- if (token == null) {
- // Tested with TestParserExceptions.TestPMreadParameters CASE 2 e.g. "$filter=concat(123"
- throw FilterParserExceptionImpl.createCOMMA_OR_CLOSING_PARENTHESIS_EXPECTED_AFTER_POS(tokenList
- .lookPrevToken(), curExpression);
- }
-
- if (token.getKind() == TokenKind.COMMA) {
- expectAnotherExpression = true;
- if (expression == null) {
- // Tested with TestParserExceptions.TestPMreadParameters CASE 3 e.g. "$filter=concat(,"
- throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AT_POS(token, curExpression);
- }
-
- tokenList.expectToken(",", true);
- readComma = true;
- } else {
- readComma = false;
- }
- }
+ return leftNode;
+ }
+
+ /**
+ * Reads the content between parenthesis. Its is expected that the current token is of kind
+ * {@link TokenKind#OPENPAREN} because it MUST be check in the calling method ( when read the method
+ * name and the '(' is read).
+ *
+ * @return An expression which reflects the content within the parenthesis
+ * @throws ExpressionParserException While reading the elements in the parenthesis an error occurred
+ * @throws TokenizerMessage The next token did not match the expected token
+ */
+ protected CommonExpression readParenthesis() throws ExpressionParserException, ExpressionParserInternalError {
+ // The existing of a '(' is verified BEFORE this method is called --> so it's a internal error
+ Token openParenthesis = tokenList.expectToken(TokenKind.OPENPAREN, true);
+
+ CommonExpression firstExpression = readElement(null);
+ CommonExpression parenthesisExpression = readElements(firstExpression, 0);
+
+ // check for ')'
+ try {
+ tokenList.expectToken(TokenKind.CLOSEPAREN); // TokenizerMessage
+ } catch (TokenizerExpectError e) {
+ // Internal parsing error, even if there are no more token (then there should be a different
+ // exception).
+ // Tested with TestParserExceptions.TestPMreadParenthesis
+ throw FilterParserExceptionImpl.createMISSING_CLOSING_PARENTHESIS(openParenthesis.getPosition(), curExpression, e);
+ }
+ return parenthesisExpression;
+ }
+
+ /**
+ * Read the parameters of a method expression
+ *
+ * @param methodInfo Signature information about the method whose parameters should be read
+ * @param methodExpression Method expression to which the read parameters are added
+ * @return The method expression input parameter
+ * @throws ExpressionParserException
+ * @throws ExpressionParserInternalError
+ * @throws TokenizerExpectError The next token did not match the expected token
+ */
+ protected MethodExpression readParameters(final InfoMethod methodInfo, final MethodExpressionImpl methodExpression,
+ final Token methodToken) throws ExpressionParserException, ExpressionParserInternalError {
+ CommonExpression expression;
+ boolean expectAnotherExpression = false;
+ boolean readComma = true;
+
+ // The existing of a '(' is verified BEFORE this method is called --> so it's a internal error
+ Token openParenthesis = tokenList.expectToken(TokenKind.OPENPAREN, true); // throws FilterParserInternalError
+
+ Token token = tokenList.lookToken();
+ if (token == null) {
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 1 e.g. "$filter=concat("
+ throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AFTER_POS(openParenthesis, curExpression);
+ }
- // because the while loop above only exits if a ')' has been found it is an
- // internal error if there is not ')'
- tokenList.expectToken(TokenKind.CLOSEPAREN, true);
+ while (token.getKind() != TokenKind.CLOSEPAREN) {
+ if (!readComma) {
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 12 e.g. "$filter=concat('a' 'b')"
+ throw FilterParserExceptionImpl.createCOMMA_OR_CLOSING_PARENTHESIS_EXPECTED_AFTER_POS(tokenList.lookPrevToken(),
+ curExpression);
+ }
+ expression = readElement(null);
+ if (expression != null) {
+ expression = readElements(expression, 0);
+ }
+
+ if ((expression == null) && expectAnotherExpression) {
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 4 e.g. "$filter=concat(,"
+ throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AFTER_POS(token, curExpression);
+ }
+ if (expression != null) {// parameter list may be empty
+ methodExpression.appendParameter(expression);
+ }
+
+ token = tokenList.lookToken();
+ if (token == null) {
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 2 e.g. "$filter=concat(123"
+ throw FilterParserExceptionImpl.createCOMMA_OR_CLOSING_PARENTHESIS_EXPECTED_AFTER_POS(tokenList.lookPrevToken(),
+ curExpression);
+ }
+
+ if (token.getKind() == TokenKind.COMMA) {
+ expectAnotherExpression = true;
+ if (expression == null) {
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 3 e.g. "$filter=concat(,"
+ throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AT_POS(token, curExpression);
+ }
+
+ tokenList.expectToken(",", true);
+ readComma = true;
+ } else {
+ readComma = false;
+ }
+ }
- // ---check parameter count
- int count = methodExpression.getParameters().size();
- if ((methodInfo.getMinParameter() > -1) && (count < methodInfo.getMinParameter())) {
- // Tested with TestParserExceptions.TestPMreadParameters CASE 12
- throw FilterParserExceptionImpl.createMETHOD_WRONG_ARG_COUNT(methodExpression, methodToken, curExpression);
- }
+ // because the while loop above only exits if a ')' has been found it is an
+ // internal error if there is not ')'
+ tokenList.expectToken(TokenKind.CLOSEPAREN, true);
- if ((methodInfo.getMaxParameter() > -1) && (count > methodInfo.getMaxParameter())) {
- // Tested with TestParserExceptions.TestPMreadParameters CASE 15
- throw FilterParserExceptionImpl.createMETHOD_WRONG_ARG_COUNT(methodExpression, methodToken, curExpression);
- }
+ // ---check parameter count
+ int count = methodExpression.getParameters()
+ .size();
+ if ((methodInfo.getMinParameter() > -1) && (count < methodInfo.getMinParameter())) {
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 12
+ throw FilterParserExceptionImpl.createMETHOD_WRONG_ARG_COUNT(methodExpression, methodToken, curExpression);
+ }
- return methodExpression;
- }
-
- protected CommonExpression readElement(final CommonExpression leftExpression) throws ExpressionParserException,
- ExpressionParserInternalError {
- return readElement(leftExpression, null);
- }
-
- /**
- * Reads: Unary operators, Methods, Properties, ...
- * but not binary operators which are handelt in {@link #readElements(CommonExpression, int)}
- * @param leftExpression
- * Used while parsing properties. In this case ( e.g. parsing "a/b") the property "a" ( as leftExpression of "/") is
- * relevant
- * to verify whether the property "b" exists inside the edm
- * @return a CommonExpression
- * @throws ExpressionParserException
- * @throws ExpressionParserInternalError
- * @throws TokenizerMessage
- */
- protected CommonExpression
- readElement(final CommonExpression leftExpression, final ActualBinaryOperator leftOperator)
- throws ExpressionParserException, ExpressionParserInternalError {
- CommonExpression node = null;
- Token token;
- Token lookToken;
- lookToken = tokenList.lookToken();
- if (lookToken == null) {
- return null;
- }
+ if ((methodInfo.getMaxParameter() > -1) && (count > methodInfo.getMaxParameter())) {
+ // Tested with TestParserExceptions.TestPMreadParameters CASE 15
+ throw FilterParserExceptionImpl.createMETHOD_WRONG_ARG_COUNT(methodExpression, methodToken, curExpression);
+ }
- switch (lookToken.getKind()) {
- case OPENPAREN:
- node = readParenthesis();
- return node;
- case CLOSEPAREN: // ')' finishes a parenthesis (it is no extra token)" +
- case COMMA: // . " ',' is a separator for function parameters (it is no extra token)" +
- return null;
- default:
- // continue
- }
+ return methodExpression;
+ }
+
+ protected CommonExpression readElement(final CommonExpression leftExpression)
+ throws ExpressionParserException, ExpressionParserInternalError {
+ return readElement(leftExpression, null);
+ }
+
+ /**
+ * Reads: Unary operators, Methods, Properties, ... but not binary operators which are handelt in
+ * {@link #readElements(CommonExpression, int)}
+ *
+ * @param leftExpression Used while parsing properties. In this case ( e.g. parsing "a/b") the
+ * property "a" ( as leftExpression of "/") is relevant to verify whether the property "b"
+ * exists inside the edm
+ * @return a CommonExpression
+ * @throws ExpressionParserException
+ * @throws ExpressionParserInternalError
+ * @throws TokenizerMessage
+ */
+ protected CommonExpression readElement(final CommonExpression leftExpression, final ActualBinaryOperator leftOperator)
+ throws ExpressionParserException, ExpressionParserInternalError {
+ CommonExpression node = null;
+ Token token;
+ Token lookToken;
+ lookToken = tokenList.lookToken();
+ if (lookToken == null) {
+ return null;
+ }
- // -->Check if the token is a unary operator
- InfoUnaryOperator unaryOperator = isUnaryOperator(lookToken);
- if (unaryOperator != null) {
- return readUnaryoperator(lookToken, unaryOperator);
- }
+ switch (lookToken.getKind()) {
+ case OPENPAREN:
+ return readParenthesis();
+ case CLOSEPAREN: // ')' finishes a parenthesis (it is no extra token)" +
+ case COMMA: // . " ',' is a separator for function parameters (it is no extra token)" +
+ return null;
+ default:
+ // continue
+ }
- // ---expect the look ahead token
- token = tokenList.expectToken(lookToken.getUriLiteral(), true);
- lookToken = tokenList.lookToken();
+ // -->Check if the token is a unary operator
+ InfoUnaryOperator unaryOperator = isUnaryOperator(lookToken);
+ if (unaryOperator != null) {
+ return readUnaryoperator(lookToken, unaryOperator);
+ }
- // -->Check if the token is a method
- // To avoid name clashes between method names and property names we accept here only method names if a "(" follows.
- // Hence the parser accepts a property named "concat"
- InfoMethod methodOperator = isMethod(token, lookToken);
- if (methodOperator != null) {
- return readMethod(token, methodOperator);
- }
+ // ---expect the look ahead token
+ token = tokenList.expectToken(lookToken.getUriLiteral(), true);
+ lookToken = tokenList.lookToken();
+
+ // -->Check if the token is a method
+ // To avoid name clashes between method names and property names we accept here only method names if
+ // a "(" follows.
+ // Hence the parser accepts a property named "concat"
+ InfoMethod methodOperator = isMethod(token, lookToken);
+ if (methodOperator != null) {
+ return readMethod(token, methodOperator);
+ }
- // -->Check if token is a terminal
- // is a terminal e.g. a Value like an EDM.String 'hugo' or 125L or 1.25D"
- if (token.getKind() == TokenKind.SIMPLE_TYPE) {
- LiteralExpression literal = new LiteralExpressionImpl(
- getEncodedUriLiteral(token.getUriLiteral(),token.getPosition()), token.getJavaLiteral());
- return literal;
- }
+ // -->Check if token is a terminal
+ // is a terminal e.g. a Value like an EDM.String 'hugo' or 125L or 1.25D"
+ if (token.getKind() == TokenKind.SIMPLE_TYPE) {
+ return new LiteralExpressionImpl(getEncodedUriLiteral(token.getUriLiteral(), token.getPosition()), token.getJavaLiteral());
+ }
+
+ // -->Check if token is a property, e.g. "name" or "address"
+ if (token.getKind() == TokenKind.LITERAL) {
+ PropertyExpressionImpl property = new PropertyExpressionImpl(token.getUriLiteral(), token.getJavaLiteral());
+ validateEdmProperty(leftExpression, property, token, leftOperator);
+ return property;
+ }
- // -->Check if token is a property, e.g. "name" or "address"
- if (token.getKind() == TokenKind.LITERAL) {
- PropertyExpressionImpl property = new PropertyExpressionImpl(token.getUriLiteral(), token.getJavaLiteral());
- validateEdmProperty(leftExpression, property, token, leftOperator);
- return property;
+ // not Tested, should not occur
+ throw ExpressionParserInternalError.createCOMMON();
}
- // not Tested, should not occur
- throw ExpressionParserInternalError.createCOMMON();
- }
+ protected CommonExpression readUnaryoperator(final Token lookToken, final InfoUnaryOperator unaryOperator)
+ throws ExpressionParserException, ExpressionParserInternalError {
+ tokenList.expectToken(lookToken.getUriLiteral(), true);
- protected CommonExpression readUnaryoperator(final Token lookToken, final InfoUnaryOperator unaryOperator)
- throws ExpressionParserException, ExpressionParserInternalError {
- tokenList.expectToken(lookToken.getUriLiteral(), true);
+ CommonExpression operand = readElement(null);
+ UnaryExpression unaryExpression = new UnaryExpressionImpl(unaryOperator, operand);
+ validateUnaryOperatorTypes(unaryExpression); // throws ExpressionInvalidOperatorTypeException
- CommonExpression operand = readElement(null);
- UnaryExpression unaryExpression = new UnaryExpressionImpl(unaryOperator, operand);
- validateUnaryOperatorTypes(unaryExpression); // throws ExpressionInvalidOperatorTypeException
+ return unaryExpression;
+ }
- return unaryExpression;
- }
+ protected CommonExpression readMethod(final Token token, final InfoMethod methodOperator)
+ throws ExpressionParserException, ExpressionParserInternalError {
+ MethodExpressionImpl method = new MethodExpressionImpl(methodOperator);
- protected CommonExpression readMethod(final Token token, final InfoMethod methodOperator)
- throws ExpressionParserException, ExpressionParserInternalError {
- MethodExpressionImpl method = new MethodExpressionImpl(methodOperator);
+ readParameters(methodOperator, method, token);
+ validateMethodTypes(method, token); // throws ExpressionInvalidOperatorTypeException
- readParameters(methodOperator, method, token);
- validateMethodTypes(method, token); // throws ExpressionInvalidOperatorTypeException
+ return method;
+ }
- return method;
- }
+ protected ActualBinaryOperator readBinaryOperator() {
+ InfoBinaryOperator operator = null;
+ Token token = tokenList.lookToken();
+ if (token == null) {
+ return null;
+ }
+ if ((token.getKind() == TokenKind.SYMBOL) && ("/".equals(token.getUriLiteral()))) {
+ operator = availableBinaryOperators.get(token.getUriLiteral());
+ } else if (token.getKind() == TokenKind.LITERAL) {
+ operator = availableBinaryOperators.get(token.getUriLiteral());
+ }
- protected ActualBinaryOperator readBinaryOperator() {
- InfoBinaryOperator operator = null;
- Token token = tokenList.lookToken();
- if (token == null) {
- return null;
- }
- if ((token.getKind() == TokenKind.SYMBOL) && ("/".equals(token.getUriLiteral()))) {
- operator = availableBinaryOperators.get(token.getUriLiteral());
- } else if (token.getKind() == TokenKind.LITERAL) {
- operator = availableBinaryOperators.get(token.getUriLiteral());
- }
+ if (operator == null) {
+ return null;
+ }
- if (operator == null) {
- return null;
+ return new ActualBinaryOperator(operator, token);
+ }
+
+ /**
+ * Check if a token is a UnaryOperator ( e.g. "not" or "-" )
+ *
+ * @param token Token to be checked
+ *
+ * @return
+ * <li>An instance of {@link InfoUnaryOperator} containing information about the specific
+ * unary operator</li>
+ * <li><code>null</code> if the token is not an unary operator</li>
+ */
+ protected InfoUnaryOperator isUnaryOperator(final Token token) {
+ if ((token.getKind() == TokenKind.LITERAL) || (token.getKind() == TokenKind.SYMBOL)) {
+ return availableUnaryOperators.get(token.getUriLiteral());
+ }
+ return null;
}
- return new ActualBinaryOperator(operator, token);
- }
-
- /**
- * Check if a token is a UnaryOperator ( e.g. "not" or "-" )
- *
- * @param token Token to be checked
- *
- * @return
- * <li>An instance of {@link InfoUnaryOperator} containing information about the specific unary operator</li>
- * <li><code>null</code> if the token is not an unary operator</li>
- */
- protected InfoUnaryOperator isUnaryOperator(final Token token) {
- if ((token.getKind() == TokenKind.LITERAL) || (token.getKind() == TokenKind.SYMBOL)) {
- InfoUnaryOperator operator = availableUnaryOperators.get(token.getUriLiteral());
- return operator;
+ protected InfoMethod isMethod(final Token token, final Token lookToken) {
+ if ((lookToken != null) && (lookToken.getKind() == TokenKind.OPENPAREN)) {
+ return availableMethods.get(token.getUriLiteral());
+ }
+ return null;
}
- return null;
- }
- protected InfoMethod isMethod(final Token token, final Token lookToken) {
- if ((lookToken != null) && (lookToken.getKind() == TokenKind.OPENPAREN)) {
- return availableMethods.get(token.getUriLiteral());
- }
- return null;
- }
+ protected void validateEdmProperty(final CommonExpression leftExpression, final PropertyExpressionImpl property,
+ final Token propertyToken, final ActualBinaryOperator actBinOp)
+ throws ExpressionParserException, ExpressionParserInternalError {
- protected void validateEdmProperty(final CommonExpression leftExpression, final PropertyExpressionImpl property,
- final Token propertyToken, final ActualBinaryOperator actBinOp) throws ExpressionParserException,
- ExpressionParserInternalError {
+ // Exit if no edm provided
+ if (resourceEntityType == null) {
+ return;
+ }
- // Exit if no edm provided
- if (resourceEntityType == null) {
- return;
- }
+ if (leftExpression == null) {
+ // e.g. "$filter=city eq 'Hong Kong'" --> "city" is checked against the resource entity type of the
+ // last URL
+ // segment
+ validateEdmPropertyOfStructuredType(resourceEntityType, property, propertyToken);
+ return;
+ }
+ // e.g. "$filter='Hong Kong' eq address/city" --> city is "checked" against the type of the property
+ // "address".
+ // "address" itself must be a (navigation)property of the resource entity type of the last URL
+ // segment AND
+ // "address" must have a structural edm type
+ EdmType parentType = leftExpression.getEdmType(); // parentType point now to the type of property "address"
+
+ if ((actBinOp != null) && (actBinOp.operator.getOperator() != BinaryOperator.PROPERTY_ACCESS)) {
+ validateEdmPropertyOfStructuredType(resourceEntityType, property, propertyToken);
+ return;
+ }
+ if ((leftExpression.getKind() != ExpressionKind.PROPERTY) && (leftExpression.getKind() != ExpressionKind.MEMBER)) {
+ if (actBinOp != null) {
+ // Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 6
+ throw FilterParserExceptionImpl.createLEFT_SIDE_NOT_A_PROPERTY(actBinOp.token, curExpression);
+ }
+ // not Tested, should not occur
+ throw ExpressionParserInternalError.createCOMMON();
- if (leftExpression == null) {
- // e.g. "$filter=city eq 'Hong Kong'" --> "city" is checked against the resource entity type of the last URL
- // segment
- validateEdmPropertyOfStructuredType(resourceEntityType, property, propertyToken);
- return;
- }
- // e.g. "$filter='Hong Kong' eq address/city" --> city is "checked" against the type of the property "address".
- // "address" itself must be a (navigation)property of the resource entity type of the last URL segment AND
- // "address" must have a structural edm type
- EdmType parentType = leftExpression.getEdmType(); // parentType point now to the type of property "address"
-
- if ((actBinOp != null) && (actBinOp.operator.getOperator() != BinaryOperator.PROPERTY_ACCESS)) {
- validateEdmPropertyOfStructuredType(resourceEntityType, property, propertyToken);
- return;
- } else {
- if ((leftExpression.getKind() != ExpressionKind.PROPERTY) &&
- (leftExpression.getKind() != ExpressionKind.MEMBER)) {
- if (actBinOp != null) {
- // Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 6
- throw FilterParserExceptionImpl.createLEFT_SIDE_NOT_A_PROPERTY(actBinOp.token, curExpression);
- } else {
- // not Tested, should not occur
- throw ExpressionParserInternalError.createCOMMON();
}
- }
+ if (parentType instanceof EdmEntityType) {
+ // e.g. "$filter='Hong Kong' eq navigationProp/city" --> "navigationProp" is a navigation property
+ // with a entity
+ // type
+ validateEdmPropertyOfStructuredType((EdmStructuralType) parentType, property, propertyToken);
+ } else if (parentType instanceof EdmComplexType) {
+ // e.g. "$filter='Hong Kong' eq address/city" --> "address" is a property with a complex type
+ validateEdmPropertyOfStructuredType((EdmStructuralType) parentType, property, propertyToken);
+ } else {
+ // e.g. "$filter='Hong Kong' eq name/city" --> "name is of type String"
+ // Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 5
+ throw FilterParserExceptionImpl.createLEFT_SIDE_NOT_STRUCTURAL_TYPE(parentType, property, propertyToken, curExpression);
+ }
}
- if (parentType instanceof EdmEntityType) {
- // e.g. "$filter='Hong Kong' eq navigationProp/city" --> "navigationProp" is a navigation property with a entity
- // type
- validateEdmPropertyOfStructuredType((EdmStructuralType) parentType, property, propertyToken);
- } else if (parentType instanceof EdmComplexType) {
- // e.g. "$filter='Hong Kong' eq address/city" --> "address" is a property with a complex type
- validateEdmPropertyOfStructuredType((EdmStructuralType) parentType, property, propertyToken);
- } else {
- // e.g. "$filter='Hong Kong' eq name/city" --> "name is of type String"
- // Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 5
- throw FilterParserExceptionImpl.createLEFT_SIDE_NOT_STRUCTURAL_TYPE(parentType, property, propertyToken,
- curExpression);
+ protected void validateEdmPropertyOfStructuredType(final EdmStructuralType parentType, final PropertyExpressionImpl property,
+ final Token propertyToken) throws ExpressionParserException, ExpressionParserInternalError {
+ try {
+ String propertyName = property.getUriLiteral();
+ EdmTyped edmProperty = parentType.getProperty(propertyName);
+
+ if (edmProperty == null) {
+ // Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 3
+ throw FilterParserExceptionImpl.createPROPERTY_NAME_NOT_FOUND_IN_TYPE(parentType, property, propertyToken, curExpression);
+ }
+ property.setEdmProperty(edmProperty);
+ property.setEdmType(edmProperty.getType());
+ if (isLastFilterElement(propertyName)) {
+ if (edmProperty.getMultiplicity() == EdmMultiplicity.MANY && strictFilter) {
+ throw new ExpressionParserException(ExpressionParserException.INVALID_MULTIPLICITY.create()
+ .addContent(propertyName)
+ .addContent(
+ propertyToken.getPosition()
+ + 1));
+ }
+ }
+
+ } catch (EdmException e) {
+ // not Tested, should not occur
+ throw ExpressionParserInternalError.createERROR_ACCESSING_EDM(e);
+ }
}
- return;
- }
-
- protected void validateEdmPropertyOfStructuredType(final EdmStructuralType parentType,
- final PropertyExpressionImpl property, final Token propertyToken) throws ExpressionParserException,
- ExpressionParserInternalError {
- try {
- String propertyName = property.getUriLiteral();
- EdmTyped edmProperty = parentType.getProperty(propertyName);
-
- if (edmProperty != null) {
- property.setEdmProperty(edmProperty);
- property.setEdmType(edmProperty.getType());
- if(isLastFilterElement(propertyName)) {
- if (edmProperty.getMultiplicity() == EdmMultiplicity.MANY && strictFilter) {
- throw new ExpressionParserException(
- ExpressionParserException.INVALID_MULTIPLICITY.create()
- .addContent(propertyName)
- .addContent(propertyToken.getPosition() + 1));
- }
- }
- } else {
- // Tested with TestParserExceptions.TestPMvalidateEdmProperty CASE 3
- throw FilterParserExceptionImpl.createPROPERTY_NAME_NOT_FOUND_IN_TYPE(parentType, property, propertyToken,
- curExpression);
- }
-
- } catch (EdmException e) {
- // not Tested, should not occur
- throw ExpressionParserInternalError.createERROR_ACCESSING_EDM(e);
- }
- }
-
- /**
- * Check if the property name is the last or only element of the filter
- * @param propertyName name of the property
- * @return <code>true</code> if this is the last or only otherwise <code>false</code>
- */
- private boolean isLastFilterElement(String propertyName) {
- return curExpression.contains(propertyName + " ");
- }
-
- protected void validateUnaryOperatorTypes(final UnaryExpression unaryExpression)
- throws ExpressionParserInternalError {
- InfoUnaryOperator unOpt = availableUnaryOperators.get(unaryExpression.getOperator().toUriLiteral());
- EdmType operandType = unaryExpression.getOperand().getEdmType();
-
- if ((operandType == null) && (resourceEntityType == null)) {
- return;
+ /**
+ * Check if the property name is the last or only element of the filter
+ *
+ * @param propertyName name of the property
+ * @return <code>true</code> if this is the last or only otherwise <code>false</code>
+ */
+ private boolean isLastFilterElement(String propertyName) {
+ return curExpression.contains(propertyName + " ");
}
- List<EdmType> actualParameterTypes = new ArrayList<EdmType>();
- actualParameterTypes.add(operandType);
+ protected void validateUnaryOperatorTypes(final UnaryExpression unaryExpression) throws ExpressionParserInternalError {
+ InfoUnaryOperator unOpt = availableUnaryOperators.get(unaryExpression.getOperator()
+ .toUriLiteral());
+ EdmType operandType = unaryExpression.getOperand()
+ .getEdmType();
- ParameterSet parameterSet = unOpt.validateParameterSet(actualParameterTypes);
- if (parameterSet != null) {
- unaryExpression.setEdmType(parameterSet.getReturnType());
- }
- }
+ if ((operandType == null) && (resourceEntityType == null)) {
+ return;
+ }
- protected void validateBinaryOperatorTypes(final BinaryExpression binaryExpression) throws ExpressionParserException,
- ExpressionParserInternalError {
- InfoBinaryOperator binOpt = availableBinaryOperators.get(binaryExpression.getOperator().toUriLiteral());
+ List<EdmType> actualParameterTypes = new ArrayList<EdmType>();
+ actualParameterTypes.add(operandType);
- List<EdmType> actualParameterTypes = new ArrayList<EdmType>();
- final EdmType leftType = binaryExpression.getLeftOperand().getEdmType();
- if (leftType == null && resourceEntityType == null) {
- return;
+ ParameterSet parameterSet = unOpt.validateParameterSet(actualParameterTypes);
+ if (parameterSet != null) {
+ unaryExpression.setEdmType(parameterSet.getReturnType());
+ }
}
- actualParameterTypes.add(leftType);
- final EdmType rightType = binaryExpression.getRightOperand().getEdmType();
- if (rightType == null && resourceEntityType == null) {
- return;
- }
- actualParameterTypes.add(rightType);
-
- // special case for navigation property (non-)equality comparison with null
- if ("Equality".equals(binOpt.getCategory())
- && (leftType != null && leftType.getKind() == EdmTypeKind.ENTITY
- && rightType == EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Null)
- || leftType == EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Null)
- && rightType != null && rightType.getKind() == EdmTypeKind.ENTITY)) {
- binaryExpression.setEdmType(EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Boolean));
- return;
- }
+ protected void validateBinaryOperatorTypes(final BinaryExpression binaryExpression)
+ throws ExpressionParserException, ExpressionParserInternalError {
+ InfoBinaryOperator binOpt = availableBinaryOperators.get(binaryExpression.getOperator()
+ .toUriLiteral());
- final ParameterSet parameterSet = binOpt.validateParameterSet(actualParameterTypes);
- if (parameterSet == null) {
- BinaryExpressionImpl binaryExpressionImpl = (BinaryExpressionImpl) binaryExpression;
+ List<EdmType> actualParameterTypes = new ArrayList<EdmType>();
+ final EdmType leftType = binaryExpression.getLeftOperand()
+ .getEdmType();
+ if (leftType == null && resourceEntityType == null) {
+ return;
+ }
+ actualParameterTypes.add(leftType);
- // Tested with TestParserExceptions.TestPMvalidateBinaryOperator
- throw FilterParserExceptionImpl.createINVALID_TYPES_FOR_BINARY_OPERATOR(binaryExpression.getOperator(),
- binaryExpression.getLeftOperand().getEdmType(), binaryExpression.getRightOperand().getEdmType(),
- binaryExpressionImpl.getToken(), curExpression);
+ final EdmType rightType = binaryExpression.getRightOperand()
+ .getEdmType();
+ if (rightType == null && resourceEntityType == null) {
+ return;
+ }
+ actualParameterTypes.add(rightType);
+
+ // special case for navigation property (non-)equality comparison with null
+ if ("Equality".equals(binOpt.getCategory()) && (leftType != null && leftType.getKind() == EdmTypeKind.ENTITY
+ && rightType == EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Null)
+ || leftType == EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Null) && rightType != null
+ && rightType.getKind() == EdmTypeKind.ENTITY)) {
+ binaryExpression.setEdmType(EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Boolean));
+ return;
+ }
+
+ final ParameterSet parameterSet = binOpt.validateParameterSet(actualParameterTypes);
+ if (parameterSet == null) {
+ BinaryExpressionImpl binaryExpressionImpl = (BinaryExpressionImpl) binaryExpression;
+
+ // Tested with TestParserExceptions.TestPMvalidateBinaryOperator
+ throw FilterParserExceptionImpl.createINVALID_TYPES_FOR_BINARY_OPERATOR(binaryExpression.getOperator(),
+ binaryExpression.getLeftOperand()
+ .getEdmType(),
+ binaryExpression.getRightOperand()
+ .getEdmType(),
+ binaryExpressionImpl.getToken(), curExpression);
+ }
+ binaryExpression.setEdmType(parameterSet.getReturnType());
}
- binaryExpression.setEdmType(parameterSet.getReturnType());
- }
- protected void validateMethodTypes(final MethodExpression methodExpression, final Token methodToken)
- throws ExpressionParserException, ExpressionParserInternalError {
- InfoMethod methOpt = availableMethods.get(methodExpression.getUriLiteral());
+ protected void validateMethodTypes(final MethodExpression methodExpression, final Token methodToken)
+ throws ExpressionParserException, ExpressionParserInternalError {
+ InfoMethod methOpt = availableMethods.get(methodExpression.getUriLiteral());
- List<EdmType> actualParameterTypes = new ArrayList<EdmType>();
+ List<EdmType> actualParameterTypes = new ArrayList<EdmType>();
- // If there are no parameter then don't perform a type check
- if (methodExpression.getParameters().isEmpty()) {
- return;
- }
+ // If there are no parameter then don't perform a type check
+ if (methodExpression.getParameters()
+ .isEmpty()) {
+ return;
+ }
- for (CommonExpression parameter : methodExpression.getParameters()) {
- // If there is not at parsing time its not possible to determine the type of eg myPropertyName.
- // Since this should not cause validation errors null type node arguments are leading to bypass
- // the validation
- if (parameter.getEdmType() == null && resourceEntityType == null) {
- return;
- }
- actualParameterTypes.add(parameter.getEdmType());
- }
+ for (CommonExpression parameter : methodExpression.getParameters()) {
+ // If there is not at parsing time its not possible to determine the type of eg myPropertyName.
+ // Since this should not cause validation errors null type node arguments are leading to bypass
+ // the validation
+ if (parameter.getEdmType() == null && resourceEntityType == null) {
+ return;
+ }
+ actualParameterTypes.add(parameter.getEdmType());
+ }
- ParameterSet parameterSet = methOpt.validateParameterSet(actualParameterTypes);
- // If there is not returntype then the input parameter
- if (parameterSet == null) {
- // Tested with TestParserExceptions.testPMvalidateMethodTypes CASE 1
- throw FilterParserExceptionImpl.createMETHOD_WRONG_INPUT_TYPE((MethodExpressionImpl) methodExpression,
- methodToken, curExpression);
+ ParameterSet parameterSet = methOpt.validateParameterSet(actualParameterTypes);
+ // If there is not returntype then the input parameter
+ if (parameterSet == null) {
+ // Tested with TestParserExceptions.testPMvalidateMethodTypes CASE 1
+ throw FilterParserExceptionImpl.createMETHOD_WRONG_INPUT_TYPE((MethodExpressionImpl) methodExpression, methodToken,
+ curExpression);
+ }
+ methodExpression.setEdmType(parameterSet.getReturnType());
+ }
+
+ /*
+ * In case we have + in the string literal and is replaced with ' '(space) in UriParserImpl it needs
+ * to be changed back to +
+ */
+ private String getEncodedUriLiteral(String uriLiteral, int pos) {
+ if (originalFilterString.length() != 0 && uriLiteral.contains(" ")) {
+ String encodedUriLiteral = uriLiteral.replaceAll(" ", "+");
+ String originalFilterToken = originalFilterString.substring(pos, pos + uriLiteral.length());
+ if (originalFilterToken != null && originalFilterToken.equals(encodedUriLiteral)) {
+ decodedFilterString = decodedFilterString.substring(0, pos) + encodedUriLiteral
+ + decodedFilterString.substring(pos + uriLiteral.length());
+ uriLiteral = encodedUriLiteral;
+ }
+ }
+ return uriLiteral;
+ }
+
+ static void initAvailTables() {
+ Map<String, InfoBinaryOperator> lAvailableBinaryOperators = new HashMap<String, InfoBinaryOperator>();
+ Map<String, InfoMethod> lAvailableMethods = new HashMap<String, InfoMethod>();
+ Map<String, InfoUnaryOperator> lAvailableUnaryOperators = new HashMap<String, InfoUnaryOperator>();
+
+ // create type validators
+ ParameterSetCombination combination = null;
+ // create type helpers
+ EdmSimpleType boolean_ = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Boolean);
+ EdmSimpleType sbyte = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.SByte);
+ EdmSimpleType byte_ = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Byte);
+ EdmSimpleType int16 = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Int16);
+ EdmSimpleType int32 = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Int32);
+ EdmSimpleType int64 = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Int64);
+ EdmSimpleType single = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Single);
+ EdmSimpleType double_ = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Double);
+ EdmSimpleType decimal = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Decimal);
+ EdmSimpleType string = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.String);
+ EdmSimpleType time = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Time);
+ EdmSimpleType datetime = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.DateTime);
+ EdmSimpleType datetimeoffset = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.DateTimeOffset);
+ EdmSimpleType guid = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Guid);
+ EdmSimpleType binary = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Binary);
+ EdmSimpleType null_ = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Null);
+
+ // ---Member member access---
+ lAvailableBinaryOperators.put("/", new InfoBinaryOperator(BinaryOperator.PROPERTY_ACCESS, "Primary", 100,
+ new ParameterSetCombination.PSCReturnTypeEqLastParameter()));// todo fix this
+
+ // ---Multiplicative---
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(sbyte, sbyte, sbyte));
+ combination.add(new ParameterSet(byte_, byte_, byte_));
+ combination.add(new ParameterSet(int16, int16, int16));
+ combination.add(new ParameterSet(int32, int32, int32));
+ combination.add(new ParameterSet(int64, int64, int64));
+ combination.add(new ParameterSet(single, single, single));
+ combination.add(new ParameterSet(double_, double_, double_));
+ combination.add(new ParameterSet(decimal, decimal, decimal));
+
+ combination.add(new ParameterSet(sbyte, sbyte, null_));
+ combination.add(new ParameterSet(sbyte, null_, sbyte));
+ combination.add(new ParameterSet(byte_, byte_, null_));
+ combination.add(new ParameterSet(byte_, null_, byte_));
+
+ combination.add(new ParameterSet(int16, int16, null_));
+ combination.add(new ParameterSet(int16, null_, int16));
+ combination.add(new ParameterSet(int32, int32, null_));
+ combination.add(new ParameterSet(int32, null_, int32));
+ combination.add(new ParameterSet(int64, int64, null_));
+ combination.add(new ParameterSet(int64, null_, int64));
+
+ combination.add(new ParameterSet(single, single, null_));
+ combination.add(new ParameterSet(single, null_, single));
+ combination.add(new ParameterSet(double_, double_, null_));
+ combination.add(new ParameterSet(double_, null_, double_));
+ combination.add(new ParameterSet(decimal, decimal, null_));
+ combination.add(new ParameterSet(decimal, null_, decimal));
+
+ lAvailableBinaryOperators.put(BinaryOperator.MUL.toUriLiteral(),
+ new InfoBinaryOperator(BinaryOperator.MUL, "Multiplicative", 60, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.DIV.toUriLiteral(),
+ new InfoBinaryOperator(BinaryOperator.DIV, "Multiplicative", 60, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.MODULO.toUriLiteral(),
+ new InfoBinaryOperator(BinaryOperator.MODULO, "Multiplicative", 60, combination));
+
+ // ---Additive---
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(sbyte, sbyte, sbyte));
+ combination.add(new ParameterSet(byte_, byte_, byte_));
+ combination.add(new ParameterSet(int16, int16, int16));
+ combination.add(new ParameterSet(int32, int32, int32));
+ combination.add(new ParameterSet(int64, int64, int64));
+ combination.add(new ParameterSet(single, single, single));
+ combination.add(new ParameterSet(double_, double_, double_));
+ combination.add(new ParameterSet(decimal, decimal, decimal));
+
+ combination.add(new ParameterSet(sbyte, sbyte, null_));
+ combination.add(new ParameterSet(sbyte, null_, sbyte));
+ combination.add(new ParameterSet(byte_, byte_, null_));
+ combination.add(new ParameterSet(byte_, null_, byte_));
+
+ combination.add(new ParameterSet(int16, int16, null_));
+ combination.add(new ParameterSet(int16, null_, int16));
+ combination.add(new ParameterSet(int32, int32, null_));
+ combination.add(new ParameterSet(int32, null_, int32));
+ combination.add(new ParameterSet(int64, int64, null_));
+ combination.add(new ParameterSet(int64, null_, int64));
+
+ combination.add(new ParameterSet(single, single, null_));
+ combination.add(new ParameterSet(single, null_, single));
+ combination.add(new ParameterSet(double_, double_, null_));
+ combination.add(new ParameterSet(double_, null_, double_));
+ combination.add(new ParameterSet(decimal, decimal, null_));
+ combination.add(new ParameterSet(decimal, null_, decimal));
+
+ lAvailableBinaryOperators.put(BinaryOperator.ADD.toUriLiteral(),
+ new InfoBinaryOperator(BinaryOperator.ADD, "Additive", 50, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.SUB.toUriLiteral(),
+ new InfoBinaryOperator(BinaryOperator.SUB, "Additive", 50, combination));
+
+ // ---Relational---
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(boolean_, string, string));
+ combination.add(new ParameterSet(boolean_, time, time));
+ combination.add(new ParameterSet(boolean_, datetime, datetime));
+ combination.add(new ParameterSet(boolean_, datetimeoffset, datetimeoffset));
+ combination.add(new ParameterSet(boolean_, guid, guid));
+ combination.add(new ParameterSet(boolean_, sbyte, sbyte));
+ combination.add(new ParameterSet(boolean_, byte_, byte_));
+ combination.add(new ParameterSet(boolean_, int16, int16));
+ combination.add(new ParameterSet(boolean_, int32, int32));
+ combination.add(new ParameterSet(boolean_, int64, int64));
+ combination.add(new ParameterSet(boolean_, single, single));
+ combination.add(new ParameterSet(boolean_, double_, double_));
+ combination.add(new ParameterSet(boolean_, decimal, decimal));
+ combination.add(new ParameterSet(boolean_, binary, binary));
+
+ combination.add(new ParameterSet(boolean_, string, null_));
+ combination.add(new ParameterSet(boolean_, null_, string));
+
+ combination.add(new ParameterSet(boolean_, time, null_));
+ combination.add(new ParameterSet(boolean_, null_, time));
+
+ combination.add(new ParameterSet(boolean_, datetime, null_));
+ combination.add(new ParameterSet(boolean_, null_, datetime));
+
+ combination.add(new ParameterSet(boolean_, datetimeoffset, null_));
+ combination.add(new ParameterSet(boolean_, null_, datetimeoffset));
+
+ combination.add(new ParameterSet(boolean_, guid, null_));
+ combination.add(new ParameterSet(boolean_, null_, guid));
+
+ combination.add(new ParameterSet(boolean_, sbyte, null_));
+ combination.add(new ParameterSet(boolean_, null_, sbyte));
+ combination.add(new ParameterSet(boolean_, byte_, null_));
+ combination.add(new ParameterSet(boolean_, null_, byte_));
+
+ combination.add(new ParameterSet(boolean_, int16, null_));
+ combination.add(new ParameterSet(boolean_, null_, int16));
+ combination.add(new ParameterSet(boolean_, int32, null_));
+ combination.add(new ParameterSet(boolean_, null_, int32));
+ combination.add(new ParameterSet(boolean_, int64, null_));
+ combination.add(new ParameterSet(boolean_, null_, int64));
+
+ combination.add(new ParameterSet(boolean_, single, null_));
+ combination.add(new ParameterSet(boolean_, null_, single));
+ combination.add(new ParameterSet(boolean_, double_, null_));
+ combination.add(new ParameterSet(boolean_, null_, double_));
+ combination.add(new ParameterSet(boolean_, decimal, null_));
+ combination.add(new ParameterSet(boolean_, null_, decimal));
+
+ combination.add(new ParameterSet(boolean_, binary, null_));
+ combination.add(new ParameterSet(boolean_, null_, binary));
+
+
+ lAvailableBinaryOperators.put(BinaryOperator.LT.toUriLiteral(),
+ new InfoBinaryOperator(BinaryOperator.LT, "Relational", 40, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.GT.toUriLiteral(),
+ new InfoBinaryOperator(BinaryOperator.GT, "Relational", 40, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.GE.toUriLiteral(),
+ new InfoBinaryOperator(BinaryOperator.GE, "Relational", 40, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.LE.toUriLiteral(),
+ new InfoBinaryOperator(BinaryOperator.LE, "Relational", 40, combination));
+
+ // ---Equality---
+ combination.addFirst(new ParameterSet(boolean_, boolean_, boolean_));
+
+ combination.add(new ParameterSet(boolean_, boolean_, null_));
+ combination.add(new ParameterSet(boolean_, null_, boolean_));
+
+ lAvailableBinaryOperators.put(BinaryOperator.EQ.toUriLiteral(),
+ new InfoBinaryOperator(BinaryOperator.EQ, "Equality", 30, combination));
+ lAvailableBinaryOperators.put(BinaryOperator.NE.toUriLiteral(),
+ new InfoBinaryOperator(BinaryOperator.NE, "Equality", 30, combination));
+
+ // "---Conditional AND---
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(boolean_, boolean_, boolean_));
+ combination.add(new ParameterSet(boolean_, boolean_, null_));
+ combination.add(new ParameterSet(boolean_, null_, boolean_));
+
+ lAvailableBinaryOperators.put(BinaryOperator.AND.toUriLiteral(),
+ new InfoBinaryOperator(BinaryOperator.AND, "Conditional", 20, combination));
+
+ // ---Conditional OR---
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(boolean_, boolean_, boolean_));
+ combination.add(new ParameterSet(boolean_, boolean_, null_));
+ combination.add(new ParameterSet(boolean_, null_, boolean_));
+
+ lAvailableBinaryOperators.put(BinaryOperator.OR.toUriLiteral(),
+ new InfoBinaryOperator(BinaryOperator.OR, "Conditional", 10, combination));
+
+ // endswith
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(boolean_, string, string));
+ lAvailableMethods.put(MethodOperator.ENDSWITH.toUriLiteral(), new InfoMethod(MethodOperator.ENDSWITH, 2, 2, combination));
+
+ // indexof
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(int32, string, string));
+ lAvailableMethods.put(MethodOperator.INDEXOF.toUriLiteral(), new InfoMethod(MethodOperator.INDEXOF, 2, 2, combination));
+
+ // startswith
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(boolean_, string, string));
+ lAvailableMethods.put(MethodOperator.STARTSWITH.toUriLiteral(), new InfoMethod(MethodOperator.STARTSWITH, 2, 2, combination));
+
+ // tolower
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(string, string));
+ lAvailableMethods.put(MethodOperator.TOLOWER.toUriLiteral(), new InfoMethod(MethodOperator.TOLOWER, combination));
+
+ // toupper
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(string, string));
+ lAvailableMethods.put(MethodOperator.TOUPPER.toUriLiteral(), new InfoMethod(MethodOperator.TOUPPER, combination));
+
+ // trim
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(string, string));
+ lAvailableMethods.put(MethodOperator.TRIM.toUriLiteral(), new InfoMethod(MethodOperator.TRIM, combination));
+
+ // substring
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(string, string, int32));
+ combination.add(new ParameterSet(string, string, int32, int32));
+ lAvailableMethods.put(MethodOperator.SUBSTRING.toUriLiteral(), new InfoMethod(MethodOperator.SUBSTRING, 1, -1, combination));
+
+ // substringof
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(boolean_, string, string));
+ lAvailableMethods.put(MethodOperator.SUBSTRINGOF.toUriLiteral(), new InfoMethod(MethodOperator.SUBSTRINGOF, 1, -1, combination));
+
+ // replace
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(string, string, string, string));
+ lAvailableMethods.put(MethodOperator.REPLACE.toUriLiteral(), new InfoMethod(MethodOperator.REPLACE, 3, 3, combination));
+
+ // concat
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(string, string, string).setFurtherType(string));
+ lAvailableMethods.put(MethodOperator.CONCAT.toUriLiteral(), new InfoMethod(MethodOperator.CONCAT, 2, -1, combination));
+
+ // length
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(int32, string));
+ lAvailableMethods.put(MethodOperator.LENGTH.toUriLiteral(), new InfoMethod(MethodOperator.LENGTH, combination));
+
+ // year
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(int32, datetime));
+ lAvailableMethods.put(MethodOperator.YEAR.toUriLiteral(), new InfoMethod(MethodOperator.YEAR, combination));
+
+ // month
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(int32, datetime));
+ lAvailableMethods.put(MethodOperator.MONTH.toUriLiteral(), new InfoMethod(MethodOperator.MONTH, combination));
+
+ // day
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(int32, datetime));
+ lAvailableMethods.put(MethodOperator.DAY.toUriLiteral(), new InfoMethod(MethodOperator.DAY, combination));
+
+ // hour
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(int32, datetime));
+ combination.add(new ParameterSet(int32, time));
+ combination.add(new ParameterSet(int32, datetimeoffset));
+ lAvailableMethods.put(MethodOperator.HOUR.toUriLiteral(), new InfoMethod(MethodOperator.HOUR, combination));
+
+ // minute
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(int32, datetime));
+ combination.add(new ParameterSet(int32, time));
+ combination.add(new ParameterSet(int32, datetimeoffset));
+ lAvailableMethods.put(MethodOperator.MINUTE.toUriLiteral(), new InfoMethod(MethodOperator.MINUTE, combination));
+
+ // second
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(int32, datetime));
+ combination.add(new ParameterSet(int32, time));
+ combination.add(new ParameterSet(int32, datetimeoffset));
+ lAvailableMethods.put(MethodOperator.SECOND.toUriLiteral(), new InfoMethod(MethodOperator.SECOND, combination));
+
+ // round
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(decimal, decimal));
+ combination.add(new ParameterSet(double_, double_));
+ lAvailableMethods.put(MethodOperator.ROUND.toUriLiteral(), new InfoMethod(MethodOperator.ROUND, combination));
+
+ // ceiling
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(decimal, decimal));
+ combination.add(new ParameterSet(double_, double_));
+ lAvailableMethods.put(MethodOperator.CEILING.toUriLiteral(), new InfoMethod(MethodOperator.CEILING, combination));
+
+ // floor
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(decimal, decimal));
+ combination.add(new ParameterSet(double_, double_));
+ lAvailableMethods.put(MethodOperator.FLOOR.toUriLiteral(), new InfoMethod(MethodOperator.FLOOR, combination));
+
+ // ---unary---
+
+ // minus
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(sbyte, sbyte));
+ combination.add(new ParameterSet(byte_, byte_));
+ combination.add(new ParameterSet(int16, int16));
+ combination.add(new ParameterSet(int32, int32));
+ combination.add(new ParameterSet(int64, int64));
+ combination.add(new ParameterSet(single, single));
+ combination.add(new ParameterSet(double_, double_));
+ combination.add(new ParameterSet(decimal, decimal));
+ combination.add(new ParameterSet(null_, null_));
+
+
+ // minus
+ lAvailableUnaryOperators.put(UnaryOperator.MINUS.toUriLiteral(), new InfoUnaryOperator(UnaryOperator.MINUS, "minus", combination));
+
+ // not
+ combination = new ParameterSetCombination.PSCflex();
+ combination.add(new ParameterSet(boolean_, boolean_));
+ combination.add(new ParameterSet(null_, null_));
+ lAvailableUnaryOperators.put(UnaryOperator.NOT.toUriLiteral(), new InfoUnaryOperator(UnaryOperator.NOT, "not", combination));
+
+ availableBinaryOperators = Collections.unmodifiableMap(lAvailableBinaryOperators);
+ availableMethods = Collections.unmodifiableMap(lAvailableMethods);
+ availableUnaryOperators = Collections.unmodifiableMap(lAvailableUnaryOperators);
}
- methodExpression.setEdmType(parameterSet.getReturnType());
- }
-
- /*
- * In case we have + in the string literal and is replaced with ' '(space) in UriParserImpl
- * it needs to be changed back to +
- */
- private String getEncodedUriLiteral(String uriLiteral,int pos) {
- if (originalFilterString.length()!=0 && uriLiteral.contains(" ")) {
- String encodedUriLiteral = uriLiteral.replaceAll(" ", "+");
- String originalFilterToken = originalFilterString.substring(pos,pos+uriLiteral.length());
- if (originalFilterToken!=null && originalFilterToken.equals(encodedUriLiteral)) {
- decodedFilterString=decodedFilterString.substring(0, pos)+encodedUriLiteral+
- decodedFilterString.substring(pos+uriLiteral.length());
- uriLiteral = encodedUriLiteral;
- }
- }
- return uriLiteral;
- }
-
- static void initAvailTables() {
- Map<String, InfoBinaryOperator> lAvailableBinaryOperators = new HashMap<String, InfoBinaryOperator>();
- Map<String, InfoMethod> lAvailableMethods = new HashMap<String, InfoMethod>();
- Map<String, InfoUnaryOperator> lAvailableUnaryOperators = new HashMap<String, InfoUnaryOperator>();
-
- // create type validators
- ParameterSetCombination combination = null;
- // create type helpers
- EdmSimpleType boolean_ = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Boolean);
- EdmSimpleType sbyte = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.SByte);
- EdmSimpleType byte_ = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Byte);
- EdmSimpleType int16 = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Int16);
- EdmSimpleType int32 = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Int32);
- EdmSimpleType int64 = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Int64);
- EdmSimpleType single = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Single);
- EdmSimpleType double_ = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Double);
- EdmSimpleType decimal = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Decimal);
- EdmSimpleType string = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.String);
- EdmSimpleType time = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Time);
- EdmSimpleType datetime = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.DateTime);
- EdmSimpleType datetimeoffset = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.DateTimeOffset);
- EdmSimpleType guid = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Guid);
- EdmSimpleType binary = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Binary);
- EdmSimpleType null_ = EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Null);
-
- // ---Member member access---
- lAvailableBinaryOperators.put("/", new InfoBinaryOperator(BinaryOperator.PROPERTY_ACCESS, "Primary", 100,
- new ParameterSetCombination.PSCReturnTypeEqLastParameter()));// todo fix this
-
- // ---Multiplicative---
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(sbyte, sbyte, sbyte));
- combination.add(new ParameterSet(byte_, byte_, byte_));
- combination.add(new ParameterSet(int16, int16, int16));
- combination.add(new ParameterSet(int32, int32, int32));
- combination.add(new ParameterSet(int64, int64, int64));
- combination.add(new ParameterSet(single, single, single));
- combination.add(new ParameterSet(double_, double_, double_));
- combination.add(new ParameterSet(decimal, decimal, decimal));
-
- combination.add(new ParameterSet(sbyte, sbyte, null_));
- combination.add(new ParameterSet(sbyte, null_, sbyte));
- combination.add(new ParameterSet(byte_, byte_, null_));
- combination.add(new ParameterSet(byte_, null_, byte_));
-
- combination.add(new ParameterSet(int16, int16, null_));
- combination.add(new ParameterSet(int16, null_, int16));
- combination.add(new ParameterSet(int32, int32, null_));
- combination.add(new ParameterSet(int32, null_, int32));
- combination.add(new ParameterSet(int64, int64, null_));
- combination.add(new ParameterSet(int64, null_, int64));
-
- combination.add(new ParameterSet(single, single, null_));
- combination.add(new ParameterSet(single, null_, single));
- combination.add(new ParameterSet(double_, double_, null_));
- combination.add(new ParameterSet(double_, null_, double_));
- combination.add(new ParameterSet(decimal, decimal, null_));
- combination.add(new ParameterSet(decimal, null_, decimal));
-
- lAvailableBinaryOperators.put(BinaryOperator.MUL.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.MUL,
- "Multiplicative", 60, combination));
- lAvailableBinaryOperators.put(BinaryOperator.DIV.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.DIV,
- "Multiplicative", 60, combination));
- lAvailableBinaryOperators.put(BinaryOperator.MODULO.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.MODULO,
- "Multiplicative", 60, combination));
-
- // ---Additive---
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(sbyte, sbyte, sbyte));
- combination.add(new ParameterSet(byte_, byte_, byte_));
- combination.add(new ParameterSet(int16, int16, int16));
- combination.add(new ParameterSet(int32, int32, int32));
- combination.add(new ParameterSet(int64, int64, int64));
- combination.add(new ParameterSet(single, single, single));
- combination.add(new ParameterSet(double_, double_, double_));
- combination.add(new ParameterSet(decimal, decimal, decimal));
-
- combination.add(new ParameterSet(sbyte, sbyte, null_));
- combination.add(new ParameterSet(sbyte, null_, sbyte));
- combination.add(new ParameterSet(byte_, byte_, null_));
- combination.add(new ParameterSet(byte_, null_, byte_));
-
- combination.add(new ParameterSet(int16, int16, null_));
- combination.add(new ParameterSet(int16, null_, int16));
- combination.add(new ParameterSet(int32, int32, null_));
- combination.add(new ParameterSet(int32, null_, int32));
- combination.add(new ParameterSet(int64, int64, null_));
- combination.add(new ParameterSet(int64, null_, int64));
-
- combination.add(new ParameterSet(single, single, null_));
- combination.add(new ParameterSet(single, null_, single));
- combination.add(new ParameterSet(double_, double_, null_));
- combination.add(new ParameterSet(double_, null_, double_));
- combination.add(new ParameterSet(decimal, decimal, null_));
- combination.add(new ParameterSet(decimal, null_, decimal));
-
- lAvailableBinaryOperators.put(BinaryOperator.ADD.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.ADD,
- "Additive", 50, combination));
- lAvailableBinaryOperators.put(BinaryOperator.SUB.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.SUB,
- "Additive", 50, combination));
-
- // ---Relational---
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(boolean_, string, string));
- combination.add(new ParameterSet(boolean_, time, time));
- combination.add(new ParameterSet(boolean_, datetime, datetime));
- combination.add(new ParameterSet(boolean_, datetimeoffset, datetimeoffset));
- combination.add(new ParameterSet(boolean_, guid, guid));
- combination.add(new ParameterSet(boolean_, sbyte, sbyte));
- combination.add(new ParameterSet(boolean_, byte_, byte_));
- combination.add(new ParameterSet(boolean_, int16, int16));
- combination.add(new ParameterSet(boolean_, int32, int32));
- combination.add(new ParameterSet(boolean_, int64, int64));
- combination.add(new ParameterSet(boolean_, single, single));
- combination.add(new ParameterSet(boolean_, double_, double_));
- combination.add(new ParameterSet(boolean_, decimal, decimal));
- combination.add(new ParameterSet(boolean_, binary, binary));
-
- combination.add(new ParameterSet(boolean_, string, null_));
- combination.add(new ParameterSet(boolean_, null_, string));
-
- combination.add(new ParameterSet(boolean_, time, null_));
- combination.add(new ParameterSet(boolean_, null_, time));
-
- combination.add(new ParameterSet(boolean_, datetime, null_));
- combination.add(new ParameterSet(boolean_, null_, datetime));
-
- combination.add(new ParameterSet(boolean_, datetimeoffset, null_));
- combination.add(new ParameterSet(boolean_, null_, datetimeoffset));
-
- combination.add(new ParameterSet(boolean_, guid, null_));
- combination.add(new ParameterSet(boolean_, null_, guid));
-
- combination.add(new ParameterSet(boolean_, sbyte, null_));
- combination.add(new ParameterSet(boolean_, null_, sbyte));
- combination.add(new ParameterSet(boolean_, byte_, null_));
- combination.add(new ParameterSet(boolean_, null_, byte_));
-
- combination.add(new ParameterSet(boolean_, int16, null_));
- combination.add(new ParameterSet(boolean_, null_, int16));
- combination.add(new ParameterSet(boolean_, int32, null_));
- combination.add(new ParameterSet(boolean_, null_, int32));
- combination.add(new ParameterSet(boolean_, int64, null_));
- combination.add(new ParameterSet(boolean_, null_, int64));
-
- combination.add(new ParameterSet(boolean_, single, null_));
- combination.add(new ParameterSet(boolean_, null_, single));
- combination.add(new ParameterSet(boolean_, double_, null_));
- combination.add(new ParameterSet(boolean_, null_, double_));
- combination.add(new ParameterSet(boolean_, decimal, null_));
- combination.add(new ParameterSet(boolean_, null_, decimal));
-
- combination.add(new ParameterSet(boolean_, binary, null_));
- combination.add(new ParameterSet(boolean_, null_, binary));
-
-
- lAvailableBinaryOperators.put(BinaryOperator.LT.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.LT,
- "Relational", 40, combination));
- lAvailableBinaryOperators.put(BinaryOperator.GT.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.GT,
- "Relational", 40, combination));
- lAvailableBinaryOperators.put(BinaryOperator.GE.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.GE,
- "Relational", 40, combination));
- lAvailableBinaryOperators.put(BinaryOperator.LE.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.LE,
- "Relational", 40, combination));
-
- // ---Equality---
- combination.addFirst(new ParameterSet(boolean_, boolean_, boolean_));
-
- combination.add(new ParameterSet(boolean_, boolean_, null_));
- combination.add(new ParameterSet(boolean_, null_, boolean_));
-
- lAvailableBinaryOperators.put(BinaryOperator.EQ.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.EQ,
- "Equality", 30, combination));
- lAvailableBinaryOperators.put(BinaryOperator.NE.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.NE,
- "Equality", 30, combination));
-
- // "---Conditional AND---
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(boolean_, boolean_, boolean_));
- combination.add(new ParameterSet(boolean_, boolean_, null_));
- combination.add(new ParameterSet(boolean_, null_, boolean_));
-
- lAvailableBinaryOperators.put(BinaryOperator.AND.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.AND,
- "Conditional", 20, combination));
-
- // ---Conditional OR---
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(boolean_, boolean_, boolean_));
- combination.add(new ParameterSet(boolean_, boolean_, null_));
- combination.add(new ParameterSet(boolean_, null_, boolean_));
-
- lAvailableBinaryOperators.put(BinaryOperator.OR.toUriLiteral(), new InfoBinaryOperator(BinaryOperator.OR,
- "Conditional", 10, combination));
-
- // endswith
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(boolean_, string, string));
- lAvailableMethods.put(MethodOperator.ENDSWITH.toUriLiteral(), new InfoMethod(MethodOperator.ENDSWITH, 2, 2,
- combination));
-
- // indexof
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(int32, string, string));
- lAvailableMethods.put(MethodOperator.INDEXOF.toUriLiteral(), new InfoMethod(MethodOperator.INDEXOF, 2, 2,
- combination));
-
- // startswith
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(boolean_, string, string));
- lAvailableMethods.put(MethodOperator.STARTSWITH.toUriLiteral(), new InfoMethod(MethodOperator.STARTSWITH, 2, 2,
- combination));
-
- // tolower
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(string, string));
- lAvailableMethods.put(MethodOperator.TOLOWER.toUriLiteral(), new InfoMethod(MethodOperator.TOLOWER, combination));
-
- // toupper
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(string, string));
- lAvailableMethods.put(MethodOperator.TOUPPER.toUriLiteral(), new InfoMethod(MethodOperator.TOUPPER, combination));
-
- // trim
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(string, string));
- lAvailableMethods.put(MethodOperator.TRIM.toUriLiteral(), new InfoMethod(MethodOperator.TRIM, combination));
-
- // substring
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(string, string, int32));
- combination.add(new ParameterSet(string, string, int32, int32));
- lAvailableMethods.put(MethodOperator.SUBSTRING.toUriLiteral(), new InfoMethod(MethodOperator.SUBSTRING, 1, -1,
- combination));
-
- // substringof
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(boolean_, string, string));
- lAvailableMethods.put(MethodOperator.SUBSTRINGOF.toUriLiteral(), new InfoMethod(MethodOperator.SUBSTRINGOF, 1, -1,
- combination));
-
- // replace
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(string, string, string, string));
- lAvailableMethods.put(MethodOperator.REPLACE.toUriLiteral(), new InfoMethod(MethodOperator.REPLACE, 3, 3,
- combination));
-
- // concat
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(string, string, string).setFurtherType(string));
- lAvailableMethods.put(MethodOperator.CONCAT.toUriLiteral(), new InfoMethod(MethodOperator.CONCAT, 2, -1,
- combination));
-
- // length
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(int32, string));
- lAvailableMethods.put(MethodOperator.LENGTH.toUriLiteral(), new InfoMethod(MethodOperator.LENGTH, combination));
-
- // year
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(int32, datetime));
- lAvailableMethods.put(MethodOperator.YEAR.toUriLiteral(), new InfoMethod(MethodOperator.YEAR, combination));
-
- // month
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(int32, datetime));
- lAvailableMethods.put(MethodOperator.MONTH.toUriLiteral(), new InfoMethod(MethodOperator.MONTH, combination));
-
- // day
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(int32, datetime));
- lAvailableMethods.put(MethodOperator.DAY.toUriLiteral(), new InfoMethod(MethodOperator.DAY, combination));
-
- // hour
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(int32, datetime));
- combination.add(new ParameterSet(int32, time));
- combination.add(new ParameterSet(int32, datetimeoffset));
- lAvailableMethods.put(MethodOperator.HOUR.toUriLiteral(), new InfoMethod(MethodOperator.HOUR, combination));
-
- // minute
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(int32, datetime));
- combination.add(new ParameterSet(int32, time));
- combination.add(new ParameterSet(int32, datetimeoffset));
- lAvailableMethods.put(MethodOperator.MINUTE.toUriLiteral(), new InfoMethod(MethodOperator.MINUTE, combination));
-
- // second
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(int32, datetime));
- combination.add(new ParameterSet(int32, time));
- combination.add(new ParameterSet(int32, datetimeoffset));
- lAvailableMethods.put(MethodOperator.SECOND.toUriLiteral(), new InfoMethod(MethodOperator.SECOND, combination));
-
- // round
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(decimal, decimal));
- combination.add(new ParameterSet(double_, double_));
- lAvailableMethods.put(MethodOperator.ROUND.toUriLiteral(), new InfoMethod(MethodOperator.ROUND, combination));
-
- // ceiling
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(decimal, decimal));
- combination.add(new ParameterSet(double_, double_));
- lAvailableMethods.put(MethodOperator.CEILING.toUriLiteral(), new InfoMethod(MethodOperator.CEILING, combination));
-
- // floor
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(decimal, decimal));
- combination.add(new ParameterSet(double_, double_));
- lAvailableMethods.put(MethodOperator.FLOOR.toUriLiteral(), new InfoMethod(MethodOperator.FLOOR, combination));
-
- // ---unary---
-
- // minus
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(sbyte, sbyte));
- combination.add(new ParameterSet(byte_, byte_));
- combination.add(new ParameterSet(int16, int16));
- combination.add(new ParameterSet(int32, int32));
- combination.add(new ParameterSet(int64, int64));
- combination.add(new ParameterSet(single, single));
- combination.add(new ParameterSet(double_, double_));
- combination.add(new ParameterSet(decimal, decimal));
- combination.add(new ParameterSet(null_, null_));
-
-
- // minus
- lAvailableUnaryOperators.put(UnaryOperator.MINUS.toUriLiteral(), new InfoUnaryOperator(UnaryOperator.MINUS,
- "minus", combination));
-
- // not
- combination = new ParameterSetCombination.PSCflex();
- combination.add(new ParameterSet(boolean_, boolean_));
- combination.add(new ParameterSet(null_, null_));
- lAvailableUnaryOperators.put(UnaryOperator.NOT.toUriLiteral(), new InfoUnaryOperator(UnaryOperator.NOT, "not",
- combination));
-
- availableBinaryOperators = Collections.unmodifiableMap(lAvailableBinaryOperators);
- availableMethods = Collections.unmodifiableMap(lAvailableMethods);
- availableUnaryOperators = Collections.unmodifiableMap(lAvailableUnaryOperators);
- }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java
index 4d0becd2..dc0603d6 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java
@@ -143,7 +143,7 @@ public class DispatcherTest extends BaseTest {
private static Answer<ODataResponse> getAnswer() {
return invocation -> mockResponse(invocation.getMethod()
- .getName());
+ .getName());
}
private static ODataResponse mockResponse(final String value) {
@@ -165,8 +165,9 @@ public class DispatcherTest extends BaseTest {
final String expectedMethodName) throws ODataException {
ODataServiceFactory factory = mock(ODataServiceFactory.class);
+ InputStream body = mock(InputStream.class);
final ODataResponse response =
- new Dispatcher(factory, getMockService()).dispatch(method, mockUriInfo(uriType, isValue), null, "application/xml", "*/*");
+ new Dispatcher(factory, getMockService()).dispatch(method, mockUriInfo(uriType, isValue), body, "application/xml", "*/*");
assertEquals(expectedMethodName, response.getEntity());
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java
index 3375efb5..43037868 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -227,6 +228,7 @@ public class ODataRequestHandlerValidationTest extends BaseTest {
if (httpHeaderName == HttpHeaders.ACCEPT) {
when(request.getAcceptHeaders()).thenReturn(Arrays.asList(httpHeaderValue));
}
+ when(request.getBody()).thenReturn(mock(InputStream.class));
return request;
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchHandlerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchHandlerTest.java
index bafc0039..e7038cdd 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchHandlerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchHandlerTest.java
@@ -1,27 +1,22 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.batch;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
@@ -29,7 +24,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.ODataServiceFactory;
import org.apache.olingo.odata2.api.batch.BatchHandler;
@@ -66,197 +60,221 @@ import org.junit.Test;
public class BatchHandlerTest {
- private BatchHandler handler;
- private static final String CONTENT_TYPE = HttpContentType.MULTIPART_MIXED + "; boundary=batch_123";
- private static final String CRLF = "\r\n";
- private static String SERVICE_BASE = "http://localhost/odata/";
- private static String SERVICE_ROOT = null;
-
- @Before
- public void setupBatchHandler() throws Exception {
- ODataProcessor processor = new LocalProcessor();
- ODataService serviceMock = mock(ODataService.class);
- when(serviceMock.getBatchProcessor()).thenReturn((BatchProcessor) processor);
- when(serviceMock.getEntitySetProcessor()).thenReturn((EntitySetProcessor) processor);
- when(serviceMock.getEntitySimplePropertyProcessor()).thenReturn((EntitySimplePropertyProcessor) processor);
- when(serviceMock.getProcessor()).thenReturn(processor);
- Edm mockEdm = MockFacade.getMockEdm();
- when(serviceMock.getEntityDataModel()).thenReturn(mockEdm);
- List<String> supportedContentTypes = Arrays.asList(
- HttpContentType.APPLICATION_JSON_UTF8, HttpContentType.APPLICATION_JSON);
- when(serviceMock.getSupportedContentTypes(EntityMediaProcessor.class)).thenReturn(supportedContentTypes);
- when(serviceMock.getSupportedContentTypes(EntityProcessor.class)).thenReturn(supportedContentTypes);
- when(serviceMock.getSupportedContentTypes(EntitySimplePropertyProcessor.class)).thenReturn(supportedContentTypes);
- handler = new BatchHandlerImpl(mock(ODataServiceFactory.class), serviceMock);
- }
-
- @Test
- public void contentIdReferencing() throws Exception {
- SERVICE_ROOT = SERVICE_BASE;
- PathInfoImpl pathInfo = new PathInfoImpl();
- pathInfo.setServiceRoot(new URI(SERVICE_ROOT));
- pathInfo.setODataPathSegment(Collections.<PathSegment> singletonList(
- new ODataPathSegmentImpl("$batch", null)));
- EntityProviderBatchProperties properties = EntityProviderBatchProperties.init().pathInfo(pathInfo).build();
- InputStream content = readFile("/batchContentIdReferencing.batch");
- List<BatchRequestPart> parsedRequest = EntityProvider.parseBatchRequest(CONTENT_TYPE, content, properties);
-
- PathInfo firstPathInfo = parsedRequest.get(0).getRequests().get(0).getPathInfo();
- assertFirst(firstPathInfo);
-
- handler.handleBatchPart(parsedRequest.get(0));
- }
-
- @Test
- public void contentIdReferencingForGet() throws Exception {
- SERVICE_ROOT = SERVICE_BASE;
- PathInfoImpl pathInfo = new PathInfoImpl();
- pathInfo.setServiceRoot(new URI(SERVICE_ROOT));
- pathInfo.setODataPathSegment(Collections.<PathSegment> singletonList(
- new ODataPathSegmentImpl("$batch", null)));
- EntityProviderBatchProperties properties = EntityProviderBatchProperties.init().pathInfo(pathInfo).build();
- InputStream content = readFile("/batchContentIdReferencingForGet.batch");
- List<BatchRequestPart> parsedRequest = EntityProvider.parseBatchRequest(CONTENT_TYPE, content, properties);
-
- PathInfo firstPathInfo = parsedRequest.get(0).getRequests().get(0).getPathInfo();
- assertFirst(firstPathInfo);
-
- handler.handleBatchPart(parsedRequest.get(0));
- handler.handleBatchPart(parsedRequest.get(1));
- }
-
-
- @Test
- public void contentIdReferencingWithAdditionalSegments() throws Exception {
- SERVICE_ROOT = SERVICE_BASE + "seg1/seg2/";
- PathInfoImpl pathInfo = new PathInfoImpl();
- pathInfo.setPrecedingPathSegment(Arrays.asList(
- (PathSegment) new ODataPathSegmentImpl("seg1", null),
- (PathSegment) new ODataPathSegmentImpl("seg2", null)));
- pathInfo.setServiceRoot(new URI(SERVICE_ROOT));
- pathInfo.setODataPathSegment(Collections.<PathSegment> singletonList(
- new ODataPathSegmentImpl("$batch", null)));
- EntityProviderBatchProperties properties = EntityProviderBatchProperties.init().pathInfo(pathInfo).build();
- InputStream content = readFile("/batchContentIdReferencing.batch");
- List<BatchRequestPart> parsedRequest = EntityProvider.parseBatchRequest(CONTENT_TYPE, content, properties);
-
- PathInfo firstPathInfo = parsedRequest.get(0).getRequests().get(0).getPathInfo();
- assertFirst(firstPathInfo);
-
- handler.handleBatchPart(parsedRequest.get(0));
- }
-
- @Test
- public void contentIdReferencingWithAdditionalSegmentsAndMatrixParameter() throws Exception {
- SERVICE_ROOT = SERVICE_BASE + "seg1;v=1/seg2;v=2/";
- PathInfoImpl pathInfo = new PathInfoImpl();
- pathInfo.setPrecedingPathSegment(Arrays.asList(
- (PathSegment) new ODataPathSegmentImpl("seg1",
- Collections.singletonMap("v", Collections.singletonList("1"))),
- (PathSegment) new ODataPathSegmentImpl("seg2",
- Collections.singletonMap("v", Collections.singletonList("2")))));
- pathInfo.setServiceRoot(new URI(SERVICE_ROOT));
- pathInfo.setODataPathSegment(Collections.<PathSegment> singletonList(
- new ODataPathSegmentImpl("$batch", null)));
- EntityProviderBatchProperties properties = EntityProviderBatchProperties.init().pathInfo(pathInfo).build();
- InputStream content = readFile("/batchContentIdReferencing.batch");
- List<BatchRequestPart> parsedRequest = EntityProvider.parseBatchRequest(CONTENT_TYPE, content, properties);
-
- PathInfo firstPathInfo = parsedRequest.get(0).getRequests().get(0).getPathInfo();
- assertFirst(firstPathInfo);
-
- handler.handleBatchPart(parsedRequest.get(0));
- }
-
- private void assertFirst(PathInfo pathInfo) {
- assertEquals(SERVICE_ROOT + "Employees", pathInfo.getRequestUri().toString());
- assertEquals(SERVICE_ROOT, pathInfo.getServiceRoot().toString());
- }
-
- private InputStream readFile(String fileName) throws IOException {
- InputStream in = ClassLoader.class.getResourceAsStream(fileName);
- if (in == null) {
- throw new IOException("Requested file '" + fileName + "' was not found.");
+ private BatchHandler handler;
+ private static final String CONTENT_TYPE = HttpContentType.MULTIPART_MIXED + "; boundary=batch_123";
+ private static final String CRLF = "\r\n";
+ private static String SERVICE_BASE = "http://localhost/odata/";
+ private static String SERVICE_ROOT = null;
+
+ @Before
+ public void setupBatchHandler() throws Exception {
+ ODataProcessor processor = new LocalProcessor();
+ ODataService serviceMock = mock(ODataService.class);
+ when(serviceMock.getBatchProcessor()).thenReturn((BatchProcessor) processor);
+ when(serviceMock.getEntitySetProcessor()).thenReturn((EntitySetProcessor) processor);
+ when(serviceMock.getEntitySimplePropertyProcessor()).thenReturn((EntitySimplePropertyProcessor) processor);
+ when(serviceMock.getProcessor()).thenReturn(processor);
+ Edm mockEdm = MockFacade.getMockEdm();
+ when(serviceMock.getEntityDataModel()).thenReturn(mockEdm);
+ List<String> supportedContentTypes = Arrays.asList(HttpContentType.APPLICATION_JSON_UTF8, HttpContentType.APPLICATION_JSON);
+ when(serviceMock.getSupportedContentTypes(EntityMediaProcessor.class)).thenReturn(supportedContentTypes);
+ when(serviceMock.getSupportedContentTypes(EntityProcessor.class)).thenReturn(supportedContentTypes);
+ when(serviceMock.getSupportedContentTypes(EntitySimplePropertyProcessor.class)).thenReturn(supportedContentTypes);
+ handler = new BatchHandlerImpl(mock(ODataServiceFactory.class), serviceMock);
}
- return StringHelper.toStream(in).asStreamWithLineSeparation(CRLF);
- }
-
- public class LocalProcessor implements BatchProcessor, EntitySetProcessor, EntitySimplePropertyProcessor {
-
- private ODataContext context;
-
- @Override
- public void setContext(ODataContext context) throws ODataException {
- this.context = context;
+ @Test
+ public void contentIdReferencing() throws Exception {
+ SERVICE_ROOT = SERVICE_BASE;
+ PathInfoImpl pathInfo = new PathInfoImpl();
+ pathInfo.setServiceRoot(new URI(SERVICE_ROOT));
+ pathInfo.setODataPathSegment(Collections.<PathSegment>singletonList(new ODataPathSegmentImpl("$batch", null)));
+ EntityProviderBatchProperties properties = EntityProviderBatchProperties.init()
+ .pathInfo(pathInfo)
+ .build();
+ InputStream content = readFile("/batchContentIdReferencing.batch");
+ List<BatchRequestPart> parsedRequest = EntityProvider.parseBatchRequest(CONTENT_TYPE, content, properties);
+
+ PathInfo firstPathInfo = parsedRequest.get(0)
+ .getRequests()
+ .get(0)
+ .getPathInfo();
+ assertFirst(firstPathInfo);
+
+ handler.handleBatchPart(parsedRequest.get(0));
}
- @Override
- public ODataContext getContext() throws ODataException {
- return context;
+ @Test
+ public void contentIdReferencingForGet() throws Exception {
+ SERVICE_ROOT = SERVICE_BASE;
+ PathInfoImpl pathInfo = new PathInfoImpl();
+ pathInfo.setServiceRoot(new URI(SERVICE_ROOT));
+ pathInfo.setODataPathSegment(Collections.<PathSegment>singletonList(new ODataPathSegmentImpl("$batch", null)));
+ EntityProviderBatchProperties properties = EntityProviderBatchProperties.init()
+ .pathInfo(pathInfo)
+ .build();
+ InputStream content = readFile("/batchContentIdReferencingForGet.batch");
+ List<BatchRequestPart> parsedRequest = EntityProvider.parseBatchRequest(CONTENT_TYPE, content, properties);
+
+ PathInfo firstPathInfo = parsedRequest.get(0)
+ .getRequests()
+ .get(0)
+ .getPathInfo();
+ assertFirst(firstPathInfo);
+
+ handler.handleBatchPart(parsedRequest.get(0));
+ handler.handleBatchPart(parsedRequest.get(1));
}
- @Override
- public BatchResponsePart executeChangeSet(BatchHandler handler, List<ODataRequest> requests) throws ODataException {
- List<ODataResponse> responses = new ArrayList<ODataResponse>();
- // handle create
- ODataResponse response = handler.handleRequest(requests.get(0));
- assertEquals(HttpStatusCodes.OK, response.getStatus());
- assertEquals(SERVICE_ROOT + "Employees('1')", response.getIdLiteral());
- responses.add(response);
-
- // handle update
- response = handler.handleRequest(requests.get(1));
- assertEquals(HttpStatusCodes.OK, response.getStatus());
- responses.add(response);
-
- return BatchResponsePart.responses(responses).changeSet(true).build();
+ @Test
+ public void contentIdReferencingWithAdditionalSegments() throws Exception {
+ SERVICE_ROOT = SERVICE_BASE + "seg1/seg2/";
+ PathInfoImpl pathInfo = new PathInfoImpl();
+ pathInfo.setPrecedingPathSegment(
+ Arrays.asList((PathSegment) new ODataPathSegmentImpl("seg1", null), (PathSegment) new ODataPathSegmentImpl("seg2", null)));
+ pathInfo.setServiceRoot(new URI(SERVICE_ROOT));
+ pathInfo.setODataPathSegment(Collections.<PathSegment>singletonList(new ODataPathSegmentImpl("$batch", null)));
+ EntityProviderBatchProperties properties = EntityProviderBatchProperties.init()
+ .pathInfo(pathInfo)
+ .build();
+ InputStream content = readFile("/batchContentIdReferencing.batch");
+ List<BatchRequestPart> parsedRequest = EntityProvider.parseBatchRequest(CONTENT_TYPE, content, properties);
+
+ PathInfo firstPathInfo = parsedRequest.get(0)
+ .getRequests()
+ .get(0)
+ .getPathInfo();
+ assertFirst(firstPathInfo);
+
+ handler.handleBatchPart(parsedRequest.get(0));
}
- @Override
- public ODataResponse createEntity(PostUriInfo uriInfo, InputStream content, String requestContentType,
- String contentType) throws ODataException {
- PathInfo pathInfo = getContext().getPathInfo();
- assertFirst(pathInfo);
- assertEquals("Employees", uriInfo.getTargetEntitySet().getName());
- return ODataResponse.newBuilder().status(HttpStatusCodes.OK).idLiteral(SERVICE_ROOT + "Employees('1')").build();
+ @Test
+ public void contentIdReferencingWithAdditionalSegmentsAndMatrixParameter() throws Exception {
+ SERVICE_ROOT = SERVICE_BASE + "seg1;v=1/seg2;v=2/";
+ PathInfoImpl pathInfo = new PathInfoImpl();
+ pathInfo.setPrecedingPathSegment(
+ Arrays.asList((PathSegment) new ODataPathSegmentImpl("seg1", Collections.singletonMap("v", Collections.singletonList("1"))),
+ (PathSegment) new ODataPathSegmentImpl("seg2", Collections.singletonMap("v", Collections.singletonList("2")))));
+ pathInfo.setServiceRoot(new URI(SERVICE_ROOT));
+ pathInfo.setODataPathSegment(Collections.<PathSegment>singletonList(new ODataPathSegmentImpl("$batch", null)));
+ EntityProviderBatchProperties properties = EntityProviderBatchProperties.init()
+ .pathInfo(pathInfo)
+ .build();
+ InputStream content = readFile("/batchContentIdReferencing.batch");
+ List<BatchRequestPart> parsedRequest = EntityProvider.parseBatchRequest(CONTENT_TYPE, content, properties);
+
+ PathInfo firstPathInfo = parsedRequest.get(0)
+ .getRequests()
+ .get(0)
+ .getPathInfo();
+ assertFirst(firstPathInfo);
+
+ handler.handleBatchPart(parsedRequest.get(0));
}
- @Override
- public ODataResponse updateEntitySimpleProperty(PutMergePatchUriInfo uriInfo, InputStream content,
- String requestContentType, String contentType) throws ODataException {
- PathInfo pathInfo = getContext().getPathInfo();
- assertEquals(SERVICE_ROOT + "Employees('1')/EmployeeName", pathInfo.getRequestUri().toString());
- assertEquals(SERVICE_ROOT, pathInfo.getServiceRoot().toString());
- assertEquals("Employees", uriInfo.getTargetEntitySet().getName());
- return ODataResponse.newBuilder().status(HttpStatusCodes.OK).build();
+ private void assertFirst(PathInfo pathInfo) {
+ assertEquals(SERVICE_ROOT + "Employees", pathInfo.getRequestUri()
+ .toString());
+ assertEquals(SERVICE_ROOT, pathInfo.getServiceRoot()
+ .toString());
}
- @Override
- public ODataResponse readEntitySimpleProperty(GetSimplePropertyUriInfo uriInfo, String contentType)
- throws ODataException {
- // this method is not needed.
- return null;
- }
-
- @Override
- public ODataResponse readEntitySet(GetEntitySetUriInfo uriInfo, String contentType) throws ODataException {
- // this method is not needed.
- return null;
- }
+ private InputStream readFile(String fileName) throws IOException {
+ InputStream in = BatchHandlerTest.class.getResourceAsStream(fileName);
+ if (in == null) {
+ throw new IOException("Requested file '" + fileName + "' was not found.");
+ }
- @Override
- public ODataResponse countEntitySet(GetEntitySetCountUriInfo uriInfo, String contentType) throws ODataException {
- // this method is not needed.
- return null;
+ return StringHelper.toStream(in)
+ .asStreamWithLineSeparation(CRLF);
}
- @Override
- public ODataResponse executeBatch(BatchHandler handler, String contentType, InputStream content)
- throws ODataException {
- // this method is not needed.
- return null;
+ public class LocalProcessor implements BatchProcessor, EntitySetProcessor, EntitySimplePropertyProcessor {
+
+ private ODataContext context;
+
+ @Override
+ public void setContext(ODataContext context) throws ODataException {
+ this.context = context;
+ }
+
+ @Override
+ public ODataContext getContext() throws ODataException {
+ return context;
+ }
+
+ @Override
+ public BatchResponsePart executeChangeSet(BatchHandler handler, List<ODataRequest> requests) throws ODataException {
+ List<ODataResponse> responses = new ArrayList<ODataResponse>();
+
+ // handle create
+ ODataResponse response = handler.handleRequest(requests.get(0));
+ assertEquals(HttpStatusCodes.OK, response.getStatus());
+ assertEquals(SERVICE_ROOT + "Employees('1')", response.getIdLiteral());
+ responses.add(response);
+
+ // handle update
+ response = handler.handleRequest(requests.get(1));
+ assertEquals(HttpStatusCodes.OK, response.getStatus());
+ responses.add(response);
+
+ return BatchResponsePart.responses(responses)
+ .changeSet(true)
+ .build();
+ }
+
+ @Override
+ public ODataResponse createEntity(PostUriInfo uriInfo, InputStream content, String requestContentType, String contentType)
+ throws ODataException {
+ PathInfo pathInfo = getContext().getPathInfo();
+ assertFirst(pathInfo);
+ assertEquals("Employees", uriInfo.getTargetEntitySet()
+ .getName());
+ return ODataResponse.newBuilder()
+ .status(HttpStatusCodes.OK)
+ .idLiteral(SERVICE_ROOT + "Employees('1')")
+ .build();
+ }
+
+ @Override
+ public ODataResponse updateEntitySimpleProperty(PutMergePatchUriInfo uriInfo, InputStream content, String requestContentType,
+ String contentType) throws ODataException {
+ PathInfo pathInfo = getContext().getPathInfo();
+ assertEquals(SERVICE_ROOT + "Employees('1')/EmployeeName", pathInfo.getRequestUri()
+ .toString());
+ assertEquals(SERVICE_ROOT, pathInfo.getServiceRoot()
+ .toString());
+ assertEquals("Employees", uriInfo.getTargetEntitySet()
+ .getName());
+ return ODataResponse.newBuilder()
+ .status(HttpStatusCodes.OK)
+ .build();
+ }
+
+ @Override
+ public ODataResponse readEntitySimpleProperty(GetSimplePropertyUriInfo uriInfo, String contentType) throws ODataException {
+ // this method is not needed.
+ return null;
+ }
+
+ @Override
+ public ODataResponse readEntitySet(GetEntitySetUriInfo uriInfo, String contentType) throws ODataException {
+ // this method is not needed.
+ return null;
+ }
+
+ @Override
+ public ODataResponse countEntitySet(GetEntitySetCountUriInfo uriInfo, String contentType) throws ODataException {
+ // this method is not needed.
+ return null;
+ }
+
+ @Override
+ public ODataResponse executeBatch(BatchHandler handler, String contentType, InputStream content) throws ODataException {
+ // this method is not needed.
+ return null;
+ }
}
- }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
index 269f512e..cf61d9fc 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.batch;
@@ -22,14 +18,12 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.List;
-
import org.apache.olingo.odata2.api.batch.BatchException;
import org.apache.olingo.odata2.api.batch.BatchRequestPart;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
@@ -45,1215 +39,889 @@ import org.junit.Test;
public class BatchRequestParserTest {
- private static final String CRLF = "\r\n";
- private static final String CONTENT_ID_REFERENCE = "NewEmployee";
- private static final String PUT_MIME_HEADER_CONTENT_ID = "BBB_MIMEPART1";
- private static final String PUT_REQUEST_HEADER_CONTENT_ID = "BBB_REQUEST1";
- private static final String SERVICE_ROOT = "http://localhost/odata/";
- private static EntityProviderBatchProperties batchProperties;
- private static final String BOUNDARY = "batch_8194-cf13-1f56";
- private static final String contentType = "multipart/mixed;boundary=" + BOUNDARY;
- private static final String MIME_HEADERS = "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF;
- private static final String GET_REQUEST = MIME_HEADERS + CRLF
- + "GET Employees('1')/EmployeeName HTTP/1.1" + CRLF
- + CRLF
- + CRLF;
-
- @BeforeClass
- public static void setProperties() throws URISyntaxException {
- PathInfoImpl pathInfo = new PathInfoImpl();
- pathInfo.setServiceRoot(new URI(SERVICE_ROOT));
- batchProperties = EntityProviderBatchProperties.init().pathInfo(pathInfo).build();
- }
-
- @Test
- public void test() throws IOException, BatchException, URISyntaxException {
- String fileName = "/batchWithPost.batch";
- InputStream in = ClassLoader.class.getResourceAsStream(fileName);
- if (in == null) {
- throw new IOException("Requested file '" + fileName + "' was not found.");
+ private static final String CRLF = "\r\n";
+ private static final String CONTENT_ID_REFERENCE = "NewEmployee";
+ private static final String PUT_MIME_HEADER_CONTENT_ID = "BBB_MIMEPART1";
+ private static final String PUT_REQUEST_HEADER_CONTENT_ID = "BBB_REQUEST1";
+ private static final String SERVICE_ROOT = "http://localhost/odata/";
+ private static EntityProviderBatchProperties batchProperties;
+ private static final String BOUNDARY = "batch_8194-cf13-1f56";
+ private static final String contentType = "multipart/mixed;boundary=" + BOUNDARY;
+ private static final String MIME_HEADERS = "Content-Type: application/http" + CRLF + "Content-Transfer-Encoding: binary" + CRLF;
+ private static final String GET_REQUEST = MIME_HEADERS + CRLF + "GET Employees('1')/EmployeeName HTTP/1.1" + CRLF + CRLF + CRLF;
+
+ @BeforeClass
+ public static void setProperties() throws URISyntaxException {
+ PathInfoImpl pathInfo = new PathInfoImpl();
+ pathInfo.setServiceRoot(new URI(SERVICE_ROOT));
+ batchProperties = EntityProviderBatchProperties.init()
+ .pathInfo(pathInfo)
+ .build();
+ }
+
+ @Test
+ public void test() throws IOException, BatchException, URISyntaxException {
+ String fileName = "/batchWithPost.batch";
+ InputStream in = BatchRequestParserTest.class.getResourceAsStream(fileName);
+ if (in == null) {
+ throw new IOException("Requested file '" + fileName + "' was not found.");
+ }
+
+ in = StringHelper.toStream(in)
+ .asStreamWithLineSeparation(CRLF);
+
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
+ assertNotNull(batchRequestParts);
+ assertEquals(false, batchRequestParts.isEmpty());
+ for (BatchRequestPart object : batchRequestParts) {
+ if (!object.isChangeSet()) {
+ assertEquals(1, object.getRequests()
+ .size());
+ ODataRequest retrieveRequest = object.getRequests()
+ .get(0);
+ assertEquals(ODataHttpMethod.GET, retrieveRequest.getMethod());
+ if (!retrieveRequest.getAcceptableLanguages()
+ .isEmpty()) {
+ assertEquals(3, retrieveRequest.getAcceptableLanguages()
+ .size());
+ }
+ assertEquals(new URI(SERVICE_ROOT), retrieveRequest.getPathInfo()
+ .getServiceRoot());
+ ODataPathSegmentImpl pathSegment = new ODataPathSegmentImpl("Employees('2')", null);
+ assertEquals(pathSegment.getPath(), retrieveRequest.getPathInfo()
+ .getODataSegments()
+ .get(0)
+ .getPath());
+ if (retrieveRequest.getQueryParameters()
+ .get("$format") != null) {
+ assertEquals("json", retrieveRequest.getQueryParameters()
+ .get("$format"));
+ }
+ assertEquals(SERVICE_ROOT + "Employees('2')/EmployeeName?$format=json", retrieveRequest.getPathInfo()
+ .getRequestUri()
+ .toASCIIString());
+ } else {
+ List<ODataRequest> requests = object.getRequests();
+ for (ODataRequest request : requests) {
+
+ assertEquals(ODataHttpMethod.PUT, request.getMethod());
+ assertEquals("100000", request.getRequestHeaderValue(HttpHeaders.CONTENT_LENGTH.toLowerCase()));
+ assertEquals("application/json;odata=verbose", request.getContentType());
+ assertEquals(3, request.getAcceptHeaders()
+ .size());
+ assertNotNull(request.getAcceptableLanguages());
+ assertTrue(request.getAcceptableLanguages()
+ .isEmpty());
+ assertEquals("*/*", request.getAcceptHeaders()
+ .get(2));
+ assertEquals("application/atomsvc+xml", request.getAcceptHeaders()
+ .get(0));
+ assertEquals(new URI(SERVICE_ROOT + "Employees('2')/EmployeeName").toASCIIString(), request.getPathInfo()
+ .getRequestUri()
+ .toASCIIString());
+
+ ODataPathSegmentImpl pathSegment = new ODataPathSegmentImpl("Employees('2')", null);
+ assertEquals(pathSegment.getPath(), request.getPathInfo()
+ .getODataSegments()
+ .get(0)
+ .getPath());
+ ODataPathSegmentImpl pathSegment2 = new ODataPathSegmentImpl("EmployeeName", null);
+ assertEquals(pathSegment2.getPath(), request.getPathInfo()
+ .getODataSegments()
+ .get(1)
+ .getPath());
+
+ }
+ }
+ }
}
-
- in = StringHelper.toStream(in).asStreamWithLineSeparation(CRLF);
-
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
- assertNotNull(batchRequestParts);
- assertEquals(false, batchRequestParts.isEmpty());
- for (BatchRequestPart object : batchRequestParts) {
- if (!object.isChangeSet()) {
- assertEquals(1, object.getRequests().size());
- ODataRequest retrieveRequest = object.getRequests().get(0);
- assertEquals(ODataHttpMethod.GET, retrieveRequest.getMethod());
- if (!retrieveRequest.getAcceptableLanguages().isEmpty()) {
- assertEquals(3, retrieveRequest.getAcceptableLanguages().size());
+
+ @Test
+ public void testImageInContent() throws IOException, BatchException, URISyntaxException {
+ String fileName = "/batchWithContent.batch";
+ InputStream contentInputStream = BatchRequestParserTest.class.getResourceAsStream(fileName);
+ if (contentInputStream == null) {
+ throw new IOException("Requested file '" + fileName + "' was not found.");
}
- assertEquals(new URI(SERVICE_ROOT), retrieveRequest.getPathInfo().getServiceRoot());
- ODataPathSegmentImpl pathSegment = new ODataPathSegmentImpl("Employees('2')", null);
- assertEquals(pathSegment.getPath(), retrieveRequest.getPathInfo().getODataSegments().get(0).getPath());
- if (retrieveRequest.getQueryParameters().get("$format") != null) {
- assertEquals("json", retrieveRequest.getQueryParameters().get("$format"));
+ String content = StringHelper.inputStreamToString(contentInputStream);
+ String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "GET Employees?$filter=Age%20gt%2040 HTTP/1.1" + CRLF
+ + "Accept: application/atomsvc+xml;q=0.8, application/json;odata=verbose;q=0.5, */*;q=0.1" + CRLF
+ + "MaxDataServiceVersion: 2.0" + CRLF + CRLF + CRLF + "--" + BOUNDARY + CRLF
+ + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF + "--changeset_f980-1cb6-94dd" + CRLF
+ + "content-type: Application/http" + CRLF + "content-transfer-encoding: Binary" + CRLF + "Content-ID: 1" + CRLF + CRLF
+ + "POST Employees HTTP/1.1" + CRLF + "Content-length: 100000" + CRLF + "Content-type: application/octet-stream" + CRLF
+ + CRLF + content + CRLF + CRLF + "--changeset_f980-1cb6-94dd--" + CRLF + "--" + BOUNDARY + "--";
+ List<BatchRequestPart> BatchRequestParts = parse(batch);
+ for (BatchRequestPart object : BatchRequestParts) {
+ if (!object.isChangeSet()) {
+ assertEquals(1, object.getRequests()
+ .size());
+ ODataRequest retrieveRequest = object.getRequests()
+ .get(0);
+ assertEquals(ODataHttpMethod.GET, retrieveRequest.getMethod());
+ assertEquals("Age gt 40", retrieveRequest.getQueryParameters()
+ .get("$filter"));
+ assertEquals(new URI("http://localhost/odata/Employees?$filter=Age%20gt%2040"), retrieveRequest.getPathInfo()
+ .getRequestUri());
+ } else {
+ List<ODataRequest> requests = object.getRequests();
+ for (ODataRequest request : requests) {
+ assertEquals(ODataHttpMethod.POST, request.getMethod());
+ assertEquals("100000", request.getRequestHeaderValue(HttpHeaders.CONTENT_LENGTH.toLowerCase()));
+ assertEquals("1", request.getRequestHeaderValue(BatchHelper.MIME_HEADER_CONTENT_ID));
+ assertEquals("application/octet-stream", request.getContentType());
+ InputStream body = request.getBody();
+ assertEquals(content, StringHelper.inputStreamToString(body));
+
+ }
+
+ }
}
- assertEquals(SERVICE_ROOT + "Employees('2')/EmployeeName?$format=json", retrieveRequest.getPathInfo()
- .getRequestUri().toASCIIString());
- } else {
- List<ODataRequest> requests = object.getRequests();
- for (ODataRequest request : requests) {
-
- assertEquals(ODataHttpMethod.PUT, request.getMethod());
- assertEquals("100000", request.getRequestHeaderValue(HttpHeaders.CONTENT_LENGTH.toLowerCase()));
- assertEquals("application/json;odata=verbose", request.getContentType());
- assertEquals(3, request.getAcceptHeaders().size());
- assertNotNull(request.getAcceptableLanguages());
- assertTrue(request.getAcceptableLanguages().isEmpty());
- assertEquals("*/*", request.getAcceptHeaders().get(2));
- assertEquals("application/atomsvc+xml", request.getAcceptHeaders().get(0));
- assertEquals(new URI(SERVICE_ROOT + "Employees('2')/EmployeeName").toASCIIString(), request.getPathInfo()
- .getRequestUri().toASCIIString());
-
- ODataPathSegmentImpl pathSegment = new ODataPathSegmentImpl("Employees('2')", null);
- assertEquals(pathSegment.getPath(), request.getPathInfo().getODataSegments().get(0).getPath());
- ODataPathSegmentImpl pathSegment2 = new ODataPathSegmentImpl("EmployeeName", null);
- assertEquals(pathSegment2.getPath(), request.getPathInfo().getODataSegments().get(1).getPath());
+ }
+ @Test
+ public void testPostWithoutBody() throws IOException, BatchException, URISyntaxException {
+ String fileName = "/batchWithContent.batch";
+ InputStream contentInputStream = BatchRequestParserTest.class.getResourceAsStream(fileName);
+ if (contentInputStream == null) {
+ throw new IOException("Requested file '" + fileName + "' was not found.");
+ }
+ StringHelper.inputStreamToString(contentInputStream);
+ String batch = CRLF + "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + "Content-ID: changeRequest1" + CRLF + CRLF
+ + "POST Employees('2') HTTP/1.1" + CRLF + "Content-Length: 100" + CRLF + "Content-Type: application/octet-stream" + CRLF
+ + CRLF + CRLF + "--changeset_f980-1cb6-94dd--" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ List<BatchRequestPart> batchRequestParts = parse(batch);
+ for (BatchRequestPart object : batchRequestParts) {
+ if (object.isChangeSet()) {
+ List<ODataRequest> requests = object.getRequests();
+ for (ODataRequest request : requests) {
+ assertEquals(ODataHttpMethod.POST, request.getMethod());
+ assertEquals("100", request.getRequestHeaderValue(HttpHeaders.CONTENT_LENGTH.toLowerCase()));
+ assertEquals("application/octet-stream", request.getContentType());
+ assertNotNull(request.getBody());
+ }
+ }
}
- }
}
- }
-
- @Test
- public void testImageInContent() throws IOException, BatchException, URISyntaxException {
- String fileName = "/batchWithContent.batch";
- InputStream contentInputStream = ClassLoader.class.getResourceAsStream(fileName);
- if (contentInputStream == null) {
- throw new IOException("Requested file '" + fileName + "' was not found.");
+
+ @Test
+ public void testBoundaryParameterWithQuotas() throws BatchException {
+ String contentType = "multipart/mixed; boundary=\"batch_1.2+34:2j)0?\"";
+
+ String batch = "--batch_1.2+34:2j)0?" + CRLF + GET_REQUEST + "--batch_1.2+34:2j)0?--";
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
+ assertNotNull(batchRequestParts);
+ assertEquals(false, batchRequestParts.isEmpty());
+ }
+
+ @Test(expected = BatchException.class)
+ public void testBatchWithInvalidContentType() throws BatchException {
+ String invalidContentType = "multipart;boundary=batch_1740-bb84-2f7f";
+
+ String batch = "--batch_1740-bb84-2f7f" + CRLF + GET_REQUEST + "--batch_1740-bb84-2f7f--";
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(invalidContentType, batchProperties, true);
+ parser.parseBatchRequest(in);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testBatchWithoutBoundaryParameter() throws BatchException {
+ String invalidContentType = "multipart/mixed";
+ String batch = "--batch_1740-bb84-2f7f" + CRLF + GET_REQUEST + "--batch_1740-bb84-2f7f--";
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(invalidContentType, batchProperties, true);
+ parser.parseBatchRequest(in);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testBoundaryParameterWithoutQuota() throws BatchException {
+ String invalidContentType = "multipart/mixed;boundary=batch_1740-bb:84-2f7f";
+ String batch = "--batch_1740-bb:84-2f7f" + CRLF + GET_REQUEST + "--batch_1740-bb:84-2f7f--";
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(invalidContentType, batchProperties, true);
+ parser.parseBatchRequest(in);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testWrongBoundaryString() throws BatchException {
+ String batch = "--batch_8194-cf13-1f5" + CRLF + GET_REQUEST + "--" + BOUNDARY + "--";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testMissingHttpVersion() throws BatchException {
+ String batch = "" + "--" + BOUNDARY + CRLF + "Content-Type: application/http" + CRLF + "Content-Transfer-Encoding:binary" + CRLF
+ + CRLF + "GET Employees?$format=json" + CRLF + "Host: localhost:8080" + CRLF + CRLF + "--" + BOUNDARY + "--";
+
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testMissingHttpVersion2() throws BatchException {
+ String batch = "" + "--" + BOUNDARY + CRLF + "Content-Type: application/http" + CRLF + "Content-Transfer-Encoding:binary" + CRLF
+ + CRLF + "GET Employees?$format=json " + CRLF + "Host: localhost:8080" + CRLF + CRLF + "--" + BOUNDARY + "--";
+
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testMissingHttpVersion3() throws BatchException {
+ String batch = "" + "--" + BOUNDARY + CRLF + "Content-Type: application/http" + CRLF + "Content-Transfer-Encoding:binary" + CRLF
+ + CRLF + "GET Employees?$format=json SMTP:3.1" + CRLF + "Host: localhost:8080" + CRLF + CRLF + "--" + BOUNDARY + "--";
+
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testBoundaryWithoutHyphen() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + GET_REQUEST + BOUNDARY + CRLF + GET_REQUEST + "--" + BOUNDARY + "--";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testNoBoundaryString() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + GET_REQUEST
+ // + no boundary string
+ + GET_REQUEST + "--" + BOUNDARY + "--";
+
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testBatchBoundaryEqualsChangeSetBoundary() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed;boundary=batch_8194-cf13-1f56" + CRLF + CRLF + "--"
+ + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "PUT Employees('2')/EmployeeName HTTP/1.1" + CRLF
+ + "Accept: application/atomsvc+xml;q=0.8, application/json;odata=verbose;q=0.5, */*;q=0.1" + CRLF
+ + "Content-Type: application/json;odata=verbose" + CRLF + "MaxDataServiceVersion: 2.0" + CRLF + CRLF
+ + "{\"EmployeeName\":\"Frederic Fall MODIFIED\"}" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test
+ public void testContentTypeCharset() throws BatchException {
+ final String contentType = "multipart/mixed; charset=UTF-8;boundary=" + BOUNDARY;
+ final String batch = "--" + BOUNDARY + CRLF + GET_REQUEST + "--" + BOUNDARY + "--";
+ final BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ final List<BatchRequestPart> parts = parser.parseBatchRequest(new ByteArrayInputStream(batch.getBytes()));
+
+ assertEquals(1, parts.size());
+ }
+
+ @Test
+ public void testContentTypeCharsetWrongBoundaryAtEnd() throws BatchException {
+ final String contentType = "multipart/mixed; charset=UTF-8;boundary=" + BOUNDARY + ";boundary=wrong_boundary";
+ final String batch = "--" + BOUNDARY + CRLF + GET_REQUEST + "--" + BOUNDARY + "--";
+ final BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ final List<BatchRequestPart> parts = parser.parseBatchRequest(new ByteArrayInputStream(batch.getBytes()));
+
+ assertEquals(1, parts.size());
+ }
+
+ @Test(expected = BatchException.class)
+ public void testContentTypeCharsetWrongBoundaryAtBeginning() throws BatchException {
+ final String contentType = "multipart/mixed; charset=UTF-8;boundary=wrong_boundary;boundary=" + BOUNDARY;
+ final String batch = "--" + BOUNDARY + CRLF + GET_REQUEST + "--" + BOUNDARY + "--";
+ final BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ final List<BatchRequestPart> parts = parser.parseBatchRequest(new ByteArrayInputStream(batch.getBytes()));
+
+ assertEquals(1, parts.size());
+ }
+
+ @Test(expected = BatchException.class)
+ public void testNoContentType() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Transfer-Encoding: binary" + CRLF + CRLF
+ + "GET Employees('1')/EmployeeName HTTP/1.1" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testMimeHeaderContentType() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: text/plain" + CRLF + "Content-Transfer-Encoding: binary" + CRLF + CRLF
+ + "GET Employees('1')/EmployeeName HTTP/1.1" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testMimeHeaderEncoding() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: application/http" + CRLF + "Content-Transfer-Encoding: 8bit" + CRLF + CRLF
+ + "GET Employees('1')/EmployeeName HTTP/1.1" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testGetRequestMissingCRLF() throws BatchException {
+ String batch =
+ "--" + BOUNDARY + CRLF + MIME_HEADERS + "Content-ID: 1" + CRLF + CRLF + "GET Employees('1')/EmployeeName HTTP/1.1" + CRLF
+ // + CRLF // Belongs to the GET request
+ + CRLF // Belongs to the
+ + "--" + BOUNDARY + "--";
+
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testInvalidMethodForBatch() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "POST Employees('1')/EmployeeName HTTP/1.1" + CRLF + CRLF + "--"
+ + BOUNDARY + "--";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testNoBoundaryFound() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "POST Employees('1')/EmployeeName HTTP/1.1" + CRLF + CRLF;
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testBadRequest() throws BatchException {
+ String batch = "This is a bad request. There is no syntax and also no semantic";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testNoMethod() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + /* GET */"Employees('1')/EmployeeName HTTP/1.1" + CRLF + CRLF + "--"
+ + BOUNDARY + "--";
+ parseInvalidBatchBody(batch);
}
- String content = StringHelper.inputStreamToString(contentInputStream);
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "GET Employees?$filter=Age%20gt%2040 HTTP/1.1" + CRLF
- + "Accept: application/atomsvc+xml;q=0.8, application/json;odata=verbose;q=0.5, */*;q=0.1" + CRLF
- + "MaxDataServiceVersion: 2.0" + CRLF
- + CRLF
- + CRLF
- + "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + "content-type: Application/http" + CRLF
- + "content-transfer-encoding: Binary" + CRLF
- + "Content-ID: 1" + CRLF
- + CRLF
- + "POST Employees HTTP/1.1" + CRLF
- + "Content-length: 100000" + CRLF
- + "Content-type: application/octet-stream" + CRLF
- + CRLF
- + content + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + "--" + BOUNDARY + "--";
- List<BatchRequestPart> BatchRequestParts = parse(batch);
- for (BatchRequestPart object : BatchRequestParts) {
- if (!object.isChangeSet()) {
- assertEquals(1, object.getRequests().size());
- ODataRequest retrieveRequest = object.getRequests().get(0);
- assertEquals(ODataHttpMethod.GET, retrieveRequest.getMethod());
- assertEquals("Age gt 40", retrieveRequest.getQueryParameters().get("$filter"));
- assertEquals(new URI("http://localhost/odata/Employees?$filter=Age%20gt%2040"), retrieveRequest.getPathInfo()
- .getRequestUri());
- } else {
- List<ODataRequest> requests = object.getRequests();
- for (ODataRequest request : requests) {
- assertEquals(ODataHttpMethod.POST, request.getMethod());
- assertEquals("100000", request.getRequestHeaderValue(HttpHeaders.CONTENT_LENGTH.toLowerCase()));
- assertEquals("1", request.getRequestHeaderValue(BatchHelper.MIME_HEADER_CONTENT_ID));
- assertEquals("application/octet-stream", request.getContentType());
- InputStream body = request.getBody();
- assertEquals(content, StringHelper.inputStreamToString(body));
+
+ @Test(expected = BatchException.class)
+ public void testInvalidMethodForChangeset() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + CRLF + "GET Employees('2')/EmployeeName HTTP/1.1" + CRLF
+ + "Content-Type: application/json;odata=verbose" + CRLF + "MaxDataServiceVersion: 2.0" + CRLF + CRLF + "--" + BOUNDARY
+ + "--";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testInvalidChangeSetBoundary() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed;boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94d"/* +"d" */ + CRLF + MIME_HEADERS + CRLF + "POST Employees('2') HTTP/1.1" + CRLF
+ + "Content-Type: application/json;odata=verbose" + CRLF + "MaxDataServiceVersion: 2.0" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd--" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testNestedChangeset() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed;boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + CRLF
+ + "Content-Type: multipart/mixed;boundary=changeset_f980-1cb6-94dd2" + CRLF + CRLF + "--changeset_f980-1cb6-94dd2" + CRLF
+ + MIME_HEADERS + CRLF + "POST Employees('2') HTTP/1.1" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF
+ + "MaxDataServiceVersion: 2.0" + CRLF + CRLF + "--changeset_f980-1cb6-94dd--" + CRLF + CRLF + "--changeset_f980-1cb6-94dd--"
+ + CRLF + CRLF + "--" + BOUNDARY + "--";
+ parse(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testMissingContentTransferEncoding() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed;boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + "Content-Type: application/http" + CRLF
+ // + "Content-Transfer-Encoding: binary" + CRLF
+ + CRLF + "POST Employees('2') HTTP/1.1" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF
+ + "MaxDataServiceVersion: 2.0" + CRLF + CRLF + "--changeset_f980-1cb6-94dd--" + CRLF + "--" + BOUNDARY + "--";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testMissingContentType() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed;boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF
+ // + "Content-Type: application/http" + CRLF
+ + "Content-Transfer-Encoding: binary" + CRLF + CRLF + "POST Employees('2') HTTP/1.1" + CRLF
+ + "Content-Type: application/json;odata=verbose" + CRLF + "MaxDataServiceVersion: 2.0" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd--" + CRLF + "--" + BOUNDARY + "--";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testNoCloseDelimiter() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + GET_REQUEST;
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testNoCloseDelimiter2() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "GET Employees('1')/EmployeeName HTTP/1.1" + CRLF;
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testInvalidUri() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "GET http://localhost/aa/odata/Employees('1')/EmployeeName HTTP/1.1"
+ + CRLF + CRLF + CRLF + "--" + BOUNDARY + "--";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test
+ public void uriWithAbsolutePath() throws Exception {
+ final String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "GET /odata/Employees('1')/EmployeeName HTTP/1.1" + CRLF + CRLF
+ + CRLF + "--" + BOUNDARY + "--";
+ final List<BatchRequestPart> batchRequestParts = parse(batch);
+ assertEquals(1, batchRequestParts.size());
+ assertEquals(1, batchRequestParts.get(0)
+ .getRequests()
+ .size());
+ final ODataRequest request = batchRequestParts.get(0)
+ .getRequests()
+ .get(0);
+ assertEquals(ODataHttpMethod.GET, request.getMethod());
+ }
+
+ @Test(expected = BatchException.class)
+ public void uriWithWrongAbsolutePath() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "GET /wrong/Employees('1')/EmployeeName HTTP/1.1" + CRLF + CRLF + CRLF
+ + "--" + BOUNDARY + "--";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void wrongHost() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "GET /odata/Employees('1')/EmployeeName HTTP/1.1" + CRLF
+ + "Host: wrongHost" + CRLF + CRLF + CRLF + "--" + BOUNDARY + "--";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testNoCloseDelimiter3() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + GET_REQUEST + "--" + BOUNDARY + "-";
+ parseInvalidBatchBody(batch);
+ }
+
+ @Test
+ public void testAcceptHeaders() throws BatchException, URISyntaxException {
+ String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "GET Employees('2')/EmployeeName HTTP/1.1" + CRLF
+ + "Content-Length: 100000" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF
+ + "Accept: application/xml;q=0.3, application/atomsvc+xml;q=0.8, " + "application/json;odata=verbose;q=0.5, */*;q=0.001"
+ + CRLF + CRLF + CRLF + "--" + BOUNDARY + "--";
+ List<BatchRequestPart> batchRequestParts = parse(batch);
+ for (BatchRequestPart multipart : batchRequestParts) {
+ if (!multipart.isChangeSet()) {
+ assertEquals(1, multipart.getRequests()
+ .size());
+ ODataRequest retrieveRequest = multipart.getRequests()
+ .get(0);
+ assertEquals(ODataHttpMethod.GET, retrieveRequest.getMethod());
+ assertNotNull(retrieveRequest.getAcceptHeaders());
+ assertEquals(4, retrieveRequest.getAcceptHeaders()
+ .size());
+ assertEquals("application/atomsvc+xml", retrieveRequest.getAcceptHeaders()
+ .get(0));
+ assertEquals("*/*", retrieveRequest.getAcceptHeaders()
+ .get(3));
+ }
}
+ }
- }
+ @Test
+ public void testAcceptHeaders2() throws BatchException, URISyntaxException {
+ String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "GET Employees('2')/EmployeeName HTTP/1.1" + CRLF
+ + "Content-Length: 100000" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF
+ + "Accept: */*;q=0.5, application/json;odata=verbose;q=1.0,application/atom+xml" + CRLF + CRLF + CRLF + "--" + BOUNDARY
+ + "--";
+ List<BatchRequestPart> batchRequestParts = parse(batch);
+ for (BatchRequestPart multipart : batchRequestParts) {
+ if (!multipart.isChangeSet()) {
+ assertEquals(1, multipart.getRequests()
+ .size());
+ ODataRequest retrieveRequest = multipart.getRequests()
+ .get(0);
+ assertEquals(ODataHttpMethod.GET, retrieveRequest.getMethod());
+ assertNotNull(retrieveRequest.getAcceptHeaders());
+ assertEquals(3, retrieveRequest.getAcceptHeaders()
+ .size());
+ assertEquals("application/json;odata=verbose", retrieveRequest.getAcceptHeaders()
+ .get(0));
+ assertEquals("application/atom+xml", retrieveRequest.getAcceptHeaders()
+ .get(1));
+ assertEquals("*/*", retrieveRequest.getAcceptHeaders()
+ .get(2));
+ }
+
+ }
}
- }
-
- @Test
- public void testPostWithoutBody() throws IOException, BatchException, URISyntaxException {
- String fileName = "/batchWithContent.batch";
- InputStream contentInputStream = ClassLoader.class.getResourceAsStream(fileName);
- if (contentInputStream == null) {
- throw new IOException("Requested file '" + fileName + "' was not found.");
+
+ @Test
+ public void testAcceptHeaders3() throws BatchException, URISyntaxException {
+ String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "GET Employees('2')/EmployeeName HTTP/1.1" + CRLF
+ + "Content-Length: 100000" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF
+ + "accept: */*,application/atom+xml,application/atomsvc+xml,application/xml" + CRLF + CRLF + CRLF + "--" + BOUNDARY + "--";
+ List<BatchRequestPart> batchRequestParts = parse(batch);
+ for (BatchRequestPart multipart : batchRequestParts) {
+ if (!multipart.isChangeSet()) {
+ assertEquals(1, multipart.getRequests()
+ .size());
+ ODataRequest retrieveRequest = multipart.getRequests()
+ .get(0);
+ assertEquals(ODataHttpMethod.GET, retrieveRequest.getMethod());
+ assertNotNull(retrieveRequest.getAcceptHeaders());
+ assertEquals(4, retrieveRequest.getAcceptHeaders()
+ .size());
+
+ assertEquals("application/atom+xml", retrieveRequest.getAcceptHeaders()
+ .get(0));
+ assertEquals("application/atomsvc+xml", retrieveRequest.getAcceptHeaders()
+ .get(1));
+
+ assertEquals("application/xml", retrieveRequest.getAcceptHeaders()
+ .get(2));
+ }
+
+ }
}
- StringHelper.inputStreamToString(contentInputStream);
- String batch = CRLF
- + "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + "Content-ID: changeRequest1" + CRLF
- + CRLF
- + "POST Employees('2') HTTP/1.1" + CRLF
- + "Content-Length: 100" + CRLF
- + "Content-Type: application/octet-stream" + CRLF
- + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- List<BatchRequestPart> batchRequestParts = parse(batch);
- for (BatchRequestPart object : batchRequestParts) {
- if (object.isChangeSet()) {
- List<ODataRequest> requests = object.getRequests();
- for (ODataRequest request : requests) {
- assertEquals(ODataHttpMethod.POST, request.getMethod());
- assertEquals("100", request.getRequestHeaderValue(HttpHeaders.CONTENT_LENGTH.toLowerCase()));
- assertEquals("application/octet-stream", request.getContentType());
- assertNotNull(request.getBody());
+
+ @Test
+ public void testNegativeContentLengthChangeSet() throws BatchException, IOException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF
+ + "Content-Length: -2" + CRLF + CRLF + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF
+ + "Content-Type: application/json;odata=verbose" + CRLF + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF + CRLF
+ + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF + "--changeset_f980-1cb6-94dd--" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ parser.parseBatchRequest(in);
+ }
+
+ @Test(expected = BatchException.class)
+ public void testNegativeContentLengthRequest() throws BatchException, IOException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF + CRLF + "PUT $"
+ + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF
+ + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF + "Content-Length: -2" + CRLF + CRLF
+ + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF + "--changeset_f980-1cb6-94dd--" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ parser.parseBatchRequest(in);
+ }
+
+ @Test
+ public void testContentLengthGreatherThanBodyLength() throws BatchException, IOException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF + CRLF + "PUT $"
+ + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF
+ + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF + "Content-Length: 100000" + CRLF + CRLF
+ + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF + "--changeset_f980-1cb6-94dd--" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
+ assertNotNull(batchRequestParts);
+ for (BatchRequestPart multipart : batchRequestParts) {
+ if (multipart.isChangeSet()) {
+ assertEquals(1, multipart.getRequests()
+ .size());
+ ODataRequest request = multipart.getRequests()
+ .get(0);
+ assertEquals("{\"EmployeeName\":\"Peter Fall\"}", inputStreamToString(request.getBody()));
+ }
+ }
+ }
+
+ @Test
+ public void testContentLengthSmallerThanBodyLength() throws BatchException, IOException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF + CRLF + "PUT $"
+ + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF
+ + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF + "Content-Length: 10" + CRLF + CRLF
+ + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF + "--changeset_f980-1cb6-94dd--" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
+ assertNotNull(batchRequestParts);
+ for (BatchRequestPart multipart : batchRequestParts) {
+ if (multipart.isChangeSet()) {
+ assertEquals(1, multipart.getRequests()
+ .size());
+ ODataRequest request = multipart.getRequests()
+ .get(0);
+ assertEquals("{\"Employee", inputStreamToString(request.getBody()));
+ }
}
- }
}
- }
-
- @Test
- public void testBoundaryParameterWithQuotas() throws BatchException {
- String contentType = "multipart/mixed; boundary=\"batch_1.2+34:2j)0?\"";
-
- String batch = "--batch_1.2+34:2j)0?" + CRLF
- + GET_REQUEST
- + "--batch_1.2+34:2j)0?--";
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
- assertNotNull(batchRequestParts);
- assertEquals(false, batchRequestParts.isEmpty());
- }
-
- @Test(expected = BatchException.class)
- public void testBatchWithInvalidContentType() throws BatchException {
- String invalidContentType = "multipart;boundary=batch_1740-bb84-2f7f";
-
- String batch = "--batch_1740-bb84-2f7f" + CRLF
- + GET_REQUEST
- + "--batch_1740-bb84-2f7f--";
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(invalidContentType, batchProperties, true);
- parser.parseBatchRequest(in);
- }
-
- @Test(expected = BatchException.class)
- public void testBatchWithoutBoundaryParameter() throws BatchException {
- String invalidContentType = "multipart/mixed";
- String batch = "--batch_1740-bb84-2f7f" + CRLF
- + GET_REQUEST
- + "--batch_1740-bb84-2f7f--";
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(invalidContentType, batchProperties, true);
- parser.parseBatchRequest(in);
- }
-
- @Test(expected = BatchException.class)
- public void testBoundaryParameterWithoutQuota() throws BatchException {
- String invalidContentType = "multipart/mixed;boundary=batch_1740-bb:84-2f7f";
- String batch = "--batch_1740-bb:84-2f7f" + CRLF
- + GET_REQUEST
- + "--batch_1740-bb:84-2f7f--";
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(invalidContentType, batchProperties, true);
- parser.parseBatchRequest(in);
- }
-
- @Test(expected = BatchException.class)
- public void testWrongBoundaryString() throws BatchException {
- String batch = "--batch_8194-cf13-1f5" + CRLF
- + GET_REQUEST
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testMissingHttpVersion() throws BatchException {
- String batch = ""
- + "--" + BOUNDARY + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding:binary" + CRLF
- + CRLF
- + "GET Employees?$format=json" + CRLF
- + "Host: localhost:8080" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
-
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testMissingHttpVersion2() throws BatchException {
- String batch = ""
- + "--" + BOUNDARY + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding:binary" + CRLF
- + CRLF
- + "GET Employees?$format=json " + CRLF
- + "Host: localhost:8080" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
-
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testMissingHttpVersion3() throws BatchException {
- String batch = ""
- + "--" + BOUNDARY + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding:binary" + CRLF
- + CRLF
- + "GET Employees?$format=json SMTP:3.1" + CRLF
- + "Host: localhost:8080" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
-
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testBoundaryWithoutHyphen() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + GET_REQUEST
- + BOUNDARY + CRLF
- + GET_REQUEST
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testNoBoundaryString() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + GET_REQUEST
- // + no boundary string
- + GET_REQUEST
- + "--" + BOUNDARY + "--";
-
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testBatchBoundaryEqualsChangeSetBoundary() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed;boundary=batch_8194-cf13-1f56" + CRLF
- + CRLF
- + "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "PUT Employees('2')/EmployeeName HTTP/1.1" + CRLF
- + "Accept: application/atomsvc+xml;q=0.8, application/json;odata=verbose;q=0.5, */*;q=0.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "MaxDataServiceVersion: 2.0" + CRLF
- + CRLF
- + "{\"EmployeeName\":\"Frederic Fall MODIFIED\"}" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test
- public void testContentTypeCharset() throws BatchException {
- final String contentType = "multipart/mixed; charset=UTF-8;boundary=" + BOUNDARY;
- final String batch = "--" + BOUNDARY + CRLF
- + GET_REQUEST
- + "--" + BOUNDARY + "--";
- final BatchParser parser = new BatchParser(contentType, batchProperties, true);
- final List<BatchRequestPart> parts = parser.parseBatchRequest(new ByteArrayInputStream(batch.getBytes()));
-
- assertEquals(1, parts.size());
- }
-
- @Test
- public void testContentTypeCharsetWrongBoundaryAtEnd() throws BatchException {
- final String contentType = "multipart/mixed; charset=UTF-8;boundary=" + BOUNDARY + ";boundary=wrong_boundary";
- final String batch = "--" + BOUNDARY + CRLF
- + GET_REQUEST
- + "--" + BOUNDARY + "--";
- final BatchParser parser = new BatchParser(contentType, batchProperties, true);
- final List<BatchRequestPart> parts = parser.parseBatchRequest(new ByteArrayInputStream(batch.getBytes()));
-
- assertEquals(1, parts.size());
- }
-
- @Test(expected = BatchException.class)
- public void testContentTypeCharsetWrongBoundaryAtBeginning() throws BatchException {
- final String contentType = "multipart/mixed; charset=UTF-8;boundary=wrong_boundary;boundary=" + BOUNDARY;
- final String batch = "--" + BOUNDARY + CRLF
- + GET_REQUEST
- + "--" + BOUNDARY + "--";
- final BatchParser parser = new BatchParser(contentType, batchProperties, true);
- final List<BatchRequestPart> parts = parser.parseBatchRequest(new ByteArrayInputStream(batch.getBytes()));
-
- assertEquals(1, parts.size());
- }
-
- @Test(expected = BatchException.class)
- public void testNoContentType() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + CRLF
- + "GET Employees('1')/EmployeeName HTTP/1.1" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testMimeHeaderContentType() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: text/plain" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + CRLF
- + "GET Employees('1')/EmployeeName HTTP/1.1" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testMimeHeaderEncoding() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: 8bit" + CRLF
- + CRLF
- + "GET Employees('1')/EmployeeName HTTP/1.1" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testGetRequestMissingCRLF() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + "Content-ID: 1" + CRLF
- + CRLF
- + "GET Employees('1')/EmployeeName HTTP/1.1" + CRLF
- // + CRLF // Belongs to the GET request
- + CRLF // Belongs to the
- + "--" + BOUNDARY + "--";
-
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testInvalidMethodForBatch() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "POST Employees('1')/EmployeeName HTTP/1.1" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testNoBoundaryFound() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "POST Employees('1')/EmployeeName HTTP/1.1" + CRLF
- + CRLF;
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testBadRequest() throws BatchException {
- String batch = "This is a bad request. There is no syntax and also no semantic";
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testNoMethod() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + /* GET */"Employees('1')/EmployeeName HTTP/1.1" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testInvalidMethodForChangeset() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + CRLF
- + "GET Employees('2')/EmployeeName HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "MaxDataServiceVersion: 2.0" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testInvalidChangeSetBoundary() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed;boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94d"/* +"d" */+ CRLF
- + MIME_HEADERS
- + CRLF
- + "POST Employees('2') HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "MaxDataServiceVersion: 2.0" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testNestedChangeset() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed;boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + CRLF
- + "Content-Type: multipart/mixed;boundary=changeset_f980-1cb6-94dd2" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd2" + CRLF
- + MIME_HEADERS
- + CRLF
- + "POST Employees('2') HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "MaxDataServiceVersion: 2.0" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- parse(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testMissingContentTransferEncoding() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed;boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + "Content-Type: application/http" + CRLF
- // + "Content-Transfer-Encoding: binary" + CRLF
- + CRLF
- + "POST Employees('2') HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "MaxDataServiceVersion: 2.0" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testMissingContentType() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed;boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- // + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + CRLF
- + "POST Employees('2') HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "MaxDataServiceVersion: 2.0" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testNoCloseDelimiter() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + GET_REQUEST;
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testNoCloseDelimiter2() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "GET Employees('1')/EmployeeName HTTP/1.1" + CRLF;
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testInvalidUri() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "GET http://localhost/aa/odata/Employees('1')/EmployeeName HTTP/1.1" + CRLF
- + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test
- public void uriWithAbsolutePath() throws Exception {
- final String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "GET /odata/Employees('1')/EmployeeName HTTP/1.1" + CRLF
- + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- final List<BatchRequestPart> batchRequestParts = parse(batch);
- assertEquals(1, batchRequestParts.size());
- assertEquals(1, batchRequestParts.get(0).getRequests().size());
- final ODataRequest request = batchRequestParts.get(0).getRequests().get(0);
- assertEquals(ODataHttpMethod.GET, request.getMethod());
- }
-
- @Test(expected = BatchException.class)
- public void uriWithWrongAbsolutePath() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "GET /wrong/Employees('1')/EmployeeName HTTP/1.1" + CRLF
- + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void wrongHost() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "GET /odata/Employees('1')/EmployeeName HTTP/1.1" + CRLF
- + "Host: wrongHost" + CRLF
- + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- parseInvalidBatchBody(batch);
- }
-
- @Test(expected = BatchException.class)
- public void testNoCloseDelimiter3() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + GET_REQUEST + "--" + BOUNDARY + "-";
- parseInvalidBatchBody(batch);
- }
-
- @Test
- public void testAcceptHeaders() throws BatchException, URISyntaxException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "GET Employees('2')/EmployeeName HTTP/1.1"
- + CRLF
- + "Content-Length: 100000"
- + CRLF
- + "Content-Type: application/json;odata=verbose"
- + CRLF
- + "Accept: application/xml;q=0.3, application/atomsvc+xml;q=0.8, " +
- "application/json;odata=verbose;q=0.5, */*;q=0.001"
- + CRLF
- + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- List<BatchRequestPart> batchRequestParts = parse(batch);
- for (BatchRequestPart multipart : batchRequestParts) {
- if (!multipart.isChangeSet()) {
- assertEquals(1, multipart.getRequests().size());
- ODataRequest retrieveRequest = multipart.getRequests().get(0);
- assertEquals(ODataHttpMethod.GET, retrieveRequest.getMethod());
- assertNotNull(retrieveRequest.getAcceptHeaders());
- assertEquals(4, retrieveRequest.getAcceptHeaders().size());
- assertEquals("application/atomsvc+xml", retrieveRequest.getAcceptHeaders().get(0));
- assertEquals("*/*", retrieveRequest.getAcceptHeaders().get(3));
- }
+ @Test(expected = BatchException.class)
+ public void testNonNumericContentLength() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF + CRLF + "PUT $"
+ + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF
+ + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF + "Content-Length: 10abc" + CRLF + CRLF
+ + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF + "--changeset_f980-1cb6-94dd--" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ parser.parseBatchRequest(in);
}
- }
-
- @Test
- public void testAcceptHeaders2() throws BatchException, URISyntaxException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "GET Employees('2')/EmployeeName HTTP/1.1" + CRLF
- + "Content-Length: 100000" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "Accept: */*;q=0.5, application/json;odata=verbose;q=1.0,application/atom+xml" + CRLF
- + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- List<BatchRequestPart> batchRequestParts = parse(batch);
- for (BatchRequestPart multipart : batchRequestParts) {
- if (!multipart.isChangeSet()) {
- assertEquals(1, multipart.getRequests().size());
- ODataRequest retrieveRequest = multipart.getRequests().get(0);
- assertEquals(ODataHttpMethod.GET, retrieveRequest.getMethod());
- assertNotNull(retrieveRequest.getAcceptHeaders());
- assertEquals(3, retrieveRequest.getAcceptHeaders().size());
- assertEquals("application/json;odata=verbose", retrieveRequest.getAcceptHeaders().get(0));
- assertEquals("application/atom+xml", retrieveRequest.getAcceptHeaders().get(1));
- assertEquals("*/*", retrieveRequest.getAcceptHeaders().get(2));
- }
+ @Test
+ public void testNonStrictParser() throws BatchException, IOException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed;boundary=changeset_8194-cf13-1f56" + CRLF
+ + "--changeset_8194-cf13-1f56" + CRLF + MIME_HEADERS + "Content-ID: myRequest" + CRLF
+ + "PUT Employees('2')/EmployeeName HTTP/1.1" + CRLF
+ + "Accept: application/atomsvc+xml;q=0.8, application/json;odata=verbose;q=0.5, */*;q=0.1" + CRLF
+ + "Content-Type: application/json;odata=verbose" + CRLF + "MaxDataServiceVersion: 2.0" + CRLF
+ + "{\"EmployeeName\":\"Frederic Fall MODIFIED\"}" + CRLF + "--changeset_8194-cf13-1f56--" + CRLF + "--" + BOUNDARY + "--";
+
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, false);
+ List<BatchRequestPart> requests = parser.parseBatchRequest(in);
+ assertNotNull(requests);
+ assertEquals(1, requests.size());
+
+ BatchRequestPart part = requests.get(0);
+ assertTrue(part.isChangeSet());
+ assertNotNull(part.getRequests());
+ assertEquals(1, part.getRequests()
+ .size());
+
+ ODataRequest changeRequest = part.getRequests()
+ .get(0);
+ assertEquals("{\"EmployeeName\":\"Frederic Fall MODIFIED\"}", inputStreamToString(changeRequest.getBody()));
+ assertEquals("application/json;odata=verbose", changeRequest.getContentType());
+ assertEquals(ODataHttpMethod.PUT, changeRequest.getMethod());
}
- }
-
- @Test
- public void testAcceptHeaders3() throws BatchException, URISyntaxException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "GET Employees('2')/EmployeeName HTTP/1.1" + CRLF
- + "Content-Length: 100000" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "accept: */*,application/atom+xml,application/atomsvc+xml,application/xml" + CRLF
- + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- List<BatchRequestPart> batchRequestParts = parse(batch);
- for (BatchRequestPart multipart : batchRequestParts) {
- if (!multipart.isChangeSet()) {
- assertEquals(1, multipart.getRequests().size());
- ODataRequest retrieveRequest = multipart.getRequests().get(0);
- assertEquals(ODataHttpMethod.GET, retrieveRequest.getMethod());
- assertNotNull(retrieveRequest.getAcceptHeaders());
- assertEquals(4, retrieveRequest.getAcceptHeaders().size());
-
- assertEquals("application/atom+xml", retrieveRequest.getAcceptHeaders().get(0));
- assertEquals("application/atomsvc+xml", retrieveRequest.getAcceptHeaders().get(1));
-
- assertEquals("application/xml", retrieveRequest.getAcceptHeaders().get(2));
- }
+ @Test(expected = BatchException.class)
+ public void testNonStrictParserMoreCRLF() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed;boundary=changeset_8194-cf13-1f56" + CRLF
+ + "--changeset_8194-cf13-1f56" + CRLF + MIME_HEADERS + CRLF + CRLF // Only one CRLF allowed
+ + "PUT Employees('2')/EmployeeName HTTP/1.1" + CRLF
+ + "Accept: application/atomsvc+xml;q=0.8, application/json;odata=verbose;q=0.5, */*;q=0.1" + CRLF
+ + "Content-Type: application/json;odata=verbose" + CRLF + "MaxDataServiceVersion: 2.0" + CRLF
+ + "{\"EmployeeName\":\"Frederic Fall MODIFIED\"}" + CRLF + "--changeset_8194-cf13-1f56--" + CRLF + "--" + BOUNDARY + "--";
+
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, false);
+ parser.parseBatchRequest(in);
}
- }
-
- @Test
- public void testNegativeContentLengthChangeSet() throws BatchException, IOException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF
- + "Content-Length: -2" + CRLF
- + CRLF
- + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF
- + CRLF
- + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- parser.parseBatchRequest(in);
- }
-
- @Test(expected = BatchException.class)
- public void testNegativeContentLengthRequest() throws BatchException, IOException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF
- + CRLF
- + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF
- + "Content-Length: -2" + CRLF
- + CRLF
- + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- parser.parseBatchRequest(in);
- }
-
- @Test
- public void testContentLengthGreatherThanBodyLength() throws BatchException, IOException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF
- + CRLF
- + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF
- + "Content-Length: 100000" + CRLF
- + CRLF
- + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
- assertNotNull(batchRequestParts);
- for (BatchRequestPart multipart : batchRequestParts) {
- if (multipart.isChangeSet()) {
- assertEquals(1, multipart.getRequests().size());
- ODataRequest request = multipart.getRequests().get(0);
- assertEquals("{\"EmployeeName\":\"Peter Fall\"}", inputStreamToString(request.getBody()));
- }
+
+ @Test
+ public void testContentId() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "GET Employees HTTP/1.1" + CRLF
+ + "accept: */*,application/atom+xml,application/atomsvc+xml,application/xml" + CRLF + "Content-Id: BBB" + CRLF + CRLF + CRLF
+ + "--batch_8194-cf13-1f56" + CRLF + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + "Content-Id: " + CONTENT_ID_REFERENCE + CRLF + CRLF
+ + "POST Employees HTTP/1.1" + CRLF + "Content-type: application/octet-stream" + CRLF + CRLF
+ + "/9j/4AAQSkZJRgABAQEBLAEsAAD/4RM0RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAA" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF + CRLF + "PUT $"
+ + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF
+ + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF + CRLF + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
+ + "--changeset_f980-1cb6-94dd--" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
+ assertNotNull(batchRequestParts);
+ for (BatchRequestPart multipart : batchRequestParts) {
+ if (!multipart.isChangeSet()) {
+ assertEquals(1, multipart.getRequests()
+ .size());
+ ODataRequest retrieveRequest = multipart.getRequests()
+ .get(0);
+ assertEquals("BBB", retrieveRequest.getRequestHeaderValue(BatchHelper.REQUEST_HEADER_CONTENT_ID.toLowerCase()));
+ } else {
+ for (ODataRequest request : multipart.getRequests()) {
+ if (ODataHttpMethod.POST.equals(request.getMethod())) {
+ assertEquals(CONTENT_ID_REFERENCE, request.getRequestHeaderValue(BatchHelper.MIME_HEADER_CONTENT_ID.toLowerCase()));
+ } else if (ODataHttpMethod.PUT.equals(request.getMethod())) {
+ assertEquals(PUT_MIME_HEADER_CONTENT_ID,
+ request.getRequestHeaderValue(BatchHelper.MIME_HEADER_CONTENT_ID.toLowerCase()));
+ assertEquals(PUT_REQUEST_HEADER_CONTENT_ID,
+ request.getRequestHeaderValue(BatchHelper.REQUEST_HEADER_CONTENT_ID.toLowerCase()));
+ assertNull(request.getPathInfo()
+ .getRequestUri());
+ assertEquals("$" + CONTENT_ID_REFERENCE, request.getPathInfo()
+ .getODataSegments()
+ .get(0)
+ .getPath());
+ }
+ }
+ }
+ }
+ }
+
+ @Test
+ public void testNoContentId() throws BatchException {
+ String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "GET Employees HTTP/1.1" + CRLF
+ + "accept: */*,application/atom+xml,application/atomsvc+xml,application/xml" + CRLF + CRLF + CRLF + "--batch_8194-cf13-1f56"
+ + CRLF + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF + "--changeset_f980-1cb6-94dd"
+ + CRLF + MIME_HEADERS + CRLF + "POST Employees HTTP/1.1" + CRLF + "Content-type: application/octet-stream" + CRLF + CRLF
+ + "/9j/4AAQSkZJRgABAQEBLAEsAAD/4RM0RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAA" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + CRLF + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1"
+ + CRLF + "Content-Type: application/json;odata=verbose" + CRLF + CRLF + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
+ + "--changeset_f980-1cb6-94dd--" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in); // No exception should be thrown
+ assertNotNull(batchRequestParts);
}
- }
-
- @Test
- public void testContentLengthSmallerThanBodyLength() throws BatchException, IOException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF
- + CRLF
- + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF
- + "Content-Length: 10" + CRLF
- + CRLF
- + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
- assertNotNull(batchRequestParts);
- for (BatchRequestPart multipart : batchRequestParts) {
- if (multipart.isChangeSet()) {
- assertEquals(1, multipart.getRequests().size());
- ODataRequest request = multipart.getRequests().get(0);
- assertEquals("{\"Employee", inputStreamToString(request.getBody()));
- }
+
+ @Test
+ public void testPreamble() throws BatchException, IOException {
+ String batch = "" + "This is a preamble and must be ignored" + CRLF + CRLF + CRLF + "----1242" + CRLF + "--" + BOUNDARY + CRLF
+ + MIME_HEADERS + CRLF + "GET Employees HTTP/1.1" + CRLF
+ + "accept: */*,application/atom+xml,application/atomsvc+xml,application/xml" + CRLF + "Content-Id: BBB" + CRLF + CRLF + CRLF
+ + "--batch_8194-cf13-1f56" + CRLF + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "This is a preamble and must be ignored" + CRLF + CRLF + CRLF + "----1242" + CRLF + "--changeset_f980-1cb6-94dd" + CRLF
+ + MIME_HEADERS + "Content-Id: " + CONTENT_ID_REFERENCE + CRLF + CRLF + "POST Employees HTTP/1.1" + CRLF
+ + "Content-type: application/octet-stream" + CRLF + CRLF
+ + "/9j/4AAQSkZJRgABAQEBLAEsAAD/4RM0RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAA" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF + CRLF + "PUT $"
+ + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF
+ + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF + CRLF + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
+ + "--changeset_f980-1cb6-94dd--" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
+
+ assertNotNull(batchRequestParts);
+ assertEquals(2, batchRequestParts.size());
+
+ BatchRequestPart getRequestPart = batchRequestParts.get(0);
+ assertEquals(1, getRequestPart.getRequests()
+ .size());
+ ODataRequest getRequest = getRequestPart.getRequests()
+ .get(0);
+ assertEquals(ODataHttpMethod.GET, getRequest.getMethod());
+
+ BatchRequestPart changeSetPart = batchRequestParts.get(1);
+ assertEquals(2, changeSetPart.getRequests()
+ .size());
+ assertEquals("/9j/4AAQSkZJRgABAQEBLAEsAAD/4RM0RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAA" + CRLF,
+ inputStreamToString(changeSetPart.getRequests()
+ .get(0)
+ .getBody()));
+ assertEquals("{\"EmployeeName\":\"Peter Fall\"}", inputStreamToString(changeSetPart.getRequests()
+ .get(1)
+ .getBody()));
+ }
+
+ @SuppressWarnings("unused")
+ @Test
+ public void testContentTypeCaseInsensitive() throws BatchException, IOException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: muLTiParT/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF
+ + "Content-Length: -2" + CRLF + CRLF + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF
+ + "Content-Type: application/json;odata=verbose" + CRLF + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF + CRLF
+ + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF + "--changeset_f980-1cb6-94dd--" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
}
- }
-
- @Test(expected = BatchException.class)
- public void testNonNumericContentLength() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF
- + CRLF
- + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF
- + "Content-Length: 10abc" + CRLF
- + CRLF
- + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- parser.parseBatchRequest(in);
- }
-
- @Test
- public void testNonStrictParser() throws BatchException, IOException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed;boundary=changeset_8194-cf13-1f56" + CRLF
- + "--changeset_8194-cf13-1f56" + CRLF
- + MIME_HEADERS
- + "Content-ID: myRequest" + CRLF
- + "PUT Employees('2')/EmployeeName HTTP/1.1" + CRLF
- + "Accept: application/atomsvc+xml;q=0.8, application/json;odata=verbose;q=0.5, */*;q=0.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "MaxDataServiceVersion: 2.0" + CRLF
- + "{\"EmployeeName\":\"Frederic Fall MODIFIED\"}" + CRLF
- + "--changeset_8194-cf13-1f56--" + CRLF
- + "--" + BOUNDARY + "--";
-
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, false);
- List<BatchRequestPart> requests = parser.parseBatchRequest(in);
- assertNotNull(requests);
- assertEquals(1, requests.size());
-
- BatchRequestPart part = requests.get(0);
- assertTrue(part.isChangeSet());
- assertNotNull(part.getRequests());
- assertEquals(1, part.getRequests().size());
-
- ODataRequest changeRequest = part.getRequests().get(0);
- assertEquals("{\"EmployeeName\":\"Frederic Fall MODIFIED\"}", inputStreamToString(changeRequest.getBody()));
- assertEquals("application/json;odata=verbose", changeRequest.getContentType());
- assertEquals(ODataHttpMethod.PUT, changeRequest.getMethod());
- }
-
- @Test(expected = BatchException.class)
- public void testNonStrictParserMoreCRLF() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed;boundary=changeset_8194-cf13-1f56" + CRLF
- + "--changeset_8194-cf13-1f56" + CRLF
- + MIME_HEADERS
- + CRLF
- + CRLF // Only one CRLF allowed
- + "PUT Employees('2')/EmployeeName HTTP/1.1" + CRLF
- + "Accept: application/atomsvc+xml;q=0.8, application/json;odata=verbose;q=0.5, */*;q=0.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "MaxDataServiceVersion: 2.0" + CRLF
- + "{\"EmployeeName\":\"Frederic Fall MODIFIED\"}" + CRLF
- + "--changeset_8194-cf13-1f56--" + CRLF
- + "--" + BOUNDARY + "--";
-
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, false);
- parser.parseBatchRequest(in);
- }
-
- @Test
- public void testContentId() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "GET Employees HTTP/1.1" + CRLF
- + "accept: */*,application/atom+xml,application/atomsvc+xml,application/xml" + CRLF
- + "Content-Id: BBB" + CRLF
- + CRLF + CRLF
- + "--batch_8194-cf13-1f56" + CRLF
- + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + "Content-Id: " + CONTENT_ID_REFERENCE + CRLF
- + CRLF
- + "POST Employees HTTP/1.1" + CRLF
- + "Content-type: application/octet-stream" + CRLF
- + CRLF
- + "/9j/4AAQSkZJRgABAQEBLAEsAAD/4RM0RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAA" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF
- + CRLF
- + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF
- + CRLF
- + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
- assertNotNull(batchRequestParts);
- for (BatchRequestPart multipart : batchRequestParts) {
- if (!multipart.isChangeSet()) {
- assertEquals(1, multipart.getRequests().size());
- ODataRequest retrieveRequest = multipart.getRequests().get(0);
- assertEquals("BBB", retrieveRequest.getRequestHeaderValue(BatchHelper.REQUEST_HEADER_CONTENT_ID.toLowerCase()));
- } else {
- for (ODataRequest request : multipart.getRequests()) {
- if (ODataHttpMethod.POST.equals(request.getMethod())) {
- assertEquals(CONTENT_ID_REFERENCE, request.getRequestHeaderValue(BatchHelper.MIME_HEADER_CONTENT_ID
- .toLowerCase()));
- } else if (ODataHttpMethod.PUT.equals(request.getMethod())) {
- assertEquals(PUT_MIME_HEADER_CONTENT_ID, request.getRequestHeaderValue(BatchHelper.MIME_HEADER_CONTENT_ID
- .toLowerCase()));
- assertEquals(PUT_REQUEST_HEADER_CONTENT_ID, request
- .getRequestHeaderValue(BatchHelper.REQUEST_HEADER_CONTENT_ID.toLowerCase()));
- assertNull(request.getPathInfo().getRequestUri());
- assertEquals("$" + CONTENT_ID_REFERENCE, request.getPathInfo().getODataSegments().get(0).getPath());
- }
+
+ @Test
+ public void testContentTypeBoundaryCaseInsensitive() throws BatchException, IOException {
+ String batch = "--" + BOUNDARY + CRLF + "Content-Type: multipart/mixed; bOunDaRy=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF
+ + "Content-Length: -2" + CRLF + CRLF + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF
+ + "Content-Type: application/json;odata=verbose" + CRLF + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF + CRLF
+ + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF + "--changeset_f980-1cb6-94dd--" + CRLF + CRLF + "--" + BOUNDARY + "--";
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
+
+ assertNotNull(batchRequestParts);
+ assertEquals(1, batchRequestParts.size());
+ assertTrue(batchRequestParts.get(0)
+ .isChangeSet());
+ assertEquals(1, batchRequestParts.get(0)
+ .getRequests()
+ .size());
+ }
+
+ @Test
+ public void testEpilog() throws BatchException, IOException {
+ String batch = "--" + BOUNDARY + CRLF + MIME_HEADERS + CRLF + "GET Employees HTTP/1.1" + CRLF
+ + "accept: */*,application/atom+xml,application/atomsvc+xml,application/xml" + CRLF + "Content-Id: BBB" + CRLF + CRLF + CRLF
+ + "--batch_8194-cf13-1f56" + CRLF + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + "Content-Id: " + CONTENT_ID_REFERENCE + CRLF + CRLF
+ + "POST Employees HTTP/1.1" + CRLF + "Content-type: application/octet-stream" + CRLF + CRLF
+ + "/9j/4AAQSkZJRgABAQEBLAEsAAD/4RM0RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAA" + CRLF + CRLF
+ + "--changeset_f980-1cb6-94dd" + CRLF + MIME_HEADERS + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF + CRLF + "PUT $"
+ + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF + "Content-Type: application/json;odata=verbose" + CRLF
+ + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF + CRLF + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
+ + "--changeset_f980-1cb6-94dd--" + CRLF + CRLF + "This is an epilog and must be ignored" + CRLF + CRLF + CRLF + "----1242"
+ + CRLF + "--" + BOUNDARY + "--" + CRLF + "This is an epilog and must be ignored" + CRLF + CRLF + CRLF + "----1242";
+
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
+
+ assertNotNull(batchRequestParts);
+ assertEquals(2, batchRequestParts.size());
+
+ BatchRequestPart getRequestPart = batchRequestParts.get(0);
+ assertEquals(1, getRequestPart.getRequests()
+ .size());
+ ODataRequest getRequest = getRequestPart.getRequests()
+ .get(0);
+ assertEquals(ODataHttpMethod.GET, getRequest.getMethod());
+
+ BatchRequestPart changeSetPart = batchRequestParts.get(1);
+ assertEquals(2, changeSetPart.getRequests()
+ .size());
+ assertEquals("/9j/4AAQSkZJRgABAQEBLAEsAAD/4RM0RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAA" + CRLF,
+ inputStreamToString(changeSetPart.getRequests()
+ .get(0)
+ .getBody()));
+ assertEquals("{\"EmployeeName\":\"Peter Fall\"}", inputStreamToString(changeSetPart.getRequests()
+ .get(1)
+ .getBody()));
+ }
+
+ @Test
+ public void testLargeBatch() throws BatchException, IOException {
+ String fileName = "/batchLarge.batch";
+ InputStream in = BatchRequestParserTest.class.getResourceAsStream(fileName);
+ if (in == null) {
+ throw new IOException("Requested file '" + fileName + "' was not found.");
}
- }
+ in = StringHelper.toStream(in)
+ .asStreamWithLineSeparation(CRLF);
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ parser.parseBatchRequest(in);
}
- }
-
- @Test
- public void testNoContentId() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "GET Employees HTTP/1.1" + CRLF
- + "accept: */*,application/atom+xml,application/atomsvc+xml,application/xml" + CRLF
- + CRLF + CRLF
- + "--batch_8194-cf13-1f56" + CRLF
- + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + CRLF
- + "POST Employees HTTP/1.1" + CRLF
- + "Content-type: application/octet-stream" + CRLF
- + CRLF
- + "/9j/4AAQSkZJRgABAQEBLAEsAAD/4RM0RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAA" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + CRLF
- + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + CRLF
- + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in); // No exception should be thrown
- assertNotNull(batchRequestParts);
- }
-
- @Test
- public void testPreamble() throws BatchException, IOException {
- String batch = ""
- + "This is a preamble and must be ignored" + CRLF
- + CRLF
- + CRLF
- + "----1242" + CRLF
- + "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "GET Employees HTTP/1.1" + CRLF
- + "accept: */*,application/atom+xml,application/atomsvc+xml,application/xml" + CRLF
- + "Content-Id: BBB" + CRLF
- + CRLF
- + CRLF
- + "--batch_8194-cf13-1f56" + CRLF
- + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "This is a preamble and must be ignored" + CRLF
- + CRLF
- + CRLF
- + "----1242" + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + "Content-Id: " + CONTENT_ID_REFERENCE + CRLF
- + CRLF
- + "POST Employees HTTP/1.1" + CRLF
- + "Content-type: application/octet-stream" + CRLF
- + CRLF
- + "/9j/4AAQSkZJRgABAQEBLAEsAAD/4RM0RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAA" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF
- + CRLF
- + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF
- + CRLF
- + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
-
- assertNotNull(batchRequestParts);
- assertEquals(2, batchRequestParts.size());
-
- BatchRequestPart getRequestPart = batchRequestParts.get(0);
- assertEquals(1, getRequestPart.getRequests().size());
- ODataRequest getRequest = getRequestPart.getRequests().get(0);
- assertEquals(ODataHttpMethod.GET, getRequest.getMethod());
-
- BatchRequestPart changeSetPart = batchRequestParts.get(1);
- assertEquals(2, changeSetPart.getRequests().size());
- assertEquals("/9j/4AAQSkZJRgABAQEBLAEsAAD/4RM0RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAA"
- + CRLF,
- inputStreamToString(changeSetPart.getRequests().get(0).getBody()));
- assertEquals("{\"EmployeeName\":\"Peter Fall\"}",
- inputStreamToString(changeSetPart.getRequests().get(1).getBody()));
- }
-
- @SuppressWarnings("unused")
- @Test
- public void testContentTypeCaseInsensitive() throws BatchException, IOException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: muLTiParT/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF
- + "Content-Length: -2" + CRLF
- + CRLF
- + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF
- + CRLF
- + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
- }
-
- @Test
- public void testContentTypeBoundaryCaseInsensitive() throws BatchException, IOException {
- String batch = "--" + BOUNDARY + CRLF
- + "Content-Type: multipart/mixed; bOunDaRy=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF
- + "Content-Length: -2" + CRLF
- + CRLF
- + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF
- + CRLF
- + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "--" + BOUNDARY + "--";
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
-
- assertNotNull(batchRequestParts);
- assertEquals(1, batchRequestParts.size());
- assertTrue(batchRequestParts.get(0).isChangeSet());
- assertEquals(1, batchRequestParts.get(0).getRequests().size());
- }
-
- @Test
- public void testEpilog() throws BatchException, IOException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + CRLF
- + "GET Employees HTTP/1.1" + CRLF
- + "accept: */*,application/atom+xml,application/atomsvc+xml,application/xml" + CRLF
- + "Content-Id: BBB" + CRLF
- + CRLF
- + CRLF
- + "--batch_8194-cf13-1f56" + CRLF
- + "Content-Type: multipart/mixed; boundary=changeset_f980-1cb6-94dd" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + "Content-Id: " + CONTENT_ID_REFERENCE + CRLF
- + CRLF
- + "POST Employees HTTP/1.1" + CRLF
- + "Content-type: application/octet-stream" + CRLF
- + CRLF
- + "/9j/4AAQSkZJRgABAQEBLAEsAAD/4RM0RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAA" + CRLF
- + CRLF
- + "--changeset_f980-1cb6-94dd" + CRLF
- + MIME_HEADERS
- + "Content-ID: " + PUT_MIME_HEADER_CONTENT_ID + CRLF
- + CRLF
- + "PUT $" + CONTENT_ID_REFERENCE + "/EmployeeName HTTP/1.1" + CRLF
- + "Content-Type: application/json;odata=verbose" + CRLF
- + "Content-Id:" + PUT_REQUEST_HEADER_CONTENT_ID + CRLF
- + CRLF
- + "{\"EmployeeName\":\"Peter Fall\"}" + CRLF
- + "--changeset_f980-1cb6-94dd--" + CRLF
- + CRLF
- + "This is an epilog and must be ignored" + CRLF
- + CRLF
- + CRLF
- + "----1242" + CRLF
- + "--" + BOUNDARY + "--" + CRLF
- + "This is an epilog and must be ignored" + CRLF
- + CRLF
- + CRLF
- + "----1242";
-
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
-
- assertNotNull(batchRequestParts);
- assertEquals(2, batchRequestParts.size());
-
- BatchRequestPart getRequestPart = batchRequestParts.get(0);
- assertEquals(1, getRequestPart.getRequests().size());
- ODataRequest getRequest = getRequestPart.getRequests().get(0);
- assertEquals(ODataHttpMethod.GET, getRequest.getMethod());
-
- BatchRequestPart changeSetPart = batchRequestParts.get(1);
- assertEquals(2, changeSetPart.getRequests().size());
- assertEquals("/9j/4AAQSkZJRgABAQEBLAEsAAD/4RM0RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAA"
- + CRLF,
- inputStreamToString(changeSetPart.getRequests().get(0).getBody()));
- assertEquals("{\"EmployeeName\":\"Peter Fall\"}",
- inputStreamToString(changeSetPart.getRequests().get(1).getBody()));
- }
-
- @Test
- public void testLargeBatch() throws BatchException, IOException {
- String fileName = "/batchLarge.batch";
- InputStream in = ClassLoader.class.getResourceAsStream(fileName);
- if (in == null) {
- throw new IOException("Requested file '" + fileName + "' was not found.");
+
+ @Test
+ public void testNonStrictGetRequestWithMissingCRLF() throws BatchException {
+ String batch =
+ "--" + BOUNDARY + CRLF + MIME_HEADERS + "Content-ID: 1" + CRLF + CRLF + "GET Employees('1')/EmployeeName HTTP/1.1" + CRLF
+ // + CRLF // Belongs to the GET request
+ + CRLF // Belongs to the
+ + "--" + BOUNDARY + "--";
+
+ parse(batch, false);
}
- in = StringHelper.toStream(in).asStreamWithLineSeparation(CRLF);
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- parser.parseBatchRequest(in);
- }
-
- @Test
- public void testNonStrictGetRequestWithMissingCRLF() throws BatchException {
- String batch = "--" + BOUNDARY + CRLF
- + MIME_HEADERS
- + "Content-ID: 1" + CRLF
- + CRLF
- + "GET Employees('1')/EmployeeName HTTP/1.1" + CRLF
- // + CRLF // Belongs to the GET request
- + CRLF // Belongs to the
- + "--" + BOUNDARY + "--";
-
- parse(batch, false);
- }
-
- private List<BatchRequestPart> parse(final String batch) throws BatchException {
- return parse(batch, true);
- }
-
- private List<BatchRequestPart> parse(final String batch, final boolean isStrict) throws BatchException {
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, isStrict);
- List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
- assertNotNull(batchRequestParts);
- assertEquals(false, batchRequestParts.isEmpty());
- return batchRequestParts;
- }
-
- private void parseInvalidBatchBody(final String batch) throws BatchException {
- InputStream in = new ByteArrayInputStream(batch.getBytes());
- BatchParser parser = new BatchParser(contentType, batchProperties, true);
- parser.parseBatchRequest(in);
- }
-
- private String inputStreamToString(final InputStream in) throws IOException {
- int input;
- final StringBuilder builder = new StringBuilder();
-
- while ((input = in.read()) != -1) {
- builder.append((char) input);
+
+ private List<BatchRequestPart> parse(final String batch) throws BatchException {
+ return parse(batch, true);
}
- return builder.toString();
- }
+ private List<BatchRequestPart> parse(final String batch, final boolean isStrict) throws BatchException {
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, isStrict);
+ List<BatchRequestPart> batchRequestParts = parser.parseBatchRequest(in);
+ assertNotNull(batchRequestParts);
+ assertEquals(false, batchRequestParts.isEmpty());
+ return batchRequestParts;
+ }
+
+ private void parseInvalidBatchBody(final String batch) throws BatchException {
+ InputStream in = new ByteArrayInputStream(batch.getBytes());
+ BatchParser parser = new BatchParser(contentType, batchProperties, true);
+ parser.parseBatchRequest(in);
+ }
+
+ private String inputStreamToString(final InputStream in) throws IOException {
+ int input;
+ final StringBuilder builder = new StringBuilder();
+
+ while ((input = in.read()) != -1) {
+ builder.append((char) input);
+ }
+
+ return builder.toString();
+ }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseParserTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseParserTest.java
index f8980a83..f0becc78 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseParserTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseParserTest.java
@@ -1,31 +1,25 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.batch;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-
import org.apache.olingo.odata2.api.batch.BatchException;
import org.apache.olingo.odata2.api.client.batch.BatchSingleResponse;
import org.apache.olingo.odata2.api.commons.HttpContentType;
@@ -37,478 +31,322 @@ import org.junit.Test;
public class BatchResponseParserTest {
- private static final String CRLF = "\r\n";
- private static final String LF = "\n";
-
- @Test
- public void testSimpleBatchResponse() throws BatchException {
- String getResponse = "--batch_123" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + "Content-ID: 1" + CRLF
- + CRLF
- + "HTTP/1.1 200 OK" + CRLF
- + "DataServiceVersion: 2.0" + CRLF
- + "Content-Type: text/plain;charset=utf-8" + CRLF
- + "Content-length: 22" + CRLF
- + CRLF
- + "Frederic Fall MODIFIED" + CRLF
- + "--batch_123--";
-
- InputStream in = new ByteArrayInputStream(getResponse.getBytes());
- BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
- List<BatchSingleResponse> responses = parser.parseBatchResponse(in);
- for (BatchSingleResponse response : responses) {
- assertEquals("200", response.getStatusCode());
- assertEquals("OK", response.getStatusInfo());
- assertEquals("text/plain;charset=utf-8", response.getHeaders().get(HttpHeaders.CONTENT_TYPE));
- assertEquals("22", response.getHeaders().get("Content-length"));
- assertEquals("1", response.getContentId());
- assertEquals("Frederic Fall MODIFIED", response.getBody());
+ private static final String CRLF = "\r\n";
+ private static final String LF = "\n";
+
+ @Test
+ public void testSimpleBatchResponse() throws BatchException {
+ String getResponse = "--batch_123" + CRLF + "Content-Type: application/http" + CRLF + "Content-Transfer-Encoding: binary" + CRLF
+ + "Content-ID: 1" + CRLF + CRLF + "HTTP/1.1 200 OK" + CRLF + "DataServiceVersion: 2.0" + CRLF
+ + "Content-Type: text/plain;charset=utf-8" + CRLF + "Content-length: 22" + CRLF + CRLF + "Frederic Fall MODIFIED" + CRLF
+ + "--batch_123--";
+
+ InputStream in = new ByteArrayInputStream(getResponse.getBytes());
+ BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
+ List<BatchSingleResponse> responses = parser.parseBatchResponse(in);
+ for (BatchSingleResponse response : responses) {
+ assertEquals("200", response.getStatusCode());
+ assertEquals("OK", response.getStatusInfo());
+ assertEquals("text/plain;charset=utf-8", response.getHeaders()
+ .get(HttpHeaders.CONTENT_TYPE));
+ assertEquals("22", response.getHeaders()
+ .get("Content-length"));
+ assertEquals("1", response.getContentId());
+ assertEquals("Frederic Fall MODIFIED", response.getBody());
+ }
}
- }
-
- @Test
- public void testSimpleBatchResponseWithLinebreak() throws BatchException {
- String getResponse = "--batch_123" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + "Content-ID: 1" + CRLF
- + CRLF
- + "HTTP/1.1 200 OK" + CRLF
- + "DataServiceVersion: 2.0" + CRLF
- + "Content-Type: text/plain;charset=utf-8" + CRLF
- + "Content-length: 24" + CRLF
- + CRLF
- + "Frederic Fall MODIFIED" + CRLF
- + CRLF
- + "--batch_123--";
-
- InputStream in = new ByteArrayInputStream(getResponse.getBytes());
- BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
- List<BatchSingleResponse> responses = parser.parseBatchResponse(in);
- for (BatchSingleResponse response : responses) {
- assertEquals("200", response.getStatusCode());
- assertEquals("OK", response.getStatusInfo());
- assertEquals("text/plain;charset=utf-8", response.getHeaders().get(HttpHeaders.CONTENT_TYPE));
- assertEquals("24", response.getHeaders().get("Content-length"));
- assertEquals("1", response.getContentId());
- assertEquals("Frederic Fall MODIFIED\r\n", response.getBody());
+
+ @Test
+ public void testSimpleBatchResponseWithLinebreak() throws BatchException {
+ String getResponse = "--batch_123" + CRLF + "Content-Type: application/http" + CRLF + "Content-Transfer-Encoding: binary" + CRLF
+ + "Content-ID: 1" + CRLF + CRLF + "HTTP/1.1 200 OK" + CRLF + "DataServiceVersion: 2.0" + CRLF
+ + "Content-Type: text/plain;charset=utf-8" + CRLF + "Content-length: 24" + CRLF + CRLF + "Frederic Fall MODIFIED" + CRLF
+ + CRLF + "--batch_123--";
+
+ InputStream in = new ByteArrayInputStream(getResponse.getBytes());
+ BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
+ List<BatchSingleResponse> responses = parser.parseBatchResponse(in);
+ for (BatchSingleResponse response : responses) {
+ assertEquals("200", response.getStatusCode());
+ assertEquals("OK", response.getStatusInfo());
+ assertEquals("text/plain;charset=utf-8", response.getHeaders()
+ .get(HttpHeaders.CONTENT_TYPE));
+ assertEquals("24", response.getHeaders()
+ .get("Content-length"));
+ assertEquals("1", response.getContentId());
+ assertEquals("Frederic Fall MODIFIED\r\n", response.getBody());
+ }
}
- }
-
- @Test
- public void testNoContentResponse() throws Exception {
- String responseContent =
- "--ejjeeffe1\r\n" +
- "Content-Type: application/http\r\n" +
- "Content-Length: 96\r\n" +
- "content-transfer-encoding: binary\r\n" +
- "\r\n" +
- "HTTP/1.1 204 No Content\r\n" +
- "Content-Type: text/html\r\n" +
- "dataserviceversion: 2.0\r\n" +
- "\r\n" +
- "\r\n" +
- "--ejjeeffe1--\r\n";
-
- InputStream in = new ByteArrayInputStream(responseContent.getBytes());
- BatchParser parser = new BatchParser("multipart/mixed;boundary=ejjeeffe1", true);
- List<BatchSingleResponse> responses = parser.parseBatchResponse(in);
- for (BatchSingleResponse response : responses) {
- assertEquals("204", response.getStatusCode());
- assertEquals("No Content", response.getStatusInfo());
- assertEquals("text/html", response.getHeaders().get(HttpHeaders.CONTENT_TYPE));
+
+ @Test
+ public void testNoContentResponse() throws Exception {
+ String responseContent = "--ejjeeffe1\r\n" + "Content-Type: application/http\r\n" + "Content-Length: 96\r\n"
+ + "content-transfer-encoding: binary\r\n" + "\r\n" + "HTTP/1.1 204 No Content\r\n" + "Content-Type: text/html\r\n"
+ + "dataserviceversion: 2.0\r\n" + "\r\n" + "\r\n" + "--ejjeeffe1--\r\n";
+
+ InputStream in = new ByteArrayInputStream(responseContent.getBytes());
+ BatchParser parser = new BatchParser("multipart/mixed;boundary=ejjeeffe1", true);
+ List<BatchSingleResponse> responses = parser.parseBatchResponse(in);
+ for (BatchSingleResponse response : responses) {
+ assertEquals("204", response.getStatusCode());
+ assertEquals("No Content", response.getStatusInfo());
+ assertEquals("text/html", response.getHeaders()
+ .get(HttpHeaders.CONTENT_TYPE));
+ }
}
- }
-
- @Test
- public void testBatchResponse() throws BatchException, IOException {
- String fileName = "/batchResponse.batch";
- InputStream in = ClassLoader.class.getResourceAsStream(fileName);
- if (in == null) {
- throw new IOException("Requested file '" + fileName + "' was not found.");
+
+ @Test
+ public void testBatchResponse() throws BatchException, IOException {
+ String fileName = "/batchResponse.batch";
+ InputStream in = BatchResponseParserTest.class.getResourceAsStream(fileName);
+ if (in == null) {
+ throw new IOException("Requested file '" + fileName + "' was not found.");
+ }
+ BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
+ List<BatchSingleResponse> responses = parser.parseBatchResponse(StringHelper.toStream(in)
+ .asStreamWithLineSeparation("\r\n"));
+ for (BatchSingleResponse response : responses) {
+ if ("1".equals(response.getContentId())) {
+ assertEquals("204", response.getStatusCode());
+ assertEquals("No Content", response.getStatusInfo());
+ } else if ("3".equals(response.getContentId())) {
+ assertEquals("200", response.getStatusCode());
+ assertEquals("OK", response.getStatusInfo());
+ }
+ }
}
- BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
- List<BatchSingleResponse> responses =
- parser.parseBatchResponse(StringHelper.toStream(in).asStreamWithLineSeparation("\r\n"));
- for (BatchSingleResponse response : responses) {
- if ("1".equals(response.getContentId())) {
- assertEquals("204", response.getStatusCode());
- assertEquals("No Content", response.getStatusInfo());
- } else if ("3".equals(response.getContentId())) {
- assertEquals("200", response.getStatusCode());
- assertEquals("OK", response.getStatusInfo());
- }
+
+ @Test
+ public void testResponseToChangeSet() throws BatchException {
+ String putResponse = "--batch_123" + CRLF + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d"
+ + CRLF + CRLF + "--changeset_12ks93js84d" + CRLF + "Content-Type: application/http" + CRLF
+ + "Content-Transfer-Encoding: binary" + CRLF + "Content-ID: 1" + CRLF + CRLF + "HTTP/1.1 204 No Content" + CRLF
+ + "DataServiceVersion: 2.0" + CRLF + CRLF + CRLF + "--changeset_12ks93js84d--" + CRLF + CRLF + "--batch_123--";
+
+ InputStream in = new ByteArrayInputStream(putResponse.getBytes());
+ BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
+ List<BatchSingleResponse> responses = parser.parseBatchResponse(in);
+ for (BatchSingleResponse response : responses) {
+ assertEquals("204", response.getStatusCode());
+ assertEquals("No Content", response.getStatusInfo());
+ assertEquals("1", response.getContentId());
+ }
}
- }
-
- @Test
- public void testResponseToChangeSet() throws BatchException {
- String putResponse = "--batch_123" + CRLF
- + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d" + CRLF
- + CRLF
- + "--changeset_12ks93js84d" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + "Content-ID: 1" + CRLF
- + CRLF
- + "HTTP/1.1 204 No Content" + CRLF
- + "DataServiceVersion: 2.0" + CRLF
- + CRLF
- + CRLF
- + "--changeset_12ks93js84d--" + CRLF
- + CRLF
- + "--batch_123--";
-
- InputStream in = new ByteArrayInputStream(putResponse.getBytes());
- BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
- List<BatchSingleResponse> responses = parser.parseBatchResponse(in);
- for (BatchSingleResponse response : responses) {
- assertEquals("204", response.getStatusCode());
- assertEquals("No Content", response.getStatusInfo());
- assertEquals("1", response.getContentId());
+
+ @Test
+ public void testResponseChangeSetBodyWithoutCRLF() throws BatchException {
+ String putResponse = "--batch_123" + CRLF + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d"
+ + CRLF + CRLF + "--changeset_12ks93js84d" + CRLF + "Content-Type: application/http" + CRLF
+ + "Content-Transfer-Encoding: binary" + CRLF + "Content-ID: 1" + CRLF + CRLF + "HTTP/1.1 200 Ok" + CRLF
+ + "DataServiceVersion: 2.0" + CRLF + "Content-Length: 19" + CRLF + CRLF + "TestBodyWithoutCRLF" + CRLF
+ + "--changeset_12ks93js84d--" + CRLF + CRLF + "--batch_123--";
+
+ InputStream in = new ByteArrayInputStream(putResponse.getBytes());
+ BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
+ List<BatchSingleResponse> responses = parser.parseBatchResponse(in);
+ for (BatchSingleResponse response : responses) {
+ assertEquals("200", response.getStatusCode());
+ assertEquals("Ok", response.getStatusInfo());
+ assertEquals("19", response.getHeader(HttpHeaders.CONTENT_LENGTH));
+ assertEquals("TestBodyWithoutCRLF", response.getBody());
+ assertEquals("1", response.getContentId());
+ }
+ }
+
+ @Test
+ public void testResponseChangeSetBodyWithCRLF() throws BatchException {
+ String putResponse = "--batch_123" + CRLF + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d"
+ + CRLF + CRLF + "--changeset_12ks93js84d" + CRLF + "Content-Type: application/http" + CRLF
+ + "Content-Transfer-Encoding: binary" + CRLF + "Content-ID: 1" + CRLF + CRLF + "HTTP/1.1 200 Ok" + CRLF
+ + "DataServiceVersion: 2.0" + CRLF + "Content-Length: 18" + CRLF + CRLF + "TestBodyWithCRLF" + CRLF + CRLF
+ + "--changeset_12ks93js84d--" + CRLF + CRLF + "--batch_123--";
+
+ InputStream in = new ByteArrayInputStream(putResponse.getBytes());
+ BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
+ List<BatchSingleResponse> responses = parser.parseBatchResponse(in);
+ for (BatchSingleResponse response : responses) {
+ assertEquals("200", response.getStatusCode());
+ assertEquals("Ok", response.getStatusInfo());
+ assertEquals("18", response.getHeader(HttpHeaders.CONTENT_LENGTH));
+ assertEquals("TestBodyWithCRLF" + CRLF, response.getBody());
+ assertEquals("1", response.getContentId());
+ }
+ }
+
+ @Test
+ public void testResponseToChangeSetNoContentButContentLength() throws BatchException {
+ String putResponse =
+ "--batch_123" + CRLF + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d" + CRLF + CRLF
+ + "--changeset_12ks93js84d" + CRLF + "Content-Type: application/http" + CRLF + "Content-Transfer-Encoding: binary"
+ + CRLF + "Content-ID: 1" + CRLF + CRLF + "HTTP/1.1 204 No Content" + CRLF + "Content-Length: 0" + CRLF
+ + "DataServiceVersion: 2.0" + CRLF + CRLF + CRLF + "--changeset_12ks93js84d--" + CRLF + CRLF + "--batch_123--";
+
+ InputStream in = new ByteArrayInputStream(putResponse.getBytes());
+ BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
+ List<BatchSingleResponse> responses = parser.parseBatchResponse(in);
+ for (BatchSingleResponse response : responses) {
+ assertEquals("204", response.getStatusCode());
+ assertEquals("No Content", response.getStatusInfo());
+ assertEquals("1", response.getContentId());
+ }
}
- }
-
- @Test
- public void testResponseChangeSetBodyWithoutCRLF() throws BatchException {
- String putResponse = "--batch_123" + CRLF
- + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d" + CRLF
- + CRLF
- + "--changeset_12ks93js84d" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + "Content-ID: 1" + CRLF
- + CRLF
- + "HTTP/1.1 200 Ok" + CRLF
- + "DataServiceVersion: 2.0" + CRLF
- + "Content-Length: 19" + CRLF
- + CRLF
- + "TestBodyWithoutCRLF" + CRLF
- + "--changeset_12ks93js84d--" + CRLF
- + CRLF
- + "--batch_123--";
-
- InputStream in = new ByteArrayInputStream(putResponse.getBytes());
- BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
- List<BatchSingleResponse> responses = parser.parseBatchResponse(in);
- for (BatchSingleResponse response : responses) {
- assertEquals("200", response.getStatusCode());
- assertEquals("Ok", response.getStatusInfo());
- assertEquals("19", response.getHeader(HttpHeaders.CONTENT_LENGTH));
- assertEquals("TestBodyWithoutCRLF", response.getBody());
- assertEquals("1", response.getContentId());
+
+ @Test(expected = BatchException.class)
+ public void testInvalidMimeHeader() throws BatchException {
+ String putResponse = "--batch_123" + CRLF + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d"
+ + CRLF + CRLF + "--changeset_12ks93js84d" + CRLF + "Content-Type: application/http" + CRLF
+ + "Content-Transfer-Encoding: 7bit" + CRLF // Content-Transfer-Encoding must be binary
+ + CRLF + "HTTP/1.1 No Content" + CRLF + "DataServiceVersion: 2.0" + CRLF + CRLF + CRLF + "--changeset_12ks93js84d--" + CRLF
+ + CRLF + "--batch_123--";
+
+ parseInvalidBatchResponseBody(putResponse);
}
- }
-
- @Test
- public void testResponseChangeSetBodyWithCRLF() throws BatchException {
- String putResponse = "--batch_123" + CRLF
- + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d" + CRLF
- + CRLF
- + "--changeset_12ks93js84d" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + "Content-ID: 1" + CRLF
- + CRLF
- + "HTTP/1.1 200 Ok" + CRLF
- + "DataServiceVersion: 2.0" + CRLF
- + "Content-Length: 18" + CRLF
- + CRLF
- + "TestBodyWithCRLF" + CRLF
- + CRLF
- + "--changeset_12ks93js84d--" + CRLF
- + CRLF
- + "--batch_123--";
-
- InputStream in = new ByteArrayInputStream(putResponse.getBytes());
- BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
- List<BatchSingleResponse> responses = parser.parseBatchResponse(in);
- for (BatchSingleResponse response : responses) {
- assertEquals("200", response.getStatusCode());
- assertEquals("Ok", response.getStatusInfo());
- assertEquals("18", response.getHeader(HttpHeaders.CONTENT_LENGTH));
- assertEquals("TestBodyWithCRLF" + CRLF, response.getBody());
- assertEquals("1", response.getContentId());
+
+ @Test(expected = BatchException.class)
+ public void testMissingMimeHeader() throws BatchException {
+ String putResponse = "--batch_123" + CRLF + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d"
+ + CRLF + CRLF + "--changeset_12ks93js84d" + CRLF + CRLF + "HTTP/1.1 No Content" + CRLF + "DataServiceVersion: 2.0" + CRLF
+ + CRLF + CRLF + "--changeset_12ks93js84d--" + CRLF + CRLF + "--batch_123--";
+
+ parseInvalidBatchResponseBody(putResponse);
}
- }
-
- @Test
- public void testResponseToChangeSetNoContentButContentLength() throws BatchException {
- String putResponse =
- "--batch_123" + CRLF
- + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d" + CRLF
- + CRLF
- + "--changeset_12ks93js84d" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + "Content-ID: 1" + CRLF
- + CRLF
- + "HTTP/1.1 204 No Content" + CRLF
- + "Content-Length: 0" + CRLF
- + "DataServiceVersion: 2.0" + CRLF
- + CRLF
- + CRLF
- + "--changeset_12ks93js84d--" + CRLF
- + CRLF
- + "--batch_123--";
-
- InputStream in = new ByteArrayInputStream(putResponse.getBytes());
- BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
- List<BatchSingleResponse> responses = parser.parseBatchResponse(in);
- for (BatchSingleResponse response : responses) {
- assertEquals("204", response.getStatusCode());
- assertEquals("No Content", response.getStatusInfo());
- assertEquals("1", response.getContentId());
+
+ @Test(expected = BatchException.class)
+ public void testInvalidContentType() throws BatchException {
+ String putResponse = "--batch_123" + CRLF + "Content-Type: " + HttpContentType.MULTIPART_MIXED + CRLF // Missing boundary parameter
+ + CRLF + "--changeset_12ks93js84d" + CRLF + "Content-Type: application/http" + CRLF + "Content-Transfer-Encoding: binary"
+ + CRLF + CRLF + "HTTP/1.1 No Content" + CRLF + "DataServiceVersion: 2.0" + CRLF + CRLF + CRLF + "--changeset_12ks93js84d--"
+ + CRLF + CRLF + "--batch_123--";
+
+ parseInvalidBatchResponseBody(putResponse);
}
- }
-
- @Test(expected = BatchException.class)
- public void testInvalidMimeHeader() throws BatchException {
- String putResponse = "--batch_123" + CRLF
- + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d" + CRLF
- + CRLF
- + "--changeset_12ks93js84d" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: 7bit" + CRLF // Content-Transfer-Encoding must be binary
- + CRLF
- + "HTTP/1.1 No Content" + CRLF
- + "DataServiceVersion: 2.0" + CRLF
- + CRLF
- + CRLF
- + "--changeset_12ks93js84d--" + CRLF
- + CRLF
- + "--batch_123--";
-
- parseInvalidBatchResponseBody(putResponse);
- }
-
- @Test(expected = BatchException.class)
- public void testMissingMimeHeader() throws BatchException {
- String putResponse = "--batch_123" + CRLF
- + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d" + CRLF
- + CRLF
- + "--changeset_12ks93js84d" + CRLF
- + CRLF
- + "HTTP/1.1 No Content" + CRLF
- + "DataServiceVersion: 2.0" + CRLF
- + CRLF
- + CRLF
- + "--changeset_12ks93js84d--" + CRLF
- + CRLF
- + "--batch_123--";
-
- parseInvalidBatchResponseBody(putResponse);
- }
-
- @Test(expected = BatchException.class)
- public void testInvalidContentType() throws BatchException {
- String putResponse = "--batch_123" + CRLF
- + "Content-Type: " + HttpContentType.MULTIPART_MIXED + CRLF // Missing boundary parameter
- + CRLF
- + "--changeset_12ks93js84d" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + CRLF
- + "HTTP/1.1 No Content" + CRLF
- + "DataServiceVersion: 2.0" + CRLF
- + CRLF
- + CRLF
- + "--changeset_12ks93js84d--" + CRLF
- + CRLF
- + "--batch_123--";
-
- parseInvalidBatchResponseBody(putResponse);
- }
-
- @Test(expected = BatchException.class)
- public void testInvalidStatusLine() throws BatchException {
- String putResponse = "--batch_123" + CRLF
- + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d" + CRLF
- + CRLF
- + "--changeset_12ks93js84d" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + CRLF
- + "HTTP/1.1 No Content" + CRLF
- + "DataServiceVersion: 2.0" + CRLF
- + CRLF
- + CRLF
- + "--changeset_12ks93js84d--" + CRLF
- + CRLF
- + "--batch_123--";
-
- parseInvalidBatchResponseBody(putResponse);
-
- }
-
- @Test(expected = BatchException.class)
- public void testMissingCloseDelimiter() throws BatchException {
- String putResponse = "--batch_123" + CRLF
- + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d" + CRLF
- + CRLF
- + "--changeset_12ks93js84d" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + CRLF
- + "HTTP/1.1 204 No Content" + CRLF
- + "DataServiceVersion: 2.0" + CRLF
- + CRLF
- + CRLF
- + "--changeset_12ks93js84d--" + CRLF
- + CRLF;
-
- parseInvalidBatchResponseBody(putResponse);
-
- }
-
- @Test
- public void tooBigContentLegthDoesNotResultInException() throws BatchException {
- String getResponse = "--batch_123" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + "Content-ID: 1" + CRLF
- + CRLF
- + "HTTP/1.1 200 OK" + CRLF
- + "DataServiceVersion: 2.0" + CRLF
- + "Content-Type: text/plain;charset=utf-8" + CRLF
- + "Content-Length: 100" + CRLF
- + CRLF
- + "Frederic Fall" + CRLF
- + "--batch_123--";
-
- InputStream in = new ByteArrayInputStream(getResponse.getBytes());
- List<BatchSingleResponse> batchResponse =
- EntityProvider.parseBatchResponse(in, "multipart/mixed;boundary=batch_123");
- BatchSingleResponse response = batchResponse.get(0);
- assertEquals("100", response.getHeader("Content-Length"));
- assertEquals("Frederic Fall", response.getBody());
- }
-
- @Test(expected = BatchException.class)
- public void testInvalidBoundary() throws BatchException {
- String getResponse = "--batch_321" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + "Content-ID: 1" + CRLF
- + CRLF
- + "HTTP/1.1 200 OK" + CRLF
- + "DataServiceVersion: 2.0" + CRLF
- + "Content-Type: text/plain;charset=utf-8" + CRLF
- + CRLF
- + "Frederic Fall" + CRLF
- + CRLF
- + "--batch_123--";
-
- parseInvalidBatchResponseBody(getResponse);
- }
-
- @Test
- public void boundaryInBodyMustBeIgnored() throws BatchException {
- String getResponse = "--batch_123" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + CRLF
- + "HTTP/1.1 200 OK" + CRLF
- + "Content-Type: text/plain;charset=utf-8" + CRLF
- + "Content-Length: 13" + CRLF
- + CRLF
- + "Frederic Fall" + CRLF
- + CRLF
- + "batch_123" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Transfer-Encoding: binary" + CRLF
- + CRLF
- + "HTTP/1.1 200 OK" + CRLF
- + "Content-Type: text/plain;charset=utf-8" + CRLF
- + CRLF
- + "Walter Winter" + CRLF
- + CRLF
- + "--batch_123--";
- InputStream in = new ByteArrayInputStream(getResponse.getBytes());
- List<BatchSingleResponse> batchResponse =
- EntityProvider.parseBatchResponse(in, "multipart/mixed;boundary=batch_123");
- BatchSingleResponse response = batchResponse.get(0);
- assertEquals("13", response.getHeader("Content-Length"));
- assertEquals("Frederic Fall", response.getBody());
- }
-
- @Test
- public void parseWithAdditionalLineEndingAtTheEnd() throws Exception {
- InputStream fileStream = getFileAsStream("BatchResponseWithAdditionalLineEnding.batch");
- String fileString = StringHelper.inputStreamToStringCRLFLineBreaks(fileStream);
- assertTrue(fileString.contains("\r\n--batch_123--"));
- InputStream stream = new ByteArrayInputStream(fileString.getBytes());
- BatchSingleResponse response =
- EntityProvider.parseBatchResponse(stream, "multipart/mixed;boundary=batch_123").get(0);
- assertEquals("This is the body we need to parse. The trailing line ending is part of the body." + CRLF, response
- .getBody());
-
- }
-
- @Test
- public void parseWithWindowsLineEndingsInBody() throws Exception {
- InputStream stream = getFileAsStream("BatchResponseWithLinesInBodyWin.batch");
- stream = StringHelper.toStream(stream).asStreamWithLineSeparation(CRLF);
- BatchSingleResponse response =
- EntityProvider.parseBatchResponse(stream, "multipart/mixed;boundary=batch_123").get(0);
- String body =
- "This is the body we need to parse. The line spaces in the body " + CRLF + CRLF + CRLF + "are " + CRLF + CRLF
- + "part of the body and must not be ignored or filtered.";
-
- assertEquals(body, response.getBody());
- }
-
- @Test
- public void parseWithUnixLineEndingsInBody() throws Exception {
- String body =
- "This is the body we need to parse. The line spaces in the body " + LF + LF + LF + "are " + LF + LF
- + "part of the body and must not be ignored or filtered.";
- String responseString = "--batch_123" + CRLF
- + "Content-Type: application/http" + CRLF
- + "Content-Length: 234" + CRLF
- + "content-transfer-encoding: binary" + CRLF
- + CRLF
- + "HTTP/1.1 500 Internal Server Error" + CRLF
- + "Content-Type: application/xml;charset=utf-8" + CRLF
- + "Content-Length: 125" + CRLF
- + CRLF
- + body
- + CRLF
- + "--batch_123--";
- InputStream stream = new ByteArrayInputStream(responseString.getBytes());
- BatchSingleResponse response =
- EntityProvider.parseBatchResponse(stream, "multipart/mixed;boundary=batch_123").get(0);
-
- assertEquals(body, response.getBody());
- }
-
- protected String readFile(final String filename) throws IOException {
- InputStream in = getFileAsStream(filename);
-
- byte[] tmp = new byte[8192];
- int count = in.read(tmp);
- StringBuilder b = new StringBuilder();
- while (count >= 0) {
- b.append(new String(tmp, 0, count));
- count = in.read(tmp);
+
+ @Test(expected = BatchException.class)
+ public void testInvalidStatusLine() throws BatchException {
+ String putResponse = "--batch_123" + CRLF + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d"
+ + CRLF + CRLF + "--changeset_12ks93js84d" + CRLF + "Content-Type: application/http" + CRLF
+ + "Content-Transfer-Encoding: binary" + CRLF + CRLF + "HTTP/1.1 No Content" + CRLF + "DataServiceVersion: 2.0" + CRLF + CRLF
+ + CRLF + "--changeset_12ks93js84d--" + CRLF + CRLF + "--batch_123--";
+
+ parseInvalidBatchResponseBody(putResponse);
+
}
- return b.toString();
- }
+ @Test(expected = BatchException.class)
+ public void testMissingCloseDelimiter() throws BatchException {
+ String putResponse = "--batch_123" + CRLF + "Content-Type: " + HttpContentType.MULTIPART_MIXED + ";boundary=changeset_12ks93js84d"
+ + CRLF + CRLF + "--changeset_12ks93js84d" + CRLF + "Content-Type: application/http" + CRLF
+ + "Content-Transfer-Encoding: binary" + CRLF + CRLF + "HTTP/1.1 204 No Content" + CRLF + "DataServiceVersion: 2.0" + CRLF
+ + CRLF + CRLF + "--changeset_12ks93js84d--" + CRLF + CRLF;
+
+ parseInvalidBatchResponseBody(putResponse);
+
+ }
+
+ @Test
+ public void tooBigContentLegthDoesNotResultInException() throws BatchException {
+ String getResponse = "--batch_123" + CRLF + "Content-Type: application/http" + CRLF + "Content-Transfer-Encoding: binary" + CRLF
+ + "Content-ID: 1" + CRLF + CRLF + "HTTP/1.1 200 OK" + CRLF + "DataServiceVersion: 2.0" + CRLF
+ + "Content-Type: text/plain;charset=utf-8" + CRLF + "Content-Length: 100" + CRLF + CRLF + "Frederic Fall" + CRLF
+ + "--batch_123--";
+
+ InputStream in = new ByteArrayInputStream(getResponse.getBytes());
+ List<BatchSingleResponse> batchResponse = EntityProvider.parseBatchResponse(in, "multipart/mixed;boundary=batch_123");
+ BatchSingleResponse response = batchResponse.get(0);
+ assertEquals("100", response.getHeader("Content-Length"));
+ assertEquals("Frederic Fall", response.getBody());
+ }
+
+ @Test(expected = BatchException.class)
+ public void testInvalidBoundary() throws BatchException {
+ String getResponse = "--batch_321" + CRLF + "Content-Type: application/http" + CRLF + "Content-Transfer-Encoding: binary" + CRLF
+ + "Content-ID: 1" + CRLF + CRLF + "HTTP/1.1 200 OK" + CRLF + "DataServiceVersion: 2.0" + CRLF
+ + "Content-Type: text/plain;charset=utf-8" + CRLF + CRLF + "Frederic Fall" + CRLF + CRLF + "--batch_123--";
+
+ parseInvalidBatchResponseBody(getResponse);
+ }
+
+ @Test
+ public void boundaryInBodyMustBeIgnored() throws BatchException {
+ String getResponse = "--batch_123" + CRLF + "Content-Type: application/http" + CRLF + "Content-Transfer-Encoding: binary" + CRLF
+ + CRLF + "HTTP/1.1 200 OK" + CRLF + "Content-Type: text/plain;charset=utf-8" + CRLF + "Content-Length: 13" + CRLF + CRLF
+ + "Frederic Fall" + CRLF + CRLF + "batch_123" + CRLF + "Content-Type: application/http" + CRLF
+ + "Content-Transfer-Encoding: binary" + CRLF + CRLF + "HTTP/1.1 200 OK" + CRLF + "Content-Type: text/plain;charset=utf-8"
+ + CRLF + CRLF + "Walter Winter" + CRLF + CRLF + "--batch_123--";
+ InputStream in = new ByteArrayInputStream(getResponse.getBytes());
+ List<BatchSingleResponse> batchResponse = EntityProvider.parseBatchResponse(in, "multipart/mixed;boundary=batch_123");
+ BatchSingleResponse response = batchResponse.get(0);
+ assertEquals("13", response.getHeader("Content-Length"));
+ assertEquals("Frederic Fall", response.getBody());
+ }
+
+ @Test
+ public void parseWithAdditionalLineEndingAtTheEnd() throws Exception {
+ InputStream fileStream = getFileAsStream("BatchResponseWithAdditionalLineEnding.batch");
+ String fileString = StringHelper.inputStreamToStringCRLFLineBreaks(fileStream);
+ assertTrue(fileString.contains("\r\n--batch_123--"));
+ InputStream stream = new ByteArrayInputStream(fileString.getBytes());
+ BatchSingleResponse response = EntityProvider.parseBatchResponse(stream, "multipart/mixed;boundary=batch_123")
+ .get(0);
+ assertEquals("This is the body we need to parse. The trailing line ending is part of the body." + CRLF, response.getBody());
+
+ }
+
+ @Test
+ public void parseWithWindowsLineEndingsInBody() throws Exception {
+ InputStream stream = getFileAsStream("BatchResponseWithLinesInBodyWin.batch");
+ stream = StringHelper.toStream(stream)
+ .asStreamWithLineSeparation(CRLF);
+ BatchSingleResponse response = EntityProvider.parseBatchResponse(stream, "multipart/mixed;boundary=batch_123")
+ .get(0);
+ String body = "This is the body we need to parse. The line spaces in the body " + CRLF + CRLF + CRLF + "are " + CRLF + CRLF
+ + "part of the body and must not be ignored or filtered.";
+
+ assertEquals(body, response.getBody());
+ }
+
+ @Test
+ public void parseWithUnixLineEndingsInBody() throws Exception {
+ String body = "This is the body we need to parse. The line spaces in the body " + LF + LF + LF + "are " + LF + LF
+ + "part of the body and must not be ignored or filtered.";
+ String responseString = "--batch_123" + CRLF + "Content-Type: application/http" + CRLF + "Content-Length: 234" + CRLF
+ + "content-transfer-encoding: binary" + CRLF + CRLF + "HTTP/1.1 500 Internal Server Error" + CRLF
+ + "Content-Type: application/xml;charset=utf-8" + CRLF + "Content-Length: 125" + CRLF + CRLF + body + CRLF
+ + "--batch_123--";
+ InputStream stream = new ByteArrayInputStream(responseString.getBytes());
+ BatchSingleResponse response = EntityProvider.parseBatchResponse(stream, "multipart/mixed;boundary=batch_123")
+ .get(0);
+
+ assertEquals(body, response.getBody());
+ }
+
+ protected String readFile(final String filename) throws IOException {
+ InputStream in = getFileAsStream(filename);
+
+ byte[] tmp = new byte[8192];
+ int count = in.read(tmp);
+ StringBuilder b = new StringBuilder();
+ while (count >= 0) {
+ b.append(new String(tmp, 0, count));
+ count = in.read(tmp);
+ }
+
+ return b.toString();
+ }
+
+ private InputStream getFileAsStream(final String filename) throws IOException {
+ InputStream in = Thread.currentThread()
+ .getContextClassLoader()
+ .getResourceAsStream(filename);
+ if (in == null) {
+ throw new IOException("Requested file '" + filename + "' was not found.");
+ }
+ return in;
+ }
- private InputStream getFileAsStream(final String filename) throws IOException {
- InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(filename);
- if (in == null) {
- throw new IOException("Requested file '" + filename + "' was not found.");
+ private void parseInvalidBatchResponseBody(final String putResponse) throws BatchException {
+ InputStream in = new ByteArrayInputStream(putResponse.getBytes());
+ BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
+ parser.parseBatchResponse(in);
}
- return in;
- }
-
- private void parseInvalidBatchResponseBody(final String putResponse) throws BatchException {
- InputStream in = new ByteArrayInputStream(putResponse.getBytes());
- BatchParser parser = new BatchParser("multipart/mixed;boundary=batch_123", true);
- parser.parseBatchResponse(in);
- }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseTest.java
index 8369f8fb..3f9c20e2 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchResponseTest.java
@@ -1,35 +1,28 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.batch;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertArrayEquals;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.olingo.odata2.api.batch.BatchException;
import org.apache.olingo.odata2.api.batch.BatchResponsePart;
import org.apache.olingo.odata2.api.client.batch.BatchSingleResponse;
@@ -43,207 +36,234 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.junit.Test;
/**
- * Test creation of a batch response with BatchResponseWriter and
- * then parsing this response again with BatchResponseParser.
+ * Test creation of a batch response with BatchResponseWriter and then parsing this response again
+ * with BatchResponseParser.
*/
public class BatchResponseTest {
- @Test
- public void testBatchResponse() throws BatchException, IOException {
- List<BatchResponsePart> parts = new ArrayList<BatchResponsePart>();
- ODataResponse response = ODataResponse.entity("Walter Winter")
- .status(HttpStatusCodes.OK)
- .contentHeader("application/json")
- .build();
- List<ODataResponse> responses = new ArrayList<ODataResponse>(1);
- responses.add(response);
- parts.add(BatchResponsePart.responses(responses).changeSet(false).build());
-
- ODataResponse changeSetResponse = ODataResponse.status(HttpStatusCodes.NO_CONTENT).build();
- responses = new ArrayList<ODataResponse>(1);
- responses.add(changeSetResponse);
- parts.add(BatchResponsePart.responses(responses).changeSet(true).build());
-
- BatchResponseWriter writer = new BatchResponseWriter();
- ODataResponse batchResponse = writer.writeResponse(parts);
-
- assertEquals(202, batchResponse.getStatus().getStatusCode());
- assertNotNull(batchResponse.getEntity());
- String body = (String) batchResponse.getEntity();
-
- assertTrue(body.contains("--batch"));
- assertTrue(body.contains("--changeset"));
- assertTrue(body.contains("HTTP/1.1 200 OK"));
- assertTrue(body.contains("Content-Type: application/http"));
- assertTrue(body.contains("Content-Transfer-Encoding: binary"));
- assertTrue(body.contains("Walter Winter"));
- assertTrue(body.contains("multipart/mixed; boundary=changeset"));
- assertTrue(body.contains("HTTP/1.1 204 No Content"));
-
- String contentHeader = batchResponse.getContentHeader();
- BatchParser parser = new BatchParser(contentHeader, true);
- List<BatchSingleResponse> result = parser.parseBatchResponse(new ByteArrayInputStream(body.getBytes()));
- assertEquals(2, result.size());
- }
-
- @Test
- public void testChangeSetResponse() throws BatchException, IOException {
- List<BatchResponsePart> parts = new ArrayList<BatchResponsePart>();
- ODataResponse changeSetResponse = ODataResponse.status(HttpStatusCodes.NO_CONTENT).build();
- List<ODataResponse> responses = new ArrayList<ODataResponse>(1);
- responses.add(changeSetResponse);
- parts.add(BatchResponsePart.responses(responses).changeSet(true).build());
-
- BatchResponseWriter writer = new BatchResponseWriter();
- ODataResponse batchResponse = writer.writeResponse(parts);
-
- assertEquals(202, batchResponse.getStatus().getStatusCode());
- assertNotNull(batchResponse.getEntity());
- String body = (String) batchResponse.getEntity();
- assertTrue(body.contains("--batch"));
- assertTrue(body.contains("--changeset"));
- assertTrue(body.indexOf("--changeset") != body.lastIndexOf("--changeset"));
- assertFalse(body.contains("HTTP/1.1 200 OK" + "\r\n"));
- assertTrue(body.contains("Content-Type: application/http" + "\r\n"));
- assertTrue(body.contains("Content-Transfer-Encoding: binary" + "\r\n"));
- assertTrue(body.contains("HTTP/1.1 204 No Content" + "\r\n"));
- assertTrue(body.contains("Content-Type: multipart/mixed; boundary=changeset"));
-
- String contentHeader = batchResponse.getContentHeader();
- BatchParser parser = new BatchParser(contentHeader, true);
- List<BatchSingleResponse> result = parser.parseBatchResponse(new ByteArrayInputStream(body.getBytes()));
- assertEquals(1, result.size());
- }
-
- @Test
- public void testTwoChangeSetResponse() throws BatchException, IOException {
- List<BatchResponsePart> parts = new ArrayList<BatchResponsePart>();
- ODataResponse changeSetResponse = ODataResponse.status(HttpStatusCodes.NO_CONTENT).build();
- ODataResponse changeSetResponseTwo = ODataResponse.status(HttpStatusCodes.NO_CONTENT).build();
- List<ODataResponse> responses = new ArrayList<ODataResponse>(1);
- responses.add(changeSetResponse);
- responses.add(changeSetResponseTwo);
- parts.add(BatchResponsePart.responses(responses).changeSet(true).build());
-
- BatchResponseWriter writer = new BatchResponseWriter();
- ODataResponse batchResponse = writer.writeResponse(parts);
-
- assertEquals(202, batchResponse.getStatus().getStatusCode());
- assertNotNull(batchResponse.getEntity());
- String body = (String) batchResponse.getEntity();
- assertTrue(body.contains("--batch"));
- assertTrue(body.contains("--changeset"));
- assertTrue(body.indexOf("--changeset") != body.lastIndexOf("--changeset"));
- assertFalse(body.contains("HTTP/1.1 200 OK" + "\r\n"));
- assertTrue(body.contains("Content-Type: application/http" + "\r\n"));
- assertTrue(body.contains("Content-Transfer-Encoding: binary" + "\r\n"));
- assertTrue(body.contains("HTTP/1.1 204 No Content" + "\r\n"));
- assertTrue(body.contains("Content-Type: multipart/mixed; boundary=changeset"));
-
- String contentHeader = batchResponse.getContentHeader();
- BatchParser parser = new BatchParser(contentHeader, true);
- StringHelper.Stream content = StringHelper.toStream(body);
- List<BatchSingleResponse> result = parser.parseBatchResponse(content.asStream());
- assertEquals(2, result.size());
- assertEquals("Failing content:\n" + content.asString(), 19, content.linesCount());
- }
-
- @Test
- public void testBatchResponseRawBytes() throws BatchException, IOException {
- List<BatchResponsePart> parts = new ArrayList<BatchResponsePart>();
- byte[] data = getRawBytes();
- ODataResponse response = ODataResponse.entity(data)
- .status(HttpStatusCodes.OK)
- .contentHeader("application/octect-stream;charset=iso-8859-1")
- .build();
- List<ODataResponse> responses = new ArrayList<ODataResponse>(1);
- responses.add(response);
- parts.add(BatchResponsePart.responses(responses).changeSet(false).build());
-
- BatchResponseWriter writer = new BatchResponseWriter();
- ODataResponse batchResponse = writer.writeResponse(parts);
-
- assertEquals(202, batchResponse.getStatus().getStatusCode());
- assertNotNull(batchResponse.getEntity());
- String body = (String) batchResponse.getEntity();
-
- assertTrue(body.contains("--batch"));
- assertTrue(body.contains("HTTP/1.1 200 OK"));
- assertTrue(body.contains("Content-Type: application/http"));
- assertTrue(body.contains("Content-Transfer-Encoding: binary"));
-
- String contentHeader = batchResponse.getContentHeader();
- BatchParser parser = new BatchParser(contentHeader, true);
- List<BatchSingleResponse> result = parser.parseBatchResponse(new ByteArrayInputStream(body.getBytes("iso-8859-1")));
- assertEquals(1, result.size());
- assertArrayEquals(data, result.get(0).getBody().getBytes("ISO-8859-1"));
- }
-
- @Test
- public void testBatchResponseRawBytesAsStream() throws IOException, ODataException {
- List<BatchResponsePart> parts = new ArrayList<BatchResponsePart>();
- byte[] data = getRawBytes();
- ODataResponse response = ODataResponse.entity(data)
- .status(HttpStatusCodes.OK)
- .contentHeader("application/octect-stream;charset=iso-8859-1")
- .build();
- List<ODataResponse> responses = new ArrayList<ODataResponse>(1);
- responses.add(response);
- parts.add(BatchResponsePart.responses(responses).changeSet(false).build());
-
- BatchResponseWriter writer = new BatchResponseWriter(true);
- ODataResponse batchResponse = writer.writeResponse(parts);
-
- assertEquals(202, batchResponse.getStatus().getStatusCode());
- assertNotNull(batchResponse.getEntity());
- BatchLineReader reader =
- new BatchLineReader(batchResponse.getEntityAsStream());
- List<Line> lines = reader.toLineList();
- reader.close();
- StringBuilder builder = new StringBuilder();
- for (Line line : lines) {
- builder.append(line);
+ @Test
+ public void testBatchResponse() throws BatchException, IOException {
+ List<BatchResponsePart> parts = new ArrayList<BatchResponsePart>();
+ ODataResponse response = ODataResponse.entity("Walter Winter")
+ .status(HttpStatusCodes.OK)
+ .contentHeader("application/json")
+ .build();
+ List<ODataResponse> responses = new ArrayList<ODataResponse>(1);
+ responses.add(response);
+ parts.add(BatchResponsePart.responses(responses)
+ .changeSet(false)
+ .build());
+
+ ODataResponse changeSetResponse = ODataResponse.status(HttpStatusCodes.NO_CONTENT)
+ .build();
+ responses = new ArrayList<ODataResponse>(1);
+ responses.add(changeSetResponse);
+ parts.add(BatchResponsePart.responses(responses)
+ .changeSet(true)
+ .build());
+
+ BatchResponseWriter writer = new BatchResponseWriter();
+ ODataResponse batchResponse = writer.writeResponse(parts);
+
+ assertEquals(202, batchResponse.getStatus()
+ .getStatusCode());
+ assertNotNull(batchResponse.getEntity());
+ String body = (String) batchResponse.getEntity();
+
+ assertTrue(body.contains("--batch"));
+ assertTrue(body.contains("--changeset"));
+ assertTrue(body.contains("HTTP/1.1 200 OK"));
+ assertTrue(body.contains("Content-Type: application/http"));
+ assertTrue(body.contains("Content-Transfer-Encoding: binary"));
+ assertTrue(body.contains("Walter Winter"));
+ assertTrue(body.contains("multipart/mixed; boundary=changeset"));
+ assertTrue(body.contains("HTTP/1.1 204 No Content"));
+
+ String contentHeader = batchResponse.getContentHeader();
+ BatchParser parser = new BatchParser(contentHeader, true);
+ List<BatchSingleResponse> result = parser.parseBatchResponse(new ByteArrayInputStream(body.getBytes()));
+ assertEquals(2, result.size());
+ }
+
+ @Test
+ public void testChangeSetResponse() throws BatchException, IOException {
+ List<BatchResponsePart> parts = new ArrayList<BatchResponsePart>();
+ ODataResponse changeSetResponse = ODataResponse.status(HttpStatusCodes.NO_CONTENT)
+ .build();
+ List<ODataResponse> responses = new ArrayList<ODataResponse>(1);
+ responses.add(changeSetResponse);
+ parts.add(BatchResponsePart.responses(responses)
+ .changeSet(true)
+ .build());
+
+ BatchResponseWriter writer = new BatchResponseWriter();
+ ODataResponse batchResponse = writer.writeResponse(parts);
+
+ assertEquals(202, batchResponse.getStatus()
+ .getStatusCode());
+ assertNotNull(batchResponse.getEntity());
+ String body = (String) batchResponse.getEntity();
+ assertTrue(body.contains("--batch"));
+ assertTrue(body.contains("--changeset"));
+ assertTrue(body.indexOf("--changeset") != body.lastIndexOf("--changeset"));
+ assertFalse(body.contains("HTTP/1.1 200 OK" + "\r\n"));
+ assertTrue(body.contains("Content-Type: application/http" + "\r\n"));
+ assertTrue(body.contains("Content-Transfer-Encoding: binary" + "\r\n"));
+ assertTrue(body.contains("HTTP/1.1 204 No Content" + "\r\n"));
+ assertTrue(body.contains("Content-Type: multipart/mixed; boundary=changeset"));
+
+ String contentHeader = batchResponse.getContentHeader();
+ BatchParser parser = new BatchParser(contentHeader, true);
+ List<BatchSingleResponse> result = parser.parseBatchResponse(new ByteArrayInputStream(body.getBytes()));
+ assertEquals(1, result.size());
+ }
+
+ @Test
+ public void testTwoChangeSetResponse() throws BatchException, IOException {
+ List<BatchResponsePart> parts = new ArrayList<BatchResponsePart>();
+ ODataResponse changeSetResponse = ODataResponse.status(HttpStatusCodes.NO_CONTENT)
+ .build();
+ ODataResponse changeSetResponseTwo = ODataResponse.status(HttpStatusCodes.NO_CONTENT)
+ .build();
+ List<ODataResponse> responses = new ArrayList<ODataResponse>(1);
+ responses.add(changeSetResponse);
+ responses.add(changeSetResponseTwo);
+ parts.add(BatchResponsePart.responses(responses)
+ .changeSet(true)
+ .build());
+
+ BatchResponseWriter writer = new BatchResponseWriter();
+ ODataResponse batchResponse = writer.writeResponse(parts);
+
+ assertEquals(202, batchResponse.getStatus()
+ .getStatusCode());
+ assertNotNull(batchResponse.getEntity());
+ String body = (String) batchResponse.getEntity();
+ assertTrue(body.contains("--batch"));
+ assertTrue(body.contains("--changeset"));
+ assertTrue(body.indexOf("--changeset") != body.lastIndexOf("--changeset"));
+ assertFalse(body.contains("HTTP/1.1 200 OK" + "\r\n"));
+ assertTrue(body.contains("Content-Type: application/http" + "\r\n"));
+ assertTrue(body.contains("Content-Transfer-Encoding: binary" + "\r\n"));
+ assertTrue(body.contains("HTTP/1.1 204 No Content" + "\r\n"));
+ assertTrue(body.contains("Content-Type: multipart/mixed; boundary=changeset"));
+
+ String contentHeader = batchResponse.getContentHeader();
+ BatchParser parser = new BatchParser(contentHeader, true);
+ StringHelper.Stream content = StringHelper.toStream(body);
+ List<BatchSingleResponse> result = parser.parseBatchResponse(content.asStream());
+ assertEquals(2, result.size());
+ assertEquals("Failing content:\n" + content.asString(), 19, content.linesCount());
}
- String contentHeader = batchResponse.getContentHeader();
- BatchParser parser = new BatchParser(contentHeader, true);
- List<BatchSingleResponse> result = parser.parseBatchResponse(
- new ByteArrayInputStream(builder.toString().getBytes("iso-8859-1")));
- assertEquals(1, result.size());
- assertArrayEquals(data, result.get(0).getBody().getBytes("ISO-8859-1"));
- }
-
- private byte[] getRawBytes() {
- byte[] data = new byte[Byte.MAX_VALUE - Byte.MIN_VALUE + 1];
- // binary content, not a valid UTF-8 representation of a string
- for (int i = Byte.MIN_VALUE; i <= Byte.MAX_VALUE; i++) {
- data[i - Byte.MIN_VALUE] = (byte) i;
+
+ @Test
+ public void testBatchResponseRawBytes() throws BatchException, IOException {
+ List<BatchResponsePart> parts = new ArrayList<BatchResponsePart>();
+ byte[] data = getRawBytes();
+ ODataResponse response = ODataResponse.entity(data)
+ .status(HttpStatusCodes.OK)
+ .contentHeader("application/octect-stream;charset=iso-8859-1")
+ .build();
+ List<ODataResponse> responses = new ArrayList<ODataResponse>(1);
+ responses.add(response);
+ parts.add(BatchResponsePart.responses(responses)
+ .changeSet(false)
+ .build());
+
+ BatchResponseWriter writer = new BatchResponseWriter();
+ ODataResponse batchResponse = writer.writeResponse(parts);
+
+ assertEquals(202, batchResponse.getStatus()
+ .getStatusCode());
+ assertNotNull(batchResponse.getEntity());
+ String body = (String) batchResponse.getEntity();
+
+ assertTrue(body.contains("--batch"));
+ assertTrue(body.contains("HTTP/1.1 200 OK"));
+ assertTrue(body.contains("Content-Type: application/http"));
+ assertTrue(body.contains("Content-Transfer-Encoding: binary"));
+
+ String contentHeader = batchResponse.getContentHeader();
+ BatchParser parser = new BatchParser(contentHeader, true);
+ List<BatchSingleResponse> result = parser.parseBatchResponse(new ByteArrayInputStream(body.getBytes("iso-8859-1")));
+ assertEquals(1, result.size());
+ assertArrayEquals(data, result.get(0)
+ .getBody()
+ .getBytes("ISO-8859-1"));
+ }
+
+ @Test
+ public void testBatchResponseRawBytesAsStream() throws IOException, ODataException {
+ List<BatchResponsePart> parts = new ArrayList<BatchResponsePart>();
+ byte[] data = getRawBytes();
+ ODataResponse response = ODataResponse.entity(data)
+ .status(HttpStatusCodes.OK)
+ .contentHeader("application/octect-stream;charset=iso-8859-1")
+ .build();
+ List<ODataResponse> responses = new ArrayList<ODataResponse>(1);
+ responses.add(response);
+ parts.add(BatchResponsePart.responses(responses)
+ .changeSet(false)
+ .build());
+
+ BatchResponseWriter writer = new BatchResponseWriter(true);
+ ODataResponse batchResponse = writer.writeResponse(parts);
+
+ assertEquals(202, batchResponse.getStatus()
+ .getStatusCode());
+ assertNotNull(batchResponse.getEntity());
+ BatchLineReader reader = new BatchLineReader(batchResponse.getEntityAsStream());
+ List<Line> lines = reader.toLineList();
+ reader.close();
+ StringBuilder builder = new StringBuilder();
+ for (Line line : lines) {
+ builder.append(line);
+ }
+ String contentHeader = batchResponse.getContentHeader();
+ BatchParser parser = new BatchParser(contentHeader, true);
+ List<BatchSingleResponse> result = parser.parseBatchResponse(new ByteArrayInputStream(builder.toString()
+ .getBytes("iso-8859-1")));
+ assertEquals(1, result.size());
+ assertArrayEquals(data, result.get(0)
+ .getBody()
+ .getBytes("ISO-8859-1"));
+ }
+
+ private byte[] getRawBytes() {
+ byte[] data = new byte[Byte.MAX_VALUE - Byte.MIN_VALUE + 1];
+ // binary content, not a valid UTF-8 representation of a string
+ for (int i = Byte.MIN_VALUE; i <= Byte.MAX_VALUE; i++) {
+ data[i - Byte.MIN_VALUE] = (byte) i;
+ }
+ return data;
+ }
+
+ @Test
+ public void testissueWithHeaderHavingUmlautChars() throws BatchException, IOException {
+ List<BatchResponsePart> parts = new ArrayList<BatchResponsePart>();
+ String headerValue = "<notification xmlns:ns=\"http://namespace\">"
+ + "<code>TEST_MSG/004</code><message>Team ID 'XXX_E'äöü Ö is not in the defined range."
+ + "</message><target>Team_Identifier</target><severity>error</severity><details><detail>"
+ + "<code>TEST_MSG/010</code><message>"
+ + "This is a message text of a business exception raised by the provider.</message><target>"
+ + "</target><severity>warning</severity></detail></details></notification>";
+ ODataResponse response = ODataResponse.entity("Walter Winter")
+ .status(HttpStatusCodes.OK)
+ .header("message", headerValue)
+ .contentHeader("application/xml")
+ .build();
+ List<ODataResponse> responses = new ArrayList<ODataResponse>(1);
+ responses.add(response);
+ parts.add(BatchResponsePart.responses(responses)
+ .changeSet(false)
+ .build());
+
+ BatchResponseWriter writer = new BatchResponseWriter();
+ ODataResponse batchResponse = writer.writeResponse(parts);
+
+ assertNotNull(batchResponse.getEntity());
+ assertTrue(batchResponse.getEntity()
+ .toString()
+ .contains("Team ID 'XXX_E'äöü Ö is not in the defined range."));
}
- return data;
- }
-
- @Test
- public void testissueWithHeaderHavingUmlautChars() throws BatchException, IOException {
- List<BatchResponsePart> parts = new ArrayList<BatchResponsePart>();
- String headerValue = "<notification xmlns:ns=\"http://namespace\">"
- + "<code>TEST_MSG/004</code><message>Team ID 'XXX_E'äöü Ö is not in the defined range."
- + "</message><target>Team_Identifier</target><severity>error</severity><details><detail>"
- + "<code>TEST_MSG/010</code><message>"
- + "This is a message text of a business exception raised by the provider.</message><target>"
- + "</target><severity>warning</severity></detail></details></notification>";
- ODataResponse response = ODataResponse.entity("Walter Winter")
- .status(HttpStatusCodes.OK)
- .header("message", headerValue)
- .contentHeader("application/xml")
- .build();
- List<ODataResponse> responses = new ArrayList<ODataResponse>(1);
- responses.add(response);
- parts.add(BatchResponsePart.responses(responses).changeSet(false).build());
-
- BatchResponseWriter writer = new BatchResponseWriter();
- ODataResponse batchResponse = writer.writeResponse(parts);
-
- assertNotNull(batchResponse.getEntity());
- assertTrue(batchResponse.getEntity().toString().
- contains("Team ID 'XXX_E'äöü Ö is not in the defined range."));
- }
-}
\ No newline at end of file
+}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java
index 8caa15ba..b623dbfd 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.ep.consumer;
@@ -23,14 +19,11 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
import java.io.IOException;
import java.io.InputStream;
-
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-
import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.edm.EdmEntitySetInfo;
import org.apache.olingo.odata2.api.ep.EntityProviderException;
@@ -46,235 +39,321 @@ import org.junit.Test;
public class AtomServiceDocumentConsumerTest extends AbstractXmlConsumerTest {
- public AtomServiceDocumentConsumerTest(final StreamWriterImplType type) {
- super(type);
- }
+ public AtomServiceDocumentConsumerTest(final StreamWriterImplType type) {
+ super(type);
+ }
- private static final String NAMESPACE = "http://www.foo.bar/Data";
- private static final String PREFIX = "foo";
+ private static final String NAMESPACE = "http://www.foo.bar/Data";
+ private static final String PREFIX = "foo";
- @Test
- public void checkDecodingOfEntitySetNames() throws Exception {
- AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
- ServiceDocument svcDocument = svcDocumentParser.readServiceDokument(createStreamReader("/serviceDocument.xml"));
- assertNotNull(svcDocument);
-
- EdmEntitySetInfo edmEntitySetInfo = svcDocument.getEntitySetsInfo().get(6);
- assertEquals(":EncodedName", edmEntitySetInfo.getEntitySetName());
- assertEquals("%3AEncodedName", edmEntitySetInfo.getEntitySetUri().toASCIIString());
- }
-
- @Test
- public void testServiceDocument() throws IOException, EntityProviderException {
- AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
- ServiceDocument svcDocument = svcDocumentParser.readServiceDokument(createStreamReader("/svcExample.xml"));
- assertNotNull(svcDocument);
- AtomInfo atomInfo = svcDocument.getAtomInfo();
- assertNotNull(atomInfo);
- assertNotNull(atomInfo.getWorkspaces());
- for (Workspace workspace : atomInfo.getWorkspaces()) {
- assertEquals("Data", workspace.getTitle().getText());
- assertEquals(10, workspace.getCollections().size());
- for (Collection collection : workspace.getCollections()) {
- assertNotNull(collection.getHref());
- if ("TypeOneEntityCollection".equals(collection.getHref())) {
- assertEquals("TypeOneEntityCollection", collection.getTitle().getText());
- assertFalse(collection.getCommonAttributes().getAttributes().isEmpty());
- assertEquals("content-version", collection.getCommonAttributes().getAttributes().get(0).getName());
- assertEquals(NAMESPACE, collection.getCommonAttributes().getAttributes().get(0).getNamespace());
- assertEquals(PREFIX, collection.getCommonAttributes().getAttributes().get(0).getPrefix());
- assertEquals("1", collection.getCommonAttributes().getAttributes().get(0).getText());
- assertFalse(collection.getExtesionElements().isEmpty());
- for (ExtensionElement extElement : collection.getExtesionElements()) {
- assertEquals(PREFIX, extElement.getPrefix());
- assertEquals("member-title", extElement.getName());
- assertEquals(NAMESPACE, extElement.getNamespace());
- }
- }
- }
+ @Test
+ public void checkDecodingOfEntitySetNames() throws Exception {
+ AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
+ ServiceDocument svcDocument = svcDocumentParser.readServiceDokument(createStreamReader("/serviceDocument.xml"));
+ assertNotNull(svcDocument);
+
+ EdmEntitySetInfo edmEntitySetInfo = svcDocument.getEntitySetsInfo()
+ .get(6);
+ assertEquals(":EncodedName", edmEntitySetInfo.getEntitySetName());
+ assertEquals("%3AEncodedName", edmEntitySetInfo.getEntitySetUri()
+ .toASCIIString());
}
- }
- @Test
- public void testExtensionsWithAttributes() throws IOException, EntityProviderException {
- AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
- ServiceDocument svcDocument = svcDocumentParser.readServiceDokument(createStreamReader("/svcExample.xml"));
- assertNotNull(svcDocument);
- AtomInfo atomInfo = svcDocument.getAtomInfo();
- assertNotNull(atomInfo);
- assertNotNull(atomInfo.getExtesionElements());
- assertEquals(2, atomInfo.getExtesionElements().size());
- for (ExtensionElement extElement : atomInfo.getExtesionElements()) {
- assertEquals("link", extElement.getName());
- assertEquals("atom", extElement.getPrefix());
- assertEquals(2, extElement.getAttributes().size());
- assertEquals("rel", extElement.getAttributes().get(0).getName());
- assertEquals("http://localhost/odata/TEST_APPLICATION/", extElement.getAttributes().get(1).getText());
- assertEquals("href", extElement.getAttributes().get(1).getName());
+ @Test
+ public void testServiceDocument() throws IOException, EntityProviderException {
+ AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
+ ServiceDocument svcDocument = svcDocumentParser.readServiceDokument(createStreamReader("/svcExample.xml"));
+ assertNotNull(svcDocument);
+ AtomInfo atomInfo = svcDocument.getAtomInfo();
+ assertNotNull(atomInfo);
+ assertNotNull(atomInfo.getWorkspaces());
+ for (Workspace workspace : atomInfo.getWorkspaces()) {
+ assertEquals("Data", workspace.getTitle()
+ .getText());
+ assertEquals(10, workspace.getCollections()
+ .size());
+ for (Collection collection : workspace.getCollections()) {
+ assertNotNull(collection.getHref());
+ if ("TypeOneEntityCollection".equals(collection.getHref())) {
+ assertEquals("TypeOneEntityCollection", collection.getTitle()
+ .getText());
+ assertFalse(collection.getCommonAttributes()
+ .getAttributes()
+ .isEmpty());
+ assertEquals("content-version", collection.getCommonAttributes()
+ .getAttributes()
+ .get(0)
+ .getName());
+ assertEquals(NAMESPACE, collection.getCommonAttributes()
+ .getAttributes()
+ .get(0)
+ .getNamespace());
+ assertEquals(PREFIX, collection.getCommonAttributes()
+ .getAttributes()
+ .get(0)
+ .getPrefix());
+ assertEquals("1", collection.getCommonAttributes()
+ .getAttributes()
+ .get(0)
+ .getText());
+ assertFalse(collection.getExtesionElements()
+ .isEmpty());
+ for (ExtensionElement extElement : collection.getExtesionElements()) {
+ assertEquals(PREFIX, extElement.getPrefix());
+ assertEquals("member-title", extElement.getName());
+ assertEquals(NAMESPACE, extElement.getNamespace());
+ }
+ }
+ }
+ }
}
- }
+ @Test
+ public void testExtensionsWithAttributes() throws IOException, EntityProviderException {
+ AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
+ ServiceDocument svcDocument = svcDocumentParser.readServiceDokument(createStreamReader("/svcExample.xml"));
+ assertNotNull(svcDocument);
+ AtomInfo atomInfo = svcDocument.getAtomInfo();
+ assertNotNull(atomInfo);
+ assertNotNull(atomInfo.getExtesionElements());
+ assertEquals(2, atomInfo.getExtesionElements()
+ .size());
+ for (ExtensionElement extElement : atomInfo.getExtesionElements()) {
+ assertEquals("link", extElement.getName());
+ assertEquals("atom", extElement.getPrefix());
+ assertEquals(2, extElement.getAttributes()
+ .size());
+ assertEquals("rel", extElement.getAttributes()
+ .get(0)
+ .getName());
+ assertEquals("http://localhost/odata/TEST_APPLICATION/", extElement.getAttributes()
+ .get(1)
+ .getText());
+ assertEquals("href", extElement.getAttributes()
+ .get(1)
+ .getName());
+ }
+
+ }
- @Test
- public void testServiceDocument2() throws IOException, EntityProviderException {
- AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
- ServiceDocument svcDocument = svcDocumentParser.readServiceDokument(createStreamReader("/svcAtomExample.xml"));
- assertNotNull(svcDocument);
- AtomInfo atomInfo = svcDocument.getAtomInfo();
- assertNotNull(atomInfo);
+ @Test
+ public void testServiceDocument2() throws IOException, EntityProviderException {
+ AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
+ ServiceDocument svcDocument = svcDocumentParser.readServiceDokument(createStreamReader("/svcAtomExample.xml"));
+ assertNotNull(svcDocument);
+ AtomInfo atomInfo = svcDocument.getAtomInfo();
+ assertNotNull(atomInfo);
- assertEquals(2, atomInfo.getWorkspaces().size());
+ assertEquals(2, atomInfo.getWorkspaces()
+ .size());
- Workspace workspace = atomInfo.getWorkspaces().get(0);
- assertEquals("Main Site", workspace.getTitle().getText());
- assertEquals(2, workspace.getCollections().size());
+ Workspace workspace = atomInfo.getWorkspaces()
+ .get(0);
+ assertEquals("Main Site", workspace.getTitle()
+ .getText());
+ assertEquals(2, workspace.getCollections()
+ .size());
- workspace = atomInfo.getWorkspaces().get(1);
- assertEquals("Sidebar Blog", workspace.getTitle().getText());
- assertEquals(1, workspace.getCollections().size());
- Collection collection = workspace.getCollections().get(0);
- assertEquals("Remaindered Links", collection.getTitle().getText());
+ workspace = atomInfo.getWorkspaces()
+ .get(1);
+ assertEquals("Sidebar Blog", workspace.getTitle()
+ .getText());
+ assertEquals(1, workspace.getCollections()
+ .size());
+ Collection collection = workspace.getCollections()
+ .get(0);
+ assertEquals("Remaindered Links", collection.getTitle()
+ .getText());
- assertEquals(1, collection.getAcceptElements().size());
- assertEquals("application/atom+xml;type=entry", collection.getAcceptElements().get(0).getValue());
+ assertEquals(1, collection.getAcceptElements()
+ .size());
+ assertEquals("application/atom+xml;type=entry", collection.getAcceptElements()
+ .get(0)
+ .getValue());
- }
+ }
- @Test
- public void testCategories() throws IOException, EntityProviderException {
- AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
- ServiceDocument svcDocument = svcDocumentParser.readServiceDokument(createStreamReader("/svcAtomExample.xml"));
- assertNotNull(svcDocument);
- AtomInfo atomInfo = svcDocument.getAtomInfo();
- assertNotNull(atomInfo);
+ @Test
+ public void testCategories() throws IOException, EntityProviderException {
+ AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
+ ServiceDocument svcDocument = svcDocumentParser.readServiceDokument(createStreamReader("/svcAtomExample.xml"));
+ assertNotNull(svcDocument);
+ AtomInfo atomInfo = svcDocument.getAtomInfo();
+ assertNotNull(atomInfo);
- assertEquals(2, atomInfo.getWorkspaces().size());
+ assertEquals(2, atomInfo.getWorkspaces()
+ .size());
- Workspace workspace = atomInfo.getWorkspaces().get(0);
- assertEquals(2, workspace.getCollections().size());
- for (Collection collection : workspace.getCollections()) {
- for (Categories categories : collection.getCategories()) {
- assertEquals("http://example.com/cats/forMain.cats", categories.getHref());
- }
- }
+ Workspace workspace = atomInfo.getWorkspaces()
+ .get(0);
+ assertEquals(2, workspace.getCollections()
+ .size());
+ for (Collection collection : workspace.getCollections()) {
+ for (Categories categories : collection.getCategories()) {
+ assertEquals("http://example.com/cats/forMain.cats", categories.getHref());
+ }
+ }
- workspace = atomInfo.getWorkspaces().get(1);
- for (Collection collection : workspace.getCollections()) {
- for (Categories categories : collection.getCategories()) {
- assertEquals(Fixed.YES, categories.getFixed());
- for (Category category : categories.getCategoryList()) {
- assertEquals("http://example.org/extra-cats/", category.getScheme());
+ workspace = atomInfo.getWorkspaces()
+ .get(1);
+ for (Collection collection : workspace.getCollections()) {
+ for (Categories categories : collection.getCategories()) {
+ assertEquals(Fixed.YES, categories.getFixed());
+ for (Category category : categories.getCategoryList()) {
+ assertEquals("http://example.org/extra-cats/", category.getScheme());
+ }
+ }
}
- }
- }
- }
+ }
- @Test
- public void testNestedExtensions() throws IOException, EntityProviderException {
- AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
- ServiceDocument svcDocument = svcDocumentParser.readServiceDokument(createStreamReader("/svcAtomExample.xml"));
- assertNotNull(svcDocument);
- AtomInfo atomInfo = svcDocument.getAtomInfo();
- assertNotNull(atomInfo);
- assertNotNull(atomInfo.getExtesionElements());
- for (ExtensionElement extElement : atomInfo.getExtesionElements()) {
- for (ExtensionElement nestedExtElement : extElement.getElements()) {
- if ("extension2".equals(nestedExtElement.getName())) {
- assertFalse(nestedExtElement.getAttributes().isEmpty());
- assertEquals("attributeValue", nestedExtElement.getAttributes().get(0).getText());
- assertEquals("attr", nestedExtElement.getAttributes().get(0).getName());
- } else if ("extension3".equals(nestedExtElement.getName())) {
- assertTrue(nestedExtElement.getAttributes().isEmpty());
- assertEquals("value", nestedExtElement.getText());
- } else if ("extension4".equals(nestedExtElement.getName())) {
- assertEquals("text", nestedExtElement.getText());
- assertFalse(nestedExtElement.getAttributes().isEmpty());
- assertEquals("attributeValue", nestedExtElement.getAttributes().get(0).getText());
- assertEquals("attr", nestedExtElement.getAttributes().get(0).getName());
- } else {
- fail();
+ @Test
+ public void testNestedExtensions() throws IOException, EntityProviderException {
+ AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
+ ServiceDocument svcDocument = svcDocumentParser.readServiceDokument(createStreamReader("/svcAtomExample.xml"));
+ assertNotNull(svcDocument);
+ AtomInfo atomInfo = svcDocument.getAtomInfo();
+ assertNotNull(atomInfo);
+ assertNotNull(atomInfo.getExtesionElements());
+ for (ExtensionElement extElement : atomInfo.getExtesionElements()) {
+ for (ExtensionElement nestedExtElement : extElement.getElements()) {
+ if ("extension2".equals(nestedExtElement.getName())) {
+ assertFalse(nestedExtElement.getAttributes()
+ .isEmpty());
+ assertEquals("attributeValue", nestedExtElement.getAttributes()
+ .get(0)
+ .getText());
+ assertEquals("attr", nestedExtElement.getAttributes()
+ .get(0)
+ .getName());
+ } else if ("extension3".equals(nestedExtElement.getName())) {
+ assertTrue(nestedExtElement.getAttributes()
+ .isEmpty());
+ assertEquals("value", nestedExtElement.getText());
+ } else if ("extension4".equals(nestedExtElement.getName())) {
+ assertEquals("text", nestedExtElement.getText());
+ assertFalse(nestedExtElement.getAttributes()
+ .isEmpty());
+ assertEquals("attributeValue", nestedExtElement.getAttributes()
+ .get(0)
+ .getText());
+ assertEquals("attr", nestedExtElement.getAttributes()
+ .get(0)
+ .getName());
+ } else {
+ fail();
+ }
+ }
}
- }
}
- }
- @Test(expected = EntityProviderException.class)
- public void testWithoutTitle() throws IOException, EntityProviderException {
- AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
- svcDocumentParser.readServiceDokument(createStreamReader("/svcDocWithoutTitle.xml"));
- }
+ @Test(expected = EntityProviderException.class)
+ public void testWithoutTitle() throws IOException, EntityProviderException {
+ AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
+ svcDocumentParser.readServiceDokument(createStreamReader("/svcDocWithoutTitle.xml"));
+ }
- @Test(expected = EntityProviderException.class)
- public void testSvcWithoutWorkspaces() throws IOException, EntityProviderException {
- AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
- svcDocumentParser.readServiceDokument(createStreamReader("/invalidSvcExample.xml"));
- }
+ @Test(expected = EntityProviderException.class)
+ public void testSvcWithoutWorkspaces() throws IOException, EntityProviderException {
+ AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
+ svcDocumentParser.readServiceDokument(createStreamReader("/invalidSvcExample.xml"));
+ }
- @Test
- public void testServiceDocument3() throws IOException, EntityProviderException {
- AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
- ServiceDocument svcDocument = svcDocumentParser.readServiceDokument(createStreamReader("/serviceDocExample.xml"));
- assertNotNull(svcDocument);
- AtomInfo atomInfo = svcDocument.getAtomInfo();
- assertNotNull(atomInfo);
- for (Workspace workspace : atomInfo.getWorkspaces()) {
- assertEquals("Data", workspace.getTitle().getText());
- assertEquals(9, workspace.getCollections().size());
- for (Collection collection : workspace.getCollections()) {
- assertNotNull(collection.getHref());
- if ("TravelagencyCollection".equals(collection.getHref())) {
- assertEquals("TravelagencyCollection", collection.getTitle().getText());
- assertEquals(2, collection.getCommonAttributes().getAttributes().size());
- assertEquals("content-version", collection.getCommonAttributes().getAttributes().get(1).getName());
- assertEquals(NAMESPACE, collection.getCommonAttributes().getAttributes().get(1).getNamespace());
- assertEquals(PREFIX, collection.getCommonAttributes().getAttributes().get(1).getPrefix());
- assertEquals("1", collection.getCommonAttributes().getAttributes().get(1).getText());
- assertFalse(collection.getExtesionElements().isEmpty());
- for (ExtensionElement extElement : collection.getExtesionElements()) {
- if ("member-title".equals(extElement.getName())) {
- assertEquals(PREFIX, extElement.getPrefix());
- assertEquals(NAMESPACE, extElement.getNamespace());
- assertEquals("Travelagency", extElement.getText());
- } else if ("collectionLayout".equals(extElement.getName())) {
- assertEquals("gp", extElement.getPrefix());
- assertEquals("http://www.foo.bar/Data/GP", extElement.getNamespace());
- assertNotNull(extElement.getAttributes());
- assertEquals(2, extElement.getAttributes().size());
- assertEquals("display-order", extElement.getAttributes().get(0).getName());
- assertEquals("0010", extElement.getAttributes().get(0).getText());
- assertEquals("top-level", extElement.getAttributes().get(1).getName());
- assertEquals("true", extElement.getAttributes().get(1).getText());
- } else if ("link".equals(extElement.getName())) {
- assertEquals(Edm.NAMESPACE_ATOM_2005, extElement.getNamespace());
- assertEquals(4, extElement.getAttributes().size());
- assertEquals("TravelagencyCollection/OpenSearchDescription.xml", extElement.getAttributes().get(0)
- .getText());
- assertEquals("href", extElement.getAttributes().get(0).getName());
- } else {
- fail();
+ @Test
+ public void testServiceDocument3() throws IOException, EntityProviderException {
+ AtomServiceDocumentConsumer svcDocumentParser = new AtomServiceDocumentConsumer();
+ ServiceDocument svcDocument = svcDocumentParser.readServiceDokument(createStreamReader("/serviceDocExample.xml"));
+ assertNotNull(svcDocument);
+ AtomInfo atomInfo = svcDocument.getAtomInfo();
+ assertNotNull(atomInfo);
+ for (Workspace workspace : atomInfo.getWorkspaces()) {
+ assertEquals("Data", workspace.getTitle()
+ .getText());
+ assertEquals(9, workspace.getCollections()
+ .size());
+ for (Collection collection : workspace.getCollections()) {
+ assertNotNull(collection.getHref());
+ if ("TravelagencyCollection".equals(collection.getHref())) {
+ assertEquals("TravelagencyCollection", collection.getTitle()
+ .getText());
+ assertEquals(2, collection.getCommonAttributes()
+ .getAttributes()
+ .size());
+ assertEquals("content-version", collection.getCommonAttributes()
+ .getAttributes()
+ .get(1)
+ .getName());
+ assertEquals(NAMESPACE, collection.getCommonAttributes()
+ .getAttributes()
+ .get(1)
+ .getNamespace());
+ assertEquals(PREFIX, collection.getCommonAttributes()
+ .getAttributes()
+ .get(1)
+ .getPrefix());
+ assertEquals("1", collection.getCommonAttributes()
+ .getAttributes()
+ .get(1)
+ .getText());
+ assertFalse(collection.getExtesionElements()
+ .isEmpty());
+ for (ExtensionElement extElement : collection.getExtesionElements()) {
+ if ("member-title".equals(extElement.getName())) {
+ assertEquals(PREFIX, extElement.getPrefix());
+ assertEquals(NAMESPACE, extElement.getNamespace());
+ assertEquals("Travelagency", extElement.getText());
+ } else if ("collectionLayout".equals(extElement.getName())) {
+ assertEquals("gp", extElement.getPrefix());
+ assertEquals("http://www.foo.bar/Data/GP", extElement.getNamespace());
+ assertNotNull(extElement.getAttributes());
+ assertEquals(2, extElement.getAttributes()
+ .size());
+ assertEquals("display-order", extElement.getAttributes()
+ .get(0)
+ .getName());
+ assertEquals("0010", extElement.getAttributes()
+ .get(0)
+ .getText());
+ assertEquals("top-level", extElement.getAttributes()
+ .get(1)
+ .getName());
+ assertEquals("true", extElement.getAttributes()
+ .get(1)
+ .getText());
+ } else if ("link".equals(extElement.getName())) {
+ assertEquals(Edm.NAMESPACE_ATOM_2005, extElement.getNamespace());
+ assertEquals(4, extElement.getAttributes()
+ .size());
+ assertEquals("TravelagencyCollection/OpenSearchDescription.xml", extElement.getAttributes()
+ .get(0)
+ .getText());
+ assertEquals("href", extElement.getAttributes()
+ .get(0)
+ .getName());
+ } else {
+ fail();
+ }
+ }
+ }
}
- }
}
- }
}
- }
- private XMLStreamReader createStreamReader(final String fileName) throws IOException, EntityProviderException {
- XMLInputFactory factory = XMLInputFactory.newInstance();
- factory.setProperty(XMLInputFactory.IS_VALIDATING, false);
- factory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
- InputStream in = ClassLoader.class.getResourceAsStream(fileName);
- if (in == null) {
- throw new IOException("Requested file '" + fileName + "' was not found.");
- }
- XMLStreamReader streamReader;
- try {
- streamReader = factory.createXMLStreamReader(in);
- } catch (XMLStreamException e) {
- throw new EntityProviderException(EntityProviderException.COMMON.addContent("Invalid Service Document"));
- }
+ private XMLStreamReader createStreamReader(final String fileName) throws IOException, EntityProviderException {
+ XMLInputFactory factory = XMLInputFactory.newInstance();
+ factory.setProperty(XMLInputFactory.IS_VALIDATING, false);
+ factory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
+ InputStream in = AtomServiceDocumentConsumerTest.class.getResourceAsStream(fileName);
+ if (in == null) {
+ throw new IOException("Requested file '" + fileName + "' was not found.");
+ }
+ XMLStreamReader streamReader;
+ try {
+ streamReader = factory.createXMLStreamReader(in);
+ } catch (XMLStreamException e) {
+ throw new EntityProviderException(EntityProviderException.COMMON.addContent("Invalid Service Document"));
+ }
- return streamReader;
- }
+ return streamReader;
+ }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumerTest.java
index 79317433..c7ccdadc 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumerTest.java
@@ -1,30 +1,24 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.ep.consumer;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-
import java.io.InputStream;
import java.util.List;
-
import org.apache.olingo.odata2.api.edm.EdmEntitySetInfo;
import org.apache.olingo.odata2.api.ep.EntityProviderException;
import org.apache.olingo.odata2.api.servicedocument.ServiceDocument;
@@ -32,48 +26,50 @@ import org.junit.Test;
public class JsonServiceDocumentConsumerTest {
- @Test
- public void test() throws EntityProviderException {
- JsonServiceDocumentConsumer parser = new JsonServiceDocumentConsumer();
- InputStream in = ClassLoader.class.getResourceAsStream("/svcDocJson.json");
- ServiceDocument serviceDoc = parser.parseJson(in);
- List<EdmEntitySetInfo> entitySetsInfo = serviceDoc.getEntitySetsInfo();
- assertNotNull(entitySetsInfo);
- assertEquals(7, entitySetsInfo.size());
- for (EdmEntitySetInfo entitySetInfo : entitySetsInfo) {
- if (!entitySetInfo.isDefaultEntityContainer()) {
- if ("Container2".equals(entitySetInfo.getEntityContainerName())) {
- assertEquals("Photos", entitySetInfo.getEntitySetName());
- } else if ("Container.Nr1".equals(entitySetInfo.getEntityContainerName())) {
- assertEquals("Employees", entitySetInfo.getEntitySetName());
- } else {
- fail();
+ @Test
+ public void test() throws EntityProviderException {
+ JsonServiceDocumentConsumer parser = new JsonServiceDocumentConsumer();
+ InputStream in = JsonServiceDocumentConsumerTest.class.getResourceAsStream("/svcDocJson.json");
+ ServiceDocument serviceDoc = parser.parseJson(in);
+ List<EdmEntitySetInfo> entitySetsInfo = serviceDoc.getEntitySetsInfo();
+ assertNotNull(entitySetsInfo);
+ assertEquals(7, entitySetsInfo.size());
+ for (EdmEntitySetInfo entitySetInfo : entitySetsInfo) {
+ if (!entitySetInfo.isDefaultEntityContainer()) {
+ if ("Container2".equals(entitySetInfo.getEntityContainerName())) {
+ assertEquals("Photos", entitySetInfo.getEntitySetName());
+ } else if ("Container.Nr1".equals(entitySetInfo.getEntityContainerName())) {
+ assertEquals("Employees", entitySetInfo.getEntitySetName());
+ } else {
+ fail();
+ }
+ }
}
- }
}
- }
-
- @Test
- public void checkDecodingOfEntitySetNames() throws Exception {
- JsonServiceDocumentConsumer parser = new JsonServiceDocumentConsumer();
- InputStream in = ClassLoader.class.getResourceAsStream("/svcDocJson.json");
- ServiceDocument serviceDoc = parser.parseJson(in);
- EdmEntitySetInfo entitySetInfo = serviceDoc.getEntitySetsInfo().get(6);
- assertEquals(":EncodedName", entitySetInfo.getEntitySetName());
- assertEquals("%3AEncodedName", entitySetInfo.getEntitySetUri().toASCIIString());
- }
- @Test(expected = EntityProviderException.class)
- public void testInvalidServiceDocument() throws EntityProviderException {
- JsonServiceDocumentConsumer parser = new JsonServiceDocumentConsumer();
- InputStream in = ClassLoader.class.getResourceAsStream("/invalidSvcDocJson.json");
- parser.parseJson(in);
- }
+ @Test
+ public void checkDecodingOfEntitySetNames() throws Exception {
+ JsonServiceDocumentConsumer parser = new JsonServiceDocumentConsumer();
+ InputStream in = JsonServiceDocumentConsumerTest.class.getResourceAsStream("/svcDocJson.json");
+ ServiceDocument serviceDoc = parser.parseJson(in);
+ EdmEntitySetInfo entitySetInfo = serviceDoc.getEntitySetsInfo()
+ .get(6);
+ assertEquals(":EncodedName", entitySetInfo.getEntitySetName());
+ assertEquals("%3AEncodedName", entitySetInfo.getEntitySetUri()
+ .toASCIIString());
+ }
+
+ @Test(expected = EntityProviderException.class)
+ public void testInvalidServiceDocument() throws EntityProviderException {
+ JsonServiceDocumentConsumer parser = new JsonServiceDocumentConsumer();
+ InputStream in = JsonServiceDocumentConsumerTest.class.getResourceAsStream("/invalidSvcDocJson.json");
+ parser.parseJson(in);
+ }
- @Test(expected = EntityProviderException.class)
- public void testServiceDocumentWithInvalidStructure() throws EntityProviderException {
- JsonServiceDocumentConsumer parser = new JsonServiceDocumentConsumer();
- InputStream in = ClassLoader.class.getResourceAsStream("/invalidSvcDocJson2.json");
- parser.parseJson(in);
- }
+ @Test(expected = EntityProviderException.class)
+ public void testServiceDocumentWithInvalidStructure() throws EntityProviderException {
+ JsonServiceDocumentConsumer parser = new JsonServiceDocumentConsumer();
+ InputStream in = JsonServiceDocumentConsumerTest.class.getResourceAsStream("/invalidSvcDocJson2.json");
+ parser.parseJson(in);
+ }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/ServiceDocumentConsumerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/ServiceDocumentConsumerTest.java
index 60d527f1..9410ffa6 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/ServiceDocumentConsumerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/ServiceDocumentConsumerTest.java
@@ -1,30 +1,24 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.ep.consumer;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-
import java.io.InputStream;
import java.util.List;
-
import org.apache.olingo.odata2.api.edm.EdmEntitySetInfo;
import org.apache.olingo.odata2.api.ep.EntityProvider;
import org.apache.olingo.odata2.api.ep.EntityProviderException;
@@ -38,79 +32,92 @@ import org.junit.Test;
public class ServiceDocumentConsumerTest extends BaseTest {
- @Test
- public void test() throws EntityProviderException {
- InputStream in = ClassLoader.class.getResourceAsStream("/svcExample.xml");
- assertNotNull(EntityProvider.readServiceDocument(in, "application/atom+xml"));
- }
-
- @Test
- public void testAtomServiceDocument() throws EntityProviderException {
- InputStream in = ClassLoader.class.getResourceAsStream("/svcExample.xml");
- ServiceDocument serviceDocument = EntityProvider.readServiceDocument(in, "application/atom+xml");
- assertNotNull(serviceDocument);
- AtomInfo atomInfo = serviceDocument.getAtomInfo();
- assertNotNull(atomInfo);
- for (Workspace workspace : atomInfo.getWorkspaces()) {
- assertEquals(10, workspace.getCollections().size());
- for (Collection collection : workspace.getCollections()) {
- assertNotNull(collection.getExtesionElements().get(0));
- assertEquals("member-title", collection.getExtesionElements().get(0).getName());
- assertEquals("foo", collection.getExtesionElements().get(0).getPrefix());
- }
+ @Test
+ public void test() throws EntityProviderException {
+ InputStream in = ServiceDocumentConsumerTest.class.getResourceAsStream("/svcExample.xml");
+ assertNotNull(EntityProvider.readServiceDocument(in, "application/atom+xml"));
}
- for (ExtensionElement extElement : atomInfo.getExtesionElements()) {
- assertEquals(2, extElement.getAttributes().size());
+
+ @Test
+ public void testAtomServiceDocument() throws EntityProviderException {
+ InputStream in = ServiceDocumentConsumerTest.class.getResourceAsStream("/svcExample.xml");
+ ServiceDocument serviceDocument = EntityProvider.readServiceDocument(in, "application/atom+xml");
+ assertNotNull(serviceDocument);
+ AtomInfo atomInfo = serviceDocument.getAtomInfo();
+ assertNotNull(atomInfo);
+ for (Workspace workspace : atomInfo.getWorkspaces()) {
+ assertEquals(10, workspace.getCollections()
+ .size());
+ for (Collection collection : workspace.getCollections()) {
+ assertNotNull(collection.getExtesionElements()
+ .get(0));
+ assertEquals("member-title", collection.getExtesionElements()
+ .get(0)
+ .getName());
+ assertEquals("foo", collection.getExtesionElements()
+ .get(0)
+ .getPrefix());
+ }
+ }
+ for (ExtensionElement extElement : atomInfo.getExtesionElements()) {
+ assertEquals(2, extElement.getAttributes()
+ .size());
+ }
}
- }
- @Test
- public void testJson() throws EntityProviderException {
- InputStream in = ClassLoader.class.getResourceAsStream("/svcDocJson.json");
- assertNotNull(EntityProvider.readServiceDocument(in, "application/json"));
- }
+ @Test
+ public void testJson() throws EntityProviderException {
+ InputStream in = ServiceDocumentConsumerTest.class.getResourceAsStream("/svcDocJson.json");
+ assertNotNull(EntityProvider.readServiceDocument(in, "application/json"));
+ }
- @Test(expected = EntityProviderException.class)
- public void testInvalidInputStream() throws EntityProviderException {
- InputStream in = ClassLoader.class.getResourceAsStream("/svcDocJson.json");
- EntityProvider.readServiceDocument(in, "application/atom+xml");
- }
+ @Test(expected = EntityProviderException.class)
+ public void testInvalidInputStream() throws EntityProviderException {
+ InputStream in = ServiceDocumentConsumerTest.class.getResourceAsStream("/svcDocJson.json");
+ EntityProvider.readServiceDocument(in, "application/atom+xml");
+ }
- @Test
- public void testJsonServiceDocument() throws EntityProviderException {
- InputStream in = ClassLoader.class.getResourceAsStream("/svcDocJson.json");
- ServiceDocument serviceDoc = EntityProvider.readServiceDocument(in, "application/json");
- assertNotNull(serviceDoc);
- assertNull(serviceDoc.getAtomInfo());
- List<EdmEntitySetInfo> entitySetsInfo = serviceDoc.getEntitySetsInfo();
- assertEquals(7, entitySetsInfo.size());
- for (EdmEntitySetInfo entitySetInfo : entitySetsInfo) {
- if (!entitySetInfo.isDefaultEntityContainer()) {
- if ("Container2".equals(entitySetInfo.getEntityContainerName())) {
- assertEquals("Photos", entitySetInfo.getEntitySetName());
- } else if ("Container.Nr1".equals(entitySetInfo.getEntityContainerName())) {
- assertEquals("Employees", entitySetInfo.getEntitySetName());
+ @Test
+ public void testJsonServiceDocument() throws EntityProviderException {
+ InputStream in = ServiceDocumentConsumerTest.class.getResourceAsStream("/svcDocJson.json");
+ ServiceDocument serviceDoc = EntityProvider.readServiceDocument(in, "application/json");
+ assertNotNull(serviceDoc);
+ assertNull(serviceDoc.getAtomInfo());
+ List<EdmEntitySetInfo> entitySetsInfo = serviceDoc.getEntitySetsInfo();
+ assertEquals(7, entitySetsInfo.size());
+ for (EdmEntitySetInfo entitySetInfo : entitySetsInfo) {
+ if (!entitySetInfo.isDefaultEntityContainer()) {
+ if ("Container2".equals(entitySetInfo.getEntityContainerName())) {
+ assertEquals("Photos", entitySetInfo.getEntitySetName());
+ } else if ("Container.Nr1".equals(entitySetInfo.getEntityContainerName())) {
+ assertEquals("Employees", entitySetInfo.getEntitySetName());
+ }
+ }
}
- }
}
- }
- @Test
- public void testCompareJsonWithAtom() throws EntityProviderException {
- InputStream inputJson = ClassLoader.class.getResourceAsStream("/svcDocJson.json");
- ServiceDocument serviceDocJson = EntityProvider.readServiceDocument(inputJson, "application/json");
- assertNotNull(serviceDocJson);
- List<EdmEntitySetInfo> entitySetsInfoJson = serviceDocJson.getEntitySetsInfo();
+ @Test
+ public void testCompareJsonWithAtom() throws EntityProviderException {
+ InputStream inputJson = ServiceDocumentConsumerTest.class.getResourceAsStream("/svcDocJson.json");
+ ServiceDocument serviceDocJson = EntityProvider.readServiceDocument(inputJson, "application/json");
+ assertNotNull(serviceDocJson);
+ List<EdmEntitySetInfo> entitySetsInfoJson = serviceDocJson.getEntitySetsInfo();
- InputStream inputAtom = ClassLoader.class.getResourceAsStream("/serviceDocument.xml");
- ServiceDocument serviceDocAtom = EntityProvider.readServiceDocument(inputAtom, "application/atom+xml");
- assertNotNull(serviceDocAtom);
- List<EdmEntitySetInfo> entitySetsInfoAtom = serviceDocAtom.getEntitySetsInfo();
+ InputStream inputAtom = ServiceDocumentConsumerTest.class.getResourceAsStream("/serviceDocument.xml");
+ ServiceDocument serviceDocAtom = EntityProvider.readServiceDocument(inputAtom, "application/atom+xml");
+ assertNotNull(serviceDocAtom);
+ List<EdmEntitySetInfo> entitySetsInfoAtom = serviceDocAtom.getEntitySetsInfo();
- assertEquals(entitySetsInfoJson.size(), entitySetsInfoAtom.size());
- for (int i = 0; i < entitySetsInfoJson.size(); i++) {
- assertEquals(entitySetsInfoJson.get(i).getEntitySetName(), entitySetsInfoAtom.get(i).getEntitySetName());
- assertEquals(entitySetsInfoJson.get(i).getEntitySetUri(), entitySetsInfoAtom.get(i).getEntitySetUri());
+ assertEquals(entitySetsInfoJson.size(), entitySetsInfoAtom.size());
+ for (int i = 0; i < entitySetsInfoJson.size(); i++) {
+ assertEquals(entitySetsInfoJson.get(i)
+ .getEntitySetName(),
+ entitySetsInfoAtom.get(i)
+ .getEntitySetName());
+ assertEquals(entitySetsInfoJson.get(i)
+ .getEntitySetUri(),
+ entitySetsInfoAtom.get(i)
+ .getEntitySetUri());
+ }
}
- }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
index 7e13ff2d..aecaf53a 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.uri.expression;
@@ -41,572 +37,666 @@ import org.apache.olingo.odata2.core.edm.Uint7;
import org.junit.Test;
/**
- *
- * Differences to ABAP Parser
- * - for $orderBy it the sortorder (asc/desc) not case insensitive anymore, so ASC/DESC is not allowed
- *
+ *
+ * Differences to ABAP Parser - for $orderBy it the sortorder (asc/desc) not case insensitive
+ * anymore, so ASC/DESC is not allowed
+ *
*/
public class TestAbapCompatibility extends TestBase {
- @Test
- public void nullTests() {
+ @Test
+ public void nullTests() {
+
+ // unary negate/not
+
+ GetPTF(" - null").aSerialized("{- null}")
+ .aEdmType(EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Null));
+ GetPTF("not null").aSerialized("{not null}")
+ .aEdmType(EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Null));
+
+ // binary add/sub
+ GetPTF("-1 add null").aSerialized("{-1 add null}")
+ .aEdmType(EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.SByte));
+ GetPTF("null add -1").aSerialized("{null add -1}")
+ .aEdmType(EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.SByte));
+
+ GetPTF("130 add null").aSerialized("{130 add null}")
+ .aEdmType(EdmByte.getInstance());
+ GetPTF("null add 130").aSerialized("{null add 130}")
+ .aEdmType(EdmByte.getInstance());
+
+ GetPTF("12345 add null").aSerialized("{12345 add null}")
+ .aEdmType(EdmInt16.getInstance());
+ GetPTF("null add 12345").aSerialized("{null add 12345}")
+ .aEdmType(EdmInt16.getInstance());
+
+ GetPTF("1234512345 add null").aSerialized("{1234512345 add null}")
+ .aEdmType(EdmInt32.getInstance());
+ GetPTF("null add 1234512345").aSerialized("{null add 1234512345}")
+ .aEdmType(EdmInt32.getInstance());
+
+ GetPTF("12345L add null").aSerialized("{12345L add null}")
+ .aEdmType(EdmInt64.getInstance());
+ GetPTF("null add 12345L").aSerialized("{null add 12345L}")
+ .aEdmType(EdmInt64.getInstance());
+
+ GetPTF("1.1F add null").aSerialized("{1.1F add null}")
+ .aEdmType(EdmSingle.getInstance());
+ GetPTF("null add 1.1F").aSerialized("{null add 1.1F}")
+ .aEdmType(EdmSingle.getInstance());
+
+ GetPTF("1.1D add null").aSerialized("{1.1D add null}")
+ .aEdmType(EdmDouble.getInstance());
+ GetPTF("null add 1.1D").aSerialized("{null add 1.1D}")
+ .aEdmType(EdmDouble.getInstance());
+
+ GetPTF("1.1M add null").aSerialized("{1.1M add null}")
+ .aEdmType(EdmDecimal.getInstance());
+ GetPTF("null add 1.1M").aSerialized("{null add 1.1M}")
+ .aEdmType(EdmDecimal.getInstance());
+
+ // binary mul/div/mod
+
+ GetPTF("-1 mul null").aSerialized("{-1 mul null}")
+ .aEdmType(EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.SByte));
+ GetPTF("null mul -1").aSerialized("{null mul -1}")
+ .aEdmType(EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.SByte));
+
+ GetPTF("130 mul null").aSerialized("{130 mul null}")
+ .aEdmType(EdmByte.getInstance());
+ GetPTF("null mul 130").aSerialized("{null mul 130}")
+ .aEdmType(EdmByte.getInstance());
+
+ GetPTF("12345 mul null").aSerialized("{12345 mul null}")
+ .aEdmType(EdmInt16.getInstance());
+ GetPTF("null mul 12345").aSerialized("{null mul 12345}")
+ .aEdmType(EdmInt16.getInstance());
+
+ GetPTF("1234512345 mul null").aSerialized("{1234512345 mul null}")
+ .aEdmType(EdmInt32.getInstance());
+ GetPTF("null mul 1234512345").aSerialized("{null mul 1234512345}")
+ .aEdmType(EdmInt32.getInstance());
+
+ GetPTF("12345L mul null").aSerialized("{12345L mul null}")
+ .aEdmType(EdmInt64.getInstance());
+ GetPTF("null mul 12345L").aSerialized("{null mul 12345L}")
+ .aEdmType(EdmInt64.getInstance());
+
+ GetPTF("1.1F mul null").aSerialized("{1.1F mul null}")
+ .aEdmType(EdmSingle.getInstance());
+ GetPTF("null mul 1.1F").aSerialized("{null mul 1.1F}")
+ .aEdmType(EdmSingle.getInstance());
+
+ GetPTF("1.1D mul null").aSerialized("{1.1D mul null}")
+ .aEdmType(EdmDouble.getInstance());
+ GetPTF("null mul 1.1D").aSerialized("{null mul 1.1D}")
+ .aEdmType(EdmDouble.getInstance());
+
+ GetPTF("1.1M mul null").aSerialized("{1.1M mul null}")
+ .aEdmType(EdmDecimal.getInstance());
+ GetPTF("null mul 1.1M").aSerialized("{null mul 1.1M}")
+ .aEdmType(EdmDecimal.getInstance());
+
+ // relational gt/ge/lt/le
+
+ GetPTF("'TEST' gt null").aSerialized("{'TEST' gt null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null gt 'TEST'").aSerialized("{null gt 'TEST'}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("time'PT19H02M01S' gt null").aSerialized("{time'PT19H02M01S' gt null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null gt time'PT19H02M01S'").aSerialized("{null gt time'PT19H02M01S'}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("datetime'2011-07-31T23:30:59' gt null").aSerialized("{datetime'2011-07-31T23:30:59' gt null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null gt datetime'2011-07-31T23:30:59'").aSerialized("{null gt datetime'2011-07-31T23:30:59'}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("datetimeoffset'2002-10-10T12:00:00-05:00' gt null").aSerialized("{datetimeoffset'2002-10-10T12:00:00-05:00' gt null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null gt datetimeoffset'2002-10-10T12:00:00-05:00'").aSerialized("{null gt datetimeoffset'2002-10-10T12:00:00-05:00'}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("guid'12345678-1234-1234-1234-123456789012' gt null").aSerialized("{guid'12345678-1234-1234-1234-123456789012' gt null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null gt guid'12345678-1234-1234-1234-123456789012'").aSerialized("{null gt guid'12345678-1234-1234-1234-123456789012'}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("-1 gt null").aSerialized("{-1 gt null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null gt -1").aSerialized("{null gt -1}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("130 gt null").aSerialized("{130 gt null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null gt 130").aSerialized("{null gt 130}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("12345 gt null").aSerialized("{12345 gt null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null gt 12345").aSerialized("{null gt 12345}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("1234512345 gt null").aSerialized("{1234512345 gt null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null gt 1234512345").aSerialized("{null gt 1234512345}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("12345L gt null").aSerialized("{12345L gt null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null gt 12345L").aSerialized("{null gt 12345L}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("1.1F gt null").aSerialized("{1.1F gt null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null gt 1.1F").aSerialized("{null gt 1.1F}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("1.1D gt null").aSerialized("{1.1D gt null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null gt 1.1D").aSerialized("{null gt 1.1D}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("1.1M gt null").aSerialized("{1.1M gt null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null gt 1.1M").aSerialized("{null gt 1.1M}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("X'1234567890ABCDEF' gt null").aSerialized("{X'1234567890ABCDEF' gt null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null gt X'1234567890ABCDEF'").aSerialized("{null gt X'1234567890ABCDEF'}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ // equlity eq/ne
+
+ GetPTF("'TEST' eq null").aSerialized("{'TEST' eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq 'TEST'").aSerialized("{null eq 'TEST'}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("time'PT19H02M01S' eq null").aSerialized("{time'PT19H02M01S' eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq time'PT19H02M01S'").aSerialized("{null eq time'PT19H02M01S'}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("datetime'2011-07-31T23:30:59' eq null").aSerialized("{datetime'2011-07-31T23:30:59' eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq datetime'2011-07-31T23:30:59'").aSerialized("{null eq datetime'2011-07-31T23:30:59'}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("datetimeoffset'2002-10-10T12:00:00-05:00' eq null").aSerialized("{datetimeoffset'2002-10-10T12:00:00-05:00' eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq datetimeoffset'2002-10-10T12:00:00-05:00'").aSerialized("{null eq datetimeoffset'2002-10-10T12:00:00-05:00'}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("guid'12345678-1234-1234-1234-123456789012' eq null").aSerialized("{guid'12345678-1234-1234-1234-123456789012' eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq guid'12345678-1234-1234-1234-123456789012'").aSerialized("{null eq guid'12345678-1234-1234-1234-123456789012'}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("-1 eq null").aSerialized("{-1 eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq -1").aSerialized("{null eq -1}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("130 eq null").aSerialized("{130 eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq 130").aSerialized("{null eq 130}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("12345 eq null").aSerialized("{12345 eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq 12345").aSerialized("{null eq 12345}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("1234512345 eq null").aSerialized("{1234512345 eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq 1234512345").aSerialized("{null eq 1234512345}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("12345L eq null").aSerialized("{12345L eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq 12345L").aSerialized("{null eq 12345L}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("1.1F eq null").aSerialized("{1.1F eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq 1.1F").aSerialized("{null eq 1.1F}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("1.1D eq null").aSerialized("{1.1D eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq 1.1D").aSerialized("{null eq 1.1D}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("1.1M eq null").aSerialized("{1.1M eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq 1.1M").aSerialized("{null eq 1.1M}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("X'1234567890ABCDEF' eq null").aSerialized("{X'1234567890ABCDEF' eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq X'1234567890ABCDEF'").aSerialized("{null eq X'1234567890ABCDEF'}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("true eq null").aSerialized("{true eq null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null eq true").aSerialized("{null eq true}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ // logical and/or
+ GetPTF("true and null").aSerialized("{true and null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null and true").aSerialized("{null and true}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ GetPTF("true or null").aSerialized("{true or null}")
+ .aEdmType(EdmBoolean.getInstance());
+ GetPTF("null or true").aSerialized("{null or true}")
+ .aEdmType(EdmBoolean.getInstance());
+
+ }
+
+ @Test
+ public void abapTestParameterPromotion() // copy of ABAP method test_parameter_promotion
+ {
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>binary( ).
+ // lcl_helper=>veri_type( iv_expression = `X'1234567890ABCDEF'` io_expected_type = lo_simple_type ).
+ GetPTF("X'1234567890ABCDEF'").aEdmType(EdmBinary.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
+ // lcl_helper=>veri_type( iv_expression = `true` io_expected_type = lo_simple_type ).
+ GetPTF("true").aEdmType(EdmBoolean.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'Bit' ).
+ // lcl_helper=>veri_type( iv_expression = `1` io_expected_type = lo_simple_type ).
+ GetPTF("1").aEdmType(Bit.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'Bit' ).
+ // lcl_helper=>veri_type( iv_expression = `0` io_expected_type = lo_simple_type ).
+ GetPTF("0").aEdmType(Bit.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'UInt7' ).
+ // /lcl_helper=>veri_type( iv_expression = `123` io_expected_type = lo_simple_type ).
+ GetPTF("123").aEdmType(Uint7.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>byte( ).
+ // lcl_helper=>veri_type( iv_expression = `130` io_expected_type = lo_simple_type ).
+ GetPTF("130").aEdmType(EdmByte.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>datetime( ).
+ // lcl_helper=>veri_type( iv_expression = `datetime'2011-07-31T23:30:59'` io_expected_type =
+ // lo_simple_type ).
+ GetPTF("datetime'2011-07-31T23:30:59'").aEdmType(EdmDateTime.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>datetimeoffset( ).
+ // lcl_helper=>veri_type( iv_expression = `datetimeoffset'2002-10-10T12:00:00-05:00'`
+ // io_expected_type =
+ // lo_simple_type ).
+ GetPTF("datetimeoffset'2002-10-10T12:00:00-05:00'").aEdmType(EdmDateTimeOffset.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>decimal( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1M` io_expected_type = lo_simple_type ).
+ GetPTF("1.1M").aEdmType(EdmDecimal.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1D` io_expected_type = lo_simple_type ).
+ GetPTF("1.1D").aEdmType(EdmDouble.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1E+02D` io_expected_type = lo_simple_type ).
+ GetPTF("1.1E+02D").aEdmType(EdmDouble.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>guid( ).
+ // lcl_helper=>veri_type( iv_expression = `guid'12345678-1234-1234-1234-123456789012'`
+ // io_expected_type =
+ // lo_simple_type ).
+ GetPTF("guid'12345678-1234-1234-1234-123456789012'").aEdmType(EdmGuid.getInstance());
+
+ // -->FLOAT not available on OData library for JAVA
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>float( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1F` io_expected_type = lo_simple_type ).
+ // GetPTF("1.1F").aEdmType(EdmFloat.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int16( ).
+ // lcl_helper=>veri_type( iv_expression = `12345` io_expected_type = lo_simple_type ).
+ GetPTF("12345").aEdmType(EdmInt16.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `1234512345` io_expected_type = lo_simple_type ).
+ GetPTF("1234512345").aEdmType(EdmInt32.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int64( ).
+ // lcl_helper=>veri_type( iv_expression = `12345L` io_expected_type = lo_simple_type ).
+ GetPTF("12345L").aEdmType(EdmInt64.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>sbyte( ).
+ // lcl_helper=>veri_type( iv_expression = `-12` io_expected_type = lo_simple_type ).
+ GetPTF("-12").aEdmType(EdmSByte.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>single( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1F` io_expected_type = lo_simple_type ).
+ GetPTF("1.1F").aEdmType(EdmSingle.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>string( ).
+ // lcl_helper=>veri_type( iv_expression = `'TEST'` io_expected_type = lo_simple_type ).
+ GetPTF("'TEST'").aEdmType(EdmString.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>time( ).
+ // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D'` io_expected_type = lo_simple_type ).
+ GetPTF("time'PT19H02M01S'").aEdmType(EdmTime.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>time( ).
+ // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01DT23H14M33S'` io_expected_type =
+ // lo_simple_type ).
+ GetPTF("time'PT23H14M33S'").aEdmType(EdmTime.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
+ // lcl_helper=>veri_type( iv_expression = `1.1D add 1` io_expected_type = lo_simple_type ).
+ GetPTF("1.1D add 1").aEdmType(EdmDouble.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
+ // lcl_helper=>veri_type( iv_expression = `1 add 1.1D` io_expected_type = lo_simple_type ).
+ GetPTF("1 add 1.1D").aEdmType(EdmDouble.getInstance());
+
+ // "lcl_helper=>veri_type( iv_expression = `null` io_expected_type =
+ // /IWCOR/cl_DS_edm_simple_type=>null( ) ).
+ GetPTF("null").aEdmType(EdmNull.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
+ // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D' eq time'P1998Y02M01D'`
+ // io_expected_type =
+ // lo_simple_type ).
+ GetPTF("time'PT19H02M01S' eq time'PT19H02M01S'").aEdmType(EdmBoolean.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
+ // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D' lt time'P1998Y02M01D'`
+ // io_expected_type =
+ // lo_simple_type ).
+ GetPTF("time'PT19H02M01S' lt time'PT19H02M01S'").aEdmType(EdmBoolean.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `hour(datetime'2011-07-31T23:30:59')` io_expected_type =
+ // lo_simple_type ).
+ GetPTF("hour(datetime'2011-07-31T23:30:59')").aEdmType(EdmInt32.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `minute(datetime'2011-07-31T23:30:59')` io_expected_type =
+ // lo_simple_type
+ // ).
+ GetPTF("minute(datetime'2011-07-31T23:30:59')").aEdmType(EdmInt32.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `second(datetime'2011-07-31T23:30:59')` io_expected_type =
+ // lo_simple_type
+ // ).
+ GetPTF("second(datetime'2011-07-31T23:30:59')").aEdmType(EdmInt32.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `hour(time'P1998Y02M01D')` io_expected_type =
+ // lo_simple_type ).
+ GetPTF("hour(time'PT19H02M01S')").aEdmType(EdmInt32.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `minute(time'P1998Y02M01D')` io_expected_type =
+ // lo_simple_type ).
+ GetPTF("minute(time'PT19H02M01S')").aEdmType(EdmInt32.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `second(time'P1998Y02M01D')` io_expected_type =
+ // lo_simple_type ).
+ GetPTF("second(time'PT19H02M01S')").aEdmType(EdmInt32.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `hour(datetimeoffset'2002-10-10T12:00:00-05:00')`
+ // io_expected_type =
+ // lo_simple_type ).
+ GetPTF("hour(datetimeoffset'2002-10-10T12:00:00-05:00')").aEdmType(EdmInt32.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `minute(datetimeoffset'2002-10-10T12:00:00-05:00')`
+ // io_expected_type =
+ // lo_simple_type ).
+ GetPTF("minute(datetimeoffset'2002-10-10T12:00:00-05:00')").aEdmType(EdmInt32.getInstance());
+
+ // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
+ // lcl_helper=>veri_type( iv_expression = `second(datetimeoffset'2002-10-10T12:00:00-05:00')`
+ // io_expected_type =
+ // lo_simple_type ).
+ GetPTF("second(datetimeoffset'2002-10-10T12:00:00-05:00')").aEdmType(EdmInt32.getInstance());
+
+ GetPTF("replace('aBa','B','CCC')").aEdmType(EdmString.getInstance());
+ }
+
+ @Test
+ public void abapTestOrderByParser() // copy of ABAP method test_orderby_parser
+ {
+ // lcl_helper=>veri_orderby( iv_expression = 'a' iv_expected = '{oc({o(a asc)})}' ). "default return
+ // lower asc
+ GetPTO("a").aSerialized("{oc({o(a, asc)})}");
+
+ // lcl_helper=>veri_orderby( iv_expression = 'a,b' iv_expected = '{oc({o(a asc)},{o(b asc)})}' ).
+ GetPTO("a,b").aSerialized("{oc({o(a, asc)},{o(b, asc)})}");
- // unary negate/not
+ // lcl_helper=>veri_orderby( iv_expression = 'a,b,c' iv_expected = '{oc({o(a asc)},{o(b asc)},{o(c
+ // asc)})}' ).
+ GetPTO("a,b,c").aSerialized("{oc({o(a, asc)},{o(b, asc)},{o(c, asc)})}");
- GetPTF(" - null").aSerialized("{- null}").aEdmType(
- EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Null));
- GetPTF("not null").aSerialized("{not null}").aEdmType(
- EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.Null));
+ // see comment of class
+ // //lcl_helper=>veri_orderby( iv_expression = 'a ASC' iv_expected = '{oc({o(a asc)})}' ).
+ // GetPTO("a ASC").aSerialized("{oc({o(a, asc)})}");
- // binary add/sub
- GetPTF("-1 add null").aSerialized("{-1 add null}").aEdmType(
- EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.SByte));
- GetPTF("null add -1").aSerialized("{null add -1}").aEdmType(
- EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.SByte));
+ // lcl_helper=>veri_orderby( iv_expression = 'a asc' iv_expected = '{oc({o(a asc)})}' ).
+ GetPTO("a asc").aSerialized("{oc({o(a, asc)})}");
- GetPTF("130 add null").aSerialized("{130 add null}").aEdmType(EdmByte.getInstance());
- GetPTF("null add 130").aSerialized("{null add 130}").aEdmType(EdmByte.getInstance());
+ // lcl_helper=>veri_orderby( iv_expression = 'a DESC' iv_expected = '{oc({o(a desc)})}' ).
+ // -->GetPTO("a DESC").aSerialized("{oc({o(a, desc)})}");
- GetPTF("12345 add null").aSerialized("{12345 add null}").aEdmType(EdmInt16.getInstance());
- GetPTF("null add 12345").aSerialized("{null add 12345}").aEdmType(EdmInt16.getInstance());
+ // see comment of class (case sensitive)
+ // //lcl_helper=>veri_orderby( iv_expression = 'a DESC,b DESC'
+ // // iv_expected = '{oc({o(a desc)},{o(b desc)})}' ).
+ // GetPTO("a DESC,b DESC").aSerialized("{oc({o(a, desc)},{o(b, desc)})}");
- GetPTF("1234512345 add null").aSerialized("{1234512345 add null}").aEdmType(EdmInt32.getInstance());
- GetPTF("null add 1234512345").aSerialized("{null add 1234512345}").aEdmType(EdmInt32.getInstance());
+ // see comment of class (case sensitive)
+ // //lcl_helper=>veri_orderby( iv_expression = 'a ASC, b DESC'
+ // // iv_expected = '{oc({o(a asc)},{o(b desc)})}' ).
+ // GetPTO("a ASC, b DESC").aSerialized("{oc({o(a, asc)},{o(b, desc)})}");
- GetPTF("12345L add null").aSerialized("{12345L add null}").aEdmType(EdmInt64.getInstance());
- GetPTF("null add 12345L").aSerialized("{null add 12345L}").aEdmType(EdmInt64.getInstance());
+ // see comment of class (case sensitive)
+ // //lcl_helper=>veri_orderby( iv_expression = '2 mul 6 eq 12 DESC'
+ // // iv_expected = '{oc({o({{2 mul 6} eq 12} desc)})}' ).
+ // GetPTO("2 mul 6 eq 12 DESC").aSerialized("{oc({o({{2 mul 6} eq 12}, desc)})}");
- GetPTF("1.1F add null").aSerialized("{1.1F add null}").aEdmType(EdmSingle.getInstance());
- GetPTF("null add 1.1F").aSerialized("{null add 1.1F}").aEdmType(EdmSingle.getInstance());
+ // lcl_helper=>veri_orderby( iv_expression = `concat( 'Start_' , starttime ) desc`
+ // iv_expected = `{oc({o({concat(Start_,starttime)} desc)})}` ).
+ GetPTO("concat( 'Start_' , starttime ) desc").aSerialized("{oc({o({concat('Start_',starttime)}, desc)})}");
- GetPTF("1.1D add null").aSerialized("{1.1D add null}").aEdmType(EdmDouble.getInstance());
- GetPTF("null add 1.1D").aSerialized("{null add 1.1D}").aEdmType(EdmDouble.getInstance());
+ }
- GetPTF("1.1M add null").aSerialized("{1.1M add null}").aEdmType(EdmDecimal.getInstance());
- GetPTF("null add 1.1M").aSerialized("{null add 1.1M}").aEdmType(EdmDecimal.getInstance());
+ @Test
+ public void abapTestFilterParser() { // copy of ABAP method test_filter_parser
+ // lcl_helper=>veri_expression( iv_expression = 'W/X' iv_expected = '{W/X}' ).
+ GetPTF("W/X").aSerialized("{W/X}");
- // binary mul/div/mod
+ // lcl_helper=>veri_expression( iv_expression = 'W/X eq TEST' iv_expected = '{{W/X} eq TEST}' ).
+ GetPTF("W/X eq TEST").aSerialized("{{W/X} eq TEST}");
- GetPTF("-1 mul null").aSerialized("{-1 mul null}").aEdmType(
- EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.SByte));
- GetPTF("null mul -1").aSerialized("{null mul -1}").aEdmType(
- EdmSimpleTypeFacadeImpl.getEdmSimpleType(EdmSimpleTypeKind.SByte));
+ // lcl_helper=>veri_expression( iv_expression = 'ABC eq W/X eq TEST' iv_expected = '{{ABC eq {W/X}}
+ // eq TEST}' ).
+ GetPTF("ABC eq W/X eq TEST").aSerialized("{{ABC eq {W/X}} eq TEST}");
- GetPTF("130 mul null").aSerialized("{130 mul null}").aEdmType(EdmByte.getInstance());
- GetPTF("null mul 130").aSerialized("{null mul 130}").aEdmType(EdmByte.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'ABC eq W / X eq TEST' iv_expected = '{{ABC eq
+ // {W/X}} eq TEST}' ).
+ GetPTF("ABC eq W / X eq TEST").aSerialized("{{ABC eq {W/X}} eq TEST}");
- GetPTF("12345 mul null").aSerialized("{12345 mul null}").aEdmType(EdmInt16.getInstance());
- GetPTF("null mul 12345").aSerialized("{null mul 12345}").aEdmType(EdmInt16.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'W/X/Y/Z' iv_expected = '{{{W/X}/Y}/Z}' ).
+ GetPTF("W/X/Y/Z").aSerialized("{{{W/X}/Y}/Z}");
- GetPTF("1234512345 mul null").aSerialized("{1234512345 mul null}").aEdmType(EdmInt32.getInstance());
- GetPTF("null mul 1234512345").aSerialized("{null mul 1234512345}").aEdmType(EdmInt32.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X' iv_expected = 'X' ).
+ GetPTF("X").aSerialized("X");
- GetPTF("12345L mul null").aSerialized("{12345L mul null}").aEdmType(EdmInt64.getInstance());
- GetPTF("null mul 12345L").aSerialized("{null mul 12345L}").aEdmType(EdmInt64.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = '-X' iv_expected = '{- X}' ).
+ GetPTF("-X").aSerialized("{- X}");
- GetPTF("1.1F mul null").aSerialized("{1.1F mul null}").aEdmType(EdmSingle.getInstance());
- GetPTF("null mul 1.1F").aSerialized("{null mul 1.1F}").aEdmType(EdmSingle.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'not X' iv_expected = '{not X}' ).
+ GetPTF("not X").aSerialized("{not X}");
- GetPTF("1.1D mul null").aSerialized("{1.1D mul null}").aEdmType(EdmDouble.getInstance());
- GetPTF("null mul 1.1D").aSerialized("{null mul 1.1D}").aEdmType(EdmDouble.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X mul Y' iv_expected = '{X mul Y}' ).
+ GetPTF("X mul Y").aSerialized("{X mul Y}");
- GetPTF("1.1M mul null").aSerialized("{1.1M mul null}").aEdmType(EdmDecimal.getInstance());
- GetPTF("null mul 1.1M").aSerialized("{null mul 1.1M}").aEdmType(EdmDecimal.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X div Y' iv_expected = '{X div Y}' ).
+ GetPTF("X div Y").aSerialized("{X div Y}");
- // relational gt/ge/lt/le
+ // lcl_helper=>veri_expression( iv_expression = 'X mod Y' iv_expected = '{X mod Y}' ).
+ GetPTF("X mod Y").aSerialized("{X mod Y}");
- GetPTF("'TEST' gt null").aSerialized("{'TEST' gt null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null gt 'TEST'").aSerialized("{null gt 'TEST'}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X add Y' iv_expected = '{X add Y}' ).
+ GetPTF("X add Y").aSerialized("{X add Y}");
- GetPTF("time'PT19H02M01S' gt null")
- .aSerialized("{time'PT19H02M01S' gt null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null gt time'PT19H02M01S'")
- .aSerialized("{null gt time'PT19H02M01S'}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X sub Y' iv_expected = '{X sub Y}' ).
+ GetPTF("X sub Y").aSerialized("{X sub Y}");
- GetPTF("datetime'2011-07-31T23:30:59' gt null")
- .aSerialized("{datetime'2011-07-31T23:30:59' gt null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null gt datetime'2011-07-31T23:30:59'").aSerialized(
- "{null gt datetime'2011-07-31T23:30:59'}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X lt Y' iv_expected = '{X lt Y}' ).
+ GetPTF("X lt Y").aSerialized("{X lt Y}");
- GetPTF("datetimeoffset'2002-10-10T12:00:00-05:00' gt null")
- .aSerialized("{datetimeoffset'2002-10-10T12:00:00-05:00' gt null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null gt datetimeoffset'2002-10-10T12:00:00-05:00'")
- .aSerialized("{null gt datetimeoffset'2002-10-10T12:00:00-05:00'}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X gt Y' iv_expected = '{X gt Y}' ).
+ GetPTF("X gt Y").aSerialized("{X gt Y}");
- GetPTF("guid'12345678-1234-1234-1234-123456789012' gt null")
- .aSerialized("{guid'12345678-1234-1234-1234-123456789012' gt null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null gt guid'12345678-1234-1234-1234-123456789012'")
- .aSerialized("{null gt guid'12345678-1234-1234-1234-123456789012'}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X le Y' iv_expected = '{X le Y}' ).
+ GetPTF("X le Y").aSerialized("{X le Y}");
- GetPTF("-1 gt null").aSerialized("{-1 gt null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null gt -1").aSerialized("{null gt -1}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X ge Y' iv_expected = '{X ge Y}' ).
+ GetPTF("X ge Y").aSerialized("{X ge Y}");
- GetPTF("130 gt null").aSerialized("{130 gt null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null gt 130").aSerialized("{null gt 130}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X eq Y' iv_expected = '{X eq Y}' ).
+ GetPTF("X eq Y").aSerialized("{X eq Y}");
- GetPTF("12345 gt null").aSerialized("{12345 gt null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null gt 12345").aSerialized("{null gt 12345}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X ne Y' iv_expected = '{X ne Y}' ).
+ GetPTF("X ne Y").aSerialized("{X ne Y}");
- GetPTF("1234512345 gt null").aSerialized("{1234512345 gt null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null gt 1234512345").aSerialized("{null gt 1234512345}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X and Y' iv_expected = '{X and Y}' ).
+ GetPTF("X and Y").aSerialized("{X and Y}");
- GetPTF("12345L gt null").aSerialized("{12345L gt null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null gt 12345L").aSerialized("{null gt 12345L}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X or Y' iv_expected = '{X or Y}' ).
+ GetPTF("X or Y").aSerialized("{X or Y}");
- GetPTF("1.1F gt null").aSerialized("{1.1F gt null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null gt 1.1F").aSerialized("{null gt 1.1F}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X mul Y eq Z' iv_expected = '{{X mul Y} eq Z}' ).
+ GetPTF("X mul Y eq Z").aSerialized("{{X mul Y} eq Z}");
- GetPTF("1.1D gt null").aSerialized("{1.1D gt null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null gt 1.1D").aSerialized("{null gt 1.1D}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'X eq Y mul Z' iv_expected = '{X eq {Y mul Z}}' ).
+ GetPTF("X eq Y mul Z").aSerialized("{X eq {Y mul Z}}");
- GetPTF("1.1M gt null").aSerialized("{1.1M gt null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null gt 1.1M").aSerialized("{null gt 1.1M}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = '(X)' iv_expected = 'X' ).
+ GetPTF("(X)").aSerialized("X");
- GetPTF("X'1234567890ABCDEF' gt null").aSerialized("{X'1234567890ABCDEF' gt null}").aEdmType(
- EdmBoolean.getInstance());
- GetPTF("null gt X'1234567890ABCDEF'").aSerialized("{null gt X'1234567890ABCDEF'}").aEdmType(
- EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = '(X or Y)' iv_expected = '{X or Y}' ).
+ GetPTF("(X or Y)").aSerialized("{X or Y}");
- // equlity eq/ne
+ // lcl_helper=>veri_expression( iv_expression = 'X mul (Y eq Z)' iv_expected = '{X mul {Y eq Z}}' ).
+ GetPTF("X mul (Y eq Z)").aSerialized("{X mul {Y eq Z}}");
- GetPTF("'TEST' eq null").aSerialized("{'TEST' eq null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null eq 'TEST'").aSerialized("{null eq 'TEST'}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = '(X eq Y) mul Z' iv_expected = '{{X eq Y} mul Z}' ).
+ GetPTF("(X eq Y) mul Z").aSerialized("{{X eq Y} mul Z}");
- GetPTF("time'PT19H02M01S' eq null").aSerialized("{time'PT19H02M01S' eq null}").aEdmType(
- EdmBoolean.getInstance());
- GetPTF("null eq time'PT19H02M01S'").aSerialized("{null eq time'PT19H02M01S'}").aEdmType(
- EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'indexof(X,Y)' iv_expected = '{indexof(X,Y)}' ).
+ GetPTF("indexof(X,Y)").aSerialized("{indexof(X,Y)}");
- GetPTF("datetime'2011-07-31T23:30:59' eq null").aSerialized(
- "{datetime'2011-07-31T23:30:59' eq null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null eq datetime'2011-07-31T23:30:59'").aSerialized(
- "{null eq datetime'2011-07-31T23:30:59'}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'concat(X, Y)' iv_expected = '{concat(X,Y)}' ).
+ GetPTF("concat(X, Y)").aSerialized("{concat(X,Y)}");
- GetPTF("datetimeoffset'2002-10-10T12:00:00-05:00' eq null").aSerialized(
- "{datetimeoffset'2002-10-10T12:00:00-05:00' eq null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null eq datetimeoffset'2002-10-10T12:00:00-05:00'").aSerialized(
- "{null eq datetimeoffset'2002-10-10T12:00:00-05:00'}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'concat(X,Y,Z, 1,2,3)' iv_expected =
+ // '{concat(X,Y,Z,1,2,3)}' ).
+ GetPTF("concat(X,Y,Z, 1,2,3)").aSerialized("{concat(X,Y,Z,1,2,3)}");
- GetPTF("guid'12345678-1234-1234-1234-123456789012' eq null").aSerialized(
- "{guid'12345678-1234-1234-1234-123456789012' eq null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null eq guid'12345678-1234-1234-1234-123456789012'").aSerialized(
- "{null eq guid'12345678-1234-1234-1234-123456789012'}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'a eq b eq c eq d' iv_expected = '{{{a eq b} eq c}
+ // eq d}' ).
+ GetPTF("a eq b eq c eq d").aSerialized("{{{a eq b} eq c} eq d}");
- GetPTF("-1 eq null").aSerialized("{-1 eq null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null eq -1").aSerialized("{null eq -1}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'a mul b eq c mul d' iv_expected = '{{a mul b} eq {c
+ // mul d}}' ).
+ GetPTF("a mul b eq c mul d").aSerialized("{{a mul b} eq {c mul d}}");
- GetPTF("130 eq null").aSerialized("{130 eq null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null eq 130").aSerialized("{null eq 130}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'a mul concat(X,Y,Z) eq c mul d' iv_expected = '{{a
+ // mul
+ // {concat(X,Y,Z)}} eq {c mul d}}' ).
+ GetPTF("a mul concat(X,Y,Z) eq c mul d").aSerialized("{{a mul {concat(X,Y,Z)}} eq {c mul d}}");
- GetPTF("12345 eq null").aSerialized("{12345 eq null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null eq 12345").aSerialized("{null eq 12345}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'a mul (concat(X,Y,Z) eq c) mul d' iv_expected =
+ // '{{a mul
+ // {{concat(X,Y,Z)} eq c}} mul d}' ).
+ GetPTF("a mul (concat(X,Y,Z) eq c) mul d").aSerialized("{{a mul {{concat(X,Y,Z)} eq c}} mul d}");
- GetPTF("1234512345 eq null").aSerialized("{1234512345 eq null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null eq 1234512345").aSerialized("{null eq 1234512345}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = '- not X' iv_expected = '{- {not X}}' ).
+ GetPTF("- not X").aSerialized("{- {not X}}");
- GetPTF("12345L eq null").aSerialized("{12345L eq null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null eq 12345L").aSerialized("{null eq 12345L}").aEdmType(EdmBoolean.getInstance());
+ // =>veri_expression( iv_expression = 'concat(-X,Y)' iv_expected = '{concat({- X},Y)}' ).
+ GetPTF("concat(-X,Y)").aSerialized("{concat({- X},Y)}");
- GetPTF("1.1F eq null").aSerialized("{1.1F eq null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null eq 1.1F").aSerialized("{null eq 1.1F}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'concat(not X,Y)' iv_expected = '{concat({not
+ // X},Y)}' ).
+ GetPTF("concat(not X,Y)").aSerialized("{concat({not X},Y)}");
- GetPTF("1.1D eq null").aSerialized("{1.1D eq null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null eq 1.1D").aSerialized("{null eq 1.1D}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'concat(- not X,Y)' iv_expected = '{concat({- {not
+ // X}},Y)}' ).
+ GetPTF("concat(- not X,Y)").aSerialized("{concat({- {not X}},Y)}");
- GetPTF("1.1M eq null").aSerialized("{1.1M eq null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null eq 1.1M").aSerialized("{null eq 1.1M}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'not concat(-X,Y)' iv_expected = '{not {concat({-
+ // X},Y)}}' ).
+ GetPTF("not concat(-X,Y)").aSerialized("{not {concat({- X},Y)}}");
- GetPTF("X'1234567890ABCDEF' eq null").aSerialized("{X'1234567890ABCDEF' eq null}").aEdmType(
- EdmBoolean.getInstance());
- GetPTF("null eq X'1234567890ABCDEF'").aSerialized("{null eq X'1234567890ABCDEF'}").aEdmType(
- EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'a eq not concat(-X,Y)' iv_expected = '{a eq {not
+ // {concat({-
+ // X},Y)}}}' ).
+ GetPTF("a eq not concat(-X,Y)").aSerialized("{a eq {not {concat({- X},Y)}}}");
- GetPTF("true eq null").aSerialized("{true eq null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null eq true").aSerialized("{null eq true}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'a eq b or c eq d and e eq f' iv_expected = '{{a eq
+ // b} or {{c eq d}
+ // and {e eq f}}}' ).
+ GetPTF("a eq b or c eq d and e eq f").aSerialized("{{a eq b} or {{c eq d} and {e eq f}}}");
- // logical and/or
- GetPTF("true and null").aSerialized("{true and null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null and true").aSerialized("{null and true}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'a eq b and c eq d or e eq f' iv_expected = '{{{a eq
+ // b} and {c eq
+ // d}} or {e eq f}}' ).
+ GetPTF("a eq b and c eq d or e eq f").aSerialized("{{{a eq b} and {c eq d}} or {e eq f}}");
- GetPTF("true or null").aSerialized("{true or null}").aEdmType(EdmBoolean.getInstance());
- GetPTF("null or true").aSerialized("{null or true}").aEdmType(EdmBoolean.getInstance());
+ // lcl_helper=>veri_expression( iv_expression = 'a eq 1.1E+02D' iv_expected = '{a eq 1.1E+02}' ).
+ GetPTF("a eq 1.1E+02D").aSerialized("{a eq 1.1E+02D}");
- }
+ // lcl_helper=>veri_expression_ex(
+ // iv_expression = `concat('a' 'b')`
+ // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid_parameter
+ // iv_expected_msg = 'Invalid parameter for function ''concat''' ).
+ GetPTF("concat('a' 'b')").aExMsgText("\")\" or \",\" expected after position 10 in \"concat('a' 'b')\".");
- @Test
- public void abapTestParameterPromotion() // copy of ABAP method test_parameter_promotion
- {
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>binary( ).
- // lcl_helper=>veri_type( iv_expression = `X'1234567890ABCDEF'` io_expected_type = lo_simple_type ).
- GetPTF("X'1234567890ABCDEF'").aEdmType(EdmBinary.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
- // lcl_helper=>veri_type( iv_expression = `true` io_expected_type = lo_simple_type ).
- GetPTF("true").aEdmType(EdmBoolean.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'Bit' ).
- // lcl_helper=>veri_type( iv_expression = `1` io_expected_type = lo_simple_type ).
- GetPTF("1").aEdmType(Bit.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'Bit' ).
- // lcl_helper=>veri_type( iv_expression = `0` io_expected_type = lo_simple_type ).
- GetPTF("0").aEdmType(Bit.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>get_instance( iv_name = 'UInt7' ).
- // /lcl_helper=>veri_type( iv_expression = `123` io_expected_type = lo_simple_type ).
- GetPTF("123").aEdmType(Uint7.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>byte( ).
- // lcl_helper=>veri_type( iv_expression = `130` io_expected_type = lo_simple_type ).
- GetPTF("130").aEdmType(EdmByte.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>datetime( ).
- // lcl_helper=>veri_type( iv_expression = `datetime'2011-07-31T23:30:59'` io_expected_type = lo_simple_type ).
- GetPTF("datetime'2011-07-31T23:30:59'").aEdmType(EdmDateTime.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>datetimeoffset( ).
- // lcl_helper=>veri_type( iv_expression = `datetimeoffset'2002-10-10T12:00:00-05:00'` io_expected_type =
- // lo_simple_type ).
- GetPTF("datetimeoffset'2002-10-10T12:00:00-05:00'").aEdmType(EdmDateTimeOffset.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>decimal( ).
- // lcl_helper=>veri_type( iv_expression = `1.1M` io_expected_type = lo_simple_type ).
- GetPTF("1.1M").aEdmType(EdmDecimal.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
- // lcl_helper=>veri_type( iv_expression = `1.1D` io_expected_type = lo_simple_type ).
- GetPTF("1.1D").aEdmType(EdmDouble.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
- // lcl_helper=>veri_type( iv_expression = `1.1E+02D` io_expected_type = lo_simple_type ).
- GetPTF("1.1E+02D").aEdmType(EdmDouble.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>guid( ).
- // lcl_helper=>veri_type( iv_expression = `guid'12345678-1234-1234-1234-123456789012'` io_expected_type =
- // lo_simple_type ).
- GetPTF("guid'12345678-1234-1234-1234-123456789012'").aEdmType(EdmGuid.getInstance());
-
- // -->FLOAT not available on OData library for JAVA
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>float( ).
- // lcl_helper=>veri_type( iv_expression = `1.1F` io_expected_type = lo_simple_type ).
- // GetPTF("1.1F").aEdmType(EdmFloat.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int16( ).
- // lcl_helper=>veri_type( iv_expression = `12345` io_expected_type = lo_simple_type ).
- GetPTF("12345").aEdmType(EdmInt16.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- // lcl_helper=>veri_type( iv_expression = `1234512345` io_expected_type = lo_simple_type ).
- GetPTF("1234512345").aEdmType(EdmInt32.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int64( ).
- // lcl_helper=>veri_type( iv_expression = `12345L` io_expected_type = lo_simple_type ).
- GetPTF("12345L").aEdmType(EdmInt64.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>sbyte( ).
- // lcl_helper=>veri_type( iv_expression = `-12` io_expected_type = lo_simple_type ).
- GetPTF("-12").aEdmType(EdmSByte.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>single( ).
- // lcl_helper=>veri_type( iv_expression = `1.1F` io_expected_type = lo_simple_type ).
- GetPTF("1.1F").aEdmType(EdmSingle.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>string( ).
- // lcl_helper=>veri_type( iv_expression = `'TEST'` io_expected_type = lo_simple_type ).
- GetPTF("'TEST'").aEdmType(EdmString.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>time( ).
- // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D'` io_expected_type = lo_simple_type ).
- GetPTF("time'PT19H02M01S'").aEdmType(EdmTime.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>time( ).
- // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01DT23H14M33S'` io_expected_type = lo_simple_type ).
- GetPTF("time'PT23H14M33S'").aEdmType(EdmTime.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
- // lcl_helper=>veri_type( iv_expression = `1.1D add 1` io_expected_type = lo_simple_type ).
- GetPTF("1.1D add 1").aEdmType(EdmDouble.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>double( ).
- // lcl_helper=>veri_type( iv_expression = `1 add 1.1D` io_expected_type = lo_simple_type ).
- GetPTF("1 add 1.1D").aEdmType(EdmDouble.getInstance());
-
- // "lcl_helper=>veri_type( iv_expression = `null` io_expected_type = /IWCOR/cl_DS_edm_simple_type=>null( ) ).
- GetPTF("null").aEdmType(EdmNull.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
- // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D' eq time'P1998Y02M01D'` io_expected_type =
- // lo_simple_type ).
- GetPTF("time'PT19H02M01S' eq time'PT19H02M01S'").aEdmType(EdmBoolean.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>boolean( ).
- // lcl_helper=>veri_type( iv_expression = `time'P1998Y02M01D' lt time'P1998Y02M01D'` io_expected_type =
- // lo_simple_type ).
- GetPTF("time'PT19H02M01S' lt time'PT19H02M01S'").aEdmType(EdmBoolean.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- // lcl_helper=>veri_type( iv_expression = `hour(datetime'2011-07-31T23:30:59')` io_expected_type = lo_simple_type ).
- GetPTF("hour(datetime'2011-07-31T23:30:59')").aEdmType(EdmInt32.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- // lcl_helper=>veri_type( iv_expression = `minute(datetime'2011-07-31T23:30:59')` io_expected_type = lo_simple_type
- // ).
- GetPTF("minute(datetime'2011-07-31T23:30:59')").aEdmType(EdmInt32.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- // lcl_helper=>veri_type( iv_expression = `second(datetime'2011-07-31T23:30:59')` io_expected_type = lo_simple_type
- // ).
- GetPTF("second(datetime'2011-07-31T23:30:59')").aEdmType(EdmInt32.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- // lcl_helper=>veri_type( iv_expression = `hour(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
- GetPTF("hour(time'PT19H02M01S')").aEdmType(EdmInt32.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- // lcl_helper=>veri_type( iv_expression = `minute(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
- GetPTF("minute(time'PT19H02M01S')").aEdmType(EdmInt32.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- // lcl_helper=>veri_type( iv_expression = `second(time'P1998Y02M01D')` io_expected_type = lo_simple_type ).
- GetPTF("second(time'PT19H02M01S')").aEdmType(EdmInt32.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- // lcl_helper=>veri_type( iv_expression = `hour(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type =
- // lo_simple_type ).
- GetPTF("hour(datetimeoffset'2002-10-10T12:00:00-05:00')").aEdmType(EdmInt32.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- // lcl_helper=>veri_type( iv_expression = `minute(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type =
- // lo_simple_type ).
- GetPTF("minute(datetimeoffset'2002-10-10T12:00:00-05:00')").aEdmType(EdmInt32.getInstance());
-
- // lo_simple_type = /iwcor/cl_ds_edm_simple_type=>int32( ).
- // lcl_helper=>veri_type( iv_expression = `second(datetimeoffset'2002-10-10T12:00:00-05:00')` io_expected_type =
- // lo_simple_type ).
- GetPTF("second(datetimeoffset'2002-10-10T12:00:00-05:00')").aEdmType(EdmInt32.getInstance());
-
- GetPTF("replace('aBa','B','CCC')").aEdmType(EdmString.getInstance());
- }
-
- @Test
- public void abapTestOrderByParser() // copy of ABAP method test_orderby_parser
- {
- // lcl_helper=>veri_orderby( iv_expression = 'a' iv_expected = '{oc({o(a asc)})}' ). "default return lower asc
- GetPTO("a").aSerialized("{oc({o(a, asc)})}");
-
- // lcl_helper=>veri_orderby( iv_expression = 'a,b' iv_expected = '{oc({o(a asc)},{o(b asc)})}' ).
- GetPTO("a,b").aSerialized("{oc({o(a, asc)},{o(b, asc)})}");
-
- // lcl_helper=>veri_orderby( iv_expression = 'a,b,c' iv_expected = '{oc({o(a asc)},{o(b asc)},{o(c asc)})}' ).
- GetPTO("a,b,c").aSerialized("{oc({o(a, asc)},{o(b, asc)},{o(c, asc)})}");
-
- // see comment of class
- // //lcl_helper=>veri_orderby( iv_expression = 'a ASC' iv_expected = '{oc({o(a asc)})}' ).
- // GetPTO("a ASC").aSerialized("{oc({o(a, asc)})}");
-
- // lcl_helper=>veri_orderby( iv_expression = 'a asc' iv_expected = '{oc({o(a asc)})}' ).
- GetPTO("a asc").aSerialized("{oc({o(a, asc)})}");
-
- // lcl_helper=>veri_orderby( iv_expression = 'a DESC' iv_expected = '{oc({o(a desc)})}' ).
- // -->GetPTO("a DESC").aSerialized("{oc({o(a, desc)})}");
-
- // see comment of class (case sensitive)
- // //lcl_helper=>veri_orderby( iv_expression = 'a DESC,b DESC'
- // // iv_expected = '{oc({o(a desc)},{o(b desc)})}' ).
- // GetPTO("a DESC,b DESC").aSerialized("{oc({o(a, desc)},{o(b, desc)})}");
-
- // see comment of class (case sensitive)
- // //lcl_helper=>veri_orderby( iv_expression = 'a ASC, b DESC'
- // // iv_expected = '{oc({o(a asc)},{o(b desc)})}' ).
- // GetPTO("a ASC, b DESC").aSerialized("{oc({o(a, asc)},{o(b, desc)})}");
-
- // see comment of class (case sensitive)
- // //lcl_helper=>veri_orderby( iv_expression = '2 mul 6 eq 12 DESC'
- // // iv_expected = '{oc({o({{2 mul 6} eq 12} desc)})}' ).
- // GetPTO("2 mul 6 eq 12 DESC").aSerialized("{oc({o({{2 mul 6} eq 12}, desc)})}");
-
- // lcl_helper=>veri_orderby( iv_expression = `concat( 'Start_' , starttime ) desc`
- // iv_expected = `{oc({o({concat(Start_,starttime)} desc)})}` ).
- GetPTO("concat( 'Start_' , starttime ) desc").aSerialized("{oc({o({concat('Start_',starttime)}, desc)})}");
-
- }
-
- @Test
- public void abapTestFilterParser() { // copy of ABAP method test_filter_parser
- // lcl_helper=>veri_expression( iv_expression = 'W/X' iv_expected = '{W/X}' ).
- GetPTF("W/X").aSerialized("{W/X}");
-
- // lcl_helper=>veri_expression( iv_expression = 'W/X eq TEST' iv_expected = '{{W/X} eq TEST}' ).
- GetPTF("W/X eq TEST").aSerialized("{{W/X} eq TEST}");
-
- // lcl_helper=>veri_expression( iv_expression = 'ABC eq W/X eq TEST' iv_expected = '{{ABC eq {W/X}} eq TEST}' ).
- GetPTF("ABC eq W/X eq TEST").aSerialized("{{ABC eq {W/X}} eq TEST}");
-
- // lcl_helper=>veri_expression( iv_expression = 'ABC eq W / X eq TEST' iv_expected = '{{ABC eq {W/X}} eq TEST}' ).
- GetPTF("ABC eq W / X eq TEST").aSerialized("{{ABC eq {W/X}} eq TEST}");
-
- // lcl_helper=>veri_expression( iv_expression = 'W/X/Y/Z' iv_expected = '{{{W/X}/Y}/Z}' ).
- GetPTF("W/X/Y/Z").aSerialized("{{{W/X}/Y}/Z}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X' iv_expected = 'X' ).
- GetPTF("X").aSerialized("X");
-
- // lcl_helper=>veri_expression( iv_expression = '-X' iv_expected = '{- X}' ).
- GetPTF("-X").aSerialized("{- X}");
-
- // lcl_helper=>veri_expression( iv_expression = 'not X' iv_expected = '{not X}' ).
- GetPTF("not X").aSerialized("{not X}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X mul Y' iv_expected = '{X mul Y}' ).
- GetPTF("X mul Y").aSerialized("{X mul Y}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X div Y' iv_expected = '{X div Y}' ).
- GetPTF("X div Y").aSerialized("{X div Y}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X mod Y' iv_expected = '{X mod Y}' ).
- GetPTF("X mod Y").aSerialized("{X mod Y}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X add Y' iv_expected = '{X add Y}' ).
- GetPTF("X add Y").aSerialized("{X add Y}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X sub Y' iv_expected = '{X sub Y}' ).
- GetPTF("X sub Y").aSerialized("{X sub Y}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X lt Y' iv_expected = '{X lt Y}' ).
- GetPTF("X lt Y").aSerialized("{X lt Y}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X gt Y' iv_expected = '{X gt Y}' ).
- GetPTF("X gt Y").aSerialized("{X gt Y}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X le Y' iv_expected = '{X le Y}' ).
- GetPTF("X le Y").aSerialized("{X le Y}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X ge Y' iv_expected = '{X ge Y}' ).
- GetPTF("X ge Y").aSerialized("{X ge Y}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X eq Y' iv_expected = '{X eq Y}' ).
- GetPTF("X eq Y").aSerialized("{X eq Y}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X ne Y' iv_expected = '{X ne Y}' ).
- GetPTF("X ne Y").aSerialized("{X ne Y}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X and Y' iv_expected = '{X and Y}' ).
- GetPTF("X and Y").aSerialized("{X and Y}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X or Y' iv_expected = '{X or Y}' ).
- GetPTF("X or Y").aSerialized("{X or Y}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X mul Y eq Z' iv_expected = '{{X mul Y} eq Z}' ).
- GetPTF("X mul Y eq Z").aSerialized("{{X mul Y} eq Z}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X eq Y mul Z' iv_expected = '{X eq {Y mul Z}}' ).
- GetPTF("X eq Y mul Z").aSerialized("{X eq {Y mul Z}}");
-
- // lcl_helper=>veri_expression( iv_expression = '(X)' iv_expected = 'X' ).
- GetPTF("(X)").aSerialized("X");
-
- // lcl_helper=>veri_expression( iv_expression = '(X or Y)' iv_expected = '{X or Y}' ).
- GetPTF("(X or Y)").aSerialized("{X or Y}");
-
- // lcl_helper=>veri_expression( iv_expression = 'X mul (Y eq Z)' iv_expected = '{X mul {Y eq Z}}' ).
- GetPTF("X mul (Y eq Z)").aSerialized("{X mul {Y eq Z}}");
-
- // lcl_helper=>veri_expression( iv_expression = '(X eq Y) mul Z' iv_expected = '{{X eq Y} mul Z}' ).
- GetPTF("(X eq Y) mul Z").aSerialized("{{X eq Y} mul Z}");
-
- // lcl_helper=>veri_expression( iv_expression = 'indexof(X,Y)' iv_expected = '{indexof(X,Y)}' ).
- GetPTF("indexof(X,Y)").aSerialized("{indexof(X,Y)}");
-
- // lcl_helper=>veri_expression( iv_expression = 'concat(X, Y)' iv_expected = '{concat(X,Y)}' ).
- GetPTF("concat(X, Y)").aSerialized("{concat(X,Y)}");
-
- // lcl_helper=>veri_expression( iv_expression = 'concat(X,Y,Z, 1,2,3)' iv_expected = '{concat(X,Y,Z,1,2,3)}' ).
- GetPTF("concat(X,Y,Z, 1,2,3)").aSerialized("{concat(X,Y,Z,1,2,3)}");
-
- // lcl_helper=>veri_expression( iv_expression = 'a eq b eq c eq d' iv_expected = '{{{a eq b} eq c} eq d}' ).
- GetPTF("a eq b eq c eq d").aSerialized("{{{a eq b} eq c} eq d}");
-
- // lcl_helper=>veri_expression( iv_expression = 'a mul b eq c mul d' iv_expected = '{{a mul b} eq {c mul d}}' ).
- GetPTF("a mul b eq c mul d").aSerialized("{{a mul b} eq {c mul d}}");
-
- // lcl_helper=>veri_expression( iv_expression = 'a mul concat(X,Y,Z) eq c mul d' iv_expected = '{{a mul
- // {concat(X,Y,Z)}} eq {c mul d}}' ).
- GetPTF("a mul concat(X,Y,Z) eq c mul d").aSerialized("{{a mul {concat(X,Y,Z)}} eq {c mul d}}");
-
- // lcl_helper=>veri_expression( iv_expression = 'a mul (concat(X,Y,Z) eq c) mul d' iv_expected = '{{a mul
- // {{concat(X,Y,Z)} eq c}} mul d}' ).
- GetPTF("a mul (concat(X,Y,Z) eq c) mul d").aSerialized("{{a mul {{concat(X,Y,Z)} eq c}} mul d}");
-
- // lcl_helper=>veri_expression( iv_expression = '- not X' iv_expected = '{- {not X}}' ).
- GetPTF("- not X").aSerialized("{- {not X}}");
-
- // =>veri_expression( iv_expression = 'concat(-X,Y)' iv_expected = '{concat({- X},Y)}' ).
- GetPTF("concat(-X,Y)").aSerialized("{concat({- X},Y)}");
-
- // lcl_helper=>veri_expression( iv_expression = 'concat(not X,Y)' iv_expected = '{concat({not X},Y)}' ).
- GetPTF("concat(not X,Y)").aSerialized("{concat({not X},Y)}");
-
- // lcl_helper=>veri_expression( iv_expression = 'concat(- not X,Y)' iv_expected = '{concat({- {not X}},Y)}' ).
- GetPTF("concat(- not X,Y)").aSerialized("{concat({- {not X}},Y)}");
-
- // lcl_helper=>veri_expression( iv_expression = 'not concat(-X,Y)' iv_expected = '{not {concat({- X},Y)}}' ).
- GetPTF("not concat(-X,Y)").aSerialized("{not {concat({- X},Y)}}");
-
- // lcl_helper=>veri_expression( iv_expression = 'a eq not concat(-X,Y)' iv_expected = '{a eq {not {concat({-
- // X},Y)}}}' ).
- GetPTF("a eq not concat(-X,Y)").aSerialized("{a eq {not {concat({- X},Y)}}}");
-
- // lcl_helper=>veri_expression( iv_expression = 'a eq b or c eq d and e eq f' iv_expected = '{{a eq b} or {{c eq d}
- // and {e eq f}}}' ).
- GetPTF("a eq b or c eq d and e eq f").aSerialized("{{a eq b} or {{c eq d} and {e eq f}}}");
-
- // lcl_helper=>veri_expression( iv_expression = 'a eq b and c eq d or e eq f' iv_expected = '{{{a eq b} and {c eq
- // d}} or {e eq f}}' ).
- GetPTF("a eq b and c eq d or e eq f").aSerialized("{{{a eq b} and {c eq d}} or {e eq f}}");
-
- // lcl_helper=>veri_expression( iv_expression = 'a eq 1.1E+02D' iv_expected = '{a eq 1.1E+02}' ).
- GetPTF("a eq 1.1E+02D").aSerialized("{a eq 1.1E+02D}");
-
- // lcl_helper=>veri_expression_ex(
- // iv_expression = `concat('a' 'b')`
- // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid_parameter
- // iv_expected_msg = 'Invalid parameter for function ''concat''' ).
- GetPTF("concat('a' 'b')").aExMsgText("\")\" or \",\" expected after position 10 in \"concat('a' 'b')\".");
-
- // lcl_helper=>veri_expression_ex(
- // iv_expression = `concat('125')`
- // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_to_few_parameter
- // iv_expected_msg = 'Too few parameters for function ''concat''' ).
- GetPTF("concat('125')")
- .aExMsgText(
- "No applicable method found for \"concat\" at position 1 in \"concat('125')\" with the " +
- "specified arguments. Method \"concat\" requires 2 or more arguments.");
-
- // lcl_helper=>veri_expression_ex(
- // iv_expression = `indexof('a','b','c')`
- // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_to_many_parameter
- // iv_expected_msg = 'Too many parameters for function ''indexof''' ).
- GetPTF("indexof('a','b','c')")
- .aExMsgText(
- "No applicable method found for \"indexof\" at position 1 in \"indexof('a','b','c')\" with " +
- "the specified arguments. Method \"indexof\" requires exact 2 argument(s).");
-
- // lcl_helper=>veri_expression_ex(
- // iv_expression = `replace('aBa','B','CCC')`
- // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid
- // iv_expected_msg = `Invalid function 'replace' detected` ).
- // -->see test method abapMethodRleplaceNotAllowed()
-
- GetPTF("replace('a','b')")
- .aExMsgText(
- "No applicable method found for \"replace\" at position 1 in \"replace('a','b')\" "
- + "with the specified arguments. Method \"replace\" requires exact 3 argument(s).");
-
- GetPTF("replace('a',1,2)")
- .aExMsgText(
- "No applicable method found for \"replace\" at position 1 in "
- + "\"replace('a',1,2)\" for the specified argument types.");
- }
+ // lcl_helper=>veri_expression_ex(
+ // iv_expression = `concat('125')`
+ // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_to_few_parameter
+ // iv_expected_msg = 'Too few parameters for function ''concat''' ).
+ GetPTF("concat('125')").aExMsgText("No applicable method found for \"concat\" at position 1 in \"concat('125')\" with the "
+ + "specified arguments. Method \"concat\" requires 2 or more arguments.");
+
+ // lcl_helper=>veri_expression_ex(
+ // iv_expression = `indexof('a','b','c')`
+ // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_to_many_parameter
+ // iv_expected_msg = 'Too many parameters for function ''indexof''' ).
+ GetPTF("indexof('a','b','c')").aExMsgText(
+ "No applicable method found for \"indexof\" at position 1 in \"indexof('a','b','c')\" with "
+ + "the specified arguments. Method \"indexof\" requires exact 2 argument(s).");
+
+ // lcl_helper=>veri_expression_ex(
+ // iv_expression = `replace('aBa','B','CCC')`
+ // iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid
+ // iv_expected_msg = `Invalid function 'replace' detected` ).
+ // -->see test method abapMethodRleplaceNotAllowed()
+
+ GetPTF("replace('a','b')").aExMsgText("No applicable method found for \"replace\" at position 1 in \"replace('a','b')\" "
+ + "with the specified arguments. Method \"replace\" requires exact 3 argument(s).");
+
+ GetPTF("replace('a',1,2)").aExMsgText(
+ "No applicable method found for \"replace\" at position 1 in " + "\"replace('a',1,2)\" for the specified argument types.");
+ }
}
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
index 19c88dd6..fc7bd369 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.fit.basic;
@@ -22,14 +18,13 @@ import static org.custommonkey.xmlunit.XMLAssert.assertXpathExists;
import static org.custommonkey.xmlunit.XMLAssert.assertXpathValuesEqual;
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-
import org.apache.http.HttpResponse;
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.edm.Edm;
@@ -49,35 +44,31 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.apache.olingo.odata2.testutil.server.ServletType;
import org.custommonkey.xmlunit.SimpleNamespaceContext;
import org.custommonkey.xmlunit.XMLUnit;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
import org.junit.Test;
-import org.mockito.ArgumentMatchers;
+import org.mockito.ArgumentMatcher;
/**
- *
+ *
*/
public class HttpExceptionResponseTest extends AbstractBasicTest {
- public HttpExceptionResponseTest(final ServletType servletType) {
- super(servletType);
- }
+ public HttpExceptionResponseTest(final ServletType servletType) {
+ super(servletType);
+ }
- private ODataSingleProcessor processor;
+ private ODataSingleProcessor processor;
- @Override
- protected ODataSingleProcessor createProcessor() throws ODataException {
- processor = mock(ODataSingleProcessor.class);
+ @Override
+ protected ODataSingleProcessor createProcessor() throws ODataException {
+ processor = mock(ODataSingleProcessor.class);
- return processor;
- }
+ return processor;
+ }
- @Override
- protected EdmProvider createEdmProvider() {
- final EdmProvider provider = new ScenarioEdmProvider();
- return provider;
- }
+ @Override
+ protected EdmProvider createEdmProvider() {
+ return new ScenarioEdmProvider();
+ }
@Test
public void test404HttpNotFound() throws Exception {
@@ -95,82 +86,85 @@ public class HttpExceptionResponseTest extends AbstractBasicTest {
assertXpathValuesEqual("\"" + MessageService.getMessage(Locale.ENGLISH, ODataNotFoundException.ENTITY).getText()
+ "\"", "/a:error/a:message", content);
}
-
- @Test
- public void test400BadRequestRedundantSystemQueryOptions() throws Exception {
- HttpResponse response = executeGetRequest("Employees?$top=1&$top=3");
- assertEquals(HttpStatusCodes.BAD_REQUEST.getStatusCode(), response.getStatusLine().getStatusCode());
-
- final String content = StringHelper.inputStreamToString(response.getEntity().getContent());
- assertEquals("<?xml version='1.0' encoding='UTF-8'?><error xmlns=\"http://schemas.microsoft.com/ado/2007/"
- + "08/dataservices/metadata\"><code/><message xml:lang=\"en\">Duplicate system query parameter names: "
- + "'$top'.</message></error>", content);
- }
-
- @Test
- public void genericHttpExceptions() throws Exception {
- disableLogging();
- final List<ODataHttpException> toTestExceptions = getHttpExceptionsForTest();
-
- int firstKey = 1;
- for (final ODataHttpException oDataException : toTestExceptions) {
- final String key = String.valueOf(firstKey++);
- final Matcher<GetEntityUriInfo> match = new EntityKeyMatcher(key);
- when(processor.readEntity(Matchers.argThat(match), any(String.class))).thenThrow(oDataException);
-
- final HttpResponse response = executeGetRequest("Managers('" + key + "')");
+ @Test
+ public void test400BadRequestRedundantSystemQueryOptions() throws Exception {
+ HttpResponse response = executeGetRequest("Employees?$top=1&$top=3");
+ assertEquals(HttpStatusCodes.BAD_REQUEST.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+
+ final String content = StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ assertEquals("<?xml version='1.0' encoding='UTF-8'?><error xmlns=\"http://schemas.microsoft.com/ado/2007/"
+ + "08/dataservices/metadata\"><code/><message xml:lang=\"en\">Duplicate system query parameter names: "
+ + "'$top'.</message></error>", content);
+ }
- assertEquals("Expected status code does not match for exception type '"
- + oDataException.getClass().getSimpleName() + "'.",
- oDataException.getHttpStatus().getStatusCode(), response.getStatusLine().getStatusCode());
+ @Test
+ public void genericHttpExceptions() throws Exception {
+ disableLogging();
+
+ final List<ODataHttpException> toTestExceptions = getHttpExceptionsForTest();
+
+ int firstKey = 1;
+ for (final ODataHttpException oDataException : toTestExceptions) {
+ final String key = String.valueOf(firstKey++);
+ final ArgumentMatcher<GetEntityUriInfo> match = new EntityKeyMatcher(key);
+ when(processor.readEntity(argThat(match), any(String.class))).thenThrow(oDataException);
+
+ final HttpResponse response = executeGetRequest("Managers('" + key + "')");
+
+ assertEquals("Expected status code does not match for exception type '" + oDataException.getClass()
+ .getSimpleName()
+ + "'.",
+ oDataException.getHttpStatus()
+ .getStatusCode(),
+ response.getStatusLine()
+ .getStatusCode());
+
+ final String content = StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ Map<String, String> prefixMap = new HashMap<String, String>();
+ prefixMap.put("a", Edm.NAMESPACE_M_2007_08);
+ XMLUnit.setXpathNamespaceContext(new SimpleNamespaceContext(prefixMap));
+ assertXpathExists("/a:error/a:code", content);
+ }
- final String content = StringHelper.inputStreamToString(response.getEntity().getContent());
- Map<String, String> prefixMap = new HashMap<String, String>();
- prefixMap.put("a", Edm.NAMESPACE_M_2007_08);
- XMLUnit.setXpathNamespaceContext(new SimpleNamespaceContext(prefixMap));
- assertXpathExists("/a:error/a:code", content);
}
- }
+ private List<ODataHttpException> getHttpExceptionsForTest() throws Exception {
+ final List<Class<ODataHttpException>> exClasses =
+ ClassHelper.getAssignableClasses("org.apache.olingo.odata2.api.exception", ODataHttpException.class);
- private List<ODataHttpException> getHttpExceptionsForTest() throws Exception {
- final List<Class<ODataHttpException>> exClasses =
- ClassHelper.getAssignableClasses("org.apache.olingo.odata2.api.exception", ODataHttpException.class);
+ final MessageReference mr = MessageReference.create(ODataHttpException.class, "SIMPLE FOR TEST");
+ return ClassHelper.getClassInstances(exClasses, new Class<?>[] {MessageReference.class}, new Object[] {mr});
+ }
- final MessageReference mr = MessageReference.create(ODataHttpException.class, "SIMPLE FOR TEST");
- return ClassHelper.getClassInstances(exClasses, new Class<?>[] { MessageReference.class }, new Object[] { mr });
- }
+ private class EntityKeyMatcher implements ArgumentMatcher<GetEntityUriInfo> {
- private class EntityKeyMatcher extends BaseMatcher<GetEntityUriInfo> {
+ private final String keyLiteral;
- private final String keyLiteral;
+ public EntityKeyMatcher(final String keyLiteral) {
+ if (keyLiteral == null) {
+ throw new IllegalArgumentException("Key parameter MUST NOT be NULL.");
+ }
+ this.keyLiteral = keyLiteral;
+ }
- public EntityKeyMatcher(final String keyLiteral) {
- if (keyLiteral == null) {
- throw new IllegalArgumentException("Key parameter MUST NOT be NULL.");
- }
- this.keyLiteral = keyLiteral;
- }
- @Override
- public boolean matches(final Object item) {
- if (item instanceof UriInfoImpl) {
- final UriInfoImpl upr = (UriInfoImpl) item;
- final List<KeyPredicate> keyPredicates = upr.getKeyPredicates();
- for (final KeyPredicate keyPredicate : keyPredicates) {
- if (keyLiteral.equals(keyPredicate.getLiteral())) {
- return true;
- }
+ @Override
+ public boolean matches(GetEntityUriInfo item) {
+ if (item instanceof UriInfoImpl) {
+ final UriInfoImpl upr = (UriInfoImpl) item;
+ final List<KeyPredicate> keyPredicates = upr.getKeyPredicates();
+ for (final KeyPredicate keyPredicate : keyPredicates) {
+ if (keyLiteral.equals(keyPredicate.getLiteral())) {
+ return true;
+ }
+ }
+ }
+ return false;
}
- }
- return false;
- }
- @Override
- public void describeTo(final Description description) {
- // description.appendText("");
}
-
- }
}
diff --git a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
index da185b61..92114578 100644
--- a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
+++ b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.testutil.mock;
@@ -22,24 +18,22 @@ import org.apache.olingo.odata2.api.exception.MessageReference;
import org.apache.olingo.odata2.api.exception.ODataMessageException;
/**
- *
+ *
*/
-public class SampleClassForInvalidMessageReferences extends ODataMessageException
-{
- private static final long serialVersionUID = 1L;
+public class SampleClassForInvalidMessageReferences extends ODataMessageException {
+ private static final long serialVersionUID = 1L;
- public SampleClassForInvalidMessageReferences(final MessageReference messageReference) {
- super(messageReference);
- }
+ public SampleClassForInvalidMessageReferences(final MessageReference messageReference) {
+ super(messageReference);
+ }
- public SampleClassForInvalidMessageReferences(final MessageReference messageReference, final String errorCode) {
- super(messageReference, errorCode);
- }
+ public SampleClassForInvalidMessageReferences(final MessageReference messageReference, final String errorCode) {
+ super(messageReference, errorCode);
+ }
- public static final MessageReference EXIST = createMessageReference(SampleClassForInvalidMessageReferences.class,
- "EXIST");
- public static final MessageReference DOES_NOT_EXIST = createMessageReference(
- SampleClassForInvalidMessageReferences.class, "DOES_NOT_EXIST");
- public static final MessageReference EXITS_BUT_EMPTY = createMessageReference(
- SampleClassForInvalidMessageReferences.class, "EXITS_BUT_EMPTY");
+ public static final MessageReference EXIST = createMessageReference(SampleClassForInvalidMessageReferences.class, "EXIST");
+ public static final MessageReference DOES_NOT_EXIST =
+ createMessageReference(SampleClassForInvalidMessageReferences.class, "DOES_NOT_EXIST");
+ public static final MessageReference EXITS_BUT_EMPTY =
+ createMessageReference(SampleClassForInvalidMessageReferences.class, "EXITS_BUT_EMPTY");
}
diff --git a/pom.xml b/pom.xml
index e1b33cc2..e7e7382b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@ governing permissions and limitations under
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.10</version>
+ <version>2.17</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/checkstyle/config.xml b/src/checkstyle/config.xml
index 351d8014..b9ba59b9 100644
--- a/src/checkstyle/config.xml
+++ b/src/checkstyle/config.xml
@@ -58,7 +58,7 @@
<property name="tokens" value="LITERAL_WHILE,LITERAL_FINALLY,LITERAL_IF"/>
</module>
<module name="LeftCurly">
- <property name="severity" value="warning"/>
+ <property name="severity" value="info"/>
</module>
<module name="NeedBraces">
<property name="severity" value="warning"/>
@@ -67,7 +67,7 @@
<property name="severity" value="warning"/>
</module>
<module name="LineLength">
- <property name="max" value="160"/>
+ <property name="max" value="500"/>
</module>
</module>
<module name="SuppressionCommentFilter"/>
(olingo-odata2) 27/29: adapt tests
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 7d55fd10936bc3842e1dbf124d2e28115c862847
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Thu Dec 14 12:25:18 2023 +0200
adapt tests
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.../access/model/JPAEdmMappingModelService.java | 412 +++---
.../core/ODataJPADefaultProcessorTest.java | 1141 ++++++++--------
.../core/ODataJPAResponseBuilderTest.java | 1397 ++++++++++----------
.../data/JPAEntityParserForStaticMethodTest.java | 584 ++++----
.../core/access/data/JPAEntityParserTest.java | 1267 +++++++++---------
.../core/mock/ODataJPAServiceFactoryMock.java | 60 +-
.../processor/core/mock/OnJPAWriteContentMock.java | 69 +-
.../client/core/ep/JSON_XMLErrorConsumerTest.java | 92 +-
.../JsonErrorDocumentDeserializerTest.java | 403 +++---
.../core/ep/deserializer/XmlErrorDocumentTest.java | 434 +++---
.../olingo/odata2/core/rest/ODataSubLocator.java | 83 +-
.../olingo/odata2/core/servlet/ODataServlet.java | 740 ++++++-----
.../odata2/core/ep/ProviderFacadeImplTest.java | 2 +-
.../ep/consumer/JsonErrorDocumentConsumerTest.java | 2 +-
.../ep/consumer/XmlErrorDocumentConsumerTest.java | 2 +-
.../olingo/odata2/fit/basic/BasicHttpTest.java | 4 +-
.../odata2/fit/basic/LanguageNegotiationTest.java | 153 +--
.../odata2/fit/basic/ServiceResolutionTest.java | 558 ++++----
.../olingo/odata2/fit/basic/UrlRewriteTest.java | 284 ++--
.../org/apache/olingo/odata2/ref/model/Photo.java | 261 ++--
.../odata2/testutil/helper}/LocaleAsserter.java | 2 +-
21 files changed, 4064 insertions(+), 3886 deletions(-)
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelService.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelService.java
index 69153ec1..a458f2d2 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelService.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/model/JPAEdmMappingModelService.java
@@ -1,31 +1,22 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.core.access.model;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext;
import org.apache.olingo.odata2.jpa.processor.api.access.JPAEdmMappingModelAccess;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPAModelException;
@@ -36,235 +27,250 @@ import org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEmbeddableTyp
import org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEntityTypeMapType;
import org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAPersistenceUnitMapType;
import org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPARelationshipMapType.JPARelationship;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
- boolean mappingModelExists = true;
- private JPAEdmMappingModel mappingModel;
- private InputStream mappingModelStream = null;
- private String mappingModelName;
-
- public JPAEdmMappingModelService(final ODataJPAContext ctx) {
- JPAEdmExtension ext = null;
- mappingModelName = ctx.getJPAEdmMappingModel();
- if (mappingModelName == null) {
- ext = ctx.getJPAEdmExtension();
- if (ext != null) {
- mappingModelStream = ext.getJPAEdmMappingModelStream();
- }
- }
-
- mappingModelExists = mappingModelName != null || mappingModelStream != null;
- }
-
- @Override
- public void loadMappingModel() {
- InputStream is = null;
- if (mappingModelExists) {
- JAXBContext context;
- try {
- context = JAXBContext.newInstance(JPAEdmMappingModel.class);
-
- Unmarshaller unmarshaller = context.createUnmarshaller();
- is = loadMappingModelInputStream();
- if (is == null) {
- mappingModelExists = false;
- return;
+ boolean mappingModelExists = true;
+ private JPAEdmMappingModel mappingModel;
+ private InputStream mappingModelStream = null;
+ private final String mappingModelName;
+
+ public JPAEdmMappingModelService(final ODataJPAContext ctx) {
+ JPAEdmExtension ext = null;
+ mappingModelName = ctx.getJPAEdmMappingModel();
+ if (mappingModelName == null) {
+ ext = ctx.getJPAEdmExtension();
+ if (ext != null) {
+ mappingModelStream = ext.getJPAEdmMappingModelStream();
+ }
}
- mappingModel = (JPAEdmMappingModel) unmarshaller.unmarshal(is);
+ mappingModelExists = mappingModelName != null || mappingModelStream != null;
+ }
- if (mappingModel != null) {
- mappingModelExists = true;
+ @Override
+ public void loadMappingModel() {
+ InputStream is = null;
+ if (mappingModelExists) {
+ JAXBContext context;
+ try {
+ context = JAXBContext.newInstance(JPAEdmMappingModel.class);
+
+ Unmarshaller unmarshaller = context.createUnmarshaller();
+ is = loadMappingModelInputStream();
+ if (is == null) {
+ mappingModelExists = false;
+ return;
+ }
+
+ mappingModel = (JPAEdmMappingModel) unmarshaller.unmarshal(is);
+
+ if (mappingModel != null) {
+ mappingModelExists = true;
+ }
+
+ } catch (JAXBException e) {
+ mappingModelExists = false;
+ ODataJPAModelException.throwException(ODataJPAModelException.GENERAL, e);
+ } finally {
+ try {
+ if (is != null) {
+ is.close();
+ }
+ } catch (IOException e) {
+ // do nothing
+ }
+ }
}
+ }
- } catch (JAXBException e) {
- mappingModelExists = false;
- ODataJPAModelException.throwException(ODataJPAModelException.GENERAL, e);
- } finally {
- try {
- if (is != null) {
- is.close();
- }
- } catch (IOException e) {
- // do nothing
- }
- }
+ @Override
+ public boolean isMappingModelExists() {
+ return mappingModelExists;
}
- }
- @Override
- public boolean isMappingModelExists() {
- return mappingModelExists;
- }
+ @Override
+ public JPAEdmMappingModel getJPAEdmMappingModel() {
+ return mappingModel;
+ }
- @Override
- public JPAEdmMappingModel getJPAEdmMappingModel() {
- return mappingModel;
- }
+ @Override
+ public String mapJPAPersistenceUnit(final String persistenceUnitName) {
- @Override
- public String mapJPAPersistenceUnit(final String persistenceUnitName) {
+ JPAPersistenceUnitMapType persistenceUnit = mappingModel.getPersistenceUnit();
+ if (persistenceUnit.getName()
+ .equals(persistenceUnitName)) {
+ return persistenceUnit.getEDMSchemaNamespace();
+ }
- JPAPersistenceUnitMapType persistenceUnit = mappingModel.getPersistenceUnit();
- if (persistenceUnit.getName().equals(persistenceUnitName)) {
- return persistenceUnit.getEDMSchemaNamespace();
+ return null;
}
- return null;
- }
+ @Override
+ public String mapJPAEntityType(final String jpaEntityTypeName) {
- @Override
- public String mapJPAEntityType(final String jpaEntityTypeName) {
-
- JPAEntityTypeMapType jpaEntityTypeMap = searchJPAEntityTypeMapType(jpaEntityTypeName);
- if (jpaEntityTypeMap != null) {
- return jpaEntityTypeMap.getEDMEntityType();
- } else {
- return null;
+ JPAEntityTypeMapType jpaEntityTypeMap = searchJPAEntityTypeMapType(jpaEntityTypeName);
+ if (jpaEntityTypeMap != null) {
+ return jpaEntityTypeMap.getEDMEntityType();
+ }
+ return null;
}
- }
- @Override
- public String mapJPAEntitySet(final String jpaEntityTypeName) {
- JPAEntityTypeMapType jpaEntityTypeMap = searchJPAEntityTypeMapType(jpaEntityTypeName);
- if (jpaEntityTypeMap != null) {
- return jpaEntityTypeMap.getEDMEntitySet();
- } else {
- return null;
+ @Override
+ public String mapJPAEntitySet(final String jpaEntityTypeName) {
+ JPAEntityTypeMapType jpaEntityTypeMap = searchJPAEntityTypeMapType(jpaEntityTypeName);
+ if (jpaEntityTypeMap != null) {
+ return jpaEntityTypeMap.getEDMEntitySet();
+ }
+ return null;
}
- }
- @Override
- public String mapJPAAttribute(final String jpaEntityTypeName, final String jpaAttributeName) {
- JPAEntityTypeMapType jpaEntityTypeMap = searchJPAEntityTypeMapType(jpaEntityTypeName);
- if (jpaEntityTypeMap != null && jpaEntityTypeMap.getJPAAttributes() != null) {
- // fixing attributes
- // removal issue
- // from mapping
- for (JPAAttribute jpaAttribute : jpaEntityTypeMap.getJPAAttributes().getJPAAttribute()) {
- if (jpaAttribute.getName().equals(jpaAttributeName)) {
- return jpaAttribute.getValue();
+ @Override
+ public String mapJPAAttribute(final String jpaEntityTypeName, final String jpaAttributeName) {
+ JPAEntityTypeMapType jpaEntityTypeMap = searchJPAEntityTypeMapType(jpaEntityTypeName);
+ if (jpaEntityTypeMap != null && jpaEntityTypeMap.getJPAAttributes() != null) {
+ // fixing attributes
+ // removal issue
+ // from mapping
+ for (JPAAttribute jpaAttribute : jpaEntityTypeMap.getJPAAttributes()
+ .getJPAAttribute()) {
+ if (jpaAttribute.getName()
+ .equals(jpaAttributeName)) {
+ return jpaAttribute.getValue();
+ }
+ }
}
- }
- }
- return null;
- }
+ return null;
+ }
- @Override
- public String mapJPARelationship(final String jpaEntityTypeName, final String jpaRelationshipName) {
- JPAEntityTypeMapType jpaEntityTypeMap = searchJPAEntityTypeMapType(jpaEntityTypeName);
- if (jpaEntityTypeMap != null && jpaEntityTypeMap.getJPARelationships() != null) {
- for (JPARelationship jpaRealtionship : jpaEntityTypeMap.getJPARelationships().getJPARelationship()) {
- if (jpaRealtionship.getName().equals(jpaRelationshipName)) {
- return jpaRealtionship.getValue();
+ @Override
+ public String mapJPARelationship(final String jpaEntityTypeName, final String jpaRelationshipName) {
+ JPAEntityTypeMapType jpaEntityTypeMap = searchJPAEntityTypeMapType(jpaEntityTypeName);
+ if (jpaEntityTypeMap != null && jpaEntityTypeMap.getJPARelationships() != null) {
+ for (JPARelationship jpaRealtionship : jpaEntityTypeMap.getJPARelationships()
+ .getJPARelationship()) {
+ if (jpaRealtionship.getName()
+ .equals(jpaRelationshipName)) {
+ return jpaRealtionship.getValue();
+ }
+ }
}
- }
- }
- return null;
- }
+ return null;
+ }
- @Override
- public String mapJPAEmbeddableType(final String jpaEmbeddableTypeName) {
- JPAEmbeddableTypeMapType jpaEmbeddableType = searchJPAEmbeddableTypeMapType(jpaEmbeddableTypeName);
- if (jpaEmbeddableType != null) {
- return jpaEmbeddableType.getEDMComplexType();
- } else {
- return null;
+ @Override
+ public String mapJPAEmbeddableType(final String jpaEmbeddableTypeName) {
+ JPAEmbeddableTypeMapType jpaEmbeddableType = searchJPAEmbeddableTypeMapType(jpaEmbeddableTypeName);
+ if (jpaEmbeddableType != null) {
+ return jpaEmbeddableType.getEDMComplexType();
+ }
+ return null;
}
- }
- @Override
- public String mapJPAEmbeddableTypeAttribute(final String jpaEmbeddableTypeName, final String jpaAttributeName) {
- JPAEmbeddableTypeMapType jpaEmbeddableType = searchJPAEmbeddableTypeMapType(jpaEmbeddableTypeName);
- if (jpaEmbeddableType != null && jpaEmbeddableType.getJPAAttributes() != null) {
- for (JPAAttribute jpaAttribute : jpaEmbeddableType.getJPAAttributes().getJPAAttribute()) {
- if (jpaAttribute.getName().equals(jpaAttributeName)) {
- return jpaAttribute.getValue();
+ @Override
+ public String mapJPAEmbeddableTypeAttribute(final String jpaEmbeddableTypeName, final String jpaAttributeName) {
+ JPAEmbeddableTypeMapType jpaEmbeddableType = searchJPAEmbeddableTypeMapType(jpaEmbeddableTypeName);
+ if (jpaEmbeddableType != null && jpaEmbeddableType.getJPAAttributes() != null) {
+ for (JPAAttribute jpaAttribute : jpaEmbeddableType.getJPAAttributes()
+ .getJPAAttribute()) {
+ if (jpaAttribute.getName()
+ .equals(jpaAttributeName)) {
+ return jpaAttribute.getValue();
+ }
+ }
}
- }
+ return null;
}
- return null;
- }
- private JPAEntityTypeMapType searchJPAEntityTypeMapType(final String jpaEntityTypeName) {
- if (mappingModel != null) {
- List<JPAEntityTypeMapType> types = mappingModel.getPersistenceUnit().getJPAEntityTypes().getJPAEntityType();
- for (JPAEntityTypeMapType jpaEntityType : types) {
- if (jpaEntityType.getName().equals(jpaEntityTypeName)) {
- return jpaEntityType;
+ private JPAEntityTypeMapType searchJPAEntityTypeMapType(final String jpaEntityTypeName) {
+ if (mappingModel != null) {
+ List<JPAEntityTypeMapType> types = mappingModel.getPersistenceUnit()
+ .getJPAEntityTypes()
+ .getJPAEntityType();
+ for (JPAEntityTypeMapType jpaEntityType : types) {
+ if (jpaEntityType.getName()
+ .equals(jpaEntityTypeName)) {
+ return jpaEntityType;
+ }
+ }
}
- }
+ return null;
}
- return null;
- }
- private JPAEmbeddableTypeMapType searchJPAEmbeddableTypeMapType(final String jpaEmbeddableTypeName) {
- if (null != mappingModel.getPersistenceUnit() &&
- null != mappingModel.getPersistenceUnit().getJPAEmbeddableTypes()) {
- for (JPAEmbeddableTypeMapType jpaEmbeddableType : mappingModel.getPersistenceUnit().getJPAEmbeddableTypes()
- .getJPAEmbeddableType()) {
- if (jpaEmbeddableType.getName().equals(jpaEmbeddableTypeName)) {
- return jpaEmbeddableType;
+ private JPAEmbeddableTypeMapType searchJPAEmbeddableTypeMapType(final String jpaEmbeddableTypeName) {
+ if (null != mappingModel.getPersistenceUnit() && null != mappingModel.getPersistenceUnit()
+ .getJPAEmbeddableTypes()) {
+ for (JPAEmbeddableTypeMapType jpaEmbeddableType : mappingModel.getPersistenceUnit()
+ .getJPAEmbeddableTypes()
+ .getJPAEmbeddableType()) {
+ if (jpaEmbeddableType.getName()
+ .equals(jpaEmbeddableTypeName)) {
+ return jpaEmbeddableType;
+ }
+ }
}
- }
+ return null;
}
- return null;
- }
- protected InputStream loadMappingModelInputStream() {
- if (mappingModelStream != null) {
- return mappingModelStream;
+ protected InputStream loadMappingModelInputStream() {
+ if (mappingModelStream != null) {
+ return mappingModelStream;
+ }
+ ClassLoader classLoader = JPAEdmMappingModelService.class.getClassLoader();
+ InputStream modelStream = classLoader.getResourceAsStream("../../" + mappingModelName);
+ return (modelStream != null) ? modelStream : classLoader.getResourceAsStream(mappingModelName);
}
- ClassLoader classLoader = JPAEdmMappingModelService.class.getClassLoader();
- InputStream modelStream = classLoader.getResourceAsStream("../../" + mappingModelName);
- return (modelStream != null) ? modelStream : classLoader.getResourceAsStream(mappingModelName);
- }
- @Override
- public boolean checkExclusionOfJPAEntityType(final String jpaEntityTypeName) {
- JPAEntityTypeMapType type = searchJPAEntityTypeMapType(jpaEntityTypeName);
- if (type != null) {
- return type.isExclude();
+ @Override
+ public boolean checkExclusionOfJPAEntityType(final String jpaEntityTypeName) {
+ JPAEntityTypeMapType type = searchJPAEntityTypeMapType(jpaEntityTypeName);
+ if (type != null) {
+ return type.isExclude();
+ }
+ return false;
}
- return false;
- }
- @Override
- public boolean checkExclusionOfJPAAttributeType(final String jpaEntityTypeName, final String jpaAttributeName) {
- JPAEntityTypeMapType type = searchJPAEntityTypeMapType(jpaEntityTypeName);
- if (type != null && type.getJPAAttributes() != null) {
- for (JPAAttribute jpaAttribute : type.getJPAAttributes().getJPAAttribute()) {
- if (jpaAttribute.getName().equals(jpaAttributeName)) {
- return jpaAttribute.isExclude();
+ @Override
+ public boolean checkExclusionOfJPAAttributeType(final String jpaEntityTypeName, final String jpaAttributeName) {
+ JPAEntityTypeMapType type = searchJPAEntityTypeMapType(jpaEntityTypeName);
+ if (type != null && type.getJPAAttributes() != null) {
+ for (JPAAttribute jpaAttribute : type.getJPAAttributes()
+ .getJPAAttribute()) {
+ if (jpaAttribute.getName()
+ .equals(jpaAttributeName)) {
+ return jpaAttribute.isExclude();
+ }
+ }
}
- }
+ return false;
}
- return false;
- }
- @Override
- public boolean checkExclusionOfJPAEmbeddableType(final String jpaEmbeddableTypeName) {
- JPAEmbeddableTypeMapType type = searchJPAEmbeddableTypeMapType(jpaEmbeddableTypeName);
- if (type != null) {
- return type.isExclude();
+ @Override
+ public boolean checkExclusionOfJPAEmbeddableType(final String jpaEmbeddableTypeName) {
+ JPAEmbeddableTypeMapType type = searchJPAEmbeddableTypeMapType(jpaEmbeddableTypeName);
+ if (type != null) {
+ return type.isExclude();
+ }
+ return false;
}
- return false;
- }
- @Override
- public boolean checkExclusionOfJPAEmbeddableAttributeType(final String jpaEmbeddableTypeName,
- final String jpaAttributeName) {
- JPAEmbeddableTypeMapType type = searchJPAEmbeddableTypeMapType(jpaEmbeddableTypeName);
- if (type != null && type.getJPAAttributes() != null) {
- for (JPAAttribute jpaAttribute : type.getJPAAttributes().getJPAAttribute()) {
- if (jpaAttribute.getName().equals(jpaAttributeName)) {
- return jpaAttribute.isExclude();
+ @Override
+ public boolean checkExclusionOfJPAEmbeddableAttributeType(final String jpaEmbeddableTypeName, final String jpaAttributeName) {
+ JPAEmbeddableTypeMapType type = searchJPAEmbeddableTypeMapType(jpaEmbeddableTypeName);
+ if (type != null && type.getJPAAttributes() != null) {
+ for (JPAAttribute jpaAttribute : type.getJPAAttributes()
+ .getJPAAttribute()) {
+ if (jpaAttribute.getName()
+ .equals(jpaAttributeName)) {
+ return jpaAttribute.isExclude();
+ }
+ }
}
- }
+ return false;
}
- return false;
- }
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPADefaultProcessorTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPADefaultProcessorTest.java
index 532a26e8..0b3e8173 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPADefaultProcessorTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPADefaultProcessorTest.java
@@ -1,26 +1,21 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.core;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.net.URI;
@@ -29,15 +24,8 @@ import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
-
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.EntityTransaction;
-import jakarta.persistence.Query;
-import jakarta.persistence.metamodel.EntityType;
-import jakarta.persistence.metamodel.Metamodel;
-
import org.apache.olingo.odata2.api.commons.HttpContentType;
import org.apache.olingo.odata2.api.commons.InlineCount;
import org.apache.olingo.odata2.api.edm.EdmConcurrencyMode;
@@ -69,7 +57,6 @@ import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext;
import org.apache.olingo.odata2.jpa.processor.api.ODataJPADefaultProcessor;
import org.apache.olingo.odata2.jpa.processor.api.ODataJPATransaction;
-import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPAModelException;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
import org.apache.olingo.odata2.jpa.processor.api.model.JPAEdmMapping;
import org.apache.olingo.odata2.jpa.processor.core.common.ODataJPATestConstants;
@@ -82,508 +69,612 @@ import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.Query;
+import jakarta.persistence.metamodel.EntityType;
+import jakarta.persistence.metamodel.Metamodel;
public class ODataJPADefaultProcessorTest extends JPAEdmTestModelView {
- private ODataJPADefaultProcessor objODataJPAProcessorDefault;
-
- private static final String STR_LOCAL_URI = "http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/";
- private static final String SALESORDERPROCESSING_CONTAINER = "salesorderprocessingContainer";
- private static final String SO_ID = "SoId";
- private static final String SALES_ORDER = "SalesOrder";
- private static final String SALES_ORDER_HEADERS = "SalesOrderHeaders";
- private static final String STR_CONTENT_TYPE = "Content-Type";
-
- @Before
- public void setUp() {
- objODataJPAProcessorDefault = new ODataJPADefaultProcessor(getLocalmockODataJPAContext()) { };
- }
-
- @Test
- public void testReadEntitySetGetEntitySetUriInfoString() {
- try {
- GetEntityUriInfo getEntityView = getEntityUriInfo();
- Assert.assertNotNull(objODataJPAProcessorDefault.readEntity(getEntityView, HttpContentType.APPLICATION_XML));
- } catch (ODataJPAModelException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e1) {// Expected
- assertTrue(true);
- } catch (ODataException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
-
- }
-
- @Test
- public void testcountEntitySet() {
- try {
- ODataResponse countEntitySet =
- objODataJPAProcessorDefault.countEntitySet(getEntitySetCountUriInfo(), HttpContentType.APPLICATION_XML);
- Assert.assertNotNull(countEntitySet);
- Object entity = countEntitySet.getEntity();
- Assert.assertNotNull(entity);
-
- byte[] b = new byte[2];
- ((ByteArrayInputStream) entity).read(b);
- Assert.assertEquals("11", new String(b, Charset.forName("utf-8")));
- } catch (ODataException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (Exception e) {
- assertTrue(true);
- }
- }
-
- @Test
- public void testExistsEntity() {
- try {
- Assert.assertNotNull(objODataJPAProcessorDefault.existsEntity(getEntityCountUriInfo(),
- HttpContentType.APPLICATION_XML));
- Assert.assertNull("ContentType MUST NOT set by entity provider", objODataJPAProcessorDefault.existsEntity(
- getEntityCountUriInfo(), HttpContentType.APPLICATION_XML).getHeader(STR_CONTENT_TYPE));
- } catch (ODataException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (Exception e) {
- assertTrue(true);
- }
- }
-
- @Test
- public void testDeleteEntity() {
- try {
- Assert.assertNotNull(objODataJPAProcessorDefault.deleteEntity(getDeletetUriInfo(),
- HttpContentType.APPLICATION_XML));
- } catch (ODataException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- }
-
- @Test
- public void testCreateEntity() {
- try {
- Assert.assertNotNull(objODataJPAProcessorDefault.createEntity(getPostUriInfo(), getMockedInputStreamContent(),
- HttpContentType.APPLICATION_XML, HttpContentType.APPLICATION_XML));
- } catch (ODataException e) {
- Assert.assertTrue(true); // Expected TODO - need to revisit
- }
- }
-
- @Test
- public void testUpdateEntity() {
- try {
- Assert.assertNotNull(objODataJPAProcessorDefault.updateEntity(getPutUriInfo(), getMockedInputStreamContent(),
- HttpContentType.APPLICATION_XML, false, HttpContentType.APPLICATION_XML));
- } catch (ODataException e) {
- Assert.assertTrue(true); // Expected TODO - need to revisit
- }
- }
-
- private PutMergePatchUriInfo getPutUriInfo() {
- return (PutMergePatchUriInfo) getDeletetUriInfo();
- }
-
- private PostUriInfo getPostUriInfo() {
- return (PostUriInfo) getDeletetUriInfo();
- }
-
- private InputStream getMockedInputStreamContent() {
- return new ByteArrayInputStream(getEntityBody().getBytes());
- }
-
- private String getEntityBody() {
- return "<entry xmlns=\"http://www.w3.org/2005/Atom\" " +
- "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" " +
- "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" " +
- "xml:base=\"http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/SalesOrderProcessing.svc/\">"
- + "<content type=\"application/xml\">"
- + "<m:properties>"
- + "<d:ID>2</d:ID>"
- + "<d:CreationDate>2013-01-02T00:00:00</d:CreationDate>"
- + "<d:CurrencyCode>Code_555</d:CurrencyCode>"
- + "<d:BuyerAddressInfo m:type=\"SalesOrderProcessing.AddressInfo\">"
- + "<d:Street>Test_Street_Name_055</d:Street>"
- + "<d:Number>2</d:Number>"
- + "<d:Country>Test_Country_2</d:Country>"
- + "<d:City>Test_City_2</d:City>"
- + "</d:BuyerAddressInfo>"
- + "<d:GrossAmount>0.0</d:GrossAmount>"
- + "<d:BuyerId>2</d:BuyerId>"
- + "<d:DeliveryStatus>true</d:DeliveryStatus>"
- + "<d:BuyerName>buyerName_2</d:BuyerName>"
- + "<d:NetAmount>0.0</d:NetAmount>" + "</m:properties>" + "</content>" + "</entry>";
- }
-
- private GetEntitySetCountUriInfo getEntitySetCountUriInfo() {
- return getLocalUriInfo();
- }
-
- private GetEntityCountUriInfo getEntityCountUriInfo() {
- return getLocalUriInfo();
- }
-
- private DeleteUriInfo getDeletetUriInfo() {
- UriInfo objUriInfo = EasyMock.createMock(UriInfo.class);
- EasyMock.expect(objUriInfo.getStartEntitySet()).andStubReturn(getLocalEdmEntitySet());
- List<NavigationSegment> navSegments = new ArrayList<NavigationSegment>();
- EasyMock.expect(objUriInfo.getNavigationSegments()).andReturn(navSegments).anyTimes();
- EasyMock.expect(objUriInfo.getTargetEntitySet()).andStubReturn(getLocalEdmEntitySet());
- EasyMock.expect(objUriInfo.getSelect()).andStubReturn(null);
- EasyMock.expect(objUriInfo.getOrderBy()).andStubReturn(getOrderByExpression());
- EasyMock.expect(objUriInfo.getTop()).andStubReturn(getTop());
- EasyMock.expect(objUriInfo.getSkip()).andStubReturn(getSkip());
- EasyMock.expect(objUriInfo.getInlineCount()).andStubReturn(getInlineCount());
- EasyMock.expect(objUriInfo.getFilter()).andStubReturn(getFilter());
- EasyMock.expect(objUriInfo.getKeyPredicates()).andStubReturn(getKeyPredicates());
- EasyMock.expect(objUriInfo.isLinks()).andStubReturn(false);
- EasyMock.replay(objUriInfo);
- return objUriInfo;
- }
-
- private List<KeyPredicate> getKeyPredicates() {
- List<KeyPredicate> keyPredicates = new ArrayList<KeyPredicate>();
- return keyPredicates;
- }
-
- /**
- * @return
- */
- private UriInfo getLocalUriInfo() {
- UriInfo objUriInfo = EasyMock.createMock(UriInfo.class);
- EasyMock.expect(objUriInfo.getStartEntitySet()).andStubReturn(getLocalEdmEntitySet());
- List<NavigationSegment> navSegments = new ArrayList<NavigationSegment>();
- EasyMock.expect(objUriInfo.getNavigationSegments()).andReturn(navSegments).anyTimes();
- EasyMock.expect(objUriInfo.getTargetEntitySet()).andStubReturn(getLocalEdmEntitySet());
- EasyMock.expect(objUriInfo.getSelect()).andStubReturn(null);
- EasyMock.expect(objUriInfo.getOrderBy()).andStubReturn(getOrderByExpression());
- EasyMock.expect(objUriInfo.getTop()).andStubReturn(getTop());
- EasyMock.expect(objUriInfo.getSkip()).andStubReturn(getSkip());
- EasyMock.expect(objUriInfo.getInlineCount()).andStubReturn(getInlineCount());
- EasyMock.expect(objUriInfo.getFilter()).andStubReturn(getFilter());
- EasyMock.expect(objUriInfo.getFunctionImport()).andStubReturn(null);
- EasyMock.replay(objUriInfo);
- return objUriInfo;
- }
-
- /**
- * @return
- * @throws EdmException
- */
- private EdmEntitySet getLocalEdmEntitySet() {
- EdmEntitySet edmEntitySet = EasyMock.createMock(EdmEntitySet.class);
- try {
- EasyMock.expect(edmEntitySet.getName()).andStubReturn(SALES_ORDER_HEADERS);
- EasyMock.expect(edmEntitySet.getEntityContainer()).andStubReturn(getLocalEdmEntityContainer());
- EasyMock.expect(edmEntitySet.getEntityType()).andStubReturn(getLocalEdmEntityType());
- EasyMock.replay(edmEntitySet);
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- return edmEntitySet;
- }
-
- /**
- * @return
- * @throws EdmException
- */
- private EdmEntityType getLocalEdmEntityType() {
- EdmEntityType edmEntityType = EasyMock.createMock(EdmEntityType.class);
- try {
- EasyMock.expect(edmEntityType.getKeyProperties()).andStubReturn(new ArrayList<EdmProperty>());
- EasyMock.expect(edmEntityType.getPropertyNames()).andStubReturn(getLocalPropertyNames());
- EasyMock.expect(edmEntityType.getProperty(SO_ID)).andStubReturn(getEdmTypedMockedObj(SALES_ORDER));
- EasyMock.expect(edmEntityType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
- EasyMock.expect(edmEntityType.getNamespace()).andStubReturn(SALES_ORDER_HEADERS);
- EasyMock.expect(edmEntityType.getName()).andStubReturn(SALES_ORDER_HEADERS);
- EasyMock.expect(edmEntityType.hasStream()).andStubReturn(false);
- EasyMock.expect(edmEntityType.getNavigationPropertyNames()).andStubReturn(new ArrayList<String>());
- EasyMock.expect(edmEntityType.getKeyPropertyNames()).andStubReturn(new ArrayList<String>());
- EasyMock.expect(edmEntityType.getMapping()).andStubReturn((EdmMapping) getEdmMappingMockedObj(SALES_ORDER));
- EasyMock.replay(edmEntityType);
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- return edmEntityType;
- }
-
- private InlineCount getInlineCount() {
- return InlineCount.NONE;
- }
-
- private FilterExpression getFilter() {
- return null;
- }
-
- private Integer getSkip() {
- return null;
- }
-
- private Integer getTop() {
- return null;
- }
-
- private OrderByExpression getOrderByExpression() {
- return null;
- }
-
- private ODataJPAContext getLocalmockODataJPAContext() {
- ODataJPAContext odataJPAContext = EasyMock.createMock(ODataJPAContext.class);
- EasyMock.expect(odataJPAContext.getPageSize()).andReturn(0).anyTimes();
- EasyMock.expect(odataJPAContext.getPersistenceUnitName()).andStubReturn("salesorderprocessing");
- EasyMock.expect(odataJPAContext.getEntityManagerFactory()).andStubReturn(mockEntityManagerFactory());
- EasyMock.expect(odataJPAContext.getODataJPATransaction()).andStubReturn(getLocalJpaTransaction());
- EasyMock.expect(odataJPAContext.getODataContext()).andStubReturn(getLocalODataContext());
- odataJPAContext.setODataContext((ODataContext) EasyMock.anyObject());
- EasyMock.expectLastCall().anyTimes();
- EasyMock.expect(odataJPAContext.getEntityManager()).andStubReturn(getLocalEntityManager());
- EasyMock.expect(odataJPAContext.isContainerManaged()).andReturn(false);
- EasyMock.expectLastCall().anyTimes();
- EasyMock.replay(odataJPAContext);
- return odataJPAContext;
- }
-
- private ODataJPATransaction getLocalJpaTransaction() {
- ODataJPATransaction tx = EasyMock.createMock(ODataJPATransaction.class);
- tx.begin(); // testing void method
- tx.commit();// testing void method
- tx.rollback();// testing void method
- EasyMock.expect(tx.isActive()).andReturn(false);
- EasyMock.expect(tx.isActive()).andReturn(false);
- EasyMock.replay(tx);
- return tx;
- }
-
- private EntityManagerFactory mockEntityManagerFactory() {
- EntityManagerFactory emf = EasyMock.createMock(EntityManagerFactory.class);
- EasyMock.expect(emf.getMetamodel()).andStubReturn(mockMetaModel());
- EasyMock.expect(emf.createEntityManager()).andStubReturn(getLocalEntityManager());
- EasyMock.replay(emf);
- return emf;
- }
-
- private EntityManagerFactory mockEntityManagerFactory2() {// For create, to avoid stackoverflow
- EntityManagerFactory emf = EasyMock.createMock(EntityManagerFactory.class);
- EasyMock.expect(emf.getMetamodel()).andStubReturn(mockMetaModel());
- EasyMock.replay(emf);
- return emf;
- }
-
- private EntityManager getLocalEntityManager() {
- EntityManager em = EasyMock.createMock(EntityManager.class);
- EasyMock.expect(em.createQuery("SELECT E1 FROM SalesOrderHeaders E1")).andStubReturn(getQuery());
- EasyMock.expect(em.createQuery("SELECT COUNT ( E1 ) FROM SalesOrderHeaders E1")).andStubReturn(
- getQueryForSelectCount());
- EasyMock.expect(em.getEntityManagerFactory()).andStubReturn(mockEntityManagerFactory2());// For create
- EasyMock.expect(em.getTransaction()).andStubReturn(getLocalTransaction()); // For Delete
- EasyMock.expect(em.isOpen()).andReturn(true).anyTimes();
- Address obj = new Address();
- em.remove(obj);// testing void method
- em.flush();
- em.close();
- EasyMock.expectLastCall().anyTimes();
- EasyMock.replay(em);
- return em;
- }
-
- private EntityTransaction getLocalTransaction() {
- EntityTransaction entityTransaction = EasyMock.createMock(EntityTransaction.class);
- entityTransaction.begin(); // testing void method
- entityTransaction.commit();// testing void method
- entityTransaction.rollback();// testing void method
- EasyMock.expect(entityTransaction.isActive()).andReturn(false);
- EasyMock.replay(entityTransaction);
- return entityTransaction;
- }
-
- private Query getQuery() {
- Query query = EasyMock.createMock(Query.class);
- EasyMock.expect(query.getResultList()).andStubReturn(getResultList());
- EasyMock.replay(query);
- return query;
- }
-
- private Query getQueryForSelectCount() {
- Query query = EasyMock.createMock(Query.class);
- EasyMock.expect(query.getResultList()).andStubReturn(getResultListForSelectCount());
- EasyMock.replay(query);
- return query;
- }
-
- private List<?> getResultList() {
- List<Object> list = new ArrayList<Object>();
- list.add(new Address());
- return list;
- }
-
- private List<?> getResultListForSelectCount() {
- List<Object> list = new ArrayList<Object>();
- list.add(new Long(11));
- return list;
- }
-
- class Address {
- private String soId = "12";
-
- public String getSoId() {
- return soId;
- }
-
- @Override
- public boolean equals(final Object obj) {
- boolean isEqual = false;
- if (obj instanceof Address) {
- isEqual = getSoId().equalsIgnoreCase(((Address) obj).getSoId());//
- }
- return isEqual;
- }
- }
-
- private Metamodel mockMetaModel() {
- Metamodel metaModel = EasyMock.createMock(Metamodel.class);
- EasyMock.expect(metaModel.getEntities()).andStubReturn(getLocalEntities());
- EasyMock.replay(metaModel);
- return metaModel;
- }
-
- private Set<EntityType<?>> getLocalEntities() {
- Set<EntityType<?>> entityTypeSet = new HashSet<EntityType<?>>();
- entityTypeSet.add(getLocalJPAEntityType());
- return entityTypeSet;
- }
-
- @SuppressWarnings("rawtypes")
- private EntityType<EntityType> getLocalJPAEntityType() {
- @SuppressWarnings("unchecked")
- EntityType<EntityType> entityType = EasyMock.createMock(EntityType.class);
- EasyMock.expect(entityType.getJavaType()).andStubReturn(EntityType.class);
- EasyMock.replay(entityType);
- return entityType;
- }
-
- private GetEntityUriInfo getEntityUriInfo() {
- GetEntityUriInfo getEntityView = EasyMock.createMock(GetEntityUriInfo.class);
- EdmEntitySet edmEntitySet = EasyMock.createMock(EdmEntitySet.class);
- EdmEntityType edmEntityType = EasyMock.createMock(EdmEntityType.class);
- try {
- EasyMock.expect(getEntityView.getExpand()).andStubReturn(null);
- EasyMock.expect(edmEntityType.getKeyProperties()).andStubReturn(new ArrayList<EdmProperty>());
- EasyMock.expect(edmEntitySet.getEntityType()).andStubReturn(edmEntityType);
- EasyMock.expect(edmEntitySet.getName()).andStubReturn(SALES_ORDER_HEADERS);
-
- EasyMock.expect(getEntityView.getSelect()).andStubReturn(null);
- EasyMock.expect(getEntityView.getTargetEntitySet()).andStubReturn(edmEntitySet);
- EasyMock.expect(edmEntityType.getPropertyNames()).andStubReturn(getLocalPropertyNames());
- EasyMock.expect(edmEntityType.getProperty(SO_ID)).andStubReturn(getEdmTypedMockedObj(SO_ID));
-
- EasyMock.expect(edmEntityType.getMapping()).andStubReturn((EdmMapping) getEdmMappingMockedObj(SALES_ORDER));
-
- EasyMock.expect(edmEntityType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
- EasyMock.expect(edmEntityType.getNamespace()).andStubReturn(SALES_ORDER_HEADERS);
- EasyMock.expect(edmEntityType.getName()).andStubReturn(SALES_ORDER_HEADERS);
- EasyMock.expect(edmEntityType.hasStream()).andStubReturn(false);
- EasyMock.expect(edmEntityType.getNavigationPropertyNames()).andStubReturn(new ArrayList<String>());
- EasyMock.expect(edmEntityType.getKeyPropertyNames()).andStubReturn(new ArrayList<String>());
-
- EasyMock.expect(edmEntitySet.getEntityContainer()).andStubReturn(getLocalEdmEntityContainer());
-
- EasyMock.replay(edmEntityType, edmEntitySet);
- EasyMock.expect(getEntityView.getKeyPredicates()).andStubReturn(new ArrayList<KeyPredicate>());
- List<NavigationSegment> navigationSegments = new ArrayList<NavigationSegment>();
- EasyMock.expect(getEntityView.getNavigationSegments()).andReturn(navigationSegments);
- EasyMock.expect(getEntityView.getStartEntitySet()).andReturn(edmEntitySet);
-
- EasyMock.replay(getEntityView);
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- return getEntityView;
- }
-
- private EdmEntityContainer getLocalEdmEntityContainer() {
- EdmEntityContainer edmEntityContainer = EasyMock.createMock(EdmEntityContainer.class);
- EasyMock.expect(edmEntityContainer.isDefaultEntityContainer()).andStubReturn(true);
- try {
- EasyMock.expect(edmEntityContainer.getName()).andStubReturn(SALESORDERPROCESSING_CONTAINER);
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
-
- EasyMock.replay(edmEntityContainer);
- return edmEntityContainer;
- }
-
- private EdmTyped getEdmTypedMockedObj(final String propertyName) {
- EdmProperty mockedEdmProperty = EasyMock.createMock(EdmProperty.class);
- try {
- EasyMock.expect(mockedEdmProperty.getMapping()).andStubReturn((EdmMapping) getEdmMappingMockedObj(propertyName));
- EdmType edmType = EasyMock.createMock(EdmType.class);
- EasyMock.expect(edmType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
- EasyMock.replay(edmType);
- EasyMock.expect(mockedEdmProperty.getName()).andStubReturn("identifier");
- EasyMock.expect(mockedEdmProperty.getType()).andStubReturn(edmType);
- EasyMock.expect(mockedEdmProperty.getFacets()).andStubReturn(getEdmFacetsMockedObj());
-
- EasyMock.replay(mockedEdmProperty);
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- return mockedEdmProperty;
- }
-
- private EdmFacets getEdmFacetsMockedObj() {
- EdmFacets facets = EasyMock.createMock(EdmFacets.class);
- EasyMock.expect(facets.getConcurrencyMode()).andStubReturn(EdmConcurrencyMode.Fixed);
-
- EasyMock.replay(facets);
- return facets;
- }
-
- private JPAEdmMapping getEdmMappingMockedObj(final String propertyName) {
- JPAEdmMappingImpl mockedEdmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
- if (propertyName.equalsIgnoreCase(SALES_ORDER)) {
- EasyMock.expect(((EdmMapping) mockedEdmMapping).getInternalName()).andStubReturn(SALES_ORDER_HEADERS);
- } else {
- EasyMock.expect(((EdmMapping) mockedEdmMapping).getInternalName()).andStubReturn(propertyName);
- }
- EasyMock.expect(mockedEdmMapping.getODataJPATombstoneEntityListener()).andReturn(null);
- EasyMock.<Class<?>> expect(mockedEdmMapping.getJPAType()).andReturn(SalesOrderHeader.class);
- EasyMock.replay(mockedEdmMapping);
- return mockedEdmMapping;
- }
-
- private List<String> getLocalPropertyNames() {
- List<String> list = new ArrayList<String>();
- list.add(SO_ID);
- return list;
- }
-
- private ODataContext getLocalODataContext() {
- ODataContext objODataContext = null;
- try {
- ODataContextMock contextMock = new ODataContextMock();
- contextMock.setODataService(new ODataServiceMock().mock());
- contextMock.setPathInfo(getLocalPathInfo());
- objODataContext = contextMock.mock();
-
- } catch (ODataException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- return objODataContext;
- }
-
- private PathInfo getLocalPathInfo() {
- PathInfo pathInfo = EasyMock.createMock(PathInfo.class);
- EasyMock.expect(pathInfo.getServiceRoot()).andStubReturn(getLocalURI());
- EasyMock.replay(pathInfo);
- return pathInfo;
- }
-
- private URI getLocalURI() {
- URI uri = null;
- try {
- uri = new URI(STR_LOCAL_URI);
- } catch (URISyntaxException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- return uri;
- }
+ private ODataJPADefaultProcessor objODataJPAProcessorDefault;
+
+ private static final String STR_LOCAL_URI = "http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/";
+ private static final String SALESORDERPROCESSING_CONTAINER = "salesorderprocessingContainer";
+ private static final String SO_ID = "SoId";
+ private static final String SALES_ORDER = "SalesOrder";
+ private static final String SALES_ORDER_HEADERS = "SalesOrderHeaders";
+ private static final String STR_CONTENT_TYPE = "Content-Type";
+
+ @Before
+ public void setUp() {
+ objODataJPAProcessorDefault = new ODataJPADefaultProcessor(getLocalmockODataJPAContext()) {};
+ }
+
+ @Test
+ public void testReadEntitySetGetEntitySetUriInfoString() {
+ try {
+ GetEntityUriInfo getEntityView = getEntityUriInfo();
+ Assert.assertNotNull(objODataJPAProcessorDefault.readEntity(getEntityView, HttpContentType.APPLICATION_XML));
+ } catch (ODataJPARuntimeException e1) {// Expected
+ assertTrue(true);
+ } catch (ODataException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+
+ }
+
+ @Test
+ public void testcountEntitySet() {
+ try {
+ ODataResponse countEntitySet =
+ objODataJPAProcessorDefault.countEntitySet(getEntitySetCountUriInfo(), HttpContentType.APPLICATION_XML);
+ Assert.assertNotNull(countEntitySet);
+ Object entity = countEntitySet.getEntity();
+ Assert.assertNotNull(entity);
+
+ byte[] b = new byte[2];
+ ((ByteArrayInputStream) entity).read(b);
+ Assert.assertEquals("11", new String(b, Charset.forName("utf-8")));
+ } catch (ODataException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ } catch (Exception e) {
+ assertTrue(true);
+ }
+ }
+
+ @Test
+ public void testExistsEntity() {
+ try {
+ Assert.assertNotNull(objODataJPAProcessorDefault.existsEntity(getEntityCountUriInfo(), HttpContentType.APPLICATION_XML));
+ Assert.assertNull("ContentType MUST NOT set by entity provider",
+ objODataJPAProcessorDefault.existsEntity(getEntityCountUriInfo(), HttpContentType.APPLICATION_XML)
+ .getHeader(STR_CONTENT_TYPE));
+ } catch (ODataException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ } catch (Exception e) {
+ assertTrue(true);
+ }
+ }
+
+ @Test
+ public void testDeleteEntity() {
+ try {
+ Assert.assertNotNull(objODataJPAProcessorDefault.deleteEntity(getDeletetUriInfo(), HttpContentType.APPLICATION_XML));
+ } catch (ODataException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ }
+
+ @Test
+ public void testCreateEntity() {
+ try {
+ Assert.assertNotNull(objODataJPAProcessorDefault.createEntity(getPostUriInfo(), getMockedInputStreamContent(),
+ HttpContentType.APPLICATION_XML, HttpContentType.APPLICATION_XML));
+ } catch (ODataException e) {
+ Assert.assertTrue(true); // Expected TODO - need to revisit
+ }
+ }
+
+ @Test
+ public void testUpdateEntity() {
+ try {
+ Assert.assertNotNull(objODataJPAProcessorDefault.updateEntity(getPutUriInfo(), getMockedInputStreamContent(),
+ HttpContentType.APPLICATION_XML, false, HttpContentType.APPLICATION_XML));
+ } catch (ODataException e) {
+ Assert.assertTrue(true); // Expected TODO - need to revisit
+ }
+ }
+
+ private PutMergePatchUriInfo getPutUriInfo() {
+ return (PutMergePatchUriInfo) getDeletetUriInfo();
+ }
+
+ private PostUriInfo getPostUriInfo() {
+ return (PostUriInfo) getDeletetUriInfo();
+ }
+
+ private InputStream getMockedInputStreamContent() {
+ return new ByteArrayInputStream(getEntityBody().getBytes());
+ }
+
+ private String getEntityBody() {
+ return "<entry xmlns=\"http://www.w3.org/2005/Atom\" "
+ + "xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" "
+ + "xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" "
+ + "xml:base=\"http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/SalesOrderProcessing.svc/\">"
+ + "<content type=\"application/xml\">" + "<m:properties>" + "<d:ID>2</d:ID>"
+ + "<d:CreationDate>2013-01-02T00:00:00</d:CreationDate>" + "<d:CurrencyCode>Code_555</d:CurrencyCode>"
+ + "<d:BuyerAddressInfo m:type=\"SalesOrderProcessing.AddressInfo\">" + "<d:Street>Test_Street_Name_055</d:Street>"
+ + "<d:Number>2</d:Number>" + "<d:Country>Test_Country_2</d:Country>" + "<d:City>Test_City_2</d:City>"
+ + "</d:BuyerAddressInfo>" + "<d:GrossAmount>0.0</d:GrossAmount>" + "<d:BuyerId>2</d:BuyerId>"
+ + "<d:DeliveryStatus>true</d:DeliveryStatus>" + "<d:BuyerName>buyerName_2</d:BuyerName>" + "<d:NetAmount>0.0</d:NetAmount>"
+ + "</m:properties>" + "</content>" + "</entry>";
+ }
+
+ private GetEntitySetCountUriInfo getEntitySetCountUriInfo() {
+ return getLocalUriInfo();
+ }
+
+ private GetEntityCountUriInfo getEntityCountUriInfo() {
+ return getLocalUriInfo();
+ }
+
+ private DeleteUriInfo getDeletetUriInfo() {
+ UriInfo objUriInfo = EasyMock.createMock(UriInfo.class);
+ EasyMock.expect(objUriInfo.getStartEntitySet())
+ .andStubReturn(getLocalEdmEntitySet());
+ List<NavigationSegment> navSegments = new ArrayList<NavigationSegment>();
+ EasyMock.expect(objUriInfo.getNavigationSegments())
+ .andReturn(navSegments)
+ .anyTimes();
+ EasyMock.expect(objUriInfo.getTargetEntitySet())
+ .andStubReturn(getLocalEdmEntitySet());
+ EasyMock.expect(objUriInfo.getSelect())
+ .andStubReturn(null);
+ EasyMock.expect(objUriInfo.getOrderBy())
+ .andStubReturn(getOrderByExpression());
+ EasyMock.expect(objUriInfo.getTop())
+ .andStubReturn(getTop());
+ EasyMock.expect(objUriInfo.getSkip())
+ .andStubReturn(getSkip());
+ EasyMock.expect(objUriInfo.getInlineCount())
+ .andStubReturn(getInlineCount());
+ EasyMock.expect(objUriInfo.getFilter())
+ .andStubReturn(getFilter());
+ EasyMock.expect(objUriInfo.getKeyPredicates())
+ .andStubReturn(getKeyPredicates());
+ EasyMock.expect(objUriInfo.isLinks())
+ .andStubReturn(false);
+ EasyMock.replay(objUriInfo);
+ return objUriInfo;
+ }
+
+ private List<KeyPredicate> getKeyPredicates() {
+ return new ArrayList<KeyPredicate>();
+ }
+
+ /**
+ * @return
+ */
+ private UriInfo getLocalUriInfo() {
+ UriInfo objUriInfo = EasyMock.createMock(UriInfo.class);
+ EasyMock.expect(objUriInfo.getStartEntitySet())
+ .andStubReturn(getLocalEdmEntitySet());
+ List<NavigationSegment> navSegments = new ArrayList<NavigationSegment>();
+ EasyMock.expect(objUriInfo.getNavigationSegments())
+ .andReturn(navSegments)
+ .anyTimes();
+ EasyMock.expect(objUriInfo.getTargetEntitySet())
+ .andStubReturn(getLocalEdmEntitySet());
+ EasyMock.expect(objUriInfo.getSelect())
+ .andStubReturn(null);
+ EasyMock.expect(objUriInfo.getOrderBy())
+ .andStubReturn(getOrderByExpression());
+ EasyMock.expect(objUriInfo.getTop())
+ .andStubReturn(getTop());
+ EasyMock.expect(objUriInfo.getSkip())
+ .andStubReturn(getSkip());
+ EasyMock.expect(objUriInfo.getInlineCount())
+ .andStubReturn(getInlineCount());
+ EasyMock.expect(objUriInfo.getFilter())
+ .andStubReturn(getFilter());
+ EasyMock.expect(objUriInfo.getFunctionImport())
+ .andStubReturn(null);
+ EasyMock.replay(objUriInfo);
+ return objUriInfo;
+ }
+
+ /**
+ * @return
+ * @throws EdmException
+ */
+ private EdmEntitySet getLocalEdmEntitySet() {
+ EdmEntitySet edmEntitySet = EasyMock.createMock(EdmEntitySet.class);
+ try {
+ EasyMock.expect(edmEntitySet.getName())
+ .andStubReturn(SALES_ORDER_HEADERS);
+ EasyMock.expect(edmEntitySet.getEntityContainer())
+ .andStubReturn(getLocalEdmEntityContainer());
+ EasyMock.expect(edmEntitySet.getEntityType())
+ .andStubReturn(getLocalEdmEntityType());
+ EasyMock.replay(edmEntitySet);
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ return edmEntitySet;
+ }
+
+ /**
+ * @return
+ * @throws EdmException
+ */
+ private EdmEntityType getLocalEdmEntityType() {
+ EdmEntityType edmEntityType = EasyMock.createMock(EdmEntityType.class);
+ try {
+ EasyMock.expect(edmEntityType.getKeyProperties())
+ .andStubReturn(new ArrayList<EdmProperty>());
+ EasyMock.expect(edmEntityType.getPropertyNames())
+ .andStubReturn(getLocalPropertyNames());
+ EasyMock.expect(edmEntityType.getProperty(SO_ID))
+ .andStubReturn(getEdmTypedMockedObj(SALES_ORDER));
+ EasyMock.expect(edmEntityType.getKind())
+ .andStubReturn(EdmTypeKind.SIMPLE);
+ EasyMock.expect(edmEntityType.getNamespace())
+ .andStubReturn(SALES_ORDER_HEADERS);
+ EasyMock.expect(edmEntityType.getName())
+ .andStubReturn(SALES_ORDER_HEADERS);
+ EasyMock.expect(edmEntityType.hasStream())
+ .andStubReturn(false);
+ EasyMock.expect(edmEntityType.getNavigationPropertyNames())
+ .andStubReturn(new ArrayList<String>());
+ EasyMock.expect(edmEntityType.getKeyPropertyNames())
+ .andStubReturn(new ArrayList<String>());
+ EasyMock.expect(edmEntityType.getMapping())
+ .andStubReturn((EdmMapping) getEdmMappingMockedObj(SALES_ORDER));
+ EasyMock.replay(edmEntityType);
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ return edmEntityType;
+ }
+
+ private InlineCount getInlineCount() {
+ return InlineCount.NONE;
+ }
+
+ private FilterExpression getFilter() {
+ return null;
+ }
+
+ private Integer getSkip() {
+ return null;
+ }
+
+ private Integer getTop() {
+ return null;
+ }
+
+ private OrderByExpression getOrderByExpression() {
+ return null;
+ }
+
+ private ODataJPAContext getLocalmockODataJPAContext() {
+ ODataJPAContext odataJPAContext = EasyMock.createMock(ODataJPAContext.class);
+ EasyMock.expect(odataJPAContext.getPageSize())
+ .andReturn(0)
+ .anyTimes();
+ EasyMock.expect(odataJPAContext.getPersistenceUnitName())
+ .andStubReturn("salesorderprocessing");
+ EasyMock.expect(odataJPAContext.getEntityManagerFactory())
+ .andStubReturn(mockEntityManagerFactory());
+ EasyMock.expect(odataJPAContext.getODataJPATransaction())
+ .andStubReturn(getLocalJpaTransaction());
+ EasyMock.expect(odataJPAContext.getODataContext())
+ .andStubReturn(getLocalODataContext());
+ odataJPAContext.setODataContext((ODataContext) EasyMock.anyObject());
+ EasyMock.expectLastCall()
+ .anyTimes();
+ EasyMock.expect(odataJPAContext.getEntityManager())
+ .andStubReturn(getLocalEntityManager());
+ EasyMock.expect(odataJPAContext.isContainerManaged())
+ .andReturn(false);
+ EasyMock.expectLastCall()
+ .anyTimes();
+ EasyMock.replay(odataJPAContext);
+ return odataJPAContext;
+ }
+
+ private ODataJPATransaction getLocalJpaTransaction() {
+ ODataJPATransaction tx = EasyMock.createMock(ODataJPATransaction.class);
+ tx.begin(); // testing void method
+ tx.commit();// testing void method
+ tx.rollback();// testing void method
+ EasyMock.expect(tx.isActive())
+ .andReturn(false);
+ EasyMock.expect(tx.isActive())
+ .andReturn(false);
+ EasyMock.replay(tx);
+ return tx;
+ }
+
+ private EntityManagerFactory mockEntityManagerFactory() {
+ EntityManagerFactory emf = EasyMock.createMock(EntityManagerFactory.class);
+ EasyMock.expect(emf.getMetamodel())
+ .andStubReturn(mockMetaModel());
+ EasyMock.expect(emf.createEntityManager())
+ .andStubReturn(getLocalEntityManager());
+ EasyMock.replay(emf);
+ return emf;
+ }
+
+ private EntityManagerFactory mockEntityManagerFactory2() {// For create, to avoid stackoverflow
+ EntityManagerFactory emf = EasyMock.createMock(EntityManagerFactory.class);
+ EasyMock.expect(emf.getMetamodel())
+ .andStubReturn(mockMetaModel());
+ EasyMock.replay(emf);
+ return emf;
+ }
+
+ private EntityManager getLocalEntityManager() {
+ EntityManager em = EasyMock.createMock(EntityManager.class);
+ EasyMock.expect(em.createQuery("SELECT E1 FROM SalesOrderHeaders E1"))
+ .andStubReturn(getQuery());
+ EasyMock.expect(em.createQuery("SELECT COUNT ( E1 ) FROM SalesOrderHeaders E1"))
+ .andStubReturn(getQueryForSelectCount());
+ EasyMock.expect(em.getEntityManagerFactory())
+ .andStubReturn(mockEntityManagerFactory2());// For create
+ EasyMock.expect(em.getTransaction())
+ .andStubReturn(getLocalTransaction()); // For Delete
+ EasyMock.expect(em.isOpen())
+ .andReturn(true)
+ .anyTimes();
+ Address obj = new Address();
+ em.remove(obj);// testing void method
+ em.flush();
+ em.close();
+ EasyMock.expectLastCall()
+ .anyTimes();
+ EasyMock.replay(em);
+ return em;
+ }
+
+ private EntityTransaction getLocalTransaction() {
+ EntityTransaction entityTransaction = EasyMock.createMock(EntityTransaction.class);
+ entityTransaction.begin(); // testing void method
+ entityTransaction.commit();// testing void method
+ entityTransaction.rollback();// testing void method
+ EasyMock.expect(entityTransaction.isActive())
+ .andReturn(false);
+ EasyMock.replay(entityTransaction);
+ return entityTransaction;
+ }
+
+ private Query getQuery() {
+ Query query = EasyMock.createMock(Query.class);
+ EasyMock.expect(query.getResultList())
+ .andStubReturn(getResultList());
+ EasyMock.replay(query);
+ return query;
+ }
+
+ private Query getQueryForSelectCount() {
+ Query query = EasyMock.createMock(Query.class);
+ EasyMock.expect(query.getResultList())
+ .andStubReturn(getResultListForSelectCount());
+ EasyMock.replay(query);
+ return query;
+ }
+
+ private List<?> getResultList() {
+ List<Object> list = new ArrayList<Object>();
+ list.add(new Address());
+ return list;
+ }
+
+ private List<?> getResultListForSelectCount() {
+ List<Object> list = new ArrayList<Object>();
+ list.add(new Long(11));
+ return list;
+ }
+
+ class Address {
+ private final String soId = "12";
+
+ public String getSoId() {
+ return soId;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + getEnclosingInstance().hashCode();
+ return prime * result + Objects.hash(soId);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Address other = (Address) obj;
+ if (!getEnclosingInstance().equals(other.getEnclosingInstance()))
+ return false;
+ return Objects.equals(soId, other.soId);
+ }
+
+ private ODataJPADefaultProcessorTest getEnclosingInstance() {
+ return ODataJPADefaultProcessorTest.this;
+ }
+ }
+
+ private Metamodel mockMetaModel() {
+ Metamodel metaModel = EasyMock.createMock(Metamodel.class);
+ EasyMock.expect(metaModel.getEntities())
+ .andStubReturn(getLocalEntities());
+ EasyMock.replay(metaModel);
+ return metaModel;
+ }
+
+ private Set<EntityType<?>> getLocalEntities() {
+ Set<EntityType<?>> entityTypeSet = new HashSet<EntityType<?>>();
+ entityTypeSet.add(getLocalJPAEntityType());
+ return entityTypeSet;
+ }
+
+ @SuppressWarnings("rawtypes")
+ private EntityType<EntityType> getLocalJPAEntityType() {
+ @SuppressWarnings("unchecked")
+ EntityType<EntityType> entityType = EasyMock.createMock(EntityType.class);
+ EasyMock.expect(entityType.getJavaType())
+ .andStubReturn(EntityType.class);
+ EasyMock.replay(entityType);
+ return entityType;
+ }
+
+ private GetEntityUriInfo getEntityUriInfo() {
+ GetEntityUriInfo getEntityView = EasyMock.createMock(GetEntityUriInfo.class);
+ EdmEntitySet edmEntitySet = EasyMock.createMock(EdmEntitySet.class);
+ EdmEntityType edmEntityType = EasyMock.createMock(EdmEntityType.class);
+ try {
+ EasyMock.expect(getEntityView.getExpand())
+ .andStubReturn(null);
+ EasyMock.expect(edmEntityType.getKeyProperties())
+ .andStubReturn(new ArrayList<EdmProperty>());
+ EasyMock.expect(edmEntitySet.getEntityType())
+ .andStubReturn(edmEntityType);
+ EasyMock.expect(edmEntitySet.getName())
+ .andStubReturn(SALES_ORDER_HEADERS);
+
+ EasyMock.expect(getEntityView.getSelect())
+ .andStubReturn(null);
+ EasyMock.expect(getEntityView.getTargetEntitySet())
+ .andStubReturn(edmEntitySet);
+ EasyMock.expect(edmEntityType.getPropertyNames())
+ .andStubReturn(getLocalPropertyNames());
+ EasyMock.expect(edmEntityType.getProperty(SO_ID))
+ .andStubReturn(getEdmTypedMockedObj(SO_ID));
+
+ EasyMock.expect(edmEntityType.getMapping())
+ .andStubReturn((EdmMapping) getEdmMappingMockedObj(SALES_ORDER));
+
+ EasyMock.expect(edmEntityType.getKind())
+ .andStubReturn(EdmTypeKind.SIMPLE);
+ EasyMock.expect(edmEntityType.getNamespace())
+ .andStubReturn(SALES_ORDER_HEADERS);
+ EasyMock.expect(edmEntityType.getName())
+ .andStubReturn(SALES_ORDER_HEADERS);
+ EasyMock.expect(edmEntityType.hasStream())
+ .andStubReturn(false);
+ EasyMock.expect(edmEntityType.getNavigationPropertyNames())
+ .andStubReturn(new ArrayList<String>());
+ EasyMock.expect(edmEntityType.getKeyPropertyNames())
+ .andStubReturn(new ArrayList<String>());
+
+ EasyMock.expect(edmEntitySet.getEntityContainer())
+ .andStubReturn(getLocalEdmEntityContainer());
+
+ EasyMock.replay(edmEntityType, edmEntitySet);
+ EasyMock.expect(getEntityView.getKeyPredicates())
+ .andStubReturn(new ArrayList<KeyPredicate>());
+ List<NavigationSegment> navigationSegments = new ArrayList<NavigationSegment>();
+ EasyMock.expect(getEntityView.getNavigationSegments())
+ .andReturn(navigationSegments);
+ EasyMock.expect(getEntityView.getStartEntitySet())
+ .andReturn(edmEntitySet);
+
+ EasyMock.replay(getEntityView);
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ return getEntityView;
+ }
+
+ private EdmEntityContainer getLocalEdmEntityContainer() {
+ EdmEntityContainer edmEntityContainer = EasyMock.createMock(EdmEntityContainer.class);
+ EasyMock.expect(edmEntityContainer.isDefaultEntityContainer())
+ .andStubReturn(true);
+ try {
+ EasyMock.expect(edmEntityContainer.getName())
+ .andStubReturn(SALESORDERPROCESSING_CONTAINER);
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+
+ EasyMock.replay(edmEntityContainer);
+ return edmEntityContainer;
+ }
+
+ private EdmTyped getEdmTypedMockedObj(final String propertyName) {
+ EdmProperty mockedEdmProperty = EasyMock.createMock(EdmProperty.class);
+ try {
+ EasyMock.expect(mockedEdmProperty.getMapping())
+ .andStubReturn((EdmMapping) getEdmMappingMockedObj(propertyName));
+ EdmType edmType = EasyMock.createMock(EdmType.class);
+ EasyMock.expect(edmType.getKind())
+ .andStubReturn(EdmTypeKind.SIMPLE);
+ EasyMock.replay(edmType);
+ EasyMock.expect(mockedEdmProperty.getName())
+ .andStubReturn("identifier");
+ EasyMock.expect(mockedEdmProperty.getType())
+ .andStubReturn(edmType);
+ EasyMock.expect(mockedEdmProperty.getFacets())
+ .andStubReturn(getEdmFacetsMockedObj());
+
+ EasyMock.replay(mockedEdmProperty);
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ return mockedEdmProperty;
+ }
+
+ private EdmFacets getEdmFacetsMockedObj() {
+ EdmFacets facets = EasyMock.createMock(EdmFacets.class);
+ EasyMock.expect(facets.getConcurrencyMode())
+ .andStubReturn(EdmConcurrencyMode.Fixed);
+
+ EasyMock.replay(facets);
+ return facets;
+ }
+
+ private JPAEdmMapping getEdmMappingMockedObj(final String propertyName) {
+ JPAEdmMappingImpl mockedEdmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
+ if (propertyName.equalsIgnoreCase(SALES_ORDER)) {
+ EasyMock.expect(((EdmMapping) mockedEdmMapping).getInternalName())
+ .andStubReturn(SALES_ORDER_HEADERS);
+ } else {
+ EasyMock.expect(((EdmMapping) mockedEdmMapping).getInternalName())
+ .andStubReturn(propertyName);
+ }
+ EasyMock.expect(mockedEdmMapping.getODataJPATombstoneEntityListener())
+ .andReturn(null);
+ EasyMock.<Class<?>>expect(mockedEdmMapping.getJPAType())
+ .andReturn(SalesOrderHeader.class);
+ EasyMock.replay(mockedEdmMapping);
+ return mockedEdmMapping;
+ }
+
+ private List<String> getLocalPropertyNames() {
+ List<String> list = new ArrayList<String>();
+ list.add(SO_ID);
+ return list;
+ }
+
+ private ODataContext getLocalODataContext() {
+ ODataContext objODataContext = null;
+ try {
+ ODataContextMock contextMock = new ODataContextMock();
+ contextMock.setODataService(new ODataServiceMock().mock());
+ contextMock.setPathInfo(getLocalPathInfo());
+ objODataContext = contextMock.mock();
+
+ } catch (ODataException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ return objODataContext;
+ }
+
+ private PathInfo getLocalPathInfo() {
+ PathInfo pathInfo = EasyMock.createMock(PathInfo.class);
+ EasyMock.expect(pathInfo.getServiceRoot())
+ .andStubReturn(getLocalURI());
+ EasyMock.replay(pathInfo);
+ return pathInfo;
+ }
+
+ private URI getLocalURI() {
+ URI uri = null;
+ try {
+ uri = new URI(STR_LOCAL_URI);
+ } catch (URISyntaxException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ return uri;
+ }
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderTest.java
index 7105c3db..d94f8829 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.core;
@@ -22,7 +18,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URI;
@@ -32,7 +27,6 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.olingo.odata2.api.commons.InlineCount;
import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
import org.apache.olingo.odata2.api.edm.EdmEntitySet;
@@ -76,658 +70,719 @@ import org.junit.Test;
public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
- private ODataJPAResponseBuilder responseBuilder;
-
- @Before
- public void init() {
- responseBuilder = new ODataJPAResponseBuilderDefault(getODataJPAContext());
- }
-
- /*
- * This Unit is supposed to test the building of Entity Provider Properties for query with $expand
- */
- @Test
- public void testGetEntityProviderPropertiesQuery() {
- GetEntitySetUriInfo getEntitySetUriInfo = mockEntitySetUriInfoForExpand();
- ODataJPAContext oDataJPAContext = getODataJPAContext();
- // Building the edm entity
- List<Map<String, Object>> edmEntityList = new ArrayList<Map<String, Object>>();
- Map<String, Object> edmEntity = new HashMap<String, Object>();
- edmEntity.put("ID", 1);
- edmEntityList.add(edmEntity);
- // Invoking the private static method using reflection
- Class<?> clazz = ODataJPAResponseBuilderDefault.class;
- Object[] actualParameters = { oDataJPAContext, getEntitySetUriInfo, edmEntityList };
- Class<?>[] formalParameters = { ODataJPAContext.class, GetEntitySetUriInfo.class, List.class };
- EntityProviderWriteProperties providerProperties = null;
- try {
- Method method = clazz.getDeclaredMethod("getEntityProviderProperties", formalParameters);
- method.setAccessible(true);
- providerProperties = (EntityProviderWriteProperties) method.invoke(responseBuilder, actualParameters);
- assertEquals(1, providerProperties.getExpandSelectTree().getLinks().size());
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalArgumentException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalAccessException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (InvocationTargetException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- }
-
- /*
- * This Unit is supposed to test the building of Entity Provider Properties for read with $expand
- */
- @Test
- public void testGetEntityProviderPropertiesRead() {
-
- // Getting the EntityUriInfo
- GetEntityUriInfo getEntityUriInfo = mockEntityUriInfoForExpand();
- ODataJPAContext oDataJPAContext = getODataJPAContext();
- Class<?> clazz = ODataJPAResponseBuilderDefault.class;
- Object[] actualParameters = { oDataJPAContext, getEntityUriInfo };
- Class<?>[] formalParameters = { ODataJPAContext.class, GetEntityUriInfo.class };
- EntityProviderWriteProperties providerProperties = null;
- try {
- Method method = clazz.getDeclaredMethod("getEntityProviderProperties", formalParameters);
- method.setAccessible(true);
- providerProperties = (EntityProviderWriteProperties) method.invoke(responseBuilder, actualParameters);
- assertEquals(1, providerProperties.getExpandSelectTree().getLinks().size());
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalArgumentException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalAccessException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (InvocationTargetException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
-
- }
-
- @SuppressWarnings("unchecked")
- @Test
- public void testConstructListofNavProperty() {
- List<ArrayList<NavigationPropertySegment>> expand = new ArrayList<ArrayList<NavigationPropertySegment>>();
- ArrayList<NavigationPropertySegment> navPropList1 = new ArrayList<NavigationPropertySegment>();
- navPropList1.add(getNavigationPropertySegment("DemoNavigationProperties11"));
- navPropList1.add(getNavigationPropertySegment("DemoNavigationProperties12"));
- expand.add(navPropList1);
- ArrayList<NavigationPropertySegment> navPropList2 = new ArrayList<NavigationPropertySegment>();
- navPropList2.add(getNavigationPropertySegment("DemoNavigationProperties21"));
- navPropList2.add(getNavigationPropertySegment("DemoNavigationProperties22"));
- expand.add(navPropList2);
- Class<?> clazz = ODataJPAResponseBuilderDefault.class;
- Object[] actualParameters = { expand };
- Class<?>[] formalParameters = { List.class };
- List<EdmNavigationProperty> navigationProperties = null;
- try {
- Method method = clazz.getDeclaredMethod("constructListofNavProperty", formalParameters);
- method.setAccessible(true);
- navigationProperties = (List<EdmNavigationProperty>) method.invoke(responseBuilder, actualParameters);
- assertEquals("DemoNavigationProperties21", navigationProperties.get(1).getName());
- assertEquals("DemoNavigationProperties11", navigationProperties.get(0).getName());
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalArgumentException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalAccessException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (InvocationTargetException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
-
- }
-
- @Test
- public void testBuildListOfTGetEntitySetUriInfoStringODataJPAContext() {
- try {
- assertNotNull(responseBuilder.build(getResultsView(), getJPAEntities(), "application/xml"));
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
-
- }
-
- @Test
- public void testBuildNegatives() {// Bad content type
- try {
- EntityType entity = new EntityType();
- entity.setName("SalesOrderHeader");
- try {
- assertNotNull(responseBuilder.build(getLocalGetURIInfo(), getEntity(), "xml"));
- } catch (ODataNotFoundException e) {
- assertTrue(true);
- }
- } catch (ODataJPARuntimeException e) {
- assertTrue(true);// Nothing to do, Expected.
- }
- try {// Bad content type
- assertNotNull(responseBuilder.build(getResultsView(), getJPAEntities(), "xml"));
- } catch (ODataJPARuntimeException e) {
- assertTrue(true);// Nothing to do, Expected.
- }
-
- }
-
- @Test
- public void testBuildObjectGetEntityUriInfoStringODataJPAContext() throws ODataNotFoundException {
- try {
- assertNotNull(responseBuilder.build(getLocalGetURIInfo(), (Object) new SalesOrderHeader(2, 10),
- "application/xml"));
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- }
-
- @Test
- public void testBuildNullSelects() {// Bad content type
- try {
- responseBuilder.build(getResultsViewWithNullSelects(), getJPAEntities(), "xml");
- } catch (ODataJPARuntimeException e) {
- assertTrue(true);// Nothing to do, Expected.
- } catch (Exception e) {
- assertTrue(true);
- }
- }
-
- @Test
- public void testBuildGetCount() {
- ODataResponse objODataResponse = null;
- try {
- objODataResponse = responseBuilder.build(1);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- assertNotNull(objODataResponse);
- }
-
- private ODataJPAContext getODataJPAContext() {
- ODataJPAContext objODataJPAContext = EasyMock.createMock(ODataJPAContext.class);
- EasyMock.expect(objODataJPAContext.getODataContext()).andStubReturn(getLocalODataContext());
- EasyMock.expect(objODataJPAContext.getPageSize()).andReturn(10);
- EasyMock.expect(objODataJPAContext.getPaging()).andReturn(mockJPAPaging()).anyTimes();
- EasyMock.replay(objODataJPAContext);
- return objODataJPAContext;
- }
-
- private ODataContext getLocalODataContext() {
- ODataContext objODataContext = EasyMock.createMock(ODataContext.class);
- try {
- EasyMock.expect(objODataContext.getPathInfo()).andStubReturn(getLocalPathInfo());
- } catch (ODataException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- EasyMock.replay(objODataContext);
- return objODataContext;
- }
-
- private JPAPaging mockJPAPaging() {
- JPAPaging paging = new JPAPaging() {
-
- @Override
- public int getStartPage() {
- return 0;
- }
-
- @Override
- public List<Object> getPagedEntities() {
- return null;
- }
-
- @Override
- public int getPageSize() {
- return 10;
- }
-
- @Override
- public int getNextPage() {
- return 10;
- }
- };
-
- return paging;
- }
-
- private PathInfo getLocalPathInfo() {
- PathInfo pathInfo = EasyMock.createMock(PathInfo.class);
- EasyMock.expect(pathInfo.getServiceRoot()).andStubReturn(getLocalURI());
- EasyMock.expect(pathInfo.getRequestUri()).andStubReturn(getRequestURI());
- EasyMock.replay(pathInfo);
- return pathInfo;
- }
-
- private URI getRequestURI() {
- URI uri = null;
- try {
- uri = new URI("SalesOrders");
- } catch (URISyntaxException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- return uri;
- }
-
- private URI getLocalURI() {
- URI uri = null;
- try {
- uri = new URI("http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/");
- } catch (URISyntaxException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- return uri;
- }
-
- private GetEntitySetUriInfo getResultsView() {
- GetEntitySetUriInfo objGetEntitySetUriInfo = EasyMock.createMock(GetEntitySetUriInfo.class);
- EasyMock.expect(objGetEntitySetUriInfo.getInlineCount()).andStubReturn(getLocalInlineCount());
- EasyMock.expect(objGetEntitySetUriInfo.getTargetEntitySet()).andStubReturn(getLocalTargetEntitySet());
- EasyMock.expect(objGetEntitySetUriInfo.getSelect()).andStubReturn(getSelectItemList());
- EasyMock.expect(objGetEntitySetUriInfo.getExpand()).andStubReturn(getExpandList());
- EasyMock.expect(objGetEntitySetUriInfo.getSkip()).andStubReturn(new Integer(1));
- EasyMock.replay(objGetEntitySetUriInfo);
- return objGetEntitySetUriInfo;
- }
-
- private List<ArrayList<NavigationPropertySegment>> getExpandList() {
- List<ArrayList<NavigationPropertySegment>> expandList = new ArrayList<ArrayList<NavigationPropertySegment>>();
- return expandList;
- }
-
- private GetEntitySetUriInfo getResultsViewWithNullSelects() {
- GetEntitySetUriInfo objGetEntitySetUriInfo = EasyMock.createMock(GetEntitySetUriInfo.class);
- EasyMock.expect(objGetEntitySetUriInfo.getInlineCount()).andStubReturn(getLocalInlineCount());
- EasyMock.expect(objGetEntitySetUriInfo.getTargetEntitySet()).andStubReturn(getLocalTargetEntitySet());
- EasyMock.expect(objGetEntitySetUriInfo.getSelect()).andStubReturn(null);
- EasyMock.expect(objGetEntitySetUriInfo.getExpand()).andStubReturn(null);
- EasyMock.expect(objGetEntitySetUriInfo.getSkip()).andStubReturn(new Integer(1));
-
- EasyMock.replay(objGetEntitySetUriInfo);
- return objGetEntitySetUriInfo;
- }
-
- private GetEntityUriInfo getLocalGetURIInfo() {
- GetEntityUriInfo objGetEntityUriInfo = EasyMock.createMock(GetEntityUriInfo.class);
- EasyMock.expect(objGetEntityUriInfo.getSelect()).andStubReturn(getSelectItemList());
- EasyMock.expect(objGetEntityUriInfo.getTargetEntitySet()).andStubReturn(getLocalTargetEntitySet());
- EasyMock.expect(objGetEntityUriInfo.getExpand()).andStubReturn(getExpandList());
- EasyMock.replay(objGetEntityUriInfo);
- return objGetEntityUriInfo;
- }
-
- private List<SelectItem> getSelectItemList() {
- List<SelectItem> selectItems = new ArrayList<SelectItem>();
- selectItems.add(getSelectItem());
- return selectItems;
- }
-
- private SelectItem getSelectItem() {
- SelectItem selectItem = EasyMock.createMock(SelectItem.class);
- EasyMock.expect(selectItem.getProperty()).andStubReturn(getEdmPropertyForSelect());
- List<NavigationPropertySegment> navigationSegmentList = new ArrayList<NavigationPropertySegment>();
- EasyMock.expect(selectItem.getNavigationPropertySegments()).andStubReturn(navigationSegmentList);
- EasyMock.expect(selectItem.isStar()).andReturn(false).anyTimes();
- EasyMock.replay(selectItem);
- return selectItem;
- }
-
- private EdmProperty getEdmPropertyForSelect() {
- EdmSimpleType edmType = EasyMock.createMock(EdmSimpleType.class);
- EasyMock.expect(edmType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
- Facets facets = new Facets().setNullable(false);
- try {
- EasyMock.expect(edmType.valueToString(new Integer(2), EdmLiteralKind.URI, facets)).andStubReturn("2");
- EasyMock.expect(edmType.valueToString(new Integer(2), EdmLiteralKind.DEFAULT, facets)).andStubReturn("2");
- } catch (EdmSimpleTypeException e1) {
- fail("There is an exception in mocking EdmType object " + e1.getMessage());
- }
- EasyMock.replay(edmType);
- EdmProperty edmProperty = EasyMock.createMock(EdmProperty.class);
- JPAEdmMappingImpl edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
- EasyMock.expect(edmMapping.getInternalName()).andStubReturn("soId");
- EasyMock.expect(edmMapping.getMediaResourceMimeTypeKey()).andReturn(null);
- EasyMock.expect(((JPAEdmMappingImpl) edmMapping).isVirtualAccess()).andStubReturn(false);
- EasyMock.replay(edmMapping);
- try {
- EasyMock.expect(edmProperty.getName()).andStubReturn("ID");
- EasyMock.expect(edmProperty.getType()).andStubReturn(edmType);
- EasyMock.expect(edmProperty.getMapping()).andStubReturn(edmMapping);
- EasyMock.expect(edmProperty.getFacets()).andStubReturn(facets);
- EasyMock.expect(edmProperty.getCustomizableFeedMappings()).andStubReturn(null);
- EasyMock.expect(edmProperty.getMimeType()).andStubReturn(null);
- EasyMock.replay(edmProperty);
-
- } catch (EdmException e) {
- fail("There is an exception in mocking some object " + e.getMessage());
- }
-
- return edmProperty;
-
- }
-
- private EdmEntitySet getLocalTargetEntitySet() {
- EdmEntitySet objEdmEntitySet = EasyMock.createMock(EdmEntitySet.class);
- try {
- EasyMock.expect(objEdmEntitySet.getEntityType()).andStubReturn(getLocalEdmEntityType());
- EasyMock.expect(objEdmEntitySet.getName()).andStubReturn("SalesOderHeaders");
- EasyMock.expect(objEdmEntitySet.getEntityContainer()).andStubReturn(getLocalEdmEntityContainer());
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
-
- EasyMock.replay(objEdmEntitySet);
- return objEdmEntitySet;
- }
-
- private EdmEntityContainer getLocalEdmEntityContainer() {
- EdmEntityContainer edmEntityContainer = EasyMock.createMock(EdmEntityContainer.class);
- EasyMock.expect(edmEntityContainer.isDefaultEntityContainer()).andStubReturn(true);
- try {
- EasyMock.expect(edmEntityContainer.getName()).andStubReturn("salesorderprocessingContainer");
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
-
- EasyMock.replay(edmEntityContainer);
- return edmEntityContainer;
- }
-
- private EdmEntityType getLocalEdmEntityType() {
- EdmEntityType objEdmEntityType = EasyMock.createMock(EdmEntityType.class);
- try {
- EasyMock.expect(objEdmEntityType.getName()).andStubReturn("SalesOderHeaders");
- EasyMock.expect(objEdmEntityType.getNamespace()).andStubReturn("SalesOderHeaders");
- EasyMock.expect(objEdmEntityType.getKind()).andStubReturn(EdmTypeKind.ENTITY);
- EasyMock.expect(objEdmEntityType.hasStream()).andStubReturn(false);
- EasyMock.expect(objEdmEntityType.hasStream()).andStubReturn(false);
- ArrayList<String> propertyNames = new ArrayList<String>();
- propertyNames.add("ID");
- EasyMock.expect(objEdmEntityType.getProperty("ID")).andStubReturn(getEdmPropertyForSelect());
- EasyMock.expect(objEdmEntityType.getPropertyNames()).andStubReturn(propertyNames);
- EasyMock.expect(objEdmEntityType.getNavigationPropertyNames()).andStubReturn(new ArrayList<String>());
- EasyMock.expect(objEdmEntityType.getKeyPropertyNames()).andStubReturn(propertyNames);
- EasyMock.expect(objEdmEntityType.getKeyProperties()).andStubReturn(getKeyProperties());
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- EasyMock.replay(objEdmEntityType);
- return objEdmEntityType;
- }
-
- private List<EdmProperty> getKeyProperties() {
- List<EdmProperty> edmProperties = new ArrayList<EdmProperty>();
- EdmType edmType = EasyMock.createMock(EdmType.class);
- EasyMock.expect(edmType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
- EasyMock.replay(edmType);
- EdmProperty edmProperty = EasyMock.createMock(EdmProperty.class);
- EdmMapping edmMapping = EasyMock.createMock(EdmMapping.class);
- EasyMock.expect(edmMapping.getInternalName()).andStubReturn("soId");
- EasyMock.replay(edmMapping);
- try {
- EasyMock.expect(edmProperty.getName()).andStubReturn("ID");
- EasyMock.expect(edmProperty.getType()).andStubReturn(edmType);
- EasyMock.expect(edmProperty.getMapping()).andStubReturn(edmMapping);
- EasyMock.replay(edmProperty);
- } catch (EdmException e) {
- fail("There is an exception is mocking some object " + e.getMessage());
- }
-
- edmProperties.add(edmProperty);
- return edmProperties;
- }
-
- private InlineCount getLocalInlineCount() {
- return InlineCount.NONE;
- }
-
- class SalesOrderHeader {
- private int soId;
- private int Field1;
-
- public SalesOrderHeader(final int soId, final int field) {
- this.soId = soId;
- Field1 = field;
- }
-
- public int getField1() {
- return Field1;
- }
-
- public void setField1(final int field1) {
- Field1 = field1;
- }
-
- public int getSoId() {
- return soId;
- }
-
- public void setSoId(final int soId) {
- this.soId = soId;
- }
-
- }
-
- private List<Object> getJPAEntities() {
- List<Object> listJPAEntities = new ArrayList<Object>();
- SalesOrderHeader entity;
- entity = new SalesOrderHeader(2, 10);
- listJPAEntities.add(entity);
- return listJPAEntities;
- }
-
- private Object getEntity() {
- SalesOrderHeader sHeader = new SalesOrderHeader(10, 34);
- return sHeader;
- }
-
- private GetEntityUriInfo mockEntityUriInfoForExpand() {
-
- List<SelectItem> selectItemList = new ArrayList<SelectItem>();
- List<ArrayList<NavigationPropertySegment>> expandList = new ArrayList<ArrayList<NavigationPropertySegment>>();
- ArrayList<NavigationPropertySegment> navigationPropertyList = new ArrayList<NavigationPropertySegment>();
- // Mocking the navigation property
- EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
- try {
- EasyMock.expect(navigationProperty.getName()).andStubReturn("SalesOrderItemDetails");
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- EasyMock.replay(navigationProperty);
- // Mocking the navigation property segments and adding to expand list
- NavigationPropertySegment navigationPropertySegment = EasyMock.createMock(NavigationPropertySegment.class);
- EasyMock.expect(navigationPropertySegment.getNavigationProperty()).andStubReturn(navigationProperty);
- EasyMock.expect(navigationPropertySegment.getTargetEntitySet()).andStubReturn(getTargetEntitySetForExpand());
- EasyMock.replay(navigationPropertySegment);
- navigationPropertyList.add(navigationPropertySegment);
- expandList.add(navigationPropertyList);
- // Mocking EntityUriInfo
- GetEntityUriInfo entityUriInfo = EasyMock.createMock(GetEntityUriInfo.class);
- EasyMock.expect(entityUriInfo.getSelect()).andStubReturn(selectItemList);
- EasyMock.expect(entityUriInfo.getExpand()).andStubReturn(expandList);
- EasyMock.replay(entityUriInfo);
- return entityUriInfo;
- }
-
- private GetEntitySetUriInfo mockEntitySetUriInfoForExpand() {
-
- List<SelectItem> selectItemList = new ArrayList<SelectItem>();
- List<ArrayList<NavigationPropertySegment>> expandList = new ArrayList<ArrayList<NavigationPropertySegment>>();
- ArrayList<NavigationPropertySegment> navigationPropertyList = new ArrayList<NavigationPropertySegment>();
- // Mocking the navigation property
- EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
- try {
- EasyMock.expect(navigationProperty.getName()).andStubReturn("SalesOrderItemDetails");
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- EasyMock.replay(navigationProperty);
- // Mocking the navigation property segments and adding to expand list
- NavigationPropertySegment navigationPropertySegment = EasyMock.createMock(NavigationPropertySegment.class);
- EasyMock.expect(navigationPropertySegment.getNavigationProperty()).andStubReturn(navigationProperty);
- EasyMock.expect(navigationPropertySegment.getTargetEntitySet()).andStubReturn(getTargetEntitySetForExpand());
- EasyMock.replay(navigationPropertySegment);
- navigationPropertyList.add(navigationPropertySegment);
- expandList.add(navigationPropertyList);
- // Mocking EntityUriInfo
- UriInfoImpl entitySetUriInfo = EasyMock.createMock(UriInfoImpl.class);
- EasyMock.expect(entitySetUriInfo.getSelect()).andStubReturn(selectItemList);
- EasyMock.expect(entitySetUriInfo.getExpand()).andStubReturn(expandList);
- EasyMock.expect(entitySetUriInfo.getInlineCount()).andStubReturn(InlineCount.ALLPAGES);
- EasyMock.expect(entitySetUriInfo.getSkip()).andStubReturn(new Integer(1));
- EasyMock.expect(entitySetUriInfo.getTop()).andStubReturn(new Integer(2));
- Map<String, String> customQuery = new HashMap<String, String>();
- customQuery.put("count", "5");
- entitySetUriInfo.setCustomQueryOptions(null);
- EasyMock.expectLastCall().times(1);
- EasyMock.expect(entitySetUriInfo.getCustomQueryOptions()).andStubReturn(customQuery );
- EasyMock.replay(entitySetUriInfo);
- return entitySetUriInfo;
- }
-
- private EdmEntitySet getTargetEntitySetForExpand() {
- EdmEntitySet entitySet = EasyMock.createMock(EdmEntitySet.class);
- try {
- EasyMock.expect(entitySet.getName()).andStubReturn("SalesOrderHeaders");
- EasyMock.expect(entitySet.getEntityType()).andStubReturn(null);
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- EasyMock.replay(entitySet);
- return entitySet;
- }
-
- private NavigationPropertySegment getNavigationPropertySegment(final String navPropertyName) {
- EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
- try {
- EasyMock.expect(navigationProperty.getName()).andStubReturn(navPropertyName);
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- EasyMock.replay(navigationProperty);
- NavigationPropertySegment navPropertySegment = EasyMock.createMock(NavigationPropertySegment.class);
- EasyMock.expect(navPropertySegment.getNavigationProperty()).andStubReturn(navigationProperty);
- EasyMock.replay(navPropertySegment);
- return navPropertySegment;
- }
-
- private GetFunctionImportUriInfo mockFunctionImportUriInfo() {
-
- List<SelectItem> selectItemList = new ArrayList<SelectItem>();
- List<ArrayList<NavigationPropertySegment>> expandList = new
- ArrayList<ArrayList<NavigationPropertySegment>>();
- ArrayList<NavigationPropertySegment> navigationPropertyList = new ArrayList<NavigationPropertySegment>();
- // Mocking the navigation property
- EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
- try {
- EasyMock.expect(navigationProperty.getName()).andStubReturn("SalesOrderItemDetails");
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() +
- ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- EasyMock.replay(navigationProperty);
-
- // Mocking the navigation property segments and adding to expand list
- NavigationPropertySegment navigationPropertySegment = EasyMock.createMock(NavigationPropertySegment.class);
- EasyMock.expect(navigationPropertySegment.getNavigationProperty()).andStubReturn(navigationProperty);
- EasyMock.expect(navigationPropertySegment.getTargetEntitySet())
- .andStubReturn(getTargetEntitySetForExpand());
- EasyMock.replay(navigationPropertySegment);
- navigationPropertyList.add(navigationPropertySegment);
- expandList.add(navigationPropertyList);
- // Mocking EntityUriInfo
- UriInfoImpl functionImportUriInfo = EasyMock.createMock(UriInfoImpl.class);
- EasyMock.expect(functionImportUriInfo.getSelect()).andStubReturn(selectItemList);
- EasyMock.expect(functionImportUriInfo.getExpand()).andStubReturn(expandList);
- EasyMock.expect(functionImportUriInfo.getInlineCount()).andStubReturn(InlineCount.ALLPAGES);
- EasyMock.expect(functionImportUriInfo.getFunctionImport()).andStubReturn(mockEdmFunctionImport());
- EasyMock.expect(functionImportUriInfo.getCustomQueryOptions()).andStubReturn(null);
- EasyMock.replay(functionImportUriInfo);
- return functionImportUriInfo;
- }
-
- private EdmFunctionImport mockEdmFunctionImport() {
- EdmFunctionImport funcImport = EasyMock.createMock(EdmFunctionImport.class);
- try {
- EasyMock.expect(funcImport.getName()).andStubReturn("FindAllSalesOrders");
- EasyMock.expect(funcImport.getEntitySet()).andStubReturn(getLocalTargetEntitySet());
- EasyMock.expect(funcImport.getParameterNames()).andStubReturn(
- Arrays.asList("DeliveryStatusCode"));
- EdmTyped typed = EasyMock.createMock(EdmTyped.class);
- EasyMock.expect(typed.getName()).andStubReturn("SalesOrder");
- EasyMock.expect(typed.getMultiplicity()).andStubReturn(EdmMultiplicity.MANY);
- EasyMock.expect(typed.getType()).andStubReturn(getLocalEdmEntityType());
- EasyMock.replay(typed);
- EasyMock.expect(funcImport.getReturnType()).andStubReturn(typed);
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 +
- e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- EasyMock.replay(funcImport);
- return funcImport;
- }
- /*
- * This Unit is supposed to test the building of Entity Provider Properties for function import
- */
- @Test
- public void testFunctionImportProviderProperties() {
-
- // Getting the EntityUriInfo
- GetFunctionImportUriInfo getfuncImportUriInfo = mockFunctionImportUriInfo();
- ODataJPAContext oDataJPAContext = getODataJPAContext();
- Class<?> clazz = ODataJPAResponseBuilderDefault.class;
- // Building the edm entity
- List<Map<String, Object>> edmEntityList = new ArrayList<Map<String, Object>>();
- Map<String, Object> edmEntity = new HashMap<String, Object>();
- edmEntity.put("ID", 1);
- edmEntityList.add(edmEntity);
- Object[] actualParameters = { oDataJPAContext, getfuncImportUriInfo, edmEntityList };
- Class<?>[] formalParameters = { ODataJPAContext.class, GetFunctionImportUriInfo.class, List.class };
- EntityProviderWriteProperties providerProperties = null;
- try {
- Method method = clazz.getDeclaredMethod("getEntityProviderProperties", formalParameters);
- method.setAccessible(true);
- providerProperties = (EntityProviderWriteProperties) method.invoke(responseBuilder, actualParameters);
- assertEquals(1, providerProperties.getExpandSelectTree().getLinks().size());
- assertEquals(InlineCount.ALLPAGES, providerProperties.getInlineCountType());
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalArgumentException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalAccessException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (InvocationTargetException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
-
- }
-
- @Test
- public void testBuildListOfGetFunctionimportUriInfo() throws Exception {
- try {
- assertNotNull(responseBuilder.build(getFIResultsView(), getJPAEntities(), "application/xml"));
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
-
- }
-
- private GetFunctionImportUriInfo getFIResultsView() {
- GetFunctionImportUriInfo objGetFunctionImportUriInfo = EasyMock.createMock(GetFunctionImportUriInfo.class);
- EasyMock.expect(objGetFunctionImportUriInfo.getInlineCount()).andStubReturn(getLocalInlineCount());
- EasyMock.expect(objGetFunctionImportUriInfo.getFunctionImport()).andStubReturn(mockEdmFunctionImport());
- EasyMock.expect(objGetFunctionImportUriInfo.getSelect()).andStubReturn(getSelectItemList());
- EasyMock.expect(objGetFunctionImportUriInfo.getExpand()).andStubReturn(getExpandList());
- EasyMock.replay(objGetFunctionImportUriInfo);
- return objGetFunctionImportUriInfo;
- }
+ private ODataJPAResponseBuilder responseBuilder;
+
+ @Before
+ public void init() {
+ responseBuilder = new ODataJPAResponseBuilderDefault(getODataJPAContext());
+ }
+
+ /*
+ * This Unit is supposed to test the building of Entity Provider Properties for query with $expand
+ */
+ @Test
+ public void testGetEntityProviderPropertiesQuery() {
+ GetEntitySetUriInfo getEntitySetUriInfo = mockEntitySetUriInfoForExpand();
+ ODataJPAContext oDataJPAContext = getODataJPAContext();
+ // Building the edm entity
+ List<Map<String, Object>> edmEntityList = new ArrayList<Map<String, Object>>();
+ Map<String, Object> edmEntity = new HashMap<String, Object>();
+ edmEntity.put("ID", 1);
+ edmEntityList.add(edmEntity);
+ // Invoking the private static method using reflection
+ Class<?> clazz = ODataJPAResponseBuilderDefault.class;
+ Object[] actualParameters = {oDataJPAContext, getEntitySetUriInfo, edmEntityList};
+ Class<?>[] formalParameters = {ODataJPAContext.class, GetEntitySetUriInfo.class, List.class};
+ EntityProviderWriteProperties providerProperties = null;
+ try {
+ Method method = clazz.getDeclaredMethod("getEntityProviderProperties", formalParameters);
+ method.setAccessible(true);
+ providerProperties = (EntityProviderWriteProperties) method.invoke(responseBuilder, actualParameters);
+ assertEquals(1, providerProperties.getExpandSelectTree()
+ .getLinks()
+ .size());
+ } catch (SecurityException | NoSuchMethodException | IllegalArgumentException | IllegalAccessException
+ | InvocationTargetException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ }
+
+ /*
+ * This Unit is supposed to test the building of Entity Provider Properties for read with $expand
+ */
+ @Test
+ public void testGetEntityProviderPropertiesRead() {
+
+ // Getting the EntityUriInfo
+ GetEntityUriInfo getEntityUriInfo = mockEntityUriInfoForExpand();
+ ODataJPAContext oDataJPAContext = getODataJPAContext();
+ Class<?> clazz = ODataJPAResponseBuilderDefault.class;
+ Object[] actualParameters = {oDataJPAContext, getEntityUriInfo};
+ Class<?>[] formalParameters = {ODataJPAContext.class, GetEntityUriInfo.class};
+ EntityProviderWriteProperties providerProperties = null;
+ try {
+ Method method = clazz.getDeclaredMethod("getEntityProviderProperties", formalParameters);
+ method.setAccessible(true);
+ providerProperties = (EntityProviderWriteProperties) method.invoke(responseBuilder, actualParameters);
+ assertEquals(1, providerProperties.getExpandSelectTree()
+ .getLinks()
+ .size());
+ } catch (SecurityException | NoSuchMethodException | IllegalArgumentException | IllegalAccessException
+ | InvocationTargetException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+
+ }
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testConstructListofNavProperty() {
+ List<ArrayList<NavigationPropertySegment>> expand = new ArrayList<ArrayList<NavigationPropertySegment>>();
+ ArrayList<NavigationPropertySegment> navPropList1 = new ArrayList<NavigationPropertySegment>();
+ navPropList1.add(getNavigationPropertySegment("DemoNavigationProperties11"));
+ navPropList1.add(getNavigationPropertySegment("DemoNavigationProperties12"));
+ expand.add(navPropList1);
+ ArrayList<NavigationPropertySegment> navPropList2 = new ArrayList<NavigationPropertySegment>();
+ navPropList2.add(getNavigationPropertySegment("DemoNavigationProperties21"));
+ navPropList2.add(getNavigationPropertySegment("DemoNavigationProperties22"));
+ expand.add(navPropList2);
+ Class<?> clazz = ODataJPAResponseBuilderDefault.class;
+ Object[] actualParameters = {expand};
+ Class<?>[] formalParameters = {List.class};
+ List<EdmNavigationProperty> navigationProperties = null;
+ try {
+ Method method = clazz.getDeclaredMethod("constructListofNavProperty", formalParameters);
+ method.setAccessible(true);
+ navigationProperties = (List<EdmNavigationProperty>) method.invoke(responseBuilder, actualParameters);
+ assertEquals("DemoNavigationProperties21", navigationProperties.get(1)
+ .getName());
+ assertEquals("DemoNavigationProperties11", navigationProperties.get(0)
+ .getName());
+ } catch (SecurityException | NoSuchMethodException | IllegalArgumentException | IllegalAccessException | InvocationTargetException
+ | EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+
+ }
+
+ @Test
+ public void testBuildListOfTGetEntitySetUriInfoStringODataJPAContext() {
+ try {
+ assertNotNull(responseBuilder.build(getResultsView(), getJPAEntities(), "application/xml"));
+ } catch (ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+
+ }
+
+ @Test
+ public void testBuildNegatives() {// Bad content type
+ try {
+ EntityType entity = new EntityType();
+ entity.setName("SalesOrderHeader");
+ try {
+ assertNotNull(responseBuilder.build(getLocalGetURIInfo(), getEntity(), "xml"));
+ } catch (ODataNotFoundException e) {
+ assertTrue(true);
+ }
+ } catch (ODataJPARuntimeException e) {
+ assertTrue(true);// Nothing to do, Expected.
+ }
+ try {// Bad content type
+ assertNotNull(responseBuilder.build(getResultsView(), getJPAEntities(), "xml"));
+ } catch (ODataJPARuntimeException e) {
+ assertTrue(true);// Nothing to do, Expected.
+ }
+
+ }
+
+ @Test
+ public void testBuildObjectGetEntityUriInfoStringODataJPAContext() throws ODataNotFoundException {
+ try {
+ assertNotNull(responseBuilder.build(getLocalGetURIInfo(), new SalesOrderHeader(2, 10), "application/xml"));
+ } catch (ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ }
+
+ @Test
+ public void testBuildNullSelects() {// Bad content type
+ try {
+ responseBuilder.build(getResultsViewWithNullSelects(), getJPAEntities(), "xml");
+ } catch (Exception e) {
+ assertTrue(true);
+ }
+ }
+
+ @Test
+ public void testBuildGetCount() {
+ ODataResponse objODataResponse = null;
+ try {
+ objODataResponse = responseBuilder.build(1);
+ } catch (ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ assertNotNull(objODataResponse);
+ }
+
+ private ODataJPAContext getODataJPAContext() {
+ ODataJPAContext objODataJPAContext = EasyMock.createMock(ODataJPAContext.class);
+ EasyMock.expect(objODataJPAContext.getODataContext())
+ .andStubReturn(getLocalODataContext());
+ EasyMock.expect(objODataJPAContext.getPageSize())
+ .andReturn(10);
+ EasyMock.expect(objODataJPAContext.getPaging())
+ .andReturn(mockJPAPaging())
+ .anyTimes();
+ EasyMock.replay(objODataJPAContext);
+ return objODataJPAContext;
+ }
+
+ private ODataContext getLocalODataContext() {
+ ODataContext objODataContext = EasyMock.createMock(ODataContext.class);
+ try {
+ EasyMock.expect(objODataContext.getPathInfo())
+ .andStubReturn(getLocalPathInfo());
+ } catch (ODataException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ EasyMock.replay(objODataContext);
+ return objODataContext;
+ }
+
+ private JPAPaging mockJPAPaging() {
+ return new JPAPaging() {
+
+ @Override
+ public int getStartPage() {
+ return 0;
+ }
+
+ @Override
+ public List<Object> getPagedEntities() {
+ return null;
+ }
+
+ @Override
+ public int getPageSize() {
+ return 10;
+ }
+
+ @Override
+ public int getNextPage() {
+ return 10;
+ }
+ };
+ }
+
+ private PathInfo getLocalPathInfo() {
+ PathInfo pathInfo = EasyMock.createMock(PathInfo.class);
+ EasyMock.expect(pathInfo.getServiceRoot())
+ .andStubReturn(getLocalURI());
+ EasyMock.expect(pathInfo.getRequestUri())
+ .andStubReturn(getRequestURI());
+ EasyMock.replay(pathInfo);
+ return pathInfo;
+ }
+
+ private URI getRequestURI() {
+ URI uri = null;
+ try {
+ uri = new URI("SalesOrders");
+ } catch (URISyntaxException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ return uri;
+ }
+
+ private URI getLocalURI() {
+ URI uri = null;
+ try {
+ uri = new URI("http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/");
+ } catch (URISyntaxException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ return uri;
+ }
+
+ private GetEntitySetUriInfo getResultsView() {
+ GetEntitySetUriInfo objGetEntitySetUriInfo = EasyMock.createMock(GetEntitySetUriInfo.class);
+ EasyMock.expect(objGetEntitySetUriInfo.getInlineCount())
+ .andStubReturn(getLocalInlineCount());
+ EasyMock.expect(objGetEntitySetUriInfo.getTargetEntitySet())
+ .andStubReturn(getLocalTargetEntitySet());
+ EasyMock.expect(objGetEntitySetUriInfo.getSelect())
+ .andStubReturn(getSelectItemList());
+ EasyMock.expect(objGetEntitySetUriInfo.getExpand())
+ .andStubReturn(getExpandList());
+ EasyMock.expect(objGetEntitySetUriInfo.getSkip())
+ .andStubReturn(new Integer(1));
+ EasyMock.replay(objGetEntitySetUriInfo);
+ return objGetEntitySetUriInfo;
+ }
+
+ private List<ArrayList<NavigationPropertySegment>> getExpandList() {
+ return new ArrayList<ArrayList<NavigationPropertySegment>>();
+ }
+
+ private GetEntitySetUriInfo getResultsViewWithNullSelects() {
+ GetEntitySetUriInfo objGetEntitySetUriInfo = EasyMock.createMock(GetEntitySetUriInfo.class);
+ EasyMock.expect(objGetEntitySetUriInfo.getInlineCount())
+ .andStubReturn(getLocalInlineCount());
+ EasyMock.expect(objGetEntitySetUriInfo.getTargetEntitySet())
+ .andStubReturn(getLocalTargetEntitySet());
+ EasyMock.expect(objGetEntitySetUriInfo.getSelect())
+ .andStubReturn(null);
+ EasyMock.expect(objGetEntitySetUriInfo.getExpand())
+ .andStubReturn(null);
+ EasyMock.expect(objGetEntitySetUriInfo.getSkip())
+ .andStubReturn(new Integer(1));
+
+ EasyMock.replay(objGetEntitySetUriInfo);
+ return objGetEntitySetUriInfo;
+ }
+
+ private GetEntityUriInfo getLocalGetURIInfo() {
+ GetEntityUriInfo objGetEntityUriInfo = EasyMock.createMock(GetEntityUriInfo.class);
+ EasyMock.expect(objGetEntityUriInfo.getSelect())
+ .andStubReturn(getSelectItemList());
+ EasyMock.expect(objGetEntityUriInfo.getTargetEntitySet())
+ .andStubReturn(getLocalTargetEntitySet());
+ EasyMock.expect(objGetEntityUriInfo.getExpand())
+ .andStubReturn(getExpandList());
+ EasyMock.replay(objGetEntityUriInfo);
+ return objGetEntityUriInfo;
+ }
+
+ private List<SelectItem> getSelectItemList() {
+ List<SelectItem> selectItems = new ArrayList<SelectItem>();
+ selectItems.add(getSelectItem());
+ return selectItems;
+ }
+
+ private SelectItem getSelectItem() {
+ SelectItem selectItem = EasyMock.createMock(SelectItem.class);
+ EasyMock.expect(selectItem.getProperty())
+ .andStubReturn(getEdmPropertyForSelect());
+ List<NavigationPropertySegment> navigationSegmentList = new ArrayList<NavigationPropertySegment>();
+ EasyMock.expect(selectItem.getNavigationPropertySegments())
+ .andStubReturn(navigationSegmentList);
+ EasyMock.expect(selectItem.isStar())
+ .andReturn(false)
+ .anyTimes();
+ EasyMock.replay(selectItem);
+ return selectItem;
+ }
+
+ private EdmProperty getEdmPropertyForSelect() {
+ EdmSimpleType edmType = EasyMock.createMock(EdmSimpleType.class);
+ EasyMock.expect(edmType.getKind())
+ .andStubReturn(EdmTypeKind.SIMPLE);
+ Facets facets = new Facets().setNullable(false);
+ try {
+ EasyMock.expect(edmType.valueToString(new Integer(2), EdmLiteralKind.URI, facets))
+ .andStubReturn("2");
+ EasyMock.expect(edmType.valueToString(new Integer(2), EdmLiteralKind.DEFAULT, facets))
+ .andStubReturn("2");
+ } catch (EdmSimpleTypeException e1) {
+ fail("There is an exception in mocking EdmType object " + e1.getMessage());
+ }
+ EasyMock.replay(edmType);
+ EdmProperty edmProperty = EasyMock.createMock(EdmProperty.class);
+ JPAEdmMappingImpl edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
+ EasyMock.expect(edmMapping.getInternalName())
+ .andStubReturn("soId");
+ EasyMock.expect(edmMapping.getMediaResourceMimeTypeKey())
+ .andReturn(null);
+ EasyMock.expect(edmMapping.isVirtualAccess())
+ .andStubReturn(false);
+ EasyMock.replay(edmMapping);
+ try {
+ EasyMock.expect(edmProperty.getName())
+ .andStubReturn("ID");
+ EasyMock.expect(edmProperty.getType())
+ .andStubReturn(edmType);
+ EasyMock.expect(edmProperty.getMapping())
+ .andStubReturn(edmMapping);
+ EasyMock.expect(edmProperty.getFacets())
+ .andStubReturn(facets);
+ EasyMock.expect(edmProperty.getCustomizableFeedMappings())
+ .andStubReturn(null);
+ EasyMock.expect(edmProperty.getMimeType())
+ .andStubReturn(null);
+ EasyMock.replay(edmProperty);
+
+ } catch (EdmException e) {
+ fail("There is an exception in mocking some object " + e.getMessage());
+ }
+
+ return edmProperty;
+
+ }
+
+ private EdmEntitySet getLocalTargetEntitySet() {
+ EdmEntitySet objEdmEntitySet = EasyMock.createMock(EdmEntitySet.class);
+ try {
+ EasyMock.expect(objEdmEntitySet.getEntityType())
+ .andStubReturn(getLocalEdmEntityType());
+ EasyMock.expect(objEdmEntitySet.getName())
+ .andStubReturn("SalesOderHeaders");
+ EasyMock.expect(objEdmEntitySet.getEntityContainer())
+ .andStubReturn(getLocalEdmEntityContainer());
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+
+ EasyMock.replay(objEdmEntitySet);
+ return objEdmEntitySet;
+ }
+
+ private EdmEntityContainer getLocalEdmEntityContainer() {
+ EdmEntityContainer edmEntityContainer = EasyMock.createMock(EdmEntityContainer.class);
+ EasyMock.expect(edmEntityContainer.isDefaultEntityContainer())
+ .andStubReturn(true);
+ try {
+ EasyMock.expect(edmEntityContainer.getName())
+ .andStubReturn("salesorderprocessingContainer");
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+
+ EasyMock.replay(edmEntityContainer);
+ return edmEntityContainer;
+ }
+
+ private EdmEntityType getLocalEdmEntityType() {
+ EdmEntityType objEdmEntityType = EasyMock.createMock(EdmEntityType.class);
+ try {
+ EasyMock.expect(objEdmEntityType.getName())
+ .andStubReturn("SalesOderHeaders");
+ EasyMock.expect(objEdmEntityType.getNamespace())
+ .andStubReturn("SalesOderHeaders");
+ EasyMock.expect(objEdmEntityType.getKind())
+ .andStubReturn(EdmTypeKind.ENTITY);
+ EasyMock.expect(objEdmEntityType.hasStream())
+ .andStubReturn(false);
+ EasyMock.expect(objEdmEntityType.hasStream())
+ .andStubReturn(false);
+ ArrayList<String> propertyNames = new ArrayList<String>();
+ propertyNames.add("ID");
+ EasyMock.expect(objEdmEntityType.getProperty("ID"))
+ .andStubReturn(getEdmPropertyForSelect());
+ EasyMock.expect(objEdmEntityType.getPropertyNames())
+ .andStubReturn(propertyNames);
+ EasyMock.expect(objEdmEntityType.getNavigationPropertyNames())
+ .andStubReturn(new ArrayList<String>());
+ EasyMock.expect(objEdmEntityType.getKeyPropertyNames())
+ .andStubReturn(propertyNames);
+ EasyMock.expect(objEdmEntityType.getKeyProperties())
+ .andStubReturn(getKeyProperties());
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ EasyMock.replay(objEdmEntityType);
+ return objEdmEntityType;
+ }
+
+ private List<EdmProperty> getKeyProperties() {
+ List<EdmProperty> edmProperties = new ArrayList<EdmProperty>();
+ EdmType edmType = EasyMock.createMock(EdmType.class);
+ EasyMock.expect(edmType.getKind())
+ .andStubReturn(EdmTypeKind.SIMPLE);
+ EasyMock.replay(edmType);
+ EdmProperty edmProperty = EasyMock.createMock(EdmProperty.class);
+ EdmMapping edmMapping = EasyMock.createMock(EdmMapping.class);
+ EasyMock.expect(edmMapping.getInternalName())
+ .andStubReturn("soId");
+ EasyMock.replay(edmMapping);
+ try {
+ EasyMock.expect(edmProperty.getName())
+ .andStubReturn("ID");
+ EasyMock.expect(edmProperty.getType())
+ .andStubReturn(edmType);
+ EasyMock.expect(edmProperty.getMapping())
+ .andStubReturn(edmMapping);
+ EasyMock.replay(edmProperty);
+ } catch (EdmException e) {
+ fail("There is an exception is mocking some object " + e.getMessage());
+ }
+
+ edmProperties.add(edmProperty);
+ return edmProperties;
+ }
+
+ private InlineCount getLocalInlineCount() {
+ return InlineCount.NONE;
+ }
+
+ class SalesOrderHeader {
+ private int soId;
+ private int Field1;
+
+ public SalesOrderHeader(final int soId, final int field) {
+ this.soId = soId;
+ Field1 = field;
+ }
+
+ public int getField1() {
+ return Field1;
+ }
+
+ public void setField1(final int field1) {
+ Field1 = field1;
+ }
+
+ public int getSoId() {
+ return soId;
+ }
+
+ public void setSoId(final int soId) {
+ this.soId = soId;
+ }
+
+ }
+
+ private List<Object> getJPAEntities() {
+ List<Object> listJPAEntities = new ArrayList<Object>();
+ SalesOrderHeader entity;
+ entity = new SalesOrderHeader(2, 10);
+ listJPAEntities.add(entity);
+ return listJPAEntities;
+ }
+
+ private Object getEntity() {
+ return new SalesOrderHeader(10, 34);
+ }
+
+ private GetEntityUriInfo mockEntityUriInfoForExpand() {
+
+ List<SelectItem> selectItemList = new ArrayList<SelectItem>();
+ List<ArrayList<NavigationPropertySegment>> expandList = new ArrayList<ArrayList<NavigationPropertySegment>>();
+ ArrayList<NavigationPropertySegment> navigationPropertyList = new ArrayList<NavigationPropertySegment>();
+ // Mocking the navigation property
+ EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
+ try {
+ EasyMock.expect(navigationProperty.getName())
+ .andStubReturn("SalesOrderItemDetails");
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ EasyMock.replay(navigationProperty);
+ // Mocking the navigation property segments and adding to expand list
+ NavigationPropertySegment navigationPropertySegment = EasyMock.createMock(NavigationPropertySegment.class);
+ EasyMock.expect(navigationPropertySegment.getNavigationProperty())
+ .andStubReturn(navigationProperty);
+ EasyMock.expect(navigationPropertySegment.getTargetEntitySet())
+ .andStubReturn(getTargetEntitySetForExpand());
+ EasyMock.replay(navigationPropertySegment);
+ navigationPropertyList.add(navigationPropertySegment);
+ expandList.add(navigationPropertyList);
+ // Mocking EntityUriInfo
+ GetEntityUriInfo entityUriInfo = EasyMock.createMock(GetEntityUriInfo.class);
+ EasyMock.expect(entityUriInfo.getSelect())
+ .andStubReturn(selectItemList);
+ EasyMock.expect(entityUriInfo.getExpand())
+ .andStubReturn(expandList);
+ EasyMock.replay(entityUriInfo);
+ return entityUriInfo;
+ }
+
+ private GetEntitySetUriInfo mockEntitySetUriInfoForExpand() {
+
+ List<SelectItem> selectItemList = new ArrayList<SelectItem>();
+ List<ArrayList<NavigationPropertySegment>> expandList = new ArrayList<ArrayList<NavigationPropertySegment>>();
+ ArrayList<NavigationPropertySegment> navigationPropertyList = new ArrayList<NavigationPropertySegment>();
+ // Mocking the navigation property
+ EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
+ try {
+ EasyMock.expect(navigationProperty.getName())
+ .andStubReturn("SalesOrderItemDetails");
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ EasyMock.replay(navigationProperty);
+ // Mocking the navigation property segments and adding to expand list
+ NavigationPropertySegment navigationPropertySegment = EasyMock.createMock(NavigationPropertySegment.class);
+ EasyMock.expect(navigationPropertySegment.getNavigationProperty())
+ .andStubReturn(navigationProperty);
+ EasyMock.expect(navigationPropertySegment.getTargetEntitySet())
+ .andStubReturn(getTargetEntitySetForExpand());
+ EasyMock.replay(navigationPropertySegment);
+ navigationPropertyList.add(navigationPropertySegment);
+ expandList.add(navigationPropertyList);
+ // Mocking EntityUriInfo
+ UriInfoImpl entitySetUriInfo = EasyMock.createMock(UriInfoImpl.class);
+ EasyMock.expect(entitySetUriInfo.getSelect())
+ .andStubReturn(selectItemList);
+ EasyMock.expect(entitySetUriInfo.getExpand())
+ .andStubReturn(expandList);
+ EasyMock.expect(entitySetUriInfo.getInlineCount())
+ .andStubReturn(InlineCount.ALLPAGES);
+ EasyMock.expect(entitySetUriInfo.getSkip())
+ .andStubReturn(new Integer(1));
+ EasyMock.expect(entitySetUriInfo.getTop())
+ .andStubReturn(new Integer(2));
+ Map<String, String> customQuery = new HashMap<String, String>();
+ customQuery.put("count", "5");
+ entitySetUriInfo.setCustomQueryOptions(null);
+ EasyMock.expectLastCall()
+ .times(1);
+ EasyMock.expect(entitySetUriInfo.getCustomQueryOptions())
+ .andStubReturn(customQuery);
+ EasyMock.replay(entitySetUriInfo);
+ return entitySetUriInfo;
+ }
+
+ private EdmEntitySet getTargetEntitySetForExpand() {
+ EdmEntitySet entitySet = EasyMock.createMock(EdmEntitySet.class);
+ try {
+ EasyMock.expect(entitySet.getName())
+ .andStubReturn("SalesOrderHeaders");
+ EasyMock.expect(entitySet.getEntityType())
+ .andStubReturn(null);
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ EasyMock.replay(entitySet);
+ return entitySet;
+ }
+
+ private NavigationPropertySegment getNavigationPropertySegment(final String navPropertyName) {
+ EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
+ try {
+ EasyMock.expect(navigationProperty.getName())
+ .andStubReturn(navPropertyName);
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ EasyMock.replay(navigationProperty);
+ NavigationPropertySegment navPropertySegment = EasyMock.createMock(NavigationPropertySegment.class);
+ EasyMock.expect(navPropertySegment.getNavigationProperty())
+ .andStubReturn(navigationProperty);
+ EasyMock.replay(navPropertySegment);
+ return navPropertySegment;
+ }
+
+ private GetFunctionImportUriInfo mockFunctionImportUriInfo() {
+
+ List<SelectItem> selectItemList = new ArrayList<SelectItem>();
+ List<ArrayList<NavigationPropertySegment>> expandList = new ArrayList<ArrayList<NavigationPropertySegment>>();
+ ArrayList<NavigationPropertySegment> navigationPropertyList = new ArrayList<NavigationPropertySegment>();
+ // Mocking the navigation property
+ EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
+ try {
+ EasyMock.expect(navigationProperty.getName())
+ .andStubReturn("SalesOrderItemDetails");
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ EasyMock.replay(navigationProperty);
+
+ // Mocking the navigation property segments and adding to expand list
+ NavigationPropertySegment navigationPropertySegment = EasyMock.createMock(NavigationPropertySegment.class);
+ EasyMock.expect(navigationPropertySegment.getNavigationProperty())
+ .andStubReturn(navigationProperty);
+ EasyMock.expect(navigationPropertySegment.getTargetEntitySet())
+ .andStubReturn(getTargetEntitySetForExpand());
+ EasyMock.replay(navigationPropertySegment);
+ navigationPropertyList.add(navigationPropertySegment);
+ expandList.add(navigationPropertyList);
+ // Mocking EntityUriInfo
+ UriInfoImpl functionImportUriInfo = EasyMock.createMock(UriInfoImpl.class);
+ EasyMock.expect(functionImportUriInfo.getSelect())
+ .andStubReturn(selectItemList);
+ EasyMock.expect(functionImportUriInfo.getExpand())
+ .andStubReturn(expandList);
+ EasyMock.expect(functionImportUriInfo.getInlineCount())
+ .andStubReturn(InlineCount.ALLPAGES);
+ EasyMock.expect(functionImportUriInfo.getFunctionImport())
+ .andStubReturn(mockEdmFunctionImport());
+ EasyMock.expect(functionImportUriInfo.getCustomQueryOptions())
+ .andStubReturn(null);
+ EasyMock.replay(functionImportUriInfo);
+ return functionImportUriInfo;
+ }
+
+ private EdmFunctionImport mockEdmFunctionImport() {
+ EdmFunctionImport funcImport = EasyMock.createMock(EdmFunctionImport.class);
+ try {
+ EasyMock.expect(funcImport.getName())
+ .andStubReturn("FindAllSalesOrders");
+ EasyMock.expect(funcImport.getEntitySet())
+ .andStubReturn(getLocalTargetEntitySet());
+ EasyMock.expect(funcImport.getParameterNames())
+ .andStubReturn(Arrays.asList("DeliveryStatusCode"));
+ EdmTyped typed = EasyMock.createMock(EdmTyped.class);
+ EasyMock.expect(typed.getName())
+ .andStubReturn("SalesOrder");
+ EasyMock.expect(typed.getMultiplicity())
+ .andStubReturn(EdmMultiplicity.MANY);
+ EasyMock.expect(typed.getType())
+ .andStubReturn(getLocalEdmEntityType());
+ EasyMock.replay(typed);
+ EasyMock.expect(funcImport.getReturnType())
+ .andStubReturn(typed);
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ EasyMock.replay(funcImport);
+ return funcImport;
+ }
+
+ /*
+ * This Unit is supposed to test the building of Entity Provider Properties for function import
+ */
+ @Test
+ public void testFunctionImportProviderProperties() {
+
+ // Getting the EntityUriInfo
+ GetFunctionImportUriInfo getfuncImportUriInfo = mockFunctionImportUriInfo();
+ ODataJPAContext oDataJPAContext = getODataJPAContext();
+ Class<?> clazz = ODataJPAResponseBuilderDefault.class;
+ // Building the edm entity
+ List<Map<String, Object>> edmEntityList = new ArrayList<Map<String, Object>>();
+ Map<String, Object> edmEntity = new HashMap<String, Object>();
+ edmEntity.put("ID", 1);
+ edmEntityList.add(edmEntity);
+ Object[] actualParameters = {oDataJPAContext, getfuncImportUriInfo, edmEntityList};
+ Class<?>[] formalParameters = {ODataJPAContext.class, GetFunctionImportUriInfo.class, List.class};
+ EntityProviderWriteProperties providerProperties = null;
+ try {
+ Method method = clazz.getDeclaredMethod("getEntityProviderProperties", formalParameters);
+ method.setAccessible(true);
+ providerProperties = (EntityProviderWriteProperties) method.invoke(responseBuilder, actualParameters);
+ assertEquals(1, providerProperties.getExpandSelectTree()
+ .getLinks()
+ .size());
+ assertEquals(InlineCount.ALLPAGES, providerProperties.getInlineCountType());
+ } catch (SecurityException | NoSuchMethodException | IllegalArgumentException | IllegalAccessException
+ | InvocationTargetException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+
+ }
+
+ @Test
+ public void testBuildListOfGetFunctionimportUriInfo() throws Exception {
+ try {
+ assertNotNull(responseBuilder.build(getFIResultsView(), getJPAEntities(), "application/xml"));
+ } catch (ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+
+ }
+
+ private GetFunctionImportUriInfo getFIResultsView() {
+ GetFunctionImportUriInfo objGetFunctionImportUriInfo = EasyMock.createMock(GetFunctionImportUriInfo.class);
+ EasyMock.expect(objGetFunctionImportUriInfo.getInlineCount())
+ .andStubReturn(getLocalInlineCount());
+ EasyMock.expect(objGetFunctionImportUriInfo.getFunctionImport())
+ .andStubReturn(mockEdmFunctionImport());
+ EasyMock.expect(objGetFunctionImportUriInfo.getSelect())
+ .andStubReturn(getSelectItemList());
+ EasyMock.expect(objGetFunctionImportUriInfo.getExpand())
+ .andStubReturn(getExpandList());
+ EasyMock.replay(objGetFunctionImportUriInfo);
+ return objGetFunctionImportUriInfo;
+ }
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserForStaticMethodTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserForStaticMethodTest.java
index 6be07907..cbbbe785 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserForStaticMethodTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserForStaticMethodTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.core.access.data;
@@ -22,351 +18,293 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Method;
import java.sql.Blob;
import java.sql.Clob;
import java.sql.SQLException;
-
-import jakarta.sql.rowset.serial.SerialBlob;
-import jakarta.sql.rowset.serial.SerialClob;
-import jakarta.sql.rowset.serial.SerialException;
-
+import javax.sql.rowset.serial.SerialBlob;
+import javax.sql.rowset.serial.SerialClob;
+import javax.sql.rowset.serial.SerialException;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
import org.apache.olingo.odata2.jpa.processor.core.common.ODataJPATestConstants;
import org.junit.Test;
public class JPAEntityParserForStaticMethodTest {
- @Test
- public void testToStringDefault() {
-
- Character[] input = new Character[] { 'A', 'B' };
- assertEquals("AB", JPAEntityParser.toString(input));
-
- }
-
- @Test
- public void testToStringNull() {
- Character[] input = null;
- assertNull(JPAEntityParser.toString(input));
- }
-
- @Test
- public void testToStringPartialNull() {
- Character[] input = new Character[] { 'A', null };
- assertEquals("A", JPAEntityParser.toString(input));
- }
-
- @Test
- public void testToCharacterArrayDefault() {
- String input = new String("AB");
- Character[] ch = JPAEntityParser.toCharacterArray(input);
-
- assertEquals(2, ch.length);
- assertTrue(ch[0].equals('A'));
- assertTrue(ch[1].equals('B'));
- }
-
- @Test
- public void testToCharacterArrayNull() {
- String input = null;
- Character[] ch = JPAEntityParser.toCharacterArray(input);
-
- assertNull(ch);
- }
-
- @Test
- public void testGetPropertyCharacter() {
- try {
- Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharacter", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
- assertEquals("A", output);
-
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ @Test
+ public void testToStringDefault() {
+
+ Character[] input = {'A', 'B'};
+ assertEquals("AB", JPAEntityParser.toString(input));
+
+ }
+
+ @Test
+ public void testToStringNull() {
+ Character[] input = null;
+ assertNull(JPAEntityParser.toString(input));
+ }
+
+ @Test
+ public void testToStringPartialNull() {
+ Character[] input = {'A', null};
+ assertEquals("A", JPAEntityParser.toString(input));
}
- }
-
- @Test
- public void testGetPropertyCharacterNull() {
- try {
- Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharacterNull", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
- assertNull(output);
-
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ @Test
+ public void testToCharacterArrayDefault() {
+ String input = new String("AB");
+ Character[] ch = JPAEntityParser.toCharacterArray(input);
+
+ assertEquals(2, ch.length);
+ assertTrue(ch[0].equals('A'));
+ assertTrue(ch[1].equals('B'));
}
- }
-
- @Test
- public void testGetPropertyCharacterArray() {
- try {
- Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharacterArray", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
- assertEquals("AB", output);
-
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ @Test
+ public void testToCharacterArrayNull() {
+ String input = null;
+ Character[] ch = JPAEntityParser.toCharacterArray(input);
+
+ assertNull(ch);
}
- }
-
- @Test
- public void testGetPropertyCharacterArrayNull() {
- try {
- Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharacterArrayNull", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
- assertNull(output);
-
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ @Test
+ public void testGetPropertyCharacter() {
+ try {
+ Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharacter", (Class<?>[]) null);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
+ assertEquals("A", output);
+
+ } catch (NoSuchMethodException | SecurityException | ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
}
- }
-
- @Test
- public void testGetPropertyChar() {
- try {
- Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getChar", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
- assertEquals("A", output);
-
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ @Test
+ public void testGetPropertyCharacterNull() {
+ try {
+ Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharacterNull", (Class<?>[]) null);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
+ assertNull(output);
+
+ } catch (NoSuchMethodException | SecurityException | ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ }
+
+ @Test
+ public void testGetPropertyCharacterArray() {
+ try {
+ Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharacterArray", (Class<?>[]) null);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
+ assertEquals("AB", output);
+
+ } catch (NoSuchMethodException | SecurityException | ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ }
+
+ @Test
+ public void testGetPropertyCharacterArrayNull() {
+ try {
+ Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharacterArrayNull", (Class<?>[]) null);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
+ assertNull(output);
+
+ } catch (NoSuchMethodException | SecurityException | ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ }
+
+ @Test
+ public void testGetPropertyChar() {
+ try {
+ Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getChar", (Class<?>[]) null);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
+ assertEquals("A", output);
+
+ } catch (NoSuchMethodException | SecurityException | ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ }
+
+ @Test
+ public void testGetPropertyCharNull() {
+ try {
+ Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharNull", (Class<?>[]) null);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
+ assertNull(output);
+
+ } catch (NoSuchMethodException | SecurityException | ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
}
- }
-
- @Test
- public void testGetPropertyCharNull() {
- try {
- Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharNull", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
- assertNull(output);
-
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ @Test
+ public void testGetPropertyCharArray() {
+ try {
+ Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharArray", (Class<?>[]) null);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
+ assertEquals("AB", output);
+
+ } catch (NoSuchMethodException | SecurityException | ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
}
- }
-
- @Test
- public void testGetPropertyCharArray() {
- try {
- Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharArray", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
- assertEquals("AB", output);
-
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ @Test
+ public void testGetPropertyCharArrayNull() {
+ try {
+ Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharArrayNull", (Class<?>[]) null);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
+ assertNull(output);
+
+ } catch (NoSuchMethodException | SecurityException | ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
}
- }
-
- @Test
- public void testGetPropertyCharArrayNull() {
- try {
- Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharArrayNull", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
- assertNull(output);
-
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ @Test
+ public void testGetPropertyCharArrayValueNull() {
+ try {
+ Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharArrayValueNull", (Class<?>[]) null);
+ String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
+ assertEquals("A\u0000", output);
+
+ } catch (NoSuchMethodException | SecurityException | ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
}
- }
-
- @Test
- public void testGetPropertyCharArrayValueNull() {
- try {
- Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getCharArrayValueNull", (Class<?>[]) null);
- String output = (String) JPAEntityParser.getPropertyValue(method, this, "");
- assertEquals("A\u0000", output);
-
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ @Test
+ public void testGetPropertyObject() {
+
+ try {
+ Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getObject", (Class<?>[]) null);
+ Object output = JPAEntityParser.getPropertyValue(method, this, "");
+ assertTrue(output != null);
+
+ } catch (NoSuchMethodException | SecurityException | ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
}
- }
-
- @Test
- public void testGetPropertyObject() {
-
- try {
- Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getObject", (Class<?>[]) null);
- Object output = (Object) JPAEntityParser.getPropertyValue(method, this, "");
- assertTrue(output != null);
-
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- }
-
-@Test
- public void testGetPropertyObjectWithParameters() {
-
- try {
- Method method = JPAEntityParserForStaticMethodTest.class.
- getMethod("getObjectWithParameters", getParameterTypeForMethod("getObjectWithParameters"));
- Object output = (Object) JPAEntityParser.getPropertyValue(method, this, "obj1");
- assertTrue(output != null);
-
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ @Test
+ public void testGetPropertyObjectWithParameters() {
+
+ try {
+ Method method = JPAEntityParserForStaticMethodTest.class.getMethod("getObjectWithParameters",
+ getParameterTypeForMethod("getObjectWithParameters"));
+ Object output = JPAEntityParser.getPropertyValue(method, this, "obj1");
+ assertTrue(output != null);
+
+ } catch (NoSuchMethodException | SecurityException | ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
}
- }
-
-@Test
- public void testGetString() {
- char[] expectedChar = new char[] { 'a', 'b', 'c' };
- try {
- Clob clob = new SerialClob(expectedChar);
- String actualString = JPAEntityParser.getString(clob);
-
- assertEquals(new String(expectedChar), actualString);
-
- } catch (SerialException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SQLException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ @Test
+ public void testGetString() {
+ char[] expectedChar = {'a', 'b', 'c'};
+ try {
+ Clob clob = new SerialClob(expectedChar);
+ String actualString = JPAEntityParser.getString(clob);
+
+ assertEquals(new String(expectedChar), actualString);
+
+ } catch (SQLException | ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
}
- }
-
- @Test
- public void testGetBytes() {
- final String fileName = "SalesOrderProcessingMappingModels.xml";
-
- try {
- InputStream fis = JPAEntityParserForStaticMethodTest.class.getClassLoader().getResourceAsStream(fileName);
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- int content = fis.read();
- while (content != -1) {
- baos.write(content);
- content = fis.read();
- }
- Blob blob = new SerialBlob(baos.toByteArray());
- byte[] actualBytes = (byte[]) JPAEntityParser.getBytes(blob);
- byte[] expectedBytes = baos.toByteArray();
-
- assertEquals(expectedBytes.length, actualBytes.length);
- int size = actualBytes.length;
- int index = 0;
- while (index < size) {
- assertEquals(expectedBytes[index], actualBytes[index]);
- index++;
- }
-
- } catch (FileNotFoundException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SerialException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SQLException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IOException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ @Test
+ public void testGetBytes() {
+ final String fileName = "SalesOrderProcessingMappingModels.xml";
+
+ try {
+ InputStream fis = JPAEntityParserForStaticMethodTest.class.getClassLoader()
+ .getResourceAsStream(fileName);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ int content = fis.read();
+ while (content != -1) {
+ baos.write(content);
+ content = fis.read();
+ }
+ Blob blob = new SerialBlob(baos.toByteArray());
+ byte[] actualBytes = JPAEntityParser.getBytes(blob);
+ byte[] expectedBytes = baos.toByteArray();
+
+ assertEquals(expectedBytes.length, actualBytes.length);
+ int size = actualBytes.length;
+ int index = 0;
+ while (index < size) {
+ assertEquals(expectedBytes[index], actualBytes[index]);
+ index++;
+ }
+
+ } catch (SQLException | IOException | ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
}
- }
- public Character getCharacter() {
- return new Character('A');
- }
+ public Character getCharacter() {
+ return new Character('A');
+ }
- public Character getCharacterNull() {
- return null;
- }
+ public Character getCharacterNull() {
+ return null;
+ }
- public Character[] getCharacterArray() {
- return new Character[] { 'A', 'B' };
- }
+ public Character[] getCharacterArray() {
+ return new Character[] {'A', 'B'};
+ }
- public Character[] getCharacterArrayNull() {
- return null;
- }
+ public Character[] getCharacterArrayNull() {
+ return null;
+ }
- public char getChar() {
- return 'A';
- }
+ public char getChar() {
+ return 'A';
+ }
- public char getCharNull() {
- return '\u0000';
- }
+ public char getCharNull() {
+ return '\u0000';
+ }
- public char[] getCharArray() {
- return new char[] { 'A', 'B' };
- }
+ public char[] getCharArray() {
+ return new char[] {'A', 'B'};
+ }
- public char[] getCharArrayNull() {
- return null;
- }
+ public char[] getCharArrayNull() {
+ return null;
+ }
- public char[] getCharArrayValueNull() {
- return new char[] { 'A', '\u0000' };
- }
+ public char[] getCharArrayValueNull() {
+ return new char[] {'A', '\u0000'};
+ }
- public Object getObject() {
- return new Object();
- }
+ public Object getObject() {
+ return new Object();
+ }
- public Object getObjectWithParameters(Object ob1) {
- return new Object();
- }
+ public Object getObjectWithParameters(Object ob1) {
+ return new Object();
+ }
- private Class<?>[] getParameterTypeForMethod(String methodName) {
+ private Class<?>[] getParameterTypeForMethod(String methodName) {
- Method[] methods = JPAEntityParserForStaticMethodTest.class.getMethods();
- for (Method method: methods) {
- if (method.getName().equals(methodName)) {
- return method.getParameterTypes();
+ Method[] methods = JPAEntityParserForStaticMethodTest.class.getMethods();
+ for (Method method : methods) {
+ if (method.getName()
+ .equals(methodName)) {
+ return method.getParameterTypes();
+ }
}
- }
- return null;
- }
+ return null;
+ }
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
index c0b3cf6e..25f28c76 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParserTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.core.access.data;
@@ -22,14 +18,12 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.olingo.odata2.api.edm.EdmException;
import org.apache.olingo.odata2.api.edm.EdmMapping;
import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
@@ -45,619 +39,660 @@ import org.easymock.EasyMock;
import org.junit.Test;
public class JPAEntityParserTest {
- /*
- * TestCase - JPAResultParser is a singleton class Check if the same
- * instance is returned when create method is called
- */
- @Test
- public void testCreate() {
- JPAEntityParser resultParser1 = new JPAEntityParser();
- JPAEntityParser resultParser2 = new JPAEntityParser();
-
- if (resultParser1.equals(resultParser2)) {
- fail();
- }
- }
-
- @Test
- public void testparse2EdmPropertyValueMap() {
- JPAEntityParser resultParser = new JPAEntityParser();
- Object jpaEntity = new demoItem("abc", 10);
- EdmStructuralType structuralType = EasyMock.createMock(EdmStructuralType.class);
- EdmProperty edmTyped = EasyMock.createMock(EdmProperty.class);
- EdmType edmType = EasyMock.createMock(EdmType.class);
- EdmProperty edmTyped01 = EasyMock.createMock(EdmProperty.class);
- EdmType edmType01 = EasyMock.createMock(EdmType.class);
- EdmMapping edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
- EdmMapping edmMapping01 = EasyMock.createMock(JPAEdmMappingImpl.class);
-
- try {
- EasyMock.expect(edmType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
- EasyMock.expect(edmTyped.getName()).andStubReturn("identifier");
- EasyMock.replay(edmType);
- EasyMock.expect(edmMapping.getInternalName()).andStubReturn("id");
- EasyMock.expect(((JPAEdmMappingImpl) edmMapping).isVirtualAccess()).andStubReturn(false);
- EasyMock.replay(edmMapping);
- EasyMock.expect(edmTyped.getType()).andStubReturn(edmType);
- EasyMock.expect(edmTyped.getMapping()).andStubReturn(edmMapping);
- EasyMock.replay(edmTyped);
- EasyMock.expect(structuralType.getProperty("identifier")).andStubReturn(edmTyped);
-
- EasyMock.expect(edmType01.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
- EasyMock.expect(edmTyped01.getName()).andStubReturn("Value");
- EasyMock.replay(edmType01);
- EasyMock.expect(edmMapping01.getInternalName()).andStubReturn("value");
- EasyMock.expect(((JPAEdmMappingImpl) edmMapping01).isVirtualAccess()).andStubReturn(false);
- EasyMock.replay(edmMapping01);
- EasyMock.expect(edmTyped01.getType()).andStubReturn(edmType01);
- EasyMock.expect(edmTyped01.getMapping()).andStubReturn(edmMapping01);
- EasyMock.replay(edmTyped01);
- EasyMock.expect(structuralType.getProperty("value")).andStubReturn(edmTyped01);
-
- List<String> propNames = new ArrayList<String>();
- propNames.add("identifier");
- propNames.add("value");
- EasyMock.expect(structuralType.getPropertyNames()).andReturn(propNames);
- EasyMock.replay(structuralType);
-
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
+ /*
+ * TestCase - JPAResultParser is a singleton class Check if the same instance is returned when
+ * create method is called
+ */
+ @Test
+ public void testCreate() {
+ JPAEntityParser resultParser1 = new JPAEntityParser();
+ JPAEntityParser resultParser2 = new JPAEntityParser();
+
+ if (resultParser1.equals(resultParser2)) {
+ fail();
+ }
+ }
+
+ @Test
+ public void testparse2EdmPropertyValueMap() {
+ JPAEntityParser resultParser = new JPAEntityParser();
+ Object jpaEntity = new demoItem("abc", 10);
+ EdmStructuralType structuralType = EasyMock.createMock(EdmStructuralType.class);
+ EdmProperty edmTyped = EasyMock.createMock(EdmProperty.class);
+ EdmType edmType = EasyMock.createMock(EdmType.class);
+ EdmProperty edmTyped01 = EasyMock.createMock(EdmProperty.class);
+ EdmType edmType01 = EasyMock.createMock(EdmType.class);
+ EdmMapping edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
+ EdmMapping edmMapping01 = EasyMock.createMock(JPAEdmMappingImpl.class);
+
+ try {
+ EasyMock.expect(edmType.getKind())
+ .andStubReturn(EdmTypeKind.SIMPLE);
+ EasyMock.expect(edmTyped.getName())
+ .andStubReturn("identifier");
+ EasyMock.replay(edmType);
+ EasyMock.expect(edmMapping.getInternalName())
+ .andStubReturn("id");
+ EasyMock.expect(((JPAEdmMappingImpl) edmMapping).isVirtualAccess())
+ .andStubReturn(false);
+ EasyMock.replay(edmMapping);
+ EasyMock.expect(edmTyped.getType())
+ .andStubReturn(edmType);
+ EasyMock.expect(edmTyped.getMapping())
+ .andStubReturn(edmMapping);
+ EasyMock.replay(edmTyped);
+ EasyMock.expect(structuralType.getProperty("identifier"))
+ .andStubReturn(edmTyped);
+
+ EasyMock.expect(edmType01.getKind())
+ .andStubReturn(EdmTypeKind.SIMPLE);
+ EasyMock.expect(edmTyped01.getName())
+ .andStubReturn("Value");
+ EasyMock.replay(edmType01);
+ EasyMock.expect(edmMapping01.getInternalName())
+ .andStubReturn("value");
+ EasyMock.expect(((JPAEdmMappingImpl) edmMapping01).isVirtualAccess())
+ .andStubReturn(false);
+ EasyMock.replay(edmMapping01);
+ EasyMock.expect(edmTyped01.getType())
+ .andStubReturn(edmType01);
+ EasyMock.expect(edmTyped01.getMapping())
+ .andStubReturn(edmMapping01);
+ EasyMock.replay(edmTyped01);
+ EasyMock.expect(structuralType.getProperty("value"))
+ .andStubReturn(edmTyped01);
+
+ List<String> propNames = new ArrayList<String>();
+ propNames.add("identifier");
+ propNames.add("value");
+ EasyMock.expect(structuralType.getPropertyNames())
+ .andReturn(propNames);
+ EasyMock.replay(structuralType);
+
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+
+ try {
+ Map<String, Object> result = resultParser.parse2EdmPropertyValueMap(jpaEntity, structuralType);
+ assertEquals(2, result.size());
+ } catch (ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+
+ }
+
+ @Test
+ public void testparse2EdmPropertyValueMapEdmExcep() {
+ JPAEntityParser resultParser = new JPAEntityParser();
+ Object jpaEntity = new demoItem("abc", 10);
+ EdmStructuralType structuralType = EasyMock.createMock(EdmStructuralType.class);
+ EdmProperty edmTyped = EasyMock.createMock(EdmProperty.class);
+ EdmType edmType = EasyMock.createMock(EdmType.class);
+ EdmProperty edmTyped01 = EasyMock.createMock(EdmProperty.class);
+ EdmType edmType01 = EasyMock.createMock(EdmType.class);
+ EdmMapping edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
+ EdmMapping edmMapping01 = EasyMock.createMock(JPAEdmMappingImpl.class);
+
+ try {
+ EasyMock.expect(edmType.getKind())
+ .andStubReturn(EdmTypeKind.SIMPLE);
+ EasyMock.expect(edmType.getName())
+ .andReturn("identifier");
+ EasyMock.replay(edmType);
+ EasyMock.expect(edmMapping.getInternalName())
+ .andStubReturn("id");
+ EasyMock.expect(((JPAEdmMappingImpl) edmMapping).isVirtualAccess())
+ .andStubReturn(false);
+ EasyMock.replay(edmMapping);
+ EasyMock.expect(edmTyped.getType())
+ .andStubThrow(new EdmException(null));
+ EasyMock.expect(edmTyped.getMapping())
+ .andStubReturn(edmMapping);
+ EasyMock.expect(edmTyped.getName())
+ .andReturn("identifier")
+ .anyTimes();
+ EasyMock.replay(edmTyped);
+ EasyMock.expect(structuralType.getProperty("identifier"))
+ .andStubReturn(edmTyped);
+
+ EasyMock.expect(edmType01.getKind())
+ .andStubReturn(EdmTypeKind.SIMPLE);
+ EasyMock.expect(edmType01.getName())
+ .andStubReturn("value");
+ EasyMock.replay(edmType01);
+ EasyMock.expect(edmMapping01.getInternalName())
+ .andStubReturn("value");
+ EasyMock.expect(((JPAEdmMappingImpl) edmMapping01).isVirtualAccess())
+ .andStubReturn(false);
+ EasyMock.replay(edmMapping01);
+ EasyMock.expect(edmTyped01.getName())
+ .andReturn("value")
+ .anyTimes();
+ EasyMock.expect(edmTyped01.getType())
+ .andStubReturn(edmType01);
+ EasyMock.expect(edmTyped01.getMapping())
+ .andStubReturn(edmMapping01);
+ EasyMock.replay(edmTyped01);
+ EasyMock.expect(structuralType.getProperty("value"))
+ .andStubReturn(edmTyped01);
+
+ List<String> propNames = new ArrayList<String>();
+ propNames.add("identifier");
+ propNames.add("value");
+ EasyMock.expect(structuralType.getPropertyNames())
+ .andReturn(propNames);
+ EasyMock.replay(structuralType);
+
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2); // assertTrue(false);
+ }
+
+ try {
+ resultParser.parse2EdmPropertyValueMap(jpaEntity, structuralType);
+ } catch (ODataJPARuntimeException e) {
+ assertTrue(true);
+ }
+
+ }
+
+ @Test
+ public void testparse2EdmPropertyListMap() {
+ JPAEntityParser resultParser = new JPAEntityParser();
+ Map<String, Object> edmEntity = new HashMap<String, Object>();
+ edmEntity.put("SoId", 1);
+ DemoRelatedEntity relatedEntity = new DemoRelatedEntity("NewOrder");
+ demoItem jpaEntity = new demoItem("laptop", 1);
+ jpaEntity.setRelatedEntity(relatedEntity);
+ List<EdmNavigationProperty> navigationPropertyList = new ArrayList<EdmNavigationProperty>();
+ // Mocking a navigation property and its mapping object
+ EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
+ JPAEdmMappingImpl edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
+ try {
+ EasyMock.expect(edmMapping.getInternalName())
+ .andStubReturn("relatedEntity");
+ EasyMock.expect(edmMapping.isVirtualAccess())
+ .andStubReturn(false);
+ EasyMock.replay(edmMapping);
+ EasyMock.expect(navigationProperty.getName())
+ .andStubReturn("RelatedEntities");
+ EasyMock.expect(navigationProperty.getMapping())
+ .andStubReturn(edmMapping);
+ EasyMock.replay(navigationProperty);
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+
+ navigationPropertyList.add(navigationProperty);
+ try {
+ HashMap<String, Object> result = resultParser.parse2EdmNavigationValueMap(jpaEntity, navigationPropertyList);
+ assertEquals(relatedEntity, result.get("RelatedEntities"));
+
+ } catch (ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ }
+
+ @Test
+ public void testparse2EdmPropertyListMapWithVirtualAccess() {
+ JPAEntityParser resultParser = new JPAEntityParser();
+ Map<String, Object> edmEntity = new HashMap<String, Object>();
+ edmEntity.put("SoId", 1);
+ DemoRelatedEntity relatedEntity = new DemoRelatedEntity("NewOrder");
+ demoItem jpaEntity = new demoItem("laptop", 1);
+ jpaEntity.setRelatedEntity(relatedEntity);
+ List<EdmNavigationProperty> navigationPropertyList = new ArrayList<EdmNavigationProperty>();
+ // Mocking a navigation property and its mapping object
+ EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
+ JPAEdmMappingImpl edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
+ try {
+ EasyMock.expect(edmMapping.getInternalName())
+ .andStubReturn("relatedEntity");
+ EasyMock.expect(edmMapping.isVirtualAccess())
+ .andStubReturn(true);
+ EasyMock.replay(edmMapping);
+ EasyMock.expect(navigationProperty.getName())
+ .andStubReturn("RelatedEntities");
+ EasyMock.expect(navigationProperty.getMapping())
+ .andStubReturn(edmMapping);
+ EasyMock.replay(navigationProperty);
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+
+ navigationPropertyList.add(navigationProperty);
+ try {
+ HashMap<String, Object> result = resultParser.parse2EdmNavigationValueMap(jpaEntity, navigationPropertyList);
+ assertEquals(relatedEntity, result.get("RelatedEntities"));
+
+ } catch (ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ }
+
+ // This unit tests when there is a complex type in the select list
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testparse2EdmPropertyValueMapFromListComplex() {
+ JPAEntityParser resultParser = new JPAEntityParser();
+ demoItem jpaEntity = new demoItem("laptop", 1);
+ DemoRelatedEntity relatedEntity = new DemoRelatedEntity("DemoOrder");
+ jpaEntity.setRelatedEntity(relatedEntity);
+ List<EdmProperty> selectPropertyList = new ArrayList<EdmProperty>();
+ // Mocking EdmProperties
+ EdmProperty edmProperty1 = EasyMock.createMock(EdmProperty.class);
+ EdmProperty edmProperty2 = EasyMock.createMock(EdmProperty.class);
+ EdmProperty edmComplexProperty = EasyMock.createMock(EdmProperty.class);
+ EdmType edmType1 = EasyMock.createMock(EdmType.class);
+ EdmStructuralType edmType2 = EasyMock.createMock(EdmStructuralType.class);
+ EdmType edmComplexType = EasyMock.createMock(EdmType.class);
+ JPAEdmMappingImpl mapping1 = EasyMock.createMock(JPAEdmMappingImpl.class);
+ JPAEdmMappingImpl mapping2 = EasyMock.createMock(JPAEdmMappingImpl.class);
+ JPAEdmMappingImpl complexMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
+ try {
+ EasyMock.expect(edmType1.getKind())
+ .andStubReturn(EdmTypeKind.SIMPLE);
+ EasyMock.replay(edmType1);
+ EasyMock.expect(mapping1.getInternalName())
+ .andStubReturn("id");
+ EasyMock.expect(mapping1.isVirtualAccess())
+ .andStubReturn(false);
+ EasyMock.replay(mapping1);
+ EasyMock.expect(edmProperty1.getName())
+ .andStubReturn("Id");
+ EasyMock.expect(edmProperty1.getMapping())
+ .andStubReturn(mapping1);
+ EasyMock.expect(edmProperty1.getType())
+ .andStubReturn(edmType1);
+ EasyMock.replay(edmProperty1);
+ // Mocking the complex properties
+ EasyMock.expect(edmComplexType.getKind())
+ .andStubReturn(EdmTypeKind.SIMPLE);
+ EasyMock.replay(edmComplexType);
+ EasyMock.expect(complexMapping.getInternalName())
+ .andStubReturn("order");
+ EasyMock.expect(complexMapping.isVirtualAccess())
+ .andStubReturn(false);
+ EasyMock.replay(complexMapping);
+ EasyMock.expect(edmComplexProperty.getName())
+ .andStubReturn("OrderName");
+ EasyMock.expect(edmComplexProperty.getMapping())
+ .andStubReturn(complexMapping);
+ EasyMock.expect(edmComplexProperty.getType())
+ .andStubReturn(edmComplexType);
+ EasyMock.replay(edmComplexProperty);
+ EasyMock.expect(edmType2.getKind())
+ .andStubReturn(EdmTypeKind.COMPLEX);
+ EasyMock.expect(edmType2.getProperty("OrderName"))
+ .andStubReturn(edmComplexProperty);
+ List<String> propertyNames = new ArrayList<String>();
+ propertyNames.add("OrderName");
+ EasyMock.expect(edmType2.getPropertyNames())
+ .andStubReturn(propertyNames);
+ EasyMock.replay(edmType2);
+ EasyMock.expect(mapping2.getInternalName())
+ .andStubReturn("relatedEntity");
+ EasyMock.expect(mapping2.isVirtualAccess())
+ .andStubReturn(false);
+ EasyMock.replay(mapping2);
+ EasyMock.expect(edmProperty2.getName())
+ .andStubReturn("Order");
+ EasyMock.expect(edmProperty2.getMapping())
+ .andStubReturn(mapping2);
+ EasyMock.expect(edmProperty2.getType())
+ .andStubReturn(edmType2);
+ EasyMock.replay(edmProperty2);
+
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ selectPropertyList.add(edmProperty1);
+ selectPropertyList.add(edmProperty2);
+ try {
+ Map<String, Object> result = resultParser.parse2EdmPropertyValueMap(jpaEntity, selectPropertyList);
+ assertEquals(1, ((HashMap<String, Object>) result.get("Order")).size());
+ } catch (ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+
+ }
+
+ /*
+ * TestCase - getGetterName is a private method in JPAResultParser. The method is uses reflection to
+ * derive the property access methods from EdmProperty
+ */
+ @Test
+ public void testGetGettersWithOutMapping() {
+ JPAEntityParser resultParser = new JPAEntityParser();
+ try {
+
+ /*
+ * Case 1 - Property having No mapping
+ */
+ Class<?>[] pars = {String.class, EdmMapping.class, String.class};
+ Object[] params = {"Field1", null, "get"};
+ Method getGetterName = resultParser.getClass()
+ .getDeclaredMethod("getAccessModifierName", pars);
+ getGetterName.setAccessible(true);
+ String name = (String) getGetterName.invoke(resultParser, params);
+
+ assertEquals("getField1", name);
+
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ }
+ }
+
+ @Test
+ public void testGetGettersWithNullPropname() {
+ JPAEntityParser resultParser = new JPAEntityParser();
+ try {
+
+ /*
+ * Case 1 - Property having No mapping and no name
+ */
+ Class<?>[] pars = {String.class, EdmMapping.class, String.class};
+ Object[] params = {null, null, null};
+ Method getGetterName = resultParser.getClass()
+ .getDeclaredMethod("getAccessModifierName", pars);
+ getGetterName.setAccessible(true);
+
+ String name = (String) getGetterName.invoke(resultParser, params);
+ assertNull(name);
+
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ }
+ }
+
+ /*
+ * TestCase - getGetterName is a private method in JPAResultParser. The method is uses reflection to
+ * derive the property access methods from EdmProperty
+ *
+ * EdmProperty name could have been modified. Then mapping object of EdmProperty should be used for
+ * deriving the name
+ */
+ @Test
+ public void testGetGettersWithMapping() {
+ JPAEntityParser resultParser = new JPAEntityParser();
+ EdmMapping edmMapping = EasyMock.createMock(EdmMapping.class);
+ EasyMock.expect(edmMapping.getInternalName())
+ .andStubReturn("field1");
+ EasyMock.replay(edmMapping);
+ try {
+
+ Class<?>[] pars = {String.class, EdmMapping.class, String.class};
+ Object[] params = {"myField", edmMapping, "get"};
+ Method getGetterName = resultParser.getClass()
+ .getDeclaredMethod("getAccessModifierName", pars);
+ getGetterName.setAccessible(true);
+
+ String name = (String) getGetterName.invoke(resultParser, params);
+ assertEquals("getField1", name);
+
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ }
+ }
+
+ @Test
+ public void testGetGettersNoSuchMethodException() {
+ JPAEntityParser resultParser = new JPAEntityParser();
+ try {
+
+ Method getGetterName = resultParser.getClass()
+ .getDeclaredMethod("getGetterName1", EdmProperty.class);
+ getGetterName.setAccessible(true);
+
+ } catch (NoSuchMethodException e) {
+ assertEquals("org.apache.olingo.odata2.jpa.processor.core.access.data.JPAEntityParser.getGetterName1"
+ + "(org.apache.olingo.odata2.api.edm.EdmProperty)", e.getMessage());
+ } catch (SecurityException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+
+ }
+ }
+
+ @Test
+ public void testParse2EdmPropertyValueMap() {
+ JPAEntityParser resultParser = new JPAEntityParser();
+ Object jpaEntity = new DemoItem2("abc");
+ try {
+ resultParser.parse2EdmPropertyValueMap(jpaEntity, getEdmPropertyList());
+ } catch (ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ }
+
+ @Test
+ public void testParse2EdmPropertyValueMapWithVirtualAccess() {
+ JPAEntityParser resultParser = new JPAEntityParser();
+ Object jpaEntity = new DemoItem2("abc");
+ try {
+ resultParser.parse2EdmPropertyValueMap(jpaEntity, getEdmPropertyListWithVirtualAccess());
+ } catch (ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ }
+
+ @Test
+ public void testGetGetterEdmException() {
+ JPAEntityParser resultParser = new JPAEntityParser();
+ Object jpaEntity = new demoItem("abc", 10);
+ EdmStructuralType structuralType = EasyMock.createMock(EdmStructuralType.class);
+ try {
+ EasyMock.expect(structuralType.getPropertyNames())
+ .andStubThrow(new EdmException(null));
+ EasyMock.replay(structuralType);
+ Method getGetters = resultParser.getClass()
+ .getDeclaredMethod("getGetters", Object.class, EdmStructuralType.class);
+ getGetters.setAccessible(true);
+ try {
+ getGetters.invoke(resultParser, jpaEntity, structuralType);
+ } catch (IllegalAccessException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ } catch (IllegalArgumentException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ } catch (InvocationTargetException e) {
+ assertTrue(true);
+ }
+ } catch (NoSuchMethodException e) {
+ assertEquals("org.apache.olingo.odata2.jpa.processor.core.access.data.JPAEntityParser.getGetters(java.lang.Object, "
+ + "org.apache.olingo.odata2.api.edm.EdmStructuralType)", e.getMessage());
+ } catch (SecurityException | EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ }
+
+ @Test
+ public void testForNullJPAEntity() {
+ JPAEntityParser resultParser = new JPAEntityParser();
+ EdmStructuralType structuralType = EasyMock.createMock(EdmStructuralType.class);
+ Object map;
+ try {
+ map = resultParser.parse2EdmPropertyValueMap(null, structuralType);
+ assertNull(map);
+ } catch (ODataJPARuntimeException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ }
+
+ class demoItem {
+ private String id;
+ private int value;
+ private DemoRelatedEntity relatedEntity;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(final String id) {
+ this.id = id;
+ }
+
+ public DemoRelatedEntity getRelatedEntity() {
+ return relatedEntity;
+ }
+
+ public void setRelatedEntity(final DemoRelatedEntity relatedEntity) {
+ this.relatedEntity = relatedEntity;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public void set(String property, Object value)
+ throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
+ this.getClass()
+ .getDeclaredField(property)
+ .set(this, value);
+ }
+
+ public Object get(String property)
+ throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException {
+ return this.getClass()
+ .getDeclaredField(property)
+ .get(this);
+ }
+
+ public void setValue(final int value) {
+ this.value = value;
+ }
+
+ demoItem(final String id, final int value) {
+ this.id = id;
+ this.value = value;
+ }
+
+ }
+
+ class DemoRelatedEntity {
+ String order;
+
+ public String getOrder() {
+ return order;
+ }
+
+ public void setOrder(final String order) {
+ this.order = order;
+ }
+
+ public DemoRelatedEntity(final String order) {
+ this.order = order;
+ }
+
+ }
+
+ private List<EdmProperty> getEdmPropertyList() {
+ List<EdmProperty> properties = new ArrayList<EdmProperty>();
+ properties.add(getEdmProperty());
+ return properties;
+ }
+
+ private List<EdmProperty> getEdmPropertyListWithVirtualAccess() {
+ List<EdmProperty> properties = new ArrayList<EdmProperty>();
+ properties.add(getEdmPropertyWithVirtualAccess());
+ return properties;
+ }
+
+ class DemoItem2 {
+ private String field1;
+
+ public String getField1() {
+ return field1;
+ }
- try {
- Map<String, Object> result = resultParser.parse2EdmPropertyValueMap(jpaEntity, structuralType);
- assertEquals(2, result.size());
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
+ public void setField1(final String field) {
+ field1 = field;
+ }
+
+ // Getter for Dynamic Entity
+ public String get(String fieldName) {
+ return field1;
+ }
- }
-
- @Test
- public void testparse2EdmPropertyValueMapEdmExcep() {
- JPAEntityParser resultParser = new JPAEntityParser();
- Object jpaEntity = new demoItem("abc", 10);
- EdmStructuralType structuralType = EasyMock
- .createMock(EdmStructuralType.class);
- EdmProperty edmTyped = EasyMock.createMock(EdmProperty.class);
- EdmType edmType = EasyMock.createMock(EdmType.class);
- EdmProperty edmTyped01 = EasyMock.createMock(EdmProperty.class);
- EdmType edmType01 = EasyMock.createMock(EdmType.class);
- EdmMapping edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
- EdmMapping edmMapping01 = EasyMock.createMock(JPAEdmMappingImpl.class);
-
- try {
- EasyMock.expect(edmType.getKind())
- .andStubReturn(EdmTypeKind.SIMPLE);
- EasyMock.expect(edmType.getName()).andReturn("identifier");
- EasyMock.replay(edmType);
- EasyMock.expect(edmMapping.getInternalName()).andStubReturn("id");
- EasyMock.expect(((JPAEdmMappingImpl)edmMapping).isVirtualAccess()).andStubReturn(false);
- EasyMock.replay(edmMapping);
- EasyMock.expect(edmTyped.getType()).andStubThrow(
- new EdmException(null));
- EasyMock.expect(edmTyped.getMapping()).andStubReturn(edmMapping);
- EasyMock.expect(edmTyped.getName()).andReturn("identifier").anyTimes();
- EasyMock.replay(edmTyped);
- EasyMock.expect(structuralType.getProperty("identifier"))
- .andStubReturn(edmTyped);
-
- EasyMock.expect(edmType01.getKind()).andStubReturn(
- EdmTypeKind.SIMPLE);
- EasyMock.expect(edmType01.getName()).andStubReturn("value");
- EasyMock.replay(edmType01);
- EasyMock.expect(edmMapping01.getInternalName()).andStubReturn(
- "value");
- EasyMock.expect(((JPAEdmMappingImpl)edmMapping01).isVirtualAccess())
- .andStubReturn(false);
- EasyMock.replay(edmMapping01);
- EasyMock.expect(edmTyped01.getName()).andReturn("value").anyTimes();
- EasyMock.expect(edmTyped01.getType()).andStubReturn(edmType01);
- EasyMock.expect(edmTyped01.getMapping())
- .andStubReturn(edmMapping01);
- EasyMock.replay(edmTyped01);
- EasyMock.expect(structuralType.getProperty("value")).andStubReturn(
- edmTyped01);
-
- List<String> propNames = new ArrayList<String>();
- propNames.add("identifier");
- propNames.add("value");
- EasyMock.expect(structuralType.getPropertyNames()).andReturn(
- propNames);
- EasyMock.replay(structuralType);
-
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
- + ODataJPATestConstants.EXCEPTION_MSG_PART_2); // assertTrue(false);
- }
+ // Setter for Dynamic Entity
+ public void set(final String fieldName, Object fieldValue) {
+ field1 = (String) fieldValue;
+ }
- try {
- resultParser.parse2EdmPropertyValueMap(jpaEntity, structuralType);
- } catch (ODataJPARuntimeException e) {
- assertTrue(true);
- }
+ public DemoItem2(final String field) {
+ field1 = field;
+ }
- }
-
- @Test
- public void testparse2EdmPropertyListMap() {
- JPAEntityParser resultParser = new JPAEntityParser();
- Map<String, Object> edmEntity = new HashMap<String, Object>();
- edmEntity.put("SoId", 1);
- DemoRelatedEntity relatedEntity = new DemoRelatedEntity("NewOrder");
- demoItem jpaEntity = new demoItem("laptop", 1);
- jpaEntity.setRelatedEntity(relatedEntity);
- List<EdmNavigationProperty> navigationPropertyList = new ArrayList<EdmNavigationProperty>();
- // Mocking a navigation property and its mapping object
- EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
- JPAEdmMappingImpl edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
- try {
- EasyMock.expect(edmMapping.getInternalName()).andStubReturn("relatedEntity");
- EasyMock.expect(((JPAEdmMappingImpl)edmMapping).isVirtualAccess()).andStubReturn(false);
- EasyMock.replay(edmMapping);
- EasyMock.expect(navigationProperty.getName()).andStubReturn("RelatedEntities");
- EasyMock.expect(navigationProperty.getMapping()).andStubReturn(edmMapping);
- EasyMock.replay(navigationProperty);
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
-
- navigationPropertyList.add(navigationProperty);
- try {
- HashMap<String, Object> result = resultParser.parse2EdmNavigationValueMap(jpaEntity, navigationPropertyList);
- assertEquals(relatedEntity, result.get("RelatedEntities"));
-
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- }
-
- @Test
- public void testparse2EdmPropertyListMapWithVirtualAccess() {
- JPAEntityParser resultParser = new JPAEntityParser();
- Map<String, Object> edmEntity = new HashMap<String, Object>();
- edmEntity.put("SoId", 1);
- DemoRelatedEntity relatedEntity = new DemoRelatedEntity("NewOrder");
- demoItem jpaEntity = new demoItem("laptop", 1);
- jpaEntity.setRelatedEntity(relatedEntity);
- List<EdmNavigationProperty> navigationPropertyList = new ArrayList<EdmNavigationProperty>();
- // Mocking a navigation property and its mapping object
- EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
- JPAEdmMappingImpl edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
- try {
- EasyMock.expect(edmMapping.getInternalName()).andStubReturn("relatedEntity");
- EasyMock.expect(((JPAEdmMappingImpl)edmMapping).isVirtualAccess()).andStubReturn(true);
- EasyMock.replay(edmMapping);
- EasyMock.expect(navigationProperty.getName()).andStubReturn("RelatedEntities");
- EasyMock.expect(navigationProperty.getMapping()).andStubReturn(edmMapping);
- EasyMock.replay(navigationProperty);
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
}
- navigationPropertyList.add(navigationProperty);
- try {
- HashMap<String, Object> result = resultParser.parse2EdmNavigationValueMap(jpaEntity, navigationPropertyList);
- assertEquals(relatedEntity, result.get("RelatedEntities"));
+ private EdmProperty getEdmProperty() {
+ EdmProperty edmTyped = EasyMock.createMock(EdmProperty.class);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- }
-
- // This unit tests when there is a complex type in the select list
- @SuppressWarnings("unchecked")
- @Test
- public void testparse2EdmPropertyValueMapFromListComplex() {
- JPAEntityParser resultParser = new JPAEntityParser();
- demoItem jpaEntity = new demoItem("laptop", 1);
- DemoRelatedEntity relatedEntity = new DemoRelatedEntity("DemoOrder");
- jpaEntity.setRelatedEntity(relatedEntity);
- List<EdmProperty> selectPropertyList = new ArrayList<EdmProperty>();
- // Mocking EdmProperties
- EdmProperty edmProperty1 = EasyMock.createMock(EdmProperty.class);
- EdmProperty edmProperty2 = EasyMock.createMock(EdmProperty.class);
- EdmProperty edmComplexProperty = EasyMock.createMock(EdmProperty.class);
- EdmType edmType1 = EasyMock.createMock(EdmType.class);
- EdmStructuralType edmType2 = EasyMock.createMock(EdmStructuralType.class);
- EdmType edmComplexType = EasyMock.createMock(EdmType.class);
- JPAEdmMappingImpl mapping1 = EasyMock.createMock(JPAEdmMappingImpl.class);
- JPAEdmMappingImpl mapping2 = EasyMock.createMock(JPAEdmMappingImpl.class);
- JPAEdmMappingImpl complexMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
- try {
- EasyMock.expect(edmType1.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
- EasyMock.replay(edmType1);
- EasyMock.expect(mapping1.getInternalName()).andStubReturn("id");
- EasyMock.expect(((JPAEdmMappingImpl) mapping1).isVirtualAccess()).andStubReturn(false);
- EasyMock.replay(mapping1);
- EasyMock.expect(edmProperty1.getName()).andStubReturn("Id");
- EasyMock.expect(edmProperty1.getMapping()).andStubReturn(mapping1);
- EasyMock.expect(edmProperty1.getType()).andStubReturn(edmType1);
- EasyMock.replay(edmProperty1);
- // Mocking the complex properties
- EasyMock.expect(edmComplexType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
- EasyMock.replay(edmComplexType);
- EasyMock.expect(complexMapping.getInternalName()).andStubReturn("order");
- EasyMock.expect(((JPAEdmMappingImpl) complexMapping).isVirtualAccess()).andStubReturn(false);
- EasyMock.replay(complexMapping);
- EasyMock.expect(edmComplexProperty.getName()).andStubReturn("OrderName");
- EasyMock.expect(edmComplexProperty.getMapping()).andStubReturn(complexMapping);
- EasyMock.expect(edmComplexProperty.getType()).andStubReturn(edmComplexType);
- EasyMock.replay(edmComplexProperty);
- EasyMock.expect(edmType2.getKind()).andStubReturn(EdmTypeKind.COMPLEX);
- EasyMock.expect(edmType2.getProperty("OrderName")).andStubReturn(edmComplexProperty);
- List<String> propertyNames = new ArrayList<String>();
- propertyNames.add("OrderName");
- EasyMock.expect(edmType2.getPropertyNames()).andStubReturn(propertyNames);
- EasyMock.replay(edmType2);
- EasyMock.expect(mapping2.getInternalName()).andStubReturn("relatedEntity");
- EasyMock.expect(((JPAEdmMappingImpl) mapping2).isVirtualAccess()).andStubReturn(false);
- EasyMock.replay(mapping2);
- EasyMock.expect(edmProperty2.getName()).andStubReturn("Order");
- EasyMock.expect(edmProperty2.getMapping()).andStubReturn(mapping2);
- EasyMock.expect(edmProperty2.getType()).andStubReturn(edmType2);
- EasyMock.replay(edmProperty2);
-
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
- + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- selectPropertyList.add(edmProperty1);
- selectPropertyList.add(edmProperty2);
- try {
- Map<String, Object> result = resultParser.parse2EdmPropertyValueMap(jpaEntity, selectPropertyList);
- assertEquals(1, ((HashMap<String, Object>) result.get("Order")).size());
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
- + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
+ JPAEdmMappingImpl edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
+ EasyMock.expect(edmMapping.getInternalName())
+ .andStubReturn("Field1");
+ EasyMock.expect(edmMapping.isVirtualAccess())
+ .andStubReturn(false);
+ EasyMock.replay(edmMapping);
- }
-
- /*
- * TestCase - getGetterName is a private method in JPAResultParser. The
- * method is uses reflection to derive the property access methods from
- * EdmProperty
- */
- @Test
- public void testGetGettersWithOutMapping() {
- JPAEntityParser resultParser = new JPAEntityParser();
- try {
-
- /*
- * Case 1 - Property having No mapping
- */
- Class<?>[] pars = { String.class, EdmMapping.class, String.class };
- Object[] params = { "Field1", null, "get" };
- Method getGetterName = resultParser.getClass().getDeclaredMethod("getAccessModifierName", pars);
- getGetterName.setAccessible(true);
- String name = (String) getGetterName.invoke(resultParser, params);
-
- assertEquals("getField1", name);
-
- } catch (IllegalAccessException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalArgumentException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (InvocationTargetException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ EdmType edmType = EasyMock.createMock(EdmType.class);
- }
- }
-
- @Test
- public void testGetGettersWithNullPropname() {
- JPAEntityParser resultParser = new JPAEntityParser();
- try {
-
- /*
- * Case 1 - Property having No mapping and no name
- */
- Class<?>[] pars = { String.class, EdmMapping.class, String.class };
- Object[] params = { null, null, null };
- Method getGetterName = resultParser.getClass().getDeclaredMethod("getAccessModifierName", pars);
- getGetterName.setAccessible(true);
-
- String name = (String) getGetterName.invoke(resultParser, params);
- assertNull(name);
-
- } catch (IllegalAccessException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalArgumentException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (InvocationTargetException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ try {
+ EasyMock.expect(edmType.getKind())
+ .andStubReturn(EdmTypeKind.SIMPLE);
+ EasyMock.expect(edmType.getName())
+ .andStubReturn("identifier");
+ EasyMock.expect(edmTyped.getName())
+ .andStubReturn("SalesOrderHeader");
+ EasyMock.expect(edmTyped.getMapping())
+ .andStubReturn(edmMapping);
- }
- }
-
- /*
- * TestCase - getGetterName is a private method in JPAResultParser. The
- * method is uses reflection to derive the property access methods from
- * EdmProperty
- *
- * EdmProperty name could have been modified. Then mapping object of
- * EdmProperty should be used for deriving the name
- */
- @Test
- public void testGetGettersWithMapping() {
- JPAEntityParser resultParser = new JPAEntityParser();
- EdmMapping edmMapping = EasyMock.createMock(EdmMapping.class);
- EasyMock.expect(edmMapping.getInternalName()).andStubReturn("field1");
- EasyMock.replay(edmMapping);
- try {
-
- Class<?>[] pars = { String.class, EdmMapping.class, String.class };
- Object[] params = { "myField", edmMapping, "get" };
- Method getGetterName = resultParser.getClass().getDeclaredMethod("getAccessModifierName", pars);
- getGetterName.setAccessible(true);
-
- String name = (String) getGetterName.invoke(resultParser, params);
- assertEquals("getField1", name);
-
- } catch (IllegalAccessException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalArgumentException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (InvocationTargetException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (NoSuchMethodException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ EasyMock.expect(edmTyped.getType())
+ .andStubReturn(edmType);
+ EasyMock.expect(edmTyped.getMapping())
+ .andStubReturn(edmMapping);
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ EasyMock.replay(edmType);
+ EasyMock.replay(edmTyped);
+ return edmTyped;
}
- }
- @Test
- public void testGetGettersNoSuchMethodException() {
- JPAEntityParser resultParser = new JPAEntityParser();
- try {
+ private EdmProperty getEdmPropertyWithVirtualAccess() {
+ EdmProperty edmTyped = EasyMock.createMock(EdmProperty.class);
- Method getGetterName = resultParser.getClass().getDeclaredMethod("getGetterName1", EdmProperty.class);
- getGetterName.setAccessible(true);
+ JPAEdmMappingImpl edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
+ EasyMock.expect(edmMapping.getInternalName())
+ .andStubReturn("Field1");
+ EasyMock.expect(edmMapping.isVirtualAccess())
+ .andStubReturn(true);
+ EasyMock.replay(edmMapping);
- } catch (NoSuchMethodException e) {
- assertEquals(
- "org.apache.olingo.odata2.jpa.processor.core.access.data.JPAEntityParser.getGetterName1" +
- "(org.apache.olingo.odata2.api.edm.EdmProperty)",
- e.getMessage());
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ EdmSimpleType edmType = EasyMock.createMock(EdmSimpleType.class);
- }
- }
-
- @Test
- public void testParse2EdmPropertyValueMap() {
- JPAEntityParser resultParser = new JPAEntityParser();
- Object jpaEntity = new DemoItem2("abc");
- try {
- resultParser.parse2EdmPropertyValueMap(jpaEntity, getEdmPropertyList());
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- }
-
- @Test
- public void testParse2EdmPropertyValueMapWithVirtualAccess() {
- JPAEntityParser resultParser = new JPAEntityParser();
- Object jpaEntity = new DemoItem2("abc");
- try {
- resultParser.parse2EdmPropertyValueMap(jpaEntity, getEdmPropertyListWithVirtualAccess());
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- }
-
- @Test
- public void testGetGetterEdmException() {
- JPAEntityParser resultParser = new JPAEntityParser();
- Object jpaEntity = new demoItem("abc", 10);
- EdmStructuralType structuralType = EasyMock.createMock(EdmStructuralType.class);
- try {
- EasyMock.expect(structuralType.getPropertyNames()).andStubThrow(new EdmException(null));
- EasyMock.replay(structuralType);
- Method getGetters =
- resultParser.getClass().getDeclaredMethod("getGetters", Object.class, EdmStructuralType.class);
- getGetters.setAccessible(true);
- try {
- getGetters.invoke(resultParser, jpaEntity, structuralType);
- } catch (IllegalAccessException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (IllegalArgumentException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (InvocationTargetException e) {
- assertTrue(true);
- }
- } catch (NoSuchMethodException e) {
- assertEquals(
- "org.apache.olingo.odata2.jpa.processor.core.access.data.JPAEntityParser.getGetters(java.lang.Object, " +
- "org.apache.olingo.odata2.api.edm.EdmStructuralType)",
- e.getMessage());
- } catch (SecurityException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- }
-
- @Test
- public void testForNullJPAEntity() {
- JPAEntityParser resultParser = new JPAEntityParser();
- EdmStructuralType structuralType = EasyMock.createMock(EdmStructuralType.class);
- Object map;
- try {
- map = resultParser.parse2EdmPropertyValueMap(null, structuralType);
- assertNull(map);
- } catch (ODataJPARuntimeException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- }
-
- class demoItem {
- private String id;
- private int value;
- private DemoRelatedEntity relatedEntity;
-
- public String getId() {
- return id;
- }
-
- public void setId(final String id) {
- this.id = id;
- }
+ try {
+ EasyMock.expect(edmType.getKind())
+ .andStubReturn(EdmTypeKind.SIMPLE);
+ EasyMock.expect(edmType.getName())
+ .andStubReturn("identifier");
+ EasyMock.expect(edmTyped.getName())
+ .andStubReturn("SalesOrderHeader");
+ EasyMock.expect(edmTyped.getMapping())
+ .andStubReturn(edmMapping);
- public DemoRelatedEntity getRelatedEntity() {
- return relatedEntity;
- }
-
- public void setRelatedEntity(final DemoRelatedEntity relatedEntity) {
- this.relatedEntity = relatedEntity;
- }
-
- public int getValue() {
- return value;
- }
-
- public void set(String property, Object value)
- throws IllegalArgumentException, IllegalAccessException,
- NoSuchFieldException, SecurityException {
- this.getClass().getDeclaredField(property).set(this, value);
- }
-
- public Object get(String property) throws IllegalArgumentException,
- IllegalAccessException, NoSuchFieldException, SecurityException {
- return this.getClass().getDeclaredField(property).get(this);
- }
-
- public void setValue(final int value) {
- this.value = value;
- }
-
- demoItem(final String id, final int value) {
- this.id = id;
- this.value = value;
- }
-
- }
-
- class DemoRelatedEntity {
- String order;
-
- public String getOrder() {
- return order;
- }
-
- public void setOrder(final String order) {
- this.order = order;
- }
-
- public DemoRelatedEntity(final String order) {
- super();
- this.order = order;
- }
-
- }
-
- private List<EdmProperty> getEdmPropertyList() {
- List<EdmProperty> properties = new ArrayList<EdmProperty>();
- properties.add(getEdmProperty());
- return properties;
- }
-
- private List<EdmProperty> getEdmPropertyListWithVirtualAccess() {
- List<EdmProperty> properties = new ArrayList<EdmProperty>();
- properties.add(getEdmPropertyWithVirtualAccess());
- return properties;
- }
-
- class DemoItem2 {
- private String field1;
-
- public String getField1() {
- return field1;
- }
-
- public void setField1(final String field) {
- field1 = field;
- }
-
- //Getter for Dynamic Entity
- public String get(String fieldName) {
- return field1;
- }
-
- //Setter for Dynamic Entity
- public void set(final String fieldName, Object fieldValue) {
- field1 = (String) fieldValue;
- }
-
- public DemoItem2(final String field) {
- field1 = field;
- }
-
- }
-
- private EdmProperty getEdmProperty() {
- EdmProperty edmTyped = EasyMock.createMock(EdmProperty.class);
-
- JPAEdmMappingImpl edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
- EasyMock.expect(edmMapping.getInternalName()).andStubReturn("Field1");
- EasyMock.expect(((JPAEdmMappingImpl) edmMapping).isVirtualAccess()).andStubReturn(false);
- EasyMock.replay(edmMapping);
-
- EdmType edmType = EasyMock.createMock(EdmType.class);
-
- try {
- EasyMock.expect(edmType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
- EasyMock.expect(edmType.getName()).andStubReturn("identifier");
- EasyMock.expect(edmTyped.getName()).andStubReturn("SalesOrderHeader");
- EasyMock.expect(edmTyped.getMapping()).andStubReturn(edmMapping);
-
- EasyMock.expect(edmTyped.getType()).andStubReturn(edmType);
- EasyMock.expect(edmTyped.getMapping()).andStubReturn(edmMapping);
-
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- EasyMock.replay(edmType);
- EasyMock.replay(edmTyped);
- return edmTyped;
- }
-
- private EdmProperty getEdmPropertyWithVirtualAccess() {
- EdmProperty edmTyped = EasyMock.createMock(EdmProperty.class);
-
- JPAEdmMappingImpl edmMapping = EasyMock.createMock(JPAEdmMappingImpl.class);
- EasyMock.expect(edmMapping.getInternalName()).andStubReturn("Field1");
- EasyMock.expect(((JPAEdmMappingImpl) edmMapping).isVirtualAccess()).andStubReturn(true);
- EasyMock.replay(edmMapping);
-
- EdmSimpleType edmType = EasyMock.createMock(EdmSimpleType.class);
-
- try {
- EasyMock.expect(edmType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
- EasyMock.expect(edmType.getName()).andStubReturn("identifier");
- EasyMock.expect(edmTyped.getName()).andStubReturn("SalesOrderHeader");
- EasyMock.expect(edmTyped.getMapping()).andStubReturn(edmMapping);
-
- EasyMock.expect(edmTyped.getType()).andStubReturn(edmType);
- EasyMock.expect(edmTyped.getMapping()).andStubReturn(edmMapping);
-
- } catch (EdmException e) {
- fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
- }
- EasyMock.replay(edmType);
- EasyMock.replay(edmTyped);
- return edmTyped;
- }
-}
\ No newline at end of file
+ EasyMock.expect(edmTyped.getType())
+ .andStubReturn(edmType);
+ EasyMock.expect(edmTyped.getMapping())
+ .andStubReturn(edmMapping);
+
+ } catch (EdmException e) {
+ fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+ }
+ EasyMock.replay(edmType);
+ EasyMock.replay(edmTyped);
+ return edmTyped;
+ }
+}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/ODataJPAServiceFactoryMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/ODataJPAServiceFactoryMock.java
index d7dfc2d5..4ba6bfae 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/ODataJPAServiceFactoryMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/ODataJPAServiceFactoryMock.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.core.mock;
@@ -24,24 +20,24 @@ import org.apache.olingo.odata2.jpa.processor.api.ODataJPAServiceFactory;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
public class ODataJPAServiceFactoryMock extends ODataJPAServiceFactory {
- private ODataContext context = null;
+ private ODataContext context = null;
- public ODataJPAServiceFactoryMock(final ODataContext context) {
- this.context = context;
- }
+ public ODataJPAServiceFactoryMock(final ODataContext context) {
+ this.context = context;
+ }
- @Override
- public ODataJPAContext initializeODataJPAContext() throws ODataJPARuntimeException {
- ODataJPAContext oDataJPAContext = null;
- oDataJPAContext = ODataJPAContextMock.mockODataJPAContext(context);
- setOnWriteJPAContent(new OnJPAWriteContentMock());
- return oDataJPAContext;
- }
+ @Override
+ public ODataJPAContext initializeODataJPAContext() throws ODataJPARuntimeException {
+ ODataJPAContext oDataJPAContext = null;
+ oDataJPAContext = ODataJPAContextMock.mockODataJPAContext(context);
+ setOnWriteJPAContent(new OnJPAWriteContentMock());
+ return oDataJPAContext;
+ }
- public ODataJPAContext initializeODataJPAContextX() throws ODataJPARuntimeException {
- ODataJPAContext oDataJPAContext = null;
- oDataJPAContext = ODataJPAContextMock.mockODataJPAContext(context);
- setOnWriteJPAContent(null);
- return oDataJPAContext;
- }
+ public ODataJPAContext initializeODataJPAContextX() throws ODataJPARuntimeException {
+ ODataJPAContext oDataJPAContext = null;
+ oDataJPAContext = ODataJPAContextMock.mockODataJPAContext(context);
+ setOnWriteJPAContent(null);
+ return oDataJPAContext;
+ }
}
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/OnJPAWriteContentMock.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/OnJPAWriteContentMock.java
index 07cbffb6..f7d36363 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/OnJPAWriteContentMock.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/OnJPAWriteContentMock.java
@@ -1,58 +1,47 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.jpa.processor.core.mock;
import java.sql.Blob;
import java.sql.Clob;
import java.sql.SQLException;
-
-import jakarta.sql.rowset.serial.SerialBlob;
-import jakarta.sql.rowset.serial.SerialClob;
-import jakarta.sql.rowset.serial.SerialException;
-
+import javax.sql.rowset.serial.SerialBlob;
+import javax.sql.rowset.serial.SerialClob;
import org.apache.olingo.odata2.jpa.processor.api.OnJPAWriteContent;
import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
public class OnJPAWriteContentMock implements OnJPAWriteContent {
- @Override
- public Blob getJPABlob(final byte[] binaryData) throws ODataJPARuntimeException {
- try {
- return new SerialBlob(binaryData);
- } catch (SerialException e) {
- ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
- } catch (SQLException e) {
- ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
+ @Override
+ public Blob getJPABlob(final byte[] binaryData) throws ODataJPARuntimeException {
+ try {
+ return new SerialBlob(binaryData);
+ } catch (SQLException e) {
+ ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
+ }
+ return null;
}
- return null;
- }
- @Override
- public Clob getJPAClob(final char[] characterData) throws ODataJPARuntimeException {
- try {
- return new SerialClob(characterData);
- } catch (SerialException e) {
- ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
- } catch (SQLException e) {
- ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
+ @Override
+ public Clob getJPAClob(final char[] characterData) throws ODataJPARuntimeException {
+ try {
+ return new SerialClob(characterData);
+ } catch (SQLException e) {
+ ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
+ }
+ return null;
}
- return null;
- }
}
diff --git a/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/ep/JSON_XMLErrorConsumerTest.java b/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/ep/JSON_XMLErrorConsumerTest.java
index b9488f60..9041e5e5 100644
--- a/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/ep/JSON_XMLErrorConsumerTest.java
+++ b/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/ep/JSON_XMLErrorConsumerTest.java
@@ -1,70 +1,62 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.client.core.ep;
import static org.junit.Assert.assertEquals;
-
import java.util.Locale;
-
import org.apache.olingo.odata2.api.ep.EntityProviderException;
import org.apache.olingo.odata2.api.processor.ODataErrorContext;
import org.apache.olingo.odata2.client.api.ODataClient;
import org.apache.olingo.odata2.client.core.ep.deserializer.AbstractDeserializerTest;
+import org.apache.olingo.odata2.testutil.helper.LocaleAsserter;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.junit.Test;
/**
- *
+ *
*/
public class JSON_XMLErrorConsumerTest extends AbstractDeserializerTest {
- private static final String JSON = "application/json";
- private static final String XML = "application/xml";
-
- @Test
- public void readErrorDocumentJson() throws EntityProviderException {
- ODataClient providerFacade = ODataClient.newInstance();
- String errorDoc = "{\"error\":{\"code\":\"ErrorCode\",\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
- ODataErrorContext errorContext = providerFacade.createDeserializer(JSON).
- readErrorDocument(StringHelper.encapsulate(errorDoc));
- //
- assertEquals("Wrong content type", "application/json", errorContext.getContentType());
- assertEquals("Wrong message", "Message", errorContext.getMessage());
- assertEquals("Wrong error code", "ErrorCode", errorContext.getErrorCode());
- assertEquals("Wrong locale for lang", Locale.US, errorContext.getLocale());
- }
+ private static final String JSON = "application/json";
+ private static final String XML = "application/xml";
+
+ @Test
+ public void readErrorDocumentJson() throws EntityProviderException {
+ ODataClient providerFacade = ODataClient.newInstance();
+ String errorDoc = "{\"error\":{\"code\":\"ErrorCode\",\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
+ ODataErrorContext errorContext = providerFacade.createDeserializer(JSON)
+ .readErrorDocument(StringHelper.encapsulate(errorDoc));
+ //
+ assertEquals("Wrong content type", "application/json", errorContext.getContentType());
+ assertEquals("Wrong message", "Message", errorContext.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", errorContext.getErrorCode());
+ LocaleAsserter.assertLocale("Wrong locale for lang", errorContext.getLocale(), Locale.US);
+ }
- @Test
- public void readErrorDocumentXml() throws EntityProviderException {
- ODataClient providerFacade = ODataClient.newInstance();
- String errorDoc =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "</error>";
- ODataErrorContext errorContext = providerFacade.createDeserializer(XML).
- readErrorDocument(StringHelper.encapsulate(errorDoc));
- //
- assertEquals("Wrong content type", "application/xml", errorContext.getContentType());
- assertEquals("Wrong message", "Message", errorContext.getMessage());
- assertEquals("Wrong error code", "ErrorCode", errorContext.getErrorCode());
- assertEquals("Wrong locale for lang", Locale.US, errorContext.getLocale());
- }
+ @Test
+ public void readErrorDocumentXml() throws EntityProviderException {
+ ODataClient providerFacade = ODataClient.newInstance();
+ String errorDoc = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:lang=\"en-US\">Message</message>\n" + "</error>";
+ ODataErrorContext errorContext = providerFacade.createDeserializer(XML)
+ .readErrorDocument(StringHelper.encapsulate(errorDoc));
+ //
+ assertEquals("Wrong content type", "application/xml", errorContext.getContentType());
+ assertEquals("Wrong message", "Message", errorContext.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", errorContext.getErrorCode());
+ LocaleAsserter.assertLocale("Wrong locale for lang", errorContext.getLocale(), Locale.US);
+ }
}
diff --git a/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/ep/deserializer/JsonErrorDocumentDeserializerTest.java b/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/ep/deserializer/JsonErrorDocumentDeserializerTest.java
index 1548bd76..b778f25c 100644
--- a/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/ep/deserializer/JsonErrorDocumentDeserializerTest.java
+++ b/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/ep/deserializer/JsonErrorDocumentDeserializerTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.client.core.ep.deserializer;
@@ -22,213 +18,210 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
import java.io.InputStream;
import java.util.Locale;
-
import org.apache.olingo.odata2.api.ep.EntityProviderException;
import org.apache.olingo.odata2.api.processor.ODataErrorContext;
-import org.apache.olingo.odata2.client.core.ep.deserializer.JsonErrorDocumentDeserializer;
+import org.apache.olingo.odata2.testutil.helper.LocaleAsserter;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.junit.Test;
/**
- *
+ *
*/
public class JsonErrorDocumentDeserializerTest extends AbstractDeserializerTest {
- private static final String JSON_ERROR_DOCUMENT_SIMPLE = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
- private static final String JSON_ERROR_DOCUMENT_NULL_LOCALE = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":null,\"value\":\"Message\"}}}";
- private static final String JSON_ERROR_DOCUMENT_INNER_ERROR = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, \"innererror\":\"Some InnerError\"}}";
- private static final String JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, " +
- "\"innererror\":{\"moreInner\":\"More Inner Error\"}}}";
- private static final String JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_OBJECT = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, " +
- "\"innererror\":{\"moreInner\":\"More Inner Error\",\"secondInner\":\"Second\"}}}";
- private static final String JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_ARRAY = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, " +
- "\"innererror\":{\"innerArray\":[\"More Inner Error\",\"Second\"]}}}";
- private static final String JSON_ERROR_DOCUMENT_INVALID_JSON = "\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
- /* error document with name 'locale' instead of 'lang' for message object */
- private static final String JSON_ERROR_DOCUMENT_UNKNOWN_CONTENT = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"locale\":\"en-US\",\"value\":\"Message\"}}}";
- /* error document without value for message object */
- private static final String JSON_ERROR_DOCUMENT_INVALID_CONTENT = "{\"error\":{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\"}}}";
- private static final String JSON_ERROR_DOCUMENT_MISSING_MESSAGE = "{\"error\":{\"code\":\"ErrorCode\"}}";
- private static final String JSON_ERROR_DOCUMENT_MISSING_CODE = "{\"error\":{" +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
- private static final String JSON_ERROR_DOCUMENT_MISSING_ERROR = "{\"code\":\"ErrorCode\"," +
- "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}";
- private JsonErrorDocumentDeserializer jedc = new JsonErrorDocumentDeserializer();
-
- @Test
- public void simpleErrorDocument() throws Exception {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_SIMPLE);
- ODataErrorContext error = jedc.readError(in);
-
- assertEquals("Wrong content type", "application/json", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong locale for lang", Locale.US, error.getLocale());
- }
-
- @Test
- public void localeNull() throws Exception {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_NULL_LOCALE);
- ODataErrorContext error = jedc.readError(in);
-
- assertEquals("Wrong content type", "application/json", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertNull("Expected NULL for locale", error.getLocale());
- }
-
- @Test
- public void innerError() throws Exception {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR);
- ODataErrorContext error = jedc.readError(in);
-
- assertEquals("Wrong content type", "application/json", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error", "Some InnerError", error.getInnerError());
- }
-
- @Test
- public void innerErrorComplex() throws Exception {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX);
- ODataErrorContext error = jedc.readError(in);
-
- assertEquals("Wrong content type", "application/json", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error", "{\"moreInner\":\"More Inner Error\"}", error.getInnerError());
- }
-
- @Test
- public void innerErrorComplexObject() throws Exception {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_OBJECT);
- ODataErrorContext error = jedc.readError(in);
-
- assertEquals("Wrong content type", "application/json", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error",
- "{\"moreInner\":\"More Inner Error\",\"secondInner\":\"Second\"}", error.getInnerError());
- }
-
- @Test
- public void innerErrorComplexArray() throws Exception {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_ARRAY);
- ODataErrorContext error = jedc.readError(in);
-
- assertEquals("Wrong content type", "application/json", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error",
- "{\"innerArray\":[\"More Inner Error\"\"Second\"]}", error.getInnerError());
- }
-
- @Test(expected = EntityProviderException.class)
- public void invalidJson() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INVALID_JSON);
- try {
- jedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.EXCEPTION_OCCURRED, e.getMessageReference());
- throw e;
+ private static final String JSON_ERROR_DOCUMENT_SIMPLE =
+ "{\"error\":{\"code\":\"ErrorCode\"," + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
+ private static final String JSON_ERROR_DOCUMENT_NULL_LOCALE =
+ "{\"error\":{\"code\":\"ErrorCode\"," + "\"message\":{\"lang\":null,\"value\":\"Message\"}}}";
+ private static final String JSON_ERROR_DOCUMENT_INNER_ERROR = "{\"error\":{\"code\":\"ErrorCode\","
+ + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, \"innererror\":\"Some InnerError\"}}";
+ private static final String JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX = "{\"error\":{\"code\":\"ErrorCode\","
+ + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, " + "\"innererror\":{\"moreInner\":\"More Inner Error\"}}}";
+ private static final String JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_OBJECT =
+ "{\"error\":{\"code\":\"ErrorCode\"," + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, "
+ + "\"innererror\":{\"moreInner\":\"More Inner Error\",\"secondInner\":\"Second\"}}}";
+ private static final String JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_ARRAY =
+ "{\"error\":{\"code\":\"ErrorCode\"," + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}, "
+ + "\"innererror\":{\"innerArray\":[\"More Inner Error\",\"Second\"]}}}";
+ private static final String JSON_ERROR_DOCUMENT_INVALID_JSON =
+ "\"error\":{\"code\":\"ErrorCode\"," + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
+ /* error document with name 'locale' instead of 'lang' for message object */
+ private static final String JSON_ERROR_DOCUMENT_UNKNOWN_CONTENT =
+ "{\"error\":{\"code\":\"ErrorCode\"," + "\"message\":{\"locale\":\"en-US\",\"value\":\"Message\"}}}";
+ /* error document without value for message object */
+ private static final String JSON_ERROR_DOCUMENT_INVALID_CONTENT =
+ "{\"error\":{\"code\":\"ErrorCode\"," + "\"message\":{\"lang\":\"en-US\"}}}";
+ private static final String JSON_ERROR_DOCUMENT_MISSING_MESSAGE = "{\"error\":{\"code\":\"ErrorCode\"}}";
+ private static final String JSON_ERROR_DOCUMENT_MISSING_CODE =
+ "{\"error\":{" + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}}";
+ private static final String JSON_ERROR_DOCUMENT_MISSING_ERROR =
+ "{\"code\":\"ErrorCode\"," + "\"message\":{\"lang\":\"en-US\",\"value\":\"Message\"}}";
+ private final JsonErrorDocumentDeserializer jedc = new JsonErrorDocumentDeserializer();
+
+ @Test
+ public void simpleErrorDocument() throws Exception {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_SIMPLE);
+ ODataErrorContext error = jedc.readError(in);
+
+ assertEquals("Wrong content type", "application/json", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ LocaleAsserter.assertLocale("Wrong locale for lang", error.getLocale(), Locale.US);
+ }
+
+ @Test
+ public void localeNull() throws Exception {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_NULL_LOCALE);
+ ODataErrorContext error = jedc.readError(in);
+
+ assertEquals("Wrong content type", "application/json", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertNull("Expected NULL for locale", error.getLocale());
+ }
+
+ @Test
+ public void innerError() throws Exception {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR);
+ ODataErrorContext error = jedc.readError(in);
+
+ assertEquals("Wrong content type", "application/json", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", "Some InnerError", error.getInnerError());
+ }
+
+ @Test
+ public void innerErrorComplex() throws Exception {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX);
+ ODataErrorContext error = jedc.readError(in);
+
+ assertEquals("Wrong content type", "application/json", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", "{\"moreInner\":\"More Inner Error\"}", error.getInnerError());
+ }
+
+ @Test
+ public void innerErrorComplexObject() throws Exception {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_OBJECT);
+ ODataErrorContext error = jedc.readError(in);
+
+ assertEquals("Wrong content type", "application/json", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", "{\"moreInner\":\"More Inner Error\",\"secondInner\":\"Second\"}", error.getInnerError());
}
- }
-
- @Test(expected = EntityProviderException.class)
- public void invalidEmptyDocument() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate("");
- try {
- jedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.EXCEPTION_OCCURRED, e.getMessageReference());
- throw e;
+
+ @Test
+ public void innerErrorComplexArray() throws Exception {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INNER_ERROR_COMPLEX_ARRAY);
+ ODataErrorContext error = jedc.readError(in);
+
+ assertEquals("Wrong content type", "application/json", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", "{\"innerArray\":[\"More Inner Error\"\"Second\"]}", error.getInnerError());
}
- }
-
- @Test(expected = EntityProviderException.class)
- public void nullParameter() throws EntityProviderException {
- try {
- jedc.readError(null);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
- throw e;
+
+ @Test(expected = EntityProviderException.class)
+ public void invalidJson() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INVALID_JSON);
+ try {
+ jedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.EXCEPTION_OCCURRED, e.getMessageReference());
+ throw e;
+ }
}
- }
-
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentUnknown() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_UNKNOWN_CONTENT);
- try {
- jedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
- throw e;
+
+ @Test(expected = EntityProviderException.class)
+ public void invalidEmptyDocument() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate("");
+ try {
+ jedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.EXCEPTION_OCCURRED, e.getMessageReference());
+ throw e;
+ }
}
- }
-
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocument() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INVALID_CONTENT);
- try {
- jedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
- throw e;
+
+ @Test(expected = EntityProviderException.class)
+ public void nullParameter() throws EntityProviderException {
+ try {
+ jedc.readError(null);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
+ throw e;
+ }
}
- }
-
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentMissingError() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_MISSING_ERROR);
- try {
- jedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
- throw e;
+
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentUnknown() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_UNKNOWN_CONTENT);
+ try {
+ jedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
+ throw e;
+ }
}
- }
-
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentMissingCode() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_MISSING_CODE);
- try {
- jedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
- assertTrue(e.getMessage().contains("code"));
- throw e;
+
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocument() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_INVALID_CONTENT);
+ try {
+ jedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
+ throw e;
+ }
+ }
+
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentMissingError() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_MISSING_ERROR);
+ try {
+ jedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
+ throw e;
+ }
}
- }
-
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentMissingMessage() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_MISSING_MESSAGE);
- try {
- jedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
- assertTrue(e.getMessage().contains("message"));
- throw e;
+
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentMissingCode() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_MISSING_CODE);
+ try {
+ jedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
+ assertTrue(e.getMessage()
+ .contains("code"));
+ throw e;
+ }
+ }
+
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentMissingMessage() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(JSON_ERROR_DOCUMENT_MISSING_MESSAGE);
+ try {
+ jedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
+ assertTrue(e.getMessage()
+ .contains("message"));
+ throw e;
+ }
}
- }
}
diff --git a/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/ep/deserializer/XmlErrorDocumentTest.java b/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/ep/deserializer/XmlErrorDocumentTest.java
index 2a255f12..c8a6250c 100644
--- a/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/ep/deserializer/XmlErrorDocumentTest.java
+++ b/odata2-lib/odata-client-core/src/test/java/org/apache/olingo/odata2/client/core/ep/deserializer/XmlErrorDocumentTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.client.core.ep.deserializer;
@@ -22,13 +18,11 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
import java.io.InputStream;
import java.util.Locale;
-
import org.apache.olingo.odata2.api.ep.EntityProviderException;
import org.apache.olingo.odata2.api.processor.ODataErrorContext;
-import org.apache.olingo.odata2.client.core.ep.deserializer.XmlErrorDocumentDeserializer;
+import org.apache.olingo.odata2.testutil.helper.LocaleAsserter;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.junit.Test;
@@ -37,245 +31,217 @@ import org.junit.Test;
*/
public class XmlErrorDocumentTest extends AbstractDeserializerTest {
- private static final String XML_ERROR_DOCUMENT_SIMPLE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "</error>";
- private static final String XML_ERROR_DOCUMENT_NULL_LOCALE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"\">Message</message>\n" +
- "</error>";
- private static final String XML_ERROR_DOCUMENT_INNER_ERROR =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "<innererror>Some InnerError</innererror>\n" +
- "</error>";
- private static final String XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "<innererror>" +
- "<moreInner>More Inner Error</moreInner>" +
- "</innererror>\n" +
- "</error>";
- private static final String XML_ERROR_DOCUMENT_INVALID_XML =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</CODE>\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "</error>";
- /* error document with name 'locale' instead of 'lang' for message object */
- private static final String XML_ERROR_DOCUMENT_UNKNOWN_CONTENT =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:locale=\"en-US\">Message</message>\n" +
- "\t<privateMessage>Secret</privateMessage>\n" +
- "</error>";
- /* error document without value for message object */
- private static final String XML_ERROR_DOCUMENT_EMPTY_MESSAGE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"en-US\" />\n" +
- "</error>";
- private static final String XML_ERROR_DOCUMENT_MISSING_MESSAGE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "</error>";
- private static final String XML_ERROR_DOCUMENT_MISSING_CODE =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "</error>";
- private static final String XML_ERROR_DOCUMENT_MISSING_ERROR =
- "<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<errorForMe xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" +
- "\t<code>ErrorCode</code>\n" +
- "\t<message xml:lang=\"en-US\">Message</message>\n" +
- "</errorForMe>";
- private XmlErrorDocumentDeserializer xedc = new XmlErrorDocumentDeserializer();
-
- @Test
- public void simpleErrorDocument() throws Exception {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_SIMPLE);
- ODataErrorContext error = xedc.readError(in);
-
- assertEquals("Wrong content type", "application/xml", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong locale for lang", Locale.US, error.getLocale());
- }
-
- @Test
- public void emptyMessage() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_EMPTY_MESSAGE);
-
- ODataErrorContext error = xedc.readError(in);
+ private static final String XML_ERROR_DOCUMENT_SIMPLE = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:lang=\"en-US\">Message</message>\n" + "</error>";
+ private static final String XML_ERROR_DOCUMENT_NULL_LOCALE = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:lang=\"\">Message</message>\n" + "</error>";
+ private static final String XML_ERROR_DOCUMENT_INNER_ERROR = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:lang=\"en-US\">Message</message>\n" + "<innererror>Some InnerError</innererror>\n" + "</error>";
+ private static final String XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:lang=\"en-US\">Message</message>\n" + "<innererror>" + "<moreInner>More Inner Error</moreInner>"
+ + "</innererror>\n" + "</error>";
+ private static final String XML_ERROR_DOCUMENT_INVALID_XML = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</CODE>\n"
+ + "\t<message xml:lang=\"en-US\">Message</message>\n" + "</error>";
+ /* error document with name 'locale' instead of 'lang' for message object */
+ private static final String XML_ERROR_DOCUMENT_UNKNOWN_CONTENT = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:locale=\"en-US\">Message</message>\n" + "\t<privateMessage>Secret</privateMessage>\n" + "</error>";
+ /* error document without value for message object */
+ private static final String XML_ERROR_DOCUMENT_EMPTY_MESSAGE = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:lang=\"en-US\" />\n" + "</error>";
+ private static final String XML_ERROR_DOCUMENT_MISSING_MESSAGE = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "</error>";
+ private static final String XML_ERROR_DOCUMENT_MISSING_CODE = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<error xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n"
+ + "\t<message xml:lang=\"en-US\">Message</message>\n" + "</error>";
+ private static final String XML_ERROR_DOCUMENT_MISSING_ERROR = "<?xml version='1.0' encoding='UTF-8'?>\n"
+ + "<errorForMe xmlns=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\">\n" + "\t<code>ErrorCode</code>\n"
+ + "\t<message xml:lang=\"en-US\">Message</message>\n" + "</errorForMe>";
+ private final XmlErrorDocumentDeserializer xedc = new XmlErrorDocumentDeserializer();
+
+ @Test
+ public void simpleErrorDocument() throws Exception {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_SIMPLE);
+ ODataErrorContext error = xedc.readError(in);
+
+ assertEquals("Wrong content type", "application/xml", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ LocaleAsserter.assertLocale("Wrong locale for lang", error.getLocale(), Locale.US);
+ }
- assertEquals("Wrong content type", "application/xml", error.getContentType());
- assertEquals("Wrong message", "", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong locale for lang", Locale.US, error.getLocale());
- }
+ @Test
+ public void emptyMessage() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_EMPTY_MESSAGE);
- @Test
- public void localeNull() throws Exception {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_NULL_LOCALE);
- ODataErrorContext error = xedc.readError(in);
+ ODataErrorContext error = xedc.readError(in);
- assertEquals("Wrong content type", "application/xml", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertNull("Expected NULL for locale", error.getLocale());
- }
+ assertEquals("Wrong content type", "application/xml", error.getContentType());
+ assertEquals("Wrong message", "", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ LocaleAsserter.assertLocale("Wrong locale for lang", error.getLocale(), Locale.US);
+ }
- @Test
- public void innerError() throws Exception {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_INNER_ERROR);
- ODataErrorContext error = xedc.readError(in);
+ @Test
+ public void localeNull() throws Exception {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_NULL_LOCALE);
+ ODataErrorContext error = xedc.readError(in);
- assertEquals("Wrong content type", "application/xml", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error", "Some InnerError", error.getInnerError());
- }
+ assertEquals("Wrong content type", "application/xml", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertNull("Expected NULL for locale", error.getLocale());
+ }
- @Test
- public void innerErrorComplex() throws Exception {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX);
- ODataErrorContext error = xedc.readError(in);
+ @Test
+ public void innerError() throws Exception {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_INNER_ERROR);
+ ODataErrorContext error = xedc.readError(in);
- assertEquals("Wrong content type", "application/xml", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error", "<moreInner>More Inner Error</moreInner>", error.getInnerError());
- }
+ assertEquals("Wrong content type", "application/xml", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", "Some InnerError", error.getInnerError());
+ }
- @Test
- public void innerErrorComplexTwo() throws Exception {
- String innerErrorText = "<firstTag>tagText</firstTag><secondTag>secondText</secondTag>";
- String innerError = "<innererror>" + innerErrorText + "</innererror>";
- String errorDocument = XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX.replaceAll(
- "<innererror.*error>", innerError);
- InputStream in = StringHelper.encapsulate(errorDocument);
- ODataErrorContext error = xedc.readError(in);
+ @Test
+ public void innerErrorComplex() throws Exception {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX);
+ ODataErrorContext error = xedc.readError(in);
- assertEquals("Wrong content type", "application/xml", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error", innerErrorText, error.getInnerError());
- }
+ assertEquals("Wrong content type", "application/xml", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", "<moreInner>More Inner Error</moreInner>", error.getInnerError());
+ }
- @Test
- public void innerErrorComplexMoreCharacters() throws Exception {
- String innerErrorText = "\n\t<firstTag>tagText</firstTag>\n<secondTag>secondText</secondTag>\n";
- String innerError = "<innererror>" + innerErrorText + "</innererror>";
- String errorDocument = XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX.replaceAll(
- "<innererror.*error>", innerError);
- InputStream in = StringHelper.encapsulate(errorDocument);
- ODataErrorContext error = xedc.readError(in);
+ @Test
+ public void innerErrorComplexTwo() throws Exception {
+ String innerErrorText = "<firstTag>tagText</firstTag><secondTag>secondText</secondTag>";
+ String innerError = "<innererror>" + innerErrorText + "</innererror>";
+ String errorDocument = XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX.replaceAll("<innererror.*error>", innerError);
+ InputStream in = StringHelper.encapsulate(errorDocument);
+ ODataErrorContext error = xedc.readError(in);
+
+ assertEquals("Wrong content type", "application/xml", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", innerErrorText, error.getInnerError());
+ }
- assertEquals("Wrong content type", "application/xml", error.getContentType());
- assertEquals("Wrong message", "Message", error.getMessage());
- assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
- assertEquals("Wrong inner error", innerErrorText, error.getInnerError());
- }
+ @Test
+ public void innerErrorComplexMoreCharacters() throws Exception {
+ String innerErrorText = "\n\t<firstTag>tagText</firstTag>\n<secondTag>secondText</secondTag>\n";
+ String innerError = "<innererror>" + innerErrorText + "</innererror>";
+ String errorDocument = XML_ERROR_DOCUMENT_INNER_ERROR_COMPLEX.replaceAll("<innererror.*error>", innerError);
+ InputStream in = StringHelper.encapsulate(errorDocument);
+ ODataErrorContext error = xedc.readError(in);
+
+ assertEquals("Wrong content type", "application/xml", error.getContentType());
+ assertEquals("Wrong message", "Message", error.getMessage());
+ assertEquals("Wrong error code", "ErrorCode", error.getErrorCode());
+ assertEquals("Wrong inner error", innerErrorText, error.getInnerError());
+ }
- @Test(expected = EntityProviderException.class)
- public void invalidJson() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_INVALID_XML);
- try {
- xedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
- throw e;
+ @Test(expected = EntityProviderException.class)
+ public void invalidJson() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_INVALID_XML);
+ try {
+ xedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.INVALID_STATE, e.getMessageReference());
+ throw e;
+ }
}
- }
- @Test(expected = EntityProviderException.class)
- public void invalidEmptyDocument() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate("");
- try {
- xedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals("Got wrong exception: " + e.getMessageReference().getKey(),
- EntityProviderException.INVALID_STATE, e.getMessageReference());
- throw e;
+ @Test(expected = EntityProviderException.class)
+ public void invalidEmptyDocument() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate("");
+ try {
+ xedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals("Got wrong exception: " + e.getMessageReference()
+ .getKey(),
+ EntityProviderException.INVALID_STATE, e.getMessageReference());
+ throw e;
+ }
}
- }
- @Test(expected = EntityProviderException.class)
- public void nullParameter() throws EntityProviderException {
- try {
- xedc.readError(null);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.ILLEGAL_ARGUMENT, e.getMessageReference());
- throw e;
+ @Test(expected = EntityProviderException.class)
+ public void nullParameter() throws EntityProviderException {
+ try {
+ xedc.readError(null);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.ILLEGAL_ARGUMENT, e.getMessageReference());
+ throw e;
+ }
}
- }
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentUnknown() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_UNKNOWN_CONTENT);
- try {
- xedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals(EntityProviderException.INVALID_CONTENT, e.getMessageReference());
- throw e;
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentUnknown() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_UNKNOWN_CONTENT);
+ try {
+ xedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals(EntityProviderException.INVALID_CONTENT, e.getMessageReference());
+ throw e;
+ }
}
- }
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentMissingError() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_MISSING_ERROR);
- try {
- xedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals("Got wrong exception: " + e.getMessageReference().getKey(),
- EntityProviderException.INVALID_STATE, e.getMessageReference());
- throw e;
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentMissingError() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_MISSING_ERROR);
+ try {
+ xedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals("Got wrong exception: " + e.getMessageReference()
+ .getKey(),
+ EntityProviderException.INVALID_STATE, e.getMessageReference());
+ throw e;
+ }
}
- }
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentMissingCode() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_MISSING_CODE);
- try {
- xedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals("Got wrong exception: " + e.getMessageReference().getKey(),
- EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
- assertTrue(e.getMessage().contains("code"));
- throw e;
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentMissingCode() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_MISSING_CODE);
+ try {
+ xedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals("Got wrong exception: " + e.getMessageReference()
+ .getKey(),
+ EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
+ assertTrue(e.getMessage()
+ .contains("code"));
+ throw e;
+ }
}
- }
- @Test(expected = EntityProviderException.class)
- public void invalidErrorDocumentMissingMessage() throws EntityProviderException {
- InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_MISSING_MESSAGE);
- try {
- xedc.readError(in);
- fail("Expected exception was not thrown");
- } catch (EntityProviderException e) {
- assertEquals("Got wrong exception: " + e.getMessageReference().getKey(),
- EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
- assertTrue(e.getMessage().contains("message"));
- throw e;
+ @Test(expected = EntityProviderException.class)
+ public void invalidErrorDocumentMissingMessage() throws EntityProviderException {
+ InputStream in = StringHelper.encapsulate(XML_ERROR_DOCUMENT_MISSING_MESSAGE);
+ try {
+ xedc.readError(in);
+ fail("Expected exception was not thrown");
+ } catch (EntityProviderException e) {
+ assertEquals("Got wrong exception: " + e.getMessageReference()
+ .getKey(),
+ EntityProviderException.MISSING_PROPERTY, e.getMessageReference());
+ assertTrue(e.getMessage()
+ .contains("message"));
+ throw e;
+ }
}
- }
}
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
index 28ed897d..64718dfb 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
@@ -74,34 +74,65 @@ public final class ODataSubLocator {
}
@POST
- public Response handlePost(@HeaderParam("X-HTTP-Method") final String xHttpMethod) throws ODataException {
- Response response;
+ public Response handlePost(@HeaderParam("X-HTTP-Method") final String xHttpMethod,
+ @HeaderParam("X-HTTP-Method-Override") String xHttpMethodOverride) throws ODataException {
+ if (xHttpMethod == null && xHttpMethodOverride != null) {
+ return handleMethodOverride(xHttpMethodOverride);
+ }
if (xHttpMethod == null) {
- response = handle(ODataHttpMethod.POST);
- } else {
- /* tunneling */
- if ("MERGE".equals(xHttpMethod)) {
- response = handle(ODataHttpMethod.MERGE);
- } else if ("PATCH".equals(xHttpMethod)) {
- response = handle(ODataHttpMethod.PATCH);
- } else if (HttpMethod.DELETE.equals(xHttpMethod)) {
- response = handle(ODataHttpMethod.DELETE);
- } else if (HttpMethod.PUT.equals(xHttpMethod)) {
- response = handle(ODataHttpMethod.PUT);
- } else if (HttpMethod.GET.equals(xHttpMethod)) {
- response = handle(ODataHttpMethod.GET);
- } else if (HttpMethod.POST.equals(xHttpMethod)) {
- response = handle(ODataHttpMethod.POST);
- } else if (HttpMethod.HEAD.equals(xHttpMethod)) {
- response = handleHead();
- } else if (HttpMethod.OPTIONS.equals(xHttpMethod)) {
- response = handleOptions();
- } else {
- response = returnNotImplementedResponse(ODataNotImplementedException.TUNNELING);
- }
+ return handle(ODataHttpMethod.POST);
+ }
+
+ /* tunneling */
+ if ("MERGE".equals(xHttpMethod)) {
+ return handle(ODataHttpMethod.MERGE);
+ }
+ if ("PATCH".equals(xHttpMethod)) {
+ return handle(ODataHttpMethod.PATCH);
+ }
+ if (HttpMethod.DELETE.equals(xHttpMethod)) {
+ return handle(ODataHttpMethod.DELETE);
+ }
+ if (HttpMethod.PUT.equals(xHttpMethod)) {
+ return handle(ODataHttpMethod.PUT);
+ }
+ if (HttpMethod.GET.equals(xHttpMethod)) {
+ return handle(ODataHttpMethod.GET);
+ }
+ if (HttpMethod.POST.equals(xHttpMethod)) {
+ return handle(ODataHttpMethod.POST);
+ }
+ if (HttpMethod.HEAD.equals(xHttpMethod)) {
+ return handleHead();
+ }
+ if (HttpMethod.OPTIONS.equals(xHttpMethod)) {
+ return handleOptions();
+ }
+ return returnNotImplementedResponse(ODataNotImplementedException.TUNNELING);
+ }
+
+ private Response handleMethodOverride(String xHttpMethodOverride) throws ODataException {
+ switch (xHttpMethodOverride.toUpperCase()) {
+ case HttpMethod.OPTIONS:
+ return handleOptions();
+ case HttpMethod.GET:
+ return handleGet();
+ case HttpMethod.DELETE:
+ return handleDelete();
+ case HttpMethod.HEAD:
+ return handleHead();
+ case "MERGE":
+ return handleMerge();
+ case HttpMethod.PATCH:
+ return handlePatch();
+ case HttpMethod.POST:
+ return handle(ODataHttpMethod.POST);
+ case HttpMethod.PUT:
+ return handlePut();
+ default:
+ return returnNotImplementedResponse(ODataNotImplementedException.COMMON);
}
- return response;
}
private Response returnNotImplementedResponse(final MessageReference messageReference) {
@@ -128,7 +159,7 @@ public final class ODataSubLocator {
}
@OPTIONS
- public Response handleOptions() throws ODataException {
+ public Response handleOptions() {
// RFC 2616, 5.1.1: "An origin server SHOULD return the status code [...]
// 501 (Not Implemented) if the method is unrecognized or not implemented
// by the origin server."
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataServlet.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataServlet.java
index f17fb8e8..7e26e724 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataServlet.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/servlet/ODataServlet.java
@@ -1,23 +1,21 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.core.servlet;
+import java.io.IOException;
+import java.io.InputStream;
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.ODataServiceFactory;
import org.apache.olingo.odata2.api.commons.HttpHeaders;
@@ -36,387 +34,401 @@ import org.apache.olingo.odata2.api.processor.ODataResponse;
import org.apache.olingo.odata2.core.ODataContextImpl;
import org.apache.olingo.odata2.core.ODataRequestHandler;
import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
-
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
public class ODataServlet extends HttpServlet {
- private static final String HTTP_METHOD_OPTIONS = "OPTIONS";
- private static final String HTTP_METHOD_HEAD = "HEAD";
-
- /**
- * Label used in web.xml to assign servlet init parameter for a path split (service resolution).
- */
- private static final String BUFFER_SIZE = "org.apache.olingo.odata2.core.servlet.buffer.size";
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
- private static final int DEFAULT_BUFFER_SIZE = 32768;
- private static final String DEFAULT_READ_CHARSET = "utf-8";
-
- @Override
- protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws IOException {
- // We have to create the Service Factory here because otherwise we do not have access to the error callback
- ODataServiceFactory serviceFactory = getServiceFactory(req);
- if(serviceFactory == null) {
- throw new ODataRuntimeException("Unable to get Service Factory. Check either '" +
- ODataServiceFactory.FACTORY_LABEL + "' or '" + ODataServiceFactory.FACTORY_INSTANCE_LABEL + "' config.");
- }
+ private static final String HTTP_METHOD_OPTIONS = "OPTIONS";
+ private static final String HTTP_METHOD_HEAD = "HEAD";
+
+ /**
+ * Label used in web.xml to assign servlet init parameter for a path split (service resolution).
+ */
+ private static final String BUFFER_SIZE = "org.apache.olingo.odata2.core.servlet.buffer.size";
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+ private static final int DEFAULT_BUFFER_SIZE = 32768;
+ private static final String DEFAULT_READ_CHARSET = "utf-8";
+
+ @Override
+ protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws IOException {
+ // We have to create the Service Factory here because otherwise we do not have access to the error
+ // callback
+ ODataServiceFactory serviceFactory = getServiceFactory(req);
+ if (serviceFactory == null) {
+ throw new ODataRuntimeException("Unable to get Service Factory. Check either '" + ODataServiceFactory.FACTORY_LABEL + "' or '"
+ + ODataServiceFactory.FACTORY_INSTANCE_LABEL + "' config.");
+ }
- String xHttpMethod = req.getHeader("X-HTTP-Method");
- String xHttpMethodOverride = req.getHeader("X-HTTP-Method-Override");
- if (xHttpMethod != null && xHttpMethodOverride != null) {
- if (!xHttpMethod.equalsIgnoreCase(xHttpMethodOverride)) {
- ODataExceptionWrapper wrapper = new ODataExceptionWrapper(req, serviceFactory);
- createResponse(resp, wrapper.wrapInExceptionResponse(
- new ODataBadRequestException(ODataBadRequestException.AMBIGUOUS_XMETHOD)));
- return;
- }
- }
+ String xHttpMethod = req.getHeader("X-HTTP-Method");
+ String xHttpMethodOverride = req.getHeader("X-HTTP-Method-Override");
+ if (xHttpMethod != null && xHttpMethodOverride != null) {
+ if (!xHttpMethod.equalsIgnoreCase(xHttpMethodOverride)) {
+ ODataExceptionWrapper wrapper = new ODataExceptionWrapper(req, serviceFactory);
+ createResponse(resp,
+ wrapper.wrapInExceptionResponse(new ODataBadRequestException(ODataBadRequestException.AMBIGUOUS_XMETHOD)));
+ return;
+ }
+ }
- if (req.getPathInfo() != null) {
- handle(req, resp, xHttpMethod, xHttpMethodOverride, serviceFactory);
- } else {
- handleRedirect(req, resp, serviceFactory);
- }
- }
-
- /**
- * Get the service factory instance which is used for creation of the
- * <code>ODataService</code> which handles the processing of the request.
- *
- * @param request the http request which is processed as an OData request
- * @return an instance of an ODataServiceFactory
- */
- protected ODataServiceFactory getServiceFactory(HttpServletRequest request) {
- try {
- ODataServiceFactory factoryInstance = getODataServiceFactoryInstance(request);
- if(factoryInstance == null) {
- return createODataServiceFactory(request);
- }
- return factoryInstance;
-
- } catch (Exception e) {
- throw new ODataRuntimeException(e);
- }
- }
-
- protected void handle(final HttpServletRequest req, final HttpServletResponse resp, final String xHttpMethod,
- final String xHttpMethodOverride, ODataServiceFactory serviceFactory) throws IOException {
- String method = req.getMethod();
- if (ODataHttpMethod.GET.name().equals(method)) {
- handleRequest(req, ODataHttpMethod.GET, resp, serviceFactory);
- } else if (ODataHttpMethod.POST.name().equals(method)) {
- if (xHttpMethod == null && xHttpMethodOverride == null) {
- handleRequest(req, ODataHttpMethod.POST, resp, serviceFactory);
- } else if (xHttpMethod == null) {
- /* tunneling */
- boolean methodHandled = handleHttpTunneling(req, resp, xHttpMethodOverride, serviceFactory);
- if (!methodHandled) {
- createMethodNotAllowedResponse(req, ODataHttpException.COMMON, resp, serviceFactory);
+ if (req.getPathInfo() != null) {
+ handle(req, resp, xHttpMethod, xHttpMethodOverride, serviceFactory);
+ } else {
+ handleRedirect(req, resp, serviceFactory);
}
- } else {
- /* tunneling */
- boolean methodHandled = handleHttpTunneling(req, resp, xHttpMethod, serviceFactory);
- if (!methodHandled) {
- createNotImplementedResponse(req, ODataNotImplementedException.TUNNELING, resp, serviceFactory);
+ }
+
+ /**
+ * Get the service factory instance which is used for creation of the <code>ODataService</code>
+ * which handles the processing of the request.
+ *
+ * @param request the http request which is processed as an OData request
+ * @return an instance of an ODataServiceFactory
+ */
+ protected ODataServiceFactory getServiceFactory(HttpServletRequest request) {
+ try {
+ ODataServiceFactory factoryInstance = getODataServiceFactoryInstance(request);
+ if (factoryInstance == null) {
+ return createODataServiceFactory(request);
+ }
+ return factoryInstance;
+
+ } catch (Exception e) {
+ throw new ODataRuntimeException(e);
}
- }
-
- } else if (ODataHttpMethod.PUT.name().equals(method)) {
- handleRequest(req, ODataHttpMethod.PUT, resp, serviceFactory);
- } else if (ODataHttpMethod.DELETE.name().equals(method)) {
- handleRequest(req, ODataHttpMethod.DELETE, resp, serviceFactory);
- } else if (ODataHttpMethod.PATCH.name().equals(method)) {
- handleRequest(req, ODataHttpMethod.PATCH, resp, serviceFactory);
- } else if (ODataHttpMethod.MERGE.name().equals(method)) {
- handleRequest(req, ODataHttpMethod.MERGE, resp, serviceFactory);
- } else if (HTTP_METHOD_HEAD.equals(method)) {
- handleRequest(req, ODataHttpMethod.GET, resp, serviceFactory);
- } else if (HTTP_METHOD_OPTIONS.equals(method)) {
- createNotImplementedResponse(req, ODataNotImplementedException.COMMON, resp, serviceFactory);
- } else {
- createNotImplementedResponse(req, ODataHttpException.COMMON, resp, serviceFactory);
}
- }
-
- private boolean handleHttpTunneling(final HttpServletRequest req, final HttpServletResponse resp,
- final String xHttpMethod, ODataServiceFactory serviceFactory) throws IOException {
- if (ODataHttpMethod.MERGE.name().equals(xHttpMethod)) {
- handleRequest(req, ODataHttpMethod.MERGE, resp, serviceFactory);
- } else if (ODataHttpMethod.PATCH.name().equals(xHttpMethod)) {
- handleRequest(req, ODataHttpMethod.PATCH, resp, serviceFactory);
- } else if (ODataHttpMethod.DELETE.name().equals(xHttpMethod)) {
- handleRequest(req, ODataHttpMethod.DELETE, resp, serviceFactory);
- } else if (ODataHttpMethod.PUT.name().equals(xHttpMethod)) {
- handleRequest(req, ODataHttpMethod.PUT, resp, serviceFactory);
- } else if (ODataHttpMethod.GET.name().equals(xHttpMethod)) {
- handleRequest(req, ODataHttpMethod.GET, resp, serviceFactory);
- } else if (HTTP_METHOD_HEAD.equals(xHttpMethod)) {
- handleRequest(req, ODataHttpMethod.GET, resp, serviceFactory);
- } else if (ODataHttpMethod.POST.name().equals(xHttpMethod)) {
- handleRequest(req, ODataHttpMethod.POST, resp, serviceFactory);
- } else if (HTTP_METHOD_OPTIONS.equals(xHttpMethod)) {
- createNotImplementedResponse(req, ODataNotImplementedException.COMMON, resp, serviceFactory);
- } else {
- createNotImplementedResponse(req, ODataNotImplementedException.COMMON, resp, serviceFactory);
+
+ protected void handle(final HttpServletRequest req, final HttpServletResponse resp, final String xHttpMethod,
+ final String xHttpMethodOverride, ODataServiceFactory serviceFactory) throws IOException {
+ String method = req.getMethod();
+ if (ODataHttpMethod.GET.name()
+ .equals(method)) {
+ handleRequest(req, ODataHttpMethod.GET, resp, serviceFactory);
+ } else if (ODataHttpMethod.POST.name()
+ .equals(method)) {
+ if (xHttpMethod == null && xHttpMethodOverride == null) {
+ handleRequest(req, ODataHttpMethod.POST, resp, serviceFactory);
+ } else if (xHttpMethod == null) {
+ /* tunneling */
+ boolean methodHandled = handleHttpTunneling(req, resp, xHttpMethodOverride, serviceFactory);
+ if (!methodHandled) {
+ createMethodNotAllowedResponse(req, ODataHttpException.COMMON, resp, serviceFactory);
+ }
+ } else {
+ /* tunneling */
+ boolean methodHandled = handleHttpTunneling(req, resp, xHttpMethod, serviceFactory);
+ if (!methodHandled) {
+ createNotImplementedResponse(req, ODataNotImplementedException.TUNNELING, resp, serviceFactory);
+ }
+ }
+
+ } else if (ODataHttpMethod.PUT.name()
+ .equals(method)) {
+ handleRequest(req, ODataHttpMethod.PUT, resp, serviceFactory);
+ } else if (ODataHttpMethod.DELETE.name()
+ .equals(method)) {
+ handleRequest(req, ODataHttpMethod.DELETE, resp, serviceFactory);
+ } else if (ODataHttpMethod.PATCH.name()
+ .equals(method)) {
+ handleRequest(req, ODataHttpMethod.PATCH, resp, serviceFactory);
+ } else if (ODataHttpMethod.MERGE.name()
+ .equals(method)) {
+ handleRequest(req, ODataHttpMethod.MERGE, resp, serviceFactory);
+ } else if (HTTP_METHOD_HEAD.equals(method)) {
+ handleRequest(req, ODataHttpMethod.GET, resp, serviceFactory);
+ } else if (HTTP_METHOD_OPTIONS.equals(method)) {
+ resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ } else {
+ createNotImplementedResponse(req, ODataHttpException.COMMON, resp, serviceFactory);
+ }
}
- return true;
- }
-
- private void
- handleRequest(final HttpServletRequest req, final ODataHttpMethod method, final HttpServletResponse resp,
- ODataServiceFactory serviceFactory)
- throws IOException {
- try {
- final String pathSplitAsString = getInitParameter(ODataServiceFactory.PATH_SPLIT_LABEL);
- final String formEncoding = getInitParameter(ODataServiceFactory.ACCEPT_FORM_ENCODING);
- int pathSplit = 0;
- if (pathSplitAsString != null) {
- pathSplit = Integer.parseInt(pathSplitAsString);
- }
- if (req.getHeader(HttpHeaders.ACCEPT) != null && req.getHeader(HttpHeaders.ACCEPT).isEmpty()) {
- createNotAcceptableResponse(req, ODataNotAcceptableException.COMMON, resp, serviceFactory);
- return;
- }
- ODataRequest odataRequest;
- try {
- odataRequest = ODataRequest.method(method)
- .httpMethod(req.getMethod())
- .contentType(RestUtil.extractRequestContentType(req.getContentType()).toContentTypeString())
- .acceptHeaders(RestUtil.extractAcceptHeaders(req.getHeader(HttpHeaders.ACCEPT)))
- .acceptableLanguages(RestUtil.extractAcceptableLanguage(req.getHeader(HttpHeaders.ACCEPT_LANGUAGE)))
- .pathInfo(RestUtil.buildODataPathInfo(req, pathSplit))
- .allQueryParameters(RestUtil.extractAllQueryParameters(req.getQueryString(), formEncoding))
- .requestHeaders(RestUtil.extractHeaders(req))
- .body(req.getInputStream())
- .build();
- } catch (IllegalArgumentException e) {
- throw new ODataBadRequestException(ODataBadRequestException.INVALID_REQUEST, e);
- }
-
- ODataContextImpl context = new ODataContextImpl(odataRequest, serviceFactory);
- context.setParameter(ODataContext.HTTP_SERVLET_REQUEST_OBJECT, req);
-
- ODataService service = serviceFactory.createService(context);
- if (service == null) {
- createServiceUnavailableResponse(req, ODataInternalServerErrorException.NOSERVICE, resp, serviceFactory);
- } else {
- context.setService(service);
- service.getProcessor().setContext(context);
-
- ODataRequestHandler requestHandler = new ODataRequestHandler(serviceFactory, service, context);
- final ODataResponse odataResponse = requestHandler.handle(odataRequest);
- //
- boolean omitResponseBody = HTTP_METHOD_HEAD.equals(req.getMethod());
- createResponse(resp, odataResponse, omitResponseBody);
- }
- } catch (Exception e) {
- ODataExceptionWrapper wrapper = new ODataExceptionWrapper(req, serviceFactory);
- createResponse(resp, wrapper.wrapInExceptionResponse(e));
+
+ private boolean handleHttpTunneling(final HttpServletRequest req, final HttpServletResponse resp, final String xHttpMethod,
+ ODataServiceFactory serviceFactory) throws IOException {
+ if (ODataHttpMethod.MERGE.name()
+ .equals(xHttpMethod)) {
+ handleRequest(req, ODataHttpMethod.MERGE, resp, serviceFactory);
+ } else if (ODataHttpMethod.PATCH.name()
+ .equals(xHttpMethod)) {
+ handleRequest(req, ODataHttpMethod.PATCH, resp, serviceFactory);
+ } else if (ODataHttpMethod.DELETE.name()
+ .equals(xHttpMethod)) {
+ handleRequest(req, ODataHttpMethod.DELETE, resp, serviceFactory);
+ } else if (ODataHttpMethod.PUT.name()
+ .equals(xHttpMethod)) {
+ handleRequest(req, ODataHttpMethod.PUT, resp, serviceFactory);
+ } else if (ODataHttpMethod.GET.name()
+ .equals(xHttpMethod)) {
+ handleRequest(req, ODataHttpMethod.GET, resp, serviceFactory);
+ } else if (HTTP_METHOD_HEAD.equals(xHttpMethod)) {
+ handleRequest(req, ODataHttpMethod.GET, resp, serviceFactory);
+ } else if (ODataHttpMethod.POST.name()
+ .equals(xHttpMethod)) {
+ handleRequest(req, ODataHttpMethod.POST, resp, serviceFactory);
+ } else if (HTTP_METHOD_OPTIONS.equals(xHttpMethod)) {
+ createNotImplementedResponse(req, ODataNotImplementedException.COMMON, resp, serviceFactory);
+ } else {
+ createNotImplementedResponse(req, ODataNotImplementedException.COMMON, resp, serviceFactory);
+ }
+ return true;
}
- }
-
- protected void handleRedirect(final HttpServletRequest req, final HttpServletResponse resp,
- ODataServiceFactory serviceFactory) throws IOException {
- String method = req.getMethod();
- if (ODataHttpMethod.GET.name().equals(method) ||
- ODataHttpMethod.POST.name().equals(method) ||
- ODataHttpMethod.PUT.name().equals(method) ||
- ODataHttpMethod.DELETE.name().equals(method) ||
- ODataHttpMethod.PATCH.name().equals(method) ||
- ODataHttpMethod.MERGE.name().equals(method) ||
- HTTP_METHOD_HEAD.equals(method) ||
- HTTP_METHOD_OPTIONS.equals(method)) {
- ODataResponse odataResponse = ODataResponse.status(HttpStatusCodes.TEMPORARY_REDIRECT)
- .header(HttpHeaders.LOCATION, createLocation(req))
- .build();
- createResponse(resp, odataResponse);
- } else {
- createNotImplementedResponse(req, ODataHttpException.COMMON, resp, serviceFactory);
+
+ private void handleRequest(final HttpServletRequest req, final ODataHttpMethod method, final HttpServletResponse resp,
+ ODataServiceFactory serviceFactory) throws IOException {
+ try {
+ final String pathSplitAsString = getInitParameter(ODataServiceFactory.PATH_SPLIT_LABEL);
+ final String formEncoding = getInitParameter(ODataServiceFactory.ACCEPT_FORM_ENCODING);
+ int pathSplit = 0;
+ if (pathSplitAsString != null) {
+ pathSplit = Integer.parseInt(pathSplitAsString);
+ }
+ if (req.getHeader(HttpHeaders.ACCEPT) != null && req.getHeader(HttpHeaders.ACCEPT)
+ .isEmpty()) {
+ createNotAcceptableResponse(req, ODataNotAcceptableException.COMMON, resp, serviceFactory);
+ return;
+ }
+ ODataRequest odataRequest;
+ try {
+ odataRequest = ODataRequest.method(method)
+ .httpMethod(req.getMethod())
+ .contentType(RestUtil.extractRequestContentType(req.getContentType())
+ .toContentTypeString())
+ .acceptHeaders(RestUtil.extractAcceptHeaders(req.getHeader(HttpHeaders.ACCEPT)))
+ .acceptableLanguages(
+ RestUtil.extractAcceptableLanguage(req.getHeader(HttpHeaders.ACCEPT_LANGUAGE)))
+ .pathInfo(RestUtil.buildODataPathInfo(req, pathSplit))
+ .allQueryParameters(RestUtil.extractAllQueryParameters(req.getQueryString(), formEncoding))
+ .requestHeaders(RestUtil.extractHeaders(req))
+ .body(req.getInputStream())
+ .build();
+ } catch (IllegalArgumentException e) {
+ throw new ODataBadRequestException(ODataBadRequestException.INVALID_REQUEST, e);
+ }
+
+ ODataContextImpl context = new ODataContextImpl(odataRequest, serviceFactory);
+ context.setParameter(ODataContext.HTTP_SERVLET_REQUEST_OBJECT, req);
+
+ ODataService service = serviceFactory.createService(context);
+ if (service == null) {
+ createServiceUnavailableResponse(req, ODataInternalServerErrorException.NOSERVICE, resp, serviceFactory);
+ } else {
+ context.setService(service);
+ service.getProcessor()
+ .setContext(context);
+
+ ODataRequestHandler requestHandler = new ODataRequestHandler(serviceFactory, service, context);
+ final ODataResponse odataResponse = requestHandler.handle(odataRequest);
+ //
+ boolean omitResponseBody = HTTP_METHOD_HEAD.equals(req.getMethod());
+ createResponse(resp, odataResponse, omitResponseBody);
+ }
+ } catch (Exception e) {
+ ODataExceptionWrapper wrapper = new ODataExceptionWrapper(req, serviceFactory);
+ createResponse(resp, wrapper.wrapInExceptionResponse(e));
+ }
}
- }
+ protected void handleRedirect(final HttpServletRequest req, final HttpServletResponse resp, ODataServiceFactory serviceFactory)
+ throws IOException {
+ String method = req.getMethod();
+ if (ODataHttpMethod.GET.name()
+ .equals(method)
+ || ODataHttpMethod.POST.name()
+ .equals(method)
+ || ODataHttpMethod.PUT.name()
+ .equals(method)
+ || ODataHttpMethod.DELETE.name()
+ .equals(method)
+ || ODataHttpMethod.PATCH.name()
+ .equals(method)
+ || ODataHttpMethod.MERGE.name()
+ .equals(method)
+ || HTTP_METHOD_HEAD.equals(method) || HTTP_METHOD_OPTIONS.equals(method)) {
+ ODataResponse odataResponse = ODataResponse.status(HttpStatusCodes.TEMPORARY_REDIRECT)
+ .header(HttpHeaders.LOCATION, createLocation(req))
+ .build();
+ createResponse(resp, odataResponse);
+ } else {
+ createNotImplementedResponse(req, ODataHttpException.COMMON, resp, serviceFactory);
+ }
- private String createLocation(final HttpServletRequest req) {
- StringBuilder location = new StringBuilder();
- String contextPath = req.getContextPath();
- if (contextPath != null) {
- location.append(contextPath);
}
- String servletPath = req.getServletPath();
- if (servletPath != null) {
- location.append(servletPath);
+
+ private String createLocation(final HttpServletRequest req) {
+ StringBuilder location = new StringBuilder();
+ String contextPath = req.getContextPath();
+ if (contextPath != null) {
+ location.append(contextPath);
+ }
+ String servletPath = req.getServletPath();
+ if (servletPath != null) {
+ location.append(servletPath);
+ }
+ location.append("/");
+ return location.toString();
}
- location.append("/");
- return location.toString();
- }
-
- protected void createResponse(final HttpServletResponse resp, final ODataResponse response) throws IOException {
- createResponse(resp, response, false);
- }
-
- protected void createResponse(final HttpServletResponse resp, final ODataResponse response,
- final boolean omitResponseBody)
- throws IOException {
-
- resp.setStatus(response.getStatus().getStatusCode());
- resp.setContentType(response.getContentHeader());
- for (String headerName : response.getHeaderNames()) {
- resp.setHeader(headerName, response.getHeader(headerName));
+
+ protected void createResponse(final HttpServletResponse resp, final ODataResponse response) throws IOException {
+ createResponse(resp, response, false);
}
- if(omitResponseBody) {
- return;
+ protected void createResponse(final HttpServletResponse resp, final ODataResponse response, final boolean omitResponseBody)
+ throws IOException {
+
+ resp.setStatus(response.getStatus()
+ .getStatusCode());
+ resp.setContentType(response.getContentHeader());
+ for (String headerName : response.getHeaderNames()) {
+ resp.setHeader(headerName, response.getHeader(headerName));
+ }
+
+ if (omitResponseBody) {
+ return;
+ }
+
+ Object entity = response.getEntity();
+ if (entity != null) {
+ ServletOutputStream out = resp.getOutputStream();
+ int contentLength;
+
+ if (entity instanceof InputStream) {
+ contentLength = handleStream((InputStream) entity, out);
+ } else if (entity instanceof String) {
+ String body = (String) entity;
+ final byte[] entityBytes = body.getBytes(DEFAULT_READ_CHARSET);
+ out.write(entityBytes);
+ contentLength = entityBytes.length;
+ } else {
+ throw new IOException("Illegal entity object in ODataResponse of type '" + entity.getClass() + "'.");
+ }
+
+ if (response.getHeader(HttpHeaders.CONTENT_LENGTH) != null) {
+ // Override content length
+ try {
+ contentLength = Integer.parseInt(response.getHeader(HttpHeaders.CONTENT_LENGTH));
+ } catch (NumberFormatException e) {
+ // Ignore
+ }
+ }
+
+ resp.setContentLength(contentLength);
+ out.flush();
+ out.close();
+ }
}
- Object entity = response.getEntity();
- if (entity != null) {
- ServletOutputStream out = resp.getOutputStream();
- int contentLength;
-
- if (entity instanceof InputStream) {
- contentLength = handleStream((InputStream) entity, out);
- } else if (entity instanceof String) {
- String body = (String) entity;
- final byte[] entityBytes = body.getBytes(DEFAULT_READ_CHARSET);
- out.write(entityBytes);
- contentLength = entityBytes.length;
- } else {
- throw new IOException("Illegal entity object in ODataResponse of type '" + entity.getClass() + "'.");
- }
-
- if (response.getHeader(HttpHeaders.CONTENT_LENGTH) != null) {
- // Override content length
+ private int handleStream(InputStream stream, ServletOutputStream out) throws IOException {
+ int contentLength = 0;
+ byte[] buffer = getBuffer();
+
try {
- contentLength = Integer.parseInt(response.getHeader(HttpHeaders.CONTENT_LENGTH));
- } catch (NumberFormatException e) {
- // Ignore
+ int len;
+ while ((len = stream.read(buffer)) != -1) {
+ contentLength += len;
+ out.write(buffer, 0, len);
+ }
+ } finally {
+ stream.close();
+ }
+ return contentLength;
+ }
+
+ private byte[] getBuffer() {
+ int bufferSize = DEFAULT_BUFFER_SIZE;
+ String bufSizeInit = getInitParameter(BUFFER_SIZE);
+ if (bufSizeInit != null) {
+ try {
+ bufferSize = Integer.parseInt(bufSizeInit);
+ if (bufferSize <= 0) {
+ bufferSize = DEFAULT_BUFFER_SIZE;
+ }
+ } catch (NumberFormatException ignored) {
+ // this exception is ignored because if parameter is not parse able the default is used
+ }
}
- }
- resp.setContentLength(contentLength);
- out.flush();
- out.close();
+ return new byte[bufferSize];
}
- }
-
- private int handleStream(InputStream stream, ServletOutputStream out) throws IOException {
- int contentLength = 0;
- byte[] buffer = getBuffer();
-
- try {
- int len;
- while ((len = stream.read(buffer)) != -1) {
- contentLength += len;
- out.write(buffer, 0, len);
- }
- } finally {
- stream.close();
+
+ private void createNotImplementedResponse(final HttpServletRequest req, final MessageReference messageReference,
+ final HttpServletResponse resp, ODataServiceFactory serviceFactory) throws IOException {
+ // RFC 2616, 5.1.1: "An origin server SHOULD return the status code [...]
+ // 501 (Not Implemented) if the method is unrecognized [...] by the origin server."
+ ODataExceptionWrapper exceptionWrapper = new ODataExceptionWrapper(req, serviceFactory);
+ ODataResponse response = exceptionWrapper.wrapInExceptionResponse(new ODataNotImplementedException(messageReference));
+ createResponse(resp, response);
}
- return contentLength;
- }
-
- private byte[] getBuffer() {
- int bufferSize = DEFAULT_BUFFER_SIZE;
- String bufSizeInit = getInitParameter(BUFFER_SIZE);
- if(bufSizeInit != null) {
- try {
- bufferSize = Integer.parseInt(bufSizeInit);
- if(bufferSize <= 0) {
- bufferSize = DEFAULT_BUFFER_SIZE;
- }
- } catch (NumberFormatException ignored) {
- // this exception is ignored because if parameter is not parse able the default is used
- }
+
+ private void createMethodNotAllowedResponse(final HttpServletRequest req, final MessageReference messageReference,
+ final HttpServletResponse resp, ODataServiceFactory serviceFactory) throws IOException {
+ ODataExceptionWrapper exceptionWrapper = new ODataExceptionWrapper(req, serviceFactory);
+ ODataResponse response = exceptionWrapper.wrapInExceptionResponse(new ODataMethodNotAllowedException(messageReference));
+ createResponse(resp, response);
}
- return new byte[bufferSize];
- }
-
- private void createNotImplementedResponse(final HttpServletRequest req, final MessageReference messageReference,
- final HttpServletResponse resp, ODataServiceFactory serviceFactory) throws IOException {
- // RFC 2616, 5.1.1: "An origin server SHOULD return the status code [...]
- // 501 (Not Implemented) if the method is unrecognized [...] by the origin server."
- ODataExceptionWrapper exceptionWrapper = new ODataExceptionWrapper(req, serviceFactory);
- ODataResponse response =
- exceptionWrapper.wrapInExceptionResponse(new ODataNotImplementedException(messageReference));
- createResponse(resp, response);
- }
-
- private void createMethodNotAllowedResponse(final HttpServletRequest req, final MessageReference messageReference,
- final HttpServletResponse resp, ODataServiceFactory serviceFactory) throws IOException {
- ODataExceptionWrapper exceptionWrapper = new ODataExceptionWrapper(req, serviceFactory);
- ODataResponse response =
- exceptionWrapper.wrapInExceptionResponse(new ODataMethodNotAllowedException(messageReference));
- createResponse(resp, response);
- }
-
- private void createNotAcceptableResponse(final HttpServletRequest req, final MessageReference messageReference,
- final HttpServletResponse resp, ODataServiceFactory serviceFactory) throws IOException {
- ODataExceptionWrapper exceptionWrapper = new ODataExceptionWrapper(req, serviceFactory);
- ODataResponse response =
- exceptionWrapper.wrapInExceptionResponse(new ODataNotAcceptableException(messageReference));
- createResponse(resp, response);
- }
-
- private void createServiceUnavailableResponse(HttpServletRequest req, MessageReference messageReference,
- HttpServletResponse resp, ODataServiceFactory serviceFactory) throws IOException {
- ODataExceptionWrapper exceptionWrapper = new ODataExceptionWrapper(req, serviceFactory);
- ODataResponse response =
- exceptionWrapper.wrapInExceptionResponse(new ODataInternalServerErrorException(messageReference));
- createResponse(resp, response);
- }
-
- /**
- * Create an instance of a ODataServiceFactory via factory class
- * from servlet init parameter ODataServiceFactory.FACTORY_LABEL
- * and ODataServiceFactory.FACTORY_CLASSLOADER_LABEL (if set).
- *
- * @see ODataServiceFactory#FACTORY_LABEL
- * @see ODataServiceFactory#FACTORY_CLASSLOADER_LABEL
- *
- * @param req http servlet request
- * @return instance of a ODataServiceFactory
- */
- private ODataServiceFactory createODataServiceFactory(HttpServletRequest req)
- throws InstantiationException, IllegalAccessException, ClassNotFoundException {
- final String factoryClassName = getInitParameter(ODataServiceFactory.FACTORY_LABEL);
- if(factoryClassName == null) {
- return null;
+ private void createNotAcceptableResponse(final HttpServletRequest req, final MessageReference messageReference,
+ final HttpServletResponse resp, ODataServiceFactory serviceFactory) throws IOException {
+ ODataExceptionWrapper exceptionWrapper = new ODataExceptionWrapper(req, serviceFactory);
+ ODataResponse response = exceptionWrapper.wrapInExceptionResponse(new ODataNotAcceptableException(messageReference));
+ createResponse(resp, response);
}
- ClassLoader cl = (ClassLoader) req.getAttribute(ODataServiceFactory.FACTORY_CLASSLOADER_LABEL);
- if (cl == null) {
- return (ODataServiceFactory) Class.forName(factoryClassName).newInstance();
- } else {
- return (ODataServiceFactory) Class.forName(factoryClassName, true, cl).newInstance();
+ private void createServiceUnavailableResponse(HttpServletRequest req, MessageReference messageReference, HttpServletResponse resp,
+ ODataServiceFactory serviceFactory) throws IOException {
+ ODataExceptionWrapper exceptionWrapper = new ODataExceptionWrapper(req, serviceFactory);
+ ODataResponse response = exceptionWrapper.wrapInExceptionResponse(new ODataInternalServerErrorException(messageReference));
+ createResponse(resp, response);
}
- }
-
- /**
- * Get an instance of a ODataServiceFactory from request attribute
- * ODataServiceFactory.FACTORY_INSTANCE_LABEL
- *
- * @see ODataServiceFactory#FACTORY_INSTANCE_LABEL
- *
- * @param req http servlet request
- * @return instance of a ODataServiceFactory
- */
- private ODataServiceFactory getODataServiceFactoryInstance(HttpServletRequest req) {
- Object factory = req.getAttribute(ODataServiceFactory.FACTORY_INSTANCE_LABEL);
- if(factory == null) {
- return null;
- } else if(factory instanceof ODataServiceFactory) {
- return (ODataServiceFactory) factory;
+
+ /**
+ * Create an instance of a ODataServiceFactory via factory class from servlet init parameter
+ * ODataServiceFactory.FACTORY_LABEL and ODataServiceFactory.FACTORY_CLASSLOADER_LABEL (if set).
+ *
+ * @see ODataServiceFactory#FACTORY_LABEL
+ * @see ODataServiceFactory#FACTORY_CLASSLOADER_LABEL
+ *
+ * @param req http servlet request
+ * @return instance of a ODataServiceFactory
+ */
+ private ODataServiceFactory createODataServiceFactory(HttpServletRequest req)
+ throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+ final String factoryClassName = getInitParameter(ODataServiceFactory.FACTORY_LABEL);
+ if (factoryClassName == null) {
+ return null;
+ }
+
+ ClassLoader cl = (ClassLoader) req.getAttribute(ODataServiceFactory.FACTORY_CLASSLOADER_LABEL);
+ if (cl == null) {
+ return (ODataServiceFactory) Class.forName(factoryClassName)
+ .newInstance();
+ }
+ return (ODataServiceFactory) Class.forName(factoryClassName, true, cl)
+ .newInstance();
+ }
+
+ /**
+ * Get an instance of a ODataServiceFactory from request attribute
+ * ODataServiceFactory.FACTORY_INSTANCE_LABEL
+ *
+ * @see ODataServiceFactory#FACTORY_INSTANCE_LABEL
+ *
+ * @param req http servlet request
+ * @return instance of a ODataServiceFactory
+ */
+ private ODataServiceFactory getODataServiceFactoryInstance(HttpServletRequest req) {
+ Object factory = req.getAttribute(ODataServiceFactory.FACTORY_INSTANCE_LABEL);
+ if (factory == null) {
+ return null;
+ }
+ if (factory instanceof ODataServiceFactory) {
+ return (ODataServiceFactory) factory;
+ }
+ throw new ODataRuntimeException("Invalid service factory instance of type " + factory.getClass());
}
- throw new ODataRuntimeException("Invalid service factory instance of type " + factory.getClass());
- }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java
index 2d79fc09..e5cae0be 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java
@@ -45,10 +45,10 @@ import org.apache.olingo.odata2.api.ep.feed.ODataDeltaFeed;
import org.apache.olingo.odata2.api.ep.feed.ODataFeed;
import org.apache.olingo.odata2.api.processor.ODataErrorContext;
import org.apache.olingo.odata2.api.processor.ODataResponse;
-import org.apache.olingo.odata2.core.LocaleAsserter;
import org.apache.olingo.odata2.core.commons.ContentType;
import org.apache.olingo.odata2.core.edm.EdmDateTimeOffset;
import org.apache.olingo.odata2.core.ep.consumer.AbstractConsumerTest;
+import org.apache.olingo.odata2.testutil.helper.LocaleAsserter;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.apache.olingo.odata2.testutil.mock.MockFacade;
import org.junit.Test;
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonErrorDocumentConsumerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonErrorDocumentConsumerTest.java
index 5f2353ec..2c873c57 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonErrorDocumentConsumerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonErrorDocumentConsumerTest.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
import java.util.Locale;
import org.apache.olingo.odata2.api.ep.EntityProviderException;
import org.apache.olingo.odata2.api.processor.ODataErrorContext;
-import org.apache.olingo.odata2.core.LocaleAsserter;
+import org.apache.olingo.odata2.testutil.helper.LocaleAsserter;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.junit.Test;
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumerTest.java
index 432c5389..387715e0 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlErrorDocumentConsumerTest.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
import java.util.Locale;
import org.apache.olingo.odata2.api.ep.EntityProviderException;
import org.apache.olingo.odata2.api.processor.ODataErrorContext;
-import org.apache.olingo.odata2.core.LocaleAsserter;
+import org.apache.olingo.odata2.testutil.helper.LocaleAsserter;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.junit.Test;
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
index daa4655d..13047ee6 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
@@ -240,8 +240,8 @@ public class BasicHttpTest extends AbstractBasicTest {
HttpOptions options = new HttpOptions(endpoint);
HttpClient httpClient = getHttpClient();
HttpResponse response = httpClient.execute(options);
- assertEquals(HttpStatusCodes.NOT_IMPLEMENTED.getStatusCode(), response.getStatusLine()
- .getStatusCode());
+ assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
}
@Test
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
index cc57ba7c..1ee98a32 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.fit.basic;
@@ -24,12 +20,10 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-
import java.io.IOException;
import java.net.URI;
import java.util.HashMap;
import java.util.Map;
-
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.HttpGet;
@@ -39,7 +33,6 @@ import org.apache.olingo.odata2.api.exception.MessageReference;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.api.exception.ODataMessageException;
import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
-import org.apache.olingo.odata2.api.processor.part.MetadataProcessor;
import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.apache.olingo.odata2.testutil.server.ServletType;
@@ -51,87 +44,87 @@ import org.junit.Test;
import org.xml.sax.SAXException;
/**
- *
+ *
*/
public class LanguageNegotiationTest extends AbstractBasicTest {
- public LanguageNegotiationTest(final ServletType servletType) {
- super(servletType);
- }
-
- @Override
- protected ODataSingleProcessor createProcessor() throws ODataException {
- final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
- when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), anyString()))
- .thenThrow(new MyException(null));
- return processor;
- }
-
- @Override
- @Before
- public void before() {
- super.before();
+ public LanguageNegotiationTest(final ServletType servletType) {
+ super(servletType);
+ }
- Map<String, String> prefixMap = new HashMap<String, String>();
- prefixMap.put("m", Edm.NAMESPACE_M_2007_08);
- XMLUnit.setXpathNamespaceContext(new SimpleNamespaceContext(prefixMap));
+ @Override
+ protected ODataSingleProcessor createProcessor() throws ODataException {
+ final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
+ when((processor).readMetadata(any(GetMetadataUriInfo.class), anyString())).thenThrow(new MyException(null));
+ return processor;
+ }
- disableLogging();
- }
+ @Override
+ @Before
+ public void before() {
+ super.before();
- @Test
- public void issue_61() throws ClientProtocolException, IOException, XpathException, SAXException {
- final HttpGet get = new HttpGet(URI.create(getEndpoint().toString() + "$metadata"));
- get.setHeader(HttpHeaders.ACCEPT_LANGUAGE, "es");
+ Map<String, String> prefixMap = new HashMap<String, String>();
+ prefixMap.put("m", Edm.NAMESPACE_M_2007_08);
+ XMLUnit.setXpathNamespaceContext(new SimpleNamespaceContext(prefixMap));
- HttpResponse response = getHttpClient().execute(get);
- String content = StringHelper.httpEntityToString(response.getEntity());
- assertXpathExists("/m:error/m:message", content);
- }
+ disableLogging();
+ }
- @Test
- public void testErrorInItalianLanguage() throws ClientProtocolException, IOException, XpathException, SAXException {
- final HttpGet get = new HttpGet(URI.create(getEndpoint().toString() + "$metadata"));
- get.setHeader(HttpHeaders.ACCEPT_LANGUAGE, "it");
+ @Test
+ public void issue_61() throws ClientProtocolException, IOException, XpathException, SAXException {
+ final HttpGet get = new HttpGet(URI.create(getEndpoint().toString() + "$metadata"));
+ get.setHeader(HttpHeaders.ACCEPT_LANGUAGE, "es");
- HttpResponse response = getHttpClient().execute(get);
+ HttpResponse response = getHttpClient().execute(get);
+ String content = StringHelper.httpEntityToString(response.getEntity());
+ assertXpathExists("/m:error/m:message", content);
+ }
- String content = StringHelper.httpEntityToString(response.getEntity());
+ @Test
+ public void testErrorInItalianLanguage() throws ClientProtocolException, IOException, XpathException, SAXException {
+ final HttpGet get = new HttpGet(URI.create(getEndpoint().toString() + "$metadata"));
+ get.setHeader(HttpHeaders.ACCEPT_LANGUAGE, "it");
- assertXpathExists("/m:error/m:message", content);
- assertXpathExists("/m:error/m:message[@xml:lang=\"it\"]", content);
- assertXpathEvaluatesTo("eccezione comune", "/m:error/m:message/text()", content);
+ HttpResponse response = getHttpClient().execute(get);
- }
+ String content = StringHelper.httpEntityToString(response.getEntity());
- @Test
- public void testErrorNoLanguage() throws ClientProtocolException, IOException, XpathException, SAXException {
- final HttpGet get = new HttpGet(URI.create(getEndpoint().toString() + "$metadata"));
+ assertXpathExists("/m:error/m:message", content);
+ assertXpathExists("/m:error/m:message[@xml:lang=\"it\"]", content);
+ assertXpathEvaluatesTo("eccezione comune", "/m:error/m:message/text()", content);
- HttpResponse response = getHttpClient().execute(get);
+ }
- String content = StringHelper.httpEntityToString(response.getEntity());
+ @Test
+ public void testErrorNoLanguage() throws ClientProtocolException, IOException, XpathException, SAXException {
+ final HttpGet get = new HttpGet(URI.create(getEndpoint().toString() + "$metadata"));
- assertXpathExists("/m:error/m:message", content);
- assertXpathExists("/m:error/m:message[@xml:lang=\"en\"]", content);
- assertXpathEvaluatesTo("Common exception", "/m:error/m:message/text()", content);
- }
+ HttpResponse response = getHttpClient().execute(get);
- private static class MyException extends ODataMessageException {
- private static final MessageReference TEST = createMessageReference(ODataMessageException.class, "COMMON");
- private static final long serialVersionUID = 1L;
+ String content = StringHelper.httpEntityToString(response.getEntity());
- /**
- * Constructor.
- * @param messageReference unused message reference, to satisfy inheritance constraints
- */
- public MyException(final MessageReference messageReference) {
- super(TEST);
+ assertXpathExists("/m:error/m:message", content);
+ assertXpathExists("/m:error/m:message[@xml:lang=\"en\"]", content);
+ assertXpathEvaluatesTo("Common exception", "/m:error/m:message/text()", content);
}
- @Override
- public MessageReference getMessageReference() {
- return TEST;
+ private static class MyException extends ODataMessageException {
+ private static final MessageReference TEST = createMessageReference(ODataMessageException.class, "COMMON");
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Constructor.
+ *
+ * @param messageReference unused message reference, to satisfy inheritance constraints
+ */
+ public MyException(final MessageReference messageReference) {
+ super(TEST);
+ }
+
+ @Override
+ public MessageReference getMessageReference() {
+ return TEST;
+ }
}
- }
}
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
index 2f577371..1475e85a 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.fit.basic;
@@ -25,12 +21,10 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
-
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
@@ -53,254 +47,338 @@ import org.apache.olingo.odata2.testutil.server.TestServer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
/**
- *
+ *
*/
public class ServiceResolutionTest extends BaseTest {
- private final HttpClient httpClient = new DefaultHttpClient();
- private final TestServer server = new TestServer(ServletType.JAXRS_SERVLET);
- private ODataContext context;
- private ODataSingleProcessorService service;
-
- @Before
- public void before() {
- try {
- final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
- final EdmProvider provider = mock(EdmProvider.class);
-
- service = new ODataSingleProcessorService(provider, processor) {};
- // FitStaticServiceFactory.setService(service);
-
- // science fiction (return context after setContext)
- // see http://www.planetgeek.ch/2010/07/20/mockito-answer-vs-return/
-
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocation) throws Throwable {
- context = (ODataContext) invocation.getArguments()[0];
- return null;
+ private final HttpClient httpClient = new DefaultHttpClient();
+ private final TestServer server = new TestServer(ServletType.JAXRS_SERVLET);
+ private ODataContext context;
+ private ODataSingleProcessorService service;
+
+ @Before
+ public void before() {
+ try {
+ final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
+ final EdmProvider provider = mock(EdmProvider.class);
+
+ service = new ODataSingleProcessorService(provider, processor) {};
+ // FitStaticServiceFactory.setService(service);
+
+ // science fiction (return context after setContext)
+ // see http://www.planetgeek.ch/2010/07/20/mockito-answer-vs-return/
+
+ doAnswer(invocation -> {
+ context = (ODataContext) invocation.getArguments()[0];
+ return null;
+ }).when(processor)
+ .setContext(any(ODataContext.class));
+
+ when(processor.getContext()).thenAnswer(invocation -> context);
+
+ when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(
+ ODataResponse.entity("metadata")
+ .status(HttpStatusCodes.OK)
+ .build());
+ when(((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class),
+ any(String.class))).thenReturn(ODataResponse.entity("servicedocument")
+ .status(HttpStatusCodes.OK)
+ .build());
+ } catch (final ODataException e) {
+ throw new RuntimeException(e);
}
- }).when(processor).setContext(any(ODataContext.class));
-
- when(processor.getContext()).thenAnswer(new Answer<ODataContext>() {
- @Override
- public ODataContext answer(final InvocationOnMock invocation) throws Throwable {
- return context;
- }
- });
-
- when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(
- ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
- when(
- ((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class),
- any(String.class)))
- .thenReturn(ODataResponse.entity("servicedocument").status(HttpStatusCodes.OK).build());
- } catch (final ODataException e) {
- throw new RuntimeException(e);
}
- }
-
- private void startServer() {
- server.startServer(service);
- }
- @After
- public void after() {
- if (server != null) {
- server.stopServer();
+ private void startServer() {
+ server.startServer(service);
}
- }
-
- @Test
- public void testSplit0() throws IOException, ODataException {
- server.setPathSplit(0);
- startServer();
-
- final HttpGet get = new HttpGet(URI.create(server.getEndpoint().toString() + "/$metadata"));
- final HttpResponse response = httpClient.execute(get);
-
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
-
- final ODataContext ctx = service.getProcessor().getContext();
- assertNotNull(ctx);
-
- assertTrue(ctx.getPathInfo().getPrecedingSegments().isEmpty());
- assertEquals("$metadata", ctx.getPathInfo().getODataSegments().get(0).getPath());
- }
-
- @Test
- public void testSplit1() throws IOException, ODataException {
- server.setPathSplit(1);
- startServer();
-
- final HttpGet get = new HttpGet(URI.create(server.getEndpoint().toString() + "/aaa/$metadata"));
- final HttpResponse response = httpClient.execute(get);
-
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
-
- final ODataContext ctx = service.getProcessor().getContext();
- assertNotNull(ctx);
-
- assertEquals("aaa", ctx.getPathInfo().getPrecedingSegments().get(0).getPath());
- assertEquals("$metadata", ctx.getPathInfo().getODataSegments().get(0).getPath());
- }
-
- @Test
- public void testSplit2() throws IOException, ODataException {
- server.setPathSplit(2);
- startServer();
-
- final HttpGet get = new HttpGet(URI.create(server.getEndpoint().toString() + "/aaa/bbb/$metadata"));
- final HttpResponse response = httpClient.execute(get);
-
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
- final ODataContext ctx = service.getProcessor().getContext();
- assertNotNull(ctx);
-
- assertEquals("aaa", ctx.getPathInfo().getPrecedingSegments().get(0).getPath());
- assertEquals("bbb", ctx.getPathInfo().getPrecedingSegments().get(1).getPath());
- assertEquals("$metadata", ctx.getPathInfo().getODataSegments().get(0).getPath());
- }
-
- @Test
- public void testSplitUrlToShort() throws IOException, ODataException {
- server.setPathSplit(3);
- startServer();
-
- final HttpGet get = new HttpGet(URI.create(server.getEndpoint().toString() + "/aaa/$metadata"));
- final HttpResponse response = httpClient.execute(get);
-
- assertEquals(HttpStatusCodes.BAD_REQUEST.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
- @Test
- public void testSplitUrlServiceDocument() throws IOException, ODataException {
- server.setPathSplit(1);
- startServer();
-
- final HttpGet get = new HttpGet(URI.create(server.getEndpoint().toString() + "/aaa/"));
- final HttpResponse response = httpClient.execute(get);
-
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
-
- final ODataContext ctx = service.getProcessor().getContext();
- assertNotNull(ctx);
-
- assertEquals("", ctx.getPathInfo().getODataSegments().get(0).getPath());
- assertEquals("aaa", ctx.getPathInfo().getPrecedingSegments().get(0).getPath());
- }
+ @After
+ public void after() {
+ if (server != null) {
+ server.stopServer();
+ }
+ }
- @Test
- public void testMatrixParameterInNonODataPath() throws IOException, ODataException {
- server.setPathSplit(1);
- startServer();
+ @Test
+ public void testSplit0() throws IOException, ODataException {
+ server.setPathSplit(0);
+ startServer();
+
+ final HttpGet get = new HttpGet(URI.create(server.getEndpoint()
+ .toString()
+ + "/$metadata"));
+ final HttpResponse response = httpClient.execute(get);
+
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+
+ final ODataContext ctx = service.getProcessor()
+ .getContext();
+ assertNotNull(ctx);
+
+ assertTrue(ctx.getPathInfo()
+ .getPrecedingSegments()
+ .isEmpty());
+ assertEquals("$metadata", ctx.getPathInfo()
+ .getODataSegments()
+ .get(0)
+ .getPath());
+ }
- final HttpGet get = new HttpGet(URI.create(server.getEndpoint().toString() + "aaa;n=2/"));
- final HttpResponse response = httpClient.execute(get);
+ @Test
+ public void testSplit1() throws IOException, ODataException {
+ server.setPathSplit(1);
+ startServer();
+
+ final HttpGet get = new HttpGet(URI.create(server.getEndpoint()
+ .toString()
+ + "/aaa/$metadata"));
+ final HttpResponse response = httpClient.execute(get);
+
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+
+ final ODataContext ctx = service.getProcessor()
+ .getContext();
+ assertNotNull(ctx);
+
+ assertEquals("aaa", ctx.getPathInfo()
+ .getPrecedingSegments()
+ .get(0)
+ .getPath());
+ assertEquals("$metadata", ctx.getPathInfo()
+ .getODataSegments()
+ .get(0)
+ .getPath());
+ }
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
+ @Test
+ public void testSplit2() throws IOException, ODataException {
+ server.setPathSplit(2);
+ startServer();
+
+ final HttpGet get = new HttpGet(URI.create(server.getEndpoint()
+ .toString()
+ + "/aaa/bbb/$metadata"));
+ final HttpResponse response = httpClient.execute(get);
+
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+
+ final ODataContext ctx = service.getProcessor()
+ .getContext();
+ assertNotNull(ctx);
+
+ assertEquals("aaa", ctx.getPathInfo()
+ .getPrecedingSegments()
+ .get(0)
+ .getPath());
+ assertEquals("bbb", ctx.getPathInfo()
+ .getPrecedingSegments()
+ .get(1)
+ .getPath());
+ assertEquals("$metadata", ctx.getPathInfo()
+ .getODataSegments()
+ .get(0)
+ .getPath());
+ }
- final ODataContext ctx = service.getProcessor().getContext();
- assertNotNull(ctx);
+ @Test
+ public void testSplitUrlToShort() throws IOException, ODataException {
+ server.setPathSplit(3);
+ startServer();
- assertEquals("", ctx.getPathInfo().getODataSegments().get(0).getPath());
- assertEquals("aaa", ctx.getPathInfo().getPrecedingSegments().get(0).getPath());
+ final HttpGet get = new HttpGet(URI.create(server.getEndpoint()
+ .toString()
+ + "/aaa/$metadata"));
+ final HttpResponse response = httpClient.execute(get);
- assertNotNull(ctx.getPathInfo().getPrecedingSegments().get(0).getMatrixParameters());
+ assertEquals(HttpStatusCodes.BAD_REQUEST.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
- String key, value;
- key = ctx.getPathInfo().getPrecedingSegments().get(0).getMatrixParameters().keySet().iterator().next();
- assertEquals("n", key);
- value = ctx.getPathInfo().getPrecedingSegments().get(0).getMatrixParameters().get(key).get(0);
- assertEquals("2", value);
- }
+ @Test
+ public void testSplitUrlServiceDocument() throws IOException, ODataException {
+ server.setPathSplit(1);
+ startServer();
+
+ final HttpGet get = new HttpGet(URI.create(server.getEndpoint()
+ .toString()
+ + "/aaa/"));
+ final HttpResponse response = httpClient.execute(get);
+
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+
+ final ODataContext ctx = service.getProcessor()
+ .getContext();
+ assertNotNull(ctx);
+
+ assertEquals("", ctx.getPathInfo()
+ .getODataSegments()
+ .get(0)
+ .getPath());
+ assertEquals("aaa", ctx.getPathInfo()
+ .getPrecedingSegments()
+ .get(0)
+ .getPath());
+ }
- @Test
- public void testNoMatrixParameterInODataPath() throws IOException, ODataException {
- server.setPathSplit(0);
- startServer();
+ @Test
+ public void testMatrixParameterInNonODataPath() throws IOException, ODataException {
+ server.setPathSplit(1);
+ startServer();
+
+ final HttpGet get = new HttpGet(URI.create(server.getEndpoint()
+ .toString()
+ + "aaa;n=2/"));
+ final HttpResponse response = httpClient.execute(get);
+
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+
+ final ODataContext ctx = service.getProcessor()
+ .getContext();
+ assertNotNull(ctx);
+
+ assertEquals("", ctx.getPathInfo()
+ .getODataSegments()
+ .get(0)
+ .getPath());
+ assertEquals("aaa", ctx.getPathInfo()
+ .getPrecedingSegments()
+ .get(0)
+ .getPath());
+
+ assertNotNull(ctx.getPathInfo()
+ .getPrecedingSegments()
+ .get(0)
+ .getMatrixParameters());
+
+ String key, value;
+ key = ctx.getPathInfo()
+ .getPrecedingSegments()
+ .get(0)
+ .getMatrixParameters()
+ .keySet()
+ .iterator()
+ .next();
+ assertEquals("n", key);
+ value = ctx.getPathInfo()
+ .getPrecedingSegments()
+ .get(0)
+ .getMatrixParameters()
+ .get(key)
+ .get(0);
+ assertEquals("2", value);
+ }
- final HttpGet get = new HttpGet(URI.create(server.getEndpoint().toString() + "$metadata;matrix"));
- final HttpResponse response = httpClient.execute(get);
+ @Test
+ public void testNoMatrixParameterInODataPath() throws IOException, ODataException {
+ server.setPathSplit(0);
+ startServer();
- final InputStream stream = response.getEntity().getContent();
- final String body = StringHelper.inputStreamToString(stream);
+ final HttpGet get = new HttpGet(URI.create(server.getEndpoint()
+ .toString()
+ + "$metadata;matrix"));
+ final HttpResponse response = httpClient.execute(get);
- assertTrue(body.contains("metadata"));
- assertTrue(body.contains("matrix"));
- assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine().getStatusCode());
- }
+ final InputStream stream = response.getEntity()
+ .getContent();
+ final String body = StringHelper.inputStreamToString(stream);
- @Test
- public void testBaseUriWithMatrixParameter() throws IOException, ODataException,
- URISyntaxException {
- server.setPathSplit(3);
- startServer();
+ assertTrue(body.contains("metadata"));
+ assertTrue(body.contains("matrix"));
+ assertEquals(HttpStatusCodes.NOT_FOUND.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
- final String endpoint = server.getEndpoint().toString();
- final HttpGet get = new HttpGet(URI.create(endpoint + "aaa/bbb;n=2,3;m=1/ccc/"));
- final HttpResponse response = httpClient.execute(get);
-
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
+ @Test
+ public void testBaseUriWithMatrixParameter() throws IOException, ODataException, URISyntaxException {
+ server.setPathSplit(3);
+ startServer();
+
+ final String endpoint = server.getEndpoint()
+ .toString();
+ final HttpGet get = new HttpGet(URI.create(endpoint + "aaa/bbb;n=2,3;m=1/ccc/"));
+ final HttpResponse response = httpClient.execute(get);
+
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+
+ final ODataContext ctx = service.getProcessor()
+ .getContext();
+ assertNotNull(ctx);
+ validateServiceRoot(ctx.getPathInfo()
+ .getServiceRoot()
+ .toASCIIString(),
+ endpoint + "aaa/bbb;", "/ccc/", "n=2,3", "m=1");
+ }
- final ODataContext ctx = service.getProcessor().getContext();
- assertNotNull(ctx);
- validateServiceRoot(ctx.getPathInfo().getServiceRoot().toASCIIString(),
- endpoint + "aaa/bbb;", "/ccc/", "n=2,3", "m=1");
- }
+ @Test
+ public void testMetadataUriWithMatrixParameter() throws IOException, ODataException, URISyntaxException {
+ server.setPathSplit(3);
+ startServer();
+
+ final String endpoint = server.getEndpoint()
+ .toString();
+ final HttpGet get = new HttpGet(URI.create(endpoint + "aaa/bbb;n=2,3;m=1/ccc/$metadata"));
+ final HttpResponse response = httpClient.execute(get);
+
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+
+ final ODataContext ctx = service.getProcessor()
+ .getContext();
+ assertNotNull(ctx);
+ validateServiceRoot(ctx.getPathInfo()
+ .getServiceRoot()
+ .toASCIIString(),
+ endpoint + "aaa/bbb;", "/ccc/", "n=2,3", "m=1");
+ assertEquals("$metadata", ctx.getPathInfo()
+ .getODataSegments()
+ .get(0)
+ .getPath());
+ }
- @Test
- public void testMetadataUriWithMatrixParameter() throws IOException, ODataException,
- URISyntaxException {
- server.setPathSplit(3);
- startServer();
-
- final String endpoint = server.getEndpoint().toString();
- final HttpGet get = new HttpGet(URI.create(endpoint + "aaa/bbb;n=2,3;m=1/ccc/$metadata"));
- final HttpResponse response = httpClient.execute(get);
-
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
-
- final ODataContext ctx = service.getProcessor().getContext();
- assertNotNull(ctx);
- validateServiceRoot(ctx.getPathInfo().getServiceRoot().toASCIIString(),
- endpoint + "aaa/bbb;", "/ccc/", "n=2,3", "m=1");
- assertEquals("$metadata", ctx.getPathInfo().getODataSegments().get(0).getPath());
- }
-
- @Test
- public void testBaseUriWithEncoding() throws IOException, ODataException,
- URISyntaxException {
- server.setPathSplit(3);
- startServer();
-
- final URI uri =
- new URI(server.getEndpoint().getScheme(), null, server.getEndpoint().getHost(), server.getEndpoint().getPort(),
- server.getEndpoint().getPath() + "/aaa/äдержb;n=2, 3;m=1/c c/", null, null);
+ @Test
+ public void testBaseUriWithEncoding() throws IOException, ODataException, URISyntaxException {
+ server.setPathSplit(3);
+ startServer();
+
+ final URI uri = new URI(server.getEndpoint()
+ .getScheme(),
+ null, server.getEndpoint()
+ .getHost(),
+ server.getEndpoint()
+ .getPort(),
+ server.getEndpoint()
+ .getPath() + "aaa/äдержb;n=2, 3;m=1/c c/",
+ null, null);
+
+ final HttpGet get = new HttpGet(uri);
+ final HttpResponse response = httpClient.execute(get);
+
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+
+ final ODataContext context = service.getProcessor()
+ .getContext();
+ assertNotNull(context);
+ URI serviceRoot = context.getPathInfo()
+ .getServiceRoot();
+ String asciiServiceRoot = serviceRoot.toASCIIString();
+ validateServiceRoot(asciiServiceRoot, server.getEndpoint() + "aaa/%C3%A4%D0%B4%D0%B5%D1%80%D0%B6b;", "/c%20c/", "n=2,%203", "m=1");
+ }
- final HttpGet get = new HttpGet(uri);
- final HttpResponse response = httpClient.execute(get);
-
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
-
- final ODataContext context = service.getProcessor().getContext();
- assertNotNull(context);
- validateServiceRoot(context.getPathInfo().getServiceRoot().toASCIIString(),
- server.getEndpoint() + "aaa/%C3%A4%D0%B4%D0%B5%D1%80%D0%B6b;", "/c%20c/", "n=2,%203", "m=1");
- }
-
- private void validateServiceRoot(String serviceRoot, String prefix, String postfix, String ... matrixParameter) {
- assertTrue("Service root '" + serviceRoot + "' does not start with '" + prefix + "'.",
- serviceRoot.startsWith(prefix));
- assertTrue("Service root '" + serviceRoot + "' does not end with '" + postfix + "'.", serviceRoot.endsWith
- (postfix));
- for (String s : matrixParameter) {
- assertTrue("Service root '" + serviceRoot + "' misses matrix parameter '" + s + "'", serviceRoot.contains(s));
+ private void validateServiceRoot(String serviceRoot, String prefix, String postfix, String... matrixParameter) {
+ assertTrue("Service root '" + serviceRoot + "' does not start with '" + prefix + "'.", serviceRoot.startsWith(prefix));
+ assertTrue("Service root '" + serviceRoot + "' does not end with '" + postfix + "'.", serviceRoot.endsWith(postfix));
+ for (String s : matrixParameter) {
+ assertTrue("Service root '" + serviceRoot + "' misses matrix parameter '" + s + "'", serviceRoot.contains(s));
+ }
}
- }
}
diff --git a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
index d707fd46..512a9650 100644
--- a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
+++ b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.fit.basic;
@@ -22,9 +18,7 @@ import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-
import java.net.URI;
-
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpGet;
@@ -48,130 +42,148 @@ import org.apache.olingo.odata2.testutil.helper.HttpMerge;
import org.apache.olingo.odata2.testutil.helper.HttpSomethingUnsupported;
import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.apache.olingo.odata2.testutil.server.ServletType;
+import org.junit.Ignore;
import org.junit.Test;
/**
- *
+ *
*/
public class UrlRewriteTest extends AbstractBasicTest {
- public UrlRewriteTest(final ServletType servletType) {
- super(servletType);
- }
-
- @Override
- protected ODataSingleProcessor createProcessor() throws ODataException {
- final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
- when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(
- ODataResponse.entity("metadata").status(HttpStatusCodes.OK).build());
- when(
- ((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class),
- any(String.class))).thenReturn(ODataResponse.entity("service document").status(HttpStatusCodes.OK).build());
- return processor;
- }
-
- @Test
- public void testGetServiceDocumentRedirect() throws Exception {
- final HttpRequestBase httpMethod = createRedirectRequest(HttpGet.class);
- final HttpResponse response = getHttpClient().execute(httpMethod);
- assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
- @Test
- public void testPutServiceDocumentRedirect() throws Exception {
- final HttpRequestBase httpMethod = createRedirectRequest(HttpPut.class);
- final HttpResponse response = getHttpClient().execute(httpMethod);
- assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
- @Test
- public void testPostServiceDocumentRedirect() throws Exception {
- final HttpRequestBase httpMethod = createRedirectRequest(HttpPost.class);
- final HttpResponse response = getHttpClient().execute(httpMethod);
- assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
- @Test
- public void testDeleteServiceDocumentRedirect() throws Exception {
- final HttpRequestBase httpMethod = createRedirectRequest(HttpDelete.class);
- final HttpResponse response = getHttpClient().execute(httpMethod);
- assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
- @Test
- public void testOptionsServiceDocumentRedirect() throws Exception {
- final HttpRequestBase httpMethod = createRedirectRequest(HttpOptions.class);
- final HttpResponse response = getHttpClient().execute(httpMethod);
- assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
- @Test
- public void testHeadServiceDocumentRedirect() throws Exception {
- final HttpRequestBase httpMethod = createRedirectRequest(HttpHead.class);
- final HttpResponse response = getHttpClient().execute(httpMethod);
- assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
- @Test
- public void testMergeServiceDocumentRedirect() throws Exception {
- final HttpRequestBase httpMethod = createRedirectRequest(HttpMerge.class);
- final HttpResponse response = getHttpClient().execute(httpMethod);
- assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
- @Test
- public void testPatchServiceDocumentRedirect() throws Exception {
- final HttpRequestBase httpMethod = createRedirectRequest(HttpPatch.class);
- final HttpResponse response = getHttpClient().execute(httpMethod);
- assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
- @Test
- public void testSomethingUnsupportedServiceDocumentRedirect() throws Exception {
- final HttpRequestBase httpMethod = createRedirectRequest(HttpSomethingUnsupported.class);
- final HttpResponse response = getHttpClient().execute(httpMethod);
- assertEquals(HttpStatusCodes.NOT_IMPLEMENTED.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
- private HttpRequestBase createRedirectRequest(final Class<? extends HttpRequestBase> clazz) throws Exception {
- String endpoint = getEndpoint().toASCIIString();
- endpoint = endpoint.substring(0, endpoint.length() - 1);
-
- final HttpRequestBase httpMethod = clazz.newInstance();
- httpMethod.setURI(URI.create(endpoint));
-
- final HttpParams params = new BasicHttpParams();
- params.setParameter("http.protocol.handle-redirects", false);
- httpMethod.setParams(params);
- return httpMethod;
- }
-
- @Test
- public void testGetServiceDocumentWithSlash() throws Exception {
- final HttpGet get = new HttpGet(URI.create(getEndpoint().toString()));
- final HttpParams params = new BasicHttpParams();
- params.setParameter("http.protocol.handle-redirects", false);
- get.setParams(params);
-
- final HttpResponse response = getHttpClient().execute(get);
-
- final String payload = StringHelper.inputStreamToString(response.getEntity().getContent());
- assertEquals("service document", payload);
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
- }
-
- @Test
- public void testGetMetadata() throws Exception {
- final HttpGet get = new HttpGet(URI.create(getEndpoint().toString() + "$metadata"));
- final HttpParams params = new BasicHttpParams();
- params.setParameter("http.protocol.handle-redirects", false);
- get.setParams(params);
-
- final HttpResponse response = getHttpClient().execute(get);
-
- final String payload = StringHelper.inputStreamToString(response.getEntity().getContent());
- assertEquals("metadata", payload);
- assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine().getStatusCode());
- }
+ public UrlRewriteTest(final ServletType servletType) {
+ super(servletType);
+ }
+
+ @Override
+ protected ODataSingleProcessor createProcessor() throws ODataException {
+ final ODataSingleProcessor processor = mock(ODataSingleProcessor.class);
+ when(((MetadataProcessor) processor).readMetadata(any(GetMetadataUriInfo.class), any(String.class))).thenReturn(
+ ODataResponse.entity("metadata")
+ .status(HttpStatusCodes.OK)
+ .build());
+ when(((ServiceDocumentProcessor) processor).readServiceDocument(any(GetServiceDocumentUriInfo.class),
+ any(String.class))).thenReturn(ODataResponse.entity("service document")
+ .status(HttpStatusCodes.OK)
+ .build());
+ return processor;
+ }
+
+ @Test
+ public void testGetServiceDocumentRedirect() throws Exception {
+ final HttpRequestBase httpMethod = createRedirectRequest(HttpGet.class);
+ final HttpResponse response = getHttpClient().execute(httpMethod);
+ assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
+
+ @Test
+ public void testPutServiceDocumentRedirect() throws Exception {
+ final HttpRequestBase httpMethod = createRedirectRequest(HttpPut.class);
+ final HttpResponse response = getHttpClient().execute(httpMethod);
+ assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
+
+ @Test
+ public void testPostServiceDocumentRedirect() throws Exception {
+ final HttpRequestBase httpMethod = createRedirectRequest(HttpPost.class);
+ final HttpResponse response = getHttpClient().execute(httpMethod);
+ assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
+
+ @Test
+ public void testDeleteServiceDocumentRedirect() throws Exception {
+ final HttpRequestBase httpMethod = createRedirectRequest(HttpDelete.class);
+ final HttpResponse response = getHttpClient().execute(httpMethod);
+ assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
+
+ @Ignore("CXF OPTIONS requests are not handled for some reason and in this case the response is 404")
+ @Test
+ public void testOptionsServiceDocumentRedirect() throws Exception {
+ final HttpRequestBase httpMethod = createRedirectRequest(HttpOptions.class);
+ final HttpResponse response = getHttpClient().execute(httpMethod);
+ assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
+
+ @Test
+ public void testHeadServiceDocumentRedirect() throws Exception {
+ final HttpRequestBase httpMethod = createRedirectRequest(HttpHead.class);
+ final HttpResponse response = getHttpClient().execute(httpMethod);
+ assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
+
+ @Test
+ public void testMergeServiceDocumentRedirect() throws Exception {
+ final HttpRequestBase httpMethod = createRedirectRequest(HttpMerge.class);
+ final HttpResponse response = getHttpClient().execute(httpMethod);
+ assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
+
+ @Test
+ public void testPatchServiceDocumentRedirect() throws Exception {
+ final HttpRequestBase httpMethod = createRedirectRequest(HttpPatch.class);
+ final HttpResponse response = getHttpClient().execute(httpMethod);
+ assertEquals(HttpStatusCodes.TEMPORARY_REDIRECT.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
+
+ @Test
+ public void testSomethingUnsupportedServiceDocumentRedirect() throws Exception {
+ final HttpRequestBase httpMethod = createRedirectRequest(HttpSomethingUnsupported.class);
+ final HttpResponse response = getHttpClient().execute(httpMethod);
+ assertEquals(HttpStatusCodes.NOT_IMPLEMENTED.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
+
+ private HttpRequestBase createRedirectRequest(final Class<? extends HttpRequestBase> clazz) throws Exception {
+ String endpoint = getEndpoint().toASCIIString();
+ endpoint = endpoint.substring(0, endpoint.length() - 1);
+
+ final HttpRequestBase httpMethod = clazz.newInstance();
+ httpMethod.setURI(URI.create(endpoint));
+
+ final HttpParams params = new BasicHttpParams();
+ params.setParameter("http.protocol.handle-redirects", false);
+ httpMethod.setParams(params);
+ return httpMethod;
+ }
+
+ @Test
+ public void testGetServiceDocumentWithSlash() throws Exception {
+ final HttpGet get = new HttpGet(URI.create(getEndpoint().toString()));
+ final HttpParams params = new BasicHttpParams();
+ params.setParameter("http.protocol.handle-redirects", false);
+ get.setParams(params);
+
+ final HttpResponse response = getHttpClient().execute(get);
+
+ final String payload = StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ assertEquals("service document", payload);
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
+
+ @Test
+ public void testGetMetadata() throws Exception {
+ final HttpGet get = new HttpGet(URI.create(getEndpoint().toString() + "$metadata"));
+ final HttpParams params = new BasicHttpParams();
+ params.setParameter("http.protocol.handle-redirects", false);
+ get.setParams(params);
+
+ final HttpResponse response = getHttpClient().execute(get);
+
+ final String payload = StringHelper.inputStreamToString(response.getEntity()
+ .getContent());
+ assertEquals("metadata", payload);
+ assertEquals(HttpStatusCodes.OK.getStatusCode(), response.getStatusLine()
+ .getStatusCode());
+ }
}
diff --git a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Photo.java b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Photo.java
index c631e8da..689498a7 100644
--- a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Photo.java
+++ b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Photo.java
@@ -1,20 +1,16 @@
/*******************************************************************************
- * 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
- *
+ * 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.
+ *
+ * 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.apache.olingo.odata2.ref.model;
@@ -24,126 +20,121 @@ import java.io.InputStream;
import java.util.Arrays;
/**
- *
+ *
*/
public class Photo {
- private static final String RESOURCE = "/Employee_1.png";
- private static byte[] defaultImage;
-
- private final int id;
- private String name;
- private String type = "image/jpeg";
- private String imageUrl = "http://localhost" + RESOURCE;
- private byte[] image = defaultImage;
- private String imageType = type;
- private byte[] binaryData;
- private String content;
-
- public Photo(final int id, final String name, final String type) {
- this.id = id;
- setName(name);
- setType(type);
- }
-
- static {
- try {
- InputStream instream = Photo.class.getResourceAsStream(RESOURCE);
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
- int b = 0;
- while ((b = instream.read()) != -1) {
- stream.write(b);
- }
-
- Photo.defaultImage = stream.toByteArray();
- } catch (IOException e) {
- throw new ModelException(e);
- }
- }
-
- public int getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- public String getImageUri() {
- return imageUrl;
- }
-
- public void setImageUri(final String uri) {
- imageUrl = uri;
- }
-
- public byte[] getImage() {
- return image.clone();
- }
-
- public void setImage(final byte[] image) {
- this.image = image;
- }
-
- public String getImageType() {
- return imageType;
- }
-
- public void setImageType(final String imageType) {
- this.imageType = imageType;
- }
-
- public byte[] getBinaryData() {
- if (binaryData == null) {
- return null;
- } else {
- return binaryData.clone();
- }
- }
-
- public void setBinaryData(final byte[] binaryData) {
- this.binaryData = binaryData;
- }
-
- public void setContent(final String content) {
- this.content = content;
- }
-
- public String getContent() {
- return content;
- }
-
- @Override
- public int hashCode() {
- return id;
- }
-
- @Override
- public boolean equals(final Object obj) {
- return this == obj
- || obj != null && getClass() == obj.getClass() && id == ((Photo) obj).id;
- }
-
- @Override
- public String toString() {
- return "{\"Id\":" + id + ","
- + "\"Name\":\"" + name + "\","
- + "\"Type\":\"" + type + "\","
- + "\"ImageUrl\":\"" + imageUrl + "\","
- + "\"Image\":\"" + Arrays.toString(image) + "\","
- + "\"ImageType\":\"" + imageType + "\","
- + "\"Content:\"" + content + "\","
- + "\"BinaryData\":\"" + Arrays.toString(binaryData) + "\"}";
- }
+ private static final String RESOURCE = "/Employee_1.png";
+ private static byte[] defaultImage;
+
+ private final int id;
+ private String name;
+ private String type = "image/jpeg";
+ private String imageUrl = "http://localhost" + RESOURCE;
+ private byte[] image = defaultImage;
+ private String imageType = type;
+ private byte[] binaryData;
+ private String content;
+
+ public Photo(final int id, final String name, final String type) {
+ this.id = id;
+ setName(name);
+ setType(type);
+ }
+
+ static {
+ try (InputStream instream = Photo.class.getResourceAsStream(RESOURCE)) {
+ if (null == instream) {
+ throw new IllegalStateException("Missing resource " + RESOURCE);
+ }
+ ByteArrayOutputStream stream = new ByteArrayOutputStream();
+ int b = 0;
+ while ((b = instream.read()) != -1) {
+ stream.write(b);
+ }
+
+ Photo.defaultImage = stream.toByteArray();
+ } catch (IOException e) {
+ throw new ModelException(e);
+ }
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(final String type) {
+ this.type = type;
+ }
+
+ public String getImageUri() {
+ return imageUrl;
+ }
+
+ public void setImageUri(final String uri) {
+ imageUrl = uri;
+ }
+
+ public byte[] getImage() {
+ return image.clone();
+ }
+
+ public void setImage(final byte[] image) {
+ this.image = image;
+ }
+
+ public String getImageType() {
+ return imageType;
+ }
+
+ public void setImageType(final String imageType) {
+ this.imageType = imageType;
+ }
+
+ public byte[] getBinaryData() {
+ if (binaryData == null) {
+ return null;
+ }
+ return binaryData.clone();
+ }
+
+ public void setBinaryData(final byte[] binaryData) {
+ this.binaryData = binaryData;
+ }
+
+ public void setContent(final String content) {
+ this.content = content;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ @Override
+ public int hashCode() {
+ return id;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ return this == obj || obj != null && getClass() == obj.getClass() && id == ((Photo) obj).id;
+ }
+
+ @Override
+ public String toString() {
+ return "{\"Id\":" + id + "," + "\"Name\":\"" + name + "\"," + "\"Type\":\"" + type + "\"," + "\"ImageUrl\":\"" + imageUrl + "\","
+ + "\"Image\":\"" + Arrays.toString(image) + "\"," + "\"ImageType\":\"" + imageType + "\"," + "\"Content:\"" + content
+ + "\"," + "\"BinaryData\":\"" + Arrays.toString(binaryData) + "\"}";
+ }
}
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/LocaleAsserter.java b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/LocaleAsserter.java
similarity index 91%
rename from odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/LocaleAsserter.java
rename to odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/LocaleAsserter.java
index 6af9c88e..683983be 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/LocaleAsserter.java
+++ b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/LocaleAsserter.java
@@ -1,4 +1,4 @@
-package org.apache.olingo.odata2.core;
+package org.apache.olingo.odata2.testutil.helper;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertThat;
(olingo-odata2) 07/29: set version 3.0.0-SNAPSHOT Signed-off-by: Iliyan Velichkov
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 78298e8f340256cdcd6a7da503567c585aee53fd
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 10:31:59 2023 +0200
set version 3.0.0-SNAPSHOT
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.gitignore | 1 +
odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-core/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
odata2-annotation-processor/pom.xml | 2 +-
odata2-dist/janos/pom.xml | 2 +-
odata2-dist/javadoc/pom.xml | 2 +-
odata2-dist/jpa/pom.xml | 2 +-
odata2-dist/lib/pom.xml | 2 +-
odata2-dist/pom.xml | 2 +-
odata2-dist/ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-api/pom.xml | 2 +-
odata2-jpa-processor/jpa-core/pom.xml | 2 +-
odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-web/pom.xml | 2 +-
odata2-jpa-processor/pom.xml | 2 +-
odata2-lib/odata-annotation/pom.xml | 2 +-
odata2-lib/odata-api/pom.xml | 2 +-
odata2-lib/odata-client-api/pom.xml | 2 +-
odata2-lib/odata-client-core/pom.xml | 2 +-
odata2-lib/odata-core/pom.xml | 2 +-
odata2-lib/odata-fit/pom.xml | 2 +-
odata2-lib/odata-ref/pom.xml | 2 +-
odata2-lib/odata-testutil/pom.xml | 2 +-
odata2-lib/odata-web/pom.xml | 2 +-
odata2-lib/pom.xml | 2 +-
odata2-sample/cars-annotation-archetype/pom.xml | 4 ++--
odata2-sample/cars-jpa-archetype/pom.xml | 2 +-
odata2-sample/cars-service-archetype/pom.xml | 4 ++--
odata2-sample/pom.xml | 2 +-
odata2-spring/pom.xml | 2 +-
pom.xml | 2 +-
33 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/.gitignore b/.gitignore
index e000e0dc..b30725e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ classes
.DS_Store
nb-configuration.xml
context.xml
+*.versionsBackup
\ No newline at end of file
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml b/odata2-annotation-processor/annotation-processor-api/pom.xml
index 120163da..d5cf999f 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml b/odata2-annotation-processor/annotation-processor-core/pom.xml
index b57a282f..85d46807 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index 3f62b39a..1ffb864e 100644
--- a/odata2-annotation-processor/annotation-processor-ref/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-web/pom.xml b/odata2-annotation-processor/annotation-processor-web/pom.xml
index 797d8dac..4e40e412 100644
--- a/odata2-annotation-processor/annotation-processor-web/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/pom.xml b/odata2-annotation-processor/pom.xml
index d830a1c5..3f3f19c7 100644
--- a/odata2-annotation-processor/pom.xml
+++ b/odata2-annotation-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml
index f4b3926e..37704a27 100644
--- a/odata2-dist/janos/pom.xml
+++ b/odata2-dist/janos/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/javadoc/pom.xml b/odata2-dist/javadoc/pom.xml
index 841a18b8..59b4cd35 100644
--- a/odata2-dist/javadoc/pom.xml
+++ b/odata2-dist/javadoc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml
index 6264163f..8f936905 100644
--- a/odata2-dist/jpa/pom.xml
+++ b/odata2-dist/jpa/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/lib/pom.xml b/odata2-dist/lib/pom.xml
index 012687cd..e8e23da8 100644
--- a/odata2-dist/lib/pom.xml
+++ b/odata2-dist/lib/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
index 3aa08424..d0ab591b 100644
--- a/odata2-dist/pom.xml
+++ b/odata2-dist/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml
index 199f6e89..6b46b802 100644
--- a/odata2-dist/ref/pom.xml
+++ b/odata2-dist/ref/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-api/pom.xml b/odata2-jpa-processor/jpa-api/pom.xml
index 872f2ae9..f61729eb 100644
--- a/odata2-jpa-processor/jpa-api/pom.xml
+++ b/odata2-jpa-processor/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index cacc5d55..0ccae999 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-ref/pom.xml b/odata2-jpa-processor/jpa-ref/pom.xml
index 4d81e3b8..4d9355e7 100644
--- a/odata2-jpa-processor/jpa-ref/pom.xml
+++ b/odata2-jpa-processor/jpa-ref/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-web/pom.xml b/odata2-jpa-processor/jpa-web/pom.xml
index 7ba3b284..48484f93 100644
--- a/odata2-jpa-processor/jpa-web/pom.xml
+++ b/odata2-jpa-processor/jpa-web/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/pom.xml b/odata2-jpa-processor/pom.xml
index ea9877b0..f3866665 100644
--- a/odata2-jpa-processor/pom.xml
+++ b/odata2-jpa-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml
index de7fe349..ba3161ca 100644
--- a/odata2-lib/odata-annotation/pom.xml
+++ b/odata2-lib/odata-annotation/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml
index f33c2133..5f2f21e9 100644
--- a/odata2-lib/odata-api/pom.xml
+++ b/odata2-lib/odata-api/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-client-api/pom.xml b/odata2-lib/odata-client-api/pom.xml
index 502cd3e7..7b0ccf14 100644
--- a/odata2-lib/odata-client-api/pom.xml
+++ b/odata2-lib/odata-client-api/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>olingo-odata2-client-api</artifactId>
diff --git a/odata2-lib/odata-client-core/pom.xml b/odata2-lib/odata-client-core/pom.xml
index 03ef9ca6..b99efd47 100644
--- a/odata2-lib/odata-client-core/pom.xml
+++ b/odata2-lib/odata-client-core/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml
index 5b50f5b7..a27d513d 100644
--- a/odata2-lib/odata-core/pom.xml
+++ b/odata2-lib/odata-core/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml
index 1a45c362..8fa57ab5 100644
--- a/odata2-lib/odata-fit/pom.xml
+++ b/odata2-lib/odata-fit/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml
index 2d90b8f1..0abcda1e 100644
--- a/odata2-lib/odata-ref/pom.xml
+++ b/odata2-lib/odata-ref/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml
index 101c8769..beda624e 100644
--- a/odata2-lib/odata-testutil/pom.xml
+++ b/odata2-lib/odata-testutil/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml
index 073d3aac..8ab14609 100644
--- a/odata2-lib/odata-web/pom.xml
+++ b/odata2-lib/odata-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml
index 558471fd..3136e195 100644
--- a/odata2-lib/pom.xml
+++ b/odata2-lib/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-annotation-archetype/pom.xml b/odata2-sample/cars-annotation-archetype/pom.xml
index 423c19ef..58764a0c 100644
--- a/odata2-sample/cars-annotation-archetype/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/pom.xml
@@ -16,13 +16,13 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-annotation-archetype</artifactId>
<name>${project.artifactId}</name>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-jpa-archetype/pom.xml b/odata2-sample/cars-jpa-archetype/pom.xml
index 1639db67..448f597d 100644
--- a/odata2-sample/cars-jpa-archetype/pom.xml
+++ b/odata2-sample/cars-jpa-archetype/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-service-archetype/pom.xml b/odata2-sample/cars-service-archetype/pom.xml
index 580b3fcf..9b5cfb56 100644
--- a/odata2-sample/cars-service-archetype/pom.xml
+++ b/odata2-sample/cars-service-archetype/pom.xml
@@ -24,14 +24,14 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-service-archetype</artifactId>
<name>${project.artifactId}</name>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/pom.xml b/odata2-sample/pom.xml
index a7b5fe78..a3effb08 100644
--- a/odata2-sample/pom.xml
+++ b/odata2-sample/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-spring/pom.xml b/odata2-spring/pom.xml
index bfb0ef86..bf238e8b 100755
--- a/odata2-spring/pom.xml
+++ b/odata2-spring/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 72b69697..fb374b5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>2.0.13</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
(olingo-odata2) 17/29: version set to 3.0.3-SNAPSHOT for development
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit e9f46901b516fd793c75cbe41a8a266abc3a7634
Author: iliyan-velichkov <il...@users.noreply.github.com>
AuthorDate: Wed Dec 13 09:49:07 2023 +0000
version set to 3.0.3-SNAPSHOT for development
---
odata2-annotation-processor/annotation-processor-api/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-core/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-ref/pom.xml | 2 +-
odata2-annotation-processor/annotation-processor-web/pom.xml | 2 +-
odata2-annotation-processor/pom.xml | 2 +-
odata2-dist/janos/pom.xml | 2 +-
odata2-dist/javadoc/pom.xml | 2 +-
odata2-dist/jpa/pom.xml | 2 +-
odata2-dist/lib/pom.xml | 2 +-
odata2-dist/pom.xml | 2 +-
odata2-dist/ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-api/pom.xml | 2 +-
odata2-jpa-processor/jpa-core/pom.xml | 2 +-
odata2-jpa-processor/jpa-ref/pom.xml | 2 +-
odata2-jpa-processor/jpa-web/pom.xml | 2 +-
odata2-jpa-processor/pom.xml | 2 +-
odata2-lib/odata-annotation/pom.xml | 2 +-
odata2-lib/odata-api/pom.xml | 2 +-
odata2-lib/odata-client-api/pom.xml | 2 +-
odata2-lib/odata-client-core/pom.xml | 2 +-
odata2-lib/odata-core/pom.xml | 2 +-
odata2-lib/odata-fit/pom.xml | 2 +-
odata2-lib/odata-ref/pom.xml | 2 +-
odata2-lib/odata-testutil/pom.xml | 2 +-
odata2-lib/odata-web/pom.xml | 2 +-
odata2-lib/pom.xml | 2 +-
odata2-sample/cars-annotation-archetype/pom.xml | 4 ++--
odata2-sample/cars-jpa-archetype/pom.xml | 2 +-
odata2-sample/cars-service-archetype/pom.xml | 4 ++--
odata2-sample/pom.xml | 2 +-
odata2-spring/pom.xml | 2 +-
pom.xml | 2 +-
32 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml b/odata2-annotation-processor/annotation-processor-api/pom.xml
index 371cf66f..3ad930e9 100644
--- a/odata2-annotation-processor/annotation-processor-api/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml b/odata2-annotation-processor/annotation-processor-core/pom.xml
index c0e91245..aacb998b 100644
--- a/odata2-annotation-processor/annotation-processor-core/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml b/odata2-annotation-processor/annotation-processor-ref/pom.xml
index 280f6c1e..c0c71968 100644
--- a/odata2-annotation-processor/annotation-processor-ref/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/annotation-processor-web/pom.xml b/odata2-annotation-processor/annotation-processor-web/pom.xml
index 58555942..40ee806f 100644
--- a/odata2-annotation-processor/annotation-processor-web/pom.xml
+++ b/odata2-annotation-processor/annotation-processor-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-annotation-processor</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-annotation-processor/pom.xml b/odata2-annotation-processor/pom.xml
index d3d6bacd..1d097cbb 100644
--- a/odata2-annotation-processor/pom.xml
+++ b/odata2-annotation-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml
index 48ef7541..52d778f0 100644
--- a/odata2-dist/janos/pom.xml
+++ b/odata2-dist/janos/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/javadoc/pom.xml b/odata2-dist/javadoc/pom.xml
index 4924ea65..a3da7184 100644
--- a/odata2-dist/javadoc/pom.xml
+++ b/odata2-dist/javadoc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml
index 5d9280a8..fed83c76 100644
--- a/odata2-dist/jpa/pom.xml
+++ b/odata2-dist/jpa/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/lib/pom.xml b/odata2-dist/lib/pom.xml
index 7ccc84e7..2419e82d 100644
--- a/odata2-dist/lib/pom.xml
+++ b/odata2-dist/lib/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
index 82045580..d7b6f8f7 100644
--- a/odata2-dist/pom.xml
+++ b/odata2-dist/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml
index 06aaecde..2d691623 100644
--- a/odata2-dist/ref/pom.xml
+++ b/odata2-dist/ref/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-dist</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-api/pom.xml b/odata2-jpa-processor/jpa-api/pom.xml
index 5861d713..88eb7bb4 100644
--- a/odata2-jpa-processor/jpa-api/pom.xml
+++ b/odata2-jpa-processor/jpa-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml
index 641a63e4..d54ff9ec 100644
--- a/odata2-jpa-processor/jpa-core/pom.xml
+++ b/odata2-jpa-processor/jpa-core/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-ref/pom.xml b/odata2-jpa-processor/jpa-ref/pom.xml
index 66c34d8b..2bba3283 100644
--- a/odata2-jpa-processor/jpa-ref/pom.xml
+++ b/odata2-jpa-processor/jpa-ref/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/jpa-web/pom.xml b/odata2-jpa-processor/jpa-web/pom.xml
index b791c209..58ef62e9 100644
--- a/odata2-jpa-processor/jpa-web/pom.xml
+++ b/odata2-jpa-processor/jpa-web/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-jpa-processor/pom.xml b/odata2-jpa-processor/pom.xml
index 9dfad79b..4fed7e2c 100644
--- a/odata2-jpa-processor/pom.xml
+++ b/odata2-jpa-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml
index 0623df23..c1508bcd 100644
--- a/odata2-lib/odata-annotation/pom.xml
+++ b/odata2-lib/odata-annotation/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml
index e0055cf9..a231cf2f 100644
--- a/odata2-lib/odata-api/pom.xml
+++ b/odata2-lib/odata-api/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-client-api/pom.xml b/odata2-lib/odata-client-api/pom.xml
index fe4af915..6b7e336a 100644
--- a/odata2-lib/odata-client-api/pom.xml
+++ b/odata2-lib/odata-client-api/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>olingo-odata2-client-api</artifactId>
diff --git a/odata2-lib/odata-client-core/pom.xml b/odata2-lib/odata-client-core/pom.xml
index 234fdde6..48cb42cd 100644
--- a/odata2-lib/odata-client-core/pom.xml
+++ b/odata2-lib/odata-client-core/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml
index 8efc4359..6dd55fbe 100644
--- a/odata2-lib/odata-core/pom.xml
+++ b/odata2-lib/odata-core/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml
index b5c13e49..3c376191 100644
--- a/odata2-lib/odata-fit/pom.xml
+++ b/odata2-lib/odata-fit/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml
index d6d7982b..e5d5de76 100644
--- a/odata2-lib/odata-ref/pom.xml
+++ b/odata2-lib/odata-ref/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml
index 438c8a8c..e566edde 100644
--- a/odata2-lib/odata-testutil/pom.xml
+++ b/odata2-lib/odata-testutil/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml
index 2ec2468a..6cf5a91c 100644
--- a/odata2-lib/odata-web/pom.xml
+++ b/odata2-lib/odata-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-lib</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml
index 864d3580..0a42bda0 100644
--- a/odata2-lib/pom.xml
+++ b/odata2-lib/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-annotation-archetype/pom.xml b/odata2-sample/cars-annotation-archetype/pom.xml
index 380f1dd0..5a001468 100644
--- a/odata2-sample/cars-annotation-archetype/pom.xml
+++ b/odata2-sample/cars-annotation-archetype/pom.xml
@@ -16,13 +16,13 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-annotation-archetype</artifactId>
<name>${project.artifactId}</name>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-jpa-archetype/pom.xml b/odata2-sample/cars-jpa-archetype/pom.xml
index f3d81185..a116fa95 100644
--- a/odata2-sample/cars-jpa-archetype/pom.xml
+++ b/odata2-sample/cars-jpa-archetype/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/cars-service-archetype/pom.xml b/odata2-sample/cars-service-archetype/pom.xml
index 9627aef0..9d9fe22a 100644
--- a/odata2-sample/cars-service-archetype/pom.xml
+++ b/odata2-sample/cars-service-archetype/pom.xml
@@ -24,14 +24,14 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample-cars-service-archetype</artifactId>
<name>${project.artifactId}</name>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-sample</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-sample/pom.xml b/odata2-sample/pom.xml
index 6930dcd5..6fb75436 100644
--- a/odata2-sample/pom.xml
+++ b/odata2-sample/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/odata2-spring/pom.xml b/odata2-spring/pom.xml
index a5a5e7d3..45de46d7 100755
--- a/odata2-spring/pom.xml
+++ b/odata2-spring/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 7d20f079..d0e544c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-parent</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
(olingo-odata2) 09/29: add release workflow
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 54be5cab01a7972deefa69c52553dd6c47bd0ba9
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 10:49:50 2023 +0200
add release workflow
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.github/workflows/release.yml | 87 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..0c674b8f
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,87 @@
+name: Release
+
+on:
+ workflow_dispatch:
+ inputs:
+ releaseVersion:
+ description: Release Version
+ required: true
+ default: 3.0.0
+ snapshotVersion:
+ description: Snapshot Version
+ required: true
+ default: 3.0.1-SNAPSHOT
+
+run-name: 'version set to ${{ github.event.inputs.releaseVersion }} for release'
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+
+ - uses: actions/checkout@v3
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ fetch-depth: 0
+
+ - name: Cache local Maven repository
+ uses: actions/cache@v3
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-maven-
+
+ - name: Set up JDK Corretto 8
+ uses: actions/setup-java@v3
+ with:
+ distribution: 'corretto'
+ java-version: '8'
+ architecture: x64
+
+ - name: "Configure Git"
+ run: |
+ git fetch
+ git checkout ${{ github.event.inputs.branch }}
+ git config user.name "$GITHUB_ACTOR"
+ git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+
+ - name: "Maven: Set Release Version"
+ run: mvn versions:set -DnewVersion=${{ github.event.inputs.releaseVersion }}
+
+ - name: Build Project
+ run: mvn clean install
+
+ - name: "Git: Commit Release Version"
+ run: |
+ git add '**pom.xml'
+ git commit -m "version set to ${{ github.event.inputs.releaseVersion }} for release"
+
+ - name: "Maven: Set Snapshot Version"
+ run: mvn versions:set -DnewVersion=${{ github.event.inputs.snapshotVersion }}
+
+ - name: "Git: Commit Snapshot Version"
+ run: |
+ git add '**pom.xml'
+ git commit -m "version set to ${{ github.event.inputs.snapshotVersion }} for development"
+
+ - name: Create Release
+ id: create_release
+ uses: actions/create-release@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+ with:
+ tag_name: ${{ github.ref }}
+ release_name: Release ${{ github.ref }}
+ body: |
+ Changes in this Release
+ - First Change
+ - Second Change
+ draft: false
+ prerelease: false
+
+ - name: "Git: Push Changes"
+ run: |
+ git checkout -B ${{ github.event.inputs.releaseVersion }}
+ git push --set-upstream origin ${{ github.event.inputs.releaseVersion }}
+ git checkout -B master
+ git push --set-upstream origin master
\ No newline at end of file
(olingo-odata2) 01/29: add build.yml
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit ab481c5a0b20c763f9079f65480eb2c737a8afd7
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 09:54:19 2023 +0200
add build.yml
---
.github/build.yml | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/.github/build.yml b/.github/build.yml
new file mode 100644
index 00000000..1c4103e1
--- /dev/null
+++ b/.github/build.yml
@@ -0,0 +1,28 @@
+name: Build
+on:
+ push:
+ branches:
+ - main
+ - master
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ - name: Cache local Maven repository
+ uses: actions/cache@v3
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-maven-
+ - name: Set up JDK Corretto 21
+ uses: actions/setup-java@v3
+ with:
+ distribution: 'corretto'
+ java-version: '21'
+ architecture: x64
+ - name: Maven Build
+ run: mvn clean install
+
(olingo-odata2) 15/29: change job name Signed-off-by: Iliyan Velichkov
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1636-jdk_upgrade
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
commit 72646b840bac7beea2e4a592bef06fc379941221
Author: Iliyan Velichkov <ve...@gmail.com>
AuthorDate: Wed Dec 13 11:21:39 2023 +0200
change job name
Signed-off-by: Iliyan Velichkov <ve...@gmail.com>
---
.github/workflows/release.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d993627b..9c2a548c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ on:
run-name: 'version set to ${{ github.event.inputs.releaseVersion }} for release'
jobs:
- build:
+ release-project:
runs-on: ubuntu-latest
steps: