diff --git a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
index 56d12f4ed3f020..b9d916bc6636c4 100644
--- a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
+++ b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
@@ -39,16 +39,12 @@ public static void loadJni() {
     return;
   }
 
-  /**
-   * Returns a new {@link ChipDeviceController} with default parameters.
-   */
+  /** Returns a new {@link ChipDeviceController} with default parameters. */
   public ChipDeviceController() {
     this(ControllerParams.newBuilder().build());
   }
 
-  /**
-   * Returns a new {@link ChipDeviceController} with the specified parameters.
-   */
+  /** Returns a new {@link ChipDeviceController} with the specified parameters. */
   public ChipDeviceController(ControllerParams params) {
     deviceControllerPtr = newDeviceController(params);
   }
diff --git a/src/controller/java/src/chip/devicecontroller/ControllerParams.java b/src/controller/java/src/chip/devicecontroller/ControllerParams.java
index 159e610e1da51c..ee7f7d09d63faa 100644
--- a/src/controller/java/src/chip/devicecontroller/ControllerParams.java
+++ b/src/controller/java/src/chip/devicecontroller/ControllerParams.java
@@ -2,28 +2,19 @@
 
 import androidx.annotation.Nullable;
 
-/**
- * Parameters representing initialization arguments for {@link ChipDeviceController}.
- */
+/** Parameters representing initialization arguments for {@link ChipDeviceController}. */
 public final class ControllerParams {
 
   private final int udpListenPort;
-  @Nullable
-  private final KeypairDelegate keypairDelegate;
-  @Nullable
-  private final byte[] rootCertificate;
-  @Nullable
-  private final byte[] intermediateCertificate;
-  @Nullable
-  private final byte[] operationalCertificate;
-  @Nullable
-  private final byte[] ipk;
+  @Nullable private final KeypairDelegate keypairDelegate;
+  @Nullable private final byte[] rootCertificate;
+  @Nullable private final byte[] intermediateCertificate;
+  @Nullable private final byte[] operationalCertificate;
+  @Nullable private final byte[] ipk;
 
   private static final int LEGACY_GLOBAL_CHIP_PORT = 5540;
 
-  /**
-   * @param udpListenPort the UDP listening port, or 0 to pick any available port.
-   */
+  /** @param udpListenPort the UDP listening port, or 0 to pick any available port. */
   private ControllerParams(Builder builder) {
     this.udpListenPort = builder.udpListenPort;
     this.keypairDelegate = builder.keypairDelegate;
@@ -33,9 +24,7 @@ private ControllerParams(Builder builder) {
     this.ipk = builder.ipk;
   }
 
-  /**
-   * Gets the UDP listening port; 0 indicates "any available port"
-   */
+  /** Gets the UDP listening port; 0 indicates "any available port" */
   public int getUdpListenPort() {
     return udpListenPort;
   }
@@ -60,9 +49,7 @@ public byte[] getIpk() {
     return ipk;
   }
 
-  /**
-   * Returns parameters with ephemerally generated operational credentials
-   */
+  /** Returns parameters with ephemerally generated operational credentials */
   public static Builder newBuilder() {
     return new Builder();
   }
@@ -83,19 +70,13 @@ public static Builder newBuilder(OperationalKeyConfig operationalKeyConfig) {
   /** Builder for {@link ControllerParams}. */
   public static class Builder {
     private int udpListenPort = LEGACY_GLOBAL_CHIP_PORT + 1;
-    @Nullable
-    private KeypairDelegate keypairDelegate = null;
-    @Nullable
-    private byte[] rootCertificate = null;
-    @Nullable
-    private byte[] intermediateCertificate = null;
-    @Nullable
-    private byte[] operationalCertificate = null;
-    @Nullable
-    private byte[] ipk = null;
-
-    private Builder() {
-    }
+    @Nullable private KeypairDelegate keypairDelegate = null;
+    @Nullable private byte[] rootCertificate = null;
+    @Nullable private byte[] intermediateCertificate = null;
+    @Nullable private byte[] operationalCertificate = null;
+    @Nullable private byte[] ipk = null;
+
+    private Builder() {}
 
     public Builder setUdpListenPort(int udpListenPort) {
       if (udpListenPort < 0) {