taking suggestions

Author: melissaahn

common/src/main/java/com/microsoft/identity/common/internal/request/MsalBrokerRequestAdapter.java

@@ -60,7 +60,6 @@
 import com.microsoft.identity.common.java.commands.parameters.DeviceCodeFlowCommandParameters;
 import com.microsoft.identity.common.java.commands.parameters.GenerateShrCommandParameters;
 import com.microsoft.identity.common.java.commands.parameters.GetAadDeviceIdCommandParameters;
-import com.microsoft.identity.common.java.commands.parameters.IHasExtraTokenBodyParameters;
 import com.microsoft.identity.common.java.commands.parameters.InteractiveTokenCommandParameters;
 import com.microsoft.identity.common.java.commands.parameters.RemoveAccountCommandParameters;
 import com.microsoft.identity.common.java.commands.parameters.ResourceAccountCommandParameters;
@@ -212,12 +211,10 @@ public BrokerRequest brokerRequestFromSilentOperationParameters(@NonNull final S
                         .traceFlags(SpanExtension.current().getSpanContext().getTraceFlags().asByte())
                         .build()
                 );
-        if (parameters instanceof IHasExtraTokenBodyParameters) {
-            final List<Map.Entry<String, String>> extraTokenBodyParams = ((IHasExtraTokenBodyParameters) parameters).getExtraTokenBodyParameters();
-            final String extraTokenBodyParameters = extraTokenBodyParams != null ?
-                    QueryParamsAdapter._toJson(extraTokenBodyParams) : null;
-            brokerRequestBuilder.extraTokenBodyParameter(extraTokenBodyParameters);
-        }
+        final List<Map.Entry<String, String>> extraTokenBodyParams = parameters.getExtraTokenBodyParameters();
+        final String extraTokenBodyParameters = extraTokenBodyParams != null ?
+                QueryParamsAdapter._toJson(extraTokenBodyParams) : null;
+        brokerRequestBuilder.extraTokenBodyParameter(extraTokenBodyParameters);
         return brokerRequestBuilder.build();
     }
 

common4j/src/main/com/microsoft/identity/common/java/commands/parameters/BrokerSilentTokenCommandParameters.java

@@ -29,20 +29,14 @@
 import com.microsoft.identity.common.java.request.BrokerRequestType;
 import com.microsoft.identity.common.java.util.StringUtil;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.experimental.SuperBuilder;
 
 @Getter
 @SuperBuilder(toBuilder = true)
 @EqualsAndHashCode(callSuper = true)
-public class BrokerSilentTokenCommandParameters
-        extends SilentTokenCommandParameters
-        implements IHasExtraTokenBodyParameters, IBrokerTokenCommandParameters {
+public class BrokerSilentTokenCommandParameters extends SilentTokenCommandParameters implements IBrokerTokenCommandParameters {
 
     @Expose
     private final int callerUid;
@@ -61,9 +55,6 @@ public class BrokerSilentTokenCommandParameters
     @Expose
     private final String negotiatedBrokerProtocolVersion;
 
-    // Only put in the token request body
-    private final List<Map.Entry<String, String>> extraTokenBodyParameters;
-
     // If this flag is true, we will send the x-ms-PKeyAuth Header to the token endpoint.
     // Note: this flag is transferred to a MicrosoftTokenRequest in BaseController.
     @Expose
@@ -83,11 +74,6 @@ public boolean isRequestForResourceAccount() {
         return false;
     }
 
-    @Override
-    public List<Map.Entry<String, String>> getExtraTokenBodyParameters() {
-        return this.extraTokenBodyParameters == null ? null : new ArrayList<>(this.extraTokenBodyParameters);
-    }
-
     @Override
     public void validate() throws ArgumentException {
         if (callerUid == 0) {

common4j/src/main/com/microsoft/identity/common/java/commands/parameters/IHasExtraTokenBodyParameters.java

@@ -41,8 +41,7 @@
 @Getter
 @EqualsAndHashCode(callSuper = true)
 @SuperBuilder(toBuilder = true)
-public class InteractiveTokenCommandParameters extends TokenCommandParameters
-        implements IHasExtraTokenBodyParameters {
+public class InteractiveTokenCommandParameters extends TokenCommandParameters {
 
     private final transient List<BrowserDescriptor> browserSafeList;
 
@@ -71,9 +70,6 @@ public class InteractiveTokenCommandParameters extends TokenCommandParameters
 
     private final List<Map.Entry<String, String>> extraQueryStringParameters;
 
-    // Only put in the token request body
-    private final List<Map.Entry<String, String>> extraTokenBodyParameters;
-
     @Expose()
     private final List<String> extraScopesToConsent;
 
@@ -95,11 +91,6 @@ public List<Map.Entry<String, String>> getExtraQueryStringParameters() {
         return this.extraQueryStringParameters == null ? null : new ArrayList<>(this.extraQueryStringParameters);
     }
 
-    @Override
-    public List<Map.Entry<String, String>> getExtraTokenBodyParameters() {
-        return this.extraTokenBodyParameters == null ? null : new ArrayList<>(this.extraTokenBodyParameters);
-    }
-
     public List<String> getExtraScopesToConsent() {
         return this.extraScopesToConsent == null ? null : new ArrayList<>(this.extraScopesToConsent);
     }

common4j/src/main/com/microsoft/identity/common/java/commands/parameters/InteractiveTokenCommandParameters.java

@@ -28,8 +28,8 @@
 import com.microsoft.identity.common.java.authscheme.AbstractAuthenticationScheme;
 import com.microsoft.identity.common.java.dto.IAccountRecord;
 import com.microsoft.identity.common.java.logging.Logger;
-import com.microsoft.identity.common.java.util.StringUtil;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -73,10 +73,17 @@ public class TokenCommandParameters extends CommandParameters {
 
     private final List<Map.Entry<String, String>> extraOptions;
 
+    // Only put in the token request body
+    private final List<Map.Entry<String, String>> extraTokenBodyParameters;
+
     public Set<String> getScopes() {
         return this.scopes == null ? null : new HashSet<>(this.scopes);
     }
 
+    public List<Map.Entry<String, String>> getExtraTokenBodyParameters() {
+        return this.extraTokenBodyParameters == null ? null : new ArrayList<>(this.extraTokenBodyParameters);
+    }
+
     public String getMamEnrollmentId(){
         return mamEnrollmentId;
     }