Remove operator methods

Remove symbol/operator methods from Dot and Of.
NthPortal · Jun 18, 2017 · 0d14d27 · 0d14d27
1 parent 604b29b
commit 0d14d27
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 38 deletions.
diff --git a/src/main/scala/com/nthportal/versions/Dot.scala b/src/main/scala/com/nthportal/versions/Dot.scala
@@ -23,14 +23,4 @@ trait Dot[A] {
     * @see [[apply]]
     */
   final def dot(value: Int): A = apply(value)
-
-  /**
-    * @see [[apply]]
-    */
-  final def :*(value: Int): A = apply(value)
-
-  /**
-    * @see [[apply]]
-    */
-  final def ⋅(value: Int): A = apply(value)
 }
diff --git a/src/main/scala/com/nthportal/versions/Of.scala b/src/main/scala/com/nthportal/versions/Of.scala
@@ -18,14 +18,4 @@ trait Of[D <: Dot[_]] {
     * @see [[of]]
     */
   final def apply(value: Int): D = of(value)
-
-  /**
-    * @see [[of]]
-    */
-  final def :>(value: Int): D = of(value)
-
-  /**
-    * @see [[of]]
-    */
-  final def ⋮(value: Int): D = of(value)
 }
diff --git a/src/test/scala/com/nthportal/versions/v2/VersionTest.scala b/src/test/scala/com/nthportal/versions/v2/VersionTest.scala
@@ -6,9 +6,7 @@ class VersionTest extends SimpleSpec {
   behavior of "Version (2)"
 
   it should "have consistent constructors" in {
-    val v = Version ⋮ 1⋅3
-    v should equal (Version(1)(3))
-    v should equal (Version :> 1 :* 3)
+    val v = Version(1)(3)
     v should equal (Version of 1 dot 3)
     v should equal (Version(1, 3))
   }
@@ -19,7 +17,7 @@ class VersionTest extends SimpleSpec {
   }
 
   it should "compare correctly" in {
-    val v = Version ⋮ 1⋅3
+    val v = Version(1)(3)
 
     v should be > Version(1)(2)
     v should be > Version(0)(9)

diff --git a/src/test/scala/com/nthportal/versions/v2/compat/VersionFactoryTest.scala b/src/test/scala/com/nthportal/versions/v2/compat/VersionFactoryTest.scala
@@ -12,8 +12,8 @@ class VersionFactoryTest extends SimpleSpec {
   it should "parse versions correctly" in {
     val f = VersionFactory(extensionDef, extensionParser)
 
-    f parseVersion "1.3" should equal(Version ⋮ 1⋅3 -- Release)
-    f parseVersion "0.0-SNAPSHOT" should equal(Version ⋮ 0⋅0 -- Snapshot)
+    f parseVersion "1.3" should equal(Version(1)(3) -- Release)
+    f parseVersion "0.0-SNAPSHOT" should equal(Version(0)(0) -- Snapshot)
 
     a [VersionFormatException] should be thrownBy {f parseVersion "1.0-INVALID"}
     a [VersionFormatException] should be thrownBy {f parseVersion "1.0-RELEASE"}

diff --git a/src/test/scala/com/nthportal/versions/v3/VersionTest.scala b/src/test/scala/com/nthportal/versions/v3/VersionTest.scala
@@ -6,9 +6,7 @@ class VersionTest extends SimpleSpec {
   behavior of "Version (3)"
 
   it should "have consistent constructors" in {
-    val v = Version ⋮ 1⋅2⋅5
-    v should equal (Version(1)(2)(5))
-    v should equal (Version :> 1 :* 2 :* 5)
+    val v = Version(1)(2)(5)
     v should equal (Version of 1 dot 2 dot 5)
     v should equal (Version(1, 2, 5))
   }
@@ -20,7 +18,7 @@ class VersionTest extends SimpleSpec {
   }
 
   it should "compare correctly" in {
-    val v = Version ⋮ 1⋅2⋅5
+    val v = Version(1)(2)(5)
 
     v should be > Version(1)(2)(4)
     v should be > Version(1)(1)(9)

diff --git a/src/test/scala/com/nthportal/versions/v3/compat/VersionFactoryTest.scala b/src/test/scala/com/nthportal/versions/v3/compat/VersionFactoryTest.scala
@@ -12,8 +12,8 @@ class VersionFactoryTest extends SimpleSpec {
   it should "parse versions correctly" in {
     val f = VersionFactory(extensionDef, extensionParser)
 
-    f parseVersion "1.2.5" should equal(Version ⋮ 1⋅2⋅5 -- Release)
-    f parseVersion "0.0.0-SNAPSHOT" should equal(Version ⋮ 0⋅0⋅0 -- Snapshot)
+    f parseVersion "1.2.5" should equal(Version(1)(2)(5) -- Release)
+    f parseVersion "0.0.0-SNAPSHOT" should equal(Version(0)(0)(0) -- Snapshot)
 
     a [VersionFormatException] should be thrownBy {f parseVersion "1.0.0-INVALID"}
     a [VersionFormatException] should be thrownBy {f parseVersion "1.0.0-RELEASE"}

diff --git a/src/test/scala/com/nthportal/versions/v4/VersionTest.scala b/src/test/scala/com/nthportal/versions/v4/VersionTest.scala
@@ -6,9 +6,7 @@ class VersionTest extends SimpleSpec {
   behavior of "Version (4)"
 
   it should "have consistent constructors" in {
-    val v = Version ⋮ 1⋅2⋅5⋅4
-    v should equal (Version(1)(2)(5)(4))
-    v should equal (Version :> 1 :* 2 :* 5 :* 4)
+    val v = Version(1)(2)(5)(4)
     v should equal (Version of 1 dot 2 dot 5 dot 4)
     v should equal (Version(1, 2, 5, 4))
   }
@@ -21,7 +19,7 @@ class VersionTest extends SimpleSpec {
   }
 
   it should "compare correctly" in {
-    val v = Version ⋮ 1⋅2⋅5⋅4
+    val v = Version(1)(2)(5)(4)
 
     v should be > Version(1)(2)(5)(3)
     v should be > Version(1)(2)(4)(9)

diff --git a/src/test/scala/com/nthportal/versions/v4/compat/VersionFactoryTest.scala b/src/test/scala/com/nthportal/versions/v4/compat/VersionFactoryTest.scala
@@ -12,8 +12,8 @@ class VersionFactoryTest extends SimpleSpec {
   it should "parse versions correctly" in {
     val f = VersionFactory(extensionDef, extensionParser)
 
-    f parseVersion "1.2.5.4" should equal(Version ⋮ 1⋅2⋅5⋅4 -- Release)
-    f parseVersion "0.0.0.0-SNAPSHOT" should equal(Version ⋮ 0⋅0⋅0⋅0 -- Snapshot)
+    f parseVersion "1.2.5.4" should equal(Version(1)(2)(5)(4) -- Release)
+    f parseVersion "0.0.0.0-SNAPSHOT" should equal(Version(0)(0)(0)(0) -- Snapshot)
 
     a [VersionFormatException] should be thrownBy {f parseVersion "1.0.0.0-INVALID"}
     a [VersionFormatException] should be thrownBy {f parseVersion "1.0.0.0-RELEASE"}