Browse Source

Merge pull request #5020 in CORE/base-third from release/11.0 to final/11.0

* commit '8f0b253fc660c2e31b68c52946ba5d49c8a0067c':
  REPORT-66916 fix:使用自定义mysql8驱动,连接失败
  KERNEL-9267 拆分third.jar为third.jar + cbb.jar
  BI-100757 fix:使用自定义驱动,mysql数据连接连接不上
  无JIRA任务 fix: 添加essential依赖
  KERNEL-9984 feat: 【产品改进】slf4j冲突或缺少slf4j
final/11.0
superman 3 years ago
parent
commit
9195e1d824
  1. 52
      build.third_step0-jdk11.gradle
  2. 110
      build.third_step0.gradle
  3. 4
      build.third_step1.gradle
  4. 46
      fine-druid/src/main/java/com/fr/third/alibaba/druid/util/MySqlUtils.java
  5. 14
      fine-druid/src/main/java/com/fr/third/alibaba/druid/util/Utils.java
  6. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/Cache.java
  7. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/CacheManager.java
  8. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/DiskStorePathManager.java
  9. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/Element.java
  10. 6
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/TransactionController.java
  11. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/BeanHandler.java
  12. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/CacheConfiguration.java
  13. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/Configuration.java
  14. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/ConfigurationFactory.java
  15. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/ConfigurationHelper.java
  16. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/DiskStoreConfiguration.java
  17. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/TerracottaConfiguration.java
  18. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/blocking/SelfPopulatingCache.java
  19. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/blocking/UpdatingSelfPopulatingCache.java
  20. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/OverseerJob.java
  21. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/RefreshBatchJob.java
  22. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/ScheduledRefreshCacheExtension.java
  23. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/web/ShutdownListener.java
  24. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/ManualRMICacheManagerPeerProvider.java
  25. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatReceiver.java
  26. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatSender.java
  27. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastRMICacheManagerPeerProvider.java
  28. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/PayloadUtil.java
  29. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIAsynchronousCacheReplicator.java
  30. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIBootstrapCacheLoader.java
  31. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIBootstrapCacheLoaderFactory.java
  32. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerListener.java
  33. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerProvider.java
  34. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerProviderFactory.java
  35. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICachePeer.java
  36. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheReplicatorFactory.java
  37. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMISynchronousCacheReplicator.java
  38. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/exceptionhandler/ExceptionHandlingDynamicCacheProxy.java
  39. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/DevModeClassLoader.java
  40. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ManagementServerLoader.java
  41. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ManagementService.java
  42. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ResourceClassLoader.java
  43. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheConfigsResourceServiceImpl.java
  44. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheConfigsResourceServiceImplV2.java
  45. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagerConfigsResourceServiceImpl.java
  46. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagerConfigsResourceServiceImplV2.java
  47. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagersResourceServiceImpl.java
  48. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagersResourceServiceImplV2.java
  49. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheStatisticSamplesResourceServiceImpl.java
  50. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheStatisticSamplesResourceServiceImplV2.java
  51. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CachesResourceServiceImpl.java
  52. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CachesResourceServiceImplV2.java
  53. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/ElementsResourceServiceImpl.java
  54. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/ElementsResourceServiceImplV2.java
  55. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/QueryResourceServiceImpl.java
  56. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/QueryResourceServiceImplV2.java
  57. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/sampled/CacheSamplerImpl.java
  58. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/sampled/SampledMBeanRegistrationProvider.java
  59. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheEntityBuilder.java
  60. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheEntityBuilderV2.java
  61. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheManagerEntityBuilder.java
  62. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheManagerEntityBuilderV2.java
  63. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilder.java
  64. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilderV2.java
  65. 2
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/ConstrainableEntityBuilderSupport.java
  66. 2
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/ConstrainableEntityBuilderSupportV2.java
  67. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/RemoteAgentEndpointImpl.java
  68. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/impl/DefaultSizeOfEngine.java
  69. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/AgentLoader.java
  70. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/JvmInformation.java
  71. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/ObjectGraphWalker.java
  72. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/ReflectionSizeOf.java
  73. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/SizeOf.java
  74. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/UnsafeSizeOf.java
  75. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/filter/AnnotationSizeOfFilter.java
  76. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/statistics/beans/ExtendedStatisticsMBean.java
  77. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/statistics/extended/ExtendedStatisticsImpl.java
  78. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/CacheStore.java
  79. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/DiskStoreBootstrapCacheLoader.java
  80. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/DiskStoreBootstrapCacheLoaderFactory.java
  81. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/LruMemoryStore.java
  82. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/MemoryStore.java
  83. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/MemoryStoreEvictionPolicy.java
  84. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/cachingtier/CountBasedBackEnd.java
  85. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/cachingtier/PooledBasedBackEnd.java
  86. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/DiskStorageFactory.java
  87. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/Segment.java
  88. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/ods/FileAllocationTree.java
  89. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/KeySnapshotter.java
  90. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/RotatingSnapshotFile.java
  91. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaBootstrapCacheLoader.java
  92. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaCacheCluster.java
  93. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaClient.java
  94. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaClusteredInstanceHelper.java
  95. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/JtaLocalTransactionStore.java
  96. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/LocalTransactionContext.java
  97. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/LocalTransactionStore.java
  98. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/DefaultTransactionManagerLookup.java
  99. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/BitronixSelector.java
  100. 4
      fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/ClassSelector.java
  101. Some files were not shown because too many files have changed in this diff Show More

52
build.third_step0-jdk11.gradle

