Skip to content

Commit 26297d9

Browse files
andytaelandytael
committed
code cleanup and java 17
1 parent 9c7dffc commit 26297d9

File tree

17 files changed

+66
-60
lines changed

17 files changed

+66
-60
lines changed

‎LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Spring Cloud for OCI.
22

3-
Copyright (c) 2023, Oracle and/or its affiliates.
3+
Copyright (c) 2023, 2024, Oracle and/or its affiliates.
44

55
The Universal Permissive License (UPL), Version 1.0
66

‎README.md

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
[![License: UPL](https://img.shields.io/badge/license-UPL-green)](https://img.shields.io/badge/license-UPL-green)
44

55
## Introduction
6-
Spring Cloud for OCI, eases the integration with OCI services with the help of OCI Java SDK internally. It offers a convenient way to interact with OCI-provided services using well-known Spring idioms and APIs, such as the messaging or storage API. Developers can build their applications around the hosted services without having to care about infrastructure or maintenance. Spring Cloud for OCI contains auto-configuration support for OCI-managed services.
6+
7+
Spring Cloud for OCI, eases the integration with OCI services with the help of OCI Java SDK internally. It offers a convenient way to interact with OCI-provided services using well-known Spring idioms and APIs, such as the messaging or storage API. Developers can build their applications around the hosted services without having to care about infrastructure or maintenance. Spring Cloud for OCI contains autoconfiguration support for OCI-managed services.
78

89
All Spring Cloud for OCI artifacts are made available through Maven Central. With Spring Cloud for OCI, the developers only need to add some annotations and a small number of configurations to connect Spring Cloud applications to the OCI services.
910

@@ -15,22 +16,21 @@ For a deep dive into the project, refer to the Spring Cloud OCI documentation:
1516
|------------------------|---------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
1617
| Spring Cloud OCI 1.0.0 | [Reference Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/reference/html/index.html) | [API Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/javadocs/index.html) |
1718

18-
1919
## Compatibility with Spring Project Versions
2020

2121
This project has dependency and transitive dependencies on Spring Projects. The table below outlines the versions of Spring Cloud, Spring Boot and Spring Framework versions that are compatible with certain Spring Cloud OCI version.
2222

23-
| Spring Cloud OCI | Spring Cloud | Spring Boot | OCI Java SDK |
24-
|-------------------|---------------------------|---------------------|--------------|
25-
| 1.0.0 | 2022.0.x | 3.1.x, 3.0.x | 3.24.0 |
26-
23+
| Spring Cloud OCI | Spring Cloud | Spring Boot | OCI Java SDK |
24+
|------------------|--------------------|---------------------|--------------|
25+
| 1.0.0 | 2022.0.x, 2023.0.x | 3.2.x, 3.1.x, 3.0.x | 3.41.1 |
2726

2827
## Try out samples
29-
You may checkout samples for the each service supported by Spring Cloud OCI below.
3028

31-
* [OCI Storage Sample](./spring-cloud-oci-samples/spring-cloud-oci-storage-sample/)
32-
* [OCI Notification Service Sample](./spring-cloud-oci-samples/spring-cloud-oci-notification-sample/)
33-
* [OCI Logging Service Sample](./spring-cloud-oci-samples/spring-cloud-oci-logging-sample/)
29+
Samples for each service supported by Spring Cloud OCI below:
30+
31+
* [OCI Storage Sample](spring-cloud-oci-samples/spring-cloud-oci-storage-sample/README.md)
32+
* [OCI Notification Service Sample](spring-cloud-oci-samples/spring-cloud-oci-notification-sample/README.md)
33+
* [OCI Logging Service Sample](spring-cloud-oci-samples/spring-cloud-oci-logging-sample/README.md)
3434

3535
## Checking out and building
3636

@@ -42,35 +42,37 @@ or
4242

4343
To check out the project manually and build it from source, do the following:
4444

45-
```
45+
```shell
4646
git clone https://github.com/oracle/spring-cloud-oci.git
4747
cd spring-cloud-oci
4848
mvn package
4949
```
5050

5151
To build and install jars into your local Maven cache:
5252

53-
```
53+
```shell
5454
mvn install
5555
```
5656

5757
For faster builds, we recommend using [Maven Daemon](https://github.com/apache/maven-mvnd) and using following commands:
5858

5959
Build:
60-
```
60+
61+
```shell
6162
make build
6263
```
6364

6465
Clean:
65-
```
66+
67+
```shell
6668
make clean
6769
```
6870

6971
## Documentation
7072

7173
Java docs can be generated with below command
7274

73-
```
75+
```shell
7476
make javadocs
7577
```
7678

‎spring-cloud-oci-autoconfigure/src/main/java/com/oracle/cloud/spring/autoconfigure/core/CredentialsProviderAutoConfiguration.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@
55

66
package com.oracle.cloud.spring.autoconfigure.core;
77

8-
import com.oracle.bmc.ClientRuntime;
9-
import com.oracle.bmc.Region;
108
import com.oracle.bmc.auth.AuthenticationDetailsProvider;
11-
import com.oracle.bmc.auth.BasicAuthenticationDetailsProvider;
12-
import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider;
13-
import com.oracle.bmc.auth.InstancePrincipalsAuthenticationDetailsProvider;
14-
import com.oracle.bmc.auth.ResourcePrincipalAuthenticationDetailsProvider;
15-
import com.oracle.bmc.auth.SimpleAuthenticationDetailsProvider;
16-
import com.oracle.bmc.auth.SimplePrivateKeySupplier;
17-
import com.oracle.bmc.auth.SessionTokenAuthenticationDetailsProvider;
189
import org.springframework.boot.autoconfigure.AutoConfiguration;
1910
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2011
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

‎spring-cloud-oci-autoconfigure/src/test/java/com/oracle/cloud/spring/autoconfigure/core/RegionProviderAutoConfigurationTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import com.oracle.bmc.Region;
99
import com.oracle.bmc.auth.RegionProvider;
10-
import com.oracle.cloud.spring.core.compartment.CompartmentProvider;
1110
import org.junit.jupiter.api.Test;
1211
import org.springframework.boot.autoconfigure.AutoConfigurations;
1312
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

‎spring-cloud-oci-samples/spring-cloud-oci-common-samples-utils/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2023, Oracle and/or its affiliates.
3+
Copyright (c) 2023, 2024, Oracle and/or its affiliates.
44
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
55
-->
66

@@ -17,7 +17,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
1717
<name>spring-cloud-oci-common-samples-utils</name>
1818
<description>spring-cloud-oci-common-samples-utils</description>
1919
<properties>
20-
<java.version>21</java.version>
20+
<java.version>17</java.version>
2121
</properties>
2222

2323
<dependencies>

‎spring-cloud-oci-samples/spring-cloud-oci-function-sample/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
2424
</license>
2525
</licenses>
2626
<properties>
27-
<java.version>21</java.version>
27+
<java.version>17</java.version>
2828
</properties>
2929
<dependencies>
3030
<dependency>

‎spring-cloud-oci-samples/spring-cloud-oci-logging-sample/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
2424
</license>
2525
</licenses>
2626
<properties>
27-
<java.version>21</java.version>
27+
<java.version>17</java.version>
2828
</properties>
2929
<dependencies>
3030
<dependency>

‎spring-cloud-oci-samples/spring-cloud-oci-notification-sample/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
2424
</license>
2525
</licenses>
2626
<properties>
27-
<java.version>21</java.version>
27+
<java.version>17</java.version>
2828
</properties>
2929
<dependencies>
3030
<dependency>

‎spring-cloud-oci-samples/spring-cloud-oci-queue-sample/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
2424
</license>
2525
</licenses>
2626
<properties>
27-
<java.version>21</java.version>
27+
<java.version>17</java.version>
2828
</properties>
2929
<dependencies>
3030
<dependency>

‎spring-cloud-oci-samples/spring-cloud-oci-storage-sample/README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# OCI Storage - Spring Cloud OCI Sample
22

3-
This sample demonstrates getting started quickly with Spring Cloud OCI to work with Oracle Cloud Infrastructre (OCI) Storage Service. This sample implements simple REST service which internally uses Spring Cloud OCI Storage APIs.
3+
This sample demonstrates getting started quickly with Spring Cloud OCI to work with Oracle Cloud Infrastructure (OCI) Storage Service. This sample implements simple REST service which internally uses Spring Cloud OCI Storage APIs.
44

55
## What is Spring Cloud OCI?
66

7-
Spring Cloud for OCI, eases the integration of OCI services with the help of internal OCI Java SDK. It offers a convenient way to interact with OCI-provided services using well-known Spring idioms and APIs, such as the messaging or storage API. Developers can build applications around the hosted services without concern for infrastructure or maintenance. Spring Cloud for OCI contains auto-configuration support for OCI-managed services.
7+
Spring Cloud for OCI, eases the integration of OCI services with the help of internal OCI Java SDK. It offers a convenient way to interact with OCI-provided services using well-known Spring idioms and APIs, such as the messaging or storage API. Developers can build applications around the hosted services without concern for infrastructure or maintenance. Spring Cloud for OCI contains autoconfiguration support for OCI-managed services.
88

99
## What is OCI Storage?
1010

@@ -45,13 +45,12 @@ git clone https://github.com/oracle/spring-cloud-oci.git spring-cloud-oci
4545

4646
1. Run `mvn clean install` from the root directory of the repository code.
4747

48-
2. Set appropriate values at `application.properties` for the following properties. (Refer to the Spring Cloud OCI docs for more details.)
48+
1. Set appropriate values at `application.properties` for the following properties. (Refer to the Spring Cloud OCI docs for more details.)
4949
```
5050
spring.cloud.oci.region.static = US_ASHBURN_1
5151
spring.cloud.oci.compartment.static = <COMPARTMENT_OCID>
5252
```
53-
54-
3. Start the application using the following command from sample root directory.
53+
1. Start the application using the following command from sample root directory.
5554
```
5655
mvn spring-boot:run
5756
```

0 commit comments

Comments
 (0)