General refactoring

Author: PeterBackroll

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java

@@ -0,0 +1,24 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you 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 org.apache.cloudstack.backup.backroll.model.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public abstract class BackrollAsyncResponse {
+    @JsonProperty("state")
+    public String state;
+}

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java

@@ -1,27 +1,10 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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 org.apache.cloudstack.backup.backroll.model.response.archive;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse;
 
-public class BackrollBackupsFromVMResponse {
-    @JsonProperty("state")
-    public String state;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
+public class BackrollBackupsFromVMResponse extends BackrollAsyncResponse {
     @JsonProperty("info")
     public BackrollArchivesResponse archives;
-}
+}

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/BackrollAsyncResponse.java

@@ -0,0 +1,23 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you 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 org.apache.cloudstack.backup.backroll.model.response.backup;
+
+import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse;
+
+public class BackrollBackupResponse extends BackrollAsyncResponse{
+
+}

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/archive/BackrollBackupsFromVMResponse.java

@@ -16,12 +16,11 @@
 // under the License.
 package org.apache.cloudstack.backup.backroll.model.response.metrics.backup;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse;
 
-public class BackrollBackupMetricsResponse {
-    @JsonProperty("state")
-    public String state;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
+public class BackrollBackupMetricsResponse extends BackrollAsyncResponse {
     @JsonProperty("info")
     public BackupMetricsInfo info;
 }

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/backup/BackrollBackupResponse.java

@@ -16,12 +16,11 @@
 // under the License.
 package org.apache.cloudstack.backup.backroll.model.response.metrics.virtualMachine;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse;
 
-public class BackrollVmMetricsResponse {
-    @JsonProperty("state")
-    public String state;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
+public class BackrollVmMetricsResponse extends BackrollAsyncResponse{
     @JsonProperty("info")
     public MetricsInfos infos;
 }

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/metrics/backup/BackrollBackupMetricsResponse.java

@@ -16,12 +16,11 @@
 // under the License.
 package org.apache.cloudstack.backup.backroll.model.response.metrics.virtualMachineBackups;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse;
 
-public class VirtualMachineBackupsResponse {
-    @JsonProperty("state")
-    public String state;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
+public class VirtualMachineBackupsResponse extends BackrollAsyncResponse {
     @JsonProperty("info")
     public Archives info;
 }

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/metrics/virtualMachine/BackrollVmMetricsResponse.java

@@ -18,12 +18,12 @@
 
 import java.util.List;
 
+import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class BackupPoliciesResponse {
-    @JsonProperty("state")
-    public String state;
+public class BackupPoliciesResponse extends BackrollAsyncResponse {
 
     @JsonProperty("info")
     @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/metrics/virtualMachineBackups/VirtualMachineBackupsResponse.java

@@ -0,0 +1,28 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you 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 org.apache.cloudstack.backup.backroll.model.response.restore;
+
+import org.apache.cloudstack.backup.backroll.model.response.BackrollAsyncResponse;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class BackrollRestoreResponse extends BackrollAsyncResponse {
+    @JsonProperty("info")
+    public String info;
+}