From 1613ccc12c58a94026e6f6db28e233c59bd135ff Mon Sep 17 00:00:00 2001
From: Tim Middleton <tim.middleton@oracle.com>
Date: Mon, 22 Jul 2024 08:10:23 +0800
Subject: [PATCH] Minor updates and revert netty to .110Final due to bug

---
 .github/workflows/maven-build-jdk21.yml       |  2 +-
 .github/workflows/maven-build-snapshots.yml   |  4 ++--
 pom.xml                                       |  8 +++----
 .../coherence/demo/application/Utilities.java | 23 ++++---------------
 .../resources/cache-config-grid-edition.xml   |  6 +----
 src/main/resources/cache-config.xml           |  6 +----
 .../web/fragments/federationStarted.html      |  2 +-
 7 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/maven-build-jdk21.yml b/.github/workflows/maven-build-jdk21.yml
index 9dcbf6d..2b19c57 100644
--- a/.github/workflows/maven-build-jdk21.yml
+++ b/.github/workflows/maven-build-jdk21.yml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - 22.06.8
+          - 22.06.9
 
     steps:
     - name: Checkout
diff --git a/.github/workflows/maven-build-snapshots.yml b/.github/workflows/maven-build-snapshots.yml
index 030ad67..18ae6d5 100644
--- a/.github/workflows/maven-build-snapshots.yml
+++ b/.github/workflows/maven-build-snapshots.yml
@@ -18,8 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         coherenceVersion:
-          - 24.03.1-SNAPSHOT
-          - 24.03
+          - 24.03.2-SNAPSHOT
+          - 24.03.1
 
     steps:
     - uses: actions/checkout@v4
diff --git a/pom.xml b/pom.xml
index 06040d4..19d6986 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.oracle.coherence</groupId>
   <artifactId>coherence-demo</artifactId>
-  <version>8.0.0-SNAPSHOT</version>
+  <version>8.0.1-SNAPSHOT</version>
 
   <properties>
     <!-- The groupId of the Coherence product -->
@@ -32,7 +32,7 @@
 
     <!-- dependency versions -->
     <bedrock.version>7.0.4</bedrock.version>
-    <coherence.version>24.03</coherence.version>
+    <coherence.version>24.03.1</coherence.version>
     <jakarta.xml.bind.version>3.0.1</jakarta.xml.bind.version>
     <copy.rename.maven.plugin.version>1.0.1</copy.rename.maven.plugin.version>
     <derby.version>10.17.1.0</derby.version>
@@ -48,7 +48,7 @@
     <jib.version>3.4.3</jib.version>
     <jib.goal>dockerBuild</jib.goal>
     <kotlin.version>2.0.0</kotlin.version>
-    <netty.version>4.1.111.Final</netty.version>
+    <netty.version>4.1.110.Final</netty.version>
     <opentracing.jdbc.version>0.2.15</opentracing.jdbc.version>
 
     <!-- maven configuration -->
@@ -400,7 +400,7 @@
       <plugin>
         <groupId>com.oracle.coherence.ce</groupId>
         <artifactId>pof-maven-plugin</artifactId>
-        <version>24.03</version>
+        <version>${coherence.version}</version>
         <executions>
           <execution>
             <id>instrument</id>
diff --git a/src/main/java/com/oracle/coherence/demo/application/Utilities.java b/src/main/java/com/oracle/coherence/demo/application/Utilities.java
index 57bcacc..b61a854 100644
--- a/src/main/java/com/oracle/coherence/demo/application/Utilities.java
+++ b/src/main/java/com/oracle/coherence/demo/application/Utilities.java
@@ -1,7 +1,7 @@
 /*
  * File: Utilities.java
  *
- * Copyright (c) 2015, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2015, 2024 Oracle and/or its affiliates.
  *
  * You may not use this file except in compliance with the Universal Permissive
  * License (UPL), Version 1.0 (the "License.")
@@ -23,10 +23,9 @@
 import com.oracle.coherence.demo.model.Trade;
 
 import com.tangosol.net.CacheFactory;
+import com.tangosol.net.Coherence;
 import com.tangosol.net.NamedCache;
 
-import com.tangosol.net.cache.TypeAssertion;
-
 import com.tangosol.util.Filters;
 import com.tangosol.util.InvocableMap;
 
@@ -88,20 +87,6 @@ public final class Utilities
     @SuppressWarnings("unused")
     public static final String VISUALVM = System.getProperty("visualvm.executable", "");
 
-    /**
-     * The {@link TypeAssertion} for the trades cache.
-     */
-    public static final TypeAssertion<String, Trade> TRADE_CACHE_TYPE =
-            TypeAssertion.withTypes(String.class, Trade.class);
-
-
-    /**
-     * The {@link TypeAssertion} for the prices cache.
-     */
-    public static final TypeAssertion<String, Price> PRICE_CACHE_TYPE =
-            TypeAssertion.withTypes(String.class, Price.class);
-
-
     /**
      * The name of the trades cache.
      */
