github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#1528] Let generated interfaces extend Serializable

Browse Source
This commit is contained in:
Lukas Eder 2012-07-06 12:19:16 +02:00
parent 535a28f9fd
commit cab9bde9de
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jOOQ-codegen/src/main/java/org/jooq/util/DefaultGeneratorStrategy.java
View File

@ -37,7 +37,6 @@ package org.jooq.util;
import static org.jooq.util.GenerationUtil.convertToJavaIdentifier;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@ -122,10 +121,7 @@ public class DefaultGeneratorStrategy extends AbstractGeneratorStrategy {
public List<String> getJavaClassImplements(Definition definition, Mode mode) {
List<String> result = new ArrayList<String>();
if (mode == Mode.POJO) {
result.add(Serializable.class.getName());
}
else if (mode == Mode.DAO) {
if (mode == Mode.DAO) {
TableDefinition table = (TableDefinition) definition;
List<ColumnDefinition> keyColumns = table.getMainUniqueKey().getKeyColumns();

18
jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java
View File

@ -37,7 +37,9 @@ package org.jooq.util;
import static org.jooq.util.GenerationUtil.convertToJavaIdentifier;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@ -248,7 +250,21 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy {
public List<String> getJavaClassImplements(Definition definition, Mode mode) {
// [#1243] All generation modes can accept interfaces
return delegate.getJavaClassImplements(definition, mode);
List<String> result = new ArrayList<String>(delegate.getJavaClassImplements(definition, mode));
// [#1528] Generated interfaces (implemented by RECORD and POJO) are
// always Serializable
if (mode == Mode.INTERFACE) {
result.add(Serializable.class.getName());
}
// [#1528] POJOs only implement Serializable if they don't inherit
// Serializable from INTERFACE already
else if (mode == Mode.POJO && !generator.generateInterfaces()) {
result.add(Serializable.class.getName());
}
return result;
}
@Override