Merge branch 'HTTP-RPC:master' into master

Author: lawson89

sierra-tools/dtd-encoder/build.gradle

@@ -20,7 +20,6 @@ dependencies {
     implementation project(':sierra')
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
-    testImplementation 'org.jfree:jfreechart:1.5.6'
 
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
@@ -30,5 +29,5 @@ tasks.named('test', Test) {
 }
 
 application {
-    mainClass = 'org.httprpc.sierra.tools.DTDEncoder'
+    mainClass = 'org.httprpc.sierra.tools.dtd.DTDEncoder'
 }

…org/httprpc/sierra/tools/DTDEncoder.java …httprpc/sierra/tools/dtd/DTDEncoder.javasierra-tools/dtd-encoder/src/main/java/org/httprpc/sierra/tools/DTDEncoder.java renamed to sierra-tools/dtd-encoder/src/main/java/org/httprpc/sierra/tools/dtd/DTDEncoder.java sierra-tools/dtd-encoder/src/main/java/org/httprpc/sierra/tools/DTDEncoder.java renamed to sierra-tools/dtd-encoder/src/main/java/org/httprpc/sierra/tools/dtd/DTDEncoder.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.httprpc.sierra.tools;
+package org.httprpc.sierra.tools.dtd;
 
 import org.httprpc.kilo.beans.BeanAdapter;
 import org.httprpc.kilo.io.Encoder;
@@ -37,6 +37,8 @@
 import java.awt.Image;
 import java.io.IOException;
 import java.io.Writer;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -47,8 +49,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import static org.httprpc.sierra.UILoader.*;
-
 public class DTDEncoder extends Encoder<Void> {
     private List<Class<?>> typeList;
     private Map<Class<?>, String> tags;
@@ -256,15 +256,30 @@ public static void main(String[] args) throws Exception {
         var workingPath = Path.of(System.getProperty("user.dir"));
 
         if (args.length > 0) {
-            applyBindings(workingPath.resolve(args[0]));
+            ClassLoader classLoader;
+            if (args.length > 1) {
+                try (var paths = Files.walk(workingPath.resolve(args[1]))) {
+                    classLoader = new URLClassLoader(paths.map(path -> {
+                        try {
+                            return path.toUri().toURL();
+                        } catch (IOException exception) {
+                            throw new RuntimeException(exception);
+                        }
+                    }).toArray(URL[]::new));
+                }
+            } else {
+                classLoader = ClassLoader.getSystemClassLoader();
+            }
+
+            applyBindings(workingPath.resolve(args[0]), classLoader);
         }
 
         var typeSet = new HashSet<Class<?>>();
 
         var tags = new HashMap<Class<?>, String>();
 
-        for (var tag : getTags()) {
-            var type = (Class<?>)getType(tag);
+        for (var tag : UILoader.getTags()) {
+            var type = (Class<?>)UILoader.getType(tag);
 
             tags.put(type, tag);
 
@@ -287,7 +302,7 @@ public static void main(String[] args) throws Exception {
     }
 
     @SuppressWarnings("unchecked")
-    private static void applyBindings(Path path) throws IOException, ClassNotFoundException {
+    private static void applyBindings(Path path, ClassLoader classLoader) throws IOException, ClassNotFoundException {
         var bindings = new Properties();
 
         try (var inputStream = Files.newInputStream(path)) {
@@ -296,9 +311,9 @@ private static void applyBindings(Path path) throws IOException, ClassNotFoundEx
 
         for (var entry : bindings.entrySet()) {
             var tag = (String)entry.getKey();
-            var type = (Class<? extends JComponent>)Class.forName((String)entry.getValue());
+            var typeName = (String)entry.getValue();
 
-            UILoader.bind(tag, type, () -> null);
+            UILoader.bind(tag, (Class<? extends JComponent>)classLoader.loadClass(typeName), () -> null);
         }
     }
 

…httprpc/sierra/tools/DTDEncoderTest.java …rpc/sierra/tools/dtd/DTDEncoderTest.javasierra-tools/dtd-encoder/src/test/java/org/httprpc/sierra/tools/DTDEncoderTest.java renamed to sierra-tools/dtd-encoder/src/test/java/org/httprpc/sierra/tools/dtd/DTDEncoderTest.java sierra-tools/dtd-encoder/src/test/java/org/httprpc/sierra/tools/DTDEncoderTest.java renamed to sierra-tools/dtd-encoder/src/test/java/org/httprpc/sierra/tools/dtd/DTDEncoderTest.java

@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-package org.httprpc.sierra.tools;
+package org.httprpc.sierra.tools.dtd;
 
 import org.httprpc.kilo.io.TextDecoder;
-import org.jfree.chart.ChartPanel;
 import org.junit.jupiter.api.Test;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.Properties;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -30,18 +30,34 @@ public void testDTDEncoder() throws Exception {
         var workingPath = Path.of(System.getProperty("user.dir"));
 
         var bindingsPath = workingPath.resolve("bindings.properties");
-        var dtdPath = workingPath.resolve("sierra.dtd");
 
         var properties = new Properties();
 
-        properties.put("chart-panel", ChartPanel.class.getName());
+        properties.put("chart-panel", "org.jfree.chart.ChartPanel");
+
+        var libraryPath = workingPath.resolve("lib");
+
+        Files.createDirectories(libraryPath);
+
+        var dependencyName = "jfreechart-1.5.6.jar";
+
+        var dependencyPath = libraryPath.resolve(dependencyName);
+
+        try (var inputStream = DTDEncoderTest.class.getResourceAsStream(dependencyName)) {
+            Files.copy(inputStream, dependencyPath, StandardCopyOption.REPLACE_EXISTING);
+        }
+
+        var dtdPath = workingPath.resolve("sierra.dtd");
 
         try {
             try (var outputStream = Files.newOutputStream(bindingsPath)) {
                 properties.store(outputStream, "Test Bindings");
             }
 
-            DTDEncoder.main(new String[]{bindingsPath.getFileName().toString()});
+            DTDEncoder.main(new String[]{
+                bindingsPath.getFileName().toString(),
+                libraryPath.getFileName().toString()
+            });
 
             String text;
             try (var inputStream = Files.newInputStream(dtdPath)) {
@@ -53,6 +69,9 @@ public void testDTDEncoder() throws Exception {
             assertTrue(text.contains("chart-panel"));
         } finally {
             Files.deleteIfExists(bindingsPath);
+            Files.deleteIfExists(dependencyPath);
+            Files.deleteIfExists(libraryPath);
+
             Files.deleteIfExists(dtdPath);
         }
     }

sierra-tools/dtd-encoder/src/test/resources/org/httprpc/sierra/tools/dtd/jfreechart-1.5.6.jar

@@ -155,7 +155,7 @@ private void paint(Graphics2D graphics) {
 
                 var x = switch (horizontalAlignment) {
                     case LEFT -> insets.left;
-                    case RIGHT -> insets.right;
+                    case RIGHT -> size.width - (lineWidth + insets.right);
                     case LEADING, TRAILING -> {
                         if (getComponentOrientation().isLeftToRight() ^ horizontalAlignment == HorizontalAlignment.TRAILING) {
                             yield insets.left;