Fix the FETPAPI DLL name to load in Java example

Author: philippeVerney

cmake/FetpapiClientUsingFesapi.java

@@ -16,7 +16,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 specific language governing permissions and limitations
 under the License.
 -----------------------------------------------------------------------*/
-package com.f2i_consulting.fetpapi.client;
+package com.f2i_consulting.example;
 
 import java.util.Optional;
 import java.util.UUID;

cmake/swigEtp1_2Include.i.in

@@ -300,6 +300,7 @@ typedef long long 				time_t;
 
 %typemap(javaimports) SWIGTYPE %{
 	import com.f2i_consulting.fetpapi.*;
+import com.f2i_consulting.fetpapi.*;
 %}
 
 namespace Energistics {
@@ -2134,7 +2135,7 @@ namespace ETP_NS
 		bool validateUri(const std::string& uri);
 
 		/**
-		* @Validate an ETP dataobject URI
+		* Validate an ETP dataobject URI
 		*/
 		bool validateDataObjectUri(const std::string& uri);
 	}
@@ -2217,7 +2218,7 @@ namespace ETP_NS
 
 #ifdef WITH_FESAPI
 %typemap(javaimports) FesapiHdfProxyFactory %{
-	import com.f2i_consulting.fesapi.common.HdfProxyFactory;
+import com.f2i_consulting.fesapi.common.HdfProxyFactory;
 %}
 %typemap(csimports) FesapiHdfProxyFactory %{
 	using F2iConsulting.Fesapi.common;

java/CMakeLists.txt

@@ -20,9 +20,9 @@ file (REMOVE_RECURSE ${CMAKE_SOURCE_DIR}/java/src/com/f2i_consulting/fetpapi/etp
 # The assembly name is used to load the debug vs release FETPAPI library in the Java example
 if (WIN32)
 	if (SWIG_LINKED_TO_RELEASE)
-		set (ASSEMBLY_NAME ${PROJECT_NAME}${CMAKE_RELEASE_POSTFIX}.${Fetpapi_VERSION})
+		set (ASSEMBLY_NAME ${PROJECT_NAME}${CMAKE_RELEASE_POSTFIX}-${Fetpapi_VERSION_MAJOR}.${Fetpapi_VERSION_MINOR})
 	else (SWIG_LINKED_TO_RELEASE)
-		set (ASSEMBLY_NAME ${PROJECT_NAME}${CMAKE_DEBUG_POSTFIX}.${Fetpapi_VERSION})
+		set (ASSEMBLY_NAME ${PROJECT_NAME}${CMAKE_DEBUG_POSTFIX}-${Fetpapi_VERSION_MAJOR}.${Fetpapi_VERSION_MINOR})
 	endif (SWIG_LINKED_TO_RELEASE)
 else (WIN32)
 	if (SWIG_LINKED_TO_RELEASE)

src/etp/EtpHelpers.h

@@ -65,7 +65,7 @@ namespace ETP_NS
 		FETPAPI_DLL_IMPORT_OR_EXPORT bool validateUri(const std::string& uri);
 
 		/**
-		* @Validate an ETP dataobject URI
+		* Validate an ETP dataobject URI
 		*/
 		FETPAPI_DLL_IMPORT_OR_EXPORT bool validateDataObjectUri(const std::string& uri);
 

src/etp/fesapi/FesapiHdfProxy.cpp

@@ -333,16 +333,19 @@ void FesapiHdfProxy::writeArrayNdSlab(
 
 	auto t_start = std::chrono::high_resolution_clock::now();
 	while (!stillProcessingMsgIds.empty()) {
+		std::vector<int64_t> idsToErase;
 		for (int64_t msgId : stillProcessingMsgIds) {
 			if (!session_->isMessageStillProcessing(msgId)) {
-				stillProcessingMsgIds.erase(msgId);
+				idsToErase.push_back(msgId);
 			}
 		}
+		for (int64_t msgId : idsToErase) {
+			stillProcessingMsgIds.erase(msgId);
+		}
 		if (std::chrono::duration<double, std::milli>(std::chrono::high_resolution_clock::now() - t_start).count() > session_->getTimeOut()) {
 			throw std::runtime_error("Time out waiting for a writeArrayNdSlab response");
 		}
 	}
-	std::cerr << "writeArrayNdSlab Response got in " << std::chrono::duration<double, std::milli>(std::chrono::high_resolution_clock::now() - t_start).count() << " ms" << std::endl;
 }
 
 std::set<int64_t> FesapiHdfProxy::async_writeArrayNdSlab(

src/etp/fesapi/FesapiHdfProxy.h

@@ -37,7 +37,7 @@ namespace ETP_NS
 		*/
 		FesapiHdfProxy(AbstractSession* session, COMMON_NS::DataObjectRepository * repo, const std::string & guid, const std::string & title, const std::string & packageDirAbsolutePath, const std::string & externalFilePath, COMMON_NS::DataObjectRepository::openingMode hdfPermissionAccess) :
 			EML2_NS::AbstractHdfProxy(packageDirAbsolutePath, externalFilePath, hdfPermissionAccess), session_(session), compressionLevel(0) {
-			xmlNs_ = repo->getDefaultEmlVersion() == COMMON_NS::DataObjectRepository::EnergisticsStandard::EML2_0 ? "eml20" : "eml23";
+			xmlNs_ = repo->getDefaultEmlVersion() == COMMON_NS::DataObjectRepository::EnergisticsStandard::EML2_3 ? "eml23" : "eml20";
 			initGsoapProxy(repo, guid, title, 20);
 		}