Removes connectToHTTPVABElement method
* Replaced by getDeepProxy of last commit
Change-Id: I5497c53b9ac4ea78ab1de7a5a3dedb154656acb7
Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
diff --git a/components/basys.components/src/main/java/org/eclipse/basyx/tools/aas/connManager/AASConnectionManager.java b/components/basys.components/src/main/java/org/eclipse/basyx/tools/aas/connManager/AASConnectionManager.java
index 46abbe8..66cbbf9 100644
--- a/components/basys.components/src/main/java/org/eclipse/basyx/tools/aas/connManager/AASConnectionManager.java
+++ b/components/basys.components/src/main/java/org/eclipse/basyx/tools/aas/connManager/AASConnectionManager.java
@@ -109,28 +109,6 @@
}
/**
- * Connect to an VAB element on an HTTP server and add an URL prefix
- *
- * @param urn
- * the URN that describes the element.
- * @param prefix
- * the prefix will be added to the address
- */
- @Override
- public VABElementProxy connectToHTTPVABElement(String urn, String prefix) {
- // Get AAS from directory
- String addr = "";
-
- // Lookup address in directory server
- addr = directoryService.lookup(urn);
- // - Add prefix to addr
- addr = VABPathTools.concatenatePaths(addr, prefix);
-
- // Return a new VABElementProxy
- return new VABElementProxy(VABPathTools.removeAddressEntry(addr), providerProvider.getConnector(addr));
- }
-
- /**
* Connect to an VAB element on an HTTP server using a qualified URL
*
* @param url
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/device/SmartBaSyxTCPDeviceMockup.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/device/SmartBaSyxTCPDeviceMockup.java
index c8e4389..2b9414b 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/device/SmartBaSyxTCPDeviceMockup.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/device/SmartBaSyxTCPDeviceMockup.java
@@ -110,7 +110,7 @@
// Connect to AAS server
- aasServerConnection = this.getConnectionManager().connectToHTTPVABElement("AASServer", "/aas/submodels/aasRepository/");
+ aasServerConnection = this.getConnectionManager().connectToVABElement("AASServer").getDeepProxy("/aas/submodels/aasRepository/");
// Create device AAS
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/BaSyxTCPControlManufacturingDeviceManager.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/BaSyxTCPControlManufacturingDeviceManager.java
index 04a61b6..94a569e 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/BaSyxTCPControlManufacturingDeviceManager.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/BaSyxTCPControlManufacturingDeviceManager.java
@@ -53,7 +53,7 @@
// Set service connection manager and create AAS server connection
setConnectionManager(new VABConnectionManager(new ExamplesPreconfiguredDirectory(), new HTTPConnectorProvider()));
// - Create AAS server connection
- aasServerConnection = getConnectionManager().connectToHTTPVABElement("AASServer", "/aas/submodels/aasRepository/");
+ aasServerConnection = getConnectionManager().connectToVABElement("AASServer").getDeepProxy("/aas/submodels/aasRepository/");
// Set AAS server VAB object ID, AAS server URL, and AAS server path prefix
diff --git a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/ManufacturingDeviceManager.java b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/ManufacturingDeviceManager.java
index 0c31911..44bb8d1 100644
--- a/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/ManufacturingDeviceManager.java
+++ b/examples/basys.examples/src/test/java/org/eclipse/basyx/examples/mockup/devicemanager/ManufacturingDeviceManager.java
@@ -85,7 +85,7 @@
// Set service connection manager and create AAS server connection
setConnectionManager(new VABConnectionManager(new ExamplesPreconfiguredDirectory(), new HTTPConnectorProvider()));
// - Create AAS server connection
- aasServerConnection = getConnectionManager().connectToHTTPVABElement("AASServer", "/aas/submodels/aasRepository/");
+ aasServerConnection = getConnectionManager().connectToVABElement("AASServer").getDeepProxy("/aas/submodels/aasRepository/");
// Set AAS server VAB object ID, AAS server URL, and AAS server path prefix
diff --git a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/vab/core/VABConnectionManager.java b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/vab/core/VABConnectionManager.java
index 1ffc280..5af2818 100644
--- a/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/vab/core/VABConnectionManager.java
+++ b/sdks/java/basys.sdk/src/main/java/org/eclipse/basyx/vab/core/VABConnectionManager.java
@@ -61,28 +61,6 @@
return new VABElementProxy(VABPathTools.removeAddressEntry(addr), providerProvider.getConnector(addr));
}
-
- /**
- * Connect to an VAB element on an HTTP server and add an URL prefix
- *
- * @param urn the URN that describes the element.
- * @param prefix the prefix will be added to the address
- */
- public VABElementProxy connectToHTTPVABElement(String urn, String prefix) {
-
- // Get AAS from directory
- String addr = "";
-
- // Lookup address in directory server
- addr = directoryService.lookup(urn);
- // - Add prefix to addr
- addr = VABPathTools.concatenatePaths(addr, prefix);
-
- // Return a new VABElementProxy
- return new VABElementProxy(VABPathTools.removeAddressEntry(addr), providerProvider.getConnector(addr));
- }
-
-
/**
* Connect to an VAB element on an HTTP server using a qualified URL
*