rik/jlibloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Changed Native.get() to cache integration instances.

Browse Source 
- Extracted DefaultSystemInfo out of a couple of separate places.
This commit is contained in:
Adam Murdoch
2012-09-08 10:11:25 +10:00
parent ab1487d215
commit f6ea1d8e33
10 changed files with 90 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/net/rubygrapefruit/platform/Native.java
View File

@@ -5,6 +5,8 @@ import net.rubygrapefruit.platform.internal.Platform;
import net.rubygrapefruit.platform.internal.jni.NativeLibraryFunctions;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
/**
* Provides access to the native integrations. Use {@link #get(Class)} to load a particular integration.
@@ -12,6 +14,7 @@ import java.io.File;
@ThreadSafe
public class Native {
private static boolean loaded;
private static final Map<Class<?>, Object> integrations = new HashMap<Class<?>, Object>();
private Native() {
}
@@ -59,13 +62,19 @@ public class Native {
public static <T extends NativeIntegration> T get(Class<T> type)
throws NativeIntegrationUnavailableException, NativeException {
init(null);
try {
Platform platform = Platform.current();
return platform.get(type);
} catch (NativeException e) {
throw e;
} catch (Throwable t) {
throw new NativeException(String.format("Failed to load native integration %s.", type.getSimpleName()), t);
synchronized (Native.class) {
Object instance = integrations.get(type);
if (instance == null) {
try {
instance = Platform.current().get(type);
} catch (NativeException e) {
throw e;
} catch (Throwable t) {
throw new NativeException(String.format("Failed to load native integration %s.", type.getSimpleName()), t);
}
integrations.put(type, instance);
}
return type.cast(instance);
}
}
}

7
src/main/java/net/rubygrapefruit/platform/internal/AbstractTerminals.java
View File

@@ -4,11 +4,12 @@ import net.rubygrapefruit.platform.Terminal;
import net.rubygrapefruit.platform.Terminals;
public abstract class AbstractTerminals implements Terminals {
private static Output currentlyOpen;
private static AbstractTerminal current;
private final Object lock = new Object();
private Output currentlyOpen;
private AbstractTerminal current;
public Terminal getTerminal(Output output) {
synchronized (AbstractTerminals.class) {
synchronized (lock) {
if (currentlyOpen != null && currentlyOpen != output) {
throw new UnsupportedOperationException("Currently only one output can be used as a terminal.");
}

11
src/main/java/net/rubygrapefruit/platform/internal/DefaultPosixFile.java
View File

@@ -2,7 +2,6 @@ package net.rubygrapefruit.platform.internal;
import net.rubygrapefruit.platform.NativeException;
import net.rubygrapefruit.platform.PosixFile;
import net.rubygrapefruit.platform.internal.jni.NativeLibraryFunctions;
import net.rubygrapefruit.platform.internal.jni.PosixFileFunctions;
import java.io.File;
@@ -12,14 +11,8 @@ public class DefaultPosixFile implements PosixFile {
private final String characterEncoding;
public DefaultPosixFile() {
MutableSystemInfo systemInfo = new MutableSystemInfo();
FunctionResult result = new FunctionResult();
NativeLibraryFunctions.getSystemInfo(systemInfo, result);
if (result.isFailed()) {
throw new NativeException(String.format("Could not fetch system information: %s",
result.getMessage()));
}
this.characterEncoding = systemInfo.characterEncoding;
DefaultSystemInfo systemInfo = new DefaultSystemInfo();
this.characterEncoding = systemInfo.getCharacterEncoding();
}
public void setMode(File file, int perms) {

37
src/main/java/net/rubygrapefruit/platform/internal/DefaultSystemInfo.java Normal file
View File

@@ -0,0 +1,37 @@
package net.rubygrapefruit.platform.internal;
import net.rubygrapefruit.platform.NativeException;
import net.rubygrapefruit.platform.SystemInfo;
import net.rubygrapefruit.platform.internal.jni.NativeLibraryFunctions;
public class DefaultSystemInfo implements SystemInfo {
MutableSystemInfo systemInfo = new MutableSystemInfo();
public DefaultSystemInfo() {
FunctionResult result = new FunctionResult();
NativeLibraryFunctions.getSystemInfo(systemInfo, result);
if (result.isFailed()) {
throw new NativeException(String.format("Could not fetch system information: %s",
result.getMessage()));
}
}
@Override
public String getKernelName() {
return systemInfo.getKernelName();
}
@Override
public String getKernelVersion() {
return systemInfo.getKernelVersion();
}
@Override
public String getMachineArchitecture() {
return systemInfo.getMachineArchitecture();
}
public String getCharacterEncoding() {
return systemInfo.characterEncoding;
}
}

10
src/main/java/net/rubygrapefruit/platform/internal/Platform.java
View File

@@ -2,7 +2,6 @@ package net.rubygrapefruit.platform.internal;
import net.rubygrapefruit.platform.*;
import net.rubygrapefruit.platform.Process;
import net.rubygrapefruit.platform.internal.jni.NativeLibraryFunctions;
public abstract class Platform {
private static Platform platform;
@@ -75,14 +74,7 @@ public abstract class Platform {
return type.cast(new TerminfoTerminals());
}
if (type.equals(SystemInfo.class)) {
MutableSystemInfo systemInfo = new MutableSystemInfo();
FunctionResult result = new FunctionResult();
NativeLibraryFunctions.getSystemInfo(systemInfo, result);
if (result.isFailed()) {
throw new NativeException(String.format("Could not fetch system information: %s",
result.getMessage()));
}
return type.cast(systemInfo);
return type.cast(new DefaultSystemInfo());
}
return super.get(type);
}

5
src/test/groovy/net/rubygrapefruit/platform/FileSystemsTest.groovy
View File

@@ -8,6 +8,11 @@ class FileSystemsTest extends Specification {
@Rule TemporaryFolder tmpDir
final FileSystems fileSystems = Native.get(FileSystems.class)
def "caches file systems instance"() {
expect:
Native.get(FileSystems.class) == fileSystems
}
def "can query filesystem details"() {
expect:
fileSystems.fileSystems.collect() { it.mountPoint }.containsAll(File.listRoots())

5
src/test/groovy/net/rubygrapefruit/platform/PosixFileTest.groovy
View File

@@ -11,6 +11,11 @@ class PosixFileTest extends Specification {
@Rule TemporaryFolder tmpDir
final PosixFile file = Native.get(PosixFile.class)
def "caches file instance"() {
expect:
Native.get(PosixFile.class) == file
}
def "can set mode on a file"() {
def testFile = tmpDir.newFile("test.txt")

5
src/test/groovy/net/rubygrapefruit/platform/ProcessTest.groovy
View File

@@ -8,6 +8,11 @@ class ProcessTest extends Specification {
@Rule TemporaryFolder tmpDir
final Process process = Native.get(Process.class)
def "caches process instance"() {
expect:
Native.get(Process.class) == process
}
def "can get PID"() {
expect:
process.getProcessId() != 0

5
src/test/groovy/net/rubygrapefruit/platform/SystemInfoTest.groovy
View File

@@ -8,6 +8,11 @@ class SystemInfoTest extends Specification {
@Rule TemporaryFolder tmpDir
final SystemInfo systemInfo = Native.get(SystemInfo.class)
def "caches system info instance"() {
expect:
Native.get(SystemInfo.class) == systemInfo
}
def "can query OS details"() {
expect:
systemInfo.kernelName

15
src/test/groovy/net/rubygrapefruit/platform/TerminalsTest.groovy
View File

@@ -8,18 +8,23 @@ import spock.lang.IgnoreIf
class TerminalsTest extends Specification {
@Rule TemporaryFolder tmpDir
final Terminals terminal = Native.get(Terminals.class)
final Terminals terminals = Native.get(Terminals.class)
def "caches terminals instance"() {
expect:
Native.get(Terminals.class) == terminals
}
def "can check if attached to terminal"() {
expect:
!terminal.isTerminal(Terminals.Output.Stdout);
!terminal.isTerminal(Terminals.Output.Stderr);
!terminals.isTerminal(Terminals.Output.Stdout);
!terminals.isTerminal(Terminals.Output.Stderr);
}
@IgnoreIf({Platform.current().windows})
def "cannot access posix terminal from a test"() {
when:
terminal.getTerminal(Terminals.Output.Stdout)
terminals.getTerminal(Terminals.Output.Stdout)
then:
NativeException e = thrown()
@@ -29,7 +34,7 @@ class TerminalsTest extends Specification {
@IgnoreIf({!Platform.current().windows})
def "cannot access windows console from a test"() {
when:
terminal.getTerminal(Terminals.Output.Stdout)
terminals.getTerminal(Terminals.Output.Stdout)
then:
NativeException e = thrown()