dsmiley commented on code in PR #1053: URL: https://github.com/apache/solr/pull/1053#discussion_r1010941513
########## solr/core/src/test/org/apache/solr/handler/admin/api/DeleteReplicaPropertyAPITest.java: ########## @@ -0,0 +1,116 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.solr.handler.admin.api; + +import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.SHARD_UNIQUE; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import io.opentracing.noop.NoopSpan; +import java.util.Map; +import java.util.Optional; +import org.apache.solr.SolrTestCaseJ4; +import org.apache.solr.cloud.OverseerSolrResponse; +import org.apache.solr.cloud.api.collections.DistributedCollectionConfigSetCommandRunner; +import org.apache.solr.common.SolrException; +import org.apache.solr.common.cloud.ZkNodeProps; +import org.apache.solr.common.util.NamedList; +import org.apache.solr.core.CoreContainer; +import org.apache.solr.request.SolrQueryRequest; +import org.apache.solr.response.SolrQueryResponse; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockito.ArgumentCaptor; + +/** Unit tests for {@link DeleteReplicaPropertyAPI} */ +public class DeleteReplicaPropertyAPITest extends SolrTestCaseJ4 { + + private CoreContainer mockCoreContainer; + private DistributedCollectionConfigSetCommandRunner mockCommandRunner; + private SolrQueryRequest mockQueryRequest; + private SolrQueryResponse queryResponse; + private ArgumentCaptor<ZkNodeProps> messageCapturer; + + private DeleteReplicaPropertyAPI deleteReplicaPropApi; + + @BeforeClass + public static void ensureWorkingMockito() { + assumeWorkingMockito(); + } + + @Before + public void setUp() throws Exception { + super.setUp(); + + mockCoreContainer = mock(CoreContainer.class); + mockCommandRunner = mock(DistributedCollectionConfigSetCommandRunner.class); + when(mockCoreContainer.getDistributedCollectionCommandRunner()) + .thenReturn(Optional.of(mockCommandRunner)); + when(mockCommandRunner.runCollectionCommand(any(), any(), anyLong())) + .thenReturn(new OverseerSolrResponse(new NamedList<>())); + mockQueryRequest = mock(SolrQueryRequest.class); + when(mockQueryRequest.getSpan()).thenReturn(NoopSpan.INSTANCE); + queryResponse = new SolrQueryResponse(); + messageCapturer = ArgumentCaptor.forClass(ZkNodeProps.class); + + deleteReplicaPropApi = + new DeleteReplicaPropertyAPI(mockCoreContainer, mockQueryRequest, queryResponse); + } + + @Test + public void testReportsErrorWhenCalledInStandaloneMode() { + when(mockCoreContainer.isZooKeeperAware()).thenReturn(false); + + final SolrException e = + expectThrows( + SolrException.class, + () -> { + deleteReplicaPropApi.deleteReplicaProperty( + "someColl", "someShard", "someReplica", "somePropName"); + }); + assertEquals(400, e.code()); + assertTrue( + "Exception message differed from expected: " + e.getMessage(), + e.getMessage().contains("not running in SolrCloud mode")); + } + + @Test + public void testCreatesValidOverseerMessage() throws Exception { Review Comment: > Yep, that's exactly what this PR does! Can you substantiate that please? I'm talking about a unit test that only tests the V1 to V2 mapping without implementation details of how V2 does its job. I could imagine mocking (yes me, endorsing mocking) to capture what parameters are passed to DeleteReplicaPropertyAPI.deleteReplicaProperty() to ensure they align with a V1 call. Mention of the Overseer would be an unwanted implementation detail. ########## solr/core/src/test/org/apache/solr/handler/admin/api/DeleteReplicaPropertyAPITest.java: ########## @@ -0,0 +1,116 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.solr.handler.admin.api; + +import static org.apache.solr.cloud.api.collections.CollectionHandlingUtils.SHARD_UNIQUE; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import io.opentracing.noop.NoopSpan; +import java.util.Map; +import java.util.Optional; +import org.apache.solr.SolrTestCaseJ4; +import org.apache.solr.cloud.OverseerSolrResponse; +import org.apache.solr.cloud.api.collections.DistributedCollectionConfigSetCommandRunner; +import org.apache.solr.common.SolrException; +import org.apache.solr.common.cloud.ZkNodeProps; +import org.apache.solr.common.util.NamedList; +import org.apache.solr.core.CoreContainer; +import org.apache.solr.request.SolrQueryRequest; +import org.apache.solr.response.SolrQueryResponse; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockito.ArgumentCaptor; + +/** Unit tests for {@link DeleteReplicaPropertyAPI} */ +public class DeleteReplicaPropertyAPITest extends SolrTestCaseJ4 { + + private CoreContainer mockCoreContainer; + private DistributedCollectionConfigSetCommandRunner mockCommandRunner; + private SolrQueryRequest mockQueryRequest; + private SolrQueryResponse queryResponse; + private ArgumentCaptor<ZkNodeProps> messageCapturer; + + private DeleteReplicaPropertyAPI deleteReplicaPropApi; + + @BeforeClass + public static void ensureWorkingMockito() { + assumeWorkingMockito(); + } + + @Before + public void setUp() throws Exception { + super.setUp(); + + mockCoreContainer = mock(CoreContainer.class); + mockCommandRunner = mock(DistributedCollectionConfigSetCommandRunner.class); + when(mockCoreContainer.getDistributedCollectionCommandRunner()) + .thenReturn(Optional.of(mockCommandRunner)); + when(mockCommandRunner.runCollectionCommand(any(), any(), anyLong())) + .thenReturn(new OverseerSolrResponse(new NamedList<>())); + mockQueryRequest = mock(SolrQueryRequest.class); + when(mockQueryRequest.getSpan()).thenReturn(NoopSpan.INSTANCE); Review Comment: > Mocking can be awkward for sure. You're not wrong. But IMO most of the time when mocking is ugly or when it has to reference obscure unrelated things - it's holding up a mirror to the design of the code-under-test. I agree. > e.g. We only have to muck about with NoopSpan here because the API logic itself in CollectionsHandler mucks about with spans (albeit indirectly, through o.a.s.util.tracing.TracingUtils). I'm sure there's good reason for it to be where it is, but If tracing stuff was off in a Jetty servlet filter (or where ever) this test probably would have no mention of it. I did much of Solr's tracing and can substantiate just about every detail. Tracing at the servlet filter level would be generic; wouldn't have deep knowledge of Solr. Consequently, its value/utility would be less. If that's all we wanted out of tracing, we wouldn't even need special Solr code for it -- we could recommend users take off-the-shelf telemetry agents that can do this. Solr has deep / integrated tracing. Back to testing.... it's a shame that methods mocked return null even when the real implementation certainly wouldn't return null! Maybe we could have a TestingCoreContainer? ########## solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java: ########## @@ -1298,19 +1298,25 @@ public Map<String, Object> execute( V2ApiUtils.squashIntoSolrResponseWithoutHeader(rsp, addReplicaPropResponse); return null; }), - // XXX should this command support followAliases? DELETEREPLICAPROP_OP( DELETEREPLICAPROP, (req, rsp, h) -> { - Map<String, Object> map = - copy( - req.getParams().required(), - null, - COLLECTION_PROP, - PROPERTY_PROP, - SHARD_ID_PROP, - REPLICA_PROP); - return copy(req.getParams(), map, PROPERTY_PROP); + final RequiredSolrParams requiredParams = req.getParams().required(); + final String propNameToDelete = requiredParams.get(PROPERTY_PROP); + final String trimmedPropNameToDelete = + propNameToDelete.startsWith(PROPERTY_PREFIX) + ? propNameToDelete.substring(PROPERTY_PREFIX.length()) + : propNameToDelete; + final DeleteReplicaPropertyAPI deleteReplicaPropertyAPI = Review Comment: Don't mean to nit-pick, but I've been thinking of Java's new-ish `var` keyword and this line here is the poster-child for when `var` is appropriate. The variable name `deleteReplicaPropertyAPI` is completely unambiguous. The value is merely calling the constructor. Thus saying `DeleteReplicaPropertyAPI` for the type is verbose for no benefit. Java doesn't *have* to be verbose as much nowadays, even though it deservedly has had this reputation. If I can't convince us to use `var` here, then we might as well forbid `var` :-) CC @epugh you've been thinking we need some bigger discussion on the dev list before we can use this Java language feature? I can do so if you wish; I will certainly point to this very line in this PR if some discussion is necessary to get you to use it ;-) ditto for `RequiredSolrParams` above. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
