Skip to content

Commit 7e7f01a

Browse files
committed
Move classes/resources into non-exported package
This moves implementation classes into a non-exported package in order to prepare for binary compatibility analysis.
1 parent abf33e0 commit 7e7f01a

22 files changed

+46
-52
lines changed

net.adoptopenjdk.v3.tests/src/test/java/net/adoptopenjdk/v3/tests/AOV3ClientsTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,17 @@
1919
import net.adoptopenjdk.v3.api.AOV3ExceptionHTTPRequestFailed;
2020
import net.adoptopenjdk.v3.api.AOV3ReleaseKind;
2121
import net.adoptopenjdk.v3.vanilla.AOV3Clients;
22-
import net.adoptopenjdk.v3.vanilla.AOV3Messages;
23-
import net.adoptopenjdk.v3.vanilla.AOV3MessagesType;
24-
import net.adoptopenjdk.v3.vanilla.AOV3ResponseParserType;
25-
import net.adoptopenjdk.v3.vanilla.AOV3ResponseParsersType;
22+
import net.adoptopenjdk.v3.vanilla.internal.AOV3Messages;
23+
import net.adoptopenjdk.v3.vanilla.internal.AOV3MessagesType;
24+
import net.adoptopenjdk.v3.vanilla.internal.AOV3ResponseParserType;
25+
import net.adoptopenjdk.v3.vanilla.internal.AOV3ResponseParsersType;
2626
import org.junit.jupiter.api.Assertions;
2727
import org.junit.jupiter.api.BeforeEach;
2828
import org.junit.jupiter.api.Test;
2929
import org.mockito.Mockito;
3030
import org.slf4j.Logger;
3131
import org.slf4j.LoggerFactory;
3232

33-
import java.io.IOException;
3433
import java.math.BigInteger;
3534
import java.net.URI;
3635
import java.net.http.HttpClient;

net.adoptopenjdk.v3.tests/src/test/java/net/adoptopenjdk/v3/tests/AOV3ResponseParsersTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import net.adoptopenjdk.v3.api.AOV3Error;
1818
import net.adoptopenjdk.v3.api.AOV3ExceptionParseFailed;
1919
import net.adoptopenjdk.v3.api.AOV3Installer;
20-
import net.adoptopenjdk.v3.vanilla.AOV3ResponseParsers;
21-
import net.adoptopenjdk.v3.vanilla.AOV3ResponseParsersType;
20+
import net.adoptopenjdk.v3.vanilla.internal.AOV3ResponseParsers;
21+
import net.adoptopenjdk.v3.vanilla.internal.AOV3ResponseParsersType;
2222
import org.apache.commons.io.input.BrokenInputStream;
2323
import org.junit.jupiter.api.Assertions;
2424
import org.junit.jupiter.api.BeforeEach;

net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/AOV3Clients.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616

1717
import net.adoptopenjdk.v3.api.AOV3ClientProviderType;
1818
import net.adoptopenjdk.v3.api.AOV3ClientType;
19+
import net.adoptopenjdk.v3.vanilla.internal.AOV3Client;
20+
import net.adoptopenjdk.v3.vanilla.internal.AOV3Messages;
21+
import net.adoptopenjdk.v3.vanilla.internal.AOV3MessagesType;
22+
import net.adoptopenjdk.v3.vanilla.internal.AOV3ResponseParsers;
23+
import net.adoptopenjdk.v3.vanilla.internal.AOV3ResponseParsersType;
1924
import org.osgi.service.component.annotations.Component;
2025

2126
import java.net.http.HttpClient;

net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/AOV3AST.java renamed to net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/internal/AOV3AST.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* limitations under the License.
1313
*/
1414

15-
package net.adoptopenjdk.v3.vanilla;
15+
package net.adoptopenjdk.v3.vanilla.internal;
1616

1717
import com.fasterxml.jackson.annotation.JsonProperty;
1818
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/AOV3Client.java renamed to net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/internal/AOV3Client.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* limitations under the License.
1313
*/
1414

15-
package net.adoptopenjdk.v3.vanilla;
15+
package net.adoptopenjdk.v3.vanilla.internal;
1616

1717
import net.adoptopenjdk.v3.api.AOV3Architecture;
1818
import net.adoptopenjdk.v3.api.AOV3ClientType;
@@ -51,15 +51,15 @@
5151
import java.util.function.Consumer;
5252
import java.util.zip.GZIPInputStream;
5353

