From c8dcc52766ae11db2929a5921fd3b4277b686a55 Mon Sep 17 00:00:00 2001 From: Abhinav Sarkar Date: Mon, 20 May 2013 00:59:34 +0530 Subject: [PATCH] Organized imports --- .../ircsearch/HttpRequestHandler.scala | 9 ++----- .../net/abhinavsarkar/ircsearch/Server.scala | 27 +++++++------------ .../ircsearch/lucene/Indexer.scala | 15 +++-------- .../ircsearch/lucene/Searcher.scala | 18 +++---------- 4 files changed, 19 insertions(+), 50 deletions(-) diff --git a/src/main/scala/net/abhinavsarkar/ircsearch/HttpRequestHandler.scala b/src/main/scala/net/abhinavsarkar/ircsearch/HttpRequestHandler.scala index e5b24c4..cefc3c5 100644 --- a/src/main/scala/net/abhinavsarkar/ircsearch/HttpRequestHandler.scala +++ b/src/main/scala/net/abhinavsarkar/ircsearch/HttpRequestHandler.scala @@ -3,15 +3,10 @@ package net.abhinavsarkar.ircsearch import com.typesafe.scalalogging.slf4j.Logging import io.netty.buffer.Unpooled -import io.netty.channel.ChannelFutureListener -import io.netty.channel.ChannelHandlerContext -import io.netty.channel.ChannelInboundMessageHandlerAdapter -import io.netty.handler.codec.http.DefaultHttpResponse -import io.netty.handler.codec.http.HttpHeaders +import io.netty.channel.{ ChannelFutureListener, ChannelHandlerContext, ChannelInboundMessageHandlerAdapter } +import io.netty.handler.codec.http.{ DefaultHttpResponse, HttpHeaders, HttpRequest, HttpResponse } import io.netty.handler.codec.http.HttpHeaders.Names._ import io.netty.handler.codec.http.HttpHeaders.isKeepAlive -import io.netty.handler.codec.http.HttpRequest -import io.netty.handler.codec.http.HttpResponse import io.netty.handler.codec.http.HttpResponseStatus._ import io.netty.handler.codec.http.HttpVersion.HTTP_1_1 diff --git a/src/main/scala/net/abhinavsarkar/ircsearch/Server.scala b/src/main/scala/net/abhinavsarkar/ircsearch/Server.scala index b07a3f4..a738a27 100644 --- a/src/main/scala/net/abhinavsarkar/ircsearch/Server.scala +++ b/src/main/scala/net/abhinavsarkar/ircsearch/Server.scala @@ -10,28 +10,21 @@ import scala.concurrent.future import com.typesafe.scalalogging.slf4j.Logging import au.com.bytecode.opencsv.CSVParser + import io.netty.bootstrap.ServerBootstrap import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandler.Sharable -import io.netty.channel.ChannelHandlerContext -import io.netty.channel.ChannelInboundByteHandlerAdapter -import io.netty.channel.ChannelInboundMessageHandlerAdapter -import io.netty.channel.ChannelInitializer +import io.netty.channel.{ ChannelHandlerContext, ChannelInboundByteHandlerAdapter, + ChannelInboundMessageHandlerAdapter, ChannelInitializer } import io.netty.channel.socket.SocketChannel -import io.netty.channel.socket.nio.NioEventLoopGroup -import io.netty.channel.socket.nio.NioServerSocketChannel -import io.netty.handler.codec.DelimiterBasedFrameDecoder -import io.netty.handler.codec.Delimiters -import io.netty.handler.codec.http.HttpChunkAggregator -import io.netty.handler.codec.http.HttpContentCompressor -import io.netty.handler.codec.http.HttpMethod -import io.netty.handler.codec.http.HttpRequest -import io.netty.handler.codec.http.HttpRequestDecoder -import io.netty.handler.codec.http.HttpResponseEncoder -import io.netty.handler.codec.http.QueryStringDecoder +import io.netty.channel.socket.nio.{ NioEventLoopGroup, NioServerSocketChannel } +import io.netty.handler.codec.{ DelimiterBasedFrameDecoder, Delimiters } +import io.netty.handler.codec.http.{ HttpChunkAggregator, HttpContentCompressor, HttpMethod, + HttpRequest, HttpRequestDecoder, HttpResponseEncoder, + QueryStringDecoder } import io.netty.handler.codec.string.StringDecoder -import net.abhinavsarkar.ircsearch.lucene.Indexer -import net.abhinavsarkar.ircsearch.lucene.Searcher + +import net.abhinavsarkar.ircsearch.lucene._ import net.abhinavsarkar.ircsearch.model._ import net.liftweb.json.DefaultFormats import net.liftweb.json.Serialization diff --git a/src/main/scala/net/abhinavsarkar/ircsearch/lucene/Indexer.scala b/src/main/scala/net/abhinavsarkar/ircsearch/lucene/Indexer.scala index 73d32be..d956a74 100644 --- a/src/main/scala/net/abhinavsarkar/ircsearch/lucene/Indexer.scala +++ b/src/main/scala/net/abhinavsarkar/ircsearch/lucene/Indexer.scala @@ -2,10 +2,7 @@ package net.abhinavsarkar.ircsearch.lucene import java.io.File import java.util.ArrayList -import java.util.concurrent.Executors -import java.util.concurrent.Future -import java.util.concurrent.PriorityBlockingQueue -import java.util.concurrent.TimeUnit +import java.util.concurrent.{ Executors, Future, PriorityBlockingQueue, TimeUnit } import java.util.concurrent.locks.ReentrantLock import scala.collection.JavaConversions._ @@ -18,12 +15,8 @@ import org.apache.lucene.analysis.core.KeywordAnalyzer import org.apache.lucene.analysis.en.EnglishAnalyzer import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper import org.apache.lucene.analysis.standard.StandardAnalyzer -import org.apache.lucene.document.Field -import org.apache.lucene.document.LongField -import org.apache.lucene.document.StringField -import org.apache.lucene.document.TextField -import org.apache.lucene.index.IndexWriter -import org.apache.lucene.index.IndexWriterConfig +import org.apache.lucene.document.{ Field, LongField, StringField, TextField } +import org.apache.lucene.index.{ IndexWriter, IndexWriterConfig } import org.apache.lucene.store.FSDirectory import org.apache.lucene.util.Version @@ -44,14 +37,12 @@ object Indexer extends Logging { } object IndexRecord { - def fromIndexRequest(indexRequest : IndexRequest) = { val IndexRequest(server, channel, botName, chatLines) = indexRequest for { chatLine <- chatLines } yield new IndexRecord(server, channel, botName, chatLine) } - } val LUCENE_VERSION = Version.LUCENE_43 diff --git a/src/main/scala/net/abhinavsarkar/ircsearch/lucene/Searcher.scala b/src/main/scala/net/abhinavsarkar/ircsearch/lucene/Searcher.scala index 9e96a35..f70aa6e 100644 --- a/src/main/scala/net/abhinavsarkar/ircsearch/lucene/Searcher.scala +++ b/src/main/scala/net/abhinavsarkar/ircsearch/lucene/Searcher.scala @@ -1,8 +1,7 @@ package net.abhinavsarkar.ircsearch.lucene import java.io.File -import java.text.ParseException -import java.text.SimpleDateFormat +import java.text.{ SimpleDateFormat, ParseException } import scala.collection.JavaConversions._ import scala.collection.immutable.Map @@ -12,18 +11,9 @@ import scala.collection.mutable.Buffer import org.apache.lucene.analysis.Analyzer import org.apache.lucene.queries.ChainedFilter import org.apache.lucene.queryparser.classic.MultiFieldQueryParser -import org.apache.lucene.search.BooleanClause -import org.apache.lucene.search.BooleanQuery -import org.apache.lucene.search.Filter -import org.apache.lucene.search.FilteredQuery -import org.apache.lucene.search.NumericRangeFilter -import org.apache.lucene.search.Query -import org.apache.lucene.search.QueryWrapperFilter -import org.apache.lucene.search.SearcherFactory -import org.apache.lucene.search.SearcherManager -import org.apache.lucene.search.Sort -import org.apache.lucene.search.SortField -import org.apache.lucene.search.TermQuery +import org.apache.lucene.search.{ BooleanClause, BooleanQuery, Filter, FilteredQuery, + NumericRangeFilter, Query, QueryWrapperFilter, SearcherFactory, + SearcherManager, Sort, SortField, TermQuery } import org.apache.lucene.store.FSDirectory import com.typesafe.scalalogging.slf4j.Logging