gerlowskija commented on a change in pull request #565: URL: https://github.com/apache/solr/pull/565#discussion_r791886377
########## File path: solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/SplitCorePayload.java ########## @@ -0,0 +1,47 @@ +/* + * 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.client.solrj.request.beans; + +import org.apache.solr.common.annotation.JsonProperty; +import org.apache.solr.common.util.ReflectMapWriter; + +import java.util.List; + +public class SplitCorePayload implements ReflectMapWriter { + // Should be converted as an array Review comment: Oops - no, this isn't a bug. This was just a "note to self" so I could remember some niggling detail while I was working on this one. I forgot to remove it is all. Will remove. ########## File path: solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/SwapCoresPayload.java ########## @@ -0,0 +1,29 @@ +/* + * 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.client.solrj.request.beans; + +import org.apache.solr.common.annotation.JsonProperty; +import org.apache.solr.common.util.ReflectMapWriter; + +public class SwapCoresPayload implements ReflectMapWriter { + @JsonProperty(required = true) Review comment: Yep, this enforcement is built in to the annotation-style APIs. > Should we be doing required = true is other places as part of this conversion? For sure - if there's a place where I skipped `required = true` that's actually required, absolutely lmk. I thought I set it everywhere I should have, but it's easy to miss. ########## File path: solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/SwapCoresPayload.java ########## @@ -0,0 +1,29 @@ +/* + * 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.client.solrj.request.beans; + +import org.apache.solr.common.annotation.JsonProperty; +import org.apache.solr.common.util.ReflectMapWriter; + +public class SwapCoresPayload implements ReflectMapWriter { + @JsonProperty(required = true) Review comment: Yep, this enforcement is built in to the annotation-style APIs. > Should we be doing required = true is other places as part of this conversion? For sure - if there's a place where I skipped `required = true` that's actually required, absolutely lmk. I thought I set it everywhere I should have, but it's easy to miss. ########## File path: solr/core/src/java/org/apache/solr/handler/admin/api/MergeIndexesAPI.java ########## @@ -0,0 +1,77 @@ +/* + * 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 org.apache.commons.collections4.CollectionUtils; +import org.apache.solr.api.Command; +import org.apache.solr.api.EndPoint; +import org.apache.solr.api.PayloadObj; +import org.apache.solr.client.solrj.request.beans.MergeIndexesPayload; +import org.apache.solr.common.params.CoreAdminParams; +import org.apache.solr.common.params.UpdateParams; +import org.apache.solr.handler.admin.CoreAdminHandler; + +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +import static org.apache.solr.client.solrj.SolrRequest.METHOD.POST; +import static org.apache.solr.handler.ClusterAPI.wrapParams; +import static org.apache.solr.security.PermissionNameProvider.Name.CORE_EDIT_PERM; + +/** + * V2 API for merging one or more Solr cores into the target core. + * + * The new API (POST /v2/cores/coreName {'merge-indexes': {...}}) is equivalent to the v1 + * /admin/cores?action=mergeindexes command. + * + * @see org.apache.solr.client.solrj.request.beans.MergeIndexesPayload + */ +@EndPoint( Review comment: Cool! (That's a good thing right? I _think_ they should have the same annotations, except that the path on CreateCore should be `/cores`?) ########## File path: solr/core/src/java/org/apache/solr/handler/ClusterAPI.java ########## @@ -48,18 +45,21 @@ import org.apache.solr.response.SolrQueryResponse; import org.apache.zookeeper.KeeperException; +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Set; + import static org.apache.solr.client.solrj.SolrRequest.METHOD.DELETE; -import static org.apache.solr.client.solrj.SolrRequest.METHOD.GET; -import static org.apache.solr.client.solrj.SolrRequest.METHOD.POST; -import static org.apache.solr.client.solrj.SolrRequest.METHOD.PUT; +import static org.apache.solr.client.solrj.SolrRequest.METHOD.*; Review comment: Agreed, sigh. I play with these IDE settings every now and then when it comes up in review, but I still see it revert from time to time. Not sure what the deal is - I'll try playing with it a bit more. -- 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
