From 37e4f1e8d5ed7a4d1a9945ce033425968cf7229c Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Wed, 22 Dec 2021 13:33:08 +0000
Subject: [PATCH] "default" is now a reserved keyword when used as an
 identifier.

Requesting a resource with the identifier "default" now maps to a blank string. This allows the /arbitrary/{service}/{name}/{identifier} endpoints to be used for default resources too, as they previously didn't support a blank string as the third parameter.
---
 src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java | 4 ++--
 tools/qdata                                                 | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java
index a87f653e..f26419c8 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java
@@ -65,8 +65,8 @@ public class ArbitraryDataReader {
             resourceId = resourceId.toLowerCase();
         }
 
-        // If identifier is a blank string, treat it as null
-        if (identifier == null || identifier.equals("")) {
+        // If identifier is a blank string, or reserved keyword "default", treat it as null
+        if (identifier == null || identifier.equals("") || identifier.equals("default")) {
             identifier = null;
         }
 
diff --git a/tools/qdata b/tools/qdata
index 923a71d0..9c8668f1 100755
--- a/tools/qdata
+++ b/tools/qdata
@@ -109,9 +109,6 @@ elif [[ "${method}" == "GET" ]]; then
   fi
 
   # Handle default
-  if [[ "${identifier}" == "default" ]]; then
-    identifier=""
-  fi
   if [[ "${filepath}" == "default" ]]; then
     filepath=""
   fi