Skip to content

Commit

Permalink
fixed scalastyle errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ericmittelhammer committed Apr 12, 2014
1 parent 1534afc commit e6e7c9c
Show file tree
Hide file tree
Showing 7 changed files with 138 additions and 15 deletions.
2 changes: 1 addition & 1 deletion app/Global.scala
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ object Global extends GlobalSettings {
// Akka.system.actorOf(MessageStream.props(messageList.toList))

// }
}
}
8 changes: 4 additions & 4 deletions app/actors/OfflineMessageStream.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ object OfflineMessageStream {
supervisor: ActorRef,
messageList: List[MessageStream.Message],
minMilliseconds: Int,
maxMilliseconds: Int) =
maxMilliseconds: Int): Props =
Props(
classOf[OfflineMessageStream],
supervisor,
Expand Down Expand Up @@ -74,12 +74,12 @@ class OfflineMessageStream(
scala.util.Random.nextInt(
(maxMilliseconds - minMilliseconds) + 1) + minMilliseconds
context.system.scheduler.scheduleOnce(nextMessageAt milliseconds) {
//schedule the next message to be sent
//schedule the next message to be sent
self ! OfflineMessageStream.NextMessage
}
}
}

override def receive = stopped
override def receive: Receive = stopped

}
}
8 changes: 4 additions & 4 deletions app/actors/SocketEndpoint.scala
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ object SocketEndpoint {

case class NewMessage(message: MessageStream.Message)

def props(supervisor: ActorRef) = Props(classOf[SocketEndpoint], supervisor)
def props(supervisor: ActorRef): Props = Props(classOf[SocketEndpoint], supervisor)

// used to convert from raw json coming from the socket into the message type
val inputReads: Reads[MessageStream.Message] = (
Expand Down Expand Up @@ -66,18 +66,18 @@ class SocketEndpoint(supervisor: ActorRef) extends Actor {

var filterString: Option[String] = None

def receive = LoggingReceive {
def receive: Receive = LoggingReceive {

case Supervisor.NewSocket(name: Option[String]) => {

// create the iteratee that will handle incoming data from the websocket
// create the iteratee that will handle incoming data from the websocket
var in: Iteratee[JsValue, Unit] = Iteratee.foreach[JsValue] { msg =>

msg \ "messageType" match {

case JsString("newMessage") =>

//try to parse the json into a Message
//try to parse the json into a Message
inputToMessageResult((msg \ "payload").as[JsValue]) match {

// if it validates, send the message to the supervisor
Expand Down
10 changes: 5 additions & 5 deletions app/actors/Supervisor.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ object Supervisor {
case class SocketClosed(closedSocket: ActorRef)

def props(messageStreamFactory: MessageStreamFactory,
socketEndpointFactory: SocketEndpointFactory) =
socketEndpointFactory: SocketEndpointFactory): Props =
Props(classOf[Supervisor], messageStreamFactory, socketEndpointFactory)

}

/**
* Supervisor that will route messages between the MessageStream and SocketEndpoints
* @param messageStream a factory function to create MessageStream actors.
* The funciton accepts a reference to it's supervisor
* @param messageStreamFactory a factory function usedto create MessageStream actors.
* @param socketEndpointFactory a factory function used to create SocketEndpint actors.
*/
class Supervisor(messageStreamFactory: MessageStreamFactory,
socketEndpointFactory: SocketEndpointFactory) extends Actor {
Expand All @@ -41,7 +41,7 @@ class Supervisor(messageStreamFactory: MessageStreamFactory,

var sockets = ParSet[ActorRef]()

def receive = LoggingReceive {
def receive: Receive = LoggingReceive {

case m @ NewSocket(name: Option[String]) => {

Expand Down Expand Up @@ -76,4 +76,4 @@ class Supervisor(messageStreamFactory: MessageStreamFactory,
}

}
}
}
2 changes: 2 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ libraryDependencies ++= Seq(
play.Project.playScalaSettings

scalariformSettings

org.scalastyle.sbt.ScalastylePlugin.Settings
6 changes: 5 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ logLevel := Level.Warn
// The Typesafe repository
resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"

resolvers += "sonatype-releases" at "https://oss.sonatype.org/content/repositories/releases/"

// Use the Play sbt plugin for Play projects
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.1")

addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.1")

addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.4.0")
117 changes: 117 additions & 0 deletions scalastyle-config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
<scalastyle>
<name>Scalastyle standard configuration</name>
<check level="warning" class="org.scalastyle.file.FileTabChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.file.FileLengthChecker" enabled="true">
<parameters>
<parameter name="maxFileLength"><![CDATA[800]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.file.HeaderMatchesChecker" enabled="true">
<parameters>
<parameter name="header"><![CDATA[// Copyright (C) 2011-2012 the original author or authors.
// See the LICENCE.txt file distributed with this work for additional
// information regarding copyright ownership.
//
// 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.]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.SpacesAfterPlusChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.file.WhitespaceEndOfLineChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.scalariform.SpacesBeforePlusChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.file.FileLineLengthChecker" enabled="true">
<parameters>
<parameter name="maxLineLength"><![CDATA[160]]></parameter>
<parameter name="tabSize"><![CDATA[4]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.ClassNamesChecker" enabled="true">
<parameters>
<parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.ObjectNamesChecker" enabled="true">
<parameters>
<parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.PackageObjectNamesChecker" enabled="true">
<parameters>
<parameter name="regex"><![CDATA[^[a-z][A-Za-z]*$]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.EqualsHashCodeChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.scalariform.IllegalImportsChecker" enabled="true">
<parameters>
<parameter name="illegalImports"><![CDATA[sun._,java.awt._]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.ParameterNumberChecker" enabled="true">
<parameters>
<parameter name="maxParameters"><![CDATA[8]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.MagicNumberChecker" enabled="true">
<parameters>
<parameter name="ignore"><![CDATA[-1,0,1,2,3]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.scalariform.ReturnChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.scalariform.NullChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.scalariform.NoCloneChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.scalariform.NoFinalizeChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.scalariform.CovariantEqualsChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.scalariform.StructuralTypeChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.file.RegexChecker" enabled="true">
<parameters>
<parameter name="regex"><![CDATA[println]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.NumberOfTypesChecker" enabled="true">
<parameters>
<parameter name="maxTypes"><![CDATA[30]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.CyclomaticComplexityChecker" enabled="true">
<parameters>
<parameter name="maximum"><![CDATA[10]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.UppercaseLChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.scalariform.SimplifyBooleanExpressionChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.scalariform.IfBraceChecker" enabled="true">
<parameters>
<parameter name="singleLineAllowed"><![CDATA[true]]></parameter>
<parameter name="doubleLineAllowed"><![CDATA[false]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.MethodLengthChecker" enabled="true">
<parameters>
<parameter name="maxLength"><![CDATA[50]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.MethodNamesChecker" enabled="true">
<parameters>
<parameter name="regex"><![CDATA[^[a-z][A-Za-z0-9]*$]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.NumberOfMethodsInTypeChecker" enabled="true">
<parameters>
<parameter name="maxMethods"><![CDATA[30]]></parameter>
</parameters>
</check>
<check level="warning" class="org.scalastyle.scalariform.PublicMethodsHaveTypeChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.file.NewLineAtEofChecker" enabled="true"></check>
<check level="warning" class="org.scalastyle.file.NoNewLineAtEofChecker" enabled="false"></check>
</scalastyle>

0 comments on commit e6e7c9c

Please sign in to comment.