Don't call super in generated equals/hashCode when super is Structure

eclipse · May 7, 2019 · 8e76b2f · 8e76b2f
1 parent ab34db6
commit 8e76b2f
Show file tree

Hide file tree

Showing 217 changed files with 414 additions and 533 deletions.
diff --git a/.../main/java/org/eclipse/milo/opcua/stack/core/types/structured/ActivateSessionRequest.java b/.../main/java/org/eclipse/milo/opcua/stack/core/types/structured/ActivateSessionRequest.java
@@ -22,7 +22,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.ExtensionObject;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true
@@ -35,8 +35,6 @@ public class ActivateSessionRequest extends Structure implements UaRequestMessag
 
     public static final ExpandedNodeId XML_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=466");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15145");
-
     private final RequestHeader requestHeader;
 
     private final SignatureData clientSignature;

diff --git a/...main/java/org/eclipse/milo/opcua/stack/core/types/structured/ActivateSessionResponse.java b/...main/java/org/eclipse/milo/opcua/stack/core/types/structured/ActivateSessionResponse.java
@@ -24,7 +24,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true
@@ -37,8 +37,6 @@ public class ActivateSessionResponse extends Structure implements UaResponseMess
 
     public static final ExpandedNodeId XML_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=469");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15146");
-
     private final ResponseHeader responseHeader;
 
     private final ByteString serverNonce;

diff --git a/...k-core/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AddNodesItem.java b/...k-core/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AddNodesItem.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 the Eclipse Milo Authors
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
 package org.eclipse.milo.opcua.stack.core.types.structured;
 
 import lombok.EqualsAndHashCode;
@@ -15,7 +25,7 @@
 import org.eclipse.milo.opcua.stack.core.types.enumerated.NodeClass;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true
@@ -28,8 +38,6 @@ public class AddNodesItem extends Structure implements UaStructure {
 
     public static final ExpandedNodeId BINARY_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=378");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15165");
-
     private final ExpandedNodeId parentNodeId;
 
     private final NodeId referenceTypeId;

diff --git a/...ore/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AddNodesRequest.java b/...ore/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AddNodesRequest.java
@@ -21,7 +21,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true
@@ -34,8 +34,6 @@ public class AddNodesRequest extends Structure implements UaRequestMessage {
 
     public static final ExpandedNodeId XML_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=487");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15167");
-
     private final RequestHeader requestHeader;
 
     private final AddNodesItem[] nodesToAdd;

diff --git a/...re/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AddNodesResponse.java b/...re/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AddNodesResponse.java
@@ -22,7 +22,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true
@@ -35,8 +35,6 @@ public class AddNodesResponse extends Structure implements UaResponseMessage {
 
     public static final ExpandedNodeId XML_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=490");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15168");
-
     private final ResponseHeader responseHeader;
 
     private final AddNodesResult[] results;

diff --git a/...core/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AddNodesResult.java b/...core/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AddNodesResult.java
@@ -23,7 +23,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true
@@ -36,8 +36,6 @@ public class AddNodesResult extends Structure implements UaStructure {
 
     public static final ExpandedNodeId XML_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=484");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15166");
-
     private final StatusCode statusCode;
 
     private final NodeId addedNodeId;

diff --git a/...e/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AddReferencesItem.java b/...e/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AddReferencesItem.java
@@ -23,7 +23,7 @@
 import org.eclipse.milo.opcua.stack.core.types.enumerated.NodeClass;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true
@@ -36,8 +36,6 @@ public class AddReferencesItem extends Structure implements UaStructure {
 
     public static final ExpandedNodeId BINARY_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=381");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15169");
-
     private final NodeId sourceNodeId;
 
     private final NodeId referenceTypeId;

diff --git a/...rc/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AddReferencesRequest.java b/...rc/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AddReferencesRequest.java
@@ -21,7 +21,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true
@@ -34,8 +34,6 @@ public class AddReferencesRequest extends Structure implements UaRequestMessage
 
     public static final ExpandedNodeId XML_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=493");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15170");
-
     private final RequestHeader requestHeader;
 
     private final AddReferencesItem[] referencesToAdd;

diff --git a/...c/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AddReferencesResponse.java b/...c/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AddReferencesResponse.java
@@ -23,7 +23,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true
@@ -36,8 +36,6 @@ public class AddReferencesResponse extends Structure implements UaResponseMessag
 
     public static final ExpandedNodeId XML_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=496");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15171");
-
     private final ResponseHeader responseHeader;
 
     private final StatusCode[] results;

diff --git a/.../main/java/org/eclipse/milo/opcua/stack/core/types/structured/AggregateConfiguration.java b/.../main/java/org/eclipse/milo/opcua/stack/core/types/structured/AggregateConfiguration.java
@@ -22,7 +22,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UByte;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true
@@ -35,8 +35,6 @@ public class AggregateConfiguration extends Structure implements UaStructure {
 
     public static final ExpandedNodeId BINARY_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=950");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15304");
