Add deferred loader

m3m0r7 · m3m0r7 · commit c4458849d9ac · 2019-04-06T19:30:10.000+09:00
diff --git a/README.md b/README.md
@@ -276,7 +276,7 @@ $javaClass = new JavaClass(
 | entrypoint | ?string | null | Specify to run entrypoint in JAR.  | JavaArchive |
 | max_stack_exceeded | integer | 9999 | Execute more than the specified number of times be stopped the operation. | JavaClass | 
 | strict | boolean | true | If strict mode is `true` then execute method, variables and so on with strict. But if strict mode is `false` then execute ambiguously method, variable and etc in PHPJava. | Both |
-| preload | boolean | false | preload is pre-read JavaClass in emulating JAR. This may be a lot of consuming memories by large JAR file. but if this is false then to use deffer loading. | JavaArchive |
+| preload | boolean | false | preload is pre-read JavaClass in emulating JAR. This may be a lot of consuming memories by large JAR file. but if this is false then to use defer loading. | JavaArchive |
 | validation.method.arguments_count_only | boolean | false | If this mode `true` then ClassResolver validate arguments size only. | JavaClass |
 | operations.enable_trace | boolean | true | Store operations history into memory if this is enabled. | JavaClass |
 | operations.temporary_code_stream | string | php://memory | TBD | JavaClass |
diff --git a/src/Core/JavaArchive.php b/src/Core/JavaArchive.php
@@ -1,6 +1,7 @@
 <?php
 namespace PHPJava\Core;
 
+use PHPJava\Core\JVM\Parameters\GlobalOptions;
 use PHPJava\Core\JVM\Parameters\Runtime;
 use PHPJava\Exceptions\UndefinedEntrypointException;
 use PHPJava\Imitation\java\io\FileNotFoundException;
@@ -93,7 +94,17 @@ function ($fileName) {
             if (in_array($className, static::IGNORE_FILES)) {
                 continue;
             }
-            $this->classes[str_replace('/', '.', $className)] = new JavaClass(
+            $classPath = str_replace('/', '.', $className);
+            if (!($this->options['preload'] ?? GlobalOptions::get('preload') ?? Runtime::PRELOAD)) {
+                $this->classes[$classPath] = new JavaClassDeferredLoader(
+                    JavaClassInlineReader::class,
+                    [$className, $code],
+                    $this->options
+                );
+                continue;
+            }
+
+            $this->classes[$classPath] = new JavaClass(
                 new JavaClassInlineReader(
                     $className,
                     $code
@@ -194,7 +205,7 @@ public function getClasses(): array
         return $this->classes;
     }
 
-    public function getClassByName(string $name): JavaClass
+    public function getClassByName(string $name): JavaClassInterface
     {
         if (!isset($this->classes[$name])) {
             throw new ClassNotFoundException(str_replace('/', '.', $name) . ' does not found on ' . $this->jarFile . '.');
diff --git a/src/Core/JavaClass.php b/src/Core/JavaClass.php
@@ -16,7 +16,7 @@
 use PHPJava\Utilities\DebugTool;
 use PHPJava\Utilities\Formatter;
 
-class JavaClass
+class JavaClass implements JavaClassInterface
 {
     use \PHPJava\Kernel\Core\ConstantPool;
 
diff --git a/src/Core/JavaClassDeferredLoader.php b/src/Core/JavaClassDeferredLoader.php
@@ -0,0 +1,35 @@
+<?php
+namespace PHPJava\Core;
+
+class JavaClassDeferredLoader implements JavaClassInterface
+{
+
+    private $deferLoadingReaderClass;
+    private $arguments = [];
+    private $options = [];
+    private $javaClass;
+
+    public function __construct(
+        string $deferLoadingReaderClass,
+        array $arguments = [],
+        array $options = []
+    ) {
+        $this->deferLoadingReaderClass = $deferLoadingReaderClass;
+        $this->arguments = $arguments;
+        $this->options = $options;
+    }
+
+    public function __call($name, $arguments)
+    {
+        $this->initializeIfNotInitiated();
+        return $this->javaClass->{$name}(...$arguments);
+    }
+
+    private function initializeIfNotInitiated()
+    {
+        $this->javaClass = new JavaClass(
+            new $this->deferLoadingReaderClass(...$this->arguments),
+            $this->options
+        );
+    }
+}
diff --git a/src/Core/JavaClassInterface.php b/src/Core/JavaClassInterface.php
@@ -0,0 +1,6 @@
+<?php
+namespace PHPJava\Core;
+
+interface JavaClassInterface
+{
+}

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use PHPJava\Utilities\DebugTool;`
`17`	`17`	`use PHPJava\Utilities\Formatter;`
`18`	`18`
`19`		`-class JavaClass`
	`19`	`+class JavaClass implements JavaClassInterface`
`20`	`20`	`{`
`21`	`21`	`use \PHPJava\Kernel\Core\ConstantPool;`
`22`	`22`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +<?php
 +namespace PHPJava\Core;
++
 +interface JavaClassInterface
 +{
 +}