Skip to content

Commit

Permalink
Restyled by google-java-format
Browse files Browse the repository at this point in the history
  • Loading branch information
@restyled-commits @joonhaengHeo
restyled-commits authored and joonhaengHeo committed Jun 19, 2024
1 parent 93c8d7c commit 5a5e7e2
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 60 deletions.
58 changes: 37 additions & 21 deletions src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public void pairDevice(
}

/* This method was deprecated. Please use {@link ChipDeviceController.pairDevice(BluetoothGatt, int, long, long, CommissionParameters)}. */
@Deprecated
@Deprecated
public void pairDevice(
BluetoothGatt bleServer,
int connId,
Expand All @@ -182,7 +182,7 @@ public void pairDevice(
}

/* This method was deprecated. Please use {@link ChipDeviceController.pairDevice(BluetoothGatt, int, long, long, CommissionParameters)}. */
@Deprecated
@Deprecated
public void pairDevice(
BluetoothGatt bleServer,
int connId,
Expand All @@ -206,8 +206,8 @@ public void pairDevice(
* @param icdRegistrationInfo the informations for ICD registration. For detailed information
* {@link ICDRegistrationInfo}. If this value is null when commissioning an ICD device, {@link
* CompletionListener.onICDRegistrationInfoRequired} is called to request the
* ICDRegistrationInfo value.
* This method was deprecated. Please use {@link ChipDeviceController.pairDevice(BluetoothGatt, int, long, long, CommissionParameters)}.
* ICDRegistrationInfo value. This method was deprecated. Please use {@link
* ChipDeviceController.pairDevice(BluetoothGatt, int, long, long, CommissionParameters)}.
*/
@Deprecated
public void pairDevice(
Expand All @@ -218,18 +218,24 @@ public void pairDevice(
@Nullable byte[] csrNonce,
NetworkCredentials networkCredentials,
@Nullable ICDRegistrationInfo icdRegistrationInfo) {
CommissionParameters params = new CommissionParameters.Builder().setCsrNonce(csrNonce).setNetworkCredentials(networkCredentials).setICDRegistrationInfo(icdRegistrationInfo).build();
CommissionParameters params =
new CommissionParameters.Builder()
.setCsrNonce(csrNonce)
.setNetworkCredentials(networkCredentials)
.setICDRegistrationInfo(icdRegistrationInfo)
.build();
pairDevice(bleServer, connId, deviceId, setupPincode, params);
}

/**
/**
* Pair a device connected through BLE.
*
* @param bleServer the BluetoothGatt representing the BLE connection to the device
* @param connId the BluetoothGatt Id representing the BLE connection to the device
* @param deviceId the node ID to assign to the device
* @param setupPincode the pincode for the device
* @param params Parameters representing commissioning arguments. see detailed in {@link CommissionParameters}
* @param params Parameters representing commissioning arguments. see detailed in {@link
* CommissionParameters}
*/
public void pairDevice(
BluetoothGatt bleServer,
Expand Down Expand Up @@ -287,8 +293,9 @@ public void pairDeviceWithAddress(
* @param icdRegistrationInfo the informations for ICD registration. For detailed information
* {@link ICDRegistrationInfo}. If this value is null when commissioning an ICD device, {@link
* CompletionListener.onICDRegistrationInfoRequired} is called to request the
* ICDRegistrationInfo value.
* This method was deprecated. Please use {@link ChipDeviceController.pairDeviceWithAddress(long, String, int, int, long, CommissionParameters)}.
* ICDRegistrationInfo value. This method was deprecated. Please use {@link
* ChipDeviceController.pairDeviceWithAddress(long, String, int, int, long,
* CommissionParameters)}.
*/
@Deprecated
public void pairDeviceWithAddress(
Expand All @@ -310,15 +317,16 @@ public void pairDeviceWithAddress(
icdRegistrationInfo);
}

/**
/**
* Pair a device connected using IP Address.
*
* @param deviceId the node ID to assign to the device
* @param address IP Address of the connecting device
* @param port the port of the connecting device
* @param discriminator the discriminator for connecting device
* @param pinCode the pincode for connecting device
* @param params Parameters representing commissioning arguments. see detailed in {@link CommissionParameters}
* @param params Parameters representing commissioning arguments. see detailed in {@link
* CommissionParameters}
*/
public void pairDeviceWithAddress(
long deviceId,
Expand Down Expand Up @@ -378,7 +386,9 @@ public void pairDeviceWithCode(
* {@link ICDRegistrationInfo}. If this value is null when commissioning an ICD device, {@link
* CompletionListener.onICDRegistrationInfoRequired} is called to request the
* ICDRegistrationInfo value.
* <p>This method was deprecated. Please use {@link ChipDeviceController.pairDeviceWithCode(long, String, boolean, boolean, CommissionParameters)}.
* <p>This method was deprecated. Please use {@link
* ChipDeviceController.pairDeviceWithCode(long, String, boolean, boolean,
* CommissionParameters)}.
*/
@Deprecated
public void pairDeviceWithCode(
Expand All @@ -400,15 +410,16 @@ public void pairDeviceWithCode(
icdRegistrationInfo);
}

/**
/**
* Pair a device connected using the scanned QR code or manual entry code.
*
* @param deviceId the node ID to assign to the device
* @param setupCode the scanned QR code or manual entry code
* @param discoverOnce the flag to enable/disable PASE auto retry mechanism
* @param useOnlyOnNetworkDiscovery the flag to indicate the commissionable device is available on
* the network
* @param params Parameters representing commissioning arguments. see detailed in {@link CommissionParameters}
* @param params Parameters representing commissioning arguments. see detailed in {@link
* CommissionParameters}
*/
public void pairDeviceWithCode(
long deviceId,
Expand Down Expand Up @@ -466,7 +477,8 @@ public void establishPaseConnection(long deviceId, String address, int port, lon
*
* @param deviceId the ID of the node to be commissioned
* @param networkCredentials the credentials (Wi-Fi or Thread) to be provisioned
* <p>This method was deprecated. Please use {@link ChipDeviceController.commissionDevice(long, CommissionParameters)}.
* <p>This method was deprecated. Please use {@link
* ChipDeviceController.commissionDevice(long, CommissionParameters)}.
*/
@Deprecated
public void commissionDevice(long deviceId, @Nullable NetworkCredentials networkCredentials) {
Expand All @@ -481,7 +493,8 @@ public void commissionDevice(long deviceId, @Nullable NetworkCredentials network
* @param deviceId the ID of the node to be commissioned
* @param csrNonce a nonce to be used for the CSR request
* @param networkCredentials the credentials (Wi-Fi or Thread) to be provisioned
* <p>This method was deprecated. Please use {@link ChipDeviceController.commissionDevice(long, CommissionParameters)}.
* <p>This method was deprecated. Please use {@link
* ChipDeviceController.commissionDevice(long, CommissionParameters)}.
*/
@Deprecated
public void commissionDevice(
Expand All @@ -495,13 +508,16 @@ public void commissionDevice(
* #establishPaseConnection(long, int, long)}.
*
* @param deviceId the ID of the node to be commissioned
* @param params Parameters representing commissioning arguments. see detailed in {@link CommissionParameters}
* @param params Parameters representing commissioning arguments. see detailed in {@link
* CommissionParameters}
*/
public void commissionDevice(
long deviceId,
@Nonnull CommissionParameters params) {
public void commissionDevice(long deviceId, @Nonnull CommissionParameters params) {
commissionDevice(
deviceControllerPtr, deviceId, params.getCsrNonce(), params.getNetworkCredentials(), params.getICDRegistrationInfo());
deviceControllerPtr,
deviceId,
params.getCsrNonce(),
params.getNetworkCredentials(),
params.getICDRegistrationInfo());
}

/**
Expand Down
78 changes: 39 additions & 39 deletions src/controller/java/src/chip/devicecontroller/CommissionParameters.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,51 +21,51 @@

/** Parameters representing commissioning arguments for {@link ChipDeviceController}. */
public final class CommissionParameters {
@Nullable private final byte[] csrNonce;
@Nullable private final NetworkCredentials networkCredentials;
@Nullable private final ICDRegistrationInfo icdRegistrationInfo;
@Nullable private final byte[] csrNonce;
@Nullable private final NetworkCredentials networkCredentials;
@Nullable private final ICDRegistrationInfo icdRegistrationInfo;

private CommissionParameters(Builder builder) {
csrNonce = builder.csrNonce;
networkCredentials = builder.networkCredentials;
icdRegistrationInfo = builder.icdRegistrationInfo;
}
/* a nonce to be used for the CSR request */
public byte[] getCsrNonce() {
return csrNonce;
}
private CommissionParameters(Builder builder) {
csrNonce = builder.csrNonce;
networkCredentials = builder.networkCredentials;
icdRegistrationInfo = builder.icdRegistrationInfo;
}
/* a nonce to be used for the CSR request */
public byte[] getCsrNonce() {
return csrNonce;
}

/* the credentials (Wi-Fi or Thread) to be provisioned */
public NetworkCredentials getNetworkCredentials() {
return networkCredentials;
}
/* the informations for ICD registration. For detailed information {@link ICDRegistrationInfo}. If this value is null when commissioning an ICD device, {@link CompletionListener.onICDRegistrationInfoRequired} is called to request the ICDRegistrationInfo value. */
public ICDRegistrationInfo getICDRegistrationInfo() {
return icdRegistrationInfo;
}
/* the credentials (Wi-Fi or Thread) to be provisioned */
public NetworkCredentials getNetworkCredentials() {
return networkCredentials;
}
/* the informations for ICD registration. For detailed information {@link ICDRegistrationInfo}. If this value is null when commissioning an ICD device, {@link CompletionListener.onICDRegistrationInfoRequired} is called to request the ICDRegistrationInfo value. */
public ICDRegistrationInfo getICDRegistrationInfo() {
return icdRegistrationInfo;
}

public static class Builder {
@Nullable private byte[] csrNonce = null;
@Nullable private NetworkCredentials networkCredentials = null;
@Nullable private ICDRegistrationInfo icdRegistrationInfo = null;
public static class Builder {
@Nullable private byte[] csrNonce = null;
@Nullable private NetworkCredentials networkCredentials = null;
@Nullable private ICDRegistrationInfo icdRegistrationInfo = null;

public Builder setCsrNonce(byte[] csrNonce) {
this.csrNonce = csrNonce;
return this;
}
public Builder setCsrNonce(byte[] csrNonce) {
this.csrNonce = csrNonce;
return this;
}

public Builder setNetworkCredentials(NetworkCredentials networkCredentials) {
this.networkCredentials = networkCredentials;
return this;
}
public Builder setNetworkCredentials(NetworkCredentials networkCredentials) {
this.networkCredentials = networkCredentials;
return this;
}

public Builder setICDRegistrationInfo(ICDRegistrationInfo icdRegistrationInfo) {
this.icdRegistrationInfo = icdRegistrationInfo;
return this;
}
public Builder setICDRegistrationInfo(ICDRegistrationInfo icdRegistrationInfo) {
this.icdRegistrationInfo = icdRegistrationInfo;
return this;
}

public CommissionParameters build() {
return new CommissionParameters(this);
}
public CommissionParameters build() {
return new CommissionParameters(this);
}
}
}

0 comments on commit 5a5e7e2

Please sign in to comment.