@ -7,7 +7,7 @@ tasks.withType(JavaCompile){
}
configurations.all {
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
}
//
sourceCompatibility=11
@ -24,8 +24,8 @@ jar{
}
repositories {
mavenCentral()
maven { url "http://mvn.finedevelop.com/repository/maven-public/" }
mavenCentral()
maven { url "http://mvn.finedevelop.com/repository/maven-public/" }
maven { url "http://mvn.finedevelop.com/repository/fanruan/" }
}
@ -52,7 +52,7 @@ def maven_version="${version}-${MVN_BRANCH}-SNAPSHOT"
def jar_version = version
configurations {
// thirdjar
// thirdjar
// sigar
essential
}
@ -63,32 +63,32 @@ String essentialVersion = findProperty("essentialVersion")
//
dependencies{
compileOnly "com.fr.essential:fine-essential:${essentialVersion}"
// thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
// thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
// sigar "com.fr.third:sigar:1.6.0"
testCompile 'junit:junit:4.12'
testCompile 'junit:junit:4.12'
}
publishing {
publications {
third(MavenPublication) {
groupId "com.fr.third"
artifactId "fine-third"
version maven_version
from components.java
}
}
repositories {
publications {
third(MavenPublication) {
groupId "com.fr.third"
artifactId "fine-third"
version maven_version
from components.java
}
}
repositories {
maven {
url "http://mvn.finedevelop.com/repository/fanruan/"
credentials {
username = findProperty("NEXUS_USERNAME")
password = findProperty("NEXUS_PASSWORD")
}
url "http://mvn.finedevelop.com/repository/fanruan/"
credentials {
username = findProperty("NEXUS_USERNAME")
password = findProperty("NEXUS_PASSWORD")
}
}
}
}
}
task unpack(type:Copy) {
@ -121,15 +121,5 @@ task unpack(type:Copy) {
}
// essential依赖等级的jar全部解压到classes下
task unpackEssential(type:Copy) {
for (File file : configurations.essential.files) {
from zipTree(file)
}
into classesDir
}
jar.dependsOn unpackEssential
jar.dependsOn unpack

110
build.third_step0.gradle

@ -7,7 +7,7 @@ tasks.withType(JavaCompile){
}
configurations.all {
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
}
//
sourceCompatibility=1.8
@ -23,8 +23,8 @@ jar{
}
repositories {
mavenCentral()
maven { url "http://mvn.finedevelop.com/repository/maven-public/" }
mavenCentral()
maven { url "http://mvn.finedevelop.com/repository/maven-public/" }
maven { url "http://mvn.finedevelop.com/repository/fanruan/" }
}
@ -54,11 +54,11 @@ def indexV = branchName.indexOf( "%2F");
String branchNameUpperCase = "RELEASE"
if(indexV != -1){
version= branchName.substring(indexV+3, branchName.length()).toUpperCase()
version= branchName.substring(indexV+3, branchName.length()).toUpperCase()
branchNameUpperCase = branchName.substring(0, indexV).toUpperCase()
maven_version_build = project.version +"-" + branchNameUpperCase +"-SNAPSHOT"
} else {
version= branchName
version= branchName
maven_version_build = project.version +"-SNAPSHOT"
}
@ -66,7 +66,7 @@ def maven_version="${version}.${formattedDate}"
def jar_version = version
configurations {
// thirdjar
// thirdjar
// sigar
essential
}
@ -78,64 +78,61 @@ String cbbVersion = findProperty("cbbVersion")
//
dependencies{
essential "com.fr.essential:fine-essential:${essentialVersion}"
essential "com.fr.cbb:fine-scheduler:${cbbVersion}"
essential "com.fr.cbb:fine-function:${cbbVersion}"
essential "com.fr.cbb:fine-sql:${cbbVersion}"
// thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
// thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
// sigar "com.fr.third:sigar:1.6.0"
testCompile 'junit:junit:4.12'
testCompile 'junit:junit:4.12'
}
publishing {
publications {
third(MavenPublication) {
groupId "com.fr.third"
artifactId "fine-third"
version maven_version
ext.repo = 'release'
from components.java
}
third_build(MavenPublication) {
groupId "com.fr.third"
artifactId project.hasProperty("withCBB") ? "fine-third" : "fine-third-without-cbb"
version maven_version_build
ext.repo = 'snapshot'
from components.java
}
}
repositories {
publications {
third(MavenPublication) {
groupId "com.fr.third"
artifactId "fine-third"
version maven_version
ext.repo = 'release'
from components.java
}
third_build(MavenPublication) {
groupId "com.fr.third"
artifactId "fine-third"
version maven_version_build
ext.repo = 'snapshot'
from components.java
}
}
repositories {
maven {
name "release"
url "http://mvn.finedevelop.com/repository/fanruan-release/"
credentials {
username = findProperty("NEXUS_USERNAME")
password = findProperty("NEXUS_PASSWORD")
}
name "release"
url "http://mvn.finedevelop.com/repository/fanruan-release/"
credentials {
username = findProperty("NEXUS_USERNAME")
password = findProperty("NEXUS_PASSWORD")
}
}
maven {
name "snapshot"
url "http://mvn.finedevelop.com/repository/fanruan/"
credentials {
username = findProperty("NEXUS_USERNAME")
password = findProperty("NEXUS_PASSWORD")
}
name "snapshot"
url "http://mvn.finedevelop.com/repository/fanruan/"
credentials {
username = findProperty("NEXUS_USERNAME")
password = findProperty("NEXUS_PASSWORD")
}
}
}
}
}
afterEvaluate {
tasks.withType(PublishToMavenRepository) { task ->
if (task.publication.hasProperty('repo') && task.publication.repo != task.repository.name) {
task.enabled = false
task.group = null
}
}
tasks.withType(PublishToMavenRepository) { task ->
if (task.publication.hasProperty('repo') && task.publication.repo != task.repository.name) {
task.enabled = false
task.group = null
}
}
}
task unpack(type:Copy) {
@ -167,19 +164,4 @@ task unpack(type:Copy) {
}
}
// essential依赖等级的jar全部解压到classes下
task unpackEssential(type:Copy) {
if (project.hasProperty("withCBB")) {
for (File file : configurations.essential.files) {
from (zipTree(file)) {
exclude "META-INF/versions/11/*"
exclude "META-INF/maven/com.zaxxer/**"
}
}
into classesDir
}
}
unpackEssential.dependsOn unpack
jar.dependsOn unpackEssential
jar.dependsOn unpack

4
build.third_step1.gradle

@ -86,8 +86,12 @@ def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.s
def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1)
def MVN_BRANCH = branchVariable.toUpperCase()
// essential的对应关系配置在TeamCity
String essentialVersion = findProperty("essentialVersion")
//
dependencies{
compileOnly "com.fr.essential:fine-essential:${essentialVersion}"
compile fileTree(dir:"${srcDir}/fine-aspectj/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-cssparser/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-freehep/lib",include:'**/*.jar')

46
fine-druid/src/main/java/com/fr/third/alibaba/druid/util/MySqlUtils.java

@ -357,16 +357,14 @@ public class MySqlUtils {
}
Class<?> clazz = conn.getClass();
if (class_ConnectionImpl == null) {
if (clazz.getName().equals("com.mysql.jdbc.ConnectionImpl")) {
class_ConnectionImpl = clazz;
} else if (clazz.getName().equals("com.mysql.jdbc.Connection")) { // mysql 5.0.x
class_ConnectionImpl = clazz;
} else if (clazz.getName().equals("com.mysql.cj.jdbc.ConnectionImpl")) { // mysql 5.0.x
class_ConnectionImpl = clazz;
} else if (clazz.getSuperclass().getName().equals("com.mysql.jdbc.ConnectionImpl")) {
class_ConnectionImpl = clazz.getSuperclass();
}
if (clazz.getName().equals("com.mysql.jdbc.ConnectionImpl")) {
class_ConnectionImpl = clazz;
} else if (clazz.getName().equals("com.mysql.jdbc.Connection")) { // mysql 5.0.x
class_ConnectionImpl = clazz;
} else if (clazz.getName().equals("com.mysql.cj.jdbc.ConnectionImpl")) { // mysql 5.0.x
class_ConnectionImpl = clazz;
} else if (clazz.getSuperclass().getName().equals("com.mysql.jdbc.ConnectionImpl")) {
class_ConnectionImpl = clazz.getSuperclass();
}
if (class_ConnectionImpl == clazz || class_ConnectionImpl == clazz.getSuperclass()) {
@ -387,14 +385,16 @@ public class MySqlUtils {
}
public static long getLastPacketReceivedTimeMs(Connection conn) throws SQLException {
if (class_connectionImpl == null && !class_connectionImpl_Error) {
if (!class_connectionImpl_Error) {
if (conn == null) {
return -1;
}
try {
class_connectionImpl = Utils.loadClass("com.mysql.jdbc.MySQLConnection");
if (class_connectionImpl == null) {
class_connectionImpl = Utils.loadClass("com.mysql.cj.MysqlConnection");
if (class_connectionImpl != null) {
mysqlJdbcVersion6 = true;
}
//REPORT-66916 这里之前获取到的是lib下的mysql5实现,而不是自定义mysql8驱动的实现
String className = conn.getClass().getName();
class_connectionImpl = Utils.loadClass(className);
if (className.equals("com.mysql.cj.MysqlConnection")) {
mysqlJdbcVersion6 = true;
}
} catch (Throwable error) {
class_connectionImpl_Error = true;
@ -406,9 +406,7 @@ public class MySqlUtils {
}
if(mysqlJdbcVersion6){
if (classJdbc == null) {
classJdbc = Utils.loadClass("com.mysql.cj.jdbc.JdbcConnection");
}
classJdbc = Utils.loadClass("com.mysql.cj.jdbc.JdbcConnection");
if (classJdbc == null) {
return -1;
@ -435,13 +433,13 @@ public class MySqlUtils {
return System.currentTimeMillis()
- ((Long)
getIdleFor.invoke(connImpl))
getIdleFor.invoke(connImpl))
.longValue();
} catch (Exception e) {
throw new SQLException("getIdleFor error", e);
}
} else {
if (method_getIO == null && !method_getIO_error) {
if (!method_getIO_error) {
try {
method_getIO = class_connectionImpl.getMethod("getIO");
} catch (Throwable error) {
@ -453,7 +451,7 @@ public class MySqlUtils {
return -1;
}
if (class_MysqlIO == null && !class_MysqlIO_Error) {
if (!class_MysqlIO_Error) {
try {
class_MysqlIO = Utils.loadClass("com.mysql.jdbc.MysqlIO");
} catch (Throwable error) {
@ -465,7 +463,7 @@ public class MySqlUtils {
return -1;
}
if (method_getLastPacketReceivedTimeMs == null && !method_getLastPacketReceivedTimeMs_error) {
if (!method_getLastPacketReceivedTimeMs_error) {
try {
Method method = class_MysqlIO.getDeclaredMethod("getLastPacketReceivedTimeMs");
method.setAccessible(true);

14
fine-druid/src/main/java/com/fr/third/alibaba/druid/util/Utils.java

@ -239,21 +239,21 @@ public class Utils {
return null;
}
try {
return Class.forName(className);
} catch (ClassNotFoundException e) {
// skip
}
ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader();
if (ctxClassLoader != null) {
try {
clazz = ctxClassLoader.loadClass(className);
return clazz = ctxClassLoader.loadClass(className);
} catch (ClassNotFoundException e) {
// skip
}
}
try {
clazz = Class.forName(className);
} catch (ClassNotFoundException e) {
// skip
}
return clazz;
}

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/Cache.java vendored

@ -99,8 +99,8 @@ import com.fr.third.net.sf.ehcache.writer.CacheWriterManagerException;
import com.fr.third.net.sf.ehcache.constructs.nonstop.concurrency.LockOperationTimedOutNonstopException;
import com.fr.third.net.sf.ehcache.store.TxCopyingCacheStore;
import com.fr.third.net.sf.ehcache.util.PropertyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.context.annotations.ContextAttribute;
import org.terracotta.statistics.StatisticsManager;
import org.terracotta.statistics.observer.OperationObserver;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/CacheManager.java vendored

@ -65,8 +65,8 @@ import com.fr.third.net.sf.ehcache.util.FailSafeTimer;
import com.fr.third.net.sf.ehcache.util.PropertyUtil;
import com.fr.third.net.sf.ehcache.writer.writebehind.WriteBehind;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.statistics.StatisticsManager;
import java.io.File;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/DiskStorePathManager.java vendored

@ -27,8 +27,8 @@ import java.util.Set;
import com.fr.third.net.sf.ehcache.config.DiskStoreConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* Manager class to handle disk store path. CacheManager has a reference to this manager.

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/Element.java vendored

@ -22,8 +22,8 @@ import com.fr.third.net.sf.ehcache.config.CacheConfiguration;
import com.fr.third.net.sf.ehcache.pool.sizeof.annotations.IgnoreSizeOf;
import com.fr.third.net.sf.ehcache.util.TimeUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;

6
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/TransactionController.java vendored

@ -22,9 +22,9 @@ import com.fr.third.net.sf.ehcache.transaction.local.LocalTransactionContext;
import com.fr.third.net.sf.ehcache.util.lang.VicariousThreadLocal;
import com.fr.third.net.sf.ehcache.transaction.TransactionTimeoutException;
import com.fr.third.net.sf.ehcache.transaction.local.LocalRecoveryManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import com.fr.third.slf4j.MDC;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/BeanHandler.java vendored

@ -24,8 +24,8 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/CacheConfiguration.java vendored

@ -33,8 +33,8 @@ import com.fr.third.net.sf.ehcache.event.NotificationScope;
import com.fr.third.net.sf.ehcache.store.MemoryStoreEvictionPolicy;
import com.fr.third.net.sf.ehcache.store.compound.ReadWriteCopyStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collection;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/Configuration.java vendored

@ -29,8 +29,8 @@ import com.fr.third.net.sf.ehcache.CacheException;
import com.fr.third.net.sf.ehcache.ObjectExistsException;
import com.fr.third.net.sf.ehcache.util.PropertyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/ConfigurationFactory.java vendored

@ -33,8 +33,8 @@ import java.net.URL;
import java.util.HashSet;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
import java.util.regex.Matcher;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/ConfigurationHelper.java vendored

@ -43,8 +43,8 @@ import com.fr.third.net.sf.ehcache.exceptionhandler.CacheExceptionHandler;
import com.fr.third.net.sf.ehcache.exceptionhandler.CacheExceptionHandlerFactory;
import com.fr.third.net.sf.ehcache.util.PropertyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* The configuration for ehcache.

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/DiskStoreConfiguration.java vendored

@ -20,8 +20,8 @@ import java.io.File;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* A class to represent DiskStore configuration

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/TerracottaConfiguration.java vendored

@ -16,8 +16,8 @@
package com.fr.third.net.sf.ehcache.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* Class to hold the Terracotta configuration - either a pointer to the real config or a

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/blocking/SelfPopulatingCache.java vendored

@ -19,8 +19,8 @@ package com.fr.third.net.sf.ehcache.constructs.blocking;
import com.fr.third.net.sf.ehcache.Ehcache;
import com.fr.third.net.sf.ehcache.CacheException;
import com.fr.third.net.sf.ehcache.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.util.Collection;
import java.util.Iterator;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/blocking/UpdatingSelfPopulatingCache.java vendored

@ -25,8 +25,8 @@ import com.fr.third.net.sf.ehcache.concurrent.Sync;
import com.fr.third.net.sf.ehcache.CacheException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/OverseerJob.java vendored

@ -38,8 +38,8 @@ import com.fr.third.v2.org.quartz.SchedulerException;
import com.fr.third.v2.org.quartz.Trigger;
import com.fr.third.v2.org.quartz.TriggerBuilder;
import com.fr.third.v2.org.quartz.impl.matchers.GroupMatcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* This is the seed job for a scheduled execution of a scheduled refresh job.

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/RefreshBatchJob.java vendored

@ -24,8 +24,8 @@ import com.fr.third.v2.org.quartz.Job;
import com.fr.third.v2.org.quartz.JobDataMap;
import com.fr.third.v2.org.quartz.JobExecutionContext;
import com.fr.third.v2.org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.util.Collection;
import java.util.HashMap;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/ScheduledRefreshCacheExtension.java vendored

@ -29,8 +29,8 @@ import com.fr.third.v2.org.quartz.Scheduler;
import com.fr.third.v2.org.quartz.SchedulerException;
import com.fr.third.v2.org.quartz.TriggerBuilder;
import com.fr.third.v2.org.quartz.impl.StdSchedulerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.statistics.StatisticsManager;
import java.util.Collection;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/web/ShutdownListener.java vendored

@ -17,8 +17,8 @@
package com.fr.third.net.sf.ehcache.constructs.web;
import com.fr.third.net.sf.ehcache.CacheManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/ManualRMICacheManagerPeerProvider.java vendored

@ -25,8 +25,8 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* A provider of Peer RMI addresses based off manual configuration.

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatReceiver.java vendored

@ -32,8 +32,8 @@ import java.util.concurrent.Executors;
import com.fr.third.net.sf.ehcache.CacheManager;
import com.fr.third.net.sf.ehcache.util.NamedThreadFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* Receives heartbeats from any {@link MulticastKeepaliveHeartbeatSender}s out there.

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatSender.java vendored

@ -26,8 +26,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* Sends heartbeats to a multicast group containing a compressed list of URLs.

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastRMICacheManagerPeerProvider.java vendored

@ -28,8 +28,8 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* A peer provider which discovers peers using Multicast.

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/PayloadUtil.java vendored

@ -25,8 +25,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIAsynchronousCacheReplicator.java vendored

@ -31,8 +31,8 @@ import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import com.fr.third.net.sf.ehcache.distribution.RmiEventMessage.RmiEventType;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
/**
* Listens to {@link CacheManager} and {@link Cache} events and propagates those to

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIBootstrapCacheLoader.java vendored

@ -26,8 +26,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* Loads Elements from a random Cache Peer

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIBootstrapCacheLoaderFactory.java vendored

@ -18,8 +18,8 @@ package com.fr.third.net.sf.ehcache.distribution;
import com.fr.third.net.sf.ehcache.bootstrap.BootstrapCacheLoaderFactory;
import com.fr.third.net.sf.ehcache.util.PropertyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.util.Properties;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerListener.java vendored

@ -41,8 +41,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* A cache server which exposes available cache operations remotely through RMI.

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerProvider.java vendored

@ -29,8 +29,8 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerProviderFactory.java vendored

@ -25,8 +25,8 @@ import java.net.InetAddress;
import java.util.Properties;
import java.util.StringTokenizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* Builds a factory based on RMI

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICachePeer.java vendored

@ -27,8 +27,8 @@ import java.rmi.server.UnicastRemoteObject;
import java.util.ArrayList;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* An RMI based implementation of <code>CachePeer</code>.

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheReplicatorFactory.java vendored

@ -22,8 +22,8 @@ import com.fr.third.net.sf.ehcache.util.PropertyUtil;
import java.util.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMISynchronousCacheReplicator.java vendored

@ -26,8 +26,8 @@ import com.fr.third.net.sf.ehcache.CacheException;
import java.io.Serializable;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* Listens to {@link CacheManager} and {@link Cache} events and propagates those to

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/exceptionhandler/ExceptionHandlingDynamicCacheProxy.java vendored

@ -22,8 +22,8 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/DevModeClassLoader.java vendored

@ -32,8 +32,8 @@ import java.util.regex.Pattern;
import com.fr.third.net.sf.ehcache.util.MergedEnumeration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* Classloader used for devmode to load management classes

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ManagementServerLoader.java vendored

@ -19,8 +19,8 @@ package com.fr.third.net.sf.ehcache.management;
import com.fr.third.net.sf.ehcache.CacheManager;
import com.fr.third.net.sf.ehcache.CacheException;
import com.fr.third.net.sf.ehcache.config.ManagementRESTServiceConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ManagementService.java vendored

@ -21,8 +21,8 @@ import com.fr.third.net.sf.ehcache.event.CacheEventListener;
import com.fr.third.net.sf.ehcache.CacheException;
import com.fr.third.net.sf.ehcache.Status;
import com.fr.third.net.sf.ehcache.event.CacheManagerEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import javax.management.InstanceAlreadyExistsException;
import javax.management.MBeanRegistrationException;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ResourceClassLoader.java vendored

@ -33,8 +33,8 @@ import java.util.jar.Attributes.Name;
import com.fr.third.net.sf.ehcache.util.MergedEnumeration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* ResourceClassLoader can load classes nested in a subdirectory of a jar

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheConfigsResourceServiceImpl.java vendored

@ -3,8 +3,8 @@ package com.fr.third.net.sf.ehcache.management.resource.services;
import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactory;
import com.fr.third.net.sf.ehcache.management.resource.CacheConfigEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.ServiceExecutionException;
import org.terracotta.management.ServiceLocator;
import org.terracotta.management.resource.exceptions.ResourceRuntimeException;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheConfigsResourceServiceImplV2.java vendored

@ -3,8 +3,8 @@ package com.fr.third.net.sf.ehcache.management.resource.services;
import com.fr.third.net.sf.ehcache.management.resource.CacheConfigEntityV2;
import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactoryV2;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.ServiceExecutionException;
import org.terracotta.management.ServiceLocator;
import org.terracotta.management.resource.ResponseEntityV2;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagerConfigsResourceServiceImpl.java vendored

@ -3,8 +3,8 @@ package com.fr.third.net.sf.ehcache.management.resource.services;
import com.fr.third.net.sf.ehcache.management.resource.CacheManagerConfigEntity;
import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.ServiceExecutionException;
import org.terracotta.management.ServiceLocator;
import org.terracotta.management.resource.exceptions.ResourceRuntimeException;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagerConfigsResourceServiceImplV2.java vendored

@ -3,8 +3,8 @@ package com.fr.third.net.sf.ehcache.management.resource.services;
import com.fr.third.net.sf.ehcache.management.resource.CacheManagerConfigEntityV2;
import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactoryV2;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.ServiceExecutionException;
import org.terracotta.management.ServiceLocator;
import org.terracotta.management.resource.ResponseEntityV2;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagersResourceServiceImpl.java vendored

@ -4,8 +4,8 @@ import com.fr.third.net.sf.ehcache.management.resource.CacheManagerEntity;
import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactory;
import com.fr.third.net.sf.ehcache.management.service.CacheManagerService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.ServiceLocator;
import org.terracotta.management.ServiceExecutionException;
import org.terracotta.management.resource.exceptions.ResourceRuntimeException;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagersResourceServiceImplV2.java vendored

@ -4,8 +4,8 @@ import com.fr.third.net.sf.ehcache.management.resource.CacheManagerEntityV2;
import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactoryV2;
import com.fr.third.net.sf.ehcache.management.service.CacheManagerServiceV2;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.ServiceLocator;
import org.terracotta.management.ServiceExecutionException;
import org.terracotta.management.resource.ResponseEntityV2;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheStatisticSamplesResourceServiceImpl.java vendored

@ -7,8 +7,8 @@ package com.fr.third.net.sf.ehcache.management.resource.services;
import com.fr.third.net.sf.ehcache.management.resource.CacheStatisticSampleEntity;
import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.ServiceExecutionException;
import org.terracotta.management.ServiceLocator;
import org.terracotta.management.resource.exceptions.ResourceRuntimeException;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheStatisticSamplesResourceServiceImplV2.java vendored

@ -18,8 +18,8 @@ import javax.ws.rs.core.UriInfo;
import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactoryV2;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.ServiceExecutionException;
import org.terracotta.management.ServiceLocator;
import org.terracotta.management.resource.ResponseEntityV2;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CachesResourceServiceImpl.java vendored

@ -21,8 +21,8 @@ import com.fr.third.net.sf.ehcache.management.service.CacheService;
import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactory;
import com.fr.third.net.sf.ehcache.management.resource.CacheEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.ServiceExecutionException;
import org.terracotta.management.ServiceLocator;
import org.terracotta.management.resource.exceptions.ResourceRuntimeException;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CachesResourceServiceImplV2.java vendored

@ -20,8 +20,8 @@ import com.fr.third.net.sf.ehcache.management.service.CacheServiceV2;
import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactoryV2;
import com.fr.third.net.sf.ehcache.management.resource.CacheEntityV2;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.ServiceExecutionException;
import org.terracotta.management.ServiceLocator;
import org.terracotta.management.resource.ResponseEntityV2;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/ElementsResourceServiceImpl.java vendored

@ -7,8 +7,8 @@ package com.fr.third.net.sf.ehcache.management.resource.services;
import com.fr.third.net.sf.ehcache.management.service.CacheService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.ServiceExecutionException;
import org.terracotta.management.ServiceLocator;
import org.terracotta.management.resource.exceptions.ResourceRuntimeException;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/ElementsResourceServiceImplV2.java vendored

@ -7,8 +7,8 @@ package com.fr.third.net.sf.ehcache.management.resource.services;
import com.fr.third.net.sf.ehcache.management.service.CacheServiceV2;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.ServiceExecutionException;
import org.terracotta.management.ServiceLocator;
import org.terracotta.management.resource.exceptions.ResourceRuntimeException;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/QueryResourceServiceImpl.java vendored

@ -15,8 +15,8 @@ import javax.ws.rs.core.UriInfo;
import com.fr.third.net.sf.ehcache.management.resource.QueryResultsEntity;
import com.fr.third.net.sf.ehcache.management.service.CacheManagerService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.ServiceExecutionException;
import org.terracotta.management.ServiceLocator;
import org.terracotta.management.resource.exceptions.ExceptionUtils;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/QueryResourceServiceImplV2.java vendored

@ -13,8 +13,8 @@ import javax.ws.rs.core.UriInfo;
import com.fr.third.net.sf.ehcache.management.service.CacheManagerServiceV2;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.ServiceExecutionException;
import org.terracotta.management.ServiceLocator;
import org.terracotta.management.resource.ResponseEntityV2;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/sampled/CacheSamplerImpl.java vendored

@ -36,8 +36,8 @@ import com.fr.third.net.sf.ehcache.util.counter.sampled.SampledCounter;
import com.fr.third.net.sf.ehcache.util.counter.sampled.SampledRateCounter;
import com.fr.third.net.sf.ehcache.util.counter.sampled.TimeStampedCounterValue;
import com.fr.third.net.sf.ehcache.writer.writebehind.WriteBehindManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.statistics.archive.Timestamped;
import java.util.ArrayList;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/sampled/SampledMBeanRegistrationProvider.java vendored

@ -25,8 +25,8 @@ import com.fr.third.net.sf.ehcache.event.CacheManagerEventListener;
import com.fr.third.net.sf.ehcache.management.provider.MBeanRegistrationProvider;
import com.fr.third.net.sf.ehcache.management.provider.MBeanRegistrationProviderException;
import com.fr.third.net.sf.ehcache.terracotta.ClusteredInstanceFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import javax.management.InstanceAlreadyExistsException;
import javax.management.MBeanRegistrationException;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheEntityBuilder.java vendored

@ -16,8 +16,8 @@ import com.fr.third.net.sf.ehcache.management.sampled.CacheSampler;
import com.fr.third.net.sf.ehcache.management.resource.CacheEntity;
import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.resource.AgentEntity;
/**

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheEntityBuilderV2.java vendored

@ -16,8 +16,8 @@ import com.fr.third.net.sf.ehcache.management.sampled.CacheSampler;
import com.fr.third.net.sf.ehcache.management.resource.CacheEntityV2;
import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.resource.AgentEntityV2;
/**

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheManagerEntityBuilder.java vendored

@ -7,8 +7,8 @@ package com.fr.third.net.sf.ehcache.management.service.impl;
import com.fr.third.net.sf.ehcache.management.resource.CacheManagerEntity;
import com.fr.third.net.sf.ehcache.management.sampled.CacheManagerSampler;
import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.resource.AgentEntity;
import java.util.ArrayList;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheManagerEntityBuilderV2.java vendored

@ -8,8 +8,8 @@ import com.fr.third.net.sf.ehcache.management.resource.CacheManagerEntityV2;
import com.fr.third.net.sf.ehcache.management.sampled.CacheManagerSampler;
import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.resource.AgentEntityV2;
import java.util.ArrayList;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilder.java vendored

@ -21,8 +21,8 @@ import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix;
import com.fr.third.net.sf.ehcache.util.counter.sampled.SampledCounter;
import com.fr.third.net.sf.ehcache.util.counter.sampled.TimeStampedCounterValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.resource.AgentEntity;
/**

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilderV2.java vendored

@ -21,8 +21,8 @@ import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix;
import com.fr.third.net.sf.ehcache.util.counter.sampled.SampledCounter;
import com.fr.third.net.sf.ehcache.util.counter.sampled.TimeStampedCounterValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.resource.AgentEntityV2;
/**

2
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/ConstrainableEntityBuilderSupport.java vendored

@ -7,7 +7,7 @@ package com.fr.third.net.sf.ehcache.management.service.impl;
import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix;
import com.fr.third.net.sf.ehcache.util.counter.Counter;
import com.fr.third.net.sf.ehcache.util.counter.sampled.SampledCounter;
import org.slf4j.Logger;
import com.fr.third.slf4j.Logger;
import java.lang.reflect.Method;
import java.util.Arrays;

2
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/ConstrainableEntityBuilderSupportV2.java vendored

@ -17,7 +17,7 @@ import com.fr.third.net.sf.ehcache.util.counter.sampled.SampledCounter;
import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix;
import com.fr.third.net.sf.ehcache.util.ManagementAttribute;
import org.slf4j.Logger;
import com.fr.third.slf4j.Logger;
/**
* @author brandony

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/RemoteAgentEndpointImpl.java vendored

@ -5,8 +5,8 @@
package com.fr.third.net.sf.ehcache.management.service.impl;
import com.fr.third.net.sf.ehcache.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.management.l1bridge.AbstractRemoteAgentEndpointImpl;
import javax.management.MBeanException;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/impl/DefaultSizeOfEngine.java vendored

@ -36,8 +36,8 @@ import com.fr.third.net.sf.ehcache.pool.sizeof.ReflectionSizeOf;
import com.fr.third.net.sf.ehcache.pool.sizeof.UnsafeSizeOf;
import com.fr.third.net.sf.ehcache.pool.sizeof.filter.CombinationSizeOfFilter;
import com.fr.third.net.sf.ehcache.pool.sizeof.filter.ResourceSizeOfFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* @author Alex Snaps

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/AgentLoader.java vendored

@ -18,8 +18,8 @@ package com.fr.third.net.sf.ehcache.pool.sizeof;
import com.fr.third.net.sf.ehcache.config.MemoryUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileOutputStream;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/JvmInformation.java vendored

@ -23,8 +23,8 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.openmbean.CompositeData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* Detects and represents JVM-specific properties that relate to the memory

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/ObjectGraphWalker.java vendored

@ -29,8 +29,8 @@ import java.util.Stack;
import com.fr.third.net.sf.ehcache.pool.sizeof.filter.SizeOfFilter;
import com.fr.third.net.sf.ehcache.util.WeakIdentityConcurrentMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* This will walk an object graph and let you execute some "function" along the way

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/ReflectionSizeOf.java vendored

@ -23,8 +23,8 @@ import java.util.Stack;
import com.fr.third.net.sf.ehcache.pool.sizeof.filter.PassThroughFilter;
import com.fr.third.net.sf.ehcache.pool.sizeof.filter.SizeOfFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* SizeOf that uses reflection to measure on heap size of object graphs

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/SizeOf.java vendored

@ -20,8 +20,8 @@ import com.fr.third.net.sf.ehcache.pool.Size;
import com.fr.third.net.sf.ehcache.pool.sizeof.ObjectGraphWalker.Visitor;
import com.fr.third.net.sf.ehcache.pool.sizeof.filter.SizeOfFilter;
import com.fr.third.net.sf.ehcache.util.WeakIdentityConcurrentMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/UnsafeSizeOf.java vendored

@ -22,8 +22,8 @@ import java.lang.reflect.Modifier;
import com.fr.third.net.sf.ehcache.pool.sizeof.filter.PassThroughFilter;
import com.fr.third.net.sf.ehcache.pool.sizeof.filter.SizeOfFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import sun.misc.Unsafe;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/filter/AnnotationSizeOfFilter.java vendored

@ -25,8 +25,8 @@ import java.lang.annotation.Annotation;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* A Filter that will filter fields, based on the {@link IgnoreSizeOf} annotation

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/statistics/beans/ExtendedStatisticsMBean.java vendored

@ -28,8 +28,8 @@ import java.util.concurrent.TimeUnit;
import com.fr.third.net.sf.ehcache.Ehcache;
import com.fr.third.net.sf.ehcache.statistics.extended.ExtendedStatistics;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.statistics.ValueStatistic;
import org.terracotta.statistics.archive.Timestamped;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/statistics/extended/ExtendedStatisticsImpl.java vendored

@ -31,8 +31,8 @@ import com.fr.third.net.sf.ehcache.store.StoreOperationOutcomes;
import com.fr.third.net.sf.ehcache.transaction.xa.XaCommitOutcome;
import com.fr.third.net.sf.ehcache.transaction.xa.XaRecoveryOutcome;
import com.fr.third.net.sf.ehcache.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.context.TreeNode;
import org.terracotta.context.query.Matcher;
import org.terracotta.context.query.Matchers;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/CacheStore.java vendored

@ -40,8 +40,8 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.context.annotations.ContextChild;
/**

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/DiskStoreBootstrapCacheLoader.java vendored

@ -19,8 +19,8 @@ package com.fr.third.net.sf.ehcache.store;
import com.fr.third.net.sf.ehcache.CacheException;
import com.fr.third.net.sf.ehcache.Ehcache;
import com.fr.third.net.sf.ehcache.distribution.RemoteCacheException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.util.Iterator;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/DiskStoreBootstrapCacheLoaderFactory.java vendored

@ -17,8 +17,8 @@
package com.fr.third.net.sf.ehcache.store;
import com.fr.third.net.sf.ehcache.bootstrap.BootstrapCacheLoaderFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.util.Properties;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/LruMemoryStore.java vendored

@ -28,8 +28,8 @@ import com.fr.third.net.sf.ehcache.pool.Size;
import com.fr.third.net.sf.ehcache.pool.SizeOfEngine;
import com.fr.third.net.sf.ehcache.pool.SizeOfEngineLoader;
import com.fr.third.net.sf.ehcache.writer.CacheWriterManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Iterator;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/MemoryStore.java vendored

@ -44,8 +44,8 @@ import com.fr.third.net.sf.ehcache.search.impl.SearchManager;
import com.fr.third.net.sf.ehcache.store.chm.SelectableConcurrentHashMap;
import com.fr.third.net.sf.ehcache.writer.CacheWriterManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.statistics.OperationStatistic;
import org.terracotta.statistics.Statistic;
import org.terracotta.statistics.StatisticsManager;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/MemoryStoreEvictionPolicy.java vendored

@ -19,8 +19,8 @@ package com.fr.third.net.sf.ehcache.store;
import java.io.Serializable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* A typesafe enumeration of eviction policies.

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/cachingtier/CountBasedBackEnd.java vendored

@ -20,8 +20,8 @@ import com.fr.third.net.sf.ehcache.store.LruPolicy;
import com.fr.third.net.sf.ehcache.store.Policy;
import com.fr.third.net.sf.ehcache.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/cachingtier/PooledBasedBackEnd.java vendored

@ -28,8 +28,8 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.statistics.observer.OperationObserver;
import org.terracotta.statistics.OperationStatistic;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/DiskStorageFactory.java vendored

@ -53,8 +53,8 @@ import com.fr.third.net.sf.ehcache.util.MemoryEfficientByteArrayOutputStream;
import com.fr.third.net.sf.ehcache.util.PreferredLoaderObjectInputStream;
import com.fr.third.net.sf.ehcache.util.TimeUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* A mock-up of a on-disk element proxy factory.

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/Segment.java vendored

@ -31,8 +31,8 @@ import com.fr.third.net.sf.ehcache.store.disk.DiskStorageFactory.DiskSubstitute;
import com.fr.third.net.sf.ehcache.store.disk.DiskStorageFactory.Placeholder;
import com.fr.third.net.sf.ehcache.util.FindBugsSuppressWarnings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import org.terracotta.statistics.observer.OperationObserver;
import java.io.Serializable;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/ods/FileAllocationTree.java vendored

@ -18,8 +18,8 @@ package com.fr.third.net.sf.ehcache.store.disk.ods;
import java.io.IOException;
import java.io.RandomAccessFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* File allocation tree allows C-like alloc/free operations on a random access file.

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/KeySnapshotter.java vendored

@ -23,8 +23,8 @@ import com.fr.third.net.sf.ehcache.Ehcache;
import com.fr.third.net.sf.ehcache.store.Store;
import com.fr.third.net.sf.ehcache.store.TerracottaStore;
import com.fr.third.net.sf.ehcache.util.WeakIdentityConcurrentMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.Collection;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/RotatingSnapshotFile.java vendored

@ -33,8 +33,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import com.fr.third.net.sf.ehcache.DiskStorePathManager;
import com.fr.third.net.sf.ehcache.util.PreferredLoaderObjectInputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* A file will rotate on every write, so to never loose older values in case of a JVM crash

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaBootstrapCacheLoader.java vendored

@ -29,8 +29,8 @@ import com.fr.third.net.sf.ehcache.Status;
import com.fr.third.net.sf.ehcache.distribution.RemoteCacheException;
import com.fr.third.net.sf.ehcache.store.MemoryLimitedCacheLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* A {@link BootstrapCacheLoader} that will load Elements into a Terracotta clustered cache, based on a previously

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaCacheCluster.java vendored

@ -28,8 +28,8 @@ import com.fr.third.net.sf.ehcache.cluster.ClusterNode;
import com.fr.third.net.sf.ehcache.cluster.ClusterScheme;
import com.fr.third.net.sf.ehcache.cluster.ClusterTopologyListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* {@link CacheCluster} implementation that delegates to an underlying cache cluster. The underlying {@link CacheCluster} can be changed

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaClient.java vendored

@ -21,8 +21,8 @@ import com.fr.third.net.sf.ehcache.cluster.CacheCluster;
import com.fr.third.net.sf.ehcache.CacheException;
import com.fr.third.net.sf.ehcache.config.TerracottaClientConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.lang.reflect.Method;
import java.util.concurrent.ExecutorService;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaClusteredInstanceHelper.java vendored

@ -20,8 +20,8 @@ import com.fr.third.net.sf.ehcache.util.ClassLoaderUtil;
import com.fr.third.net.sf.ehcache.CacheException;
import com.fr.third.net.sf.ehcache.config.TerracottaClientConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* A small helper class that knows how to create terracotta store factories

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/JtaLocalTransactionStore.java vendored

@ -31,8 +31,8 @@ import com.fr.third.net.sf.ehcache.transaction.xa.XATransactionContext;
import com.fr.third.net.sf.ehcache.util.lang.VicariousThreadLocal;
import com.fr.third.net.sf.ehcache.writer.CacheWriterManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.util.Collection;
import java.util.List;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/LocalTransactionContext.java vendored

@ -20,8 +20,8 @@ import com.fr.third.net.sf.ehcache.transaction.TransactionException;
import com.fr.third.net.sf.ehcache.transaction.TransactionID;
import com.fr.third.net.sf.ehcache.transaction.TransactionIDFactory;
import com.fr.third.net.sf.ehcache.transaction.TransactionTimeoutException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collections;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/LocalTransactionStore.java vendored

@ -36,8 +36,8 @@ import com.fr.third.net.sf.ehcache.transaction.SoftLockManager;
import com.fr.third.net.sf.ehcache.transaction.TransactionTimeoutException;
import com.fr.third.net.sf.ehcache.util.LargeSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.Iterator;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/DefaultTransactionManagerLookup.java vendored

@ -38,8 +38,8 @@ import com.fr.third.net.sf.ehcache.transaction.manager.selector.GlassfishSelecto
import com.fr.third.net.sf.ehcache.transaction.manager.selector.WeblogicSelector;
import com.fr.third.net.sf.ehcache.transaction.xa.EhcacheXAResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
/**
* Default {@link TransactionManagerLookup} implementation, that will be used by an {@link Cache#initialise() initializing}

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/BitronixSelector.java vendored

@ -16,8 +16,8 @@
package com.fr.third.net.sf.ehcache.transaction.manager.selector;
import com.fr.third.net.sf.ehcache.transaction.xa.EhcacheXAResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import java.lang.reflect.Method;

4
fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/ClassSelector.java vendored

@ -15,8 +15,8 @@
*/
package com.fr.third.net.sf.ehcache.transaction.manager.selector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fr.third.slf4j.Logger;
import com.fr.third.slf4j.LoggerFactory;
import javax.transaction.TransactionManager;

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save