From 75ad0eb76cf3131631d18e8ce00f831891f0226b Mon Sep 17 00:00:00 2001 From: Stefan Feuerhahn Date: Wed, 24 Jun 2020 09:57:37 +0200 Subject: [PATCH] updated build plugins/dependencies: spotless, bnd, junit, archunit --- build.gradle.kts | 11 +++++------ .../josistack/internal/acse/asn1/Myexternal.java | 1 + .../josistack/internal/acse/asn1/Myexternal2.java | 1 + .../josistack/internal/presentation/asn1/CPAPPDU.java | 1 + .../josistack/internal/presentation/asn1/CPType.java | 1 + .../internal/presentation/asn1/ContextList.java | 2 ++ .../josistack/internal/presentation/asn1/PDVList.java | 1 + .../internal/presentation/asn1/ResultList.java | 1 + .../internal/mms/asn1/AlternateAccess.java | 1 + .../internal/mms/asn1/AlternateAccessSelection.java | 6 ++++++ .../beanit/openiec61850/internal/mms/asn1/Data.java | 2 ++ .../mms/asn1/DeleteNamedVariableListRequest.java | 2 ++ .../internal/mms/asn1/FileDirectoryResponse.java | 1 + .../internal/mms/asn1/GetNameListRequest.java | 1 + .../internal/mms/asn1/GetNameListResponse.java | 1 + .../internal/mms/asn1/InformationReport.java | 1 + .../internal/mms/asn1/InitiateRequestPDU.java | 1 + .../internal/mms/asn1/InitiateResponsePDU.java | 1 + .../openiec61850/internal/mms/asn1/ObjectName.java | 1 + .../openiec61850/internal/mms/asn1/ReadResponse.java | 1 + .../openiec61850/internal/mms/asn1/RejectPDU.java | 1 + .../openiec61850/internal/mms/asn1/ServiceError.java | 1 + .../internal/mms/asn1/TypeDescription.java | 4 ++++ .../openiec61850/internal/mms/asn1/VariableDefs.java | 1 + .../openiec61850/internal/mms/asn1/WriteRequest.java | 1 + .../openiec61850/internal/mms/asn1/WriteResponse.java | 1 + 26 files changed, 41 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0215353..ece8a4f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,8 +3,8 @@ plugins { `maven-publish` signing eclipse - id("biz.aQute.bnd.builder") version "5.0.0" - id("com.diffplug.gradle.spotless") version "3.27.2" + id("biz.aQute.bnd.builder") version "5.1.1" + id("com.diffplug.gradle.spotless") version "4.4.0" id("io.codearte.nexus-staging") version "0.21.2" } @@ -65,7 +65,7 @@ tasks.register("tar") { //-----java root project configurations dependencies { - implementation("com.beanit:asn1bean:1.11.4-SNAPSHOT") + implementation("com.beanit:asn1bean:1.12.0") implementation("com.toedter:jcalendar:1.4") implementation("org.slf4j:slf4j-api:1.7.25") runtimeOnly("ch.qos.logback:logback-classic:1.2.3") @@ -138,7 +138,6 @@ configure(javaProjects) { repositories { mavenCentral() - mavenLocal() } java { @@ -149,8 +148,8 @@ configure(javaProjects) { } dependencies { - testImplementation("org.junit.jupiter:junit-jupiter:5.5.1") - testImplementation("com.tngtech.archunit:archunit-junit5:0.13.1") + testImplementation("org.junit.jupiter:junit-jupiter:5.6.2") + testImplementation("com.tngtech.archunit:archunit-junit5:0.14.1") } tasks.test { diff --git a/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal.java b/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal.java index 092869b..61b7372 100644 --- a/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal.java +++ b/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal.java @@ -23,6 +23,7 @@ public class Myexternal implements BerType, Serializable { private BerObjectIdentifier directReference = null; private BerInteger indirectReference = null; private Encoding encoding = null; + public Myexternal() {} public Myexternal(byte[] code) { diff --git a/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal2.java b/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal2.java index bd22893..a063087 100644 --- a/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal2.java +++ b/src/main/java-gen/com/beanit/josistack/internal/acse/asn1/Myexternal2.java @@ -23,6 +23,7 @@ public class Myexternal2 implements BerType, Serializable { private BerObjectIdentifier directReference = null; private BerInteger indirectReference = null; private Encoding encoding = null; + public Myexternal2() {} public Myexternal2(byte[] code) { diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPAPPDU.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPAPPDU.java index d39d5c1..b85280a 100644 --- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPAPPDU.java +++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPAPPDU.java @@ -17,6 +17,7 @@ public class CPAPPDU implements BerType, Serializable { private byte[] code = null; private ModeSelector modeSelector = null; private NormalModeParameters normalModeParameters = null; + public CPAPPDU() {} public CPAPPDU(byte[] code) { diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPType.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPType.java index 984e170..fecf5b9 100644 --- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPType.java +++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/CPType.java @@ -17,6 +17,7 @@ public class CPType implements BerType, Serializable { private byte[] code = null; private ModeSelector modeSelector = null; private NormalModeParameters normalModeParameters = null; + public CPType() {} public CPType(byte[] code) { diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ContextList.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ContextList.java index 5ba6eb5..bc6f6fa 100644 --- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ContextList.java +++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ContextList.java @@ -19,6 +19,7 @@ public class ContextList implements BerType, Serializable { private static final long serialVersionUID = 1L; private byte[] code = null; private List seqOf = null; + public ContextList() { seqOf = new ArrayList(); } @@ -155,6 +156,7 @@ public class ContextList implements BerType, Serializable { private PresentationContextIdentifier presentationContextIdentifier = null; private AbstractSyntaxName abstractSyntaxName = null; private TransferSyntaxNameList transferSyntaxNameList = null; + public SEQUENCE() {} public SEQUENCE(byte[] code) { diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/PDVList.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/PDVList.java index 9fc0f19..1a4f98e 100644 --- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/PDVList.java +++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/PDVList.java @@ -21,6 +21,7 @@ public class PDVList implements BerType, Serializable { private TransferSyntaxName transferSyntaxName = null; private PresentationContextIdentifier presentationContextIdentifier = null; private PresentationDataValues presentationDataValues = null; + public PDVList() {} public PDVList(byte[] code) { diff --git a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ResultList.java b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ResultList.java index 9815745..1f9d45c 100644 --- a/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ResultList.java +++ b/src/main/java-gen/com/beanit/josistack/internal/presentation/asn1/ResultList.java @@ -20,6 +20,7 @@ public class ResultList implements BerType, Serializable { private static final long serialVersionUID = 1L; private byte[] code = null; private List seqOf = null; + public ResultList() { seqOf = new ArrayList(); } diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccess.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccess.java index 78a8170..412aba0 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccess.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccess.java @@ -19,6 +19,7 @@ public class AlternateAccess implements BerType, Serializable { private static final long serialVersionUID = 1L; private byte[] code = null; private List seqOf = null; + public AlternateAccess() { seqOf = new ArrayList(); } diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccessSelection.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccessSelection.java index f360e39..2068ae4 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccessSelection.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/AlternateAccessSelection.java @@ -20,6 +20,7 @@ public class AlternateAccessSelection implements BerType, Serializable { private SelectAccess selectAccess = null; public AlternateAccessSelection() {} + public AlternateAccessSelection(byte[] code) { this.code = code; } @@ -140,6 +141,7 @@ public class AlternateAccessSelection implements BerType, Serializable { private byte[] code = null; private AccessSelection accessSelection = null; private AlternateAccess alternateAccess = null; + public SelectAlternateAccess() {} public SelectAlternateAccess(byte[] code) { @@ -299,7 +301,9 @@ public class AlternateAccessSelection implements BerType, Serializable { private Unsigned32 index = null; private IndexRange indexRange = null; private BerNull allElements = null; + public AccessSelection() {} + public AccessSelection(byte[] code) { this.code = code; } @@ -739,7 +743,9 @@ public class AlternateAccessSelection implements BerType, Serializable { private Unsigned32 index = null; private IndexRange indexRange = null; private BerNull allElements = null; + public SelectAccess() {} + public SelectAccess(byte[] code) { this.code = code; } diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/Data.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/Data.java index eb007c4..a1c8f3b 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/Data.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/Data.java @@ -35,7 +35,9 @@ public class Data implements BerType, Serializable { private TimeOfDay binaryTime = null; private MMSString mMSString = null; private UtcTime utcTime = null; + public Data() {} + public Data(byte[] code) { this.code = code; } diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java index 9d653c6..9ffd09a 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/DeleteNamedVariableListRequest.java @@ -22,7 +22,9 @@ public class DeleteNamedVariableListRequest implements BerType, Serializable { private BerInteger scopeOfDelete = null; private ListOfVariableListName listOfVariableListName = null; private DomainName domainName = null; + public DeleteNamedVariableListRequest() {} + public DeleteNamedVariableListRequest(byte[] code) { this.code = code; } diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/FileDirectoryResponse.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/FileDirectoryResponse.java index f8d2df0..e423118 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/FileDirectoryResponse.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/FileDirectoryResponse.java @@ -21,6 +21,7 @@ public class FileDirectoryResponse implements BerType, Serializable { private byte[] code = null; private ListOfDirectoryEntry listOfDirectoryEntry = null; private BerBoolean moreFollows = null; + public FileDirectoryResponse() {} public FileDirectoryResponse(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListRequest.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListRequest.java index 4addee5..5088f30 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListRequest.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListRequest.java @@ -19,6 +19,7 @@ public class GetNameListRequest implements BerType, Serializable { private ObjectClass objectClass = null; private ObjectScope objectScope = null; private Identifier continueAfter = null; + public GetNameListRequest() {} public GetNameListRequest(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListResponse.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListResponse.java index 95de079..c06d852 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListResponse.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/GetNameListResponse.java @@ -21,6 +21,7 @@ public class GetNameListResponse implements BerType, Serializable { private byte[] code = null; private ListOfIdentifier listOfIdentifier = null; private BerBoolean moreFollows = null; + public GetNameListResponse() {} public GetNameListResponse(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InformationReport.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InformationReport.java index c37ea2a..7f40297 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InformationReport.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InformationReport.java @@ -20,6 +20,7 @@ public class InformationReport implements BerType, Serializable { private byte[] code = null; private VariableAccessSpecification variableAccessSpecification = null; private ListOfAccessResult listOfAccessResult = null; + public InformationReport() {} public InformationReport(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateRequestPDU.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateRequestPDU.java index 8589d20..3a35c72 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateRequestPDU.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateRequestPDU.java @@ -20,6 +20,7 @@ public class InitiateRequestPDU implements BerType, Serializable { private Integer16 proposedMaxServOutstandingCalled = null; private Integer8 proposedDataStructureNestingLevel = null; private InitRequestDetail initRequestDetail = null; + public InitiateRequestPDU() {} public InitiateRequestPDU(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateResponsePDU.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateResponsePDU.java index 81a17f7..d1b1159 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateResponsePDU.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/InitiateResponsePDU.java @@ -20,6 +20,7 @@ public class InitiateResponsePDU implements BerType, Serializable { private Integer16 negotiatedMaxServOutstandingCalled = null; private Integer8 negotiatedDataStructureNestingLevel = null; private InitResponseDetail initResponseDetail = null; + public InitiateResponsePDU() {} public InitiateResponsePDU(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ObjectName.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ObjectName.java index 3ab0888..a49492f 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ObjectName.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ObjectName.java @@ -18,6 +18,7 @@ public class ObjectName implements BerType, Serializable { private Identifier vmdSpecific = null; private DomainSpecific domainSpecific = null; private Identifier aaSpecific = null; + public ObjectName() {} public ObjectName(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ReadResponse.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ReadResponse.java index 3f1b7a3..7a11820 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ReadResponse.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ReadResponse.java @@ -20,6 +20,7 @@ public class ReadResponse implements BerType, Serializable { private byte[] code = null; private VariableAccessSpecification variableAccessSpecification = null; private ListOfAccessResult listOfAccessResult = null; + public ReadResponse() {} public ReadResponse(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/RejectPDU.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/RejectPDU.java index 599e9c8..1ee1adf 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/RejectPDU.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/RejectPDU.java @@ -18,6 +18,7 @@ public class RejectPDU implements BerType, Serializable { private byte[] code = null; private Unsigned32 originalInvokeID = null; private RejectReason rejectReason = null; + public RejectPDU() {} public RejectPDU(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ServiceError.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ServiceError.java index e2da85c..2ddfba9 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ServiceError.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/ServiceError.java @@ -20,6 +20,7 @@ public class ServiceError implements BerType, Serializable { private ErrorClass errorClass = null; private BerInteger additionalCode = null; private BerVisibleString additionalDescription = null; + public ServiceError() {} public ServiceError(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/TypeDescription.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/TypeDescription.java index 4edd830..7f12f7b 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/TypeDescription.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/TypeDescription.java @@ -32,7 +32,9 @@ public class TypeDescription implements BerType, Serializable { private BerBoolean binaryTime = null; private Integer32 mMSString = null; private BerNull utcTime = null; + public TypeDescription() {} + public TypeDescription(byte[] code) { this.code = code; } @@ -626,6 +628,7 @@ public class TypeDescription implements BerType, Serializable { private byte[] code = null; private BerBoolean packed = null; private Components components = null; + public Structure() {} public Structure(byte[] code) { @@ -788,6 +791,7 @@ public class TypeDescription implements BerType, Serializable { private static final long serialVersionUID = 1L; private byte[] code = null; private List seqOf = null; + public Components() { seqOf = new ArrayList(); } diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/VariableDefs.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/VariableDefs.java index 0a420b3..c05d2f7 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/VariableDefs.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/VariableDefs.java @@ -19,6 +19,7 @@ public class VariableDefs implements BerType, Serializable { private static final long serialVersionUID = 1L; private byte[] code = null; private List seqOf = null; + public VariableDefs() { seqOf = new ArrayList(); } diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteRequest.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteRequest.java index e2e2db8..eb9e741 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteRequest.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteRequest.java @@ -20,6 +20,7 @@ public class WriteRequest implements BerType, Serializable { private byte[] code = null; private VariableAccessSpecification variableAccessSpecification = null; private ListOfData listOfData = null; + public WriteRequest() {} public WriteRequest(byte[] code) { diff --git a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteResponse.java b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteResponse.java index 75f8899..5a1cf2e 100644 --- a/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteResponse.java +++ b/src/main/java-gen/com/beanit/openiec61850/internal/mms/asn1/WriteResponse.java @@ -20,6 +20,7 @@ public class WriteResponse implements BerType, Serializable { private static final long serialVersionUID = 1L; private byte[] code = null; private List seqOf = null; + public WriteResponse() { seqOf = new ArrayList(); }