You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2016/02/24 08:49:27 UTC
[1/2] jclouds-labs git commit: Prefer GenerationType.AUTO over
SEQUENCE
Repository: jclouds-labs
Updated Branches:
refs/heads/master 5bd8447b2 -> d169a7bb7
Prefer GenerationType.AUTO over SEQUENCE
This seems to cause primary key violations with H2.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/d169a7bb
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/d169a7bb
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/d169a7bb
Branch: refs/heads/master
Commit: d169a7bb7186473ed6f794311b507b4b4975ffeb
Parents: 7255d73
Author: Andrew Gaul <ga...@apache.org>
Authored: Tue Feb 23 21:03:01 2016 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Tue Feb 23 23:47:38 2016 -0800
----------------------------------------------------------------------
jdbc/src/main/java/org/jclouds/jdbc/entity/ChunkEntity.java | 3 +--
jdbc/src/main/java/org/jclouds/jdbc/entity/ContainerEntity.java | 3 +--
jdbc/src/main/java/org/jclouds/jdbc/entity/PayloadEntity.java | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/d169a7bb/jdbc/src/main/java/org/jclouds/jdbc/entity/ChunkEntity.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/jclouds/jdbc/entity/ChunkEntity.java b/jdbc/src/main/java/org/jclouds/jdbc/entity/ChunkEntity.java
index 72d77b2..41a8cee 100644
--- a/jdbc/src/main/java/org/jclouds/jdbc/entity/ChunkEntity.java
+++ b/jdbc/src/main/java/org/jclouds/jdbc/entity/ChunkEntity.java
@@ -21,7 +21,6 @@ import org.jclouds.jdbc.reference.JdbcConstants;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.Table;
@@ -31,7 +30,7 @@ import javax.persistence.Table;
public class ChunkEntity {
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE)
+ @GeneratedValue
private Long id;
@Lob
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/d169a7bb/jdbc/src/main/java/org/jclouds/jdbc/entity/ContainerEntity.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/jclouds/jdbc/entity/ContainerEntity.java b/jdbc/src/main/java/org/jclouds/jdbc/entity/ContainerEntity.java
index 5ace841..ab30f06 100644
--- a/jdbc/src/main/java/org/jclouds/jdbc/entity/ContainerEntity.java
+++ b/jdbc/src/main/java/org/jclouds/jdbc/entity/ContainerEntity.java
@@ -21,7 +21,6 @@ import org.jclouds.blobstore.domain.ContainerAccess;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.PrePersist;
import javax.persistence.Table;
@@ -32,7 +31,7 @@ import java.util.Date;
public class ContainerEntity {
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE)
+ @GeneratedValue
private Long id;
@Column(unique = true)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/d169a7bb/jdbc/src/main/java/org/jclouds/jdbc/entity/PayloadEntity.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/jclouds/jdbc/entity/PayloadEntity.java b/jdbc/src/main/java/org/jclouds/jdbc/entity/PayloadEntity.java
index 534c260..ca71a69 100644
--- a/jdbc/src/main/java/org/jclouds/jdbc/entity/PayloadEntity.java
+++ b/jdbc/src/main/java/org/jclouds/jdbc/entity/PayloadEntity.java
@@ -22,7 +22,6 @@ import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import java.util.Date;
import java.util.List;
@@ -31,7 +30,7 @@ import java.util.List;
public class PayloadEntity {
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE)
+ @GeneratedValue
private Long id;
@ElementCollection(fetch = FetchType.EAGER)
[2/2] jclouds-labs git commit: Avoid uniqueness constraint errors via
upsert
Posted by ga...@apache.org.
Avoid uniqueness constraint errors via upsert
Do this in JPA instead of hacking around in the application.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/7255d73c
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/7255d73c
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/7255d73c
Branch: refs/heads/master
Commit: 7255d73ced667002d59985df8a371509989c958c
Parents: 5bd8447
Author: Andrew Gaul <ga...@apache.org>
Authored: Mon Feb 22 11:30:35 2016 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Tue Feb 23 23:47:38 2016 -0800
----------------------------------------------------------------------
jdbc/src/main/java/org/jclouds/jdbc/service/JdbcService.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7255d73c/jdbc/src/main/java/org/jclouds/jdbc/service/JdbcService.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/jclouds/jdbc/service/JdbcService.java b/jdbc/src/main/java/org/jclouds/jdbc/service/JdbcService.java
index 9cd185c..af75721 100644
--- a/jdbc/src/main/java/org/jclouds/jdbc/service/JdbcService.java
+++ b/jdbc/src/main/java/org/jclouds/jdbc/service/JdbcService.java
@@ -109,7 +109,6 @@ public class JdbcService {
BlobEntity oldBlobEntity = findBlobById(containerName, key);
if (oldBlobEntity != null) {
creationDate = oldBlobEntity.getCreationDate();
- deleteBlob(containerName, key);
}
BlobEntity blobEntity = blobToBlobEntity.apply(blob);
blobEntity.getPayload().setChunks(storeData(blob.getPayload().openStream()));
@@ -117,12 +116,13 @@ public class JdbcService {
blobEntity.setKey(key);
blobEntity.setBlobAccess(blobAccess);
blobEntity.setCreationDate(creationDate);
+ blobEntity.setLastModified(new Date());
HashCode hash = ByteStreams2.hashAndClose(blob.getPayload().openStream(), Hashing.md5());
blobEntity.setEtag(base16().lowerCase().encode(hash.asBytes()));
blobEntity.getPayload().setContentMD5(hash.asBytes());
- BlobEntity result = blobRepository.create(blobEntity);
+ BlobEntity result = blobRepository.save(blobEntity);
checkIntegrity(blob, result);
return result;
}
@@ -138,7 +138,7 @@ public class JdbcService {
blobEntity.setKey(blob.getMetadata().getName());
blobEntity.setBlobAccess(blobAccess);
blobEntity.setEtag(DIRECTORY_MD5);
- return blobRepository.create(blobEntity);
+ return blobRepository.save(blobEntity);
}
@Transactional