Skip to content

Commit 8d2394e

Browse files
author
Tim Middleton
committed
Minor code updates
1 parent fa573eb commit 8d2394e

File tree

7 files changed

+36
-24
lines changed

7 files changed

+36
-24
lines changed

‎coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/VisualVMModel.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,10 @@ private void init()
167167
// Loop through each data retriever and initialize the map of
168168
// report XML. Doing it this way we load it only once
169169

170-
Iterator<Map.Entry<Class, DataRetriever>> iter = f_mapDataRetrievers.entrySet().iterator();
170+
Iterator<Map.Entry<Class<?>, DataRetriever>> iter = f_mapDataRetrievers.entrySet().iterator();
171171
while (iter.hasNext())
172172
{
173-
Map.Entry<Class, DataRetriever> entry = iter.next();
173+
Map.Entry<Class<?>, DataRetriever> entry = iter.next();
174174
String sReport = entry.getValue().getReporterReport();
175175
if (sReport != null)
176176
{
@@ -229,7 +229,7 @@ public void refreshStatistics(RequestSender requestSender)
229229
{
230230
if (m_fLogJMXQueryTimes)
231231
{
232-
LOGGER.info("Starting querying statistics for " + type.toString());
232+
LOGGER.log(Level.INFO, "Starting querying statistics for {0}", type.toString());
233233
}
234234

235235
long ldtCollectionStart = System.currentTimeMillis();
@@ -246,7 +246,7 @@ public void refreshStatistics(RequestSender requestSender)
246246
{
247247
if (m_fLogJMXQueryTimes)
248248
{
249-
LOGGER.info("Skipping querying statistics for " + type.toString() + " as it is not configured");
249+
LOGGER.log(Level.INFO, "Skipping querying statistics for {0} as it is not configured", type);
250250
}
251251
}
252252
}
@@ -255,7 +255,7 @@ public void refreshStatistics(RequestSender requestSender)
255255

256256
if (m_fLogJMXQueryTimes)
257257
{
258-
LOGGER.info("Time to query all statistics was " + ldtTotalDuration + " ms");
258+
LOGGER.log(Level.INFO, "Time to query all statistics was {0} ms", ldtTotalDuration);
259259
}
260260

261261
m_nRefreshTime = getRefreshTime();
@@ -364,7 +364,7 @@ private boolean shouldRetrieveData(DataType type)
364364
*
365365
* @return the {@link List} of data obtainer by either method
366366
*/
367-
public List<Entry<Object, Data>> getData(RequestSender requestSender, Class clazz)
367+
public List<Entry<Object, Data>> getData(RequestSender requestSender, Class<?> clazz)
368368
{
369369
boolean fFallBack = false;
370370

@@ -410,8 +410,7 @@ public List<Entry<Object, Data>> getData(RequestSender requestSender, Class claz
410410
{
411411
// we received an error running the report, so mark as
412412
// a fall back so it will be immediately run
413-
LOGGER.warning(Localization.getLocalText("ERR_Failed_to_run_report", clazz.toString(), e.toString()));
414-
e.printStackTrace();
413+
LOGGER.log(Level.WARNING, Localization.getLocalText("ERR_Failed_to_run_report", clazz.toString()), e);
415414
fFallBack = true;
416415
}
417416
}
@@ -440,7 +439,7 @@ public List<Entry<Object, Data>> getData(RequestSender requestSender, Class claz
440439
if (isReporterAvailable() == null || is1213AndAbove() == null)
441440
{
442441
// get the Coherence version. Easier to do if we are connected to a cluster,
443-
// but we are have JMX connection as we have to look in data we collected.
442+
// but we have JMX connection as we have to look in data we collected.
444443

445444
if (clusterData != null)
446445
{
@@ -467,15 +466,15 @@ else if (sCoherenceVersion.startsWith("2"))
467466
// 20.06.1 -> 2006100
468467
// 20.06.10 -> 2006100
469468
String sStrippedVersion = sCoherenceVersion.replaceAll("\\.", "");
470-
nVersion = Integer.parseInt(sStrippedVersion) * (int) Math.pow(10, 7 - sStrippedVersion.length());
469+
nVersion = Integer.parseInt(sStrippedVersion) * (int) Math.pow(10, 7 - (double) sStrippedVersion.length());
471470
}
472471
else
473472
{
474473
nVersion = Integer.parseInt(sCoherenceVersion.replaceAll("\\.", ""));
475474
}
476475

477476
LOGGER.log(Level.INFO, "Raw Coherence version identified as {0}", m_sClusterVersion);
478-
LOGGER.log(Level.INFO,"Numeric Coherence version identified as {0}", String.format("%d", nVersion));
477+
LOGGER.log(Level.INFO, "Numeric Coherence version identified as {0}", String.format("%d", nVersion));
479478

480479
if (nVersion >= 121300)
481480
{
@@ -1721,7 +1720,7 @@ public String[] getMetadata()
17211720
/**
17221721
* Map of instances of data retrievers for execution of actual JMX queries.
17231722
*/
1724-
private final Map<Class, DataRetriever> f_mapDataRetrievers = new HashMap<Class, DataRetriever>();
1723+
private final Map<Class<?>, DataRetriever> f_mapDataRetrievers = new HashMap<>();
17251724

17261725
/**
17271726
* The set of distributed caches so that we don't double count replicated

‎coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/VisualVMView.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import java.util.List;
6161
import java.util.Map;
6262
import java.util.Set;
63-
import java.util.TreeSet;
63+
import java.util.logging.Level;
6464
import java.util.logging.Logger;
6565

6666
import javax.swing.ImageIcon;
@@ -69,7 +69,6 @@
6969
import javax.swing.Timer;
7070

7171
import org.graalvm.visualvm.application.Application;
72-
import org.graalvm.visualvm.core.options.GlobalPreferences;
7372
import org.graalvm.visualvm.core.ui.DataSourceView;
7473
import org.graalvm.visualvm.core.ui.components.DataViewComponent;
7574
import org.graalvm.visualvm.tools.jmx.JmxModel;
@@ -388,8 +387,7 @@ public void run()
388387
}
389388
catch (Exception ex)
390389
{
391-
LOGGER.warning("Error while refreshing tabs. " + ex.toString());
392-
ex.printStackTrace();
390+
LOGGER.log(Level.WARNING, "Error while refreshing tabs. ", e);
393391
}
394392
finally
395393
{

‎coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/VisualVMViewProvider.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
import org.graalvm.visualvm.core.ui.DataSourceViewsManager;
3434
import org.graalvm.visualvm.tools.jmx.JmxModel;
3535
import org.graalvm.visualvm.tools.jmx.JmxModelFactory;
36+
import java.util.logging.Level;
37+
import java.util.logging.Logger;
3638

3739
/**
3840
* Class to provide the view for Coherence JVisualVM plugin.
@@ -79,7 +81,7 @@ public boolean supportsViewFor(Application application)
7981
}
8082
catch (Exception ex)
8183
{
82-
ex.printStackTrace();
84+
LOGGER.log(Level.WARNING, "Error initializing", ex);
8385
}
8486
}
8587

@@ -132,5 +134,12 @@ static void unregister()
132134

133135
// ----- constants ------------------------------------------------------
134136

135-
private static DataSourceViewProvider<Application> s_instance = new VisualVMViewProvider();
137+
private static final DataSourceViewProvider<Application> s_instance = new VisualVMViewProvider();
138+
139+
140+
/**
141+
* The logger object to use.
142+
*/
143+
private static final Logger LOGGER = Logger.getLogger(VisualVMViewProvider.class.getName());
144+
136145
}

‎coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/helper/GraphHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1209,7 +1209,7 @@ private static SimpleXYChartSupport createChart(SimpleXYChartDescriptor sxycd)
12091209
/**
12101210
* Static TB value.
12111211
*/
1212-
public static final long TB = MB * MB;
1212+
public static final long TB = (long) MB * MB;
12131213

12141214
/**
12151215
* The number of values to hold for an individual graph. The default value of

‎coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/AbstractCoherencePanel.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828

2929
import com.oracle.coherence.plugin.visualvm.Localization;
30+
import com.oracle.coherence.plugin.visualvm.VisualVMView;
3031
import com.oracle.coherence.plugin.visualvm.helper.RenderHelper;
3132
import com.oracle.coherence.plugin.visualvm.helper.RequestSender;
3233
import com.oracle.coherence.plugin.visualvm.tablemodel.model.Data;
@@ -58,6 +59,8 @@
5859

5960
import java.util.TreeMap;
6061
import java.util.concurrent.atomic.AtomicInteger;
62+
import java.util.logging.Level;
63+
import java.util.logging.Logger;
6164
import javax.management.Attribute;
6265
import javax.management.MBeanServerConnection;
6366
import javax.management.ObjectName;
@@ -415,7 +418,7 @@ else if (f_nSelectedItem == SELECTED_FRONT_CACHE)
415418
{
416419
showMessageDialog(Localization.getLocalText("LBL_error"), e.getMessage(),
417420
JOptionPane.ERROR_MESSAGE);
418-
e.printStackTrace();
421+
LOGGER.log(Level.WARNING, Localization.getLocalText("LBL_error"), e);
419422
}
420423
}
421424
}
@@ -859,4 +862,10 @@ protected String getLatencyValue(Object oValue)
859862
* The visualVM model.
860863
*/
861864
protected final VisualVMModel f_model;
865+
866+
/**
867+
* The logger object to use.
868+
*/
869+
private static final Logger LOGGER = Logger.getLogger(AbstractCoherencePanel.class.getName());
870+
862871
}

‎coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/AbstractData.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,7 @@ public SortedMap<Object, Data> getAggregatedDataUsingReport(VisualVMModel model,
176176
String sError = Localization.getLocalText("ERR_error_running_report",
177177
sReportXML, this.getClass().getCanonicalName(), e.getMessage());
178178

179-
LOGGER.log(Level.WARNING, sError);
180-
e.printStackTrace();
179+
LOGGER.log(Level.WARNING, sError, e);
181180

182181
model.setReporterAvailable(false);
183182

‎coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/AbstractElasticData.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,6 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender sender, VisualVMMo
167167
catch (Exception e)
168168
{
169169
LOGGER.log(Level.WARNING, "Error getting " + this.getClass().getName() + " statistics", e);
170-
e.printStackTrace();
171-
172170
return null;
173171
}
174172
}

0 commit comments

Comments
 (0)