perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6024 - in trunk/perfsonar-java-sql-ma: . src src/checkstyle src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
Subject: perfsonar development work
List archive
[pS-dev] [GEANT/SA2/ps-java-services] r6024 - in trunk/perfsonar-java-sql-ma: . src src/checkstyle src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
Chronological Thread
- From:
- To:
- Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6024 - in trunk/perfsonar-java-sql-ma: . src src/checkstyle src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
- Date: Mon, 8 Oct 2012 13:49:17 +0100 (BST)
Author: nordunet.behrmann
Date: 2012-10-08 13:49:17 +0100 (Mon, 08 Oct 2012)
New Revision: 6024
Added:
trunk/perfsonar-java-sql-ma/src/checkstyle/
trunk/perfsonar-java-sql-ma/src/checkstyle/checkstyle.xml
Modified:
trunk/perfsonar-java-sql-ma/pom.xml
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/NMWGInterfaceBaseChaining.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/ResponseGeneratorFactory.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/nmwg/OwampAggregationDatum.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/OwampStoreRequestProcess.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/StoreRequestProcessFactory.java
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/UtilizationStoreRequestProcess.java
Log:
perfsonar-java-sql-ma: Added checkstyle plugin
The Maven checkstyle plugin verifies that coding conventions
are followed.
The commit also fixes a large number of checkstyle violations.
Issue: PSSERVICES-588
Issue: PSSERVICES-597
f Please enter the commit message for your changes. Lines starting
Modified: trunk/perfsonar-java-sql-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/pom.xml 2012-10-06 17:26:23 UTC (rev 6023)
+++ trunk/perfsonar-java-sql-ma/pom.xml 2012-10-08 12:49:17 UTC (rev 6024)
@@ -44,6 +44,27 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.9.1</version>
+ <executions>
+ <execution>
+ <id>check-style</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>validate</phase>
+ <configuration>
+ <consoleOutput>true</consoleOutput>
+
<logViolationsToConsole>true</logViolationsToConsole>
+ <failsOnError>true</failsOnError>
+ <failOnViolation>true</failOnViolation>
+
<configLocation>src/checkstyle/checkstyle.xml</configLocation>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.9</version>
Added: trunk/perfsonar-java-sql-ma/src/checkstyle/checkstyle.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/src/checkstyle/checkstyle.xml
(rev 0)
+++ trunk/perfsonar-java-sql-ma/src/checkstyle/checkstyle.xml 2012-10-08
12:49:17 UTC (rev 6024)
@@ -0,0 +1,196 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_3.dtd";>
+
+<!--
+ Based on the default checkstyle configuration, but with minor
+ modifications based on established conventions in existing
+ perfsonar code.
+-->
+
+<!--
+
+ Checkstyle configuration that checks the sun coding conventions from:
+
+ - the Java Language Specification at
+ http://java.sun.com/docs/books/jls/second_edition/html/index.html
+
+ - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
+
+ - the Javadoc guidelines at
+ http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+
+ - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
+
+ - some best practices
+
+ Checkstyle is very configurable. Be sure to read the documentation at
+ http://checkstyle.sf.net (or in your downloaded distribution).
+
+ Most Checks are configurable, be sure to consult the documentation.
+
+ To completely disable a check, just comment it out or delete it from the
file.
+
+ Finally, it is worth reading the documentation.
+
+-->
+
+<module name="Checker">
+ <!--
+ If you set the basedir property below, then all reported file
+ names will be relative to the specified directory. See
+ http://checkstyle.sourceforge.net/5.x/config.html#Checker
+
+ <property name="basedir" value="${basedir}"/>
+ -->
+
+ <!-- Checks that a package-info.java file exists for each package.
-->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
+ <!--module name="JavadocPackage"/-->
+
+ <!-- Checks whether files end with a new line. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+ <module name="NewlineAtEndOfFile"/>
+
+ <!-- Checks that property files contain the same keys. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+ <module name="Translation"/>
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="FileLength"/>
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="FileTabCharacter"/>
+
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <module name="RegexpSingleline">
+ <property name="format" value="\s+$"/>
+ <property name="minimum" value="0"/>
+ <property name="maximum" value="0"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+
+ <!-- Checks for Headers -->
+ <!-- See http://checkstyle.sf.net/config_header.html -->
+ <!-- <module name="Header"> -->
+ <!-- <property name="headerFile" value="${checkstyle.header.file}"/>
-->
+ <!-- <property name="fileExtensions" value="java"/> -->
+ <!-- </module> -->
+
+ <module name="TreeWalker">
+
+ <!-- Checks for Javadoc comments. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+ <!--module name="JavadocMethod"/>
+ <module name="JavadocType"/>
+ <module name="JavadocVariable"/-->
+ <module name="JavadocStyle"/>
+
+
+ <!-- Checks for Naming Conventions. -->
+ <!-- See http://checkstyle.sf.net/config_naming.html -->
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+
+
+ <!-- Checks for imports -->
+ <!-- See http://checkstyle.sf.net/config_import.html -->
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ </module>
+ <module name="MethodLength"/>
+ <module name="ParameterNumber"/>
+
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="EmptyForIteratorPad"/>
+ <module name="GenericWhitespace"/>
+ <module name="MethodParamPad"/>
+ <module name="NoWhitespaceAfter"/>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap"/>
+ <module name="ParenPad"/>
+ <module name="TypecastParenPad"/>
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround"/>
+
+
+ <!-- Modifier Checks -->
+ <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+
+
+ <!-- Checks for blocks. You know, those {}'s -->
+ <!-- See http://checkstyle.sf.net/config_blocks.html -->
+ <module name="AvoidNestedBlocks"/>
+ <module name="EmptyBlock">
+ <property name="tokens"
+
value="LITERAL_DO,LITERAL_FINALLY,LITERAL_ELSE,LITERAL_FOR,LITERAL_TRY,LITERAL_WHILE,INSTANCE_INIT,STATIC_INIT"/>
+ </module>
+ <module name="LeftCurly">
+ <property name="option" value="nl"/>
+ <property name="tokens"
value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF"/>
+ </module>
+ <module name="NeedBraces"/>
+ <module name="RightCurly"/>
+
+
+ <!-- Checks for common coding problems -->
+ <!-- See http://checkstyle.sf.net/config_coding.html -->
+ <module name="AvoidInlineConditionals"/>
+ <module name="DoubleCheckedLocking"/> <!-- MY FAVOURITE -->
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="HiddenField">
+ <property name="tokens" value="VARIABLE_DEF"/>
+ </module>
+ <module name="IllegalInstantiation"/>
+ <module name="InnerAssignment"/>
+ <module name="MagicNumber"/>
+ <module name="MissingSwitchDefault"/>
+ <module name="RedundantThrows"/>
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+
+ <!-- Checks for class design -->
+ <!-- See http://checkstyle.sf.net/config_design.html -->
+ <!--module name="DesignForExtension"/-->
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="InterfaceIsType"/>
+ <module name="VisibilityModifier">
+ <property name="protectedAllowed" value="true"/>
+ </module>
+
+
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <module name="ArrayTypeStyle"/>
+ <!--module name="FinalParameters"/-->
+ <module name="TodoComment"/>
+ <module name="UpperEll"/>
+
+ </module>
+
+</module>
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/BaseChainingMergerFactory.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -16,8 +16,12 @@
*
* @author romradz
*/
-public class BaseChainingMergerFactory
+public final class BaseChainingMergerFactory
{
+ private BaseChainingMergerFactory()
+ {
+ }
+
public static Set<BaseChaining> getBaseChainingMergers(String
mergerNames)
throws PerfSONARException
{
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/NMWGInterfaceBaseChaining.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/NMWGInterfaceBaseChaining.java
2012-10-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/NMWGInterfaceBaseChaining.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -31,7 +31,7 @@
/**
- * This class handles base chaining of NMWG Interface element for MA requests
+ * This class handles base chaining of NMWG Interface element for MA
requests.
*
* @author romradz
*/
@@ -58,14 +58,14 @@
{
- Subject m1_subject = metadata1.getSubject();
- Subject m2_subject = metadata2.getSubject();
+ Subject m1Subject = metadata1.getSubject();
+ Subject m2Subject = metadata2.getSubject();
String subjectClassName = "";
- if (m1_subject != null) {
- subjectClassName = m1_subject.getClass().getName();
- } else if (m2_subject != null) {
- subjectClassName = m2_subject.getClass().getName();
+ if (m1Subject != null) {
+ subjectClassName = m1Subject.getClass().getName();
+ } else if (m2Subject != null) {
+ subjectClassName = m2Subject.getClass().getName();
}
@@ -84,81 +84,26 @@
protected void mergeMetadataWithUtilSubject(
Metadata metadata1, Metadata metadata2, Metadata newMetadata)
{
-
- org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject m1_subject =
+ org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject m1Subject =
(org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject)
metadata1.getSubject();
- org.ggf.ns.nmwg.topology.v2_0.Interface m1_interf = null;
- EventType m1_eventType = metadata1.getEventType();
+ org.ggf.ns.nmwg.topology.v2_0.Interface m1Interf = null;
+ EventType m1EventType = metadata1.getEventType();
- IpAddress m1_ipAddress = null;
- HostName m1_hostName = null;
- IfName m1_ifName = null;
- IfDescription m1_ifDescription = null;
- IfAddress m1_ifAddress = null;
- IfIndex m1_ifIndex = null;
- Type m1_type = null;
- Direction m1_direction = null;
- AuthRealm m1_authRealm = null;
- ClassOfService m1_classOfService = null;
- Capacity m1_capacity = null;
-
- if (m1_subject != null) {
- m1_interf = m1_subject.getInterface();
- if (m1_interf != null) {
- m1_ipAddress = m1_interf.getIpAddressElement();
- m1_hostName = m1_interf.getHostNameElement();
- m1_ifName = m1_interf.getIfNameElement();
- m1_ifDescription = m1_interf.getIfDescriptionElement();
- m1_ifAddress = m1_interf.getIfAddressElement();
- m1_ifIndex = m1_interf.getIfIndexElement();
- m1_type = m1_interf.getTypeElement();
- m1_direction = m1_interf.getDirectionElement();
- m1_authRealm = m1_interf.getAuthRealmElement();
- m1_classOfService = m1_interf.getClassOfServiceElement();
- m1_capacity = m1_interf.getCapacityElement();
- }
+ if (m1Subject != null) {
+ m1Interf = m1Subject.getInterface();
}
-
- org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject m2_subject =
+ org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject m2Subject =
(org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject)
metadata2.getSubject();
- org.ggf.ns.nmwg.topology.v2_0.Interface m2_interf = null;
- EventType m2_eventType = metadata2.getEventType();
+ org.ggf.ns.nmwg.topology.v2_0.Interface m2Interf = null;
+ EventType m2EventType = metadata2.getEventType();
- IpAddress m2_ipAddress = null;
- HostName m2_hostName = null;
- IfName m2_ifName = null;
- IfDescription m2_ifDescription = null;
- IfAddress m2_ifAddress = null;
- IfIndex m2_ifIndex = null;
- Type m2_type = null;
- Direction m2_direction = null;
- AuthRealm m2_authRealm = null;
- ClassOfService m2_classOfService = null;
- Capacity m2_capacity = null;
-
- if (m2_subject != null) {
- m2_interf = m2_subject.getInterface();
- if (m2_interf != null) {
- m2_ipAddress = m2_interf.getIpAddressElement();
- m2_hostName = m2_interf.getHostNameElement();
- m2_ifName = m2_interf.getIfNameElement();
- m2_ifDescription = m2_interf.getIfDescriptionElement();
- m2_ifAddress = m2_interf.getIfAddressElement();
- m2_ifIndex = m2_interf.getIfIndexElement();
- m2_type = m2_interf.getTypeElement();
- m2_direction = m2_interf.getDirectionElement();
- m2_authRealm = m2_interf.getAuthRealmElement();
- m2_classOfService = m2_interf.getClassOfServiceElement();
- m2_capacity = m2_interf.getCapacityElement();
- }
+ if (m2Subject != null) {
+ m2Interf = m2Subject.getInterface();
}
-
// comparing and adding
-
-
- if (m1_subject != null || m2_subject != null) {
+ if (m1Subject != null || m2Subject != null) {
if (newMetadata.getSubject() == null) {
newMetadata.setSubject(new
org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject());
}
@@ -167,108 +112,85 @@
(org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject)
newMetadata.getSubject();
- if (m1_interf != null || m2_interf != null) {
+ if (m1Interf != null || m2Interf != null) {
if (newSubject.getInterface() == null) {
newSubject.setInterface(new
org.ggf.ns.nmwg.topology.v2_0.Interface());
}
}
- if (m1_eventType != null) {
+ if (m1EventType != null) {
newMetadata.setEventType(new EventType());
-
newMetadata.getEventType().setEventType(m1_eventType.getEventType());
- } else if (m2_eventType != null) {
+
newMetadata.getEventType().setEventType(m1EventType.getEventType());
+ } else if (m2EventType != null) {
newMetadata.setEventType(new EventType());
-
newMetadata.getEventType().setEventType(m2_eventType.getEventType());
+
newMetadata.getEventType().setEventType(m2EventType.getEventType());
}
- if (m1_subject != null) {
- if (m1_interf != null) {
- org.ggf.ns.nmwg.topology.v2_0.Interface newInterf =
-
((org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject)
- newMetadata.getSubject()).getInterface();
-
- if (m1_ipAddress != null) {
- newInterf.setIpAddressElement(m1_ipAddress);
- }
- if (m1_hostName != null) {
- newInterf.setHostNameElement(m1_hostName);
- }
- if (m1_ifName != null) {
- newInterf.setIfNameElement(m1_ifName);
- }
- if (m1_ifDescription != null) {
- newInterf.setIfDescriptionElement(m1_ifDescription);
- }
- if (m1_ifAddress != null) {
- newInterf.setIfAddressElement(m1_ifAddress);
- }
- if (m1_ifIndex != null) {
- newInterf.setIfIndexElement(m1_ifIndex);
- }
- if (m1_type != null) {
- newInterf.setTypeElement(m1_type);
- }
- if (m1_direction != null) {
- newInterf.setDirectionElement(m1_direction);
- }
- if (m1_authRealm != null) {
- newInterf.setAuthRealmElement(m1_authRealm);
- }
- if (m1_classOfService != null) {
- newInterf.setClassOfServiceElement(m1_classOfService);
- }
- if (m1_capacity != null) {
- newInterf.setCapacityElement(m1_capacity);
- }
- }
+ if (m1Interf != null) {
+ org.ggf.ns.nmwg.topology.v2_0.Interface newInterf =
+ ((org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject)
+ newMetadata.getSubject()).getInterface();
+ copyInterfacePropertiesTo(newInterf, m1Interf);
}
-
- if (m2_subject != null) {
- if (m2_interf != null) {
- org.ggf.ns.nmwg.topology.v2_0.Interface newInterf =
-
((org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject)
- newMetadata.getSubject()).getInterface();
-
- if (m2_ipAddress != null) {
- newInterf.setIpAddressElement(m2_ipAddress);
- }
- if (m2_hostName != null) {
- newInterf.setHostNameElement(m2_hostName);
- }
- if (m2_ifName != null) {
- newInterf.setIfNameElement(m2_ifName);
- }
- if (m2_ifDescription != null) {
- newInterf.setIfDescriptionElement(m2_ifDescription);
- }
- if (m2_ifAddress != null) {
- newInterf.setIfAddressElement(m2_ifAddress);
- }
- if (m2_ifIndex != null) {
- newInterf.setIfIndexElement(m2_ifIndex);
- }
- if (m2_type != null) {
- newInterf.setTypeElement(m2_type);
- }
- if (m2_direction != null) {
- newInterf.setDirectionElement(m2_direction);
- }
- if (m2_authRealm != null) {
- newInterf.setAuthRealmElement(m2_authRealm);
- }
- if (m2_classOfService != null) {
- newInterf.setClassOfServiceElement(m2_classOfService);
- }
- if (m2_capacity != null) {
- newInterf.setCapacityElement(m2_capacity);
- }
- }
+ if (m2Interf != null) {
+ org.ggf.ns.nmwg.topology.v2_0.Interface newInterf =
+ ((org.ggf.ns.nmwg.characteristic.utilization.v2_0.Subject)
+ newMetadata.getSubject()).getInterface();
+ copyInterfacePropertiesTo(newInterf, m2Interf);
}
+ }
+ private static void
copyInterfacePropertiesTo(org.ggf.ns.nmwg.topology.v2_0.Interface dst,
+
org.ggf.ns.nmwg.topology.v2_0.Interface src)
+ {
+ IpAddress ipAddress = src.getIpAddressElement();
+ HostName hostName = src.getHostNameElement();
+ IfName ifName = src.getIfNameElement();
+ IfDescription ifDescription = src.getIfDescriptionElement();
+ IfAddress ifAddress = src.getIfAddressElement();
+ IfIndex ifIndex = src.getIfIndexElement();
+ Type type = src.getTypeElement();
+ Direction direction = src.getDirectionElement();
+ AuthRealm authRealm = src.getAuthRealmElement();
+ ClassOfService classOfService = src.getClassOfServiceElement();
+ Capacity capacity = src.getCapacityElement();
+ if (ipAddress != null) {
+ dst.setIpAddressElement(ipAddress);
+ }
+ if (hostName != null) {
+ dst.setHostNameElement(hostName);
+ }
+ if (ifName != null) {
+ dst.setIfNameElement(ifName);
+ }
+ if (ifDescription != null) {
+ dst.setIfDescriptionElement(ifDescription);
+ }
+ if (ifAddress != null) {
+ dst.setIfAddressElement(ifAddress);
+ }
+ if (ifIndex != null) {
+ dst.setIfIndexElement(ifIndex);
+ }
+ if (type != null) {
+ dst.setTypeElement(type);
+ }
+ if (direction != null) {
+ dst.setDirectionElement(direction);
+ }
+ if (authRealm != null) {
+ dst.setAuthRealmElement(authRealm);
+ }
+ if (classOfService != null) {
+ dst.setClassOfServiceElement(classOfService);
+ }
+ if (capacity != null) {
+ dst.setCapacityElement(capacity);
+ }
}
@@ -276,16 +198,16 @@
Metadata metadata1, Metadata metadata2, Metadata newMetadata)
{
- org.ggf.ns.nmwg.ops.select.v2_0.Subject m1_subject =
+ org.ggf.ns.nmwg.ops.select.v2_0.Subject m1Subject =
(org.ggf.ns.nmwg.ops.select.v2_0.Subject) metadata1.getSubject();
- EventType m1_eventType = metadata1.getEventType();
+ EventType m1EventType = metadata1.getEventType();
- org.ggf.ns.nmwg.ops.select.v2_0.Subject m2_subject =
+ org.ggf.ns.nmwg.ops.select.v2_0.Subject m2Subject =
(org.ggf.ns.nmwg.ops.select.v2_0.Subject) metadata2.getSubject();
- EventType m2_eventType = metadata2.getEventType();
+ EventType m2EventType = metadata2.getEventType();
- if (m1_subject != null || m2_subject != null) {
+ if (m1Subject != null || m2Subject != null) {
if (newMetadata.getSubject() == null) {
newMetadata.setSubject(new
org.ggf.ns.nmwg.ops.select.v2_0.Subject());
}
@@ -294,37 +216,39 @@
(org.ggf.ns.nmwg.ops.select.v2_0.Subject)
newMetadata.getSubject();
- if (m1_subject != null) {
- if (!m1_subject.getMetadataIdRef().isEmpty())
- newSubject.setMetadataIdRef(m1_subject.getMetadataIdRef());
+ if (m1Subject != null) {
+ if (!m1Subject.getMetadataIdRef().isEmpty()) {
+ newSubject.setMetadataIdRef(m1Subject.getMetadataIdRef());
+ }
}
- if (m2_subject != null) {
- if (!m2_subject.getMetadataIdRef().isEmpty())
- newSubject.setMetadataIdRef(m2_subject.getMetadataIdRef());
+ if (m2Subject != null) {
+ if (!m2Subject.getMetadataIdRef().isEmpty()) {
+ newSubject.setMetadataIdRef(m2Subject.getMetadataIdRef());
+ }
}
- if (m1_eventType != null) {
+ if (m1EventType != null) {
newMetadata.setEventType(new EventType());
-
newMetadata.getEventType().setEventType(m1_eventType.getEventType());
- } else if (m2_eventType != null) {
+
newMetadata.getEventType().setEventType(m1EventType.getEventType());
+ } else if (m2EventType != null) {
newMetadata.setEventType(new EventType());
-
newMetadata.getEventType().setEventType(m2_eventType.getEventType());
+
newMetadata.getEventType().setEventType(m2EventType.getEventType());
}
- Parameters m1_paremeters = metadata1.getParameters();
- Parameters m2_paremeters = metadata2.getParameters();
+ Parameters m1Parameters = metadata1.getParameters();
+ Parameters m2Parameters = metadata2.getParameters();
org.ggf.ns.nmwg.ops.select.v2_0.Parameters newParameters = null;
- if (m1_paremeters != null || m2_paremeters != null) {
+ if (m1Parameters != null || m2Parameters != null) {
newParameters = new org.ggf.ns.nmwg.ops.select.v2_0.Parameters();
}
- Iterator _pIt = m1_paremeters.getParameterIterator();
- while (_pIt.hasNext()) {
- Parameter param = (Parameter) _pIt.next();
+ Iterator pIt = m1Parameters.getParameterIterator();
+ while (pIt.hasNext()) {
+ Parameter param = (Parameter) pIt.next();
newParameters.addParameter(param);
}
- Iterator pIt = m2_paremeters.getParameterIterator();
+ pIt = m2Parameters.getParameterIterator();
while (pIt.hasNext()) {
Parameter param = (Parameter) pIt.next();
newParameters.addParameter(param);
@@ -337,4 +261,4 @@
}
-} //NMWGInterfaceBaseChaining
\ No newline at end of file
+} //NMWGInterfaceBaseChaining
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -114,7 +114,7 @@
Key key = md.getKey();
- Map<String,Object> ibatisParams = new HashMap<String,Object>();
+ Map<String, Object> ibatisParams = new HashMap<String, Object>();
Map parametersMap = key.getParametersMap();
for (Object o : parametersMap.values()) {
@@ -198,9 +198,9 @@
}
//logger.debug("SQLStorageManager.fetch: "
- // + "The number of fetched rows from db for
metadata "
- // + md.getId() + ": "
- // + resultList.size());
+ // + "The number of fetched rows from db for metadata "
+ // + md.getId() + ": "
+ // + resultList.size());
String eventType = (String) ibatisParams.get("eventType");
//logger.debug("SQLStorageManager.fetch: EventType: " +
eventType);
@@ -332,4 +332,4 @@
}
-} //SQLStorageManager
\ No newline at end of file
+} //SQLStorageManager
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -39,7 +39,7 @@
/**
* Class implementing the Measurement Archive Service Engine which deals with
- * SQL database
+ * SQL database.
*
* @author romradz
* @see org.perfsonar.service.base.engine
@@ -53,20 +53,20 @@
/**
- * The object to log control/debugging messages
+ * The object to log control/debugging messages.
*/
protected LoggerComponent logger = null;
/**
* This object provides access to the service configuration
- * (service.properties)
+ * (service.properties).
*/
protected ConfigurationComponent configuration = null;
/**
- * This object provides access to metadata configuration
+ * This object provides access to metadata configuration.
*/
protected NMWGStorageManager metadataConfig = null;
@@ -84,10 +84,14 @@
public static final String SELECT_NAMESPACE =
"http://ggf.org/ns/nmwg/ops/select/2.0";;
- public static final String ECHO_SELF_TEST_NAMESPACE =
"http://schemas.perfsonar.net/tools/admin/selftest/";;
- public static final String ECHO_XMLDB_ACCESS_TEST_NAMESPACE =
"http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test";;
- public static final String ECHO_XMLDB_CONTENT_TEST_NAMESPACE =
"http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test";;
- public static final String ECHO_RANDOM_FETCH_TEST_NAMESPACE =
"http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test";;
+ public static final String ECHO_SELF_TEST_NAMESPACE =
+ "http://schemas.perfsonar.net/tools/admin/selftest/";;
+ public static final String ECHO_XMLDB_ACCESS_TEST_NAMESPACE =
+
"http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test";;
+ public static final String ECHO_XMLDB_CONTENT_TEST_NAMESPACE =
+
"http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test";;
+ public static final String ECHO_RANDOM_FETCH_TEST_NAMESPACE =
+
"http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test";;
// ---------------------------------- constructors
@@ -131,9 +135,10 @@
Metadata metadata = null;
Map metadataMap = keyMessage.getMetadataMap();
if (metadataMap != null) {
- if (!data.getMetadataIdRef().isEmpty())
+ if (!data.getMetadataIdRef().isEmpty()) {
metadata = (Metadata)
metadataMap.get(data.getMetadataIdRef());
+ }
}
Message dReq = new Message();
@@ -145,8 +150,7 @@
// putting in the response
- Collection<Data> _datas = dMsg.getDataMap().values();
- for (Data d : _datas) {
+ for (Data d : (Collection<Data>) dMsg.getDataMap().values()) {
response.addChild(d);
@@ -220,7 +224,6 @@
protected Key getStoreKey(Metadata metadata)
throws PerfSONARException
{
-
EventType eventTypeObj = metadata.getEventType();
if (eventTypeObj == null) {
throw new PerfSONARException("error.ma.query",
@@ -238,9 +241,7 @@
Key key = metadata.getKey();
if (key != null) {
-
// check parameters in the key
-
Parameter ibatisConfig = key.getParameterByName("ibatisConfig");
if (ibatisConfig == null) {
ibatisConfig = getIbatisConfig(eventType);
@@ -255,9 +256,7 @@
"SQLTypeMAServiceEngine.getStoreKey: "
+ "No ibatisConfig parameter in the key");
}
-
} else {
-
// no key in the request
Message query = new Message();
query.addChild(metadata);
@@ -285,24 +284,23 @@
if (key.getParameterByName("eventType") == null) {
key.addParameter("eventType", eventType);
}
-
} else {
// metadata does not exist in xmldb
// getting default ibatis parameter from service.properties
- String ibatis_config_str;
+ String ibatisConfigStr;
try {
- ibatis_config_str =
+ ibatisConfigStr =
configuration.getProperty("service.ma.sql.default_ibatis_config");
} catch (Exception ex) {
- ibatis_config_str = "";
+ ibatisConfigStr = "";
}
Parameter ibatisConfig = null;
- if (!ibatis_config_str.trim().isEmpty()) {
+ if (!ibatisConfigStr.trim().isEmpty()) {
ibatisConfig = new Parameter();
ibatisConfig.setParameterName("ibatisConfig");
- ibatisConfig.setParameterValue(ibatis_config_str);
+ ibatisConfig.setParameterValue(ibatisConfigStr);
}
Key k = new Key();
@@ -316,13 +314,11 @@
originalParams = copyParameters(params);
}
if (params == null || !params.getPrefix().equals("nmwg")) {
-
params = new Parameters();
params.addParameter("eventType", eventType);
}
if (ibatisConfig != null) {
-
params.getParameterMap().remove("ibatisConfig");
params.addChild(ibatisConfig);
@@ -343,49 +339,38 @@
+ "in the service configuration file");
}
-
k.addChild(params);
params.addParameter("metadataId", metadataId);
-
key = k;
key.addParameter("eventType", eventType);
-
// we need to remove parameters from metadata,
// so temporary metadata is created with elements from
original metadata
// except parameters
- Metadata _metadata = new Metadata();
- _metadata.addChild(metadata.getSubject());
- _metadata.setEventType(eventTypeObj);
+ Metadata metadata2 = new Metadata();
+ metadata2.addChild(metadata2.getSubject());
+ metadata2.setEventType(eventTypeObj);
// adding original parameters
if (originalParams != null) {
- _metadata.setParameters(originalParams);
+ metadata2.setParameters(originalParams);
}
Message configMessage = new Message();
- _metadata.setId(metadataId);
- configMessage.addChild(_metadata);
+ metadata2.setId(metadataId);
+ configMessage.addChild(metadata2);
Data dk = new Data();
dk.addChild(key);
- dk.setMetadataIdRef(_metadata.getId());
+ dk.setMetadataIdRef(metadata2.getId());
configMessage.addChild(dk);
- //logger.debug("SQLTypeMAServiceEngine.getStoreKey: "
- // + "metadataConfig message: "
- // + configMessage.toString());
-
metadataConfig.store(configMessage);
-
}
-
}
-
return key;
}
-
private Parameters copyParameters(Parameters parameters)
{
@@ -643,9 +628,8 @@
protected ConfigurationComponent getConfiguration() throws
PerfSONARException
{
-
try {
- return configuration = (ConfigurationComponent)
AuxiliaryComponentManager.getInstance().
+ configuration = (ConfigurationComponent)
AuxiliaryComponentManager.getInstance().
getComponent(ComponentNames.CONFIG);
} catch (PerfSONARException e) {
throw new PerfSONARException(
@@ -653,6 +637,7 @@
"SQLTypeMAServiceEngine.getConfiguration: "
+ "Cannot get config component");
}
+ return configuration;
}
@@ -692,7 +677,7 @@
try {
- _getKey(metadata, null, metadataMap, message,
metadataConfig);
+ getKeyImpl(metadata, null, metadataMap, message,
metadataConfig);
} catch (NullPointerException npex) {
@@ -771,11 +756,11 @@
*
* @throws PerfSONARException
*/
- protected void _getKey(Metadata metadata,
- Data data,
- Map metadataMap,
- Message message,
- NMWGStorageManager metadataConfig)
+ protected void getKeyImpl(Metadata metadata,
+ Data data,
+ Map metadataMap,
+ Message message,
+ NMWGStorageManager metadataConfig)
throws PerfSONARException
{
@@ -792,7 +777,7 @@
Message msg = metadataConfig.fetch(query);
//logger.debug(
- // "SQLTypeMAServiceEngine._getKey: "
+ // "SQLTypeMAServiceEngine.getKeyImpl: "
// + "found in metadata configuration: "
// + msg);
@@ -814,7 +799,7 @@
} catch (Exception ex) {
throw new PerfSONARException(
"error.ma.query",
- "SQLTypeMAServiceEngine._getKey: "
+ "SQLTypeMAServiceEngine.getKeyImpl: "
+ "something wrong with eventType in metadata
id=" + metadata.getId());
}
@@ -823,7 +808,7 @@
String metadataIdRef =
metadata.getSubject().getMetadataIdRef();
Metadata m = (Metadata) metadataMap.get(metadataIdRef);
- _getKey(m, null, metadataMap, message, metadataConfig);
+ getKeyImpl(m, null, metadataMap, message,
metadataConfig);
for (Object d : message.getDataMap().values()) {
@@ -838,7 +823,7 @@
throw new PerfSONARException(
"error.ma.query",
- "SQLTypeMAServiceEngine._getKey: "
+ "SQLTypeMAServiceEngine.getKeyImpl: "
+ "eventType " + eventType + " in metadata id="
+ metadata.getId()
+ " is not supported");
@@ -848,13 +833,10 @@
} else {
- Key key;
+ Key key = metadata.getKey();
- if ((key = metadata.getKey()) != null) {
-
-
+ if (key != null) {
if (data == null) {
-
data = new Data();
message.addChild(data);
@@ -901,7 +883,7 @@
throw new PerfSONARException(
"error.ma.query",
- "SQLTypeMAServiceEngine._getKey: "
+ "SQLTypeMAServiceEngine.getKeyImpl: "
+ "no eventType or key element in metadata id="
+ metadata.getId());
@@ -991,7 +973,7 @@
}
- protected final static String _codeResponse1 = "Fetching data from the
relational database is correct.";
+ protected static final String CODE_RESPONSE_1 = "Fetching data from the
relational database is correct.";
protected Message executeRandomFetchTest(Message request, String
testName) throws PerfSONARException
{
@@ -1050,7 +1032,7 @@
return generateResultCodeResponse(
ECHO_SELF_TEST_NAMESPACE + serviceType + "/" + serviceName + "/"
+ testName + "/success/1.0",
- _codeResponse1);
+ CODE_RESPONSE_1);
//return getData(dataRequest);
}
@@ -1152,4 +1134,4 @@
}
-} //SQLTypeMAServiceEngine
\ No newline at end of file
+} //SQLTypeMAServiceEngine
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -1,8 +1,6 @@
package org.perfsonar.service.measurementArchive.sqlType.fetch;
-import java.util.Collection;
-import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -24,11 +22,11 @@
}
@Override
- public Data getResponse(List<Map<String,Object>> resultList)
+ public Data getResponse(List<Map<String, Object>> resultList)
{
Data data = new Data();
- for (Map<String,Object> resultMap: resultList) {
+ for (Map<String, Object> resultMap: resultList) {
Datum datum = new Datum();
for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -5,7 +5,6 @@
package org.perfsonar.service.measurementArchive.sqlType.fetch;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -27,11 +26,11 @@
}
@Override
- public Data getResponse(List<Map<String,Object>> resultList)
+ public Data getResponse(List<Map<String, Object>> resultList)
{
Data data = new Data();
- for (Map<String,Object> resultMap : resultList) {
+ for (Map<String, Object> resultMap : resultList) {
Datum datum = new Datum();
for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ErrorsResponseGenerator.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -5,7 +5,6 @@
package org.perfsonar.service.measurementArchive.sqlType.fetch;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -27,11 +26,11 @@
}
@Override
- public Data getResponse(List<Map<String,Object>> resultList)
+ public Data getResponse(List<Map<String, Object>> resultList)
{
Data data = new Data();
- for (Map<String,Object> resultMap: resultList) {
+ for (Map<String, Object> resultMap: resultList) {
Datum datum = new Datum();
for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/GenericResponseGenerator.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -5,7 +5,6 @@
package org.perfsonar.service.measurementArchive.sqlType.fetch;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -27,11 +26,11 @@
}
@Override
- public Data getResponse(List<Map<String,Object>> resultList)
+ public Data getResponse(List<Map<String, Object>> resultList)
{
Data data = new Data();
- for (Map<String,Object> resultMap : resultList) {
+ for (Map<String, Object> resultMap : resultList) {
Datum datum = new Datum();
for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -5,7 +5,6 @@
package org.perfsonar.service.measurementArchive.sqlType.fetch;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -27,15 +26,15 @@
}
@Override
- public Data getResponse(List<Map<String,Object>> resultList)
+ public Data getResponse(List<Map<String, Object>> resultList)
{
Data data = new Data();
- for (Map<String,Object> resultMap : resultList) {
+ for (Map<String, Object> resultMap : resultList) {
Datum datum = new Datum();
- for (Map.Entry<String,Object> entry : resultMap.entrySet()) {
+ for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
if (entry.getValue() != null) {
String column = entry.getKey();
String value = entry.getValue().toString();
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -5,7 +5,6 @@
package org.perfsonar.service.measurementArchive.sqlType.fetch;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -31,11 +30,11 @@
}
@Override
- public Data getResponse(List<Map<String,Object>> resultList)
+ public Data getResponse(List<Map<String, Object>> resultList)
{
Data data = new Data();
- for (Map<String,Object> resultMap : resultList) {
+ for (Map<String, Object> resultMap : resultList) {
Datum datum = new Datum();
for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -24,7 +24,7 @@
}
/**
- * Constructor only for test purposes
+ * Constructor only for test purposes.
*
* @param t
*/
@@ -34,7 +34,7 @@
}
@Override
- public Data getResponse(List<Map<String,Object>> resultList)
+ public Data getResponse(List<Map<String, Object>> resultList)
{
Data data = new Data();
@@ -77,7 +77,7 @@
}
System.out.println("Here 1");
- for (Map<String,Object> resultMap : resultList) {
+ for (Map<String, Object> resultMap : resultList) {
System.out.println("Here 2");
if (owamp) {
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -1,7 +1,6 @@
package org.perfsonar.service.measurementArchive.sqlType.fetch;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -23,11 +22,11 @@
}
@Override
- public Data getResponse(List<Map<String,Object>> resultList)
+ public Data getResponse(List<Map<String, Object>> resultList)
{
Data data = new Data();
- for (Map<String,Object> resultMap : resultList) {
+ for (Map<String, Object> resultMap : resultList) {
Datum datum = new Datum();
for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGenerator.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -10,10 +10,6 @@
import org.ggf.ns.nmwg.base.v2_0.Data;
-import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
-import org.perfsonar.base.auxiliary.ComponentNames;
-import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
-
import org.perfsonar.base.exceptions.PerfSONARException;
/**
@@ -23,25 +19,13 @@
*/
public abstract class ResponseGenerator
{
- protected LoggerComponent logger = null;
-
public ResponseGenerator() throws PerfSONARException
{
- try {
- logger = (LoggerComponent)
- AuxiliaryComponentManager.
- getInstance().
- getComponent(ComponentNames.LOGGER);
- } catch (PerfSONARException e) {
- throw new PerfSONARException(
- "error.common.no_logger",
- "ResponseGenerator.constructor: "
- + "Cannot get logger component", e);
- }
}
/**
- * Contstructor only for test purposes. It is implemented because when
unitTest run it cannot get loggger from main constructor
+ * Contstructor only for test purposes. It is implemented because when
unitTest run it cannot get loggger from
+ * main constructor.
*
* @param t
*/
@@ -49,5 +33,5 @@
{
}
- public abstract Data getResponse(List<Map<String,Object>> resultList);
+ public abstract Data getResponse(List<Map<String, Object>> resultList);
}
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGeneratorFactory.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGeneratorFactory.java
2012-10-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ResponseGeneratorFactory.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -22,10 +22,12 @@
*
* @author romradz
*/
-public class ResponseGeneratorFactory
+public final class ResponseGeneratorFactory
{
+ private ResponseGeneratorFactory()
+ {
+ }
-
public static ResponseGenerator getResponseGenerator(String
eventTypeName)
throws PerfSONARException
{
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -5,7 +5,6 @@
package org.perfsonar.service.measurementArchive.sqlType.fetch;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -27,11 +26,11 @@
}
@Override
- public Data getResponse(List<Map<String,Object>> resultList)
+ public Data getResponse(List<Map<String, Object>> resultList)
{
Data data = new Data();
- for (Map<String,Object> resultMap : resultList) {
+ for (Map<String, Object> resultMap : resultList) {
Datum datum = new Datum();
for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg/OwampAggregationDatum.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg/OwampAggregationDatum.java
2012-10-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg/OwampAggregationDatum.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -21,45 +21,46 @@
public class OwampAggregationDatum extends
org.ggf.ns.nmwg.tools.owamp.v2_0.Datum
{
- public static final String FILENAME =
"org/perfsonar/service/measurementArchive/sqlType/nmwg/OwampAggregationDatum.java";
+ public static final String FILENAME =
+
"org/perfsonar/service/measurementArchive/sqlType/nmwg/OwampAggregationDatum.java";
/**
- * attribute for Sender
+ * attribute for Sender.
*/
protected String sender;
/**
- * attribute for receiver
+ * attribute for receiver.
*/
protected String receiver;
/**
- * attribute for sent
+ * attribute for sent.
*/
protected String sent;
/**
- * attribute for loss
+ * attribute for loss.
*/
protected String loss;
/**
- * attribute for RECVTIME (Receive timestamp)
+ * attribute for RECVTIME (Receive timestamp).
*/
protected String duplicates;
/**
- * attribute for Lost in percrent
+ * attribute for Lost in percrent.
*/
protected String lostPercent;
/**
- * attribute for minimum dealy
+ * attribute for minimum dealy.
*/
protected String minDelay;
/**
- * attribute for medium delay
+ * attribute for medium delay.
*/
protected String medDelay;
@@ -260,9 +261,7 @@
if (attr.equals("value")) {
setValue(value);
- }
- //OWAMP SUMMARY DATUM PARAMETERS
- else if (attr.equals("valueUnits")) {
+ } else if (attr.equals("valueUnits")) {
setValueUnits(value);
} else if (attr.equals("numBytes")) {
setNumBytes(value);
@@ -298,9 +297,7 @@
setJitterUnits(value);
} else if (attr.equals("hops")) {
setHops(value);
- }
- //OWAMP DATUM PARAMETERS
- else if (attr.equals("seqNum")) {
+ } else if (attr.equals("seqNum")) {
setSeqNum(value);
} else if (attr.equals("sendTime")) {
setSendTime(value);
@@ -506,7 +503,8 @@
atts.addAttribute(getUri(), "receiveTime", "receiveTime",
"CDATA", getReceiveTime());
}
if (!(getReceiveSynchronized().isEmpty())) {
- atts.addAttribute(getUri(), "receiveSynchronized",
"receiveSynchronized", "CDATA", getReceiveSynchronized());
+ atts.addAttribute(getUri(), "receiveSynchronized",
"receiveSynchronized", "CDATA",
+ getReceiveSynchronized());
}
if (!(getReceiveTimeError().isEmpty())) {
atts.addAttribute(getUri(), "receiveTimeError",
"receiveTimeError", "CDATA", getReceiveTimeError());
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/BwctlStoreRequestProcess.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -12,7 +12,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
/**
- * Moves data from nmwg data element into ibatis map structure
+ * Moves data from nmwg data element into ibatis map structure.
*
* @author fernandes
*/
@@ -35,7 +35,7 @@
@Override
- public Map<String,Object> prepareStoreParameters(Element datum,
Map<String,Object> 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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/DiscardsStoreRequestProcess.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -13,7 +13,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
/**
- * Moves data from nmwg data element into ibatis map structure
+ * Moves data from nmwg data element into ibatis map structure.
*
* @author romradz
*/
@@ -36,7 +36,7 @@
@Override
- public Map<String,Object> prepareStoreParameters(Element datum,
Map<String,Object> 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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/ErrorsStoreRequestProcess.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -13,7 +13,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
/**
- * Moves data from nmwg data element into ibatis map structure
+ * Moves data from nmwg data element into ibatis map structure.
*
* @author romradz
*/
@@ -36,7 +36,7 @@
@Override
- public Map<String,Object> prepareStoreParameters(Element datum,
Map<String,Object> 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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -13,7 +13,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
/**
- * Moves data from nmwg data element into ibatis map structure
+ * Moves data from nmwg data element into ibatis map structure.
*
* @author romradz
*/
@@ -36,7 +36,7 @@
@Override
- public Map<String,Object> prepareStoreParameters(Element datum,
Map<String,Object> ibatisParams)
+ public Map<String, Object> prepareStoreParameters(Element datum,
Map<String, Object> ibatisParams)
{
String strValue = ((Datum) datum).getValue();
@@ -100,4 +100,4 @@
}
-} //IperfStoreRequestProcess
\ No newline at end of file
+} //IperfStoreRequestProcess
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -7,6 +7,7 @@
import java.util.Map;
import java.util.Date;
+import java.util.concurrent.TimeUnit;
import org.ggf.ns.nmwg.base.v2_0.Element;
import org.ggf.ns.nmwg.event.status.base.v2_0.Datum;
@@ -15,7 +16,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
/**
- * Moves data from nmwg data element into ibatis map structure
+ * Moves data from nmwg data element into ibatis map structure.
*
* @author romradz
*/
@@ -38,7 +39,7 @@
@Override
- public Map<String,Object> prepareStoreParameters(Element datum,
Map<String,Object> ibatisParams)
+ public Map<String, Object> prepareStoreParameters(Element datum,
Map<String, Object> ibatisParams)
{
String timeType = ((Datum) datum).getTimeType();
@@ -66,12 +67,12 @@
}
- protected void handleUnixTimeValue(String timeValue, Map<String,Object>
ibatisParams)
+ protected void handleUnixTimeValue(String timeValue, Map<String, Object>
ibatisParams)
{
int timeValueInt;
if (timeValue.isEmpty()) {
- timeValueInt = (int) ((new Date()).getTime() / 1000);
+ timeValueInt = (int) TimeUnit.MILLISECONDS.toSeconds(new
Date().getTime());
ibatisParams.put("timeValue", timeValueInt);
} else {
ibatisParams.put("timeValue", Integer.parseInt(timeValue));
@@ -80,7 +81,7 @@
}
- protected void handleIsoTimeValue(String timeValue, Map<String,Object>
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/OwampStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
2012-10-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -11,7 +11,7 @@
import
org.perfsonar.service.measurementArchive.sqlType.nmwg.OwampAggregationDatum;
/**
- * Moves data from nmwg data element into ibatis map structure
+ * Moves data from nmwg data element into ibatis map structure.
*
* @author fernandes
*/
@@ -106,7 +106,7 @@
System.out.println("DATUM TYPE! " + datumType);
- if (datumType != true) {
+ if (!datumType) {
System.out.println("I AM HERE!");
// OWAMP AGGREGATION DATUM
ibatisParams.put("sender", ((OwampAggregationDatum) datum)
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/PingStoreRequestProcess.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -12,7 +12,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
/**
- * Moves data from nmwg data element into ibatis map structure
+ * Moves data from nmwg data element into ibatis map structure.
*
* @author fernandes
*/
@@ -35,7 +35,7 @@
@Override
- public Map<String,Object> prepareStoreParameters(Element datum,
Map<String,Object> 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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcess.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -59,7 +59,8 @@
}
/**
- * For test purposes only. Otherwise UnitTests cannot be made with this
class because main constructor cannot find the logger
+ * For test purposes only. Otherwise UnitTests cannot be made with this
class because main constructor cannot
+ * find the logger.
*
* @param test
*/
@@ -72,7 +73,7 @@
// -------------------------------------- public methods
- public void process(SqlMapClient sqlMap, Data data, Map<String,Object>
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/StoreRequestProcessFactory.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcessFactory.java
2012-10-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/StoreRequestProcessFactory.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -19,10 +19,12 @@
/**
* @author romradz
*/
-public class StoreRequestProcessFactory
+public final class StoreRequestProcessFactory
{
+ private StoreRequestProcessFactory()
+ {
+ }
-
public static StoreRequestProcess getStoreRequestProcess(String
eventTypeName)
throws PerfSONARException
{
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-06 17:26:23 UTC (rev 6023)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/UtilizationStoreRequestProcess.java
2012-10-08 12:49:17 UTC (rev 6024)
@@ -13,7 +13,7 @@
import org.perfsonar.base.exceptions.PerfSONARException;
/**
- * Moves data from nmwg data element into ibatis map structure
+ * Moves data from nmwg data element into ibatis map structure.
*
* @author romradz
*/
@@ -36,7 +36,7 @@
@Override
- public Map<String,Object> prepareStoreParameters(Element datum,
Map<String,Object> ibatisParams)
+ public Map<String, Object> prepareStoreParameters(Element datum,
Map<String, Object> ibatisParams)
{
String strValue = ((Datum) datum).getValue();
- [pS-dev] [GEANT/SA2/ps-java-services] r6024 - in trunk/perfsonar-java-sql-ma: . src src/checkstyle src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg src/main/java/org/perfsonar/service/measurementArchive/sqlType/store, svn-noreply, 10/08/2012
Archive powered by MHonArc 2.6.16.