[Samples & SDK] Replace Double Brace initialization with Standard Initialization (#1103)

* Fix double brace in botbuilder library

* Fix double brace in botbuilder-dialogs library

* Fix double brace in bot-schema library

* Fix double brace in bot-ai-luis library

* Fix double brace in bot-ai-qna library

* Fix double brace in bot-azure library

* Fix double brace in bot-connector library

* Fix double brace in bot-integration library

* Fix double brace in sample 3

* Fix double brace in sample 6

* Fix double brace in sample 7

* Fix double brace in sample 8

* Fix double brace in sample 11

* Fix double brace in sample 15

* Fix double brace in sample 17

* Fix double brace in sample 50

* Fix double brace in sample 51

* Fix double brace in sample 52

* Fix double brace in sample 53

* Fix double brace in sample 54

* Fix double brace in sample 55

* Fix double brace in sample 56

* Fix double brace in sample 57

* Fix double brace in sample 58

* Fix double brace in sample 81

* Fix double brace in sample 13

* Replicate change in generator for core bot template

Author: Batta32

Generator/generator-botbuilder-java/generators/app/templates/core/src/main/java/DateResolverDialog.java

@@ -75,12 +75,10 @@ private CompletableFuture<DialogTurnResult> initialStep(WaterfallStepContext ste
             return stepContext.prompt("DateTimePrompt", promptOptions);
         }
 
-        DateTimeResolution dateTimeResolution = new DateTimeResolution() {{
-            setTimex(timex);
-        }};
-        List<DateTimeResolution> dateTimeResolutions = new ArrayList<DateTimeResolution>() {{
-            add(dateTimeResolution);
-        }};
+        DateTimeResolution dateTimeResolution = new DateTimeResolution();
+        dateTimeResolution.setTimex(timex);
+        List<DateTimeResolution> dateTimeResolutions = new ArrayList<DateTimeResolution>();
+        dateTimeResolutions.add(dateTimeResolution);
         return stepContext.next(dateTimeResolutions);
     }
 

Generator/generator-botbuilder-java/generators/app/templates/core/src/main/java/DialogAndWelcomeBot.java

