jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1719185 [2/8] - in /jmeter/trunk/src/core/org/apache/jmeter/report: config/ core/ dashboard/ processor/ processor/graph/ processor/graph/impl/
Date Thu, 10 Dec 2015 19:10:08 GMT
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java Thu Dec 10 19:10:06 2015
@@ -1,654 +1,654 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.config;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Properties;
-
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
-
-import jodd.props.Props;
-
-/**
- * The class ReportGeneratorConfiguration describes the configuration of the
- * report generator.
- *
- * @since 2.14
- */
-public class ReportGeneratorConfiguration {
-
-    private static final Logger log = LoggingManager.getLoggerForClass();
-
-    public static final char KEY_DELIMITER = '.';
-    public static final String REPORT_GENERATOR_KEY_PREFIX = "jmeter.reportgenerator";
-    public static final String REPORT_GENERATOR_GRAPH_KEY_PREFIX = REPORT_GENERATOR_KEY_PREFIX
-            + KEY_DELIMITER + "graph";
-    public static final String REPORT_GENERATOR_EXPORTER_KEY_PREFIX = REPORT_GENERATOR_KEY_PREFIX
-            + KEY_DELIMITER + "exporter";
-
-    // Temporary directory
-    private static final String REPORT_GENERATOR_KEY_TEMP_DIR = REPORT_GENERATOR_KEY_PREFIX
-            + KEY_DELIMITER + "temp_dir";
-    private static final File REPORT_GENERATOR_KEY_TEMP_DIR_DEFAULT = new File(
-            "temp");
-
-    // Apdex Satified Threshold
-    private static final String REPORT_GENERATOR_KEY_APDEX_SATISFIED_THRESHOLD = REPORT_GENERATOR_KEY_PREFIX
-            + KEY_DELIMITER + "apdex_statisfied_threshold";
-    private static final long REPORT_GENERATOR_KEY_APDEX_SATISFIED_THRESHOLD_DEFAULT = 500L;
-
-    // Apdex Tolerated Threshold
-    private static final String REPORT_GENERATOR_KEY_APDEX_TOLERATED_THRESHOLD = REPORT_GENERATOR_KEY_PREFIX
-            + KEY_DELIMITER + "apdex_tolerated_threshold";
-    private static final long REPORT_GENERATOR_KEY_APDEX_TOLERATED_THRESHOLD_DEFAULT = 1500L;
-
-    // Sample Filter
-    private static final String REPORT_GENERATOR_KEY_SAMPLE_FILTER = REPORT_GENERATOR_KEY_PREFIX
-            + KEY_DELIMITER + "sample_filter";
-
-    private static final String LOAD_EXPORTER_FMT = "Load configuration for exporter \"%s\"";
-    private static final String LOAD_GRAPH_FMT = "Load configuration for graph \"%s\"";
-    private static final String INVALID_KEY_FMT = "Invalid property \"%s\", skip it.";
-    private static final String NOT_FOUND_PROPERTY_FMT = "Property \"%s\" not found, using default value \"%s\" instead.";
-
-    // Required graph properties
-    // Exclude controllers
-    public static final String GRAPH_KEY_EXCLUDE_CONTROLLERS = "exclude_controllers";
-    public static final boolean GRAPH_KEY_EXCLUDE_CONTROLLERS_DEFAULT = false;
-
-    // Title
-    public static final String GRAPH_KEY_TITLE = "title";
-    public static final String GRAPH_KEY_TITLE_DEFAULT = "Generic graph title";
-
-    // Required exporter properties
-    // Filters only sample series ?
-    public static final String EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES = "filters_only_sample_series";
-    public static final boolean EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES_DEFAULT = false;
-
-    // Series filter
-    public static final String EXPORTER_KEY_SERIES_FILTER = "series_filter";
-    public static final String EXPORTER_KEY_SERIES_FILTER_DEFAULT = "";
-
-    // Show controllers only
-    private static final String EXPORTER_KEY_SHOW_CONTROLLERS_ONLY = "show_controllers_only";
-    private static final boolean EXPORTER_KEY_SHOW_CONTROLLERS_ONLY_DEFAULT = false;
-
-    // Optional exporter properties
-    public static final String EXPORTER_KEY_GRAPH_EXTRA_OPTIONS = "graph_options";
-
-    // Sub configuration keys
-    public static final String SUBCONF_KEY_CLASSNAME = "classname";
-    public static final String SUBCONF_KEY_PROPERTY = "property";
-
-    private static final String START_LOADING_MSG = "Report generator properties loading";
-    private static final String END_LOADING_MSG = "End of report generator properties loading";
-    private static final String REQUIRED_PROPERTY_FMT = "Use \"%s\" value for required property \"%s\"";
-    private static final String OPTIONAL_PROPERTY_FMT = "Use \"%s\" value for optional property \"%s\"";
-
-    /**
-     * A factory for creating SubConfiguration objects.
-     *
-     * @param <TSubConfiguration>
-     *            the generic type
-     */
-    private interface SubConfigurationFactory<TSubConfiguration> {
-        TSubConfiguration createSubConfiguration();
-
-        void initialize(String subConfId, TSubConfiguration subConfiguration)
-                throws ConfigurationException;
-    }
-
-    private String sampleFilter;
-    private File tempDirectory;
-    private long apdexSatisfiedThreshold;
-    private long apdexToleratedThreshold;
-    private ArrayList<String> filteredSamples = new ArrayList<>();
-    private HashMap<String, ExporterConfiguration> exportConfigurations = new HashMap<>();
-    private HashMap<String, GraphConfiguration> graphConfigurations = new HashMap<>();
-
-    /**
-     * Gets the overall sample filter.
-     *
-     * @return the overall sample filter
-     */
-    public final String getSampleFilter() {
-        return sampleFilter;
-    }
-
-    /**
-     * Sets the overall sample filter.
-     *
-     * @param sampleFilter
-     *            the new overall sample filter
-     */
-    public final void setSampleFilter(String sampleFilter) {
-        if (Objects.equals(this.sampleFilter, sampleFilter) == false) {
-            this.sampleFilter = sampleFilter;
-            filteredSamples.clear();
-            if (sampleFilter != null) {
-                String[] items = sampleFilter.split(",");
-                int count = items.length;
-                for (int index = 0; index < count; index++) {
-                    filteredSamples.add(items[index].trim());
-                }
-            }
-        }
-    }
-
-    /**
-     * Gets the temporary directory.
-     *
-     * @return the temporary directory
-     */
-    public final File getTempDirectory() {
-        return tempDirectory;
-    }
-
-    /**
-     * Sets the temporary directory.
-     *
-     * @param tempDirectory
-     *            the temporary directory to set
-     */
-    public final void setTempDirectory(File tempDirectory) {
-        this.tempDirectory = tempDirectory;
-    }
-
-    /**
-     * Gets the apdex satisfied threshold.
-     *
-     * @return the apdex satisfied threshold
-     */
-    public final long getApdexSatisfiedThreshold() {
-        return apdexSatisfiedThreshold;
-    }
-
-    /**
-     * Sets the apdex satisfied threshold.
-     *
-     * @param apdexSatisfiedThreshold
-     *            the apdex satisfied threshold to set
-     */
-    public final void setApdexSatisfiedThreshold(long apdexSatisfiedThreshold) {
-        this.apdexSatisfiedThreshold = apdexSatisfiedThreshold;
-    }
-
-    /**
-     * Gets the apdex tolerated threshold.
-     *
-     * @return the apdex tolerated threshold
-     */
-    public final long getApdexToleratedThreshold() {
-        return apdexToleratedThreshold;
-    }
-
-    /**
-     * Sets the apdex tolerated threshold.
-     *
-     * @param apdexToleratedThreshold
-     *            the apdex tolerated threshold to set
-     */
-    public final void setApdexToleratedThreshold(long apdexToleratedThreshold) {
-        this.apdexToleratedThreshold = apdexToleratedThreshold;
-    }
-
-    /**
-     * Gets the filtered samples.
-     *
-     * @return the filteredSamples
-     */
-    public final List<String> getFilteredSamples() {
-        return filteredSamples;
-    }
-
-    /**
-     * Gets the export configurations.
-     *
-     * @return the export configurations
-     */
-    public final Map<String, ExporterConfiguration> getExportConfigurations() {
-        return exportConfigurations;
-    }
-
-    /**
-     * Gets the graph configurations.
-     *
-     * @return the graph configurations
-     */
-    public final Map<String, GraphConfiguration> getGraphConfigurations() {
-        return graphConfigurations;
-    }
-
-    // /**
-    // * Gets the exporter property prefix from the specified exporter
-    // identifier.
-    // *
-    // * @param exporterId
-    // * the exporter identifier
-    // * @return the exporter property prefix
-    // */
-    // public static String getExporterPropertyPrefix(String exporterId) {
-    // return REPORT_GENERATOR_EXPORTER_KEY_PREFIX + KEY_DELIMITER
-    // + exporterId;
-    // }
-
-    /**
-     * Gets the sub configuration property prefix from the specified sub
-     * configuration identifier.
-     *
-     * @param exporterId
-     *            the sub configuration identifier
-     * @return the sub configuration property prefix
-     */
-    public static String getSubConfigurationPropertyPrefix(String keyPrefix,
-            String subConfId) {
-        return keyPrefix + KEY_DELIMITER + subConfId;
-    }
-
-    /**
-     * Gets the sub configuration property key from the specified identifier and
-     * property name.
-     *
-     * @param exporterId
-     *            the sub configuration identifier
-     * @param propertyName
-     *            the property name
-     * @return the sub configuration property key
-     */
-    public static String getSubConfigurationPropertyKey(String keyPrefix,
-            String subConfId, String propertyName) {
-        return getSubConfigurationPropertyPrefix(keyPrefix, subConfId)
-                + KEY_DELIMITER + propertyName;
-    }
-
-    /**
-     * Gets the exporter property key from the specified identifier and property
-     * name.
-     *
-     * @param exporterId
-     *            the exporter identifier
-     * @param propertyName
-     *            the property name
-     * @return the exporter property key
-     */
-    public static String getExporterPropertyKey(String exporterId,
-            String propertyName) {
-        return getSubConfigurationPropertyPrefix(
-                REPORT_GENERATOR_EXPORTER_KEY_PREFIX, exporterId)
-                + KEY_DELIMITER + propertyName;
-    }
-
-    // /**
-    // * Gets the graph property prefix from the specified graph identifier.
-    // *
-    // * @param graphId
-    // * the graph identifier
-    // * @return the graph property prefix
-    // */
-    // public static String getGraphPropertyPrefix(String graphId) {
-    // return REPORT_GENERATOR_GRAPH_KEY_PREFIX + KEY_DELIMITER + graphId;
-    // }
-
-    /**
-     * Gets the graph property key from the specified identifier and property
-     * name.
-     *
-     * @param graphId
-     *            the graph identifier
-     * @param propertyName
-     *            the property name
-     * @return the graph property key
-     */
-    public static String getGraphPropertyKey(String graphId, String propertyName) {
-        return getSubConfigurationPropertyPrefix(
-                REPORT_GENERATOR_GRAPH_KEY_PREFIX, graphId)
-                + KEY_DELIMITER
-                + propertyName;
-    }
-
-    /**
-     * Gets the property matching the specified key in the properties and casts
-     * it. Returns a default value is the key is not found.
-     *
-     * @param <TProperty>
-     *            the target type
-     * @param props
-     *            the properties
-     * @param key
-     *            the key of the property
-     * @param defaultValue
-     *            the default value
-     * @param clazz
-     *            the target class
-     * @return the property
-     * @throws ConfigurationException
-     *             thrown when the property cannot be cast to the specified type
-     */
-    private static <TProperty> TProperty getProperty(Props props, String key,
-            TProperty defaultValue, Class<TProperty> clazz)
-            throws ConfigurationException {
-        TProperty property = null;
-        String value = props.getValue(key);
-        if (value == null) {
-            if (defaultValue != null) {
-                property = defaultValue;
-                log.info(String.format(NOT_FOUND_PROPERTY_FMT, key,
-                        defaultValue));
-            }
-        } else {
-            property = ConfigurationUtils.convert(value, clazz);
-        }
-        return property;
-    }
-
-    private static <TProperty> TProperty getOptionalProperty(Props props,
-            String key, Class<TProperty> clazz) throws ConfigurationException {
-        TProperty property = getProperty(props, key, null, clazz);
-        if (property != null) {
-            log.debug(String.format(OPTIONAL_PROPERTY_FMT, property, key));
-        }
-        return property;
-    }
-
-    private static <TProperty> TProperty getRequiredProperty(Props props,
-            String key, TProperty defaultValue, Class<TProperty> clazz)
-            throws ConfigurationException {
-        TProperty property = getProperty(props, key, defaultValue, clazz);
-        log.debug(String.format(REQUIRED_PROPERTY_FMT, property, key));
-        return property;
-    }
-
-    /**
-     * * Initialize sub configuration items. This function iterates over
-     * properties and find each direct sub properties with the specified prefix
-     * 
-     * <p>
-     * E.g. :
-     * </p>
-     * 
-     * <p>
-     * With properties :
-     * <ul>
-     * <li>jmeter.reportgenerator.graph.graph1.title</li>
-     * <li>jmeter.reportgenerator.graph.graph1.min_abscissa</li>
-     * <li>jmeter.reportgenerator.graph.graph2.title</li>
-     * </ul>
-     * </p>
-     * <p>
-     * And prefix : jmeter.reportgenerator.graph
-     * </p>
-     * 
-     * <p>
-     * The function creates 2 sub configuration items : graph1 and graph2
-     * </p>
-     *
-     * @param <TSubConf>
-     *            the generic type
-     * @param subConfigurations
-     *            the sub configurations
-     * @param props
-     *            the props
-     * @param propertyPrefix
-     *            the property prefix
-     * @param factory
-     *            the factory
-     * @param noPropertyKey
-     *            indicates whether extra properties are prefixed with the
-     *            SUBCONF_KEY_PROPERTY
-     * @throws ConfigurationException
-     *             the configuration exception
-     */
-    private static <TSubConf extends SubConfiguration> void loadSubConfiguration(
-            Map<String, TSubConf> subConfigurations, Props props,
-            String propertyPrefix, boolean noPropertyKey,
-            SubConfigurationFactory<TSubConf> factory)
-            throws ConfigurationException {
-
-        for (Map.Entry<String, Object> entry : props.innerMap(propertyPrefix)
-                .entrySet()) {
-            String key = entry.getKey();
-            int index = key.indexOf(KEY_DELIMITER);
-            if (index > 0) {
-                String name = key.substring(0, index);
-                TSubConf subConfiguration = subConfigurations.get(name);
-                if (subConfiguration == null) {
-                    subConfiguration = factory.createSubConfiguration();
-                    subConfigurations.put(name, subConfiguration);
-                }
-            } else {
-                log.warn(String.format(INVALID_KEY_FMT, key));
-            }
-        }
-
-        // Load sub configurations
-        for (Map.Entry<String, TSubConf> entry : subConfigurations.entrySet()) {
-            String subConfId = entry.getKey();
-            final TSubConf subConfiguration = entry.getValue();
-
-            // Load specific properties
-            factory.initialize(subConfId, subConfiguration);
-
-            // Load extra properties
-            Map<String, Object> extraKeys = props
-                    .innerMap(noPropertyKey ? getSubConfigurationPropertyPrefix(
-                            propertyPrefix, subConfId)
-                            : getSubConfigurationPropertyKey(propertyPrefix,
-                                    subConfId, SUBCONF_KEY_PROPERTY));
-            Map<String, String> extraProperties = subConfiguration
-                    .getProperties();
-            for (Map.Entry<String, Object> entryProperty : extraKeys.entrySet()) {
-                extraProperties.put(entryProperty.getKey(),
-                        (String) entryProperty.getValue());
-            }
-        }
-    }
-
-    /**
-     * Load a configuration from the specified properties.
-     *
-     * @param properties
-     *            the properties
-     * @return the report generator configuration
-     */
-    public static ReportGeneratorConfiguration LoadFromProperties(
-            Properties properties) throws ConfigurationException {
-
-        log.debug(START_LOADING_MSG);
-
-        ReportGeneratorConfiguration configuration = new ReportGeneratorConfiguration();
-
-        // Use jodd.Props to ease property handling
-        final Props props = new Props();
-        props.load(properties);
-
-        // Load temporary directory property
-        final File tempDirectory = getRequiredProperty(props,
-                REPORT_GENERATOR_KEY_TEMP_DIR,
-                REPORT_GENERATOR_KEY_TEMP_DIR_DEFAULT, File.class);
-        configuration.setTempDirectory(tempDirectory);
-
-        // Load apdex statified threshold
-        final long apdexSatisfiedThreshold = getRequiredProperty(props,
-                REPORT_GENERATOR_KEY_APDEX_SATISFIED_THRESHOLD,
-                REPORT_GENERATOR_KEY_APDEX_SATISFIED_THRESHOLD_DEFAULT,
-                long.class);
-        configuration.setApdexSatisfiedThreshold(apdexSatisfiedThreshold);
-
-        // Load apdex tolerated threshold
-        final long apdexToleratedThreshold = getRequiredProperty(props,
-                REPORT_GENERATOR_KEY_APDEX_TOLERATED_THRESHOLD,
-                REPORT_GENERATOR_KEY_APDEX_TOLERATED_THRESHOLD_DEFAULT,
-                long.class);
-        configuration.setApdexToleratedThreshold(apdexToleratedThreshold);
-
-        // Load sample filter
-        final String sampleFilter = getOptionalProperty(props,
-                REPORT_GENERATOR_KEY_SAMPLE_FILTER, String.class);
-        configuration.setSampleFilter(sampleFilter);
-
-        // Find graph identifiers and load a configuration for each
-        final Map<String, GraphConfiguration> graphConfigurations = configuration
-                .getGraphConfigurations();
-        loadSubConfiguration(graphConfigurations, props,
-                REPORT_GENERATOR_GRAPH_KEY_PREFIX, false,
-                new SubConfigurationFactory<GraphConfiguration>() {
-
-                    @Override
-                    public GraphConfiguration createSubConfiguration() {
-                        return new GraphConfiguration();
-                    }
-
-                    @Override
-                    public void initialize(String graphId,
-                            GraphConfiguration graphConfiguration)
-                            throws ConfigurationException {
-                        log.debug(String.format(LOAD_GRAPH_FMT, graphId));
-
-                        // Get the property defining whether the graph have to
-                        // filter controller samples
-                        boolean excludeControllers = getRequiredProperty(
-                                props,
-                                getGraphPropertyKey(graphId,
-                                        GRAPH_KEY_EXCLUDE_CONTROLLERS),
-                                GRAPH_KEY_EXCLUDE_CONTROLLERS_DEFAULT,
-                                Boolean.class);
-                        graphConfiguration
-                                .setExcludeControllers(excludeControllers);
-
-                        // Get the property defining the title of the graph
-                        String title = getRequiredProperty(props,
-                                getGraphPropertyKey(graphId, GRAPH_KEY_TITLE),
-                                GRAPH_KEY_TITLE_DEFAULT, String.class);
-                        graphConfiguration.setTitle(title);
-
-                        // Get the property defining the class name
-                        String className = getRequiredProperty(
-                                props,
-                                getGraphPropertyKey(graphId,
-                                        SUBCONF_KEY_CLASSNAME), "",
-                                String.class);
-                        graphConfiguration.setClassName(className);
-
-                    }
-                });
-
-        if (graphConfigurations.isEmpty()) {
-            log.info("No graph configuration found.");
-        }
-
-        // Find exporter identifiers and load a configuration for each
-        final Map<String, ExporterConfiguration> exportConfigurations = configuration
-                .getExportConfigurations();
-        loadSubConfiguration(exportConfigurations, props,
-                REPORT_GENERATOR_EXPORTER_KEY_PREFIX, false,
-                new SubConfigurationFactory<ExporterConfiguration>() {
-
-                    @Override
-                    public ExporterConfiguration createSubConfiguration() {
-                        return new ExporterConfiguration();
-                    }
-
-                    @Override
-                    public void initialize(String exportId,
-                            ExporterConfiguration exportConfiguration)
-                            throws ConfigurationException {
-                        log.debug(String.format(LOAD_EXPORTER_FMT, exportId));
-
-                        // Get the property defining the class name
-                        String className = getRequiredProperty(
-                                props,
-                                getExporterPropertyKey(exportId,
-                                        SUBCONF_KEY_CLASSNAME), "",
-                                String.class);
-                        exportConfiguration.setClassName(className);
-
-                        // Get the property defining whether only sample series
-                        // are filtered
-                        boolean filtersOnlySampleSeries = getRequiredProperty(
-                                props,
-                                getExporterPropertyKey(exportId,
-                                        EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES),
-                                EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES_DEFAULT,
-                                Boolean.class);
-                        exportConfiguration
-                                .filtersOnlySampleSeries(filtersOnlySampleSeries);
-
-                        // Get the property defining the series filter
-                        String seriesFilter = getRequiredProperty(
-                                props,
-                                getExporterPropertyKey(exportId,
-                                        EXPORTER_KEY_SERIES_FILTER),
-                                EXPORTER_KEY_SERIES_FILTER_DEFAULT,
-                                String.class);
-                        exportConfiguration.setSeriesFilter(seriesFilter);
-
-                        // Get the property defining whether only controllers
-                        // series are shown
-                        boolean showControllerSeriesOnly = getRequiredProperty(
-                                props,
-                                getExporterPropertyKey(exportId,
-                                        EXPORTER_KEY_SHOW_CONTROLLERS_ONLY),
-                                EXPORTER_KEY_SHOW_CONTROLLERS_ONLY_DEFAULT,
-                                Boolean.class);
-                        exportConfiguration
-                                .showControllerSeriesOnly(showControllerSeriesOnly);
-
-                        // Load graph extra properties
-                        Map<String, SubConfiguration> graphExtraConfigurations = exportConfiguration
-                                .getGraphExtraConfigurations();
-                        loadSubConfiguration(
-                                graphExtraConfigurations,
-                                props,
-                                getSubConfigurationPropertyKey(
-                                        REPORT_GENERATOR_EXPORTER_KEY_PREFIX,
-                                        exportId,
-                                        EXPORTER_KEY_GRAPH_EXTRA_OPTIONS),
-                                true,
-                                new SubConfigurationFactory<SubConfiguration>() {
-
-                                    @Override
-                                    public SubConfiguration createSubConfiguration() {
-                                        return new SubConfiguration();
-                                    }
-
-                                    @Override
-                                    public void initialize(String subConfId,
-                                            SubConfiguration subConfiguration)
-                                            throws ConfigurationException {
-                                        // do nothing
-
-                                    }
-                                });
-                    }
-                });
-
-        if (exportConfigurations.isEmpty()) {
-            log.warn("No export configuration found. None report will be generated.");
-        }
-
-        log.debug(END_LOADING_MSG);
-
-        return configuration;
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.config;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
+
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
+
+import jodd.props.Props;
+
+/**
+ * The class ReportGeneratorConfiguration describes the configuration of the
+ * report generator.
+ *
+ * @since 2.14
+ */
+public class ReportGeneratorConfiguration {
+
+    private static final Logger log = LoggingManager.getLoggerForClass();
+
+    public static final char KEY_DELIMITER = '.';
+    public static final String REPORT_GENERATOR_KEY_PREFIX = "jmeter.reportgenerator";
+    public static final String REPORT_GENERATOR_GRAPH_KEY_PREFIX = REPORT_GENERATOR_KEY_PREFIX
+            + KEY_DELIMITER + "graph";
+    public static final String REPORT_GENERATOR_EXPORTER_KEY_PREFIX = REPORT_GENERATOR_KEY_PREFIX
+            + KEY_DELIMITER + "exporter";
+
+    // Temporary directory
+    private static final String REPORT_GENERATOR_KEY_TEMP_DIR = REPORT_GENERATOR_KEY_PREFIX
+            + KEY_DELIMITER + "temp_dir";
+    private static final File REPORT_GENERATOR_KEY_TEMP_DIR_DEFAULT = new File(
+            "temp");
+
+    // Apdex Satified Threshold
+    private static final String REPORT_GENERATOR_KEY_APDEX_SATISFIED_THRESHOLD = REPORT_GENERATOR_KEY_PREFIX
+            + KEY_DELIMITER + "apdex_statisfied_threshold";
+    private static final long REPORT_GENERATOR_KEY_APDEX_SATISFIED_THRESHOLD_DEFAULT = 500L;
+
+    // Apdex Tolerated Threshold
+    private static final String REPORT_GENERATOR_KEY_APDEX_TOLERATED_THRESHOLD = REPORT_GENERATOR_KEY_PREFIX
+            + KEY_DELIMITER + "apdex_tolerated_threshold";
+    private static final long REPORT_GENERATOR_KEY_APDEX_TOLERATED_THRESHOLD_DEFAULT = 1500L;
+
+    // Sample Filter
+    private static final String REPORT_GENERATOR_KEY_SAMPLE_FILTER = REPORT_GENERATOR_KEY_PREFIX
+            + KEY_DELIMITER + "sample_filter";
+
+    private static final String LOAD_EXPORTER_FMT = "Load configuration for exporter \"%s\"";
+    private static final String LOAD_GRAPH_FMT = "Load configuration for graph \"%s\"";
+    private static final String INVALID_KEY_FMT = "Invalid property \"%s\", skip it.";
+    private static final String NOT_FOUND_PROPERTY_FMT = "Property \"%s\" not found, using default value \"%s\" instead.";
+
+    // Required graph properties
+    // Exclude controllers
+    public static final String GRAPH_KEY_EXCLUDE_CONTROLLERS = "exclude_controllers";
+    public static final boolean GRAPH_KEY_EXCLUDE_CONTROLLERS_DEFAULT = false;
+
+    // Title
+    public static final String GRAPH_KEY_TITLE = "title";
+    public static final String GRAPH_KEY_TITLE_DEFAULT = "Generic graph title";
+
+    // Required exporter properties
+    // Filters only sample series ?
+    public static final String EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES = "filters_only_sample_series";
+    public static final boolean EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES_DEFAULT = false;
+
+    // Series filter
+    public static final String EXPORTER_KEY_SERIES_FILTER = "series_filter";
+    public static final String EXPORTER_KEY_SERIES_FILTER_DEFAULT = "";
+
+    // Show controllers only
+    private static final String EXPORTER_KEY_SHOW_CONTROLLERS_ONLY = "show_controllers_only";
+    private static final boolean EXPORTER_KEY_SHOW_CONTROLLERS_ONLY_DEFAULT = false;
+
+    // Optional exporter properties
+    public static final String EXPORTER_KEY_GRAPH_EXTRA_OPTIONS = "graph_options";
+
+    // Sub configuration keys
+    public static final String SUBCONF_KEY_CLASSNAME = "classname";
+    public static final String SUBCONF_KEY_PROPERTY = "property";
+
+    private static final String START_LOADING_MSG = "Report generator properties loading";
+    private static final String END_LOADING_MSG = "End of report generator properties loading";
+    private static final String REQUIRED_PROPERTY_FMT = "Use \"%s\" value for required property \"%s\"";
+    private static final String OPTIONAL_PROPERTY_FMT = "Use \"%s\" value for optional property \"%s\"";
+
+    /**
+     * A factory for creating SubConfiguration objects.
+     *
+     * @param <TSubConfiguration>
+     *            the generic type
+     */
+    private interface SubConfigurationFactory<TSubConfiguration> {
+        TSubConfiguration createSubConfiguration();
+
+        void initialize(String subConfId, TSubConfiguration subConfiguration)
+                throws ConfigurationException;
+    }
+
+    private String sampleFilter;
+    private File tempDirectory;
+    private long apdexSatisfiedThreshold;
+    private long apdexToleratedThreshold;
+    private ArrayList<String> filteredSamples = new ArrayList<>();
+    private HashMap<String, ExporterConfiguration> exportConfigurations = new HashMap<>();
+    private HashMap<String, GraphConfiguration> graphConfigurations = new HashMap<>();
+
+    /**
+     * Gets the overall sample filter.
+     *
+     * @return the overall sample filter
+     */
+    public final String getSampleFilter() {
+        return sampleFilter;
+    }
+
+    /**
+     * Sets the overall sample filter.
+     *
+     * @param sampleFilter
+     *            the new overall sample filter
+     */
+    public final void setSampleFilter(String sampleFilter) {
+        if (Objects.equals(this.sampleFilter, sampleFilter) == false) {
+            this.sampleFilter = sampleFilter;
+            filteredSamples.clear();
+            if (sampleFilter != null) {
+                String[] items = sampleFilter.split(",");
+                int count = items.length;
+                for (int index = 0; index < count; index++) {
+                    filteredSamples.add(items[index].trim());
+                }
+            }
+        }
+    }
+
+    /**
+     * Gets the temporary directory.
+     *
+     * @return the temporary directory
+     */
+    public final File getTempDirectory() {
+        return tempDirectory;
+    }
+
+    /**
+     * Sets the temporary directory.
+     *
+     * @param tempDirectory
+     *            the temporary directory to set
+     */
+    public final void setTempDirectory(File tempDirectory) {
+        this.tempDirectory = tempDirectory;
+    }
+
+    /**
+     * Gets the apdex satisfied threshold.
+     *
+     * @return the apdex satisfied threshold
+     */
+    public final long getApdexSatisfiedThreshold() {
+        return apdexSatisfiedThreshold;
+    }
+
+    /**
+     * Sets the apdex satisfied threshold.
+     *
+     * @param apdexSatisfiedThreshold
+     *            the apdex satisfied threshold to set
+     */
+    public final void setApdexSatisfiedThreshold(long apdexSatisfiedThreshold) {
+        this.apdexSatisfiedThreshold = apdexSatisfiedThreshold;
+    }
+
+    /**
+     * Gets the apdex tolerated threshold.
+     *
+     * @return the apdex tolerated threshold
+     */
+    public final long getApdexToleratedThreshold() {
+        return apdexToleratedThreshold;
+    }
+
+    /**
+     * Sets the apdex tolerated threshold.
+     *
+     * @param apdexToleratedThreshold
+     *            the apdex tolerated threshold to set
+     */
+    public final void setApdexToleratedThreshold(long apdexToleratedThreshold) {
+        this.apdexToleratedThreshold = apdexToleratedThreshold;
+    }
+
+    /**
+     * Gets the filtered samples.
+     *
+     * @return the filteredSamples
+     */
+    public final List<String> getFilteredSamples() {
+        return filteredSamples;
+    }
+
+    /**
+     * Gets the export configurations.
+     *
+     * @return the export configurations
+     */
+    public final Map<String, ExporterConfiguration> getExportConfigurations() {
+        return exportConfigurations;
+    }
+
+    /**
+     * Gets the graph configurations.
+     *
+     * @return the graph configurations
+     */
+    public final Map<String, GraphConfiguration> getGraphConfigurations() {
+        return graphConfigurations;
+    }
+
+    // /**
+    // * Gets the exporter property prefix from the specified exporter
+    // identifier.
+    // *
+    // * @param exporterId
+    // * the exporter identifier
+    // * @return the exporter property prefix
+    // */
+    // public static String getExporterPropertyPrefix(String exporterId) {
+    // return REPORT_GENERATOR_EXPORTER_KEY_PREFIX + KEY_DELIMITER
+    // + exporterId;
+    // }
+
+    /**
+     * Gets the sub configuration property prefix from the specified sub
+     * configuration identifier.
+     *
+     * @param exporterId
+     *            the sub configuration identifier
+     * @return the sub configuration property prefix
+     */
+    public static String getSubConfigurationPropertyPrefix(String keyPrefix,
+            String subConfId) {
+        return keyPrefix + KEY_DELIMITER + subConfId;
+    }
+
+    /**
+     * Gets the sub configuration property key from the specified identifier and
+     * property name.
+     *
+     * @param exporterId
+     *            the sub configuration identifier
+     * @param propertyName
+     *            the property name
+     * @return the sub configuration property key
+     */
+    public static String getSubConfigurationPropertyKey(String keyPrefix,
+            String subConfId, String propertyName) {
+        return getSubConfigurationPropertyPrefix(keyPrefix, subConfId)
+                + KEY_DELIMITER + propertyName;
+    }
+
+    /**
+     * Gets the exporter property key from the specified identifier and property
+     * name.
+     *
+     * @param exporterId
+     *            the exporter identifier
+     * @param propertyName
+     *            the property name
+     * @return the exporter property key
+     */
+    public static String getExporterPropertyKey(String exporterId,
+            String propertyName) {
+        return getSubConfigurationPropertyPrefix(
+                REPORT_GENERATOR_EXPORTER_KEY_PREFIX, exporterId)
+                + KEY_DELIMITER + propertyName;
+    }
+
+    // /**
+    // * Gets the graph property prefix from the specified graph identifier.
+    // *
+    // * @param graphId
+    // * the graph identifier
+    // * @return the graph property prefix
+    // */
+    // public static String getGraphPropertyPrefix(String graphId) {
+    // return REPORT_GENERATOR_GRAPH_KEY_PREFIX + KEY_DELIMITER + graphId;
+    // }
+
+    /**
+     * Gets the graph property key from the specified identifier and property
+     * name.
+     *
+     * @param graphId
+     *            the graph identifier
+     * @param propertyName
+     *            the property name
+     * @return the graph property key
+     */
+    public static String getGraphPropertyKey(String graphId, String propertyName) {
+        return getSubConfigurationPropertyPrefix(
+                REPORT_GENERATOR_GRAPH_KEY_PREFIX, graphId)
+                + KEY_DELIMITER
+                + propertyName;
+    }
+
+    /**
+     * Gets the property matching the specified key in the properties and casts
+     * it. Returns a default value is the key is not found.
+     *
+     * @param <TProperty>
+     *            the target type
+     * @param props
+     *            the properties
+     * @param key
+     *            the key of the property
+     * @param defaultValue
+     *            the default value
+     * @param clazz
+     *            the target class
+     * @return the property
+     * @throws ConfigurationException
+     *             thrown when the property cannot be cast to the specified type
+     */
+    private static <TProperty> TProperty getProperty(Props props, String key,
+            TProperty defaultValue, Class<TProperty> clazz)
+            throws ConfigurationException {
+        TProperty property = null;
+        String value = props.getValue(key);
+        if (value == null) {
+            if (defaultValue != null) {
+                property = defaultValue;
+                log.info(String.format(NOT_FOUND_PROPERTY_FMT, key,
+                        defaultValue));
+            }
+        } else {
+            property = ConfigurationUtils.convert(value, clazz);
+        }
+        return property;
+    }
+
+    private static <TProperty> TProperty getOptionalProperty(Props props,
+            String key, Class<TProperty> clazz) throws ConfigurationException {
+        TProperty property = getProperty(props, key, null, clazz);
+        if (property != null) {
+            log.debug(String.format(OPTIONAL_PROPERTY_FMT, property, key));
+        }
+        return property;
+    }
+
+    private static <TProperty> TProperty getRequiredProperty(Props props,
+            String key, TProperty defaultValue, Class<TProperty> clazz)
+            throws ConfigurationException {
+        TProperty property = getProperty(props, key, defaultValue, clazz);
+        log.debug(String.format(REQUIRED_PROPERTY_FMT, property, key));
+        return property;
+    }
+
+    /**
+     * * Initialize sub configuration items. This function iterates over
+     * properties and find each direct sub properties with the specified prefix
+     * 
+     * <p>
+     * E.g. :
+     * </p>
+     * 
+     * <p>
+     * With properties :
+     * <ul>
+     * <li>jmeter.reportgenerator.graph.graph1.title</li>
+     * <li>jmeter.reportgenerator.graph.graph1.min_abscissa</li>
+     * <li>jmeter.reportgenerator.graph.graph2.title</li>
+     * </ul>
+     * </p>
+     * <p>
+     * And prefix : jmeter.reportgenerator.graph
+     * </p>
+     * 
+     * <p>
+     * The function creates 2 sub configuration items : graph1 and graph2
+     * </p>
+     *
+     * @param <TSubConf>
+     *            the generic type
+     * @param subConfigurations
+     *            the sub configurations
+     * @param props
+     *            the props
+     * @param propertyPrefix
+     *            the property prefix
+     * @param factory
+     *            the factory
+     * @param noPropertyKey
+     *            indicates whether extra properties are prefixed with the
+     *            SUBCONF_KEY_PROPERTY
+     * @throws ConfigurationException
+     *             the configuration exception
+     */
+    private static <TSubConf extends SubConfiguration> void loadSubConfiguration(
+            Map<String, TSubConf> subConfigurations, Props props,
+            String propertyPrefix, boolean noPropertyKey,
+            SubConfigurationFactory<TSubConf> factory)
+            throws ConfigurationException {
+
+        for (Map.Entry<String, Object> entry : props.innerMap(propertyPrefix)
+                .entrySet()) {
+            String key = entry.getKey();
+            int index = key.indexOf(KEY_DELIMITER);
+            if (index > 0) {
+                String name = key.substring(0, index);
+                TSubConf subConfiguration = subConfigurations.get(name);
+                if (subConfiguration == null) {
+                    subConfiguration = factory.createSubConfiguration();
+                    subConfigurations.put(name, subConfiguration);
+                }
+            } else {
+                log.warn(String.format(INVALID_KEY_FMT, key));
+            }
+        }
+
+        // Load sub configurations
+        for (Map.Entry<String, TSubConf> entry : subConfigurations.entrySet()) {
+            String subConfId = entry.getKey();
+            final TSubConf subConfiguration = entry.getValue();
+
+            // Load specific properties
+            factory.initialize(subConfId, subConfiguration);
+
+            // Load extra properties
+            Map<String, Object> extraKeys = props
+                    .innerMap(noPropertyKey ? getSubConfigurationPropertyPrefix(
+                            propertyPrefix, subConfId)
+                            : getSubConfigurationPropertyKey(propertyPrefix,
+                                    subConfId, SUBCONF_KEY_PROPERTY));
+            Map<String, String> extraProperties = subConfiguration
+                    .getProperties();
+            for (Map.Entry<String, Object> entryProperty : extraKeys.entrySet()) {
+                extraProperties.put(entryProperty.getKey(),
+                        (String) entryProperty.getValue());
+            }
+        }
+    }
+
+    /**
+     * Load a configuration from the specified properties.
+     *
+     * @param properties
+     *            the properties
+     * @return the report generator configuration
+     */
+    public static ReportGeneratorConfiguration LoadFromProperties(
+            Properties properties) throws ConfigurationException {
+
+        log.debug(START_LOADING_MSG);
+
+        ReportGeneratorConfiguration configuration = new ReportGeneratorConfiguration();
+
+        // Use jodd.Props to ease property handling
+        final Props props = new Props();
+        props.load(properties);
+
+        // Load temporary directory property
+        final File tempDirectory = getRequiredProperty(props,
+                REPORT_GENERATOR_KEY_TEMP_DIR,
+                REPORT_GENERATOR_KEY_TEMP_DIR_DEFAULT, File.class);
+        configuration.setTempDirectory(tempDirectory);
+
+        // Load apdex statified threshold
+        final long apdexSatisfiedThreshold = getRequiredProperty(props,
+                REPORT_GENERATOR_KEY_APDEX_SATISFIED_THRESHOLD,
+                REPORT_GENERATOR_KEY_APDEX_SATISFIED_THRESHOLD_DEFAULT,
+                long.class);
+        configuration.setApdexSatisfiedThreshold(apdexSatisfiedThreshold);
+
+        // Load apdex tolerated threshold
+        final long apdexToleratedThreshold = getRequiredProperty(props,
+                REPORT_GENERATOR_KEY_APDEX_TOLERATED_THRESHOLD,
+                REPORT_GENERATOR_KEY_APDEX_TOLERATED_THRESHOLD_DEFAULT,
+                long.class);
+        configuration.setApdexToleratedThreshold(apdexToleratedThreshold);
+
+        // Load sample filter
+        final String sampleFilter = getOptionalProperty(props,
+                REPORT_GENERATOR_KEY_SAMPLE_FILTER, String.class);
+        configuration.setSampleFilter(sampleFilter);
+
+        // Find graph identifiers and load a configuration for each
+        final Map<String, GraphConfiguration> graphConfigurations = configuration
+                .getGraphConfigurations();
+        loadSubConfiguration(graphConfigurations, props,
+                REPORT_GENERATOR_GRAPH_KEY_PREFIX, false,
+                new SubConfigurationFactory<GraphConfiguration>() {
+
+                    @Override
+                    public GraphConfiguration createSubConfiguration() {
+                        return new GraphConfiguration();
+                    }
+
+                    @Override
+                    public void initialize(String graphId,
+                            GraphConfiguration graphConfiguration)
+                            throws ConfigurationException {
+                        log.debug(String.format(LOAD_GRAPH_FMT, graphId));
+
+                        // Get the property defining whether the graph have to
+                        // filter controller samples
+                        boolean excludeControllers = getRequiredProperty(
+                                props,
+                                getGraphPropertyKey(graphId,
+                                        GRAPH_KEY_EXCLUDE_CONTROLLERS),
+                                GRAPH_KEY_EXCLUDE_CONTROLLERS_DEFAULT,
+                                Boolean.class);
+                        graphConfiguration
+                                .setExcludeControllers(excludeControllers);
+
+                        // Get the property defining the title of the graph
+                        String title = getRequiredProperty(props,
+                                getGraphPropertyKey(graphId, GRAPH_KEY_TITLE),
+                                GRAPH_KEY_TITLE_DEFAULT, String.class);
+                        graphConfiguration.setTitle(title);
+
+                        // Get the property defining the class name
+                        String className = getRequiredProperty(
+                                props,
+                                getGraphPropertyKey(graphId,
+                                        SUBCONF_KEY_CLASSNAME), "",
+                                String.class);
+                        graphConfiguration.setClassName(className);
+
+                    }
+                });
+
+        if (graphConfigurations.isEmpty()) {
+            log.info("No graph configuration found.");
+        }
+
+        // Find exporter identifiers and load a configuration for each
+        final Map<String, ExporterConfiguration> exportConfigurations = configuration
+                .getExportConfigurations();
+        loadSubConfiguration(exportConfigurations, props,
+                REPORT_GENERATOR_EXPORTER_KEY_PREFIX, false,
+                new SubConfigurationFactory<ExporterConfiguration>() {
+
+                    @Override
+                    public ExporterConfiguration createSubConfiguration() {
+                        return new ExporterConfiguration();
+                    }
+
+                    @Override
+                    public void initialize(String exportId,
+                            ExporterConfiguration exportConfiguration)
+                            throws ConfigurationException {
+                        log.debug(String.format(LOAD_EXPORTER_FMT, exportId));
+
+                        // Get the property defining the class name
+                        String className = getRequiredProperty(
+                                props,
+                                getExporterPropertyKey(exportId,
+                                        SUBCONF_KEY_CLASSNAME), "",
+                                String.class);
+                        exportConfiguration.setClassName(className);
+
+                        // Get the property defining whether only sample series
+                        // are filtered
+                        boolean filtersOnlySampleSeries = getRequiredProperty(
+                                props,
+                                getExporterPropertyKey(exportId,
+                                        EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES),
+                                EXPORTER_KEY_FILTERS_ONLY_SAMPLE_SERIES_DEFAULT,
+                                Boolean.class);
+                        exportConfiguration
+                                .filtersOnlySampleSeries(filtersOnlySampleSeries);
+
+                        // Get the property defining the series filter
+                        String seriesFilter = getRequiredProperty(
+                                props,
+                                getExporterPropertyKey(exportId,
+                                        EXPORTER_KEY_SERIES_FILTER),
+                                EXPORTER_KEY_SERIES_FILTER_DEFAULT,
+                                String.class);
+                        exportConfiguration.setSeriesFilter(seriesFilter);
+
+                        // Get the property defining whether only controllers
+                        // series are shown
+                        boolean showControllerSeriesOnly = getRequiredProperty(
+                                props,
+                                getExporterPropertyKey(exportId,
+                                        EXPORTER_KEY_SHOW_CONTROLLERS_ONLY),
+                                EXPORTER_KEY_SHOW_CONTROLLERS_ONLY_DEFAULT,
+                                Boolean.class);
+                        exportConfiguration
+                                .showControllerSeriesOnly(showControllerSeriesOnly);
+
+                        // Load graph extra properties
+                        Map<String, SubConfiguration> graphExtraConfigurations = exportConfiguration
+                                .getGraphExtraConfigurations();
+                        loadSubConfiguration(
+                                graphExtraConfigurations,
+                                props,
+                                getSubConfigurationPropertyKey(
+                                        REPORT_GENERATOR_EXPORTER_KEY_PREFIX,
+                                        exportId,
+                                        EXPORTER_KEY_GRAPH_EXTRA_OPTIONS),
+                                true,
+                                new SubConfigurationFactory<SubConfiguration>() {
+
+                                    @Override
+                                    public SubConfiguration createSubConfiguration() {
+                                        return new SubConfiguration();
+                                    }
+
+                                    @Override
+                                    public void initialize(String subConfId,
+                                            SubConfiguration subConfiguration)
+                                            throws ConfigurationException {
+                                        // do nothing
+
+                                    }
+                                });
+                    }
+                });
+
+        if (exportConfigurations.isEmpty()) {
+            log.warn("No export configuration found. None report will be generated.");
+        }
+
+        log.debug(END_LOADING_MSG);
+
+        return configuration;
+    }
+}

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/StringConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/StringConverter.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/StringConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/StringConverter.java Thu Dec 10 19:10:06 2015
@@ -1,40 +1,40 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.config;
-
-/**
- * The interface StringConverter represents a converter from a string to another
- * type.
- *
- * @param <TDest>
- *            the generic type
- * @since 2.14
- */
-public interface StringConverter<TDest> {
-
-    /**
-     * Converts the specified value to the type TDest.
-     *
-     * @param value
-     *            the value to convert
-     * @return the destination type
-     * @throws ConvertException
-     *             occurs when the value cannot be converted to the type TDest
-     */
-    TDest convert(String value) throws ConvertException;
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.config;
+
+/**
+ * The interface StringConverter represents a converter from a string to another
+ * type.
+ *
+ * @param <TDest>
+ *            the generic type
+ * @since 2.14
+ */
+public interface StringConverter<TDest> {
+
+    /**
+     * Converts the specified value to the type TDest.
+     *
+     * @param value
+     *            the value to convert
+     * @return the destination type
+     * @throws ConvertException
+     *             occurs when the value cannot be converted to the type TDest
+     */
+    TDest convert(String value) throws ConvertException;
+}

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/config/StringConverter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java Thu Dec 10 19:10:06 2015
@@ -1,68 +1,68 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.config;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * The class SubConfiguration describes a sub configuration item
- *
- * @since 2.14
- */
-public class SubConfiguration {
-
-    private HashMap<String, String> properties = new HashMap<>();
-
-    /**
-     * Gets the properties of the item.
-     *
-     * @return the properties of the item
-     */
-    public final Map<String, String> getProperties() {
-        return properties;
-    }
-
-    /**
-     * Gets the value of the specified property.
-     *
-     * @param <TProperty>
-     *            the type of the property
-     * @param key
-     *            the key identifier of the property
-     * @param defaultValue
-     *            the default value of the property
-     * @param clazz
-     *            the class of the property
-     * @return the value of property if found; defaultValue otherwise
-     * @throws ConfigurationException
-     *             if cannot convert property
-     */
-    public final <TProperty> TProperty getProperty(String key,
-            TProperty defaultValue, Class<TProperty> clazz)
-                    throws ConfigurationException {
-        String value = properties.get(key);
-        TProperty result;
-        if (value == null) {
-            result = defaultValue;
-        } else {
-            result = ConfigurationUtils.convert(value, clazz);
-        }
-        return result;
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.config;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * The class SubConfiguration describes a sub configuration item
+ *
+ * @since 2.14
+ */
+public class SubConfiguration {
+
+    private HashMap<String, String> properties = new HashMap<>();
+
+    /**
+     * Gets the properties of the item.
+     *
+     * @return the properties of the item
+     */
+    public final Map<String, String> getProperties() {
+        return properties;
+    }
+
+    /**
+     * Gets the value of the specified property.
+     *
+     * @param <TProperty>
+     *            the type of the property
+     * @param key
+     *            the key identifier of the property
+     * @param defaultValue
+     *            the default value of the property
+     * @param clazz
+     *            the class of the property
+     * @return the value of property if found; defaultValue otherwise
+     * @throws ConfigurationException
+     *             if cannot convert property
+     */
+    public final <TProperty> TProperty getProperty(String key,
+            TProperty defaultValue, Class<TProperty> clazz)
+                    throws ConfigurationException {
+        String value = properties.get(key);
+        TProperty result;
+        if (value == null) {
+            result = defaultValue;
+        } else {
+            result = ConfigurationUtils.convert(value, clazz);
+        }
+        return result;
+    }
+}

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/ArgumentNullException.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/ArgumentNullException.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/ArgumentNullException.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/ArgumentNullException.java Thu Dec 10 19:10:06 2015
@@ -1,68 +1,68 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.core;
-
-/**
- * The class ArgumentNullException provides an exception thrown when a required
- * argument is null.
- * 
- * @since 2.14
- */
-public class ArgumentNullException extends IllegalArgumentException {
-    private static final long serialVersionUID = -1386650939198336456L;
-    private static final String MESSAGE_FMT = "%s cannot be null.";
-
-    /**
-     * Instantiates a new argument null exception.
-     */
-    public ArgumentNullException() {
-    }
-
-    /**
-     * Instantiates a new argument null exception.
-     *
-     * @param parameter
-     *            the name of the parameter
-     */
-    public ArgumentNullException(String parameter) {
-        super(String.format(MESSAGE_FMT, parameter));
-    }
-
-    /**
-     * Instantiates a new argument null exception.
-     *
-     * @param cause
-     *            the inner cause
-     */
-    public ArgumentNullException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Instantiates a new argument null exception.
-     *
-     * @param parameter
-     *            The name of the parameter
-     * @param cause
-     *            the inner cause
-     */
-    public ArgumentNullException(String parameter, Throwable cause) {
-        super(String.format(MESSAGE_FMT, parameter), cause);
-    }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.core;
+
+/**
+ * The class ArgumentNullException provides an exception thrown when a required
+ * argument is null.
+ * 
+ * @since 2.14
+ */
+public class ArgumentNullException extends IllegalArgumentException {
+    private static final long serialVersionUID = -1386650939198336456L;
+    private static final String MESSAGE_FMT = "%s cannot be null.";
+
+    /**
+     * Instantiates a new argument null exception.
+     */
+    public ArgumentNullException() {
+    }
+
+    /**
+     * Instantiates a new argument null exception.
+     *
+     * @param parameter
+     *            the name of the parameter
+     */
+    public ArgumentNullException(String parameter) {
+        super(String.format(MESSAGE_FMT, parameter));
+    }
+
+    /**
+     * Instantiates a new argument null exception.
+     *
+     * @param cause
+     *            the inner cause
+     */
+    public ArgumentNullException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Instantiates a new argument null exception.
+     *
+     * @param parameter
+     *            The name of the parameter
+     * @param cause
+     *            the inner cause
+     */
+    public ArgumentNullException(String parameter, Throwable cause) {
+        super(String.format(MESSAGE_FMT, parameter), cause);
+    }
+
+}

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/ArgumentNullException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/ControllerSamplePredicate.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/ControllerSamplePredicate.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/ControllerSamplePredicate.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/ControllerSamplePredicate.java Thu Dec 10 19:10:06 2015
@@ -1,43 +1,43 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.core;
-
-/**
- * The class ControllerSamplePredicate provides a way to define whether a sample
- * is a controller.
- * 
- * @since 2.14
- */
-public class ControllerSamplePredicate implements SamplePredicate {
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.jmeter.report.csv.processor.SamplePredicate#matches(org.apache
-     * .jmeter.report.csv.core.Sample)
-     */
-    @Override
-    public boolean matches(Sample sample) {
-        if (sample == null) {
-            throw new ArgumentNullException("sample");
-        }
-
-        return sample.isController();
-    }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.core;
+
+/**
+ * The class ControllerSamplePredicate provides a way to define whether a sample
+ * is a controller.
+ * 
+ * @since 2.14
+ */
+public class ControllerSamplePredicate implements SamplePredicate {
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.apache.jmeter.report.csv.processor.SamplePredicate#matches(org.apache
+     * .jmeter.report.csv.core.Sample)
+     */
+    @Override
+    public boolean matches(Sample sample) {
+        if (sample == null) {
+            throw new ArgumentNullException("sample");
+        }
+
+        return sample.isController();
+    }
+
+}

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/ControllerSamplePredicate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvFile.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleReader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/DataContext.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/DataContext.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/DataContext.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/DataContext.java Thu Dec 10 19:10:06 2015
@@ -1,31 +1,31 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.core;
-
-import java.util.TreeMap;
-
-/**
- * The class DataContext provides a map to store data for reports generation.
- * 
- * @since 2.14
- */
-public class DataContext extends TreeMap<String, Object> {
-
-    /** The Constant serialVersionUID. */
-    private static final long serialVersionUID = -3433238675809262160L;
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.core;
+
+import java.util.TreeMap;
+
+/**
+ * The class DataContext provides a map to store data for reports generation.
+ * 
+ * @since 2.14
+ */
+public class DataContext extends TreeMap<String, Object> {
+
+    /** The Constant serialVersionUID. */
+    private static final long serialVersionUID = -3433238675809262160L;
+}

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/DataContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/JsonUtil.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/JsonUtil.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/JsonUtil.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/JsonUtil.java Thu Dec 10 19:10:06 2015
@@ -1,62 +1,62 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.core;
-
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * The class JsonUtil provides helper functions to generate Json.
- * 
- * @since 2.14
- */
-public final class JsonUtil {
-
-    /**
-     * Converts the specified array to a json-like array string.
-     *
-     * @param array
-     *            the array
-     * @return the json string
-     */
-    public static String toJsonArray(String[] array) {
-        return '[' + StringUtils.join(array, ", ") + ']';
-    }
-
-    /**
-     * Converts the specified map to a json-like object string.
-     *
-     * @param map
-     *            the map
-     * @return the string
-     */
-    public static String toJsonObject(Map<String, String> map) {
-        String result = "{";
-        if (map != null) {
-            String[] array = new String[map.size()];
-            int index = 0;
-            for (Map.Entry<String, String> entry : map.entrySet()) {
-                array[index] = '"' + entry.getKey() + "\": " + entry.getValue();
-                index++;
-            }
-            result += StringUtils.join(array, ", ");
-        }
-        return result + "}";
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.core;
+
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * The class JsonUtil provides helper functions to generate Json.
+ * 
+ * @since 2.14
+ */
+public final class JsonUtil {
+
+    /**
+     * Converts the specified array to a json-like array string.
+     *
+     * @param array
+     *            the array
+     * @return the json string
+     */
+    public static String toJsonArray(String[] array) {
+        return '[' + StringUtils.join(array, ", ") + ']';
+    }
+
+    /**
+     * Converts the specified map to a json-like object string.
+     *
+     * @param map
+     *            the map
+     * @return the string
+     */
+    public static String toJsonObject(Map<String, String> map) {
+        String result = "{";
+        if (map != null) {
+            String[] array = new String[map.size()];
+            int index = 0;
+            for (Map.Entry<String, String> entry : map.entrySet()) {
+                array[index] = '"' + entry.getKey() + "\": " + entry.getValue();
+                index++;
+            }
+            result += StringUtils.join(array, ", ");
+        }
+        return result + "}";
+    }
+}

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/JsonUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/Sample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleComparator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetaDataParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetadata.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/SamplePredicate.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/SamplePredicate.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/SamplePredicate.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/SamplePredicate.java Thu Dec 10 19:10:06 2015
@@ -1,36 +1,36 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.core;
-
-/**
- * The interface SamplePredicate represents a predicate to apply to a sample. It
- * can be used in filtering decision.
- * 
- * @since 2.14
- */
-public interface SamplePredicate {
-
-    /**
-     * Defines if the specified sample matches the current predicate.
-     *
-     * @param sample
-     *            the sample to test
-     * @return true, if successful; otherwise false
-     */
-    boolean matches(Sample sample);
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.core;
+
+/**
+ * The interface SamplePredicate represents a predicate to apply to a sample. It
+ * can be used in filtering decision.
+ * 
+ * @since 2.14
+ */
+public interface SamplePredicate {
+
+    /**
+     * Defines if the specified sample matches the current predicate.
+     *
+     * @param sample
+     *            the sample to test
+     * @return true, if successful; otherwise false
+     */
+    boolean matches(Sample sample);
+}

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/SamplePredicate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleSelector.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleSelector.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleSelector.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleSelector.java Thu Dec 10 19:10:06 2015
@@ -1,38 +1,38 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.core;
-
-/**
- * The interface SampleSelector represents a typed projection from a sample.
- *
- * @param <TSelection>
- *            the type of the projection
- *
- * @since 2.14
- */
-public interface SampleSelector<TSelection> {
-
-    /**
-     * Do the projection from the specified sample
-     *
-     * @param sample
-     *            the sample
-     * @return the projection result
-     */
-    TSelection select(Sample sample);
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.core;
+
+/**
+ * The interface SampleSelector represents a typed projection from a sample.
+ *
+ * @param <TSelection>
+ *            the type of the projection
+ *
+ * @since 2.14
+ */
+public interface SampleSelector<TSelection> {
+
+    /**
+     * Do the projection from the specified sample
+     *
+     * @param sample
+     *            the sample
+     * @return the projection result
+     */
+    TSelection select(Sample sample);
+}

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleSelector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/core/TimeHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message