Skip to content

Commit 581243d

Browse files
committed
renamed logger
1 parent 494bc9d commit 581243d

File tree

9 files changed

+32
-32
lines changed

9 files changed

+32
-32
lines changed

app/aem/core/src/main/java/com/cognifide/apm/core/actions/ActionMapperRegistryImpl.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
)
5454
public class ActionMapperRegistryImpl implements RegistryChangedListener, ActionMapperRegistry {
5555

56-
private static final Logger LOG = LoggerFactory.getLogger(ActionMapperRegistryImpl.class);
56+
private static final Logger LOGGER = LoggerFactory.getLogger(ActionMapperRegistryImpl.class);
5757

5858
private static final String BUNDLE_HEADER = "APM-Actions";
5959

@@ -103,12 +103,12 @@ private static Map<String, MapperDescriptor> createActionMappers(List<Class<?>>
103103
MapperDescriptor mapperDescriptor = mapperDescriptorFactory.create(clazz);
104104
mappers.put(mapperDescriptor.getName(), mapperDescriptor);
105105
} catch (InvalidActionMapperException e) {
106-
LOG.warn("Cannot register ActionMapper of class " + clazz.getName(), e);
106+
LOGGER.warn("Cannot register ActionMapper of class " + clazz.getName(), e);
107107
}
108108
}
109109

110-
if (LOG.isDebugEnabled()) {
111-
LOG.debug("Created {} action mappers from {} classes", mappers.size(), classes.size());
110+
if (LOGGER.isDebugEnabled()) {
111+
LOGGER.debug("Created {} action mappers from {} classes", mappers.size(), classes.size());
112112
}
113113
return mappers;
114114
}

