Remove further deprecated methods

- com.sun.jna.Platform#isAix - com.sun.jna.platform.win32.Ole32#CoCreateGuid(GUID.ByReference pguid) - com.sun.jna.platform.win32.Ole32#CLSIDFromString(WString lpsz, CLSID.ByReference pclsid)
java-native-access · Jul 13, 2018 · 6481112 · 6481112
1 parent 5c346ce
commit 6481112
Show file tree

Hide file tree

Showing 37 changed files with 16 additions and 49 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,4 +28,5 @@ pom-jna-platform.xml.asc
 .idea
 *.iml
 /contrib/platform/${build.generated.sources.dir}/
-/contrib/platform/${build}/
+/contrib/platform/${build}/
+/contrib/platform/nbproject/private/
diff --git a/CHANGES.md b/CHANGES.md
@@ -75,6 +75,7 @@ Breaking Changes
 * the parameters of the methods `gethostname`, `sethostname`, `getdomainname` 
    and `setdomainname` in the interface `com.sun.jna.platform.unix.LibCAPI`
   were changed from `(char[] name, int len)` to `(byte[] name, int len)`
+* `com.sun.jna.Platform#isAix` was replaced by `com.sun.jna.Platform#isAIX`
 * `com.sun.jna.platform.win32.Sspi.SecBufferDesc` was incompatibly changed to 
   match the correct native semantics. SecBufferDesc describing more than one
   buffer were broken. For most usecases 
@@ -110,6 +111,10 @@ Breaking Changes
    consequence `com.sun.jna.platform.win32.Advapi32Util#getFileSecurity` was
    changed similarly. The SID accessors `getSidString` and `getSID` were moved
    from `ACEStructure` to `ACCESS_ACEStructure`.
+* `com.sun.jna.platform.win32.Ole32#CoCreateGuid(GUID.ByReference pguid)` was replaced by
+  `com.sun.jna.platform.win32.Ole32#CoCreateGuid(GUID pguid)` and 
+  `com.sun.jna.platform.win32.Ole32#CLSIDFromString(WString lpsz, CLSID.ByReference pclsid)` was replaced by
+  `com.sun.jna.platform.win32.Ole32#CLSIDFromString(String lpsz, CLSID.ByReference pclsid)`
 
 Release 4.5.0
 =============

diff --git a/build.xml b/build.xml
@@ -67,12 +67,12 @@
   </condition>
   <property name="jna.version" value="${jna.major}.${jna.minor}.${jna.revision}${version.suffix}"/>
   <!-- jnidispatch library release version -->
-  <property name="jni.major" value="5"/>
-  <property name="jni.minor" value="2"/>
-  <property name="jni.revision" value="1"/>
+  <property name="jni.major" value="6"/>
+  <property name="jni.minor" value="0"/>
+  <property name="jni.revision" value="0"/>
   <property name="jni.build" value="0"/> <!--${build.number}-->
   <property name="jni.version" value="${jni.major}.${jni.minor}.${jni.revision}"/>
-  <property name="jni.md5" value="74e8f8e397c43487738c5c1f1363498b"/>
+  <property name="jni.md5" value="147a998f0cbc89681a1ae6c0dd121629"/>
   <property name="spec.title" value="Java Native Access (JNA)"/>
   <property name="spec.vendor" value="${vendor}"/>
   <property name="spec.version" value="${jna.major}"/>

diff --git a/contrib/platform/src/com/sun/jna/platform/win32/COM/TypeLibUtil.java b/contrib/platform/src/com/sun/jna/platform/win32/COM/TypeLibUtil.java
@@ -25,7 +25,6 @@
 
 import com.sun.jna.Native;
 import com.sun.jna.Pointer;
-import com.sun.jna.WString;
 import com.sun.jna.platform.win32.Guid.CLSID;
 import com.sun.jna.platform.win32.Kernel32;
 import com.sun.jna.platform.win32.OaIdl.MEMBERID;
