diff options
-rw-r--r-- | scalastyle-config.xml | 107 | ||||
-rw-r--r-- | shared/src/main/scala/xyz/driver/core/CoreJsonFormats.scala | 9 | ||||
-rw-r--r-- | shared/src/main/scala/xyz/driver/core/core.scala | 12 | ||||
-rw-r--r-- | shared/src/main/scala/xyz/driver/core/rest/ContextHeaders.scala | 6 | ||||
-rw-r--r-- | shared/src/main/scala/xyz/driver/core/rest/sorting.scala | 2 |
5 files changed, 124 insertions, 12 deletions
diff --git a/scalastyle-config.xml b/scalastyle-config.xml new file mode 100644 index 0000000..348d7f9 --- /dev/null +++ b/scalastyle-config.xml @@ -0,0 +1,107 @@ +<scalastyle> + <name>Scalastyle standard configuration</name> + <check level="error" class="org.scalastyle.file.FileTabChecker" enabled="true"/> + <check level="error" class="org.scalastyle.file.FileLengthChecker" enabled="true"> + <parameters> + <parameter name="maxFileLength"><![CDATA[800]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.file.HeaderMatchesChecker" enabled="false"> + <parameters> + <parameter name="header">package</parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.SpacesBeforePlusChecker" enabled="true"/> + <check level="error" class="org.scalastyle.scalariform.SpacesAfterPlusChecker" enabled="true"/> + <check level="error" class="org.scalastyle.file.WhitespaceEndOfLineChecker" enabled="true"/> + <check level="error" class="org.scalastyle.file.FileLineLengthChecker" enabled="true"> + <parameters> + <parameter name="maxLineLength"><![CDATA[160]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.ClassNamesChecker" enabled="true"> + <parameters> + <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.ObjectNamesChecker" enabled="true"> + <parameters> + <parameter name="regex"><![CDATA[[A-Za-z]*]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.PackageObjectNamesChecker" enabled="true"> + <parameters> + <parameter name="regex"><![CDATA[^[a-z][A-Za-z]*$]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.EqualsHashCodeChecker" enabled="true"/> + <check level="error" class="org.scalastyle.scalariform.IllegalImportsChecker" enabled="true"> + <parameters> + <parameter name="illegalImports"><![CDATA[sun._,java.awt._]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.ParameterNumberChecker" enabled="true"> + <parameters> + <parameter name="maxParameters"><![CDATA[15]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.MagicNumberChecker" enabled="false"> + <parameters> + <parameter name="ignore"><![CDATA[-1,0,1,2,3]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker" enabled="true"/> + <check level="error" class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker" enabled="true"/> + <check level="error" class="org.scalastyle.scalariform.ReturnChecker" enabled="true"/> + <check level="error" class="org.scalastyle.scalariform.NoCloneChecker" enabled="true"/> + <check level="error" class="org.scalastyle.scalariform.NoFinalizeChecker" enabled="true"/> + <check level="error" class="org.scalastyle.scalariform.CovariantEqualsChecker" enabled="true"/> + <check level="error" class="org.scalastyle.file.RegexChecker" enabled="true"> + <parameters> + <parameter name="regex"><![CDATA[println]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.NumberOfTypesChecker" enabled="true"> + <parameters> + <parameter name="maxTypes"><![CDATA[100]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.CyclomaticComplexityChecker" enabled="true"> + <parameters> + <parameter name="maximum"><![CDATA[50]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.UppercaseLChecker" enabled="true"/> + <check level="error" class="org.scalastyle.scalariform.SimplifyBooleanExpressionChecker" enabled="true"/> + <check level="error" class="org.scalastyle.scalariform.IfBraceChecker" enabled="true"> + <parameters> + <parameter name="singleLineAllowed"><![CDATA[true]]></parameter> + <parameter name="doubleLineAllowed"><![CDATA[true]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.MethodLengthChecker" enabled="true"> + <parameters> + <parameter name="maxLength"><![CDATA[100]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.ClassTypeParameterChecker" enabled="false"> + <parameters> + <parameter name="regex"><![CDATA[^[A-Za-z]*$]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.NumberOfMethodsInTypeChecker" enabled="true"> + <parameters> + <parameter name="maxMethods"><![CDATA[50]]></parameter> + </parameters> + </check> + <check level="error" class="org.scalastyle.scalariform.PublicMethodsHaveTypeChecker" enabled="false"/> + <check level="error" class="org.scalastyle.file.NewLineAtEofChecker" enabled="true"/> + <check level="error" class="org.scalastyle.file.NoNewLineAtEofChecker" enabled="false"/> + <check level="error" class="org.scalastyle.scalariform.DeprecatedJavaChecker" enabled="true"/> + <check level="error" class="org.scalastyle.scalariform.EmptyClassChecker" enabled="true"/> + <check level="error" class="org.scalastyle.scalariform.RedundantIfChecker" enabled="true"/> + <check level="error" class="org.scalastyle.scalariform.MultipleStringLiteralsChecker" enabled="false"/> + <check level="error" class="org.scalastyle.scalariform.SpaceAfterCommentStartChecker" enabled="true"/> + <check level="error" class="org.scalastyle.scalariform.ProcedureDeclarationChecker" enabled="true"/> + <check level="error" class="org.scalastyle.scalariform.NotImplementedErrorUsage" enabled="true"/> +</scalastyle> diff --git a/shared/src/main/scala/xyz/driver/core/CoreJsonFormats.scala b/shared/src/main/scala/xyz/driver/core/CoreJsonFormats.scala index 68e741c..fd44162 100644 --- a/shared/src/main/scala/xyz/driver/core/CoreJsonFormats.scala +++ b/shared/src/main/scala/xyz/driver/core/CoreJsonFormats.scala @@ -189,7 +189,7 @@ trait CoreJsonFormats extends DerivedJsonProtocol { override def write(value: T): JsValue = { map.find(_._2 == value).map(_._1) match { case Some(name) => JsString(name) - case _ => serializationError(s"Value $value is not found in the mapping $map") + case _ => serializationError(s"Value $value is not found in the mapping $map") } } @@ -205,7 +205,7 @@ trait CoreJsonFormats extends DerivedJsonProtocol { def read(json: JsValue): T = json match { case JsNumber(value) => create(value) - case _ => deserializationError(s"Expected number as ${typeOf[T].getClass.getName}, but got " + json.toString) + case _ => deserializationError(s"Expected number as ${typeOf[T].getClass.getName}, but got " + json.toString) } } @@ -288,7 +288,8 @@ trait CoreJsonFormats extends DerivedJsonProtocol { } } - implicit def nonEmptyNameFormat[T](implicit nonEmptyStringFormat: JsonFormat[Refined[String, NonEmpty]]): RootJsonFormat[NonEmptyName[T]] = + implicit def nonEmptyNameFormat[T]( + implicit nonEmptyStringFormat: JsonFormat[Refined[String, NonEmpty]]): RootJsonFormat[NonEmptyName[T]] = new RootJsonFormat[NonEmptyName[T]] { def write(name: NonEmptyName[T]) = JsString(name.value.value) @@ -318,4 +319,4 @@ trait CoreJsonFormats extends DerivedJsonProtocol { private[core] object CoreJsonFormats { def unrecognizedValue(value: String, possibleValues: Seq[Any]): Nothing = deserializationError(s"Unexpected value $value. Expected one of: ${possibleValues.mkString("[", ", ", "]")}") -}
\ No newline at end of file +} diff --git a/shared/src/main/scala/xyz/driver/core/core.scala b/shared/src/main/scala/xyz/driver/core/core.scala index ea05829..d7bba00 100644 --- a/shared/src/main/scala/xyz/driver/core/core.scala +++ b/shared/src/main/scala/xyz/driver/core/core.scala @@ -118,15 +118,19 @@ package core { implicit def nonEmptyNameOrdering[T]: Ordering[NonEmptyName[T]] = Ordering.by(_.value.value) } - @deprecated("Base64 formats are rarely used in core and will be removed. Please implement the wrapper type in " + - "services, or open an issue if you think it should stay in core.", "driver-core 1.11.5") + @deprecated( + "Base64 formats are rarely used in core and will be removed. Please implement the wrapper type in " + + "services, or open an issue if you think it should stay in core.", + "driver-core 1.11.5") final case class Revision[T](id: String) object Revision { implicit def revisionEqual[T]: Equal[Revision[T]] = Equal.equal[Revision[T]](_.id == _.id) } - @deprecated("Base64 formats are rarely used in core and will be removed. Please implement the wrapper type in " + - "services, or open an issue if you think it should stay in core.", "driver-core 1.11.5") + @deprecated( + "Base64 formats are rarely used in core and will be removed. Please implement the wrapper type in " + + "services, or open an issue if you think it should stay in core.", + "driver-core 1.11.5") final case class Base64(value: String) } diff --git a/shared/src/main/scala/xyz/driver/core/rest/ContextHeaders.scala b/shared/src/main/scala/xyz/driver/core/rest/ContextHeaders.scala index 7efe84c..5e9ae3e 100644 --- a/shared/src/main/scala/xyz/driver/core/rest/ContextHeaders.scala +++ b/shared/src/main/scala/xyz/driver/core/rest/ContextHeaders.scala @@ -10,6 +10,6 @@ object ContextHeaders { val OriginatingIpHeader: String = "X-Forwarded-For" val ResourceCount: String = "X-Resource-Count" val PageCount: String = "X-Page-Count" - val TraceHeaderName = "Tracing-Trace-Id" - val SpanHeaderName = "Tracing-Span-Id" - }
\ No newline at end of file + val TraceHeaderName = "Tracing-Trace-Id" + val SpanHeaderName = "Tracing-Span-Id" +} diff --git a/shared/src/main/scala/xyz/driver/core/rest/sorting.scala b/shared/src/main/scala/xyz/driver/core/rest/sorting.scala index ccdf150..5b68d2a 100644 --- a/shared/src/main/scala/xyz/driver/core/rest/sorting.scala +++ b/shared/src/main/scala/xyz/driver/core/rest/sorting.scala @@ -32,4 +32,4 @@ object ListResponse { Meta(itemsCount, pagination.pageNumber, pagination.pageSize) } -}
\ No newline at end of file +} |