codegen: Minor formatting

common-parent/codegen/src/main/java/com/speedment/common/codegen/Generator.java

@@ -83,7 +83,11 @@ public interface Generator {
      * 
      * @see Meta
      */
-    default <A, B> Stream<Meta<A, B>> metaOn(A from, Class<B> to, Class<? extends Transform<A, B>> transform) {
+    default <A, B> Stream<Meta<A, B>> metaOn(
+            A from, 
+            Class<B> to, 
+            Class<? extends Transform<A, B>> transform) {
+
         return metaOn(from, to)
             .filter(meta -> transform.equals(meta.getTransform().getClass()));
     }
@@ -113,7 +117,7 @@ default <M> Stream<Meta<M, String>> metaOn(M model) {
      * @see Meta
      */
     default <A> Stream<Meta<A, String>> metaOn(Collection<A> models) {
-        return models.stream().map(this::metaOn).flatMap(m -> m);
+        return models.stream().flatMap(this::metaOn);
     }
 
     /**
@@ -128,8 +132,10 @@ default <A> Stream<Meta<A, String>> metaOn(Collection<A> models) {
      * 
      * @see Meta
      */
-    default <A, B> Stream<Meta<A, B>> metaOn(Collection<A> models, Class<B> to) {
-        return models.stream().map(model -> metaOn(model, to)).flatMap(m -> m);
+    default <A, B> Stream<Meta<A, B>> metaOn(
+            Collection<A> models, Class<B> to) {
+
+        return models.stream().flatMap(model -> metaOn(model, to));
     }
 
     /**
@@ -149,7 +155,11 @@ default <A, B> Stream<Meta<A, B>> metaOn(Collection<A> models, Class<B> to) {
      * 
      * @see Meta
      */
-    default <A, B> Stream<Meta<A, B>> metaOn(Collection<A> models, Class<B> to, Class<? extends Transform<A, B>> transform) {
+    default <A, B> Stream<Meta<A, B>> metaOn(
+            Collection<A> models, 
+            Class<B> to, 
+            Class<? extends Transform<A, B>> transform) {
+
         return metaOn(models, to)
             .filter(meta -> meta.getTransform().is(transform));
     }
@@ -163,16 +173,20 @@ default <A, B> Stream<Meta<A, B>> metaOn(Collection<A> models, Class<B> to, Clas
      * @return       the generated text if any
      */
     default Optional<String> on(Object model) {
+        final Object m;
+
         if (model instanceof Optional) {
             final Optional<?> result = (Optional<?>) model;
             if (result.isPresent()) {
-                model = result.get();
+                m = result.get();
             } else {
                 return Optional.empty();
             }
+        } else {
+            m = model;
         }
 
-        return metaOn(model).map(Meta::getResult).findAny();
+        return metaOn(m).map(Meta::getResult).findAny();
     }
 
     /**
@@ -200,5 +214,8 @@ default <M> Stream<String> onEach(Collection<M> models) {
      * @see    Transform
      * @see    TransformFactory
      */
-    <A, B> Optional<Meta<A, B>> transform(Transform<A, B> transform, A model, TransformFactory factory);
+    <A, B> Optional<Meta<A, B>> transform(
+            Transform<A, B> transform, 
+            A model, 
+            TransformFactory factory);
 }

common-parent/codegen/src/main/java/com/speedment/common/codegen/internal/java/view/InterfaceView.java

@@ -19,6 +19,7 @@
 import com.speedment.common.codegen.Generator;
 import com.speedment.common.codegen.internal.model.InterfaceMethodImpl;
 import com.speedment.common.codegen.model.Interface;
+import com.speedment.common.codegen.model.InterfaceMethod;
 import com.speedment.common.codegen.model.Method;
 
 /**
@@ -44,7 +45,7 @@ protected String renderSupertype(Generator gen, Interface model) {
 	}
 
     @Override
-    public Object wrapMethod(Method method) {
+    public InterfaceMethod wrapMethod(Method method) {
         return new InterfaceMethodImpl(method);
     }
 

common-parent/codegen/src/main/java/com/speedment/common/codegen/internal/model/InterfaceImpl.java

@@ -24,7 +24,8 @@
  * 
  * @author Emil Forslund
  */
-public final class InterfaceImpl extends ClassOrInterfaceImpl<Interface> implements Interface {
+public final class InterfaceImpl extends ClassOrInterfaceImpl<Interface> 
+implements Interface {
 
     /**
      * Initializes this interface using a name.