Skip to content
This repository was archived by the owner on Mar 3, 2026. It is now read-only.

Commit f1359ed

Browse files
authored
New API Tool implementation (jooby-project#858)
* API tool * deprecate route-spec in favor of apitool * new api parser for Java and Kotlin * fuzzy javadoc for Java and Kotlin * Swagger export * fix jooby-project#758 * fix jooby-project#843 * Swagger and RAML support * .json storage for internal API * Themes for swagger and raml * Javadoc * Finish new API Tool module * added javadoc * maven and gradle support * support kotlin class with main method * bug fixing
1 parent d7089bb commit f1359ed

File tree

119 files changed

+15645
-474
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+15645
-474
lines changed

build/ant.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<project>
2+
<target name="clean-idea">
3+
<echo message="${user.dir}" />
4+
<delete>
5+
<fileset dir="${user.dir}" includes="**/*.iml"/>
6+
<fileset dir="${user.dir}" includes="**/.idea/"/>
7+
<fileset dir="${user.dir}" includes="**/pom.xml.versionsBackup"/>
8+
</delete>
9+
</target>
10+
</project>

jooby/src/main/java/org/jooby/Route.java

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,25 @@
203203
*/
204204
package org.jooby;
205205

206+
import com.google.common.base.CaseFormat;
206207
import static com.google.common.base.Preconditions.checkArgument;
208+
import com.google.common.base.Strings;
209+
import com.google.common.collect.ImmutableList;
210+
import com.google.common.collect.ImmutableMap;
211+
import com.google.common.collect.Lists;
212+
import com.google.common.primitives.Primitives;
213+
import com.google.inject.Key;
214+
import com.google.inject.TypeLiteral;
207215
import static java.util.Objects.requireNonNull;
208216
import static javaslang.API.Case;
209217
import static javaslang.API.Match;
218+
import javaslang.CheckedFunction1;
210219
import static javaslang.Predicates.instanceOf;
220+
import org.jooby.internal.RouteImpl;
221+
import org.jooby.internal.RouteMatcher;
222+
import org.jooby.internal.RoutePattern;
223+
import org.jooby.internal.RouteSourceImpl;
224+
import org.jooby.internal.SourceProvider;
211225

212226
import java.lang.reflect.Array;
213227
import java.lang.reflect.Method;
@@ -222,23 +236,6 @@
222236
import java.util.function.Function;
223237
import java.util.stream.Collectors;
224238

225-
import org.jooby.internal.RouteImpl;
226-
import org.jooby.internal.RouteMatcher;
227-
import org.jooby.internal.RoutePattern;
228-
import org.jooby.internal.RouteSourceImpl;
229-
230-
import com.google.common.base.CaseFormat;
231-
import com.google.common.base.Strings;
232-
import com.google.common.collect.ImmutableList;
233-
import com.google.common.collect.ImmutableMap;
234-
import com.google.common.collect.Lists;
235-
import com.google.common.primitives.Primitives;
236-
import com.google.inject.Key;
237-
import com.google.inject.TypeLiteral;
238-
import com.google.inject.internal.util.SourceProvider;
239-
240-
import javaslang.CheckedFunction1;
241-
242239
/**
243240
* Routes are a key concept in Jooby. Routes are executed in the same order they are defined.
244241
*
@@ -525,7 +522,7 @@ interface Mapper<T> {
525522
* @param next The second mapper to apply.
526523
* @return A new mapper.
527524
*/
528-
@SuppressWarnings({"rawtypes", "unchecked" })
525+
@SuppressWarnings({"rawtypes", "unchecked"})
529526
static Mapper<Object> chain(final Mapper it, final Mapper next) {
530527
return create(it.name() + ">" + next.name(), v -> next.map(it.map(v)));
531528
}
@@ -1100,7 +1097,9 @@ private void newRoute(final Route.Definition route) {
11001097
routes.add(route);
11011098
}
11021099

1103-
};
1100+
}
1101+
1102+
;
11041103

