Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[client] Write clients to the same package #546

Merged
merged 6 commits into from
Jan 16, 2025
Merged

[client] Write clients to the same package #546

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5e24ed
[client] write clients to the same package
SentryMan Jan 15, 2025
2dfdeca
Update DHttpClientRequestTest.java
SentryMan Jan 15, 2025
f7bb02c
handle import
SentryMan Jan 15, 2025
2f962a6
Merge branch 'master' into package
SentryMan Jan 15, 2025
611af39
Update DHttpClientRequestTest.java
SentryMan Jan 15, 2025
95bd3d2
respect visibility choice
SentryMan Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion http-generator-client/src/main/java/io/avaje/http/generator/client/ClientWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import io.avaje.http.generator.core.APContext;
import io.avaje.http.generator.core.BaseControllerWriter;
import io.avaje.http.generator.core.ClientPrism;
import io.avaje.http.generator.core.ControllerReader;
import io.avaje.http.generator.core.MethodReader;

Expand All @@ -11,6 +12,8 @@
import java.util.List;
import java.util.Set;

import javax.lang.model.element.Modifier;

/**
* Write Http client adapter.
*/
Expand All @@ -37,7 +40,11 @@ final class ClientWriter extends BaseControllerWriter {
@Override
protected String initPackageName(String originName) {
// put the generated Http client into a sub-package
return super.initPackageName(originName) + ".httpclient";
final var beanType = reader.beanType();

return !beanType.getModifiers().contains(Modifier.PUBLIC) && ClientPrism.isPresent(beanType)
? super.initPackageName(originName)
: super.initPackageName(originName) + ".httpclient";
}

private void readMethods() {
Expand Down
Loading