Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions adapters/dynamoDB_adapters/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@
<artifactId>commons-text</artifactId>
<version>1.9</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>


</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,24 @@
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.ResultSetExtractor;

import java.sql.SQLException;
import org.springframework.jdbc.core.RowMapper;

import java.io.StringReader;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLEncoder;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
import java.util.Date;
import java.util.UUID;
import java.util.LinkedList;
import java.util.Collections;
import java.util.concurrent.TimeUnit;

import static org.apache.abdera.i18n.text.UrlEncoding.decode;
Expand Down Expand Up @@ -794,7 +803,16 @@ public Object extractData( ResultSet rs ) throws SQLException, DataAccessExcepti
entry.setEntryId(rs.getString("entryid"));


List<String> cats = new ArrayList<String>( Arrays.asList( (String[])rs.getArray( "categories" ).getArray() ) );
List<String> cats = new ArrayList<String>();
try {
cats.addAll(Arrays.asList((String[]) rs.getArray("categories").getArray()));
} catch (SQLException e) {
// Handle PostgreSQL-specific array processing errors
LOG.warn("Failed to process categories array: {}", e.getMessage(), e);
} catch (NullPointerException e) {
// Handle cases where array or its elements are null
LOG.warn("Null pointer encountered while processing categories: {}", e.getMessage(), e);
}

for( String column : mapColumn.keySet() ) {

Expand Down
6 changes: 1 addition & 5 deletions atomhopper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,7 @@
<version>4.2.5.RELEASE</version>
</dependency>

<dependency>
<groupId>org.atomhopper.adapter</groupId>
<artifactId>dynamoDB_adapters</artifactId>
<version>1.2.35-SNAPSHOT</version>
</dependency>


<dependency>
<groupId>jakarta.xml.bind</groupId>
Expand Down
2 changes: 1 addition & 1 deletion atomhopper/src/main/resources/META-INF/atom-server.cfg.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ NOTE: Place this file in the following folder: /etc/atomhopper/atom-server.cfg.x
<categories-descriptor reference="workspace-categories-descriptor" />

<feed title="Testing Feed" resource="/feed">
<!-- <feed-source reference="hibernate-feed-source" /> -->
<!-- <feed-source reference="hibernate-feed-source" /> -->
<publisher reference="dynamodb-feed-publisher" />
</feed>
</workspace>
Expand Down
5 changes: 2 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN mkdir -p "${CATALINA_HOME}" "${AH_HOME}" /etc/atomhopper/ /var/log/atomhoppe
WORKDIR ${AH_HOME}

COPY --from=tomcat /usr/local/tomcat ${CATALINA_HOME}
COPY start.sh .
COPY docker/start.sh .

RUN apk --no-cache add curl \
&& curl -o atomhopper.war https://maven.research.rackspacecloud.com/content/repositories/releases/org/atomhopper/atomhopper/${AH_VERSION}/atomhopper-${AH_VERSION}.war \
Expand All @@ -39,5 +39,4 @@ RUN apk --no-cache add curl \

EXPOSE 8080

CMD ["start.sh"]

CMD ["/opt/atomhopper/start.sh"]
2 changes: 1 addition & 1 deletion documentation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.atomhopper</groupId>
<artifactId>parent</artifactId>
<version>1.2.35-SNAPSHOT</version>
<version>1.2.35-SNAPSHOT</version>
</parent>

<groupId>org.atomhopper</groupId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<version>${project.version}</version>
</dependency>

<dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>4.1.3.Final</version>
Expand Down