FunctionExecutor is now an optional interface

Author: mibo

janos-api/src/main/java/org/apache/olingo/odata2/janos/processor/api/datasource/FunctionExecutor.java

@@ -19,9 +19,18 @@
 package org.apache.olingo.odata2.janos.processor.api.datasource;
 
 /**
+ * A FunctionExecutor defines a class which is used to execute a function and
+ * wants to get the DataStoreManager.
+ *
  * Created by mibo on 23.08.15.
  */
 public interface FunctionExecutor {
 
+  /**
+   * Init method must be called from a FunctionSource which prepare
+   * a class which has methods with @EdmFunctionImport annotation
+   *
+   * @param dataStore data store manager which is used by DataSources
+   */
   void init(DataStoreManager dataStore);
 }

janos-api/src/main/java/org/apache/olingo/odata2/janos/processor/api/datasource/FunctionSource.java

@@ -27,13 +27,14 @@
 import java.util.Map;
 
 /**
+ * A FunctionSource contains functionality to execute functions for
+ * given EdmFunctionImports.
+ *
  * Created by mibo on 23.08.15.
  */
 public interface FunctionSource {
 
-  FunctionExecutor getFunctionExecutor(String functionName);
-
-//  Object executeFunction(String functionName, Object... parameters);
+//  FunctionExecutor getFunctionExecutor(String functionName);
 
   /**
    * <p>Retrieves data for the specified function import and key.</p>

janos-core/src/main/java/org/apache/olingo/odata2/janos/processor/core/DataSourceProcessor.java

@@ -40,7 +40,6 @@
 import org.apache.olingo.odata2.api.uri.info.*;
 import org.apache.olingo.odata2.janos.processor.api.datasource.DataSource;
 import org.apache.olingo.odata2.janos.processor.api.datasource.DataSource.BinaryData;
-import org.apache.olingo.odata2.janos.processor.api.datasource.FunctionExecutor;
 import org.apache.olingo.odata2.janos.processor.api.datasource.FunctionSource;
 import org.apache.olingo.odata2.janos.processor.api.datasource.ValueAccess;
 
@@ -76,11 +75,6 @@ public DataSourceProcessor(final DataSource dataSource, final ValueAccess valueA
 
   private static FunctionSource createDefaultFunctionSource() {
     return new FunctionSource() {
-      @Override
-      public FunctionExecutor getFunctionExecutor(String functionName) {
-        return null;
-      }
-
       @Override
       public Object executeFunction(EdmFunctionImport function, Map<String, Object> parameters, Map<String, Object> keys)
           throws ODataNotImplementedException, ODataNotFoundException, EdmException, ODataApplicationException {
@@ -290,11 +284,9 @@ public ODataResponse readEntity(final GetEntityUriInfo uriInfo, final String con
 
     final ExpandSelectTreeNode expandSelectTreeNode =
         UriParser.createExpandSelectTree(uriInfo.getSelect(), uriInfo.getExpand());
-    ODataResponse odr =
-        ODataResponse.fromResponse(writeEntry(uriInfo.getTargetEntitySet(), expandSelectTreeNode, data, contentType))
-            .build();
 
-    return odr;
+    return ODataResponse.fromResponse(
+        writeEntry(uriInfo.getTargetEntitySet(), expandSelectTreeNode, data, contentType)).build();
   }
 
   @Override
@@ -1490,7 +1482,7 @@ private void handleMimeType(final Object data, final EdmMapping mapping, final M
   private <T> Map<String, Object> getSimpleTypeValueMap(final T data, final List<EdmProperty> propertyPath)
       throws ODataException {
     final EdmProperty property = propertyPath.get(propertyPath.size() - 1);
-    Map<String, Object> valueWithMimeType = new HashMap<String, Object>();
+    Map<String, Object> valueWithMimeType = new HashMap<>();
     valueWithMimeType.put(property.getName(), getPropertyValue(data, propertyPath));
 
     handleMimeType(data, property.getMapping(), valueWithMimeType);

janos-core/src/main/java/org/apache/olingo/odata2/janos/processor/core/datasource/AnnotationFunctionSource.java

@@ -30,21 +30,15 @@ private AnnotationFunctionSource() { /* private ctor because of builder */ }
 
   private void init(Collection<Class<?>> annotatedClasses) {
     for (Class<?> annotatedClass : annotatedClasses) {
-      if(FunctionExecutor.class.isAssignableFrom(annotatedClass)) {
-        init((Class<FunctionExecutor>) annotatedClass);
-      }
-    }
-  }
+      List<Method> methods = annotationHelper.getAnnotatedMethods(annotatedClass, EdmFunctionImport.class, false);
 
