diff --git a/‎.github/scripts/build_javadocs.sh‎
Lines changed: 17 additions & 1 deletion b/‎.github/scripts/build_javadocs.sh‎
Lines changed: 17 additions & 1 deletion
diff --git a/‎CodenameOne/src/com/codename1/annotations/JsonIgnore.java‎
Lines changed: 5 additions & 0 deletions b/‎CodenameOne/src/com/codename1/annotations/JsonIgnore.java‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎CodenameOne/src/com/codename1/annotations/JsonProperty.java‎
Lines changed: 4 additions & 0 deletions b/‎CodenameOne/src/com/codename1/annotations/JsonProperty.java‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎docs/demos/backend/src/main/java/com/codenameone/developerguide/backend/DatabaseSnippets.java‎
Lines changed: 2 additions & 3 deletions b/‎docs/demos/backend/src/main/java/com/codenameone/developerguide/backend/DatabaseSnippets.java‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎docs/demos/backend/src/main/java/com/codenameone/developerguide/backend/Notes.java‎
Lines changed: 9 additions & 6 deletions b/‎docs/demos/backend/src/main/java/com/codenameone/developerguide/backend/Notes.java‎
Lines changed: 9 additions & 6 deletions
diff --git a/‎docs/demos/backend/src/main/java/com/codenameone/developerguide/backend/NotesEndpoint.java‎
Lines changed: 4 additions & 2 deletions b/‎docs/demos/backend/src/main/java/com/codenameone/developerguide/backend/NotesEndpoint.java‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎docs/demos/backend/src/main/java/com/codenameone/developerguide/backend/Products.java‎
Lines changed: 91 additions & 0 deletions b/‎docs/demos/backend/src/main/java/com/codenameone/developerguide/backend/Products.java‎
Lines changed: 91 additions & 0 deletions
diff --git a/‎docs/demos/backend/src/main/java/com/codenameone/developerguide/backend/PushFeedback.java‎
Lines changed: 22 additions & 10 deletions b/‎docs/demos/backend/src/main/java/com/codenameone/developerguide/backend/PushFeedback.java‎
Lines changed: 22 additions & 10 deletions
diff --git a/‎docs/demos/backend/src/main/java/com/codenameone/developerguide/backend/TracingSnippets.java‎
Lines changed: 0 additions & 9 deletions b/‎docs/demos/backend/src/main/java/com/codenameone/developerguide/backend/TracingSnippets.java‎
Lines changed: 0 additions & 9 deletions
diff --git a/‎docs/demos/backend/src/main/java/com/codenameone/developerguide/backend/WebSocketSnippets.java‎
Lines changed: 0 additions & 31 deletions b/‎docs/demos/backend/src/main/java/com/codenameone/developerguide/backend/WebSocketSnippets.java‎
Lines changed: 0 additions & 31 deletions
@@ -172,9 +172,25 @@ done < <("$BACKEND_DIR/shared-sources.sh")
 # server as for an app. The website's doclet marks the whole tree shared with
 # --shared-sources.
 BACKEND_SOURCES_ARGFILE="$CN1_DIR/build/backend-javadoc-sources.txt"
+# The vm/JavaAPI classes the backend's public API exposes beyond the CLDC set --
+# @Async's Future and what its get() throws, Config's Properties. The backend
+# compiles against vm/JavaAPI, so these work there; listing them here is what makes
+# them documented, supported API rather than an accident of the class library.
+# check-backend-jdk-surface.py fails the build when the backend exposes a JDK type
+# that is neither CLDC nor in this list. Keep the two lists in step.
+BACKEND_PROMOTED_JDK="java/util/Properties.java
+java/util/concurrent/CancellationException.java
+java/util/concurrent/ExecutionException.java
+java/util/concurrent/Future.java
+java/util/concurrent/TimeUnit.java
+java/util/concurrent/TimeoutException.java"
+python3 "$ROOT_DIR/scripts/check-backend-jdk-surface.py"
 {
   find "$BACKEND_STAGE" -name "*.java" | grep -v '/com/codename1/impl/'
   find "$ROOT_DIR/Ports/CLDC11/src" -name "*.java"
+  echo "$BACKEND_PROMOTED_JDK" | while IFS= read -r promoted; do
+    echo "$ROOT_DIR/vm/JavaAPI/src/$promoted"
+  done
 } | LC_ALL=C sort > "$BACKEND_SOURCES_ARGFILE"
 
 # Held to the same doclint as the client API above. --release 8 matches the backend module's
