diff --git a/README.md b/README.md index 8fa636a..f6f7afa 100644 --- a/README.md +++ b/README.md @@ -23,3 +23,11 @@ Link will be the combination of sendTo Address, and InvokeId. The response will sendTo Address, now as sender Address. Step 1 will have to be more simple though. + +## Parse Response + +``` +Read from Socket, convert byte to string. +String hexString = ..fromByte(..) +ParserResult result = BvlcParser.parse(hexString) +``` diff --git a/src/main/java/no/entra/bacnet/bvlc/BvlcResult.java b/src/main/java/no/entra/bacnet/bvlc/BvlcResult.java deleted file mode 100644 index 859d614..0000000 --- a/src/main/java/no/entra/bacnet/bvlc/BvlcResult.java +++ /dev/null @@ -1,29 +0,0 @@ -package no.entra.bacnet.bvlc; - -@Deprecated //Use ParserResult -public class BvlcResult { - private final Bvlc bvlc; - private final String unprocessedHexString; - private boolean parsedOk = true; - - public BvlcResult(Bvlc bvlc, String unprocessedHexString) { - this.bvlc = bvlc; - this.unprocessedHexString = unprocessedHexString; - } - - public Bvlc getBvlc() { - return bvlc; - } - - public String getUnprocessedHexString() { - return unprocessedHexString; - } - - public boolean isParsedOk() { - return parsedOk; - } - - public void setParsedOk(boolean isParsedOk) { - this.parsedOk = isParsedOk; - } -} diff --git a/src/main/java/no/entra/bacnet/npdu/NpduResult.java b/src/main/java/no/entra/bacnet/npdu/NpduResult.java deleted file mode 100644 index 360a79d..0000000 --- a/src/main/java/no/entra/bacnet/npdu/NpduResult.java +++ /dev/null @@ -1,29 +0,0 @@ -package no.entra.bacnet.npdu; - -@Deprecated //Use ParserResult -public class NpduResult { - private final Npdu npdu; - private final String unprocessedHexString; - private boolean parsedOk = true; - - public NpduResult(Npdu npdu, String unprocessedHexString) { - this.npdu = npdu; - this.unprocessedHexString = unprocessedHexString; - } - - public Npdu getNpdu() { - return npdu; - } - - public String getUnprocessedHexString() { - return unprocessedHexString; - } - - public boolean isParsedOk() { - return parsedOk; - } - - public void setParsedOk(boolean parsedOk) { - this.parsedOk = parsedOk; - } -} diff --git a/src/main/java/no/entra/bacnet/properties/ReadAccessResult.java b/src/main/java/no/entra/bacnet/properties/ReadAccessResult.java index 4b4493f..235e93f 100644 --- a/src/main/java/no/entra/bacnet/properties/ReadAccessResult.java +++ b/src/main/java/no/entra/bacnet/properties/ReadAccessResult.java @@ -17,6 +17,7 @@ import static java.lang.Integer.parseInt; import static org.slf4j.LoggerFactory.getLogger; +@Deprecated public class ReadAccessResult { private static final Logger log = getLogger(ReadAccessResult.class); public static final String OBJECT_IDENTIFIER = "0c"; diff --git a/src/main/java/no/entra/bacnet/services/ReadObjectPropertiesResult.java b/src/main/java/no/entra/bacnet/properties/ReadObjectPropertiesResult.java similarity index 98% rename from src/main/java/no/entra/bacnet/services/ReadObjectPropertiesResult.java rename to src/main/java/no/entra/bacnet/properties/ReadObjectPropertiesResult.java index 3cee248..bd6fd46 100644 --- a/src/main/java/no/entra/bacnet/services/ReadObjectPropertiesResult.java +++ b/src/main/java/no/entra/bacnet/properties/ReadObjectPropertiesResult.java @@ -1,4 +1,4 @@ -package no.entra.bacnet.services; +package no.entra.bacnet.properties; import no.entra.bacnet.objects.ObjectId; diff --git a/src/main/java/no/entra/bacnet/services/ReadObjectPropertiesResultParser.java b/src/main/java/no/entra/bacnet/properties/ReadObjectPropertiesResultParser.java similarity index 98% rename from src/main/java/no/entra/bacnet/services/ReadObjectPropertiesResultParser.java rename to src/main/java/no/entra/bacnet/properties/ReadObjectPropertiesResultParser.java index 6ebef13..f36f37b 100644 --- a/src/main/java/no/entra/bacnet/services/ReadObjectPropertiesResultParser.java +++ b/src/main/java/no/entra/bacnet/properties/ReadObjectPropertiesResultParser.java @@ -1,10 +1,11 @@ -package no.entra.bacnet.services; +package no.entra.bacnet.properties; import no.entra.bacnet.apdu.SDContextTag; import no.entra.bacnet.objects.ObjectId; import no.entra.bacnet.objects.ObjectIdMapper; import no.entra.bacnet.octet.OctetReader; import no.entra.bacnet.parseandmap.ParserResult; +import no.entra.bacnet.services.BacnetParserException; import org.slf4j.Logger; import static no.entra.bacnet.apdu.ArrayTag.ARRAY1_END; diff --git a/src/main/java/no/entra/bacnet/services/ReadPropertyMultipleResponse.java b/src/main/java/no/entra/bacnet/properties/ReadPropertyMultipleResponse.java similarity index 99% rename from src/main/java/no/entra/bacnet/services/ReadPropertyMultipleResponse.java rename to src/main/java/no/entra/bacnet/properties/ReadPropertyMultipleResponse.java index 0167806..cee1199 100644 --- a/src/main/java/no/entra/bacnet/services/ReadPropertyMultipleResponse.java +++ b/src/main/java/no/entra/bacnet/properties/ReadPropertyMultipleResponse.java @@ -1,4 +1,4 @@ -package no.entra.bacnet.services; +package no.entra.bacnet.properties; import org.slf4j.Logger; diff --git a/src/main/java/no/entra/bacnet/services/ReadPropertyMultipleService.java b/src/main/java/no/entra/bacnet/properties/ReadPropertyMultipleService.java similarity index 97% rename from src/main/java/no/entra/bacnet/services/ReadPropertyMultipleService.java rename to src/main/java/no/entra/bacnet/properties/ReadPropertyMultipleService.java index 657d44f..5b49c92 100644 --- a/src/main/java/no/entra/bacnet/services/ReadPropertyMultipleService.java +++ b/src/main/java/no/entra/bacnet/properties/ReadPropertyMultipleService.java @@ -1,4 +1,4 @@ -package no.entra.bacnet.services; +package no.entra.bacnet.properties; import no.entra.bacnet.apdu.*; import no.entra.bacnet.bvlc.Bvlc; @@ -12,8 +12,10 @@ import no.entra.bacnet.octet.Octet; import no.entra.bacnet.octet.OctetReader; import no.entra.bacnet.parseandmap.ParserResult; -import no.entra.bacnet.properties.PropertyIdentifier; -import no.entra.bacnet.properties.PropertyReference; +import no.entra.bacnet.services.BacnetRequest; +import no.entra.bacnet.services.BacnetResponse; +import no.entra.bacnet.services.ConfirmedServiceChoice; +import no.entra.bacnet.services.Service; import org.slf4j.Logger; import java.util.HashSet; diff --git a/src/main/java/no/entra/bacnet/services/ReadPropertyMultipleServiceBuilder.java b/src/main/java/no/entra/bacnet/properties/ReadPropertyMultipleServiceBuilder.java similarity index 96% rename from src/main/java/no/entra/bacnet/services/ReadPropertyMultipleServiceBuilder.java rename to src/main/java/no/entra/bacnet/properties/ReadPropertyMultipleServiceBuilder.java index fe92bc2..7cba245 100644 --- a/src/main/java/no/entra/bacnet/services/ReadPropertyMultipleServiceBuilder.java +++ b/src/main/java/no/entra/bacnet/properties/ReadPropertyMultipleServiceBuilder.java @@ -1,11 +1,9 @@ -package no.entra.bacnet.services; +package no.entra.bacnet.properties; import no.entra.bacnet.device.DeviceId; import no.entra.bacnet.objects.ObjectId; import no.entra.bacnet.objects.ObjectProperties; import no.entra.bacnet.objects.ObjectType; -import no.entra.bacnet.properties.PropertyIdentifier; -import no.entra.bacnet.properties.PropertyReference; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/no/entra/bacnet/services/ReadPropertyResult.java b/src/main/java/no/entra/bacnet/properties/ReadPropertyResult.java similarity index 94% rename from src/main/java/no/entra/bacnet/services/ReadPropertyResult.java rename to src/main/java/no/entra/bacnet/properties/ReadPropertyResult.java index 67cc0de..1e45d6b 100644 --- a/src/main/java/no/entra/bacnet/services/ReadPropertyResult.java +++ b/src/main/java/no/entra/bacnet/properties/ReadPropertyResult.java @@ -1,6 +1,4 @@ -package no.entra.bacnet.services; - -import no.entra.bacnet.properties.PropertyIdentifier; +package no.entra.bacnet.properties; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/no/entra/bacnet/services/ReadPropertyResultParser.java b/src/main/java/no/entra/bacnet/properties/ReadPropertyResultParser.java similarity index 98% rename from src/main/java/no/entra/bacnet/services/ReadPropertyResultParser.java rename to src/main/java/no/entra/bacnet/properties/ReadPropertyResultParser.java index d58690b..19a9dc6 100644 --- a/src/main/java/no/entra/bacnet/services/ReadPropertyResultParser.java +++ b/src/main/java/no/entra/bacnet/properties/ReadPropertyResultParser.java @@ -1,4 +1,4 @@ -package no.entra.bacnet.services; +package no.entra.bacnet.properties; import no.entra.bacnet.apdu.ApplicationTag; import no.entra.bacnet.apdu.MeasurementUnit; @@ -11,7 +11,7 @@ import no.entra.bacnet.octet.Octet; import no.entra.bacnet.octet.OctetReader; import no.entra.bacnet.parseandmap.ParserResult; -import no.entra.bacnet.properties.PropertyIdentifier; +import no.entra.bacnet.services.BacnetParserException; import org.slf4j.Logger; import java.util.HashMap; diff --git a/src/test/java/no/entra/bacnet/device/FindDevicesAndSensorsOnADeviceFlowTest.java b/src/test/java/no/entra/bacnet/device/FindDevicesAndSensorsOnADeviceFlowTest.java index 2f6ba62..861eaa9 100644 --- a/src/test/java/no/entra/bacnet/device/FindDevicesAndSensorsOnADeviceFlowTest.java +++ b/src/test/java/no/entra/bacnet/device/FindDevicesAndSensorsOnADeviceFlowTest.java @@ -3,8 +3,8 @@ import no.entra.bacnet.objects.ObjectProperties; import no.entra.bacnet.properties.PropertyIdentifier; import no.entra.bacnet.properties.PropertyReference; -import no.entra.bacnet.services.ReadPropertyMultipleService; -import no.entra.bacnet.services.ReadPropertyMultipleServiceBuilder; +import no.entra.bacnet.properties.ReadPropertyMultipleService; +import no.entra.bacnet.properties.ReadPropertyMultipleServiceBuilder; import org.junit.jupiter.api.Test; import java.util.*; diff --git a/src/test/java/no/entra/bacnet/services/ReadObjectPropertiesResultParserTest.java b/src/test/java/no/entra/bacnet/properties/ReadObjectPropertiesResultParserTest.java similarity index 98% rename from src/test/java/no/entra/bacnet/services/ReadObjectPropertiesResultParserTest.java rename to src/test/java/no/entra/bacnet/properties/ReadObjectPropertiesResultParserTest.java index 277d636..64237df 100644 --- a/src/test/java/no/entra/bacnet/services/ReadObjectPropertiesResultParserTest.java +++ b/src/test/java/no/entra/bacnet/properties/ReadObjectPropertiesResultParserTest.java @@ -1,10 +1,10 @@ -package no.entra.bacnet.services; +package no.entra.bacnet.properties; import no.entra.bacnet.apdu.MeasurementUnit; import no.entra.bacnet.objects.ObjectId; import no.entra.bacnet.objects.ObjectType; import no.entra.bacnet.parseandmap.ParserResult; -import no.entra.bacnet.properties.PropertyIdentifier; +import no.entra.bacnet.services.BacnetParserException; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/src/test/java/no/entra/bacnet/services/ReadPropertyResultParserTest.java b/src/test/java/no/entra/bacnet/properties/ReadPropertyResultParserTest.java similarity index 95% rename from src/test/java/no/entra/bacnet/services/ReadPropertyResultParserTest.java rename to src/test/java/no/entra/bacnet/properties/ReadPropertyResultParserTest.java index 149e22b..4579a84 100644 --- a/src/test/java/no/entra/bacnet/services/ReadPropertyResultParserTest.java +++ b/src/test/java/no/entra/bacnet/properties/ReadPropertyResultParserTest.java @@ -1,18 +1,18 @@ -package no.entra.bacnet.services; +package no.entra.bacnet.properties; import no.entra.bacnet.apdu.MeasurementUnit; import no.entra.bacnet.error.ErrorClassType; import no.entra.bacnet.error.ErrorCodeType; import no.entra.bacnet.objects.ObjectId; import no.entra.bacnet.parseandmap.ParserResult; -import no.entra.bacnet.properties.PropertyIdentifier; +import no.entra.bacnet.services.BacnetParserException; import org.junit.jupiter.api.Test; import java.util.Map; import static no.entra.bacnet.objects.ObjectType.AnalogValue; -import static no.entra.bacnet.services.ReadPropertyResultParser.ERROR_CLASS; -import static no.entra.bacnet.services.ReadPropertyResultParser.ERROR_CODE; +import static no.entra.bacnet.properties.ReadPropertyResultParser.ERROR_CLASS; +import static no.entra.bacnet.properties.ReadPropertyResultParser.ERROR_CODE; import static org.junit.jupiter.api.Assertions.*; /*