Modification as per SVACE result for Java layer
authorsaurabh.s9 <saurabh.s9@samsung.com>
Tue, 27 Jun 2017 04:02:22 +0000 (09:32 +0530)
committerDmitriy Zhuravlev <d.zhuravlev@samsung.com>
Wed, 28 Jun 2017 07:28:49 +0000 (07:28 +0000)
Change-Id: If26f219c2e137efa292dae87468eb4fc8abe987b
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21033
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
30 files changed:
java/common/src/main/java/org/iotivity/base/CredType.java
java/common/src/main/java/org/iotivity/base/DeviceStatus.java
java/common/src/main/java/org/iotivity/base/ErrorCode.java
java/common/src/main/java/org/iotivity/base/KeySize.java
java/common/src/main/java/org/iotivity/base/MVJustWorksOptionMask.java
java/common/src/main/java/org/iotivity/base/ModeType.java
java/common/src/main/java/org/iotivity/base/ObserveAction.java
java/common/src/main/java/org/iotivity/base/ObserveType.java
java/common/src/main/java/org/iotivity/base/OcAccountManager.java
java/common/src/main/java/org/iotivity/base/OcCloudProvisioning.java
java/common/src/main/java/org/iotivity/base/OcConnectivityType.java
java/common/src/main/java/org/iotivity/base/OcDirectPairDevice.java
java/common/src/main/java/org/iotivity/base/OcPlatformStatus.java
java/common/src/main/java/org/iotivity/base/OcPrmType.java [changed mode: 0755->0644]
java/common/src/main/java/org/iotivity/base/OcProvisioning.java
java/common/src/main/java/org/iotivity/base/OcRDClient.java
java/common/src/main/java/org/iotivity/base/OcResource.java
java/common/src/main/java/org/iotivity/base/OcSecureResource.java
java/common/src/main/java/org/iotivity/base/OicSecAce.java
java/common/src/main/java/org/iotivity/base/OicSecAcl.java
java/common/src/main/java/org/iotivity/base/OicSecCloudAce.java
java/common/src/main/java/org/iotivity/base/OicSecResr.java
java/common/src/main/java/org/iotivity/base/OicSecValidity.java
java/common/src/main/java/org/iotivity/base/OwnedStatus.java
java/common/src/main/java/org/iotivity/base/PinType.java [changed mode: 0755->0644]
java/common/src/main/java/org/iotivity/base/ProvisionResult.java
java/common/src/main/java/org/iotivity/base/RequestHandlerFlag.java
java/common/src/main/java/org/iotivity/base/RequestType.java
java/common/src/main/java/org/iotivity/base/ResourceProperty.java
java/common/src/main/java/org/iotivity/base/ServiceType.java

