Attachment #35973 for bug #62426

View | Details | Raw Unified | Return to bug 62426
Collapse All | Expand All




 */
package org.apache.jmeter.report.processor.graph.impl;

import java.text.MessageFormat;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;

import org.apache.jmeter.report.core.Sample;
import org.apache.jmeter.report.processor.ListResultData;
import org.apache.jmeter.report.processor.MapResultData;
import org.apache.jmeter.report.processor.SumAggregatorFactory;
import org.apache.jmeter.report.processor.ValueResultData;
import org.apache.jmeter.report.processor.graph.AbstractGraphConsumer;
import org.apache.jmeter.report.processor.graph.AbstractSeriesSelector;
import org.apache.jmeter.report.processor.graph.CountValueSelector;
import org.apache.jmeter.report.processor.graph.GraphKeysSelector;
import org.apache.jmeter.report.processor.graph.GroupInfo;
import org.apache.jmeter.report.processor.graph.SeriesData;
import org.apache.jmeter.report.processor.ListResultData;
import org.apache.jmeter.report.processor.MapResultData;
import org.apache.jmeter.report.processor.SumAggregatorFactory;
import org.apache.jmeter.report.processor.ValueResultData;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.text.PreCompiledFormatter;
import org.apache.jorphan.text.PreCompiledFormatterBuilder;

