removing of reportOutputOid from schema

Evolveum · May 22, 2023 · b5a331b · b5a331b
1 parent 81026b6
commit b5a331b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 33 deletions.
diff --git a/config/initial-objects/archetype/507-archetype-task-report.xml b/config/initial-objects/archetype/507-archetype-task-report.xml
@@ -32,10 +32,6 @@
             <path>extension/rext:reportParam</path>
             <visibility>visible</visibility>
         </itemConstraint>
-        <itemConstraint>
-            <path>extension/rext:reportOutputOid</path>
-            <visibility>visible</visibility>
-        </itemConstraint>
         <itemConstraint>
             <path>extension/rext:reportDataParam</path>
             <visibility>visible</visibility>
@@ -53,9 +49,6 @@
                         <item>
                             <c:path>extension/rext:reportParam</c:path>
                         </item>
-                        <item>
-                            <c:path>extension/rext:reportOutputOid</c:path>
-                        </item>
                         <item>
                             <c:path>extension/rext:reportDataParam</c:path>
                         </item>

diff --git a/...java/com/evolveum/midpoint/gui/impl/page/admin/component/TaskOperationalButtonsPanel.java b/...java/com/evolveum/midpoint/gui/impl/page/admin/component/TaskOperationalButtonsPanel.java
@@ -483,11 +483,6 @@ private String getReportDataOid() {
         if (reportData != null && reportData.getRealValue() != null && reportData.getRealValue().getOid() != null) {
             return reportData.getRealValue().getOid();
         }
-        PrismProperty<String> reportOutputOid = task.findProperty(
-                ItemPath.create(TaskType.F_EXTENSION, ReportConstants.REPORT_OUTPUT_OID_PROPERTY_NAME));
-        if (reportOutputOid != null) {
-            return reportOutputOid.getRealValue();
-        }
         return getReportDataOidFromImportActivity(task.asObjectable());
     }
 

diff --git a/infra/schema/src/main/resources/xml/ns/public/report/extension-3.xsd b/infra/schema/src/main/resources/xml/ns/public/report/extension-3.xsd
@@ -30,11 +30,16 @@
         <xsd:annotation>
             <xsd:appinfo>
                 <a:extension ref="c:TaskType"/>
+                <a:schemaMigration>
+                    <a:element>tns:reportOutputOid</a:element>
+                    <a:version>4.8</a:version>
+                    <a:operation>removed</a:operation>
+                    <a:comment>Use reportDataParam instead.</a:comment>
+                </a:schemaMigration>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element ref="tns:reportParam" minOccurs="0"/>
-            <xsd:element ref="tns:reportOutputOid" minOccurs="0"/>
             <xsd:element ref="tns:reportDataParam" minOccurs="0"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -49,18 +54,6 @@
         </xsd:annotation>
     </xsd:element>
 
-    <xsd:element name="reportOutputOid" type="xsd:string">
-        <xsd:annotation>
-            <xsd:documentation>OID of created Report Output object. TODO consider replacing with object reference.</xsd:documentation>
-            <xsd:appinfo>
-                <a:displayName>TaskExtension.reportOutputOid</a:displayName>
-                <a:minOccurs>0</a:minOccurs>
-                <a:maxOccurs>1</a:maxOccurs>
-                <a:deprecated>true</a:deprecated>
-                <a:plannedRemoval>4.3</a:plannedRemoval>
-            </xsd:appinfo>
-        </xsd:annotation>
-    </xsd:element>
 
     <xsd:element name="reportDataParam" type="c:ObjectReferenceType">
         <xsd:annotation>

diff --git a/model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportConstants.java b/model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportConstants.java
@@ -12,7 +12,6 @@
 public class ReportConstants {
 
     public static final ItemName REPORT_PARAMS_PROPERTY_NAME = new ItemName(SchemaConstants.NS_REPORT_EXTENSION, "reportParam");
-    public static final ItemName REPORT_OUTPUT_OID_PROPERTY_NAME = new ItemName(SchemaConstants.NS_REPORT_EXTENSION, "reportOutputOid");
     public static final ItemName REPORT_DATA_PROPERTY_NAME = new ItemName(SchemaConstants.NS_REPORT_EXTENSION, "reportDataParam");
 
 }
diff --git a/repo/system-init/src/main/resources/initial-objects/archetype/507-archetype-task-report.xml b/repo/system-init/src/main/resources/initial-objects/archetype/507-archetype-task-report.xml
@@ -32,10 +32,6 @@
             <path>extension/rext:reportParam</path>
             <visibility>visible</visibility>
         </itemConstraint>
-        <itemConstraint>
-            <path>extension/rext:reportOutputOid</path>
-            <visibility>visible</visibility>
-        </itemConstraint>
         <itemConstraint>
             <path>extension/rext:reportDataParam</path>
             <visibility>visible</visibility>
@@ -53,9 +49,6 @@
                         <item>
                             <c:path>extension/rext:reportParam</c:path>
                         </item>
-                        <item>
-                            <c:path>extension/rext:reportOutputOid</c:path>
-                        </item>
                         <item>
                             <c:path>extension/rext:reportDataParam</c:path>
                         </item>