index 87a33eb..39582ce 100644 (file)
@@ -39,9 +39,7 @@ public enum CredType {
 
     PIN_PASSWORD                    (1 << 4),
 
-    ASYMMETRIC_ENCRYPTION_KEY       (1 << 5),
-
-    ;
+    ASYMMETRIC_ENCRYPTION_KEY       (1 << 5);
     private int value;
 
     private CredType(int value) {
index 0eefcaf..bc44c4a 100644 (file)
@@ -39,16 +39,13 @@ public enum DeviceStatus {
 
     public static DeviceStatus convertDeviceStatus(int value) {
 
-        if (1 == value)
-        {
+        if (1 == value) {
             return DeviceStatus.ON;
         }
-        else if (2 == value)
-        {
+        else if (2 == value) {
             return DeviceStatus.OFF;
         }
-        else
-        {
+        else {
             return DeviceStatus.INVALID;
         }
     }
index 7318a0c..4293514 100644 (file)
@@ -75,7 +75,7 @@ public enum ErrorCode {
     JNI_EXCEPTION("JNI_EXCEPTION", "Generic Java binder error"),
     JNI_NO_NATIVE_OBJECT("JNI_NO_NATIVE_OBJECT", ""),
     JNI_INVALID_VALUE("JNI_INVALID_VALUE", ""),
-    INVALID_CLASS_CAST("INVALID_CLASS_CAST", ""),;
+    INVALID_CLASS_CAST("INVALID_CLASS_CAST", "");
 
     private String error;
     private String description;
index 83c5799..fdd19a9 100644 (file)
@@ -23,8 +23,8 @@
 package org.iotivity.base;
 
 public enum KeySize {
-    OWNER_PSK_LENGTH_128 (128/8),
-    OWNER_PSK_LENGTH_256 (256/8),;
+    OWNER_PSK_LENGTH_128 (128 / 8),
+    OWNER_PSK_LENGTH_256 (256 / 8);
 
     private int value;
 
index 7e111ca..2a61e89 100644 (file)
@@ -28,8 +28,7 @@ import java.util.EnumSet;
 public enum MVJustWorksOptionMask {
     NOT_APPLICABLE (0x0),
     DISPLAY_MUTUAL_VERIF_NUM  (0x1 << 0),
-    CONFIRM_MUTUAL_VERIF_NUM  (0x1 << 1),
-    ;
+    CONFIRM_MUTUAL_VERIF_NUM  (0x1 << 1);
 
     private int value;
 
index d12cab7..7ac8026 100644 (file)
@@ -41,7 +41,7 @@ public enum ModeType {
     /**
      * Client/Server mode along with Routing capabilities.
      */
-    GATEWAY(3),;
+    GATEWAY(3);
 
     private int value;
 
index 5506749..15ad58c 100644 (file)
@@ -24,7 +24,7 @@ package org.iotivity.base;
 
 public enum ObserveAction {
     REGISTER(0),
-    UNREGISTER(1),;
+    UNREGISTER(1);
 
     private int value;
 
index ca990a9..2140203 100644 (file)
@@ -24,7 +24,7 @@ package org.iotivity.base;
 
 public enum ObserveType {
     OBSERVE(0),
-    OBSERVE_ALL(1),;
+    OBSERVE_ALL(1);
 
     private int value;
 
index 9280ec4..7647aa8 100644 (file)
@@ -451,10 +451,10 @@ public final class OcAccountManager {
      * Event listeners are notified asynchronously
      */
     public interface OnPostListener {
-            public void onPostCompleted(List<OcHeaderOption> headerOptionList,
-                                        OcRepresentation ocRepresentation);
+        public void onPostCompleted(List<OcHeaderOption> headerOptionList,
+                                    OcRepresentation ocRepresentation);
 
-            public void onPostFailed(Throwable ex);
+        public void onPostFailed(Throwable ex);
     }
 
     /**
index cbe9938..e10a0eb 100644 (file)
@@ -70,7 +70,7 @@ public class  OcCloudProvisioning {
         public void getAclIdByDeviceListener(int result, String aclId);
     }
 
-     public interface CreateAclIdListener {
+    public interface CreateAclIdListener {
         public void createAclIdListener(int result, String aclId);
     }
 
@@ -130,7 +130,7 @@ public class  OcCloudProvisioning {
     public native void getIndividualAclInfo(String aclId,
             GetIndividualAclInfoListener cloudAclIndividualGetInfoHandler) throws OcException;
 
-        /**
+    /**
     * Method to update Individual ACL info
     * @param aclId ACL ID
     * @param cloudAces List of cloud Aces for updation.
index 0eb951a..d933032 100644 (file)
@@ -82,8 +82,7 @@ public enum OcConnectivityType {
     CT_SCOPE_ORG            (0x8),
 
     /** IPv6 Global scope.*/
-    CT_SCOPE_GLOBAL         (0xE),
-    ;
+    CT_SCOPE_GLOBAL         (0xE);
 
     private int value;
 
index 57c7475..66083b8 100644 (file)
@@ -39,13 +39,11 @@ public class OcDirectPairDevice {
         this.mNativeHandle = nativeHandle;
     }
 
-    public OcDirectPairDevice(String deviceID)
-    {
+    public OcDirectPairDevice(String deviceID) {
         this.mdeviceID = deviceID;
     }
 
-    public String getDevId()
-    {
+    public String getDevId() {
         return this.mdeviceID;
     }
 
@@ -54,8 +52,7 @@ public class OcDirectPairDevice {
     public List<Integer> getPairingMethodList() {
         int [] intList = this.getPairingMethods();
         List<Integer> prmList = new ArrayList<Integer>();
-        for (int i = 0; i < intList.length; i++)
-        {
+        for (int i = 0; i < intList.length; i++) {
             prmList.add(intList[i]);
         }
         return  prmList;
index c41eb37..6ddb22e 100644 (file)
@@ -24,7 +24,7 @@ package org.iotivity.base;
 
 public enum OcPlatformStatus {
     UP(0),
-    DOWN(1),;
+    DOWN(1);
 
     private int value;
 
old mode 100755 (executable)
new mode 100644 (file)
index 2c2b37f..c1d5de1
@@ -44,8 +44,7 @@ public enum OcPrmType {
     }\r
 \r
     public static OcPrmType convertOcPrmType(int value) {\r
-        switch (value)\r
-        {\r
+        switch (value) {\r
             case 0:\r
                 return OcPrmType.DP_NOT_ALLOWED;\r
             case 1:\r
index e02755c..c5d2305 100644 (file)
@@ -83,16 +83,29 @@ public class OcProvisioning {
      *
      * @param type     OxmType ownership transfer type.
      * @param pinCallbackListener Pin callback Listener.
-     *
+     * @deprecated use {@link #setOwnershipTransferCBdata} instead.
      * @throws OcException Indicate failure registering ownership transfer.
      *                     Use OcException.GetErrorCode() for more details.
      */
     public static void SetownershipTransferCBdata(OxmType type,
-            PinCallbackListener pinCallbackListener) throws OcException
-    {
+            PinCallbackListener pinCallbackListener) throws OcException {
         OcProvisioning.ownershipTransferCBdata(type.getValue(), pinCallbackListener);
     }
 
+    /**
+     *  API for registering Ownership transfer methods for a particular
+     *  transfer Type
+     *
+     * @param type     OxmType ownership transfer type.
+     * @param pinCallbackListener Pin callback Listener.
+     *
+     * @throws OcException Indicate failure registering ownership transfer.
+     *                     Use OcException.GetErrorCode() for more details.
+     */
+    public static void setOwnershipTransferCBdata(OxmType type,
+            PinCallbackListener pinCallbackListener) throws OcException {
+        OcProvisioning.ownershipTransferCBdata(type.getValue(), pinCallbackListener);
+    }
     private  static native void ownershipTransferCBdata(int oxmType,  PinCallbackListener pinCallbackListener);
 
     public static interface PinCallbackListener {
@@ -111,8 +124,8 @@ public class OcProvisioning {
      */
     public static List<OcSecureResource> discoverMOTEnabledDevices(int timeout)
         throws OcException {
-            return Arrays.asList(OcProvisioning.discoverMOTEnabledDevices1(timeout));
-        }
+        return Arrays.asList(OcProvisioning.discoverMOTEnabledDevices1(timeout));
+    }
     private static native OcSecureResource[] discoverMOTEnabledDevices1(int timeout)
         throws OcException;
 
@@ -126,8 +139,8 @@ public class OcProvisioning {
      */
     public static List<OcSecureResource> discoverMOTEnabledOwnedDevices(int timeout)
         throws OcException {
-            return Arrays.asList(OcProvisioning.discoverMOTEnabledOwnedDevices1(timeout));
-        }
+        return Arrays.asList(OcProvisioning.discoverMOTEnabledOwnedDevices1(timeout));
+    }
     private static native OcSecureResource[] discoverMOTEnabledOwnedDevices1(int timeout)
         throws OcException;
 
@@ -249,7 +262,7 @@ public class OcProvisioning {
      *                     Use OcException.GetErrorCode() for more details.
      */
     public static int saveTrustCertChain(byte[] trustCertChain, EncodingType encodingType) throws OcException {
-        return saveTrustCertChain1(trustCertChain,encodingType.getValue());
+        return saveTrustCertChain1(trustCertChain, encodingType.getValue());
     }
     private static native int saveTrustCertChain1(byte[] trustCertChain, int encodingType)
         throws OcException;
index fbbd481..697ee18 100644 (file)
@@ -27,8 +27,7 @@ import java.util.List;
 public final class OcRDClient {
     private static QualityOfService sPlatformQualityOfService = QualityOfService.NA;
 
-    private OcRDClient()
-    {
+    private OcRDClient() {
     }
     /**
      * API to publish resource to remote resource-directory.
@@ -241,7 +240,7 @@ public final class OcRDClient {
      * @param host                        Host Address of a service to publish resource.
      * @param connectivityTypeSet         Set of types of connectivity. Example: IP
      * @param ocResourceHandleList        reference to list of resource handles to be published.
-     * @param onDeleteResourceListener         Handles events, success states and failure states.
+     * @param onDeleteResourceListener    Handles events, success states and failure states.
      * @throws OcException if failure
      */
     public static void deleteResourceFromRD(
index c987058..f8cadaa 100644 (file)
@@ -565,7 +565,7 @@ public class OcResource {
      * @return New host Address.
      *         Not observable.
      */
-     public native String setHost(String host);
+    public native String setHost(String host);
      
     /**
      * Method to get the list of resource types
index 9f7f295..8437f2d 100644 (file)
@@ -178,16 +178,15 @@ public class OcSecureResource {
             boolean edp , ProvisionDirectPairingListener provisionDirectPairingListener)
         throws OcException {
 
-            int[] typeArray = new int[type.size()];
-            int i = 0;
-            for (OcPrmType ocPrmType:type) {
-                typeArray[i++] = ocPrmType.getValue();
-            }
-
-            this.provisionDirectPairing(pin, pdacls, typeArray, (edp?1:0),
-                    provisionDirectPairingListener);
+        int[] typeArray = new int[type.size()];
+        int i = 0;
+        for (OcPrmType ocPrmType:type) {
+            typeArray[i++] = ocPrmType.getValue();
         }
 
+        this.provisionDirectPairing(pin, pdacls, typeArray, (edp ? 1: 0), provisionDirectPairingListener);
+    }
+
     private native void provisionDirectPairing(String pin, OicSecPdAcl[] pdacls, int[] type,
             int edp , ProvisionDirectPairingListener provisionDirectPairingListener)
         throws OcException;
@@ -352,7 +351,7 @@ public class OcSecureResource {
                 int hasError);
     }
 
-       /**
+    /**
      * provisionTrustCertChainListener can be registered with ProvisionTrustCertChainListener
      * call.
      * Listener notified asynchronously.
@@ -386,7 +385,7 @@ public class OcSecureResource {
      *
      *  @return Sring List  List of device id's of linked devices.
      */
-     public native List<String> getLinkedDevices();
+    public native List<String> getLinkedDevices();
 
      /**
       * Method to get IP address of sercure discovered device.
index a5bd53f..25aa762 100644 (file)
@@ -24,57 +24,57 @@ package org.iotivity.base;
 
 import java.util.List;
 public class OicSecAce {
-        private String subjectID;
-        private int permission;
-        private List<OicSecResr> resources;
-        private List<OicSecValidity> validities;
+    private String subjectID;
+    private int permission;
+    private List<OicSecResr> resources;
+    private List<OicSecValidity> validities;
 
-        public OicSecAce(String subjectID, int permission,
-                List<OicSecResr> resources, List<OicSecValidity> validities) {
-            super();
-            this.subjectID = subjectID;
-            this.permission = permission;
-            this.resources = resources;
-            this.validities = validities;
-        }
+    public OicSecAce(String subjectID, int permission,
+            List<OicSecResr> resources, List<OicSecValidity> validities) {
+        super();
+        this.subjectID = subjectID;
+        this.permission = permission;
+        this.resources = resources;
+        this.validities = validities;
+    }
 
-        public String getSubjectID() {
-            return subjectID;
-        }
+    public String getSubjectID() {
+        return subjectID;
+    }
 
-        public void setSubjectID(String subjectID) {
-            this.subjectID = subjectID;
-        }
+    public void setSubjectID(String subjectID) {
+        this.subjectID = subjectID;
+    }
 
-        public int getPermission() {
-            return permission;
-        }
+    public int getPermission() {
+        return permission;
+    }
 
-        public void setPermission(int permission) {
-            this.permission = permission;
-        }
+    public void setPermission(int permission) {
+        this.permission = permission;
+    }
 
-        public List<OicSecResr> getResourcesList() {
-            return resources;
-        }
+    public List<OicSecResr> getResourcesList() {
+        return resources;
+    }
 
-        public OicSecResr[] getResources() {
-            return resources.toArray(new OicSecResr[resources.size()]);
-        }
-        public void setResources(List<OicSecResr> resources) {
-            this.resources = resources;
-        }
+    public OicSecResr[] getResources() {
+        return resources.toArray(new OicSecResr[resources.size()]);
+    }
+    public void setResources(List<OicSecResr> resources) {
+        this.resources = resources;
+    }
 
-        public List<OicSecValidity> getValiditiesList() {
-            return validities;
-        }
+    public List<OicSecValidity> getValiditiesList() {
+        return validities;
+    }
 
-        public OicSecValidity[] getValidities() {
-            return validities.toArray(new OicSecValidity[validities.size()]);
-        }
+    public OicSecValidity[] getValidities() {
+        return validities.toArray(new OicSecValidity[validities.size()]);
+    }
 
 
-        public void setValidities(List<OicSecValidity> validities) {
-            this.validities = validities;
-        }
+    public void setValidities(List<OicSecValidity> validities) {
+        this.validities = validities;
+    }
 }
index f0fdc72..0311f13 100644 (file)
@@ -28,11 +28,11 @@ public class OicSecAcl {
     private String rownerID;\r
     private List<OicSecAce> oicSecAces;\r
 \r
-   public OicSecAcl (String rownerID, List<OicSecAce> oicSecAces) {\r
-       super();\r
-       this.rownerID = rownerID;\r
-       this.oicSecAces = oicSecAces;\r
-   }\r
+    public OicSecAcl (String rownerID, List<OicSecAce> oicSecAces) {\r
+        super();\r
+        this.rownerID = rownerID;\r
+        this.oicSecAces = oicSecAces;\r
+    }\r
     public String getRownerID() {\r
         return rownerID;\r
     }\r
index dd13ff1..14cccbb 100644 (file)
@@ -24,75 +24,75 @@ package org.iotivity.base;
 
 import java.util.List;
 public class OicSecCloudAce {
-        private String aclID;
-        private String subjectID;
-        private int stype;
-        private int permission;
-        private List<OicSecResr> resources;
-        private List<OicSecValidity> validities;
-
-        public OicSecCloudAce(String aclID, String subjectID, int stype, int permission,
-                List<OicSecResr> resources, List<OicSecValidity> validities) {
-            super();
-            this.subjectID = subjectID;
-            this.permission = permission;
-            this.resources = resources;
-            this.validities = validities;
-        }
-
-        public String getAclID() {
-            return aclID;
-        }
-
-        public String getSubjectID() {
-            return subjectID;
-        }
-
-        public void setAclID(String aclID) {
-            this.aclID = aclID;
-        }
-
-        public void setSubjectID(String subjectID) {
-            this.subjectID = subjectID;
-        }
-
-        public int getStype() {
-            return stype;
-        }
-
-        public void setStype(int stype) {
-            this.stype = stype;
-        }
-
-
-        public int getPermission() {
-            return permission;
-        }
-
-        public void setPermission(int permission) {
-            this.permission = permission;
-        }
-
-        public List<OicSecResr> getResourcesList() {
-            return resources;
-        }
-
-        public OicSecResr[] getResources() {
-            return resources.toArray(new OicSecResr[resources.size()]);
-        }
-        public void setResources(List<OicSecResr> resources) {
-            this.resources = resources;
-        }
-
-        public List<OicSecValidity> getValiditiesList() {
-            return validities;
-        }
-
-        public OicSecValidity[] getValidities() {
-            return validities.toArray(new OicSecValidity[validities.size()]);
-        }
-
-        public void setValidities(List<OicSecValidity> validities) {
-            this.validities = validities;
-        }
+    private String aclID;
+    private String subjectID;
+    private int stype;
+    private int permission;
+    private List<OicSecResr> resources;
+    private List<OicSecValidity> validities;
+
+    public OicSecCloudAce(String aclID, String subjectID, int stype, int permission,
+            List<OicSecResr> resources, List<OicSecValidity> validities) {
+        super();
+        this.subjectID = subjectID;
+        this.permission = permission;
+        this.resources = resources;
+        this.validities = validities;
+    }
+
+    public String getAclID() {
+        return aclID;
+    }
+
+    public String getSubjectID() {
+        return subjectID;
+    }
+
+    public void setAclID(String aclID) {
+        this.aclID = aclID;
+    }
+
+    public void setSubjectID(String subjectID) {
+        this.subjectID = subjectID;
+    }
+
+    public int getStype() {
+        return stype;
+    }
+
+    public void setStype(int stype) {
+        this.stype = stype;
+    }
+
+
+    public int getPermission() {
+        return permission;
+    }
+
+    public void setPermission(int permission) {
+        this.permission = permission;
+    }
+
+    public List<OicSecResr> getResourcesList() {
+        return resources;
+    }
+
+    public OicSecResr[] getResources() {
+        return resources.toArray(new OicSecResr[resources.size()]);
+    }
+    public void setResources(List<OicSecResr> resources) {
+        this.resources = resources;
+    }
+
+    public List<OicSecValidity> getValiditiesList() {
+        return validities;
+    }
+
+    public OicSecValidity[] getValidities() {
+        return validities.toArray(new OicSecValidity[validities.size()]);
+    }
+
+    public void setValidities(List<OicSecValidity> validities) {
+        this.validities = validities;
+    }
 }
index 490462e..d581af2 100644 (file)
@@ -25,78 +25,78 @@ package org.iotivity.base;
 import java.util.List;
 public class OicSecResr {
 
-        private String href;
-        private String rel;
-        private List<String> types;
-        private int typeLen;
-        private List<String> interfaces;
-        private int interfaceLen;
-
-        public OicSecResr(String href, String rel, List<String> types, int typeLen,
-                List<String> interfaces, int interfaceLen) {
-            super();
-            this.href = href;
-            this.rel = rel;
-            this.types = types;
-            this.typeLen = typeLen;
-            this.interfaces = interfaces;
-            this.interfaceLen = interfaceLen;
-        }
-
-        public String getHref() {
-            return href;
-        }
-
-        public void setHref(String href) {
-            this.href = href;
-        }
-
-        public String getRel() {
-            return rel;
-        }
-
-        public void setRel(String rel) {
-            this.rel = rel;
-        }
-
-        public List<String> getTypesList() {
-            return types;
-        }
-
-        public void setTypes(List<String> types) {
-            this.types = types;
-        }
-
-        public int getTypeLen() {
-            return typeLen;
-        }
-
-        public void setTypeLen(int typeLen) {
-            this.typeLen = typeLen;
-        }
-
-        public List<String> getInterfacesList() {
-            return interfaces;
-        }
-
-        public String getInterfaces(int i) {
-            return this.interfaces.get(i);
-        }
-
-        public String getTypes(int i) {
-            return this.types.get(i);
-        }
-
-        public void setInterfaces(List<String> interfaces) {
-            this.interfaces = interfaces;
-        }
-
-        public int getInterfaceLen() {
-            return interfaceLen;
-        }
-
-        public void setInterfaceLen(int interfaceLen) {
-            this.interfaceLen = interfaceLen;
-        }
+    private String href;
+    private String rel;
+    private List<String> types;
+    private int typeLen;
+    private List<String> interfaces;
+    private int interfaceLen;
+
+    public OicSecResr(String href, String rel, List<String> types, int typeLen,
+            List<String> interfaces, int interfaceLen) {
+        super();
+        this.href = href;
+        this.rel = rel;
+        this.types = types;
+        this.typeLen = typeLen;
+        this.interfaces = interfaces;
+        this.interfaceLen = interfaceLen;
+    }
+
+    public String getHref() {
+        return href;
+    }
+
+    public void setHref(String href) {
+        this.href = href;
+    }
+
+    public String getRel() {
+        return rel;
+    }
+
+    public void setRel(String rel) {
+        this.rel = rel;
+    }
+
+    public List<String> getTypesList() {
+        return types;
+    }
+
+    public void setTypes(List<String> types) {
+        this.types = types;
+    }
+
+    public int getTypeLen() {
+        return typeLen;
+    }
+
+    public void setTypeLen(int typeLen) {
+        this.typeLen = typeLen;
+    }
+
+    public List<String> getInterfacesList() {
+        return interfaces;
+    }
+
+    public String getInterfaces(int i) {
+        return this.interfaces.get(i);
+    }
+
+    public String getTypes(int i) {
+        return this.types.get(i);
+    }
+
+    public void setInterfaces(List<String> interfaces) {
+        this.interfaces = interfaces;
+    }
+
+    public int getInterfaceLen() {
+        return interfaceLen;
+    }
+
+    public void setInterfaceLen(int interfaceLen) {
+        this.interfaceLen = interfaceLen;
+    }
 
 }
index 0846658..82acbd9 100644 (file)
@@ -24,44 +24,44 @@ package org.iotivity.base;
 
 import java.util.List;
 public class OicSecValidity {
-        private String period;
-        private List<String> recurrences;
-        private int recurrenceLen;
+    private String period;
+    private List<String> recurrences;
+    private int recurrenceLen;
 
-        public OicSecValidity(String period, List<String> recurrences,
-                int recurrenceLen) {
-            super();
-            this.period = period;
-            this.recurrences = recurrences;
-            this.recurrenceLen = recurrenceLen;
-        }
+    public OicSecValidity(String period, List<String> recurrences,
+            int recurrenceLen) {
+        super();
+        this.period = period;
+        this.recurrences = recurrences;
+        this.recurrenceLen = recurrenceLen;
+    }
 
-        public String getPeriod() {
-            return period;
-        }
+    public String getPeriod() {
+        return period;
+    }
 
-        public void setPeriod(String period) {
-            this.period = period;
-        }
+    public void setPeriod(String period) {
+        this.period = period;
+    }
 
-        public List<String> getRecurrencesList() {
-            return recurrences;
-        }
+    public List<String> getRecurrencesList() {
+        return recurrences;
+    }
 
-        public String getRecurrences(int i) {
-            return this.recurrences.get(i);
-        }
+    public String getRecurrences(int i) {
+        return this.recurrences.get(i);
+    }
 
-        public void setRecurrences(List<String> recurrences) {
-            this.recurrences = recurrences;
-        }
+    public void setRecurrences(List<String> recurrences) {
+        this.recurrences = recurrences;
+    }
 
-        public int getRecurrenceLen() {
-            return recurrenceLen;
-        }
+    public int getRecurrenceLen() {
+        return recurrenceLen;
+    }
 
-        public void setRecurrenceLen(int recurrenceLen) {
-            this.recurrenceLen = recurrenceLen;
-        }
+    public void setRecurrenceLen(int recurrenceLen) {
+        this.recurrenceLen = recurrenceLen;
+    }
 
 }
index 4abfc3e..ea7f6aa 100644 (file)
@@ -39,16 +39,13 @@ public enum OwnedStatus {
 
     public static OwnedStatus convertOwnedStatus(int value) {
 
-        if (0 == value)
-        {
+        if (0 == value) {
             return OwnedStatus.UNOWNED;
         }
-        else if (1 == value)
-        {
+        else if (1 == value) {
             return OwnedStatus.OWNED;
         }
-        else
-        {
+        else {
             return OwnedStatus.INVALID;
         }
     }
old mode 100755 (executable)
new mode 100644 (file)
index 65759fd..552dab8
@@ -28,8 +28,7 @@ import java.util.EnumSet;
 public enum PinType {
     NUM_PIN (0x1 << 0),
     UPPERCASE_CHAR_PIN  (0x1 << 1),
-    LOWERCASE_CHAR_PIN  (0x1 << 2),
-    ;
+    LOWERCASE_CHAR_PIN  (0x1 << 2);
 
     private int value;
 
index 5d46b8f..b3d49ce 100644 (file)
@@ -24,18 +24,15 @@ public class ProvisionResult {
     private String mDeviceId;
     private int mResult;
 
-    public ProvisionResult(String deviceId, int result)
-    {
+    public ProvisionResult(String deviceId, int result) {
         this.mDeviceId = deviceId;
         this.mResult = result;
     }
 
-    public String getDevId()
-    {
+    public String getDevId() {
         return this.mDeviceId;
     }
-    public int getResult()
-    {
+    public int getResult() {
         return this.mResult;
     }
 }
index 3536f78..3eab9a2 100644 (file)
@@ -27,7 +27,7 @@ import java.util.EnumSet;
 public enum RequestHandlerFlag {
     INIT(1 << 0),
     REQUEST(1 << 1),
-    OBSERVER(1 << 2),;
+    OBSERVER(1 << 2);
 
     private int value;
 
index 8c55a74..6745c29 100644 (file)
@@ -26,7 +26,7 @@ public enum RequestType {
     GET("GET"),
     PUT("PUT"),
     POST("POST"),
-    DELETE("DELETE"),;
+    DELETE("DELETE");
     private String value;
 
     private RequestType(String value) {
index 5e10e86..b259014 100644 (file)
@@ -60,7 +60,7 @@ public enum ResourceProperty {
      * if discovery request contains an explicit querystring.
      * Ex: GET /oic/res?rt=oic.sec.acl
      */
-    EXPLICIT_DISCOVERABLE(1 << 5),;
+    EXPLICIT_DISCOVERABLE(1 << 5);
 
     private int value;
 
index 4d9027e..9b278fb 100644 (file)
@@ -24,7 +24,7 @@ package org.iotivity.base;
 
 public enum ServiceType {
     IN_PROC(0),
-    OUT_OF_PROC(1),;
+    OUT_OF_PROC(1);
 
     private int value;