Skip to content

Commit

Permalink
Remove Frameworks parent module (#92)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rnewbigging
rnewbigging authored Oct 17, 2023
1 parent da3792f commit c991234
Show file tree
Hide file tree
Showing 42 changed files with 57 additions and 116 deletions.
4 changes: 2 additions & 2 deletions cloudplatform/cloudplatform-connectivity-scp-cf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<artifactId>resilience</artifactId>
</dependency>
<dependency>
<groupId>com.sap.cloud.sdk.frameworks</groupId>
<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
<artifactId>resilience4j</artifactId>
<scope>runtime</scope>
</dependency>
Expand Down Expand Up @@ -242,7 +242,7 @@
<configuration>
<ignoredUnusedDeclaredDependencies>
<!-- default resilience implementation -->
<ignoredUnusedDeclaredDependency>com.sap.cloud.sdk.frameworks:resilience4j</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>com.sap.cloud.sdk.cloudplatform:resilience4j</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>com.sap.cloud.sdk.cloudplatform:security-scp-cf</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
<ignoredNonTestScopedDependencies>
Expand Down
4 changes: 2 additions & 2 deletions cloudplatform/connectivity-dwc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sap.cloud.sdk.frameworks</groupId>
<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
<artifactId>resilience4j</artifactId>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -156,7 +156,7 @@
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>com.sap.cloud.sdk.frameworks:resilience4j</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>com.sap.cloud.sdk.cloudplatform:resilience4j</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>com.github.ben-manes.caffeine:jcache</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
Expand Down
1 change: 1 addition & 0 deletions cloudplatform/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<module>connectivity-apache-httpclient4</module>
<module>connectivity-apache-httpclient5</module>
<module>resilience</module>
<module>resilience4j</module>
<module>security</module>
<module>security-scp-cf</module>
<module>servlet</module>
Expand Down
0 frameworks/resilience4j/.gitignore → cloudplatform/resilience4j/.gitignore
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions frameworks/resilience4j/pom.xml → cloudplatform/resilience4j/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.sap.cloud.sdk.frameworks</groupId>
<artifactId>frameworks-parent</artifactId>
<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
<artifactId>cloudplatform-parent</artifactId>
<version>5.0.0-alpha-SNAPSHOT</version>
</parent>
<artifactId>resilience4j</artifactId>
<name>Frameworks - Resilience4j</name>
<name>Cloud Platform - Resilience4j</name>
<description>Framework adaptation for Resilience4j.</description>
<url>https://sap.github.io/cloud-sdk/docs/java/getting-started</url>
<organization>
Expand Down
2 changes: 1 addition & 1 deletion ...eworks/resilience4j/BulkheadProvider.java → ...atform/resilience4j/BulkheadProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import javax.annotation.Nonnull;

Expand Down
2 changes: 1 addition & 1 deletion .../resilience4j/CircuitBreakerProvider.java → .../resilience4j/CircuitBreakerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import javax.annotation.Nonnull;

Expand Down
2 changes: 1 addition & 1 deletion ...resilience4j/DefaultBulkheadProvider.java → ...resilience4j/DefaultBulkheadProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
Expand Down
2 changes: 1 addition & 1 deletion ...resilience4j/DefaultCachingDecorator.java → ...resilience4j/DefaultCachingDecorator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import java.io.Serializable;
import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion ...ence4j/DefaultCircuitBreakerProvider.java → ...ence4j/DefaultCircuitBreakerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
Expand Down
2 changes: 1 addition & 1 deletion ...ilience4j/DefaultRateLimiterProvider.java → ...ilience4j/DefaultRateLimiterProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
Expand Down
2 changes: 1 addition & 1 deletion ...ks/resilience4j/DefaultRetryProvider.java → ...rm/resilience4j/DefaultRetryProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
Expand Down
2 changes: 1 addition & 1 deletion ...ilience4j/DefaultTimeLimiterProvider.java → ...ilience4j/DefaultTimeLimiterProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import java.util.concurrent.Callable;
import java.util.concurrent.Future;
Expand Down
2 changes: 1 addition & 1 deletion ...eworks/resilience4j/GenericDecorator.java → ...atform/resilience4j/GenericDecorator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import java.util.concurrent.Callable;

Expand Down
2 changes: 1 addition & 1 deletion ...rks/resilience4j/RateLimiterProvider.java → ...orm/resilience4j/RateLimiterProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import javax.annotation.Nonnull;

Expand Down
2 changes: 1 addition & 1 deletion ...nce4j/Resilience4jDecorationStrategy.java → ...nce4j/Resilience4jDecorationStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import java.util.Arrays;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...rameworks/resilience4j/RetryProvider.java → ...dplatform/resilience4j/RetryProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import javax.annotation.Nonnull;

Expand Down
2 changes: 1 addition & 1 deletion ...rks/resilience4j/TimeLimiterProvider.java → ...orm/resilience4j/TimeLimiterProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import javax.annotation.Nonnull;

Expand Down
1 change: 1 addition & 0 deletions ...META-INF/services/com.sap.cloud.sdk.cloudplatform.resilience.ResilienceDecorationStrategy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.sap.cloud.sdk.cloudplatform.resilience4j.Resilience4jDecorationStrategy
2 changes: 1 addition & 1 deletion ...meworks/resilience4j/CacheFilterTest.java → ...latform/resilience4j/CacheFilterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
Expand Down
2 changes: 1 addition & 1 deletion ...orks/resilience4j/CircuitBreakerTest.java → ...form/resilience4j/CircuitBreakerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
Expand Down
2 changes: 1 addition & 1 deletion ...meworks/resilience4j/ClassLoaderUtil.java → ...latform/resilience4j/ClassLoaderUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import java.util.concurrent.atomic.AtomicReference;

Expand Down
2 changes: 1 addition & 1 deletion ...ience4j/CustomResilienceStrategyTest.java → ...ience4j/CustomResilienceStrategyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static org.assertj.core.api.Assertions.assertThat;

Expand Down
2 changes: 1 addition & 1 deletion ...lience4j/DefaultCachingDecoratorTest.java → ...lience4j/DefaultCachingDecoratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static com.sap.cloud.sdk.cloudplatform.resilience.ResilienceConfiguration.CacheConfiguration;
import static org.assertj.core.api.Assertions.assertThat;
Expand Down
2 changes: 1 addition & 1 deletion ...works/resilience4j/NoopCacheProvider.java → ...tform/resilience4j/NoopCacheProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import java.net.URI;
import java.util.Properties;
Expand Down
2 changes: 1 addition & 1 deletion ...meworks/resilience4j/RateLimiterTest.java → ...latform/resilience4j/RateLimiterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatNoException;
Expand Down
2 changes: 1 addition & 1 deletion ...esilience4jCachingCustomProviderTest.java → ...esilience4jCachingCustomProviderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static com.sap.cloud.sdk.cloudplatform.resilience.ResilienceConfiguration.CacheConfiguration;
import static org.assertj.core.api.Assertions.assertThat;
Expand Down
2 changes: 1 addition & 1 deletion ...silience4jCachingDefaultProviderTest.java → ...silience4jCachingDefaultProviderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static com.sap.cloud.sdk.cloudplatform.resilience.ResilienceConfiguration.CacheConfiguration;
import static com.sap.cloud.sdk.cloudplatform.resilience.ResilienceConfiguration.RetryConfiguration;
Expand Down
2 changes: 1 addition & 1 deletion ...ce4j/Resilience4jDecorationAsyncTest.java → ...ce4j/Resilience4jDecorationAsyncTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/
package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static java.time.Duration.ofMillis;
import static java.time.Duration.ofNanos;
Expand Down
2 changes: 1 addition & 1 deletion ...ience4jDecorationStrategyBuilderTest.java → ...ience4jDecorationStrategyBuilderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
Expand Down
2 changes: 1 addition & 1 deletion ...ce4jDecorationStrategyClearCacheTest.java → ...ce4jDecorationStrategyClearCacheTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Fail.fail;
Expand Down
4 changes: 2 additions & 2 deletions ...j/Resilience4jDecorationStrategyTest.java → ...j/Resilience4jDecorationStrategyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
Expand All @@ -26,7 +26,7 @@
import com.sap.cloud.sdk.cloudplatform.resilience.ResilienceDecorator;
import com.sap.cloud.sdk.cloudplatform.resilience.ResilienceIsolationMode;
import com.sap.cloud.sdk.cloudplatform.resilience.ResilienceRuntimeException;
import com.sap.cloud.sdk.frameworks.resilience4j.Resilience4jCachingDefaultProviderTest.TestCallable;
import com.sap.cloud.sdk.cloudplatform.resilience4j.Resilience4jCachingDefaultProviderTest.TestCallable;
import com.sap.cloud.sdk.testutil.MockUtil;

public class Resilience4jDecorationStrategyTest
Expand Down
2 changes: 1 addition & 1 deletion ...ence4j/Resilience4jThreadContextTest.java → ...ence4j/Resilience4jThreadContextTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/
package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static org.assertj.core.api.Assertions.assertThat;

Expand Down
2 changes: 1 addition & 1 deletion ...dk/frameworks/resilience4j/RetryTest.java → ...cloudplatform/resilience4j/RetryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
Expand Down
2 changes: 1 addition & 1 deletion ...meworks/resilience4j/ThreadLocalTest.java → ...latform/resilience4j/ThreadLocalTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static org.assertj.core.api.Assertions.assertThat;

Expand Down
2 changes: 1 addition & 1 deletion ...meworks/resilience4j/TimeLimiterTest.java → ...latform/resilience4j/TimeLimiterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved.
*/

package com.sap.cloud.sdk.frameworks.resilience4j;
package com.sap.cloud.sdk.cloudplatform.resilience4j;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
Expand Down
45 changes: 0 additions & 45 deletions frameworks/pom.xml
View file

This file was deleted.

1 change: 0 additions & 1 deletion ...META-INF/services/com.sap.cloud.sdk.cloudplatform.resilience.ResilienceDecorationStrategy
View file

This file was deleted.

Loading

0 comments on commit c991234

Please sign in to comment.