File tree Expand file tree Collapse file tree 4 files changed +12
-40
lines changed
http-client/src/main/java/io/avaje/http/client
http-generator-client/src/main/java/io/avaje/http/generator/client Expand file tree Collapse file tree 4 files changed +12
-40
lines changed Original file line number Diff line number Diff line change @@ -143,12 +143,12 @@ private BodyAdapter defaultBodyAdapter() {
143143 .orElseGet (() -> {
144144 try {
145145 return new JsonbBodyAdapter ();
146- } catch (NoClassDefFoundError e ) {
146+ } catch (Throwable e ) {
147147 // I guess it don't exist
148148 }
149149 try {
150150 return new JacksonBodyAdapter ();
151- } catch (NoClassDefFoundError e ) {
151+ } catch (Throwable e ) {
152152 return bodyAdapter ;
153153 }
154154 });
Original file line number Diff line number Diff line change @@ -28,14 +28,14 @@ String fullName() {
2828 String topPackage = TopPackage .of (generatedClients );
2929
3030 var defaultPackage =
31- !topPackage .contains ("." )
32- && APContext .getProjectModuleElement ().isUnnamed ()
33- && APContext .elements ().getPackageElement (topPackage ) == null ;
34-
31+ !topPackage .contains ("." )
32+ && APContext .getProjectModuleElement ().isUnnamed ()
33+ && APContext .elements ().getPackageElement (topPackage ) == null ;
34+
3535 fullName =
36- defaultPackage
37- ? name ( topPackage ) + "HttpComponent "
38- : topPackage + "." + name (topPackage ) + "HttpComponent" ;
36+ defaultPackage
37+ ? "DefaultHttpComponent "
38+ : topPackage + "." + name (topPackage ) + "HttpComponent" ;
3939 }
4040 return fullName ;
4141 }
Original file line number Diff line number Diff line change 11package io .avaje .http .generator .client ;
22
3- import static io .avaje .http .generator .core .ProcessingContext .createMetaInfWriter ;
43import static io .avaje .http .generator .core .ProcessingContext .createWriter ;
54
65import java .io .IOException ;
76import java .util .List ;
87import java .util .Set ;
98import java .util .TreeSet ;
109
11- import javax .tools .FileObject ;
1210import javax .tools .JavaFileObject ;
1311
1412import io .avaje .http .generator .core .Append ;
15- import io .avaje .http .generator .core .Constants ;
1613import io .avaje .http .generator .core .Util ;
1714
1815final class SimpleComponentWriter {
@@ -98,7 +95,8 @@ private void writeImports() {
9895 }
9996
10097 private void writePackage () {
101- final String packageName = TopPackage .packageOf (fullName );
98+ final String packageName =
99+ "DefaultHttpComponent" .equals (fullName ) ? "" : ProcessorUtils .packageOf (fullName );
102100 if (!packageName .isEmpty ()) {
103101 writer .append ("package %s;" , packageName ).eol ().eol ();
104102 }
Original file line number Diff line number Diff line change @@ -16,33 +16,7 @@ private String value() {
1616
1717 private TopPackage (Collection <String > values ) {
1818 for (final String pkg : values ) {
19- topPackage = commonParent (topPackage , pkg );
19+ topPackage = ProcessorUtils . commonParent (topPackage , pkg );
2020 }
2121 }
22-
23- /** Return the common parent package. */
24- static String commonParent (String currentTop , String aPackage ) {
25- if (aPackage == null ) return currentTop ;
26- if (currentTop == null ) return packageOf (aPackage );
27- if (aPackage .startsWith (currentTop )) {
28- return currentTop ;
29- }
30- int next ;
31- do {
32- next = currentTop .lastIndexOf ('.' );
33- if (next > -1 ) {
34- currentTop = currentTop .substring (0 , next );
35- if (aPackage .startsWith (currentTop )) {
36- return currentTop ;
37- }
38- }
39- } while (next > -1 );
40-
41- return currentTop ;
42- }
43-
44- static String packageOf (String cls ) {
45- final int pos = cls .lastIndexOf ('.' );
46- return (pos == -1 ) ? "" : cls .substring (0 , pos );
47- }
4822}
You can’t perform that action at this time.
0 commit comments