From be8b418e6a97c258be420ee15cf38cdf2c894802 Mon Sep 17 00:00:00 2001 From: "saurabh.s9" Date: Tue, 27 Jun 2017 09:32:22 +0530 Subject: [PATCH] Modification as per SVACE result for Java layer Change-Id: If26f219c2e137efa292dae87468eb4fc8abe987b Signed-off-by: saurabh.s9 Reviewed-on: https://gerrit.iotivity.org/gerrit/21033 Tested-by: jenkins-iotivity Reviewed-by: Jongmin Choi Reviewed-by: Dmitriy Zhuravlev --- .../src/main/java/org/iotivity/base/CredType.java | 4 +- .../main/java/org/iotivity/base/DeviceStatus.java | 9 +- .../src/main/java/org/iotivity/base/ErrorCode.java | 2 +- .../src/main/java/org/iotivity/base/KeySize.java | 4 +- .../org/iotivity/base/MVJustWorksOptionMask.java | 3 +- .../src/main/java/org/iotivity/base/ModeType.java | 2 +- .../main/java/org/iotivity/base/ObserveAction.java | 2 +- .../main/java/org/iotivity/base/ObserveType.java | 2 +- .../java/org/iotivity/base/OcAccountManager.java | 6 +- .../org/iotivity/base/OcCloudProvisioning.java | 4 +- .../java/org/iotivity/base/OcConnectivityType.java | 3 +- .../java/org/iotivity/base/OcDirectPairDevice.java | 9 +- .../java/org/iotivity/base/OcPlatformStatus.java | 2 +- .../src/main/java/org/iotivity/base/OcPrmType.java | 3 +- .../java/org/iotivity/base/OcProvisioning.java | 29 ++-- .../main/java/org/iotivity/base/OcRDClient.java | 5 +- .../main/java/org/iotivity/base/OcResource.java | 2 +- .../java/org/iotivity/base/OcSecureResource.java | 19 ++- .../src/main/java/org/iotivity/base/OicSecAce.java | 84 ++++++------ .../src/main/java/org/iotivity/base/OicSecAcl.java | 10 +- .../java/org/iotivity/base/OicSecCloudAce.java | 142 ++++++++++---------- .../main/java/org/iotivity/base/OicSecResr.java | 146 ++++++++++----------- .../java/org/iotivity/base/OicSecValidity.java | 62 ++++----- .../main/java/org/iotivity/base/OwnedStatus.java | 9 +- .../src/main/java/org/iotivity/base/PinType.java | 3 +- .../java/org/iotivity/base/ProvisionResult.java | 9 +- .../java/org/iotivity/base/RequestHandlerFlag.java | 2 +- .../main/java/org/iotivity/base/RequestType.java | 2 +- .../java/org/iotivity/base/ResourceProperty.java | 2 +- .../main/java/org/iotivity/base/ServiceType.java | 2 +- 30 files changed, 288 insertions(+), 295 deletions(-) mode change 100755 => 100644 java/common/src/main/java/org/iotivity/base/OcPrmType.java mode change 100755 => 100644 java/common/src/main/java/org/iotivity/base/PinType.java diff --git a/java/common/src/main/java/org/iotivity/base/CredType.java b/java/common/src/main/java/org/iotivity/base/CredType.java index 87a33eb..39582ce 100644 --- a/java/common/src/main/java/org/iotivity/base/CredType.java +++ b/java/common/src/main/java/org/iotivity/base/CredType.java @@ -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) { diff --git a/java/common/src/main/java/org/iotivity/base/DeviceStatus.java b/java/common/src/main/java/org/iotivity/base/DeviceStatus.java index 0eefcaf..bc44c4a 100644 --- a/java/common/src/main/java/org/iotivity/base/DeviceStatus.java +++ b/java/common/src/main/java/org/iotivity/base/DeviceStatus.java @@ -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; } } diff --git a/java/common/src/main/java/org/iotivity/base/ErrorCode.java b/java/common/src/main/java/org/iotivity/base/ErrorCode.java index 7318a0c..4293514 100644 --- a/java/common/src/main/java/org/iotivity/base/ErrorCode.java +++ b/java/common/src/main/java/org/iotivity/base/ErrorCode.java @@ -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; diff --git a/java/common/src/main/java/org/iotivity/base/KeySize.java b/java/common/src/main/java/org/iotivity/base/KeySize.java index 83c5799..fdd19a9 100644 --- a/java/common/src/main/java/org/iotivity/base/KeySize.java +++ b/java/common/src/main/java/org/iotivity/base/KeySize.java @@ -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; diff --git a/java/common/src/main/java/org/iotivity/base/MVJustWorksOptionMask.java b/java/common/src/main/java/org/iotivity/base/MVJustWorksOptionMask.java index 7e111ca..2a61e89 100644 --- a/java/common/src/main/java/org/iotivity/base/MVJustWorksOptionMask.java +++ b/java/common/src/main/java/org/iotivity/base/MVJustWorksOptionMask.java @@ -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; diff --git a/java/common/src/main/java/org/iotivity/base/ModeType.java b/java/common/src/main/java/org/iotivity/base/ModeType.java index d12cab7..7ac8026 100644 --- a/java/common/src/main/java/org/iotivity/base/ModeType.java +++ b/java/common/src/main/java/org/iotivity/base/ModeType.java @@ -41,7 +41,7 @@ public enum ModeType { /** * Client/Server mode along with Routing capabilities. */ - GATEWAY(3),; + GATEWAY(3); private int value; diff --git a/java/common/src/main/java/org/iotivity/base/ObserveAction.java b/java/common/src/main/java/org/iotivity/base/ObserveAction.java index 5506749..15ad58c 100644 --- a/java/common/src/main/java/org/iotivity/base/ObserveAction.java +++ b/java/common/src/main/java/org/iotivity/base/ObserveAction.java @@ -24,7 +24,7 @@ package org.iotivity.base; public enum ObserveAction { REGISTER(0), - UNREGISTER(1),; + UNREGISTER(1); private int value; diff --git a/java/common/src/main/java/org/iotivity/base/ObserveType.java b/java/common/src/main/java/org/iotivity/base/ObserveType.java index ca990a9..2140203 100644 --- a/java/common/src/main/java/org/iotivity/base/ObserveType.java +++ b/java/common/src/main/java/org/iotivity/base/ObserveType.java @@ -24,7 +24,7 @@ package org.iotivity.base; public enum ObserveType { OBSERVE(0), - OBSERVE_ALL(1),; + OBSERVE_ALL(1); private int value; diff --git a/java/common/src/main/java/org/iotivity/base/OcAccountManager.java b/java/common/src/main/java/org/iotivity/base/OcAccountManager.java index 9280ec4..7647aa8 100644 --- a/java/common/src/main/java/org/iotivity/base/OcAccountManager.java +++ b/java/common/src/main/java/org/iotivity/base/OcAccountManager.java @@ -451,10 +451,10 @@ public final class OcAccountManager { * Event listeners are notified asynchronously */ public interface OnPostListener { - public void onPostCompleted(List headerOptionList, - OcRepresentation ocRepresentation); + public void onPostCompleted(List headerOptionList, + OcRepresentation ocRepresentation); - public void onPostFailed(Throwable ex); + public void onPostFailed(Throwable ex); } /** diff --git a/java/common/src/main/java/org/iotivity/base/OcCloudProvisioning.java b/java/common/src/main/java/org/iotivity/base/OcCloudProvisioning.java index cbe9938..e10a0eb 100644 --- a/java/common/src/main/java/org/iotivity/base/OcCloudProvisioning.java +++ b/java/common/src/main/java/org/iotivity/base/OcCloudProvisioning.java @@ -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. diff --git a/java/common/src/main/java/org/iotivity/base/OcConnectivityType.java b/java/common/src/main/java/org/iotivity/base/OcConnectivityType.java index 0eb951a..d933032 100644 --- a/java/common/src/main/java/org/iotivity/base/OcConnectivityType.java +++ b/java/common/src/main/java/org/iotivity/base/OcConnectivityType.java @@ -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; diff --git a/java/common/src/main/java/org/iotivity/base/OcDirectPairDevice.java b/java/common/src/main/java/org/iotivity/base/OcDirectPairDevice.java index 57c7475..66083b8 100644 --- a/java/common/src/main/java/org/iotivity/base/OcDirectPairDevice.java +++ b/java/common/src/main/java/org/iotivity/base/OcDirectPairDevice.java @@ -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 getPairingMethodList() { int [] intList = this.getPairingMethods(); List prmList = new ArrayList(); - for (int i = 0; i < intList.length; i++) - { + for (int i = 0; i < intList.length; i++) { prmList.add(intList[i]); } return prmList; diff --git a/java/common/src/main/java/org/iotivity/base/OcPlatformStatus.java b/java/common/src/main/java/org/iotivity/base/OcPlatformStatus.java index c41eb37..6ddb22e 100644 --- a/java/common/src/main/java/org/iotivity/base/OcPlatformStatus.java +++ b/java/common/src/main/java/org/iotivity/base/OcPlatformStatus.java @@ -24,7 +24,7 @@ package org.iotivity.base; public enum OcPlatformStatus { UP(0), - DOWN(1),; + DOWN(1); private int value; diff --git a/java/common/src/main/java/org/iotivity/base/OcPrmType.java b/java/common/src/main/java/org/iotivity/base/OcPrmType.java old mode 100755 new mode 100644 index 2c2b37f..c1d5de1 --- a/java/common/src/main/java/org/iotivity/base/OcPrmType.java +++ b/java/common/src/main/java/org/iotivity/base/OcPrmType.java @@ -44,8 +44,7 @@ public enum OcPrmType { } public static OcPrmType convertOcPrmType(int value) { - switch (value) - { + switch (value) { case 0: return OcPrmType.DP_NOT_ALLOWED; case 1: diff --git a/java/common/src/main/java/org/iotivity/base/OcProvisioning.java b/java/common/src/main/java/org/iotivity/base/OcProvisioning.java index e02755c..c5d2305 100644 --- a/java/common/src/main/java/org/iotivity/base/OcProvisioning.java +++ b/java/common/src/main/java/org/iotivity/base/OcProvisioning.java @@ -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 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 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; diff --git a/java/common/src/main/java/org/iotivity/base/OcRDClient.java b/java/common/src/main/java/org/iotivity/base/OcRDClient.java index fbbd481..697ee18 100644 --- a/java/common/src/main/java/org/iotivity/base/OcRDClient.java +++ b/java/common/src/main/java/org/iotivity/base/OcRDClient.java @@ -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( diff --git a/java/common/src/main/java/org/iotivity/base/OcResource.java b/java/common/src/main/java/org/iotivity/base/OcResource.java index c987058..f8cadaa 100644 --- a/java/common/src/main/java/org/iotivity/base/OcResource.java +++ b/java/common/src/main/java/org/iotivity/base/OcResource.java @@ -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 diff --git a/java/common/src/main/java/org/iotivity/base/OcSecureResource.java b/java/common/src/main/java/org/iotivity/base/OcSecureResource.java index 9f7f295..8437f2d 100644 --- a/java/common/src/main/java/org/iotivity/base/OcSecureResource.java +++ b/java/common/src/main/java/org/iotivity/base/OcSecureResource.java @@ -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 getLinkedDevices(); + public native List getLinkedDevices(); /** * Method to get IP address of sercure discovered device. diff --git a/java/common/src/main/java/org/iotivity/base/OicSecAce.java b/java/common/src/main/java/org/iotivity/base/OicSecAce.java index a5bd53f..25aa762 100644 --- a/java/common/src/main/java/org/iotivity/base/OicSecAce.java +++ b/java/common/src/main/java/org/iotivity/base/OicSecAce.java @@ -24,57 +24,57 @@ package org.iotivity.base; import java.util.List; public class OicSecAce { - private String subjectID; - private int permission; - private List resources; - private List validities; + private String subjectID; + private int permission; + private List resources; + private List validities; - public OicSecAce(String subjectID, int permission, - List resources, List validities) { - super(); - this.subjectID = subjectID; - this.permission = permission; - this.resources = resources; - this.validities = validities; - } + public OicSecAce(String subjectID, int permission, + List resources, List 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 getResourcesList() { - return resources; - } + public List getResourcesList() { + return resources; + } - public OicSecResr[] getResources() { - return resources.toArray(new OicSecResr[resources.size()]); - } - public void setResources(List resources) { - this.resources = resources; - } + public OicSecResr[] getResources() { + return resources.toArray(new OicSecResr[resources.size()]); + } + public void setResources(List resources) { + this.resources = resources; + } - public List getValiditiesList() { - return validities; - } + public List 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 validities) { - this.validities = validities; - } + public void setValidities(List validities) { + this.validities = validities; + } } diff --git a/java/common/src/main/java/org/iotivity/base/OicSecAcl.java b/java/common/src/main/java/org/iotivity/base/OicSecAcl.java index f0fdc72..0311f13 100644 --- a/java/common/src/main/java/org/iotivity/base/OicSecAcl.java +++ b/java/common/src/main/java/org/iotivity/base/OicSecAcl.java @@ -28,11 +28,11 @@ public class OicSecAcl { private String rownerID; private List oicSecAces; - public OicSecAcl (String rownerID, List oicSecAces) { - super(); - this.rownerID = rownerID; - this.oicSecAces = oicSecAces; - } + public OicSecAcl (String rownerID, List oicSecAces) { + super(); + this.rownerID = rownerID; + this.oicSecAces = oicSecAces; + } public String getRownerID() { return rownerID; } diff --git a/java/common/src/main/java/org/iotivity/base/OicSecCloudAce.java b/java/common/src/main/java/org/iotivity/base/OicSecCloudAce.java index dd13ff1..14cccbb 100644 --- a/java/common/src/main/java/org/iotivity/base/OicSecCloudAce.java +++ b/java/common/src/main/java/org/iotivity/base/OicSecCloudAce.java @@ -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 resources; - private List validities; - - public OicSecCloudAce(String aclID, String subjectID, int stype, int permission, - List resources, List 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 getResourcesList() { - return resources; - } - - public OicSecResr[] getResources() { - return resources.toArray(new OicSecResr[resources.size()]); - } - public void setResources(List resources) { - this.resources = resources; - } - - public List getValiditiesList() { - return validities; - } - - public OicSecValidity[] getValidities() { - return validities.toArray(new OicSecValidity[validities.size()]); - } - - public void setValidities(List validities) { - this.validities = validities; - } + private String aclID; + private String subjectID; + private int stype; + private int permission; + private List resources; + private List validities; + + public OicSecCloudAce(String aclID, String subjectID, int stype, int permission, + List resources, List 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 getResourcesList() { + return resources; + } + + public OicSecResr[] getResources() { + return resources.toArray(new OicSecResr[resources.size()]); + } + public void setResources(List resources) { + this.resources = resources; + } + + public List getValiditiesList() { + return validities; + } + + public OicSecValidity[] getValidities() { + return validities.toArray(new OicSecValidity[validities.size()]); + } + + public void setValidities(List validities) { + this.validities = validities; + } } diff --git a/java/common/src/main/java/org/iotivity/base/OicSecResr.java b/java/common/src/main/java/org/iotivity/base/OicSecResr.java index 490462e..d581af2 100644 --- a/java/common/src/main/java/org/iotivity/base/OicSecResr.java +++ b/java/common/src/main/java/org/iotivity/base/OicSecResr.java @@ -25,78 +25,78 @@ package org.iotivity.base; import java.util.List; public class OicSecResr { - private String href; - private String rel; - private List types; - private int typeLen; - private List interfaces; - private int interfaceLen; - - public OicSecResr(String href, String rel, List types, int typeLen, - List 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 getTypesList() { - return types; - } - - public void setTypes(List types) { - this.types = types; - } - - public int getTypeLen() { - return typeLen; - } - - public void setTypeLen(int typeLen) { - this.typeLen = typeLen; - } - - public List 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 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 types; + private int typeLen; + private List interfaces; + private int interfaceLen; + + public OicSecResr(String href, String rel, List types, int typeLen, + List 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 getTypesList() { + return types; + } + + public void setTypes(List types) { + this.types = types; + } + + public int getTypeLen() { + return typeLen; + } + + public void setTypeLen(int typeLen) { + this.typeLen = typeLen; + } + + public List 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 interfaces) { + this.interfaces = interfaces; + } + + public int getInterfaceLen() { + return interfaceLen; + } + + public void setInterfaceLen(int interfaceLen) { + this.interfaceLen = interfaceLen; + } } diff --git a/java/common/src/main/java/org/iotivity/base/OicSecValidity.java b/java/common/src/main/java/org/iotivity/base/OicSecValidity.java index 0846658..82acbd9 100644 --- a/java/common/src/main/java/org/iotivity/base/OicSecValidity.java +++ b/java/common/src/main/java/org/iotivity/base/OicSecValidity.java @@ -24,44 +24,44 @@ package org.iotivity.base; import java.util.List; public class OicSecValidity { - private String period; - private List recurrences; - private int recurrenceLen; + private String period; + private List recurrences; + private int recurrenceLen; - public OicSecValidity(String period, List recurrences, - int recurrenceLen) { - super(); - this.period = period; - this.recurrences = recurrences; - this.recurrenceLen = recurrenceLen; - } + public OicSecValidity(String period, List 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 getRecurrencesList() { - return recurrences; - } + public List 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 recurrences) { - this.recurrences = recurrences; - } + public void setRecurrences(List 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; + } } diff --git a/java/common/src/main/java/org/iotivity/base/OwnedStatus.java b/java/common/src/main/java/org/iotivity/base/OwnedStatus.java index 4abfc3e..ea7f6aa 100644 --- a/java/common/src/main/java/org/iotivity/base/OwnedStatus.java +++ b/java/common/src/main/java/org/iotivity/base/OwnedStatus.java @@ -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; } } diff --git a/java/common/src/main/java/org/iotivity/base/PinType.java b/java/common/src/main/java/org/iotivity/base/PinType.java old mode 100755 new mode 100644 index 65759fd..552dab8 --- a/java/common/src/main/java/org/iotivity/base/PinType.java +++ b/java/common/src/main/java/org/iotivity/base/PinType.java @@ -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; diff --git a/java/common/src/main/java/org/iotivity/base/ProvisionResult.java b/java/common/src/main/java/org/iotivity/base/ProvisionResult.java index 5d46b8f..b3d49ce 100644 --- a/java/common/src/main/java/org/iotivity/base/ProvisionResult.java +++ b/java/common/src/main/java/org/iotivity/base/ProvisionResult.java @@ -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; } } diff --git a/java/common/src/main/java/org/iotivity/base/RequestHandlerFlag.java b/java/common/src/main/java/org/iotivity/base/RequestHandlerFlag.java index 3536f78..3eab9a2 100644 --- a/java/common/src/main/java/org/iotivity/base/RequestHandlerFlag.java +++ b/java/common/src/main/java/org/iotivity/base/RequestHandlerFlag.java @@ -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; diff --git a/java/common/src/main/java/org/iotivity/base/RequestType.java b/java/common/src/main/java/org/iotivity/base/RequestType.java index 8c55a74..6745c29 100644 --- a/java/common/src/main/java/org/iotivity/base/RequestType.java +++ b/java/common/src/main/java/org/iotivity/base/RequestType.java @@ -26,7 +26,7 @@ public enum RequestType { GET("GET"), PUT("PUT"), POST("POST"), - DELETE("DELETE"),; + DELETE("DELETE"); private String value; private RequestType(String value) { diff --git a/java/common/src/main/java/org/iotivity/base/ResourceProperty.java b/java/common/src/main/java/org/iotivity/base/ResourceProperty.java index 5e10e86..b259014 100644 --- a/java/common/src/main/java/org/iotivity/base/ResourceProperty.java +++ b/java/common/src/main/java/org/iotivity/base/ResourceProperty.java @@ -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; diff --git a/java/common/src/main/java/org/iotivity/base/ServiceType.java b/java/common/src/main/java/org/iotivity/base/ServiceType.java index 4d9027e..9b278fb 100644 --- a/java/common/src/main/java/org/iotivity/base/ServiceType.java +++ b/java/common/src/main/java/org/iotivity/base/ServiceType.java @@ -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; -- 2.7.4