~ comment and logging fixups

eclipse · Apr 18, 2021 · d12a127 · d12a127
1 parent c7d4633
commit d12a127
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/...s/client-examples/src/main/java/org/eclipse/milo/examples/client/ClientExampleRunner.java b/...s/client-examples/src/main/java/org/eclipse/milo/examples/client/ClientExampleRunner.java
@@ -64,20 +64,22 @@ public ClientExampleRunner(ClientExample clientExample, boolean serverRequired)
     }
 
     private OpcUaClient createClient() throws Exception {
-        Path securityTempDir = Paths.get(System.getProperty("java.io.tmpdir"), "client-example", "security");
+        Path securityTempDir = Paths.get(System.getProperty("java.io.tmpdir"), "client", "security");
         Files.createDirectories(securityTempDir);
         if (!Files.exists(securityTempDir)) {
             throw new Exception("unable to create security dir: " + securityTempDir);
         }
 
+        File pkiDir = securityTempDir.resolve("pki").toFile();
+
         LoggerFactory.getLogger(getClass())
-            .info("security temp dir: {}", securityTempDir.toAbsolutePath());
+            .info("security dir: {}", securityTempDir.toAbsolutePath());
+        LoggerFactory.getLogger(getClass())
+            .info("security pki dir: {}", pkiDir.getAbsolutePath());
 
         KeyStoreLoader loader = new KeyStoreLoader().load(securityTempDir);
 
-        File pkiDir = securityTempDir.resolve("pki").toFile();
         trustListManager = new DefaultTrustListManager(pkiDir);
-        LoggerFactory.getLogger(getClass()).info("pki dir: {}", pkiDir.getAbsolutePath());
 
         DefaultClientCertificateValidator certificateValidator =
             new DefaultClientCertificateValidator(trustListManager);
@@ -112,13 +114,13 @@ public void run() {
             // will need to be moved from the security "pki/rejected" directory to the
             // "pki/trusted/certs" directory.
 
-            // Make the example client trust the example server certificate by default.
+            // Make the example server trust the example client certificate by default.
             client.getConfig().getCertificate().ifPresent(
                 certificate ->
                     exampleServer.getServer().getConfig().getTrustListManager().addTrustedCertificate(certificate)
             );
 
-            // Make the example server trust the example client certificate by default.
+            // Make the example client trust the example server certificate by default.
             exampleServer.getServer().getConfig().getCertificateManager().getCertificates().forEach(
                 certificate ->
                     trustListManager.addTrustedCertificate(certificate)

diff --git a/...xamples/server-examples/src/main/java/org/eclipse/milo/examples/server/ExampleServer.java b/...xamples/server-examples/src/main/java/org/eclipse/milo/examples/server/ExampleServer.java
@@ -88,14 +88,18 @@ public static void main(String[] args) throws Exception {
     private final ExampleNamespace exampleNamespace;
 
     public ExampleServer() throws Exception {
-        Path securityTempDir = Paths.get(System.getProperty("java.io.tmpdir"), "server-example", "security");
+        Path securityTempDir = Paths.get(System.getProperty("java.io.tmpdir"), "server", "security");
         Files.createDirectories(securityTempDir);
         if (!Files.exists(securityTempDir)) {
             throw new Exception("unable to create security temp dir: " + securityTempDir);
         }
 
+        File pkiDir = securityTempDir.resolve("pki").toFile();
+
         LoggerFactory.getLogger(getClass())
-            .info("security temp dir: {}", securityTempDir.toAbsolutePath());
+            .info("security dir: {}", securityTempDir.toAbsolutePath());
+        LoggerFactory.getLogger(getClass())
+            .info("security pki dir: {}", pkiDir.getAbsolutePath());
 
         KeyStoreLoader loader = new KeyStoreLoader().load(securityTempDir);
 
@@ -104,9 +108,7 @@ public ExampleServer() throws Exception {
             loader.getServerCertificateChain()
         );
 
-        File pkiDir = securityTempDir.resolve("pki").toFile();
         DefaultTrustListManager trustListManager = new DefaultTrustListManager(pkiDir);
-        LoggerFactory.getLogger(getClass()).info("pki dir: {}", pkiDir.getAbsolutePath());
 
         DefaultServerCertificateValidator certificateValidator =
             new DefaultServerCertificateValidator(trustListManager);