You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2016/03/26 08:26:25 UTC
olingo-odata4 git commit: [OLINGO-852] Minor tutorial fix
Repository: olingo-odata4
Updated Branches:
refs/heads/master 300316db8 -> 838ca234e
[OLINGO-852] Minor tutorial fix
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/838ca234
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/838ca234
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/838ca234
Branch: refs/heads/master
Commit: 838ca234e432223c746533e0ab4a4dcf29d5aa92
Parents: 300316d
Author: mibo <mi...@apache.org>
Authored: Sat Mar 26 08:25:37 2016 +0100
Committer: mibo <mi...@apache.org>
Committed: Sat Mar 26 08:26:03 2016 +0100
----------------------------------------------------------------------
.../main/java/myservice/mynamespace/data/Storage.java | 14 ++++++++++----
.../main/java/myservice/mynamespace/data/Storage.java | 14 ++++++++++----
2 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/838ca234/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/data/Storage.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/data/Storage.java b/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/data/Storage.java
index 3413e32..d632625 100644
--- a/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/data/Storage.java
+++ b/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/data/Storage.java
@@ -566,23 +566,27 @@ public class Storage {
private void initAdvertisementSampleData() {
final List<Entity> advertisements = manager.getEntityCollection(DemoEdmProvider.ES_ADVERTISEMENTS_NAME);
-
+
Entity entity = new Entity();
- entity.addProperty(new Property(null, "ID", ValueType.PRIMITIVE,
+ entity.setType(DemoEdmProvider.ET_ADVERTISEMENT_FQN.getFullQualifiedNameAsString());
+ entity.addProperty(new Property(null, "ID", ValueType.PRIMITIVE,
UUID.fromString("f89dee73-af9f-4cd4-b330-db93c25ff3c7")));
entity.addProperty(new Property(null, "Name", ValueType.PRIMITIVE, "Old School Lemonade Store, Retro Style"));
entity.addProperty(new Property(null, "AirDate", ValueType.PRIMITIVE, Timestamp.valueOf("2012-11-07 00:00:00")));
entity.addProperty(new Property(null, MEDIA_PROPERTY_NAME, ValueType.PRIMITIVE, "Super content".getBytes()));
entity.setMediaContentType(ContentType.parse("text/plain").toContentTypeString());
+ entity.setId(createId(entity, "ID"));
advertisements.add(entity);
-
+
entity = new Entity();
- entity.addProperty(new Property(null, "ID", ValueType.PRIMITIVE,
+ entity.setType(DemoEdmProvider.ET_ADVERTISEMENT_FQN.getFullQualifiedNameAsString());
+ entity.addProperty(new Property(null, "ID", ValueType.PRIMITIVE,
UUID.fromString("db2d2186-1c29-4d1e-88ef-a127f521b9c67")));
entity.addProperty(new Property(null, "Name", ValueType.PRIMITIVE, "Early morning start, need coffee"));
entity.addProperty(new Property(null, "AirDate", ValueType.PRIMITIVE, Timestamp.valueOf("2000-02-29 00:00:00")));
entity.addProperty(new Property(null, MEDIA_PROPERTY_NAME, ValueType.PRIMITIVE, "Super content2".getBytes()));
entity.setMediaContentType(ContentType.parse("text/plain").toContentTypeString());
+ entity.setId(createId(entity, "ID"));
advertisements.add(entity);
}
@@ -646,6 +650,8 @@ private void initAdvertisementSampleData() {
return DemoEdmProvider.ES_CATEGORIES_NAME;
} else if (DemoEdmProvider.ET_PRODUCT_FQN.getFullQualifiedNameAsString().equals(entity.getType())) {
return DemoEdmProvider.ES_PRODUCTS_NAME;
+ } else if (DemoEdmProvider.ET_ADVERTISEMENT_FQN.getFullQualifiedNameAsString().equals(entity.getType())) {
+ return DemoEdmProvider.ES_ADVERTISEMENTS_NAME;
}
return entity.getType();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/838ca234/samples/tutorials/p10_media/src/main/java/myservice/mynamespace/data/Storage.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p10_media/src/main/java/myservice/mynamespace/data/Storage.java b/samples/tutorials/p10_media/src/main/java/myservice/mynamespace/data/Storage.java
index ad9925b..732af86 100644
--- a/samples/tutorials/p10_media/src/main/java/myservice/mynamespace/data/Storage.java
+++ b/samples/tutorials/p10_media/src/main/java/myservice/mynamespace/data/Storage.java
@@ -431,23 +431,27 @@ public class Storage {
}
private void initAdvertisementSampleData() {
-
+
Entity entity = new Entity();
- entity.addProperty(new Property(null, "ID", ValueType.PRIMITIVE,
+ entity.setType(DemoEdmProvider.ET_ADVERTISEMENT_FQN.getFullQualifiedNameAsString());
+ entity.addProperty(new Property(null, "ID", ValueType.PRIMITIVE,
UUID.fromString("f89dee73-af9f-4cd4-b330-db93c25ff3c7")));
entity.addProperty(new Property(null, "Name", ValueType.PRIMITIVE, "Old School Lemonade Store, Retro Style"));
entity.addProperty(new Property(null, "AirDate", ValueType.PRIMITIVE, Timestamp.valueOf("2012-11-07 00:00:00")));
entity.addProperty(new Property(null, MEDIA_PROPERTY_NAME, ValueType.PRIMITIVE, "Super content".getBytes()));
entity.setMediaContentType(ContentType.parse("text/plain").toContentTypeString());
+ entity.setId(createId(entity, "ID"));
advertisements.add(entity);
-
+
entity = new Entity();
- entity.addProperty(new Property(null, "ID", ValueType.PRIMITIVE,
+ entity.setType(DemoEdmProvider.ET_ADVERTISEMENT_FQN.getFullQualifiedNameAsString());
+ entity.addProperty(new Property(null, "ID", ValueType.PRIMITIVE,
UUID.fromString("db2d2186-1c29-4d1e-88ef-a127f521b9c67")));
entity.addProperty(new Property(null, "Name", ValueType.PRIMITIVE, "Early morning start, need coffee"));
entity.addProperty(new Property(null, "AirDate", ValueType.PRIMITIVE, Timestamp.valueOf("2000-02-29 00:00:00")));
entity.addProperty(new Property(null, MEDIA_PROPERTY_NAME, ValueType.PRIMITIVE, "Super content2".getBytes()));
entity.setMediaContentType(ContentType.parse("text/plain").toContentTypeString());
+ entity.setId(createId(entity, "ID"));
advertisements.add(entity);
}
@@ -474,6 +478,8 @@ public class Storage {
return DemoEdmProvider.ES_CATEGORIES_NAME;
} else if(DemoEdmProvider.ET_PRODUCT_FQN.getFullQualifiedNameAsString().equals(entity.getType())) {
return DemoEdmProvider.ES_PRODUCTS_NAME;
+ } else if (DemoEdmProvider.ET_ADVERTISEMENT_FQN.getFullQualifiedNameAsString().equals(entity.getType())) {
+ return DemoEdmProvider.ES_ADVERTISEMENTS_NAME;
}
return entity.getType();
}