/**
 * The class SyntheticResponseTimeDistributionGraphConsumer provides a graph to visualize

public class SyntheticResponseTimeDistributionGraphConsumer extends
        AbstractGraphConsumer {
    private static final String FAILED_LABEL = JMeterUtils.getResString("response_time_distribution_failed_label");
    private static final PreCompiledFormatter SATISFIED_LABEL = PreCompiledFormatterBuilder.build(
            JMeterUtils.getResString("response_time_distribution_satisfied_label"));
    private static final PreCompiledFormatter TOLERATED_LABEL = PreCompiledFormatterBuilder.build(
            JMeterUtils.getResString("response_time_distribution_tolerated_label"));
    private static final PreCompiledFormatter UNTOLERATED_LABEL = PreCompiledFormatterBuilder.build(
            JMeterUtils.getResString("response_time_distribution_untolerated_label"));
    private static final String SERIE_COLOR_PROPERTY = "color";
    private static final String SATISFIED_COLOR = "#9ACD32";
    private static final String TOLERATED_COLOR = "yellow";




public class TransactionsPerSecondGraphConsumer extends
        AbstractOverTimeGraphConsumer {

    private static final String STATUS_SERIES_FORMAT = "%s-%s";
    private static final String SUCCESS_SERIES_SUFFIX = "success";
    private static final String FAILURE_SERIES_SUFFIX = "failure";



                    @Override
                    public Iterable<String> select(Sample sample) {
                        String success = sample.getSuccess() ? SUCCESS_SERIES_SUFFIX : FAILURE_SERIES_SUFFIX;
                        String label = sample.getName() + "-" + success;
                                sample.getSuccess() ? SUCCESS_SERIES_SUFFIX
                                        : FAILURE_SERIES_SUFFIX);
                        return Arrays.asList(label);
                    }
                },




/* 
 * 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.jorphan.text;

import java.util.function.Function;

public class BooleanFormatter implements SimpleFormatter {

  Function<String, String> transformer;

  public BooleanFormatter() {
    this(s -> s);
  }

  public BooleanFormatter(Function<String, String> transformer) {
    this.transformer = transformer;
  }

  @Override
  public void format(StringBuilder sb, Object arg) {
    String valueAsString = arg instanceof Boolean ? String.valueOf(arg) : "true";
    sb.append(transformer.apply(arg == null ? "false" : valueAsString));
  }

  @Override
  public int argsNeeded() {
    return 1;
  }

}




/* 
 * 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.jorphan.text;

import java.util.List;

public class CombinedFormatter implements PreCompiledFormatter {

  private List<SimpleFormatter> formatters;

  public CombinedFormatter(List<SimpleFormatter> formatters) {
    this.formatters = formatters;
  }

  @Override
  public String format(Object... args) {
    StringBuilder sb = new StringBuilder();
    int index = 0;
    for (SimpleFormatter f : formatters) {
      if (f.argsNeeded() > 0) {
        f.format(sb, args[index]);
      } else {
        f.format(sb, null);
      }
      index += f.argsNeeded();
    }
    return sb.toString();
  }

}




/* 
 * 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.jorphan.text;

public class NoOpFormatter implements PreCompiledFormatter {

  @Override
  public String format(Object... args) {
    return "";
  }

}




/* 
 * 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.jorphan.text;

public interface PreCompiledFormatter {

  public String format(Object... args);
}




/* 
 * 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.jorphan.text;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

public class PreCompiledFormatterBuilder {

  private PreCompiledFormatterBuilder() {
    // hide publicly
  }

  private static Map<String, SimpleFormatter> availableFormatters;
  static {
    availableFormatters = new HashMap<>();
    availableFormatters.put("s", new StringFormatter());
    availableFormatters.put("S", new StringFormatter(String::toUpperCase));
    availableFormatters.put("b", new BooleanFormatter());
    availableFormatters.put("B", new BooleanFormatter(String::toUpperCase));
    availableFormatters.put("%", new StaticFormatter("%"));
    availableFormatters.put("n", new StaticFormatter("\n"));
  }

  private static Pattern formatPattern = Pattern.compile("%(\\w)");

  public static PreCompiledFormatter build(String format) {
    List<SimpleFormatter> f = new ArrayList<>();
    Matcher matcher = formatPattern.matcher(format);
    while (matcher.find()) {
      StringBuffer buf = new StringBuffer();
      matcher.appendReplacement(buf,
          Matcher.quoteReplacement(""));
      String prefix = buf.toString();
      if (prefix.length() > 0) {
        f.add(new StaticFormatter(prefix));
      }
      if (availableFormatters.containsKey(matcher.group(1))) {
        f.add(availableFormatters.get(matcher.group(1)));
      } else {
        throw new IllegalArgumentException("No formatter available for %" + matcher.group(1) + " in [" + format + "]");
      }
    }
    String tailString = extractTail(matcher);
    if (!tailString.isEmpty()) {
      f.add(new StaticFormatter(tailString));
    }
    if (f.isEmpty()) {
      return new NoOpFormatter();
    }
    return new CombinedFormatter(f);
  }

  private static String extractTail(Matcher matcher) {
    StringBuffer buf = new StringBuffer();
    matcher.appendTail(buf);
    return buf.toString();
  }
}




/* 
 * 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.jorphan.text;

public interface SimpleFormatter {

  public void format(StringBuilder sb, Object arg);

  public int argsNeeded();
}




/* 
 * 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.jorphan.text;

public class StaticFormatter implements SimpleFormatter {

  private final String text;

  public StaticFormatter(final String text) {
    this.text = text;
  }

  @Override
  public void format(StringBuilder sb, Object arg) {
    sb.append(text);
  }

  @Override
  public int argsNeeded() {
    return 0;
  }

}




/* 
 * 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.jorphan.text;

import java.util.function.Function;

public class StringFormatter implements SimpleFormatter {

  Function<String, String> transform;

  public StringFormatter() {
    this(s -> s);
  }

  public StringFormatter(Function<String, String> transform) {
    this.transform = transform;
  }

  @Override
  public void format(StringBuilder sb, Object arg) {
    sb.append(transform.apply(arg == null ? "null" : arg.toString()));
  }

  @Override
  public int argsNeeded() {
    return 1;
  }

}




/* 
 * 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.jorphan.io

import org.apache.jorphan.text.PreCompiledFormatter
import org.apache.jorphan.text.PreCompiledFormatterBuilder
import spock.lang.Specification
import spock.lang.Unroll

@Unroll
class PreCompiledFormatterSpec extends Specification {

    def "empty format gives an empty string"() {
        given:
            def sut = PreCompiledFormatterBuilder.build("")
        expect:
            sut.format() == ""
    }

    def "formats are the same as String.format"() {
        given:
            def sut = PreCompiledFormatterBuilder.build(format)
            Object[] args = allArgs.toArray(new Object[0])
        expect:
            sut.format(args) == String.format(format, args)
        where:
            format       | allArgs
            "Hello, %s!" | ['World']
            "%s-%s"      | [42, 23]
            "%s => %S"   | ['aBc', 'aBc']
            "%s => %b"   | [true, true]
    }

}

Return to bug 62426

Lines 39-45 import org.apache.jmeter.report.processor.graph.TimeStampKeysSelector; Link Here

(-)a/src/core/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java (-5 / +2 lines)
39	public class TransactionsPerSecondGraphConsumer extends	39	public class TransactionsPerSecondGraphConsumer extends
40	AbstractOverTimeGraphConsumer {	40	AbstractOverTimeGraphConsumer {
41		41
42	private static final String STATUS_SERIES_FORMAT = "%s-%s";
43	private static final String SUCCESS_SERIES_SUFFIX = "success";	42	private static final String SUCCESS_SERIES_SUFFIX = "success";
44	private static final String FAILURE_SERIES_SUFFIX = "failure";	43	private static final String FAILURE_SERIES_SUFFIX = "failure";
45		44
Lines 72-81 public class TransactionsPerSecondGraphConsumer extends Link Here
72		71
73	@Override	72	@Override
74	public Iterable<String> select(Sample sample) {	73	public Iterable<String> select(Sample sample) {
75	String label = String.format(STATUS_SERIES_FORMAT,	74	String success = sample.getSuccess() ? SUCCESS_SERIES_SUFFIX : FAILURE_SERIES_SUFFIX;
76	sample.getName(),	75	String label = sample.getName() + "-" + success;
77	sample.getSuccess() ? SUCCESS_SERIES_SUFFIX
78	: FAILURE_SERIES_SUFFIX);
79	return Arrays.asList(label);	76	return Arrays.asList(label);
80	}	77	}
81	},	78	},

Lines 17-39 Link Here

(-)a/src/core/org/apache/jmeter/report/processor/graph/impl/SyntheticResponseTimeDistributionGraphConsumer.java (-8 / +12 lines)
17	*/	17	*/
18	package org.apache.jmeter.report.processor.graph.impl;	18	package org.apache.jmeter.report.processor.graph.impl;
19		19
20	import java.text.MessageFormat;
21	import java.util.Arrays;	20	import java.util.Arrays;
22	import java.util.HashMap;	21	import java.util.HashMap;
23	import java.util.Map;	22	import java.util.Map;
24		23
25	import org.apache.jmeter.report.core.Sample;	24	import org.apache.jmeter.report.core.Sample;
26	import org.apache.jmeter.report.processor.ListResultData;
27	import org.apache.jmeter.report.processor.MapResultData;
28	import org.apache.jmeter.report.processor.SumAggregatorFactory;
29	import org.apache.jmeter.report.processor.ValueResultData;
30	import org.apache.jmeter.report.processor.graph.AbstractGraphConsumer;	25	import org.apache.jmeter.report.processor.graph.AbstractGraphConsumer;
31	import org.apache.jmeter.report.processor.graph.AbstractSeriesSelector;	26	import org.apache.jmeter.report.processor.graph.AbstractSeriesSelector;
32	import org.apache.jmeter.report.processor.graph.CountValueSelector;	27	import org.apache.jmeter.report.processor.graph.CountValueSelector;
33	import org.apache.jmeter.report.processor.graph.GraphKeysSelector;	28	import org.apache.jmeter.report.processor.graph.GraphKeysSelector;
34	import org.apache.jmeter.report.processor.graph.GroupInfo;	29	import org.apache.jmeter.report.processor.graph.GroupInfo;
35	import org.apache.jmeter.report.processor.graph.SeriesData;	30	import org.apache.jmeter.report.processor.graph.SeriesData;
		31	import org.apache.jmeter.report.processor.ListResultData;
		32	import org.apache.jmeter.report.processor.MapResultData;
		33	import org.apache.jmeter.report.processor.SumAggregatorFactory;
		34	import org.apache.jmeter.report.processor.ValueResultData;
