Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ private JSONObject encodeManagedInstance(final OpenJPAStateManager sm, final Set
case JavaTypes.LOCALE:
case JavaTypes.STRING:
case JavaTypes.ENUM:
case JavaTypes.UUID_OBJ:
root.set(fmd.getName(), value);
break;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ private Element encodeManagedInstance(final OpenJPAStateManager sm, final Elemen
case JavaTypes.DATE:
case JavaTypes.NUMBER:
case JavaTypes.CALENDAR:
case JavaTypes.UUID_OBJ:
case JavaTypes.LOCALE:
case JavaTypes.STRING:
case JavaTypes.ENUM:
Expand Down
11 changes: 11 additions & 0 deletions openjpa-jest/src/test/java/demo/Actor.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;

import jakarta.persistence.Entity;
import jakarta.persistence.Id;
Expand Down Expand Up @@ -58,6 +59,7 @@ public static enum Gender {Male, Female}
private Actor partner;
@OneToMany
private Set<Movie> movies;
private UUID randomId;

protected Actor() {

Expand All @@ -70,6 +72,7 @@ public Actor(String id, String firstName, String lastName, Gender gender, Date d
this.lastName = lastName;
this.gender = gender;
this.dob = dob;
this.randomId = java.util.UUID.randomUUID();
}

public String getId() {
Expand Down Expand Up @@ -102,6 +105,14 @@ public void setPartner(Actor partner) {
public Set<Movie> getMovies() {
return movies;
}

public void setRandomId(UUID uuid) {
this.randomId = uuid;
}

public UUID getRandomId() {
return randomId;
}

public void addMovie(Movie movie) {
if (movies == null)
Expand Down
7 changes: 4 additions & 3 deletions openjpa-jest/src/test/resources/META-INF/persistence.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="1.0">

<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"
version="2.1">
<persistence-unit name="test-jest">

<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import java.util.HashSet;
import java.util.Locale;
import java.util.TreeSet;
import java.util.UUID;

import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.CollectionAttribute;
Expand Down Expand Up @@ -169,6 +170,9 @@ public AbstractManagedType(ClassMetaData meta, MetamodelImpl model) {
case JavaTypes.LOCALE:
attrs.add(new Members.SingularAttributeImpl<X, Locale>(this, f));
break;
case JavaTypes.UUID_OBJ:
attrs.add(new Members.SingularAttributeImpl<X, UUID>(this, f));
break;
case JavaTypes.OBJECT:
case JavaTypes.OID:
case JavaTypes.PC:
Expand Down
Loading