Remove workaround for /v2/apps/:guid/summary issue (#176)

This reverts commit b9994bb.

Author: nictas

src/main/java/com/sap/cloudfoundry/client/facade/adapters/RawCloudApplication.java

@@ -44,11 +44,9 @@ public abstract class RawCloudApplication extends RawCloudEntity<CloudApplicatio
 
     @Override
     public CloudApplication derive() {
-        Resource<ApplicationEntity> resource = getResource();
-        ApplicationEntity entity = resource.getEntity();
         SummaryApplicationResponse summary = getSummary();
         return ImmutableCloudApplication.builder()
-                                        .metadata(parseResourceMetadata(resource))
+                                        .metadata(parseResourceMetadata(getResource()))
                                         .name(summary.getName())
                                         .memory(summary.getMemory())
                                         .uris(toUrlStrings(summary.getRoutes()))
@@ -60,7 +58,7 @@ public CloudApplication derive() {
                                         .packageState(parsePackageState(summary.getPackageState()))
                                         .stagingError(summary.getStagingFailedDescription())
                                         .services(getNames(summary.getServices()))
-                                        .env(parseEnv(entity.getEnvironmentJsons()))
+                                        .env(parseEnv(summary.getEnvironmentJsons()))
                                         .space(getSpace().derive())
                                         .build();
     }

src/test/java/com/sap/cloudfoundry/client/facade/adapters/RawCloudApplicationTest.java

@@ -162,7 +162,12 @@ private static Map<String, String> buildExpectedEnvironment() {
     }
 
     private static RawCloudApplication buildRawApplicationWithoutEnvironment() {
-        return buildRawApplication(buildApplicationResourceWithoutEnvironment(), buildApplicationSummary());
+        SummaryApplicationResponse summary = buildApplicationSummary();
+        SummaryApplicationResponse summaryWithoutEnvironment = SummaryApplicationResponse.builder()
+                                                                                         .from(summary)
+                                                                                         .environmentJsons(null)
+                                                                                         .build();
+        return buildRawApplication(summaryWithoutEnvironment);
     }
 
     private static RawCloudApplication buildRawApplicationWithoutDockerInfo() {
@@ -172,7 +177,7 @@ private static RawCloudApplication buildRawApplicationWithoutDockerInfo() {
                                                                                         .dockerImage(null)
                                                                                         .dockerCredentials(null)
                                                                                         .build();
-        return buildRawApplication(buildApplicationResource(), summaryWithoutDockerInfo);
+        return buildRawApplication(summaryWithoutDockerInfo);
     }
 
     private static RawCloudApplication buildRawApplicationWithoutDockerCredentials() {
@@ -181,37 +186,25 @@ private static RawCloudApplication buildRawApplicationWithoutDockerCredentials()
                                                                                                .from(summary)
                                                                                                .dockerCredentials(null)
                                                                                                .build();
-        return buildRawApplication(buildApplicationResource(), summaryWithoutDockerCredentials);
+        return buildRawApplication(summaryWithoutDockerCredentials);
     }
 
     private static RawCloudApplication buildRawApplication() {
-        return buildRawApplication(buildApplicationResource(), buildApplicationSummary());
+        return buildRawApplication(buildApplicationSummary());
     }
 
-    private static RawCloudApplication buildRawApplication(Resource<ApplicationEntity> applicationResource,
-                                                           SummaryApplicationResponse summary) {
+    private static RawCloudApplication buildRawApplication(SummaryApplicationResponse summary) {
         return ImmutableRawCloudApplication.builder()
-                                           .resource(applicationResource)
+                                           .resource(buildApplicationResource())
                                            .summary(summary)
                                            .stack(STACK)
                                            .space(SPACE)
                                            .build();
     }
 
     private static Resource<ApplicationEntity> buildApplicationResource() {
-        return buildApplicationResource(ENVIRONMENT);
-    }
-
-    private static Resource<ApplicationEntity> buildApplicationResourceWithoutEnvironment() {
-        return buildApplicationResource(null);
-    }
-
-    private static Resource<ApplicationEntity> buildApplicationResource(Map<String, Object> environmentJsons) {
         return ApplicationResource.builder()
                                   .metadata(RawCloudEntityTest.METADATA)
-                                  .entity(ApplicationEntity.builder()
-                                                           .environmentJsons(environmentJsons)
-                                                           .build())
                                   .build();
     }
 
@@ -232,6 +225,7 @@ private static SummaryApplicationResponse buildApplicationSummary() {
                                          .enableSsh(SSH_ENABLED)
                                          .dockerImage(DOCKER_IMAGE)
                                          .dockerCredentials(DOCKER_CREDENTIALS)
+                                         .environmentJsons(ENVIRONMENT)
                                          .command(COMMAND)
                                          .buildpack(BUILDPACK)
                                          .detectedBuildpack(DETECTED_BUILDPACK)