From ce7d6d3db5b0613692b7190dd3be100e51b3c31d Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 23 Nov 2018 12:56:34 +0000 Subject: [PATCH] Code cleanup. --- .../main/java/org/briarproject/bramble/util/OsUtils.java | 2 -- .../bramble/system/UnixSecureRandomProviderTest.java | 5 +++-- .../bramble/system/UnixSecureRandomSpiTest.java | 5 +++-- .../bramble/lifecycle/DesktopLifecycleModule.java | 5 +++-- .../bramble/lifecycle/WindowsShutdownManagerImpl.java | 6 +++--- .../bramble/system/DesktopSecureRandomModule.java | 6 ++++-- .../java/org/briarproject/briar/headless/HeadlessModule.kt | 4 ++-- 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/bramble-api/src/main/java/org/briarproject/bramble/util/OsUtils.java b/bramble-api/src/main/java/org/briarproject/bramble/util/OsUtils.java index bcde55bf0..8821838ef 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/util/OsUtils.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/util/OsUtils.java @@ -10,8 +10,6 @@ public class OsUtils { @Nullable private static final String os = System.getProperty("os.name"); @Nullable - private static final String version = System.getProperty("os.version"); - @Nullable private static final String vendor = System.getProperty("java.vendor"); public static boolean isWindows() { diff --git a/bramble-core/src/test/java/org/briarproject/bramble/system/UnixSecureRandomProviderTest.java b/bramble-core/src/test/java/org/briarproject/bramble/system/UnixSecureRandomProviderTest.java index a200d9a63..c7fd59e14 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/system/UnixSecureRandomProviderTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/system/UnixSecureRandomProviderTest.java @@ -1,7 +1,6 @@ package org.briarproject.bramble.system; import org.briarproject.bramble.test.BrambleTestCase; -import org.briarproject.bramble.util.OsUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -11,6 +10,8 @@ import java.security.Provider; import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory; import static org.briarproject.bramble.test.TestUtils.getTestDirectory; +import static org.briarproject.bramble.util.OsUtils.isLinux; +import static org.briarproject.bramble.util.OsUtils.isMac; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -22,7 +23,7 @@ public class UnixSecureRandomProviderTest extends BrambleTestCase { @Before public void setUp() { - assumeTrue(OsUtils.isLinux() || OsUtils.isMac()); + assumeTrue(isLinux() || isMac()); assertTrue(testDir.mkdirs()); } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/system/UnixSecureRandomSpiTest.java b/bramble-core/src/test/java/org/briarproject/bramble/system/UnixSecureRandomSpiTest.java index b31138bc1..528733a9c 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/system/UnixSecureRandomSpiTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/system/UnixSecureRandomSpiTest.java @@ -4,7 +4,6 @@ import org.briarproject.bramble.api.Bytes; import org.briarproject.bramble.test.BrambleTestCase; import org.briarproject.bramble.test.TestUtils; import org.briarproject.bramble.util.IoUtils; -import org.briarproject.bramble.util.OsUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -17,6 +16,8 @@ import java.util.Set; import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory; import static org.briarproject.bramble.test.TestUtils.getTestDirectory; +import static org.briarproject.bramble.util.OsUtils.isLinux; +import static org.briarproject.bramble.util.OsUtils.isMac; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -32,7 +33,7 @@ public class UnixSecureRandomSpiTest extends BrambleTestCase { @Before public void setUp() { - assumeTrue(OsUtils.isLinux() || OsUtils.isMac()); + assumeTrue(isLinux() || isMac()); assertTrue(testDir.mkdirs()); } diff --git a/bramble-java/src/main/java/org/briarproject/bramble/lifecycle/DesktopLifecycleModule.java b/bramble-java/src/main/java/org/briarproject/bramble/lifecycle/DesktopLifecycleModule.java index de9ca4bdb..30af46e6c 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/lifecycle/DesktopLifecycleModule.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/lifecycle/DesktopLifecycleModule.java @@ -1,20 +1,21 @@ package org.briarproject.bramble.lifecycle; import org.briarproject.bramble.api.lifecycle.ShutdownManager; -import org.briarproject.bramble.util.OsUtils; import javax.inject.Singleton; import dagger.Module; import dagger.Provides; +import static org.briarproject.bramble.util.OsUtils.isWindows; + @Module public class DesktopLifecycleModule extends LifecycleModule { @Provides @Singleton ShutdownManager provideDesktopShutdownManager() { - if (OsUtils.isWindows()) return new WindowsShutdownManagerImpl(); + if (isWindows()) return new WindowsShutdownManagerImpl(); else return new ShutdownManagerImpl(); } } diff --git a/bramble-java/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java b/bramble-java/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java index 2e9a7a2b3..094754ddf 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/lifecycle/WindowsShutdownManagerImpl.java @@ -15,7 +15,6 @@ import com.sun.jna.win32.W32APIFunctionMapper; import com.sun.jna.win32.W32APITypeMapper; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import org.briarproject.bramble.util.OsUtils; import java.util.Collections; import java.util.HashMap; @@ -29,6 +28,7 @@ import static com.sun.jna.Library.OPTION_FUNCTION_MAPPER; import static com.sun.jna.Library.OPTION_TYPE_MAPPER; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; +import static org.briarproject.bramble.util.OsUtils.isWindows; @ThreadSafe @NotNullByDefault @@ -71,7 +71,7 @@ class WindowsShutdownManagerImpl extends ShutdownManagerImpl { // Locking: lock private void initialise() { - if (OsUtils.isWindows()) { + if (isWindows()) { new EventLoop().start(); } else { LOG.warning("Windows shutdown manager used on non-Windows OS"); @@ -111,7 +111,7 @@ class WindowsShutdownManagerImpl extends ShutdownManagerImpl { public void run() { try { // Load user32.dll - User32 user32 = (User32) Native.loadLibrary("user32", + User32 user32 = Native.loadLibrary("user32", User32.class, options); // Create a callback to handle the WM_QUERYENDSESSION message WindowProc proc = (hwnd, msg, wp, lp) -> { diff --git a/bramble-java/src/main/java/org/briarproject/bramble/system/DesktopSecureRandomModule.java b/bramble-java/src/main/java/org/briarproject/bramble/system/DesktopSecureRandomModule.java index 14e093287..47dfe5b0a 100644 --- a/bramble-java/src/main/java/org/briarproject/bramble/system/DesktopSecureRandomModule.java +++ b/bramble-java/src/main/java/org/briarproject/bramble/system/DesktopSecureRandomModule.java @@ -1,20 +1,22 @@ package org.briarproject.bramble.system; import org.briarproject.bramble.api.system.SecureRandomProvider; -import org.briarproject.bramble.util.OsUtils; import javax.inject.Singleton; import dagger.Module; import dagger.Provides; +import static org.briarproject.bramble.util.OsUtils.isLinux; +import static org.briarproject.bramble.util.OsUtils.isMac; + @Module public class DesktopSecureRandomModule { @Provides @Singleton SecureRandomProvider provideSecureRandomProvider() { - if (OsUtils.isLinux() || OsUtils.isMac()) + if (isLinux() || isMac()) return new UnixSecureRandomProvider(); // TODO: Create a secure random provider for Windows throw new UnsupportedOperationException(); diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt index dea73be0f..7bce4d7eb 100644 --- a/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt +++ b/briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt @@ -26,7 +26,7 @@ import org.briarproject.bramble.plugin.tor.CircumventionModule import org.briarproject.bramble.plugin.tor.CircumventionProvider import org.briarproject.bramble.plugin.tor.LinuxTorPluginFactory import org.briarproject.bramble.system.JavaSystemModule -import org.briarproject.bramble.util.OsUtils +import org.briarproject.bramble.util.OsUtils.isLinux import org.briarproject.bramble.util.StringUtils.fromHexString import org.briarproject.briar.headless.blogs.HeadlessBlogModule import org.briarproject.briar.headless.contact.HeadlessContactModule @@ -72,7 +72,7 @@ internal class HeadlessModule(private val appDir: File) { ): PluginConfig { val torDirectory = File(appDir, "tor") val duplex: List - if (OsUtils.isLinux()) { + if (isLinux()) { val tor = LinuxTorPluginFactory( ioExecutor, networkManager, locationUtils, eventBus, torSocketFactory, backoffFactory, resourceProvider, circumventionProvider,