-
     private final Boolean useServerCapabilitiesDefaults;
 
     private final Boolean treatUncertainAsBad;

diff --git a/...ore/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AggregateFilter.java b/...ore/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AggregateFilter.java
@@ -36,8 +36,6 @@ public class AggregateFilter extends MonitoringFilter implements UaStructure {
 
     public static final ExpandedNodeId XML_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=729");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15312");
-
     private final DateTime startTime;
 
     private final NodeId aggregateType;

diff --git a/...c/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AggregateFilterResult.java b/...c/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AggregateFilterResult.java
@@ -35,8 +35,6 @@ public class AggregateFilterResult extends MonitoringFilterResult implements UaS
 
     public static final ExpandedNodeId XML_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=738");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15315");
-
     private final DateTime revisedStartTime;
 
     private final Double revisedProcessingInterval;

diff --git a/...ack-core/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/Annotation.java b/...ack-core/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/Annotation.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 the Eclipse Milo Authors
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
 package org.eclipse.milo.opcua.stack.core.types.structured;
 
 import lombok.EqualsAndHashCode;
@@ -12,7 +22,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true

diff --git a/.../main/java/org/eclipse/milo/opcua/stack/core/types/structured/AnonymousIdentityToken.java b/.../main/java/org/eclipse/milo/opcua/stack/core/types/structured/AnonymousIdentityToken.java
@@ -34,8 +34,6 @@ public class AnonymousIdentityToken extends UserIdentityToken implements UaStruc
 
     public static final ExpandedNodeId BINARY_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=321");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15141");
-
     public AnonymousIdentityToken(String policyId) {
         super(policyId);
     }

diff --git a/.../main/java/org/eclipse/milo/opcua/stack/core/types/structured/ApplicationDescription.java b/.../main/java/org/eclipse/milo/opcua/stack/core/types/structured/ApplicationDescription.java
@@ -23,7 +23,7 @@
 import org.eclipse.milo.opcua.stack.core.types.enumerated.ApplicationType;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true
@@ -36,8 +36,6 @@ public class ApplicationDescription extends Structure implements UaStructure {
 
     public static final ExpandedNodeId BINARY_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=310");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15087");
-
     private final String applicationUri;
 
     private final String productUri;

diff --git a/...stack-core/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/Argument.java b/...stack-core/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/Argument.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 the Eclipse Milo Authors
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
 package org.eclipse.milo.opcua.stack.core.types.structured;
 
 import lombok.EqualsAndHashCode;
@@ -14,7 +24,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true
@@ -27,8 +37,6 @@ public class Argument extends Structure implements UaStructure {
 
     public static final ExpandedNodeId BINARY_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=298");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15081");
-
     private final String name;
 
     private final NodeId dataType;

diff --git a/...ore/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AxisInformation.java b/...ore/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/AxisInformation.java
@@ -23,7 +23,7 @@
 import org.eclipse.milo.opcua.stack.core.types.enumerated.AxisScaleEnumeration;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true
@@ -36,8 +36,6 @@ public class AxisInformation extends Structure implements UaStructure {
 
     public static final ExpandedNodeId BINARY_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=12089");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15379");
-
     private final EUInformation engineeringUnits;
 
     private final Range eURange;

diff --git a/...e/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/BrowseDescription.java b/...e/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/BrowseDescription.java
@@ -24,7 +24,7 @@
 import org.eclipse.milo.opcua.stack.core.types.enumerated.BrowseDirection;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true
@@ -37,8 +37,6 @@ public class BrowseDescription extends Structure implements UaStructure {
 
     public static final ExpandedNodeId XML_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=515");
 
-    public static final ExpandedNodeId JSON_ENCODING_ID = ExpandedNodeId.parse("nsu=http://opcfoundation.org/UA/;i=15180");
-
     private final NodeId nodeId;
 
     private final BrowseDirection browseDirection;

diff --git a/...e/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/BrowseNextRequest.java b/...e/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/BrowseNextRequest.java
@@ -22,7 +22,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true

diff --git a/.../src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/BrowseNextResponse.java b/.../src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/BrowseNextResponse.java
@@ -22,7 +22,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true

diff --git a/...ack-core/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/BrowsePath.java b/...ack-core/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/BrowsePath.java
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 2019 the Eclipse Milo Authors
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
 package org.eclipse.milo.opcua.stack.core.types.structured;
 
 import lombok.EqualsAndHashCode;
@@ -12,7 +22,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true

diff --git a/...re/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/BrowsePathResult.java b/...re/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/BrowsePathResult.java
@@ -22,7 +22,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true

diff --git a/...re/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/BrowsePathTarget.java b/...re/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/BrowsePathTarget.java
@@ -22,7 +22,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true

diff --git a/...-core/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/BrowseRequest.java b/...-core/src/main/java/org/eclipse/milo/opcua/stack/core/types/structured/BrowseRequest.java
@@ -22,7 +22,7 @@
 import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
 
 @EqualsAndHashCode(
-    callSuper = true
+    callSuper = false
 )
 @SuperBuilder(
     toBuilder = true