Move WinningBids into the queries package

apache · Aug 23, 2017 · a39cb80 · a39cb80
1 parent a6dbdfa
commit a39cb80
Show file tree

Hide file tree

Showing 31 changed files with 25 additions and 56 deletions.
diff --git a/...gration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkRunner.java b/...gration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/NexmarkRunner.java
@@ -38,6 +38,8 @@
 import org.apache.beam.integration.nexmark.model.Event;
 import org.apache.beam.integration.nexmark.model.KnownSize;
 import org.apache.beam.integration.nexmark.model.Person;
+import org.apache.beam.integration.nexmark.queries.NexmarkQuery;
+import org.apache.beam.integration.nexmark.queries.NexmarkQueryModel;
 import org.apache.beam.integration.nexmark.queries.Query0;
 import org.apache.beam.integration.nexmark.queries.Query0Model;
 import org.apache.beam.integration.nexmark.queries.Query1;

diff --git a/...tion/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/model/AuctionBid.java b/...tion/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/model/AuctionBid.java
@@ -24,13 +24,12 @@
 import java.io.OutputStream;
 import java.io.Serializable;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
-import org.apache.beam.integration.nexmark.WinningBids;
 import org.apache.beam.sdk.coders.Coder;
 import org.apache.beam.sdk.coders.CoderException;
 import org.apache.beam.sdk.coders.CustomCoder;
 
 /**
- * Result of {@link WinningBids} transform.
+ * Result of {@link org.apache.beam.integration.nexmark.queries.WinningBids} transform.
  */
 public class AuctionBid implements KnownSize, Serializable {
   public static final Coder<AuctionBid> CODER = new CustomCoder<AuctionBid>() {

diff --git a/...ntegration/nexmark/AbstractSimulator.java → ...on/nexmark/queries/AbstractSimulator.java b/...ntegration/nexmark/AbstractSimulator.java → ...on/nexmark/queries/AbstractSimulator.java
@@ -16,13 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.beam.integration.nexmark;
+package org.apache.beam.integration.nexmark.queries;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import javax.annotation.Nullable;
 
+import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.sdk.transforms.windowing.BoundedWindow;
 import org.apache.beam.sdk.values.TimestampedValue;
 import org.joda.time.Duration;

diff --git a/...eam/integration/nexmark/NexmarkQuery.java → ...gration/nexmark/queries/NexmarkQuery.java b/...eam/integration/nexmark/NexmarkQuery.java → ...gration/nexmark/queries/NexmarkQuery.java
@@ -15,8 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.beam.integration.nexmark;
+package org.apache.beam.integration.nexmark.queries;
 
+import org.apache.beam.integration.nexmark.Monitor;
+import org.apache.beam.integration.nexmark.NexmarkConfiguration;
+import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Auction;
 import org.apache.beam.integration.nexmark.model.Bid;
 import org.apache.beam.integration.nexmark.model.Event;
@@ -41,8 +44,8 @@
  */
 public abstract class NexmarkQuery
     extends PTransform<PCollection<Event>, PCollection<TimestampedValue<KnownSize>>> {
-  protected static final TupleTag<Auction> AUCTION_TAG = new TupleTag<>("auctions");
-  protected static final TupleTag<Bid> BID_TAG = new TupleTag<>("bids");
+  public static final TupleTag<Auction> AUCTION_TAG = new TupleTag<>("auctions");
+  public static final TupleTag<Bid> BID_TAG = new TupleTag<>("bids");
   protected static final TupleTag<Person> PERSON_TAG = new TupleTag<>("person");
 
   /** Predicate to detect a new person event. */
@@ -169,7 +172,7 @@ public void processElement(ProcessContext c) {
   /**
    * Transform to filter for just the new auction events.
    */
-  protected static final PTransform<PCollection<Event>, PCollection<Auction>> JUST_NEW_AUCTIONS =
+  public static final PTransform<PCollection<Event>, PCollection<Auction>> JUST_NEW_AUCTIONS =
       new PTransform<PCollection<Event>, PCollection<Auction>>("justNewAuctions") {
         @Override
         public PCollection<Auction> expand(PCollection<Event> input) {
@@ -181,7 +184,7 @@ public PCollection<Auction> expand(PCollection<Event> input) {
   /**
    * Transform to filter for just the new person events.
    */
-  protected static final PTransform<PCollection<Event>, PCollection<Person>> JUST_NEW_PERSONS =
+  public static final PTransform<PCollection<Event>, PCollection<Person>> JUST_NEW_PERSONS =
       new PTransform<PCollection<Event>, PCollection<Person>>("justNewPersons") {
         @Override
         public PCollection<Person> expand(PCollection<Event> input) {
@@ -193,7 +196,7 @@ public PCollection<Person> expand(PCollection<Event> input) {
   /**
    * Transform to filter for just the bid events.
    */
-  protected static final PTransform<PCollection<Event>, PCollection<Bid>> JUST_BIDS =
+  public static final PTransform<PCollection<Event>, PCollection<Bid>> JUST_BIDS =
       new PTransform<PCollection<Event>, PCollection<Bid>>("justBids") {
         @Override
         public PCollection<Bid> expand(PCollection<Event> input) {

diff --git a/...ntegration/nexmark/NexmarkQueryModel.java → ...on/nexmark/queries/NexmarkQueryModel.java b/...ntegration/nexmark/NexmarkQueryModel.java → ...on/nexmark/queries/NexmarkQueryModel.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.beam.integration.nexmark;
+package org.apache.beam.integration.nexmark.queries;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.beam.integration.nexmark.NexmarkConfiguration;
 import org.apache.beam.integration.nexmark.model.KnownSize;
 import org.apache.beam.sdk.transforms.SerializableFunction;
 import org.apache.beam.sdk.values.TimestampedValue;
@@ -40,7 +41,7 @@
  * applied against the actual query results to check their consistency with the model.
  */
 public abstract class NexmarkQueryModel implements Serializable {
-  protected final NexmarkConfiguration configuration;
+  public final NexmarkConfiguration configuration;
 
   public NexmarkQueryModel(NexmarkConfiguration configuration) {
     this.configuration = configuration;
@@ -86,7 +87,7 @@ protected static <T> Set<String> toValue(Iterator<TimestampedValue<T>> itr) {
   }
 
   /** Return simulator for query. */
-  protected abstract AbstractSimulator<?, ?> simulator();
+  public abstract AbstractSimulator<?, ?> simulator();
 
   /** Return sub-sequence of results which are significant for model. */
   protected Iterable<TimestampedValue<KnownSize>> relevantResults(

diff --git a/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query0.java b/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query0.java
@@ -22,7 +22,6 @@
 import java.io.IOException;
 
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQuery;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Event;
 import org.apache.beam.integration.nexmark.model.KnownSize;

diff --git a/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query0Model.java b/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query0Model.java
@@ -20,9 +20,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.beam.integration.nexmark.AbstractSimulator;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQueryModel;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Event;
 import org.apache.beam.sdk.values.TimestampedValue;
@@ -56,7 +54,7 @@ public Query0Model(NexmarkConfiguration configuration) {
   }
 
   @Override
-  protected AbstractSimulator<?, ?> simulator() {
+  public AbstractSimulator<?, ?> simulator() {
     return new Simulator(configuration);
   }
 

diff --git a/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query1.java b/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query1.java
@@ -18,7 +18,6 @@
 package org.apache.beam.integration.nexmark.queries;
 
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQuery;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Bid;
 import org.apache.beam.integration.nexmark.model.Event;

diff --git a/...ation/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query10.java b/...ation/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query10.java
@@ -28,7 +28,6 @@
 import java.util.concurrent.ThreadLocalRandom;
 import javax.annotation.Nullable;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQuery;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Done;
 import org.apache.beam.integration.nexmark.model.Event;

diff --git a/...ation/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query11.java b/...ation/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query11.java
@@ -18,7 +18,6 @@
 package org.apache.beam.integration.nexmark.queries;
 
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQuery;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Bid;
 import org.apache.beam.integration.nexmark.model.BidsPerSession;

diff --git a/...ation/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query12.java b/...ation/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query12.java
@@ -18,7 +18,6 @@
 package org.apache.beam.integration.nexmark.queries;
 
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQuery;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Bid;
 import org.apache.beam.integration.nexmark.model.BidsPerSession;

diff --git a/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query1Model.java b/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query1Model.java
@@ -21,9 +21,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.beam.integration.nexmark.AbstractSimulator;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQueryModel;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Bid;
 import org.apache.beam.integration.nexmark.model.Event;

diff --git a/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query2.java b/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query2.java
@@ -18,7 +18,6 @@
 package org.apache.beam.integration.nexmark.queries;
 
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQuery;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.AuctionPrice;
 import org.apache.beam.integration.nexmark.model.Bid;

diff --git a/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query2Model.java b/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query2Model.java
@@ -21,9 +21,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.beam.integration.nexmark.AbstractSimulator;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQueryModel;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.AuctionPrice;
 import org.apache.beam.integration.nexmark.model.Bid;

diff --git a/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query3.java b/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query3.java
@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQuery;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Auction;
 import org.apache.beam.integration.nexmark.model.Event;

diff --git a/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query3Model.java b/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query3Model.java
@@ -26,9 +26,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.beam.integration.nexmark.AbstractSimulator;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQueryModel;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Auction;
 import org.apache.beam.integration.nexmark.model.Event;

diff --git a/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query4.java b/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query4.java
@@ -19,9 +19,7 @@
 
 import org.apache.beam.integration.nexmark.Monitor;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQuery;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
-import org.apache.beam.integration.nexmark.WinningBids;
 import org.apache.beam.integration.nexmark.model.Auction;
 import org.apache.beam.integration.nexmark.model.AuctionBid;
 import org.apache.beam.integration.nexmark.model.Bid;

diff --git a/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query4Model.java b/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query4Model.java
@@ -24,11 +24,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-import org.apache.beam.integration.nexmark.AbstractSimulator;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQueryModel;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
-import org.apache.beam.integration.nexmark.WinningBidsSimulator;
 import org.apache.beam.integration.nexmark.model.Auction;
 import org.apache.beam.integration.nexmark.model.AuctionBid;
 import org.apache.beam.integration.nexmark.model.Bid;

diff --git a/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query5.java b/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query5.java
@@ -21,7 +21,6 @@
 import java.util.Arrays;
 import java.util.List;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQuery;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.AuctionCount;
 import org.apache.beam.integration.nexmark.model.Bid;

diff --git a/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query5Model.java b/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query5Model.java
@@ -24,9 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-import org.apache.beam.integration.nexmark.AbstractSimulator;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQueryModel;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.AuctionCount;
 import org.apache.beam.integration.nexmark.model.Bid;

diff --git a/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query6.java b/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query6.java
@@ -22,9 +22,7 @@
 import java.util.Collections;
 import java.util.List;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQuery;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
-import org.apache.beam.integration.nexmark.WinningBids;
 import org.apache.beam.integration.nexmark.model.Auction;
 import org.apache.beam.integration.nexmark.model.AuctionBid;
 import org.apache.beam.integration.nexmark.model.Bid;

diff --git a/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query6Model.java b/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query6Model.java
@@ -22,11 +22,8 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeMap;
-import org.apache.beam.integration.nexmark.AbstractSimulator;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQueryModel;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
-import org.apache.beam.integration.nexmark.WinningBidsSimulator;
 import org.apache.beam.integration.nexmark.model.Auction;
 import org.apache.beam.integration.nexmark.model.AuctionBid;
 import org.apache.beam.integration.nexmark.model.Bid;

diff --git a/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query7.java b/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query7.java
@@ -18,7 +18,6 @@
 package org.apache.beam.integration.nexmark.queries;
 
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQuery;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Bid;
 import org.apache.beam.integration.nexmark.model.Event;

diff --git a/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query7Model.java b/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query7Model.java
@@ -23,9 +23,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.beam.integration.nexmark.AbstractSimulator;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQueryModel;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Bid;
 import org.apache.beam.integration.nexmark.model.Event;

diff --git a/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query8.java b/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query8.java
@@ -18,7 +18,6 @@
 package org.apache.beam.integration.nexmark.queries;
 
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQuery;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Auction;
 import org.apache.beam.integration.nexmark.model.Event;

diff --git a/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query8Model.java b/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query8Model.java
@@ -24,9 +24,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import org.apache.beam.integration.nexmark.AbstractSimulator;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQueryModel;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Auction;
 import org.apache.beam.integration.nexmark.model.Event;

diff --git a/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query9.java b/...ration/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query9.java
@@ -18,9 +18,7 @@
 package org.apache.beam.integration.nexmark.queries;
 
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQuery;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
-import org.apache.beam.integration.nexmark.WinningBids;
 import org.apache.beam.integration.nexmark.model.AuctionBid;
 import org.apache.beam.integration.nexmark.model.Event;
 import org.apache.beam.integration.nexmark.model.KnownSize;

diff --git a/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query9Model.java b/...n/java/nexmark/src/main/java/org/apache/beam/integration/nexmark/queries/Query9Model.java
@@ -21,10 +21,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.beam.integration.nexmark.AbstractSimulator;
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQueryModel;
-import org.apache.beam.integration.nexmark.WinningBidsSimulator;
 import org.apache.beam.sdk.values.TimestampedValue;
 
 /**

diff --git a/...beam/integration/nexmark/WinningBids.java → ...egration/nexmark/queries/WinningBids.java b/...beam/integration/nexmark/WinningBids.java → ...egration/nexmark/queries/WinningBids.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.beam.integration.nexmark;
+package org.apache.beam.integration.nexmark.queries;
 
 import static com.google.common.base.Preconditions.checkState;
 
@@ -30,6 +30,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import org.apache.beam.integration.nexmark.NexmarkConfiguration;
+import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Auction;
 import org.apache.beam.integration.nexmark.model.AuctionBid;
 import org.apache.beam.integration.nexmark.model.Bid;

diff --git a/...gration/nexmark/WinningBidsSimulator.java → ...nexmark/queries/WinningBidsSimulator.java b/...gration/nexmark/WinningBidsSimulator.java → ...nexmark/queries/WinningBidsSimulator.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.beam.integration.nexmark;
+package org.apache.beam.integration.nexmark.queries;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -26,6 +26,8 @@
 import java.util.TreeSet;
 import javax.annotation.Nullable;
 
+import org.apache.beam.integration.nexmark.NexmarkConfiguration;
+import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.Auction;
 import org.apache.beam.integration.nexmark.model.AuctionBid;
 import org.apache.beam.integration.nexmark.model.Bid;

diff --git a/...ion/java/nexmark/src/test/java/org/apache/beam/integration/nexmark/queries/QueryTest.java b/...ion/java/nexmark/src/test/java/org/apache/beam/integration/nexmark/queries/QueryTest.java
@@ -18,8 +18,6 @@
 package org.apache.beam.integration.nexmark.queries;
 
 import org.apache.beam.integration.nexmark.NexmarkConfiguration;
-import org.apache.beam.integration.nexmark.NexmarkQuery;
-import org.apache.beam.integration.nexmark.NexmarkQueryModel;
 import org.apache.beam.integration.nexmark.NexmarkUtils;
 import org.apache.beam.integration.nexmark.model.KnownSize;
 import org.apache.beam.sdk.PipelineResult;