SAK-33588 Time now = timeService.newTime() => (sakaiproject#4987)

Instant now = Instant.now();
gexingfeiyang · Nov 15, 2017 · c707445 · c707445
1 parent 5cfa590
commit c707445
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/...t/impl/src/java/org/sakaiproject/assignment/impl/AssignmentSupplementItemServiceImpl.java b/...t/impl/src/java/org/sakaiproject/assignment/impl/AssignmentSupplementItemServiceImpl.java
@@ -41,8 +41,6 @@
 import org.sakaiproject.assignment.api.model.AssignmentSupplementItemWithAttachment;
 import org.sakaiproject.authz.api.AuthzGroupService;
 import org.sakaiproject.site.api.SiteService;
-import org.sakaiproject.time.api.Time;
-import org.sakaiproject.time.api.TimeService;
 import org.sakaiproject.user.api.User;
 import org.sakaiproject.user.api.UserDirectoryService;
 import org.springframework.dao.DataAccessException;
@@ -120,11 +118,6 @@ public void setSiteService(SiteService siteService)
 		m_siteService = siteService;
 	}
 
-	protected TimeService timeService;
-
-	public void setTimeService(TimeService timeService) {
-		this.timeService = timeService;
-	}
 	/********************** attachment   ************************/
 	/**
 	 * {@inheritDoc}
@@ -589,7 +582,7 @@ public boolean canViewAllPurposeItem(Assignment a)
 			{
 				if (!aItem.getHide())
 				{
-					Time now = timeService.newTime();
+					Instant now = Instant.now();
 					Date releaseDate = aItem.getReleaseDate();
 					Date retractDate = aItem.getRetractDate();
 
@@ -601,18 +594,18 @@ public boolean canViewAllPurposeItem(Assignment a)
 					else if (releaseDate != null && retractDate == null)
 					{
 						// has relase date but not retract date
-						rv = now.getTime() > releaseDate.getTime();
+						rv = now.toEpochMilli() > releaseDate.getTime();
 					}
 					else if (releaseDate == null && retractDate != null)
 					{
 						// has retract date but not release date
-						rv = now.getTime() < retractDate.getTime();
+						rv = now.toEpochMilli() < retractDate.getTime();
 					}
 					else if (now != null)
 					{
 						// both releaseDate and retract date are not null
 						// has both release and retract dates
-						rv = now.getTime() > releaseDate.getTime() && now.getTime() < retractDate.getTime();
+						rv = now.toEpochMilli() > releaseDate.getTime() && now.toEpochMilli() < retractDate.getTime();
 					}
 				}
 				else

diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/sort/AssignmentComparator.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/sort/AssignmentComparator.java
@@ -15,12 +15,10 @@
  */
 package org.sakaiproject.assignment.impl.sort;
 
-import org.sakaiproject.assignment.api.model.Assignment;
-import org.sakaiproject.time.api.Time;
-
 import java.time.Instant;
 import java.util.Comparator;
-import java.util.Date;
+
+import org.sakaiproject.assignment.api.model.Assignment;
 
 /**
  * The AssignmentComparator class that sorts by the due date of the assignment.

diff --git a/assignment/impl/src/webapp/WEB-INF/components.xml b/assignment/impl/src/webapp/WEB-INF/components.xml
@@ -145,7 +145,6 @@
         <property name="assignmentService" ref="org.sakaiproject.assignment.api.AssignmentService"/>
         <property name="authzGroupService" ref="org.sakaiproject.authz.api.AuthzGroupService"/>
         <property name="siteService" ref="org.sakaiproject.site.api.SiteService"/>
-        <property name="timeService" ref="org.sakaiproject.time.api.TimeService"/>
     </bean>
 
     <bean id="org.sakaiproject.assignment.impl.AssignmentGradeInfoProvider"