clean up of code after removing of jasper report

Evolveum · Apr 28, 2021 · 5d640fe · 5d640fe
1 parent 2f6afd2
commit 5d640fe
Show file tree

Hide file tree

Showing 60 changed files with 209 additions and 5,080 deletions.
diff --git a/config/initial-objects/000-system-configuration.xml b/config/initial-objects/000-system-configuration.xml
@@ -54,11 +54,6 @@
             <level>OFF</level>
             <package>org.hibernate.internal.ExceptionMapperStandardImpl</package>
         </classLogger>
-        <classLogger>
-            <!-- disabled because of MID-1612, jasper library needs to be fixed -->
-            <level>OFF</level>
-            <package>net.sf.jasperreports.engine.fill.JRFillDataset</package>
-        </classLogger>
         <classLogger>
             <!-- disabled because we don't need to see every property file
             loading message (unnecessary log pollution) -->

diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -747,29 +747,6 @@
 
         <!-- end connectors -->
 
-        <!-- Jasper reports -->
-        <dependency>
-            <groupId>net.sf.jasperreports</groupId>
-            <artifactId>jasperreports</artifactId>
-            <exclusions> <!-- we dont want bouncy castle to include into midPoint -->
-                <exclusion>
-                    <groupId>bouncycastle</groupId>
-                    <artifactId>bcmail-jdk14</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>bouncycastle</groupId>
-                    <artifactId>bcprov-jdk14</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>bouncycastle</groupId>
-                    <artifactId>bctsp-jdk14</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <!-- report dependency (needed for microsoft office formats) -->
         <dependency>
             <groupId>org.apache.poi</groupId>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
@@ -396,14 +396,7 @@ private MainMenuItem createReportsItems() {
             reportsMenu.addMenuItem(edit);
         }
 
-        if (classMatches(PageJasperReport.class)) {
-            MenuItem configure = new MenuItem("PageAdmin.menu.top.reports.configure",
-                    PageJasperReport.class);
-            reportsMenu.addMenuItem(configure);
-        }
-
         reportsMenu.addMenuItem(new MenuItem("PageAdmin.menu.top.reports.created", PageCreatedReports.class));
-        reportsMenu.addMenuItem(new MenuItem("PageAdmin.menu.top.reports.new", PageNewReport.class));
 
 
 //        if (WebComponentUtil.isAuthorized(ModelAuthorizationAction.AUDIT_READ.getUrl())) {

diff --git a/.../java/com/evolveum/midpoint/gui/impl/factory/panel/AutoCompleteReferencePanelFactory.java b/.../java/com/evolveum/midpoint/gui/impl/factory/panel/AutoCompleteReferencePanelFactory.java
@@ -56,8 +56,9 @@ public Integer getOrder() {
 
     @Override
     public <IW extends ItemWrapper<?, ?>> boolean match(IW wrapper) {
-        return QNameUtil.match(ObjectReferenceType.COMPLEX_TYPE, wrapper.getTypeName()) &&
-                ReportConstants.NS_EXTENSION.equals(wrapper.getNamespace());
+        return QNameUtil.match(ObjectReferenceType.COMPLEX_TYPE, wrapper.getTypeName())
+                && ReportConstants.NS_EXTENSION.equals(wrapper.getNamespace())
+                && wrapper.getParent() == null;
     }
 
     @Override

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
@@ -28,7 +28,6 @@
 import com.evolveum.midpoint.schema.SelectorOptions;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.schema.util.ReportTypeUtil;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
@@ -37,7 +36,6 @@
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType;
 
 /**
  * Imports initial data objects as needed, ignoring already imported objects.
@@ -103,10 +101,6 @@ private ImportResult importInitialObjectsResource(
                 String objectText = IOUtils.toString(resourceInputStream, StandardCharsets.UTF_8);
                 object = prismContext.parseObject(objectText);
             }
-            if (ReportType.class.equals(object.getCompileTimeClass())) {
-                //noinspection unchecked
-                ReportTypeUtil.applyDefinition((PrismObject<ReportType>) object, prismContext);
-            }
 
             return importObject(object, resource.getFilename(), task, mainResult, overwrite);
         } catch (Exception ex) {

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageJasperReport.html b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageJasperReport.html