Multi workload with DSE Search

.gitignore

@@ -16,14 +16,11 @@ release.properties
 *.ipr
 *.iws
 .idea
-.idea
 */.idea/*
 *~
 .cache
 .springBeans
 test-output
-target
-target/*
 .DS_Store
 *.swp
 .java-version

pom.xml

@@ -11,7 +11,7 @@
     <properties>
         <start-class>killrvideo.KillrVideoServer</start-class>
         <grpc.version>1.0.0</grpc.version>
-        <dse.version>1.4.0</dse.version>
+        <dse.version>1.4.2</dse.version>
         <commons.lang3.version>3.3.2</commons.lang3.version>
         <commons-codec.version>1.10</commons-codec.version>
         <commons-collections.version>4.1</commons-collections.version>

src/main/java/killrvideo/configuration/MapperConfiguration.java

@@ -29,9 +29,6 @@ public Mapper<User> userMapper() {
     @Bean
     public Mapper<LatestVideos> latestVideosMapper() { return manager.mapper(LatestVideos.class); }
 
-    @Bean
-    public Mapper<TagsByLetter> tagsByLetterMapper() { return manager.mapper(TagsByLetter.class); }
-
     @Bean
     public Mapper<UserCredentials> userCredentialsMapper() {
         return manager.mapper(UserCredentials.class);
@@ -43,9 +40,6 @@ public Mapper<UserCredentials> userCredentialsMapper() {
     @Bean
     public Mapper<Video> videoMapper() { return manager.mapper(Video.class); }
 
-    @Bean
-    public Mapper<VideoByTag> videosByTagMapper() { return manager.mapper(VideoByTag.class); }
-
     @Bean
     public Mapper<VideoPlaybackStats> videoPlaybackStatsMapper() { return manager.mapper(VideoPlaybackStats.class); }
 

src/main/java/killrvideo/entity/Video.java

@@ -19,6 +19,8 @@
 import killrvideo.video_catalog.VideoCatalogServiceOuterClass.GetVideoResponse;
 import killrvideo.video_catalog.VideoCatalogServiceOuterClass.VideoLocationType;
 import killrvideo.video_catalog.VideoCatalogServiceOuterClass.VideoPreview;
+import killrvideo.search.SearchServiceOuterClass.SearchResultsVideoPreview;
+import killrvideo.suggested_videos.SuggestedVideosService.SuggestedVideoPreview;
 
 @Table(keyspace = KEYSPACE, name = "videos")
 public class Video extends AbstractVideo{
@@ -155,4 +157,26 @@ public VideoPreview toVideoPreview() {
                 .setVideoId(TypeConverter.uuidToUuid(videoid))
                 .build();
     }
+
+    public SearchResultsVideoPreview toResultVideoPreview() {
+        return SearchResultsVideoPreview
+                .newBuilder()
+                .setAddedDate(TypeConverter.dateToTimestamp(addedDate))
+                .setName(name)
+                .setPreviewImageLocation(previewImageLocation)
+                .setUserId(TypeConverter.uuidToUuid(userid))
+                .setVideoId(TypeConverter.uuidToUuid(videoid))
+                .build();
+    }
+
+    public SuggestedVideoPreview toSuggestedVideoPreview() {
+        return SuggestedVideoPreview
+                .newBuilder()
+                .setVideoId(TypeConverter.uuidToUuid(videoid))
+                .setAddedDate(TypeConverter.dateToTimestamp(addedDate))
+                .setName(name)
+                .setPreviewImageLocation(previewImageLocation)
+                .setUserId(TypeConverter.uuidToUuid(userid))
+                .build();
+    }
 }

src/main/java/killrvideo/grpc/GrpcServer.java

@@ -23,7 +23,6 @@
 import killrvideo.comments.CommentsServiceGrpc;
 import killrvideo.configuration.KillrVideoProperties;
 import killrvideo.events.CassandraMutationErrorHandler;
-import killrvideo.events.VideoAddedHandlers;
 import killrvideo.ratings.RatingsServiceGrpc;
 import killrvideo.search.SearchServiceGrpc;
 import killrvideo.service.*;
@@ -65,9 +64,6 @@ public class GrpcServer {
     @Inject
     EventBus eventBus;
 
-    @Inject
-    VideoAddedHandlers videoAddedHandlers;
-
     @Inject
     SuggestedVideosService suggestedVideosService;
 
@@ -111,7 +107,6 @@ public void start() throws Exception {
 
         LOGGER.info("Starting Grpc Server on port " + port);
 
-        eventBus.register(videoAddedHandlers);
         eventBus.register(suggestedVideosService);
         eventBus.register(cassandraMutationErrorHandler);
 
@@ -136,7 +131,6 @@ public void run() {
 
     @PreDestroy
     public void stop() {
-        eventBus.unregister(videoAddedHandlers);
         eventBus.unregister(suggestedVideosService);
         eventBus.unregister(cassandraMutationErrorHandler);
         server.shutdown();