36	import org.apache.jmeter.util.JMeterUtils;	35	import org.apache.jmeter.util.JMeterUtils;
		36	import org.apache.jorphan.text.PreCompiledFormatter;
		37	import org.apache.jorphan.text.PreCompiledFormatterBuilder;
37		38
38	/**	39	/**
39	* The class SyntheticResponseTimeDistributionGraphConsumer provides a graph to visualize	40	* The class SyntheticResponseTimeDistributionGraphConsumer provides a graph to visualize
Lines 44-52 import org.apache.jmeter.util.JMeterUtils; Link Here
44	public class SyntheticResponseTimeDistributionGraphConsumer extends	45	public class SyntheticResponseTimeDistributionGraphConsumer extends
45	AbstractGraphConsumer {	46	AbstractGraphConsumer {
46	private static final String FAILED_LABEL = JMeterUtils.getResString("response_time_distribution_failed_label");	47	private static final String FAILED_LABEL = JMeterUtils.getResString("response_time_distribution_failed_label");
47	private static final MessageFormat SATISFIED_LABEL = new MessageFormat(JMeterUtils.getResString("response_time_distribution_satisfied_label"));	48	private static final PreCompiledFormatter SATISFIED_LABEL = PreCompiledFormatterBuilder.build(
48	private static final MessageFormat TOLERATED_LABEL = new MessageFormat(JMeterUtils.getResString("response_time_distribution_tolerated_label"));	49	JMeterUtils.getResString("response_time_distribution_satisfied_label"));
49	private static final MessageFormat UNTOLERATED_LABEL = new MessageFormat(JMeterUtils.getResString("response_time_distribution_untolerated_label"));	50	private static final PreCompiledFormatter TOLERATED_LABEL = PreCompiledFormatterBuilder.build(
		51	JMeterUtils.getResString("response_time_distribution_tolerated_label"));
		52	private static final PreCompiledFormatter UNTOLERATED_LABEL = PreCompiledFormatterBuilder.build(
		53	JMeterUtils.getResString("response_time_distribution_untolerated_label"));
50	private static final String SERIE_COLOR_PROPERTY = "color";	54	private static final String SERIE_COLOR_PROPERTY = "color";
51	private static final String SATISFIED_COLOR = "#9ACD32";	55	private static final String SATISFIED_COLOR = "#9ACD32";
52	private static final String TOLERATED_COLOR = "yellow";	56	private static final String TOLERATED_COLOR = "yellow";

Line 0 Link Here

(-)a/src/jorphan/org/apache/jorphan/text/BooleanFormatter.java (+46 lines)
	1	/*
	2	* Licensed to the Apache Software Foundation (ASF) under one or more
	3	* contributor license agreements. See the NOTICE file distributed with
	4	* this work for additional information regarding copyright ownership.
	5	* The ASF licenses this file to You under the Apache License, Version 2.0
	6	* (the "License"); you may not use this file except in compliance with
	7	* the License. You may obtain a copy of the License at
	8	*
	9	* http://www.apache.org/licenses/LICENSE-2.0
	10	*
	11	* Unless required by applicable law or agreed to in writing, software
	12	* distributed under the License is distributed on an "AS IS" BASIS,
	13	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
	14	* implied.
	15	*
	16	* See the License for the specific language governing permissions and
	17	* limitations under the License.
	18	*/
	19	package org.apache.jorphan.text;
	20
	21	import java.util.function.Function;
	22
	23	public class BooleanFormatter implements SimpleFormatter {
	24
	25	Function<String, String> transformer;
	26
	27	public BooleanFormatter() {
	28	this(s -> s);
	29	}
	30
	31	public BooleanFormatter(Function<String, String> transformer) {
	32	this.transformer = transformer;
	33	}
	34
	35	@Override
	36	public void format(StringBuilder sb, Object arg) {
	37	String valueAsString = arg instanceof Boolean ? String.valueOf(arg) : "true";
	38	sb.append(transformer.apply(arg == null ? "false" : valueAsString));
	39	}
	40
	41	@Override
	42	public int argsNeeded() {
	43	return 1;
	44	}
	45
	46	}

