mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-07-06 08:18:41 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refined primary key field error handling

Browse Source
This commit is contained in:
Collin Smith
2020-12-15 17:17:33 -08:00
parent 8bcca53490
commit 188d44b624
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
table/annotation-processor/src/main/java/com/riiablo/table/annotation/FieldElement.java
View File

@ -7,6 +7,9 @@ import javax.lang.model.element.VariableElement;
final class FieldElement {
static FieldElement get(Context context, VariableElement element) {
FormatElement formatElement = FormatElement.get(context, element);
PrimaryKeyElement primaryKeyElement = PrimaryKeyElement.get(context, element);
Set<Modifier> modifiers = element.getModifiers();
if (!modifiers.contains(Modifier.PUBLIC)) {
context.warn(element, "record fields should be declared {}", Modifier.PUBLIC);
@ -20,9 +23,6 @@ final class FieldElement {
context.error(element, "'{}' is an illegal record field name", Constants.RESERVED_NAME);
return null;
}
FormatElement formatElement = FormatElement.get(context, element);
PrimaryKeyElement primaryKeyElement = PrimaryKeyElement.get(context, element);
return new FieldElement(element, formatElement, primaryKeyElement);
}

6
table/annotation-processor/src/main/java/com/riiablo/table/annotation/PrimaryKeyElement.java
View File

@ -1,12 +1,18 @@
package com.riiablo.table.annotation;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.VariableElement;
final class PrimaryKeyElement extends AnnotationElement<PrimaryKey> {
static PrimaryKeyElement get(Context context, VariableElement element) {
PrimaryKey annotation = element.getAnnotation(PrimaryKey.class);
if (annotation == null) return null;
if (!element.getModifiers().contains(Modifier.PUBLIC)) {
context.warn(element, "{} fields must be declared {}", PrimaryKey.class, Modifier.PUBLIC);
return null;
}
AnnotationMirror mirror = context.getAnnotationMirror(element, Constants.PRIMARY_KEY);
return new PrimaryKeyElement(context, annotation, mirror);
}

7
table/annotation-processor/src/main/java/com/riiablo/table/annotation/SchemaElement.java
View File

@ -36,12 +36,12 @@ final class SchemaElement {
} else {
primaryKeyFieldElement = FieldElement.firstPrimaryKey(fields);
if (primaryKeyFieldElement == null) {
context.error(element, "{element} did not declare any {}", PrimaryKey.class);
context.error(element, "{element} did not declare any valid {}", PrimaryKey.class);
return null;
}
context.warn(element,
"{element} did not declare any {}, using {}",
"{element} did not declare any valid {}, using {}",
PrimaryKey.class, primaryKeyFieldElement);
}
@ -58,7 +58,8 @@ final class SchemaElement {
for (Element e : superclassElement.getEnclosedElements()) {
switch (e.getKind()) {
case FIELD:
columns.add(FieldElement.get(context, (VariableElement) e));
FieldElement field = FieldElement.get(context, (VariableElement) e);
if (field != null) columns.add(field);
break;
}
}