diff --git a/querydsl-scala/src/main/scala/com/querydsl/scala/sql/ScalaMetaDataSerializer.scala b/querydsl-scala/src/main/scala/com/querydsl/scala/sql/ScalaMetaDataSerializer.scala index b441d1a06..b4dc1f412 100644 --- a/querydsl-scala/src/main/scala/com/querydsl/scala/sql/ScalaMetaDataSerializer.scala +++ b/querydsl-scala/src/main/scala/com/querydsl/scala/sql/ScalaMetaDataSerializer.scala @@ -88,10 +88,10 @@ class ScalaMetaDataSerializer @Inject() (typeMappings: TypeMappings, val namingS columnMeta.append(".named(\"" + metadata.getName + "\")") columnMeta.append(".ofType(" + metadata.getJdbcType + ")") if (metadata.hasSize) { - columnMeta.append(".withSize(" + metadata.getSize() + ")") + columnMeta.append(".withSize(" + metadata.getSize + ")") } if (metadata.getDigits > 0) { - columnMeta.append(".withDigits(" + metadata.getDigits() + ")") + columnMeta.append(".withDigits(" + metadata.getDigits + ")") } if (!metadata.isNullable) { columnMeta.append(".notNull()") @@ -102,13 +102,13 @@ class ScalaMetaDataSerializer @Inject() (typeMappings: TypeMappings, val namingS override def writeAnnotations(model: EntityType, queryType: Type, writer: ScalaWriter) = { if (model == queryType) { - model.getAnnotations.foreach(writer.annotation(_)) + model.getAnnotations.foreach(writer.annotation) } } def serializePrimaryKeys(model: EntityType, writer: CodeWriter, primaryKeys: Collection[PrimaryKeyData]) { primaryKeys.foreach { pk => - val fieldName = namingStrategy.getPropertyNameForPrimaryKey(pk.getName(), model) + val fieldName = namingStrategy.getPropertyNameForPrimaryKey(pk.getName, model) val value = pk.getColumns.map(c => escape(namingStrategy.getPropertyName(c, model))) .mkString("createPrimaryKey(", ", ", ")") writer.publicFinal(new ClassType(classOf[PrimaryKey[_]], model), fieldName, value) @@ -126,7 +126,7 @@ class ScalaMetaDataSerializer @Inject() (typeMappings: TypeMappings, val namingS val value = new StringBuilder(if (inverse) "createInvForeignKey(" else "createForeignKey(") if (fk.getForeignColumns.size == 1) { value.append(namingStrategy.getPropertyName(fk.getForeignColumns.get(0), model)) - value.append(", \"" + fk.getParentColumns().get(0) + "\"") + value.append(", \"" + fk.getParentColumns.get(0) + "\"") } else { val local = fk.getForeignColumns.map(c => escape(namingStrategy.getPropertyName(c, model))).mkString(", ") val foreign = fk.getParentColumns.map("\"" + _ + "\"").mkString(", ") @@ -134,7 +134,7 @@ class ScalaMetaDataSerializer @Inject() (typeMappings: TypeMappings, val namingS } value.append(")") val t = new ClassType(classOf[ForeignKey[_]], fk.getType) - writer.publicFinal(t, fieldName, value.toString()) + writer.publicFinal(t, fieldName, value.toString) } } diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala index 472480ee6..c0a330ba8 100644 --- a/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala +++ b/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala @@ -34,7 +34,7 @@ class CaseClassSerializerTest { serializer.createCompanionObject = false typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType)) serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer)) - val str = writer.toString() + val str = writer.toString CompileTestUtils.assertCompileSuccess(str) } diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala index c2073fe79..a1f2b5f7f 100644 --- a/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala +++ b/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala @@ -51,7 +51,7 @@ class ScalaEntitySerializerTest { typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType)) val serializer = new ScalaEntitySerializer(typeMappings) serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer)) - val str = writer.toString() + val str = writer.toString //System.err.println(str) assertTrue(str.contains("class QPerson(cl: Class[_ <: Person], md: PathMetadata) " + "extends EntityPathImpl[Person](cl, md) {")) @@ -67,7 +67,7 @@ class ScalaEntitySerializerTest { typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType)) val serializer = new ScalaEntitySerializer(typeMappings) serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer)) - val str = writer.toString() + val str = writer.toString //System.err.println(str); CompileTestUtils.assertCompileSuccess(str) }