Archive

.github/workflows/docker-image.yml

@@ -2,9 +2,9 @@ name: Build & Test
 
 on:
   push:
-    branches: [ master ]
+    branches: [ archive ]
   pull_request:
-    branches: [ master ]
+    branches: [ archive ]
 
 jobs:
 

.github/workflows/docker-publish.yml

@@ -2,10 +2,10 @@ name: Publish Docker
 
 on:
   push:
-    branches: [ master ]
-    tags: [ 'v*.*.*' ]
+    branches: [ archive ]
+    tags: [ 'archive-v*.*.*' ]
   pull_request:
-    branches: [ master ]
+    branches: [ archive ]
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -57,12 +57,12 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: |
+            latest=false
           tags: |
             type=ref,event=branch
             type=ref,event=pr
-            type=semver,pattern=v{{version}}
-            type=semver,pattern=v{{major}}.{{minor}}
-            type=semver,pattern=v{{major}}
+            type=ref,event=tag
 
       # Build and push Docker image with Buildx
       # https://github.com/docker/build-push-action

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 
 on:
   push:
-    tags: [ 'v*.*.*' ]
+    tags: [ 'archive-v*.*.*' ]
 
 env:
   # Use docker.io for Docker Hub if empty

src/main/java/jasper/component/Ingest.java

