owlplug-client/src/main/java/com/owlplug/explore/model/PackageBundle.java (2)

39-41: Deprecating only the field makes intent unclear—document or align accessors.

If "name" is truly legacy, consider deprecating getters/setters too (or add Javadoc explaining transitional use) so call sites surface warnings when you’re ready to migrate.

-  private String name;
+  @Deprecated
+  private String name;
+
+  /**
+   * Deprecated: UI should derive display names from RemotePackage + targets.
+   */
+  @Deprecated
+  public String getName() { return name; }
+
+  /**
+   * Deprecated: UI should derive display names from RemotePackage + targets.
+   */
+  @Deprecated
+  public void setName(String name) { this.name = name; }

---

44-46: Remove deprecated format field and its accessors from PackageBundle. No external calls to getFormat/setFormat on PackageBundle were found; delete the field (lines 44–46) and its getter/setter methods (lines 131–139).

owlplug-client/src/main/java/com/owlplug/explore/model/mappers/oas/OASModelAdapter.java (1)

112-127: Avoid recomputation; check file type null.

getPluginFormatsFromFileFormats is called twice; compute once. Also guard file.getType() before equals.

-    if (files != null) {
+    if (files != null) {
       for (OASFile file : files) {
-
-        // Skipping. If a file contains only unmappable plugins formats
-        if (getPluginFormatsFromFileFormats(file.getContains()).isEmpty()) {
+        // Skipping. If a file contains only unmappable plugins formats
+        List<String> mappedFormats = getPluginFormatsFromFileFormats(file.getContains());
+        if (mappedFormats.isEmpty()) {
           continue;
         }
 
         // Skipping. OwlPlug only supports archives (installer not supported)
-        if (!file.getType().equals("archive")) {
+        if (file.getType() == null || !"archive".equals(file.getType())) {
           continue;
         }
 
-        PackageBundle bundle = mapperToEntity(file, remotePackage.getName());
+        PackageBundle bundle = mapperToEntity(file, remotePackage.getName());
         bundle.setRemotePackage(remotePackage);
+        // Use the formats we already computed
+        bundle.setFormats(new java.util.ArrayList<>(mappedFormats));
         bundles.add(bundle);
       }
     }

owlplug-client/src/main/java/com/owlplug/explore/model/mappers/registry/BundleMapper.java (1)

25-26: Surface deprecation at call sites.

Also deprecate accessors so usages get flagged during migration to derived names.

   @Deprecated
   private String name;
+  /**
+   * Deprecated: bundle display name will be derived from RemotePackage + targets.
+   */
+  @Deprecated
+  public String getName() { return name; }
+  /**
+   * Deprecated: bundle display name will be derived from RemotePackage + targets.
+   */
+  @Deprecated
+  public void setName(String name) { this.name = name; }

owlplug-client/src/main/java/com/owlplug/explore/controllers/ExploreController.java (1)

240-248: Good: collapse multiple PLATFORM chips into a single PLATFORM_LIST.

This fixes the previous unintended AND. Consider guarding against overlapping async searches (rapid toggles) to avoid stale results replacing newer ones (track a request id/version).

owlplug-client/src/main/java/com/owlplug/explore/services/ExploreService.java (1)

124-127: Switch to fetchBundlesAndTargets: OK; remove dead variable and re-check default filtering.

• The change to .and(RemotePackageRepository.fetchBundlesAndTargets()) is sensible for eager loading.
• RuntimePlatform env (Line 122) is now unused—remove it.
• Since controller filters are now UI-driven, ensure all call sites that bypass performPackageSearch() won’t unintentionally return unfiltered results.

-    RuntimePlatform env = this.getApplicationDefaults().getRuntimePlatform();
+    // removed: unused RuntimePlatform env

owlplug-client/src/main/java/com/owlplug/explore/model/mappers/registry/RegistryModelAdapter.java (1)

93-97: Update Javadoc to reflect new parameter.

Add @param name to the method’s doc to keep Javadoc accurate.

-   * @param bundleMapper bundle json bundleMapper
+   * @param bundleMapper bundle json bundleMapper
+   * @param name remote package name used as bundle display name prefix

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

💡 Knowledge Base configuration:

• MCP integration is disabled by default for public repositories
• Jira integration is disabled by default for public repositories
• Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

owlplug-client/src/main/java/com/owlplug/explore/repositories/RemotePackageRepository.java (1)

125-139: Protect fetch-join spec from count queries; set distinct on select.

Applying fetch joins during count causes runtime errors on many providers. Guard by result type; set distinct(true) for the select.

   @SuppressWarnings("unchecked")
   static Specification<RemotePackage> fetchBundlesAndTargets() {
     return (root, query, cb) -> {
-      Fetch<Object, Object> bundlesFetch = root.fetch("bundles", JoinType.INNER);
-      bundlesFetch.fetch("targets", JoinType.LEFT);
-
-      // Always true predicate for WHERE clause
-      return cb.conjunction();
+      Class<?> rt = query.getResultType();
+      boolean isCount = (rt == Long.class || rt == long.class);
+      if (!isCount) {
+        Fetch<Object, Object> bundlesFetch = root.fetch("bundles", JoinType.INNER);
+        bundlesFetch.fetch("targets", JoinType.LEFT);
+        query.distinct(true);
+      }
+      return cb.conjunction();
     };
   }

owlplug-client/src/main/java/com/owlplug/core/components/RuntimePlatformResolver.java (3)

44-47: Optional: Add common macOS aliases to improve repository matching.

If upstream package metadata uses "darwin"/"macos"/"osx" keys, define aliases like Windows/Linux do.

-    RuntimePlatform macX64 = new RuntimePlatform("mac-x64", OperatingSystem.MAC, "x64");
+    RuntimePlatform macX64 = new RuntimePlatform("mac-x64", OperatingSystem.MAC, "x64",
+        new String[] {"darwin-x64", "macos-x64", "osx-x64", "darwin", "macos", "osx"});
     platforms.add(macX64);
-    RuntimePlatform macArm64 = new RuntimePlatform("mac-arm64", OperatingSystem.MAC, "arm64");
+    RuntimePlatform macArm64 = new RuntimePlatform("mac-arm64", OperatingSystem.MAC, "arm64",
+        new String[] {"darwin-arm64", "macos-arm64", "osx-arm64", "aarch64"});
     platforms.add(macArm64);

---

52-55: Nit: Rename linuxArm86 → linuxArm32 for clarity.

It represents 32‑bit ARM; the current name suggests x86.

-    RuntimePlatform linuxArm86 = new RuntimePlatform("linux-arm32", OperatingSystem.LINUX, "arm32");
-    platforms.add(linuxArm86);
+    RuntimePlatform linuxArm32 = new RuntimePlatform("linux-arm32", OperatingSystem.LINUX, "arm32");
+    platforms.add(linuxArm32);
@@
-    linuxArm64.getCompatiblePlatforms().add(linuxArm86);
+    linuxArm64.getCompatiblePlatforms().add(linuxArm32);

Also applies to: 59-59

---

85-86: Nit: Unify unknown arch casing.

Return "unknown" consistently to avoid mismatches.

-    if (arch == null) {
-      return "Unknown";
+    if (arch == null) {
+      return "unknown";
@@
-    } else {
-      return "unknown";
+    } else {
+      return "unknown";

Also applies to: 99-100

owlplug-client/src/main/java/com/owlplug/explore/model/mappers/oas/OASModelAdapter.java (2)

88-104: Make bundle name and targets deterministic and null-safe.

Guard against null/blank name and empty/duplicate targets; sort targets for stable UI; avoid trailing " - " when no targets.

Apply:

-  public static PackageBundle mapperToEntity(OASFile file, String name) {
+  public static PackageBundle mapperToEntity(OASFile file, String name) {
@@
-    List<String> targets = new ArrayList<>();
-    for (OASFile.System system : file.getSystems()) {
-      for (String arch : file.getArchitectures()) {
-        targets.add(system.getType() + "-" + arch);
-      }
-    }
-    packageBundle.setTargets(targets);
-
-    String bundleName = name + " - " + String.join(" ", targets);
-    packageBundle.setName(bundleName);
+    List<String> targets = new ArrayList<>();
+    if (file.getSystems() != null && file.getArchitectures() != null) {
+      for (OASFile.System system : file.getSystems()) {
+        if (system == null || system.getType() == null) continue;
+        for (String arch : file.getArchitectures()) {
+          if (arch == null || arch.isBlank()) continue;
+          targets.add(system.getType() + "-" + arch);
+        }
+      }
+    }
+    targets = targets.stream().distinct().sorted().toList();
+    packageBundle.setTargets(targets);
+
+    String safeName = (name == null || name.isBlank()) ? "Bundle" : name.trim();
+    String bundleName = targets.isEmpty() ? safeName : safeName + " - " + String.join(", ", targets);
+    packageBundle.setName(bundleName);

---

105-107: Confirm bit-to-byte conversion and potential rounding.

If upstream size isn’t guaranteed to be a multiple of 8, prefer ceiling to avoid underreporting bytes.

-    packageBundle.setFileSize(file.getSize() / 8);
+    packageBundle.setFileSize((file.getSize() + 7) / 8);

owlplug-client/src/main/java/com/owlplug/explore/model/mappers/registry/BundleMapper.java (1)

25-26: Clarify deprecations and migration path.

Add since/version and guidance to use remote package name + targets; consider forRemoval when safe; keep JSON compatibility.

-  @Deprecated
+  @Deprecated(since = "1.9.0") // update to actual version
   private String name;
@@
-  @Deprecated
+  @Deprecated(since = "1.9.0")
   public String getName() {
@@
-  @Deprecated
+  @Deprecated(since = "1.9.0")
   public void setName(String name) {
@@
-  @Deprecated
+  @Deprecated(since = "1.9.0")
   public String getFormat() {
@@
-  @Deprecated
+  @Deprecated(since = "1.9.0")
   public void setFormat(String format) {

Optionally, to ease registry compatibility when only a single ‘format’ is provided:

// Add alongside existing setters
@com.fasterxml.jackson.annotation.JsonSetter("format")
public void setLegacyFormat(String legacy) {
  if (legacy == null) return;
  this.formats = (this.formats == null || this.formats.isEmpty())
      ? List.of(legacy)
      : this.formats;
}

Also applies to: 40-44, 53-56, 90-94, 111-114

owlplug-client/src/main/java/com/owlplug/explore/model/search/ExploreCriteriaAdapter.java (1)

56-58: Guard against null/empty lists to avoid invalid IN () predicates.

Short-circuit when the list is null/empty.

-    if (criteria.getFilterType().equals(ExploreFilterCriteriaType.PLATFORM_LIST)) {
-      return RemotePackageRepository.hasPlatformTag((List<String>) criteria.getValue());
-    }
+    if (criteria.getFilterType().equals(ExploreFilterCriteriaType.PLATFORM_LIST)) {
+      @SuppressWarnings("unchecked")
+      List<String> platforms = (List<String>) criteria.getValue();
+      if (platforms == null || platforms.isEmpty()) {
+        return Specification.where(null);
+      }
+      return RemotePackageRepository.hasPlatformTag(platforms);
+    }

owlplug-client/src/main/java/com/owlplug/explore/repositories/RemotePackageRepository.java (1)

117-123: Handle empty platformTagList defensively to avoid provider-specific errors.

path.in(emptyList) can error or always-false depending on JPA provider. Return a tautology when list is empty.

   static Specification<RemotePackage> hasPlatformTag(List<String> platformTagList) {
     return (remotePackage, cq, cb) -> {
+      if (platformTagList == null || platformTagList.isEmpty()) {
+        return cb.conjunction();
+      }
       Join<Object, Object> bundles = (Join<Object, Object>) remotePackage.fetch("bundles", JoinType.INNER);
       return bundles.join("targets").in(platformTagList);
 
     };
   }

owlplug-client/src/main/java/com/owlplug/explore/controllers/ExploreController.java (4)

180-182: Avoid recomputing defaults inside the loop.

Store preselected once before iterating.

Example:

final Set<String> preselected = this.getApplicationDefaults().getRuntimePlatform().getCompatiblePlatformsTags();
for (Entry<String, CheckBox> entry : targetFilterCheckBoxes.entrySet()) {
  entry.getValue().setSelected(preselected.contains(entry.getKey()));
  ...
}

---

241-249: Good consolidation into a single PLATFORM_LIST criterion; add task-cancel to prevent stale UI.

Rapid toggles can race; cancel the previous search before starting a new one.

Additional changes (outside this hunk):

// field
private volatile Task<Iterable<RemotePackage>> currentSearch;

// in performPackageSearch(), before starting the new thread:
if (currentSearch != null) { currentSearch.cancel(); }
currentSearch = task;

---

278-279: Delegating refreshView() to performPackageSearch() is fine.

Optionally change the sync listener to this::performPackageSearch for clarity; behavior is equivalent.

---

287-287: synchronized likely unnecessary on JavaFX thread.

displayPackages runs from Task.setOnSucceeded on the FX thread; synchronization can be dropped unless called off-FX elsewhere.

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

💡 Knowledge Base configuration:

• MCP integration is disabled by default for public repositories
• Jira integration is disabled by default for public repositories
• Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

Learnt from: DropSnorz
PR: DropSnorz/OwlPlug#364
File: owlplug-client/src/main/java/com/owlplug/explore/repositories/RemotePackageRepository.java:125-139
Timestamp: 2025-09-04T19:44:02.376Z
Learning: Modern Hibernate versions (≥5.3) automatically handle entity deduplication when using fetch joins in JPA Specifications. The main issue with fetch joins in Specifications is count query compatibility, not duplicate entity creation.

Learnt from: DropSnorz
PR: DropSnorz/OwlPlug#364
File: owlplug-client/src/main/java/com/owlplug/explore/model/mappers/registry/RegistryModelAdapter.java:98-106
Timestamp: 2025-09-04T18:09:08.241Z
Learning: In OwlPlug's RegistryModelAdapter.jsonMapperToEntity method, bundleMapper.getTargets() is guaranteed to not be null based on the registry data sources used, so defensive null checks are not needed in this context.