Skip to content

Commit

Permalink
XWIKI-20477: Upgrade to Solr 9.4.1 and Lucene 9.8.0
Browse files Browse the repository at this point in the history
XWIKI-12955: Upgrade to JAX-RS 2.1.6 (JSR370)
XWIKI-12674: Replace Restlet with Jersey
* change the target to 16.2.0RC1 as it's a bit late for 16.1.0RC1
  • Loading branch information
tmortagne committed Feb 15, 2024
1 parent ae68fec commit 820fc47
Show file tree
Hide file tree
Showing 17 changed files with 24 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

/**
* @version $Id$
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
public abstract class AbstractAnnotationsRESTResource extends AbstractAnnotationRESTResource
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
* Reload Jersey when a XWikiResource component is uninstalled/installed.
*
* @version $Id$
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
@Component
@Named(JerseyReloadListener.HINT)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
* registered/unregistered).
*
* @version $Id$
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
@Component(roles = JerseyServletContainer.class)
@Singleton
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* taking into account JAX-RS annotations).
*
* @version $Id$
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
@Provider
@Produces(MediaType.APPLICATION_JSON)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
* Wrap the regular Jersey {@link InjectionManager} to get some of the components as XWiki components.
*
* @version $Id$
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
@Component(roles = XWikiInjectionManager.class)
@InstantiationStrategy(ComponentInstantiationStrategy.PER_LOOKUP)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
* </ul>
*
* @version $Id$
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
public class XWikiRESTServlet extends HttpServlet
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* Provider various tools to help implement {@link MessageBodyWriter} and {@link MessageBodyReader}.
*
* @version $Id$
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
@Role
@Unstable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
* Default implementation of {@link JAXRSUtils}.
*
* @version $Id$
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
@Component
@Singleton
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
* </ul>
*
* @version $Id$
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
@Component
@Named("org.xwiki.rest.internal.PreMatchingRequestFilter")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
* </ul>
*
* @version $Id$
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
@Component
@Named("org.xwiki.rest.internal.ResponseFilter")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ private void migrateFields(XWikiSolrCore sourceCore, XWikiSolrCore targetCore, b

/**
* @return the number of document to retrieve at the same time when migrating the data
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
@Unstable
protected int getMigrationBatchRows()
Expand Down Expand Up @@ -1106,7 +1106,7 @@ protected void commit() throws SolrException
/**
* @param core the client to commit
* @throws SolrException when failing to commit
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
protected void commit(XWikiSolrCore core) throws SolrException
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public interface Solr
* solr core specific to the setup)
* @return the cached {@link SolrCore} instance to use to manipulate the core
* @throws SolrException when failing to create the solr client
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
@Unstable
default XWikiSolrCore getCore(String name) throws SolrException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public interface SolrCoreInitializer
*
* @param core to manipulate the core
* @throws SolrException when failing to initialize the core
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
default void initialize(XWikiSolrCore core) throws SolrException
{
Expand All @@ -76,7 +76,7 @@ default boolean isCache()
* @param sourceCore the core to copy from
* @param targetCore the core to copy to
* @throws SolrException when failing to migrate the core
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
@Unstable
default void migrate(XWikiSolrCore sourceCore, XWikiSolrCore targetCore) throws SolrException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* The main entry point to manipulate a Solr core in XWiki.
*
* @version $Id$
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
@Unstable
public interface XWikiSolrCore
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ protected String toXWikiCoreName(String solrCoreName)
protected abstract SolrClient getInternalSolrClient(String solrCoreName) throws SolrException;

/**
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
protected abstract SolrClient createSolrClient(String solrCoreName, boolean isCache) throws SolrException;
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* Default implementation of {@link XWikiSolrCore}.
*
* @version $Id$
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
public class DefaultXWikiSolrCore implements XWikiSolrCore
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private SolrCoreSchema getSchema(XWikiSolrCore core)
* @param force if {@code true} reloads all information, else gets the information from the cache
* @return the map of all fields
* @throws SolrException in case of problem to request fields information
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
public Map<String, FieldTypeRepresentation> getFieldTypes(XWikiSolrCore core, boolean force) throws SolrException
{
Expand Down Expand Up @@ -115,7 +115,7 @@ public Map<String, FieldTypeRepresentation> getFieldTypes(XWikiSolrCore core, bo
* @param force if {@code true} reloads all information, else gets the information from the cache
* @return the map of all fields
* @throws SolrException in case of problem to request fields information
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
public Map<String, Map<String, Object>> getFields(XWikiSolrCore core, boolean force) throws SolrException
{
Expand Down Expand Up @@ -171,7 +171,7 @@ public Map<String, Map<String, Object>> getDynamicFields(XWikiSolrCore core, boo
* @param definition the definition of the field to add
* @param add true if the field type should be added, false for replace
* @throws SolrException when failing to add the field
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
public void setFieldType(XWikiSolrCore core, FieldTypeDefinition definition, boolean add) throws SolrException
{
Expand Down Expand Up @@ -225,7 +225,7 @@ public void setField(XWikiSolrCore core, Map<String, Object> fieldAttributes, bo
* @param dynamic true to create a dynamic field
* @param add true if the field type should be added, false for replace
* @throws SolrException when failing to add the field
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
public void setField(XWikiSolrCore core, Map<String, Object> fieldAttributes, boolean dynamic, boolean add)
throws SolrException
Expand Down Expand Up @@ -308,7 +308,7 @@ public void setField(XWikiSolrCore core, String name, String type, boolean dynam
* @param name the name of the field to delete
* @param dynamic true to delete a dynamic field
* @throws SolrException when failing to delete the field
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
public void deleteField(XWikiSolrCore core, String name, boolean dynamic) throws SolrException
{
Expand All @@ -333,7 +333,7 @@ public void deleteField(XWikiSolrCore core, String name, boolean dynamic) throws
* @param source the source field name
* @param dest the collection of the destination field names
* @throws SolrException when failing to add the field
* @since 16.1.0RC1
* @since 16.2.0RC1
*/
public void addCopyField(XWikiSolrCore core, String source, String... dest) throws SolrException
{
Expand Down

0 comments on commit 820fc47

Please sign in to comment.