updated to use lai-model 1.1.1 and lai-event 1.1.4

this will be a release of 1.0.9

Author: Steven Cody

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>apereo</groupId>
   <artifactId>data-loader-library</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.9</version>
   <packaging>jar</packaging>
 
   <name>apereo-data-loader-library</name>
@@ -46,12 +46,12 @@
     <dependency>
       <groupId>apereo</groupId>
       <artifactId>lai-event</artifactId>
-      <version>1.0.2</version>
+      <version>1.1.4</version>
     </dependency>
     <dependency>
       <groupId>apereo</groupId>
       <artifactId>lai-model</artifactId>
-      <version>1.0.4</version>
+      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -92,4 +92,5 @@
     </plugins>
   </build>
 
+  <description>for use with Apereo LRW_Suite (or Shuhari) products. Mostly used for Data Loading (for the OpenDashboard)</description>
 </project>

src/main/java/unicon/matthews/dataloader/MatthewsClient.java

@@ -3,7 +3,7 @@
  */
 package unicon.matthews.dataloader;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -19,14 +19,14 @@
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
-import unicon.matthews.caliper.Envelope;
-import unicon.matthews.caliper.Event;
-import unicon.matthews.entity.ClassMapping;
-import unicon.matthews.entity.DataSync;
-import unicon.matthews.entity.UserMapping;
-import unicon.matthews.oneroster.Enrollment;
-import unicon.matthews.oneroster.LineItem;
-import unicon.matthews.oneroster.User;
+import org.apereo.openlrw.caliper.Envelope;
+import org.apereo.openlrw.caliper.Event;
+import org.apereo.model.entity.ClassMapping;
+import org.apereo.model.entity.DataSync;
+import org.apereo.model.entity.UserMapping;
+import org.apereo.model.oneroster.Enrollment;
+import org.apereo.model.oneroster.LineItem;
+import org.apereo.model.oneroster.User;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
@@ -184,8 +184,8 @@ public void postLineItem(LineItem lineItem) {
 
   }
 
-  public void postClass(unicon.matthews.oneroster.Class klass) {
-    HttpEntity<unicon.matthews.oneroster.Class> he = new HttpEntity<unicon.matthews.oneroster.Class>(klass, this.httpHeaders);
+  public void postClass(org.apereo.model.oneroster.Class klass) {
+    HttpEntity<org.apereo.model.oneroster.Class> he = new HttpEntity<org.apereo.model.oneroster.Class>(klass, this.httpHeaders);
 
     String path = "/api/classes";
     String url = this.baseUrl + path;
@@ -194,8 +194,8 @@ public void postClass(unicon.matthews.oneroster.Class klass) {
         .exchange(url, HttpMethod.POST, he, JsonObject.class);
   }
 
-  public void postCourse(unicon.matthews.oneroster.Course course) {
-    HttpEntity<unicon.matthews.oneroster.Course> he = new HttpEntity<unicon.matthews.oneroster.Course>(course, this.httpHeaders);
+  public void postCourse(org.apereo.model.oneroster.Course course) {
+    HttpEntity<org.apereo.model.oneroster.Course> he = new HttpEntity<org.apereo.model.oneroster.Course>(course, this.httpHeaders);
 
     String path = "/api/courses";
     String url = this.baseUrl + path;
@@ -219,7 +219,7 @@ public void postEvent(Event event, String sensorName) {
     Envelope envelope
     = new Envelope.Builder()
       .withData(Collections.singletonList(event))
-      .withSendTime(LocalDateTime.now())
+      .withSendTime(Instant.now())
       .withSensor(sensorName)
       .build();
 
@@ -236,7 +236,7 @@ public void postEvents(Collection<Event> events, String sensorName) {
     Envelope envelope
     = new Envelope.Builder()
       .withData(new ArrayList<>(events))
-      .withSendTime(LocalDateTime.now())
+      .withSendTime(Instant.now())
       .withSensor(sensorName)
       .build();
 
@@ -260,7 +260,7 @@ public void postDataSync(DataSync dataSync) {
 
   }
 
-  public DataSync getLatestDataSyncForType(unicon.matthews.entity.DataSync.DataSyncType dataSyncType) {
+  public DataSync getLatestDataSyncForType(org.apereo.model.entity.DataSync.DataSyncType dataSyncType) {
     DataSync dataSync = null;
 
     String path = "/api/sync/".concat(dataSyncType.toString()).concat("/latest");

src/main/java/unicon/matthews/dataloader/converter/Converter.java

@@ -1,6 +1,6 @@
 package unicon.matthews.dataloader.converter;
 
-import unicon.matthews.caliper.Event;
+import org.apereo.openlrw.caliper.Event;
 
 /**
  * General interface for type converters. The Type parameters <S, T > will allow the converters to be type safe

src/main/java/unicon/matthews/dataloader/converter/EventBuilderUtils.java

@@ -1,13 +1,13 @@
 package unicon.matthews.dataloader.converter;
 
-import unicon.matthews.caliper.Agent;
-import unicon.matthews.caliper.Entity;
-import unicon.matthews.caliper.Event;
-import unicon.matthews.caliper.Group;
-import unicon.matthews.caliper.Membership;
+import org.apereo.openlrw.caliper.Agent;
+import org.apereo.openlrw.caliper.Entity;
+import org.apereo.openlrw.caliper.Event;
+import org.apereo.openlrw.caliper.Group;
+import org.apereo.openlrw.caliper.Membership;
 import unicon.matthews.dataloader.util.Maps;
-import unicon.matthews.oneroster.Enrollment;
-import unicon.matthews.oneroster.User;
+import org.apereo.model.oneroster.Enrollment;
+import org.apereo.model.oneroster.User;
 
 import java.util.Arrays;
 import java.util.UUID;
@@ -262,7 +262,7 @@ public static Group.Builder usingCourseSectionGroup(Enrollment enrollment) {
                 .withType(CaliperV1p1Vocab.Entity.COURSE_SECTION)
                 .withId(enrollment.getKlass().getSourcedId())
                 .withExtensions(Maps.ofEntries(
-                        entry("context_type", enrollment.getKlass().getTitle())));  // TODO - optional and course title is likely wrong - but where do we find something else useful for it
+                        entry("context_type", enrollment.getKlass().getType())));  // TODO - optional and course title is likely wrong - but where do we find something else useful for it
     }
 
     public static Membership.Builder usingMembership(Enrollment enrollment) {