Author: markt
Date: Tue Mar 21 13:10:48 2017
New Revision: 1787962
URL: http://svn.apache.org/viewvc?rev=1787962&view=rev
Log:
Refactoring
Single utility class for X -> comma separated list
Added:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/StringUtils.java
- copied, changed from r1787938,
tomcat/trunk/java/org/apache/tomcat/util/buf/StringUtils.java
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityListener.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryGroup.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryUser.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/SignCode.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 21 13:10:48 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,1768520,1768569,1768651,176
8762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,1778141-1778150,1778154,
1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778582,1778600,1779641,1779654,1779708,1779718,1779897,1779899,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,1768520,1768569,1768651,176
8762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,1778141-1778150,1778154,
1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778582,1778600,1779641,1779654,1779708,1779718,1779897,1779899,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1787962&r1=1787961&r2=1787962&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java Tue
Mar 21 13:10:48 2017
@@ -115,6 +115,7 @@ import org.apache.tomcat.InstanceManager
import org.apache.tomcat.JarScanner;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.buf.StringUtils;
import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.descriptor.XmlIdentifiers;
import org.apache.tomcat.util.descriptor.web.ApplicationParameter;
@@ -1031,17 +1032,7 @@ public class StandardContext extends Con
@Override
public String getResourceOnlyServlets() {
- StringBuilder result = new StringBuilder();
- boolean first = true;
- for (String servletName : resourceOnlyServlets) {
- if (first) {
- first = false;
- } else {
- result.append(',');
- }
- result.append(servletName);
- }
- return result.toString();
+ return StringUtils.join(resourceOnlyServlets);
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1787962&r1=1787961&r2=1787962&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
Tue Mar 21 13:10:48 2017
@@ -44,6 +44,7 @@ import org.apache.catalina.core.Containe
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.startup.HostConfig;
import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.buf.StringUtils;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -519,15 +520,8 @@ public class HostManagerServlet
Host host = (Host) hosts[i];
String name = host.getName();
String[] aliases = host.findAliases();
- StringBuilder buf = new StringBuilder();
- if (aliases.length > 0) {
- buf.append(aliases[0]);
- for (int j = 1; j < aliases.length; j++) {
- buf.append(',').append(aliases[j]);
- }
- }
writer.println(smClient.getString("hostManagerServlet.listitem",
- name, buf.toString()));
+ name, StringUtils.join(aliases)));
}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityListener.java?rev=1787962&r1=1787961&r2=1787962&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityListener.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/security/SecurityListener.java
Tue Mar 21 13:10:48 2017
@@ -17,7 +17,6 @@
package org.apache.catalina.security;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Locale;
import java.util.Set;
@@ -26,6 +25,7 @@ import org.apache.catalina.LifecycleEven
import org.apache.catalina.LifecycleListener;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.buf.StringUtils;
import org.apache.tomcat.util.res.StringManager;
public class SecurityListener implements LifecycleListener {
@@ -97,18 +97,7 @@ public class SecurityListener implements
* @return A comma separated list of operating system user names.
*/
public String getCheckedOsUsers() {
- if (checkedOsUsers.size() == 0) {
- return "";
- }
-
- StringBuilder result = new StringBuilder();
- Iterator<String> iter = checkedOsUsers.iterator();
- result.append(iter.next());
- while (iter.hasNext()) {
- result.append(',');
- result.append(iter.next());
- }
- return result.toString();
+ return StringUtils.join(checkedOsUsers);
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryGroup.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryGroup.java?rev=1787962&r1=1787961&r2=1787962&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryGroup.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryGroup.java Tue
Mar 21 13:10:48 2017
@@ -25,6 +25,8 @@ import java.util.Iterator;
import org.apache.catalina.Role;
import org.apache.catalina.User;
import org.apache.catalina.UserDatabase;
+import org.apache.tomcat.util.buf.StringUtils;
+import org.apache.tomcat.util.buf.StringUtils.Function;
/**
@@ -200,22 +202,12 @@ public class MemoryGroup extends Abstrac
synchronized (roles) {
if (roles.size() > 0) {
sb.append(" roles=\"");
- int n = 0;
- Iterator<Role> values = roles.iterator();
- while (values.hasNext()) {
- if (n > 0) {
- sb.append(',');
- }
- n++;
- sb.append((values.next()).getRolename());
- }
+ StringUtils.join(roles, ',', new Function<Role>(){
+ @Override public String apply(Role t) { return
t.getRolename(); }}, sb);
sb.append("\"");
}
}
sb.append("/>");
return (sb.toString());
-
}
-
-
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryUser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryUser.java?rev=1787962&r1=1787961&r2=1787962&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryUser.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryUser.java Tue Mar
21 13:10:48 2017
@@ -26,6 +26,8 @@ import org.apache.catalina.Group;
import org.apache.catalina.Role;
import org.apache.catalina.UserDatabase;
import org.apache.catalina.util.RequestUtil;
+import org.apache.tomcat.util.buf.StringUtils;
+import org.apache.tomcat.util.buf.StringUtils.Function;
/**
* <p>Concrete implementation of {@link org.apache.catalina.User} for the
@@ -271,38 +273,30 @@ public class MemoryUser extends Abstract
synchronized (groups) {
if (groups.size() > 0) {
sb.append(" groups=\"");
- int n = 0;
- Iterator<Group> values = groups.iterator();
- while (values.hasNext()) {
- if (n > 0) {
- sb.append(',');
+ StringUtils.join(groups, ',', new Function<Group>() {
+ @Override public String apply(Group t) {
+ return RequestUtil.filter(t.getGroupname());
}
- n++;
-
sb.append(RequestUtil.filter(values.next().getGroupname()));
- }
+ }, sb);
sb.append("\"");
}
}
synchronized (roles) {
if (roles.size() > 0) {
sb.append(" roles=\"");
- int n = 0;
- Iterator<Role> values = roles.iterator();
- while (values.hasNext()) {
- if (n > 0) {
- sb.append(',');
+ StringUtils.join(roles, ',', new Function<Role>() {
+ @Override public String apply(Role t) {
+ return RequestUtil.filter(t.getRolename());
}
- n++;
- sb.append(RequestUtil.filter(values.next().getRolename()));
- }
+ }, sb);
sb.append("\"");
}
}
sb.append("/>");
- return (sb.toString());
-
+ return sb.toString();
}
+
/**
* <p>Return a String representation of this user.</p>
*/
@@ -320,35 +314,25 @@ public class MemoryUser extends Abstract
synchronized (groups) {
if (groups.size() > 0) {
sb.append(", groups=\"");
- int n = 0;
- Iterator<Group> values = groups.iterator();
- while (values.hasNext()) {
- if (n > 0) {
- sb.append(',');
+ StringUtils.join(groups, ',', new Function<Group>() {
+ @Override public String apply(Group t) {
+ return RequestUtil.filter(t.getGroupname());
}
- n++;
-
sb.append(RequestUtil.filter(values.next().getGroupname()));
- }
+ }, sb);
sb.append("\"");
}
}
synchronized (roles) {
if (roles.size() > 0) {
sb.append(", roles=\"");
- int n = 0;
- Iterator<Role> values = roles.iterator();
- while (values.hasNext()) {
- if (n > 0) {
- sb.append(',');
+ StringUtils.join(roles, ',', new Function<Role>() {
+ @Override public String apply(Role t) {
+ return RequestUtil.filter(t.getRolename());
}
- n++;
- sb.append(RequestUtil.filter(values.next().getRolename()));
- }
+ }, sb);
sb.append("\"");
}
}
- return (sb.toString());
+ return sb.toString();
}
-
-
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1787962&r1=1787961&r2=1787962&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Tue Mar 21 13:10:48 2017
@@ -36,6 +36,7 @@ import org.apache.coyote.UpgradeToken;
import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
import org.apache.coyote.http11.upgrade.UpgradeProcessorExternal;
import org.apache.coyote.http11.upgrade.UpgradeProcessorInternal;
+import org.apache.tomcat.util.buf.StringUtils;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -274,17 +275,7 @@ public abstract class AbstractHttp11Prot
// sync is unnecessary.
List<String> copy = new ArrayList<>(allowedTrailerHeaders.size());
copy.addAll(allowedTrailerHeaders);
- StringBuilder result = new StringBuilder();
- boolean first = true;
- for (String header : copy) {
- if (first) {
- first = false;
- } else {
- result.append(',');
- }
- result.append(header);
- }
- return result.toString();
+ return StringUtils.join(copy);
}
public void addAllowedTrailerHeader(String header) {
if (header != null) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java?rev=1787962&r1=1787961&r2=1787962&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java Tue
Mar 21 13:10:48 2017
@@ -33,6 +33,7 @@ import org.apache.coyote.UpgradeProtocol
import org.apache.coyote.UpgradeToken;
import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
import org.apache.coyote.http11.upgrade.UpgradeProcessorInternal;
+import org.apache.tomcat.util.buf.StringUtils;
import org.apache.tomcat.util.net.SocketWrapperBase;
public class Http2Protocol implements UpgradeProtocol {
@@ -224,17 +225,7 @@ public class Http2Protocol implements Up
// sync is unnecessary.
List<String> copy = new ArrayList<>(allowedTrailerHeaders.size());
copy.addAll(allowedTrailerHeaders);
- StringBuilder result = new StringBuilder();
- boolean first = true;
- for (String header : copy) {
- if (first) {
- first = false;
- } else {
- result.append(',');
- }
- result.append(header);
- }
- return result.toString();
+ return StringUtils.join(copy);
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/SignCode.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/SignCode.java?rev=1787962&r1=1787961&r2=1787962&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/SignCode.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/SignCode.java Tue Mar
21 13:10:48 2017
@@ -41,6 +41,7 @@ import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
+import org.apache.tomcat.util.buf.StringUtils;
import org.apache.tomcat.util.codec.binary.Base64;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
@@ -172,7 +173,7 @@ public class SignCode extends Task {
SOAPElement commaDelimitedFileNames =
requestSigningRequest.addChildElement("commaDelimitedFileNames", NS);
- commaDelimitedFileNames.addTextNode(listToString(fileNames));
+ commaDelimitedFileNames.addTextNode(StringUtils.join(fileNames));
SOAPElement application =
requestSigningRequest.addChildElement("application", NS);
@@ -214,21 +215,6 @@ public class SignCode extends Task {
}
- private String listToString(List<String> list) {
- StringBuilder sb = new StringBuilder(list.size() * 6);
- boolean doneFirst = false;
- for (String s : list) {
- if (doneFirst) {
- sb.append(',');
- } else {
- doneFirst = true;
- }
- sb.append(s);
- }
- return sb.toString();
- }
-
-
private void downloadSignedFiles(List<File> filesToSign, String id)
throws SOAPException, IOException {
Copied: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/StringUtils.java
(from r1787938, tomcat/trunk/java/org/apache/tomcat/util/buf/StringUtils.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/StringUtils.java?p2=tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/StringUtils.java&p1=tomcat/trunk/java/org/apache/tomcat/util/buf/StringUtils.java&r1=1787938&r2=1787962&rev=1787962&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/StringUtils.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/StringUtils.java Tue
Mar 21 13:10:48 2017
@@ -18,7 +18,6 @@ package org.apache.tomcat.util.buf;
import java.util.Arrays;
import java.util.Collection;
-import java.util.function.Function;
/**
* Utility methods to build a separated list from a given set (not
@@ -57,17 +56,18 @@ public final class StringUtils {
public static void join(Iterable<String> iterable, char separator,
StringBuilder sb) {
- join(iterable, separator, (x) -> x, sb);
+ join(iterable, separator,
+ new Function<String>() {@Override public String apply(String
t) { return t; }}, sb);
}
- public static <T> void join(T[] array, char separator, Function<T,String>
function,
+ public static <T> void join(T[] array, char separator, Function<T>
function,
StringBuilder sb) {
join(Arrays.asList(array), separator, function, sb);
}
- public static <T> void join(Iterable<T> iterable, char separator,
Function<T,String> function,
+ public static <T> void join(Iterable<T> iterable, char separator,
Function<T> function,
StringBuilder sb) {
boolean first = true;
for (T value : iterable) {
@@ -79,4 +79,9 @@ public final class StringUtils {
sb.append(function.apply(value));
}
}
+
+
+ public interface Function<T> {
+ public String apply(T t);
+ }
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1787962&r1=1787961&r2=1787962&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/Parameters.java Tue
Mar 21 13:10:48 2017
@@ -31,6 +31,7 @@ import org.apache.juli.logging.LogFactor
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.buf.StringUtils;
import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.log.UserDataHelper;
import org.apache.tomcat.util.res.StringManager;
@@ -513,10 +514,7 @@ public final class Parameters {
StringBuilder sb = new StringBuilder();
for (Map.Entry<String, ArrayList<String>> e :
paramHashValues.entrySet()) {
sb.append(e.getKey()).append('=');
- ArrayList<String> values = e.getValue();
- for (String value : values) {
- sb.append(value).append(',');
- }
+ StringUtils.join(e.getValue(), ',', sb);
sb.append('\n');
}
return sb.toString();
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=1787962&r1=1787961&r2=1787962&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
Tue Mar 21 13:10:48 2017
@@ -38,6 +38,9 @@ import javax.management.ReflectionExcept
import javax.management.RuntimeOperationsException;
import javax.management.ServiceNotFoundException;
+import org.apache.tomcat.util.buf.StringUtils;
+import org.apache.tomcat.util.buf.StringUtils.Function;
+
/**
* <p>Internal configuration information for a managed bean (MBean)
@@ -565,26 +568,17 @@ public class ManagedBean implements java
private String createOperationKey(OperationInfo operation) {
StringBuilder key = new StringBuilder(operation.getName());
key.append('(');
- for (ParameterInfo parameterInfo: operation.getSignature()) {
- key.append(parameterInfo.getType());
- // Note: A trailing ',' does not matter in this case
- key.append(',');
- }
+ StringUtils.join(operation.getSignature(), ',', new
Function<ParameterInfo>() {
+ @Override public String apply(ParameterInfo t) { return
t.getType(); }}, key);
key.append(')');
-
return key.toString();
}
- private String createOperationKey(String methodName,
- String[] parameterTypes) {
+ private String createOperationKey(String methodName, String[]
parameterTypes) {
StringBuilder key = new StringBuilder(methodName);
key.append('(');
- for (String parameter: parameterTypes) {
- key.append(parameter);
- // Note: A trailing ',' does not matter in this case
- key.append(',');
- }
+ StringUtils.join(parameterTypes);
key.append(')');
return key.toString();
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1787962&r1=1787961&r2=1787962&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Tue Mar 21 13:10:48 2017
@@ -67,6 +67,7 @@ import javax.websocket.WebSocketContaine
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.InstanceManager;
+import org.apache.tomcat.util.buf.StringUtils;
import org.apache.tomcat.util.codec.binary.Base64;
import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
import org.apache.tomcat.util.res.StringManager;
@@ -628,21 +629,13 @@ public class WsWebSocketContainer implem
private static void addHeader(ByteBuffer result, String key, List<String>
values) {
- StringBuilder sb = new StringBuilder();
-
- Iterator<String> iter = values.iterator();
- if (!iter.hasNext()) {
+ if (values.isEmpty()) {
return;
}
- sb.append(iter.next());
- while (iter.hasNext()) {
- sb.append(',');
- sb.append(iter.next());
- }
result.put(key.getBytes(StandardCharsets.ISO_8859_1));
result.put(": ".getBytes(StandardCharsets.ISO_8859_1));
- result.put(sb.toString().getBytes(StandardCharsets.ISO_8859_1));
+
result.put(StringUtils.join(values).getBytes(StandardCharsets.ISO_8859_1));
result.put(crlf);
}
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1787962&r1=1787961&r2=1787962&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Mar 21 13:10:48 2017
@@ -67,6 +67,11 @@
Align <code>PushBuilder</code> API with changes from Servlet expert
group. (markt)
</update>
+ <scode>
+ Refactor the various implementations of X to comma separated list to a
+ single utility class and update the code to use the new utility class.
+ (markt)
+ </scode>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
