Refactor getter name to avoid JSON serialization, Fix #101

src/main/java/com/speedment/code/StandardTranslatorKey.java

@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); You may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.speedment.code;
 
 import com.speedment.config.db.Project;

src/main/java/com/speedment/code/Translator.java

@@ -110,7 +110,7 @@ default Column column() {
      *
      * @return the enabled columns
      * @see Column
-     * @see Enableable#isEnabled()
+     * @see HasEnabled#isEnabled()
      */
     default Stream<? extends Column> columns() {
         return table().columns().filter(HasEnabled::test);
@@ -122,7 +122,7 @@ default Stream<? extends Column> columns() {
      *
      * @return the enabled indexes
      * @see Index
-     * @see Enableable#isEnabled()
+     * @see HasEnabled#isEnabled()
      */
     default Stream<? extends Index> indexes() {
         return table().indexes().filter(HasEnabled::test);
@@ -134,7 +134,7 @@ default Stream<? extends Index> indexes() {
      *
      * @return the enabled foreign keys
      * @see ForeignKey
-     * @see Enableable#isEnabled()
+     * @see HasEnabled#isEnabled()
      */
     default Stream<? extends ForeignKey> foreignKeys() {
         return table().foreignKeys().filter(HasEnabled::test);
@@ -146,7 +146,7 @@ default Stream<? extends ForeignKey> foreignKeys() {
      *
      * @return the enabled primary key columns
      * @see PrimaryKeyColumn
-     * @see Enableable#isEnabled()
+     * @see HasEnabled#isEnabled()
      */
     default Stream<? extends PrimaryKeyColumn> primaryKeyColumns() {
         return table().primaryKeyColumns().filter(HasEnabled::test);

src/main/java/com/speedment/code/TranslatorConstructor.java

@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); You may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.speedment.code;
 
 import com.speedment.Speedment;

src/main/java/com/speedment/code/TranslatorKey.java

@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); You may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.speedment.code;
 
 import com.speedment.config.db.trait.HasMainInterface;

src/main/java/com/speedment/component/CodeGenerationComponent.java

@@ -109,7 +109,7 @@ default <T extends HasMainInterface> void remove(Class<T> clazz, TranslatorKey<T
      * registered key.
      *
      * @param <T> Document type
-     * @param document
+     * @param document to use when making translators
      * @return a Stream of newly created {@code Translator Translators} for the
      * given Document
      */
@@ -121,8 +121,8 @@ default <T extends HasMainInterface> void remove(Class<T> clazz, TranslatorKey<T
      * included in the Stream.
      *
      * @param <T> Document type
-     * @param document
-     * @param hasKey
+     * @param document to use when making translators
+     * @param hasKey key
      * @return a Stream of newly created {@code Translator Translators} for the
      * given Document
      */
@@ -137,8 +137,8 @@ default <T extends HasMainInterface> void remove(Class<T> clazz, TranslatorKey<T
      * included in the Stream.
      *
      * @param <T> Document type
-     * @param document
-     * @param key
+     * @param document to use when making translators
+     * @param key key
      * @return a Stream of newly created {@code Translator Translators} for the
      * given Document
      */

src/main/java/com/speedment/event/PreviewEvent.java

@@ -1,17 +1,18 @@
-/*
- * Copyright 2016 Speedment, Inc..
+/**
+ *
+ * Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); You may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at:
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 package com.speedment.event;
 

src/main/java/com/speedment/internal/core/code/AbstractBaseEntity.java

@@ -38,7 +38,7 @@ public AbstractBaseEntity(Speedment speedment) {
         this.speedment = requireNonNull(speedment);
     }
 
-    protected Speedment getSpeedment_() {
+    protected Speedment speedment() {
         return speedment;
     }
 
@@ -82,19 +82,19 @@ public ENTITY remove(Consumer<MetaResult<ENTITY>> consumer) throws SpeedmentExce
         return manager_().remove(selfAsEntity(), consumer);
     }
 
-    protected abstract Class<ENTITY> getEntityClass_();
+    protected abstract Class<ENTITY> entityClass();
 
     @SuppressWarnings("unchecked")
     private ENTITY selfAsEntity() {
         return (ENTITY) this;
     }
 
     protected Manager<ENTITY> manager_() {
-        return managerOf_(getEntityClass_());
+        return managerOf_(entityClass());
     }
 
     protected <T> Manager<T> managerOf_(Class<T> entityClass) {
-        return getSpeedment_().managerOf(requireNonNull(entityClass));
+        return speedment().managerOf(requireNonNull(entityClass));
     }
 
 }

src/main/java/com/speedment/internal/core/code/TranslatorKeyImpl.java

@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); You may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.speedment.internal.core.code;
 
 import com.speedment.code.TranslatorKey;

src/main/java/com/speedment/internal/core/code/entity/EntityImplTranslator.java

@@ -202,7 +202,7 @@ protected Class make(File file) {
                 .add(toString(file))
                 .add(equalsMethod())
                 .add(hashCodeMethod())
-                .add(Method.of("getEntityClass_", Type.of(java.lang.Class.class).add(Generic.of().add(ENTITY.getType()))).public_().add(OVERRIDE)
+                .add(Method.of("entityClass", Type.of(java.lang.Class.class).add(Generic.of().add(ENTITY.getType()))).public_().add(OVERRIDE)
                         .add("return " + ENTITY.getName() + ".class;")
                 );
 
@@ -212,7 +212,7 @@ protected Class make(File file) {
 
     private Method copy() {
         return Method.of("copy", ENTITY.getType()).public_().add(OVERRIDE)
-                .add("return new " + ENTITY.getImplName() + "(getSpeedment_(), this);");
+                .add("return new " + ENTITY.getImplName() + "(speedment(), this);");
 
     }
 

src/main/java/com/speedment/internal/core/config/db/SchemaImpl.java

@@ -1,4 +1,5 @@
-/*
+/**
+ *
  * Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); You may not

src/main/java/com/speedment/internal/ui/config/preview/PreviewNode.java

@@ -1,17 +1,18 @@
-/*
- * Copyright 2016 Speedment, Inc..
+/**
+ *
+ * Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); You may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at:
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 package com.speedment.internal.ui.config.preview;
 

src/main/java/com/speedment/internal/ui/property/DefaultStringPropertyItem.java

@@ -1,17 +1,18 @@
-/*
- * Copyright 2016 Speedment, Inc..
+/**
+ *
+ * Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); You may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at:
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 package com.speedment.internal.ui.property;
 

src/main/java/com/speedment/internal/ui/property/PreviewPropertyItem.java

@@ -1,17 +1,18 @@
-/*
- * Copyright 2016 Speedment, Inc..
+/**
+ *
+ * Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); You may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at:
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 package com.speedment.internal.ui.property;
 

src/main/java/com/speedment/internal/util/document/TraitUtil.java

@@ -1,17 +1,18 @@
-/*
- * Copyright 2016 Speedment, Inc..
+/**
+ *
+ * Copyright (c) 2006-2016, Speedment, Inc. All Rights Reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); You may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at:
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 package com.speedment.internal.util.document;