-  private void init(Class<FunctionExecutor> annotatedClass) {
-    List<Method> methods = annotationHelper.getAnnotatedMethods(annotatedClass, EdmFunctionImport.class, false);
-
-    for (Method method : methods) {
-      initFunctionHolder(annotatedClass, method);
+      for (Method method : methods) {
+        initFunctionHolder(annotatedClass, method);
+      }
     }
   }
 
-  private void initFunctionHolder(Class<FunctionExecutor> annotatedClass, Method method) {
+  private void initFunctionHolder(Class<?> annotatedClass, Method method) {
     try {
       EdmFunctionImport efi = method.getAnnotation(EdmFunctionImport.class);
       String name = efi.name();
@@ -59,7 +53,8 @@ private void initFunctionHolder(Class<FunctionExecutor> annotatedClass, Method m
       holder.executor = annotatedClass.newInstance();
       holder.functionImport = efi;
       holder.functionParameters = parameters;
-      holder.executor.init(dataStoreManager);
+      //
+      callInitMethods(holder.executor);
 
       functionHolders.put(name, holder);
     } catch (InstantiationException | IllegalAccessException e) {
@@ -68,6 +63,12 @@ private void initFunctionHolder(Class<FunctionExecutor> annotatedClass, Method m
 
   }
 
+  private void callInitMethods(Object functionInstance) {
+    if(functionInstance instanceof FunctionExecutor) {
+      ((FunctionExecutor) functionInstance).init(dataStoreManager);
+    }
+  }
+
   private LinkedHashMap<String, EdmFunctionImportParameter> extractParameters(Parameter[] parameters) {
     LinkedHashMap<String, EdmFunctionImportParameter> result = new LinkedHashMap<>();
     for (Parameter parameter : parameters) {
@@ -77,14 +78,14 @@ private LinkedHashMap<String, EdmFunctionImportParameter> extractParameters(Para
     return result;
   }
 
-  @Override
-  public FunctionExecutor getFunctionExecutor(String functionName) {
-    FunctionHolder holder =  functionHolders.get(functionName);
-    if(holder == null) {
-      return null;
-    }
-    return holder.executor;
-  }
+//  @Override
+//  public FunctionExecutor getFunctionExecutor(String functionName) {
+//    FunctionHolder holder = functionHolders.get(functionName);
+//    if(holder == null) {
+//      return null;
+//    }
+//    return holder.executor;
+//  }
 
   @Override
   public Object executeFunction(org.apache.olingo.odata2.api.edm.EdmFunctionImport function,
@@ -115,7 +116,7 @@ private Object[] mapParameters(FunctionHolder holder, Map<String, Object> parame
 
 
   static class FunctionHolder {
-    FunctionExecutor executor;
+    Object executor;
     Method method;
     EdmFunctionImport functionImport;
     LinkedHashMap<String, EdmFunctionImportParameter> functionParameters;

janos-ref/src/main/java/org/apache/olingo/odata2/janos/processor/ref/model/RefFunctions.java

@@ -15,9 +15,9 @@
 import static org.apache.olingo.odata2.api.annotation.edm.EdmFunctionImport.*;
 
 /**
- * Created by mibo on 23.08.15.
- *
+ * Reference Implementation for a FunctionExecutor
  *
+ * Created by mibo on 23.08.15.
  */
 public class RefFunctions implements FunctionExecutor {