Skip to content

Commit

Permalink
Use spotify formatter instead of coveo to fix broken build due to ver…
Browse files Browse the repository at this point in the history
…sion upgrade
  • Loading branch information
jbaiter committed Nov 15, 2024
1 parent 239579a commit 6edaac0
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<version.slf4j>2.0.16</version.slf4j>
<version.solr>9.7.0</version.solr>
<version.lucene>9.11.1</version.lucene>
<version.fmt-maven-plugin>2.13</version.fmt-maven-plugin>
<version.fmt-maven-plugin>2.25</version.fmt-maven-plugin>
<version.maven-gpg-plugin>3.2.7</version.maven-gpg-plugin>
<version.maven-javadoc-plugin>3.11.1</version.maven-javadoc-plugin>
<version.maven-shade-plugin>3.6.0</version.maven-shade-plugin>
Expand Down Expand Up @@ -168,7 +168,7 @@
<build>
<plugins>
<plugin>
<groupId>com.coveo</groupId>
<groupId>com.spotify.fmt</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<version>${version.fmt-maven-plugin}</version>
<executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
import javax.xml.stream.XMLStreamException;

public class MiniOcrFormat implements OcrFormat {
private static final Pattern pageIdPat =
Pattern.compile("(?:xml)?:id=[\"'](?<pageId>.+?)[\"']");
private static final Pattern pageIdPat = Pattern.compile("(?:xml)?:id=[\"'](?<pageId>.+?)[\"']");
private static final Pattern pageDimPat =
Pattern.compile("wh=[\"'](?<width>\\d+) (?<height>\\d+)[\"']");
private static final Map<OcrBlock, String> blockTagMapping =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public class SanitizingXmlFilter extends BaseCharFilter implements SourceAwareRe
* stored in the instance state.
*/
private char[] closingTagsTrailer = null;

/** Tracks how much of the trailer has already been written during previous `read` calls. */
private int closingTagsTrailerIdx = -1;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public abstract class BaseSourceReader implements SourceReader {
* BaseSourceReader#maxCacheEntries} slots will ever be non-null
*/
CachedSection[] cache;

/**
* Array of length {@link BaseSourceReader#maxCacheEntries} with the indexes of the sections that
* are currently cached
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ private int lockedRead0() throws IOException {
case 2:
leftoverChar = cb[1];
haveLeftoverChar = true;
// FALL THROUGH
// FALL THROUGH
case 1:
return cb[0];
default:
Expand Down

0 comments on commit 6edaac0

Please sign in to comment.