Skip to content

Commit 175a880

Browse files
jonathanaustinjonathanaustin
committed
Rename Impl to Default
1 parent 01b0b23 commit 175a880

File tree

14 files changed

+38
-23
lines changed

14 files changed

+38
-23
lines changed

taskmaster-cache-ehcache/src/main/java/com/github/bordertech/taskmaster/ehcache/CacheHelperEhCachePropertiesConfigImpl.java renamed to taskmaster-cache-ehcache/src/main/java/com/github/bordertech/taskmaster/ehcache/CacheHelperEhCachePropertiesConfig.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.bordertech.taskmaster.ehcache;
22

33
import com.github.bordertech.config.Config;
4-
import com.github.bordertech.taskmaster.cache.CacheHelperXmlConfigImpl;
4+
import com.github.bordertech.taskmaster.cache.impl.CacheHelperXmlConfig;
55
import java.beans.PropertyChangeEvent;
66
import java.beans.PropertyChangeListener;
77
import java.util.HashMap;
@@ -24,16 +24,16 @@
2424
* Cache Helper that configures ehcache with properties and wraps the cache with JSR107 interface.
2525
*/
2626
@Singleton
27-
public class CacheHelperEhCachePropertiesConfigImpl extends CacheHelperXmlConfigImpl {
27+
public class CacheHelperEhCachePropertiesConfig extends CacheHelperXmlConfig {
2828

29-
private static final Log LOGGER = LogFactory.getLog(CacheHelperEhCachePropertiesConfigImpl.class);
29+
private static final Log LOGGER = LogFactory.getLog(CacheHelperEhCachePropertiesConfig.class);
3030
private static final String CACHE_PREFIX = "Cache [";
3131
private final Map<String, Triple<String, Class, Class>> caches = new HashMap<>();
3232

3333
/**
3434
* Construct Helper.
3535
*/
36-
public CacheHelperEhCachePropertiesConfigImpl() {
36+
public CacheHelperEhCachePropertiesConfig() {
3737
// Add property change listener
3838
PropertyChangeListener listener = new RefreshCachePropertyChangeListener();
3939
Config.addPropertyChangeListener(listener);

taskmaster-cache-helper/src/main/java/com/github/bordertech/taskmaster/cache/CacheHelperImpl.java renamed to taskmaster-cache-helper/src/main/java/com/github/bordertech/taskmaster/cache/impl/CacheHelperDefault.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package com.github.bordertech.taskmaster.cache;
1+
package com.github.bordertech.taskmaster.cache.impl;
22

3+
import com.github.bordertech.taskmaster.cache.CacheHelper;
34
import javax.cache.Cache;
45
import javax.cache.CacheManager;
56
import javax.cache.Caching;
@@ -13,7 +14,7 @@
1314
*
1415
* @author jonathan
1516
*/
16-
public class CacheHelperImpl implements CacheHelper {
17+
public class CacheHelperDefault implements CacheHelper {
1718

1819
@Override
1920
public synchronized <K, V> Cache<K, V> getOrCreateCache(final String name, final Class<K> keyClass,

taskmaster-cache-helper/src/main/java/com/github/bordertech/taskmaster/cache/CacheHelperXmlConfigImpl.java renamed to taskmaster-cache-helper/src/main/java/com/github/bordertech/taskmaster/cache/impl/CacheHelperXmlConfig.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package com.github.bordertech.taskmaster.cache;
1+
package com.github.bordertech.taskmaster.cache.impl;
22

33
import com.github.bordertech.config.Config;
4+
import com.github.bordertech.taskmaster.cache.CacheHelper;
45
import java.net.URI;
56
import java.net.URISyntaxException;
67
import javax.cache.Cache;
@@ -17,9 +18,9 @@
1718
* Cache Helper that relies on the cache config in a xml file.
1819
*/
1920
@Singleton
20-
public class CacheHelperXmlConfigImpl implements CacheHelper {
21+
public class CacheHelperXmlConfig implements CacheHelper {
2122

22-
private static final Log LOGGER = LogFactory.getLog(CacheHelperXmlConfigImpl.class);
23+
private static final Log LOGGER = LogFactory.getLog(CacheHelperXmlConfig.class);
2324

2425
private static final CacheManager MANAGER;
2526

@@ -29,12 +30,12 @@ public class CacheHelperXmlConfigImpl implements CacheHelper {
2930
LOGGER.info("Loading cache config [" + config + "].");
3031
URI uri;
3132
try {
32-
uri = CacheHelperXmlConfigImpl.class.getResource(config).toURI();
33+
uri = CacheHelperXmlConfig.class.getResource(config).toURI();
3334
} catch (URISyntaxException e) {
3435
throw new IllegalStateException("Could not load cache config [" + config + "]." + e.getMessage(), e);
3536
}
3637
CachingProvider cachingProvider = Caching.getCachingProvider();
37-
MANAGER = cachingProvider.getCacheManager(uri, CacheHelperXmlConfigImpl.class.getClassLoader());
38+
MANAGER = cachingProvider.getCacheManager(uri, CacheHelperXmlConfig.class.getClassLoader());
3839
}
3940

4041
@Override

‎taskmaster-cache-helper/src/main/java/com/github/bordertech/taskmaster/cache/impl/package-info.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/**
2+
* CacheHelper implementations.
3+
*/
4+
package com.github.bordertech.taskmaster.cache.impl;

‎taskmaster-cache-helper/src/main/java/com/github/bordertech/taskmaster/cache/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/**
2-
* Create Cache helper based on JSR 107.
2+
* CacheHelper based on JSR 107.
33
*/
44
package com.github.bordertech.taskmaster.cache;

‎taskmaster-cache-helper/src/main/resources/bordertech-defaults.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
## Default Cache Helper
2-
bordertech.factory.impl.com.github.bordertech.taskmaster.cache.CacheHelper=com.github.bordertech.taskmaster.cache.CacheHelperImpl
2+
bordertech.factory.impl.com.github.bordertech.taskmaster.cache.CacheHelper=com.github.bordertech.taskmaster.cache.impl.CacheHelperDefault

taskmaster-core/src/main/java/com/github/bordertech/taskmaster/impl/TaskMasterExecutorServiceImpl.java renamed to taskmaster-core/src/main/java/com/github/bordertech/taskmaster/impl/TaskMasterExecutorService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* @since 1.0.0
2626
*/
2727
@Singleton
28-
public class TaskMasterExecutorServiceImpl implements TaskMaster {
28+
public class TaskMasterExecutorService implements TaskMaster {
2929

3030
private static final Map<String, ExecutorService> THREAD_POOLS = new HashMap<>();
3131

‎taskmaster-core/src/main/java/com/github/bordertech/taskmaster/impl/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/**
2-
* Concurrent Task Master Implementations.
2+
* TaskMaster using ExecutorService.
33
*/
44
package com.github.bordertech.taskmaster.impl;

‎taskmaster-core/src/main/java/com/github/bordertech/taskmaster/servlet/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/**
2-
* Task Master Servlet Helpers.
2+
* TaskMaster Servlet Helpers.
33
*/
44
package com.github.bordertech.taskmaster.servlet;

‎taskmaster-core/src/main/resources/bordertech-defaults.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
## Default Task Master and Future Cache (Used for Polling)
2-
bordertech.factory.impl.com.github.bordertech.taskmaster.TaskMaster=com.github.bordertech.taskmaster.impl.TaskMasterExecutorServiceImpl
1+
## Default Task Master
2+
bordertech.factory.impl.com.github.bordertech.taskmaster.TaskMaster=com.github.bordertech.taskmaster.impl.TaskMasterExecutorService

0 commit comments

Comments
 (0)