Merge branch 'solr' into update

Cherry-picking #623

Author: JulianKniephoff

frontend/js/integrations/search.js

@@ -80,7 +80,7 @@ define([
         data: "id=" + mediaPackageId + "&limit=1",
         dataType: "json"
     }).then(function (data) {
-        return data["search-results"].result;
+        return data.result[0];
     });
     var mediaPackage = searchResult.then(function (result) {
         return result.mediapackage;

opencast-backend/annotation-impl/src/main/java/org/opencast/annotation/impl/persistence/ExtendedAnnotationServiceJpaImpl.java

@@ -63,12 +63,12 @@
 import org.opencastproject.db.DBSession;
 import org.opencastproject.db.DBSessionFactory;
 import org.opencastproject.mediapackage.MediaPackage;
-import org.opencastproject.search.api.SearchQuery;
-import org.opencastproject.search.api.SearchResultItem;
 import org.opencastproject.search.api.SearchService;
 import org.opencastproject.security.api.AuthorizationService;
 import org.opencastproject.security.api.SecurityConstants;
 import org.opencastproject.security.api.SecurityService;
+import org.opencastproject.security.api.UnauthorizedException;
+import org.opencastproject.util.NotFoundException;
 import org.opencastproject.util.data.Effect;
 import org.opencastproject.util.data.Function;
 import org.opencastproject.util.data.Function0;
@@ -1169,14 +1169,11 @@ public Boolean none() {
 
   @Override
   public Option<MediaPackage> findMediaPackage(String id) {
-    return head(searchService.getByQuery(new SearchQuery().withId(id)).getItems()).map(
-            new Function<>() {
-              @Override
-              public MediaPackage apply(SearchResultItem searchResultItem) {
-                return searchResultItem.getMediaPackage();
-              }
-            }
-    );
+    try {
+      return Option.some(searchService.get(id));
+    } catch (NotFoundException | UnauthorizedException e) {
+      return Option.none();
+    }
   }
 
   @Override

opencast-backend/annotation-impl/src/test/java/org/opencast/annotation/endpoint/TestRestService.java

@@ -28,15 +28,14 @@
 import org.opencast.annotation.impl.persistence.ExtendedAnnotationServiceJpaImpl;
 
 import org.opencastproject.mediapackage.MediaPackage;
-import org.opencastproject.search.api.SearchQuery;
-import org.opencastproject.search.api.SearchResult;
-import org.opencastproject.search.api.SearchResultItem;
 import org.opencastproject.search.api.SearchService;
 import org.opencastproject.security.api.AuthorizationService;
 import org.opencastproject.security.api.DefaultOrganization;
 import org.opencastproject.security.api.SecurityService;
+import org.opencastproject.security.api.UnauthorizedException;
 import org.opencastproject.security.api.User;
 import org.opencastproject.security.util.SecurityUtil;
+import org.opencastproject.util.NotFoundException;
 
 import org.easymock.EasyMock;
 import org.junit.Ignore;
@@ -96,17 +95,12 @@ private static AuthorizationService getAuthorizationService() {
   private static SearchService getSearchService() {
     MediaPackage mediaPackage = EasyMock.createNiceMock(MediaPackage.class);
 
-    SearchResultItem searchResultItem = EasyMock.createNiceMock(SearchResultItem.class);
-    EasyMock.expect(searchResultItem.getMediaPackage()).andReturn(mediaPackage).anyTimes();
-    EasyMock.replay(searchResultItem);
-
-    SearchResult searchResult = EasyMock.createNiceMock(SearchResult.class);
-    EasyMock.expect(searchResult.getItems()).andReturn(new SearchResultItem[]{searchResultItem}).anyTimes();
-    EasyMock.replay(searchResult);
-
     SearchService searchService = EasyMock.createNiceMock(SearchService.class);
-    EasyMock.expect(searchService.getByQuery(EasyMock.anyObject(SearchQuery.class)))
-            .andReturn(searchResult).anyTimes();
+    try {
+      EasyMock.expect(searchService.get(EasyMock.anyObject(String.class))).andReturn(mediaPackage).anyTimes();
+    } catch (UnauthorizedException | NotFoundException e) {
+      // Do nothing. We just have to pretend to handle checked exceptions somehow to appease the compiler.
+    }
     EasyMock.replay(searchService);
     return searchService;
   }