You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/05/26 22:33:06 UTC
svn commit: r1486471 - in /cayenne/main/trunk/tutorials:
tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/
tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/
tutorial/src/main/java/org/apache/c...
Author: aadamchik
Date: Sun May 26 20:33:05 2013
New Revision: 1486471
URL: http://svn.apache.org/r1486471
Log:
updating tutorials to match 3.2 APIs
Modified:
cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java
cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Artist.java
cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Gallery.java
cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Painting.java
cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java
cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Artist.java
cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Gallery.java
cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Painting.java
Modified: cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java?rev=1486471&r1=1486470&r2=1486471&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java (original)
+++ cayenne/main/trunk/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java Sun May 26 20:33:05 2013
@@ -32,72 +32,68 @@ import org.apache.cayenne.query.SelectQu
public class Main {
- public static void main(String[] args) {
+ public static void main(String[] args) {
- Map<String, String> properties = new HashMap<String, String>();
- properties.put(Constants.ROP_SERVICE_URL_PROPERTY,
- "http://localhost:8080/tutorial-rop-server/cayenne-service");
- properties.put(Constants.ROP_SERVICE_USERNAME_PROPERTY, "cayenne-user");
- properties.put(Constants.ROP_SERVICE_PASSWORD_PROPERTY, "secret");
-
- ClientRuntime runtime = new ClientRuntime(properties);
-
- ObjectContext context = runtime.getContext();
-
- newObjectsTutorial(context);
- selectTutorial(context);
- deleteTutorial(context);
- }
-
- static void newObjectsTutorial(ObjectContext context) {
-
- // creating new Artist
- Artist picasso = context.newObject(Artist.class);
- picasso.setName("Pablo Picasso");
-
- // Creating other objects
- Gallery metropolitan = context.newObject(Gallery.class);
- metropolitan.setName("Metropolitan Museum of Art");
-
- Painting girl = context.newObject(Painting.class);
- girl.setName("Girl Reading at a Table");
-
- Painting stein = context.newObject(Painting.class);
- stein.setName("Gertrude Stein");
-
- // connecting objects together via relationships
- picasso.addToPaintings(girl);
- picasso.addToPaintings(stein);
-
- girl.setGallery(metropolitan);
- stein.setGallery(metropolitan);
-
- // saving all the changes above
- context.commitChanges();
- }
-
- static void selectTutorial(ObjectContext context) {
- // SelectQuery examples
- SelectQuery<Painting> select1 = SelectQuery.query(Painting.class, null);
- List<Painting> paintings1 = context.performQuery(select1);
-
- Expression qualifier2 = ExpressionFactory.likeIgnoreCaseExp(
- Painting.NAME_PROPERTY, "gi%");
- SelectQuery<Painting> select2 = SelectQuery.query(Painting.class, qualifier2);
- List<Painting> paintings2 = context.performQuery(select2);
- }
-
- static void deleteTutorial(ObjectContext context) {
- // Delete object examples
- Expression qualifier = ExpressionFactory.matchExp(Artist.NAME_PROPERTY,
- "Pablo Picasso");
- SelectQuery<Artist> selectToDelete = SelectQuery.query(Artist.class, qualifier);
- Artist picasso = (Artist) Cayenne.objectForQuery(context,
- selectToDelete);
-
- if (picasso != null) {
- context.deleteObjects(picasso);
- context.commitChanges();
- }
- }
+ Map<String, String> properties = new HashMap<String, String>();
+ properties.put(Constants.ROP_SERVICE_URL_PROPERTY, "http://localhost:8080/tutorial-rop-server/cayenne-service");
+ properties.put(Constants.ROP_SERVICE_USERNAME_PROPERTY, "cayenne-user");
+ properties.put(Constants.ROP_SERVICE_PASSWORD_PROPERTY, "secret");
+
+ ClientRuntime runtime = new ClientRuntime(properties);
+
+ ObjectContext context = runtime.newContext();
+
+ newObjectsTutorial(context);
+ selectTutorial(context);
+ deleteTutorial(context);
+ }
+
+ static void newObjectsTutorial(ObjectContext context) {
+
+ // creating new Artist
+ Artist picasso = context.newObject(Artist.class);
+ picasso.setName("Pablo Picasso");
+
+ // Creating other objects
+ Gallery metropolitan = context.newObject(Gallery.class);
+ metropolitan.setName("Metropolitan Museum of Art");
+
+ Painting girl = context.newObject(Painting.class);
+ girl.setName("Girl Reading at a Table");
+
+ Painting stein = context.newObject(Painting.class);
+ stein.setName("Gertrude Stein");
+
+ // connecting objects together via relationships
+ picasso.addToPaintings(girl);
+ picasso.addToPaintings(stein);
+
+ girl.setGallery(metropolitan);
+ stein.setGallery(metropolitan);
+
+ // saving all the changes above
+ context.commitChanges();
+ }
+
+ static void selectTutorial(ObjectContext context) {
+ // SelectQuery examples
+ SelectQuery<Painting> select1 = SelectQuery.query(Painting.class);
+ List<Painting> paintings1 = context.select(select1);
+
+ Expression qualifier2 = ExpressionFactory.likeIgnoreCaseExp(Painting.NAME_PROPERTY, "gi%");
+ SelectQuery<Painting> select2 = SelectQuery.query(Painting.class, qualifier2);
+ List<Painting> paintings2 = context.select(select2);
+ }
+
+ static void deleteTutorial(ObjectContext context) {
+ // Delete object examples
+ Expression qualifier = ExpressionFactory.matchExp(Artist.NAME_PROPERTY, "Pablo Picasso");
+ SelectQuery<Artist> selectToDelete = SelectQuery.query(Artist.class, qualifier);
+ Artist picasso = (Artist) Cayenne.objectForQuery(context, selectToDelete);
+
+ if (picasso != null) {
+ context.deleteObjects(picasso);
+ context.commitChanges();
+ }
+ }
}
Modified: cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Artist.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Artist.java?rev=1486471&r1=1486470&r2=1486471&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Artist.java (original)
+++ cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Artist.java Sun May 26 20:33:05 2013
@@ -4,6 +4,7 @@ import java.util.Date;
import java.util.List;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.tutorial.persistent.Painting;
/**
@@ -14,12 +15,19 @@ import org.apache.cayenne.tutorial.persi
*/
public abstract class _Artist extends CayenneDataObject {
+ @Deprecated
public static final String DATE_OF_BIRTH_PROPERTY = "dateOfBirth";
+ @Deprecated
public static final String NAME_PROPERTY = "name";
+ @Deprecated
public static final String PAINTINGS_PROPERTY = "paintings";
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<Date> DATE_OF_BIRTH = new Property<Date>("dateOfBirth");
+ public static final Property<String> NAME = new Property<String>("name");
+ public static final Property<List<Painting>> PAINTINGS = new Property<List<Painting>>("paintings");
+
public void setDateOfBirth(Date dateOfBirth) {
writeProperty("dateOfBirth", dateOfBirth);
}
Modified: cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Gallery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Gallery.java?rev=1486471&r1=1486470&r2=1486471&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Gallery.java (original)
+++ cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Gallery.java Sun May 26 20:33:05 2013
@@ -3,6 +3,7 @@ package org.apache.cayenne.tutorial.pers
import java.util.List;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.tutorial.persistent.Painting;
/**
@@ -13,11 +14,16 @@ import org.apache.cayenne.tutorial.persi
*/
public abstract class _Gallery extends CayenneDataObject {
+ @Deprecated
public static final String NAME_PROPERTY = "name";
+ @Deprecated
public static final String PAINTINGS_PROPERTY = "paintings";
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<String> NAME = new Property<String>("name");
+ public static final Property<List<Painting>> PAINTINGS = new Property<List<Painting>>("paintings");
+
public void setName(String name) {
writeProperty("name", name);
}
Modified: cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Painting.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Painting.java?rev=1486471&r1=1486470&r2=1486471&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Painting.java (original)
+++ cayenne/main/trunk/tutorials/tutorial-rop-server/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Painting.java Sun May 26 20:33:05 2013
@@ -1,6 +1,7 @@
package org.apache.cayenne.tutorial.persistent.auto;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.tutorial.persistent.Artist;
import org.apache.cayenne.tutorial.persistent.Gallery;
@@ -12,12 +13,19 @@ import org.apache.cayenne.tutorial.persi
*/
public abstract class _Painting extends CayenneDataObject {
+ @Deprecated
public static final String NAME_PROPERTY = "name";
+ @Deprecated
public static final String ARTIST_PROPERTY = "artist";
+ @Deprecated
public static final String GALLERY_PROPERTY = "gallery";
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<String> NAME = new Property<String>("name");
+ public static final Property<Artist> ARTIST = new Property<Artist>("artist");
+ public static final Property<Gallery> GALLERY = new Property<Gallery>("gallery");
+
public void setName(String name) {
writeProperty("name", name);
}
Modified: cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java?rev=1486471&r1=1486470&r2=1486471&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java (original)
+++ cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/Main.java Sun May 26 20:33:05 2013
@@ -27,7 +27,6 @@ import org.apache.cayenne.Cayenne;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.exp.Expression;
-import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.tutorial.persistent.Artist;
import org.apache.cayenne.tutorial.persistent.Gallery;
@@ -35,80 +34,74 @@ import org.apache.cayenne.tutorial.persi
public class Main {
- public static void main(String[] args) {
+ public static void main(String[] args) {
- // starting Cayenne
- ServerRuntime cayenneRuntime = new ServerRuntime(
- "cayenne-project.xml");
-
- // getting a hold of ObjectContext
- ObjectContext context = cayenneRuntime.getContext();
-
- newObjectsTutorial(context);
- selectTutorial(context);
- deleteTutorial(context);
- }
-
- static void newObjectsTutorial(ObjectContext context) {
-
- // creating new Artist
- Artist picasso = context.newObject(Artist.class);
- picasso.setName("Pablo Picasso");
- picasso.setDateOfBirthString("18811025");
-
- // Creating other objects
- Gallery metropolitan = context.newObject(Gallery.class);
- metropolitan.setName("Metropolitan Museum of Art");
-
- Painting girl = context.newObject(Painting.class);
- girl.setName("Girl Reading at a Table");
-
- Painting stein = context.newObject(Painting.class);
- stein.setName("Gertrude Stein");
-
- // connecting objects together via relationships
- picasso.addToPaintings(girl);
- picasso.addToPaintings(stein);
-
- girl.setGallery(metropolitan);
- stein.setGallery(metropolitan);
-
- // saving all the changes above
- context.commitChanges();
- }
-
- static void selectTutorial(ObjectContext context) {
- // SelectQuery examples
- SelectQuery<Painting> select1 = SelectQuery.query(Painting.class, null);
- List<Painting> paintings1 = context.performQuery(select1);
-
- Expression qualifier2 = ExpressionFactory.likeIgnoreCaseExp(
- Painting.NAME_PROPERTY, "gi%");
- SelectQuery<Painting> select2 = SelectQuery.query(Painting.class, qualifier2);
- List<Painting> paintings2 = context.performQuery(select2);
-
- Calendar c = new GregorianCalendar();
- c.set(c.get(Calendar.YEAR) - 100, 0, 1, 0, 0, 0);
-
- Expression qualifier3 = Expression
- .fromString("artist.dateOfBirth < $date");
- qualifier3 = qualifier3.expWithParameters(Collections.singletonMap(
- "date", c.getTime()));
- SelectQuery<Painting> select3 = SelectQuery.query(Painting.class, qualifier3);
- List<Painting> paintings3 = context.performQuery(select3);
- }
-
- static void deleteTutorial(ObjectContext context) {
- // Delete object examples
- Expression qualifier = ExpressionFactory.matchExp(Artist.NAME_PROPERTY,
- "Pablo Picasso");
- SelectQuery<Artist> selectToDelete = SelectQuery.query(Artist.class, qualifier);
- Artist picasso = (Artist) Cayenne.objectForQuery(context,
- selectToDelete);
-
- if (picasso != null) {
- context.deleteObjects(picasso);
- context.commitChanges();
- }
- }
+ // starting Cayenne
+ ServerRuntime cayenneRuntime = new ServerRuntime("cayenne-project.xml");
+
+ // getting a hold of ObjectContext
+ ObjectContext context = cayenneRuntime.newContext();
+
+ newObjectsTutorial(context);
+ selectTutorial(context);
+ deleteTutorial(context);
+ }
+
+ static void newObjectsTutorial(ObjectContext context) {
+
+ // creating new Artist
+ Artist picasso = context.newObject(Artist.class);
+ picasso.setName("Pablo Picasso");
+ picasso.setDateOfBirthString("18811025");
+
+ // Creating other objects
+ Gallery metropolitan = context.newObject(Gallery.class);
+ metropolitan.setName("Metropolitan Museum of Art");
+
+ Painting girl = context.newObject(Painting.class);
+ girl.setName("Girl Reading at a Table");
+
+ Painting stein = context.newObject(Painting.class);
+ stein.setName("Gertrude Stein");
+
+ // connecting objects together via relationships
+ picasso.addToPaintings(girl);
+ picasso.addToPaintings(stein);
+
+ girl.setGallery(metropolitan);
+ stein.setGallery(metropolitan);
+
+ // saving all the changes above
+ context.commitChanges();
+ }
+
+ static void selectTutorial(ObjectContext context) {
+ // SelectQuery examples
+ SelectQuery<Painting> select1 = SelectQuery.query(Painting.class, null);
+ List<Painting> paintings1 = context.select(select1);
+
+ Expression qualifier2 = Painting.NAME.likeInsensitive("gi%");
+ SelectQuery<Painting> select2 = SelectQuery.query(Painting.class, qualifier2);
+ List<Painting> paintings2 = context.select(select2);
+
+ Calendar c = new GregorianCalendar();
+ c.set(c.get(Calendar.YEAR) - 100, 0, 1, 0, 0, 0);
+
+ Expression qualifier3 = Expression.fromString("artist.dateOfBirth < $date");
+ qualifier3 = qualifier3.expWithParameters(Collections.singletonMap("date", c.getTime()));
+ SelectQuery<Painting> select3 = SelectQuery.query(Painting.class, qualifier3);
+ List<Painting> paintings3 = context.select(select3);
+ }
+
+ static void deleteTutorial(ObjectContext context) {
+ // Delete object examples
+ Expression qualifier = Artist.NAME.eq("Pablo Picasso");
+ SelectQuery<Artist> selectToDelete = SelectQuery.query(Artist.class, qualifier);
+ Artist picasso = (Artist) Cayenne.objectForQuery(context, selectToDelete);
+
+ if (picasso != null) {
+ context.deleteObjects(picasso);
+ context.commitChanges();
+ }
+ }
}
Modified: cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Artist.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Artist.java?rev=1486471&r1=1486470&r2=1486471&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Artist.java (original)
+++ cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Artist.java Sun May 26 20:33:05 2013
@@ -4,6 +4,7 @@ import java.util.Date;
import java.util.List;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.tutorial.persistent.Painting;
/**
@@ -14,12 +15,19 @@ import org.apache.cayenne.tutorial.persi
*/
public abstract class _Artist extends CayenneDataObject {
+ @Deprecated
public static final String DATE_OF_BIRTH_PROPERTY = "dateOfBirth";
+ @Deprecated
public static final String NAME_PROPERTY = "name";
+ @Deprecated
public static final String PAINTINGS_PROPERTY = "paintings";
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<Date> DATE_OF_BIRTH = new Property<Date>("dateOfBirth");
+ public static final Property<String> NAME = new Property<String>("name");
+ public static final Property<List<Painting>> PAINTINGS = new Property<List<Painting>>("paintings");
+
public void setDateOfBirth(Date dateOfBirth) {
writeProperty("dateOfBirth", dateOfBirth);
}
Modified: cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Gallery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Gallery.java?rev=1486471&r1=1486470&r2=1486471&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Gallery.java (original)
+++ cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Gallery.java Sun May 26 20:33:05 2013
@@ -3,6 +3,7 @@ package org.apache.cayenne.tutorial.pers
import java.util.List;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.tutorial.persistent.Painting;
/**
@@ -13,11 +14,16 @@ import org.apache.cayenne.tutorial.persi
*/
public abstract class _Gallery extends CayenneDataObject {
+ @Deprecated
public static final String NAME_PROPERTY = "name";
+ @Deprecated
public static final String PAINTINGS_PROPERTY = "paintings";
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<String> NAME = new Property<String>("name");
+ public static final Property<List<Painting>> PAINTINGS = new Property<List<Painting>>("paintings");
+
public void setName(String name) {
writeProperty("name", name);
}
Modified: cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Painting.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Painting.java?rev=1486471&r1=1486470&r2=1486471&view=diff
==============================================================================
--- cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Painting.java (original)
+++ cayenne/main/trunk/tutorials/tutorial/src/main/java/org/apache/cayenne/tutorial/persistent/auto/_Painting.java Sun May 26 20:33:05 2013
@@ -1,6 +1,7 @@
package org.apache.cayenne.tutorial.persistent.auto;
import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.exp.Property;
import org.apache.cayenne.tutorial.persistent.Artist;
import org.apache.cayenne.tutorial.persistent.Gallery;
@@ -12,12 +13,19 @@ import org.apache.cayenne.tutorial.persi
*/
public abstract class _Painting extends CayenneDataObject {
+ @Deprecated
public static final String NAME_PROPERTY = "name";
+ @Deprecated
public static final String ARTIST_PROPERTY = "artist";
+ @Deprecated
public static final String GALLERY_PROPERTY = "gallery";
public static final String ID_PK_COLUMN = "ID";
+ public static final Property<String> NAME = new Property<String>("name");
+ public static final Property<Artist> ARTIST = new Property<Artist>("artist");
+ public static final Property<Gallery> GALLERY = new Property<Gallery>("gallery");
+
public void setName(String name) {
writeProperty("name", name);
}