You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/03/27 19:57:33 UTC
svn commit: r1461800 - in /cxf/branches/2.6.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
Author: sergeyb
Date: Wed Mar 27 18:57:32 2013
New Revision: 1461800
URL: http://svn.apache.org/r1461800
Log:
Merged revisions 1461778,1461792 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................
r1461778 | sergeyb | 2013-03-27 21:42:55 +0300 (Wed, 27 Mar 2013) | 9 lines
Merged revisions 1461774 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1461774 | sergeyb | 2013-03-27 21:38:45 +0300 (Wed, 27 Mar 2013) | 1 line
Making few of WADLGenerator methods protected
........
................
r1461792 | sergeyb | 2013-03-27 21:53:17 +0300 (Wed, 27 Mar 2013) | 9 lines
Merged revisions 1461787 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1461787 | sergeyb | 2013-03-27 21:50:19 +0300 (Wed, 27 Mar 2013) | 1 line
Making few of WADLGenerator methods protected: one more, sorry
........
................
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 27 18:57:32 2013
@@ -0,0 +1,2 @@
+/cxf/branches/2.7.x-fixes:1461778-1461792
+/cxf/trunk:1461774,1461787
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=1461800&r1=1461799&r2=1461800&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java Wed Mar 27 18:57:32 2013
@@ -280,7 +280,7 @@ public class WadlGenerator implements Re
}
}
- private void handleGrammars(StringBuilder sbApp, StringBuilder sbGrammars,
+ protected void handleGrammars(StringBuilder sbApp, StringBuilder sbGrammars,
SchemaWriter writer, Map<Class<?>, QName> clsMap) {
if (writer == null) {
return;
@@ -299,7 +299,7 @@ public class WadlGenerator implements Re
}
- private void handleResource(StringBuilder sb, Set<Class<?>> jaxbTypes,
+ protected void handleResource(StringBuilder sb, Set<Class<?>> jaxbTypes,
ElementQNameResolver qnameResolver,
Map<Class<?>, QName> clsMap, ClassResourceInfo cri,
Set<ClassResourceInfo> visitedResources,
@@ -368,7 +368,7 @@ public class WadlGenerator implements Re
sb.append(">");
}
- private String getPath(String path) {
+ protected String getPath(String path) {
String thePath = null;
if (ignoreForwardSlash && path.startsWith("/") && path.length() > 0) {
thePath = path.substring(1);
@@ -390,7 +390,7 @@ public class WadlGenerator implements Re
}
//CHECKSTYLE:OFF
- private boolean handleOperation(StringBuilder sb, Set<Class<?>> jaxbTypes,
+ protected boolean handleOperation(StringBuilder sb, Set<Class<?>> jaxbTypes,
ElementQNameResolver qnameResolver,
Map<Class<?>, QName> clsMap,
OperationResourceInfo ori,
@@ -520,13 +520,13 @@ public class WadlGenerator implements Re
sb.append("</resource>");
}
- private void handlePathAndMatrixClassParams(StringBuilder sb, Map<Parameter, Object> params,
+ protected void handlePathAndMatrixClassParams(StringBuilder sb, Map<Parameter, Object> params,
boolean isJson) {
doHandleClassParams(sb, params, isJson, ParameterType.PATH);
doHandleClassParams(sb, params, isJson, ParameterType.MATRIX);
}
- private void doHandleClassParams(StringBuilder sb, Map<Parameter, Object> params,
+ protected void doHandleClassParams(StringBuilder sb, Map<Parameter, Object> params,
boolean isJson, ParameterType... pType) {
Set<ParameterType> pTypes = new LinkedHashSet<ParameterType>(Arrays.asList(pType));
for (Map.Entry<Parameter, Object> entry : params.entrySet()) {
@@ -544,13 +544,13 @@ public class WadlGenerator implements Re
}
}
- private void handlePathAndMatrixParams(StringBuilder sb, OperationResourceInfo ori, boolean isJson) {
+ protected void handlePathAndMatrixParams(StringBuilder sb, OperationResourceInfo ori, boolean isJson) {
handleParams(sb, ori, ParameterType.PATH, isJson);
handleParams(sb, ori, ParameterType.MATRIX, isJson);
}
- private void handleParameter(StringBuilder sb, Set<Class<?>> jaxbTypes,
+ protected void handleParameter(StringBuilder sb, Set<Class<?>> jaxbTypes,
ElementQNameResolver qnameResolver,
Map<Class<?>, QName> clsMap, OperationResourceInfo ori, Parameter pm,
boolean isJson) {
@@ -568,7 +568,7 @@ public class WadlGenerator implements Re
}
- private void handleParams(StringBuilder sb, OperationResourceInfo ori, ParameterType type,
+ protected void handleParams(StringBuilder sb, OperationResourceInfo ori, ParameterType type,
boolean isJson) {
for (Parameter pm : ori.getParameters()) {
if (pm.getType() == type) {
@@ -704,7 +704,7 @@ public class WadlGenerator implements Re
}
//TODO: Collapse multiple parameters into a holder
//CHECKSTYLE:OFF
- private void handleRepresentation(StringBuilder sb, Set<Class<?>> jaxbTypes,
+ protected void handleRepresentation(StringBuilder sb, Set<Class<?>> jaxbTypes,
ElementQNameResolver qnameResolver,
Map<Class<?>, QName> clsMap, OperationResourceInfo ori,
Class<?> type, boolean isJson, boolean inbound) {