Line 0 Link Here

(-)a/test/src/org/apache/jorphan/text/PreCompiledFormatterSpec.groovy (-1 / +50 lines)
0	-	1	/*
		2	* Licensed to the Apache Software Foundation (ASF) under one or more
		3	* contributor license agreements. See the NOTICE file distributed with
		4	* this work for additional information regarding copyright ownership.
		5	* The ASF licenses this file to You under the Apache License, Version 2.0
		6	* (the "License"); you may not use this file except in compliance with
		7	* the License. You may obtain a copy of the License at
		8	*
		9	* http://www.apache.org/licenses/LICENSE-2.0
		10	*
		11	* Unless required by applicable law or agreed to in writing, software
		12	* distributed under the License is distributed on an "AS IS" BASIS,
		13	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
		14	* implied.
		15	*
		16	* See the License for the specific language governing permissions and
		17	* limitations under the License.
		18	*/
		19	package org.apache.jorphan.io
		20
		21	import org.apache.jorphan.text.PreCompiledFormatter
		22	import org.apache.jorphan.text.PreCompiledFormatterBuilder
		23	import spock.lang.Specification
		24	import spock.lang.Unroll
		25
		26	@Unroll
		27	class PreCompiledFormatterSpec extends Specification {
		28
		29	def "empty format gives an empty string"() {
		30	given:
		31	def sut = PreCompiledFormatterBuilder.build("")
		32	expect:
		33	sut.format() == ""
		34	}
		35
		36	def "formats are the same as String.format"() {
		37	given:
		38	def sut = PreCompiledFormatterBuilder.build(format)
		39	Object[] args = allArgs.toArray(new Object[0])
		40	expect:
		41	sut.format(args) == String.format(format, args)
		42	where:
		43	format \| allArgs
		44	"Hello, %s!" \| ['World']
		45	"%s-%s" \| [42, 23]
		46	"%s => %S" \| ['aBc', 'aBc']
		47	"%s => %b" \| [true, true]
		48	}
		49
		50	}