Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor updates and revert netty to .110Final due to bug #118

Merged
merged 2 commits into from
Jul 22, 2024
Merged

Minor updates and revert netty to .110Final due to bug #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1613ccc
Minor updates and revert netty to .110Final due to bug
tmiddlet2666 Jul 22, 2024
0fbc6a8
Use pof-maven-plugin 24.03.1
tmiddlet2666 Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/maven-build-jdk21.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
version:
- 22.06.8
- 22.06.9

steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven-build-snapshots.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@

<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 -->
<coherence.group.id>com.oracle.coherence.ce</coherence.group.id>

<!-- 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>
Expand All @@ -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 -->
Expand Down Expand Up @@ -400,7 +400,7 @@
<plugin>
<groupId>com.oracle.coherence.ce</groupId>
<artifactId>pof-maven-plugin</artifactId>
<version>24.03</version>
<version>24.03.1</version>
<executions>
<execution>
<id>instrument</id>
Expand Down
23 changes: 4 additions & 19 deletions src/main/java/com/oracle/coherence/demo/application/Utilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.")
Expand All @@ -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;

Expand Down Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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);
}


Expand All @@ -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);
}


Expand Down
6 changes: 1 addition & 5 deletions src/main/resources/cache-config-grid-edition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down Expand Up @@ -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>

Expand Down
6 changes: 1 addition & 5 deletions src/main/resources/cache-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/web/fragments/federationStarted.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>.
Loading