[BAEL-2894] Minor formatting
This commit is contained in:
parent
2fad9df50c
commit
f833bc18d1
|
@ -68,16 +68,6 @@
|
||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</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>
|
<dependency>
|
||||||
<groupId>org.apache.olingo</groupId>
|
<groupId>org.apache.olingo</groupId>
|
||||||
<artifactId>olingo-odata2-jpa-processor-core</artifactId>
|
<artifactId>olingo-odata2-jpa-processor-core</artifactId>
|
||||||
|
|
|
@ -53,16 +53,16 @@
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
<artifactId>spring-boot-starter-web</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.olingo</groupId>
|
|
||||||
<artifactId>odata-server-api</artifactId>
|
|
||||||
<version>${odata.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.olingo</groupId>
|
<groupId>org.apache.olingo</groupId>
|
||||||
<artifactId>odata-server-core</artifactId>
|
<artifactId>odata-server-core</artifactId>
|
||||||
<version>${odata.version}</version>
|
<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>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -75,7 +75,7 @@
|
||||||
<artifactId>odata-commons-core</artifactId>
|
<artifactId>odata-commons-core</artifactId>
|
||||||
<version>${odata.version}</version>
|
<version>${odata.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-beanutils</groupId>
|
<groupId>commons-beanutils</groupId>
|
||||||
<artifactId>commons-beanutils</artifactId>
|
<artifactId>commons-beanutils</artifactId>
|
||||||
|
|
|
@ -192,7 +192,7 @@ public class JpaEdmProvider extends CsdlAbstractEdmProvider {
|
||||||
List<CsdlProperty> properties = et.getDeclaredSingularAttributes()
|
List<CsdlProperty> properties = et.getDeclaredSingularAttributes()
|
||||||
.stream()
|
.stream()
|
||||||
.filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.BASIC)
|
.filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.BASIC)
|
||||||
.map(attr -> buildBasicAttribute(et, attr))
|
.map(attr -> buildBasicAttribute(attr))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
result.setProperties(properties);
|
result.setProperties(properties);
|
||||||
|
@ -201,7 +201,7 @@ public class JpaEdmProvider extends CsdlAbstractEdmProvider {
|
||||||
List<CsdlPropertyRef> ids = et.getDeclaredSingularAttributes()
|
List<CsdlPropertyRef> ids = et.getDeclaredSingularAttributes()
|
||||||
.stream()
|
.stream()
|
||||||
.filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.BASIC && attr.isId())
|
.filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.BASIC && attr.isId())
|
||||||
.map(attr -> buildRefAttribute(et, attr))
|
.map(attr -> buildRefAttribute(attr))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
result.setKey(ids);
|
result.setKey(ids);
|
||||||
|
@ -209,7 +209,8 @@ public class JpaEdmProvider extends CsdlAbstractEdmProvider {
|
||||||
// Process 1:N navs
|
// Process 1:N navs
|
||||||
List<CsdlNavigationProperty> navs = et.getDeclaredPluralAttributes()
|
List<CsdlNavigationProperty> navs = et.getDeclaredPluralAttributes()
|
||||||
.stream()
|
.stream()
|
||||||
.map(attr -> buildNavAttribute(et, attr))
|
.filter(attr -> attr.isAssociation())
|
||||||
|
.map(attr -> buildNavAttribute(attr))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
result.setNavigationProperties(navs);
|
result.setNavigationProperties(navs);
|
||||||
|
|
||||||
|
@ -217,7 +218,7 @@ public class JpaEdmProvider extends CsdlAbstractEdmProvider {
|
||||||
List<CsdlNavigationProperty> navs2 = et.getDeclaredSingularAttributes()
|
List<CsdlNavigationProperty> navs2 = et.getDeclaredSingularAttributes()
|
||||||
.stream()
|
.stream()
|
||||||
.filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.MANY_TO_ONE)
|
.filter(attr -> attr.getPersistentAttributeType() == PersistentAttributeType.MANY_TO_ONE)
|
||||||
.map(attr -> buildNavAttribute(et, attr))
|
.map(attr -> buildMany2OneNavAttribute(attr))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
result.getNavigationProperties().addAll(navs2);
|
result.getNavigationProperties().addAll(navs2);
|
||||||
|
@ -226,26 +227,24 @@ public class JpaEdmProvider extends CsdlAbstractEdmProvider {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private CsdlProperty buildBasicAttribute(EntityType<?> et, SingularAttribute<?, ?> attr) {
|
private CsdlProperty buildBasicAttribute(SingularAttribute<?, ?> attr) {
|
||||||
|
|
||||||
CsdlProperty p = new CsdlProperty().setName(attr.getName())
|
CsdlProperty p = new CsdlProperty().setName(attr.getName())
|
||||||
.setType(typeMapper.java2edm(attr.getJavaType())
|
.setType(typeMapper.java2edm(attr.getJavaType())
|
||||||
.getFullQualifiedName())
|
.getFullQualifiedName())
|
||||||
.setNullable(et.getDeclaredSingularAttribute(attr.getName())
|
.setNullable(attr.isOptional());
|
||||||
.isOptional());
|
|
||||||
|
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
private CsdlPropertyRef buildRefAttribute(EntityType<?> et, SingularAttribute<?, ?> attr) {
|
private CsdlPropertyRef buildRefAttribute(SingularAttribute<?, ?> attr) {
|
||||||
|
|
||||||
CsdlPropertyRef p = new CsdlPropertyRef().setName(attr.getName());
|
CsdlPropertyRef p = new CsdlPropertyRef().setName(attr.getName());
|
||||||
|
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build NavProperty for 1:N or M:N associations
|
// 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())
|
CsdlNavigationProperty p = new CsdlNavigationProperty().setName(attr.getName())
|
||||||
.setType(new FullQualifiedName(NAMESPACE, attr.getBindableJavaType().getSimpleName()))
|
.setType(new FullQualifiedName(NAMESPACE, attr.getBindableJavaType().getSimpleName()))
|
||||||
|
@ -256,7 +255,7 @@ public class JpaEdmProvider extends CsdlAbstractEdmProvider {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build NavProperty for N:1 associations
|
// 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())
|
CsdlNavigationProperty p = new CsdlNavigationProperty().setName(attr.getName())
|
||||||
.setType(new FullQualifiedName(NAMESPACE, attr.getBindableJavaType().getSimpleName()))
|
.setType(new FullQualifiedName(NAMESPACE, attr.getBindableJavaType().getSimpleName()))
|
||||||
|
|
Loading…
Reference in New Issue