repo-sqale: MObject used directly instead of empty subclasses

Evolveum · Mar 12, 2021 · 87d5dc0 · 87d5dc0
1 parent c052e5e
commit 87d5dc0
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 105 deletions.
diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/MDashboard.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/MDashboard.java
diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/MObjectCollection.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/MObjectCollection.java
diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/QDashboard.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/QDashboard.java
@@ -6,13 +6,14 @@
  */
 package com.evolveum.midpoint.repo.sqale.qmodel;
 
+import com.evolveum.midpoint.repo.sqale.qmodel.object.MObject;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.QObject;
 
 /**
  * Querydsl query type for {@value #TABLE_NAME} table.
  */
 @SuppressWarnings("unused")
-public class QDashboard extends QObject<MDashboard> {
+public class QDashboard extends QObject<MObject> {
 
     private static final long serialVersionUID = -3546780348548754579L;
 
@@ -25,6 +26,6 @@ public QDashboard(String variable) {
     }
 
     public QDashboard(String variable, String schema, String table) {
-        super(MDashboard.class, variable, schema, table);
+        super(MObject.class, variable, schema, table);
     }
 }
diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/QDashboardMapping.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/QDashboardMapping.java
@@ -6,6 +6,7 @@
  */
 package com.evolveum.midpoint.repo.sqale.qmodel;
 
+import com.evolveum.midpoint.repo.sqale.qmodel.object.MObject;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.ObjectSqlTransformer;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.QObjectMapping;
 import com.evolveum.midpoint.repo.sqlbase.SqlTransformerSupport;
@@ -15,7 +16,7 @@
  * Mapping between {@link QDashboard} and {@link DashboardType}.
  */
 public class QDashboardMapping
-        extends QObjectMapping<DashboardType, QDashboard, MDashboard> {
+        extends QObjectMapping<DashboardType, QDashboard, MObject> {
 
     public static final String DEFAULT_ALIAS_NAME = "d";
 
@@ -32,14 +33,14 @@ protected QDashboard newAliasInstance(String alias) {
     }
 
     @Override
-    public ObjectSqlTransformer<DashboardType, QDashboard, MDashboard>
+    public ObjectSqlTransformer<DashboardType, QDashboard, MObject>
     createTransformer(SqlTransformerSupport transformerSupport) {
         // no special class needed, no additional columns
         return new ObjectSqlTransformer<>(transformerSupport, this);
     }
 
     @Override
-    public MDashboard newRowObject() {
-        return new MDashboard();
+    public MObject newRowObject() {
+        return new MObject();
     }
 }
diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/QObjectCollection.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/QObjectCollection.java
@@ -6,13 +6,14 @@
  */
 package com.evolveum.midpoint.repo.sqale.qmodel;
 
+import com.evolveum.midpoint.repo.sqale.qmodel.object.MObject;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.QObject;
 
 /**
  * Querydsl query type for {@value #TABLE_NAME} table.
  */
 @SuppressWarnings("unused")
-public class QObjectCollection extends QObject<MObjectCollection> {
+public class QObjectCollection extends QObject<MObject> {
 
     private static final long serialVersionUID = -62230817260259478L;
 
@@ -25,6 +26,6 @@ public QObjectCollection(String variable) {
     }
 
     public QObjectCollection(String variable, String schema, String table) {
-        super(MObjectCollection.class, variable, schema, table);
+        super(MObject.class, variable, schema, table);
     }
 }
diff --git a/...sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/QObjectCollectionMapping.java b/...sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/QObjectCollectionMapping.java
@@ -6,6 +6,7 @@
  */
 package com.evolveum.midpoint.repo.sqale.qmodel;
 
+import com.evolveum.midpoint.repo.sqale.qmodel.object.MObject;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.ObjectSqlTransformer;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.QObjectMapping;
 import com.evolveum.midpoint.repo.sqlbase.SqlTransformerSupport;
@@ -15,7 +16,7 @@
  * Mapping between {@link QObjectCollection} and {@link ObjectCollectionType}.
  */
 public class QObjectCollectionMapping
-        extends QObjectMapping<ObjectCollectionType, QObjectCollection, MObjectCollection> {
+        extends QObjectMapping<ObjectCollectionType, QObjectCollection, MObject> {
 
     public static final String DEFAULT_ALIAS_NAME = "oc";
 
@@ -32,14 +33,14 @@ protected QObjectCollection newAliasInstance(String alias) {
     }
 
     @Override
-    public ObjectSqlTransformer<ObjectCollectionType, QObjectCollection, MObjectCollection>
+    public ObjectSqlTransformer<ObjectCollectionType, QObjectCollection, MObject>
     createTransformer(SqlTransformerSupport transformerSupport) {
         // no special class needed, no additional columns
         return new ObjectSqlTransformer<>(transformerSupport, this);
     }
 
     @Override
-    public MObjectCollection newRowObject() {
-        return new MObjectCollection();
+    public MObject newRowObject() {
+        return new MObject();
     }
 }
diff --git a/...sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/lookuptable/MLookupTable.java b/...sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/lookuptable/MLookupTable.java
@@ -12,4 +12,6 @@
  * Querydsl "row bean" type related to {@link QLookupTable}.
  */
 public class MLookupTable extends MObject {
+
+    // TODO if no additional fields are needed (e.g. for rows) replace with MObject
 }
diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/MObject.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/MObject.java
@@ -14,6 +14,7 @@
 
 /**
  * Querydsl "row bean" type related to {@link QObject}.
+ * It is also used for other mappings/objects types with no additional columns in their tables.
  */
 public class MObject {
 

diff --git a/...o-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/MSecurityPolicy.java b/...o-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/MSecurityPolicy.java
diff --git a/...le/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/MSystemConfiguration.java b/...le/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/MSystemConfiguration.java
diff --git a/...repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/MValuePolicy.java b/...repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/MValuePolicy.java
diff --git a/...o-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/QSecurityPolicy.java b/...o-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/QSecurityPolicy.java
@@ -6,13 +6,14 @@
  */
 package com.evolveum.midpoint.repo.sqale.qmodel.system;
 
+import com.evolveum.midpoint.repo.sqale.qmodel.object.MObject;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.QObject;
 
 /**
  * Querydsl query type for {@value #TABLE_NAME} table.
  */
 @SuppressWarnings("unused")
-public class QSecurityPolicy extends QObject<MSecurityPolicy> {
+public class QSecurityPolicy extends QObject<MObject> {
 
     private static final long serialVersionUID = 289603300613404007L;
 
@@ -25,6 +26,6 @@ public QSecurityPolicy(String variable) {
     }
 
     public QSecurityPolicy(String variable, String schema, String table) {
-        super(MSecurityPolicy.class, variable, schema, table);
+        super(MObject.class, variable, schema, table);
     }
 }
diff --git a/.../src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/QSecurityPolicyMapping.java b/.../src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/QSecurityPolicyMapping.java
@@ -6,6 +6,7 @@
  */
 package com.evolveum.midpoint.repo.sqale.qmodel.system;
 
+import com.evolveum.midpoint.repo.sqale.qmodel.object.MObject;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.ObjectSqlTransformer;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.QObjectMapping;
 import com.evolveum.midpoint.repo.sqlbase.SqlTransformerSupport;
@@ -15,7 +16,7 @@
  * Mapping between {@link QSecurityPolicy} and {@link SecurityPolicyType}.
  */
 public class QSecurityPolicyMapping
-        extends QObjectMapping<SecurityPolicyType, QSecurityPolicy, MSecurityPolicy> {
+        extends QObjectMapping<SecurityPolicyType, QSecurityPolicy, MObject> {
 
     public static final String DEFAULT_ALIAS_NAME = "sp";
 
@@ -32,14 +33,14 @@ protected QSecurityPolicy newAliasInstance(String alias) {
     }
 
     @Override
-    public ObjectSqlTransformer<SecurityPolicyType, QSecurityPolicy, MSecurityPolicy>
+    public ObjectSqlTransformer<SecurityPolicyType, QSecurityPolicy, MObject>
     createTransformer(SqlTransformerSupport transformerSupport) {
         // no special class needed, no additional columns
         return new ObjectSqlTransformer<>(transformerSupport, this);
     }
 
     @Override
-    public MSecurityPolicy newRowObject() {
-        return new MSecurityPolicy();
+    public MObject newRowObject() {
+        return new MObject();
     }
 }
diff --git a/...le/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/QSystemConfiguration.java b/...le/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/QSystemConfiguration.java
@@ -6,13 +6,14 @@
  */
 package com.evolveum.midpoint.repo.sqale.qmodel.system;
 
+import com.evolveum.midpoint.repo.sqale.qmodel.object.MObject;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.QObject;
 
 /**
  * Querydsl query type for {@value #TABLE_NAME} table.
  */
 @SuppressWarnings("unused")
-public class QSystemConfiguration extends QObject<MSystemConfiguration> {
+public class QSystemConfiguration extends QObject<MObject> {
 
     private static final long serialVersionUID = -2157392986065893792L;
 
@@ -25,6 +26,6 @@ public QSystemConfiguration(String variable) {
     }
 
     public QSystemConfiguration(String variable, String schema, String table) {
-        super(MSystemConfiguration.class, variable, schema, table);
+        super(MObject.class, variable, schema, table);
     }
 }
diff --git a/...main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/QSystemConfigurationMapping.java b/...main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/QSystemConfigurationMapping.java
@@ -6,6 +6,7 @@
  */
 package com.evolveum.midpoint.repo.sqale.qmodel.system;
 
+import com.evolveum.midpoint.repo.sqale.qmodel.object.MObject;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.ObjectSqlTransformer;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.QObjectMapping;
 import com.evolveum.midpoint.repo.sqlbase.SqlTransformerSupport;
@@ -15,7 +16,7 @@
  * Mapping between {@link QSystemConfiguration} and {@link SystemConfigurationType}.
  */
 public class QSystemConfigurationMapping
-        extends QObjectMapping<SystemConfigurationType, QSystemConfiguration, MSystemConfiguration> {
+        extends QObjectMapping<SystemConfigurationType, QSystemConfiguration, MObject> {
 
     public static final String DEFAULT_ALIAS_NAME = "sc";
 
@@ -32,14 +33,14 @@ protected QSystemConfiguration newAliasInstance(String alias) {
     }
 
     @Override
-    public ObjectSqlTransformer<SystemConfigurationType, QSystemConfiguration, MSystemConfiguration>
+    public ObjectSqlTransformer<SystemConfigurationType, QSystemConfiguration, MObject>
     createTransformer(SqlTransformerSupport transformerSupport) {
         // no special class needed, no additional columns
         return new ObjectSqlTransformer<>(transformerSupport, this);
     }
 
     @Override
-    public MSystemConfiguration newRowObject() {
-        return new MSystemConfiguration();
+    public MObject newRowObject() {
+        return new MObject();
     }
 }
diff --git a/...repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/QValuePolicy.java b/...repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/QValuePolicy.java
@@ -6,13 +6,14 @@
  */
 package com.evolveum.midpoint.repo.sqale.qmodel.system;
 
+import com.evolveum.midpoint.repo.sqale.qmodel.object.MObject;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.QObject;
 
 /**
  * Querydsl query type for {@value #TABLE_NAME} table.
  */
 @SuppressWarnings("unused")
-public class QValuePolicy extends QObject<MValuePolicy> {
+public class QValuePolicy extends QObject<MObject> {
 
     private static final long serialVersionUID = 5623917383769868004L;
 
@@ -25,6 +26,6 @@ public QValuePolicy(String variable) {
     }
 
     public QValuePolicy(String variable, String schema, String table) {
-        super(MValuePolicy.class, variable, schema, table);
+        super(MObject.class, variable, schema, table);
     }
 }
diff --git a/...ale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/QValuePolicyMapping.java b/...ale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/system/QValuePolicyMapping.java
@@ -6,6 +6,7 @@
  */
 package com.evolveum.midpoint.repo.sqale.qmodel.system;
 
+import com.evolveum.midpoint.repo.sqale.qmodel.object.MObject;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.ObjectSqlTransformer;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.QObjectMapping;
 import com.evolveum.midpoint.repo.sqlbase.SqlTransformerSupport;
@@ -15,7 +16,7 @@
  * Mapping between {@link QValuePolicy} and {@link ValuePolicyType}.
  */
 public class QValuePolicyMapping
-        extends QObjectMapping<ValuePolicyType, QValuePolicy, MValuePolicy> {
+        extends QObjectMapping<ValuePolicyType, QValuePolicy, MObject> {
 
     public static final String DEFAULT_ALIAS_NAME = "vp";
 
@@ -32,14 +33,14 @@ protected QValuePolicy newAliasInstance(String alias) {
     }
 
     @Override
-    public ObjectSqlTransformer<ValuePolicyType, QValuePolicy, MValuePolicy>
+    public ObjectSqlTransformer<ValuePolicyType, QValuePolicy, MObject>
     createTransformer(SqlTransformerSupport transformerSupport) {
         // no special class needed, no additional columns
         return new ObjectSqlTransformer<>(transformerSupport, this);
     }
 
     @Override
-    public MValuePolicy newRowObject() {
-        return new MValuePolicy();
+    public MObject newRowObject() {
+        return new MObject();
     }
 }