Removing unused region tags (GoogleCloudPlatform#1393)

billyjacobson · web-flow · commit 788979da174b · 2019-05-23T11:32:30.000-04:00
* Removing unused region tags

* updating example region tagˆ

* Rename tests to match new format

* Changing system properties for tests
diff --git a/appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelloWorld.java b/appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelloWorld.java
@@ -30,7 +30,7 @@
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.util.Bytes;
-// [START example]
+// [START bigtable_app_engine_standard_hw]
 
 /**
  * A minimal application that connects to Cloud Bigtable using the native HBase API and performs
@@ -63,7 +63,6 @@ public static String create(Connection connection) {
       descriptor.addFamily(new HColumnDescriptor(COLUMN_FAMILY_NAME));
 
       admin.createTable(descriptor);
-      // [END creating_a_table]
     } catch (IOException e) {
       return "Table exists.";
     }
@@ -110,7 +109,7 @@ public static String doHelloWorld() {
       Result getResult = table.get(new Get(Bytes.toBytes(rowKey)));
       String greeting = Bytes.toString(getResult.getValue(COLUMN_FAMILY_NAME, COLUMN_NAME));
       result.append("Get a single greeting by row key<br>");
-      // [END getting_a_row]
+
       result.append("     ");
       result.append(rowKey);
       result.append("= ");
@@ -138,4 +137,4 @@ public static String doHelloWorld() {
     return result.toString();
   }
 }
-// [END example]
+// [END bigtable_app_engine_standard_hw]
diff --git a/appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelper.java b/appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelper.java
@@ -100,10 +100,10 @@ public void contextInitialized(ServletContextEvent event) {
     }
 
     if (PROJECT_ID == null) {
-      PROJECT_ID = System.getProperty("BIGTABLE_PROJECT");
+      PROJECT_ID = System.getProperty("bigtable.projectID");
     }
     if (INSTANCE_ID == null) {
-      INSTANCE_ID = System.getProperty("BIGTABLE_INSTANCE");
+      INSTANCE_ID = System.getProperty("bigtable.instanceID");
     }
 
     try {
diff --git a/appengine-java8/bigtable/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/bigtable/src/main/webapp/WEB-INF/appengine-web.xml
@@ -11,7 +11,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- [START config] -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <threadsafe>true</threadsafe>
   <runtime>java8</runtime>
@@ -22,4 +21,3 @@
     <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
   </system-properties>
 </appengine-web-app>
-  <!-- [END config] -->
diff --git a/appengine-java8/bigtable/src/test/java/com/example/bigtable/BigtableHelloWorldTests.java b/appengine-java8/bigtable/src/test/java/com/example/bigtable/BigtableHelloWorldTests.java
@@ -25,8 +25,7 @@
 
 /** Unit tests for {@link BigtableHelloWorld}. */
 @RunWith(JUnit4.class)
-@SuppressWarnings("checkstyle:abbreviationaswordinname")
-public class ITBigtableHelloWorld {
+public class BigtableHelloWorldTests {
 
   private BigtableHelper helper;
 

Original file line number	Diff line number	Diff line change
`@@ -100,10 +100,10 @@ public void contextInitialized(ServletContextEvent event) {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`if (PROJECT_ID == null) {`
`103`		`- PROJECT_ID = System.getProperty("BIGTABLE_PROJECT");`
	`103`	`+ PROJECT_ID = System.getProperty("bigtable.projectID");`
`104`	`104`	`}`
`105`	`105`	`if (INSTANCE_ID == null) {`
`106`		`- INSTANCE_ID = System.getProperty("BIGTABLE_INSTANCE");`
	`106`	`+ INSTANCE_ID = System.getProperty("bigtable.instanceID");`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`try {`