11051104
/**
11061105
* Collection of {@link Route.Props} useful for registering/setting route options at once.
@@ -1110,8 +1109,7 @@ private void newRoute(final Route.Definition route) {
11101109
* @author edgar
11111110
* @since 0.5.0
11121111
*/
1113-
@SuppressWarnings({"unchecked", "rawtypes" })
1114-
class Collection implements Props<Collection> {
1112+
@SuppressWarnings({"unchecked", "rawtypes"}) class Collection implements Props<Collection> {
11151113

11161114
/** List of definitions. */
11171115
private final Route.Props[] routes;
@@ -1244,10 +1242,6 @@ public Collection map(final Mapper<?> mapper) {
12441242
*/
12451243
class Definition implements Props<Definition> {
12461244

1247-
private static final SourceProvider SRC = SourceProvider.DEFAULT_INSTANCE
1248-
.plusSkippedClasses(Definition.class, Jooby.class, Collection.class, Group.class,
1249-
javaslang.collection.List.class, Router.class, Forwarding.class, Deferred.class);
1250-
12511245
/**
12521246
* Route's name.
12531247
*/
@@ -1352,9 +1346,10 @@ public Definition(final String method, final String pattern,
13521346
// normalized pattern
13531347
this.pattern = cpattern.pattern();
13541348
this.filter = filter;
1355-
StackTraceElement source = SRC.get(new Throwable().getStackTrace());
1356-
this.line = source.getLineNumber();
1357-
this.declaringClass = source.getClassName();
1349+
SourceProvider.INSTANCE.get().ifPresent(source -> {
1350+
this.line = source.getLineNumber();
1351+
this.declaringClass = source.getClassName();
1352+
});
13581353
}
13591354

13601355
/**
@@ -1459,7 +1454,7 @@ public Definition attr(final String name, final Object value) {
14591454
requireNonNull(value, "Attribute value is required.");
14601455

14611456
if (valid(value)) {
1462-
attributes = ImmutableMap.<String, Object> builder()
1457+
attributes = ImmutableMap.<String, Object>builder()
14631458
.putAll(attributes)
14641459
.put(name, value)
14651460
.build();
@@ -2404,7 +2399,7 @@ default void next(final Request req, final Response rsp) throws Throwable {
24042399
/**
24052400
* Well known HTTP methods.
24062401
*/
2407-
List<String> METHODS = ImmutableList.<String> builder()
2402+
List<String> METHODS = ImmutableList.<String>builder()
24082403
.add(GET,
24092404
POST,
24102405
PUT,
@@ -2570,9 +2565,9 @@ static String errpath(final String path) {
25702565
*/
25712566
default String print(final int indent) {
25722567
StringBuilder buff = new StringBuilder();
2573-
String[] header = {"Method", "Path", "Source", "Name", "Pattern", "Consumes", "Produces" };
2568+
String[] header = {"Method", "Path", "Source", "Name", "Pattern", "Consumes", "Produces"};
25742569
String[] values = {method(), path(), source().toString(), name(), pattern(),
2575-
consumes().toString(), produces().toString() };
2570+
consumes().toString(), produces().toString()};
25762571

25772572
BiConsumer<Function<Integer, String>, Character> format = (v, s) -> {
25782573
buff.append(Strings.padEnd("", indent, ' '))
Lines changed: 249 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,249 @@
1+
/**
2+
* Apache License
3+
* Version 2.0, January 2004
4+
* http://www.apache.org/licenses/
5+
*
6+
* TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
*
8+
* 1. Definitions.
9+
*
10+
* "License" shall mean the terms and conditions for use, reproduction,
11+
* and distribution as defined by Sections 1 through 9 of this document.
12+
*
13+
* "Licensor" shall mean the copyright owner or entity authorized by
14+
* the copyright owner that is granting the License.
15+
*
16+
* "Legal Entity" shall mean the union of the acting entity and all
17+
* other entities that control, are controlled by, or are under common
18+
* control with that entity. For the purposes of this definition,
19+
* "control" means (i) the power, direct or indirect, to cause the
20+
* direction or management of such entity, whether by contract or
21+
* otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
* outstanding shares, or (iii) beneficial ownership of such entity.
23+
*
24+
* "You" (or "Your") shall mean an individual or Legal Entity
25+
* exercising permissions granted by this License.
26+
*
27+
* "Source" form shall mean the preferred form for making modifications,
28+
* including but not limited to software source code, documentation
29+
* source, and configuration files.
30+
*
31+
* "Object" form shall mean any form resulting from mechanical
32+
* transformation or translation of a Source form, including but
33+
* not limited to compiled object code, generated documentation,
34+
* and conversions to other media types.
35+
*
36+
* "Work" shall mean the work of authorship, whether in Source or
37+
* Object form, made available under the License, as indicated by a
38+
* copyright notice that is included in or attached to the work
39+
* (an example is provided in the Appendix below).
40+
*
41+
* "Derivative Works" shall mean any work, whether in Source or Object
42+
* form, that is based on (or derived from) the Work and for which the
43+
* editorial revisions, annotations, elaborations, or other modifications
44+
* represent, as a whole, an original work of authorship. For the purposes
45+
* of this License, Derivative Works shall not include works that remain
46+
* separable from, or merely link (or bind by name) to the interfaces of,
47+
* the Work and Derivative Works thereof.
48+
*
49+
* "Contribution" shall mean any work of authorship, including
50+
* the original version of the Work and any modifications or additions
51+
* to that Work or Derivative Works thereof, that is intentionally
52+
* submitted to Licensor for inclusion in the Work by the copyright owner
53+
* or by an individual or Legal Entity authorized to submit on behalf of
54+
* the copyright owner. For the purposes of this definition, "submitted"
55+
* means any form of electronic, verbal, or written communication sent
56+
* to the Licensor or its representatives, including but not limited to
57+
* communication on electronic mailing lists, source code control systems,
58+
* and issue tracking systems that are managed by, or on behalf of, the
59+
* Licensor for the purpose of discussing and improving the Work, but
60+
* excluding communication that is conspicuously marked or otherwise
61+
* designated in writing by the copyright owner as "Not a Contribution."
62+
*
63+
* "Contributor" shall mean Licensor and any individual or Legal Entity
64+
* on behalf of whom a Contribution has been received by Licensor and
65+
* subsequently incorporated within the Work.
66+
*
67+
* 2. Grant of Copyright License. Subject to the terms and conditions of
68+
* this License, each Contributor hereby grants to You a perpetual,
69+
* worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
* copyright license to reproduce, prepare Derivative Works of,
71+
* publicly display, publicly perform, sublicense, and distribute the
72+
* Work and such Derivative Works in Source or Object form.
73+
*
74+
* 3. Grant of Patent License. Subject to the terms and conditions of
75+
* this License, each Contributor hereby grants to You a perpetual,
76+
* worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
* (except as stated in this section) patent license to make, have made,
78+
* use, offer to sell, sell, import, and otherwise transfer the Work,
79+
* where such license applies only to those patent claims licensable
80+
* by such Contributor that are necessarily infringed by their
81+
* Contribution(s) alone or by combination of their Contribution(s)
82+
* with the Work to which such Contribution(s) was submitted. If You
83+
* institute patent litigation against any entity (including a
84+
* cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
* or a Contribution incorporated within the Work constitutes direct
86+
* or contributory patent infringement, then any patent licenses
87+
* granted to You under this License for that Work shall terminate
88+
* as of the date such litigation is filed.
89+
*
90+
* 4. Redistribution. You may reproduce and distribute copies of the
91+
* Work or Derivative Works thereof in any medium, with or without
92+
* modifications, and in Source or Object form, provided that You
93+
* meet the following conditions:
94+
*
95+
* (a) You must give any other recipients of the Work or
96+
* Derivative Works a copy of this License; and
97+
*
98+
* (b) You must cause any modified files to carry prominent notices
99+
* stating that You changed the files; and
100+
*
101+
* (c) You must retain, in the Source form of any Derivative Works
102+
* that You distribute, all copyright, patent, trademark, and
103+
* attribution notices from the Source form of the Work,
104+
* excluding those notices that do not pertain to any part of
105+
* the Derivative Works; and
106+
*
107+
* (d) If the Work includes a "NOTICE" text file as part of its
108+
* distribution, then any Derivative Works that You distribute must
109+
* include a readable copy of the attribution notices contained
110+
* within such NOTICE file, excluding those notices that do not
111+
* pertain to any part of the Derivative Works, in at least one
112+
* of the following places: within a NOTICE text file distributed
113+
* as part of the Derivative Works; within the Source form or
114+
* documentation, if provided along with the Derivative Works; or,
115+
* within a display generated by the Derivative Works, if and
116+
* wherever such third-party notices normally appear. The contents
117+
* of the NOTICE file are for informational purposes only and
118+
* do not modify the License. You may add Your own attribution
119+
* notices within Derivative Works that You distribute, alongside
120+
* or as an addendum to the NOTICE text from the Work, provided
121+
* that such additional attribution notices cannot be construed
122+
* as modifying the License.
123+
*
124+
* You may add Your own copyright statement to Your modifications and
125+
* may provide additional or different license terms and conditions
126+
* for use, reproduction, or distribution of Your modifications, or
127+
* for any such Derivative Works as a whole, provided Your use,
128+
* reproduction, and distribution of the Work otherwise complies with
129+
* the conditions stated in this License.
130+
*
131+
* 5. Submission of Contributions. Unless You explicitly state otherwise,
132+
* any Contribution intentionally submitted for inclusion in the Work
133+
* by You to the Licensor shall be under the terms and conditions of
134+
* this License, without any additional terms or conditions.
135+
* Notwithstanding the above, nothing herein shall supersede or modify
136+
* the terms of any separate license agreement you may have executed
137+
* with Licensor regarding such Contributions.
138+
*
139+
* 6. Trademarks. This License does not grant permission to use the trade
140+
* names, trademarks, service marks, or product names of the Licensor,
141+
* except as required for reasonable and customary use in describing the
142+
* origin of the Work and reproducing the content of the NOTICE file.
143+
*
144+
* 7. Disclaimer of Warranty. Unless required by applicable law or
145+
* agreed to in writing, Licensor provides the Work (and each
146+
* Contributor provides its Contributions) on an "AS IS" BASIS,
147+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
* implied, including, without limitation, any warranties or conditions
149+
* of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
* PARTICULAR PURPOSE. You are solely responsible for determining the
151+
* appropriateness of using or redistributing the Work and assume any
152+
* risks associated with Your exercise of permissions under this License.
153+
*
154+
* 8. Limitation of Liability. In no event and under no legal theory,
155+
* whether in tort (including negligence), contract, or otherwise,
156+
* unless required by applicable law (such as deliberate and grossly
157+
* negligent acts) or agreed to in writing, shall any Contributor be
158+
* liable to You for damages, including any direct, indirect, special,
159+
* incidental, or consequential damages of any character arising as a
160+
* result of this License or out of the use or inability to use the
161+
* Work (including but not limited to damages for loss of goodwill,
162+
* work stoppage, computer failure or malfunction, or any and all
163+
* other commercial damages or losses), even if such Contributor
164+
* has been advised of the possibility of such damages.
165+
*
166+
* 9. Accepting Warranty or Additional Liability. While redistributing
167+
* the Work or Derivative Works thereof, You may choose to offer,
168+
* and charge a fee for, acceptance of support, warranty, indemnity,
169+
* or other liability obligations and/or rights consistent with this
170+
* License. However, in accepting such obligations, You may act only
171+
* on Your own behalf and on Your sole responsibility, not on behalf
172+
* of any other Contributor, and only if You agree to indemnify,
173+
* defend, and hold each Contributor harmless for any liability
174+
* incurred by, or claims asserted against, such Contributor by reason
175+
* of your accepting any such warranty or additional liability.
176+
*
177+
* END OF TERMS AND CONDITIONS
178+
*
179+
* APPENDIX: How to apply the Apache License to your work.
180+
*
181+
* To apply the Apache License to your work, attach the following
182+
* boilerplate notice, with the fields enclosed by brackets "{}"
183+
* replaced with your own identifying information. (Don't include
184+
* the brackets!) The text should be enclosed in the appropriate
185+
* comment syntax for the file format. We also recommend that a
186+
* file or class name and description of purpose be included on the
187+
* same "printed page" as the copyright notice for easier
188+
* identification within third-party archives.
189+
*
190+
* Copyright 2014 Edgar Espina
191+
*
192+
* Licensed under the Apache License, Version 2.0 (the "License");
193+
* you may not use this file except in compliance with the License.
194+
* You may obtain a copy of the License at
195+
*
196+
* http://www.apache.org/licenses/LICENSE-2.0
197+
*
198+
* Unless required by applicable law or agreed to in writing, software
199+
* distributed under the License is distributed on an "AS IS" BASIS,
200+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
* See the License for the specific language governing permissions and
202+
* limitations under the License.
203+
*/
204+
package org.jooby.internal;
205+
206+
import java.util.Optional;
207+
import java.util.function.Predicate;
208+
209+
public class SourceProvider {
210+
private static final Predicate<String> JOOBY_PKG = pkg("org.jooby");
211+
private static final Predicate<String> JAVALANG_PKG = pkg("javaslang");
212+
private static final Predicate<String> GOOGLE_PKG = pkg("com.google");
213+
private static final Predicate<String> SUN_PKG = pkg("sun.").or(pkg("com.sun"));
214+
private static final Predicate<String> JAVA_PKG = pkg("java.");
215+
private static final Predicate<String> SKIP = JOOBY_PKG.or(GOOGLE_PKG).or(JAVALANG_PKG)
216+
.or(SUN_PKG).or(JAVA_PKG);
217+
218+
public static final SourceProvider INSTANCE = new SourceProvider(SKIP);
219+
220+
private final Predicate<String> skip;
221+
222+
private SourceProvider(Predicate<String> skip) {
223+
this.skip = skip;
224+
}
225+
226+
public Optional<StackTraceElement> get() {
227+
return get(new Throwable().getStackTrace());
228+
}
229+
230+
public Optional<StackTraceElement> get(StackTraceElement[] elements) {
231+
for (StackTraceElement element : elements) {
232+
String className = element.getClassName();
233+
234+
if (!skip.test(className)) {
235+
int innerStart = className.indexOf('$');
236+
if (innerStart > 0) {
237+
return Optional.of(new StackTraceElement(className.substring(0, innerStart),
238+
element.getMethodName(), element.getFileName(), element.getLineNumber()));
239+
}
240+
return Optional.of(element);
241+
}
242+
}
243+
return Optional.empty();
244+
}
245+
246+
private static Predicate<String> pkg(String pkg) {
247+
return classname -> classname.startsWith(pkg);
248+
}
249+
}

0 commit comments

Comments
 (0)