diff --git a/src/main/java/org/sagebionetworks/web/client/SynapseClient.java b/src/main/java/org/sagebionetworks/web/client/SynapseClient.java index fdb6632835..da89636b5b 100644 --- a/src/main/java/org/sagebionetworks/web/client/SynapseClient.java +++ b/src/main/java/org/sagebionetworks/web/client/SynapseClient.java @@ -292,12 +292,6 @@ Entity updateFileEntity( void deleteAccessApprovals(String accessRequirement, String accessorId) throws RestServiceException; - String generateSqlWithFacets( - String basicSql, - List selectedFacets, - List schema - ) throws RestServiceException; - Boolean isUserAllowedToRenderHTML(String userId) throws RestServiceException; long getTeamMemberCount(String teamId) throws RestServiceException; diff --git a/src/main/java/org/sagebionetworks/web/client/SynapseClientAsync.java b/src/main/java/org/sagebionetworks/web/client/SynapseClientAsync.java index 4b705167ba..ba2955e107 100644 --- a/src/main/java/org/sagebionetworks/web/client/SynapseClientAsync.java +++ b/src/main/java/org/sagebionetworks/web/client/SynapseClientAsync.java @@ -400,13 +400,6 @@ void deleteAccessApprovals( AsyncCallback asyncCallback ); - void generateSqlWithFacets( - String basicSql, - List selectedFacets, - List schema, - AsyncCallback callback - ); - void isUserAllowedToRenderHTML( String userId, AsyncCallback callback diff --git a/src/main/java/org/sagebionetworks/web/client/widget/table/explore/TableEntityWidgetV2.java b/src/main/java/org/sagebionetworks/web/client/widget/table/explore/TableEntityWidgetV2.java index b1be9f76f6..4852946066 100755 --- a/src/main/java/org/sagebionetworks/web/client/widget/table/explore/TableEntityWidgetV2.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/table/explore/TableEntityWidgetV2.java @@ -420,27 +420,29 @@ private void setQuery(Query query, boolean isFromResults) { ginInjector.getSynapseJSNIUtils().consoleError(e); } }; - OnQueryResultBundleCallback onQueryResultBundleChange = newQueryResultBundleJson -> { - try { - JSONObjectAdapter adapter = ginInjector - .getJSONObjectAdapter() - .createNew(newQueryResultBundleJson); - this.currentQueryResultBundle = new QueryResultBundle(adapter); - this.queryExecutionFinished( - true, - QueryResultEditorWidget.isQueryResultEditable( - this.currentQueryResultBundle, - tableType - ) - ); - } catch (JSONObjectAdapterException e) { - ginInjector.getSynapseJSNIUtils().consoleError(e); - } - }; + OnQueryResultBundleCallback onQueryResultBundleChange = + newQueryResultBundleJson -> { + try { + JSONObjectAdapter adapter = ginInjector + .getJSONObjectAdapter() + .createNew(newQueryResultBundleJson); + this.currentQueryResultBundle = new QueryResultBundle(adapter); + this.queryExecutionFinished( + true, + QueryResultEditorWidget.isQueryResultEditable( + this.currentQueryResultBundle, + tableType + ) + ); + } catch (JSONObjectAdapterException e) { + ginInjector.getSynapseJSNIUtils().consoleError(e); + } + }; - OnViewSharingSettingsHandler onViewSharingSettingsHandler = entityId -> { - onViewSharingSettingsClicked(entityId); - }; + OnViewSharingSettingsHandler onViewSharingSettingsHandler = + entityId -> { + onViewSharingSettingsClicked(entityId); + }; JSONObjectAdapter adapter = ginInjector .getJSONObjectAdapter() .createNew(); @@ -462,22 +464,6 @@ private void setQuery(Query query, boolean isFromResults) { } } - private void generateSqlWithFacets(AsyncCallback callback) { - if ( - currentQuery.getSelectedFacets() == null || - currentQuery.getSelectedFacets().isEmpty() - ) { - callback.onSuccess(currentQuery.getSql()); - } else { - synapseClient.generateSqlWithFacets( - currentQuery.getSql(), - currentQuery.getSelectedFacets(), - tableBundle.getColumnModels(), - callback - ); - } - } - /** * Set the view to show no columns message. */ @@ -664,27 +650,10 @@ public void onStartingNewQuery(Query newQuery) { setQuery(newQuery, true); } - @Override - public void onShowDownloadFilesProgrammatically() { - AsyncCallback callback = new AsyncCallback() { - @Override - public void onSuccess(String sql) { - String escapedSql = sql.replace("\"", "\\\""); - fileViewClientsHelp.setQuery(escapedSql); - fileViewClientsHelp.show(); - } - - @Override - public void onFailure(Throwable caught) { - view.showErrorMessage(caught.getMessage()); - } - }; - generateSqlWithFacets(callback); - } - @Override public void onAddToDownloadList() { - AddToDownloadListV2 newAddToDownloadList = ginInjector.getAddToDownloadListV2(); + AddToDownloadListV2 newAddToDownloadList = + ginInjector.getAddToDownloadListV2(); view.setAddToDownloadList(newAddToDownloadList); newAddToDownloadList.configure( entityBundle.getEntity().getId(), diff --git a/src/main/java/org/sagebionetworks/web/client/widget/table/v2/results/QueryInputListener.java b/src/main/java/org/sagebionetworks/web/client/widget/table/v2/results/QueryInputListener.java index 47509b091c..658275de5a 100755 --- a/src/main/java/org/sagebionetworks/web/client/widget/table/v2/results/QueryInputListener.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/table/v2/results/QueryInputListener.java @@ -19,10 +19,5 @@ public interface QueryInputListener { */ public void onEditResults(); - /** - * user clicked download files (from view) button. - */ - public void onShowDownloadFilesProgrammatically(); - void onAddToDownloadList(); } diff --git a/src/main/java/org/sagebionetworks/web/server/servlet/SynapseClientImpl.java b/src/main/java/org/sagebionetworks/web/server/servlet/SynapseClientImpl.java index ccc0ceb749..eaef569f18 100644 --- a/src/main/java/org/sagebionetworks/web/server/servlet/SynapseClientImpl.java +++ b/src/main/java/org/sagebionetworks/web/server/servlet/SynapseClientImpl.java @@ -87,12 +87,9 @@ import org.sagebionetworks.repo.model.search.query.SearchQuery; import org.sagebionetworks.repo.model.table.ColumnChange; import org.sagebionetworks.repo.model.table.ColumnModel; -import org.sagebionetworks.repo.model.table.Dataset; -import org.sagebionetworks.repo.model.table.FacetColumnRequest; import org.sagebionetworks.repo.model.table.TableSchemaChangeRequest; import org.sagebionetworks.repo.model.table.TableUpdateRequest; import org.sagebionetworks.repo.model.table.TableUpdateTransactionRequest; -import org.sagebionetworks.repo.model.table.TransformSqlWithFacetsRequest; import org.sagebionetworks.repo.model.v2.wiki.V2WikiHistorySnapshot; import org.sagebionetworks.repo.model.v2.wiki.V2WikiPage; import org.sagebionetworks.repo.model.wiki.WikiPage; @@ -103,7 +100,6 @@ import org.sagebionetworks.schema.adapter.org.json.AdapterFactoryImpl; import org.sagebionetworks.util.SerializationUtils; import org.sagebionetworks.web.client.SynapseClient; -import org.sagebionetworks.web.server.servlet.filter.CrawlFilter; import org.sagebionetworks.web.shared.MembershipRequestBundle; import org.sagebionetworks.web.shared.OpenTeamInvitationBundle; import org.sagebionetworks.web.shared.OpenUserInvitationBundle; @@ -2089,26 +2085,6 @@ public Entity updateFileEntity( } } - @Override - public String generateSqlWithFacets( - String basicSql, - List selectedFacets, - List schema - ) throws RestServiceException { - try { - org.sagebionetworks.client.SynapseClient synapseClient = - createSynapseClient(); - TransformSqlWithFacetsRequest request = - new TransformSqlWithFacetsRequest(); - request.setSqlToTransform(basicSql); - request.setSelectedFacets(selectedFacets); - request.setSchema(schema); - return synapseClient.transformSqlRequest(request); - } catch (SynapseException e) { - throw ExceptionUtil.convertSynapseException(e); - } - } - @Override public Boolean isUserAllowedToRenderHTML(String userId) throws RestServiceException { diff --git a/src/test/java/org/sagebionetworks/web/unitclient/widget/table/explore/TableEntityWidgetV2Test.java b/src/test/java/org/sagebionetworks/web/unitclient/widget/table/explore/TableEntityWidgetV2Test.java index 8c165d85c3..42c79ed05c 100755 --- a/src/test/java/org/sagebionetworks/web/unitclient/widget/table/explore/TableEntityWidgetV2Test.java +++ b/src/test/java/org/sagebionetworks/web/unitclient/widget/table/explore/TableEntityWidgetV2Test.java @@ -4,7 +4,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyList; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; @@ -141,8 +140,6 @@ public class TableEntityWidgetV2Test { @Captor ArgumentCaptor queryCaptor; - public static final String FACET_SQL = - "select * from syn123 where \"x\" = 'a'"; public static final String EXPECTED_SQL_FOR_CLIENT = "select * from syn123 where \\\"x\\\" = 'a'"; @@ -231,15 +228,6 @@ public void before() { mockEventBus ); - AsyncMockStubber - .callSuccessWith(FACET_SQL) - .when(mockSynapseClient) - .generateSqlWithFacets( - anyString(), - anyList(), - anyList(), - any(AsyncCallback.class) - ); // The test bundle entityBundle = new EntityBundle(); entityBundle.setEntity(tableEntity); @@ -574,7 +562,8 @@ public void testOnExecuteQuery() throws JSONObjectAdapterException { newBundle.setQueryCount(expectedQueryCount); newBundle.writeToJSONObject(adapter); - OnQueryResultBundleCallback queryResultCallback = onQueryResultBundleCallbackCaptor.getValue(); + OnQueryResultBundleCallback queryResultCallback = + onQueryResultBundleCallbackCaptor.getValue(); queryResultCallback.run(adapter.toJSONString()); assertEquals( @@ -583,7 +572,8 @@ public void testOnExecuteQuery() throws JSONObjectAdapterException { ); // test OnViewSharingSettingsHandler - OnViewSharingSettingsHandler onViewSharingSettingsHandler = onViewSharingSettingsHandlerCaptor.getValue(); + OnViewSharingSettingsHandler onViewSharingSettingsHandler = + onViewSharingSettingsHandlerCaptor.getValue(); String testEntityId = "syn0000001"; onViewSharingSettingsHandler.onViewSharingSettingsClicked(testEntityId); @@ -731,26 +721,6 @@ public void testEditTablePreflightPassed() { .showEditor(any(QueryResultBundle.class), any(TableType.class)); } - @Test - public void testOnShowDownloadFiles() { - Query startQuery = new Query(); - startQuery.setSql(FACET_SQL); - when(mockQueryChangeHandler.getQueryString()).thenReturn(startQuery); - widget.configure( - entityBundle, - versionNumber, - true, - false, - mockQueryChangeHandler, - mockActionMenu - ); - - widget.onShowDownloadFilesProgrammatically(); - - verify(mockFileViewClientsHelp).setQuery(EXPECTED_SQL_FOR_CLIENT); - verify(mockFileViewClientsHelp).show(); - } - @Test public void testAutoAddToDownloadListV2() throws JSONObjectAdapterException { when( diff --git a/src/test/java/org/sagebionetworks/web/unitserver/SynapseClientImplTest.java b/src/test/java/org/sagebionetworks/web/unitserver/SynapseClientImplTest.java index 5ca760a5bf..79a37f2e19 100644 --- a/src/test/java/org/sagebionetworks/web/unitserver/SynapseClientImplTest.java +++ b/src/test/java/org/sagebionetworks/web/unitserver/SynapseClientImplTest.java @@ -48,7 +48,6 @@ import org.mockito.internal.util.reflection.Whitebox; import org.mockito.runners.MockitoJUnitRunner; import org.sagebionetworks.client.SynapseClient; -import org.sagebionetworks.client.exceptions.SynapseBadRequestException; import org.sagebionetworks.client.exceptions.SynapseException; import org.sagebionetworks.client.exceptions.SynapseNotFoundException; import org.sagebionetworks.evaluation.model.Evaluation; @@ -115,14 +114,10 @@ import org.sagebionetworks.repo.model.table.ColumnChange; import org.sagebionetworks.repo.model.table.ColumnModel; import org.sagebionetworks.repo.model.table.ColumnType; -import org.sagebionetworks.repo.model.table.FacetColumnRequest; -import org.sagebionetworks.repo.model.table.FacetColumnValuesRequest; -import org.sagebionetworks.repo.model.table.FacetType; import org.sagebionetworks.repo.model.table.SqlTransformRequest; import org.sagebionetworks.repo.model.table.TableSchemaChangeRequest; import org.sagebionetworks.repo.model.table.TableUpdateRequest; import org.sagebionetworks.repo.model.table.TableUpdateTransactionRequest; -import org.sagebionetworks.repo.model.table.TransformSqlWithFacetsRequest; import org.sagebionetworks.repo.model.v2.wiki.V2WikiHistorySnapshot; import org.sagebionetworks.repo.model.v2.wiki.V2WikiPage; import org.sagebionetworks.repo.model.wiki.WikiPage; @@ -400,7 +395,8 @@ public void before() throws SynapseException, JSONObjectAdapterException { bene.setId("syn999"); when(mockSynapse.getEntityBenefactor(anyString())).thenReturn(bene); - org.sagebionetworks.reflection.model.PaginatedResults batchHeaders = new org.sagebionetworks.reflection.model.PaginatedResults(); + org.sagebionetworks.reflection.model.PaginatedResults batchHeaders = + new org.sagebionetworks.reflection.model.PaginatedResults(); batchHeaderResults = new ArrayList(); for (int i = 0; i < 10; i++) { EntityHeader h = new EntityHeader(); @@ -410,7 +406,8 @@ public void before() throws SynapseException, JSONObjectAdapterException { batchHeaders.setResults(batchHeaderResults); when(mockSynapse.getEntityHeaderBatch(anyList())).thenReturn(batchHeaders); - List accessRequirements = new ArrayList(); + List accessRequirements = + new ArrayList(); accessRequirements.add(createAccessRequirement(ACCESS_TYPE.DOWNLOAD)); int mask = ENTITY | ANNOTATIONS | PERMISSIONS | ENTITY_PATH | HAS_CHILDREN; @@ -442,7 +439,8 @@ public void before() throws SynapseException, JSONObjectAdapterException { handle.setFileName(testFileName); handle.setKey("key"); when(mockSynapse.getRawFileHandle(anyString())).thenReturn(handle); - org.sagebionetworks.reflection.model.PaginatedResults ars = new org.sagebionetworks.reflection.model.PaginatedResults(); + org.sagebionetworks.reflection.model.PaginatedResults ars = + new org.sagebionetworks.reflection.model.PaginatedResults(); ars.setTotalNumberOfResults(0); ars.setResults(new ArrayList()); when( @@ -458,7 +456,8 @@ public void before() throws SynapseException, JSONObjectAdapterException { when(mockUserProfile.getOwnerId()).thenReturn(MY_USER_PROFILE_OWNER_ID); when(mockSynapse.getMyProfile()).thenReturn(mockUserProfile); - PaginatedResults openInvites = new PaginatedResults(); + PaginatedResults openInvites = + new PaginatedResults(); openInvites.setTotalNumberOfResults(0); when( mockSynapse.getOpenMembershipInvitations( @@ -470,7 +469,8 @@ public void before() throws SynapseException, JSONObjectAdapterException { ) .thenReturn(openInvites); - PaginatedResults openRequests = new PaginatedResults(); + PaginatedResults openRequests = + new PaginatedResults(); openRequests.setTotalNumberOfResults(0); when( mockSynapse.getOpenMembershipRequests( @@ -544,11 +544,13 @@ public void before() throws SynapseException, JSONObjectAdapterException { } private AccessRequirement createAccessRequirement(ACCESS_TYPE type) { - TermsOfUseAccessRequirement accessRequirement = new TermsOfUseAccessRequirement(); + TermsOfUseAccessRequirement accessRequirement = + new TermsOfUseAccessRequirement(); accessRequirement.setConcreteType( TermsOfUseAccessRequirement.class.getName() ); - RestrictableObjectDescriptor descriptor = new RestrictableObjectDescriptor(); + RestrictableObjectDescriptor descriptor = + new RestrictableObjectDescriptor(); descriptor.setId("101"); descriptor.setType(RestrictableObjectType.ENTITY); accessRequirement.setSubjectIds( @@ -559,12 +561,14 @@ private AccessRequirement createAccessRequirement(ACCESS_TYPE type) { } private void setupTeamInvitations() throws SynapseException { - ArrayList testInvitations = new ArrayList(); + ArrayList testInvitations = + new ArrayList(); testInvitation = new MembershipInvitation(); testInvitation.setId("628319"); testInvitation.setInviteeId(USER_ID); testInvitations.add(testInvitation); - PaginatedResults paginatedInvitations = new PaginatedResults(); + PaginatedResults paginatedInvitations = + new PaginatedResults(); paginatedInvitations.setResults(testInvitations); when( mockSynapse.getOpenMembershipInvitationSubmissions( @@ -584,11 +588,13 @@ private void setupTeamInvitations() throws SynapseException { } private void setupOpenTeamRequest() throws SynapseException { - ArrayList testInvitations = new ArrayList(); + ArrayList testInvitations = + new ArrayList(); when(mockMembershipRequest.getTeamId()).thenReturn("111"); when(mockMembershipRequest.getUserId()).thenReturn(USER_ID); testInvitations.add(mockMembershipRequest); - PaginatedResults paginatedInvitations = new PaginatedResults(); + PaginatedResults paginatedInvitations = + new PaginatedResults(); paginatedInvitations.setResults(testInvitations); when( mockSynapse.getOpenMembershipRequests( @@ -771,7 +777,8 @@ public void testRestoreV2WikiPage() throws Exception { @Test public void testGetV2WikiHistory() throws Exception { - PaginatedResults historyResults = new PaginatedResults(); + PaginatedResults historyResults = + new PaginatedResults(); when( mockSynapse.getV2WikiHistory( any(org.sagebionetworks.repo.model.dao.WikiPageKey.class), @@ -858,14 +865,16 @@ public void getV2WikiPageAsV1() throws Exception { @Test public void testHtmlTeamMembersCache() throws Exception { - PaginatedResults teamMembersPage1 = new PaginatedResults(); + PaginatedResults teamMembersPage1 = + new PaginatedResults(); String trustedUserId = "876543"; UserGroupHeader mockHeader = mock(UserGroupHeader.class); when(mockHeader.getOwnerId()).thenReturn(trustedUserId); TeamMember mockTeamMember = mock(TeamMember.class); when(mockTeamMember.getMember()).thenReturn(mockHeader); teamMembersPage1.setResults(Collections.singletonList(mockTeamMember)); - PaginatedResults teamMembersPage2 = new PaginatedResults(); + PaginatedResults teamMembersPage2 = + new PaginatedResults(); teamMembersPage2.setResults(new ArrayList()); when( mockSynapse.getTeamMembers(anyString(), anyString(), anyInt(), anyInt()) @@ -1259,11 +1268,8 @@ public void testGetOpenTeamInvitations() int limit = 55; int offset = 2; String teamId = "132"; - List invitationBundles = synapseClient.getOpenTeamInvitations( - teamId, - limit, - offset - ); + List invitationBundles = + synapseClient.getOpenTeamInvitations(teamId, limit, offset); verify(mockSynapse) .getOpenMembershipInvitationSubmissions( eq(teamId), @@ -1338,7 +1344,8 @@ public void testGetTeamMembers() throws SynapseException, RestServiceException, MalformedURLException, JSONObjectAdapterException { // set team member count Long testMemberCount = 111L; - PaginatedResults allMembers = new PaginatedResults(); + PaginatedResults allMembers = + new PaginatedResults(); allMembers.setTotalNumberOfResults(testMemberCount); List members = new ArrayList(); @@ -1489,9 +1496,8 @@ public void testGetCertifiedUserPassingRecord() .toJSONString(); when(mockSynapse.getCertifiedUserPassingRecord(anyString())) .thenReturn(passingRecord); - String returnedPassingRecordJson = synapseClient.getCertifiedUserPassingRecord( - "123" - ); + String returnedPassingRecordJson = + synapseClient.getCertifiedUserPassingRecord("123"); verify(mockSynapse).getCertifiedUserPassingRecord(anyString()); assertEquals(passingRecordJson, returnedPassingRecordJson); } @@ -1537,7 +1543,8 @@ public void testSubmitCertificationQuizResponse() @Test public void testFilterAccessRequirements() throws Exception { - List unfilteredAccessRequirements = new ArrayList(); + List unfilteredAccessRequirements = + new ArrayList(); List filteredAccessRequirements; // filter empty list should not result in failure filteredAccessRequirements = @@ -1587,7 +1594,8 @@ public void testFilterAccessRequirements() throws Exception { @Test public void testAddEmail() throws Exception { - EmailValidationSignedToken emailValidationSignedToken = new EmailValidationSignedToken(); + EmailValidationSignedToken emailValidationSignedToken = + new EmailValidationSignedToken(); synapseClient.addEmail(emailValidationSignedToken); verify(mockSynapse) .addEmail(any(EmailValidationSignedToken.class), anyBoolean()); @@ -1696,8 +1704,10 @@ public void testHandleSignedTokenInvalidNotificationSettings() private void setupGetMyLocationSettings() throws SynapseException, RestServiceException { - List existingStorageLocations = new ArrayList(); - StorageLocationSetting storageLocation = new ExternalS3StorageLocationSetting(); + List existingStorageLocations = + new ArrayList(); + StorageLocationSetting storageLocation = + new ExternalS3StorageLocationSetting(); storageLocation.setStorageLocationId(1L); storageLocation.setBanner(BANNER_1); existingStorageLocations.add(storageLocation); @@ -1748,17 +1758,20 @@ public void testCreateStorageLocationSettingFoundStorageAndProjectSetting() throws SynapseException, RestServiceException { setupGetMyLocationSettings(); Long storageLocationId = 2L; - UploadDestinationListSetting projectSetting = new UploadDestinationListSetting(); + UploadDestinationListSetting projectSetting = + new UploadDestinationListSetting(); projectSetting.setLocations(Collections.EMPTY_LIST); when(mockSynapse.getProjectSetting(entityId, ProjectSettingsType.upload)) .thenReturn(projectSetting); // test the case when it finds a duplicate storage location. - ExternalStorageLocationSetting setting = new ExternalStorageLocationSetting(); + ExternalStorageLocationSetting setting = + new ExternalStorageLocationSetting(); setting.setBanner(BANNER_2); setting.setUrl("sftp://www.jayhodgson.com"); - ExternalStorageLocationSetting foundSetting = new ExternalStorageLocationSetting(); + ExternalStorageLocationSetting foundSetting = + new ExternalStorageLocationSetting(); foundSetting.setBanner(BANNER_2); foundSetting.setUrl("sftp://www.jayhodgson.com"); foundSetting.setStorageLocationId(storageLocationId); @@ -1780,7 +1793,8 @@ public void testCreateStorageLocationSettingFoundStorageAndProjectSetting() ProjectSetting.class ); verify(mockSynapse).updateProjectSetting(captor.capture()); - UploadDestinationListSetting updatedProjectSetting = (UploadDestinationListSetting) captor.getValue(); + UploadDestinationListSetting updatedProjectSetting = + (UploadDestinationListSetting) captor.getValue(); List locations = updatedProjectSetting.getLocations(); assertEquals(storageLocationId, locations.get(0)); } @@ -1790,7 +1804,8 @@ public void testSetDefaultStorageLocationSetting() throws SynapseException, RestServiceException { setupGetMyLocationSettings(); - UploadDestinationListSetting projectSetting = new UploadDestinationListSetting(); + UploadDestinationListSetting projectSetting = + new UploadDestinationListSetting(); projectSetting.setLocations(Collections.EMPTY_LIST); when(mockSynapse.getProjectSetting(entityId, ProjectSettingsType.upload)) .thenReturn(projectSetting); @@ -1805,7 +1820,8 @@ public void testSetDefaultStorageLocationSetting() ProjectSetting.class ); verify(mockSynapse).updateProjectSetting(captor.capture()); - UploadDestinationListSetting updatedProjectSetting = (UploadDestinationListSetting) captor.getValue(); + UploadDestinationListSetting updatedProjectSetting = + (UploadDestinationListSetting) captor.getValue(); List locations = updatedProjectSetting.getLocations(); assertEquals(SynapseClientImpl.defaultStorageLocation, locations.get(0)); } @@ -1818,12 +1834,14 @@ public void testCreateStorageLocationSettingNewStorageAndProjectSetting() .thenReturn(null); // test the case when it does not find duplicate storage location setting. - ExternalStorageLocationSetting setting = new ExternalStorageLocationSetting(); + ExternalStorageLocationSetting setting = + new ExternalStorageLocationSetting(); setting.setBanner(BANNER_2); setting.setUrl("sftp://www.google.com"); Long newStorageLocationId = 1007L; - ExternalStorageLocationSetting createdSetting = new ExternalStorageLocationSetting(); + ExternalStorageLocationSetting createdSetting = + new ExternalStorageLocationSetting(); createdSetting.setStorageLocationId(newStorageLocationId); when( @@ -1843,7 +1861,8 @@ public void testCreateStorageLocationSettingNewStorageAndProjectSetting() ProjectSetting.class ); verify(mockSynapse).createProjectSetting(captor.capture()); - UploadDestinationListSetting updatedProjectSetting = (UploadDestinationListSetting) captor.getValue(); + UploadDestinationListSetting updatedProjectSetting = + (UploadDestinationListSetting) captor.getValue(); List locations = updatedProjectSetting.getLocations(); assertEquals(newStorageLocationId, locations.get(0)); assertEquals( @@ -1900,7 +1919,8 @@ private void setupVersionedEntityBundle( ) ) .thenReturn(eb); - PaginatedResults versionInfoPaginatedResults = new PaginatedResults(); + PaginatedResults versionInfoPaginatedResults = + new PaginatedResults(); List versionInfoList = new LinkedList(); VersionInfo versionInfo = new VersionInfo(); versionInfo.setVersionNumber(latestVersionNumber); @@ -1929,15 +1949,15 @@ public void testGetTableUpdateTransactionRequestNoChange() when(mockSynapse.getColumnModelsForTableEntity(tableId)) .thenReturn(oldColumnModels); - TableUpdateTransactionRequest request = synapseClient.getTableUpdateTransactionRequest( - tableId, - oldColumnModels, - newColumnModels - ); + TableUpdateTransactionRequest request = + synapseClient.getTableUpdateTransactionRequest( + tableId, + oldColumnModels, + newColumnModels + ); assertEquals(1, request.getChanges().size()); - TableSchemaChangeRequest tableUpdateRequest = (TableSchemaChangeRequest) request - .getChanges() - .get(0); + TableSchemaChangeRequest tableUpdateRequest = + (TableSchemaChangeRequest) request.getChanges().get(0); List orderColumnIds = tableUpdateRequest.getOrderedColumnIds(); assertEquals(OLD_COLUMN_MODEL_ID2, orderColumnIds.get(0)); assertEquals(OLD_COLUMN_MODEL_ID1, orderColumnIds.get(1)); @@ -1954,18 +1974,18 @@ public void testGetTableUpdateTransactionRequestNewColumn() List newColumnModels = Collections.singletonList( mockNewColumnModel ); - TableUpdateTransactionRequest request = synapseClient.getTableUpdateTransactionRequest( - tableId, - oldColumnModels, - newColumnModels - ); + TableUpdateTransactionRequest request = + synapseClient.getTableUpdateTransactionRequest( + tableId, + oldColumnModels, + newColumnModels + ); verify(mockSynapse).createColumnModels(anyList()); assertEquals(tableId, request.getEntityId()); List tableUpdates = request.getChanges(); assertEquals(1, tableUpdates.size()); - TableSchemaChangeRequest schemaChange = (TableSchemaChangeRequest) tableUpdates.get( - 0 - ); + TableSchemaChangeRequest schemaChange = + (TableSchemaChangeRequest) tableUpdates.get(0); List changes = schemaChange.getChanges(); assertEquals(1, changes.size()); ColumnChange columnChange = changes.get(0); @@ -2022,18 +2042,18 @@ public void testGetTableUpdateTransactionRequestFullTest() when(mockSynapse.createColumnModels(anyList())) .thenReturn(newSchemaAfterUpdate); - TableUpdateTransactionRequest request = synapseClient.getTableUpdateTransactionRequest( - tableId, - oldSchema, - proposedNewSchema - ); + TableUpdateTransactionRequest request = + synapseClient.getTableUpdateTransactionRequest( + tableId, + oldSchema, + proposedNewSchema + ); verify(mockSynapse).createColumnModels(anyList()); assertEquals(tableId, request.getEntityId()); List tableUpdates = request.getChanges(); assertEquals(1, tableUpdates.size()); - TableSchemaChangeRequest schemaChange = (TableSchemaChangeRequest) tableUpdates.get( - 0 - ); + TableSchemaChangeRequest schemaChange = + (TableSchemaChangeRequest) tableUpdates.get(0); // changes should consist of a create, an update, and a delete List changes = schemaChange.getChanges(); @@ -2096,52 +2116,6 @@ public void testUpdateFileEntityUnauthorized() synapseClient.updateFileEntity(mockFileEntity, mockFileHandleCopyRequest); } - @Test(expected = BadRequestException.class) - public void testGenerateSqlWithFacetsError() - throws RestServiceException, SynapseException { - when(mockSynapse.transformSqlRequest(any(SqlTransformRequest.class))) - .thenThrow(new SynapseBadRequestException()); - synapseClient.generateSqlWithFacets(null, null, null); - } - - @Test - public void testGenerateSqlWithFacets() - throws RestServiceException, SynapseException { - String sql = "select * from syn123"; - String expectedTransformedSql = - "SELECT * FROM syn123 WHERE ( ( \"col1\" = 'a' ) )"; - when(mockSynapse.transformSqlRequest(any(SqlTransformRequest.class))) - .thenReturn(expectedTransformedSql); - FacetColumnRequest request = new FacetColumnValuesRequest(); - String columnName = "col1"; - String facetValue = "a"; - request.setColumnName(columnName); - when(mockNewColumnModel.getName()).thenReturn(columnName); - when(mockNewColumnModel.getFacetType()).thenReturn(FacetType.enumeration); - when(mockNewColumnModel.getColumnType()).thenReturn(ColumnType.STRING); - ((FacetColumnValuesRequest) request).setFacetValues( - Collections.singleton(facetValue) - ); - List selectedFacets = Collections.singletonList( - request - ); - List schema = Collections.singletonList(mockNewColumnModel); - - String newSql = synapseClient.generateSqlWithFacets( - sql, - selectedFacets, - schema - ); - - verify(mockSynapse) - .transformSqlRequest(sqlTransformRequestCaptor.capture()); - assertEquals(expectedTransformedSql, newSql); - TransformSqlWithFacetsRequest transformRequest = (TransformSqlWithFacetsRequest) sqlTransformRequestCaptor.getValue(); - assertEquals(sql, transformRequest.getSqlToTransform()); - assertEquals(selectedFacets, transformRequest.getSelectedFacets()); - assertEquals(schema, transformRequest.getSchema()); - } - @Test public void testGetFileNameFromLocationPath() { String name = "filename.txt"; @@ -2177,7 +2151,8 @@ public void testIsChallenge() throws RestServiceException, SynapseException { .thenReturn(true); assertTrue(synapseClient.isChallenge("syn123")); - org.sagebionetworks.reflection.model.PaginatedResults testResults = new org.sagebionetworks.reflection.model.PaginatedResults(); + org.sagebionetworks.reflection.model.PaginatedResults testResults = + new org.sagebionetworks.reflection.model.PaginatedResults(); Evaluation e = new Evaluation(); e.setId(EVAL_ID_1); e.setContentSource("syn123");