0041033: ImportEntryPreProcessors with qualifiers are not executed

diff --git a/src-test/src/org/openbravo/test/system/ImportEntryBuilderTest.java b/src-test/src/org/openbravo/test/system/ImportEntryBuilderTest.java
--- a/src-test/src/org/openbravo/test/system/ImportEntryBuilderTest.java
+++ b/src-test/src/org/openbravo/test/system/ImportEntryBuilderTest.java
@@ -58,6 +58,7 @@
   private static final Role QA_TESTING_ADMIN_ROLE = OBDal.getInstance()
       .getProxy(Role.class, "4028E6C72959682B01295A071429011E");
   private static final String JSON_DATA = "{\"custom\":\"data\"}";
+  private static final String JSON_DATA_MODIFIED = "{\"custom\":\"data\",\"preProcessField\":\"1\"}";
   private static final String IMPORT_STATUS = "Initial";
   private static final String TYPE_OF_DATA = "Order";
 
@@ -119,6 +120,23 @@
   }
 
   /**
+   * Check that the test ImportEntryPreProcessor is executed
+   */
+  @Test
+  public void importEntryPreProcessorsAreExecuted() {
+    TestImportEntryPreProcessor.enable();
+    try {
+      createdEntry = ImportEntryBuilder.newInstance(TYPE_OF_DATA, JSON_DATA) //
+          .create();
+
+      assertThat("ImportEntryPreProcessor has been executed", createdEntry.getJsonInfo(),
+          is(JSON_DATA_MODIFIED));
+    } finally {
+      TestImportEntryPreProcessor.disable();
+    }
+  }
+
+  /**
    * Before creating an ImportEntry, if ID is provided, builder will check whether this entry exists
    * in ImportEntry table
    */
diff --git a/src-test/src/org/openbravo/test/system/TestImportEntryPreProcessor.java b/src-test/src/org/openbravo/test/system/TestImportEntryPreProcessor.java
new file mode 100644
--- /dev/null
+++ b/src-test/src/org/openbravo/test/system/TestImportEntryPreProcessor.java
@@ -0,0 +1,43 @@
+package org.openbravo.test.system;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.client.kernel.ComponentProvider.Qualifier;
+import org.openbravo.service.importprocess.ImportEntry;
+import org.openbravo.service.importprocess.ImportEntryPreProcessor;
+
+@Qualifier("")
+public class TestImportEntryPreProcessor extends ImportEntryPreProcessor {
+
+  private static final Logger log = LogManager.getLogger();
+  private static boolean isDisabled = true;
+
+  @Override
+  public void beforeCreate(ImportEntry importEntry) {
+    if (isDisabled) {
+      return;
+    }
+    addCustomInformation(importEntry);
+  }
+
+  private void addCustomInformation(ImportEntry importEntry) {
+    try {
+      JSONObject json = new JSONObject(importEntry.getJsonInfo());
+      json.put("preProcessField", "1");
+      importEntry.setJsonInfo(json.toString());
+    } catch (JSONException ex) {
+      log.error("Could not add custom information for import entry {}", importEntry, ex);
+    }
+  }
+
+  public static void disable() {
+    isDisabled = true;
+  }
+
+  public static void enable() {
+    isDisabled = false;
+  }
+
+}