Chronological Thread 

< Chronological >      < Thread >

---

Author: nordunet.behrmann
Date: 2012-09-11 08:41:49 +0100 (Tue, 11 Sep 2012)
New Revision: 6006

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/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/UtilizationResponseGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINFilterHelper.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/SASLCAClient.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AttrEERequestGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSRegisterRequestGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPUbCClient.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCSaslTest.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/LinkRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MessageHandlerFactory.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlStorageManager.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/transport/SSHFileTransport.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfiguration.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
Log:
Remove redundant constructs

- Redundant type casts
- Redundant array creation for varargs method calls

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-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -935,7 +935,7 @@

response = metadataConfig.fetch(request);
eventTypeStr = ECHO_SELF_TEST_NAMESPACE + serviceType + "/" +
serviceName + "/" + testName + "/success/1.0";
- data = ((Data[])response.getDataArray())[0];
+ data = response.getDataArray()[0];

} catch (PerfSONARException psEx) {


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-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -64,7 +64,7 @@
else if (className.equals("java.lang.Long"))
strValue = Long.toString((Long) value);
else if (className.equals("java.lang.Date"))
- strValue = ((Date) value).toString();
+ strValue = value.toString();
else if (className.equals("java.lang.String"))
strValue = (String) value;


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-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -68,7 +68,7 @@
else if (className.equals("java.lang.Long"))
strValue = Long.toString((Long) value);
else if (className.equals("java.lang.Date"))
- strValue = ((Date) value).toString();
+ strValue = value.toString();
else if (className.equals("java.lang.String"))
strValue = (String) value;


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-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ErrorsResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -68,7 +68,7 @@
else if (className.equals("java.lang.Long"))
strValue = Long.toString((Long) value);
else if (className.equals("java.lang.Date"))
- strValue = ((Date) value).toString();
+ strValue = value.toString();
else if (className.equals("java.lang.String"))
strValue = (String) value;


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-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/GenericResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -68,7 +68,7 @@
else if (className.equals("java.lang.Long"))
strValue = Long.toString((Long) value);
else if (className.equals("java.lang.Date"))
- strValue = ((Date) value).toString();
+ strValue = value.toString();
else if (className.equals("java.lang.String"))
strValue = (String) value;


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-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -69,7 +69,7 @@
else if (className.equals("java.lang.Long"))
strValue = Long.toString((Long) value);
else if (className.equals("java.lang.Date"))
- strValue = ((Date) value).toString();
+ strValue = value.toString();
else if (className.equals("java.lang.String"))
strValue = (String) value;


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-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -72,7 +72,7 @@
else if (className.equals("java.lang.Long"))
strValue = Long.toString((Long) value);
else if (className.equals("java.lang.Date"))
- strValue = ((Date) value).toString();
+ strValue = value.toString();
else if (className.equals("java.lang.String"))
strValue = (String) value;


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-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -108,7 +108,7 @@
else if (className.equals("java.lang.Long"))
strValue = Long.toString((Long) value);
else if (className.equals("java.lang.Date"))
- strValue = ((Date) value).toString();
+ strValue = value.toString();
else if (className.equals("java.lang.String"))
strValue = (String) value;

@@ -160,7 +160,7 @@
else if (className.equals("java.lang.Long"))
strValue = Long.toString((Long) value);
else if (className.equals("java.lang.Date"))
- strValue = ((Date) value).toString();
+ strValue = value.toString();
else if (className.equals("java.lang.String"))
strValue = (String) value;


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-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -64,7 +64,7 @@
else if (className.equals("java.lang.Long"))
strValue = Long.toString((Long) value);
else if (className.equals("java.lang.Date"))
- strValue = ((Date) value).toString();
+ strValue = value.toString();
else if (className.equals("java.lang.String"))
strValue = (String) value;


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-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -68,7 +68,7 @@
else if (className.equals("java.lang.Long"))
strValue = Long.toString((Long) value);
else if (className.equals("java.lang.Date"))
- strValue = ((Date) value).toString();
+ strValue = value.toString();
else if (className.equals("java.lang.String"))
strValue = (String) value;


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -272,7 +272,7 @@
// Convert the vector into an array
String[] result = new String[aliases.size()];
for (int i = 0; i < aliases.size(); i++)
- result[i] = (String) aliases.elementAt(i);
+ result[i] = aliases.elementAt(i);

return result;
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -73,7 +73,7 @@
}
// add the security provider
BouncyCastleProvider bcp = new BouncyCastleProvider();
- java.security.Security.addProvider((Provider)bcp);
+ java.security.Security.addProvider(bcp);

