refactor samples

Author: Sita04

genai/pom.xml

@@ -20,8 +20,8 @@
   </parent>
 
   <properties>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -32,7 +32,7 @@
         <groupId>com.google.cloud</groupId>
         <scope>import</scope>
         <type>pom</type>
-        <version>26.32.0</version>
+        <version>26.33.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -55,11 +55,5 @@
       <version>1.4.0</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <version>RELEASE</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

…enai/text_generation/TextgenWithTxt.java …enai/text_generation/TextGeneration.javagenai/src/main/java/genai/text_generation/TextgenWithTxt.java renamed to genai/src/main/java/genai/text_generation/TextGeneration.java genai/src/main/java/genai/text_generation/TextgenWithTxt.java renamed to genai/src/main/java/genai/text_generation/TextGeneration.java

@@ -22,21 +22,26 @@
 import java.io.IOException;
 import org.apache.http.HttpException;
 
-public class TxtgenWithTxt {
+public class TextGeneration {
   public static void main(String[] args) throws IOException, HttpException {
-    Client client = new Client();
+    // TODO(Developer): Replace the below variables before running the sample.
+    String modelId = "gemini-2.0-flash-001";
+    String prompt = "How does AI work?";
+    generateContent(modelId, prompt);
+  }
 
-    GenerateContentResponse response = client.models.generateContent(
-      "gemini-2.0-flash-001",
-      "How does AI work?",
-      null
-    );
-    System.out.println(response.text());
-    // Example response:
-    // Okay, let's break down how AI works. It's a broad field, so I'll focus on the ...
-    //
-    // Here's a simplified overview:
-    // ...
+  public static String generateContent(String modelId, String prompt) throws HttpException, IOException {
+    // Initialize client that will be used to send requests. This client only needs to be created
+    // once, and can be reused for multiple requests.
+    try (Client client = new Client()) {
+      GenerateContentResponse response = client.models.generateContent(modelId, prompt, null);
+      System.out.println(response.text());
+      // Example response:
+      // Okay, let's break down how AI works. It's a broad field, so I'll focus on the ...
+      // Here's a simplified overview:
+      // ...
+      return response.text();
+    }
   }
 }
 // [END googlegenaisdk_textgen_with_txt]

genai/src/test/java/genai/text_generation/TextGenerationIT.java

@@ -21,21 +21,17 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.PrintStream;
 import org.apache.http.HttpException;
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
 public class TextGenerationIT {
 
-  private ByteArrayOutputStream bout;
-  private PrintStream originalOut;
-
+  private String MODEL_ID="gemini-2.0-flash-001";
 
   // Check if the required environment variables are set.
   public static void requireEnvVar(String envVarName) {
@@ -44,21 +40,18 @@ public static void requireEnvVar(String envVarName) {
         .isNotEmpty();
   }
 
-  @Before
-  public void setUp() {
-      originalOut = System.out;
-      bout = new ByteArrayOutputStream();
-      System.setOut(new PrintStream(bout));
+  @BeforeClass
+  public static void setUp() {
+      requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
+      requireEnvVar("GOOGLE_CLOUD_PROJECT");
+      requireEnvVar("GOOGLE_CLOUD_LOCATION");
+      requireEnvVar("GOOGLE_GENAI_USE_VERTEXAI");
   }
 
-    public void tearDown() {
-        System.setOut(originalOut);
-    }
-
   @Test
-  public void testTextgenWithTxt() throws IOException, HttpException {
-    TxtgenWithTxt.main(new String[]{});
-    tearDown();
-    assertThat(bout.toString()).isNotEmpty();
+  public void testTextGeneration() throws IOException, HttpException {
+    String prompt = "How does AI work?";
+    String response = TextGeneration.generateContent(MODEL_ID, prompt);
+    assertThat(response).isNotEmpty();
   }
 }