You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/07/26 22:42:30 UTC
(commons-jcs) branch master updated (4b755cf1 -> d3ea9374)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
from 4b755cf1 Merge pull request #267 from apache/dependabot/github_actions/github/codeql-action-3.25.14
new 7a98c8bb Add Java 22 to the GitHub CI build
new f436a9ad Remove useless comments
new d3ea9374 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-jcs
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/maven.yml | 2 +-
.../commons/jcs/auxiliary/javagroups/JavaGroupsCache.java | 10 ----------
.../jcs/auxiliary/javagroups/JavaGroupsCacheAttributes.java | 2 --
.../commons/jcs/auxiliary/javagroups/JavaGroupsCache.java | 10 ----------
.../jcs/auxiliary/lateral/javagroups/LateralJGService.java | 2 --
.../commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java | 4 ----
.../apache/commons/jcs3/auxiliary/disk/AbstractDiskCache.java | 4 ----
.../apache/commons/jcs3/auxiliary/disk/PurgatoryElement.java | 2 --
.../engine/memory/AbstractDoubleLinkedListMemoryCache.java | 4 ----
.../apache/commons/jcs3/engine/memory/AbstractMemoryCache.java | 2 --
.../commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java | 4 ----
.../jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCService.java | 2 --
12 files changed, 1 insertion(+), 47 deletions(-)
(commons-jcs) 02/03: Remove useless comments
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit f436a9ad3a58eee3bb145cd7b552d7e13858424f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jul 26 18:41:31 2024 -0400
Remove useless comments
---
.../commons/jcs/auxiliary/javagroups/JavaGroupsCache.java | 10 ----------
.../jcs/auxiliary/javagroups/JavaGroupsCacheAttributes.java | 2 --
.../commons/jcs/auxiliary/javagroups/JavaGroupsCache.java | 10 ----------
.../jcs/auxiliary/lateral/javagroups/LateralJGService.java | 2 --
.../commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java | 4 ----
.../apache/commons/jcs3/auxiliary/disk/AbstractDiskCache.java | 4 ----
.../apache/commons/jcs3/auxiliary/disk/PurgatoryElement.java | 2 --
.../engine/memory/AbstractDoubleLinkedListMemoryCache.java | 4 ----
.../apache/commons/jcs3/engine/memory/AbstractMemoryCache.java | 2 --
.../commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java | 4 ----
.../jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCService.java | 2 --
11 files changed, 46 deletions(-)
diff --git a/auxiliary-builds/javagroups/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java b/auxiliary-builds/javagroups/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
index 6980e2d5..70d93130 100644
--- a/auxiliary-builds/javagroups/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
+++ b/auxiliary-builds/javagroups/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
@@ -128,8 +128,6 @@ public class JavaGroupsCache
}
}
- // ----------------------------------------------- interface AuxiliaryCache
-
/**
* Sends the provided element to all peers (connected to the same channel
* and region name).
@@ -276,8 +274,6 @@ public class JavaGroupsCache
return null;
}
- // --------------------------------------------------- interface ICacheType
-
/**
* Gets the cache type (always Lateral).
*
@@ -288,8 +284,6 @@ public class JavaGroupsCache
return ICacheType.LATERAL_CACHE;
}
- // ----------------------------------------------- interface RequestHandler
-
/**
* Handles a message from a peer. The message should contain a Request,
* and depending on the command this will call localUpdate, localRemove,
@@ -342,8 +336,6 @@ public class JavaGroupsCache
return null;
}
- // ------------------------------------------- interface MembershipListener
-
public void viewAccepted( View view )
{
log.info( "View Changed: " + String.valueOf( view ) );
@@ -353,8 +345,6 @@ public class JavaGroupsCache
public void block() { }
- // ---------------------------------------------------------- inner classes
-
/**
* Object for messages, wraps the command type (update, remove, or remove
* all) and original cache element to distribute.
diff --git a/auxiliary-builds/javagroups/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCacheAttributes.java b/auxiliary-builds/javagroups/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCacheAttributes.java
index b59c9047..c2f4389a 100644
--- a/auxiliary-builds/javagroups/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCacheAttributes.java
+++ b/auxiliary-builds/javagroups/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCacheAttributes.java
@@ -82,8 +82,6 @@ public class JavaGroupsCacheAttributes implements AuxiliaryCacheAttributes
this.getFromPeers = getFromPeers;
}
- // ----------------------------------------------- AuxiliaryCacheAttributes
-
/**
* Accessor for cacheName property.
*/
diff --git a/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java b/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
index 2994a070..fce44080 100644
--- a/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
+++ b/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
@@ -128,8 +128,6 @@ public class JavaGroupsCache
}
}
- // ----------------------------------------------- interface AuxiliaryCache
-
/**
* Sends the provided element to all peers (connected to the same channel
* and region name).
@@ -285,8 +283,6 @@ public class JavaGroupsCache
return null;
}
- // --------------------------------------------------- interface ICacheType
-
/**
* Gets the cache type (always Lateral).
*
@@ -297,8 +293,6 @@ public class JavaGroupsCache
return ICacheType.LATERAL_CACHE;
}
- // ----------------------------------------------- interface RequestHandler
-
/**
* Handles a message from a peer. The message should contain a Request, and
* depending on the command this will call localUpdate, localRemove, or
@@ -363,8 +357,6 @@ public class JavaGroupsCache
return cacheMgr.getCache( this.cacheName );
}
- // ------------------------------------------- interface MembershipListener
-
public void viewAccepted( View view )
{
log.info( "View Changed: " + String.valueOf( view ) );
@@ -411,8 +403,6 @@ public class JavaGroupsCache
return stats;
}
- // ---------------------------------------------------------- inner classes
-
/**
* Object for messages, wraps the command type (update, remove, or remove
* all) and original cache element to distribute.
diff --git a/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralJGService.java b/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralJGService.java
index 7080799f..9e479d86 100644
--- a/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralJGService.java
+++ b/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralJGService.java
@@ -76,8 +76,6 @@ public class LateralJGService
}
}
- // -------------------------------------------------------- Service Methods
-
/**
* @param item
* @throws IOException
diff --git a/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java b/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
index bc3f5e2b..7d60043e 100644
--- a/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
+++ b/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
@@ -235,8 +235,6 @@ public class LHMLRUMemoryCache
}
}
- // ---------------------------------------------------------- debug methods
-
/**
* Dump the cache map for debugging.
*/
@@ -273,8 +271,6 @@ public class LHMLRUMemoryCache
return size;
}
- // ---------------------------------------------------------- extended map
-
/**
* Implements removeEldestEntry from {@link LinkedHashMap}.
*/
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCache.java
index a051462f..010c7de2 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCache.java
@@ -250,8 +250,6 @@ public abstract class AbstractDiskCache<K, V>
/** DEBUG: Keeps a count of the number of purgatory hits for debug messages */
private int purgHits;
- // ----------------------------------------------------------- constructors
-
/**
* We lock here, so that we cannot get an update after a remove all. an individual removal locks
* the item.
@@ -325,8 +323,6 @@ public abstract class AbstractDiskCache<K, V>
super.disposeWithEventLogging();
}
- // ------------------------------------------------------- interface ICache
-
/**
* Gets a value from the persistent store.
*
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/PurgatoryElement.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/PurgatoryElement.java
index fe457b34..abf254f1 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/PurgatoryElement.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/PurgatoryElement.java
@@ -91,8 +91,6 @@ public class PurgatoryElement<K, V>
return cacheElement.getCacheName();
}
- // ------------------------------------------------ interface ICacheElement
-
/**
* @return cacheElement.getElementAttributes();
* @see ICacheElement#getElementAttributes
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractDoubleLinkedListMemoryCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractDoubleLinkedListMemoryCache.java
index 7e770b20..56c6e695 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractDoubleLinkedListMemoryCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractDoubleLinkedListMemoryCache.java
@@ -50,8 +50,6 @@ public abstract class AbstractDoubleLinkedListMemoryCache<K, V> extends Abstract
/** Thread-safe double linked list for lru */
protected DoubleLinkedList<MemoryElementDescriptor<K, V>> list; // TODO privatise
-
- // --------------------------- internal methods (linked list implementation)
/**
* Adds a new node to the start of the link list.
* <p>
@@ -324,8 +322,6 @@ public abstract class AbstractDoubleLinkedListMemoryCache<K, V> extends Abstract
() -> map.size(), () -> list.size());
}
- // ---------------------------------------------------------- debug methods
-
/**
* This spools the last element in the LRU, if one exists.
* The method is called guarded by the lock
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java
index 126cc565..9cfff48d 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java
@@ -101,8 +101,6 @@ public abstract class AbstractMemoryCache<K, V>
putCnt.set(0);
log.info( "Memory Cache dispose called." );
}
-
- // ---------------------------------------------------------- debug method
/**
* Dump the cache map for debugging.
*/
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java
index eba24272..20609106 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java
@@ -157,8 +157,6 @@ public class LHMLRUMemoryCache<K, V>
// empty
}
- // ---------------------------------------------------------- debug methods
-
/**
* Removes all cached items from the cache control structures.
* (guarded by the lock)
@@ -181,8 +179,6 @@ public class LHMLRUMemoryCache<K, V>
// empty
}
- // ---------------------------------------------------------- extended map
-
/**
* Puts an item to the cache.
* <p>
diff --git a/src/experimental/org/apache/commons/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCService.java b/src/experimental/org/apache/commons/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCService.java
index 569f9634..eb0d5665 100644
--- a/src/experimental/org/apache/commons/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCService.java
+++ b/src/experimental/org/apache/commons/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCService.java
@@ -80,8 +80,6 @@ public class LateralXMLRPCService
}
}
- // -------------------------------------------------------- Service Methods
-
/**
* @param item
* @throws IOException
(commons-jcs) 03/03: Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-jcs
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit d3ea93740f659a32752c604143e4b033d86a9cb4
Merge: f436a9ad 4b755cf1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jul 26 18:42:14 2024 -0400
Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-jcs
.github/workflows/codeql-analysis.yml | 6 +++---
.github/workflows/scorecards-analysis.yml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
(commons-jcs) 01/03: Add Java 22 to the GitHub CI build
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit 7a98c8bbf74ceb0cea267e3a31ab559a128de15a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jul 26 18:41:21 2024 -0400
Add Java 22 to the GitHub CI build
---
.github/workflows/maven.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e1dea39d..8d501704 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
- java: [ 17, 21 ]
+ java: [ 17, 21, 22 ]
experimental: [false]
include:
- java: 23-ea