-
-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Makes servers publics, adds imports in apiconfiguration * Adds Servers files * Adds java comment * Adds classes to store servers for each jsonPath including root servers * ServerInfo classes updated * Samples regen
- Loading branch information
Showing
50 changed files
with
1,016 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
.../3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/RootServerInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package org.openapijsonschematools.client; | ||
|
|
||
| import org.openapijsonschematools.client.exceptions.UnsetPropertyException; | ||
| import org.openapijsonschematools.client.servers.Server0; | ||
| import org.openapijsonschematools.client.servers.Server; | ||
| import org.openapijsonschematools.client.servers.ServerProvider; | ||
| import org.checkerframework.checker.nullness.qual.Nullable; | ||
|
|
||
| import java.util.AbstractMap; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import java.util.EnumMap; | ||
|
|
||
| public class RootServerInfo implements ServerProvider<RootServerInfo.ServerIndex> { | ||
| final private Servers servers; | ||
| final private ServerIndex serverIndex; | ||
|
|
||
| public RootServerInfo() { | ||
| this.servers = new Servers(); | ||
| this.serverIndex = ServerIndex.SERVER_0; | ||
| } | ||
|
|
||
| public RootServerInfo(Servers servers, ServerIndex serverIndex) { | ||
| this.servers = servers; | ||
| this.serverIndex = serverIndex; | ||
| } | ||
|
|
||
| public static class Servers { | ||
| private final EnumMap<ServerIndex, Server> servers; | ||
|
|
||
| public Servers() { | ||
| servers = new EnumMap<>( | ||
| Map.ofEntries( | ||
| new AbstractMap.SimpleEntry<>( | ||
| ServerIndex.SERVER_0, | ||
| new Server0() | ||
| ) | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| public Servers( | ||
| @Nullable Server0 server0 | ||
| ) { | ||
| servers = new EnumMap<>( | ||
| Map.ofEntries( | ||
| new AbstractMap.SimpleEntry<>( | ||
| ServerIndex.SERVER_0, | ||
| Objects.requireNonNullElseGet(server0, Server0::new) | ||
| ) | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| public Server get(ServerIndex serverIndex) { | ||
| if (servers.containsKey(serverIndex)) { | ||
| return get(serverIndex); | ||
| } | ||
| throw new UnsetPropertyException(serverIndex+" is unset"); | ||
| } | ||
| } | ||
|
|
||
| public enum ServerIndex { | ||
| SERVER_0 | ||
| } | ||
|
|
||
| public Server getServer(@Nullable ServerIndex serverIndex) { | ||
| if (serverIndex == null) { | ||
| return servers.get(this.serverIndex); | ||
| } | ||
| return servers.get(serverIndex); | ||
| } | ||
| } |
37 changes: 37 additions & 0 deletions
37
...java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package org.openapijsonschematools.client.configurations; | ||
|
|
||
| import org.openapijsonschematools.client.servers.Server; | ||
| import org.openapijsonschematools.client.RootServerInfo; | ||
| import org.checkerframework.checker.nullness.qual.Nullable; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| public class ApiConfiguration { | ||
| private final ServerInfo serverInfo; | ||
|
|
||
| public ApiConfiguration() { | ||
| serverInfo = new ServerInfo(); | ||
| } | ||
|
|
||
| public ApiConfiguration(ServerInfo serverInfo) { | ||
| this.serverInfo = serverInfo; | ||
| } | ||
|
|
||
| public static class ServerInfo { | ||
| protected final RootServerInfo rootServerInfo; | ||
|
|
||
| public ServerInfo() { | ||
| rootServerInfo = new RootServerInfo(); | ||
| } | ||
|
|
||
| public ServerInfo( | ||
| @Nullable RootServerInfo rootServerInfo | ||
| ) { | ||
| this.rootServerInfo = Objects.requireNonNullElseGet(rootServerInfo, RootServerInfo::new); | ||
| } | ||
| } | ||
|
|
||
| public Server getServer(RootServerInfo. @Nullable ServerIndex serverIndex) { | ||
| return serverInfo.rootServerInfo.getServer(serverIndex); | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
.../3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/servers/Server.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package org.openapijsonschematools.client.servers; | ||
|
|
||
| public interface Server { | ||
| String url(); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
...nit_test/java/src/main/java/org/openapijsonschematools/client/servers/ServerProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package org.openapijsonschematools.client.servers; | ||
|
|
||
| import org.checkerframework.checker.nullness.qual.Nullable; | ||
|
|
||
| public interface ServerProvider<T> { | ||
| Server getServer(@Nullable T serverIndex); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 5 additions & 1 deletion
6
.../java/src/main/java/org/openapijsonschematools/client/servers/ServerWithoutVariables.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,14 @@ | ||
| package org.openapijsonschematools.client.servers; | ||
|
|
||
| public abstract class ServerWithoutVariables { | ||
| public abstract class ServerWithoutVariables implements Server { | ||
| public final String url; | ||
|
|
||
| protected ServerWithoutVariables(String url) { | ||
| this.url = url; | ||
| } | ||
|
|
||
| public String url(){ | ||
| return url; | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
.../3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/RootServerInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package org.openapijsonschematools.client; | ||
|
|
||
| import org.openapijsonschematools.client.exceptions.UnsetPropertyException; | ||
| import org.openapijsonschematools.client.servers.Server0; | ||
| import org.openapijsonschematools.client.servers.Server; | ||
| import org.openapijsonschematools.client.servers.ServerProvider; | ||
| import org.checkerframework.checker.nullness.qual.Nullable; | ||
|
|
||
| import java.util.AbstractMap; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import java.util.EnumMap; | ||
|
|
||
| public class RootServerInfo implements ServerProvider<RootServerInfo.ServerIndex> { | ||
| final private Servers servers; | ||
| final private ServerIndex serverIndex; | ||
|
|
||
| public RootServerInfo() { | ||
| this.servers = new Servers(); | ||
| this.serverIndex = ServerIndex.SERVER_0; | ||
| } | ||
|
|
||
| public RootServerInfo(Servers servers, ServerIndex serverIndex) { | ||
| this.servers = servers; | ||
| this.serverIndex = serverIndex; | ||
| } | ||
|
|
||
| public static class Servers { | ||
| private final EnumMap<ServerIndex, Server> servers; | ||
|
|
||
| public Servers() { | ||
| servers = new EnumMap<>( | ||
| Map.ofEntries( | ||
| new AbstractMap.SimpleEntry<>( | ||
| ServerIndex.SERVER_0, | ||
| new Server0() | ||
| ) | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| public Servers( | ||
| @Nullable Server0 server0 | ||
| ) { | ||
| servers = new EnumMap<>( | ||
| Map.ofEntries( | ||
| new AbstractMap.SimpleEntry<>( | ||
| ServerIndex.SERVER_0, | ||
| Objects.requireNonNullElseGet(server0, Server0::new) | ||
| ) | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| public Server get(ServerIndex serverIndex) { | ||
| if (servers.containsKey(serverIndex)) { | ||
| return get(serverIndex); | ||
| } | ||
| throw new UnsetPropertyException(serverIndex+" is unset"); | ||
| } | ||
| } | ||
|
|
||
| public enum ServerIndex { | ||
| SERVER_0 | ||
| } | ||
|
|
||
| public Server getServer(@Nullable ServerIndex serverIndex) { | ||
| if (serverIndex == null) { | ||
| return servers.get(this.serverIndex); | ||
| } | ||
| return servers.get(serverIndex); | ||
| } | ||
| } |
37 changes: 37 additions & 0 deletions
37
...java/src/main/java/org/openapijsonschematools/client/configurations/ApiConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package org.openapijsonschematools.client.configurations; | ||
|
|
||
| import org.openapijsonschematools.client.servers.Server; | ||
| import org.openapijsonschematools.client.RootServerInfo; | ||
| import org.checkerframework.checker.nullness.qual.Nullable; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| public class ApiConfiguration { | ||
| private final ServerInfo serverInfo; | ||
|
|
||
| public ApiConfiguration() { | ||
| serverInfo = new ServerInfo(); | ||
| } | ||
|
|
||
| public ApiConfiguration(ServerInfo serverInfo) { | ||
| this.serverInfo = serverInfo; | ||
| } | ||
|
|
||
| public static class ServerInfo { | ||
| protected final RootServerInfo rootServerInfo; | ||
|
|
||
| public ServerInfo() { | ||
| rootServerInfo = new RootServerInfo(); | ||
| } | ||
|
|
||
| public ServerInfo( | ||
| @Nullable RootServerInfo rootServerInfo | ||
| ) { | ||
| this.rootServerInfo = Objects.requireNonNullElseGet(rootServerInfo, RootServerInfo::new); | ||
| } | ||
| } | ||
|
|
||
| public Server getServer(RootServerInfo. @Nullable ServerIndex serverIndex) { | ||
| return serverInfo.rootServerInfo.getServer(serverIndex); | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
.../3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/servers/Server.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package org.openapijsonschematools.client.servers; | ||
|
|
||
| public interface Server { | ||
| String url(); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
...nit_test/java/src/main/java/org/openapijsonschematools/client/servers/ServerProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package org.openapijsonschematools.client.servers; | ||
|
|
||
| import org.checkerframework.checker.nullness.qual.Nullable; | ||
|
|
||
| public interface ServerProvider<T> { | ||
| Server getServer(@Nullable T serverIndex); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 5 additions & 1 deletion
6
.../java/src/main/java/org/openapijsonschematools/client/servers/ServerWithoutVariables.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,14 @@ | ||
| package org.openapijsonschematools.client.servers; | ||
|
|
||
| public abstract class ServerWithoutVariables { | ||
| public abstract class ServerWithoutVariables implements Server { | ||
| public final String url; | ||
|
|
||
| protected ServerWithoutVariables(String url) { | ||
| this.url = url; | ||
| } | ||
|
|
||
| public String url(){ | ||
| return url; | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.