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

Commit 4f54865

Browse files
jknackjknack
committed
Move Server to internal package and remove SetHeader
1 parent 14507d0 commit 4f54865

10 files changed

Lines changed: 20 additions & 73 deletions

File tree

‎jooby-core/src/main/java/jooby/Jooby.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import jooby.Route.Err;
2323
import jooby.internal.AssetRoute;
2424
import jooby.internal.FallbackBodyConverter;
25+
import jooby.internal.Server;
2526
import jooby.internal.TypeConverters;
2627
import jooby.internal.jetty.Jetty;
2728
import jooby.internal.mvc.Routes;

‎jooby-core/src/main/java/jooby/Response.java‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
* @since 0.1.0
2828
*/
2929
@Beta
30-
public interface Response extends SetHeader {
30+
public interface Response {
3131

32-
class Body implements SetHeader {
32+
class Body {
3333

3434
private Map<String, String> headers = new LinkedHashMap<>();
3535

@@ -99,55 +99,46 @@ public Optional<Object> content() {
9999
return Optional.ofNullable(content);
100100
}
101101

102-
@Override
103102
public Body header(final String name, final char value) {
104103
setHeader.header(name, value);
105104
return this;
106105
}
107106

108-
@Override
109107
public Body header(final String name, final byte value) {
110108
setHeader.header(name, value);
111109
return this;
112110
}
113111

114-
@Override
115112
public Body header(final String name, final short value) {
116113
setHeader.header(name, value);
117114
return this;
118115
}
119116

120-
@Override
121117
public Body header(final String name, final int value) {
122118
setHeader.header(name, value);
123119
return this;
124120
}
125121

126-
@Override
127122
public Body header(final String name, final long value) {
128123
setHeader.header(name, value);
129124
return this;
130125
}
131126

132-
@Override
133127
public Body header(final String name, final float value) {
134128
setHeader.header(name, value);
135129
return this;
136130
}
137131

138-
@Override
139132
public Body header(final String name, final double value) {
140133
setHeader.header(name, value);
141134
return this;
142135
}
143136

144-
@Override
145137
public Body header(final String name, final CharSequence value) {
146138
setHeader.header(name, value);
147139
return this;
148140
}
149141

150-
@Override
151142
public Body header(final String name, final Date value) {
152143
setHeader.header(name, value);
153144
return this;
@@ -823,31 +814,22 @@ default Response cookie(final String name, final String value) {
823814
@Nonnull
824815
Variant header(@Nonnull String name);
825816

826-
@Override
827817
Response header(@Nonnull String name, char value);
828818

829-
@Override
830819
Response header(@Nonnull String name, byte value);
831820

832-
@Override
833821
Response header(@Nonnull String name, short value);
834822

835-
@Override
836823
Response header(@Nonnull String name, int value);
837824

838-
@Override
839825
Response header(@Nonnull String name, long value);
840826

841-
@Override
842827
Response header(@Nonnull String name, float value);
843828

844-
@Override
845829
Response header(@Nonnull String name, double value);
846830

847-
@Override
848831
Response header(@Nonnull String name, CharSequence value);
849832

850-
@Override
851833
Response header(@Nonnull String name, Date value);
852834

853835
/**

‎jooby-core/src/main/java/jooby/SetHeader.java‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

jooby-core/src/main/java/jooby/Server.java renamed to jooby-core/src/main/java/jooby/internal/Server.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package jooby;
1+
package jooby.internal;
22

33
import com.google.common.annotations.Beta;
44

‎jooby-core/src/main/java/jooby/internal/SetHeaderImpl.java‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,68 +9,59 @@
99
import java.util.Date;
1010
import java.util.function.BiConsumer;
1111

12-
import jooby.SetHeader;
13-
14-
public class SetHeaderImpl implements SetHeader {
12+
public class SetHeaderImpl {
1513

1614
private BiConsumer<String, String> header;
1715

1816
public SetHeaderImpl(final BiConsumer<String, String> header) {
1917
this.header = requireNonNull(header, "A header fn is required.");
2018
}
2119

22-
@Override
23-
public SetHeader header(final String name, final byte value) {
20+
public SetHeaderImpl header(final String name, final byte value) {
2421
requireNonNull(name, "A header's name is required.");
2522

2623
header.accept(name, Byte.toString(value));
2724
return this;
2825
}
2926

30-
@Override
31-
public SetHeader header(final String name, final char value) {
27+
public SetHeaderImpl header(final String name, final char value) {
3228
requireNonNull(name, "A header's name is required.");
3329

3430
header.accept(name, Character.toString(value));
3531
return this;
3632
}
3733

38-
@Override
39-
public SetHeader header(final String name, final double value) {
34+
public SetHeaderImpl header(final String name, final double value) {
4035
requireNonNull(name, "A header's name is required.");
4136

4237
// TODO: Decimal Formatter?
4338
header.accept(name, Double.toString(value));
4439
return this;
4540
}
4641

47-
@Override
48-
public SetHeader header(final String name, final float value) {
42+
public SetHeaderImpl header(final String name, final float value) {
4943
requireNonNull(name, "A header's name is required.");
5044

5145
// TODO: Decimal Formatter?
5246
header.accept(name, Float.toString(value));
5347
return this;
5448
}
5549

56-
@Override
57-
public SetHeader header(final String name, final int value) {
50+
public SetHeaderImpl header(final String name, final int value) {
5851
requireNonNull(name, "A header's name is required.");
5952

6053
header.accept(name, Integer.toString(value));
6154
return this;
6255
}
6356

64-
@Override
65-
public SetHeader header(final String name, final long value) {
57+
public SetHeaderImpl header(final String name, final long value) {
6658
requireNonNull(name, "A header's name is required.");
6759

6860
header.accept(name, Long.toString(value));
6961
return this;
7062
}
7163

72-
@Override
73-
public SetHeader header(final String name, final Date value) {
64+
public SetHeaderImpl header(final String name, final Date value) {
7465
requireNonNull(name, "A header's name is required.");
7566
requireNonNull(value, "A date value is required.");
7667

@@ -82,16 +73,14 @@ public SetHeader header(final String name, final Date value) {
8273
return this;
8374
}
8475

85-
@Override
86-
public SetHeader header(final String name, final short value) {
76+
public SetHeaderImpl header(final String name, final short value) {
8777
requireNonNull(name, "A header's name is required.");
8878

8979
header.accept(name, Short.toString(value));
9080
return this;
9181
}
9282

93-
@Override
94-
public SetHeader header(final String name, final CharSequence value) {
83+
public SetHeaderImpl header(final String name, final CharSequence value) {
9584
requireNonNull(name, "A header's name is required.");
9685
requireNonNull(value, "A header's value is required.");
9786

‎jooby-core/src/main/java/jooby/internal/jetty/Jetty.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207

208208
import jooby.Jooby;
209209
import jooby.Mode;
210-
import jooby.Server;
210+
import jooby.internal.Server;
211211

212212
import com.google.inject.Binder;
213213
import com.google.inject.multibindings.OptionalBinder;

‎jooby-core/src/main/java/jooby/internal/jetty/JettyServer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211

212212
import com.typesafe.config.Config;
213213

214-
public class JettyServer implements jooby.Server {
214+
public class JettyServer implements jooby.internal.Server {
215215

216216
private Server server;
217217

‎jooby-core/src/main/java/jooby/internal/jetty/JettyServerBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
public class JettyServerBuilder {
4646

4747
/** The logging system. */
48-
private static final Logger log = LoggerFactory.getLogger(jooby.Server.class);
48+
private static final Logger log = LoggerFactory.getLogger(jooby.internal.Server.class);
4949
protected static final String WebSocketImpl = null;
5050

5151
public static Server build(final Config config, final RouteHandler routeHandler)

‎jooby-tests/src/main/java/jooby/JoobyRunner.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
import javax.inject.Singleton;
1010

11+
import jooby.internal.Server;
12+
1113
import org.junit.runners.BlockJUnit4ClassRunner;
1214
import org.junit.runners.model.InitializationError;
1315
import org.junit.runners.model.MultipleFailureException;

‎jooby-tests/src/main/java/jooby/NoJoinServer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212

213213
import com.typesafe.config.Config;
214214

215-
public class NoJoinServer implements jooby.Server {
215+
public class NoJoinServer implements jooby.internal.Server {
216216

217217
private Server server;
218218

0 commit comments

Comments
 (0)