Revision: 8081
Author: [email protected]
Date: Mon May 10 18:33:18 2010
Log: Added: (i) a DataGenerator factored out of ExpensesDataServlet to
generate
sample data, (ii) SampleDataPopulator that can populate the datastore using
a
json-format datafile (iii) a dataPopulator script to invoke
SampleDataPopulator.
Review at http://gwt-code-reviews.appspot.com/505801
Review by: [email protected]
http://code.google.com/p/google-web-toolkit/source/detail?r=8081
Added:
/branches/2.1/bikeshed/scripts
/branches/2.1/bikeshed/scripts/dataPopulator
/branches/2.1/bikeshed/scripts/maven_script.sh
/branches/2.1/bikeshed/src/com/google/gwt/requestfactory/server/SampleDataPopulator.java
/branches/2.1/bikeshed/src/com/google/gwt/sample/expenses/server/DataGenerator.java
Modified:
/branches/2.1/bikeshed/src/com/google/gwt/sample/expenses/server/ExpensesDataServlet.java
/branches/2.1/bikeshed/war/WEB-INF/web.xml
=======================================
--- /dev/null
+++ /branches/2.1/bikeshed/scripts/dataPopulator Mon May 10 18:33:18 2010
@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# Copyright 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
not
+# use this file except in compliance with the License. You may obtain a
copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
under
+# the License.
+
+# the first argument should be the URL.
+# the second argument is the pathname of the file to be read.
+
+MAVEN_REPO=~/.m2/repository
+
+NEW_CLASSPATH=$MAVEN_REPO/org/json/json/20090211/json-20090211.jar
+for i in dev user servlet bikeshed
+do
+
NEW_CLASSPATH=$MAVEN_REPO/com/google/gwt/gwt-${i}/2.0.999/gwt-${i}-2.0.999.jar:$NEW_CLASSPATH
+done
+
+java -cp $NEW_CLASSPATH
com.google.gwt.requestfactory.server.SampleDataPopulator "$@"
=======================================
--- /dev/null
+++ /branches/2.1/bikeshed/scripts/maven_script.sh Mon May 10 18:33:18 2010
@@ -0,0 +1,27 @@
+#!/bin/bash
+#
+# Copyright 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
not
+# use this file except in compliance with the License. You may obtain a
copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
under
+# the License.
+
+
+# This script should be run from the trunk dir.
+ant clean dist-bikeshed
+
+MAVEN_REPO=~/.m2/repository
+
+for i in dev user servlet bikeshed
+do
+ mvn install:install-file -DgroupId=com.google.gwt -DartifactId=gwt-${i}
-Dversion=2.0.999 -Dpackaging=jar -Dfile=build/lib/gwt-${i}.jar
-DgeneratePom=true
+done
+echo "installed the gwt libs in the maven repo"
=======================================
--- /dev/null
+++
/branches/2.1/bikeshed/src/com/google/gwt/requestfactory/server/SampleDataPopulator.java
Mon May 10 18:33:18 2010
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
not
+ * use this file except in compliance with the License. You may obtain a
copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
under
+ * the License.
+ */
+package com.google.gwt.requestfactory.server;
+
+import com.google.gwt.dev.util.Util;
+import com.google.gwt.requestfactory.shared.RequestFactory;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Class to populate the datastore with sample data in a JSON file.
+ */
+public class SampleDataPopulator {
+
+ public static void main(String args[]) throws HttpException,
JSONException, IOException {
+ if (args.length < 2) {
+ System.err.println("Require two arguments: URL string and fileName");
+ System.exit(-1);
+ }
+ SampleDataPopulator populator = new SampleDataPopulator(args[0],
args[1]);
+ populator.populate();
+ }
+
+ private final String url;
+
+ private final String filePathName;
+
+ SampleDataPopulator(String url, String filePathName) {
+ this.url = url;
+ this.filePathName = filePathName;
+ }
+
+ public void populate() throws JSONException, HttpException, IOException {
+ JSONObject jsonObject =
readAsJsonObject(readFileAsString(filePathName));
+ postJsonFile(jsonObject);
+ }
+
+ private void postJsonFile(JSONObject contentData) throws HttpException,
+ IOException, JSONException {
+ PostMethod post = new PostMethod(url);
+ JSONObject request = new JSONObject();
+ request.put("operation", RequestFactory.SYNC);
+ request.put("contentData", contentData);
+ post.setRequestBody(request.toString());
+ HttpClient client = new HttpClient();
+ int status = client.executeMethod(post);
+ String response = post.getResponseBodyAsString();
+ System.out.println("status = " + status + ", response: " + response);
+ }
+
+ private JSONObject readAsJsonObject(String string) throws JSONException {
+ JSONObject jsonObject = new JSONObject(string);
+ return jsonObject;
+ }
+
+ private String readFileAsString(String filePathName) {
+ File file = new File(filePathName);
+ return Util.readFileAsString(file);
+ }
+
+}
=======================================
--- /dev/null
+++
/branches/2.1/bikeshed/src/com/google/gwt/sample/expenses/server/DataGenerator.java
Mon May 10 18:33:18 2010
@@ -0,0 +1,227 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
not
+ * use this file except in compliance with the License. You may obtain a
copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
under
+ * the License.
+ */
+package com.google.gwt.sample.expenses.server;
+
+import com.google.gwt.dev.util.Util;
+import com.google.gwt.requestfactory.shared.RequestFactory.WriteOperation;
+import com.google.gwt.sample.expenses.server.domain.Employee;
+import com.google.gwt.sample.expenses.server.domain.Expense;
+import com.google.gwt.sample.expenses.server.domain.Report;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+
+/**
+ *
+ */
+public class DataGenerator {
+ // Must be in sync with DESCRIPTIONS
+ private static final String[] CATEGORIES = {
+ "Dining", "Dining", "Dining", "Lodging", "Lodging",
+ "Local Transportation", "Local Transportation", "Local
Transportation",
+ "Air Travel", "Air Travel", "Office Supplies", "Office Supplies",
+ "Office Supplies", "Office Supplies",};
+
+ private static final String[] DEPARTMENTS = {
+ "Sales", "Marketing", "Engineering", "Operations"};
+
+ // Must be in sync with CATEGORIES
+ private static final String[] DESCRIPTIONS = {
+ "Breakfast", "Lunch", "Dinner", "Hotel", "Bed & Breakfast", "Train
fare",
+ "Taxi fare", "Bus ticket", "Flight from ATL to SFO",
+ "Flight from SFO to
ATL", "Paperclips", "Stapler", "Scissors", "Paste",};
+
+ private static final String[] FIRST_NAMES = {
+ "Amy", "Bob", "Catherine", "Dave", "Earl", "Flin", "George", "Harriot",
+ "Ingrid", "John", "Katy", "Leo", "Mike", "Nancy", "Owen", "Paul",
+ "Reece", "Sally", "Terry", "Val", "Wes", "Xavier", "Zack"};
+
+ private static final String[] LAST_NAMES = {
+ "Awesome", "Bravo", "Cool", "Fantastic", "Great", "Happy",
+ "Ignoranomous", "Krazy", "Luminous", "Magnanimous", "Outstanding",
+ "Perfect", "Radical", "Stellar", "Terrific", "Wonderful"};
+
+ private static final String[] NOTES = {
+ // Some entries do not have notes.
+ "", "Need approval by Monday", "Show me the money",
+ "Please bill to the Widgets project", "High priority", "Review
A.S.A.P."};
+
+ private static final String[] PURPOSES = {
+ "Spending lots of money", "Team building diamond cutting offsite",
+ "Visit to Istanbul", "ISDN modem for telecommuting", "Sushi offsite",
+ "Baseball card research", "Potato chip cooking offsite",
+ "Money laundering", "Donut day"};
+
+ public static void main(String args[]) throws JSONException {
+ if (args.length < 2) {
+ throw new IllegalArgumentException(
+ "Requires two arguments: #Employees and json-fileName");
+ }
+ int numEmployees = Integer.parseInt(args[0]);
+ DataGenerator generator = new DataGenerator();
+ List<Object> recordList = generator.generateData(numEmployees);
+ System.out.println("Generated " + recordList.size()
+ + " records, #employees: " + numEmployees);
+ String jsonString = generator.getJsonString(recordList);
+ File output = new File(args[1]);
+ Util.writeStringAsFile(output, jsonString);
+ System.out.println("Wrote out the data as json into file "
+ + output.getAbsolutePath());
+ }
+
+ Random rand = new Random();
+ List<Object> objectList = new ArrayList<Object>();
+
+ // TODO: hacky, assuming that id is assigned sequentially.
+ long id = 1;
+
+ List<Object> generateData(int numEmployees) {
+ // Initialize the database.
+ for (int i = 0; i < numEmployees; i++) {
+ addEmployee();
+ }
+ return objectList;
+ }
+
+ /**
+ * Add a randomly generated employee.
+ */
+ private void addEmployee() {
+ Employee abc = new Employee();
+ String firstName = nextValue(FIRST_NAMES);
+ String lastName = nextValue(LAST_NAMES);
+ String username = (firstName.charAt(0) + lastName).toLowerCase();
+ abc.setUserName(username);
+ abc.setDisplayName(firstName + " " + lastName);
+ abc.setDepartment(nextValue(DEPARTMENTS));
+ abc.setId(id++);
+ objectList.add(abc);
+
+ addReports(abc.getId());
+ }
+
+ private void addExpenses(Long reportId) {
+ int num = rand.nextInt(5) + 1;
+ for (int i = 0; i < num; i++) {
+ int index = rand.nextInt(DESCRIPTIONS.length);
+ Expense detail = new Expense();
+ detail.setReportId(reportId);
+ detail.setDescription(DESCRIPTIONS[index]);
+ detail.setDate(getDate());
+ detail.setAmount(rand.nextInt(25000) / 100.0);
+ detail.setCategory(CATEGORIES[index]);
+ detail.setApproval("");
+ detail.setReasonDenied("");
+ detail.setId(id++);
+ objectList.add(detail);
+ }
+ }
+
+ /**
+ * Add a randomly generated report.
+ *
+ * @param employeeId the id of the employee who created the report
+ */
+ private void addReports(Long employeeId) {
+ // Add 1-20 expense reports.
+ int reportCount = 1 + rand.nextInt(20);
+ for (int i = 0; i < reportCount; i++) {
+ Report report = new Report();
+ report.setCreated(getDate());
+ report.setReporterKey(employeeId);
+ report.setPurpose(nextValue(PURPOSES));
+ report.setNotes(nextValue(NOTES));
+ report.setId(id++);
+ objectList.add(report);
+
+ addExpenses(report.getId());
+ }
+ }
+
+ private Date getDate() {
+ long now = new Date().getTime();
+ // Go back up to 90 days from the current date
+ long dateOffset = rand.nextInt(60 * 60 * 24 * 90) * 1000L;
+ return new Date(now - dateOffset);
+ }
+
+ private JSONObject getEmployeeAsJson(Employee employee) throws
JSONException {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("id", "" + employee.getId());
+ jsonObject.put("userName", employee.getUserName());
+ jsonObject.put("displayName", employee.getDisplayName());
+ // EmployeeRecord needs to be updated
+ // jsonObject.put("department", employee.getDepartment());
+ return jsonObject;
+ }
+
+ private JSONObject getExpenseAsJson(Expense expense) throws
JSONException {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("id", "" + expense.getId());
+ jsonObject.put("description", expense.getDescription());
+ jsonObject.put("date", expense.getDate().getTime());
+ jsonObject.put("amount", expense.getAmount());
+ jsonObject.put("category", expense.getCategory());
+ return jsonObject;
+ }
+
+ // use reflection later.
+ private String getJsonString(List<Object> objectList) throws
JSONException {
+ JSONObject outer = new JSONObject();
+ JSONArray createList = new JSONArray();
+ for (Object object : objectList) {
+ JSONObject record = new JSONObject();
+ if (object instanceof Employee) {
+ record.put("EmployeeRecord", getEmployeeAsJson((Employee) object));
+ } else if (object instanceof Report) {
+ record.put("ReportRecord", getReportAsJson((Report) object));
+ } else if (object instanceof Expense) {
+ record.put("ExpenseRecord", getExpenseAsJson((Expense) object));
+ }
+ id++;
+ createList.put(record);
+ }
+ outer.put(WriteOperation.CREATE.name(), createList);
+ return outer.toString(4);
+ }
+
+ private JSONObject getReportAsJson(Report report) throws JSONException {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("id", "" + report.getId());
+ jsonObject.put("created", report.getCreated().getTime());
+ jsonObject.put("reporterKey", report.getReporterKey());
+ jsonObject.put("purpose", report.getPurpose());
+ jsonObject.put("notes", report.getNotes());
+ return jsonObject;
+ }
+
+ /**
+ * Get the next random value from an array.
+ *
+ * @param array the array
+ * @return a random value from the array
+ */
+ private String nextValue(String[] array) {
+ return array[rand.nextInt(array.length)];
+ }
+}
=======================================
---
/branches/2.1/bikeshed/src/com/google/gwt/sample/expenses/server/ExpensesDataServlet.java
Tue May 4 10:22:18 2010
+++
/branches/2.1/bikeshed/src/com/google/gwt/sample/expenses/server/ExpensesDataServlet.java
Mon May 10 18:33:18 2010
@@ -20,8 +20,7 @@
import com.google.gwt.sample.expenses.server.domain.Expense;
import com.google.gwt.sample.expenses.server.domain.Report;
-import java.util.Date;
-import java.util.Random;
+import java.util.List;
/**
* Dwindling interim servlet that calls our mock storage backend directly
@@ -30,124 +29,29 @@
@SuppressWarnings("serial")
public class ExpensesDataServlet extends RequestFactoryServlet {
- // Must be in sync with DESCRIPTIONS
- private static final String[] CATEGORIES = {
- "Dining", "Dining", "Dining", "Lodging", "Lodging",
- "Local Transportation", "Local Transportation", "Local
Transportation",
- "Air Travel", "Air Travel", "Office Supplies", "Office Supplies",
- "Office Supplies", "Office Supplies",};
-
- private static final String[] DEPARTMENTS = {
- "Sales", "Marketing", "Engineering", "Operations"};
-
- // Must be in sync with CATEGORIES
- private static final String[] DESCRIPTIONS = {
- "Breakfast", "Lunch", "Dinner", "Hotel", "Bed & Breakfast", "Train
fare",
- "Taxi fare", "Bus ticket", "Flight from ATL to SFO",
- "Flight from SFO to
ATL", "Paperclips", "Stapler", "Scissors", "Paste",};
-
- private static final String[] FIRST_NAMES = {
- "Amy", "Bob", "Catherine", "Dave", "Earl", "Flin", "George", "Harriot",
- "Ingrid", "John", "Katy", "Leo", "Mike", "Nancy", "Owen", "Paul",
- "Reece", "Sally", "Terry", "Val", "Wes", "Xavier", "Zack"};
-
- private static final String[] LAST_NAMES = {
- "Awesome", "Bravo", "Cool", "Fantastic", "Great", "Happy",
- "Ignoranomous", "Krazy", "Luminous", "Magnanimous", "Outstanding",
- "Perfect", "Radical", "Stellar", "Terrific", "Wonderful"};
-
- private static final String[] NOTES = {
- // Some entries do not have notes.
- "", "Need approval by Monday", "Show me the money",
- "Please bill to the Widgets project", "High priority", "Review
A.S.A.P."};
-
- private static final String[] PURPOSES = {
- "Spending lots of money", "Team building diamond cutting offsite",
- "Visit to Istanbul", "ISDN modem for telecommuting", "Sushi offsite",
- "Baseball card research", "Potato chip cooking offsite",
- "Money laundering", "Donut day"};
-
- Random rand = new Random();
+ private static final boolean DISABLED = true;
@Override
protected void initDb() {
+ if (DISABLED) {
+ return;
+ }
+
long size = Employee.countEmployees();
if (size > 1) {
return;
}
-
- // Initialize the database.
- for (int i = 0; i < 100; i++) {
- addEmployee();
+ List<Object> objectList = new DataGenerator().generateData(100);
+ for (Object object : objectList) {
+ if (object instanceof Employee) {
+ ((Employee) object).persist();
+ }
+ if (object instanceof Report) {
+ ((Report) object).persist();
+ }
+ if (object instanceof Expense) {
+ ((Expense) object).persist();
+ }
}
}
-
- /**
- * Add a randomly generated employee.
- */
- private void addEmployee() {
- Employee abc = new Employee();
- String firstName = nextValue(FIRST_NAMES);
- String lastName = nextValue(LAST_NAMES);
- String username = (firstName.charAt(0) + lastName).toLowerCase();
- abc.setUserName(username);
- abc.setDisplayName(firstName + " " + lastName);
- abc.setDepartment(nextValue(DEPARTMENTS));
- abc.persist();
-
- addReports(abc.getId());
- }
-
- private void addExpenses(Long reportId) {
- int num = rand.nextInt(5) + 1;
- for (int i = 0; i < num; i++) {
- int index = rand.nextInt(DESCRIPTIONS.length);
- Expense detail = new Expense();
- detail.setReportId(reportId);
- detail.setDescription(DESCRIPTIONS[index]);
- detail.setDate(getDate());
- detail.setAmount(rand.nextInt(25000) / 100.0);
- detail.setCategory(CATEGORIES[index]);
- detail.setApproval("");
- detail.setReasonDenied("");
- detail.persist();
- }
- }
-
- /**
- * Add a randomly generated report.
- *
- * @param employeeId the id of the employee who created the report
- */
- private void addReports(Long employeeId) {
- // Add 1-20 expense reports.
- int reportCount = 1 + rand.nextInt(20);
- for (int i = 0; i < reportCount; i++) {
- Report report = new Report();
- report.setCreated(getDate());
- report.setReporterKey(employeeId);
- report.setPurpose(nextValue(PURPOSES));
- report.setNotes(nextValue(NOTES));
- report.persist();
-
- addExpenses(report.getId());
- }
- }
-
- private Date getDate() {
- long now = new Date().getTime();
- // Go back up to 90 days from the current date
- long dateOffset = rand.nextInt(60 * 60 * 24 * 90) * 1000L;
- return new Date(now - dateOffset);
- }
-
- /**
- * Get the next random value from an array.
- *
- * @param array the array
- * @return a random value from the array
- */
- private String nextValue(String[] array) {
- return array[rand.nextInt(array.length)];
- }
-}
+}
=======================================
--- /branches/2.1/bikeshed/war/WEB-INF/web.xml Mon May 10 09:59:13 2010
+++ /branches/2.1/bikeshed/war/WEB-INF/web.xml Mon May 10 18:33:18 2010
@@ -79,8 +79,8 @@
</filter-mapping>
-->
-
<!-- Require login. -->
+<!--
<security-constraint>
<web-resource-collection>
<web-resource-name>Access</web-resource-name>
@@ -90,5 +90,6 @@
<role-name>*</role-name>
</auth-constraint>
</security-constraint>
+-->
</web-app>
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
