iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[BAEL-2894] Minor formatting

This commit is contained in:
Philippe 2019-05-11 21:21:18 -03:00
parent 2fad9df50c
commit f833bc18d1
3 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apache-olingo/olingo2/pom.xml
View File

@ -68,16 +68,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-api</artifactId>
<version>${olingo2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-api</artifactId>
<version>${olingo2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>olingo-odata2-jpa-processor-core</artifactId>

14
apache-olingo/olingo4/pom.xml
View File

@ -53,16 +53,16 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-server-api</artifactId>
<version>${odata.version}</version>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-server-core</artifactId>
<version>${odata.version}</version>
<scope>runtime</scope>
</dependency>
<!--
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-server-api</artifactId>
<version>${odata.version}</version>
</dependency>
<dependency>
@ -75,7 +75,7 @@
<artifactId>odata-commons-core</artifactId>
<version>${odata.version}</version>
</dependency>
-->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>

21
apache-olingo/olingo4/src/main/java/org/baeldung/examples/olingo4/edm/JpaEdmProvider.java
View File

@ -192,7 +192,7 @@ public class JpaEdmProvider extends CsdlAbstractEdmProvider {
List<CsdlProperty> properties = et.getDeclaredSingularAttributes()
.stream()
.filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.BASIC)
.map(attr -> buildBasicAttribute(et, attr))
.map(attr -> buildBasicAttribute(attr))
.collect(Collectors.toList());
result.setProperties(properties);
@ -201,7 +201,7 @@ public class JpaEdmProvider extends CsdlAbstractEdmProvider {
List<CsdlPropertyRef> ids = et.getDeclaredSingularAttributes()
.stream()
.filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.BASIC && attr.isId())
.map(attr -> buildRefAttribute(et, attr))
.map(attr -> buildRefAttribute(attr))
.collect(Collectors.toList());
result.setKey(ids);
@ -209,7 +209,8 @@ public class JpaEdmProvider extends CsdlAbstractEdmProvider {
// Process 1:N navs
List<CsdlNavigationProperty> navs = et.getDeclaredPluralAttributes()
.stream()
.map(attr -> buildNavAttribute(et, attr))
.filter(attr -> attr.isAssociation())
.map(attr -> buildNavAttribute(attr))
.collect(Collectors.toList());
result.setNavigationProperties(navs);
@ -217,7 +218,7 @@ public class JpaEdmProvider extends CsdlAbstractEdmProvider {
List<CsdlNavigationProperty> navs2 = et.getDeclaredSingularAttributes()
.stream()
.filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.MANY_TO_ONE)
.map(attr -> buildNavAttribute(et, attr))
.map(attr -> buildMany2OneNavAttribute(attr))
.collect(Collectors.toList());
result.getNavigationProperties().addAll(navs2);
@ -226,26 +227,24 @@ public class JpaEdmProvider extends CsdlAbstractEdmProvider {
return result;
}
private CsdlProperty buildBasicAttribute(EntityType<?> et, SingularAttribute<?, ?> attr) {
private CsdlProperty buildBasicAttribute(SingularAttribute<?, ?> attr) {
CsdlProperty p = new CsdlProperty().setName(attr.getName())
.setType(typeMapper.java2edm(attr.getJavaType())
.getFullQualifiedName())
.setNullable(et.getDeclaredSingularAttribute(attr.getName())
.isOptional());
.setNullable(attr.isOptional());
return p;
}
private CsdlPropertyRef buildRefAttribute(EntityType<?> et, SingularAttribute<?, ?> attr) {
private CsdlPropertyRef buildRefAttribute(SingularAttribute<?, ?> attr) {
CsdlPropertyRef p = new CsdlPropertyRef().setName(attr.getName());
return p;
}
// Build NavProperty for 1:N or M:N associations
private CsdlNavigationProperty buildNavAttribute(EntityType<?> et, PluralAttribute<?, ?, ?> attr) {
private CsdlNavigationProperty buildNavAttribute(PluralAttribute<?, ?, ?> attr) {
CsdlNavigationProperty p = new CsdlNavigationProperty().setName(attr.getName())
.setType(new FullQualifiedName(NAMESPACE, attr.getBindableJavaType().getSimpleName()))
@ -256,7 +255,7 @@ public class JpaEdmProvider extends CsdlAbstractEdmProvider {
}
// Build NavProperty for N:1 associations
private CsdlNavigationProperty buildNavAttribute(EntityType<?> et, SingularAttribute<?, ?> attr) {
private CsdlNavigationProperty buildMany2OneNavAttribute(SingularAttribute<?, ?> attr) {
CsdlNavigationProperty p = new CsdlNavigationProperty().setName(attr.getName())
.setType(new FullQualifiedName(NAMESPACE, attr.getBindableJavaType().getSimpleName()))