/*
 * Copyright 2016-present Facebook, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License"); you may
 * not use this file except in compliance with the License. You may obtain
 * a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations
 * under the License.
 */

package com.facebook.buck.io;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.facebook.buck.util.immutables.BuckStyleImmutable;

import org.immutables.value.Value;

@Value.Immutable
@BuckStyleImmutable
abstract class AbstractWatchmanQuery {

  @Value.Parameter
  abstract String getQueryPath();

  @Value.Parameter
  abstract ImmutableMap<String, Object> getQueryParams();

  public ImmutableList<Object> toList(String sinceCursor) {
    return ImmutableList.of(
        "query",
        getQueryPath(),
        ImmutableMap.<String, Object>builder()
            .put("since", sinceCursor)
            .putAll(getQueryParams())
            .build());
  }
}

@@ -776,23 +776,19 @@
 uckStyle
-Immutab
+Tup
 le;%0A%0Aimp
@@ -847,23 +847,19 @@
 uckStyle
-Immutab
+Tup
 le%0Aabstr
@@ -893,35 +893,16 @@
 uery %7B%0A%0A
-  @Value.Parameter%0A
   abstra
@@ -932,27 +932,8 @@
 );%0A%0A
-  @Value.Parameter%0A
   ab

Switch to a BuckStyleTuple