#4 Restructured code to reflect "package by function"

entraeiendom · Apr 10, 2021 · 1dc66a6 · 1dc66a6
1 parent a763ce9
commit 1dc66a6
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 80 deletions.
diff --git 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<T> 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
diff --git a/src/main/java/no/entra/bacnet/npdu/NpduResult.java b/src/main/java/no/entra/bacnet/npdu/NpduResult.java
diff --git 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/.../services/ReadObjectPropertiesResult.java → ...roperties/ReadObjectPropertiesResult.java b/.../services/ReadObjectPropertiesResult.java → ...roperties/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/...ces/ReadObjectPropertiesResultParser.java → ...ies/ReadObjectPropertiesResultParser.java b/...ces/ReadObjectPropertiesResultParser.java → ...ies/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/...ervices/ReadPropertyMultipleResponse.java → ...perties/ReadPropertyMultipleResponse.java b/...ervices/ReadPropertyMultipleResponse.java → ...perties/ReadPropertyMultipleResponse.java
@@ -1,4 +1,4 @@
-package no.entra.bacnet.services;
+package no.entra.bacnet.properties;
 
 import org.slf4j.Logger;
 

diff --git a/...services/ReadPropertyMultipleService.java → ...operties/ReadPropertyMultipleService.java b/...services/ReadPropertyMultipleService.java → ...operties/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/...s/ReadPropertyMultipleServiceBuilder.java → ...s/ReadPropertyMultipleServiceBuilder.java b/...s/ReadPropertyMultipleServiceBuilder.java → ...s/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/...a/bacnet/services/ReadPropertyResult.java → ...bacnet/properties/ReadPropertyResult.java b/...a/bacnet/services/ReadPropertyResult.java → ...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/...et/services/ReadPropertyResultParser.java → .../properties/ReadPropertyResultParser.java b/...et/services/ReadPropertyResultParser.java → .../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
@@ -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/...ReadObjectPropertiesResultParserTest.java → ...ReadObjectPropertiesResultParserTest.java b/...ReadObjectPropertiesResultParserTest.java → ...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/...ervices/ReadPropertyResultParserTest.java → ...perties/ReadPropertyResultParserTest.java b/...ervices/ReadPropertyResultParserTest.java → ...perties/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.*;
 
 /*