Skip to content
This repository was archived by the owner on Sep 14, 2023. It is now read-only.

A bug of wrong ManyToOne.targetEntity() value interpreting was fixed. #37

Open
buzden wants to merge 1 commit into
base: master
Choose a base branch
from
Open

A bug of wrong ManyToOne.targetEntity() value interpreting was fixed. #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions jirm-orm/src/main/java/co/jirm/mapper/definition/SqlParameterDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package co.jirm.mapper.definition;

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Strings.isNullOrEmpty;

Expand Down Expand Up @@ -161,7 +160,11 @@ static SqlParameterDefinition parameterDef(
String sn = null;
ManyToOne manyToOne = getAnnotation(objectType, parameterName, ManyToOne.class);
if (manyToOne != null) {
Class<?> subK = checkNotNull(manyToOne.targetEntity(), "targetEntity not set");
Class<?> subK = manyToOne.targetEntity();
if (subK == null || subK.equals(void.class)) {
subK = parameterType;
}

JoinColumn joinColumn = getAnnotation(objectType, parameterName, JoinColumn.class);
SqlObjectDefinition<?> od = SqlObjectDefinition.fromClass(subK, config);
checkState( ! od.getIdParameters().isEmpty(), "No id parameters");
Expand Down