Merge Spring Integration - Meeds-io/MIPs#57 (#35)

Meeds-io · Jan 11, 2024 · 70802a5 · 70802a5
2 parents 51f35a5 + e56ff74
commit 70802a5
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 23 deletions.
diff --git a/gamification-twitter-services/pom.xml b/gamification-twitter-services/pom.xml
@@ -45,23 +45,8 @@
       <artifactId>gamification-services</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.exoplatform.addons.gamification</groupId>
-      <artifactId>gamification-services</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
   <build>
     <finalName>gamification-twitter-service</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.projectlombok</groupId>
-        <artifactId>lombok-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>com.jcabi</groupId>
-        <artifactId>jcabi-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
   </build>
 </project>
diff --git a/...n-twitter-services/src/main/java/io/meeds/gamification/twitter/dao/TwitterAccountDAO.java b/...n-twitter-services/src/main/java/io/meeds/gamification/twitter/dao/TwitterAccountDAO.java
@@ -21,8 +21,8 @@
 import io.meeds.gamification.twitter.entity.TwitterAccountEntity;
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
 
-import javax.persistence.NoResultException;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.TypedQuery;
 import java.util.List;
 
 public class TwitterAccountDAO extends GenericDAOJPAImpl<TwitterAccountEntity, Long> {

diff --git a/...ter-services/src/main/java/io/meeds/gamification/twitter/entity/TwitterAccountEntity.java b/...ter-services/src/main/java/io/meeds/gamification/twitter/entity/TwitterAccountEntity.java
@@ -21,7 +21,7 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
 

diff --git a/...services/src/main/java/io/meeds/gamification/twitter/model/TwitterAccessTokenContext.java b/...services/src/main/java/io/meeds/gamification/twitter/model/TwitterAccessTokenContext.java
@@ -23,7 +23,7 @@
 
 import com.github.scribejava.core.model.OAuth2AccessToken;
 import io.meeds.oauth.spi.AccessTokenContext;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class TwitterAccessTokenContext extends AccessTokenContext implements Serializable {
 

diff --git a/...r-services/src/main/java/io/meeds/gamification/twitter/plugin/TwitterConnectorPlugin.java b/...r-services/src/main/java/io/meeds/gamification/twitter/plugin/TwitterConnectorPlugin.java
@@ -33,7 +33,7 @@
 import io.meeds.oauth.exception.OAuthExceptionCode;
 import io.meeds.oauth.utils.HttpResponseContext;
 import io.meeds.oauth.utils.OAuthUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.json.JSONObject;

diff --git a/...twitter-services/src/main/java/io/meeds/gamification/twitter/rest/TwitterAccountRest.java b/...twitter-services/src/main/java/io/meeds/gamification/twitter/rest/TwitterAccountRest.java
@@ -34,7 +34,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.ObjectAlreadyExistsException;
 import org.exoplatform.commons.exception.ObjectNotFoundException;

diff --git a/...tter-services/src/main/java/io/meeds/gamification/twitter/web/TwitterConnectorFilter.java b/...tter-services/src/main/java/io/meeds/gamification/twitter/web/TwitterConnectorFilter.java
@@ -20,7 +20,7 @@
 
 import java.io.IOException;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.github.scribejava.core.builder.ServiceBuilder;
 import com.github.scribejava.core.oauth.OAuth20Service;

diff --git a/...twitter-services/src/main/resources/db/changelog/twitter-connector.db.changelog-1.0.0.xml b/...twitter-services/src/main/resources/db/changelog/twitter-connector.db.changelog-1.0.0.xml
@@ -53,7 +53,13 @@
       </column>
     </createTable>
   </changeSet>
-  <changeSet author="twitter-connector" id="1.0.0-2" dbms="oracle,postgresql">
+  <changeSet author="twitter-connector" id="1.0.0-2" dbms="oracle,postgresql,hsqldb" onValidationFail="MARK_RAN" failOnError="false">
+    <validCheckSum>ANY</validCheckSum>
+    <preConditions>
+      <not>
+        <sequenceExists sequenceName="SEQ_TWITTER_ACCOUNTS_ID" />
+      </not>
+    </preConditions>
     <createSequence sequenceName="SEQ_TWITTER_ACCOUNTS_ID" startValue="1"/>
   </changeSet>