@@ -85,10 +85,10 @@ private Attachment createAdaptiveCardAttachment() {
             String adaptiveCardJson = IOUtils
                 .toString(inputStream, StandardCharsets.UTF_8.toString());
 
-            return new Attachment() {{
-                setContentType("application/vnd.microsoft.card.adaptive");
-                setContent(Serialization.jsonToTree(adaptiveCardJson));
-            }};
+            Attachment attachment = new Attachment();
+            attachment.setContentType("application/vnd.microsoft.card.adaptive");
+            attachment.setContent(Serialization.jsonToTree(adaptiveCardJson));
+            return attachment;
 
         } catch (IOException e) {
             e.printStackTrace();

Generator/generator-botbuilder-java/generators/app/templates/core/src/main/java/FlightBookingRecognizer.java

@@ -42,12 +42,8 @@ public FlightBookingRecognizer(Configuration configuration) {
             // Set the recognizer options depending on which endpoint version you want to use.
             // More details can be found in
             // https://docs.microsoft.com/en-gb/azure/cognitive-services/luis/luis-migration-api-v3
-            LuisRecognizerOptionsV3 recognizerOptions = new LuisRecognizerOptionsV3(
-                luisApplication) {
-                {
-                    setIncludeInstanceData(true);
-                }
-            };
+            LuisRecognizerOptionsV3 recognizerOptions = new LuisRecognizerOptionsV3(luisApplication);
+            recognizerOptions.setIncludeInstanceData(true);
 
             this.recognizer = new LuisRecognizer(recognizerOptions);
         }

libraries/bot-ai-luis-v3/src/main/java/com/microsoft/bot/ai/luis/LuisRecognizerOptionsV3.java

@@ -485,11 +485,8 @@ private CompletableFuture<RecognizerResult> recognizeInternal(TurnContext turnCo
         ObjectMapper mapper = new ObjectMapper().findAndRegisterModules();
 
         if (utterance == null || utterance.isEmpty()) {
-            recognizerResult = new RecognizerResult() {
-                {
-                    setText(utterance);
-                }
-            };
+            recognizerResult = new RecognizerResult();
+            recognizerResult.setText(utterance);
         } else {
             try {
                 Request request = buildRequest(buildRequestBody(utterance));
@@ -541,11 +538,9 @@ private Map<String, IntentScore> getIntents(JsonNode prediction) {
             Map.Entry<String, JsonNode> intent = it.next();
             double score = intent.getValue().get("score").asDouble();
             String intentName = intent.getKey().replace(".", "_").replace(" ", "_");
-            intents.put(intentName, new IntentScore() {
-                {
-                    setScore(score);
-                }
-            });
+            IntentScore intentScore = new IntentScore();
+            intentScore.setScore(score);
+            intents.put(intentName, intentScore);
         }
 
         return intents;

libraries/bot-ai-luis-v3/src/test/java/com/microsoft/bot/ai/luis/LuisRecognizerOptionsV3Tests.java

@@ -124,13 +124,9 @@ private void shouldParseLuisResponsesCorrectly_TurnContextPassed(String fileName
             LuisRecognizerOptionsV3 v3 = buildTestRecognizer(endpoint, testSettings);
 
             // Run test
-            Activity activity = new Activity() {
-                {
-                    setText(testData.get("text").asText());
-                    setType(ActivityTypes.MESSAGE);
-                    setChannelId("EmptyContext");
-                }
-            };
+            Activity activity = new Activity(ActivityTypes.MESSAGE);
+            activity.setText(testData.get("text").asText());
+            activity.setChannelId("EmptyContext");
             doReturn(activity)
                 .when(turnContext)
                 .getActivity();
@@ -198,23 +194,21 @@ public void shouldBuildExternalEntities_DialogContextPassed_ExternalRecognizer()
             LuisRecognizerOptionsV3 v3 = buildTestRecognizer(endpoint, testSettings);
             v3.setExternalEntityRecognizer(recognizer);
 
-            Activity activity = new Activity() {
-                {
-                    setText(testData.get("text").asText());
-                    setType(ActivityTypes.MESSAGE);
-                    setChannelId("EmptyContext");
-                }
-            };
+            Activity activity = new Activity(ActivityTypes.MESSAGE);
+            activity.setText(testData.get("text").asText());
+            activity.setChannelId("EmptyContext");
 
             doReturn(CompletableFuture.completedFuture(new ResourceResponse()))
                 .when(turnContext)
                 .sendActivity(any(Activity.class));
 
             when(dC.getContext()).thenReturn(turnContext);
 
-            doReturn(CompletableFuture.supplyAsync(() -> new RecognizerResult(){{
-                setEntities(testSettings.get("ExternalRecognizerResult"));
-            }}))
+            doReturn(CompletableFuture.supplyAsync(() -> {
+                RecognizerResult recognizerResult = new RecognizerResult();
+                recognizerResult.setEntities(testSettings.get("ExternalRecognizerResult"));
+                return recognizerResult;
+            }))
                 .when(recognizer)
                 .recognize(any(DialogContext.class), any(Activity.class));
 
@@ -244,13 +238,9 @@ public void shouldBuildExternalEntities_DialogContextPassed_ExternalRecognizer()
 
     public static TurnContext createContext(String message) {
 
-        Activity activity = new Activity() {
-            {
-                setText(message);
-                setType(ActivityTypes.MESSAGE);
-                setChannelId("EmptyContext");
-            }
-        };
+        Activity activity = new Activity(ActivityTypes.MESSAGE);
+        activity.setText(message);
+        activity.setChannelId("EmptyContext");
 
         return new TurnContextImpl(new NotImplementedAdapter(), activity);
     }
@@ -323,18 +313,18 @@ private LuisRecognizerOptionsV3 buildTestRecognizer (String endpoint, JsonNode t
         ObjectMapper mapper = new ObjectMapper().findAndRegisterModules();
         ObjectReader readerDynamicList = mapper.readerFor(new TypeReference<List<DynamicList>>() {});
         ObjectReader readerExternalentities = mapper.readerFor(new TypeReference<List<ExternalEntity>>() {});
-        return new LuisRecognizerOptionsV3(
+        LuisRecognizerOptionsV3 recognizer = new LuisRecognizerOptionsV3(
             new LuisApplication(
                 this.applicationId,
                 this.subscriptionKey,
-                endpoint)) {{
-            setIncludeInstanceData(testSettings.get("IncludeInstanceData").asBoolean());
-            setIncludeAllIntents(testSettings.get("IncludeAllIntents").asBoolean());
-            setVersion(testSettings.get("Version") == null ? null : testSettings.get("Version").asText());
-            setDynamicLists(testSettings.get("DynamicLists") == null ? null : readerDynamicList.readValue(testSettings.get("DynamicLists")));
-            setExternalEntities(testSettings.get("ExternalEntities") == null ? null : readerExternalentities.readValue(testSettings.get("ExternalEntities")));
-            setDateTimeReference(testSettings.get("DateTimeReference") == null ? null : testSettings.get("DateTimeReference").asText());
-        }};
+                endpoint));
+        recognizer.setIncludeInstanceData(testSettings.get("IncludeInstanceData").asBoolean());
+        recognizer.setIncludeAllIntents(testSettings.get("IncludeAllIntents").asBoolean());
+        recognizer.setVersion(testSettings.get("Version") == null ? null : testSettings.get("Version").asText());
+        recognizer.setDynamicLists(testSettings.get("DynamicLists") == null ? null : readerDynamicList.readValue(testSettings.get("DynamicLists")));
+        recognizer.setExternalEntities(testSettings.get("ExternalEntities") == null ? null : readerExternalentities.readValue(testSettings.get("ExternalEntities")));
+        recognizer.setDateTimeReference(testSettings.get("DateTimeReference") == null ? null : testSettings.get("DateTimeReference").asText());
+        return recognizer;
     }
 
 }