repository classes: removed unused <T> from RObject

Evolveum · Jun 3, 2020 · 86da91a · 86da91a
1 parent 953b63a
commit 86da91a
Show file tree

Hide file tree

Showing 30 changed files with 116 additions and 154 deletions.
diff --git a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
@@ -271,7 +271,7 @@ RExtItem createOrFindExtensionItemDefinition(Class<? extends ObjectType> type, I
         return extItemDictionary.createOrFindItemDefinition(propertyDefinition, false);
     }
 
-    void assertExtension(RObject<?> object, RExtItem item, String... expectedValues) {
+    void assertExtension(RObject object, RExtItem item, String... expectedValues) {
         Set<String> realValues = object.getStrings().stream()
                 .filter(extString -> Objects.equals(extString.getItemId(), item.getId()))
                 .map(ROExtString::getValue)

diff --git a/...rc/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java b/...rc/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java
@@ -41,7 +41,7 @@
 )
 @Persister(impl = MidPointJoinedPersister.class)
 @ForeignKey(name = "fk_acc_cert_campaign")
-public class RAccessCertificationCampaign extends RObject<AccessCertificationCampaignType> {
+public class RAccessCertificationCampaign extends RObject {
 
     public static final String TABLE_NAME = "m_acc_cert_campaign";
 

diff --git a/.../main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java b/.../main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.java
@@ -32,7 +32,7 @@
 )
 @Persister(impl = MidPointJoinedPersister.class)
 @ForeignKey(name = "fk_acc_cert_definition")
-public class RAccessCertificationDefinition extends RObject<AccessCertificationDefinitionType> {
+public class RAccessCertificationDefinition extends RObject {
 
     public static final String TABLE_NAME = "m_acc_cert_definition";
 

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCase.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCase.java
@@ -44,7 +44,7 @@
 }
 )
 @Persister(impl = MidPointJoinedPersister.class)
-public class RCase extends RObject<CaseType> {
+public class RCase extends RObject {
 
     private RPolyString nameCopy;
 

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java
@@ -35,7 +35,7 @@
 @Table(indexes = {
         @Index(name = "iConnectorNameOrig", columnList = "name_orig"),
         @Index(name = "iConnectorNameNorm", columnList = "name_norm")})
-public class RConnector extends RObject<ConnectorType> {
+public class RConnector extends RObject {
 
     private static final Trace LOGGER = TraceManager.getTrace(RConnector.class);
     private RPolyString nameCopy;

diff --git a/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java b/...epo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
@@ -31,7 +31,7 @@
         }
 )
 @Persister(impl = MidPointJoinedPersister.class)
-public class RConnectorHost extends RObject<ConnectorHostType> {
+public class RConnectorHost extends RObject {
 
     private RPolyString nameCopy;
     private String hostname;

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RDashboard.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RDashboard.java
@@ -33,7 +33,7 @@
         }
 )
 @Persister(impl = MidPointJoinedPersister.class)
-public class RDashboard extends RObject<DashboardType> {
+public class RDashboard extends RObject {
 
     private static final long serialVersionUID = 1L;
 

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
@@ -50,7 +50,7 @@
         @Index(name = "iFocusValidTo", columnList = "validTo")
 })
 @Persister(impl = MidPointJoinedPersister.class)
-public abstract class RFocus<T extends FocusType> extends RObject<T> {
+public abstract class RFocus<T extends FocusType> extends RObject {
 
     private Set<RObjectReference<RShadow>> linkRef;                         // FocusType
     private Set<RObjectReference<RFocus>> personaRef;                       // FocusType

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.java
@@ -32,7 +32,7 @@
         }
 )
 @Persister(impl = MidPointJoinedPersister.class)
-public class RForm extends RObject<FormType> {
+public class RForm extends RObject {
 
     private RPolyString nameCopy;
 

diff --git a/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java b/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFunctionLibrary.java
@@ -33,7 +33,7 @@
         }
 )
 @Persister(impl = MidPointJoinedPersister.class)
-public class RFunctionLibrary extends RObject<FunctionLibraryType> {
+public class RFunctionLibrary extends RObject {
 
     private RPolyString nameCopy;
 

diff --git a/.../repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java b/.../repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java
@@ -36,7 +36,7 @@
         }
 )
 @Persister(impl = MidPointJoinedPersister.class)
-public class RLookupTable extends RObject<LookupTableType> {
+public class RLookupTable extends RObject {
 
     private RPolyString nameCopy;
     private Set<RLookupTableRow> rows;

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.java
@@ -31,7 +31,7 @@
         }
 )
 @Persister(impl = MidPointJoinedPersister.class)
-public class RNode extends RObject<NodeType> {
+public class RNode extends RObject {
 
     private RPolyString nameCopy;
     private String nodeIdentifier;