// add the private and public keys
Crypto crypto;
@@ -86,7 +86,7 @@
try {
Certificate[] certs = new Certificate[certchain.size()];
certs = certchain.toArray(certs);
- ks.setKeyEntry("xmlsec", (Key)key, "security".toCharArray(),
certs);
+ ks.setKeyEntry("xmlsec", key, "security".toCharArray(),
certs);
} catch (KeyStoreException e) {
throw new PerfSONARException("error.as.crypto","WSSAuthNData:
"+e.getMessage());
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -57,7 +57,7 @@

// add the security provider
BouncyCastleProvider bcp = new BouncyCastleProvider();
- java.security.Security.addProvider((Provider)bcp);
+ java.security.Security.addProvider(bcp);

// add the private and public keys
Crypto crypto;
@@ -83,7 +83,7 @@

// add the security provider
BouncyCastleProvider bcp = new BouncyCastleProvider();
- java.security.Security.addProvider((Provider)bcp);
+ java.security.Security.addProvider(bcp);

Crypto crypto;
try {
@@ -94,7 +94,7 @@
KeyStore ks=crypto.getKeyStore();

try {
- ks.setKeyEntry("xmlsec", (Key)privateKey,
"security".toCharArray(), new Certificate[]{(Certificate)cert});
+ ks.setKeyEntry("xmlsec", privateKey,
"security".toCharArray(), new Certificate[]{cert});
} catch (KeyStoreException e) {
throw new PerfSONARException("error.as.crypto","WSSAuthNData:
"+e.getMessage());
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINFilterHelper.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINFilterHelper.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/edugain/EduGAINFilterHelper.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -18,7 +18,7 @@

Enumeration<String> attrs = session.getAttributeNames();
while (attrs.hasMoreElements()&&authStatementAssertion==null)
{
- String attrName = (String)attrs.nextElement();
+ String attrName = attrs.nextElement();
Object attrValRaw = session.getAttribute(attrName);
if (attrValRaw instanceof SAMLResponse) {
SAMLResponse
samlResponse=(SAMLResponse)attrValRaw;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/SASLCAClient.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/SASLCAClient.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/SASLCAClient.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -64,7 +64,7 @@
clientProtocolHandler.addCSR(edugainCSR);

try {
- certMap = (Map<CertificationRequest,
X509Certificate[]>) Subject
+ certMap = Subject
.doAs(subj, clientProtocolHandler);
} catch (Exception e) {
e.printStackTrace();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AttrEERequestGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AttrEERequestGenerator.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AttrEERequestGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -111,7 +111,7 @@

samlMessage += "<saml:Attribute
NameFormat=\"urn:oasis:names:tc:SAML:2.0:attrname-format:uri\" Name=\"" + urn
+ "\" FriendlyName=\"" + friendlyName + "\">";

- List<String> attrsValues = (List<String>) data.get(friendlyName);
+ List<String> attrsValues = data.get(friendlyName);
for (String attrsValue : attrsValues) {
samlMessage += "<saml:AttributeValue
xsi:type=\"xsd:string\">" + attrsValue + "</saml:AttributeValue>";
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSRegisterRequestGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSRegisterRequestGenerator.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSRegisterRequestGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -94,7 +94,7 @@
subject.setService(service);

//access point -- mandatory
- String
accessPointString=(String)commonParameters.get("access_point");
+ String accessPointString= commonParameters.get("access_point");
if (accessPointString==null) throw new PerfSONARException(
"error.lsregistrator.no_accesspoint",
"AccessPoint parameter was not found. Registration failed");
@@ -106,7 +106,7 @@
service.setAccessPoint(ap);

//service name -- mandatory
- String
serviceNameString=(String)commonParameters.get("service_name");
+ String serviceNameString= commonParameters.get("service_name");
if (serviceNameString==null) throw new PerfSONARException(
"error.lsregistrator.no_servicename",
"ServiceName parameter was not found. Registration failed");
@@ -118,7 +118,7 @@
service.setServiceName(sn);

//service type -- mandatory
- String
serviceTypeString=(String)commonParameters.get("service_type");
+ String serviceTypeString= commonParameters.get("service_type");
if (serviceTypeString==null) throw new PerfSONARException(
"error.lsregistrator.no_servicetype",
"ServiceType parameter was not found. Registration failed");
@@ -131,7 +131,7 @@

String param;
//service description -- optional
- param=(String)commonParameters.get("service_description");
+ param= commonParameters.get("service_description");
if (param!=null) {
//System.out.println(param);
ServiceDescription sd = new ServiceDescription();
@@ -140,7 +140,7 @@
}

//organization name - optional
- param=(String)commonParameters.get("organization_name");
+ param= commonParameters.get("organization_name");
if (param!=null) {
Organization o = new Organization();
o.setOrganization(param);
@@ -148,7 +148,7 @@
}

//service version - optional
- param=(String)commonParameters.get("service_version");
+ param= commonParameters.get("service_version");
if (param!=null) {
ServiceVersion sv = new ServiceVersion();
sv.setServiceVersion(param);
@@ -156,7 +156,7 @@
}

//contact-email - optional
- param=(String)commonParameters.get("contact_email");
+ param= commonParameters.get("contact_email");
if (param!=null) {
ContactEmail ce = new ContactEmail();
ce.setContactEmail(param);
@@ -164,7 +164,7 @@
}

//add supported event types
- param=(String)commonParameters.get("supported_event_types");
+ param= commonParameters.get("supported_event_types");
if (param!=null) {

String[] supportedEventTypes = param.split("\\,\\ *");

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPUbCClient.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPUbCClient.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPUbCClient.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -148,7 +148,7 @@

// add the security provider
BouncyCastleProvider bcp = new BouncyCastleProvider();
- java.security.Security.addProvider((Provider)bcp);
+ java.security.Security.addProvider(bcp);

Crypto crypto = new DynamicCrypto();
KeyStore ks=crypto.getKeyStore();
@@ -160,7 +160,7 @@

PrivateKey privateKey=keyPair.getPrivate();
X509Certificate cert = client.getCertficate(keyPair);
- ks.setKeyEntry("xmlsec", (Key)privateKey,
"security".toCharArray(), new Certificate[]{(Certificate)cert});
+ ks.setKeyEntry("xmlsec", privateKey, "security".toCharArray(),
new Certificate[]{cert});
WSSecSignature sec509 = new WSSecSignature();
sec509.setUserInfo("xmlsec", "security");
SOAPConstants soapConstants =
WSSecurityUtil.getSOAPConstants(envelope.getAsDOM());

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCSaslTest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCSaslTest.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCSaslTest.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -172,14 +172,14 @@

// add the security provider
BouncyCastleProvider bcp = new BouncyCastleProvider();
- java.security.Security.addProvider((Provider)bcp);
+ java.security.Security.addProvider(bcp);

Crypto crypto = new DynamicCrypto();
KeyStore ks=crypto.getKeyStore();

PrivateKey privateKey=keyPair.getPrivate();
X509Certificate cert = client.getCertficate(keyPair);
- ks.setKeyEntry("xmlsec", (Key)privateKey,
"security".toCharArray(), new Certificate[]{(Certificate)cert});
+ ks.setKeyEntry("xmlsec", privateKey, "security".toCharArray(),
new Certificate[]{cert});
WSSecSignature sec509 = new WSSecSignature();
sec509.setUserInfo("xmlsec", "security");
SOAPConstants soapConstants =
WSSecurityUtil.getSOAPConstants(envelope.getAsDOM());

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-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/DataRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -72,7 +72,7 @@
}

// filter chaining is done using the Subject element.
- org.ggf.ns.nmwg.base.v2_0.Subject subj =
((org.ggf.ns.nmwg.base.v2_0.Subject)head.getSubject());
+ 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);

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -70,7 +70,7 @@
} else if
(!metadata.getSubject().getChildrenByType("link").isEmpty()) {

Link link = (Link)
metadata.getSubject().getChildrenByType("link").get(0);
- Node[] nodeArray = (Node[]) link.getNodeArray();
+ Node[] nodeArray = link.getNodeArray();
if (nodeArray.length > 0) {

for (Node aNodeArray : nodeArray)

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MessageHandlerFactory.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MessageHandlerFactory.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MessageHandlerFactory.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -38,7 +38,7 @@
}

// get the classname for this message type
- String className = (String) m2c.get(messageType);
+ String className = m2c.get(messageType);
logger.debug("MessageHandlerFactory: classname asked for is " +
className);

if (className == null) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlStorageManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlStorageManager.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlStorageManager.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -138,10 +138,10 @@

try {
results = httpAccess.sendExistXQueryRequest(
- ((XmlDbDataRepository)dataRepository).getDbUri(),
+ dataRepository.getDbUri(),
(String)query,
- ((XmlDbDataRepository)dataRepository).getDbUsername(),
- ((XmlDbDataRepository)dataRepository).getDbPassword(),
+ dataRepository.getDbUsername(),
+ dataRepository.getDbPassword(),
ExistDbHTTPAccess.FIRST,
ExistDbHTTPAccess.ALL_RESULTS);

@@ -171,10 +171,10 @@

try {
results = httpAccess.sendExistXUpdateRequest(
- ((XmlDbDataRepository)dataRepository).getDbUri(),
+ dataRepository.getDbUri(),
(String)xml,
- ((XmlDbDataRepository)dataRepository).getDbUsername(),
- ((XmlDbDataRepository)dataRepository).getDbPassword());
+ dataRepository.getDbUsername(),
+ dataRepository.getDbPassword());

} catch (Exception ex) {
throw new PerfSONARException(

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/transport/SSHFileTransport.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/transport/SSHFileTransport.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/transport/SSHFileTransport.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -115,7 +115,7 @@
+ remoteFilePath + "'");
Process ssh =
Runtime.getRuntime().exec(
- (String[])cmdArgs.toArray(new String[cmdArgs.size()]));
+ cmdArgs.toArray(new String[cmdArgs.size()]));

// Feed local file to SSH process
OutputStream sshOut = ssh.getOutputStream();
@@ -170,7 +170,7 @@
+ remoteFilePath + "'");
Process ssh =
Runtime.getRuntime().exec(
- (String[])cmdArgs.toArray(new String[cmdArgs.size()]));
+ cmdArgs.toArray(new String[cmdArgs.size()]));

// Write file retrived from SSH process to local file
InputStream sshIn = ssh.getInputStream();
@@ -249,7 +249,7 @@

Process ssh =
Runtime.getRuntime().exec(
- (String[])cmdArgs.toArray(new String[cmdArgs.size()]));
+ cmdArgs.toArray(new String[cmdArgs.size()]));


ssh.getInputStream().close();
@@ -313,7 +313,7 @@

Process ssh =
Runtime.getRuntime().exec(
- (String[])cmdArgs.toArray(new String[cmdArgs.size()]));
+ cmdArgs.toArray(new String[cmdArgs.size()]));


InputStream sshIn = ssh.getInputStream();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfiguration.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfiguration.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfiguration.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -35,7 +35,7 @@
}

public EventType getEventType(String name) {
- return ((EventType)eventTypeMap.get(name));
+ return eventTypeMap.get(name);
}

public Map<String,EventType> getEventTypeMap() {

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-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -172,7 +172,7 @@

private Message storeSinglePair(Message dataSet) throws
PerfSONARException {

- Data data = (Data) dataSet.getDataArray()[0];
+ Data data = dataSet.getDataArray()[0];

if (data == null) {
logger.error("MetadataConfigurationStorageManager.store: "
@@ -335,7 +335,7 @@
newData.setMetadataIdRef(metadataIdRef);
newData.setKey(key);

- storeElements(Arrays.asList(new Data[]{newData}));
+ storeElements(Arrays.asList(newData));

// metadata element gets key with parameters
metadata = new Metadata();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -121,7 +121,7 @@
Parameters params;
try {
// iperf:parameters
- params = (org.ggf.ns.nmwg.tools.iperf.v2_0.Parameters)
metadata.getParameters();
+ params = metadata.getParameters();
} catch (ClassCastException ex) {
// nmwg:parameters
params = metadata.getParameters();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -103,7 +103,7 @@



- Subject subject = (Subject) metadata.getSubject();
+ Subject subject = metadata.getSubject();

Parameter keywordParameter = metadata.getParameterByName("keyword");
String keywordQueryPart = "";
@@ -214,7 +214,7 @@

} else {

- Node[] nodeArray = (Node[]) link.getNodeArray();
+ Node[] nodeArray = link.getNodeArray();

if (nodeArray == null) {
logger.error(

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
2012-09-11 07:41:47 UTC (rev 6005)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
2012-09-11 07:41:49 UTC (rev 6006)
@@ -106,7 +106,7 @@



- Subject subject = (Subject) metadata.getSubject();
+ Subject subject = metadata.getSubject();

Parameter keywordParameter = metadata.getParameterByName("keyword");
String keywordQueryPart = "";
@@ -218,7 +218,7 @@

} else {

- Node[] nodeArray = (Node[]) link.getNodeArray();
+ Node[] nodeArray = link.getNodeArray();

if (nodeArray == null) {
logger.error(

---

• [pS-dev] [GEANT/SA2/ps-java-services] r6006 - 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_base/src/main/java/org/perfsonar /base/auxiliary/components/authn perfsonar_base/src/main /java/org/perfsonar/client/base/authn perfsonar_base/src /main/java/org/perfsonar/client/base/authn/edugain perfson ar_base/src/main/java/org/perfsonar/client/base/authn/sa slca perfsonar_base/src/main/java/org/perfsonar/client/b ase/requests/authService perfsonar_base/src/main/java/or g/perfsonar/client/base/requests/lookupService perfsonar _base/src/main/java/org/perfsonar/client/testHarness per fsonar_base/src/main/java/org/perfsonar/service/base/mes sages perfsonar_base/src/main/java/org/perfsonar/service /base/storage/xmldb/exist/rest perfsonar_base/src/main/j ava/org/perfsonar/service/base/transport perfsonar_base/ src/main/java/org/perfsonar/service/measur ementArchive/ev entTypeConfig perfsonar_base/src/main/java/org/perfsonar /service/measurementArchive/metadataConfig perfsonar_bas e/src/main/java/org/perfsonar/service/measurementArchive/m etadataConfig/queryGenerator, svn-noreply, 09/11/2012

---

Archive powered by MHonArc 2.6.16.