@@ -147,7 +132,7 @@ public static void main(String[] args)
      */
     public static NamedCache<String, Trade> getTradesCache()
     {
-        return CacheFactory.getTypedCache(TRADE_CACHE, TRADE_CACHE_TYPE);
+        return Coherence.getInstance().getSession().getCache(TRADE_CACHE);
     }
 
 
@@ -158,7 +143,7 @@ public static NamedCache<String, Trade> getTradesCache()
      */
     public static NamedCache<String, Price> getPricesCache()
     {
-        return CacheFactory.getTypedCache(PRICE_CACHE, PRICE_CACHE_TYPE);
+        return Coherence.getInstance().getSession().getCache(PRICE_CACHE);
     }
 
 
diff --git a/src/main/resources/cache-config-grid-edition.xml b/src/main/resources/cache-config-grid-edition.xml
index ac3f34d..b8ba2cc 100644
--- a/src/main/resources/cache-config-grid-edition.xml
+++ b/src/main/resources/cache-config-grid-edition.xml
@@ -3,7 +3,7 @@
 <!--
  * File: cache-config-grid-edition.xml
  *
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
  *
  * You may not use this file except in compliance with the Universal Permissive
  * License (UPL), Version 1.0 (the "License.")
@@ -42,14 +42,10 @@
         <cache-mapping>
             <cache-name>Trade</cache-name>
             <scheme-name>federated-scheme</scheme-name>
-            <key-type>java.lang.String</key-type>
-            <value-type>com.oracle.coherence.demo.model.Trade</value-type>
         </cache-mapping>
         <cache-mapping>
             <cache-name>Price</cache-name>
             <scheme-name>federated-scheme</scheme-name>
-            <key-type>java.lang.String</key-type>
-            <value-type>com.oracle.coherence.demo.model.Price</value-type>
         </cache-mapping>
     </caching-scheme-mapping>
 
diff --git a/src/main/resources/cache-config.xml b/src/main/resources/cache-config.xml
index 680e10d..4e0da7f 100644
--- a/src/main/resources/cache-config.xml
+++ b/src/main/resources/cache-config.xml
@@ -3,7 +3,7 @@
 <!--
  * File: cache-config.xml
  *
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2024 Oracle and/or its affiliates.
  *
  * You may not use this file except in compliance with the Universal Permissive
  * License (UPL), Version 1.0 (the "License.")
@@ -39,14 +39,10 @@
         <cache-mapping>
             <cache-name>Trade</cache-name>
             <scheme-name>distributed-scheme</scheme-name>
-            <key-type>java.lang.String</key-type>
-            <value-type>com.oracle.coherence.demo.model.Trade</value-type>
         </cache-mapping>
         <cache-mapping>
             <cache-name>Price</cache-name>
             <scheme-name>distributed-scheme</scheme-name>
-            <key-type>java.lang.String</key-type>
-            <value-type>com.oracle.coherence.demo.model.Price</value-type>
         </cache-mapping>
     </caching-scheme-mapping>
 
diff --git a/src/main/resources/web/fragments/federationStarted.html b/src/main/resources/web/fragments/federationStarted.html
index c5cb407..583f3f6 100644
--- a/src/main/resources/web/fragments/federationStarted.html
+++ b/src/main/resources/web/fragments/federationStarted.html
@@ -43,4 +43,4 @@
   &lt;/federation-config&gt;
 </pre>
 
-For more information of Federation see the <a href="https://docs.oracle.com/middleware/12213/coherence/COHAG/federating-caches-clusters.htm" target="_blank">Oracle Documentation</a>.
+For more information of Federation see the <a href="https://docs.oracle.com/en/middleware/standalone/coherence/14.1.1.2206/administer/federating-caches-clusters.html" target="_blank">Oracle Documentation</a>.