Skip to content

Commit c889ffe

Browse files
Fixes
Signed-off-by: Anders Swanson <anders.swanson@oracle.com>
1 parent 47899ec commit c889ffe

File tree

16 files changed

+57
-16
lines changed

16 files changed

+57
-16
lines changed

database/starters/oracle-spring-boot-json-relational-duality-views/src/main/java/com/oracle/spring/json/duality/annotation/AccessMode.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality.annotation;
25

36
import java.lang.annotation.Retention;

database/starters/oracle-spring-boot-json-relational-duality-views/src/main/java/com/oracle/spring/json/duality/annotation/JsonRelationalDualityView.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality.annotation;
25

36
import java.lang.annotation.Documented;

database/starters/oracle-spring-boot-json-relational-duality-views/src/main/java/com/oracle/spring/json/duality/builder/Annotations.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality.builder;
25

36
import java.lang.annotation.Annotation;
@@ -7,6 +10,7 @@
710
import com.oracle.spring.json.duality.annotation.AccessMode;
811
import com.oracle.spring.json.duality.annotation.JsonRelationalDualityView;
912
import jakarta.json.bind.annotation.JsonbProperty;
13+
import jakarta.json.bind.annotation.JsonbTransient;
1014
import jakarta.persistence.Column;
1115
import jakarta.persistence.JoinTable;
1216
import jakarta.persistence.ManyToMany;
@@ -90,6 +94,10 @@ static boolean isRelationalEntity(Field f) {
9094
return false;
9195
}
9296

97+
static boolean isFieldIncluded(Field f) {
98+
return f.getAnnotation(JsonbTransient.class) == null;
99+
}
100+
93101

94102
static String getJsonbPropertyName(Field f) {
95103
JsonbProperty jsonbProperty = f.getAnnotation(JsonbProperty.class);

database/starters/oracle-spring-boot-json-relational-duality-views/src/main/java/com/oracle/spring/json/duality/builder/DualityViewBuilder.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality.builder;
25

36
import java.sql.Connection;
47
import java.sql.SQLException;
58
import java.sql.Statement;
69
import java.util.ArrayList;
710
import java.util.List;
8-
import java.util.Optional;
911

1012
import com.oracle.spring.json.duality.annotation.JsonRelationalDualityView;
1113
import javax.sql.DataSource;

database/starters/oracle-spring-boot-json-relational-duality-views/src/main/java/com/oracle/spring/json/duality/builder/DualityViewScanner.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality.builder;
25

36
import java.util.Set;
47

58
import com.oracle.spring.json.duality.annotation.JsonRelationalDualityView;
6-
import jakarta.annotation.PostConstruct;
79
import jakarta.persistence.EntityManager;
810
import jakarta.persistence.metamodel.EntityType;
911
import org.springframework.boot.context.event.ApplicationReadyEvent;

database/starters/oracle-spring-boot-json-relational-duality-views/src/main/java/com/oracle/spring/json/duality/builder/RootSnippet.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality.builder;
25

36
public enum RootSnippet {

database/starters/oracle-spring-boot-json-relational-duality-views/src/main/java/com/oracle/spring/json/duality/builder/ViewEntity.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality.builder;
25

36
import java.lang.reflect.Field;
@@ -21,6 +24,7 @@
2124
import static com.oracle.spring.json.duality.builder.Annotations.getJsonbPropertyName;
2225
import static com.oracle.spring.json.duality.builder.Annotations.getTableName;
2326
import static com.oracle.spring.json.duality.builder.Annotations.getNestedViewName;
27+
import static com.oracle.spring.json.duality.builder.Annotations.isFieldIncluded;
2428
import static com.oracle.spring.json.duality.builder.Annotations.isRelationalEntity;
2529

2630
final class ViewEntity {
@@ -71,7 +75,9 @@ ViewEntity build() {
7175

7276
incNesting();
7377
for (Field f : javaType.getDeclaredFields()) {
74-
parseField(f);
78+
if (isFieldIncluded(f)) {
79+
parseField(f);
80+
}
7581
}
7682
addTrailer(rootSnippet == null);
7783
return this;
@@ -215,7 +221,7 @@ private void addTrailer(boolean addNewline) {
215221
}
216222

217223
private String getPadding() {
218-
return String.format("%" + nesting + "s", " ");
224+
return " ".repeat(nesting);
219225
}
220226

221227
private void incNesting() {

database/starters/oracle-spring-boot-json-relational-duality-views/src/test/java/com/oracle/spring/json/duality/Application.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality;
25

36
import org.springframework.boot.SpringApplication;

database/starters/oracle-spring-boot-json-relational-duality-views/src/test/java/com/oracle/spring/json/duality/JsonRelationalDualityClient.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality;
25

36
import com.oracle.spring.json.jsonb.JSONB;

database/starters/oracle-spring-boot-json-relational-duality-views/src/test/java/com/oracle/spring/json/duality/SpringBootDualityTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality;
25

36
import java.io.File;

database/starters/oracle-spring-boot-json-relational-duality-views/src/test/java/com/oracle/spring/json/duality/builder/DualityViewBuilderTest.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality.builder;
25

3-
import java.lang.reflect.Field;
4-
import java.util.ArrayList;
56
import java.util.stream.Stream;
67

78
import com.oracle.spring.json.duality.model.movie.Actor;
8-
import com.oracle.spring.json.duality.model.movie.Movie;
99
import com.oracle.spring.json.duality.model.student.Student;
1010
import org.jetbrains.annotations.NotNull;
11-
import org.junit.jupiter.api.Test;
1211
import org.junit.jupiter.params.ParameterizedTest;
1312
import org.junit.jupiter.params.provider.Arguments;
1413
import org.junit.jupiter.params.provider.MethodSource;
@@ -46,11 +45,4 @@ private DualityViewBuilder getDualityViewBuilder(String ddlAuto) {
4645
hibernateProperties
4746
);
4847
}
49-
50-
@Test
51-
void t() throws Exception {
52-
Field m = Actor.class.getDeclaredField("movies");
53-
54-
System.out.println(m.getGenericType());
55-
}
5648
}

database/starters/oracle-spring-boot-json-relational-duality-views/src/test/java/com/oracle/spring/json/duality/model/movie/Actor.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality.model.movie;
25

36
import java.util.HashSet;

database/starters/oracle-spring-boot-json-relational-duality-views/src/test/java/com/oracle/spring/json/duality/model/movie/Director.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality.model.movie;
25

36
import java.util.Objects;

database/starters/oracle-spring-boot-json-relational-duality-views/src/test/java/com/oracle/spring/json/duality/model/movie/DirectorBio.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality.model.movie;
25

36
import java.util.Objects;

database/starters/oracle-spring-boot-json-relational-duality-views/src/test/java/com/oracle/spring/json/duality/model/movie/Movie.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
2+
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
package com.oracle.spring.json.duality.model.movie;
25

36
import java.util.Objects;

database/starters/oracle-spring-boot-json-relational-duality-views/src/test/java/com/oracle/spring/json/duality/model/student/Student.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
// Copyright (c) 2024, Oracle and/or its affiliates.
1+
// Copyright (c) 2025, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
34
package com.oracle.spring.json.duality.model.student;
45

56
import com.oracle.spring.json.duality.annotation.JsonRelationalDualityView;

0 commit comments

Comments
 (0)