You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by na...@apache.org on 2019/12/11 10:35:14 UTC
[plc4x] branch PLC4X-157OPC-UADisablediscovery updated: [fix]
Removed author tag [fix] Use of Calendar API
This is an automated email from the ASF dual-hosted git repository.
nalim2 pushed a commit to branch PLC4X-157OPC-UADisablediscovery
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/PLC4X-157OPC-UADisablediscovery by this push:
new 088f14b [fix] Removed author tag [fix] Use of Calendar API
088f14b is described below
commit 088f14b62bfd427bcb8ca149d4e727a541e0428f
Author: Matthias Milan Strljic <ma...@gmail.com>
AuthorDate: Wed Dec 11 11:33:53 2019 +0100
[fix] Removed author tag
[fix] Use of Calendar API
---
.../java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java | 1 -
.../plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java | 1 -
.../plc4x/java/opcua/connection/OpcuaConnectionFactory.java | 1 -
.../plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java | 1 -
.../org/apache/plc4x/java/opcua/protocol/OpcuaField.java | 1 -
.../plc4x/java/opcua/protocol/OpcuaPlcFieldHandler.java | 1 -
.../plc4x/java/opcua/protocol/OpcuaSubsriptionHandle.java | 1 -
.../plc4x/java/opcua/protocol/model/OpcuaDataTypes.java | 1 -
.../java/opcua/protocol/model/OpcuaIdentifierType.java | 1 -
.../java/org/apache/plc4x/java/opcua/ManualPLC4XOpcua.java | 13 ++++++-------
.../org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java | 1 -
.../test/java/org/apache/plc4x/java/opcua/UtilsTest.java | 1 -
.../java/opcua/connection/OpcuaTcpPlcConnectionTest.java | 1 -
.../apache/plc4x/java/opcua/protocol/OpcuaFieldTest.java | 1 -
.../plc4x/java/opcua/protocol/OpcuaPlcFieldHandlerTest.java | 1 -
.../java/opcua/protocol/OpcuaSubscriptionHandleTest.java | 1 -
16 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java
index b627aa1..1d5ca88 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/OpcuaPlcDriver.java
@@ -35,7 +35,6 @@ import java.util.regex.Pattern;
* Implementation of the OPC UA protocol, based on:
* - Eclipse Milo (https://github.com/eclipse/milo)
*
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public class OpcuaPlcDriver implements PlcDriver {
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java
index aeaa92f..a7a2d43 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java
@@ -30,7 +30,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public abstract class BaseOpcuaPlcConnection extends AbstractPlcConnection implements PlcReader, PlcWriter, PlcSubscriber {
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaConnectionFactory.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaConnectionFactory.java
index 67f3ef4..4c4654c 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaConnectionFactory.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaConnectionFactory.java
@@ -22,7 +22,6 @@ import java.net.InetAddress;
import java.util.Objects;
/**
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public class OpcuaConnectionFactory {
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
index d2102c1..1270972 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
@@ -70,7 +70,6 @@ import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.
* Corresponding implementaion for a TCP-based connection for an OPC UA server.
* TODO: At the moment are just connections without any security mechanism possible
*
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public class OpcuaTcpPlcConnection extends BaseOpcuaPlcConnection {
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaField.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaField.java
index 2d4ae38..d304fd9 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaField.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaField.java
@@ -27,7 +27,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public class OpcuaField implements PlcField {
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandler.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandler.java
index 93079de..bf4e052 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandler.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandler.java
@@ -28,7 +28,6 @@ import java.math.BigInteger;
import java.util.ArrayList;
/**
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public class OpcuaPlcFieldHandler extends DefaultPlcFieldHandler {
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubsriptionHandle.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubsriptionHandle.java
index bc42049..7028ae6 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubsriptionHandle.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubsriptionHandle.java
@@ -40,7 +40,6 @@ import java.util.Set;
import java.util.function.Consumer;
/**
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public class OpcuaSubsriptionHandle implements PlcSubscriptionHandle {
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaDataTypes.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaDataTypes.java
index 43aedbf..954d892 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaDataTypes.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaDataTypes.java
@@ -19,7 +19,6 @@
package org.apache.plc4x.java.opcua.protocol.model;
/**
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public enum OpcuaDataTypes {
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaIdentifierType.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaIdentifierType.java
index 5df04b3..b6dff56 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaIdentifierType.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/model/OpcuaIdentifierType.java
@@ -19,7 +19,6 @@
package org.apache.plc4x.java.opcua.protocol.model;
/**
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public enum OpcuaIdentifierType {
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/ManualPLC4XOpcua.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/ManualPLC4XOpcua.java
index 9c081f3..89146db 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/ManualPLC4XOpcua.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/ManualPLC4XOpcua.java
@@ -33,7 +33,6 @@ import org.apache.plc4x.java.opcua.protocol.OpcuaPlcFieldHandler;
import java.math.BigInteger;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
-import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
@@ -48,7 +47,6 @@ import java.util.function.Consumer;
* <p>
* TODO: replace current public server with local Milo instance
*
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public class ManualPLC4XOpcua {
@@ -154,10 +152,10 @@ public class ManualPLC4XOpcua {
OpcuaPlcFieldHandler fieldH = new OpcuaPlcFieldHandler();
PlcField field = fieldH.createField("ns=2;i=10855");
- long milisStart = Calendar.getInstance().getTimeInMillis();
+ long milisStart = System.currentTimeMillis();
opcuaConnection = (OpcuaTcpPlcConnection)
new PlcDriverManager().getConnection(ConnectionString);
- long result = Calendar.getInstance().getTimeInMillis() - milisStart;
+ long result = System.currentTimeMillis() - milisStart;
opcuaConnection.close();
return result;
}
@@ -172,22 +170,23 @@ public class ManualPLC4XOpcua {
OpcuaPlcFieldHandler fieldH = new OpcuaPlcFieldHandler();
PlcField field = fieldH.createField("ns=2;i=10855");
- long milisStart = Calendar.getInstance().getTimeInMillis();
+ long milisStart = System.currentTimeMillis();
try {
opcuaConnection = (OpcuaTcpPlcConnection)
new PlcDriverManager().getConnection(connectionString);
} catch (PlcConnectionException e) {
e.printStackTrace();
}
- result += Calendar.getInstance().getTimeInMillis() - milisStart;
+ result += System.currentTimeMillis() - milisStart;
try {
+ assert opcuaConnection != null;
opcuaConnection.close();
} catch (Exception e) {
e.printStackTrace();
}
}
- return result / 1;
+ return result;
}
}
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
index de041ac..7b3d951 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
@@ -27,7 +27,6 @@ import static org.apache.plc4x.java.opcua.OpcuaPlcDriver.OPCUA_URI_PATTERN;
import static org.apache.plc4x.java.opcua.UtilsTest.assertMatching;
/**
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public class OpcuaPlcDriverTest {
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/UtilsTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/UtilsTest.java
index 579118c..011f8d5 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/UtilsTest.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/UtilsTest.java
@@ -23,7 +23,6 @@ import java.util.regex.Pattern;
import static org.junit.Assert.fail;
/**
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public class UtilsTest {
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnectionTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnectionTest.java
index 8ebf365..0ed750c 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnectionTest.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnectionTest.java
@@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public class OpcuaTcpPlcConnectionTest {
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaFieldTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaFieldTest.java
index 8f8ba49..e853552 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaFieldTest.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaFieldTest.java
@@ -26,7 +26,6 @@ import static org.apache.plc4x.java.opcua.UtilsTest.assertMatching;
import static org.apache.plc4x.java.opcua.protocol.OpcuaField.ADDRESS_PATTERN;
/**
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public class OpcuaFieldTest {
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandlerTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandlerTest.java
index 53af2cf..f28e76d 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandlerTest.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaPlcFieldHandlerTest.java
@@ -22,7 +22,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
/**
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public class OpcuaPlcFieldHandlerTest {
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java
index 8b159c9..d1513f4 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java
@@ -22,7 +22,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
/**
- * @author Matthias Milan Strljic
* Created by Matthias Milan Strljic on 10.05.2019
*/
public class OpcuaSubscriptionHandleTest {