54-
final class AOV3Client implements AOV3ClientType, AOV3ClientInternalType
54+
public final class AOV3Client implements AOV3ClientType, AOV3ClientInternalType
5555
{
5656
private static final Logger LOG = LoggerFactory.getLogger(AOV3Client.class);
5757
private final String baseURI;
5858
private final HttpClient client;
5959
private final AOV3ResponseParsersType parsers;
6060
private final AOV3MessagesType messages;
6161

62-
AOV3Client(
62+
public AOV3Client(
6363
final String inBaseURI,
6464
final HttpClient inClient,
6565
final AOV3MessagesType inMessages,

net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/AOV3ClientInternalType.java renamed to net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/internal/AOV3ClientInternalType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* limitations under the License.
1313
*/
1414

15-
package net.adoptopenjdk.v3.vanilla;
15+
package net.adoptopenjdk.v3.vanilla.internal;
1616

1717
import net.adoptopenjdk.v3.api.AOV3Error;
1818
import net.adoptopenjdk.v3.api.AOV3Exception;

net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/AOV3Deserializers.java renamed to net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/internal/AOV3Deserializers.java

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1515
*/
1616

17-
package net.adoptopenjdk.v3.vanilla;
17+
package net.adoptopenjdk.v3.vanilla.internal;
1818

19-
import com.fasterxml.jackson.core.JsonParseException;
2019
import com.fasterxml.jackson.databind.BeanDescription;
2120
import com.fasterxml.jackson.databind.DeserializationConfig;
2221
import com.fasterxml.jackson.databind.JavaType;
@@ -65,20 +64,20 @@ private static Set<String> classWhitelist()
6564
"java.net.URI",
6665
"java.util.List<java.lang.String>",
6766
"java.util.List<java.math.BigInteger>",
68-
"java.util.List<net.adoptopenjdk.v3.vanilla.AOV3AST$AOV3BinaryJSON>",
69-
"java.util.List<net.adoptopenjdk.v3.vanilla.AOV3AST$AOV3ListBinaryAssetViewJSON>",
70-
"java.util.List<net.adoptopenjdk.v3.vanilla.AOV3AST$AOV3ReleaseJSON>",
71-
"java.util.List<net.adoptopenjdk.v3.vanilla.AOV3AST$AOV3ReleaseVersionJSON>",
72-
"net.adoptopenjdk.v3.vanilla.AOV3AST.AOV3AvailableReleasesJSON",
73-
"net.adoptopenjdk.v3.vanilla.AOV3AST.AOV3BinaryJSON",
74-
"net.adoptopenjdk.v3.vanilla.AOV3AST.AOV3InstallerJSON",
75-
"net.adoptopenjdk.v3.vanilla.AOV3AST.AOV3ListBinaryAssetViewJSON",
76-
"net.adoptopenjdk.v3.vanilla.AOV3AST.AOV3PackageJSON",
77-
"net.adoptopenjdk.v3.vanilla.AOV3AST.AOV3ReleaseJSON",
78-
"net.adoptopenjdk.v3.vanilla.AOV3AST.AOV3ReleaseNamesJSON",
79-
"net.adoptopenjdk.v3.vanilla.AOV3AST.AOV3ReleaseVersionJSON",
80-
"net.adoptopenjdk.v3.vanilla.AOV3AST.AOV3ReleaseVersionsJSON",
81-
"net.adoptopenjdk.v3.vanilla.AOV3AST.AOV3SourceJSON"
67+
"java.util.List<net.adoptopenjdk.v3.vanilla.internal.AOV3AST$AOV3BinaryJSON>",
68+
"java.util.List<net.adoptopenjdk.v3.vanilla.internal.AOV3AST$AOV3ListBinaryAssetViewJSON>",
69+
"java.util.List<net.adoptopenjdk.v3.vanilla.internal.AOV3AST$AOV3ReleaseJSON>",
70+
"java.util.List<net.adoptopenjdk.v3.vanilla.internal.AOV3AST$AOV3ReleaseVersionJSON>",
71+
"net.adoptopenjdk.v3.vanilla.internal.AOV3AST.AOV3AvailableReleasesJSON",
72+
"net.adoptopenjdk.v3.vanilla.internal.AOV3AST.AOV3BinaryJSON",
73+
"net.adoptopenjdk.v3.vanilla.internal.AOV3AST.AOV3InstallerJSON",
74+
"net.adoptopenjdk.v3.vanilla.internal.AOV3AST.AOV3ListBinaryAssetViewJSON",
75+
"net.adoptopenjdk.v3.vanilla.internal.AOV3AST.AOV3PackageJSON",
76+
"net.adoptopenjdk.v3.vanilla.internal.AOV3AST.AOV3ReleaseJSON",
77+
"net.adoptopenjdk.v3.vanilla.internal.AOV3AST.AOV3ReleaseNamesJSON",
78+
"net.adoptopenjdk.v3.vanilla.internal.AOV3AST.AOV3ReleaseVersionJSON",
79+
"net.adoptopenjdk.v3.vanilla.internal.AOV3AST.AOV3ReleaseVersionsJSON",
80+
"net.adoptopenjdk.v3.vanilla.internal.AOV3AST.AOV3SourceJSON"
8281
);
8382
}
8483

net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/AOV3Messages.java renamed to net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/internal/AOV3Messages.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* limitations under the License.
1313
*/
1414

15-
package net.adoptopenjdk.v3.vanilla;
15+
package net.adoptopenjdk.v3.vanilla.internal;
1616

1717
import java.net.URI;
1818
import java.net.http.HttpClient;
@@ -42,7 +42,7 @@ public static ResourceBundle getResourceBundle(
4242
final Locale locale)
4343
{
4444
return ResourceBundle.getBundle(
45-
"net.adoptopenjdk.v3.vanilla.Strings",
45+
"net.adoptopenjdk.v3.vanilla.internal.Strings",
4646
locale);
4747
}
4848

net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/AOV3MessagesType.java renamed to net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/internal/AOV3MessagesType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* limitations under the License.
1313
*/
1414

15-
package net.adoptopenjdk.v3.vanilla;
15+
package net.adoptopenjdk.v3.vanilla.internal;
1616

1717
import java.net.URI;
1818
import java.net.http.HttpClient;

net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/AOV3ObjectMappers.java renamed to net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/internal/AOV3ObjectMappers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* limitations under the License.
1313
*/
1414

15-
package net.adoptopenjdk.v3.vanilla;
15+
package net.adoptopenjdk.v3.vanilla.internal;
1616

1717
import com.fasterxml.jackson.databind.DeserializationFeature;
1818
import com.fasterxml.jackson.databind.ObjectMapper;

0 commit comments

Comments
 (0)