Skip to content

Parse UUID and handle null value correctly #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
celine-madi-veriforce wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Parse UUID and handle null value correctly #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae08bc0
parse UUID
celine-madi-veriforce Sep 15, 2025
6a23dd9
QUAL-5999 handle null value
celine-madi-veriforce Sep 16, 2025
2816d16
QUAL-5999 remove unused import
celine-madi-veriforce Sep 16, 2025
c2070aa
QUAL-5999 indent
celine-madi-veriforce Sep 16, 2025
78766a2
Merge pull request #3 from Alcumus/QUAL-5999
celine-madi-veriforce Sep 23, 2025
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
15 changes: 11 additions & 4 deletions src/main/java/tech/ailef/snapadmin/external/dbmapping/CustomJpaRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,13 @@ public int update(DbObjectSchema schema, Map<String, String> params, Map<String,
}
}

if (field.getConnectedSchema() != null)
value = field.getConnectedSchema().getJpaRepository().findById(value).get();
if (field.getConnectedSchema() != null) {
if (value != null) {
value = field.getConnectedSchema().getJpaRepository().findById(value).orElse(null);
} else {
value = null;
}
}

update.set(root.get(field.getJavaName()), value);
hasUpdate = true;
Expand All @@ -143,8 +148,10 @@ public int update(DbObjectSchema schema, Map<String, String> params, Map<String,
if (!hasUpdate) return 0;

String pkName = schema.getPrimaryKey().getJavaName();
update.where(cb.equal(root.get(pkName), params.get(schema.getPrimaryKey().getName())));

Object parsedPk = schema.getPrimaryKey().getType().parseValue(
params.get(schema.getPrimaryKey().getName())
);
update.where(cb.equal(root.get(pkName), parsedPk));
Query query = entityManager.createQuery(update);
return query.executeUpdate();
}
Expand Down
19 changes: 13 additions & 6 deletions src/main/java/tech/ailef/snapadmin/external/dbmapping/SnapAdminRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public SnapAdminRepository() {
@SuppressWarnings({ "rawtypes", "unchecked" })
public Optional<DbObject> findById(DbObjectSchema schema, Object id) {
SimpleJpaRepository repository = schema.getJpaRepository();
Optional optional = repository.findById(id);
Object parsedId = parsePrimaryKey(schema, id);
Optional optional = repository.findById(parsedId);
if (optional.isEmpty())
return Optional.empty();
else {
Expand Down Expand Up @@ -194,7 +194,8 @@ private Object save(DbObjectSchema schema, DbObject o) {
*/
@Transactional("transactionManager")
public void attachManyToMany(DbObjectSchema schema, Object id, Map<String, List<String>> params) {
Optional<DbObject> optional = findById(schema, id);
Object parsedId = parsePrimaryKey(schema, id);
Optional<DbObject> optional = findById(schema, parsedId);

DbObject dbObject = optional.orElseThrow(() -> {
return new SnapAdminException("Unable to retrieve newly inserted item");
Expand All @@ -210,7 +211,8 @@ public void attachManyToMany(DbObjectSchema schema, Object id, Map<String, List<

List<DbObject> traverseMany = new ArrayList<>();
for (String oId : idValues) {
Optional<DbObject> findById = findById(linkedSchema, oId);
Object linkedParsedId = parsePrimaryKey(linkedSchema, oId);
Optional<DbObject> findById = findById(linkedSchema, linkedParsedId);
if (findById.isPresent()) {
traverseMany.add(findById.get());
}
Expand Down Expand Up @@ -324,7 +326,12 @@ public DbQueryResult executeQuery(String sql) {
@SuppressWarnings("unchecked")
@Transactional("transactionManager")
public void delete(DbObjectSchema schema, String id) {
schema.getJpaRepository().deleteById(id);
Object parsedId = parsePrimaryKey(schema, id);
schema.getJpaRepository().deleteById(parsedId);
}


private Object parsePrimaryKey(DbObjectSchema schema, Object rawId) {
DbField idField = schema.getFieldByName("id");
return idField.getType().parseValue(rawId);
}
}
5 changes: 4 additions & 1 deletion src/main/java/tech/ailef/snapadmin/external/dbmapping/fields/UUIDFieldType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ public String getFragmentName() {

@Override
public Object parseValue(Object value) {
return java.util.UUID.fromString(value.toString());
if (value == null) return null;
String str = value.toString().trim();
if (str.isEmpty()) return null;
return java.util.UUID.fromString(str);
}

@Override
Expand Down
Loading