fiftyone-devicedetection-onpremise 4.5.0a40__tar.gz → 4.5.0a44__tar.gz

{fiftyone_devicedetection_onpremise-4.5.0a40 → fiftyone_devicedetection_onpremise-4.5.0a44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiftyone_devicedetection_onpremise
-Version: 4.5.0a40
+Version: 4.5.0a44
 Summary: This project contains 51Degrees Device Detection OnPremise engine that can be used with the 51Degrees Pipeline API. The Pipeline is a generic web request intelligence and data processing solution with the ability to add a range of 51Degrees and/or custom plug ins (Engines)
 Author: 51Degrees Engineering
 Author-email: engineering@51degrees.com

{fiftyone_devicedetection_onpremise-4.5.0a40 → fiftyone_devicedetection_onpremise-4.5.0a44}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/IpAddress.i

@@ -1,9 +1,16 @@
-%include "common-cxx/ip.i"
+%include "ip.i"
 
 %nodefaultctor IpAddress;
 
 %rename (IpAddressSwig) IpAddress;
 
+#ifdef SWIGJAVA
+%include "JavaTypes.i"
+
+%apply (unsigned char *UCHAR, fiftyoneDegreesIpType type) {(unsigned char ipAddress[], fiftyoneDegreesIpType type)}
+%apply (unsigned char *UCHAR, uint32_t UINT32) {(unsigned char copy[], uint32_t size)}
+#endif
+
 class IpAddress {
 public:
     IpAddress(const unsigned char ipAddress[], fiftyoneDegreesIpType type);

{fiftyone_devicedetection_onpremise-4.5.0a40 → fiftyone_devicedetection_onpremise-4.5.0a44}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/JavaTypes.i

@@ -25,17 +25,15 @@
 %include std_string.i
 %include various.i
 
-%typemap(jni) (unsigned char *UCHAR, long LONG) "jbyteArray"
-%typemap(jtype) (unsigned char *UCHAR, long LONG) "byte[]"
-%typemap(jstype) (unsigned char *UCHAR, long LONG) "byte[]"
-%typemap(in) (unsigned char *UCHAR, long LONG) {
+%define JAVA_UBYTE_ARR_TYPEMAP_BODY
+    long arrSize = 0;
 	if ($input != NULL) {
 	    // Get the number of bytes in the byte array.
-		$2 = jenv->GetArrayLength($input);
+		arrSize = jenv->GetArrayLength($input);
 		// Allocate memory for the destination byte array used internally by
 		// the data set. This memory is required for the lifetime of the data
 		// set.
-		$1 = (unsigned char*)malloc($2);
+		$1 = (unsigned char*)malloc(arrSize);
 		if ($1 == NULL) {
 		    SWIG_JavaThrowException(
 		        jenv,
@@ -54,22 +52,55 @@
 		}
         // Copy the input byte array to the destination and release the
         // reference to source pointer.
-        memcpy($1, data, $2);
+        memcpy($1, data, arrSize);
         jenv->ReleaseByteArrayElements($input, data, JNI_ABORT);
 	}
 	else {
 	    // Let the underlying C implementation throw the null pointer exception.
 		$1 = (unsigned char*)NULL;
-		$2 = 0;
 	}
+%enddef
+
+
+%typemap(jni) (unsigned char *UCHAR) "jbyteArray"
+%typemap(jtype) (unsigned char *UCHAR) "byte[]"
+%typemap(jstype) (unsigned char *UCHAR) "byte[]"
+%typemap(in) (unsigned char *UCHAR) {
+    JAVA_UBYTE_ARR_TYPEMAP_BODY
 }
 
-%typemap(javain) (unsigned char *UCHAR, long LONG) "$javainput"
+%typemap(javain) (unsigned char *UCHAR) "$javainput"
 
 /* Prevent default freearg typemap from being used */
-%typemap(freearg) (unsigned char *UCHAR, long LONG) ""
+%typemap(freearg) (unsigned char *UCHAR) ""
+
+%apply (unsigned char *UCHAR) { (unsigned char data[]) };
+%apply (unsigned char *UCHAR) { (unsigned char ipAddress[]) };
+
+
+%define JAVA_UBYTE_ARR_DECL(CTYPE, CTYPEVAR)
+%typemap(jni) (unsigned char *UCHAR, CTYPE CTYPEVAR) "jbyteArray"
+%typemap(jtype) (unsigned char *UCHAR, CTYPE CTYPEVAR) "byte[]"
+%typemap(jstype) (unsigned char *UCHAR, CTYPE CTYPEVAR) "byte[]"
+%typemap(in) (unsigned char *UCHAR, CTYPE CTYPEVAR) {
+    JAVA_UBYTE_ARR_TYPEMAP_BODY
+    $2 = arrSize;
+}
+
+%typemap(javain) (unsigned char *UCHAR, CTYPE CTYPEVAR) "$javainput"
+
+/* Prevent default freearg typemap from being used */
+%typemap(freearg) (unsigned char *UCHAR, CTYPE CTYPEVAR) ""
+
+%apply (unsigned char *UCHAR, CTYPE CTYPEVAR) { (unsigned char data[], CTYPE length) };
+%apply (unsigned char *UCHAR, CTYPE CTYPEVAR) { (unsigned char ipAddress[], CTYPE length) };
+%enddef
+
+
+JAVA_UBYTE_ARR_DECL(long, LONG)
+JAVA_UBYTE_ARR_DECL(uint32_t, UINT32)
+
 
-%apply (unsigned char *UCHAR, long LONG) { (unsigned char data[], long length) };
 
 /* Use byte correctly where methods would otherwise not take a proper type. */
 %typemap(jni) (unsigned char UCHAR) "int"

{fiftyone_devicedetection_onpremise-4.5.0a40 → fiftyone_devicedetection_onpremise-4.5.0a44}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/indices.c

@@ -30,7 +30,7 @@ typedef struct map_t {
 } map;
 
 // Gets the index of the profile id in the property profile index.
-static uint32_t getProfileIndex(
+static uint32_t getProfileIdIndex(
 	IndicesPropertyProfile* index, 
 	uint32_t profileId) {
 	return profileId - index->minProfileId;
@@ -51,7 +51,7 @@ static void addProfileValuesMethod(
 	DataReset(&valueItem.data);
 	
 	uint32_t* first = (uint32_t*)(profile + 1); // First value for the profile
-	uint32_t base = getProfileIndex(index, profile->profileId) * 
+	uint32_t base = getProfileIdIndex(index, profile->profileId) * 
 		index->availablePropertyCount;
 
 	// For each of the values associated with the profile check to see if it
@@ -256,7 +256,7 @@ uint32_t fiftyoneDegreesIndicesPropertyProfileLookup(
 	uint32_t profileId,
 	uint32_t availablePropertyIndex) {
 	uint32_t valueIndex = 
-		(getProfileIndex(index, profileId) * index->availablePropertyCount) + 
+		(getProfileIdIndex(index, profileId) * index->availablePropertyCount) + 
 		availablePropertyIndex;
 	assert(valueIndex < index->size);
 	return index->valueIndexes[valueIndex];

{fiftyone_devicedetection_onpremise-4.5.0a40 → fiftyone_devicedetection_onpremise-4.5.0a44}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/ip.h

@@ -56,7 +56,7 @@
 /**
  * Enum indicating the type of IP address.
  */
-typedef enum e_fiftyone_degrees_ip_evidence_type {
+typedef enum e_fiftyone_degrees_ip_type {
 	FIFTYONE_DEGREES_IP_TYPE_INVALID = 0, /**< Invalid IP address */
 	FIFTYONE_DEGREES_IP_TYPE_IPV4 = 4, /**< An IPv4 address */
 	FIFTYONE_DEGREES_IP_TYPE_IPV6 = 6, /**< An IPv6 address */

{fiftyone_devicedetection_onpremise-4.5.0a40 → fiftyone_devicedetection_onpremise-4.5.0a44}/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/stringBuilder.c

@@ -214,8 +214,6 @@ StringBuilder* fiftyoneDegreesStringBuilderAddDouble(
 	return builder;
 }
 
-#undef MAX_DOUBLE_DECIMAL_PLACES
-
 fiftyoneDegreesStringBuilder* fiftyoneDegreesStringBuilderAddChars(
 	fiftyoneDegreesStringBuilder* builder,
 	const char * const value,

fiftyone_devicedetection_onpremise-4.5.0a44/src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/tests/TestUtils_Pointers.hpp

@@ -0,0 +1,59 @@
+/* *********************************************************************
+* This Original Work is copyright of 51 Degrees Mobile Experts Limited.
+ * Copyright 2023 51 Degrees Mobile Experts Limited, Davidson House,
+ * Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
+ *
+ * This Original Work is licensed under the European Union Public Licence
+ * (EUPL) v.1.2 and is subject to its terms as set out below.
+ *
+ * If a copy of the EUPL was not distributed with this file, You can obtain
+ * one at https://opensource.org/licenses/EUPL-1.2.
+ *
+ * The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
+ * amended by the European Commission) shall be deemed incompatible for
+ * the purposes of the Work and the provisions of the compatibility
+ * clause in Article 5 of the EUPL shall not apply.
+ *
+ * If using the Work as, or as part of, a network application, by
+ * including the attribution notice(s) required under Article 5 of the EUPL
+ * in the end user terms of the application under an appropriate heading,
+ * such notice(s) shall fulfill the requirements of that article.
+ * ********************************************************************* */
+
+#ifndef TESTUTILS_POINTERS_HPP
+#define TESTUTILS_POINTERS_HPP
+
+#include "../fiftyone.h"
+#include <memory>
+
+static void freeCollection(fiftyoneDegreesCollection * const ptr) {
+    if (ptr) {
+        ptr->freeCollection(ptr);
+    }
+}
+using CollectionPtr = std::unique_ptr<fiftyoneDegreesCollection, decltype(&freeCollection)>;
+
+
+static void releaseItem(Item * const item) {
+    if (item) {
+        COLLECTION_RELEASE(item->collection, item);
+    }
+}
+using ItemPtr = std::unique_ptr<Item, decltype(&releaseItem)>;
+
+class ItemBox {
+    Item item = {};
+public:
+    ItemBox() {
+        DataReset(&item.data);
+    }
+    ~ItemBox() {
+        if (item.collection) {
+            COLLECTION_RELEASE(item.collection, &item);
+        }
+    }
+    Item *operator*() { return &item; }
+    Item *operator->() { return &item; }
+};
+
+#endif //TESTUTILS_POINTERS_HPP

{fiftyone_devicedetection_onpremise-4.5.0a40 → fiftyone_devicedetection_onpremise-4.5.0a44}/src/fiftyone_devicedetection_onpremise.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiftyone-devicedetection-onpremise
-Version: 4.5.0a40
+Version: 4.5.0a44
 Summary: This project contains 51Degrees Device Detection OnPremise engine that can be used with the 51Degrees Pipeline API. The Pipeline is a generic web request intelligence and data processing solution with the ability to add a range of 51Degrees and/or custom plug ins (Engines)
 Author: 51Degrees Engineering
 Author-email: engineering@51degrees.com

{fiftyone_devicedetection_onpremise-4.5.0a40 → fiftyone_devicedetection_onpremise-4.5.0a44}/src/fiftyone_devicedetection_onpremise.egg-info/SOURCES.txt

@@ -186,6 +186,7 @@ src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/tests/FixedSizeCollect
 src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/tests/HeadersContainer.hpp
 src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/tests/StringCollection.hpp
 src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/tests/TestStrings.hpp
+src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/tests/TestUtils_Pointers.hpp
 src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/tests/VariableSizeCollection.hpp
 src/fiftyone_devicedetection_onpremise/cxx/src/common-cxx/tests/pch.h
 src/fiftyone_devicedetection_onpremise/cxx/src/hash/ComponentMetaDataBuilderHash.cpp

fiftyone_devicedetection_onpremise-4.5.0a44/version.txt

@@ -0,0 +1 @@
+4.5.0-alpha.44

fiftyone_devicedetection_onpremise-4.5.0a40/version.txt

@@ -1 +0,0 @@
-4.5.0-alpha.40