Update to work with Sakai 22, issue sakaicontrib#29

ern · Aug 3, 2022 · 1384661 · 1384661
1 parent 6378a4e
commit 1384661
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 44 deletions.
diff --git a/app/business/pom.xml b/app/business/pom.xml
@@ -50,7 +50,6 @@
     <dependency>
       <groupId>org.sakaiproject.edu-services.gradebook</groupId>
       <artifactId>gradebook-service-hibernate</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.edu-services.gradebook</groupId>
@@ -65,8 +64,6 @@
 	<dependency>
         <groupId>org.sakaiproject.edu-services.scoringservice</groupId>
         <artifactId>scoring-service-api</artifactId>
-        <scope>provided</scope>
-        <version>${sakai.version}</version>
     </dependency>
 <!-- this is required for any Sakai JSF tool -->
     <dependency>
@@ -115,9 +112,8 @@
 -->
 <!-- End database dependencies -->
     <dependency>
-      <groupId>${sakai.spring.groupId}</groupId>
-      <artifactId>${sakai.spring.test.artifactId}</artifactId>
-      <version>${sakai.spring.test.version}</version>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
     </dependency>
     <dependency>
       <groupId>aopalliance</groupId>

diff --git a/...ness/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookCalculationImpl.java b/...ness/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookCalculationImpl.java
@@ -28,15 +28,17 @@
 
 import org.hibernate.Query;
 import org.hibernate.Session;
+import org.sakaiproject.service.gradebook.shared.ConflictingCategoryNameException;
 import org.sakaiproject.service.gradebook.shared.GradebookService;
+import org.sakaiproject.service.gradebook.shared.StaleObjectModificationException;
 import org.sakaiproject.tool.gradebook.GradebookAssignment;
 import org.sakaiproject.tool.gradebook.AssignmentGradeRecord;
 import org.sakaiproject.tool.gradebook.Category;
 import org.sakaiproject.tool.gradebook.CourseGrade;
 import org.sakaiproject.tool.gradebook.CourseGradeRecord;
 import org.sakaiproject.tool.gradebook.Gradebook;
 import org.sakaiproject.tool.gradebook.business.GradebookManager;
-import org.springframework.orm.hibernate4.HibernateCallback;
+import org.springframework.orm.hibernate5.HibernateCallback;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -419,9 +421,14 @@ else if(gradebook.getCategory_type() == GradebookService.CATEGORY_TYPE_ONLY_CATE
 
 		return totalPointsPossible;
 	}
-
+
+	@Override
+	public Long createCategory(Long gradebookId, String name, Double weight, Integer dropLowest, Integer dropHighest, Integer keepHighest, Boolean is_extra_credit) throws ConflictingCategoryNameException, StaleObjectModificationException {
+		return super.createCategory(gradebookId, name, weight, dropLowest, dropHighest, keepHighest, is_extra_credit, false, null);
+	}
+
 	@Override
     public void applyDropScores(Collection<AssignmentGradeRecord> gradeRecords) {
-        super.applyDropScores(gradeRecords);
+        super.applyDropScores(gradeRecords, GradebookService.CATEGORY_TYPE_NO_CATEGORY);
     }
 }
diff --git a/...src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java b/...src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java
@@ -59,8 +59,8 @@
 import org.sakaiproject.tool.gradebook.business.GbSynchronizer;
 import org.sakaiproject.tool.gradebook.business.GradebookManager;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.orm.hibernate4.HibernateCallback;
-import org.springframework.orm.hibernate4.HibernateOptimisticLockingFailureException;
+import org.springframework.orm.hibernate5.HibernateCallback;
+import org.springframework.orm.hibernate5.HibernateOptimisticLockingFailureException;
 
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/app/business/src/java/org/sakaiproject/tool/gradebook/framework/GradebookEntityProducer.java b/app/business/src/java/org/sakaiproject/tool/gradebook/framework/GradebookEntityProducer.java
@@ -25,7 +25,6 @@
 import org.sakaiproject.entity.api.EntityManager;
 import org.sakaiproject.entity.api.EntityProducer;
 import org.sakaiproject.entity.api.EntityTransferrer;
-import org.sakaiproject.entity.api.EntityTransferrerRefMigrator;
 import org.sakaiproject.entity.api.HttpAccess;
 import org.sakaiproject.entity.api.Reference;
 import org.sakaiproject.entity.api.ResourceProperties;
@@ -44,7 +43,7 @@
  * Entity Producer for Gradebook. This is required to participate in other entity actions but also handles the transfer of data between
  * sites
  */
