perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6014 - in trunk: perfsonar-java-sql-ma/src/main/java/org/perfso nar/service/measurementArchive/sqlType perfsonar-java-sql- ma/src/main/java/org/perfsonar/service/measurementArchive/ sqlType/fetch perfsonar-java-sql-ma/src/main/java/org/perf sonar/service/measurementArchive/sqlType/store perfsonar-j ava-sql-ma/src/test/java/org/perfsonar/service/measurement Archive/sqlType perfsonar_base/src/main/java/org/perfson ar/base/auxiliary/components/scheduler/actions perfsonar _base/src/main/java/org/perfsonar/service/base/authn/tok ens perfsonar_base/src/main/java/org/perfsonar/service/b ase/messages perfsonar_base/src/main/java/org/perfsonar/ service/measurementArchive/metadataConfig
Subject: perfsonar development work
List archive
[pS-dev] [GEANT/SA2/ps-java-services] r6014 - in trunk: perfsonar-java-sql-ma/src/main/java/org/perfso nar/service/measurementArchive/sqlType perfsonar-java-sql- ma/src/main/java/org/perfsonar/service/measurementArchive/ sqlType/fetch perfsonar-java-sql-ma/src/main/java/org/perf sonar/service/measurementArchive/sqlType/store perfsonar-j ava-sql-ma/src/test/java/org/perfsonar/service/measurement Archive/sqlType perfsonar_base/src/main/java/org/perfson ar/base/auxiliary/components/scheduler/actions perfsonar _base/src/main/java/org/perfsonar/service/base/authn/tok ens perfsonar_base/src/main/java/org/perfsonar/service/b ase/messages perfsonar_base/src/main/java/org/perfsonar/ service/measurementArchive/metadataConfig
Chronological Thread
- From:
- To:
- Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6014 - in trunk: perfsonar-java-sql-ma/src/main/java/org/perfso nar/service/measurementArchive/sqlType perfsonar-java-sql- ma/src/main/java/org/perfsonar/service/measurementArchive/ sqlType/fetch perfsonar-java-sql-ma/src/main/java/org/perf sonar/service/measurementArchive/sqlType/store perfsonar-j ava-sql-ma/src/test/java/org/perfsonar/service/measurement Archive/sqlType perfsonar_base/src/main/java/org/perfson ar/base/auxiliary/components/scheduler/actions perfsonar _base/src/main/java/org/perfsonar/service/base/authn/tok ens perfsonar_base/src/main/java/org/perfsonar/service/b ase/messages perfsonar_base/src/main/java/org/perfsonar/ service/measurementArchive/metadataConfig
- Date: Fri, 5 Oct 2012 10:22:51 +0100 (BST)
Author: nordunet.behrmann
Date: 2012-10-05 10:22:51 +0100 (Fri, 05 Oct 2012)
New Revision: 6014
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/BaseChainingMergerFactory.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ErrorsResponseGenerator.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/GenericResponseGenerator.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGenerator.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/BwctlStoreRequestProcess.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/DiscardsStoreRequestProcess.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/ErrorsStoreRequestProcess.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/PingStoreRequestProcess.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcess.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/UtilizationStoreRequestProcess.java
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampResponseGeneratorTest.java
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/DataRequest.java
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LookupInfoRequest.java
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
Log:
perfsonar_base, perfsonar-java-sql-ma: Use typed collections when possible
Issue: PSSERVICES-597
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/BaseChainingMergerFactory.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/BaseChainingMergerFactory.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/BaseChainingMergerFactory.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -18,7 +18,7 @@
*/
public class BaseChainingMergerFactory
{
- public static Set getBaseChainingMergers(String mergerNames)
+ public static Set<BaseChaining> getBaseChainingMergers(String
mergerNames)
throws PerfSONARException
{
LoggerComponent logger = (LoggerComponent)
@@ -26,7 +26,7 @@
getInstance().
getComponent(ComponentNames.LOGGER);
- Set baseChainingMergers = new HashSet();
+ Set<BaseChaining> baseChainingMergers = new HashSet<BaseChaining>();
String[] mergerNamesArray = mergerNames.split("\\s*,\\s*");
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -114,7 +114,7 @@
Key key = md.getKey();
- Map ibatisParams = new HashMap();
+ Map<String,Object> ibatisParams = new HashMap<String,Object>();
Map parametersMap = key.getParametersMap();
for (Object o : parametersMap.values()) {
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -749,18 +749,14 @@
return message;
}
- Set baseChainingMergers =
+ Set<BaseChaining> baseChainingMergers =
BaseChainingMergerFactory.getBaseChainingMergers(mergerNames);
if (baseChainingMergers == null) {
return message;
}
- BaseChaining baseChaining;
-
- for (Object baseChainingMerger : baseChainingMergers) {
-
- baseChaining = (BaseChaining) baseChainingMerger;
+ for (BaseChaining baseChaining : baseChainingMergers) {
message = baseChaining.processChaining(message);
}
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -34,19 +34,18 @@
@Override
- public Data getResponse(List resultList) throws Exception
+ public Data getResponse(List<Map<String,Object>> resultList) throws
Exception
{
Data data = new Data();
- for (Object aResultList : resultList) {
+ for (Map<String,Object> resultMap: resultList) {
Datum datum = new Datum();
- Map resultMap = (Map) aResultList;
- Collection<String> kCollection = ((Map) aResultList).keySet();
+ Collection<String> kCollection = resultMap.keySet();
for (String column : kCollection) {
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -38,22 +38,19 @@
@Override
- public Data getResponse(List resultList) throws Exception
+ public Data getResponse(List<Map<String,Object>> resultList) throws
Exception
{
Data data = new Data();
- for (Object aResultList : resultList) {
+ for (Map<String,Object> resultMap : resultList) {
Datum datum = new Datum();
- Map resultMap = (Map) aResultList;
- Collection<String> kCollection = ((Map) aResultList).keySet();
+ for (String column : resultMap.keySet()) {
- for (String column : kCollection) {
-
Object value = resultMap.get(column);
String className = value.getClass().getName();
String strValue = null;
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ErrorsResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ErrorsResponseGenerator.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ErrorsResponseGenerator.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -38,22 +38,19 @@
@Override
- public Data getResponse(List resultList) throws Exception
+ public Data getResponse(List<Map<String,Object>> resultList) throws
Exception
{
Data data = new Data();
- for (Object aResultList : resultList) {
+ for (Map<String,Object> resultMap: resultList) {
Datum datum = new Datum();
- Map resultMap = (Map) aResultList;
- Collection<String> kCollection = ((Map) aResultList).keySet();
+ for (String column : resultMap.keySet()) {
- for (String column : kCollection) {
-
Object value = resultMap.get(column);
String className = value.getClass().getName();
String strValue = null;
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/GenericResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/GenericResponseGenerator.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/GenericResponseGenerator.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -38,22 +38,19 @@
@Override
- public Data getResponse(List resultList) throws Exception
+ public Data getResponse(List<Map<String,Object>> resultList) throws
Exception
{
Data data = new Data();
- for (Object aResultList : resultList) {
+ for (Map<String,Object> resultMap : resultList) {
Datum datum = new Datum();
- Map resultMap = (Map) aResultList;
- Collection<String> kCollection = ((Map) aResultList).keySet();
+ for (String column : resultMap.keySet()) {
- for (String column : kCollection) {
-
Object value = resultMap.get(column);
String className = value.getClass().getName();
String strValue = null;
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -38,22 +38,19 @@
@Override
- public Data getResponse(List resultList) throws Exception
+ public Data getResponse(List<Map<String,Object>> resultList) throws
Exception
{
Data data = new Data();
- for (Object aResultList : resultList) {
+ for (Map<String,Object> resultMap : resultList) {
Datum datum = new Datum();
- Map resultMap = (Map) aResultList;
- Collection<String> kCollection = ((Map) aResultList).keySet();
+ for (String column : resultMap.keySet()) {
- for (String column : kCollection) {
-
Object value = resultMap.get(column);
if (value == null) {
continue;
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -42,22 +42,19 @@
@Override
- public Data getResponse(List resultList) throws Exception
+ public Data getResponse(List<Map<String,Object>> resultList) throws
Exception
{
Data data = new Data();
- for (Object aResultList : resultList) {
+ for (Map<String,Object> resultMap : resultList) {
Datum datum = new Datum();
- Map resultMap = (Map) aResultList;
- Collection<String> kCollection = ((Map) aResultList).keySet();
+ for (String column : resultMap.keySet()) {
- for (String column : kCollection) {
-
Object value = resultMap.get(column);
String className = value.getClass().getName();
String strValue = null;
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -44,7 +44,7 @@
// -------------------------------------- public methods
@Override
- public Data getResponse(List resultList) throws Exception
+ public Data getResponse(List<Map<String,Object>> resultList) throws
Exception
{
Data data = new Data();
@@ -56,7 +56,7 @@
// First check if results are for ordinary OWAMP (owamp table) or
OWAMP
// Aggregate (owamp_agg) table
if (!resultList.isEmpty()) {
- Collection<String> kCollection = ((Map)
resultList.get(0)).keySet();
+ Collection<String> kCollection = resultList.get(0).keySet();
for (String columnName : kCollection) {
if (columnName.equals("seqNum")
|| columnName.equals("sendTime")
@@ -88,11 +88,10 @@
}
System.out.println("Here 1");
- for (Object aResultList : resultList) {
+ for (Map<String,Object> resultMap : resultList) {
System.out.println("Here 2");
- Map resultMap = (Map) aResultList;
- Collection<String> kCollection = ((Map) aResultList).keySet();
+ Collection<String> kCollection = resultMap.keySet();
if (owamp) {
Datum datum = new Datum();
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -34,22 +34,19 @@
@Override
- public Data getResponse(List resultList) throws Exception
+ public Data getResponse(List<Map<String,Object>> resultList) throws
Exception
{
Data data = new Data();
- for (Object aResultList : resultList) {
+ for (Map<String,Object> resultMap : resultList) {
Datum datum = new Datum();
- Map resultMap = (Map) aResultList;
- Collection<String> kCollection = ((Map) aResultList).keySet();
+ for (String column : resultMap.keySet()) {
- for (String column : kCollection) {
-
Object value = resultMap.get(column);
String className = value.getClass().getName();
String strValue = null;
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGenerator.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGenerator.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -6,6 +6,7 @@
import java.util.List;
+import java.util.Map;
import org.ggf.ns.nmwg.base.v2_0.Data;
@@ -68,7 +69,7 @@
// -------------------------------------- public abstract methods
- public abstract Data getResponse(List resultList) throws Exception;
+ public abstract Data getResponse(List<Map<String,Object>> resultList)
throws Exception;
} //ResponseGenerator
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -38,22 +38,19 @@
@Override
- public Data getResponse(List resultList) throws Exception
+ public Data getResponse(List<Map<String,Object>> resultList) throws
Exception
{
Data data = new Data();
- for (Object aResultList : resultList) {
+ for (Map<String,Object> resultMap : resultList) {
Datum datum = new Datum();
- Map resultMap = (Map) aResultList;
- Collection<String> kCollection = ((Map) aResultList).keySet();
+ for (String column : resultMap.keySet()) {
- for (String column : kCollection) {
-
Object value = resultMap.get(column);
String className = value.getClass().getName();
String strValue = null;
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/BwctlStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/BwctlStoreRequestProcess.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/BwctlStoreRequestProcess.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -35,7 +35,7 @@
@Override
- public Map prepareStoreParameters(Element datum, Map ibatisParams)
+ public Map<String,Object> prepareStoreParameters(Element datum,
Map<String,Object> ibatisParams)
{
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/DiscardsStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/DiscardsStoreRequestProcess.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/DiscardsStoreRequestProcess.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -36,7 +36,7 @@
@Override
- public Map prepareStoreParameters(Element datum, Map ibatisParams)
+ public Map<String,Object> prepareStoreParameters(Element datum,
Map<String,Object> ibatisParams)
{
String strValue = ((Datum) datum).getValue();
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/ErrorsStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/ErrorsStoreRequestProcess.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/ErrorsStoreRequestProcess.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -36,7 +36,7 @@
@Override
- public Map prepareStoreParameters(Element datum, Map ibatisParams)
+ public Map<String,Object> prepareStoreParameters(Element datum,
Map<String,Object> ibatisParams)
{
String strValue = ((Datum) datum).getValue();
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -36,7 +36,7 @@
@Override
- public Map prepareStoreParameters(Element datum, Map ibatisParams)
+ public Map<String,Object> prepareStoreParameters(Element datum,
Map<String,Object> ibatisParams)
{
String strValue = ((Datum) datum).getValue();
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -38,7 +38,7 @@
@Override
- public Map prepareStoreParameters(Element datum, Map ibatisParams)
+ public Map<String,Object> prepareStoreParameters(Element datum,
Map<String,Object> ibatisParams)
{
String timeType = ((Datum) datum).getTimeType();
@@ -66,7 +66,7 @@
}
- protected void handleUnixTimeValue(String timeValue, Map ibatisParams)
+ protected void handleUnixTimeValue(String timeValue, Map<String,Object>
ibatisParams)
{
int timeValueInt;
@@ -80,7 +80,7 @@
}
- protected void handleIsoTimeValue(String timeValue, Map ibatisParams)
+ protected void handleIsoTimeValue(String timeValue, Map<String,Object>
ibatisParams)
{
try {
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/PingStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/PingStoreRequestProcess.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/PingStoreRequestProcess.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -35,7 +35,7 @@
@Override
- public Map prepareStoreParameters(Element datum, Map ibatisParams)
+ public Map<String,Object> prepareStoreParameters(Element datum,
Map<String,Object> ibatisParams)
{
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcess.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcess.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -72,7 +72,7 @@
// -------------------------------------- public methods
- public void process(SqlMapClient sqlMap, Data data, Map ibatisParams)
+ public void process(SqlMapClient sqlMap, Data data, Map<String,Object>
ibatisParams)
throws Exception
{
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/UtilizationStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/UtilizationStoreRequestProcess.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/UtilizationStoreRequestProcess.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -36,7 +36,7 @@
@Override
- public Map prepareStoreParameters(Element datum, Map ibatisParams)
+ public Map<String,Object> prepareStoreParameters(Element datum,
Map<String,Object> ibatisParams)
{
String strValue = ((Datum) datum).getValue();
Modified:
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampResponseGeneratorTest.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampResponseGeneratorTest.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampResponseGeneratorTest.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -24,7 +24,7 @@
public void shouldReturnDatum()
{
//given
- Map<String, String> row = new HashMap<String, String>();
+ Map<String, Object> row = new HashMap<String, Object>();
row.put("seqNum", "1");
row.put("sendTime", "1.0");
row.put("sendSynchronized", "1");
@@ -35,16 +35,16 @@
row.put("ttl", "1");
Datum datum = new Datum();
- datum.setSeqNum(row.get("seqNum"));
- datum.setSendTime(row.get("sendTime"));
- datum.setSendSynchronized(row.get("sendSynchronized"));
- datum.setSendTimeError(row.get("sendTimeError"));
- datum.setReceiveTime(row.get("receiveTime"));
- datum.setReceiveTimeError(row.get("receiveTimeError"));
- datum.setReceiveSynchronized(row.get("receiveSynchronized"));
- datum.setTTL(row.get("ttl"));
+ datum.setSeqNum((String) row.get("seqNum"));
+ datum.setSendTime((String) row.get("sendTime"));
+ datum.setSendSynchronized((String) row.get("sendSynchronized"));
+ datum.setSendTimeError((String) row.get("sendTimeError"));
+ datum.setReceiveTime((String) row.get("receiveTime"));
+ datum.setReceiveTimeError((String) row.get("receiveTimeError"));
+ datum.setReceiveSynchronized((String)
row.get("receiveSynchronized"));
+ datum.setTTL((String) row.get("ttl"));
- List<Map<String, String>> list = new ArrayList<Map<String,
String>>();
+ List<Map<String, Object>> list = new ArrayList<Map<String,
Object>>();
list.add(row);
String s = "";
@@ -69,7 +69,7 @@
public void shouldReturnOwampAggregaionDatum()
{
//given
- Map<String, String> row = new HashMap<String, String>();
+ Map<String, Object> row = new HashMap<String, Object>();
row.put("sender", "1");
row.put("receiver", "1");
row.put("sent", "1");
@@ -87,24 +87,24 @@
row.put("hops", "1");
OwampAggregationDatum datum = new OwampAggregationDatum();
- datum.setSender(row.get("sender"));
- datum.setReceiver(row.get("receiver"));
- datum.setSent(row.get("sent"));
- datum.setLoss(row.get("loss"));
- datum.setLostPercent(row.get("lostPercent"));
- datum.setDuplicates(row.get("duplicates"));
- datum.setDelayUnits(row.get("minDelay"));
- datum.setMinDelay(row.get("minDelay"));
- datum.setMedDelay(row.get("medDelay"));
- datum.setMaxDelay(row.get("maxDelay"));
- datum.setDelayUnits(row.get("delayUnits"));
- datum.setError(row.get("error"));
- datum.setErrorUnits(row.get("errorUnits"));
- datum.setJitter(row.get("jitter"));
- datum.setJitterUnits(row.get("jitterUnits"));
- datum.setHops(row.get("hops"));
+ datum.setSender((String) row.get("sender"));
+ datum.setReceiver((String) row.get("receiver"));
+ datum.setSent((String) row.get("sent"));
+ datum.setLoss((String) row.get("loss"));
+ datum.setLostPercent((String) row.get("lostPercent"));
+ datum.setDuplicates((String) row.get("duplicates"));
+ datum.setDelayUnits((String) row.get("minDelay"));
+ datum.setMinDelay((String) row.get("minDelay"));
+ datum.setMedDelay((String) row.get("medDelay"));
+ datum.setMaxDelay((String) row.get("maxDelay"));
+ datum.setDelayUnits((String) row.get("delayUnits"));
+ datum.setError((String) row.get("error"));
+ datum.setErrorUnits((String) row.get("errorUnits"));
+ datum.setJitter((String) row.get("jitter"));
+ datum.setJitterUnits((String) row.get("jitterUnits"));
+ datum.setHops((String) row.get("hops"));
- List<Map<String, String>> list = new ArrayList<Map<String,
String>>();
+ List<Map<String, Object>> list = new ArrayList<Map<String,
Object>>();
list.add(row);
String s = "";
Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -186,7 +186,7 @@
" to use class: " + handlerClassName + " for this event
type");
- Class handlerClass;
+ Class<?> handlerClass;
try {
handlerClass = Class.forName(handlerClassName);
@@ -214,7 +214,7 @@
}
- Class[] interfaceClasses;
+ Class<?>[] interfaceClasses;
interfaceClasses = handlerClass.getInterfaces();
String matchedInterfaceClassName = null;
@@ -230,7 +230,7 @@
} else {
- for (Class interfaceClass : interfaceClasses) {
+ for (Class<?> interfaceClass : interfaceClasses) {
String interfaceClassName;
interfaceClassName = interfaceClass.getName();
Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -178,10 +178,9 @@
Object stValue = token.getSecTokenValue();
if (!isDelegated(token)) {
X509Certificate cert = (X509Certificate) stValue;
- Collection subjectAltNames = cert.getSubjectAlternativeNames();
+ Collection<List<?>> subjectAltNames =
cert.getSubjectAlternativeNames();
if (subjectAltNames != null) {
- for (Object subjectAltName : subjectAltNames) {
- List<?> values = (List<?>) subjectAltName;
+ for (List<?> values : subjectAltNames) {
if (values.size() == 2) {
Integer type = (Integer) values.get(0);
String name = (String) values.get(1);
Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/DataRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/DataRequest.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/DataRequest.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -46,7 +46,7 @@
*/
protected void addChainList(
Metadata head,
- Map mdMap,
+ Map<String,Metadata> mdMap,
List<Metadata> mdChain,
boolean mustKey)
throws PerfSONARException
@@ -75,7 +75,7 @@
org.ggf.ns.nmwg.base.v2_0.Subject subj = head.getSubject();
if (subj != null) {
// Recurse again if this metadata is chained
- addChainList((Metadata) mdMap.get(subj.getMetadataIdRef()),
mdMap, mdChain, mustKey);
+ addChainList(mdMap.get(subj.getMetadataIdRef()), mdMap, mdChain,
mustKey);
}
// If there was no subject, a key is required or this is an invalid
// metadata
Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LookupInfoRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LookupInfoRequest.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LookupInfoRequest.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -142,7 +142,7 @@
PropertiesServiceDescription serviceDescription =
new PropertiesServiceDescription();
- Map commonParameters =
serviceDescription.getServiceDescription();
+ Map<String,String> commonParameters =
serviceDescription.getServiceDescription();
response = getResponse(commonParameters);
@@ -157,7 +157,7 @@
}
- protected Message getResponse(Map commonParameters)
+ protected Message getResponse(Map<String,String> commonParameters)
{
logger.debug("LookupInfoRequest: getResponse()");
@@ -180,7 +180,7 @@
datum.setElement(service);
//access point
- String accessPointString = (String)
commonParameters.get("access_point");
+ String accessPointString = commonParameters.get("access_point");
if (accessPointString == null) {
accessPointString = "";
}
@@ -189,7 +189,7 @@
service.setAccessPoint(ap);
//service name
- String serviceNameString = (String)
commonParameters.get("service_name");
+ String serviceNameString = commonParameters.get("service_name");
if (serviceNameString == null) {
serviceNameString = "";
}
@@ -198,7 +198,7 @@
service.setServiceName(sn);
//service type
- String serviceTypeString = (String)
commonParameters.get("service_type");
+ String serviceTypeString = commonParameters.get("service_type");
if (serviceTypeString == null) {
serviceTypeString = "";
}
@@ -207,7 +207,7 @@
service.setServiceType(st);
//service description
- String serviceDescString = (String)
commonParameters.get("service_description");
+ String serviceDescString =
commonParameters.get("service_description");
if (serviceDescString == null) {
serviceDescString = "";
}
@@ -216,7 +216,7 @@
service.setServiceDescription(sd);
//service version
- String serviceVersionString = (String)
commonParameters.get("service_version");
+ String serviceVersionString =
commonParameters.get("service_version");
if (serviceVersionString == null) {
serviceVersionString = "";
}
@@ -225,7 +225,7 @@
service.setServiceVersion(sv);
//organization owning the service
- String organizationString = (String)
commonParameters.get("organization_name");
+ String organizationString =
commonParameters.get("organization_name");
if (organizationString == null) {
organizationString = "";
}
@@ -234,7 +234,7 @@
service.setOrganization(organization);
//organization owning the service
- String contactEmailString = (String)
commonParameters.get("contact_email");
+ String contactEmailString = commonParameters.get("contact_email");
if (contactEmailString == null) {
contactEmailString = "";
}
Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
2012-10-05 09:22:49 UTC (rev 6013)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
2012-10-05 09:22:51 UTC (rev 6014)
@@ -265,17 +265,17 @@
}
- protected void storeElements(Collection collection) throws
PerfSONARException
+ protected void storeElements(Collection<Element> collection) throws
PerfSONARException
{
String query;
- for (Object element : collection) {
+ for (Element element : collection) {
- if (isAlreadyStored((Element) element)) {
+ if (isAlreadyStored(element)) {
continue;
}
- query = "update insert " +
transformations.serializeXML((Element) element) + " into //*:store";
+ query = "update insert " + transformations.serializeXML(element)
+ " into //*:store";
logger.debug(query);
executeQuery(query);
}
@@ -372,7 +372,7 @@
newData.setMetadataIdRef(metadataIdRef);
newData.setKey(key);
- storeElements(Arrays.asList(newData));
+ storeElements(Arrays.<Element>asList(newData));
// metadata element gets key with parameters
metadata = new Metadata();
- [pS-dev] [GEANT/SA2/ps-java-services] r6014 - in trunk: perfsonar-java-sql-ma/src/main/java/org/perfso nar/service/measurementArchive/sqlType perfsonar-java-sql- ma/src/main/java/org/perfsonar/service/measurementArchive/ sqlType/fetch perfsonar-java-sql-ma/src/main/java/org/perf sonar/service/measurementArchive/sqlType/store perfsonar-j ava-sql-ma/src/test/java/org/perfsonar/service/measurement Archive/sqlType perfsonar_base/src/main/java/org/perfson ar/base/auxiliary/components/scheduler/actions perfsonar _base/src/main/java/org/perfsonar/service/base/authn/tok ens perfsonar_base/src/main/java/org/perfsonar/service/b ase/messages perfsonar_base/src/main/java/org/perfsonar/ service/measurementArchive/metadataConfig, svn-noreply, 10/05/2012
Archive powered by MHonArc 2.6.16.