Update to work with Sakai 22, issue #29 (#30)

(cherry picked from commit a87bdee) Conflicts: app/business/pom.xml app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookCalculationImpl.java app/business/src/java/org/sakaiproject/tool/gradebook/framework/GradebookEntityProducer.java app/ui/pom.xml pom.xml
sakaicontrib · Aug 4, 2022 · eb7c608 · eb7c608
1 parent 84bb6dc
commit eb7c608
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 35 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>
@@ -117,7 +114,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>${sakai.spring.version}</version>
     </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
@@ -421,19 +421,14 @@ else if(gradebook.getCategory_type() == GradebookService.CATEGORY_TYPE_ONLY_CATE
 
 		return totalPointsPossible;
 	}
-
-	@Override
-		public void applyDropScores(Collection<AssignmentGradeRecord> gradeRecords) {
-				if (gradeRecords != null && gradeRecords.iterator().hasNext()) {
-					AssignmentGradeRecord firstRecord = gradeRecords.iterator().next();
-					super.applyDropScores(gradeRecords, firstRecord.getGradableObject().getGradebook().getCategory_type());
-				}
-		}
 
 	@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);
+	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, GradebookService.CATEGORY_TYPE_NO_CATEGORY);
+    }
 }
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
@@ -133,7 +133,7 @@ public String[] myToolIds() {
 	}
 
 	@Override
-	public Map<String, String> transferCopyEntities(String fromContext, String toContext, List<String> ids, List<String> options) {
+	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());
@@ -144,7 +144,7 @@ public Map<String, String> transferCopyEntities(String fromContext, String toCon
 	}
 
 	@Override
-	public Map<String, String> transferCopyEntities(String fromContext, String toContext, List<String> ids, List<String> options, 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);
@@ -159,7 +159,7 @@ public Map<String, String> transferCopyEntities(String fromContext, String toCon
 		}
 
 		// now migrate
-		return transferCopyEntities(fromContext, toContext, ids, options);
+		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
@@ -141,7 +141,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>${sakai.spring.version}</version>
     </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
@@ -5,7 +5,6 @@
       <groupId>org.sakaiproject</groupId>
       <artifactId>master</artifactId>
       <version>22-SNAPSHOT</version>
-      <relativePath>../master/pom.xml</relativePath>
     </parent>
 
   <name>Sakai Gradebook Project</name>
@@ -21,7 +20,6 @@
 
   <dependencyManagement>
     <dependencies>
-<!--internal dependencies -->
       <dependency>
         <groupId>org.sakaiproject</groupId>
         <artifactId>sakai-gradebook-app-ui</artifactId>
@@ -38,23 +36,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>