use "exists" instead of "map().getOrElse(false)"

squeryl · Apr 2, 2017 · 20b6dc9 · 20b6dc9
1 parent b8c349a
commit 20b6dc9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/scala/org/squeryl/internals/FieldMetaData.scala b/src/main/scala/org/squeryl/internals/FieldMetaData.scala
@@ -111,8 +111,8 @@ class FieldMetaData(
     }
   }
 
-  def isIdFieldOfKeyedEntity =
-    parentMetaData.viewOrTable.ked.map(_.idPropertyName == nameOfProperty).getOrElse(false)
+  def isIdFieldOfKeyedEntity: Boolean =
+    parentMetaData.viewOrTable.ked.exists(_.idPropertyName == nameOfProperty)
 
   if(isIdFieldOfKeyedEntity && ! classOf[CompositeKey].isAssignableFrom(wrappedFieldType)) {
     schema.defaultColumnAttributesForKeyedEntityId(wrappedFieldType).foreach(ca => {

diff --git a/src/main/scala/org/squeryl/internals/PosoMetaData.scala b/src/main/scala/org/squeryl/internals/PosoMetaData.scala
@@ -239,20 +239,20 @@ class PosoMetaData[T](val clasz: Class[T], val schema: Schema, val viewOrTable:
     if(property._4.find(an => an.isInstanceOf[Transient]) != None)
       return false
 
-    val hasAField = property._1.map { field =>
+    val hasAField = property._1.exists { field =>
       !Modifier.isStatic(field.getModifiers)
-    } getOrElse false
+    }
 
-    val hasGetter = property._2.map { getter =>
+    val hasGetter = property._2.exists { getter =>
       !Modifier.isStatic(getter.getModifiers) &&
         !classOf[java.lang.Void].isAssignableFrom(getter.getReturnType) &&
         getter.getParameterTypes.length == 0
-    } getOrElse false
+    }
 
-    val hasSetter = property._3.map { setter =>
+    val hasSetter = property._3.exists { setter =>
       !Modifier.isStatic(setter.getModifiers) &&
         property._3.get.getParameterTypes.length == 1
-    } getOrElse false
+    }
 
     val memberTypes = new ArrayBuffer[Class[_]]