From: James Moger Date: Tue, 8 Nov 2011 02:18:14 +0000 (-0500) Subject: Moved ObjectCache class X-Git-Tag: v0.7.0~14 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9275bd77ebc70efeea44bbc9fc3b5723c697a475;p=gitblit.git Moved ObjectCache class --- diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index 834375b7..8db72af1 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -65,7 +65,6 @@ import com.gitblit.models.FederationModel; import com.gitblit.models.FederationProposal; import com.gitblit.models.FederationSet; import com.gitblit.models.Metric; -import com.gitblit.models.ObjectCache; import com.gitblit.models.RepositoryModel; import com.gitblit.models.ServerSettings; import com.gitblit.models.ServerStatus; @@ -76,6 +75,7 @@ import com.gitblit.utils.FederationUtils; import com.gitblit.utils.JGitUtils; import com.gitblit.utils.JsonUtils; import com.gitblit.utils.MetricUtils; +import com.gitblit.utils.ObjectCache; import com.gitblit.utils.StringUtils; /** diff --git a/src/com/gitblit/models/ObjectCache.java b/src/com/gitblit/models/ObjectCache.java deleted file mode 100644 index 57494fbc..00000000 --- a/src/com/gitblit/models/ObjectCache.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright 2011 gitblit.com. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gitblit.models; - -import java.io.Serializable; -import java.util.Date; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * Reusable object cache. - * - * @author James Moger - * - */ -public class ObjectCache implements Serializable { - - private static final long serialVersionUID = 1L; - - private final Map> cache = new ConcurrentHashMap>(); - - private class CachedObject { - - public final String name; - - private volatile Date date; - - private volatile Y object; - - CachedObject(String name) { - this.name = name; - date = new Date(0); - } - - @Override - public String toString() { - return getClass().getSimpleName() + ": " + name; - } - } - - public boolean hasCurrent(String name, Date date) { - return cache.containsKey(name) && cache.get(name).date.compareTo(date) == 0; - } - - public Date getDate(String name) { - return cache.get(name).date; - } - - public X getObject(String name) { - return cache.get(name).object; - } - - public void updateObject(String name, X object) { - this.updateObject(name, new Date(), object); - } - - public void updateObject(String name, Date date, X object) { - CachedObject obj; - if (cache.containsKey(name)) { - obj = cache.get(name); - } else { - obj = new CachedObject(name); - cache.put(name, obj); - } - obj.date = date; - obj.object = object; - } - - public Object remove(String name) { - if (cache.containsKey(name)) { - return cache.remove(name).object; - } - return null; - } -} diff --git a/src/com/gitblit/utils/ObjectCache.java b/src/com/gitblit/utils/ObjectCache.java new file mode 100644 index 00000000..3bbf4d19 --- /dev/null +++ b/src/com/gitblit/utils/ObjectCache.java @@ -0,0 +1,94 @@ +/* + * Copyright 2011 gitblit.com. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gitblit.utils; + +import java.io.Serializable; +import java.util.Date; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * Reusable coarse date-based object cache. The date precision is in + * milliseconds and in fast, concurrent systems this cache is too simplistic. + * However, for the cases where its being used in Gitblit this cache technique + * is just fine. + * + * @author James Moger + * + */ +public class ObjectCache implements Serializable { + + private static final long serialVersionUID = 1L; + + private final Map> cache = new ConcurrentHashMap>(); + + private class CachedObject { + + public final String name; + + private volatile Date date; + + private volatile Y object; + + CachedObject(String name) { + this.name = name; + date = new Date(0); + } + + @Override + public String toString() { + return getClass().getSimpleName() + ": " + name; + } + } + + public boolean hasCurrent(String name, Date date) { + return cache.containsKey(name) && cache.get(name).date.compareTo(date) == 0; + } + + public Date getDate(String name) { + return cache.get(name).date; + } + + public X getObject(String name) { + if (cache.containsKey(name)) { + return cache.get(name).object; + } + return null; + } + + public void updateObject(String name, X object) { + this.updateObject(name, new Date(), object); + } + + public void updateObject(String name, Date date, X object) { + CachedObject obj; + if (cache.containsKey(name)) { + obj = cache.get(name); + } else { + obj = new CachedObject(name); + cache.put(name, obj); + } + obj.date = date; + obj.object = object; + } + + public Object remove(String name) { + if (cache.containsKey(name)) { + return cache.remove(name).object; + } + return null; + } +}