Rename 'Glob' -> 'Pattern' in FileNamingScheme

eduard-vasinskyi · eduard-vasinskyi · commit be7ffb351b39 · 2024-12-10T17:57:18.000+02:00
diff --git a/util-state/src/main/java/io/activej/state/file/FileNamingScheme.java b/util-state/src/main/java/io/activej/state/file/FileNamingScheme.java
@@ -14,13 +14,13 @@ default R firstRevision() {
 		return nextRevision(null);
 	}
 
-	Pattern snapshotGlob();
+	Pattern snapshotPattern();
 
 	String encodeSnapshot(R revision);
 
 	@Nullable R decodeSnapshot(String filename) throws IOException;
 
-	Pattern diffGlob();
+	Pattern diffPattern();
 
 	String encodeDiff(R from, R to);
 
diff --git a/util-state/src/main/java/io/activej/state/file/FileNamingSchemes.java b/util-state/src/main/java/io/activej/state/file/FileNamingSchemes.java
@@ -119,7 +119,7 @@ public R nextRevision(@Nullable R previousRevision) {
 		}
 
 		@Override
-		public Pattern snapshotGlob() {
+		public Pattern snapshotPattern() {
 			return Pattern.compile(Pattern.quote(prefix) + "[0-9]+" + Pattern.quote(suffix));
 		}
 
@@ -137,7 +137,7 @@ public String encodeSnapshot(R revision) {
 		}
 
 		@Override
-		public Pattern diffGlob() {
+		public Pattern diffPattern() {
 			if (!hasDiffsSupport()) throw new UnsupportedOperationException();
 			return Pattern.compile(Pattern.quote(diffPrefix) + "[0-9]+" + Pattern.quote(diffSeparator) + "[0-9]+" + Pattern.quote(diffSuffix));
 		}
diff --git a/util-state/src/main/java/io/activej/state/file/FileStateManager.java b/util-state/src/main/java/io/activej/state/file/FileStateManager.java
@@ -155,7 +155,7 @@ public R newRevision() throws IOException {
 
 	@Override
 	public @Nullable R getLastSnapshotRevision() throws IOException {
-		Pattern pattern = fileNamingScheme.snapshotGlob();
+		Pattern pattern = fileNamingScheme.snapshotPattern();
 		Map<String, FileMetadata> list = fileSystem.list("*");
 		R best = null;
 		for (String s : list.keySet()) {
@@ -172,7 +172,7 @@ public R newRevision() throws IOException {
 	@Override
 	public @Nullable R getLastDiffRevision(R currentRevision) throws IOException {
 		if (!hasDiffsSupport()) throw new UnsupportedOperationException();
-		Pattern pattern = fileNamingScheme.diffGlob();
+		Pattern pattern = fileNamingScheme.diffPattern();
 		Map<String, FileMetadata> list = fileSystem.list("*");
 		R best = null;
 		for (String s : list.keySet()) {
@@ -254,7 +254,7 @@ public void save(T state, R revision) throws IOException {
 
 	private void doSave(T state, R revision) throws IOException {
 		if (hasDiffsSupport() && maxSaveDiffs != 0) {
-			Pattern pattern = fileNamingScheme.snapshotGlob();
+			Pattern pattern = fileNamingScheme.snapshotPattern();
 			Map<String, FileMetadata> filenames = fileSystem.list("*");
 			PriorityQueue<R> top = new PriorityQueue<>(maxSaveDiffs);
 			for (var filename : filenames.keySet()) {
@@ -317,7 +317,7 @@ private void safeUpload(String filename, StreamOutputConsumer consumer) throws I
 
 	public void cleanup(int maxRevisions) throws IOException {
 		Map<String, FileMetadata> filenames = fileSystem.list("**");
-		Pattern snapshotPattern = fileNamingScheme.snapshotGlob();
+		Pattern snapshotPattern = fileNamingScheme.snapshotPattern();
 
 		PriorityQueue<R> top = new PriorityQueue<>(maxRevisions);
 		for (var filename : filenames.keySet()) {
@@ -330,7 +330,7 @@ public void cleanup(int maxRevisions) throws IOException {
 		if (top.isEmpty()) return;
 		R minRetainedRevision = top.poll();
 		if (hasDiffsSupport()) {
-			Pattern diffPattern = fileNamingScheme.diffGlob();
+			Pattern diffPattern = fileNamingScheme.diffPattern();
 			for (String filename : filenames.keySet()) {
 				if (!diffPattern.matcher(filename).matches()) continue;
 				FileNamingScheme.Diff<R> diff = fileNamingScheme.decodeDiff(filename);

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public R nextRevision(@Nullable R previousRevision) {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`@Override`
`122`		`- public Pattern snapshotGlob() {`
	`122`	`+ public Pattern snapshotPattern() {`
`123`	`123`	`return Pattern.compile(Pattern.quote(prefix) + "[0-9]+" + Pattern.quote(suffix));`
`124`	`124`	`}`
`125`	`125`
`@@ -137,7 +137,7 @@ public String encodeSnapshot(R revision) {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`@Override`
`140`		`- public Pattern diffGlob() {`
	`140`	`+ public Pattern diffPattern() {`
`141`	`141`	`if (!hasDiffsSupport()) throw new UnsupportedOperationException();`
`142`	`142`	`return Pattern.compile(Pattern.quote(diffPrefix) + "[0-9]+" + Pattern.quote(diffSeparator) + "[0-9]+" + Pattern.quote(diffSuffix));`
`143`	`143`	`}`