-public class GradebookEntityProducer implements EntityProducer, EntityTransferrer, EntityTransferrerRefMigrator {
+public class GradebookEntityProducer implements EntityProducer, EntityTransferrer {
 
 	protected static final String[] TOOL_IDS = { "sakai.gradebook.tool" };
 
@@ -134,17 +133,7 @@ public String[] myToolIds() {
 	}
 
 	@Override
-	public void transferCopyEntities(String fromContext, String toContext, List<String> ids) {
-		transferCopyEntitiesRefMigrator(fromContext, toContext, ids);
-	}
-
-	@Override
-	public void transferCopyEntities(String fromContext, String toContext, List<String> ids, boolean cleanup) {
-		transferCopyEntitiesRefMigrator(fromContext, toContext, ids, cleanup);
-	}
-
-	@Override
-	public Map<String, String> transferCopyEntitiesRefMigrator(String fromContext, String toContext, List<String> ids) {
+	public Map<String, String> transferCopyEntities(String fromContext, String toContext, List<String> ids, List<String> transferOptions) {
 		Gradebook gradebook = (Gradebook) this.gradebookService.getGradebook(fromContext);
 
 		GradebookInformation gradebookInformation = this.gradebookService.getGradebookInformation(gradebook.getUid());
@@ -155,7 +144,7 @@ public Map<String, String> transferCopyEntitiesRefMigrator(String fromContext, S
 	}
 
 	@Override
-	public Map<String, String> transferCopyEntitiesRefMigrator(String fromContext, String toContext, List<String> ids, boolean cleanup) {
+	public Map<String, String> transferCopyEntities(String fromContext, String toContext, List<String> ids, List<String> transferOptions, boolean cleanup) {
 		if (cleanup) {
 
 			Gradebook gradebook = (Gradebook) this.gradebookService.getGradebook(toContext);
@@ -170,7 +159,7 @@ public Map<String, String> transferCopyEntitiesRefMigrator(String fromContext, S
 		}
 
 		// now migrate
-		return transferCopyEntitiesRefMigrator(fromContext, toContext, ids);
+		return transferCopyEntities(fromContext, toContext, ids, transferOptions);
 	}
 
 	@Override

diff --git a/app/sakai-tool/src/webapp/WEB-INF/applicationContext.xml b/app/sakai-tool/src/webapp/WEB-INF/applicationContext.xml
@@ -23,7 +23,7 @@
     <!-- EB Entity Providers - classes in sakai-gradebook-app-ui -->
     <bean id="GradebookEntityProvider" 
     	parent="org.sakaiproject.entitybroker.entityprovider.AbstractEntityProvider"
-    	class="org.sakaiproject.tool.gradebook.ui.helpers.entity.GradebookEntityProvider"
+    	class="org.sakaiproject.tool.gradebook.ui.helpers.entity.[GradebookEntityProvider"
         >
         <property name="gradebookService" ref="org.sakaiproject.service.gradebook.GradebookService" />
         <property name="developerHelperService" ref="org.sakaiproject.entitybroker.DeveloperHelperService" />

diff --git a/app/ui/pom.xml b/app/ui/pom.xml
@@ -139,9 +139,8 @@
 <!-- End database dependencies -->
 <!--${sakai.spring.groupId}${sakai.spring.artifactId}${sakai.spring.version}-->
     <dependency>
-      <groupId>${sakai.spring.groupId}</groupId>
-      <artifactId>${sakai.spring.test.artifactId}</artifactId>
-      <version>${sakai.spring.test.version}</version>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
     </dependency>
     <dependency>
       <groupId>aopalliance</groupId>

diff --git a/app/ui/src/webapp/WEB-INF/applicationContext.xml b/app/ui/src/webapp/WEB-INF/applicationContext.xml
@@ -8,7 +8,7 @@
    </bean>
 
     <bean id="GradebookEntityProvider" class="org.sakaiproject.tool.gradebook.ui.helpers.entity.GradebookEntityProvider"
-      init-method="init" destroy-method="destroy">
+      destroy-method="destroy">
       <property name="entityProviderManager" ref="org.sakaiproject.entitybroker.entityprovider.EntityProviderManager" />
       <property name="gradebookService" ref="org.sakaiproject.service.gradebook.GradebookService" />
     </bean>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
       <groupId>org.sakaiproject</groupId>
       <artifactId>master</artifactId>
-      <version>19-SNAPSHOT</version>
+      <version>22-SNAPSHOT</version>
     </parent>
 
   <name>Sakai Gradebook Project</name>
@@ -21,7 +21,6 @@
 
   <dependencyManagement>
     <dependencies>
-<!--internal dependencies -->
       <dependency>
         <groupId>org.sakaiproject</groupId>
         <artifactId>sakai-gradebook-app-ui</artifactId>
@@ -38,23 +37,16 @@
         <version>${project.version}</version>
         <type>pom</type>
       </dependency>
-      <!-- other sakai dependencies-->
-      <!-- Depends on impls - https://jira.sakaiproject.org/browse/SAK-23917 -->
       <dependency>
         <groupId>org.sakaiproject.edu-services.gradebook</groupId>
         <artifactId>gradebook-service-impl</artifactId>
         <version>${sakai.version}</version>
       </dependency>
       <dependency>
-	<groupId>org.sakaiproject.edu-services.gradebook</groupId>
-	<artifactId>gradebook-service-hibernate</artifactId>
-	<version>${sakai.version}</version>
-	<scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.sakaiproject.edu-services.sections</groupId>
-        <artifactId>sections-impl-standalone</artifactId>
-	<version>${sakai.version}</version>
+        <groupId>org.sakaiproject.edu-services.scoringservice</groupId>
+        <artifactId>scoring-service-api</artifactId>
+        <version>${sakai.version}</version>
+        <scope>provided</scope>
       </dependency>
     </dependencies>
   </dependencyManagement>