@@ -185,7 +201,7 @@ BACKEND_SOURCES_ARGFILE="$CN1_DIR/build/backend-javadoc-sources.txt"
   --add-script "$ROOT_DIR/maven/javadoc-resources/highlight.min.js" \
   --add-script "$ROOT_DIR/maven/javadoc-resources/javadoc-highlight-init.js" \
   --release 8 \
-  -sourcepath "$BACKEND_STAGE:$ROOT_DIR/Ports/CLDC11/src" \
+  -sourcepath "$BACKEND_STAGE:$ROOT_DIR/Ports/CLDC11/src:$ROOT_DIR/vm/JavaAPI/src" \
   -Xdoclint:all,-missing \
   -Xmaxerrs 10000 \
   -Xmaxwarns 10000 \
 
@@ -29,6 +29,11 @@
 
 /// Excludes a `@Mapped` field from the JSON projection. The same field still
 /// participates in XML mapping unless `@XmlTransient` is also present.
+///
+/// The server's generated codecs honour it too: a field that points back at its
+/// owner is the usual candidate, since writing both ends of that loop never
+/// finishes.
+@com.codename1.impl.SharedWithBackend
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.FIELD)
 public @interface JsonIgnore {
 
@@ -30,6 +30,10 @@
 /// Renames a `@Mapped` field in the JSON projection. The default JSON key is
 /// the field name; `@JsonProperty` lets a field map to `snake_case` or any
 /// alternative spelling without touching the Java identifier.
+///
+/// The server's generated codecs read it too, so a class shared between an app
+/// and its backend has one JSON form on both sides.
+@com.codename1.impl.SharedWithBackend
 @Retention(RetentionPolicy.CLASS)
 @Target(ElementType.FIELD)
 public @interface JsonProperty {
 
@@ -34,10 +34,9 @@ public final class DatabaseSnippets {
     private DatabaseSnippets() {
     }
 
-    public static List open() throws IOException {
+    public static List open(DataSource db) throws IOException {
 // tag::backend-database[]
-DataSource db = DataSource.open(System.getenv("DATABASE_URL"));   // or ":memory:"
-
+// db is the pool the server opened from cn1.datasource.url and injected
 List rows = db.query("SELECT id, body FROM note WHERE id > ?",
                      new Object[] { Integer.valueOf(10) });
 // end::backend-database[]
 
@@ -32,17 +32,18 @@
 import com.codename1.backend.annotations.ResponseStatus;
 import com.codename1.backend.annotations.RestController;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
 // tag::backend-first-server[]
 @RestController
 @RequestMapping("/notes")
 public class Notes {
-    private final Map<Long, Map> store = new ConcurrentHashMap<Long, Map>();
+    private final Map<Long, Map> store =
+            Collections.synchronizedMap(new LinkedHashMap<Long, Map>());
     private final AtomicLong nextId = new AtomicLong(1);
 
     @GetMapping("/healthz")
@@ -58,11 +59,13 @@ public Map read(@PathVariable("id") long id) {
     @GetMapping
     public List list(@RequestParam(value = "limit", defaultValue = "20") int limit) {
         List page = new ArrayList();
-        for (Map note : store.values()) {
-            if (page.size() >= limit) {
-                break;
+        synchronized (store) {                   // iterating needs the map's own lock
+            for (Map note : store.values()) {
+                if (page.size() >= limit) {
+                    break;
+                }
+                page.add(note);
             }
-            page.add(note);
         }
         return page;
     }
 
@@ -22,12 +22,14 @@
  */
 package com.codenameone.developerguide.backend;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 // tag::backend-contract-server[]
 public class NotesEndpoint implements NotesApiServer {
-    private final Map<String, Note> notes = new ConcurrentHashMap<String, Note>();
+    private final Map<String, Note> notes =
+            Collections.synchronizedMap(new HashMap<String, Note>());
 
     public Note note(String id) {                // no callback: this IS the server
         return notes.get(id);
 
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2012, Codename One and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Codename One designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Codename One through http://www.codenameone.com/ if you
+ * need additional information or have any questions.
+ */
+package com.codenameone.developerguide.backend;
+
+import com.codename1.backend.HttpServer;
+import com.codename1.backend.annotations.DeleteMapping;
+import com.codename1.backend.annotations.GetMapping;
+import com.codename1.backend.annotations.PathVariable;
+import com.codename1.backend.annotations.PostMapping;
+import com.codename1.backend.annotations.RequestBody;
+import com.codename1.backend.annotations.RequestHeader;
+import com.codename1.backend.annotations.RequestMapping;
+import com.codename1.backend.annotations.RequestParam;
+import com.codename1.backend.annotations.ResponseStatus;
+import com.codename1.backend.annotations.RestController;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+// tag::backend-web-mappings[]
+@RestController
+@RequestMapping("/api/products")
+public class Products {
+    private final Map<Long, Map<String, Object>> products =
+            new LinkedHashMap<Long, Map<String, Object>>();
+
+    @GetMapping("/{id}")                                       // GET /api/products/42
+    public synchronized Map<String, Object> get(@PathVariable("id") long id) {
+        return products.get(Long.valueOf(id));                 // null answers 404
+    }
+
+    @GetMapping("/search")                                     // GET /api/products/search?q=mug
+    public synchronized List<Map<String, Object>> search(
+            @RequestParam(value = "q", required = false) String query,
+            @RequestParam(value = "limit", defaultValue = "20") int limit) {
+        List<Map<String, Object>> out = new ArrayList<Map<String, Object>>();
+        for (Map<String, Object> p : products.values()) {
+            if (out.size() < limit
+                    && (query == null || String.valueOf(p.get("name")).contains(query))) {
+                out.add(p);
+            }
+        }
+        return out;
+    }
+
+    @PostMapping                                               // POST /api/products
+    @ResponseStatus(201)
+    public synchronized Map<String, Object> create(
+            @RequestBody Map<String, Object> body,
+            @RequestHeader(value = "Idempotency-Key", required = false) String key) {
+        Long id = Long.valueOf(products.size() + 1);
+        Map<String, Object> product = new LinkedHashMap<String, Object>(body);
+        product.put("id", id);
+        products.put(id, product);
+        return product;
+    }
+
+    @DeleteMapping("/{id}")                                    // void answers 204
+    public synchronized void delete(@PathVariable("id") long id) {
+        products.remove(Long.valueOf(id));
+    }
+
+    @GetMapping("/{id}/label")
+    public HttpServer.Response label(HttpServer.Request request, @PathVariable("id") long id) {
+        byte[] text = ("product " + id).getBytes();
+        return request.respond(200, "text/plain; charset=utf-8", text);
+    }
+}
+// end::backend-web-mappings[]
@@ -24,10 +24,11 @@
 
 import com.codename1.backend.Crypto;
 import com.codename1.backend.HttpServer;
+import com.codename1.backend.Json;
 import com.codename1.backend.annotations.PostMapping;
 import com.codename1.backend.annotations.RequestMapping;
 import com.codename1.backend.annotations.RestController;
-import com.codename1.io.JSONParser;
+import com.codename1.backend.annotations.Value;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
@@ -57,25 +58,35 @@ void removeTargetAndMarkApplied(String eventKey, String provider, String target)
                 throws Exception;
     }
 
-    /** Assigned once at start-up; there is no dependency injection here. */
-    static DeviceStore store;
+    private final DeviceStore store;
 
-    /** The signing secret shown in Push > Settings. Read it from configuration. */
-    private static final String SECRET = System.getenv("CN1_PUSH_CALLBACK_SECRET");
+    /** The signing secret shown in Push > Settings. */
+    private final String secret;
+
+    /**
+     * Both are injected: the store is your bean implementing DeviceStore, and
+     * the secret is read from cn1.push.callbackSecret, which the environment
+     * variable CN1_PUSH_CALLBACKSECRET overrides.
+     */
+    public PushFeedback(DeviceStore store,
+                        @Value("${cn1.push.callbackSecret}") String secret) {
+        this.store = store;
+        this.secret = secret;
+    }
 
     /** Reject a digest whose timestamp is older than this, to bound replay. */
     private static final long MAX_AGE_MS = 5 * 60 * 1000L;
 
     @PostMapping("/feedback")
     public HttpServer.Response feedback(HttpServer.Request request) throws Exception {
         String body = request.getBody();
-        if (!verified(request.getHeader("X-CN1-Signature"), body)) {
+        if (!verified(request.getHeader("X-CN1-Signature"), body, secret)) {
             // Anything but 2xx keeps the window at the sender and resends it,
             // which is what you want while a secret rotation is half-applied.
             return new HttpServer.Response(401, "text/plain",
                     "bad signature".getBytes(StandardCharsets.UTF_8));
         }
-        Map digest = JSONParser.parseJSON(body);
+        Map digest = Json.parseObject(body);
         List events = (List) digest.get("events");
         if (events != null) {
             for (Object entry : events) {
@@ -118,8 +129,9 @@ public HttpServer.Response feedback(HttpServer.Request request) throws Exception
 
     // throws, because String.getBytes(Charset) is a CHECKED throw in the
     // ParparVM class library even though it is not one on a JVM.
-    private static boolean verified(String header, String body) throws Exception {
-        if (header == null || SECRET == null) {
+    private static boolean verified(String header, String body, String secret)
+            throws Exception {
+        if (header == null || secret == null || secret.length() == 0) {
             return false;
         }
         long timestamp = 0;
@@ -156,7 +168,7 @@ private static boolean verified(String header, String body) throws Exception {
         // no JCE. equalsConstantTime is here for the same reason a hand-written
         // loop would be -- an early exit on the first differing byte lets a MAC
         // be forged one byte at a time.
-        byte[] expected = Crypto.hmacSha256(SECRET.getBytes(StandardCharsets.UTF_8),
+        byte[] expected = Crypto.hmacSha256(secret.getBytes(StandardCharsets.UTF_8),
                 (timestamp + "." + body).getBytes(StandardCharsets.UTF_8));
         return Crypto.equalsConstantTime(expected, decodeHex(provided));
     }
 
@@ -22,13 +22,10 @@
  */
 package com.codenameone.developerguide.backend;
 
-import com.codename1.backend.Config;
-import com.codename1.backend.Tracing;
 import com.codename1.backend.annotations.GetMapping;
 import com.codename1.backend.annotations.OpenTelemetry;
 import com.codename1.backend.annotations.PathVariable;
 import com.codename1.backend.annotations.RestController;
-import com.codename1.backend.otel.OtlpTracer;
 
 /// The Backend chapter's tracing examples, compiled so they cannot drift. This
 /// module runs no annotation processing, which is what lets `@OpenTelemetry` appear
@@ -51,10 +48,4 @@ public String note(@PathVariable("id") String id) {
 // end::backend-otel-annotation[]
     }
 
-    public static void installByHand() throws Exception {
-// tag::backend-otel-install[]
-Tracing.install(OtlpTracer.open(Config.load(), "notes"));
-// end::backend-otel-install[]
-    }
-
 }
@@ -22,10 +22,6 @@
  */
 package com.codenameone.developerguide.backend;
 
-import com.codename1.backend.Backend;
-import com.codename1.backend.DataSource;
-import com.codename1.backend.orm.EntityManager;
-import com.codename1.backend.HttpServer;
 import com.codename1.backend.WebSocket;
 import com.codename1.backend.WebSocketSession;
 import com.codename1.backend.annotations.WebSocketMapping;
@@ -58,19 +54,6 @@ public void onBinary(WebSocketSession session, byte[] message, int offset, int l
 }
 // end::backend-websocket-echo[]
 
-// tag::backend-websocket-register[]
-public static void main(String[] args) throws Exception {
-    Backend.builder()
-            .webSockets(new Backend.WebSocketEndpoints() {
-                public void register(HttpServer.WebSocketRegistry registry,
-                                     DataSource dataSource, EntityManager entities) {
-                    registry.route("/echo", new Echo());
-                }
-            })
-            .run();
-}
-// end::backend-websocket-register[]
-
 // tag::backend-websocket-annotated[]
 @WebSocketMapping("/chat")
 public static final class ChatEndpoint implements WebSocket {
@@ -143,18 +126,4 @@ public void onBinary(WebSocketSession session, byte[] message, int offset, int l
 }
 // end::backend-websocket-subprotocol[]
 
-// tag::backend-websocket-raw[]
-public static void serveForever() throws Exception {
-    HttpServer server = HttpServer.start(null, 8080, 512, 16, new HttpServer.Handler() {
-        public HttpServer.Response handle(HttpServer.Request request) {
-            return HttpServer.Response.text(200, "ok");
-        }
-    }, null, new HttpServer.WebSocketRoutes() {
-        public void register(HttpServer.WebSocketRegistry registry) {
-            registry.route("/echo", new Echo());
-        }
-    });
-    server.awaitTermination();
-}
-// end::backend-websocket-raw[]
 }