@@ -58,7 +58,7 @@ public void ingest(Ref ref, boolean force) {
 
 	@Timed(value = "jasper.ref", histogram = true)
 	public void update(Ref ref, boolean force) {
-		var maybeExisting = refRepository.findOneByUrlAndOrigin(ref.getUrl(), ref.getOrigin());
+		var maybeExisting = refRepository.findFirstByUrlAndOriginOrderByModifiedDesc(ref.getUrl(), ref.getOrigin());
 		if (maybeExisting.isEmpty()) throw new NotFoundException("Ref");
 		ref.addHierarchicalTags();
 		validate.ref(ref, force);
@@ -68,7 +68,7 @@ public void update(Ref ref, boolean force) {
 
 	@Timed(value = "jasper.ref", histogram = true)
 	public void push(Ref ref) {
-		var maybeExisting = refRepository.findOneByUrlAndOrigin(ref.getUrl(), ref.getOrigin());
+		var maybeExisting = refRepository.findFirstByUrlAndOriginOrderByModifiedDesc(ref.getUrl(), ref.getOrigin());
 		ref.addHierarchicalTags();
 		validate.ref(ref, true);
 		meta.update(ref, maybeExisting.orElse(null), null);
@@ -93,7 +93,7 @@ private void ensureUniqueModified(Ref ref) {
 
 	@Timed(value = "jasper.ref", histogram = true)
 	public void delete(String url, String origin) {
-		var maybeExisting = refRepository.findOneByUrlAndOrigin(url, origin);
+		var maybeExisting = refRepository.findFirstByUrlAndOriginOrderByModifiedDesc(url, origin);
 		if (maybeExisting.isEmpty()) return;
 		meta.update(null, maybeExisting.get(), null);
 		refRepository.deleteByUrlAndOrigin(url, origin);

src/main/java/jasper/component/Replicator.java

@@ -102,7 +102,7 @@ public void pull(Ref remote) {
 				for (var ref : client.refPull(url, options)) {
 					pull.migrate(ref, config);
 					if (pull.isGenerateMetadata()) {
-						var maybeExisting = refRepository.findOneByUrlAndOrigin(ref.getUrl(), ref.getOrigin());
+						var maybeExisting = refRepository.findFirstByUrlAndOriginOrderByModifiedDesc(ref.getUrl(), ref.getOrigin());
 						meta.update(ref, maybeExisting.orElse(null), metadataPlugins);
 					}
 					try {

src/main/java/jasper/domain/Ext.java

@@ -58,6 +58,8 @@ public class Ext implements Tag {
 	@Column(columnDefinition = "jsonb")
 	private JsonNode config;
 
+	@Id
+	@Column(updatable = false)
 	@LastModifiedDate
 	private Instant modified = Instant.now();
 

src/main/java/jasper/domain/Plugin.java

@@ -75,6 +75,8 @@ public class Plugin implements Tag {
 
 	private boolean userUrl = false;
 
+	@Id
+	@Column(updatable = false)
 	@LastModifiedDate
 	private Instant modified = Instant.now();
 

src/main/java/jasper/domain/Ref.java

@@ -120,6 +120,8 @@ public class Ref implements HasTags {
 	@Column(updatable = false)
 	private Instant created = Instant.now();
 
+	@Id
+	@Column(updatable = false)
 	@LastModifiedDate
 	private Instant modified = Instant.now();
 

src/main/java/jasper/domain/RefId.java

@@ -6,6 +6,7 @@
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.time.Instant;
 import java.util.Objects;
 
 @Getter
@@ -15,17 +16,18 @@
 public class RefId implements Serializable {
 	private String url;
 	private String origin;
+	private Instant modified;
 
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) return true;
 		if (o == null || getClass() != o.getClass()) return false;
 		RefId refId = (RefId) o;
-		return url.equals(refId.url) && origin.equals(refId.origin);
+		return url.equals(refId.url) && origin.equals(refId.origin) && modified.equals(refId.modified);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(url, origin);
+		return Objects.hash(url, origin, modified);
 	}
 }

src/main/java/jasper/domain/TagId.java

@@ -6,6 +6,7 @@
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.time.Instant;
 import java.util.Objects;
 
 @Getter
@@ -16,17 +17,18 @@ public class TagId implements Serializable {
 
 	private String tag;
 	private String origin;
+	private Instant modified;
 
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) return true;
 		if (o == null || getClass() != o.getClass()) return false;
 		TagId tagId = (TagId) o;
-		return tag.equals(tagId.tag) && origin.equals(tagId.origin);
+		return tag.equals(tagId.tag) && origin.equals(tagId.origin) && modified.equals(tagId.modified);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(tag, origin);
+		return Objects.hash(tag, origin, modified);
 	}
 }

src/main/java/jasper/domain/Template.java

@@ -69,6 +69,8 @@ public class Template implements Tag {
 	@SchemaValid
 	private ObjectNode schema;
 
+	@Id
+	@Column(updatable = false)
 	@LastModifiedDate
 	private Instant modified = Instant.now();
 

src/main/java/jasper/domain/User.java

@@ -96,6 +96,8 @@ public class User implements Tag {
 	@Column(columnDefinition = "jsonb")
 	private List<@Length(max = TAG_LEN) @Pattern(regexp = Tag.REGEX) String> tagWriteAccess;
 
+	@Id
+	@Column(updatable = false)
 	@LastModifiedDate
 	private Instant modified = Instant.now();
 

src/main/java/jasper/repository/QualifiedTagMixin.java

@@ -6,7 +6,7 @@
 import java.util.Optional;
 
 public interface QualifiedTagMixin<T extends Tag> extends JpaSpecificationExecutor<T> {
-	Optional<T> findOneByQualifiedTag(String tag);
+	Optional<T> findFirstByQualifiedTagOrderByModifiedDesc(String tag);
 	void deleteByQualifiedTag(String tag);
 	boolean existsByQualifiedTag(String tag);
 }

src/main/java/jasper/repository/RefRepository.java

@@ -15,7 +15,7 @@
 @Repository
 public interface RefRepository extends JpaRepository<Ref, RefId>, JpaSpecificationExecutor<Ref>, StreamMixin<RefView>, ModifiedCursor, OriginMixin {
 
-	Optional<Ref> findOneByUrlAndOrigin(String url, String origin);
+	Optional<Ref> findFirstByUrlAndOriginOrderByModifiedDesc(String url, String origin);
 	void deleteByUrlAndOrigin(String url, String origin);
 	boolean existsByUrlAndOrigin(String url, String origin);
 

src/main/java/jasper/security/Auth.java

@@ -193,7 +193,7 @@ public boolean canReadRef(HasTags ref) {
 	}
 
 	protected boolean canReadRef(String url, String origin) {
-		var maybeExisting = refRepository.findOneByUrlAndOrigin(url, origin);
+		var maybeExisting = refRepository.findFirstByUrlAndOriginOrderByModifiedDesc(url, origin);
 		return maybeExisting.filter(this::canReadRef).isPresent();
 	}
 
@@ -209,7 +209,7 @@ public boolean canWriteRef(Ref ref) {
 		// If we can write to the existing we are granted permission
 		// We do not need to check if we have write access to the updated Ref,
 		// as self revocation is allowed
-		var maybeExisting = refRepository.findOneByUrlAndOrigin(ref.getUrl(), ref.getOrigin());
+		var maybeExisting = refRepository.findFirstByUrlAndOriginOrderByModifiedDesc(ref.getUrl(), ref.getOrigin());
 		// We do need to check if we are allowed to add any of the new tags
 		// by calling canAddTag on each one
 		return newTags(ref.getTags(), maybeExisting.map(Ref::getTags)).allMatch(this::canAddTag);
@@ -223,7 +223,7 @@ public boolean canWriteRef(String url, String origin) {
 		if (!local(origin)) return false;
 		// Minimum role for writing Refs is USER
 		if (!hasRole(USER)) return false;
-		var maybeExisting = refRepository.findOneByUrlAndOrigin(url, origin);
+		var maybeExisting = refRepository.findFirstByUrlAndOriginOrderByModifiedDesc(url, origin);
 		// If we're creating, simply having the role USER is enough
 		if (maybeExisting.isEmpty()) return true;
 		var existing = maybeExisting.get();
@@ -423,7 +423,7 @@ public boolean canWriteUser(String tag) {
 		if (!local(selector(tag).origin)) return false;
 		if (hasRole(MOD)) return true;
 		if (!canWriteTag(tag)) return false;
-		var role = userRepository.findOneByQualifiedTag(tag).map(User::getRole).orElse(null);
+		var role = userRepository.findFirstByQualifiedTagOrderByModifiedDesc(tag).map(User::getRole).orElse(null);
 		return isBlank(role) || hasRole(role);
 	}
 
@@ -436,7 +436,7 @@ public boolean canWriteUser(User user) {
 		if (!canWriteUser(user.getQualifiedTag())) return false;
 		if (isNotBlank(user.getRole()) && !hasRole(user.getRole())) return false;
 		if (hasRole(MOD)) return true;
-		var maybeExisting = userRepository.findOneByQualifiedTag(user.getQualifiedTag());
+		var maybeExisting = userRepository.findFirstByQualifiedTagOrderByModifiedDesc(user.getQualifiedTag());
 		// No public tags in write access
 		if (user.getWriteAccess() != null && user.getWriteAccess().stream().anyMatch(Auth::isPublicTag)) return false;
 		// The writing user must already have write access to give read or write access to another user
@@ -569,7 +569,7 @@ protected Optional<User> getUser() {
 			var auth = getAuthentication();
 			user = Optional.ofNullable((User) auth.getDetails());
 			if (isLoggedIn() && user.isEmpty()) {
-				user = userRepository.findOneByQualifiedTag(getUserTag().toString());
+				user = userRepository.findFirstByQualifiedTagOrderByModifiedDesc(getUserTag().toString());
 			}
 		}
 		return user;

src/main/java/jasper/service/ExtService.java

@@ -79,7 +79,7 @@ public void push(Ext ext) {
 	@PreAuthorize("@auth.canReadTag(#qualifiedTag)")
 	@Timed(value = "jasper.service", extraTags = {"service", "ext"}, histogram = true)
 	public Ext get(String qualifiedTag) {
-		return extRepository.findOneByQualifiedTag(qualifiedTag)
+		return extRepository.findFirstByQualifiedTagOrderByModifiedDesc(qualifiedTag)
 							.orElseThrow(() -> new NotFoundException("Ext " + qualifiedTag));
 	}
 
@@ -104,7 +104,7 @@ public Page<Ext> page(TagFilter filter, Pageable pageable) {
 	@PreAuthorize("@auth.canWriteTag(#ext.qualifiedTag)")
 	@Timed(value = "jasper.service", extraTags = {"service", "ext"}, histogram = true)
 	public void update(Ext ext) {
-		var maybeExisting = extRepository.findOneByQualifiedTag(ext.getQualifiedTag());
+		var maybeExisting = extRepository.findFirstByQualifiedTagOrderByModifiedDesc(ext.getQualifiedTag());
 		if (maybeExisting.isEmpty()) throw new NotFoundException("Ext " + ext.getQualifiedTag());
 		var existing = maybeExisting.get();
 		if (!ext.getModified().truncatedTo(ChronoUnit.SECONDS).equals(existing.getModified().truncatedTo(ChronoUnit.SECONDS))) throw new ModifiedException("Ext " + ext.getQualifiedTag());
@@ -121,7 +121,7 @@ public void update(Ext ext) {
 	@Timed(value = "jasper.service", extraTags = {"service", "ext"}, histogram = true)
 	public void patch(String qualifiedTag, JsonPatch patch) {
 		var created = false;
-		var ext = extRepository.findOneByQualifiedTag(qualifiedTag).orElse(null);
+		var ext = extRepository.findFirstByQualifiedTagOrderByModifiedDesc(qualifiedTag).orElse(null);
 		if (ext == null) {
 			created = true;
 			ext = new Ext();

src/main/java/jasper/service/GraphService.java

@@ -41,7 +41,7 @@ public class GraphService {
 	@PostAuthorize("@auth.canReadRef(returnObject)")
 	@Timed(value = "jasper.service", extraTags = {"service", "graph"}, histogram = true)
 	public RefNodeDto get(String url, String origin) {
-		var result = refRepository.findOneByUrlAndOrigin(url, origin)
+		var result = refRepository.findFirstByUrlAndOriginOrderByModifiedDesc(url, origin)
 				.or(() -> refRepository.findOne(isUrl(url).and(isOrigin(origin))))
 				.orElseThrow(() -> new NotFoundException("Ref " + origin + " " + url));
 		return mapper.domainToNodeDto(result);

src/main/java/jasper/service/OriginService.java

@@ -45,15 +45,15 @@ public class OriginService {
 	@PreAuthorize("hasRole('MOD') and @auth.local(#origin)")
 	@Timed(value = "jasper.service", extraTags = {"service", "origin"}, histogram = true)
 	public void push(String url, String origin) throws FeedException, IOException {
-		var source = refRepository.findOneByUrlAndOrigin(url, origin)
+		var source = refRepository.findFirstByUrlAndOriginOrderByModifiedDesc(url, origin)
 			.orElseThrow(() -> new NotFoundException("Ref " + origin + " " + url));
 		replicator.push(source);
 	}
 
 	@PreAuthorize("@auth.sysMod() and @auth.local(#origin)")
 	@Timed(value = "jasper.service", extraTags = {"service", "origin"}, histogram = true)
 	public void pull(String url, String origin) throws FeedException, IOException {
-		var source = refRepository.findOneByUrlAndOrigin(url, origin)
+		var source = refRepository.findFirstByUrlAndOriginOrderByModifiedDesc(url, origin)
 			.orElseThrow(() -> new NotFoundException("Ref " + origin + " " + url));
 		replicator.pull(source);
 	}

src/main/java/jasper/service/PluginService.java

@@ -56,7 +56,7 @@ public void push(Plugin plugin) {
 	@PreAuthorize("@auth.canReadTag(#qualifiedTag)")
 	@Timed(value = "jasper.service", extraTags = {"service", "plugin"}, histogram = true)
 	public Plugin get(String qualifiedTag) {
-		return pluginRepository.findOneByQualifiedTag(qualifiedTag)
+		return pluginRepository.findFirstByQualifiedTagOrderByModifiedDesc(qualifiedTag)
 							   .orElseThrow(() -> new NotFoundException("Plugin " + qualifiedTag));
 	}
 
@@ -88,7 +88,7 @@ public Page<Plugin> page(TagFilter filter, Pageable pageable) {
 	@PreAuthorize("@auth.local(#plugin.getOrigin()) and hasRole('ADMIN')")
 	@Timed(value = "jasper.service", extraTags = {"service", "plugin"}, histogram = true)
 	public void update(Plugin plugin) {
-		var maybeExisting = pluginRepository.findOneByQualifiedTag(plugin.getQualifiedTag());
+		var maybeExisting = pluginRepository.findFirstByQualifiedTagOrderByModifiedDesc(plugin.getQualifiedTag());
 		if (maybeExisting.isEmpty()) throw new NotFoundException("Plugin " + plugin.getQualifiedTag());
 		var existing = maybeExisting.get();
 		if (!plugin.getModified().truncatedTo(ChronoUnit.SECONDS).equals(existing.getModified().truncatedTo(ChronoUnit.SECONDS))) throw new ModifiedException("Plugin " + plugin.getQualifiedTag());

src/main/java/jasper/service/RefService.java

@@ -85,7 +85,7 @@ public void push(Ref ref) {
 	@PostAuthorize("@auth.canReadRef(returnObject)")
 	@Timed(value = "jasper.service", extraTags = {"service", "ref"}, histogram = true)
 	public RefDto get(String url, String origin) {
-		var result = refRepository.findOneByUrlAndOrigin(url, origin)
+		var result = refRepository.findFirstByUrlAndOriginOrderByModifiedDesc(url, origin)
 			.or(() -> refRepository.findOne(isUrl(url).and(isOrigin(origin))))
 			.orElseThrow(() -> new NotFoundException("Ref " + origin + " " + url));
 		return mapper.domainToDto(result);
@@ -127,7 +127,7 @@ public void update(Ref ref, boolean force) {
 			if (!force) throw new MaxSourcesException(props.getMaxSources(), ref.getSources().size());
 			ref.getSources().subList(props.getMaxSources(), ref.getSources().size()).clear();
 		}
-		var maybeExisting = refRepository.findOneByUrlAndOrigin(ref.getUrl(), ref.getOrigin());
+		var maybeExisting = refRepository.findFirstByUrlAndOriginOrderByModifiedDesc(ref.getUrl(), ref.getOrigin());
 		if (maybeExisting.isEmpty()) throw new NotFoundException("Ref " + ref.getOrigin() + " " + ref.getUrl());
 		var existing = maybeExisting.get();
 		if (!ref.getModified().truncatedTo(ChronoUnit.SECONDS).equals(existing.getModified().truncatedTo(ChronoUnit.SECONDS))) throw new ModifiedException("Ref");
@@ -141,7 +141,7 @@ public void update(Ref ref, boolean force) {
 	@Timed(value = "jasper.service", extraTags = {"service", "ref"}, histogram = true)
 	public void patch(String url, String origin, JsonPatch patch) {
 		var created = false;
-		var ref = refRepository.findOneByUrlAndOrigin(url, origin).orElse(null);
+		var ref = refRepository.findFirstByUrlAndOriginOrderByModifiedDesc(url, origin).orElse(null);
 		if (ref == null) {
 			created = true;
 			ref = new Ref();

src/main/java/jasper/service/ScrapeService.java

@@ -40,7 +40,7 @@ public class ScrapeService {
 	@PreAuthorize("hasRole('MOD') and @auth.local(#origin)")
 	@Timed(value = "jasper.service", extraTags = {"service", "scrape"}, histogram = true)
 	public void feed(String url, String origin) throws FeedException, IOException {
-		var source = refRepository.findOneByUrlAndOrigin(url, origin)
+		var source = refRepository.findFirstByUrlAndOriginOrderByModifiedDesc(url, origin)
 			.orElseThrow(() -> new NotFoundException("Ref " + origin + " " + url));
 		rssParser.scrape(source);
 	}