(M/Q)Resource._abstract renamed to abstractValue to satisfy Checkstyle

Evolveum · Mar 22, 2023 · bac51e8 · bac51e8
1 parent 91b64f6
commit bac51e8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.../repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/resource/MResource.java b/.../repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/resource/MResource.java
@@ -28,5 +28,6 @@ public class MResource extends MObject {
     public MObjectType connectorRefTargetType;
     public Integer connectorRefRelationId;
     public Boolean template;
-    public Boolean _abstract;
+    // column and item are both called "abstract" which is a Java keyword
+    public Boolean abstractValue;
 }
diff --git a/.../repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/resource/QResource.java b/.../repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/resource/QResource.java
@@ -63,7 +63,7 @@ public class QResource extends QAssignmentHolder<MResource> {
     public final NumberPath<Integer> connectorRefRelationId =
             createInteger("connectorRefRelationId", CONNECTOR_REF_RELATION_ID);
     public final BooleanPath template = createBoolean("template", TEMPLATE);
-    public final BooleanPath _abstract = createBoolean("_abstract", ABSTRACT);
+    public final BooleanPath abstractValue = createBoolean("abstractValue", ABSTRACT);
 
     public QResource(String variable) {
         this(variable, DEFAULT_SCHEMA_NAME, TABLE_NAME);

diff --git a/...qale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/resource/QResourceMapping.java b/...qale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/resource/QResourceMapping.java
@@ -68,7 +68,7 @@ private QResourceMapping(@NotNull SqaleRepoContext repositoryContext) {
                 q -> q.connectorRefRelationId,
                 QConnectorMapping::get);
         addItemMapping(F_TEMPLATE, booleanMapper(q -> q.template));
-        addItemMapping(F_ABSTRACT, booleanMapper(q -> q._abstract));
+        addItemMapping(F_ABSTRACT, booleanMapper(q -> q.abstractValue));
     }
 
     @Override
@@ -107,7 +107,7 @@ public MResource newRowObject() {
                 t -> row.connectorRefTargetType = t,
                 r -> row.connectorRefRelationId = r);
         row.template = schemaObject.isTemplate();
-        row._abstract = schemaObject.isAbstract();
+        row.abstractValue = schemaObject.isAbstract();
 
         return row;
     }

diff --git a/...ale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoAddDeleteObjectTest.java b/...ale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoAddDeleteObjectTest.java
@@ -1320,7 +1320,7 @@ public void test810ResourceAndItsBusinessApproverReferences() throws Exception {
         assertThat(row.connectorRefTargetType).isEqualTo(MObjectType.CONNECTOR);
         assertCachedUri(row.connectorRefRelationId, connectorRelation);
         assertThat(row.template).isFalse();
-        assertThat(row._abstract).isFalse();
+        assertThat(row.abstractValue).isFalse();
 
         QObjectReference<?> ref = QObjectReferenceMapping
                 .getForResourceBusinessConfigurationApprover().defaultAlias();