Integrating capability-based RMI on Sentinel for Java side

[iot2.git] / iotjava / iotruntime / master / ObjectInitHandler.java

diff --git a/iotjava/iotruntime/master/ObjectInitHandler.java b/iotjava/iotruntime/master/ObjectInitHandler.java
index 2686a81ee7d30db6aa5fe48a3728975d6c4d9387..27366b6ce8185a47630fcc8aee7cd659c1fa2b7f 100644 (file)
--- a/iotjava/iotruntime/master/ObjectInitHandler.java
+++ b/iotjava/iotruntime/master/ObjectInitHandler.java
@@ -118,7 +118,7 @@ public final class ObjectInitHandler {
         */
        public void addObjectIntoField(String strField, String strIoTSlaveObjectHostAdd,
                String strObjName, String strObjClassName, String strObjClassInterfaceName,
-               int iRMIRegPort, int iRMIStubPort) {
+               String strObjStubClsIntfaceName, int iRMIRegPort, int iRMIStubPort) {
 
                // Get index of strField
                int iFieldIndex = listField.indexOf(strField);
@@ -127,7 +127,7 @@ public final class ObjectInitHandler {
                List<ObjectInitInfo> list = listFieldToObject.get(iFieldIndex);
                // Create a new ObjectInitInfo for a new object in the field
                ObjectInitInfo objInitInfo = new ObjectInitInfo(strIoTSlaveObjectHostAdd, strObjName,
-                       strObjClassName, strObjClassInterfaceName, iRMIRegPort, iRMIStubPort);
+                       strObjClassName, strObjClassInterfaceName, strObjStubClsIntfaceName, iRMIRegPort, iRMIStubPort);
                // Add the new ObjectInitInfo
                list.add(objInitInfo);
        }
@@ -149,7 +149,7 @@ public final class ObjectInitHandler {
         */
        public void addSecondObjectIntoField(String strField, String strIoTSlaveObjectHostAdd,
                String strObjName, String strObjClassName, String strObjClassInterfaceName,
-               int iRMIRegPort, int iRMIStubPort) {
+               String strObjStubClsIntfaceName, int iRMIRegPort, int iRMIStubPort) {
 
                // Get index of strField
                int iFieldIndex = listField.indexOf(strField);
@@ -157,7 +157,7 @@ public final class ObjectInitHandler {
                List<ObjectInitInfo> list = mapFieldToSecondObject.get(iFieldIndex);
                // Create a new ObjectInitInfo for a new object in the field
                ObjectInitInfo objInitInfo = new ObjectInitInfo(strIoTSlaveObjectHostAdd, strObjName,
-                       strObjClassName, strObjClassInterfaceName, iRMIRegPort, iRMIStubPort);
+                       strObjClassName, strObjClassInterfaceName, strObjStubClsIntfaceName, iRMIRegPort, iRMIStubPort);
                // Add the new ObjectInitInfo
                list.add(objInitInfo);
        }
@@ -246,6 +246,7 @@ public final class ObjectInitHandler {
                                RuntimeOutput.print("==> Object name: " + objInitInfo.getObjectName(), bVerbose);
                                RuntimeOutput.print("==> Object class name: " + objInitInfo.getObjectClassName(), bVerbose);
                                RuntimeOutput.print("==> Object class interface: " + objInitInfo.getObjectClassInterfaceName(), bVerbose);
+                               RuntimeOutput.print("==> Object stub class interface: " + objInitInfo.getObjectStubClassInterfaceName(), bVerbose);
                                RuntimeOutput.print("==> RMI registry port: " + objInitInfo.getRMIRegistryPort(), bVerbose);
                                RuntimeOutput.print("==> RMI stub port: " + objInitInfo.getRMIStubPort(), bVerbose);
 
@@ -257,42 +258,11 @@ public final class ObjectInitHandler {
                                        RuntimeOutput.print("==> Object name: " + objSecObj.getObjectName(), bVerbose);
                                        RuntimeOutput.print("==> Object class name: " + objSecObj.getObjectClassName(), bVerbose);
                                        RuntimeOutput.print("==> Object class interface: " + objSecObj.getObjectClassInterfaceName(), bVerbose);
+                                       RuntimeOutput.print("==> Object stub class interface: " + objInitInfo.getObjectStubClassInterfaceName(), bVerbose);
                                        RuntimeOutput.print("==> RMI registry port: " + objSecObj.getRMIRegistryPort(), bVerbose);
                                        RuntimeOutput.print("==> RMI stub port: " + objSecObj.getRMIStubPort(), bVerbose);                              
                                }
                        }
                }
        }
-
-       public static void main(String[] args) throws Exception {
-
-               ObjectInitHandler objInitHand = new ObjectInitHandler(true);
-               // Field #1 IoTSet
-               objInitHand.addField("someField1", IoTCommCode.CREATE_NEW_IOTSET);
-               objInitHand.addObjectIntoField("someField1", "192.168.2.191", "LifxLightBulbLB1", 
-                       "LifxLightBulb", "LightBulb", 1234, 2345);
-               objInitHand.addObjectIntoField("someField1", "192.168.2.192", "LifxLightBulbLB2", 
-                       "LifxLightBulb", "LightBulb", 4321, 5432);
-
-               // Field #2 IoTRelation
-               objInitHand.addField("someField2", IoTCommCode.CREATE_NEW_IOTRELATION);
-               objInitHand.addObjectIntoField("someField2", "192.168.2.191", "LifxLightBulbLB1", 
-                       "LifxLightBulb", "LightBulb", 1111, 2222);
-               objInitHand.addSecondObjectIntoField("someField2", "192.168.2.192", "LifxLightBulbLB1", 
-                       "LifxLightBulb", "LightBulb", 3333, 4444);
-
-               objInitHand.addObjectIntoField("someField2", "192.168.2.191", "LifxLightBulbLB2", 
-                       "LifxLightBulb", "LightBulb", 5555, 6666);
-               objInitHand.addSecondObjectIntoField("someField2", "192.168.2.192", "LifxLightBulbLB2", 
-                       "LifxLightBulb", "LightBulb", 7777, 8888);
-
-               // Field #3 IoTSet
-               objInitHand.addField("someField3", IoTCommCode.CREATE_NEW_IOTSET);
-               objInitHand.addObjectIntoField("someField3", "192.168.2.191", "LifxLightBulbLB1", 
-                       "LifxLightBulb", "LightBulb", 5678, 8989);
-               objInitHand.addObjectIntoField("someField3", "192.168.2.192", "LifxLightBulbLB2", 
-                       "LifxLightBulb", "LightBulb", 5432, 4576);
-               objInitHand.printLists();
-               //objInitHand.addField("someField1", IoTCommCode.CREATE_NEW_IOTSET, null, null);
-       }
 }