app/aem/core/src/main/java/com/cognifide/apm/core/actions/scanner/AnnotatedClassRegistry.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
*/
4343
public class AnnotatedClassRegistry {
4444

45-
private static final Logger LOG = LoggerFactory.getLogger(AnnotatedClassRegistry.class);
45+
private static final Logger LOGGER = LoggerFactory.getLogger(AnnotatedClassRegistry.class);
4646

4747
private final BundleTracker<?> tracker;
4848

@@ -106,15 +106,15 @@ private void registerClasses(Bundle bundle) {
106106
classes.put(bundle.getBundleId(), scanned);
107107
notifyChangeListeners();
108108
}
109-
if (LOG.isDebugEnabled()) {
110-
LOG.debug("Adding classes ({}) from bundle: {}", scanned.size(), bundle.getSymbolicName());
109+
if (LOGGER.isDebugEnabled()) {
110+
LOGGER.debug("Adding classes ({}) from bundle: {}", scanned.size(), bundle.getSymbolicName());
111111
}
112112
}
113113

114114
private void unregisterClasses(Bundle bundle) {
115115
final List<Class<?>> registered = classes.get(bundle.getBundleId());
116-
if (LOG.isDebugEnabled()) {
117-
LOG.debug("Removing classes ({}) from bundle: {}", registered.size(), bundle.getSymbolicName());
116+
if (LOGGER.isDebugEnabled()) {
117+
LOGGER.debug("Removing classes ({}) from bundle: {}", registered.size(), bundle.getSymbolicName());
118118
}
119119
classes.remove(bundle.getBundleId());
120120
notifyChangeListeners();

app/aem/core/src/main/java/com/cognifide/apm/core/actions/scanner/ClassScanner.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public ClassScanner(Bundle bundle, BundleContext context) {
5252
this.context = context;
5353
}
5454

55-
private static final Logger LOG = LoggerFactory.getLogger(ClassScanner.class);
55+
private static final Logger LOGGER = LoggerFactory.getLogger(ClassScanner.class);
5656

5757
public List<Class<?>> findClasses(String packageName) {
5858
@SuppressWarnings("unchecked") final Enumeration<URL> classUrls = bundle
@@ -61,7 +61,7 @@ public List<Class<?>> findClasses(String packageName) {
6161
final ArrayList<Class<?>> classes = new ArrayList<>();
6262

6363
if (classUrls == null) {
64-
LOG.warn("No classes found in bundle: {}", bundleName);
64+
LOGGER.warn("No classes found in bundle: {}", bundleName);
6565
} else {
6666
while (classUrls.hasMoreElements()) {
6767
final URL url = classUrls.nextElement();
@@ -70,22 +70,22 @@ public List<Class<?>> findClasses(String packageName) {
7070
try {
7171
if (BundleUtils.isFragment(bundle)) {
7272
if (context == null) {
73-
LOG.warn("Cannot load class from fragment bundle {} if context is unspecified",
73+
LOGGER.warn("Cannot load class from fragment bundle {} if context is unspecified",
7474
bundleName);
7575
}
7676

7777
final Bundle hostBundle = BundleUtils.getHostBundle(context, bundle);
7878

7979
if (hostBundle == null) {
80-
LOG.warn("Cannot find host bundle for {}", bundleName);
80+
LOGGER.warn("Cannot find host bundle for {}", bundleName);
8181
} else {
8282
classes.add(hostBundle.loadClass(className));
8383
}
8484
} else {
8585
classes.add(bundle.loadClass(className));
8686
}
8787
} catch (ClassNotFoundException e) {
88-
LOG.warn("Unable to load class", e);
88+
LOGGER.warn("Unable to load class", e);
8989
}
9090
}
9191
}

app/aem/core/src/main/java/com/cognifide/apm/core/history/HistoryImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class HistoryImpl implements History {
5959

6060
public static final String HISTORY_FOLDER = "/var/apm/history";
6161

62-
private static final Logger LOG = LoggerFactory.getLogger(HistoryImpl.class);
62+
private static final Logger LOGGER = LoggerFactory.getLogger(HistoryImpl.class);
6363

6464
private static final String APM_HISTORY = "apmHistory";
6565

@@ -165,7 +165,7 @@ private HistoryEntry createHistoryEntry(ResourceResolver resolver, Script script
165165
resolver.commit();
166166
return resolver.getResource(historyEntryNode.getPath()).adaptTo(HistoryEntryImpl.class);
167167
} catch (IOException | RepositoryException e) {
168-
LOG.error("Issues with saving to repository while logging script execution", e);
168+
LOGGER.error("Issues with saving to repository while logging script execution", e);
169169
return null;
170170
}
171171
}

app/aem/core/src/main/java/com/cognifide/apm/core/jobs/ScriptRunnerJobConsumer.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
)
4646
public class ScriptRunnerJobConsumer {
4747

48-
private static final Logger LOG = LoggerFactory.getLogger(ScriptRunnerJobConsumer.class);
48+
private static final Logger LOGGER = LoggerFactory.getLogger(ScriptRunnerJobConsumer.class);
4949

5050
@Reference
5151
private History history;
@@ -63,7 +63,7 @@ public class ScriptRunnerJobConsumer {
6363
private ResourceResolverProvider resolverProvider;
6464

6565
public void process(Map<String, Object> properties) {
66-
LOG.info("Script runner properties consumer started");
66+
LOGGER.info("Script runner properties consumer started");
6767
String id = (String) properties.get(AsyncScriptExecutorImpl.ID);
6868
ExecutionMode mode = getMode(properties);
6969
String userId = getUserId(properties);
@@ -75,7 +75,7 @@ public void process(Map<String, Object> properties) {
7575
String summaryPath = getSummaryPath(resolver, script, mode);
7676
jobResultsCache.put(id, ExecutionSummary.finished(executionResult, summaryPath));
7777
} catch (RepositoryException | PersistenceException e) {
78-
LOG.error("Script manager failed to process script", e);
78+
LOGGER.error("Script manager failed to process script", e);
7979
}
8080
}
8181
});
@@ -96,7 +96,7 @@ private ExecutionMode getMode(Map<String, Object> properties) {
9696
if (StringUtils.isNotBlank(modeName)) {
9797
result = StringUtils.isEmpty(modeName) ? ExecutionMode.DRY_RUN : ExecutionMode.valueOf(modeName.toUpperCase());
9898
} else {
99-
LOG.error("Mode is null");
99+
LOGGER.error("Mode is null");
100100
}
101101
return result;
102102
}
@@ -114,12 +114,12 @@ private Script getScript(Map<String, Object> properties, ResourceResolver resolv
114114
if (StringUtils.isNotBlank(scriptSearchPath)) {
115115
Script script = scriptFinder.find(scriptSearchPath, resolver);
116116
if (script == null) {
117-
LOG.error("Script not found: {}", scriptSearchPath);
117+
LOGGER.error("Script not found: {}", scriptSearchPath);
118118
return null;
119119
}
120120
return script;
121121
} else {
122-
LOG.error("Script search path is blank");
122+
LOGGER.error("Script search path is blank");
123123
return null;
124124
}
125125
}

app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptManagerImpl.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
)
7373
public class ScriptManagerImpl implements ScriptManager {
7474

75-
private static final Logger LOG = LoggerFactory.getLogger(ScriptManagerImpl.class);
75+
private static final Logger LOGGER = LoggerFactory.getLogger(ScriptManagerImpl.class);
7676

7777
@Reference
7878
private ActionFactory actionFactory;
@@ -111,7 +111,7 @@ private Progress execute(Script script, ExecutionMode mode, Map<String, String>
111111

112112
String path = script.getPath();
113113

114-
LOG.info(String.format("Script execution started: %s [%s]", path, mode));
114+
LOGGER.info(String.format("Script execution started: %s [%s]", path, mode));
115115
Progress progress = new ProgressImpl(executor);
116116
ActionExecutor actionExecutor = createExecutor(mode, resolver);
117117
Context context = actionExecutor.getContext();
@@ -132,7 +132,7 @@ private Progress execute(Script script, ExecutionMode mode, Map<String, String>
132132
}
133133
return result.getStatus();
134134
} catch (RepositoryException | ActionCreationException e) {
135-
LOG.error("Error while processing command: {}", commandName, e);
135+
LOGGER.error("Error while processing command: {}", commandName, e);
136136
progress.addEntry(Status.ERROR, e.getMessage(), commandName);
137137
return Status.ERROR;
138138
}

app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptStorageImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
)
5959
public class ScriptStorageImpl implements ScriptStorage {
6060

61-
private static final Logger LOG = LoggerFactory.getLogger(ScriptStorageImpl.class);
61+
private static final Logger LOGGER = LoggerFactory.getLogger(ScriptStorageImpl.class);
6262

6363
private static final Pattern FILE_NAME_PATTERN = Pattern.compile("[0-9a-zA-Z_\\-]+\\.apm");
6464

@@ -119,7 +119,7 @@ private Script saveScript(FileDescriptor descriptor, LaunchMetadata launchMetada
119119
session.save();
120120
result = scriptFinder.find(fileNode.getPath(), resolver);
121121
} catch (RepositoryException e) {
122-
LOG.error(e.getMessage(), e);
122+
LOGGER.error(e.getMessage(), e);
123123
}
124124
return result;
125125
}

app/aem/core/src/main/java/com/cognifide/apm/core/ui/models/ConsoleModel.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public final class ConsoleModel {
3636

3737
public static final String PATH_PARAM = "path";
3838

39-
private static final Logger LOG = LoggerFactory.getLogger(ConsoleModel.class);
39+
private static final Logger LOGGER = LoggerFactory.getLogger(ConsoleModel.class);
4040

4141
private static final String FILE_NAME_DEFAULT = "filename";
4242

@@ -68,7 +68,7 @@ private String getContentDefault() {
6868
try {
6969
return IOUtils.toString(getClass().getResourceAsStream(CONTENT_FILE), CONTENT_FILE_CHARSET);
7070
} catch (IOException e) {
71-
LOG.warn("Cannot read content of default script template.", e);
71+
LOGGER.warn("Cannot read content of default script template.", e);
7272
return "";
7373
}
7474
}

app/aem/core/src/main/java/com/cognifide/apm/core/utils/sling/SlingHelper.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
public final class SlingHelper {
2828

29-
private static final Logger LOG = LoggerFactory.getLogger(SlingHelper.class);
29+
private static final Logger LOGGER = LoggerFactory.getLogger(SlingHelper.class);
3030

3131
private static final String RESOLVE_ERROR_MESSAGE = "Error occurred while resolving data from repository.";
3232

@@ -55,7 +55,7 @@ public static <T> T resolveDefault(ResourceResolverProvider provider, ResolveCal
5555
try {
5656
return resolve(provider, callback);
5757
} catch (ResolveException e) {
58-
LOG.error(RESOLVE_ERROR_MESSAGE, e);
58+
LOGGER.error(RESOLVE_ERROR_MESSAGE, e);
5959
}
6060
return defaultValue;
6161
}
@@ -82,7 +82,7 @@ public static void operateTraced(ResourceResolverProvider provider, OperateCallb
8282
try {
8383
operate(provider, callback);
8484
} catch (OperateException e) {
85-
LOG.error(OPERATE_ERROR_MESSAGE, e);
85+
LOGGER.error(OPERATE_ERROR_MESSAGE, e);
8686
}
8787
}
8888

0 commit comments

Comments
 (0)