You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2020/12/16 13:48:33 UTC
[plc4x] branch develop updated: - Updated the package names and the
imports
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 36239b4 - Updated the package names and the imports
36239b4 is described below
commit 36239b46d5a6863c00930302fcd471a1a4a79f1a
Author: cdutz <ch...@c-ware.de>
AuthorDate: Wed Dec 16 14:48:25 2020 +0100
- Updated the package names and the imports
---
.../java/org/apache/plc4x/java/opcuaserver/KeyStoreLoader.java | 9 ++-------
.../apache/plc4x/java/opcuaserver/backend/Plc4xNamespace.java | 3 +++
.../plc4x/java/opcuaserver/configuration/Configuration.java | 7 +------
.../java/opcuaserver/configuration/DeviceConfiguration.java | 2 +-
.../java/opcuaserver/configuration/PasswordConfiguration.java | 2 +-
.../org/apache/plc4x/java/opcuaserver/configuration/Tag.java | 3 +--
.../org/apache/plc4x/java/opcuaserver/configuration/User.java | 10 +---------
7 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/KeyStoreLoader.java b/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/KeyStoreLoader.java
index 0838fec..985e58c 100644
--- a/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/KeyStoreLoader.java
+++ b/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/KeyStoreLoader.java
@@ -22,8 +22,6 @@ package org.apache.plc4x.java.opcuaserver;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.Console;
-import java.io.IOException;
import java.security.Key;
import java.security.KeyPair;
import java.security.KeyStore;
@@ -36,17 +34,14 @@ import java.util.UUID;
import java.util.regex.Pattern;
import com.google.common.collect.Sets;
+import org.apache.plc4x.java.opcuaserver.configuration.Configuration;
+import org.apache.plc4x.java.opcuaserver.configuration.PasswordConfiguration;
import org.eclipse.milo.opcua.sdk.server.util.HostnameUtil;
import org.eclipse.milo.opcua.stack.core.util.SelfSignedCertificateBuilder;
import org.eclipse.milo.opcua.stack.core.util.SelfSignedCertificateGenerator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-
-
-
class KeyStoreLoader {
private static final Pattern IP_ADDR_PATTERN = Pattern.compile(
diff --git a/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/backend/Plc4xNamespace.java b/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/backend/Plc4xNamespace.java
index 15ac138..415d469 100644
--- a/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/backend/Plc4xNamespace.java
+++ b/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/backend/Plc4xNamespace.java
@@ -27,6 +27,9 @@ import java.util.List;
import java.util.Random;
import java.util.UUID;
+import org.apache.plc4x.java.opcuaserver.configuration.Configuration;
+import org.apache.plc4x.java.opcuaserver.configuration.DeviceConfiguration;
+import org.apache.plc4x.java.opcuaserver.configuration.Tag;
import org.eclipse.milo.opcua.sdk.core.AccessLevel;
import org.eclipse.milo.opcua.sdk.core.Reference;
import org.eclipse.milo.opcua.sdk.core.ValueRank;
diff --git a/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/Configuration.java b/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/Configuration.java
index 0060c85..854e8c0 100644
--- a/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/Configuration.java
+++ b/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/Configuration.java
@@ -17,14 +17,9 @@
* under the License.
*/
-package org.apache.plc4x.java.opcuaserver;
+package org.apache.plc4x.java.opcuaserver.configuration;
import java.util.List;
-import java.io.File;
-import java.io.IOException;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/DeviceConfiguration.java b/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/DeviceConfiguration.java
index 9907a86..469882b 100644
--- a/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/DeviceConfiguration.java
+++ b/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/DeviceConfiguration.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.plc4x.java.opcuaserver;
+package org.apache.plc4x.java.opcuaserver.configuration;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
diff --git a/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/PasswordConfiguration.java b/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/PasswordConfiguration.java
index 853a366..4f7beb2 100644
--- a/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/PasswordConfiguration.java
+++ b/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/PasswordConfiguration.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.plc4x.java.opcuaserver;
+package org.apache.plc4x.java.opcuaserver.configuration;
import org.eclipse.jetty.util.security.Password;
diff --git a/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/Tag.java b/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/Tag.java
index 6f01069..09e7d44 100644
--- a/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/Tag.java
+++ b/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/Tag.java
@@ -17,10 +17,9 @@
* under the License.
*/
-package org.apache.plc4x.java.opcuaserver;
+package org.apache.plc4x.java.opcuaserver.configuration;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.List;
public class Tag {
diff --git a/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/User.java b/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/User.java
index 9ba3aa2..11534b9 100644
--- a/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/User.java
+++ b/plc4j/integrations/opcua-server/src/main/java/org/apache/plc4x/java/opcuaserver/configuration/User.java
@@ -17,22 +17,14 @@
* under the License.
*/
-package org.apache.plc4x.java.opcuaserver;
+package org.apache.plc4x.java.opcuaserver.configuration;
-import java.util.List;
-import java.io.File;
-import java.io.IOException;
import java.security.SecureRandom;
import org.apache.commons.codec.digest.DigestUtils;
-import org.eclipse.jetty.util.security.Password;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.slf4j.LoggerFactory;
import java.util.Base64;