@@ -87,8 +86,7 @@ public class TypeLibUtil {
     public TypeLibUtil(String clsidStr, int wVerMajor, int wVerMinor) {
         CLSID.ByReference clsid = new CLSID.ByReference();
         // get CLSID from string
-        HRESULT hr = Ole32.INSTANCE.CLSIDFromString(new WString(clsidStr),
-                clsid);
+        HRESULT hr = Ole32.INSTANCE.CLSIDFromString(clsidStr, clsid);
         COMUtils.checkRC(hr);
 
         // load typelib

diff --git a/contrib/platform/src/com/sun/jna/platform/win32/Ole32.java b/contrib/platform/src/com/sun/jna/platform/win32/Ole32.java
@@ -25,7 +25,6 @@
 
 import com.sun.jna.Native;
 import com.sun.jna.Pointer;
-import com.sun.jna.WString;
 import com.sun.jna.platform.win32.Guid.CLSID;
 import com.sun.jna.platform.win32.Guid.GUID;
 import com.sun.jna.platform.win32.WinDef.DWORD;
@@ -56,13 +55,6 @@ public interface Ole32 extends StdCallLibrary {
      */
     HRESULT CoCreateGuid(GUID pguid);
 
-    /**
-     * @deprecated use {@link #CoCreateGuid(Guid.GUID)}.
-     * @param pguid GUID reference
-     * @return result
-     */
-    HRESULT CoCreateGuid(GUID.ByReference pguid);
-
     /**
      * Converts a globally unique identifier (GUID) into a string of printable
      * characters.
@@ -228,8 +220,6 @@ HRESULT CoCreateInstance(GUID rclsid, Pointer pUnkOuter, int dwClsContext,
      *         REGDB_E_READREGDB The registry could not be opened for reading.
      */
     HRESULT CLSIDFromString(String lpsz, CLSID.ByReference pclsid);
-    /** @deprecated use the String version */
-    HRESULT CLSIDFromString(WString lpsz, CLSID.ByReference pclsid);
 
 	/**
 	 * Allocates a block of task memory in the same way that IMalloc::Alloc does. CoTaskMemAlloc uses the default

diff --git a/contrib/platform/test/com/sun/jna/platform/win32/COM/ITypeLibTest.java b/contrib/platform/test/com/sun/jna/platform/win32/COM/ITypeLibTest.java
@@ -26,7 +26,6 @@
 import com.sun.jna.platform.win32.Ole32;
 import com.sun.jna.platform.win32.OleAuto;
 import com.sun.jna.platform.win32.WTypes;
-import com.sun.jna.platform.win32.WTypes.BSTR;
 import com.sun.jna.platform.win32.WinDef;
 import com.sun.jna.platform.win32.WinDef.LCID;
 import com.sun.jna.platform.win32.WinDef.UINT;
@@ -59,7 +58,7 @@ public ITypeLibTest() {
     private ITypeLib loadShellTypeLib() {
         CLSID.ByReference clsid = new CLSID.ByReference();
         // get CLSID from string
-        HRESULT hr = Ole32.INSTANCE.CLSIDFromString(new WString(SHELL_CLSID), clsid);
+        HRESULT hr = Ole32.INSTANCE.CLSIDFromString(SHELL_CLSID, clsid);
         assertTrue(COMUtils.SUCCEEDED(hr));
 
         // get user default lcid

diff --git a/contrib/platform/test/com/sun/jna/platform/win32/OleAutoTest.java b/contrib/platform/test/com/sun/jna/platform/win32/OleAutoTest.java
@@ -14,7 +14,6 @@
 
 import junit.framework.TestCase;
 
-import com.sun.jna.WString;
 import com.sun.jna.platform.win32.Guid.CLSID;
 import com.sun.jna.platform.win32.WTypes.BSTR;
 import com.sun.jna.platform.win32.WinDef.LCID;
@@ -50,8 +49,8 @@ public void testSysFreeString() {
     public void testLoadRegTypeLib() {
         CLSID.ByReference clsid = new CLSID.ByReference();
         // get CLSID from string, Microsoft Scripting Engine
-        HRESULT hr = Ole32.INSTANCE.CLSIDFromString(new WString(
-                "{420B2830-E718-11CF-893D-00A0C9054228}"), clsid);
+        HRESULT hr = Ole32.INSTANCE.CLSIDFromString(
+                "{420B2830-E718-11CF-893D-00A0C9054228}", clsid);
         COMUtils.checkRC(hr);
         assertEquals(0, hr.intValue());
 

diff --git a/lib/native/android-aarch64.jar b/lib/native/android-aarch64.jar
diff --git a/lib/native/android-arm.jar b/lib/native/android-arm.jar
diff --git a/lib/native/android-armv7.jar b/lib/native/android-armv7.jar
diff --git a/lib/native/android-mips.jar b/lib/native/android-mips.jar
diff --git a/lib/native/android-mips64.jar b/lib/native/android-mips64.jar
diff --git a/lib/native/android-x86-64.jar b/lib/native/android-x86-64.jar
diff --git a/lib/native/android-x86.jar b/lib/native/android-x86.jar
diff --git a/lib/native/darwin.jar b/lib/native/darwin.jar
diff --git a/lib/native/freebsd-x86-64.jar b/lib/native/freebsd-x86-64.jar
diff --git a/lib/native/freebsd-x86.jar b/lib/native/freebsd-x86.jar
diff --git a/lib/native/linux-aarch64.jar b/lib/native/linux-aarch64.jar
diff --git a/lib/native/linux-arm.jar b/lib/native/linux-arm.jar
diff --git a/lib/native/linux-armel.jar b/lib/native/linux-armel.jar
diff --git a/lib/native/linux-mips64el.jar b/lib/native/linux-mips64el.jar
diff --git a/lib/native/linux-ppc.jar b/lib/native/linux-ppc.jar
diff --git a/lib/native/linux-ppc64le.jar b/lib/native/linux-ppc64le.jar
diff --git a/lib/native/linux-s390x.jar b/lib/native/linux-s390x.jar
diff --git a/lib/native/linux-x86.jar b/lib/native/linux-x86.jar
diff --git a/lib/native/openbsd-x86-64.jar b/lib/native/openbsd-x86-64.jar
diff --git a/lib/native/openbsd-x86.jar b/lib/native/openbsd-x86.jar
diff --git a/lib/native/sunos-sparc.jar b/lib/native/sunos-sparc.jar
diff --git a/lib/native/sunos-sparcv9.jar b/lib/native/sunos-sparcv9.jar
diff --git a/lib/native/sunos-x86-64.jar b/lib/native/sunos-x86-64.jar
diff --git a/lib/native/sunos-x86.jar b/lib/native/sunos-x86.jar
diff --git a/lib/native/win32-x86-64.jar b/lib/native/win32-x86-64.jar
diff --git a/lib/native/win32-x86.jar b/lib/native/win32-x86.jar
diff --git a/native/dispatch.c b/native/dispatch.c
@@ -2522,21 +2522,6 @@ JNIEXPORT jlong JNICALL Java_com_sun_jna_Native__1getPointer
     return A2L(ptr);
 }
 
-/*
- * Class:     com_sun_jna_Native
- * Method:    getDirectByteBuffer
- * Signature: (JJ)Ljava/nio/ByteBuffer;
- */
-JNIEXPORT jobject JNICALL Java_com_sun_jna_Native_getDirectByteBuffer__JJ
-    (JNIEnv *env, jclass UNUSED(cls), jlong addr, jlong length)
-{
-#ifdef NO_NIO_BUFFERS
-    return NULL;
-#else
-    return (*env)->NewDirectByteBuffer(env, L2A(addr), length);
-#endif
-}
-
 /*
  * Class:     com_sun_jna_Native
  * Method:    getDirectByteBuffer

diff --git a/src/com/sun/jna/Native.java b/src/com/sun/jna/Native.java
@@ -2260,12 +2260,6 @@ static String getString(Pointer pointer, long offset, String encoding) {
      */
     public static native void free(long ptr);
 
-    /**
-     * @deprecated retained to keep native signature
-     */
-    @Deprecated
-    private static native ByteBuffer getDirectByteBuffer(long addr, long length);
-
     private static final ThreadLocal<Memory> nativeThreadTerminationFlag =
         new ThreadLocal<Memory>() {
             @Override

diff --git a/src/com/sun/jna/Platform.java b/src/com/sun/jna/Platform.java
@@ -149,10 +149,6 @@ public static final boolean isLinux() {
     public static final boolean isAIX() {
         return osType == AIX;
     }
-    /** @deprecated */
-    public static final boolean isAix() {
-        return isAIX();
-    }
     public static final boolean isWindowsCE() {
         return osType == WINDOWSCE;
     }

diff --git a/src/com/sun/jna/Version.java b/src/com/sun/jna/Version.java
@@ -24,5 +24,5 @@
 package com.sun.jna;
 interface Version {
     String VERSION = "5.0.0-SNAPSHOT";
-    String VERSION_NATIVE = "5.2.1";
+    String VERSION_NATIVE = "6.0.0";
 }