Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
cfc7f2dd
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cfc7f2dd
编写于
5月 13, 2015
作者:
O
Oleg Nenashev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor fingerprint classes: Javadoc and annotations
上级
8373984f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
83 addition
and
48 deletion
+83
-48
core/src/main/java/hudson/model/Fingerprint.java
core/src/main/java/hudson/model/Fingerprint.java
+48
-26
core/src/main/java/hudson/model/FingerprintMap.java
core/src/main/java/hudson/model/FingerprintMap.java
+10
-7
core/src/main/java/hudson/util/KeyedDataStorage.java
core/src/main/java/hudson/util/KeyedDataStorage.java
+18
-11
core/src/main/java/jenkins/model/FingerprintFacet.java
core/src/main/java/jenkins/model/FingerprintFacet.java
+7
-4
未找到文件。
core/src/main/java/hudson/model/Fingerprint.java
浏览文件 @
cfc7f2dd
...
...
@@ -71,6 +71,7 @@ import java.util.TreeMap;
import
java.util.logging.Level
;
import
java.util.logging.Logger
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
import
org.xmlpull.v1.XmlPullParserException
;
/**
...
...
@@ -761,13 +762,16 @@ public class Fingerprint implements ModelObject, Saveable {
private
static
final
DateConverter
DATE_CONVERTER
=
new
DateConverter
();
private
final
Date
timestamp
;
/**
* Time when the fingerprint has been captured.
*/
private
final
@Nonnull
Date
timestamp
;
/**
* Null if this fingerprint is for a file that's
* apparently produced outside.
*/
private
final
BuildPtr
original
;
private
final
@CheckForNull
BuildPtr
original
;
private
final
byte
[]
md5sum
;
...
...
@@ -785,12 +789,12 @@ public class Fingerprint implements ModelObject, Saveable {
*/
private
transient
volatile
List
<
FingerprintFacet
>
transientFacets
=
null
;
public
Fingerprint
(
Run
build
,
String
fileName
,
byte
[]
md5sum
)
throws
IOException
{
public
Fingerprint
(
@CheckForNull
Run
build
,
@Nonnull
String
fileName
,
@Nonnull
byte
[]
md5sum
)
throws
IOException
{
this
(
build
==
null
?
null
:
new
BuildPtr
(
build
),
fileName
,
md5sum
);
save
();
}
Fingerprint
(
BuildPtr
original
,
String
fileName
,
byte
[]
md5sum
)
{
Fingerprint
(
@CheckForNull
BuildPtr
original
,
@Nonnull
String
fileName
,
@Nonnull
byte
[]
md5sum
)
{
this
.
original
=
original
;
this
.
md5sum
=
md5sum
;
this
.
fileName
=
fileName
;
...
...
@@ -809,11 +813,11 @@ public class Fingerprint implements ModelObject, Saveable {
* if the file is apparently created outside Hudson.
*/
@Exported
public
BuildPtr
getOriginal
()
{
public
@CheckForNull
BuildPtr
getOriginal
()
{
return
original
;
}
public
String
getDisplayName
()
{
public
@Nonnull
String
getDisplayName
()
{
return
fileName
;
}
...
...
@@ -821,7 +825,7 @@ public class Fingerprint implements ModelObject, Saveable {
* The file name (like "foo.jar" without path).
*/
@Exported
public
String
getFileName
()
{
public
@Nonnull
String
getFileName
()
{
return
fileName
;
}
...
...
@@ -829,7 +833,7 @@ public class Fingerprint implements ModelObject, Saveable {
* Gets the MD5 hash string.
*/
@Exported
(
name
=
"hash"
)
public
String
getHashString
()
{
public
@Nonnull
String
getHashString
()
{
return
Util
.
toHexString
(
md5sum
);
}
...
...
@@ -837,7 +841,7 @@ public class Fingerprint implements ModelObject, Saveable {
* Gets the timestamp when this record is created.
*/
@Exported
public
Date
getTimestamp
()
{
public
@Nonnull
Date
getTimestamp
()
{
return
timestamp
;
}
...
...
@@ -847,7 +851,7 @@ public class Fingerprint implements ModelObject, Saveable {
* @return
* string like "3 minutes" "1 day" etc.
*/
public
String
getTimestampString
()
{
public
@Nonnull
String
getTimestampString
()
{
long
duration
=
System
.
currentTimeMillis
()-
timestamp
.
getTime
();
return
Util
.
getPastTimeString
(
duration
);
}
...
...
@@ -857,8 +861,9 @@ public class Fingerprint implements ModelObject, Saveable {
*
* <p>
* These builds of this job has used this file.
* @return may be empty but not null.
*/
public
RangeSet
getRangeSet
(
String
jobFullName
)
{
public
@Nonnull
RangeSet
getRangeSet
(
String
jobFullName
)
{
RangeSet
r
=
usages
.
get
(
jobFullName
);
if
(
r
==
null
)
r
=
new
RangeSet
();
return
r
;
...
...
@@ -871,14 +876,14 @@ public class Fingerprint implements ModelObject, Saveable {
/**
* Gets the sorted list of job names where this jar is used.
*/
public
List
<
String
>
getJobs
()
{
public
@Nonnull
List
<
String
>
getJobs
()
{
List
<
String
>
r
=
new
ArrayList
<
String
>();
r
.
addAll
(
usages
.
keySet
());
Collections
.
sort
(
r
);
return
r
;
}
public
Hashtable
<
String
,
RangeSet
>
getUsages
()
{
public
@Nonnull
Hashtable
<
String
,
RangeSet
>
getUsages
()
{
return
usages
;
}
...
...
@@ -897,34 +902,39 @@ public class Fingerprint implements ModelObject, Saveable {
// this is for remote API
@Exported
(
name
=
"usage"
)
public
List
<
RangeItem
>
_getUsages
()
{
public
@Nonnull
List
<
RangeItem
>
_getUsages
()
{
List
<
RangeItem
>
r
=
new
ArrayList
<
RangeItem
>();
for
(
Entry
<
String
,
RangeSet
>
e
:
usages
.
entrySet
())
r
.
add
(
new
RangeItem
(
e
.
getKey
(),
e
.
getValue
()));
return
r
;
}
/**
* @deprecated Use {@link #addFor(hudson.model.Run)}
*/
@Deprecated
public
synchronized
void
add
(
AbstractBuild
b
)
throws
IOException
{
public
synchronized
void
add
(
@Nonnull
AbstractBuild
b
)
throws
IOException
{
addFor
((
Run
)
b
);
}
/**
* Adds a usage reference to the build.
* @param b {@link Run} to be referenced in {@link #usages}
* @since 1.577
*/
public
synchronized
void
addFor
(
Run
b
)
throws
IOException
{
public
synchronized
void
addFor
(
@Nonnull
Run
b
)
throws
IOException
{
add
(
b
.
getParent
().
getFullName
(),
b
.
getNumber
());
}
/**
* Records that a build of a job has used this file.
*/
public
synchronized
void
add
(
String
jobFullName
,
int
n
)
throws
IOException
{
public
synchronized
void
add
(
@Nonnull
String
jobFullName
,
int
n
)
throws
IOException
{
addWithoutSaving
(
jobFullName
,
n
);
save
();
}
void
addWithoutSaving
(
String
jobFullName
,
int
n
)
{
void
addWithoutSaving
(
@Nonnull
String
jobFullName
,
int
n
)
{
synchronized
(
usages
)
{
// TODO why not synchronized (this) like some, though not all, other accesses?
RangeSet
r
=
usages
.
get
(
jobFullName
);
if
(
r
==
null
)
{
...
...
@@ -968,6 +978,8 @@ public class Fingerprint implements ModelObject, Saveable {
*
* @return true
* if this record was modified.
*
* @throws IOException Save failure
*/
public
synchronized
boolean
trim
()
throws
IOException
{
boolean
modified
=
false
;
...
...
@@ -1041,7 +1053,7 @@ public class Fingerprint implements ModelObject, Saveable {
*
* @since 1.421
*/
public
Collection
<
FingerprintFacet
>
getFacets
()
{
public
@Nonnull
Collection
<
FingerprintFacet
>
getFacets
()
{
if
(
transientFacets
==
null
)
{
List
<
FingerprintFacet
>
transientFacets
=
new
ArrayList
<
FingerprintFacet
>();
for
(
TransientFingerprintFacetFactory
fff
:
TransientFingerprintFacetFactory
.
all
())
{
...
...
@@ -1079,7 +1091,11 @@ public class Fingerprint implements ModelObject, Saveable {
};
}
public
Collection
<
FingerprintFacet
>
getSortedFacets
()
{
/**
* Sorts {@link FingerprintFacet}s by their timestamps.
* @return Sorted list of {@link FingerprintFacet}s
*/
public
@Nonnull
Collection
<
FingerprintFacet
>
getSortedFacets
()
{
List
<
FingerprintFacet
>
r
=
new
ArrayList
<
FingerprintFacet
>(
getFacets
());
Collections
.
sort
(
r
,
new
Comparator
<
FingerprintFacet
>()
{
public
int
compare
(
FingerprintFacet
o1
,
FingerprintFacet
o2
)
{
...
...
@@ -1095,8 +1111,11 @@ public class Fingerprint implements ModelObject, Saveable {
/**
* Finds a facet of the specific type (including subtypes.)
* @param <T> Class of the {@link FingerprintFacet}
* @return First matching facet of the specified class
* @since 1.556
*/
public
<
T
extends
FingerprintFacet
>
T
getFacet
(
Class
<
T
>
type
)
{
public
@CheckForNull
<
T
extends
FingerprintFacet
>
T
getFacet
(
Class
<
T
>
type
)
{
for
(
FingerprintFacet
f
:
getFacets
())
{
if
(
type
.
isInstance
(
f
))
return
type
.
cast
(
f
);
...
...
@@ -1107,7 +1126,7 @@ public class Fingerprint implements ModelObject, Saveable {
/**
* Returns the actions contributed from {@link #getFacets()}
*/
public
List
<
Action
>
getActions
()
{
public
@Nonnull
List
<
Action
>
getActions
()
{
List
<
Action
>
r
=
new
ArrayList
<
Action
>();
for
(
FingerprintFacet
ff
:
getFacets
())
ff
.
createActions
(
r
);
...
...
@@ -1116,6 +1135,7 @@ public class Fingerprint implements ModelObject, Saveable {
/**
* Save the settings to a file.
* @throws IOException Save error
*/
public
synchronized
void
save
()
throws
IOException
{
if
(
BulkChange
.
contains
(
this
))
return
;
...
...
@@ -1218,14 +1238,14 @@ public class Fingerprint implements ModelObject, Saveable {
/**
* The file we save our configuration.
*/
private
static
XmlFile
getConfigFile
(
File
file
)
{
private
static
@Nonnull
XmlFile
getConfigFile
(
@Nonnull
File
file
)
{
return
new
XmlFile
(
XSTREAM
,
file
);
}
/**
* Determines the file name from md5sum.
*/
private
static
File
getFingerprintFile
(
byte
[]
md5sum
)
{
private
static
@Nonnull
File
getFingerprintFile
(
@Nonnull
byte
[]
md5sum
)
{
assert
md5sum
.
length
==
16
;
return
new
File
(
Jenkins
.
getInstance
().
getRootDir
(),
"fingerprints/"
+
Util
.
toHexString
(
md5sum
,
0
,
1
)+
'/'
+
Util
.
toHexString
(
md5sum
,
1
,
1
)+
'/'
+
Util
.
toHexString
(
md5sum
,
2
,
md5sum
.
length
-
2
)+
".xml"
);
...
...
@@ -1233,11 +1253,13 @@ public class Fingerprint implements ModelObject, Saveable {
/**
* Loads a {@link Fingerprint} from a file in the image.
* @return Loaded {@link Fingerprint}. Null if the config file does not exist or
* malformed.
*/
/*package*/
static
@CheckForNull
Fingerprint
load
(
byte
[]
md5sum
)
throws
IOException
{
/*package*/
static
@CheckForNull
Fingerprint
load
(
@Nonnull
byte
[]
md5sum
)
throws
IOException
{
return
load
(
getFingerprintFile
(
md5sum
));
}
/*package*/
static
@CheckForNull
Fingerprint
load
(
File
file
)
throws
IOException
{
/*package*/
static
@CheckForNull
Fingerprint
load
(
@Nonnull
File
file
)
throws
IOException
{
XmlFile
configFile
=
getConfigFile
(
file
);
if
(!
configFile
.
exists
())
return
null
;
...
...
core/src/main/java/hudson/model/FingerprintMap.java
浏览文件 @
cfc7f2dd
...
...
@@ -30,6 +30,8 @@ import jenkins.model.Jenkins;
import
java.io.File
;
import
java.io.IOException
;
import
java.util.Locale
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
/**
* Cache of {@link Fingerprint}s.
...
...
@@ -56,16 +58,17 @@ public final class FingerprintMap extends KeyedDataStorage<Fingerprint,Fingerpri
* set to non-null if {@link Fingerprint} to be created (if so)
* will have this build as the owner. Otherwise null, to indicate
* an owner-less build.
* @throws IOException Loading error
*/
public
Fingerprint
getOrCreate
(
AbstractBuild
build
,
String
fileName
,
byte
[]
md5sum
)
throws
IOException
{
public
@Nonnull
Fingerprint
getOrCreate
(
@CheckForNull
AbstractBuild
build
,
@Nonnull
String
fileName
,
@Nonnull
byte
[]
md5sum
)
throws
IOException
{
return
getOrCreate
(
build
,
fileName
,
Util
.
toHexString
(
md5sum
));
}
public
Fingerprint
getOrCreate
(
AbstractBuild
build
,
String
fileName
,
String
md5sum
)
throws
IOException
{
public
@Nonnull
Fingerprint
getOrCreate
(
@CheckForNull
AbstractBuild
build
,
@Nonnull
String
fileName
,
@Nonnull
String
md5sum
)
throws
IOException
{
return
super
.
getOrCreate
(
md5sum
,
new
FingerprintParams
(
build
,
fileName
));
}
public
Fingerprint
getOrCreate
(
Run
build
,
String
fileName
,
String
md5sum
)
throws
IOException
{
public
@Nonnull
Fingerprint
getOrCreate
(
@CheckForNull
Run
build
,
@Nonnull
String
fileName
,
@Nonnull
String
md5sum
)
throws
IOException
{
return
super
.
getOrCreate
(
md5sum
,
new
FingerprintParams
(
build
,
fileName
));
}
...
...
@@ -86,11 +89,11 @@ public final class FingerprintMap extends KeyedDataStorage<Fingerprint,Fingerpri
return
data
;
}
protected
Fingerprint
create
(
String
md5sum
,
FingerprintParams
createParams
)
throws
IOException
{
protected
@Nonnull
Fingerprint
create
(
@Nonnull
String
md5sum
,
@Nonnull
FingerprintParams
createParams
)
throws
IOException
{
return
new
Fingerprint
(
createParams
.
build
,
createParams
.
fileName
,
toByteArray
(
md5sum
));
}
protected
Fingerprint
load
(
String
key
)
throws
IOException
{
protected
@CheckForNull
Fingerprint
load
(
@Nonnull
String
key
)
throws
IOException
{
return
Fingerprint
.
load
(
toByteArray
(
key
));
}
...
...
@@ -98,10 +101,10 @@ static class FingerprintParams {
/**
* Null if the build isn't claiming to be the owner.
*/
final
Run
build
;
final
@CheckForNull
Run
build
;
final
String
fileName
;
public
FingerprintParams
(
Run
build
,
String
fileName
)
{
public
FingerprintParams
(
@CheckForNull
Run
build
,
@Nonnull
String
fileName
)
{
this
.
build
=
build
;
this
.
fileName
=
fileName
;
...
...
core/src/main/java/hudson/util/KeyedDataStorage.java
浏览文件 @
cfc7f2dd
...
...
@@ -31,6 +31,8 @@ import java.lang.ref.SoftReference;
import
java.text.MessageFormat
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
/**
* Convenient base class for implementing data storage.
...
...
@@ -69,10 +71,10 @@ public abstract class KeyedDataStorage<T,P> {
* but do so without having a single lock.
*/
private
static
class
Loading
<
T
>
{
private
T
value
;
private
@CheckForNull
T
value
;
private
boolean
set
;
public
synchronized
void
set
(
T
value
)
{
public
synchronized
void
set
(
@CheckForNull
T
value
)
{
this
.
set
=
true
;
this
.
value
=
value
;
notifyAll
();
...
...
@@ -82,7 +84,7 @@ public abstract class KeyedDataStorage<T,P> {
* Blocks until the value is {@link #set(Object)} by another thread
* and returns the value.
*/
public
synchronized
T
get
()
{
public
synchronized
@CheckForNull
T
get
()
{
try
{
while
(!
set
)
wait
();
...
...
@@ -100,26 +102,31 @@ public abstract class KeyedDataStorage<T,P> {
* {@link #create(String,Object) create} it and return it.
*
* @return
*
Never null
.
*
Item with the specified {@code key}
.
* @param createParams
* Additional parameters needed to create a new data object. Can be null.
* @throws IOException Loading error
*/
public
T
getOrCreate
(
String
key
,
P
createParams
)
throws
IOException
{
public
@Nonnull
T
getOrCreate
(
String
key
,
P
createParams
)
throws
IOException
{
return
get
(
key
,
true
,
createParams
);
}
/**
* Finds the data object that matches the given key if available, or null
* if not found.
* @return Item with the specified {@code key}
* @throws IOException Loading error
*/
public
T
get
(
String
key
)
throws
IOException
{
public
@CheckForNull
T
get
(
String
key
)
throws
IOException
{
return
get
(
key
,
false
,
null
);
}
/**
* Implementation of get/getOrCreate.
* @return Item with the specified {@code key}
* @throws IOException Loading error
*/
protected
T
get
(
String
key
,
boolean
createIfNotExist
,
P
createParams
)
throws
IOException
{
protected
@CheckForNull
T
get
(
@Nonnull
String
key
,
boolean
createIfNotExist
,
P
createParams
)
throws
IOException
{
while
(
true
)
{
totalQuery
.
incrementAndGet
();
Object
value
=
core
.
get
(
key
);
...
...
@@ -155,7 +162,7 @@ public abstract class KeyedDataStorage<T,P> {
if
(
t
==
null
&&
createIfNotExist
)
{
t
=
create
(
key
,
createParams
);
// create the new data
if
(
t
==
null
)
throw
new
IllegalStateException
();
// bug in the derived classes
throw
new
IllegalStateException
(
"Bug in the derived class"
);
// bug in the derived classes
}
}
catch
(
IOException
e
)
{
loadFailure
.
incrementAndGet
();
...
...
@@ -192,7 +199,7 @@ public abstract class KeyedDataStorage<T,P> {
* if load operation fails. This exception will be
* propagated to the caller.
*/
protected
abstract
T
load
(
String
key
)
throws
IOException
;
protected
abstract
@CheckForNull
T
load
(
String
key
)
throws
IOException
;
/**
* Creates a new data object.
...
...
@@ -206,13 +213,13 @@ public abstract class KeyedDataStorage<T,P> {
* this method returns a properly initialized "valid" object.
*
* @return
*
never null
. If construction fails, abort with an exception.
*
Created item
. If construction fails, abort with an exception.
* @throws IOException
* if the method fails to create a new data object, it can throw
* {@link IOException} (or any other exception) and that will be
* propagated to the caller.
*/
protected
abstract
T
create
(
String
key
,
P
createParams
)
throws
IOException
;
protected
abstract
@Nonnull
T
create
(
@Nonnull
String
key
,
@Nonnull
P
createParams
)
throws
IOException
;
public
void
resetPerformanceStats
()
{
totalQuery
.
set
(
0
);
...
...
core/src/main/java/jenkins/model/FingerprintFacet.java
浏览文件 @
cfc7f2dd
...
...
@@ -30,6 +30,7 @@ import org.kohsuke.accmod.Restricted;
import
org.kohsuke.accmod.restrictions.NoExternalUse
;
import
java.util.List
;
import
javax.annotation.Nonnull
;
/**
* Plugin-specific additions to fingerprint information.
...
...
@@ -65,9 +66,9 @@ public abstract class FingerprintFacet implements ExtensionPoint {
* @param fingerprint
* {@link Fingerprint} object to which this facet is going to be added to.
* @param timestamp
* Timestamp when the use happened.
* Timestamp when the use happened
(when the facet has been created)
.
*/
protected
FingerprintFacet
(
Fingerprint
fingerprint
,
long
timestamp
)
{
protected
FingerprintFacet
(
@Nonnull
Fingerprint
fingerprint
,
long
timestamp
)
{
assert
fingerprint
!=
null
;
this
.
fingerprint
=
fingerprint
;
this
.
timestamp
=
timestamp
;
...
...
@@ -79,18 +80,20 @@ public abstract class FingerprintFacet implements ExtensionPoint {
* @return
* always non-null.
*/
public
Fingerprint
getFingerprint
()
{
public
@Nonnull
Fingerprint
getFingerprint
()
{
return
fingerprint
;
}
/**
* Create action objects to be contributed to the owner {@link Fingerprint}.
*
*
By default, creates no actions.
* <p>
* {@link Fingerprint} calls this method for every {@link FingerprintFacet} that
* it owns when the rendering is requested.
* @param result Output list
*/
public
void
createActions
(
List
<
Action
>
result
)
{
// Create no actions by default
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录