mindol1004/record-builder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix indentation in OptionBasedRecordBuilderMetaData as well

Browse Source
This commit is contained in:
sipkab
2020-02-05 08:49:02 +01:00
parent 0774278032
commit 0fc82139de
2 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/OptionBasedRecordBuilderMetaData.java
View File

@@ -20,103 +20,103 @@ import java.util.Map;
import io.soabase.recordbuilder.core.RecordBuilderMetaData; import io.soabase.recordbuilder.core.RecordBuilderMetaData;
public class OptionBasedRecordBuilderMetaData implements RecordBuilderMetaData { public class OptionBasedRecordBuilderMetaData implements RecordBuilderMetaData {
/** /**
* @see #suffix() * @see #suffix()
*/ */
public static final String OPTION_SUFFIX = "suffix"; public static final String OPTION_SUFFIX = "suffix";
/** /**
* @see #copyMethodName() * @see #copyMethodName()
*/ */
public static final String OPTION_COPY_METHOD_NAME = "copyMethodName"; public static final String OPTION_COPY_METHOD_NAME = "copyMethodName";
/** /**
* @see #builderMethodName() * @see #builderMethodName()
*/ */
public static final String OPTION_BUILDER_METHOD_NAME = "builderMethodName"; public static final String OPTION_BUILDER_METHOD_NAME = "builderMethodName";
/** /**
* @see #buildMethodName() * @see #buildMethodName()
*/ */
public static final String OPTION_BUILD_METHOD_NAME = "buildMethodName"; public static final String OPTION_BUILD_METHOD_NAME = "buildMethodName";
/** /**
* @see #componentsMethodName() * @see #componentsMethodName()
*/ */
public static final String OPTION_COMPONENTS_METHOD_NAME = "componentsMethodName"; public static final String OPTION_COMPONENTS_METHOD_NAME = "componentsMethodName";
/** /**
* @see #fileComment() * @see #fileComment()
*/ */
public static final String OPTION_FILE_COMMENT = "fileComment"; public static final String OPTION_FILE_COMMENT = "fileComment";
/** /**
* @see #fileIndent() * @see #fileIndent()
*/ */
public static final String OPTION_FILE_INDENT = "fileIndent"; public static final String OPTION_FILE_INDENT = "fileIndent";
/** /**
* @see #prefixEnclosingClassNames() * @see #prefixEnclosingClassNames()
*/ */
public static final String OPTION_PREFIX_ENCLOSING_CLASS_NAMES = "prefixEnclosingClassNames"; public static final String OPTION_PREFIX_ENCLOSING_CLASS_NAMES = "prefixEnclosingClassNames";
private final String suffix; private final String suffix;
private final String copyMethodName; private final String copyMethodName;
private final String builderMethodName; private final String builderMethodName;
private final String buildMethodName; private final String buildMethodName;
private final String componentsMethodName; private final String componentsMethodName;
private final String fileComment; private final String fileComment;
private final String fileIndent; private final String fileIndent;
private final boolean prefixEnclosingClassNames; private final boolean prefixEnclosingClassNames;
public OptionBasedRecordBuilderMetaData(Map<String, String> options) { public OptionBasedRecordBuilderMetaData(Map<String, String> options) {
suffix = options.getOrDefault(OPTION_SUFFIX, "Builder"); suffix = options.getOrDefault(OPTION_SUFFIX, "Builder");
builderMethodName = options.getOrDefault(OPTION_BUILDER_METHOD_NAME, "builder"); builderMethodName = options.getOrDefault(OPTION_BUILDER_METHOD_NAME, "builder");
copyMethodName = options.getOrDefault(OPTION_COPY_METHOD_NAME, builderMethodName); copyMethodName = options.getOrDefault(OPTION_COPY_METHOD_NAME, builderMethodName);
buildMethodName = options.getOrDefault(OPTION_BUILD_METHOD_NAME, "build"); buildMethodName = options.getOrDefault(OPTION_BUILD_METHOD_NAME, "build");
componentsMethodName = options.getOrDefault(OPTION_COMPONENTS_METHOD_NAME, "stream"); componentsMethodName = options.getOrDefault(OPTION_COMPONENTS_METHOD_NAME, "stream");
fileComment = options.getOrDefault(OPTION_FILE_COMMENT, fileComment = options.getOrDefault(OPTION_FILE_COMMENT,
"Auto generated by io.soabase.recordbuilder.core.RecordBuilder: https://github.com/Randgalt/record-builder"); "Auto generated by io.soabase.recordbuilder.core.RecordBuilder: https://github.com/Randgalt/record-builder");
fileIndent = options.getOrDefault(OPTION_FILE_INDENT, " "); fileIndent = options.getOrDefault(OPTION_FILE_INDENT, " ");
String prefixenclosingclassnamesopt = options.get(OPTION_PREFIX_ENCLOSING_CLASS_NAMES); String prefixenclosingclassnamesopt = options.get(OPTION_PREFIX_ENCLOSING_CLASS_NAMES);
if (prefixenclosingclassnamesopt == null) { if (prefixenclosingclassnamesopt == null) {
prefixEnclosingClassNames = true; prefixEnclosingClassNames = true;
} else { } else {
prefixEnclosingClassNames = Boolean.parseBoolean(prefixenclosingclassnamesopt); prefixEnclosingClassNames = Boolean.parseBoolean(prefixenclosingclassnamesopt);
} }
} }
@Override @Override
public String suffix() { public String suffix() {
return suffix; return suffix;
} }
@Override @Override
public String copyMethodName() { public String copyMethodName() {
return copyMethodName; return copyMethodName;
} }
@Override @Override
public String builderMethodName() { public String builderMethodName() {
return builderMethodName; return builderMethodName;
} }
@Override @Override
public String buildMethodName() { public String buildMethodName() {
return buildMethodName; return buildMethodName;
} }
@Override @Override
public String componentsMethodName() { public String componentsMethodName() {
return componentsMethodName; return componentsMethodName;
} }
@Override @Override
public String fileComment() { public String fileComment() {
return fileComment; return fileComment;
} }
@Override @Override
public String fileIndent() { public String fileIndent() {
return fileIndent; return fileIndent;
} }
@Override @Override
public boolean prefixEnclosingClassNames() { public boolean prefixEnclosingClassNames() {
return prefixEnclosingClassNames; return prefixEnclosingClassNames;
} }
} }

2
record-builder-processor/src/main/java/io/soabase/recordbuilder/processor/RecordBuilderMetaDataLoader.java
View File

@@ -37,7 +37,7 @@ class RecordBuilderMetaDataLoader {
logger.accept("Found meta data: " + clazz); logger.accept("Found meta data: " + clazz);
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
// log the thrown exception instead of the invocation target exception // log the thrown exception instead of the invocation target exception
logger.accept("Could not load meta data: " + metaDataClassName + " - " + e); logger.accept("Could not load meta data: " + metaDataClassName + " - " + e.getCause());
} catch (Exception e) { } catch (Exception e) {
logger.accept("Could not load meta data: " + metaDataClassName + " - " + e); logger.accept("Could not load meta data: " + metaDataClassName + " - " + e);
} }