Skip to content
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

Jump to bottom

Quasi-support for java.time types #53

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

Quasi-support for java.time types #53

Show file tree
Hide file tree
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
11 changes: 10 additions & 1 deletion ...core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,8 +537,17 @@ private static String evaluateComparingExpression(String uriLiteral, final EdmSi
(Calendar) edmSimpleType.valueOfString(uriLiteral, EdmLiteralKind.DEFAULT, null, edmSimpleType
.getDefaultType());

Object realDateTime = datetime;
if (edmMappedType != null && datetime != null) {
String edmMappedTypeName = edmMappedType.getName();
ODataJavaTimeCallback callback = ODataJPAContextImpl.getContextInThreadLocal().getServiceFactory().getCallback(ODataJavaTimeCallback.class);
if (callback != null) {
realDateTime = callback.convert(datetime, edmMappedTypeName);
}
}

if (!positionalParameters.containsKey(index)) {
positionalParameters.put(index, datetime);
positionalParameters.put(index, realDateTime);
}
uriLiteral = "?" + index;

Expand Down
12 changes: 12 additions & 0 deletions ...core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJavaTimeCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package org.apache.olingo.odata2.jpa.processor.core;

import org.apache.olingo.odata2.api.ODataCallback;

import java.util.Calendar;

/**
* Created by marcinpiela on 05/10/2024.
*/
public interface ODataJavaTimeCallback extends ODataCallback {
Object convert(Calendar calendar, String javaTimeType);
}
16 changes: 8 additions & 8 deletions ...rc/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
import java.util.List;
import java.util.Map;

import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;

import org.apache.olingo.odata2.api.edm.EdmAssociationEnd;
import org.apache.olingo.odata2.api.edm.EdmException;
import org.apache.olingo.odata2.api.edm.EdmMapping;
Expand Down Expand Up @@ -242,7 +245,10 @@ public static Object getPropertyValue(final Method method, final Object entity,
method.setAccessible(true);
Class<?> returnType = method.getReturnType();

if (returnType.equals(char[].class)) {
if(method.isAnnotationPresent(XmlJavaTypeAdapter.class)) {
XmlAdapter xmlAdapter = method.getAnnotation(XmlJavaTypeAdapter.class).value().newInstance();
propertyValue = xmlAdapter.marshal(method.invoke(entity));
} else if (returnType.equals(char[].class)) {
char[] ch = (char[]) method.invoke(entity);
if (ch != null) {
propertyValue = (String) String.valueOf((char[]) method.invoke(entity));
Expand Down Expand Up @@ -270,13 +276,7 @@ public static Object getPropertyValue(final Method method, final Object entity,
propertyValue = method.invoke(entity);
}
}
} catch (IllegalAccessException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
} catch (IllegalArgumentException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
} catch (InvocationTargetException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
} catch (SecurityException e) {
} catch (Exception e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
}

Expand Down