From 8326f88d8350e0c515fb2c0ce32139093778398f Mon Sep 17 00:00:00 2001 From: James Brook Date: Thu, 22 Nov 2012 11:55:35 +0100 Subject: [PATCH] Changes to comply with Project Wonder coding conventions: * Class and interface names start with ERX or IERX respectively. * Individual imports instead of '*'. --- .../statistics/ERXStatisticsStore.java | 41 +++++++++++++------ .../store/DumbERXStatisticsStoreListener.java | 8 ---- .../store/ERXDumbStatisticsStoreListener.java | 8 ++++ ...n.java => ERXEmptyRequestDescription.java} | 4 +- ....java => ERXNormalRequestDescription.java} | 4 +- .../store/ERXStatisticsStoreListener.java | 9 ---- ...ption.java => IERXRequestDescription.java} | 2 +- .../store/IERXStatisticsStoreListener.java | 9 ++++ 8 files changed, 51 insertions(+), 34 deletions(-) delete mode 100644 Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/DumbERXStatisticsStoreListener.java create mode 100644 Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXDumbStatisticsStoreListener.java rename Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/{EmptyRequestDescription.java => ERXEmptyRequestDescription.java} (86%) rename Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/{NormalRequestDescription.java => ERXNormalRequestDescription.java} (80%) delete mode 100644 Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXStatisticsStoreListener.java rename Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/{RequestDescription.java => IERXRequestDescription.java} (83%) create mode 100644 Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/IERXStatisticsStoreListener.java diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java index cba36082fe3..2ff847d405e 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStatisticsStore.java @@ -1,18 +1,35 @@ package er.extensions.statistics; -import com.webobjects.appserver.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; + +import org.apache.log4j.Logger; + +import com.webobjects.appserver.WOComponent; +import com.webobjects.appserver.WOContext; +import com.webobjects.appserver.WORequest; +import com.webobjects.appserver.WOSession; +import com.webobjects.appserver.WOStatisticsStore; import com.webobjects.foundation.NSArray; import com.webobjects.foundation.NSDictionary; import com.webobjects.foundation.NSMutableArray; import com.webobjects.foundation.NSMutableDictionary; + import er.extensions.appserver.ERXApplication; import er.extensions.eof.ERXEC; import er.extensions.eof.ERXObjectStoreCoordinator; import er.extensions.foundation.ERXProperties; -import er.extensions.statistics.store.*; -import org.apache.log4j.Logger; - -import java.util.*; +import er.extensions.statistics.store.ERXDumbStatisticsStoreListener; +import er.extensions.statistics.store.IERXStatisticsStoreListener; +import er.extensions.statistics.store.ERXEmptyRequestDescription; +import er.extensions.statistics.store.ERXNormalRequestDescription; +import er.extensions.statistics.store.IERXRequestDescription; /** * Enhances the normal stats store with a bunch of useful things which get @@ -45,10 +62,10 @@ private StopWatchTimer timer() { return _timer; } - private final ERXStatisticsStoreListener listener; + private final IERXStatisticsStoreListener listener; public ERXStatisticsStore() { - listener = new DumbERXStatisticsStoreListener(); + listener = new ERXDumbStatisticsStoreListener(); } /** @@ -57,7 +74,7 @@ public ERXStatisticsStore() { * * @param listener a customer listener to do something 'special' when requests are slow */ - public ERXStatisticsStore(ERXStatisticsStoreListener listener) { + public ERXStatisticsStore(IERXStatisticsStoreListener listener) { this.listener = listener; } @@ -117,7 +134,7 @@ protected void endTimer(WOContext aContext, String aString) { _lastLog = currentTime; } - RequestDescription requestDescription = descriptionObjectForContext(aContext, aString); + IERXRequestDescription requestDescription = descriptionObjectForContext(aContext, aString); listener.log(requestTime, requestDescription); if (requestTime > _maximumRequestFatalTime) { log.fatal("Request did take too long : " + requestTime + "ms request was: " + requestDescription + trace); @@ -221,7 +238,7 @@ public String descriptionForContext(WOContext aContext, String string) { return descriptionObjectForContext(aContext, string).toString(); } - public RequestDescription descriptionObjectForContext(WOContext aContext, String string) { + public IERXRequestDescription descriptionObjectForContext(WOContext aContext, String string) { if (aContext != null) { try { WOComponent component = aContext.page(); @@ -232,13 +249,13 @@ public RequestDescription descriptionObjectForContext(WOContext aContext, String if (!requestHandler.equals("wo")) { additionalInfo = additionalInfo + aContext.request().uri(); } - return new NormalRequestDescription(componentName, requestHandler, additionalInfo); + return new ERXNormalRequestDescription(componentName, requestHandler, additionalInfo); } catch (RuntimeException e) { log.error("Cannot get context description since received exception " + e, e); } } - return new EmptyRequestDescription(string); + return new ERXEmptyRequestDescription(string); } diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/DumbERXStatisticsStoreListener.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/DumbERXStatisticsStoreListener.java deleted file mode 100644 index 10f6affd2c8..00000000000 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/DumbERXStatisticsStoreListener.java +++ /dev/null @@ -1,8 +0,0 @@ -package er.extensions.statistics.store; - -public class DumbERXStatisticsStoreListener implements ERXStatisticsStoreListener { - - public void log(long requestTime, RequestDescription description) {} - - public void deadlock(int deadlocksCount) {} -} diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXDumbStatisticsStoreListener.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXDumbStatisticsStoreListener.java new file mode 100644 index 00000000000..3d1b9b1bd36 --- /dev/null +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXDumbStatisticsStoreListener.java @@ -0,0 +1,8 @@ +package er.extensions.statistics.store; + +public class ERXDumbStatisticsStoreListener implements IERXStatisticsStoreListener { + + public void log(long requestTime, IERXRequestDescription description) {} + + public void deadlock(int deadlocksCount) {} +} diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/EmptyRequestDescription.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXEmptyRequestDescription.java similarity index 86% rename from Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/EmptyRequestDescription.java rename to Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXEmptyRequestDescription.java index 21097c26efc..a3563a0fd82 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/EmptyRequestDescription.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXEmptyRequestDescription.java @@ -1,11 +1,11 @@ package er.extensions.statistics.store; -public class EmptyRequestDescription implements RequestDescription { +public class ERXEmptyRequestDescription implements IERXRequestDescription { public static final String ERROR_STRING = "Error-during-context-description"; private String descriptionString = ERROR_STRING; - public EmptyRequestDescription(String descriptionString) { + public ERXEmptyRequestDescription(String descriptionString) { if (descriptionString != null) { this.descriptionString = descriptionString; } diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/NormalRequestDescription.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXNormalRequestDescription.java similarity index 80% rename from Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/NormalRequestDescription.java rename to Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXNormalRequestDescription.java index 409740c86f6..d1f19c95b45 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/NormalRequestDescription.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXNormalRequestDescription.java @@ -1,12 +1,12 @@ package er.extensions.statistics.store; -public class NormalRequestDescription implements RequestDescription { +public class ERXNormalRequestDescription implements IERXRequestDescription { private final String componentName; private final String requestHandler; private final String additionalInfo; - public NormalRequestDescription(String componentName, String requestHandler, String additionalInfo) { + public ERXNormalRequestDescription(String componentName, String requestHandler, String additionalInfo) { this.componentName = componentName; this.requestHandler = requestHandler; this.additionalInfo = additionalInfo; diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXStatisticsStoreListener.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXStatisticsStoreListener.java deleted file mode 100644 index f338ef17f1b..00000000000 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/ERXStatisticsStoreListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package er.extensions.statistics.store; - -public interface ERXStatisticsStoreListener { - - public void log(long requestTime, RequestDescription description); - - public void deadlock(int deadlocksCount); - -} diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/RequestDescription.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/IERXRequestDescription.java similarity index 83% rename from Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/RequestDescription.java rename to Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/IERXRequestDescription.java index ff51c5e9fd1..37f22f26d72 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/RequestDescription.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/IERXRequestDescription.java @@ -1,6 +1,6 @@ package er.extensions.statistics.store; -public interface RequestDescription { +public interface IERXRequestDescription { public String getComponentName(); diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/IERXStatisticsStoreListener.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/IERXStatisticsStoreListener.java new file mode 100644 index 00000000000..7f6e37063a7 --- /dev/null +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/store/IERXStatisticsStoreListener.java @@ -0,0 +1,9 @@ +package er.extensions.statistics.store; + +public interface IERXStatisticsStoreListener { + + public void log(long requestTime, IERXRequestDescription description); + + public void deadlock(int deadlocksCount); + +}